diff --git a/ToAddBack/1.9/recipes/RecipesBiomesOPlenty.java b/ToAddBack/1.9/recipes/RecipesBiomesOPlenty.java deleted file mode 100644 index aa0f1743d..000000000 --- a/ToAddBack/1.9/recipes/RecipesBiomesOPlenty.java +++ /dev/null @@ -1,82 +0,0 @@ -package techreborn.compat.recipes; - - -import biomesoplenty.api.block.BOPBlocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.event.FMLServerStartingEvent; -import net.minecraftforge.oredict.OreDictionary; -import techreborn.api.recipe.RecipeHandler; -import techreborn.api.recipe.machines.IndustrialSawmillRecipe; -import techreborn.compat.ICompatModule; -import techreborn.config.ConfigTechReborn; - -public class RecipesBiomesOPlenty implements ICompatModule { - @Override - public void preInit(FMLPreInitializationEvent event) { - - } - - @Override - public void init(FMLInitializationEvent event) { - if (ConfigTechReborn.AllowBOPRecipes) { - ItemStack pulpStack = OreDictionary.getOres("pulpWood").get(0); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPBlocks.log_0, 1, 0), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(BOPBlocks.planks_0, 6, 0), pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPBlocks.log_0, 1, 0), new ItemStack(Items.water_bucket), null, new ItemStack(BOPBlocks.planks_0, 6, 0), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPBlocks.log_0, 1, 1), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(BOPBlocks.planks_0, 6, 1), pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPBlocks.log_0, 1, 1), new ItemStack(Items.water_bucket), null, new ItemStack(BOPBlocks.planks_0, 6, 1), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPBlocks.log_0, 1, 2), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(BOPBlocks.planks_0, 6, 2), pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPBlocks.log_0, 1, 2), new ItemStack(Items.water_bucket), null, new ItemStack(BOPBlocks.planks_0, 6, 2), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPBlocks.log_0, 1, 3), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(BOPBlocks.planks_0, 6, 3), pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPBlocks.log_0, 1, 3), new ItemStack(Items.water_bucket), null, new ItemStack(BOPBlocks.planks_0, 6, 3), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPBlocks.log_1, 1, 0), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(BOPBlocks.planks_0, 6, 4), pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPBlocks.log_1, 1, 0), new ItemStack(Items.water_bucket), null, new ItemStack(BOPBlocks.planks_0, 6, 4), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPBlocks.log_1, 1, 1), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(BOPBlocks.planks_0, 6, 5), pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPBlocks.log_1, 1, 1), new ItemStack(Items.water_bucket), null, new ItemStack(BOPBlocks.planks_0, 6, 5), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPBlocks.log_1, 1, 2), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(BOPBlocks.planks_0, 6, 6), pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPBlocks.log_1, 1, 2), new ItemStack(Items.water_bucket), null, new ItemStack(BOPBlocks.planks_0, 6, 6), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPBlocks.log_1, 1, 3), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(BOPBlocks.planks_0, 6, 7), pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPBlocks.log_1, 1, 3), new ItemStack(Items.water_bucket), null, new ItemStack(BOPBlocks.planks_0, 6, 7), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPBlocks.log_2, 1, 0), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(BOPBlocks.planks_0, 6, 8), pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPBlocks.log_2, 1, 0), new ItemStack(Items.water_bucket), null, new ItemStack(BOPBlocks.planks_0, 6, 8), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPBlocks.log_2, 1, 1), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(BOPBlocks.planks_0, 6, 9), pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPBlocks.log_2, 1, 1), new ItemStack(Items.water_bucket), null, new ItemStack(BOPBlocks.planks_0, 6, 9), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPBlocks.log_3, 1, 0), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(BOPBlocks.planks_0, 6, 11), pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPBlocks.log_3, 1, 0), new ItemStack(Items.water_bucket), null, new ItemStack(BOPBlocks.planks_0, 6, 11), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPBlocks.log_3, 1, 1), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(BOPBlocks.planks_0, 6, 12), pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPBlocks.log_3, 1, 1), new ItemStack(Items.water_bucket), null, new ItemStack(BOPBlocks.planks_0, 6, 12), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPBlocks.log_3, 1, 2), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(BOPBlocks.planks_0, 6, 13), pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPBlocks.log_3, 1, 2), new ItemStack(Items.water_bucket), null, new ItemStack(BOPBlocks.planks_0, 6, 13), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPBlocks.log_3, 1, 3), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(BOPBlocks.planks_0, 6, 14), pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPBlocks.log_3, 1, 3), new ItemStack(Items.water_bucket), null, new ItemStack(BOPBlocks.planks_0, 6, 14), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - } - } - - @Override - public void postInit(FMLPostInitializationEvent event) { - - } - - @Override - public void serverStarting(FMLServerStartingEvent event) { - - } -} diff --git a/ToAddBack/1.9/recipes/RecipesBuildcraft.java b/ToAddBack/1.9/recipes/RecipesBuildcraft.java deleted file mode 100644 index 337fc193c..000000000 --- a/ToAddBack/1.9/recipes/RecipesBuildcraft.java +++ /dev/null @@ -1,71 +0,0 @@ -package techreborn.compat.recipes; - -import buildcraft.BuildCraftBuilders; -import buildcraft.api.fuels.IFuel; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.event.FMLServerStartingEvent; -import net.minecraftforge.oredict.OreDictionary; -import reborncore.api.fuel.FluidPowerManager; -import reborncore.common.powerSystem.PowerSystem; -import reborncore.common.util.CraftingHelper; -import reborncore.common.util.RecipeRemover; -import techreborn.Core; -import techreborn.api.TechRebornAPI; -import techreborn.compat.ICompatModule; - -public class RecipesBuildcraft implements ICompatModule { - - public static Block quarryBlock; - - public static void removeRecipes() { - RecipeRemover.removeAnyRecipe(new ItemStack( - quarryBlock)); - } - - public static void addRecipies() { - Item drill = TechRebornAPI.recipeCompact.getItem("diamondDrill").getItem(); - ItemStack drillStack = new ItemStack(drill, 1, OreDictionary.WILDCARD_VALUE); - //Quarry - CraftingHelper.addShapedOreRecipe(new ItemStack(quarryBlock), new Object[] - { - "IAI", "GIG", "DED", - 'I', "gearIron", - 'G', "gearGold", - 'D', "gearDiamond", - 'A', TechRebornAPI.recipeCompact.getItem("advancedCircuit"), - 'E', drillStack - } - ); - } - - @Override - public void preInit(FMLPreInitializationEvent event) { - - } - - @Override - public void init(FMLInitializationEvent event) { - - } - - @Override - public void postInit(FMLPostInitializationEvent event) { - Core.logHelper.info("Trying to change the quarry recipe"); - quarryBlock = BuildCraftBuilders.quarryBlock; - removeRecipes(); - addRecipies(); - for (IFuel fuel : buildcraft.energy.fuels.FuelManager.INSTANCE.getFuels()) { - FluidPowerManager.fluidPowerValues.put(fuel.getFluid(), (double) fuel.getPowerPerCycle() / PowerSystem.euPerRF); - } - } - - @Override - public void serverStarting(FMLServerStartingEvent event) { - - } -} diff --git a/ToAddBack/1.9/recipes/RecipesThaumcraft.java b/ToAddBack/1.9/recipes/RecipesThaumcraft.java deleted file mode 100644 index c9f655a2f..000000000 --- a/ToAddBack/1.9/recipes/RecipesThaumcraft.java +++ /dev/null @@ -1,53 +0,0 @@ -package techreborn.compat.recipes; - -import ic2.api.item.IC2Items; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.event.FMLServerStartingEvent; -import net.minecraftforge.oredict.OreDictionary; -import techreborn.api.recipe.RecipeHandler; -import techreborn.api.recipe.machines.IndustrialSawmillRecipe; -import techreborn.compat.ICompatModule; -import thaumcraft.api.blocks.BlocksTC; - -public class RecipesThaumcraft implements ICompatModule { - @Override - public void preInit(FMLPreInitializationEvent event) { - - - } - - @Override - public void init(FMLInitializationEvent event) { - ItemStack pulpStack = OreDictionary.getOres("pulpWood").get(0); - //ItemStack greatWoodStack = BlocksTC.getBlock("blockWoodenDevice", 6); - ItemStack greatWoodStack = null; - //SOMEONE WHO KNOWS TC FIX THIS -// greatWoodStack.stackSize = 6; - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BlocksTC.log), null, new FluidStack(FluidRegistry.WATER, 1000), greatWoodStack, pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BlocksTC.log), IC2Items.getItem("waterCell"), null, greatWoodStack, pulpStack, IC2Items.getItem("cell"), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BlocksTC.log), new ItemStack(Items.water_bucket), null, greatWoodStack, pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - - //ItemStack silverWoodStack = ItemApi.getBlock("blockWoodenDevice", 7); - ItemStack silverWoodStack = null; - //silverWoodStack.stackSize = 6; - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BlocksTC.log, 1), null, new FluidStack(FluidRegistry.WATER, 1000), silverWoodStack, pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BlocksTC.log, 1), IC2Items.getItem("waterCell"), null, silverWoodStack, pulpStack, IC2Items.getItem("cell"), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BlocksTC.log, 1), new ItemStack(Items.water_bucket), null, silverWoodStack, pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - } - - @Override - public void postInit(FMLPostInitializationEvent event) { - - } - - @Override - public void serverStarting(FMLServerStartingEvent event) { - - } -} \ No newline at end of file diff --git a/ToAddBack/compat/ee3/CommandCustomLoad.java b/ToAddBack/compat/ee3/CommandCustomLoad.java deleted file mode 100644 index 7d619f545..000000000 --- a/ToAddBack/compat/ee3/CommandCustomLoad.java +++ /dev/null @@ -1,4 +0,0 @@ -package techreborn.compat.ee3; - -public class CommandCustomLoad { -} diff --git a/ToAddBack/compat/ee3/CommandRegen.java b/ToAddBack/compat/ee3/CommandRegen.java deleted file mode 100644 index 3bce2214d..000000000 --- a/ToAddBack/compat/ee3/CommandRegen.java +++ /dev/null @@ -1,59 +0,0 @@ -package techreborn.compat.ee3; - -import com.pahimar.ee3.command.CommandSyncEnergyValues; -import com.pahimar.ee3.exchange.DynamicEnergyValueInitThread; -import com.pahimar.ee3.exchange.EnergyValueRegistry; -import com.pahimar.ee3.reference.Reference; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraft.command.CommandBase; -import net.minecraft.command.ICommandSender; -import net.minecraft.util.ChatComponentText; - -import java.io.File; - -public class CommandRegen extends CommandBase { - - public static final String EE3_ENERGYVALUES_DIR = - FMLCommonHandler.instance().getMinecraftServerInstance().getEntityWorld().getSaveHandler().getWorldDirectory() - + File.separator + "data" + File.separator - + Reference.LOWERCASE_MOD_ID + File.separator - + "energyvalues"; - - @Override - public String getCommandName() { - return "eeregen"; - } - - @Override - public int getRequiredPermissionLevel() { - return 4; - } - - @Override - public String getCommandUsage(ICommandSender commandSender) { - return ""; - } - - @Override - public void processCommand(ICommandSender commandSender, String[] args) { - commandSender.addChatMessage(new ChatComponentText("Regening EMC Values...")); - File energyValuesDirectory = new File(EE3_ENERGYVALUES_DIR); - - if (energyValuesDirectory.exists() && energyValuesDirectory.isDirectory()) { - File[] files = energyValuesDirectory.listFiles(); - for (File f : files) { - if (f.getName().toLowerCase().contains(".gz")) { - f.delete(); - commandSender.addChatMessage(new ChatComponentText("Deleted " + f.getName())); - } - - } - } - commandSender.addChatMessage(new ChatComponentText("Regening EMC Values")); - DynamicEnergyValueInitThread.initEnergyValueRegistry(); - EnergyValueRegistry.getInstance().setShouldRegenNextRestart(false); - EnergyValueRegistry.getInstance().save(); - commandSender.addChatMessage(new ChatComponentText("Syncing all EMC Values")); - new CommandSyncEnergyValues().processCommand(commandSender, args); - } -} diff --git a/ToAddBack/compat/ee3/CommandReload.java b/ToAddBack/compat/ee3/CommandReload.java deleted file mode 100644 index 637d971b0..000000000 --- a/ToAddBack/compat/ee3/CommandReload.java +++ /dev/null @@ -1,54 +0,0 @@ -package techreborn.compat.ee3; - -import com.pahimar.ee3.exchange.DynamicEnergyValueInitThread; -import com.pahimar.ee3.exchange.EnergyValueRegistry; -import com.pahimar.ee3.reference.Files; -import com.pahimar.ee3.reference.Reference; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraft.command.CommandBase; -import net.minecraft.command.ICommandSender; -import net.minecraft.util.ChatComponentText; - -import java.io.File; - -public class CommandReload extends CommandBase { - - public static final String EE3_ENERGYVALUES_DIR = - FMLCommonHandler.instance().getMinecraftServerInstance().getEntityWorld().getSaveHandler().getWorldDirectory() - + File.separator + "data" + File.separator - + Reference.LOWERCASE_MOD_ID + File.separator - + "energyvalues"; - - @Override - public String getCommandName() { - return "eerelaod"; - } - - @Override - public int getRequiredPermissionLevel() { - return 4; - } - - @Override - public String getCommandUsage(ICommandSender commandSender) { - return ""; - } - - @Override - public void processCommand(ICommandSender commandSender, String[] args) { - commandSender.addChatMessage(new ChatComponentText("Reloading EMC Values...")); - File energyValuesDirectory = new File(EE3_ENERGYVALUES_DIR); - - if (energyValuesDirectory.exists() && energyValuesDirectory.isDirectory()) { - File staticValues = new File(energyValuesDirectory, Files.STATIC_ENERGY_VALUES_JSON); - commandSender.addChatMessage(new ChatComponentText("Looking for " + staticValues.getName())); - if (staticValues.exists()) { - commandSender.addChatMessage(new ChatComponentText("Found static values, reloading from disk!")); - } else { - commandSender.addChatMessage(new ChatComponentText("Will now recompute all values!!")); - } - } - DynamicEnergyValueInitThread.initEnergyValueRegistry(); - EnergyValueRegistry.getInstance().setShouldRegenNextRestart(false); - } -} \ No newline at end of file diff --git a/ToAddBack/compat/ee3/EmcValues.java b/ToAddBack/compat/ee3/EmcValues.java deleted file mode 100644 index 729b27e47..000000000 --- a/ToAddBack/compat/ee3/EmcValues.java +++ /dev/null @@ -1,94 +0,0 @@ -package techreborn.compat.ee3; - -import com.pahimar.ee3.api.exchange.EnergyValue; -import com.pahimar.ee3.api.exchange.EnergyValueRegistryProxy; -import com.pahimar.ee3.api.exchange.RecipeRegistryProxy; -import com.pahimar.ee3.exchange.EnergyValueRegistry; -import com.pahimar.ee3.exchange.OreStack; -import com.pahimar.ee3.exchange.WrappedStack; -import net.minecraftforge.fml.common.Loader; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.event.FMLServerStartingEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; -import techreborn.api.recipe.IBaseRecipeType; -import techreborn.api.recipe.RecipeHandler; -import techreborn.compat.ICompatModule; -import techreborn.items.ItemParts; -import techreborn.items.ItemPlates; - -public class EmcValues implements ICompatModule { - - - @Override - public void preInit(FMLPreInitializationEvent event) { - - } - - @Override - public void init(FMLInitializationEvent event) { - for (IBaseRecipeType recipeType : RecipeHandler.recipeList) { - if (recipeType.getOutputsSize() == 1) { - RecipeRegistryProxy.addRecipe(recipeType.getOutput(0), recipeType.getInputs()); - } - } - } - - @Override - public void postInit(FMLPostInitializationEvent event) { - if (!Loader.isModLoaded("EE3Compatibility")) { - MinecraftForge.EVENT_BUS.register(this); - addOre("ingotCopper", 128); - addOre("ingotSilver", 1024); - addOre("ingotTin", 256); - addOre("ingotLead", 256); - addOre("dustSteel", 512); - addOre("ingotRefinedIron", 512); - addOre("dustCoal", 32); - addOre("dustDiamond", 8192); - addOre("dustSulfur", 32); - addOre("dustLead", 256); - addOre("ingotBronze", 256); - addOre("ingotElectrum", 2052); - addOre("dustLapis", 864); - addOre("dustSilver", 1024); - addOre("dustTin", 256); - } - - addStack(ItemPlates.getPlateByName("steel"), 512); - addStack(ItemParts.getPartByName("lazuriteChunk"), 7776); - } - - @Override - public void serverStarting(FMLServerStartingEvent event) { - event.registerServerCommand(new CommandRegen()); - event.registerServerCommand(new CommandReload()); - } - - @SubscribeEvent - public void serverTick(TickEvent.ServerTickEvent event) { - //This should be a fix for the things not saving - EnergyValueRegistry.getInstance().setShouldRegenNextRestart(false); - } - - private void addOre(String name, float value) { - WrappedStack stack = WrappedStack.wrap(new OreStack(name)); - EnergyValue energyValue = new EnergyValue(value); - - EnergyValueRegistryProxy.addPreAssignedEnergyValue(stack, energyValue); - } - - - private void addStack(ItemStack itemStack, float value) { - WrappedStack stack = WrappedStack.wrap(itemStack); - EnergyValue energyValue = new EnergyValue(value); - - EnergyValueRegistryProxy.addPreAssignedEnergyValue(stack, energyValue); - } - - -} diff --git a/ToAddBack/compat/recipes/RecipesForestry.java b/ToAddBack/compat/recipes/RecipesForestry.java deleted file mode 100644 index b6f8ae5be..000000000 --- a/ToAddBack/compat/recipes/RecipesForestry.java +++ /dev/null @@ -1,74 +0,0 @@ -package techreborn.compat.recipes; - -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.event.FMLServerStartingEvent; -import forestry.api.arboriculture.EnumWoodType; -import forestry.api.arboriculture.TreeManager; -import forestry.api.fuels.FuelManager; -import forestry.api.fuels.GeneratorFuel; -import ic2.api.item.IC2Items; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; -import reborncore.api.fuel.FluidPowerManager; -import techreborn.api.recipe.RecipeHandler; -import techreborn.api.recipe.machines.IndustrialSawmillRecipe; -import techreborn.compat.ICompatModule; -import techreborn.config.ConfigTechReborn; - -import java.util.Iterator; -import java.util.Map; - -public class RecipesForestry implements ICompatModule { - @Override - public void preInit(FMLPreInitializationEvent event) { - } - - @Override - public void init(FMLInitializationEvent event) { - - } - - @Override - public void postInit(FMLPostInitializationEvent event) { - if (ConfigTechReborn.AllowForestryRecipes) { - ItemStack pulpStack = OreDictionary.getOres("pulpWood").get(0); - for (EnumWoodType woodType : EnumWoodType.VALUES) { - ItemStack log = TreeManager.woodItemAccess.getLog(woodType, true); - log.stackSize = 1; - ItemStack plank = TreeManager.woodItemAccess.getPlanks(woodType, true); - plank.stackSize = 6; - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(log, null, new FluidStack(FluidRegistry.WATER, 1000), plank, pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(log, IC2Items.getItem("waterCell"), null, plank, pulpStack, IC2Items.getItem("cell"), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(log, new ItemStack(Items.water_bucket), null, plank, pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - - log = TreeManager.woodItemAccess.getLog(woodType, false); - log.stackSize = 1; - plank = TreeManager.woodItemAccess.getPlanks(woodType, false); - plank.stackSize = 6; - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(log, null, new FluidStack(FluidRegistry.WATER, 1000), plank, pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(log, IC2Items.getItem("waterCell"), null, plank, pulpStack, IC2Items.getItem("cell"), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(log, new ItemStack(Items.water_bucket), null, plank, pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - } - } - - Iterator entries = FuelManager.generatorFuel.entrySet().iterator(); - while (entries.hasNext()) { - Map.Entry thisEntry = (Map.Entry) entries.next(); - Fluid fluid = (Fluid) thisEntry.getKey(); - GeneratorFuel generatorFuel = (GeneratorFuel) thisEntry.getValue(); - FluidPowerManager.fluidPowerValues.put(fluid, (double) (generatorFuel.eu / generatorFuel.rate)); - } - } - - @Override - public void serverStarting(FMLServerStartingEvent event) { - - } -} - diff --git a/ToAddBack/compat/recipes/RecipesIC2.java b/ToAddBack/compat/recipes/RecipesIC2.java deleted file mode 100644 index 1ffaf3a85..000000000 --- a/ToAddBack/compat/recipes/RecipesIC2.java +++ /dev/null @@ -1,1392 +0,0 @@ -package techreborn.compat.recipes; - -import net.minecraftforge.fml.common.Loader; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.event.FMLServerStartingEvent; -import net.minecraftforge.fml.common.registry.GameRegistry; -import ic2.api.info.IC2Classic; -import ic2.api.item.IC2Items; -import ic2.api.recipe.RecipeInputOreDict; -import ic2.api.recipe.RecipeOutput; -import ic2.api.recipe.Recipes; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; -import reborncore.common.util.CraftingHelper; -import reborncore.common.util.OreUtil; -import reborncore.common.util.RecipeRemover; -import techreborn.Core; -import techreborn.api.reactor.FusionReactorRecipe; -import techreborn.api.reactor.FusionReactorRecipeHelper; -import techreborn.api.recipe.RecipeHandler; -import techreborn.api.recipe.machines.*; -import techreborn.compat.CompatManager; -import techreborn.compat.ICompatModule; -import techreborn.config.ConfigTechReborn; -import techreborn.init.ModBlocks; -import techreborn.init.ModFluids; -import techreborn.init.ModItems; -import techreborn.items.*; - -import java.util.ArrayList; -import java.util.List; - -public class RecipesIC2 implements ICompatModule { - - @Override - public void preInit(FMLPreInitializationEvent event) { - - } - - @Override - public void init(FMLInitializationEvent event) { - removeIc2Recipes(); - addShappedIc2Recipes(); - addTRMaceratorRecipes(); - addTROreWashingRecipes(); - addTRThermalCentrifugeRecipes(); - addMetalFormerRecipes(); - addTRRecipes(); - - FusionReactorRecipeHelper.registerRecipe(new FusionReactorRecipe(ItemCells.getCellByName("wolframium"), ItemCells.getCellByName("lithium"), IC2Items.getItem("iridiumOre"), 90000000, -2048, 1024)); - } - - @Override - public void postInit(FMLPostInitializationEvent event) { - //Has to be done later, not sure why - RecipeRemover.removeAnyRecipe(IC2Items.getItem("iridiumPlate")); - } - - @Override - public void serverStarting(FMLServerStartingEvent event) { - - } - - public void addTRRecipes() { - //General - CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.manuel), IC2Items.getItem("plateiron"), Items.book); - - CraftingHelper.addShapedOreRecipe( - ItemParts.getPartByName("machineParts", 16), - "CSC", "SCS", "CSC", - 'S', "ingotSteel", - 'C', IC2Items.getItem("electronicCircuit")); - - CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("energyFlowCircuit", 4), - "ATA", "LIL", "ATA", - 'T', "plateTungsten", - 'I', "plateIridium", - 'A', IC2Items.getItem("advancedCircuit"), - 'L', IC2Items.getItem("lapotronCrystal")); - - CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("superconductor", 4), - "CCC", "TIT", "EEE", - 'E', ItemParts.getPartByName("energyFlowCircuit"), - 'C', ItemParts.getPartByName("heliumCoolantSimple"), - 'T', "ingotTungsten", - 'I', IC2Items.getItem("iridiumPlate")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.lapotronicOrb), - "LLL", "LPL", "LLL", - 'L', new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), - 'P', IC2Items.getItem("iridiumPlate")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.industrialSawmill), - "PAP", - "SSS", - "ACA", - 'P', IC2Items.getItem("pump"), - 'A', IC2Items.getItem("advancedCircuit"), - 'S', ItemParts.getPartByName("diamondSawBlade"), - 'C', IC2Items.getItem("advancedMachine")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ComputerCube), - "DME", "MAM", "EMD", - 'E', ItemParts.getPartByName("energyFlowCircuit"), - 'D', ItemParts.getPartByName("dataOrb"), - 'M', ItemParts.getPartByName("computerMonitor"), - 'A', IC2Items.getItem("advancedMachine")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MatterFabricator), - "ETE", "AOA", "ETE", - 'E', ItemParts.getPartByName("energyFlowCircuit"), - 'T', IC2Items.getItem("teleporter"), - 'A', ModBlocks.HighAdvancedMachineBlock, - 'O', ModItems.lapotronicOrb); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.thermalGenerator), - "III", "IHI", "CGC", - 'I', "plateInvar", - 'H', IC2Items.getItem("reinforcedGlass"), - 'C', "circuitBasic", - 'G', new ItemStack(ModBlocks.heatGenerator)); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.thermalGenerator), - "AAA", "AHA", "CGC", - 'A', "plateAluminum", - 'H', IC2Items.getItem("reinforcedGlass"), - 'C', "circuitBasic", - 'G', new ItemStack(ModBlocks.heatGenerator)); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.heatGenerator), - "III", "IHI", "CGC", - 'I', "plateIron", - 'H', new ItemStack(Blocks.iron_bars), - 'C', "circuitBasic", - 'G', IC2Items.getItem("geothermalGenerator")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Gasturbine), - "IAI", "WGW", "IAI", - 'I', "plateInvar", - 'A', IC2Items.getItem("advancedCircuit"), - 'W', IC2Items.getItem("windMill"), - 'G', IC2Items.getItem("reinforcedGlass")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Gasturbine), - "IAI", "WGW", "IAI", - 'I', "plateAluminum", - 'A', IC2Items.getItem("advancedCircuit"), - 'W', IC2Items.getItem("windMill"), - 'G', IC2Items.getItem("reinforcedGlass")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Semifluidgenerator), - "III", "IHI", "CGC", - 'I', "plateIron", - 'H', IC2Items.getItem("reinforcedGlass"), - 'C', "circuitBasic", - 'G', IC2Items.getItem("generator")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Semifluidgenerator), - "AAA", "AHA", "CGC", - 'A', "plateAluminum", - 'H', IC2Items.getItem("reinforcedGlass"), - 'C', "circuitBasic", - 'G', IC2Items.getItem("generator")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.DieselGenerator), - "III", "I I", "CGC", - 'I', "plateIron", - 'C', "circuitBasic", - 'G', IC2Items.getItem("generator")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.DieselGenerator), - "AAA", "A A", "CGC", - 'A', "plateAluminum", - 'C', "circuitBasic", - 'G', IC2Items.getItem("generator")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MagicalAbsorber), - "CSC", "IBI", "CAC", - 'C', "circuitMaster", - 'S', "craftingSuperconductor", - 'B', Blocks.beacon, - 'A', ModBlocks.Magicenergeyconverter, - 'I', IC2Items.getItem("iridiumPlate")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Magicenergeyconverter), - "CTC", "PBP", "CLC", - 'C', "circuitAdvanced", - 'P', "platePlatinum", - 'B', Blocks.beacon, - 'L', IC2Items.getItem("lapotronCrystal"), - 'T', IC2Items.getItem("teleporter")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Dragoneggenergysiphoner), - "CTC", "ISI", "CBC", - 'I', IC2Items.getItem("iridiumPlate"), - 'C', "circuitMaster", - 'B', "batteryUltimate", - 'S', ModBlocks.Supercondensator, - 'T', IC2Items.getItem("teleporter")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.centrifuge), - "SCS", "BEB", "SCS", - 'S', "plateSteel", - 'C', "circuitAdvanced", - 'B', IC2Items.getItem("advancedMachine"), - 'E', IC2Items.getItem("extractor")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.IndustrialElectrolyzer), - "SXS", "CEC", "SMS", - 'S', "plateSteel", - 'C', "circuitAdvanced", - 'X', IC2Items.getItem("extractor"), - 'E', IC2Items.getItem("electrolyzer"), - 'M', IC2Items.getItem("magnetizer")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.BlastFurnace), - "CHC", "HBH", "FHF", - 'H', new ItemStack(ModItems.parts, 1, 17), - 'C', "circuitAdvanced", - 'B', IC2Items.getItem("advancedMachine"), - 'F', IC2Items.getItem("inductionFurnace")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Grinder), - "ECP", "GGG", "CBC", - 'E', ModBlocks.IndustrialElectrolyzer, - 'P', IC2Items.getItem("pump"), - 'C', "circuitAdvanced", - 'B', IC2Items.getItem("advancedMachine"), - 'G', "craftingGrinder"); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ImplosionCompressor), - "ABA", "CPC", "ABA", - 'A', IC2Items.getItem("advancedAlloy"), - 'C', "circuitAdvanced", - 'B', IC2Items.getItem("advancedMachine"), - 'P', IC2Items.getItem("compressor")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.VacuumFreezer), - "SPS", "CGC", "SPS", - 'S', "plateSteel", - 'C', "circuitAdvanced", - 'G', IC2Items.getItem("reinforcedGlass"), - 'P', IC2Items.getItem("pump")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Distillationtower), - "CMC", "PBP", "EME", - 'E', ModBlocks.IndustrialElectrolyzer, - 'M', "circuitMaster", - 'B', IC2Items.getItem("advancedMachine"), - 'C', ModBlocks.centrifuge, - 'P', IC2Items.getItem("pump")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.AlloyFurnace), - "III", "F F", "III", - 'I', "plateIron", - 'F', IC2Items.getItem("ironFurnace")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ChemicalReactor), - "IMI", "CPC", "IEI", - 'I', "plateInvar", - 'C', "circuitAdvanced", - 'M', IC2Items.getItem("magnetizer"), - 'P', IC2Items.getItem("compressor"), - 'E', IC2Items.getItem("extractor")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ChemicalReactor), - "AMA", "CPC", "AEA", - 'A', "plateAluminum", - 'C', "circuitAdvanced", - 'M', IC2Items.getItem("magnetizer"), - 'P', IC2Items.getItem("compressor"), - 'E', IC2Items.getItem("extractor")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.RollingMachine), - "PCP", "MBM", "PCP", - 'P', "craftingPiston", - 'C', "circuitAdvanced", - 'M', IC2Items.getItem("compressor"), - 'B', IC2Items.getItem("machine")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ElectricCraftingTable), - "ITI", "IBI", "ICI", - 'I', "plateIron", - 'C', "circuitAdvanced", - 'T', "crafterWood", - 'B', IC2Items.getItem("machine")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ElectricCraftingTable), - "ATA", "ABA", "ACA", - 'A', "plateAluminum", - 'C', "circuitAdvanced", - 'T', "crafterWood", - 'B', IC2Items.getItem("machine")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ChunkLoader), - "SCS", "CMC", "SCS", - 'S', "plateSteel", - 'C', "circuitMaster", - 'M', new ItemStack(ModItems.parts, 1, 39)); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Lesu), - " L ", "CBC", " M ", - 'L', IC2Items.getItem("lvTransformer"), - 'C', "circuitAdvanced", - 'M', IC2Items.getItem("mvTransformer"), - 'B', ModBlocks.LesuStorage); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.HighAdvancedMachineBlock), - "CTC", "TBT", "CTC", - 'C', "plateChrome", - 'T', "plateTitanium", - 'B', IC2Items.getItem("advancedMachine")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MachineCasing, 4, 0), - "III", "CBC", "III", - 'I', "plateIron", - 'C', "circuitBasic", - 'B', IC2Items.getItem("machine")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MachineCasing, 4, 1), - "SSS", "CBC", "SSS", - 'S', "plateSteel", - 'C', "circuitAdvanced", - 'B', IC2Items.getItem("advancedMachine")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MachineCasing, 4, 2), - "HHH", "CBC", "HHH", - 'H', "plateChrome", - 'C', "circuitElite", - 'B', ModBlocks.HighAdvancedMachineBlock); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.quantumChest), - "DCD", "ATA", "DQD", - 'D', ItemParts.getPartByName("dataOrb"), - 'C', ItemParts.getPartByName("computerMonitor"), - 'A', ModBlocks.HighAdvancedMachineBlock, - 'Q', ModBlocks.digitalChest, - 'T', IC2Items.getItem("teleporter")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.PlasmaGenerator), - "PPP", "PTP", "CGC", - 'P', ItemPlates.getPlateByName("tungstensteel"), - 'T', IC2Items.getItem("hvTransformer"), - 'G', IC2Items.getItem("generator"), - 'C', ItemParts.getPartByName("energyFlowCircuit") - ); - - - //Smetling - GameRegistry.addSmelting(ItemDusts.getDustByName("copper", 1), IC2Items.getItem("copperIngot"), 1F); - GameRegistry.addSmelting(ItemDusts.getDustByName("tin", 1), IC2Items.getItem("tinIngot"), 1F); - GameRegistry.addSmelting(ItemDusts.getDustByName("bronze", 1), IC2Items.getItem("bronzeIngot"), 1F); - GameRegistry.addSmelting(ItemDusts.getDustByName("lead", 1), IC2Items.getItem("leadIngot"), 1F); - GameRegistry.addSmelting(ItemDusts.getDustByName("silver", 1), IC2Items.getItem("silverIngot"), 1F); - - //Saw mill - ItemStack pulpStack = OreDictionary.getOres("pulpWood").get(0); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.log, 1, 0), IC2Items.getItem("waterCell"), null, new ItemStack(Blocks.planks, 6, 0), pulpStack, IC2Items.getItem("cell"), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.log, 1, 0), IC2Items.getItem("waterCell"), null, new ItemStack(Blocks.planks, 6, 0), pulpStack, IC2Items.getItem("cell"), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.log, 1, 2), IC2Items.getItem("waterCell"), null, new ItemStack(Blocks.planks, 6, 2), pulpStack, IC2Items.getItem("cell"), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.log, 1, 3), IC2Items.getItem("waterCell"), null, new ItemStack(Blocks.planks, 6, 3), pulpStack, IC2Items.getItem("cell"), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.log2, 1, 0), IC2Items.getItem("waterCell"), null, new ItemStack(Blocks.planks, 6, 4), pulpStack, IC2Items.getItem("cell"), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.log2, 1, 1), IC2Items.getItem("waterCell"), null, new ItemStack(Blocks.planks, 6, 5), pulpStack, IC2Items.getItem("cell"), 200, 30, false)); - - //UU - if (ConfigTechReborn.UUrecipesIridiamOre) - CraftingHelper.addShapedOreRecipe((IC2Items.getItem("iridiumOre")), - "UUU", - " U ", - "UUU", - 'U', ModItems.uuMatter); - - - //Blast Furnace - RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemCells.getCellByName("silicon", 2), null, ItemPlates.getPlateByName("silicon"), new ItemStack(IC2Items.getItem("cell").getItem(), 2), 1000, 120, 1500)); - - //CentrifugeRecipes - - //Plantball/Bio Chaff - if (!IC2Classic.isIc2ClassicLoaded()) { - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Blocks.grass, 16), null, new ItemStack(IC2Items.getItem("biochaff").getItem(), 8), new ItemStack(IC2Items.getItem("plantBall").getItem(), 8), new ItemStack(Items.clay_ball), new ItemStack(Blocks.sand, 8), 2500, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Blocks.dirt, 16), null, new ItemStack(IC2Items.getItem("biochaff").getItem(), 4), new ItemStack(IC2Items.getItem("plantBall").getItem(), 4), new ItemStack(Items.clay_ball), new ItemStack(Blocks.sand, 8), 2500, 5)); - } - - //Methane - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.mushroom_stew, 16), IC2Items.getItem("cell"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.apple, 32), IC2Items.getItem("cell"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.porkchop, 12), IC2Items.getItem("cell"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.cooked_porkchop, 16), IC2Items.getItem("cell"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.bread, 64), IC2Items.getItem("cell"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.fish, 12), IC2Items.getItem("cell"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.cooked_fished, 16), IC2Items.getItem("cell"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.beef, 12), IC2Items.getItem("cell"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.cooked_beef, 16), IC2Items.getItem("cell"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Blocks.pumpkin, 16), IC2Items.getItem("cell"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.speckled_melon, 1), IC2Items.getItem("cell"), ItemCells.getCellByName("methane", 1), new ItemStack(Items.gold_nugget, 6), null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.spider_eye, 32), IC2Items.getItem("cell"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.chicken, 12), IC2Items.getItem("cell"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.cooked_chicken, 16), IC2Items.getItem("cell"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.rotten_flesh, 16), IC2Items.getItem("cell"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.melon, 64), IC2Items.getItem("cell"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.cookie, 64), IC2Items.getItem("cell"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.cake, 8), IC2Items.getItem("cell"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.golden_carrot, 1), IC2Items.getItem("cell"), ItemCells.getCellByName("methane", 1), new ItemStack(Items.gold_nugget, 6), null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.carrot, 16), IC2Items.getItem("cell"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.baked_potato, 24), IC2Items.getItem("cell"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.potato, 16), IC2Items.getItem("cell"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.poisonous_potato, 12), IC2Items.getItem("cell"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.nether_wart, 1), IC2Items.getItem("cell"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(IC2Items.getItem("terraWart").getItem(), 16), IC2Items.getItem("cell"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Blocks.brown_mushroom, 1), IC2Items.getItem("cell"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Blocks.red_mushroom, 1), IC2Items.getItem("cell"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - - //Rubber Wood Yields - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(IC2Items.getItem("rubberWood").getItem(), 15), new ItemStack(IC2Items.getItem("cell").getItem(), 5), new ItemStack(IC2Items.getItem("resin").getItem(), 8), new ItemStack(IC2Items.getItem("plantBall").getItem(), 6), ItemCells.getCellByName("methane", 1), ItemCells.getCellByName("carbon", 4), 5000, 5)); - - //Soul Sand Byproducts - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Blocks.soul_sand, 16), IC2Items.getItem("cell"), ItemCells.getCellByName("oil", 1), ItemDusts.getDustByName("saltpeter", 4), ItemDusts.getDustByName("coal", 1), new ItemStack(Blocks.sand, 10), 2500, 5)); - - //Ice - RecipeHandler.addRecipe(new CentrifugeRecipe(ItemCells.getCellByName("ice", 1), null, new ItemStack(Blocks.ice, 1), IC2Items.getItem("cell"), null, null, 40, 5)); - - - //Dust Byproducts - - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.glowstone_dust, 16), IC2Items.getItem("cell"), new ItemStack(Items.redstone, 8), ItemDusts.getDustByName("gold", 8), ItemCells.getCellByName("helium", 1), null, 25000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("phosphorous", 5), new ItemStack(IC2Items.getItem("cell").getItem(), 3), ItemCells.getCellByName("calcium", 3), null, null, null, 1280, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("ashes", 1), IC2Items.getItem("cell"), ItemCells.getCellByName("carbon"), null, null, null, 80, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.redstone, 10), new ItemStack(IC2Items.getItem("cell").getItem(), 4), ItemCells.getCellByName("silicon", 1), ItemDusts.getDustByName("pyrite", 3), ItemDusts.getDustByName("ruby", 1), ItemCells.getCellByName("mercury", 3), 6800, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("endstone", 16), new ItemStack(IC2Items.getItem("cell").getItem(), 2), ItemCells.getCellByName("helium3", 1), ItemCells.getCellByName("helium"), ItemDustsSmall.getSmallDustByName("Tungsten", 1), new ItemStack(Blocks.sand, 12), 4800, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("cinnabar", 2), IC2Items.getItem("cell"), ItemCells.getCellByName("mercury", 1), ItemDusts.getDustByName("sulfur", 1), null, null, 80, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("flint", 1), null, IC2Items.getItem("silicondioxideDust"), null, null, null, 160, 5)); - - - //Deuterium/Tritium - RecipeHandler.addRecipe(new CentrifugeRecipe(ItemCells.getCellByName("helium", 16), null, ItemCells.getCellByName("deuterium", 1), new ItemStack(IC2Items.getItem("cell").getItem(), 15), null, null, 10000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(ItemCells.getCellByName("deuterium", 4), null, ItemCells.getCellByName("tritium", 1), new ItemStack(IC2Items.getItem("cell").getItem(), 3), null, null, 3000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(ItemCells.getCellByName("hydrogen", 4), null, ItemCells.getCellByName("deuterium", 1), new ItemStack(IC2Items.getItem("cell").getItem(), 3), null, null, 3000, 5)); - - //Lava Cell Byproducts - ItemStack lavaCells = IC2Items.getItem("lavaCell"); - lavaCells.stackSize = 8; - RecipeHandler.addRecipe(new CentrifugeRecipe(lavaCells, null, ItemNuggets.getNuggetByName("electrum", 4), ItemIngots.getIngotByName("copper", 2), ItemDustsSmall.getSmallDustByName("Tungsten", 1), ItemIngots.getIngotByName("tin", 2), 6000, 5)); - - //IndustrialGrinderRecipes - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.coal_ore, 1), IC2Items.getItem("waterCell"), null, new ItemStack(Items.coal, 1), ItemDustsSmall.getSmallDustByName("Coal", 6), ItemDustsSmall.getSmallDustByName("Coal", 2), IC2Items.getItem("cell"), 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.iron_ore, 1), IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("iron", 2), ItemDustsSmall.getSmallDustByName("Nickel", 1), ItemDustsSmall.getSmallDustByName("Tin", 1), IC2Items.getItem("cell"), 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.gold_ore, 1), IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("gold", 2), ItemDustsSmall.getSmallDustByName("Copper", 1), ItemDustsSmall.getSmallDustByName("Nickel", 1), IC2Items.getItem("cell"), 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.iron_ore, 1), ItemCells.getCellByName("sodiumPersulfate", 1), null, ItemDusts.getDustByName("iron", 2), ItemDusts.getDustByName("nickel", 1), ItemDustsSmall.getSmallDustByName("Tin", 1), IC2Items.getItem("cell"), 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.gold_ore, 1), ItemCells.getCellByName("sodiumPersulfate", 1), null, ItemDusts.getDustByName("gold", 2), ItemDusts.getDustByName("copper", 1), ItemDustsSmall.getSmallDustByName("Nickel", 1), IC2Items.getItem("cell"), 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.gold_ore, 1), ItemCells.getCellByName("mercury", 1), null, ItemDusts.getDustByName("gold", 3), ItemDustsSmall.getSmallDustByName("Copper", 1), ItemDustsSmall.getSmallDustByName("Nickel", 1), IC2Items.getItem("cell"), 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.diamond_ore, 1), IC2Items.getItem("waterCell"), null, new ItemStack(Items.diamond, 1), ItemDustsSmall.getSmallDustByName("Diamond", 6), ItemDustsSmall.getSmallDustByName("Coal", 2), IC2Items.getItem("cell"), 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.emerald_ore, 1), IC2Items.getItem("waterCell"), null, new ItemStack(Items.emerald, 1), ItemDustsSmall.getSmallDustByName("Emerald", 6), ItemDustsSmall.getSmallDustByName("Aluminum", 2), IC2Items.getItem("cell"), 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.redstone_ore, 1), IC2Items.getItem("waterCell"), null, new ItemStack(Items.redstone, 10), ItemDustsSmall.getSmallDustByName("Cinnabar", 1), ItemDustsSmall.getSmallDustByName("Glowstone", 1), IC2Items.getItem("cell"), 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.lapis_ore, 1), IC2Items.getItem("waterCell"), null, new ItemStack(Items.dye, 6, 4), ItemDustsSmall.getSmallDustByName("Lapis", 36), ItemDustsSmall.getSmallDustByName("Lazurite", 8), IC2Items.getItem("cell"), 100, 120)); - - - //Copper Ore - if (OreUtil.doesOreExistAndValid("oreCopper")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreCopper").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("copper", 2), ItemDustsSmall.getSmallDustByName("Gold", 1), ItemDustsSmall.getSmallDustByName("Nickel", 1), IC2Items.getItem("cell"), 100, 120)); - - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, ItemCells.getCellByName("sodiumPersulfate", 1), null, ItemDusts.getDustByName("copper", 2), ItemDusts.getDustByName("gold", 1), ItemDustsSmall.getSmallDustByName("Nickel", 1), IC2Items.getItem("cell"), 100, 120)); - - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, ItemCells.getCellByName("mercury", 1), null, ItemDusts.getDustByName("copper", 2), ItemDustsSmall.getSmallDustByName("Gold", 1), ItemDusts.getDustByName("nickel", 1), IC2Items.getItem("cell"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Copper Ore"); - } - } - - //Tin Ore - if (OreUtil.doesOreExistAndValid("oreTin")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreTin").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("tin", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDustsSmall.getSmallDustByName("Zinc", 1), IC2Items.getItem("cell"), 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, ItemCells.getCellByName("sodiumPersulfate", 1), null, ItemDusts.getDustByName("tin", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDusts.getDustByName("zinc", 1), IC2Items.getItem("cell"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Tin Ore"); - } - } - - //Nickel Ore - if (OreUtil.doesOreExistAndValid("oreNickel")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreNickel").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("nickel", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDustsSmall.getSmallDustByName("Platinum", 1), IC2Items.getItem("cell"), 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, ItemCells.getCellByName("sodiumPersulfate", 1), null, ItemDusts.getDustByName("nickel", 3), ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDustsSmall.getSmallDustByName("Platinum", 1), IC2Items.getItem("cell"), 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, ItemCells.getCellByName("mercury", 1), null, ItemDusts.getDustByName("nickel", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDusts.getDustByName("platinum", 1), IC2Items.getItem("cell"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Nickel Ore"); - } - } - - //Zinc Ore - if (OreUtil.doesOreExistAndValid("oreZinc")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreZinc").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("zinc", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDustsSmall.getSmallDustByName("Tin", 1), IC2Items.getItem("cell"), 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, ItemCells.getCellByName("sodiumPersulfate", 1), null, ItemDusts.getDustByName("zinc", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDusts.getDustByName("iron", 1), IC2Items.getItem("cell"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Zinc Ore"); - } - } - - //Silver Ore - if (OreUtil.doesOreExistAndValid("oreSilver")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreSilver").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("silver", 2), ItemDustsSmall.getSmallDustByName("Lead", 1), ItemDustsSmall.getSmallDustByName("Sulfur", 1), IC2Items.getItem("cell"), 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, ItemCells.getCellByName("mercury", 1), null, ItemDusts.getDustByName("silver", 3), ItemDustsSmall.getSmallDustByName("Lead", 1), ItemDustsSmall.getSmallDustByName("Sulfur", 1), IC2Items.getItem("cell"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Silver Ore"); - } - } - - //Lead Ore - if (OreUtil.doesOreExistAndValid("oreLead")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreLead").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("lead", 2), ItemDustsSmall.getSmallDustByName("Silver", 1), ItemDustsSmall.getSmallDustByName("Sulfur", 1), IC2Items.getItem("cell"), 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, ItemCells.getCellByName("mercury", 1), null, ItemDusts.getDustByName("lead", 2), ItemDusts.getDustByName("silver", 1), ItemDustsSmall.getSmallDustByName("Sulfur", 1), IC2Items.getItem("cell"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Lead Ore"); - } - } - - //Uranium Ore - if (OreUtil.doesOreExistAndValid("oreUranium")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreUranium").get(0); - ItemStack uranium238Stack = IC2Items.getItem("Uran238"); - uranium238Stack.stackSize = 8; - ItemStack uranium235Stack = IC2Items.getItem("smallUran235"); - uranium235Stack.stackSize = 2; - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000), uranium238Stack, uranium235Stack, null, null, 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, uranium238Stack, uranium235Stack, null, IC2Items.getItem("cell"), 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null, uranium238Stack, uranium235Stack, null, new ItemStack(Items.bucket), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Uranium Ore"); - } - } - - //Pitchblende Ore - if (OreUtil.doesOreExistAndValid("orePitchblende")) { - try { - ItemStack oreStack = OreDictionary.getOres("orePitchblende").get(0); - ItemStack uranium238Stack = IC2Items.getItem("Uran238"); - uranium238Stack.stackSize = 8; - ItemStack uranium235Stack = IC2Items.getItem("smallUran235"); - uranium235Stack.stackSize = 2; - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000), uranium238Stack, uranium235Stack, null, null, 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, uranium238Stack, uranium235Stack, null, IC2Items.getItem("cell"), 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null, uranium238Stack, uranium235Stack, null, new ItemStack(Items.bucket), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Uranium Ore"); - } - } - - //Aluminum Ore - if (OreUtil.doesOreExistAndValid("oreAluminum")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreAluminum").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("aluminum", 2), ItemDustsSmall.getSmallDustByName("Bauxite", 1), ItemDustsSmall.getSmallDustByName("Bauxite", 1), IC2Items.getItem("cell"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Lead Ore"); - } - } - - //Ardite Ore - if (OreUtil.doesOreExistAndValid("oreArdite")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreArdite").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("ardite", 2), ItemDustsSmall.getSmallDustByName("Ardite", 1), ItemDustsSmall.getSmallDustByName("Ardite", 1), IC2Items.getItem("cell"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Ardite Ore"); - } - } - - //Cobalt Ore - if (OreUtil.doesOreExistAndValid("oreCobalt")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreCobalt").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("cobalt", 2), ItemDustsSmall.getSmallDustByName("Cobalt", 1), ItemDustsSmall.getSmallDustByName("Cobalt", 1), IC2Items.getItem("cell"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Cobalt Ore"); - } - } - - //Dark Iron Ore - if (OreUtil.doesOreExistAndValid("oreDarkIron")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreDarkIron").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("darkIron", 2), ItemDustsSmall.getSmallDustByName("DarkIron", 1), ItemDustsSmall.getSmallDustByName("Iron", 1), IC2Items.getItem("cell"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Dark Iron Ore"); - } - } - - //Cadmium Ore - if (OreUtil.doesOreExistAndValid("oreCadmium")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreCadmium").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("cadmium", 2), ItemDustsSmall.getSmallDustByName("Cadmium", 1), ItemDustsSmall.getSmallDustByName("Cadmium", 1), IC2Items.getItem("cell"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Cadmium Ore"); - } - } - - //Indium Ore - if (OreUtil.doesOreExistAndValid("oreIndium")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreIndium").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("indium", 2), ItemDustsSmall.getSmallDustByName("Indium", 1), ItemDustsSmall.getSmallDustByName("Indium", 1), IC2Items.getItem("cell"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Indium Ore"); - } - } - - //Calcite Ore - if (OreUtil.doesOreExistAndValid("oreCalcite") && OreUtil.doesOreExistAndValid("gemCalcite")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreCalcite").get(0); - ItemStack gemStack = OreDictionary.getOres("gemCalcite").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, gemStack, ItemDustsSmall.getSmallDustByName("Calcite", 6), null, IC2Items.getItem("cell"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Calcite Ore"); - } - } - - //Magnetite Ore - if (OreUtil.doesOreExistAndValid("oreMagnetite") && OreUtil.doesOreExistAndValid("chunkMagnetite")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreMagnetite").get(0); - ItemStack chunkStack = OreDictionary.getOres("chunkMagnetite").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, chunkStack, ItemDustsSmall.getSmallDustByName("Magnetite", 6), null, IC2Items.getItem("cell"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Magnetite Ore"); - } - } - - //Graphite Ore - if (OreUtil.doesOreExistAndValid("oreGraphite") && OreUtil.doesOreExistAndValid("chunkGraphite")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreGraphite").get(0); - ItemStack chunkStack = OreDictionary.getOres("chunkGraphite").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, chunkStack, ItemDustsSmall.getSmallDustByName("Graphite", 6), null, IC2Items.getItem("cell"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Graphite Ore"); - } - } - - //Osmium Ore - if (OreUtil.doesOreExistAndValid("oreOsmium")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreOsmium").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("osmium", 2), ItemDustsSmall.getSmallDustByName("Osmium", 1), ItemDustsSmall.getSmallDustByName("Osmium", 1), IC2Items.getItem("cell"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Osmium Ore"); - } - } - - //Teslatite Ore - if (OreUtil.doesOreExistAndValid("oreTeslatite") && OreUtil.doesOreExistAndValid("dustTeslatite")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreTeslatite").get(0); - ItemStack dustStack = OreDictionary.getOres("dustTeslatite").get(0); - dustStack.stackSize = 10; - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, dustStack, ItemDustsSmall.getSmallDustByName("Sodalite", 1), ItemDustsSmall.getSmallDustByName("Glowstone", 1), IC2Items.getItem("cell"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Teslatite Ore"); - } - } - - //Sulfur Ore - if (OreUtil.doesOreExistAndValid("oreSulfur")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreSulfur").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("sulfur", 2), ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemDustsSmall.getSmallDustByName("Sulfur", 1), IC2Items.getItem("cell"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Sulfur Ore"); - } - } - - //Saltpeter Ore - if (OreUtil.doesOreExistAndValid("oreSaltpeter")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreSaltpeter").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("saltpeter", 2), ItemDustsSmall.getSmallDustByName("Saltpeter", 1), ItemDustsSmall.getSmallDustByName("Saltpeter", 1), IC2Items.getItem("cell"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Saltpeter Ore"); - } - } - - //Apatite Ore - if (OreUtil.doesOreExistAndValid("oreApatite") & OreUtil.doesOreExistAndValid("gemApatite")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreApatite").get(0); - ItemStack gemStack = OreDictionary.getOres("gemApatite").get(0); - gemStack.stackSize = 6; - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, gemStack, gemStack, ItemDustsSmall.getSmallDustByName("Phosphorous", 4), IC2Items.getItem("cell"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Apatite Ore"); - } - } - - //Nether Quartz Ore - if (OreUtil.doesOreExistAndValid("dustNetherQuartz")) { - try { - ItemStack dustStack = OreDictionary.getOres("dustNetherQuartz").get(0); - dustStack.stackSize = 4; - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.quartz_ore, 1), IC2Items.getItem("waterCell"), null, new ItemStack(Items.quartz, 2), dustStack, ItemDustsSmall.getSmallDustByName("Netherrack", 2), IC2Items.getItem("cell"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Nether Quartz Ore"); - } - } - - //Certus Quartz Ore - if (OreUtil.doesOreExistAndValid("oreCertusQuartz")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreCertusQuartz").get(0); - ItemStack gemStack = OreDictionary.getOres("crystalCertusQuartz").get(0); - ItemStack dustStack = OreDictionary.getOres("dustCertusQuartz").get(0); - dustStack.stackSize = 2; - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, gemStack, dustStack, null, IC2Items.getItem("cell"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Certus Quartz Ore"); - } - } - - //Charged Certus Quartz Ore - if (OreUtil.doesOreExistAndValid("oreChargedCertusQuartz")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreChargedCertusQuartz").get(0); - ItemStack gemStack = OreDictionary.getOres("crystalChargedCertusQuartz").get(0); - ItemStack dustStack = OreDictionary.getOres("dustCertusQuartz").get(0); - dustStack.stackSize = 2; - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, gemStack, dustStack, null, IC2Items.getItem("cell"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Charged Certus Quartz Ore"); - } - } - - //Amethyst Ore - if (OreUtil.doesOreExistAndValid("oreAmethyst") && OreUtil.doesOreExistAndValid("gemAmethyst")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreAmethyst").get(0); - ItemStack gemStack = OreDictionary.getOres("gemAmethyst").get(0); - gemStack.stackSize = 2; - ItemStack dustStack = OreDictionary.getOres("gemAmethyst").get(0); - dustStack.stackSize = 1; - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, gemStack, dustStack, null, IC2Items.getItem("cell"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Certus Quartz Ore"); - } - } - - //Topaz Ore - if (OreUtil.doesOreExistAndValid("oreTopaz") && OreUtil.doesOreExistAndValid("gemTopaz")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreTopaz").get(0); - ItemStack gemStack = OreDictionary.getOres("gemTopaz").get(0); - gemStack.stackSize = 2; - ItemStack dustStack = OreDictionary.getOres("gemTopaz").get(0); - dustStack.stackSize = 1; - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, gemStack, dustStack, null, IC2Items.getItem("cell"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Topaz Ore"); - } - } - - //Tanzanite Ore - if (OreUtil.doesOreExistAndValid("oreTanzanite") && OreUtil.doesOreExistAndValid("gemTanzanite")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreTanzanite").get(0); - ItemStack gemStack = OreDictionary.getOres("gemTanzanite").get(0); - gemStack.stackSize = 2; - ItemStack dustStack = OreDictionary.getOres("gemTanzanite").get(0); - dustStack.stackSize = 1; - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, gemStack, dustStack, null, IC2Items.getItem("cell"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Tanzanite Ore"); - } - } - - //Malachite Ore - if (OreUtil.doesOreExistAndValid("oreMalachite") && OreUtil.doesOreExistAndValid("gemMalachite")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreMalachite").get(0); - ItemStack gemStack = OreDictionary.getOres("gemMalachite").get(0); - gemStack.stackSize = 2; - ItemStack dustStack = OreDictionary.getOres("gemMalachite").get(0); - dustStack.stackSize = 1; - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, gemStack, dustStack, null, IC2Items.getItem("cell"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Malachite Ore"); - } - } - - - //Implosion Compressor - - RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemParts.getPartByName("iridiumAlloyIngot"), new ItemStack(IC2Items.getItem("industrialTnt").getItem(), 8), IC2Items.getItem("iridiumPlate"), ItemDusts.getDustByName("darkAshes", 4), 20, 30)); - RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("diamond", 4), new ItemStack(IC2Items.getItem("industrialTnt").getItem(), 32), new ItemStack(IC2Items.getItem("industrialDiamond").getItem(), 3), ItemDusts.getDustByName("darkAshes", 16), 20, 30)); - RecipeHandler.addRecipe(new ImplosionCompressorRecipe(IC2Items.getItem("coalChunk"), new ItemStack(IC2Items.getItem("industrialTnt").getItem(), 8), IC2Items.getItem("industrialDiamond"), ItemDusts.getDustByName("darkAshes", 4), 20, 30)); - RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("emerald", 4), new ItemStack(IC2Items.getItem("industrialTnt").getItem(), 24), new ItemStack(Items.emerald, 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30)); - RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("sapphire", 4), new ItemStack(IC2Items.getItem("industrialTnt").getItem(), 24), ItemGems.getGemByName("sapphire", 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30)); - RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("ruby", 4), new ItemStack(IC2Items.getItem("industrialTnt").getItem(), 24), ItemGems.getGemByName("ruby", 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30)); - RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("yellowGarnet", 4), new ItemStack(IC2Items.getItem("industrialTnt").getItem(), 24), ItemGems.getGemByName("yellowGarnet", 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30)); - RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("redGarnet", 4), new ItemStack(IC2Items.getItem("industrialTnt").getItem(), 24), ItemGems.getGemByName("redGarnet", 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30)); - RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("peridot", 4), new ItemStack(IC2Items.getItem("industrialTnt").getItem(), 24), ItemGems.getGemByName("peridot", 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30)); - - - //Grinder - - - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(ModBlocks.ore, 1, 0), IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("galena", 2), ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemDustsSmall.getSmallDustByName("Silver", 1), IC2Items.getItem("cell"), 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(ModBlocks.ore, 1, 0), ItemCells.getCellByName("mercury", 1), null, ItemDusts.getDustByName("galena", 2), ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemDusts.getDustByName("silver", 1), IC2Items.getItem("cell"), 100, 120)); - - //Iridium Ore - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(ModBlocks.ore, 1, 1), null, new FluidStack(FluidRegistry.WATER, 1000), IC2Items.getItem("iridiumOre"), ItemDustsSmall.getSmallDustByName("Iridium", 6), ItemDustsSmall.getSmallDustByName("Platinum", 2), null, 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(ModBlocks.ore, 1, 1), IC2Items.getItem("waterCell"), null, IC2Items.getItem("iridiumOre"), ItemDustsSmall.getSmallDustByName("Iridium", 6), ItemDustsSmall.getSmallDustByName("Platinum", 2), IC2Items.getItem("cell"), 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(ModBlocks.ore, 1, 1), new ItemStack(Items.water_bucket), null, IC2Items.getItem("iridiumOre"), ItemDustsSmall.getSmallDustByName("Iridium", 6), ItemDustsSmall.getSmallDustByName("Platinum", 2), new ItemStack(Items.bucket), 100, 120)); - - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(ModBlocks.ore, 1, 1), null, new FluidStack(ModFluids.fluidMercury, 1000), IC2Items.getItem("iridiumOre"), ItemDustsSmall.getSmallDustByName("Iridium", 6), ItemDusts.getDustByName("platinum", 2), null, 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(ModBlocks.ore, 1, 1), ItemCells.getCellByName("mercury", 1), null, IC2Items.getItem("iridiumOre"), ItemDustsSmall.getSmallDustByName("Iridium", 6), ItemDusts.getDustByName("platinum", 2), IC2Items.getItem("cell"), 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(ModBlocks.ore, 1, 1), new ItemStack(ModItems.bucketMercury), null, IC2Items.getItem("iridiumOre"), ItemDustsSmall.getSmallDustByName("Iridium", 6), ItemDusts.getDustByName("platinum", 2), new ItemStack(Items.bucket), 100, 120)); - - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(ModBlocks.ore, 1, 2), IC2Items.getItem("waterCell"), null, ItemGems.getGemByName("ruby", 1), ItemDustsSmall.getSmallDustByName("Ruby", 6), ItemDustsSmall.getSmallDustByName("Chrome", 2), IC2Items.getItem("cell"), 100, 120)); - - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(ModBlocks.ore, 1, 3), IC2Items.getItem("waterCell"), null, ItemGems.getGemByName("sapphire", 1), ItemDustsSmall.getSmallDustByName("Sapphire", 6), ItemDustsSmall.getSmallDustByName("Aluminum", 2), IC2Items.getItem("cell"), 100, 120)); - - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(ModBlocks.ore, 1, 4), IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("bauxite", 2), ItemDustsSmall.getSmallDustByName("Grossular", 4), ItemDustsSmall.getSmallDustByName("Titanium", 4), IC2Items.getItem("cell"), 100, 120)); - - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(ModBlocks.ore, 1, 5), IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("pyrite", 2), ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemDustsSmall.getSmallDustByName("Phosphorous", 1), IC2Items.getItem("cell"), 100, 120)); - - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(ModBlocks.ore, 1, 6), IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("cinnabar", 2), ItemDustsSmall.getSmallDustByName("Redstone", 1), ItemDustsSmall.getSmallDustByName("Glowstone", 1), IC2Items.getItem("cell"), 100, 120)); - - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(ModBlocks.ore, 1, 7), IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("sphalerite", 2), ItemDustsSmall.getSmallDustByName("Zinc", 1), ItemDustsSmall.getSmallDustByName("YellowGarnet", 1), IC2Items.getItem("cell"), 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(ModBlocks.ore, 1, 7), ItemCells.getCellByName("sodiumPersulfate", 1), null, ItemDusts.getDustByName("sphalerite", 2), ItemDusts.getDustByName("zinc", 1), ItemDustsSmall.getSmallDustByName("YellowGarnet", 1), IC2Items.getItem("cell"), 100, 120)); - - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(ModBlocks.ore, 1, 8), IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("tungsten", 2), ItemDustsSmall.getSmallDustByName("Manganese", 1), ItemDustsSmall.getSmallDustByName("Silver", 1), IC2Items.getItem("cell"), 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(ModBlocks.ore, 1, 8), ItemCells.getCellByName("mercury", 1), null, ItemDusts.getDustByName("tungsten", 2), ItemDustsSmall.getSmallDustByName("Manganese", 1), ItemDusts.getDustByName("silver", 2), IC2Items.getItem("cell"), 100, 120)); - - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(ModBlocks.ore, 1, 9), IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("platinum", 2), ItemDustsSmall.getSmallDustByName("Iridium", 1), ItemDustsSmall.getSmallDustByName("Iridium", 1), IC2Items.getItem("cell"), 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(ModBlocks.ore, 1, 9), ItemCells.getCellByName("mercury", 1), null, ItemDusts.getDustByName("platinum", 3), ItemDustsSmall.getSmallDustByName("Iridium", 1), ItemDustsSmall.getSmallDustByName("Iridium", 1), IC2Items.getItem("cell"), 100, 120)); - - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(ModBlocks.ore, 1, 10), IC2Items.getItem("waterCell"), null, ItemGems.getGemByName("peridot", 1), ItemDustsSmall.getSmallDustByName("Peridot", 6), ItemDustsSmall.getSmallDustByName("Pyrope", 2), IC2Items.getItem("cell"), 100, 120)); - - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(ModBlocks.ore, 1, 11), IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("sodalite", 12), ItemDustsSmall.getSmallDustByName("Lazurite", 4), ItemDustsSmall.getSmallDustByName("Lapis", 4), IC2Items.getItem("cell"), 100, 120)); - - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(ModBlocks.ore, 1, 12), IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("tetrahedrite", 2), ItemDustsSmall.getSmallDustByName("Antimony", 1), ItemDustsSmall.getSmallDustByName("Zinc", 1), IC2Items.getItem("cell"), 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(ModBlocks.ore, 1, 12), ItemCells.getCellByName("sodiumPersulfate", 1), null, ItemDusts.getDustByName("tetrahedrite", 3), ItemDustsSmall.getSmallDustByName("Antimony", 1), ItemDustsSmall.getSmallDustByName("Zinc", 1), IC2Items.getItem("cell"), 100, 120)); - - - //Chemical Reactor - RecipeHandler.addRecipe(new ChemicalReactorRecipe(ItemDusts.getDustByName("calcite", 1), null, new ItemStack(IC2Items.getItem("fertilizer").getItem(), 1), 100, 30)); - RecipeHandler.addRecipe(new ChemicalReactorRecipe(ItemDusts.getDustByName("calcite", 1), ItemDusts.getDustByName("phosphorous", 1), new ItemStack(IC2Items.getItem("fertilizer").getItem(), 3), 100, 30)); - RecipeHandler.addRecipe(new ChemicalReactorRecipe(ItemCells.getCellByName("sodiumSulfide", 1), IC2Items.getItem("airCell"), ItemCells.getCellByName("sodiumPersulfate", 2), 2000, 30)); - RecipeHandler.addRecipe(new ChemicalReactorRecipe(ItemCells.getCellByName("nitrocarbon", 1), IC2Items.getItem("waterCell"), ItemCells.getCellByName("glyceryl", 2), 580, 30)); - RecipeHandler.addRecipe(new ChemicalReactorRecipe(ItemDusts.getDustByName("calcite", 1), ItemDusts.getDustByName("sulfur", 1), new ItemStack(IC2Items.getItem("fertilizer").getItem(), 2), 100, 30)); - ItemStack waterCells = IC2Items.getItem("waterCell").copy(); - waterCells.stackSize = 2; - RecipeHandler.addRecipe(new ChemicalReactorRecipe(ItemCells.getCellByName("sulfur", 1), waterCells, ItemCells.getCellByName("sulfuricAcid", 3), 1140, 30)); - ItemStack waterCells2 = IC2Items.getItem("waterCell").copy(); - waterCells2.stackSize = 5; - RecipeHandler.addRecipe(new ChemicalReactorRecipe(ItemCells.getCellByName("hydrogen", 4), IC2Items.getItem("airCell"), waterCells2, 10, 30)); - RecipeHandler.addRecipe(new ChemicalReactorRecipe(ItemCells.getCellByName("nitrogen", 1), IC2Items.getItem("airCell"), ItemCells.getCellByName("nitrogenDioxide", 2), 1240, 30)); - - -//IndustrialElectrolyzer - - RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe( - ItemCells.getCellByName("sulfuricAcid", 7), - null, - ItemCells.getCellByName("hydrogen", 2), - ItemDusts.getDustByName("sulfur"), - new ItemStack(IC2Items.getItem("cell").getItem(), 2, 5), - new ItemStack(IC2Items.getItem("cell").getItem(), 3, 0), - 400, 90 - )); - - - RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe( - ItemDusts.getDustByName("ruby", 6), - IC2Items.getItem("cell"), - ItemDusts.getDustByName("aluminum", 2), - new ItemStack(IC2Items.getItem("cell").getItem(), 1, 5), - ItemDusts.getDustByName("chrome", 1), - null, - 140, 90 - )); - - RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe( - ItemDusts.getDustByName("sapphire", 5), - IC2Items.getItem("cell"), - ItemDusts.getDustByName("aluminum", 2), - new ItemStack(IC2Items.getItem("cell").getItem(), 1, 5), - null, - null, - 100, 60 - )); - - RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe( - ItemCells.getCellByName("nitrogenDioxide", 3), - null, - ItemCells.getCellByName("nitrogen", 1), - new ItemStack(IC2Items.getItem("cell").getItem(), 1, 5), - null, - IC2Items.getItem("cell"), - 160, 60 - )); - - RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe( - ItemCells.getCellByName("sodiumSulfide", 2), - null, - ItemCells.getCellByName("sodium", 1), - ItemDusts.getDustByName("sulfur", 1), - null, - IC2Items.getItem("cell"), - 200, 60 - )); - - RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe( - ItemDusts.getDustByName("greenSapphire", 5), - IC2Items.getItem("cell"), - ItemDusts.getDustByName("aluminum", 2), - new ItemStack(IC2Items.getItem("cell").getItem(), 1, 5), - null, - null, - 100, 60 - )); - - RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe( - ItemDusts.getDustByName("emerald", 29), - new ItemStack(IC2Items.getItem("cell").getItem(), 18, 0), - ItemCells.getCellByName("berylium", 3), - ItemDusts.getDustByName("aluminum", 2), - ItemCells.getCellByName("silicon", 6), - new ItemStack(IC2Items.getItem("cell").getItem(), 9, 5), - 520, 120 - )); - - RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe( - new ItemStack(IC2Items.getItem("silicondioxideDust").getItem(), 3, 0), - new ItemStack(IC2Items.getItem("cell").getItem(), 2, 0), - ItemCells.getCellByName("silicon", 1), - new ItemStack(IC2Items.getItem("cell").getItem(), 1, 5), - null, - null, - 60, 60 - )); - - RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(new ItemStack(Items.dye, 3, 15), - new ItemStack(IC2Items.getItem("cell").getItem(), 1, 0), - null, - ItemCells.getCellByName("calcium", 1), - null, - null, - 20, 106 - )); - - RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe( - ItemCells.getCellByName("glyceryl", 20), - null, - ItemCells.getCellByName("carbon", 3), - ItemCells.getCellByName("hydrogen", 5), - ItemCells.getCellByName("nitrogen", 3), - new ItemStack(IC2Items.getItem("cell").getItem(), 9, 0), - 800, 90 - )); - - RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe( - ItemDusts.getDustByName("peridot", 9), - new ItemStack(IC2Items.getItem("cell").getItem(), 4, 0), - ItemDusts.getDustByName("magnesium", 2), - ItemDusts.getDustByName("iron"), - ItemCells.getCellByName("silicon", 2), - new ItemStack(IC2Items.getItem("cell").getItem(), 2, 5), - 200, 120 - )); - - RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe( - ItemCells.getCellByName("calciumCarbonate", 5), - null, - ItemCells.getCellByName("carbon"), - ItemCells.getCellByName("calcium"), - new ItemStack(IC2Items.getItem("cell").getItem(), 1, 5), - new ItemStack(IC2Items.getItem("cell").getItem(), 2, 0), - 400, 90 - )); - - RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe( - ItemCells.getCellByName("sodiumPersulfate", 6), - null, - ItemCells.getCellByName("sodium"), - ItemDusts.getDustByName("sulfur"), - new ItemStack(IC2Items.getItem("cell").getItem(), 2, 5), - new ItemStack(IC2Items.getItem("cell").getItem(), 3, 0), - 420, 90 - )); - - RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe( - ItemDusts.getDustByName("pyrope", 20), - new ItemStack(IC2Items.getItem("cell").getItem(), 9, 0), - ItemDusts.getDustByName("aluminum", 2), - ItemDusts.getDustByName("magnesium", 3), - ItemCells.getCellByName("silicon", 3), - new ItemStack(IC2Items.getItem("cell").getItem(), 6, 5), - 400, 120 - )); - - ItemStack sand = new ItemStack(Blocks.sand); - sand.stackSize = 16; - - RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe( - sand, - new ItemStack(IC2Items.getItem("cell").getItem(), 2, 0), - ItemCells.getCellByName("silicon", 1), - new ItemStack(IC2Items.getItem("cell").getItem(), 1, 5), - null, - null, - 1000, 25 - )); - - RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe( - ItemDusts.getDustByName("almandine", 20), - new ItemStack(IC2Items.getItem("cell").getItem(), 9, 0), - ItemDusts.getDustByName("aluminum", 2), - ItemDusts.getDustByName("iron", 3), - ItemCells.getCellByName("silicon", 3), - new ItemStack(IC2Items.getItem("cell").getItem(), 6, 5), - 480, 120 - )); - - RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe( - ItemDusts.getDustByName("spessartine", 20), - new ItemStack(IC2Items.getItem("cell").getItem(), 9, 0), - ItemDusts.getDustByName("aluminum", 2), - ItemDusts.getDustByName("manganese", 3), - ItemCells.getCellByName("silicon", 3), - new ItemStack(IC2Items.getItem("cell").getItem(), 6, 5), - 480, 120 - )); - - RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe( - ItemDusts.getDustByName("andradite", 20), - new ItemStack(IC2Items.getItem("cell").getItem(), 12, 0), - ItemCells.getCellByName("calcium", 3), - ItemDusts.getDustByName("iron", 2), - ItemCells.getCellByName("silicon", 3), - new ItemStack(IC2Items.getItem("cell").getItem(), 6, 5), - 480, 120 - )); - - RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe( - ItemDusts.getDustByName("grossular", 20), - new ItemStack(IC2Items.getItem("cell").getItem(), 12, 0), - ItemCells.getCellByName("calcium", 3), - ItemDusts.getDustByName("aluminum", 2), - ItemCells.getCellByName("silicon", 3), - new ItemStack(IC2Items.getItem("cell").getItem(), 6, 5), - 440, 120 - )); - - RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe( - ItemDusts.getDustByName("Uvarovite", 20), - new ItemStack(IC2Items.getItem("cell").getItem(), 12, 0), - ItemCells.getCellByName("calcium", 3), - ItemDusts.getDustByName("chrome", 2), - ItemCells.getCellByName("silicon", 3), - new ItemStack(IC2Items.getItem("cell").getItem(), 6, 5), - 480, 120 - )); - - RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe( - new ItemStack(IC2Items.getItem("cell").getItem(), 6, 10), - null, - ItemCells.getCellByName("hydrogen", 4), - new ItemStack(IC2Items.getItem("cell").getItem(), 1, 5), - new ItemStack(IC2Items.getItem("cell").getItem(), 1, 0), - null, - 100, 30 - )); - - RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe( - ItemDusts.getDustByName("darkAshes"), - new ItemStack(IC2Items.getItem("cell").getItem(), 2, 0), - ItemCells.getCellByName("carbon", 2), - null, - null, - null, - 20, 30 - )); - - if (OreUtil.doesOreExistAndValid("dustSalt")) { - ItemStack salt = OreDictionary.getOres("dustSalt").get(0); - salt.stackSize = 2; - RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe( - salt, - new ItemStack(IC2Items.getItem("cell").getItem(), 2, 0), - ItemCells.getCellByName("sodium"), - ItemCells.getCellByName("chlorine"), - null, - null, - 40, 60 - )); - } - - CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("NaKCoolantSimple"), - "TST", "PCP", "TST", - 'T', "ingotTin", - 'S', ItemCells.getCellByName("sodium"), - 'P', ItemCells.getCellByName("potassium"), - 'C', IC2Items.getItem("reactorCoolantSimple") - ); - } - - static void removeIc2Recipes() { - if (ConfigTechReborn.ExpensiveMacerator) { - RecipeRemover.removeAnyRecipe(IC2Items.getItem("macerator")); - } - if (ConfigTechReborn.ExpensiveDrill) { - RecipeRemover.removeAnyRecipe(IC2Items.getItem("miningDrill")); - } - if (ConfigTechReborn.ExpensiveDiamondDrill) { - RecipeRemover.removeAnyRecipe(IC2Items.getItem("diamondDrill")); - } - if (ConfigTechReborn.ExpensiveSolar) { - RecipeRemover.removeAnyRecipe(IC2Items.getItem("solarPanel")); - } - if (ConfigTechReborn.ExpensiveWatermill) { - RecipeRemover.removeAnyRecipe(IC2Items.getItem("waterMill")); - } - if (ConfigTechReborn.ExpensiveWindmill) { - RecipeRemover.removeAnyRecipe(IC2Items.getItem("windMill")); - } - - Core.logHelper.info("IC2 Recipes Removed"); - } - - static void addShappedIc2Recipes() { - Item drill = IC2Items.getItem("miningDrill").getItem(); - ItemStack drillStack = new ItemStack(drill, 1, OreDictionary.WILDCARD_VALUE); - - if (ConfigTechReborn.ExpensiveMacerator) - CraftingHelper.addShapedOreRecipe(IC2Items.getItem("macerator"), - "FDF", "DMD", "FCF", - 'F', Items.flint, - 'D', Items.diamond, - 'M', IC2Items.getItem("machine"), - 'C', IC2Items.getItem("electronicCircuit")); - - if (ConfigTechReborn.ExpensiveDrill) - CraftingHelper.addShapedOreRecipe(IC2Items.getItem("miningDrill"), - " S ", "SCS", "SBS", - 'S', "ingotSteel", - 'B', IC2Items.getItem("reBattery"), - 'C', IC2Items.getItem("electronicCircuit")); - - if (ConfigTechReborn.ExpensiveDiamondDrill) - CraftingHelper.addShapedOreRecipe(IC2Items.getItem("diamondDrill"), - " D ", "DBD", "TCT", - 'D', "gemDiamond", - 'T', "ingotTitanium", - 'B', drillStack, - 'C', IC2Items.getItem("advancedCircuit")); - - if (ConfigTechReborn.ExpensiveSolar) - CraftingHelper.addShapedOreRecipe(IC2Items.getItem("solarPanel"), - "PPP", "SZS", "CGC", - 'P', "paneGlass", - 'S', new ItemStack(ModItems.parts, 1, 1), - 'Z', IC2Items.getItem("carbonPlate"), - 'G', IC2Items.getItem("generator"), - 'C', IC2Items.getItem("electronicCircuit")); - - - CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("iridiumAlloyIngot"), - "IAI", "ADA", "IAI", - 'I', ItemIngots.getIngotByName("iridium"), - 'D', ItemDusts.getDustByName("diamond"), - 'A', IC2Items.getItem("advancedAlloy")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.lithiumBatpack, 1, OreDictionary.WILDCARD_VALUE), - "BCB", "BPB", "B B", - 'B', new ItemStack(ModItems.lithiumBattery), - 'P', "plateAluminum", - 'C', IC2Items.getItem("advancedCircuit")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.lithiumBattery, 1, OreDictionary.WILDCARD_VALUE), - " C ", "PFP", "PFP", - 'F', ItemCells.getCellByName("lithium"), - 'P', "plateAluminum", - 'C', IC2Items.getItem("insulatedGoldCableItem")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.lapotronpack, 1, OreDictionary.WILDCARD_VALUE), - "FOF", "SPS", "FIF", - 'F', ItemParts.getPartByName("energyFlowCircuit"), - 'O', new ItemStack(ModItems.lapotronicOrb), - 'S', ItemParts.getPartByName("superConductor"), - 'I', "ingotIridium", - 'P', new ItemStack(ModItems.lapotronpack)); - - - Recipes.compressor.addRecipe(new RecipeInputOreDict("dustLazurite"), null, ItemParts.getPartByName("lazuriteChunk")); - - Core.logHelper.info("Added Expensive IC2 Recipes"); - } - - static void addTRMaceratorRecipes() { - //Macerator - - List blackList = new ArrayList(); - blackList.add("lapis"); - blackList.add("redstone"); - blackList.add("teslatite"); - - for(String ore : OreUtil.oreNames){ - if(OreUtil.hasCrushedOre(ore) && OreUtil.hasOre(ore)){ - try{ - Recipes.macerator.addRecipe(new RecipeInputOreDict("ore" + OreUtil.capitalizeFirstLetter(ore)), null, OreUtil.getStackFromName("crushed" + OreUtil.capitalizeFirstLetter(ore), 2)); - } catch (Exception e){ - Core.logHelper.error("Failed to load recipe for " + ore + " crushed ore"); - } - } - if(OreUtil.hasOre(ore) && OreUtil.hasDust(ore) && !blackList.contains(ore)){ - try{ - Recipes.macerator.addRecipe(new RecipeInputOreDict("ore" + OreUtil.capitalizeFirstLetter(ore)), null, OreUtil.getStackFromName("dust" + OreUtil.capitalizeFirstLetter(ore), 2)); - } catch (Exception e){ - Core.logHelper.error("Failed to load recipe for " + ore); - } - } - } - - if(CompatManager.isGregTechLoaded){ - if (!IC2Classic.isIc2ClassicLoaded() && OreUtil.doesOreExistAndValid("oreRedstone")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreRedstone"), null, new ItemStack(Items.redstone, 9)); - } - if (OreUtil.doesOreExistAndValid("oreLapis")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreLapis"), null, ItemDusts.getDustByName("lapis", 9)); - } - } - - if (OreUtil.doesOreExistAndValid("oreTeslatite")) { - ItemStack teslatiteStack = OreDictionary.getOres("dustTeslatite").get(0); - teslatiteStack.stackSize = 10; - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreTeslatite"), null, teslatiteStack); - } - if (OreUtil.doesOreExistAndValid("gemRuby")) { - Recipes.macerator.getRecipes().put(new RecipeInputOreDict("gemRuby"), new RecipeOutput(new NBTTagCompound(), ItemDusts.getDustByName("ruby"))); - } - } - - static void addTROreWashingRecipes() { - //Ore Washing Plant - NBTTagCompound liquidAmount = new NBTTagCompound(); - liquidAmount.setInteger("amount", 1000); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedAluminum"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Aluminum", 1), ItemDustsSmall.getSmallDustByName("Aluminum", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedArdite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Ardite", 1), ItemDustsSmall.getSmallDustByName("Ardite", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedBauxite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Bauxite", 1), ItemDustsSmall.getSmallDustByName("Bauxite", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedCadmium"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cadmium", 1), ItemDustsSmall.getSmallDustByName("Cadmium", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedCinnabar"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cinnabar", 1), ItemDustsSmall.getSmallDustByName("Cinnabar", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedCobalt"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cobalt", 1), ItemDustsSmall.getSmallDustByName("Cobalt", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedDarkIron"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("DarkIron", 1), ItemDustsSmall.getSmallDustByName("DarkIron", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedIndium"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Indium", 1), ItemDustsSmall.getSmallDustByName("Indium", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedNickel"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Nickel", 1), ItemDustsSmall.getSmallDustByName("Nickel", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedOsmium"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Osmium", 1), ItemDustsSmall.getSmallDustByName("Osmium", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedPyrite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Pyrite", 1), ItemDustsSmall.getSmallDustByName("Pyrite", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedSphalerite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Sphalerite", 1), ItemDustsSmall.getSmallDustByName("Sphalerite", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedTetrahedrite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Tetrahedrite", 1), ItemDustsSmall.getSmallDustByName("Tetrahedrite", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedGalena"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Galena", 1), ItemDustsSmall.getSmallDustByName("Galena", 2), IC2Items.getItem("stoneDust")); - - if (!Loader.isModLoaded("aobd")) { - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedPlatinum"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Platinum", 1), ItemDustsSmall.getSmallDustByName("Platinum", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedIridium"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Iridium", 1), ItemDustsSmall.getSmallDustByName("Iridium", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedTungsten"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Tungsten", 1), ItemDustsSmall.getSmallDustByName("Tungsten", 2), IC2Items.getItem("stoneDust")); - } - } - - static void addTRThermalCentrifugeRecipes() { - //Thermal Centrifuge - - //Heat Values - NBTTagCompound aluminumHeat = new NBTTagCompound(); - aluminumHeat.setInteger("minHeat", 2000); - NBTTagCompound arditeHeat = new NBTTagCompound(); - arditeHeat.setInteger("minHeat", 3000); - NBTTagCompound bauxiteHeat = new NBTTagCompound(); - bauxiteHeat.setInteger("minHeat", 2500); - NBTTagCompound cadmiumHeat = new NBTTagCompound(); - cadmiumHeat.setInteger("minHeat", 1500); - NBTTagCompound cinnabarHeat = new NBTTagCompound(); - cinnabarHeat.setInteger("minHeat", 1500); - NBTTagCompound cobaltHeat = new NBTTagCompound(); - cobaltHeat.setInteger("minHeat", 3000); - NBTTagCompound darkIronHeat = new NBTTagCompound(); - darkIronHeat.setInteger("minHeat", 2500); - NBTTagCompound indiumHeat = new NBTTagCompound(); - indiumHeat.setInteger("minHeat", 2000); - NBTTagCompound iridiumHeat = new NBTTagCompound(); - iridiumHeat.setInteger("minHeat", 4000); - NBTTagCompound nickelHeat = new NBTTagCompound(); - nickelHeat.setInteger("minHeat", 2000); - NBTTagCompound osmiumHeat = new NBTTagCompound(); - osmiumHeat.setInteger("minHeat", 2000); - NBTTagCompound platinumHeat = new NBTTagCompound(); - platinumHeat.setInteger("minHeat", 3000); - NBTTagCompound pyriteHeat = new NBTTagCompound(); - pyriteHeat.setInteger("minHeat", 1500); - NBTTagCompound sphaleriteHeat = new NBTTagCompound(); - sphaleriteHeat.setInteger("minHeat", 1500); - NBTTagCompound tetrahedriteHeat = new NBTTagCompound(); - tetrahedriteHeat.setInteger("minHeat", 500); - NBTTagCompound tungstenHeat = new NBTTagCompound(); - tungstenHeat.setInteger("minHeat", 2000); - NBTTagCompound galenaHeat = new NBTTagCompound(); - galenaHeat.setInteger("minHeat", 2500); - - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedAluminum"), aluminumHeat, ItemDustsSmall.getSmallDustByName("Bauxite", 1), ItemDusts.getDustByName("aluminum", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedArdite"), arditeHeat, ItemDustsSmall.getSmallDustByName("Ardite", 1), ItemDusts.getDustByName("ardite", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedBauxite"), bauxiteHeat, ItemDustsSmall.getSmallDustByName("Aluminum", 1), ItemDusts.getDustByName("bauxite", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedCadmium"), cadmiumHeat, ItemDustsSmall.getSmallDustByName("Cadmium", 1), ItemDusts.getDustByName("cadmium", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedCinnabar"), cinnabarHeat, ItemDustsSmall.getSmallDustByName("Redstone", 1), ItemDusts.getDustByName("cinnabar", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedCobalt"), cobaltHeat, ItemDustsSmall.getSmallDustByName("Cobalt", 1), ItemDusts.getDustByName("cobalt", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedDarkIron"), darkIronHeat, ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDusts.getDustByName("darkIron", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedIndium"), indiumHeat, ItemDustsSmall.getSmallDustByName("Indium", 1), ItemDusts.getDustByName("indium", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedNickel"), nickelHeat, ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDusts.getDustByName("nickel", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedOsmium"), osmiumHeat, ItemDustsSmall.getSmallDustByName("Osmium", 1), ItemDusts.getDustByName("osmium", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPyrite"), pyriteHeat, ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemDusts.getDustByName("pyrite", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedSphalerite"), sphaleriteHeat, ItemDustsSmall.getSmallDustByName("Zinc", 1), ItemDusts.getDustByName("sphalerite", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedTetrahedrite"), tetrahedriteHeat, ItemDustsSmall.getSmallDustByName("Antimony", 1), ItemDusts.getDustByName("tetrahedrite", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedGalena"), galenaHeat, ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemDusts.getDustByName("galena", 1), IC2Items.getItem("stoneDust")); - - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedAluminum"), aluminumHeat, ItemDustsSmall.getSmallDustByName("Bauxite", 1), ItemDusts.getDustByName("aluminum", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedArdite"), arditeHeat, ItemDustsSmall.getSmallDustByName("Ardite", 1), ItemDusts.getDustByName("ardite", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedBauxite"), bauxiteHeat, ItemDustsSmall.getSmallDustByName("Aluminum", 1), ItemDusts.getDustByName("bauxite", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedCadmium"), cadmiumHeat, ItemDustsSmall.getSmallDustByName("Cadmium", 1), ItemDusts.getDustByName("cadmium", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedCinnabar"), cinnabarHeat, ItemDustsSmall.getSmallDustByName("Redstone", 1), ItemDusts.getDustByName("cinnabar", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedCobalt"), cobaltHeat, ItemDustsSmall.getSmallDustByName("Cobalt", 1), ItemDusts.getDustByName("cobalt", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedDarkIron"), darkIronHeat, ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDusts.getDustByName("darkIron", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedIndium"), indiumHeat, ItemDustsSmall.getSmallDustByName("Indium", 1), ItemDusts.getDustByName("indium", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedNickel"), nickelHeat, ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDusts.getDustByName("nickel", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedOsmium"), osmiumHeat, ItemDustsSmall.getSmallDustByName("Osmium", 1), ItemDusts.getDustByName("osmium", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedPyrite"), pyriteHeat, ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemDusts.getDustByName("pyrite", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedSphalerite"), sphaleriteHeat, ItemDustsSmall.getSmallDustByName("Zinc", 1), ItemDusts.getDustByName("sphalerite", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedTetrahedrite"), tetrahedriteHeat, ItemDustsSmall.getSmallDustByName("Antimony", 1), ItemDusts.getDustByName("tetrahedrite", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedGalena"), galenaHeat, ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemDusts.getDustByName("galena", 1)); - - if (!Loader.isModLoaded("aobd")) { - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedIridium"), iridiumHeat, ItemDustsSmall.getSmallDustByName("Platinum", 1), ItemDusts.getDustByName("iridium", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPlatinum"), platinumHeat, ItemDustsSmall.getSmallDustByName("Iridium", 1), ItemDusts.getDustByName("platinum", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedTungsten"), tungstenHeat, ItemDustsSmall.getSmallDustByName("Manganese", 1), ItemDusts.getDustByName("tungsten", 1), IC2Items.getItem("stoneDust")); - - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedIridium"), iridiumHeat, ItemDustsSmall.getSmallDustByName("Platinum", 1), ItemDusts.getDustByName("iridium", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedPlatinum"), platinumHeat, ItemDustsSmall.getSmallDustByName("Iridium", 1), ItemDusts.getDustByName("platinum", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedTungsten"), tungstenHeat, ItemDustsSmall.getSmallDustByName("Manganese", 1), ItemDusts.getDustByName("tungsten", 1)); - } - } - - static void addMetalFormerRecipes() { - //Metal Former - NBTTagCompound mode = new NBTTagCompound(); - mode.setInteger("mode", 1); - Recipes.metalformerRolling.addRecipe(new RecipeInputOreDict("ingotAluminum"), mode, ItemPlates.getPlateByName("aluminum")); - Recipes.metalformerRolling.addRecipe(new RecipeInputOreDict("ingotBatteryAlloy"), mode, ItemPlates.getPlateByName("batteryAlloy")); - Recipes.metalformerRolling.addRecipe(new RecipeInputOreDict("ingotBrass"), mode, ItemPlates.getPlateByName("brass")); - Recipes.metalformerRolling.addRecipe(new RecipeInputOreDict("ingotChrome"), mode, ItemPlates.getPlateByName("chrome")); - Recipes.metalformerRolling.addRecipe(new RecipeInputOreDict("ingotElectrum"), mode, ItemPlates.getPlateByName("electrum")); - Recipes.metalformerRolling.addRecipe(new RecipeInputOreDict("ingotInvar"), mode, ItemPlates.getPlateByName("invar")); - Recipes.metalformerRolling.addRecipe(new RecipeInputOreDict("ingotIridium"), mode, ItemPlates.getPlateByName("iridium")); - Recipes.metalformerRolling.addRecipe(new RecipeInputOreDict("ingotMagnalium"), mode, ItemPlates.getPlateByName("magnalium")); - Recipes.metalformerRolling.addRecipe(new RecipeInputOreDict("ingotNickel"), mode, ItemPlates.getPlateByName("nickel")); - Recipes.metalformerRolling.addRecipe(new RecipeInputOreDict("ingotOsmium"), mode, ItemPlates.getPlateByName("osmium")); - Recipes.metalformerRolling.addRecipe(new RecipeInputOreDict("ingotPlatinum"), mode, ItemPlates.getPlateByName("platinum")); - Recipes.metalformerRolling.addRecipe(new RecipeInputOreDict("ingotSilver"), mode, ItemPlates.getPlateByName("silver")); - Recipes.metalformerRolling.addRecipe(new RecipeInputOreDict("ingotTitanium"), mode, ItemPlates.getPlateByName("titanium")); - Recipes.metalformerRolling.addRecipe(new RecipeInputOreDict("ingotTungsten"), mode, ItemPlates.getPlateByName("tungsten")); - Recipes.metalformerRolling.addRecipe(new RecipeInputOreDict("ingotTungstensteel"), mode, ItemPlates.getPlateByName("tungstensteel")); - Recipes.metalformerRolling.addRecipe(new RecipeInputOreDict("ingotZinc"), mode, ItemPlates.getPlateByName("zinc")); - Recipes.metalformerRolling.addRecipe(new RecipeInputOreDict("ingotRedAlloy"), mode, ItemPlates.getPlateByName("redstone")); - Recipes.metalformerRolling.addRecipe(new RecipeInputOreDict("ingotBlueAlloy"), mode, ItemPlates.getPlateByName("teslatite")); - } -} diff --git a/ToAddBack/compat/recipes/RecipesNatura.java b/ToAddBack/compat/recipes/RecipesNatura.java deleted file mode 100644 index 6609e61c7..000000000 --- a/ToAddBack/compat/recipes/RecipesNatura.java +++ /dev/null @@ -1,89 +0,0 @@ -package techreborn.compat.recipes; - -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.event.FMLServerStartingEvent; -import ic2.api.item.IC2Items; -import mods.natura.common.NContent; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; -import techreborn.api.recipe.RecipeHandler; -import techreborn.api.recipe.machines.IndustrialSawmillRecipe; -import techreborn.compat.ICompatModule; -import techreborn.config.ConfigTechReborn; - -public class RecipesNatura implements ICompatModule { - @Override - public void preInit(FMLPreInitializationEvent event) { - - - } - - @Override - public void init(FMLInitializationEvent event) { - if (ConfigTechReborn.AllowNaturaRecipes) { - ItemStack pulpStack = OreDictionary.getOres("pulpWood").get(0); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.tree, 1, 0), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(NContent.planks, 6, 0), pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.tree, 1, 0), IC2Items.getItem("waterCell"), null, new ItemStack(NContent.planks, 6, 0), pulpStack, IC2Items.getItem("cell"), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.tree, 1, 0), new ItemStack(Items.water_bucket), null, new ItemStack(NContent.planks, 6, 0), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.tree, 1, 1), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(NContent.planks, 6, 1), pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.tree, 1, 1), IC2Items.getItem("waterCell"), null, new ItemStack(NContent.planks, 6, 1), pulpStack, IC2Items.getItem("cell"), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.tree, 1, 1), new ItemStack(Items.water_bucket), null, new ItemStack(NContent.planks, 6, 1), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.tree, 1, 2), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(NContent.planks, 6, 2), pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.tree, 1, 2), IC2Items.getItem("waterCell"), null, new ItemStack(NContent.planks, 6, 2), pulpStack, IC2Items.getItem("cell"), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.tree, 1, 2), new ItemStack(Items.water_bucket), null, new ItemStack(NContent.planks, 6, 2), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.tree, 1, 3), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(NContent.planks, 6, 5), pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.tree, 1, 3), IC2Items.getItem("waterCell"), null, new ItemStack(NContent.planks, 6, 5), pulpStack, IC2Items.getItem("cell"), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.tree, 1, 3), new ItemStack(Items.water_bucket), null, new ItemStack(NContent.planks, 6, 5), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.redwood, 1, 1), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(NContent.planks, 6, 3), pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.redwood, 1, 1), IC2Items.getItem("waterCell"), null, new ItemStack(NContent.planks, 6, 3), pulpStack, IC2Items.getItem("cell"), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.redwood, 1, 1), new ItemStack(Items.water_bucket), null, new ItemStack(NContent.planks, 6, 3), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.willow, 1, 0), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(NContent.planks, 6, 10), pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.willow, 1, 0), IC2Items.getItem("waterCell"), null, new ItemStack(NContent.planks, 6, 10), pulpStack, IC2Items.getItem("cell"), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.willow, 1, 0), new ItemStack(Items.water_bucket), null, new ItemStack(NContent.planks, 6, 10), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.rareTree, 1, 0), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(NContent.planks, 6, 6), pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.rareTree, 1, 0), IC2Items.getItem("waterCell"), null, new ItemStack(NContent.planks, 6, 6), pulpStack, IC2Items.getItem("cell"), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.rareTree, 1, 0), new ItemStack(Items.water_bucket), null, new ItemStack(NContent.planks, 6, 6), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.rareTree, 1, 1), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(NContent.planks, 6, 7), pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.rareTree, 1, 1), IC2Items.getItem("waterCell"), null, new ItemStack(NContent.planks, 6, 7), pulpStack, IC2Items.getItem("cell"), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.rareTree, 1, 1), new ItemStack(Items.water_bucket), null, new ItemStack(NContent.planks, 6, 7), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.rareTree, 1, 2), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(NContent.planks, 6, 8), pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.rareTree, 1, 2), IC2Items.getItem("waterCell"), null, new ItemStack(NContent.planks, 6, 8), pulpStack, IC2Items.getItem("cell"), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.rareTree, 1, 2), new ItemStack(Items.water_bucket), null, new ItemStack(NContent.planks, 6, 8), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.rareTree, 1, 3), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(NContent.planks, 6, 9), pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.rareTree, 1, 3), IC2Items.getItem("waterCell"), null, new ItemStack(NContent.planks, 6, 9), pulpStack, IC2Items.getItem("cell"), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.rareTree, 1, 3), new ItemStack(Items.water_bucket), null, new ItemStack(NContent.planks, 6, 9), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.darkTree, 1, 0), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(NContent.planks, 6, 11), pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.darkTree, 1, 0), IC2Items.getItem("waterCell"), null, new ItemStack(NContent.planks, 6, 11), pulpStack, IC2Items.getItem("cell"), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.darkTree, 1, 0), new ItemStack(Items.water_bucket), null, new ItemStack(NContent.planks, 6, 11), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.darkTree, 1, 1), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(NContent.planks, 6, 12), pulpStack, null, 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.darkTree, 1, 1), IC2Items.getItem("waterCell"), null, new ItemStack(NContent.planks, 6, 12), pulpStack, IC2Items.getItem("cell"), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.darkTree, 1, 1), new ItemStack(Items.water_bucket), null, new ItemStack(NContent.planks, 6, 12), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); - } - } - - @Override - public void postInit(FMLPostInitializationEvent event) { - - } - - @Override - public void serverStarting(FMLServerStartingEvent event) { - - } -} diff --git a/ToAddBack/compat/recipes/RecipesThermalExpansion.java b/ToAddBack/compat/recipes/RecipesThermalExpansion.java deleted file mode 100644 index c47e7e9c7..000000000 --- a/ToAddBack/compat/recipes/RecipesThermalExpansion.java +++ /dev/null @@ -1,32 +0,0 @@ -package techreborn.compat.recipes; - -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.event.FMLServerStartingEvent; -import techreborn.compat.ICompatModule; - -public class RecipesThermalExpansion implements ICompatModule { - - @Override - public void preInit(FMLPreInitializationEvent event) { - - } - - @Override - public void init(FMLInitializationEvent event) { - // TODO remove basic machine frame recipe - // TODO replace iron in recipe to steel - // TODO add industrial blast furnace recipes for Enderium and Fluxed Electrum - } - - @Override - public void postInit(FMLPostInitializationEvent event) { - - } - - @Override - public void serverStarting(FMLServerStartingEvent event) { - - } -} diff --git a/build.gradle b/build.gradle index a275c3477..f413a47f3 100644 --- a/build.gradle +++ b/build.gradle @@ -36,6 +36,10 @@ repositories { name = "Amadornes" url "http://maven.amadornes.com/" } + ivy { + name "CraftTweaker3" + artifactPattern "http://www.blamejared.com/content/[module]-[classifier]-Full-[revision].[ext]" + } } configurations { @@ -51,7 +55,7 @@ if (ENV.BUILD_NUMBER) { } minecraft { - version = "1.9-12.16.0.1832-1.9" + version = "1.9-12.16.0.1863-1.9" mappings = "snapshot_20160316" replace "@MODVERSION@", project.version // makeObfSourceJar = false @@ -76,7 +80,7 @@ dependencies { f.mkdir() } compile 'RebornCore:RebornCore-1.9:2.0.4.+:dev' - deobfCompile "mezz.jei:jei_1.9:3.2.5.+" + deobfCompile "mezz.jei:jei_1.9:+" deobfCompile 'MCMultiPart:MCMultiPart-experimental:1.1.0_55:universal' } diff --git a/libs/CraftTweaker-Customized-1.9-3.0.3.jar b/libs/CraftTweaker-Customized-1.9-3.0.3.jar new file mode 100644 index 000000000..2b99a6120 Binary files /dev/null and b/libs/CraftTweaker-Customized-1.9-3.0.3.jar differ diff --git a/libs/Waila-1.7.1-B3_1.9.jar b/libs/Waila-1.7.0-B2_1.9-dev.jar similarity index 83% rename from libs/Waila-1.7.1-B3_1.9.jar rename to libs/Waila-1.7.0-B2_1.9-dev.jar index 13ee0da0c..44b29a6c7 100644 Binary files a/libs/Waila-1.7.1-B3_1.9.jar and b/libs/Waila-1.7.0-B2_1.9-dev.jar differ diff --git a/src/main/java/techreborn/compat/CompatManager.java b/src/main/java/techreborn/compat/CompatManager.java index 1f9b76058..160e87fdc 100644 --- a/src/main/java/techreborn/compat/CompatManager.java +++ b/src/main/java/techreborn/compat/CompatManager.java @@ -4,9 +4,12 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; import techreborn.client.render.parts.ClientPartLoader; +import techreborn.compat.minetweaker.MinetweakerCompat; +import techreborn.compat.waila.CompatModuleWaila; import techreborn.config.ConfigTechReborn; import techreborn.parts.StandalonePartCompact; import techreborn.parts.TechRebornParts; +import techreborn.parts.walia.WailaMcMultiPartCompact; import java.util.ArrayList; @@ -36,13 +39,12 @@ public class CompatManager { isGregTechLoaded = true; } - // registerCompact(MinetweakerCompat.class, "MineTweaker3"); - // registerCompact(RecipesBiomesOPlenty.class, "BiomesOPlenty"); - // registerCompact(RecipesBuildcraft.class, "BuildCraft|Builders"); - // registerCompact(RecipesThaumcraft.class, "Thaumcraft"); + registerCompact(MinetweakerCompat.class, "MineTweaker3"); registerCompact(TechRebornParts.class, "mcmultipart"); registerCompact(ClientPartLoader.class, "mcmultipart", "@client"); registerCompact(StandalonePartCompact.class, "!mcmultipart"); + registerCompact(WailaMcMultiPartCompact.class, "mcmultipart", "Waila", "!IC2"); + registerCompact(CompatModuleWaila.class, "Waila"); } public void registerCompact(Class moduleClass, Object... objs) diff --git a/ToAddBack/1.9/minetweaker/MTAlloySmelter.java b/src/main/java/techreborn/compat/minetweaker/MTAlloySmelter.java similarity index 97% rename from ToAddBack/1.9/minetweaker/MTAlloySmelter.java rename to src/main/java/techreborn/compat/minetweaker/MTAlloySmelter.java index 407c41b9e..d6f823c6a 100644 --- a/ToAddBack/1.9/minetweaker/MTAlloySmelter.java +++ b/src/main/java/techreborn/compat/minetweaker/MTAlloySmelter.java @@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import techreborn.api.recipe.machines.AlloySmelterRecipe; -import techreborn.lib.Reference; +import techreborn.api.Reference; /** * mods.techreborn.alloySmelter.addRecipe(, , , 20, 100); diff --git a/ToAddBack/1.9/minetweaker/MTAssemblingMachine.java b/src/main/java/techreborn/compat/minetweaker/MTAssemblingMachine.java similarity index 97% rename from ToAddBack/1.9/minetweaker/MTAssemblingMachine.java rename to src/main/java/techreborn/compat/minetweaker/MTAssemblingMachine.java index dbd9283fe..09428a130 100644 --- a/ToAddBack/1.9/minetweaker/MTAssemblingMachine.java +++ b/src/main/java/techreborn/compat/minetweaker/MTAssemblingMachine.java @@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import techreborn.api.recipe.machines.AssemblingMachineRecipe; -import techreborn.lib.Reference; +import techreborn.api.Reference; @ZenClass("mods.techreborn.assemblingMachine") diff --git a/ToAddBack/1.9/minetweaker/MTBlastFurnace.java b/src/main/java/techreborn/compat/minetweaker/MTBlastFurnace.java similarity index 97% rename from ToAddBack/1.9/minetweaker/MTBlastFurnace.java rename to src/main/java/techreborn/compat/minetweaker/MTBlastFurnace.java index 868dc1a98..bf4502160 100644 --- a/ToAddBack/1.9/minetweaker/MTBlastFurnace.java +++ b/src/main/java/techreborn/compat/minetweaker/MTBlastFurnace.java @@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import techreborn.api.recipe.machines.BlastFurnaceRecipe; -import techreborn.lib.Reference; +import techreborn.api.Reference; @ZenClass("mods.techreborn.blastFurnace") public class MTBlastFurnace extends MTGeneric { diff --git a/ToAddBack/1.9/minetweaker/MTCentrifuge.java b/src/main/java/techreborn/compat/minetweaker/MTCentrifuge.java similarity index 97% rename from ToAddBack/1.9/minetweaker/MTCentrifuge.java rename to src/main/java/techreborn/compat/minetweaker/MTCentrifuge.java index 6ecf9c843..adf400785 100644 --- a/ToAddBack/1.9/minetweaker/MTCentrifuge.java +++ b/src/main/java/techreborn/compat/minetweaker/MTCentrifuge.java @@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import techreborn.api.recipe.machines.CentrifugeRecipe; -import techreborn.lib.Reference; +import techreborn.api.Reference; @ZenClass("mods.techreborn.centrifuge") public class MTCentrifuge extends MTGeneric { diff --git a/ToAddBack/1.9/minetweaker/MTChemicalReactor.java b/src/main/java/techreborn/compat/minetweaker/MTChemicalReactor.java similarity index 97% rename from ToAddBack/1.9/minetweaker/MTChemicalReactor.java rename to src/main/java/techreborn/compat/minetweaker/MTChemicalReactor.java index 66f022773..7df12785a 100644 --- a/ToAddBack/1.9/minetweaker/MTChemicalReactor.java +++ b/src/main/java/techreborn/compat/minetweaker/MTChemicalReactor.java @@ -6,8 +6,8 @@ import minetweaker.api.item.IItemStack; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; +import techreborn.api.Reference; import techreborn.api.recipe.machines.ChemicalReactorRecipe; -import techreborn.lib.Reference; @ZenClass("mods.techreborn.chemicalReactorRecipe") public class MTChemicalReactor extends MTGeneric { diff --git a/ToAddBack/1.9/minetweaker/MTFusionReactor.java b/src/main/java/techreborn/compat/minetweaker/MTFusionReactor.java similarity index 100% rename from ToAddBack/1.9/minetweaker/MTFusionReactor.java rename to src/main/java/techreborn/compat/minetweaker/MTFusionReactor.java diff --git a/ToAddBack/1.9/minetweaker/MTGenerator.java b/src/main/java/techreborn/compat/minetweaker/MTGenerator.java similarity index 100% rename from ToAddBack/1.9/minetweaker/MTGenerator.java rename to src/main/java/techreborn/compat/minetweaker/MTGenerator.java diff --git a/ToAddBack/1.9/minetweaker/MTGeneric.java b/src/main/java/techreborn/compat/minetweaker/MTGeneric.java similarity index 97% rename from ToAddBack/1.9/minetweaker/MTGeneric.java rename to src/main/java/techreborn/compat/minetweaker/MTGeneric.java index 26b8dba5e..efbe46ea3 100644 --- a/ToAddBack/1.9/minetweaker/MTGeneric.java +++ b/src/main/java/techreborn/compat/minetweaker/MTGeneric.java @@ -5,10 +5,11 @@ import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.minecraft.MineTweakerMC; import net.minecraft.item.ItemStack; +import reborncore.api.recipe.IBaseRecipeType; +import reborncore.api.recipe.RecipeHandler; import reborncore.common.util.ItemUtils; import techreborn.api.recipe.BaseRecipe; -import techreborn.api.recipe.IBaseRecipeType; -import techreborn.api.recipe.RecipeHandler; +import techreborn.api.Reference; import java.util.ArrayList; import java.util.List; diff --git a/ToAddBack/1.9/minetweaker/MTImplosionCompressor.java b/src/main/java/techreborn/compat/minetweaker/MTImplosionCompressor.java similarity index 97% rename from ToAddBack/1.9/minetweaker/MTImplosionCompressor.java rename to src/main/java/techreborn/compat/minetweaker/MTImplosionCompressor.java index 8c12e0bde..58056e7ec 100644 --- a/ToAddBack/1.9/minetweaker/MTImplosionCompressor.java +++ b/src/main/java/techreborn/compat/minetweaker/MTImplosionCompressor.java @@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import techreborn.api.recipe.machines.ImplosionCompressorRecipe; -import techreborn.lib.Reference; +import techreborn.api.Reference; @ZenClass("mods.techreborn.implosionCompressor") public class MTImplosionCompressor extends MTGeneric { diff --git a/ToAddBack/1.9/minetweaker/MTIndustrialElectrolyzer.java b/src/main/java/techreborn/compat/minetweaker/MTIndustrialElectrolyzer.java similarity index 97% rename from ToAddBack/1.9/minetweaker/MTIndustrialElectrolyzer.java rename to src/main/java/techreborn/compat/minetweaker/MTIndustrialElectrolyzer.java index e7a7fde60..3958e9795 100644 --- a/ToAddBack/1.9/minetweaker/MTIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/compat/minetweaker/MTIndustrialElectrolyzer.java @@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import techreborn.api.recipe.machines.IndustrialElectrolyzerRecipe; -import techreborn.lib.Reference; +import techreborn.api.Reference; @ZenClass("mods.techreborn.industrialElectrolyzer") public class MTIndustrialElectrolyzer extends MTGeneric { diff --git a/ToAddBack/1.9/minetweaker/MTIndustrialGrinder.java b/src/main/java/techreborn/compat/minetweaker/MTIndustrialGrinder.java similarity index 98% rename from ToAddBack/1.9/minetweaker/MTIndustrialGrinder.java rename to src/main/java/techreborn/compat/minetweaker/MTIndustrialGrinder.java index 6745881be..9e6f3c97b 100644 --- a/ToAddBack/1.9/minetweaker/MTIndustrialGrinder.java +++ b/src/main/java/techreborn/compat/minetweaker/MTIndustrialGrinder.java @@ -9,7 +9,7 @@ import net.minecraftforge.fluids.FluidStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import techreborn.api.recipe.machines.IndustrialGrinderRecipe; -import techreborn.lib.Reference; +import techreborn.api.Reference; @ZenClass("mods.techreborn.grinder") public class MTIndustrialGrinder extends MTGeneric { diff --git a/ToAddBack/1.9/minetweaker/MTIndustrialSawmill.java b/src/main/java/techreborn/compat/minetweaker/MTIndustrialSawmill.java similarity index 98% rename from ToAddBack/1.9/minetweaker/MTIndustrialSawmill.java rename to src/main/java/techreborn/compat/minetweaker/MTIndustrialSawmill.java index d9219d358..432aa347b 100644 --- a/ToAddBack/1.9/minetweaker/MTIndustrialSawmill.java +++ b/src/main/java/techreborn/compat/minetweaker/MTIndustrialSawmill.java @@ -9,7 +9,7 @@ import net.minecraftforge.fluids.FluidStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import techreborn.api.recipe.machines.IndustrialSawmillRecipe; -import techreborn.lib.Reference; +import techreborn.api.Reference; @ZenClass("mods.techreborn.industrialSawmill") public class MTIndustrialSawmill extends MTGeneric { diff --git a/ToAddBack/1.9/minetweaker/MTPlateCuttingMachine.java b/src/main/java/techreborn/compat/minetweaker/MTPlateCuttingMachine.java similarity index 97% rename from ToAddBack/1.9/minetweaker/MTPlateCuttingMachine.java rename to src/main/java/techreborn/compat/minetweaker/MTPlateCuttingMachine.java index 687647c2e..52c156e97 100644 --- a/ToAddBack/1.9/minetweaker/MTPlateCuttingMachine.java +++ b/src/main/java/techreborn/compat/minetweaker/MTPlateCuttingMachine.java @@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import techreborn.api.recipe.machines.PlateCuttingMachineRecipe; -import techreborn.lib.Reference; +import techreborn.api.Reference; @ZenClass("mods.techreborn.plateCuttingMachine") public class MTPlateCuttingMachine extends MTGeneric { diff --git a/ToAddBack/1.9/minetweaker/MTRollingMachine.java b/src/main/java/techreborn/compat/minetweaker/MTRollingMachine.java similarity index 100% rename from ToAddBack/1.9/minetweaker/MTRollingMachine.java rename to src/main/java/techreborn/compat/minetweaker/MTRollingMachine.java diff --git a/ToAddBack/1.9/minetweaker/MTVacuumFreezer.java b/src/main/java/techreborn/compat/minetweaker/MTVacuumFreezer.java similarity index 97% rename from ToAddBack/1.9/minetweaker/MTVacuumFreezer.java rename to src/main/java/techreborn/compat/minetweaker/MTVacuumFreezer.java index 6367ae1d9..f0b60bb06 100644 --- a/ToAddBack/1.9/minetweaker/MTVacuumFreezer.java +++ b/src/main/java/techreborn/compat/minetweaker/MTVacuumFreezer.java @@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import techreborn.api.recipe.machines.VacuumFreezerRecipe; -import techreborn.lib.Reference; +import techreborn.api.Reference; @ZenClass("mods.techreborn.vacuumFreezer") public class MTVacuumFreezer extends MTGeneric { diff --git a/ToAddBack/1.9/minetweaker/MinetweakerCompat.java b/src/main/java/techreborn/compat/minetweaker/MinetweakerCompat.java similarity index 100% rename from ToAddBack/1.9/minetweaker/MinetweakerCompat.java rename to src/main/java/techreborn/compat/minetweaker/MinetweakerCompat.java diff --git a/ToAddBack/compat/waila/CompatModuleWaila.java b/src/main/java/techreborn/compat/waila/CompatModuleWaila.java similarity index 100% rename from ToAddBack/compat/waila/CompatModuleWaila.java rename to src/main/java/techreborn/compat/waila/CompatModuleWaila.java diff --git a/ToAddBack/compat/waila/WailaProviderMachines.java b/src/main/java/techreborn/compat/waila/WailaProviderMachines.java similarity index 100% rename from ToAddBack/compat/waila/WailaProviderMachines.java rename to src/main/java/techreborn/compat/waila/WailaProviderMachines.java diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/ModItems.java index 41a1c86a8..6cc2effd7 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/ModItems.java @@ -334,7 +334,7 @@ public class ModItems FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidberylium", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketBerylium), new ItemStack(Items.bucket)); - BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidBerylium.getDefaultState(), bucketBerylium); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidBerylium.getFluid(), bucketBerylium); bucketcalcium = new ItemFluidbucket(ModFluids.BlockFluidCalcium); bucketcalcium.setUnlocalizedName("bucketcalcium").setContainerItem(Items.bucket); @@ -342,7 +342,7 @@ public class ModItems FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidcalcium", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketcalcium), new ItemStack(Items.bucket)); - BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidCalcium.getDefaultState(), bucketcalcium); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidCalcium.getFluid(), bucketcalcium); bucketcalciumcarbonate = new ItemFluidbucket(ModFluids.BlockFluidCalciumCarbonate); bucketcalciumcarbonate.setUnlocalizedName("bucketcalciumcarbonate").setContainerItem(Items.bucket); @@ -350,7 +350,7 @@ public class ModItems FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidcalciumcarbonate", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketcalciumcarbonate), new ItemStack(Items.bucket)); - BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidCalciumCarbonate.getDefaultState(), + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidCalciumCarbonate.getFluid(), bucketcalciumcarbonate); bucketChlorite = new ItemFluidbucket(ModFluids.BlockFluidChlorite); @@ -359,7 +359,7 @@ public class ModItems FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidchlorite", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketcalciumcarbonate), new ItemStack(Items.bucket)); - BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidChlorite.getDefaultState(), bucketChlorite); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidChlorite.getFluid(), bucketChlorite); bucketDeuterium = new ItemFluidbucket(ModFluids.BlockFluidDeuterium); bucketDeuterium.setUnlocalizedName("bucketdeuterium").setContainerItem(Items.bucket); @@ -367,7 +367,7 @@ public class ModItems FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluiddeuterium", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketDeuterium), new ItemStack(Items.bucket)); - BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidDeuterium.getDefaultState(), bucketDeuterium); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidDeuterium.getFluid(), bucketDeuterium); bucketGlyceryl = new ItemFluidbucket(ModFluids.BlockFluidGlyceryl); bucketGlyceryl.setUnlocalizedName("bucketglyceryl").setContainerItem(Items.bucket); @@ -375,7 +375,7 @@ public class ModItems FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidglyceryl", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketGlyceryl), new ItemStack(Items.bucket)); - BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidGlyceryl.getDefaultState(), bucketGlyceryl); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidGlyceryl.getFluid(), bucketGlyceryl); bucketHelium = new ItemFluidbucket(ModFluids.BlockFluidHelium); bucketHelium.setUnlocalizedName("buckethelium").setContainerItem(Items.bucket); @@ -383,7 +383,7 @@ public class ModItems FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidhelium", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketHelium), new ItemStack(Items.bucket)); - BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidHelium.getDefaultState(), bucketHelium); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidHelium.getFluid(), bucketHelium); bucketHelium3 = new ItemFluidbucket(ModFluids.BlockFluidHelium3); bucketHelium3.setUnlocalizedName("buckethelium3").setContainerItem(Items.bucket); @@ -391,7 +391,7 @@ public class ModItems FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidhelium3", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketHelium3), new ItemStack(Items.bucket)); - BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidHelium3.getDefaultState(), bucketHelium3); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidHelium3.getFluid(), bucketHelium3); bucketHeliumplasma = new ItemFluidbucket(ModFluids.BlockFluidHeliumplasma); bucketHeliumplasma.setUnlocalizedName("bucketheliumplasma").setContainerItem(Items.bucket); @@ -399,7 +399,7 @@ public class ModItems FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidheliumplasma", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketHeliumplasma), new ItemStack(Items.bucket)); - BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidHeliumplasma.getDefaultState(), bucketHeliumplasma); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidHeliumplasma.getFluid(), bucketHeliumplasma); bucketHydrogen = new ItemFluidbucket(ModFluids.BlockFluidHydrogen); bucketHydrogen.setUnlocalizedName("buckethydrogen").setContainerItem(Items.bucket); @@ -407,7 +407,7 @@ public class ModItems FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidhydrogen", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketHydrogen), new ItemStack(Items.bucket)); - BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidHydrogen.getDefaultState(), bucketHydrogen); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidHydrogen.getFluid(), bucketHydrogen); bucketLithium = new ItemFluidbucket(ModFluids.BlockFluidLithium); bucketLithium.setUnlocalizedName("bucketlithium").setContainerItem(Items.bucket); @@ -415,7 +415,7 @@ public class ModItems FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidlithium", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketLithium), new ItemStack(Items.bucket)); - BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidLithium.getDefaultState(), bucketLithium); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidLithium.getFluid(), bucketLithium); bucketMercury = new ItemFluidbucket(ModFluids.BlockFluidMercury); bucketMercury.setUnlocalizedName("bucketmercury").setContainerItem(Items.bucket); @@ -423,7 +423,7 @@ public class ModItems FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidmercury", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketMercury), new ItemStack(Items.bucket)); - BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidMercury.getDefaultState(), bucketMercury); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidMercury.getFluid(), bucketMercury); bucketMethane = new ItemFluidbucket(ModFluids.BlockFluidMethane); bucketMethane.setUnlocalizedName("bucketmethane").setContainerItem(Items.bucket); @@ -431,7 +431,7 @@ public class ModItems FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidmethane", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketMethane), new ItemStack(Items.bucket)); - BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidMethane.getDefaultState(), bucketMethane); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidMethane.getFluid(), bucketMethane); bucketNitrocoalfuel = new ItemFluidbucket(ModFluids.BlockFluidNitrocoalfuel); bucketNitrocoalfuel.setUnlocalizedName("bucketnitrocoalfuel").setContainerItem(Items.bucket); @@ -439,7 +439,7 @@ public class ModItems FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidnitrocoalfuel", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketNitrocoalfuel), new ItemStack(Items.bucket)); - BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidNitrocoalfuel.getDefaultState(), bucketNitrocoalfuel); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidNitrocoalfuel.getFluid(), bucketNitrocoalfuel); bucketNitrofuel = new ItemFluidbucket(ModFluids.BlockFluidNitrofuel); bucketNitrofuel.setUnlocalizedName("bucketnitrofuel").setContainerItem(Items.bucket); @@ -447,7 +447,7 @@ public class ModItems FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidnitrofuel", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketNitrofuel), new ItemStack(Items.bucket)); - BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidNitrofuel.getDefaultState(), bucketNitrofuel); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidNitrofuel.getFluid(), bucketNitrofuel); bucketNitrogen = new ItemFluidbucket(ModFluids.BlockFluidNitrogen); bucketNitrogen.setUnlocalizedName("bucketnitrogen").setContainerItem(Items.bucket); @@ -455,7 +455,7 @@ public class ModItems FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidnitrogen", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketNitrogen), new ItemStack(Items.bucket)); - BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidNitrogen.getDefaultState(), bucketNitrogen); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidNitrogen.getFluid(), bucketNitrogen); bucketNitrogendioxide = new ItemFluidbucket(ModFluids.BlockFluidNitrogendioxide); bucketNitrogendioxide.setUnlocalizedName("bucketnitrogendioxide").setContainerItem(Items.bucket); @@ -463,7 +463,7 @@ public class ModItems FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidnitrogendioxide", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketNitrogendioxide), new ItemStack(Items.bucket)); - BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidNitrogendioxide.getDefaultState(), + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidNitrogendioxide.getFluid(), bucketNitrogendioxide); bucketPotassium = new ItemFluidbucket(ModFluids.BlockFluidPotassium); @@ -472,7 +472,7 @@ public class ModItems FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidpotassium", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketPotassium), new ItemStack(Items.bucket)); - BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidPotassium.getDefaultState(), bucketPotassium); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidPotassium.getFluid(), bucketPotassium); bucketSilicon = new ItemFluidbucket(ModFluids.BlockFluidSilicon); bucketSilicon.setUnlocalizedName("bucketsilicon").setContainerItem(Items.bucket); @@ -480,7 +480,7 @@ public class ModItems FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidsilicon", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketSilicon), new ItemStack(Items.bucket)); - BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidSilicon.getDefaultState(), bucketSilicon); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidSilicon.getFluid(), bucketSilicon); bucketSodium = new ItemFluidbucket(ModFluids.BlockFluidSodium); bucketSodium.setUnlocalizedName("bucketsodium").setContainerItem(Items.bucket); @@ -488,7 +488,7 @@ public class ModItems FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidsodium", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketSodium), new ItemStack(Items.bucket)); - BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidSodium.getDefaultState(), bucketSodium); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidSodium.getFluid(), bucketSodium); bucketSodiumpersulfate = new ItemFluidbucket(ModFluids.BlockFluidSodiumpersulfate); bucketSodiumpersulfate.setUnlocalizedName("bucketsodiumpersulfate").setContainerItem(Items.bucket); @@ -496,7 +496,7 @@ public class ModItems FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidsodiumpersulfate", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketSodiumpersulfate), new ItemStack(Items.bucket)); - BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidSodiumpersulfate.getDefaultState(), + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidSodiumpersulfate.getFluid(), bucketSodiumpersulfate); bucketTritium = new ItemFluidbucket(ModFluids.BlockFluidTritium); @@ -505,7 +505,7 @@ public class ModItems FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidtritium", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketTritium), new ItemStack(Items.bucket)); - BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidTritium.getDefaultState(), bucketTritium); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidTritium.getFluid(), bucketTritium); bucketWolframium = new ItemFluidbucket(ModFluids.BlockFluidWolframium); bucketWolframium.setUnlocalizedName("bucketwolframium").setContainerItem(Items.bucket); @@ -513,7 +513,7 @@ public class ModItems FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidwolframium", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketWolframium), new ItemStack(Items.bucket)); - BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidWolframium.getDefaultState(), bucketWolframium); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidWolframium.getFluid(), bucketWolframium); missingRecipe = new ItemMissingRecipe().setUnlocalizedName("missingRecipe"); GameRegistry.registerItem(missingRecipe, "mssingRecipe"); diff --git a/src/main/java/techreborn/parts/CableMultipart.java b/src/main/java/techreborn/parts/CableMultipart.java index 244e47f5f..9812394d8 100644 --- a/src/main/java/techreborn/parts/CableMultipart.java +++ b/src/main/java/techreborn/parts/CableMultipart.java @@ -1,19 +1,8 @@ package techreborn.parts; -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import mcmultipart.MCMultiPartMod; import mcmultipart.microblock.IMicroblock; -import mcmultipart.multipart.IMultipartContainer; -import mcmultipart.multipart.INormallyOccludingPart; -import mcmultipart.multipart.ISlottedPart; -import mcmultipart.multipart.Multipart; -import mcmultipart.multipart.MultipartHelper; -import mcmultipart.multipart.PartSlot; +import mcmultipart.multipart.*; import mcmultipart.raytrace.PartMOP; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -27,13 +16,10 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.ITickable; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.*; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; @@ -44,396 +30,392 @@ import reborncore.common.misc.Functions; import reborncore.common.misc.vecmath.Vecs3dCube; import reborncore.common.util.WorldUtils; import techreborn.config.ConfigTechReborn; +import techreborn.parts.walia.IPartWaliaProvider; import techreborn.power.TRPowerNet; import techreborn.utils.damageSources.ElectrialShockSource; +import java.util.*; + /** * Created by modmuss50 on 02/03/2016. */ public abstract class CableMultipart extends Multipart - implements INormallyOccludingPart, ISlottedPart, ITickable, ICableType { + implements INormallyOccludingPart, ISlottedPart, ITickable, ICableType, IPartWaliaProvider { - public static final IUnlistedProperty UP = Properties.toUnlisted(PropertyBool.create("up")); - public static final IUnlistedProperty DOWN = Properties.toUnlisted(PropertyBool.create("down")); - public static final IUnlistedProperty NORTH = Properties.toUnlisted(PropertyBool.create("north")); - public static final IUnlistedProperty EAST = Properties.toUnlisted(PropertyBool.create("east")); - public static final IUnlistedProperty SOUTH = Properties.toUnlisted(PropertyBool.create("south")); - public static final IUnlistedProperty WEST = Properties.toUnlisted(PropertyBool.create("west")); - public static final IProperty TYPE = PropertyEnum.create("type", EnumCableType.class); - public Vecs3dCube[] boundingBoxes = new Vecs3dCube[14]; - public float center = 0.6F; - public float offset = 0.10F; - public Map connectedSides; - public int ticks = 0; - public ItemStack stack; - public TRPowerNet mergeWith = null; - private TRPowerNet network; + public static final IUnlistedProperty UP = Properties.toUnlisted(PropertyBool.create("up")); + public static final IUnlistedProperty DOWN = Properties.toUnlisted(PropertyBool.create("down")); + public static final IUnlistedProperty NORTH = Properties.toUnlisted(PropertyBool.create("north")); + public static final IUnlistedProperty EAST = Properties.toUnlisted(PropertyBool.create("east")); + public static final IUnlistedProperty SOUTH = Properties.toUnlisted(PropertyBool.create("south")); + public static final IUnlistedProperty WEST = Properties.toUnlisted(PropertyBool.create("west")); + public static final IProperty TYPE = PropertyEnum.create("type", EnumCableType.class); + public Vecs3dCube[] boundingBoxes = new Vecs3dCube[14]; + public float center = 0.6F; + public float offset = 0.10F; + public Map connectedSides; + public int ticks = 0; + public ItemStack stack; + public TRPowerNet mergeWith = null; + private TRPowerNet network; - public CableMultipart() { - connectedSides = new HashMap<>(); - refreshBounding(); - } + public CableMultipart() { + connectedSides = new HashMap<>(); + refreshBounding(); + } - public static CableMultipart getPartFromWorld(World world, BlockPos pos, EnumFacing side) { - if (world == null || pos == null) { - return null; - } - IMultipartContainer container = MultipartHelper.getPartContainer(world, pos); - if (side != null && container != null) { - ISlottedPart slottedPart = container.getPartInSlot(PartSlot.getFaceSlot(side)); - if (slottedPart instanceof IMicroblock.IFaceMicroblock - && !((IMicroblock.IFaceMicroblock) slottedPart).isFaceHollow()) { - return null; - } - } + public static CableMultipart getPartFromWorld(World world, BlockPos pos, EnumFacing side) { + if (world == null || pos == null) { + return null; + } + IMultipartContainer container = MultipartHelper.getPartContainer(world, pos); + if (side != null && container != null) { + ISlottedPart slottedPart = container.getPartInSlot(PartSlot.getFaceSlot(side)); + if (slottedPart instanceof IMicroblock.IFaceMicroblock + && !((IMicroblock.IFaceMicroblock) slottedPart).isFaceHollow()) { + return null; + } + } - if (container == null) { - return null; - } - ISlottedPart part = container.getPartInSlot(PartSlot.CENTER); - if (part instanceof CableMultipart) { - return (CableMultipart) part; - } - return null; - } + if (container == null) { + return null; + } + ISlottedPart part = container.getPartInSlot(PartSlot.CENTER); + if (part instanceof CableMultipart) { + return (CableMultipart) part; + } + return null; + } - public void refreshBounding() { - float centerFirst = center - offset; - double w = (getCableType().cableThickness / 16) - 0.5; - boundingBoxes[6] = new Vecs3dCube(centerFirst - w, centerFirst - w, centerFirst - w, centerFirst + w, - centerFirst + w, centerFirst + w); + public void refreshBounding() { + float centerFirst = center - offset; + double w = (getCableType().cableThickness / 16) - 0.5; + boundingBoxes[6] = new Vecs3dCube(centerFirst - w, centerFirst - w, centerFirst - w, centerFirst + w, + centerFirst + w, centerFirst + w); - int i = 0; - for (EnumFacing dir : EnumFacing.VALUES) { - double xMin1 = (dir.getFrontOffsetX() < 0 ? 0.0 - : (dir.getFrontOffsetX() == 0 ? centerFirst - w : centerFirst + w)); - double xMax1 = (dir.getFrontOffsetX() > 0 ? 1.0 - : (dir.getFrontOffsetX() == 0 ? centerFirst + w : centerFirst - w)); + int i = 0; + for (EnumFacing dir : EnumFacing.VALUES) { + double xMin1 = (dir.getFrontOffsetX() < 0 ? 0.0 + : (dir.getFrontOffsetX() == 0 ? centerFirst - w : centerFirst + w)); + double xMax1 = (dir.getFrontOffsetX() > 0 ? 1.0 + : (dir.getFrontOffsetX() == 0 ? centerFirst + w : centerFirst - w)); - double yMin1 = (dir.getFrontOffsetY() < 0 ? 0.0 - : (dir.getFrontOffsetY() == 0 ? centerFirst - w : centerFirst + w)); - double yMax1 = (dir.getFrontOffsetY() > 0 ? 1.0 - : (dir.getFrontOffsetY() == 0 ? centerFirst + w : centerFirst - w)); + double yMin1 = (dir.getFrontOffsetY() < 0 ? 0.0 + : (dir.getFrontOffsetY() == 0 ? centerFirst - w : centerFirst + w)); + double yMax1 = (dir.getFrontOffsetY() > 0 ? 1.0 + : (dir.getFrontOffsetY() == 0 ? centerFirst + w : centerFirst - w)); - double zMin1 = (dir.getFrontOffsetZ() < 0 ? 0.0 - : (dir.getFrontOffsetZ() == 0 ? centerFirst - w : centerFirst + w)); - double zMax1 = (dir.getFrontOffsetZ() > 0 ? 1.0 - : (dir.getFrontOffsetZ() == 0 ? centerFirst + w : centerFirst - w)); + double zMin1 = (dir.getFrontOffsetZ() < 0 ? 0.0 + : (dir.getFrontOffsetZ() == 0 ? centerFirst - w : centerFirst + w)); + double zMax1 = (dir.getFrontOffsetZ() > 0 ? 1.0 + : (dir.getFrontOffsetZ() == 0 ? centerFirst + w : centerFirst - w)); - boundingBoxes[i] = new Vecs3dCube(xMin1, yMin1, zMin1, xMax1, yMax1, zMax1); - i++; - } - } + boundingBoxes[i] = new Vecs3dCube(xMin1, yMin1, zMin1, xMax1, yMax1, zMax1); + i++; + } + } - @Override - public void addCollisionBoxes(AxisAlignedBB mask, List list, Entity collidingEntity) { + @Override + public void addCollisionBoxes(AxisAlignedBB mask, List list, Entity collidingEntity) { - for (EnumFacing dir : EnumFacing.VALUES) { - if (connectedSides.containsKey(dir) - && mask.intersectsWith(boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB())) - list.add(boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB()); - } - if (mask.intersectsWith(boundingBoxes[6].toAABB())) { - list.add(boundingBoxes[6].toAABB()); - } - super.addCollisionBoxes(mask, list, collidingEntity); - } + for (EnumFacing dir : EnumFacing.VALUES) { + if (connectedSides.containsKey(dir) + && mask.intersectsWith(boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB())) + list.add(boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB()); + } + if (mask.intersectsWith(boundingBoxes[6].toAABB())) { + list.add(boundingBoxes[6].toAABB()); + } + super.addCollisionBoxes(mask, list, collidingEntity); + } - @Override - public void addSelectionBoxes(List list) { + @Override + public void addSelectionBoxes(List list) { - for (EnumFacing dir : EnumFacing.VALUES) { - if (connectedSides.containsKey(dir)) - list.add(boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB()); - } - list.add(boundingBoxes[6].toAABB()); - super.addSelectionBoxes(list); - } + for (EnumFacing dir : EnumFacing.VALUES) { + if (connectedSides.containsKey(dir)) + list.add(boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB()); + } + list.add(boundingBoxes[6].toAABB()); + super.addSelectionBoxes(list); + } - @Override - public void onRemoved() { - super.onRemoved(); - removeFromNetwork(); - for (EnumFacing dir : EnumFacing.VALUES) { - CableMultipart multipart = getPartFromWorld(getWorld(), getPos().offset(dir), dir); - if (multipart != null) { - multipart.nearByChange(); - } - } - } + @Override + public void onRemoved() { + super.onRemoved(); + removeFromNetwork(); + for (EnumFacing dir : EnumFacing.VALUES) { + CableMultipart multipart = getPartFromWorld(getWorld(), getPos().offset(dir), dir); + if (multipart != null) { + multipart.nearByChange(); + } + } + } - @Override - public void onUnloaded() { - super.onUnloaded(); - removeFromNetwork(); - } + @Override + public void onUnloaded() { + super.onUnloaded(); + removeFromNetwork(); + } - @Override - public void addOcclusionBoxes(List list) { - for (EnumFacing dir : EnumFacing.VALUES) { - if (connectedSides.containsKey(dir)) - list.add(boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB()); - } - list.add(boundingBoxes[6].toAABB()); - } + @Override + public void addOcclusionBoxes(List list) { + for (EnumFacing dir : EnumFacing.VALUES) { + if (connectedSides.containsKey(dir)) + list.add(boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB()); + } + list.add(boundingBoxes[6].toAABB()); + } - @Override - public void onNeighborBlockChange(Block block) { - super.onNeighborBlockChange(block); - nearByChange(); + @Override + public void onNeighborBlockChange(Block block) { + super.onNeighborBlockChange(block); + nearByChange(); - } + } - public void nearByChange() { - if (network == null) { - findAndJoinNetwork(getWorld(), getPos()); - } - checkConnectedSides(); - for (EnumFacing direction : EnumFacing.VALUES) { - BlockPos blockPos = getPos().offset(direction); - WorldUtils.updateBlock(getWorld(), blockPos); - CableMultipart part = getPartFromWorld(getWorld(), blockPos, direction); - if (part != null) { - part.checkConnectedSides(); - } - } - TRPowerNet.buildEndpoint(network); - } + public void nearByChange() { + if (network == null) { + findAndJoinNetwork(getWorld(), getPos()); + } + checkConnectedSides(); + for (EnumFacing direction : EnumFacing.VALUES) { + BlockPos blockPos = getPos().offset(direction); + WorldUtils.updateBlock(getWorld(), blockPos); + CableMultipart part = getPartFromWorld(getWorld(), blockPos, direction); + if (part != null) { + part.checkConnectedSides(); + } + } + TRPowerNet.buildEndpoint(network); + } - @Override - public void onAdded() { - nearByChange(); - } + @Override + public void onAdded() { + nearByChange(); + } - public boolean shouldConnectTo(EnumFacing dir) { - if (dir != null) { - if (internalShouldConnectTo(dir)) { - CableMultipart cableMultipart = getPartFromWorld(getWorld(), getPos().offset(dir), dir); - if (cableMultipart != null && cableMultipart.internalShouldConnectTo(dir.getOpposite())) { - return true; - } - } else { - TileEntity tile = getNeighbourTile(dir); + public boolean shouldConnectTo(EnumFacing dir) { + if (dir != null) { + if (internalShouldConnectTo(dir)) { + CableMultipart cableMultipart = getPartFromWorld(getWorld(), getPos().offset(dir), dir); + if (cableMultipart != null && cableMultipart.internalShouldConnectTo(dir.getOpposite())) { + return true; + } + } else { + TileEntity tile = getNeighbourTile(dir); - if (tile instanceof IEnergyInterfaceTile) { - return true; - } - } - } - return false; - } + if (tile instanceof IEnergyInterfaceTile) { + return true; + } + } + } + return false; + } - public boolean internalShouldConnectTo(EnumFacing dir) { - ISlottedPart part = getContainer().getPartInSlot(PartSlot.getFaceSlot(dir)); - if (part instanceof IMicroblock.IFaceMicroblock) { - if (!((IMicroblock.IFaceMicroblock) part).isFaceHollow()) { - return false; - } - } + public boolean internalShouldConnectTo(EnumFacing dir) { + ISlottedPart part = getContainer().getPartInSlot(PartSlot.getFaceSlot(dir)); + if (part instanceof IMicroblock.IFaceMicroblock) { + if (!((IMicroblock.IFaceMicroblock) part).isFaceHollow()) { + return false; + } + } - // TODO 1.9 boken - // if (!OcclusionHelper.occlusionTest(this, - // boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB())) { - // return false; - // } + if (!OcclusionHelper.occlusionTest(getContainer().getParts(), p -> p == this, boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB())) { + return false; + } - CableMultipart cableMultipart = getPartFromWorld(getWorld(), getPos().offset(dir), dir.getOpposite()); + CableMultipart cableMultipart = getPartFromWorld(getWorld(), getPos().offset(dir), dir.getOpposite()); - return cableMultipart != null && cableMultipart.getCableType() == getCableType(); - } + return cableMultipart != null && cableMultipart.getCableType() == getCableType(); + } - public TileEntity getNeighbourTile(EnumFacing side) { - return side != null ? getWorld().getTileEntity(getPos().offset(side)) : null; - } + public TileEntity getNeighbourTile(EnumFacing side) { + return side != null ? getWorld().getTileEntity(getPos().offset(side)) : null; + } - public void checkConnectedSides() { - refreshBounding(); - connectedSides = new HashMap<>(); - for (EnumFacing dir : EnumFacing.values()) { - int d = Functions.getIntDirFromDirection(dir); - if (getWorld() == null) { - return; - } - TileEntity te = getNeighbourTile(dir); - if (shouldConnectTo(dir)) { - connectedSides.put(dir, te.getPos()); - } - } - } + public void checkConnectedSides() { + refreshBounding(); + connectedSides = new HashMap<>(); + for (EnumFacing dir : EnumFacing.values()) { + int d = Functions.getIntDirFromDirection(dir); + if (getWorld() == null) { + return; + } + TileEntity te = getNeighbourTile(dir); + if (shouldConnectTo(dir)) { + connectedSides.put(dir, te.getPos()); + } + } + } - @Override - public EnumSet getSlotMask() { - return EnumSet.of(PartSlot.CENTER); - } + @Override + public EnumSet getSlotMask() { + return EnumSet.of(PartSlot.CENTER); + } - @Override - public void update() { - if (getWorld() != null) { - if (getWorld().getTotalWorldTime() % 80 == 0) { - checkConnectedSides(); - } - } - if (network == null) { - this.findAndJoinNetwork(getWorld(), getPos()); - } else { - if (mergeWith != null) { - getNetwork().merge(network); - mergeWith = null; - } - } - } + @Override + public void update() { + if (getWorld() != null) { + if (getWorld().getTotalWorldTime() % 80 == 0) { + checkConnectedSides(); + } + } + if (network == null) { + this.findAndJoinNetwork(getWorld(), getPos()); + } else { + if (mergeWith != null) { + getNetwork().merge(network); + mergeWith = null; + } + } + } - @Override - public IBlockState getExtendedState(IBlockState state) { - IExtendedBlockState extendedBlockState = (IExtendedBlockState) state; - return extendedBlockState.withProperty(DOWN, shouldConnectTo(EnumFacing.DOWN)) - .withProperty(UP, shouldConnectTo(EnumFacing.UP)).withProperty(NORTH, shouldConnectTo(EnumFacing.NORTH)) - .withProperty(SOUTH, shouldConnectTo(EnumFacing.SOUTH)) - .withProperty(WEST, shouldConnectTo(EnumFacing.WEST)) - .withProperty(EAST, shouldConnectTo(EnumFacing.EAST)).withProperty(TYPE, getCableType()); - } + @Override + public IBlockState getExtendedState(IBlockState state) { + IExtendedBlockState extendedBlockState = (IExtendedBlockState) state; + return extendedBlockState.withProperty(DOWN, shouldConnectTo(EnumFacing.DOWN)) + .withProperty(UP, shouldConnectTo(EnumFacing.UP)).withProperty(NORTH, shouldConnectTo(EnumFacing.NORTH)) + .withProperty(SOUTH, shouldConnectTo(EnumFacing.SOUTH)) + .withProperty(WEST, shouldConnectTo(EnumFacing.WEST)) + .withProperty(EAST, shouldConnectTo(EnumFacing.EAST)).withProperty(TYPE, getCableType()); + } - // @Override - // public String getModelPath() { - // return "techreborn:cable"; - // } + @Override + public BlockStateContainer createBlockState() { + return new ExtendedBlockState(MCMultiPartMod.multipart, new IProperty[]{TYPE}, + new IUnlistedProperty[]{DOWN, UP, NORTH, SOUTH, WEST, EAST}); + } - @Override - public BlockStateContainer createBlockState() { - return new ExtendedBlockState(MCMultiPartMod.multipart, new IProperty[] { TYPE }, - new IUnlistedProperty[] { DOWN, UP, NORTH, SOUTH, WEST, EAST }); - } + @Override + public float getHardness(PartMOP hit) { + return 0.5F; + } - @Override - public float getHardness(PartMOP hit) { - return 0.5F; - } + public Material getMaterial() { + return Material.cloth; + } - public Material getMaterial() { - return Material.cloth; - } + @Override + public List getDrops() { + List list = new ArrayList<>(); + list.add(new ItemStack(TechRebornParts.cables, 1, getCableType().ordinal())); + return list; + } - @Override - public List getDrops() { - List list = new ArrayList<>(); - list.add(new ItemStack(TechRebornParts.cables, 1, getCableType().ordinal())); - return list; - } + @Override + public void onEntityCollided(Entity entity) { + if (getCableType().canKill && entity instanceof EntityLivingBase) { + if (entity instanceof EntityPlayer && ((EntityPlayer) entity).capabilities.isCreativeMode) { - @Override - public void onEntityCollided(Entity entity) { - if (getCableType().canKill && entity instanceof EntityLivingBase) { - if (entity instanceof EntityPlayer && ((EntityPlayer) entity).capabilities.isCreativeMode) { - - } else { - if (network != null) { - if (network.getEnergy() != 0) { - if (ConfigTechReborn.UninsulatedElectocutionDamage) { - if (getCableType() == EnumCableType.HV) { - entity.setFire(1); - } - network.setEnergy(-1); - entity.attackEntityFrom(new ElectrialShockSource(), 1F); - } - if (ConfigTechReborn.UninsulatedElectocutionSound) { - // getWorld().playSound(entity.posX, entity.posY, - // entity.posZ, ModSounds.shock, - // SoundCategory.BLOCKS, 0.6F, 1F, false); - } - if (ConfigTechReborn.UninsulatedElectocutionParticle) { - getWorld().spawnParticle(EnumParticleTypes.CRIT, entity.posX, entity.posY, entity.posZ, 0, - 0, 0); - } - } - } - } - } + } else { + if (network != null) { + if (network.getEnergy() != 0) { + if (ConfigTechReborn.UninsulatedElectocutionDamage) { + if (getCableType() == EnumCableType.HV) { + entity.setFire(1); + } + network.setEnergy(-1); + entity.attackEntityFrom(new ElectrialShockSource(), 1F); + } + if (ConfigTechReborn.UninsulatedElectocutionSound) { + // getWorld().playSound(entity.posX, entity.posY, + // entity.posZ, ModSounds.shock, + // SoundCategory.BLOCKS, 0.6F, 1F, false); + } + if (ConfigTechReborn.UninsulatedElectocutionParticle) { + getWorld().spawnParticle(EnumParticleTypes.CRIT, entity.posX, entity.posY, entity.posZ, 0, + 0, 0); + } + } + } + } + } - } + } - @Override - public void onEntityStanding(Entity entity) { + @Override + public void onEntityStanding(Entity entity) { - } + } - @Override - public ItemStack getPickBlock(EntityPlayer player, PartMOP hit) { - return new ItemStack(TechRebornParts.cables, 1, getCableType().ordinal()); - } + @Override + public ItemStack getPickBlock(EntityPlayer player, PartMOP hit) { + return new ItemStack(TechRebornParts.cables, 1, getCableType().ordinal()); + } - public final void findAndJoinNetwork(World world, BlockPos pos) { - for (EnumFacing dir : EnumFacing.VALUES) { - CableMultipart cableMultipart = getPartFromWorld(getWorld(), getPos().offset(dir), dir); - if (cableMultipart != null && cableMultipart.getCableType() == getCableType()) { - TRPowerNet net = cableMultipart.getNetwork(); - if (net != null) { - network = net; - network.addElement(this); - break; - } - } - } - if (network == null) { - network = new TRPowerNet(getCableType()); - network.addElement(this); - } - network.endpoints.clear(); - for (EnumFacing dir : EnumFacing.VALUES) { - TileEntity te = getNeighbourTile(dir); - if (te != null && te instanceof IEnergyInterfaceTile) { - network.addConnection((IEnergyInterfaceTile) te, dir.getOpposite()); - } - } - } + public final void findAndJoinNetwork(World world, BlockPos pos) { + for (EnumFacing dir : EnumFacing.VALUES) { + CableMultipart cableMultipart = getPartFromWorld(getWorld(), getPos().offset(dir), dir); + if (cableMultipart != null && cableMultipart.getCableType() == getCableType()) { + TRPowerNet net = cableMultipart.getNetwork(); + if (net != null) { + network = net; + network.addElement(this); + break; + } + } + } + if (network == null) { + network = new TRPowerNet(getCableType()); + network.addElement(this); + } + network.endpoints.clear(); + for (EnumFacing dir : EnumFacing.VALUES) { + TileEntity te = getNeighbourTile(dir); + if (te != null && te instanceof IEnergyInterfaceTile) { + network.addConnection((IEnergyInterfaceTile) te, dir.getOpposite()); + } + } + } - public final TRPowerNet getNetwork() { - return network; - } + public final TRPowerNet getNetwork() { + return network; + } - public final void setNetwork(TRPowerNet n) { - if (n == null) { - } else { - network = n; - network.addElement(this); - } - } + public final void setNetwork(TRPowerNet n) { + if (n == null) { + } else { + network = n; + network.addElement(this); + } + } - public final void removeFromNetwork() { - if (network == null) { - } else - network.removeElement(this); - } + public final void removeFromNetwork() { + if (network == null) { + } else + network.removeElement(this); + } - public final void rebuildNetwork() { - this.removeFromNetwork(); - this.resetNetwork(); - this.findAndJoinNetwork(getWorld(), getPos()); - } + public final void rebuildNetwork() { + this.removeFromNetwork(); + this.resetNetwork(); + this.findAndJoinNetwork(getWorld(), getPos()); + } - public final void resetNetwork() { - if (network != null) { - network.removeElement(this); - } + public final void resetNetwork() { + if (network != null) { + network.removeElement(this); + } - network = null; - } + network = null; + } - // @Override - // public void addInfo(List info) { - // info.add(EnumChatFormatting.GREEN + "EU Transfer: " + - // EnumChatFormatting.LIGHT_PURPLE + getCableType().transferRate); - // if (getCableType().canKill) { - // info.add(EnumChatFormatting.RED + "Damages entity's!"); - // } - // } + @Override + public void addInfo(List info) { + info.add(TextFormatting.GREEN + "EU Transfer: " + + TextFormatting.LIGHT_PURPLE + getCableType().transferRate); + if (getCableType().canKill) { + info.add(TextFormatting.RED + "Damages entity's!"); + } + } - @Override - public ResourceLocation getModelPath() { - return new ResourceLocation("techreborn:cable"); - } + @Override + public ResourceLocation getModelPath() { + return new ResourceLocation("techreborn:cable"); + } - @Override - public boolean canRenderInLayer(BlockRenderLayer layer) { - return layer == BlockRenderLayer.CUTOUT; - } + @Override + public boolean canRenderInLayer(BlockRenderLayer layer) { + return layer == BlockRenderLayer.CUTOUT; + } } diff --git a/ToAddBack/parts/walia/IPartWaliaProvider.java b/src/main/java/techreborn/parts/walia/IPartWaliaProvider.java similarity index 100% rename from ToAddBack/parts/walia/IPartWaliaProvider.java rename to src/main/java/techreborn/parts/walia/IPartWaliaProvider.java diff --git a/ToAddBack/parts/walia/WailaMcMultiPartCompact.java b/src/main/java/techreborn/parts/walia/WailaMcMultiPartCompact.java similarity index 100% rename from ToAddBack/parts/walia/WailaMcMultiPartCompact.java rename to src/main/java/techreborn/parts/walia/WailaMcMultiPartCompact.java diff --git a/ToAddBack/parts/walia/WaliaPartProvider.java b/src/main/java/techreborn/parts/walia/WaliaPartProvider.java similarity index 100% rename from ToAddBack/parts/walia/WaliaPartProvider.java rename to src/main/java/techreborn/parts/walia/WaliaPartProvider.java diff --git a/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java b/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java index 0b3a43ce6..b66ad828a 100644 --- a/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java +++ b/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java @@ -172,7 +172,7 @@ public class TileElectricFurnace extends TilePowerAcceptor implements IWrenchabl @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(ModBlocks.AlloySmelter, 1); + return new ItemStack(ModBlocks.ElectricFurnace, 1); } public boolean isComplete()