Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
This commit is contained in:
commit
fcb1c69804
201 changed files with 1328 additions and 1095 deletions
|
@ -1,9 +1,5 @@
|
||||||
package techreborn;
|
package techreborn;
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
|
|
||||||
import org.apache.commons.lang3.time.StopWatch;
|
|
||||||
|
|
||||||
import net.minecraft.block.BlockDispenser;
|
import net.minecraft.block.BlockDispenser;
|
||||||
import net.minecraftforge.common.MinecraftForge;
|
import net.minecraftforge.common.MinecraftForge;
|
||||||
import net.minecraftforge.fml.client.event.ConfigChangedEvent;
|
import net.minecraftforge.fml.client.event.ConfigChangedEvent;
|
||||||
|
@ -16,7 +12,9 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
|
||||||
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
|
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
|
||||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||||
import net.minecraftforge.fml.common.network.NetworkRegistry;
|
import net.minecraftforge.fml.common.network.NetworkRegistry;
|
||||||
|
import net.minecraftforge.fml.common.registry.EntityRegistry;
|
||||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||||
|
import org.apache.commons.lang3.time.StopWatch;
|
||||||
import reborncore.common.multiblock.MultiblockEventHandler;
|
import reborncore.common.multiblock.MultiblockEventHandler;
|
||||||
import reborncore.common.multiblock.MultiblockServerTickHandler;
|
import reborncore.common.multiblock.MultiblockServerTickHandler;
|
||||||
import reborncore.common.packets.AddDiscriminatorEvent;
|
import reborncore.common.packets.AddDiscriminatorEvent;
|
||||||
|
@ -32,16 +30,24 @@ import techreborn.compat.CompatManager;
|
||||||
import techreborn.compat.ICompatModule;
|
import techreborn.compat.ICompatModule;
|
||||||
import techreborn.config.ConfigTechReborn;
|
import techreborn.config.ConfigTechReborn;
|
||||||
import techreborn.dispenser.BehaviorDispenseScrapbox;
|
import techreborn.dispenser.BehaviorDispenseScrapbox;
|
||||||
|
import techreborn.entitys.EntityNukePrimed;
|
||||||
import techreborn.events.OreUnifier;
|
import techreborn.events.OreUnifier;
|
||||||
import techreborn.events.TRTickHandler;
|
import techreborn.events.TRTickHandler;
|
||||||
import techreborn.init.*;
|
import techreborn.init.ModBlocks;
|
||||||
|
import techreborn.init.ModFluids;
|
||||||
|
import techreborn.init.ModItems;
|
||||||
|
import techreborn.init.ModLoot;
|
||||||
|
import techreborn.init.ModParts;
|
||||||
|
import techreborn.init.ModRecipes;
|
||||||
|
import techreborn.init.RecipeCompact;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.lib.ModInfo;
|
||||||
import techreborn.packets.PacketAesu;
|
import techreborn.packets.PacketAesu;
|
||||||
import techreborn.packets.PacketIdsu;
|
import techreborn.packets.PacketIdsu;
|
||||||
import techreborn.proxies.CommonProxy;
|
import techreborn.proxies.CommonProxy;
|
||||||
import techreborn.tiles.idsu.IDSUManager;
|
import techreborn.tiles.idsu.IDSUManager;
|
||||||
import techreborn.world.TROreGen;
|
import techreborn.world.TechRebornWorldGen;
|
||||||
import techreborn.world.TreeGenerator;
|
|
||||||
|
import java.io.File;
|
||||||
|
|
||||||
@Mod(modid = ModInfo.MOD_ID, name = ModInfo.MOD_NAME, version = ModInfo.MOD_VERSION, dependencies = ModInfo.MOD_DEPENDENCUIES, guiFactory = ModInfo.GUI_FACTORY_CLASS, acceptedMinecraftVersions = "[1.8.8,1.8.9]")
|
@Mod(modid = ModInfo.MOD_ID, name = ModInfo.MOD_NAME, version = ModInfo.MOD_VERSION, dependencies = ModInfo.MOD_DEPENDENCUIES, guiFactory = ModInfo.GUI_FACTORY_CLASS, acceptedMinecraftVersions = "[1.8.8,1.8.9]")
|
||||||
public class Core {
|
public class Core {
|
||||||
|
@ -60,6 +66,8 @@ public class Core {
|
||||||
private static RecipeCompact recipeCompact;
|
private static RecipeCompact recipeCompact;
|
||||||
private static File configDir;
|
private static File configDir;
|
||||||
|
|
||||||
|
public static TechRebornWorldGen worldGen;
|
||||||
|
|
||||||
@Mod.EventHandler
|
@Mod.EventHandler
|
||||||
public void preinit(FMLPreInitializationEvent event) {
|
public void preinit(FMLPreInitializationEvent event) {
|
||||||
event.getModMetadata().version = ModInfo.MOD_VERSION;
|
event.getModMetadata().version = ModInfo.MOD_VERSION;
|
||||||
|
@ -67,10 +75,13 @@ public class Core {
|
||||||
FMLCommonHandler.instance().bus().register(this);
|
FMLCommonHandler.instance().bus().register(this);
|
||||||
MinecraftForge.EVENT_BUS.register(this);
|
MinecraftForge.EVENT_BUS.register(this);
|
||||||
|
|
||||||
String path = event.getSuggestedConfigurationFile().getAbsolutePath().replace(ModInfo.MOD_ID, "TechReborn");
|
configDir = new File(event.getModConfigurationDirectory(), "techreborn");
|
||||||
|
if(!configDir.exists()){
|
||||||
config = ConfigTechReborn.initialize(new File(path));
|
configDir.mkdir();
|
||||||
configDir = event.getModConfigurationDirectory();
|
}
|
||||||
|
config = ConfigTechReborn.initialize(new File(configDir, "main.cfg"));
|
||||||
|
worldGen = new TechRebornWorldGen();
|
||||||
|
worldGen.configFile = (new File(configDir, "ores.json"));
|
||||||
|
|
||||||
recipeCompact = new RecipeCompact();
|
recipeCompact = new RecipeCompact();
|
||||||
TechRebornAPI.recipeCompact = recipeCompact;
|
TechRebornAPI.recipeCompact = recipeCompact;
|
||||||
|
@ -78,6 +89,9 @@ public class Core {
|
||||||
for (ICompatModule compatModule : CompatManager.INSTANCE.compatModules) {
|
for (ICompatModule compatModule : CompatManager.INSTANCE.compatModules) {
|
||||||
compatModule.preInit(event);
|
compatModule.preInit(event);
|
||||||
}
|
}
|
||||||
|
//Entitys
|
||||||
|
EntityRegistry.registerModEntity(EntityNukePrimed.class, "nuke", 0, INSTANCE, 160, 5, true);
|
||||||
|
proxy.preInit(event);
|
||||||
|
|
||||||
RecipeConfigManager.load(event.getModConfigurationDirectory());
|
RecipeConfigManager.load(event.getModConfigurationDirectory());
|
||||||
versionChecker = new VersionChecker("TechReborn", new ModInfo());
|
versionChecker = new VersionChecker("TechReborn", new ModInfo());
|
||||||
|
@ -109,10 +123,10 @@ public class Core {
|
||||||
logHelper.all(watch + " : main recipes");
|
logHelper.all(watch + " : main recipes");
|
||||||
watch.stop();
|
watch.stop();
|
||||||
// Client only init, needs to be done before parts system
|
// Client only init, needs to be done before parts system
|
||||||
proxy.init();
|
proxy.init(event);
|
||||||
// WorldGen
|
// WorldGen
|
||||||
GameRegistry.registerWorldGenerator(new TROreGen(), 0);
|
worldGen.load();
|
||||||
GameRegistry.registerWorldGenerator(new TreeGenerator(), 0);
|
GameRegistry.registerWorldGenerator(worldGen, 0);
|
||||||
// DungeonLoot.init();
|
// DungeonLoot.init();
|
||||||
// Register Gui Handler
|
// Register Gui Handler
|
||||||
NetworkRegistry.INSTANCE.registerGuiHandler(INSTANCE, new GuiHandler());
|
NetworkRegistry.INSTANCE.registerGuiHandler(INSTANCE, new GuiHandler());
|
||||||
|
@ -123,10 +137,13 @@ public class Core {
|
||||||
MinecraftForge.EVENT_BUS.register(new MultiblockEventHandler());
|
MinecraftForge.EVENT_BUS.register(new MultiblockEventHandler());
|
||||||
// IDSU manager
|
// IDSU manager
|
||||||
IDSUManager.INSTANCE = new IDSUManager();
|
IDSUManager.INSTANCE = new IDSUManager();
|
||||||
|
//Event busses
|
||||||
MinecraftForge.EVENT_BUS.register(IDSUManager.INSTANCE);
|
MinecraftForge.EVENT_BUS.register(IDSUManager.INSTANCE);
|
||||||
MinecraftForge.EVENT_BUS.register(new MultiblockServerTickHandler());
|
MinecraftForge.EVENT_BUS.register(new MultiblockServerTickHandler());
|
||||||
MinecraftForge.EVENT_BUS.register(new TRTickHandler());
|
MinecraftForge.EVENT_BUS.register(new TRTickHandler());
|
||||||
MinecraftForge.EVENT_BUS.register(new OreUnifier());
|
MinecraftForge.EVENT_BUS.register(new OreUnifier());
|
||||||
|
MinecraftForge.EVENT_BUS.register(worldGen.retroGen);
|
||||||
|
//Scrapbox
|
||||||
if (config.scrapboxDispenser) {
|
if (config.scrapboxDispenser) {
|
||||||
BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.scrapBox, new BehaviorDispenseScrapbox());
|
BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.scrapBox, new BehaviorDispenseScrapbox());
|
||||||
}
|
}
|
||||||
|
@ -139,6 +156,7 @@ public class Core {
|
||||||
for (ICompatModule compatModule : CompatManager.INSTANCE.compatModules) {
|
for (ICompatModule compatModule : CompatManager.INSTANCE.compatModules) {
|
||||||
compatModule.postInit(event);
|
compatModule.postInit(event);
|
||||||
}
|
}
|
||||||
|
proxy.postInit(event);
|
||||||
logHelper.info(RecipeHandler.recipeList.size() + " recipes loaded");
|
logHelper.info(RecipeHandler.recipeList.size() + " recipes loaded");
|
||||||
|
|
||||||
// RecipeHandler.scanForDupeRecipes();
|
// RecipeHandler.scanForDupeRecipes();
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
package techreborn.achievement;
|
package techreborn.achievement;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.stats.Achievement;
|
import net.minecraft.stats.Achievement;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public class AchievementMod extends Achievement {
|
public class AchievementMod extends Achievement {
|
||||||
|
|
||||||
public static List<Achievement> achievements = new ArrayList();
|
public static List<Achievement> achievements = new ArrayList();
|
||||||
|
|
|
@ -1,9 +1,5 @@
|
||||||
package techreborn.api;
|
package techreborn.api;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.inventory.InventoryCrafting;
|
import net.minecraft.inventory.InventoryCrafting;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
|
@ -15,6 +11,10 @@ import net.minecraft.world.World;
|
||||||
import net.minecraftforge.oredict.ShapedOreRecipe;
|
import net.minecraftforge.oredict.ShapedOreRecipe;
|
||||||
import net.minecraftforge.oredict.ShapelessOreRecipe;
|
import net.minecraftforge.oredict.ShapelessOreRecipe;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public class RollingMachineRecipe {
|
public class RollingMachineRecipe {
|
||||||
|
|
||||||
private final List<IRecipe> recipes = new ArrayList<IRecipe>();
|
private final List<IRecipe> recipes = new ArrayList<IRecipe>();
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
package techreborn.api;
|
package techreborn.api;
|
||||||
|
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
|
|
||||||
public class ScrapboxList {
|
public class ScrapboxList {
|
||||||
|
|
||||||
public static List<ItemStack> stacks = new ArrayList<ItemStack>();
|
public static List<ItemStack> stacks = new ArrayList<ItemStack>();
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
package techreborn.api.recipe;
|
package techreborn.api.recipe;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Extend this to add a recipe
|
* Extend this to add a recipe
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
package techreborn.api.recipe;
|
package techreborn.api.recipe;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is the base recipe class implement this to make a recipe handler
|
* This is the base recipe class implement this to make a recipe handler
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.api.recipe;
|
package techreborn.api.recipe;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
import reborncore.api.power.IEnergyInterfaceTile;
|
import reborncore.api.power.IEnergyInterfaceTile;
|
||||||
|
@ -10,6 +8,8 @@ import reborncore.common.tile.TileMachineBase;
|
||||||
import reborncore.common.util.Inventory;
|
import reborncore.common.util.Inventory;
|
||||||
import reborncore.common.util.ItemUtils;
|
import reborncore.common.util.ItemUtils;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use this in your tile entity to craft things
|
* Use this in your tile entity to craft things
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1,15 +1,14 @@
|
||||||
package techreborn.api.recipe;
|
package techreborn.api.recipe;
|
||||||
|
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import org.apache.commons.lang3.time.StopWatch;
|
||||||
|
import reborncore.common.util.ItemUtils;
|
||||||
|
import techreborn.Core;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.apache.commons.lang3.time.StopWatch;
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import reborncore.common.util.ItemUtils;
|
|
||||||
import techreborn.Core;
|
|
||||||
|
|
||||||
|
|
||||||
public class RecipeHandler {
|
public class RecipeHandler {
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,6 @@
|
||||||
package techreborn.api.recipe;
|
package techreborn.api.recipe;
|
||||||
|
|
||||||
import net.minecraft.init.Blocks;
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import techreborn.api.ScrapboxList;
|
|
||||||
import techreborn.init.ModItems;
|
|
||||||
import techreborn.items.ItemParts;
|
import techreborn.items.ItemParts;
|
||||||
import techreborn.lib.Reference;
|
import techreborn.lib.Reference;
|
||||||
//THIS is only here to trick JEI into showing recipes for the recycler
|
//THIS is only here to trick JEI into showing recipes for the recycler
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
package techreborn.api.recipe;
|
package techreborn.api.recipe;
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import techreborn.api.ScrapboxList;
|
|
||||||
import techreborn.init.ModItems;
|
import techreborn.init.ModItems;
|
||||||
import techreborn.lib.Reference;
|
import techreborn.lib.Reference;
|
||||||
|
|
||||||
|
|
|
@ -1,16 +1,15 @@
|
||||||
package techreborn.api.recipe.recipeConfig;
|
package techreborn.api.recipe.recipeConfig;
|
||||||
|
|
||||||
|
import com.google.gson.Gson;
|
||||||
|
import com.google.gson.GsonBuilder;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import techreborn.api.recipe.IBaseRecipeType;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileWriter;
|
import java.io.FileWriter;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
import com.google.gson.Gson;
|
|
||||||
import com.google.gson.GsonBuilder;
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import techreborn.api.recipe.IBaseRecipeType;
|
|
||||||
|
|
||||||
public class RecipeConfigManager {
|
public class RecipeConfigManager {
|
||||||
|
|
||||||
public static ArrayList<RecipeConfig> configs = new ArrayList<RecipeConfig>();
|
public static ArrayList<RecipeConfig> configs = new ArrayList<RecipeConfig>();
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
package techreborn.api.upgrade;
|
package techreborn.api.upgrade;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import reborncore.common.util.Inventory;
|
import reborncore.common.util.Inventory;
|
||||||
import techreborn.api.recipe.RecipeCrafter;
|
import techreborn.api.recipe.RecipeCrafter;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
public class UpgradeHandler {
|
public class UpgradeHandler {
|
||||||
|
|
||||||
RecipeCrafter crafter;
|
RecipeCrafter crafter;
|
||||||
|
|
|
@ -1,9 +1,5 @@
|
||||||
package techreborn.blocks;
|
package techreborn.blocks;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
import net.minecraft.block.state.IBlockState;
|
import net.minecraft.block.state.IBlockState;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
@ -20,10 +16,12 @@ import reborncore.common.blocks.IRotationTexture;
|
||||||
import techreborn.Core;
|
import techreborn.Core;
|
||||||
import techreborn.client.GuiHandler;
|
import techreborn.client.GuiHandler;
|
||||||
import techreborn.client.TechRebornCreativeTab;
|
import techreborn.client.TechRebornCreativeTab;
|
||||||
import techreborn.init.ModBlocks;
|
|
||||||
import techreborn.tiles.TileAlloyFurnace;
|
|
||||||
import techreborn.tiles.TileIronFurnace;
|
import techreborn.tiles.TileIronFurnace;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Random;
|
||||||
|
|
||||||
public class BlockIronFurnace extends BlockMachineBase implements IRotationTexture {
|
public class BlockIronFurnace extends BlockMachineBase implements IRotationTexture {
|
||||||
|
|
||||||
public BlockIronFurnace() {
|
public BlockIronFurnace() {
|
||||||
|
|
|
@ -1,8 +1,5 @@
|
||||||
package techreborn.blocks;
|
package techreborn.blocks;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
|
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
|
@ -23,6 +20,9 @@ import reborncore.common.multiblock.BlockMultiblockBase;
|
||||||
import techreborn.client.TechRebornCreativeTab;
|
import techreborn.client.TechRebornCreativeTab;
|
||||||
import techreborn.tiles.TileMachineCasing;
|
import techreborn.tiles.TileMachineCasing;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Random;
|
||||||
|
|
||||||
public class BlockMachineCasing extends BlockMultiblockBase implements ITexturedBlock {
|
public class BlockMachineCasing extends BlockMultiblockBase implements ITexturedBlock {
|
||||||
|
|
||||||
public static final String[] types = new String[]
|
public static final String[] types = new String[]
|
||||||
|
|
|
@ -1,8 +1,5 @@
|
||||||
package techreborn.blocks;
|
package techreborn.blocks;
|
||||||
|
|
||||||
import java.security.InvalidParameterException;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
|
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.block.properties.PropertyInteger;
|
import net.minecraft.block.properties.PropertyInteger;
|
||||||
|
@ -18,6 +15,9 @@ import reborncore.common.BaseBlock;
|
||||||
import techreborn.client.TechRebornCreativeTab;
|
import techreborn.client.TechRebornCreativeTab;
|
||||||
import techreborn.init.ModBlocks;
|
import techreborn.init.ModBlocks;
|
||||||
|
|
||||||
|
import java.security.InvalidParameterException;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public class BlockMachineFrame extends BaseBlock implements ITexturedBlock {
|
public class BlockMachineFrame extends BaseBlock implements ITexturedBlock {
|
||||||
public PropertyInteger METADATA;
|
public PropertyInteger METADATA;
|
||||||
|
|
||||||
|
|
61
src/main/java/techreborn/blocks/BlockNuke.java
Normal file
61
src/main/java/techreborn/blocks/BlockNuke.java
Normal file
|
@ -0,0 +1,61 @@
|
||||||
|
package techreborn.blocks;
|
||||||
|
|
||||||
|
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
|
||||||
|
import net.minecraft.block.BlockTNT;
|
||||||
|
import net.minecraft.block.state.IBlockState;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
|
import net.minecraft.util.BlockPos;
|
||||||
|
import net.minecraft.util.EnumFacing;
|
||||||
|
import net.minecraft.world.Explosion;
|
||||||
|
import net.minecraft.world.World;
|
||||||
|
import reborncore.RebornCore;
|
||||||
|
import techreborn.client.TechRebornCreativeTabMisc;
|
||||||
|
import techreborn.entitys.EntityNukePrimed;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by Mark on 13/03/2016.
|
||||||
|
*/
|
||||||
|
public class BlockNuke extends BlockTNT implements ITexturedBlock {
|
||||||
|
|
||||||
|
public BlockNuke() {
|
||||||
|
setUnlocalizedName("techreborn.nuke");
|
||||||
|
setCreativeTab(TechRebornCreativeTabMisc.instance);
|
||||||
|
RebornCore.jsonDestroyer.registerObject(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void explode(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase igniter) {
|
||||||
|
if (!worldIn.isRemote) {
|
||||||
|
if (state.getValue(EXPLODE).booleanValue()) {
|
||||||
|
EntityNukePrimed entitynukeprimed = new EntityNukePrimed(worldIn, (double) ((float) pos.getX() + 0.5F), (double) pos.getY(), (double) ((float) pos.getZ() + 0.5F), igniter);
|
||||||
|
worldIn.spawnEntityInWorld(entitynukeprimed);
|
||||||
|
worldIn.playSoundAtEntity(entitynukeprimed, "game.tnt.primed", 1.0F, 1.0F);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onBlockDestroyedByExplosion(World worldIn, BlockPos pos, Explosion explosionIn) {
|
||||||
|
if (!worldIn.isRemote) {
|
||||||
|
EntityNukePrimed entitynukeprimed = new EntityNukePrimed(worldIn, (double) ((float) pos.getX() + 0.5F), (double) pos.getY(), (double) ((float) pos.getZ() + 0.5F), explosionIn.getExplosivePlacedBy());
|
||||||
|
entitynukeprimed.fuse = worldIn.rand.nextInt(entitynukeprimed.fuse / 4) + entitynukeprimed.fuse / 8;
|
||||||
|
worldIn.spawnEntityInWorld(entitynukeprimed);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ) {
|
||||||
|
return false; //No flint and steel
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getTextureNameFromState(IBlockState iBlockState, EnumFacing enumFacing) {
|
||||||
|
return "techreborn:blocks/machine/machine_bottom";
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int amountOfStates() {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,10 +1,5 @@
|
||||||
package techreborn.blocks;
|
package techreborn.blocks;
|
||||||
|
|
||||||
import java.security.InvalidParameterException;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
|
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.block.properties.PropertyInteger;
|
import net.minecraft.block.properties.PropertyInteger;
|
||||||
|
@ -30,8 +25,14 @@ import techreborn.config.ConfigTechReborn;
|
||||||
import techreborn.init.ModBlocks;
|
import techreborn.init.ModBlocks;
|
||||||
import techreborn.items.ItemDusts;
|
import techreborn.items.ItemDusts;
|
||||||
import techreborn.items.ItemGems;
|
import techreborn.items.ItemGems;
|
||||||
|
import techreborn.world.config.IOreNameProvider;
|
||||||
|
|
||||||
public class BlockOre extends BaseBlock implements ITexturedBlock {
|
import java.security.InvalidParameterException;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Random;
|
||||||
|
|
||||||
|
public class BlockOre extends BaseBlock implements ITexturedBlock, IOreNameProvider {
|
||||||
|
|
||||||
public static ItemStack getOreByName(String name, int count) {
|
public static ItemStack getOreByName(String name, int count) {
|
||||||
for (int i = 0; i < types.length; i++) {
|
for (int i = 0; i < types.length; i++) {
|
||||||
|
@ -39,7 +40,7 @@ public class BlockOre extends BaseBlock implements ITexturedBlock {
|
||||||
return new ItemStack(ModBlocks.ore, count, i);
|
return new ItemStack(ModBlocks.ore, count, i);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
throw new InvalidParameterException("The storage block " + name + " could not be found.");
|
throw new InvalidParameterException("The ore block " + name + " could not be found.");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ItemStack getOreByName(String name) {
|
public static ItemStack getOreByName(String name) {
|
||||||
|
@ -49,11 +50,14 @@ public class BlockOre extends BaseBlock implements ITexturedBlock {
|
||||||
public IBlockState getBlockStateFromName(String name){
|
public IBlockState getBlockStateFromName(String name){
|
||||||
int index = -1;
|
int index = -1;
|
||||||
for (int i = 0; i < types.length; i++) {
|
for (int i = 0; i < types.length; i++) {
|
||||||
if (types[i].equals(name)) {
|
if (types[i].equalsIgnoreCase(name)) {
|
||||||
index = i;
|
index = i;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if(index == -1){
|
||||||
|
return ModBlocks.ore2.getBlockStateFromName(name);
|
||||||
|
}
|
||||||
return getStateFromMeta(index);
|
return getStateFromMeta(index);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -188,4 +192,8 @@ public class BlockOre extends BaseBlock implements ITexturedBlock {
|
||||||
return new BlockState(this, METADATA);
|
return new BlockState(this, METADATA);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getUserLoclisedName(IBlockState state) {
|
||||||
|
return types[state.getValue(METADATA)];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,5 @@
|
||||||
package techreborn.blocks;
|
package techreborn.blocks;
|
||||||
|
|
||||||
import java.security.InvalidParameterException;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
|
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.block.properties.PropertyInteger;
|
import net.minecraft.block.properties.PropertyInteger;
|
||||||
|
@ -21,8 +18,12 @@ import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import reborncore.common.BaseBlock;
|
import reborncore.common.BaseBlock;
|
||||||
import techreborn.client.TechRebornCreativeTabMisc;
|
import techreborn.client.TechRebornCreativeTabMisc;
|
||||||
import techreborn.init.ModBlocks;
|
import techreborn.init.ModBlocks;
|
||||||
|
import techreborn.world.config.IOreNameProvider;
|
||||||
|
|
||||||
public class BlockOre2 extends BaseBlock implements ITexturedBlock {
|
import java.security.InvalidParameterException;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class BlockOre2 extends BaseBlock implements ITexturedBlock, IOreNameProvider {
|
||||||
|
|
||||||
public static ItemStack getOreByName(String name, int count) {
|
public static ItemStack getOreByName(String name, int count) {
|
||||||
for (int i = 0; i < types.length; i++) {
|
for (int i = 0; i < types.length; i++) {
|
||||||
|
@ -30,7 +31,7 @@ public class BlockOre2 extends BaseBlock implements ITexturedBlock {
|
||||||
return new ItemStack(ModBlocks.ore2, count, i);
|
return new ItemStack(ModBlocks.ore2, count, i);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
throw new InvalidParameterException("The storage block " + name + " could not be found.");
|
throw new InvalidParameterException("The ore block " + name + " could not be found.");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ItemStack getOreByName(String name) {
|
public static ItemStack getOreByName(String name) {
|
||||||
|
@ -45,6 +46,9 @@ public class BlockOre2 extends BaseBlock implements ITexturedBlock {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if(index == -1){
|
||||||
|
throw new InvalidParameterException("The ore block " + name + " could not be found.");
|
||||||
|
}
|
||||||
return getStateFromMeta(index);
|
return getStateFromMeta(index);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -112,4 +116,8 @@ public class BlockOre2 extends BaseBlock implements ITexturedBlock {
|
||||||
return new BlockState(this, METADATA);
|
return new BlockState(this, METADATA);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getUserLoclisedName(IBlockState state) {
|
||||||
|
return types[state.getValue(METADATA)];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +1,6 @@
|
||||||
package techreborn.blocks;
|
package techreborn.blocks;
|
||||||
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
|
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.block.properties.PropertyInteger;
|
import net.minecraft.block.properties.PropertyInteger;
|
||||||
|
@ -27,6 +24,9 @@ import reborncore.common.BaseTileBlock;
|
||||||
import techreborn.client.TechRebornCreativeTab;
|
import techreborn.client.TechRebornCreativeTab;
|
||||||
import techreborn.tiles.TilePlayerDectector;
|
import techreborn.tiles.TilePlayerDectector;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Random;
|
||||||
|
|
||||||
public class BlockPlayerDetector extends BaseTileBlock implements ITexturedBlock {
|
public class BlockPlayerDetector extends BaseTileBlock implements ITexturedBlock {
|
||||||
|
|
||||||
public PropertyInteger METADATA;
|
public PropertyInteger METADATA;
|
||||||
|
|
|
@ -1,8 +1,5 @@
|
||||||
package techreborn.blocks;
|
package techreborn.blocks;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
import me.modmuss50.jsonDestroyer.api.IOpaqueBlock;
|
import me.modmuss50.jsonDestroyer.api.IOpaqueBlock;
|
||||||
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
|
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
|
||||||
import net.minecraft.block.BlockLeaves;
|
import net.minecraft.block.BlockLeaves;
|
||||||
|
@ -23,6 +20,9 @@ import reborncore.RebornCore;
|
||||||
import techreborn.client.TechRebornCreativeTabMisc;
|
import techreborn.client.TechRebornCreativeTabMisc;
|
||||||
import techreborn.init.ModBlocks;
|
import techreborn.init.ModBlocks;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Random;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by modmuss50 on 20/02/2016.
|
* Created by modmuss50 on 20/02/2016.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1,9 +1,5 @@
|
||||||
package techreborn.blocks;
|
package techreborn.blocks;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
|
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
|
@ -23,6 +19,10 @@ import techreborn.client.TechRebornCreativeTabMisc;
|
||||||
import techreborn.items.ItemParts;
|
import techreborn.items.ItemParts;
|
||||||
import techreborn.items.tools.ItemTreeTap;
|
import techreborn.items.tools.ItemTreeTap;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Random;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by modmuss50 on 19/02/2016.
|
* Created by modmuss50 on 19/02/2016.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1,8 +1,5 @@
|
||||||
package techreborn.blocks;
|
package techreborn.blocks;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
import net.minecraft.block.BlockSapling;
|
import net.minecraft.block.BlockSapling;
|
||||||
import net.minecraft.block.state.IBlockState;
|
import net.minecraft.block.state.IBlockState;
|
||||||
import net.minecraft.creativetab.CreativeTabs;
|
import net.minecraft.creativetab.CreativeTabs;
|
||||||
|
@ -13,6 +10,9 @@ import net.minecraft.world.World;
|
||||||
import techreborn.client.TechRebornCreativeTabMisc;
|
import techreborn.client.TechRebornCreativeTabMisc;
|
||||||
import techreborn.world.RubberTreeGenerator;
|
import techreborn.world.RubberTreeGenerator;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Random;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by modmuss50 on 20/02/2016.
|
* Created by modmuss50 on 20/02/2016.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1,8 +1,5 @@
|
||||||
package techreborn.blocks;
|
package techreborn.blocks;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
|
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.block.properties.PropertyInteger;
|
import net.minecraft.block.properties.PropertyInteger;
|
||||||
|
@ -18,6 +15,9 @@ import reborncore.common.BaseBlock;
|
||||||
import techreborn.client.TechRebornCreativeTabMisc;
|
import techreborn.client.TechRebornCreativeTabMisc;
|
||||||
import techreborn.init.ModBlocks;
|
import techreborn.init.ModBlocks;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Random;
|
||||||
|
|
||||||
public class BlockStorage extends BaseBlock implements ITexturedBlock {
|
public class BlockStorage extends BaseBlock implements ITexturedBlock {
|
||||||
|
|
||||||
public static ItemStack getStorageBlockByName(String name, int count) {
|
public static ItemStack getStorageBlockByName(String name, int count) {
|
||||||
|
|
|
@ -1,9 +1,5 @@
|
||||||
package techreborn.blocks;
|
package techreborn.blocks;
|
||||||
|
|
||||||
import java.security.InvalidParameterException;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
|
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.block.properties.PropertyInteger;
|
import net.minecraft.block.properties.PropertyInteger;
|
||||||
|
@ -19,6 +15,10 @@ import reborncore.common.BaseBlock;
|
||||||
import techreborn.client.TechRebornCreativeTabMisc;
|
import techreborn.client.TechRebornCreativeTabMisc;
|
||||||
import techreborn.init.ModBlocks;
|
import techreborn.init.ModBlocks;
|
||||||
|
|
||||||
|
import java.security.InvalidParameterException;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Random;
|
||||||
|
|
||||||
public class BlockStorage2 extends BaseBlock implements ITexturedBlock {
|
public class BlockStorage2 extends BaseBlock implements ITexturedBlock {
|
||||||
|
|
||||||
public static ItemStack getStorageBlockByName(String name, int count) {
|
public static ItemStack getStorageBlockByName(String name, int count) {
|
||||||
|
|
|
@ -1,8 +1,5 @@
|
||||||
package techreborn.blocks.machine;
|
package techreborn.blocks.machine;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.block.state.IBlockState;
|
import net.minecraft.block.state.IBlockState;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
|
@ -18,6 +15,9 @@ import techreborn.client.GuiHandler;
|
||||||
import techreborn.client.TechRebornCreativeTab;
|
import techreborn.client.TechRebornCreativeTab;
|
||||||
import techreborn.tiles.TileAlloyFurnace;
|
import techreborn.tiles.TileAlloyFurnace;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public class BlockAlloyFurnace extends BlockMachineBase implements IRotationTexture {
|
public class BlockAlloyFurnace extends BlockMachineBase implements IRotationTexture {
|
||||||
|
|
||||||
public BlockAlloyFurnace(Material material) {
|
public BlockAlloyFurnace(Material material) {
|
||||||
|
|
|
@ -9,7 +9,6 @@ import reborncore.common.blocks.IRotationTexture;
|
||||||
import techreborn.Core;
|
import techreborn.Core;
|
||||||
import techreborn.client.GuiHandler;
|
import techreborn.client.GuiHandler;
|
||||||
import techreborn.client.TechRebornCreativeTab;
|
import techreborn.client.TechRebornCreativeTab;
|
||||||
import techreborn.tiles.teir1.TileCompressor;
|
|
||||||
import techreborn.tiles.teir1.TileRecycler;
|
import techreborn.tiles.teir1.TileRecycler;
|
||||||
|
|
||||||
public class BlockRecycler extends BlockMachineBase implements IRotationTexture{
|
public class BlockRecycler extends BlockMachineBase implements IRotationTexture{
|
||||||
|
|
|
@ -73,9 +73,32 @@ import techreborn.client.gui.GuiSemifluidGenerator;
|
||||||
import techreborn.client.gui.GuiThermalGenerator;
|
import techreborn.client.gui.GuiThermalGenerator;
|
||||||
import techreborn.client.gui.GuiVacuumFreezer;
|
import techreborn.client.gui.GuiVacuumFreezer;
|
||||||
import techreborn.manual.GuiManual;
|
import techreborn.manual.GuiManual;
|
||||||
import techreborn.tiles.*;
|
import techreborn.tiles.TileAesu;
|
||||||
|
import techreborn.tiles.TileAlloyFurnace;
|
||||||
|
import techreborn.tiles.TileAlloySmelter;
|
||||||
|
import techreborn.tiles.TileAssemblingMachine;
|
||||||
|
import techreborn.tiles.TileBlastFurnace;
|
||||||
|
import techreborn.tiles.TileCentrifuge;
|
||||||
|
import techreborn.tiles.TileChargeBench;
|
||||||
|
import techreborn.tiles.TileChemicalReactor;
|
||||||
|
import techreborn.tiles.TileChunkLoader;
|
||||||
|
import techreborn.tiles.TileDigitalChest;
|
||||||
|
import techreborn.tiles.TileImplosionCompressor;
|
||||||
|
import techreborn.tiles.TileIndustrialElectrolyzer;
|
||||||
|
import techreborn.tiles.TileIndustrialGrinder;
|
||||||
|
import techreborn.tiles.TileIndustrialSawmill;
|
||||||
|
import techreborn.tiles.TileIronFurnace;
|
||||||
|
import techreborn.tiles.TileMatterFabricator;
|
||||||
|
import techreborn.tiles.TileQuantumChest;
|
||||||
|
import techreborn.tiles.TileQuantumTank;
|
||||||
|
import techreborn.tiles.TileRollingMachine;
|
||||||
|
import techreborn.tiles.TileVacuumFreezer;
|
||||||
import techreborn.tiles.fusionReactor.TileEntityFusionController;
|
import techreborn.tiles.fusionReactor.TileEntityFusionController;
|
||||||
import techreborn.tiles.generator.*;
|
import techreborn.tiles.generator.TileDieselGenerator;
|
||||||
|
import techreborn.tiles.generator.TileGasTurbine;
|
||||||
|
import techreborn.tiles.generator.TileGenerator;
|
||||||
|
import techreborn.tiles.generator.TileSemifluidGenerator;
|
||||||
|
import techreborn.tiles.generator.TileThermalGenerator;
|
||||||
import techreborn.tiles.idsu.TileIDSU;
|
import techreborn.tiles.idsu.TileIDSU;
|
||||||
import techreborn.tiles.lesu.TileLesu;
|
import techreborn.tiles.lesu.TileLesu;
|
||||||
import techreborn.tiles.teir1.TileCompressor;
|
import techreborn.tiles.teir1.TileCompressor;
|
||||||
|
|
|
@ -1,15 +1,13 @@
|
||||||
package techreborn.client;
|
package techreborn.client;
|
||||||
|
|
||||||
import org.lwjgl.input.Keyboard;
|
|
||||||
|
|
||||||
import com.mojang.realmsclient.gui.ChatFormatting;
|
import com.mojang.realmsclient.gui.ChatFormatting;
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.BlockContainer;
|
import net.minecraft.block.BlockContainer;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraftforge.event.entity.player.ItemTooltipEvent;
|
import net.minecraftforge.event.entity.player.ItemTooltipEvent;
|
||||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||||
|
import org.lwjgl.input.Keyboard;
|
||||||
import reborncore.api.IListInfoProvider;
|
import reborncore.api.IListInfoProvider;
|
||||||
import reborncore.api.power.IEnergyInterfaceItem;
|
import reborncore.api.power.IEnergyInterfaceItem;
|
||||||
import reborncore.common.powerSystem.PowerSystem;
|
import reborncore.common.powerSystem.PowerSystem;
|
||||||
|
|
|
@ -1,8 +1,5 @@
|
||||||
package techreborn.client;
|
package techreborn.client;
|
||||||
|
|
||||||
import java.awt.Color;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
|
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
import net.minecraftforge.client.event.GuiScreenEvent;
|
import net.minecraftforge.client.event.GuiScreenEvent;
|
||||||
import net.minecraftforge.fml.client.GuiModList;
|
import net.minecraftforge.fml.client.GuiModList;
|
||||||
|
@ -10,6 +7,9 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||||
import reborncore.client.gui.GuiUtil;
|
import reborncore.client.gui.GuiUtil;
|
||||||
import techreborn.Core;
|
import techreborn.Core;
|
||||||
|
|
||||||
|
import java.awt.*;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
public class VersionCheckerClient {
|
public class VersionCheckerClient {
|
||||||
ResourceLocation texture;
|
ResourceLocation texture;
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import reborncore.client.gui.SlotOutput;
|
import reborncore.client.gui.SlotOutput;
|
||||||
import reborncore.common.container.RebornContainer;
|
import reborncore.common.container.RebornContainer;
|
||||||
import techreborn.api.SlotUpgrade;
|
import techreborn.api.SlotUpgrade;
|
||||||
import techreborn.tiles.teir1.TileCompressor;
|
|
||||||
import techreborn.tiles.teir1.TileRecycler;
|
import techreborn.tiles.teir1.TileRecycler;
|
||||||
|
|
||||||
public class ContainerRecycler extends RebornContainer {
|
public class ContainerRecycler extends RebornContainer {
|
||||||
|
|
|
@ -1,8 +1,5 @@
|
||||||
package techreborn.client.gui;
|
package techreborn.client.gui;
|
||||||
|
|
||||||
import java.awt.Color;
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
import net.minecraft.client.gui.GuiButton;
|
import net.minecraft.client.gui.GuiButton;
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
import net.minecraft.client.renderer.GlStateManager;
|
import net.minecraft.client.renderer.GlStateManager;
|
||||||
|
@ -15,6 +12,9 @@ import techreborn.client.container.ContainerAesu;
|
||||||
import techreborn.packets.PacketAesu;
|
import techreborn.packets.PacketAesu;
|
||||||
import techreborn.tiles.TileAesu;
|
import techreborn.tiles.TileAesu;
|
||||||
|
|
||||||
|
import java.awt.*;
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
public class GuiAesu extends GuiContainer {
|
public class GuiAesu extends GuiContainer {
|
||||||
|
|
||||||
private static final ResourceLocation texture = new ResourceLocation(
|
private static final ResourceLocation texture = new ResourceLocation(
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.client.gui;
|
package techreborn.client.gui;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
import net.minecraft.client.gui.GuiButton;
|
import net.minecraft.client.gui.GuiButton;
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
import net.minecraft.client.renderer.GlStateManager;
|
import net.minecraft.client.renderer.GlStateManager;
|
||||||
|
@ -20,6 +18,8 @@ import techreborn.init.ModBlocks;
|
||||||
import techreborn.proxies.ClientProxy;
|
import techreborn.proxies.ClientProxy;
|
||||||
import techreborn.tiles.TileBlastFurnace;
|
import techreborn.tiles.TileBlastFurnace;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
|
||||||
public class GuiBlastFurnace extends GuiContainer {
|
public class GuiBlastFurnace extends GuiContainer {
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.client.gui;
|
package techreborn.client.gui;
|
||||||
|
|
||||||
import org.lwjgl.util.Color;
|
|
||||||
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
import net.minecraft.client.renderer.GlStateManager;
|
import net.minecraft.client.renderer.GlStateManager;
|
||||||
import net.minecraft.client.resources.I18n;
|
import net.minecraft.client.resources.I18n;
|
||||||
|
|
|
@ -1,24 +1,18 @@
|
||||||
package techreborn.client.gui;
|
package techreborn.client.gui;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
import net.minecraft.client.gui.GuiButton;
|
import net.minecraft.client.gui.GuiButton;
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
import net.minecraft.client.renderer.GlStateManager;
|
import net.minecraft.client.renderer.GlStateManager;
|
||||||
import net.minecraft.client.resources.I18n;
|
import net.minecraft.client.resources.I18n;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.util.EnumFacing;
|
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
import net.minecraft.util.StatCollector;
|
import net.minecraft.util.StatCollector;
|
||||||
import reborncore.client.multiblock.MultiblockSet;
|
|
||||||
import reborncore.common.misc.Location;
|
|
||||||
import reborncore.common.multiblock.CoordTriplet;
|
|
||||||
import reborncore.common.powerSystem.PowerSystem;
|
import reborncore.common.powerSystem.PowerSystem;
|
||||||
import techreborn.client.ClientMultiBlocks;
|
|
||||||
import techreborn.client.container.ContainerFusionReactor;
|
import techreborn.client.container.ContainerFusionReactor;
|
||||||
import techreborn.proxies.ClientProxy;
|
|
||||||
import techreborn.tiles.fusionReactor.TileEntityFusionController;
|
import techreborn.tiles.fusionReactor.TileEntityFusionController;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
|
||||||
public class GuiFusionReactor extends GuiContainer {
|
public class GuiFusionReactor extends GuiContainer {
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,5 @@
|
||||||
package techreborn.client.gui;
|
package techreborn.client.gui;
|
||||||
|
|
||||||
import java.awt.Color;
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
import net.minecraft.client.gui.GuiButton;
|
import net.minecraft.client.gui.GuiButton;
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
import net.minecraft.client.renderer.GlStateManager;
|
import net.minecraft.client.renderer.GlStateManager;
|
||||||
|
@ -15,6 +12,9 @@ import techreborn.client.container.ContainerIDSU;
|
||||||
import techreborn.packets.PacketIdsu;
|
import techreborn.packets.PacketIdsu;
|
||||||
import techreborn.tiles.idsu.TileIDSU;
|
import techreborn.tiles.idsu.TileIDSU;
|
||||||
|
|
||||||
|
import java.awt.*;
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
public class GuiIDSU extends GuiContainer {
|
public class GuiIDSU extends GuiContainer {
|
||||||
|
|
||||||
private static final ResourceLocation texture = new ResourceLocation(
|
private static final ResourceLocation texture = new ResourceLocation(
|
||||||
|
|
|
@ -6,10 +6,8 @@ import net.minecraft.client.resources.I18n;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
import net.minecraft.util.StatCollector;
|
import net.minecraft.util.StatCollector;
|
||||||
import techreborn.client.container.ContainerElectricFurnace;
|
|
||||||
import techreborn.client.container.ContainerIronFurnace;
|
import techreborn.client.container.ContainerIronFurnace;
|
||||||
import techreborn.tiles.TileIronFurnace;
|
import techreborn.tiles.TileIronFurnace;
|
||||||
import techreborn.tiles.teir1.TileElectricFurnace;
|
|
||||||
|
|
||||||
public class GuiIronFurnace extends GuiContainer {
|
public class GuiIronFurnace extends GuiContainer {
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.client.gui;
|
package techreborn.client.gui;
|
||||||
|
|
||||||
import java.awt.Color;
|
|
||||||
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
import net.minecraft.client.renderer.GlStateManager;
|
import net.minecraft.client.renderer.GlStateManager;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
|
@ -11,6 +9,8 @@ import reborncore.common.powerSystem.PowerSystem;
|
||||||
import techreborn.client.container.ContainerLesu;
|
import techreborn.client.container.ContainerLesu;
|
||||||
import techreborn.tiles.lesu.TileLesu;
|
import techreborn.tiles.lesu.TileLesu;
|
||||||
|
|
||||||
|
import java.awt.*;
|
||||||
|
|
||||||
public class GuiLesu extends GuiContainer {
|
public class GuiLesu extends GuiContainer {
|
||||||
|
|
||||||
private static final ResourceLocation texture = new ResourceLocation(
|
private static final ResourceLocation texture = new ResourceLocation(
|
||||||
|
|
|
@ -1,16 +1,12 @@
|
||||||
package techreborn.client.gui;
|
package techreborn.client.gui;
|
||||||
|
|
||||||
import org.lwjgl.util.Color;
|
|
||||||
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
import net.minecraft.client.renderer.GlStateManager;
|
import net.minecraft.client.renderer.GlStateManager;
|
||||||
import net.minecraft.client.resources.I18n;
|
import net.minecraft.client.resources.I18n;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
import net.minecraft.util.StatCollector;
|
import net.minecraft.util.StatCollector;
|
||||||
import techreborn.client.container.ContainerCompressor;
|
|
||||||
import techreborn.client.container.ContainerRecycler;
|
import techreborn.client.container.ContainerRecycler;
|
||||||
import techreborn.tiles.teir1.TileCompressor;
|
|
||||||
import techreborn.tiles.teir1.TileRecycler;
|
import techreborn.tiles.teir1.TileRecycler;
|
||||||
|
|
||||||
public class GuiRecycler extends GuiContainer {
|
public class GuiRecycler extends GuiContainer {
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.client.gui;
|
package techreborn.client.gui;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
import net.minecraft.client.gui.GuiButton;
|
import net.minecraft.client.gui.GuiButton;
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
import net.minecraft.client.renderer.GlStateManager;
|
import net.minecraft.client.renderer.GlStateManager;
|
||||||
|
@ -18,6 +16,8 @@ import techreborn.client.container.ContainerVacuumFreezer;
|
||||||
import techreborn.proxies.ClientProxy;
|
import techreborn.proxies.ClientProxy;
|
||||||
import techreborn.tiles.TileVacuumFreezer;
|
import techreborn.tiles.TileVacuumFreezer;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
public class GuiVacuumFreezer extends GuiContainer {
|
public class GuiVacuumFreezer extends GuiContainer {
|
||||||
|
|
||||||
public static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/vacuum_freezer.png");
|
public static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/vacuum_freezer.png");
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.client.hud;
|
package techreborn.client.hud;
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.gui.ScaledResolution;
|
import net.minecraft.client.gui.ScaledResolution;
|
||||||
import net.minecraft.client.renderer.RenderHelper;
|
import net.minecraft.client.renderer.RenderHelper;
|
||||||
|
@ -14,6 +12,7 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority;
|
||||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
|
import org.lwjgl.opengl.GL11;
|
||||||
import reborncore.api.power.IEnergyInterfaceItem;
|
import reborncore.api.power.IEnergyInterfaceItem;
|
||||||
import reborncore.common.powerSystem.PowerSystem;
|
import reborncore.common.powerSystem.PowerSystem;
|
||||||
import reborncore.common.util.Color;
|
import reborncore.common.util.Color;
|
||||||
|
|
|
@ -1,8 +1,7 @@
|
||||||
package techreborn.client.keybindings;
|
package techreborn.client.keybindings;
|
||||||
|
|
||||||
import org.lwjgl.input.Keyboard;
|
|
||||||
|
|
||||||
import net.minecraft.client.settings.KeyBinding;
|
import net.minecraft.client.settings.KeyBinding;
|
||||||
|
import org.lwjgl.input.Keyboard;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.lib.ModInfo;
|
||||||
|
|
||||||
public class KeyBindings {
|
public class KeyBindings {
|
||||||
|
|
|
@ -0,0 +1,67 @@
|
||||||
|
package techreborn.client.render.entitys;
|
||||||
|
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.client.renderer.BlockRendererDispatcher;
|
||||||
|
import net.minecraft.client.renderer.GlStateManager;
|
||||||
|
import net.minecraft.client.renderer.entity.Render;
|
||||||
|
import net.minecraft.client.renderer.entity.RenderManager;
|
||||||
|
import net.minecraft.client.renderer.texture.TextureMap;
|
||||||
|
import net.minecraft.init.Blocks;
|
||||||
|
import net.minecraft.util.MathHelper;
|
||||||
|
import net.minecraft.util.ResourceLocation;
|
||||||
|
import techreborn.entitys.EntityNukePrimed;
|
||||||
|
import techreborn.init.ModBlocks;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by Mark on 13/03/2016.
|
||||||
|
*/
|
||||||
|
public class RenderNukePrimed extends Render<EntityNukePrimed> {
|
||||||
|
|
||||||
|
public RenderNukePrimed(RenderManager renderManager) {
|
||||||
|
super(renderManager);
|
||||||
|
this.shadowSize = 0.5F;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void doRender(EntityNukePrimed entity, double x, double y, double z, float entityYaw, float partialTicks) {
|
||||||
|
BlockRendererDispatcher blockrendererdispatcher = Minecraft.getMinecraft().getBlockRendererDispatcher();
|
||||||
|
GlStateManager.pushMatrix();
|
||||||
|
GlStateManager.translate((float) x, (float) y + 0.5F, (float) z);
|
||||||
|
if ((float) entity.fuse - partialTicks + 1.0F < 10.0F) {
|
||||||
|
float f = 1.0F - ((float) entity.fuse - partialTicks + 1.0F) / 10.0F;
|
||||||
|
f = MathHelper.clamp_float(f, 0.0F, 1.0F);
|
||||||
|
f = f * f;
|
||||||
|
f = f * f;
|
||||||
|
float f1 = 1.0F + f * 0.3F;
|
||||||
|
GlStateManager.scale(f1, f1, f1);
|
||||||
|
}
|
||||||
|
float f2 = (1.0F - ((float) entity.fuse - partialTicks + 1.0F) / 100.0F) * 0.8F;
|
||||||
|
this.bindEntityTexture(entity);
|
||||||
|
GlStateManager.translate(-0.5F, -0.5F, 0.5F);
|
||||||
|
blockrendererdispatcher.renderBlockBrightness(ModBlocks.nuke.getDefaultState(), entity.getBrightness(partialTicks));
|
||||||
|
GlStateManager.translate(0.0F, 0.0F, 1.0F);
|
||||||
|
if (entity.fuse / 5 % 2 == 0) {
|
||||||
|
GlStateManager.disableTexture2D();
|
||||||
|
GlStateManager.disableLighting();
|
||||||
|
GlStateManager.enableBlend();
|
||||||
|
GlStateManager.blendFunc(770, 772);
|
||||||
|
GlStateManager.color(1.0F, 1.0F, 1.0F, f2);
|
||||||
|
GlStateManager.doPolygonOffset(-3.0F, -3.0F);
|
||||||
|
GlStateManager.enablePolygonOffset();
|
||||||
|
blockrendererdispatcher.renderBlockBrightness(Blocks.tnt.getDefaultState(), 1.0F);
|
||||||
|
GlStateManager.doPolygonOffset(0.0F, 0.0F);
|
||||||
|
GlStateManager.disablePolygonOffset();
|
||||||
|
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
|
GlStateManager.disableBlend();
|
||||||
|
GlStateManager.enableLighting();
|
||||||
|
GlStateManager.enableTexture2D();
|
||||||
|
}
|
||||||
|
GlStateManager.popMatrix();
|
||||||
|
super.doRender(entity, x, y, z, entityYaw, partialTicks);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected ResourceLocation getEntityTexture(EntityNukePrimed entity) {
|
||||||
|
return TextureMap.locationBlocksTexture;
|
||||||
|
}
|
||||||
|
}
|
|
@ -8,7 +8,6 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority;
|
||||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import techreborn.parts.CableMultipart;
|
|
||||||
import techreborn.parts.EnumCableType;
|
import techreborn.parts.EnumCableType;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1,10 +1,13 @@
|
||||||
package techreborn.client.render.parts;
|
package techreborn.client.render.parts;
|
||||||
|
|
||||||
import buildcraft.robotics.render.RobotItemModel;
|
|
||||||
import mcmultipart.client.multipart.ISmartMultipartModel;
|
import mcmultipart.client.multipart.ISmartMultipartModel;
|
||||||
import net.minecraft.block.state.IBlockState;
|
import net.minecraft.block.state.IBlockState;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.renderer.block.model.*;
|
import net.minecraft.client.renderer.block.model.BakedQuad;
|
||||||
|
import net.minecraft.client.renderer.block.model.BlockFaceUV;
|
||||||
|
import net.minecraft.client.renderer.block.model.BlockPartFace;
|
||||||
|
import net.minecraft.client.renderer.block.model.FaceBakery;
|
||||||
|
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
|
||||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||||
import net.minecraft.client.resources.model.IBakedModel;
|
import net.minecraft.client.resources.model.IBakedModel;
|
||||||
import net.minecraft.client.resources.model.ModelRotation;
|
import net.minecraft.client.resources.model.ModelRotation;
|
||||||
|
|
|
@ -1,10 +1,5 @@
|
||||||
package techreborn.client.texture;
|
package techreborn.client.texture;
|
||||||
|
|
||||||
import java.awt.image.BufferedImage;
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
import javax.imageio.ImageIO;
|
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||||
import net.minecraft.client.resources.IResource;
|
import net.minecraft.client.resources.IResource;
|
||||||
|
@ -14,6 +9,10 @@ import net.minecraft.util.ResourceLocation;
|
||||||
import reborncore.client.texture.ConnectedTexture;
|
import reborncore.client.texture.ConnectedTexture;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.lib.ModInfo;
|
||||||
|
|
||||||
|
import javax.imageio.ImageIO;
|
||||||
|
import java.awt.image.BufferedImage;
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
//1.8 Nope
|
//1.8 Nope
|
||||||
public class CasingConnectedTextureGenerator extends TextureAtlasSprite {
|
public class CasingConnectedTextureGenerator extends TextureAtlasSprite {
|
||||||
|
|
||||||
|
|
|
@ -1,10 +1,5 @@
|
||||||
package techreborn.client.texture;
|
package techreborn.client.texture;
|
||||||
|
|
||||||
import java.awt.image.BufferedImage;
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
import javax.imageio.ImageIO;
|
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||||
import net.minecraft.client.resources.IResource;
|
import net.minecraft.client.resources.IResource;
|
||||||
|
@ -14,6 +9,10 @@ import net.minecraft.util.ResourceLocation;
|
||||||
import reborncore.client.texture.ConnectedTexture;
|
import reborncore.client.texture.ConnectedTexture;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.lib.ModInfo;
|
||||||
|
|
||||||
|
import javax.imageio.ImageIO;
|
||||||
|
import java.awt.image.BufferedImage;
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
|
||||||
//TODO 1.8 nope
|
//TODO 1.8 nope
|
||||||
public class LesuConnectedTextureGenerator extends TextureAtlasSprite {
|
public class LesuConnectedTextureGenerator extends TextureAtlasSprite {
|
||||||
|
|
|
@ -1,13 +1,21 @@
|
||||||
package techreborn.command;
|
package techreborn.command;
|
||||||
|
|
||||||
|
|
||||||
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.command.CommandBase;
|
import net.minecraft.command.CommandBase;
|
||||||
import net.minecraft.command.ICommandSender;
|
import net.minecraft.command.ICommandSender;
|
||||||
|
import net.minecraft.entity.player.EntityPlayerMP;
|
||||||
|
import net.minecraft.init.Blocks;
|
||||||
|
import net.minecraft.util.BlockPos;
|
||||||
import net.minecraft.util.ChatComponentText;
|
import net.minecraft.util.ChatComponentText;
|
||||||
import net.minecraftforge.fluids.Fluid;
|
import net.minecraftforge.fluids.Fluid;
|
||||||
import reborncore.api.fuel.FluidPowerManager;
|
import reborncore.api.fuel.FluidPowerManager;
|
||||||
|
import reborncore.common.explosion.RebornExplosion;
|
||||||
import techreborn.api.recipe.RecipeHandler;
|
import techreborn.api.recipe.RecipeHandler;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public class TechRebornDevCommand extends CommandBase {
|
public class TechRebornDevCommand extends CommandBase {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -43,11 +51,26 @@ public class TechRebornDevCommand extends CommandBase {
|
||||||
sender.addChatMessage(new ChatComponentText("Found invalid fluid entry"));
|
sender.addChatMessage(new ChatComponentText("Found invalid fluid entry"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// } else if ("parts".equals(args[0])) { //TODO 1.8
|
} else if ("clear".equals(args[0])) {
|
||||||
// for (IModPart part : ModPartRegistry.parts) {
|
EntityPlayerMP playerMP = (EntityPlayerMP) sender;
|
||||||
// sender.addChatMessage(new ChatComponentText(part.getName()));
|
List<Block> blocksToRemove = new ArrayList<>();
|
||||||
// }
|
blocksToRemove.add(Blocks.grass);
|
||||||
// }
|
blocksToRemove.add(Blocks.dirt);
|
||||||
|
blocksToRemove.add(Blocks.stone);
|
||||||
|
for (int x = 0; x < 25; x++) {
|
||||||
|
for (int z = 0; z < 25; z++) {
|
||||||
|
for (int y = 0; y < playerMP.posY; y++) {
|
||||||
|
BlockPos pos = new BlockPos(playerMP.posX + x, y, playerMP.posZ + z);
|
||||||
|
if (blocksToRemove.contains(playerMP.worldObj.getBlockState(pos).getBlock())) {
|
||||||
|
playerMP.worldObj.setBlockState(pos, Blocks.air.getDefaultState(), 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}else if ("explode".equals(args[0])) {
|
||||||
|
EntityPlayerMP playerMP = (EntityPlayerMP) sender;
|
||||||
|
RebornExplosion explosion = new RebornExplosion(playerMP.getPosition(), playerMP.worldObj, 40);
|
||||||
|
explosion.explode();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,12 +1,9 @@
|
||||||
package techreborn.compat;
|
package techreborn.compat;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
|
|
||||||
import net.minecraftforge.fml.common.FMLCommonHandler;
|
import net.minecraftforge.fml.common.FMLCommonHandler;
|
||||||
import net.minecraftforge.fml.common.Loader;
|
import net.minecraftforge.fml.common.Loader;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import techreborn.client.render.parts.ClientPartLoader;
|
import techreborn.client.render.parts.ClientPartLoader;
|
||||||
import techreborn.client.render.parts.ClientPartModelBakery;
|
|
||||||
import techreborn.compat.minetweaker.MinetweakerCompat;
|
import techreborn.compat.minetweaker.MinetweakerCompat;
|
||||||
import techreborn.compat.recipes.RecipesBiomesOPlenty;
|
import techreborn.compat.recipes.RecipesBiomesOPlenty;
|
||||||
import techreborn.compat.recipes.RecipesBuildcraft;
|
import techreborn.compat.recipes.RecipesBuildcraft;
|
||||||
|
@ -17,6 +14,8 @@ import techreborn.parts.StandalonePartCompact;
|
||||||
import techreborn.parts.TechRebornParts;
|
import techreborn.parts.TechRebornParts;
|
||||||
import techreborn.parts.walia.WailaMcMultiPartCompact;
|
import techreborn.parts.walia.WailaMcMultiPartCompact;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
public class CompatManager {
|
public class CompatManager {
|
||||||
|
|
||||||
public ArrayList<ICompatModule> compatModules = new ArrayList<ICompatModule>();
|
public ArrayList<ICompatModule> compatModules = new ArrayList<ICompatModule>();
|
||||||
|
|
|
@ -1,18 +1,17 @@
|
||||||
package techreborn.compat.jei;
|
package techreborn.compat.jei;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.recipe.BlankRecipeWrapper;
|
import mezz.jei.api.recipe.BlankRecipeWrapper;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraftforge.oredict.OreDictionary;
|
import net.minecraftforge.oredict.OreDictionary;
|
||||||
import techreborn.api.recipe.BaseRecipe;
|
import techreborn.api.recipe.BaseRecipe;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
public abstract class BaseRecipeWrapper<T extends BaseRecipe> extends BlankRecipeWrapper {
|
public abstract class BaseRecipeWrapper<T extends BaseRecipe> extends BlankRecipeWrapper {
|
||||||
protected final T baseRecipe;
|
protected final T baseRecipe;
|
||||||
@Nonnull
|
@Nonnull
|
||||||
|
|
|
@ -1,12 +1,5 @@
|
||||||
package techreborn.compat.jei;
|
package techreborn.compat.jei;
|
||||||
|
|
||||||
import java.awt.Color;
|
|
||||||
import java.text.NumberFormat;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
import mezz.jei.api.gui.IGuiFluidStackGroup;
|
import mezz.jei.api.gui.IGuiFluidStackGroup;
|
||||||
import mezz.jei.api.gui.IGuiItemStackGroup;
|
import mezz.jei.api.gui.IGuiItemStackGroup;
|
||||||
import mezz.jei.api.gui.IRecipeLayout;
|
import mezz.jei.api.gui.IRecipeLayout;
|
||||||
|
@ -16,6 +9,12 @@ import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.StatCollector;
|
import net.minecraft.util.StatCollector;
|
||||||
import net.minecraftforge.fluids.FluidStack;
|
import net.minecraftforge.fluids.FluidStack;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
import java.awt.*;
|
||||||
|
import java.text.NumberFormat;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public class RecipeUtil {
|
public class RecipeUtil {
|
||||||
private static final int color = Color.darkGray.getRGB();
|
private static final int color = Color.darkGray.getRGB();
|
||||||
|
|
||||||
|
|
|
@ -1,10 +1,5 @@
|
||||||
package techreborn.compat.jei;
|
package techreborn.compat.jei;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.BlankModPlugin;
|
import mezz.jei.api.BlankModPlugin;
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.IJeiHelpers;
|
import mezz.jei.api.IJeiHelpers;
|
||||||
|
@ -19,8 +14,41 @@ import techreborn.api.reactor.FusionReactorRecipeHelper;
|
||||||
import techreborn.api.recipe.RecipeHandler;
|
import techreborn.api.recipe.RecipeHandler;
|
||||||
import techreborn.api.recipe.machines.AssemblingMachineRecipe;
|
import techreborn.api.recipe.machines.AssemblingMachineRecipe;
|
||||||
import techreborn.api.recipe.machines.ImplosionCompressorRecipe;
|
import techreborn.api.recipe.machines.ImplosionCompressorRecipe;
|
||||||
import techreborn.client.container.*;
|
import techreborn.client.container.ContainerAlloyFurnace;
|
||||||
import techreborn.client.gui.*;
|
import techreborn.client.container.ContainerAlloySmelter;
|
||||||
|
import techreborn.client.container.ContainerAssemblingMachine;
|
||||||
|
import techreborn.client.container.ContainerBlastFurnace;
|
||||||
|
import techreborn.client.container.ContainerCentrifuge;
|
||||||
|
import techreborn.client.container.ContainerChemicalReactor;
|
||||||
|
import techreborn.client.container.ContainerCompressor;
|
||||||
|
import techreborn.client.container.ContainerExtractor;
|
||||||
|
import techreborn.client.container.ContainerFusionReactor;
|
||||||
|
import techreborn.client.container.ContainerGrinder;
|
||||||
|
import techreborn.client.container.ContainerImplosionCompressor;
|
||||||
|
import techreborn.client.container.ContainerIndustrialElectrolyzer;
|
||||||
|
import techreborn.client.container.ContainerIndustrialGrinder;
|
||||||
|
import techreborn.client.container.ContainerIndustrialSawmill;
|
||||||
|
import techreborn.client.container.ContainerRollingMachine;
|
||||||
|
import techreborn.client.container.ContainerVacuumFreezer;
|
||||||
|
import techreborn.client.gui.GuiAlloyFurnace;
|
||||||
|
import techreborn.client.gui.GuiAlloySmelter;
|
||||||
|
import techreborn.client.gui.GuiAssemblingMachine;
|
||||||
|
import techreborn.client.gui.GuiBlastFurnace;
|
||||||
|
import techreborn.client.gui.GuiCentrifuge;
|
||||||
|
import techreborn.client.gui.GuiChemicalReactor;
|
||||||
|
import techreborn.client.gui.GuiCompressor;
|
||||||
|
import techreborn.client.gui.GuiElectricFurnace;
|
||||||
|
import techreborn.client.gui.GuiExtractor;
|
||||||
|
import techreborn.client.gui.GuiFusionReactor;
|
||||||
|
import techreborn.client.gui.GuiGrinder;
|
||||||
|
import techreborn.client.gui.GuiImplosionCompressor;
|
||||||
|
import techreborn.client.gui.GuiIndustrialElectrolyzer;
|
||||||
|
import techreborn.client.gui.GuiIndustrialGrinder;
|
||||||
|
import techreborn.client.gui.GuiIndustrialSawmill;
|
||||||
|
import techreborn.client.gui.GuiIronFurnace;
|
||||||
|
import techreborn.client.gui.GuiRecycler;
|
||||||
|
import techreborn.client.gui.GuiRollingMachine;
|
||||||
|
import techreborn.client.gui.GuiVacuumFreezer;
|
||||||
import techreborn.compat.jei.alloySmelter.AlloySmelterRecipeCategory;
|
import techreborn.compat.jei.alloySmelter.AlloySmelterRecipeCategory;
|
||||||
import techreborn.compat.jei.alloySmelter.AlloySmelterRecipeHandler;
|
import techreborn.compat.jei.alloySmelter.AlloySmelterRecipeHandler;
|
||||||
import techreborn.compat.jei.assemblingMachine.AssemblingMachineRecipeCategory;
|
import techreborn.compat.jei.assemblingMachine.AssemblingMachineRecipeCategory;
|
||||||
|
@ -60,6 +88,10 @@ import techreborn.config.ConfigTechReborn;
|
||||||
import techreborn.init.ModItems;
|
import techreborn.init.ModItems;
|
||||||
import techreborn.items.ItemParts;
|
import techreborn.items.ItemParts;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
@mezz.jei.api.JEIPlugin
|
@mezz.jei.api.JEIPlugin
|
||||||
public class TechRebornJeiPlugin extends BlankModPlugin {
|
public class TechRebornJeiPlugin extends BlankModPlugin {
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.compat.jei.alloySmelter;
|
package techreborn.compat.jei.alloySmelter;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.gui.IDrawable;
|
import mezz.jei.api.gui.IDrawable;
|
||||||
import mezz.jei.api.gui.IDrawableAnimated;
|
import mezz.jei.api.gui.IDrawableAnimated;
|
||||||
|
@ -16,6 +14,8 @@ import techreborn.client.gui.GuiAlloySmelter;
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
import techreborn.compat.jei.RecipeUtil;
|
import techreborn.compat.jei.RecipeUtil;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class AlloySmelterRecipeCategory extends BlankRecipeCategory {
|
public class AlloySmelterRecipeCategory extends BlankRecipeCategory {
|
||||||
private static final int[] INPUT_SLOTS = {0, 1};
|
private static final int[] INPUT_SLOTS = {0, 1};
|
||||||
private static final int[] OUTPUT_SLOTS = {2};
|
private static final int[] OUTPUT_SLOTS = {2};
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
package techreborn.compat.jei.alloySmelter;
|
package techreborn.compat.jei.alloySmelter;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IJeiHelpers;
|
import mezz.jei.api.IJeiHelpers;
|
||||||
import mezz.jei.api.recipe.IRecipeHandler;
|
import mezz.jei.api.recipe.IRecipeHandler;
|
||||||
import mezz.jei.api.recipe.IRecipeWrapper;
|
import mezz.jei.api.recipe.IRecipeWrapper;
|
||||||
import techreborn.api.recipe.machines.AlloySmelterRecipe;
|
import techreborn.api.recipe.machines.AlloySmelterRecipe;
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class AlloySmelterRecipeHandler implements IRecipeHandler<AlloySmelterRecipe> {
|
public class AlloySmelterRecipeHandler implements IRecipeHandler<AlloySmelterRecipe> {
|
||||||
@Nonnull
|
@Nonnull
|
||||||
private final IJeiHelpers jeiHelpers;
|
private final IJeiHelpers jeiHelpers;
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.compat.jei.alloySmelter;
|
package techreborn.compat.jei.alloySmelter;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.IJeiHelpers;
|
import mezz.jei.api.IJeiHelpers;
|
||||||
import mezz.jei.api.gui.IDrawableAnimated;
|
import mezz.jei.api.gui.IDrawableAnimated;
|
||||||
|
@ -11,6 +9,8 @@ import techreborn.api.recipe.machines.AlloySmelterRecipe;
|
||||||
import techreborn.client.gui.GuiAlloySmelter;
|
import techreborn.client.gui.GuiAlloySmelter;
|
||||||
import techreborn.compat.jei.BaseRecipeWrapper;
|
import techreborn.compat.jei.BaseRecipeWrapper;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class AlloySmelterRecipeWrapper extends BaseRecipeWrapper<AlloySmelterRecipe> {
|
public class AlloySmelterRecipeWrapper extends BaseRecipeWrapper<AlloySmelterRecipe> {
|
||||||
private final IDrawableAnimated arrow;
|
private final IDrawableAnimated arrow;
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.compat.jei.assemblingMachine;
|
package techreborn.compat.jei.assemblingMachine;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.gui.IDrawable;
|
import mezz.jei.api.gui.IDrawable;
|
||||||
import mezz.jei.api.gui.IDrawableAnimated;
|
import mezz.jei.api.gui.IDrawableAnimated;
|
||||||
|
@ -16,6 +14,8 @@ import techreborn.client.gui.GuiAssemblingMachine;
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
import techreborn.compat.jei.RecipeUtil;
|
import techreborn.compat.jei.RecipeUtil;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class AssemblingMachineRecipeCategory extends BlankRecipeCategory {
|
public class AssemblingMachineRecipeCategory extends BlankRecipeCategory {
|
||||||
private static final int[] INPUT_SLOTS = {0, 1};
|
private static final int[] INPUT_SLOTS = {0, 1};
|
||||||
private static final int[] OUTPUT_SLOTS = {2};
|
private static final int[] OUTPUT_SLOTS = {2};
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
package techreborn.compat.jei.assemblingMachine;
|
package techreborn.compat.jei.assemblingMachine;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IJeiHelpers;
|
import mezz.jei.api.IJeiHelpers;
|
||||||
import mezz.jei.api.recipe.IRecipeHandler;
|
import mezz.jei.api.recipe.IRecipeHandler;
|
||||||
import mezz.jei.api.recipe.IRecipeWrapper;
|
import mezz.jei.api.recipe.IRecipeWrapper;
|
||||||
import techreborn.api.recipe.machines.AssemblingMachineRecipe;
|
import techreborn.api.recipe.machines.AssemblingMachineRecipe;
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class AssemblingMachineRecipeHandler implements IRecipeHandler<AssemblingMachineRecipe> {
|
public class AssemblingMachineRecipeHandler implements IRecipeHandler<AssemblingMachineRecipe> {
|
||||||
@Nonnull
|
@Nonnull
|
||||||
private final IJeiHelpers jeiHelpers;
|
private final IJeiHelpers jeiHelpers;
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.compat.jei.assemblingMachine;
|
package techreborn.compat.jei.assemblingMachine;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.IJeiHelpers;
|
import mezz.jei.api.IJeiHelpers;
|
||||||
import mezz.jei.api.gui.IDrawableAnimated;
|
import mezz.jei.api.gui.IDrawableAnimated;
|
||||||
|
@ -11,6 +9,8 @@ import techreborn.api.recipe.machines.AssemblingMachineRecipe;
|
||||||
import techreborn.client.gui.GuiAssemblingMachine;
|
import techreborn.client.gui.GuiAssemblingMachine;
|
||||||
import techreborn.compat.jei.BaseRecipeWrapper;
|
import techreborn.compat.jei.BaseRecipeWrapper;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class AssemblingMachineRecipeWrapper extends BaseRecipeWrapper<AssemblingMachineRecipe> {
|
public class AssemblingMachineRecipeWrapper extends BaseRecipeWrapper<AssemblingMachineRecipe> {
|
||||||
private final IDrawableAnimated progress;
|
private final IDrawableAnimated progress;
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.compat.jei.blastFurnace;
|
package techreborn.compat.jei.blastFurnace;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.gui.IDrawable;
|
import mezz.jei.api.gui.IDrawable;
|
||||||
import mezz.jei.api.gui.IGuiItemStackGroup;
|
import mezz.jei.api.gui.IGuiItemStackGroup;
|
||||||
|
@ -13,6 +11,8 @@ import techreborn.client.gui.GuiBlastFurnace;
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
import techreborn.compat.jei.RecipeUtil;
|
import techreborn.compat.jei.RecipeUtil;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class BlastFurnaceRecipeCategory extends BlankRecipeCategory {
|
public class BlastFurnaceRecipeCategory extends BlankRecipeCategory {
|
||||||
private static final int[] INPUT_SLOTS = {0, 1};
|
private static final int[] INPUT_SLOTS = {0, 1};
|
||||||
private static final int[] OUTPUT_SLOTS = {2, 3};
|
private static final int[] OUTPUT_SLOTS = {2, 3};
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
package techreborn.compat.jei.blastFurnace;
|
package techreborn.compat.jei.blastFurnace;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IJeiHelpers;
|
import mezz.jei.api.IJeiHelpers;
|
||||||
import mezz.jei.api.recipe.IRecipeHandler;
|
import mezz.jei.api.recipe.IRecipeHandler;
|
||||||
import mezz.jei.api.recipe.IRecipeWrapper;
|
import mezz.jei.api.recipe.IRecipeWrapper;
|
||||||
import techreborn.api.recipe.machines.BlastFurnaceRecipe;
|
import techreborn.api.recipe.machines.BlastFurnaceRecipe;
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class BlastFurnaceRecipeHandler implements IRecipeHandler<BlastFurnaceRecipe> {
|
public class BlastFurnaceRecipeHandler implements IRecipeHandler<BlastFurnaceRecipe> {
|
||||||
@Nonnull
|
@Nonnull
|
||||||
private final IJeiHelpers jeiHelpers;
|
private final IJeiHelpers jeiHelpers;
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.compat.jei.blastFurnace;
|
package techreborn.compat.jei.blastFurnace;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.IJeiHelpers;
|
import mezz.jei.api.IJeiHelpers;
|
||||||
import mezz.jei.api.gui.IDrawableAnimated;
|
import mezz.jei.api.gui.IDrawableAnimated;
|
||||||
|
@ -11,6 +9,8 @@ import techreborn.api.recipe.machines.BlastFurnaceRecipe;
|
||||||
import techreborn.client.gui.GuiBlastFurnace;
|
import techreborn.client.gui.GuiBlastFurnace;
|
||||||
import techreborn.compat.jei.BaseRecipeWrapper;
|
import techreborn.compat.jei.BaseRecipeWrapper;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class BlastFurnaceRecipeWrapper extends BaseRecipeWrapper<BlastFurnaceRecipe> {
|
public class BlastFurnaceRecipeWrapper extends BaseRecipeWrapper<BlastFurnaceRecipe> {
|
||||||
private final IDrawableAnimated progress;
|
private final IDrawableAnimated progress;
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.compat.jei.centrifuge;
|
package techreborn.compat.jei.centrifuge;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.gui.IDrawable;
|
import mezz.jei.api.gui.IDrawable;
|
||||||
import mezz.jei.api.gui.IGuiItemStackGroup;
|
import mezz.jei.api.gui.IGuiItemStackGroup;
|
||||||
|
@ -13,6 +11,8 @@ import techreborn.client.gui.GuiCentrifuge;
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
import techreborn.compat.jei.RecipeUtil;
|
import techreborn.compat.jei.RecipeUtil;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class CentrifugeRecipeCategory extends BlankRecipeCategory {
|
public class CentrifugeRecipeCategory extends BlankRecipeCategory {
|
||||||
private static final int[] INPUT_SLOTS = {0, 1};
|
private static final int[] INPUT_SLOTS = {0, 1};
|
||||||
private static final int[] OUTPUT_SLOTS = {2, 3, 4, 5};
|
private static final int[] OUTPUT_SLOTS = {2, 3, 4, 5};
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
package techreborn.compat.jei.centrifuge;
|
package techreborn.compat.jei.centrifuge;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IJeiHelpers;
|
import mezz.jei.api.IJeiHelpers;
|
||||||
import mezz.jei.api.recipe.IRecipeHandler;
|
import mezz.jei.api.recipe.IRecipeHandler;
|
||||||
import mezz.jei.api.recipe.IRecipeWrapper;
|
import mezz.jei.api.recipe.IRecipeWrapper;
|
||||||
import techreborn.api.recipe.machines.CentrifugeRecipe;
|
import techreborn.api.recipe.machines.CentrifugeRecipe;
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class CentrifugeRecipeHandler implements IRecipeHandler<CentrifugeRecipe> {
|
public class CentrifugeRecipeHandler implements IRecipeHandler<CentrifugeRecipe> {
|
||||||
@Nonnull
|
@Nonnull
|
||||||
private final IJeiHelpers jeiHelpers;
|
private final IJeiHelpers jeiHelpers;
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.compat.jei.centrifuge;
|
package techreborn.compat.jei.centrifuge;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.IJeiHelpers;
|
import mezz.jei.api.IJeiHelpers;
|
||||||
import mezz.jei.api.gui.IDrawableAnimated;
|
import mezz.jei.api.gui.IDrawableAnimated;
|
||||||
|
@ -11,6 +9,8 @@ import techreborn.api.recipe.machines.CentrifugeRecipe;
|
||||||
import techreborn.client.gui.GuiCentrifuge;
|
import techreborn.client.gui.GuiCentrifuge;
|
||||||
import techreborn.compat.jei.BaseRecipeWrapper;
|
import techreborn.compat.jei.BaseRecipeWrapper;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class CentrifugeRecipeWrapper extends BaseRecipeWrapper<CentrifugeRecipe> {
|
public class CentrifugeRecipeWrapper extends BaseRecipeWrapper<CentrifugeRecipe> {
|
||||||
private final IDrawableAnimated progressUp;
|
private final IDrawableAnimated progressUp;
|
||||||
private final IDrawableAnimated progressLeft;
|
private final IDrawableAnimated progressLeft;
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.compat.jei.chemicalReactor;
|
package techreborn.compat.jei.chemicalReactor;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.gui.IDrawable;
|
import mezz.jei.api.gui.IDrawable;
|
||||||
import mezz.jei.api.gui.IGuiItemStackGroup;
|
import mezz.jei.api.gui.IGuiItemStackGroup;
|
||||||
|
@ -13,6 +11,8 @@ import techreborn.client.gui.GuiChemicalReactor;
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
import techreborn.compat.jei.RecipeUtil;
|
import techreborn.compat.jei.RecipeUtil;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class ChemicalReactorRecipeCategory extends BlankRecipeCategory {
|
public class ChemicalReactorRecipeCategory extends BlankRecipeCategory {
|
||||||
private static final int[] INPUT_SLOTS = {0, 1};
|
private static final int[] INPUT_SLOTS = {0, 1};
|
||||||
private static final int[] OUTPUT_SLOTS = {2};
|
private static final int[] OUTPUT_SLOTS = {2};
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
package techreborn.compat.jei.chemicalReactor;
|
package techreborn.compat.jei.chemicalReactor;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IJeiHelpers;
|
import mezz.jei.api.IJeiHelpers;
|
||||||
import mezz.jei.api.recipe.IRecipeHandler;
|
import mezz.jei.api.recipe.IRecipeHandler;
|
||||||
import mezz.jei.api.recipe.IRecipeWrapper;
|
import mezz.jei.api.recipe.IRecipeWrapper;
|
||||||
import techreborn.api.recipe.machines.ChemicalReactorRecipe;
|
import techreborn.api.recipe.machines.ChemicalReactorRecipe;
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class ChemicalReactorRecipeHandler implements IRecipeHandler<ChemicalReactorRecipe> {
|
public class ChemicalReactorRecipeHandler implements IRecipeHandler<ChemicalReactorRecipe> {
|
||||||
@Nonnull
|
@Nonnull
|
||||||
private final IJeiHelpers jeiHelpers;
|
private final IJeiHelpers jeiHelpers;
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.compat.jei.chemicalReactor;
|
package techreborn.compat.jei.chemicalReactor;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.IJeiHelpers;
|
import mezz.jei.api.IJeiHelpers;
|
||||||
import mezz.jei.api.gui.IDrawableAnimated;
|
import mezz.jei.api.gui.IDrawableAnimated;
|
||||||
|
@ -11,6 +9,8 @@ import techreborn.api.recipe.machines.ChemicalReactorRecipe;
|
||||||
import techreborn.client.gui.GuiChemicalReactor;
|
import techreborn.client.gui.GuiChemicalReactor;
|
||||||
import techreborn.compat.jei.BaseRecipeWrapper;
|
import techreborn.compat.jei.BaseRecipeWrapper;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class ChemicalReactorRecipeWrapper extends BaseRecipeWrapper<ChemicalReactorRecipe> {
|
public class ChemicalReactorRecipeWrapper extends BaseRecipeWrapper<ChemicalReactorRecipe> {
|
||||||
private final IDrawableAnimated progress;
|
private final IDrawableAnimated progress;
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.compat.jei.compressor;
|
package techreborn.compat.jei.compressor;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.gui.IDrawable;
|
import mezz.jei.api.gui.IDrawable;
|
||||||
import mezz.jei.api.gui.IGuiItemStackGroup;
|
import mezz.jei.api.gui.IGuiItemStackGroup;
|
||||||
|
@ -10,10 +8,11 @@ import mezz.jei.api.recipe.BlankRecipeCategory;
|
||||||
import mezz.jei.api.recipe.IRecipeWrapper;
|
import mezz.jei.api.recipe.IRecipeWrapper;
|
||||||
import net.minecraft.util.StatCollector;
|
import net.minecraft.util.StatCollector;
|
||||||
import techreborn.client.gui.GuiCompressor;
|
import techreborn.client.gui.GuiCompressor;
|
||||||
import techreborn.client.gui.GuiGrinder;
|
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
import techreborn.compat.jei.RecipeUtil;
|
import techreborn.compat.jei.RecipeUtil;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class CompressorRecipeCategory extends BlankRecipeCategory {
|
public class CompressorRecipeCategory extends BlankRecipeCategory {
|
||||||
private static final int[] INPUT_SLOTS = {0};
|
private static final int[] INPUT_SLOTS = {0};
|
||||||
private static final int[] OUTPUT_SLOTS = {1};
|
private static final int[] OUTPUT_SLOTS = {1};
|
||||||
|
|
|
@ -1,14 +1,13 @@
|
||||||
package techreborn.compat.jei.compressor;
|
package techreborn.compat.jei.compressor;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IJeiHelpers;
|
import mezz.jei.api.IJeiHelpers;
|
||||||
import mezz.jei.api.recipe.IRecipeHandler;
|
import mezz.jei.api.recipe.IRecipeHandler;
|
||||||
import mezz.jei.api.recipe.IRecipeWrapper;
|
import mezz.jei.api.recipe.IRecipeWrapper;
|
||||||
import techreborn.api.recipe.machines.CompressorRecipe;
|
import techreborn.api.recipe.machines.CompressorRecipe;
|
||||||
import techreborn.api.recipe.machines.GrinderRecipe;
|
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class CompressorRecipeHandler implements IRecipeHandler<CompressorRecipe> {
|
public class CompressorRecipeHandler implements IRecipeHandler<CompressorRecipe> {
|
||||||
@Nonnull
|
@Nonnull
|
||||||
private final IJeiHelpers jeiHelpers;
|
private final IJeiHelpers jeiHelpers;
|
||||||
|
|
|
@ -1,18 +1,16 @@
|
||||||
package techreborn.compat.jei.compressor;
|
package techreborn.compat.jei.compressor;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.IJeiHelpers;
|
import mezz.jei.api.IJeiHelpers;
|
||||||
import mezz.jei.api.gui.IDrawableAnimated;
|
import mezz.jei.api.gui.IDrawableAnimated;
|
||||||
import mezz.jei.api.gui.IDrawableStatic;
|
import mezz.jei.api.gui.IDrawableStatic;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import techreborn.api.recipe.machines.CompressorRecipe;
|
import techreborn.api.recipe.machines.CompressorRecipe;
|
||||||
import techreborn.api.recipe.machines.GrinderRecipe;
|
|
||||||
import techreborn.client.gui.GuiCompressor;
|
import techreborn.client.gui.GuiCompressor;
|
||||||
import techreborn.client.gui.GuiGrinder;
|
|
||||||
import techreborn.compat.jei.BaseRecipeWrapper;
|
import techreborn.compat.jei.BaseRecipeWrapper;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class CompressorRecipeWrapper extends BaseRecipeWrapper<CompressorRecipe> {
|
public class CompressorRecipeWrapper extends BaseRecipeWrapper<CompressorRecipe> {
|
||||||
private final IDrawableAnimated progress;
|
private final IDrawableAnimated progress;
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.compat.jei.extractor;
|
package techreborn.compat.jei.extractor;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.gui.IDrawable;
|
import mezz.jei.api.gui.IDrawable;
|
||||||
import mezz.jei.api.gui.IGuiItemStackGroup;
|
import mezz.jei.api.gui.IGuiItemStackGroup;
|
||||||
|
@ -10,10 +8,11 @@ import mezz.jei.api.recipe.BlankRecipeCategory;
|
||||||
import mezz.jei.api.recipe.IRecipeWrapper;
|
import mezz.jei.api.recipe.IRecipeWrapper;
|
||||||
import net.minecraft.util.StatCollector;
|
import net.minecraft.util.StatCollector;
|
||||||
import techreborn.client.gui.GuiExtractor;
|
import techreborn.client.gui.GuiExtractor;
|
||||||
import techreborn.client.gui.GuiGrinder;
|
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
import techreborn.compat.jei.RecipeUtil;
|
import techreborn.compat.jei.RecipeUtil;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class ExtractorRecipeCategory extends BlankRecipeCategory {
|
public class ExtractorRecipeCategory extends BlankRecipeCategory {
|
||||||
private static final int[] INPUT_SLOTS = {0};
|
private static final int[] INPUT_SLOTS = {0};
|
||||||
private static final int[] OUTPUT_SLOTS = {1};
|
private static final int[] OUTPUT_SLOTS = {1};
|
||||||
|
|
|
@ -1,14 +1,13 @@
|
||||||
package techreborn.compat.jei.extractor;
|
package techreborn.compat.jei.extractor;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IJeiHelpers;
|
import mezz.jei.api.IJeiHelpers;
|
||||||
import mezz.jei.api.recipe.IRecipeHandler;
|
import mezz.jei.api.recipe.IRecipeHandler;
|
||||||
import mezz.jei.api.recipe.IRecipeWrapper;
|
import mezz.jei.api.recipe.IRecipeWrapper;
|
||||||
import techreborn.api.recipe.machines.ExtractorRecipe;
|
import techreborn.api.recipe.machines.ExtractorRecipe;
|
||||||
import techreborn.api.recipe.machines.GrinderRecipe;
|
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class ExtractorRecipeHandler implements IRecipeHandler<ExtractorRecipe> {
|
public class ExtractorRecipeHandler implements IRecipeHandler<ExtractorRecipe> {
|
||||||
@Nonnull
|
@Nonnull
|
||||||
private final IJeiHelpers jeiHelpers;
|
private final IJeiHelpers jeiHelpers;
|
||||||
|
|
|
@ -1,18 +1,16 @@
|
||||||
package techreborn.compat.jei.extractor;
|
package techreborn.compat.jei.extractor;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.IJeiHelpers;
|
import mezz.jei.api.IJeiHelpers;
|
||||||
import mezz.jei.api.gui.IDrawableAnimated;
|
import mezz.jei.api.gui.IDrawableAnimated;
|
||||||
import mezz.jei.api.gui.IDrawableStatic;
|
import mezz.jei.api.gui.IDrawableStatic;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import techreborn.api.recipe.machines.ExtractorRecipe;
|
import techreborn.api.recipe.machines.ExtractorRecipe;
|
||||||
import techreborn.api.recipe.machines.GrinderRecipe;
|
|
||||||
import techreborn.client.gui.GuiExtractor;
|
import techreborn.client.gui.GuiExtractor;
|
||||||
import techreborn.client.gui.GuiGrinder;
|
|
||||||
import techreborn.compat.jei.BaseRecipeWrapper;
|
import techreborn.compat.jei.BaseRecipeWrapper;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class ExtractorRecipeWrapper extends BaseRecipeWrapper<ExtractorRecipe> {
|
public class ExtractorRecipeWrapper extends BaseRecipeWrapper<ExtractorRecipe> {
|
||||||
private final IDrawableAnimated progress;
|
private final IDrawableAnimated progress;
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.compat.jei.fusionReactor;
|
package techreborn.compat.jei.fusionReactor;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.gui.IDrawable;
|
import mezz.jei.api.gui.IDrawable;
|
||||||
import mezz.jei.api.gui.IGuiItemStackGroup;
|
import mezz.jei.api.gui.IGuiItemStackGroup;
|
||||||
|
@ -12,6 +10,8 @@ import net.minecraft.util.StatCollector;
|
||||||
import techreborn.client.gui.GuiFusionReactor;
|
import techreborn.client.gui.GuiFusionReactor;
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class FusionReactorRecipeCategory extends BlankRecipeCategory {
|
public class FusionReactorRecipeCategory extends BlankRecipeCategory {
|
||||||
|
|
||||||
private static final int inputSlotTop = 0;
|
private static final int inputSlotTop = 0;
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
package techreborn.compat.jei.fusionReactor;
|
package techreborn.compat.jei.fusionReactor;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.recipe.IRecipeHandler;
|
import mezz.jei.api.recipe.IRecipeHandler;
|
||||||
import mezz.jei.api.recipe.IRecipeWrapper;
|
import mezz.jei.api.recipe.IRecipeWrapper;
|
||||||
import techreborn.api.reactor.FusionReactorRecipe;
|
import techreborn.api.reactor.FusionReactorRecipe;
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class FusionReactorRecipeHandler implements IRecipeHandler<FusionReactorRecipe> {
|
public class FusionReactorRecipeHandler implements IRecipeHandler<FusionReactorRecipe> {
|
||||||
|
|
||||||
@Nonnull
|
@Nonnull
|
||||||
|
|
|
@ -1,17 +1,16 @@
|
||||||
package techreborn.compat.jei.fusionReactor;
|
package techreborn.compat.jei.fusionReactor;
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.recipe.BlankRecipeWrapper;
|
import mezz.jei.api.recipe.BlankRecipeWrapper;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import techreborn.api.reactor.FusionReactorRecipe;
|
import techreborn.api.reactor.FusionReactorRecipe;
|
||||||
import techreborn.compat.jei.RecipeUtil;
|
import techreborn.compat.jei.RecipeUtil;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public class FusionReactorRecipeWrapper extends BlankRecipeWrapper {
|
public class FusionReactorRecipeWrapper extends BlankRecipeWrapper {
|
||||||
private final FusionReactorRecipe baseRecipe;
|
private final FusionReactorRecipe baseRecipe;
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.compat.jei.grinder;
|
package techreborn.compat.jei.grinder;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.gui.IDrawable;
|
import mezz.jei.api.gui.IDrawable;
|
||||||
import mezz.jei.api.gui.IGuiItemStackGroup;
|
import mezz.jei.api.gui.IGuiItemStackGroup;
|
||||||
|
@ -13,6 +11,8 @@ import techreborn.client.gui.GuiGrinder;
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
import techreborn.compat.jei.RecipeUtil;
|
import techreborn.compat.jei.RecipeUtil;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class GrinderRecipeCategory extends BlankRecipeCategory {
|
public class GrinderRecipeCategory extends BlankRecipeCategory {
|
||||||
private static final int[] INPUT_SLOTS = {0};
|
private static final int[] INPUT_SLOTS = {0};
|
||||||
private static final int[] OUTPUT_SLOTS = {1};
|
private static final int[] OUTPUT_SLOTS = {1};
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
package techreborn.compat.jei.grinder;
|
package techreborn.compat.jei.grinder;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IJeiHelpers;
|
import mezz.jei.api.IJeiHelpers;
|
||||||
import mezz.jei.api.recipe.IRecipeHandler;
|
import mezz.jei.api.recipe.IRecipeHandler;
|
||||||
import mezz.jei.api.recipe.IRecipeWrapper;
|
import mezz.jei.api.recipe.IRecipeWrapper;
|
||||||
import techreborn.api.recipe.machines.GrinderRecipe;
|
import techreborn.api.recipe.machines.GrinderRecipe;
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class GrinderRecipeHandler implements IRecipeHandler<GrinderRecipe> {
|
public class GrinderRecipeHandler implements IRecipeHandler<GrinderRecipe> {
|
||||||
@Nonnull
|
@Nonnull
|
||||||
private final IJeiHelpers jeiHelpers;
|
private final IJeiHelpers jeiHelpers;
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.compat.jei.grinder;
|
package techreborn.compat.jei.grinder;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.IJeiHelpers;
|
import mezz.jei.api.IJeiHelpers;
|
||||||
import mezz.jei.api.gui.IDrawableAnimated;
|
import mezz.jei.api.gui.IDrawableAnimated;
|
||||||
|
@ -11,6 +9,8 @@ import techreborn.api.recipe.machines.GrinderRecipe;
|
||||||
import techreborn.client.gui.GuiGrinder;
|
import techreborn.client.gui.GuiGrinder;
|
||||||
import techreborn.compat.jei.BaseRecipeWrapper;
|
import techreborn.compat.jei.BaseRecipeWrapper;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class GrinderRecipeWrapper extends BaseRecipeWrapper<GrinderRecipe> {
|
public class GrinderRecipeWrapper extends BaseRecipeWrapper<GrinderRecipe> {
|
||||||
private final IDrawableAnimated progress;
|
private final IDrawableAnimated progress;
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.compat.jei.implosionCompressor;
|
package techreborn.compat.jei.implosionCompressor;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.gui.IDrawable;
|
import mezz.jei.api.gui.IDrawable;
|
||||||
import mezz.jei.api.gui.IDrawableAnimated;
|
import mezz.jei.api.gui.IDrawableAnimated;
|
||||||
|
@ -16,6 +14,8 @@ import techreborn.client.gui.GuiImplosionCompressor;
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
import techreborn.compat.jei.RecipeUtil;
|
import techreborn.compat.jei.RecipeUtil;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class ImplosionCompressorRecipeCategory extends BlankRecipeCategory {
|
public class ImplosionCompressorRecipeCategory extends BlankRecipeCategory {
|
||||||
private static final int[] INPUT_SLOTS = {0, 1};
|
private static final int[] INPUT_SLOTS = {0, 1};
|
||||||
private static final int[] OUTPUT_SLOTS = {2, 3};
|
private static final int[] OUTPUT_SLOTS = {2, 3};
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
package techreborn.compat.jei.implosionCompressor;
|
package techreborn.compat.jei.implosionCompressor;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IJeiHelpers;
|
import mezz.jei.api.IJeiHelpers;
|
||||||
import mezz.jei.api.recipe.IRecipeHandler;
|
import mezz.jei.api.recipe.IRecipeHandler;
|
||||||
import mezz.jei.api.recipe.IRecipeWrapper;
|
import mezz.jei.api.recipe.IRecipeWrapper;
|
||||||
import techreborn.api.recipe.machines.ImplosionCompressorRecipe;
|
import techreborn.api.recipe.machines.ImplosionCompressorRecipe;
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class ImplosionCompressorRecipeHandler implements IRecipeHandler<ImplosionCompressorRecipe> {
|
public class ImplosionCompressorRecipeHandler implements IRecipeHandler<ImplosionCompressorRecipe> {
|
||||||
@Nonnull
|
@Nonnull
|
||||||
private final IJeiHelpers jeiHelpers;
|
private final IJeiHelpers jeiHelpers;
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.compat.jei.implosionCompressor;
|
package techreborn.compat.jei.implosionCompressor;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.IJeiHelpers;
|
import mezz.jei.api.IJeiHelpers;
|
||||||
import mezz.jei.api.gui.IDrawableAnimated;
|
import mezz.jei.api.gui.IDrawableAnimated;
|
||||||
|
@ -11,6 +9,8 @@ import techreborn.api.recipe.machines.ImplosionCompressorRecipe;
|
||||||
import techreborn.client.gui.GuiImplosionCompressor;
|
import techreborn.client.gui.GuiImplosionCompressor;
|
||||||
import techreborn.compat.jei.BaseRecipeWrapper;
|
import techreborn.compat.jei.BaseRecipeWrapper;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class ImplosionCompressorRecipeWrapper extends BaseRecipeWrapper<ImplosionCompressorRecipe> {
|
public class ImplosionCompressorRecipeWrapper extends BaseRecipeWrapper<ImplosionCompressorRecipe> {
|
||||||
private final IDrawableAnimated progress;
|
private final IDrawableAnimated progress;
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.compat.jei.industrialElectrolyzer;
|
package techreborn.compat.jei.industrialElectrolyzer;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.gui.IDrawable;
|
import mezz.jei.api.gui.IDrawable;
|
||||||
import mezz.jei.api.gui.IGuiItemStackGroup;
|
import mezz.jei.api.gui.IGuiItemStackGroup;
|
||||||
|
@ -13,6 +11,8 @@ import techreborn.client.gui.GuiIndustrialElectrolyzer;
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
import techreborn.compat.jei.RecipeUtil;
|
import techreborn.compat.jei.RecipeUtil;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class IndustrialElectrolyzerRecipeCategory extends BlankRecipeCategory {
|
public class IndustrialElectrolyzerRecipeCategory extends BlankRecipeCategory {
|
||||||
private static final int[] INPUT_SLOTS = {0, 1};
|
private static final int[] INPUT_SLOTS = {0, 1};
|
||||||
private static final int[] OUTPUT_SLOTS = {2, 3, 4, 5};
|
private static final int[] OUTPUT_SLOTS = {2, 3, 4, 5};
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
package techreborn.compat.jei.industrialElectrolyzer;
|
package techreborn.compat.jei.industrialElectrolyzer;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IJeiHelpers;
|
import mezz.jei.api.IJeiHelpers;
|
||||||
import mezz.jei.api.recipe.IRecipeHandler;
|
import mezz.jei.api.recipe.IRecipeHandler;
|
||||||
import mezz.jei.api.recipe.IRecipeWrapper;
|
import mezz.jei.api.recipe.IRecipeWrapper;
|
||||||
import techreborn.api.recipe.machines.IndustrialElectrolyzerRecipe;
|
import techreborn.api.recipe.machines.IndustrialElectrolyzerRecipe;
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class IndustrialElectrolyzerRecipeHandler implements IRecipeHandler<IndustrialElectrolyzerRecipe> {
|
public class IndustrialElectrolyzerRecipeHandler implements IRecipeHandler<IndustrialElectrolyzerRecipe> {
|
||||||
@Nonnull
|
@Nonnull
|
||||||
private final IJeiHelpers jeiHelpers;
|
private final IJeiHelpers jeiHelpers;
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.compat.jei.industrialElectrolyzer;
|
package techreborn.compat.jei.industrialElectrolyzer;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.IJeiHelpers;
|
import mezz.jei.api.IJeiHelpers;
|
||||||
import mezz.jei.api.gui.IDrawableAnimated;
|
import mezz.jei.api.gui.IDrawableAnimated;
|
||||||
|
@ -11,6 +9,8 @@ import techreborn.api.recipe.machines.IndustrialElectrolyzerRecipe;
|
||||||
import techreborn.client.gui.GuiIndustrialElectrolyzer;
|
import techreborn.client.gui.GuiIndustrialElectrolyzer;
|
||||||
import techreborn.compat.jei.BaseRecipeWrapper;
|
import techreborn.compat.jei.BaseRecipeWrapper;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class IndustrialElectrolyzerRecipeWrapper extends BaseRecipeWrapper<IndustrialElectrolyzerRecipe> {
|
public class IndustrialElectrolyzerRecipeWrapper extends BaseRecipeWrapper<IndustrialElectrolyzerRecipe> {
|
||||||
private final IDrawableAnimated progress;
|
private final IDrawableAnimated progress;
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.compat.jei.industrialGrinder;
|
package techreborn.compat.jei.industrialGrinder;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.gui.IDrawable;
|
import mezz.jei.api.gui.IDrawable;
|
||||||
import mezz.jei.api.gui.IGuiFluidStackGroup;
|
import mezz.jei.api.gui.IGuiFluidStackGroup;
|
||||||
|
@ -16,6 +14,8 @@ import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
import techreborn.compat.jei.RecipeUtil;
|
import techreborn.compat.jei.RecipeUtil;
|
||||||
import techreborn.tiles.TileIndustrialGrinder;
|
import techreborn.tiles.TileIndustrialGrinder;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class IndustrialGrinderRecipeCategory extends BlankRecipeCategory {
|
public class IndustrialGrinderRecipeCategory extends BlankRecipeCategory {
|
||||||
private static final int[] INPUT_SLOTS = {0, 1};
|
private static final int[] INPUT_SLOTS = {0, 1};
|
||||||
private static final int[] OUTPUT_SLOTS = {2, 3, 4, 5};
|
private static final int[] OUTPUT_SLOTS = {2, 3, 4, 5};
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
package techreborn.compat.jei.industrialGrinder;
|
package techreborn.compat.jei.industrialGrinder;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IJeiHelpers;
|
import mezz.jei.api.IJeiHelpers;
|
||||||
import mezz.jei.api.recipe.IRecipeHandler;
|
import mezz.jei.api.recipe.IRecipeHandler;
|
||||||
import mezz.jei.api.recipe.IRecipeWrapper;
|
import mezz.jei.api.recipe.IRecipeWrapper;
|
||||||
import techreborn.api.recipe.machines.IndustrialGrinderRecipe;
|
import techreborn.api.recipe.machines.IndustrialGrinderRecipe;
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class IndustrialGrinderRecipeHandler implements IRecipeHandler<IndustrialGrinderRecipe> {
|
public class IndustrialGrinderRecipeHandler implements IRecipeHandler<IndustrialGrinderRecipe> {
|
||||||
@Nonnull
|
@Nonnull
|
||||||
private final IJeiHelpers jeiHelpers;
|
private final IJeiHelpers jeiHelpers;
|
||||||
|
|
|
@ -1,10 +1,5 @@
|
||||||
package techreborn.compat.jei.industrialGrinder;
|
package techreborn.compat.jei.industrialGrinder;
|
||||||
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.IJeiHelpers;
|
import mezz.jei.api.IJeiHelpers;
|
||||||
import mezz.jei.api.gui.IDrawableAnimated;
|
import mezz.jei.api.gui.IDrawableAnimated;
|
||||||
|
@ -15,6 +10,10 @@ import techreborn.api.recipe.machines.IndustrialGrinderRecipe;
|
||||||
import techreborn.client.gui.GuiIndustrialGrinder;
|
import techreborn.client.gui.GuiIndustrialGrinder;
|
||||||
import techreborn.compat.jei.BaseRecipeWrapper;
|
import techreborn.compat.jei.BaseRecipeWrapper;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public class IndustrialGrinderRecipeWrapper extends BaseRecipeWrapper<IndustrialGrinderRecipe> {
|
public class IndustrialGrinderRecipeWrapper extends BaseRecipeWrapper<IndustrialGrinderRecipe> {
|
||||||
private final IDrawableAnimated progress;
|
private final IDrawableAnimated progress;
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.compat.jei.industrialSawmill;
|
package techreborn.compat.jei.industrialSawmill;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.gui.IDrawable;
|
import mezz.jei.api.gui.IDrawable;
|
||||||
import mezz.jei.api.gui.IGuiFluidStackGroup;
|
import mezz.jei.api.gui.IGuiFluidStackGroup;
|
||||||
|
@ -16,6 +14,8 @@ import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
import techreborn.compat.jei.RecipeUtil;
|
import techreborn.compat.jei.RecipeUtil;
|
||||||
import techreborn.tiles.TileIndustrialSawmill;
|
import techreborn.tiles.TileIndustrialSawmill;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class IndustrialSawmillRecipeCategory extends BlankRecipeCategory {
|
public class IndustrialSawmillRecipeCategory extends BlankRecipeCategory {
|
||||||
private static final int[] INPUT_SLOTS = {0, 1};
|
private static final int[] INPUT_SLOTS = {0, 1};
|
||||||
private static final int[] OUTPUT_SLOTS = {2, 3, 4};
|
private static final int[] OUTPUT_SLOTS = {2, 3, 4};
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
package techreborn.compat.jei.industrialSawmill;
|
package techreborn.compat.jei.industrialSawmill;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IJeiHelpers;
|
import mezz.jei.api.IJeiHelpers;
|
||||||
import mezz.jei.api.recipe.IRecipeHandler;
|
import mezz.jei.api.recipe.IRecipeHandler;
|
||||||
import mezz.jei.api.recipe.IRecipeWrapper;
|
import mezz.jei.api.recipe.IRecipeWrapper;
|
||||||
import techreborn.api.recipe.machines.IndustrialSawmillRecipe;
|
import techreborn.api.recipe.machines.IndustrialSawmillRecipe;
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class IndustrialSawmillRecipeHandler implements IRecipeHandler<IndustrialSawmillRecipe> {
|
public class IndustrialSawmillRecipeHandler implements IRecipeHandler<IndustrialSawmillRecipe> {
|
||||||
@Nonnull
|
@Nonnull
|
||||||
private final IJeiHelpers jeiHelpers;
|
private final IJeiHelpers jeiHelpers;
|
||||||
|
|
|
@ -1,10 +1,5 @@
|
||||||
package techreborn.compat.jei.industrialSawmill;
|
package techreborn.compat.jei.industrialSawmill;
|
||||||
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.IJeiHelpers;
|
import mezz.jei.api.IJeiHelpers;
|
||||||
import mezz.jei.api.gui.IDrawableAnimated;
|
import mezz.jei.api.gui.IDrawableAnimated;
|
||||||
|
@ -15,6 +10,10 @@ import techreborn.api.recipe.machines.IndustrialSawmillRecipe;
|
||||||
import techreborn.client.gui.GuiIndustrialSawmill;
|
import techreborn.client.gui.GuiIndustrialSawmill;
|
||||||
import techreborn.compat.jei.BaseRecipeWrapper;
|
import techreborn.compat.jei.BaseRecipeWrapper;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public class IndustrialSawmillRecipeWrapper extends BaseRecipeWrapper<IndustrialSawmillRecipe> {
|
public class IndustrialSawmillRecipeWrapper extends BaseRecipeWrapper<IndustrialSawmillRecipe> {
|
||||||
private final IDrawableAnimated progress;
|
private final IDrawableAnimated progress;
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.compat.jei.recycler;
|
package techreborn.compat.jei.recycler;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.gui.IDrawable;
|
import mezz.jei.api.gui.IDrawable;
|
||||||
import mezz.jei.api.gui.IGuiItemStackGroup;
|
import mezz.jei.api.gui.IGuiItemStackGroup;
|
||||||
|
@ -9,12 +7,12 @@ import mezz.jei.api.gui.IRecipeLayout;
|
||||||
import mezz.jei.api.recipe.BlankRecipeCategory;
|
import mezz.jei.api.recipe.BlankRecipeCategory;
|
||||||
import mezz.jei.api.recipe.IRecipeWrapper;
|
import mezz.jei.api.recipe.IRecipeWrapper;
|
||||||
import net.minecraft.util.StatCollector;
|
import net.minecraft.util.StatCollector;
|
||||||
import techreborn.client.gui.GuiCompressor;
|
|
||||||
import techreborn.client.gui.GuiGrinder;
|
|
||||||
import techreborn.client.gui.GuiRecycler;
|
import techreborn.client.gui.GuiRecycler;
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
import techreborn.compat.jei.RecipeUtil;
|
import techreborn.compat.jei.RecipeUtil;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class RecyclerRecipeCategory extends BlankRecipeCategory {
|
public class RecyclerRecipeCategory extends BlankRecipeCategory {
|
||||||
private static final int[] INPUT_SLOTS = {0};
|
private static final int[] INPUT_SLOTS = {0};
|
||||||
private static final int[] OUTPUT_SLOTS = {1};
|
private static final int[] OUTPUT_SLOTS = {1};
|
||||||
|
|
|
@ -1,15 +1,13 @@
|
||||||
package techreborn.compat.jei.recycler;
|
package techreborn.compat.jei.recycler;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IJeiHelpers;
|
import mezz.jei.api.IJeiHelpers;
|
||||||
import mezz.jei.api.recipe.IRecipeHandler;
|
import mezz.jei.api.recipe.IRecipeHandler;
|
||||||
import mezz.jei.api.recipe.IRecipeWrapper;
|
import mezz.jei.api.recipe.IRecipeWrapper;
|
||||||
import techreborn.api.recipe.RecyclerRecipe;
|
import techreborn.api.recipe.RecyclerRecipe;
|
||||||
import techreborn.api.recipe.machines.CompressorRecipe;
|
|
||||||
import techreborn.api.recipe.machines.GrinderRecipe;
|
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class RecyclerRecipeHandler implements IRecipeHandler<RecyclerRecipe> {
|
public class RecyclerRecipeHandler implements IRecipeHandler<RecyclerRecipe> {
|
||||||
@Nonnull
|
@Nonnull
|
||||||
private final IJeiHelpers jeiHelpers;
|
private final IJeiHelpers jeiHelpers;
|
||||||
|
|
|
@ -1,20 +1,16 @@
|
||||||
package techreborn.compat.jei.recycler;
|
package techreborn.compat.jei.recycler;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.IJeiHelpers;
|
import mezz.jei.api.IJeiHelpers;
|
||||||
import mezz.jei.api.gui.IDrawableAnimated;
|
import mezz.jei.api.gui.IDrawableAnimated;
|
||||||
import mezz.jei.api.gui.IDrawableStatic;
|
import mezz.jei.api.gui.IDrawableStatic;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import techreborn.api.recipe.RecyclerRecipe;
|
import techreborn.api.recipe.RecyclerRecipe;
|
||||||
import techreborn.api.recipe.machines.CompressorRecipe;
|
|
||||||
import techreborn.api.recipe.machines.GrinderRecipe;
|
|
||||||
import techreborn.client.gui.GuiCompressor;
|
|
||||||
import techreborn.client.gui.GuiGrinder;
|
|
||||||
import techreborn.client.gui.GuiRecycler;
|
import techreborn.client.gui.GuiRecycler;
|
||||||
import techreborn.compat.jei.BaseRecipeWrapper;
|
import techreborn.compat.jei.BaseRecipeWrapper;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class RecyclerRecipeWrapper extends BaseRecipeWrapper<RecyclerRecipe> {
|
public class RecyclerRecipeWrapper extends BaseRecipeWrapper<RecyclerRecipe> {
|
||||||
private final IDrawableAnimated progress;
|
private final IDrawableAnimated progress;
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.compat.jei.rollingMachine;
|
package techreborn.compat.jei.rollingMachine;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.gui.ICraftingGridHelper;
|
import mezz.jei.api.gui.ICraftingGridHelper;
|
||||||
import mezz.jei.api.gui.IDrawable;
|
import mezz.jei.api.gui.IDrawable;
|
||||||
|
@ -16,6 +14,8 @@ import net.minecraft.util.StatCollector;
|
||||||
import techreborn.client.gui.GuiRollingMachine;
|
import techreborn.client.gui.GuiRollingMachine;
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class RollingMachineRecipeCategory extends BlankRecipeCategory {
|
public class RollingMachineRecipeCategory extends BlankRecipeCategory {
|
||||||
private static final int[] INPUT_SLOTS = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
|
private static final int[] INPUT_SLOTS = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
|
||||||
private static final int[] OUTPUT_SLOTS = {10};
|
private static final int[] OUTPUT_SLOTS = {10};
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
package techreborn.compat.jei.rollingMachine;
|
package techreborn.compat.jei.rollingMachine;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.recipe.IRecipeHandler;
|
import mezz.jei.api.recipe.IRecipeHandler;
|
||||||
import mezz.jei.api.recipe.IRecipeWrapper;
|
import mezz.jei.api.recipe.IRecipeWrapper;
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class RollingMachineRecipeHandler implements IRecipeHandler<RollingMachineRecipeWrapper> {
|
public class RollingMachineRecipeHandler implements IRecipeHandler<RollingMachineRecipeWrapper> {
|
||||||
@Nonnull
|
@Nonnull
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
package techreborn.compat.jei.rollingMachine;
|
package techreborn.compat.jei.rollingMachine;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import net.minecraft.item.crafting.IRecipe;
|
import net.minecraft.item.crafting.IRecipe;
|
||||||
import techreborn.api.RollingMachineRecipe;
|
import techreborn.api.RollingMachineRecipe;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public class RollingMachineRecipeMaker {
|
public class RollingMachineRecipeMaker {
|
||||||
private RollingMachineRecipeMaker() {
|
private RollingMachineRecipeMaker() {
|
||||||
|
|
||||||
|
|
|
@ -1,10 +1,5 @@
|
||||||
package techreborn.compat.jei.rollingMachine;
|
package techreborn.compat.jei.rollingMachine;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
import mezz.jei.api.recipe.BlankRecipeWrapper;
|
import mezz.jei.api.recipe.BlankRecipeWrapper;
|
||||||
import mezz.jei.api.recipe.wrapper.ICraftingRecipeWrapper;
|
import mezz.jei.api.recipe.wrapper.ICraftingRecipeWrapper;
|
||||||
import mezz.jei.plugins.vanilla.crafting.ShapedOreRecipeWrapper;
|
import mezz.jei.plugins.vanilla.crafting.ShapedOreRecipeWrapper;
|
||||||
|
@ -18,6 +13,10 @@ import net.minecraft.item.crafting.ShapelessRecipes;
|
||||||
import net.minecraftforge.oredict.ShapedOreRecipe;
|
import net.minecraftforge.oredict.ShapedOreRecipe;
|
||||||
import net.minecraftforge.oredict.ShapelessOreRecipe;
|
import net.minecraftforge.oredict.ShapelessOreRecipe;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public class RollingMachineRecipeWrapper extends BlankRecipeWrapper implements ICraftingRecipeWrapper {
|
public class RollingMachineRecipeWrapper extends BlankRecipeWrapper implements ICraftingRecipeWrapper {
|
||||||
private final ICraftingRecipeWrapper baseRecipe;
|
private final ICraftingRecipeWrapper baseRecipe;
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.compat.jei.scrapbox;
|
package techreborn.compat.jei.scrapbox;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.gui.IDrawable;
|
import mezz.jei.api.gui.IDrawable;
|
||||||
import mezz.jei.api.gui.IGuiItemStackGroup;
|
import mezz.jei.api.gui.IGuiItemStackGroup;
|
||||||
|
@ -10,10 +8,11 @@ import mezz.jei.api.recipe.BlankRecipeCategory;
|
||||||
import mezz.jei.api.recipe.IRecipeWrapper;
|
import mezz.jei.api.recipe.IRecipeWrapper;
|
||||||
import net.minecraft.util.StatCollector;
|
import net.minecraft.util.StatCollector;
|
||||||
import techreborn.client.gui.GuiCompressor;
|
import techreborn.client.gui.GuiCompressor;
|
||||||
import techreborn.client.gui.GuiGrinder;
|
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
import techreborn.compat.jei.RecipeUtil;
|
import techreborn.compat.jei.RecipeUtil;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class ScrapboxRecipeCategory extends BlankRecipeCategory {
|
public class ScrapboxRecipeCategory extends BlankRecipeCategory {
|
||||||
private static final int[] INPUT_SLOTS = {0};
|
private static final int[] INPUT_SLOTS = {0};
|
||||||
private static final int[] OUTPUT_SLOTS = {1};
|
private static final int[] OUTPUT_SLOTS = {1};
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
package techreborn.compat.jei.scrapbox;
|
package techreborn.compat.jei.scrapbox;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IJeiHelpers;
|
import mezz.jei.api.IJeiHelpers;
|
||||||
import mezz.jei.api.recipe.IRecipeHandler;
|
import mezz.jei.api.recipe.IRecipeHandler;
|
||||||
import mezz.jei.api.recipe.IRecipeWrapper;
|
import mezz.jei.api.recipe.IRecipeWrapper;
|
||||||
import techreborn.api.recipe.ScrapboxRecipe;
|
import techreborn.api.recipe.ScrapboxRecipe;
|
||||||
import techreborn.compat.jei.RecipeCategoryUids;
|
import techreborn.compat.jei.RecipeCategoryUids;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class ScrapboxRecipeHandler implements IRecipeHandler<ScrapboxRecipe> {
|
public class ScrapboxRecipeHandler implements IRecipeHandler<ScrapboxRecipe> {
|
||||||
@Nonnull
|
@Nonnull
|
||||||
private final IJeiHelpers jeiHelpers;
|
private final IJeiHelpers jeiHelpers;
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package techreborn.compat.jei.scrapbox;
|
package techreborn.compat.jei.scrapbox;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import mezz.jei.api.IGuiHelper;
|
import mezz.jei.api.IGuiHelper;
|
||||||
import mezz.jei.api.IJeiHelpers;
|
import mezz.jei.api.IJeiHelpers;
|
||||||
import mezz.jei.api.gui.IDrawableAnimated;
|
import mezz.jei.api.gui.IDrawableAnimated;
|
||||||
|
@ -11,6 +9,8 @@ import techreborn.api.recipe.ScrapboxRecipe;
|
||||||
import techreborn.client.gui.GuiCompressor;
|
import techreborn.client.gui.GuiCompressor;
|
||||||
import techreborn.compat.jei.BaseRecipeWrapper;
|
import techreborn.compat.jei.BaseRecipeWrapper;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class ScrapboxRecipeWrapper extends BaseRecipeWrapper<ScrapboxRecipe> {
|
public class ScrapboxRecipeWrapper extends BaseRecipeWrapper<ScrapboxRecipe> {
|
||||||
private final IDrawableAnimated progress;
|
private final IDrawableAnimated progress;
|
||||||
|
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue