From 2615992e7d0d4ed3ac205800be71c831029b2dc5 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sat, 18 Jun 2016 16:55:58 +1000 Subject: ~More Refactoring Does it ever end? --- .../tileentity/TileEntityHeliumGenerator.java | 2 +- src/Java/miscutil/core/common/CommonProxy.java | 2 +- .../common/compat/COMPAT_CompactWindmills.java | 52 +-- .../core/common/compat/COMPAT_EnderIO.java | 2 +- .../core/common/compat/COMPAT_ExtraUtils.java | 2 +- .../miscutil/core/common/compat/COMPAT_IC2.java | 12 +- .../core/common/compat/COMPAT_MorePlanets.java | 2 +- .../core/common/compat/COMPAT_Thaumcraft.java | 11 +- src/Java/miscutil/core/handler/COMPAT_HANDLER.java | 10 +- src/Java/miscutil/core/handler/InitGregtech.java | 7 - .../registration/LateRegistrationHandler.java | 4 +- .../handler/registration/RegistrationHandler.java | 6 +- .../core/item/general/fuelrods/FuelRod_Base.java | 8 +- .../core/item/tool/staballoy/StaballoyPickaxe.java | 2 +- .../miscutil/core/recipe/RECIPES_GREGTECH.java | 85 ++++ .../miscutil/core/recipe/RECIPES_MTWRAPPER.java | 114 +++++ .../miscutil/core/recipe/RECIPES_Machines.java | 459 +++++++++++++++++++++ .../miscutil/core/recipe/RECIPES_Shapeless.java | 42 ++ src/Java/miscutil/core/recipe/RECIPES_Tools.java | 177 ++++++++ .../miscutil/core/recipe/ShapedRecipeObject.java | 42 ++ .../miscutil/core/tileentities/TileEntityNHG.java | 91 ++-- src/Java/miscutil/core/util/PlayerCache.java | 126 ------ src/Java/miscutil/core/util/UtilsItems.java | 455 -------------------- src/Java/miscutil/core/util/UtilsMining.java | 179 -------- .../core/util/VanillaChatCommandSender.java | 35 -- src/Java/miscutil/core/util/item/UtilsItems.java | 179 ++++++++ .../miscutil/core/util/player/PlayerCache.java | 127 ++++++ .../miscutil/core/util/player/UtilsMining.java | 180 ++++++++ .../core/util/recipe/RECIPES_GREGTECH.java | 85 ---- .../core/util/recipe/RECIPES_MTWRAPPER.java | 113 ----- .../core/util/recipe/RECIPES_Machines.java | 458 -------------------- .../core/util/recipe/RECIPES_Shapeless.java | 41 -- .../miscutil/core/util/recipe/RECIPES_Tools.java | 176 -------- .../core/util/recipe/ShapedRecipeObject.java | 43 -- .../miscutil/core/util/recipe/UtilsRecipe.java | 309 ++++++++++++++ src/Java/miscutil/core/util/wrapper/var.java | 2 +- .../gregtech/api/gui/CONTAINER_SafeBlock.java | 2 +- .../base/GregtechMetaSafeBlockBase.java | 2 +- 38 files changed, 1827 insertions(+), 1817 deletions(-) delete mode 100644 src/Java/miscutil/core/handler/InitGregtech.java create mode 100644 src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java create mode 100644 src/Java/miscutil/core/recipe/RECIPES_MTWRAPPER.java create mode 100644 src/Java/miscutil/core/recipe/RECIPES_Machines.java create mode 100644 src/Java/miscutil/core/recipe/RECIPES_Shapeless.java create mode 100644 src/Java/miscutil/core/recipe/RECIPES_Tools.java create mode 100644 src/Java/miscutil/core/recipe/ShapedRecipeObject.java delete mode 100644 src/Java/miscutil/core/util/PlayerCache.java delete mode 100644 src/Java/miscutil/core/util/UtilsItems.java delete mode 100644 src/Java/miscutil/core/util/UtilsMining.java delete mode 100644 src/Java/miscutil/core/util/VanillaChatCommandSender.java create mode 100644 src/Java/miscutil/core/util/item/UtilsItems.java create mode 100644 src/Java/miscutil/core/util/player/PlayerCache.java create mode 100644 src/Java/miscutil/core/util/player/UtilsMining.java delete mode 100644 src/Java/miscutil/core/util/recipe/RECIPES_GREGTECH.java delete mode 100644 src/Java/miscutil/core/util/recipe/RECIPES_MTWRAPPER.java delete mode 100644 src/Java/miscutil/core/util/recipe/RECIPES_Machines.java delete mode 100644 src/Java/miscutil/core/util/recipe/RECIPES_Shapeless.java delete mode 100644 src/Java/miscutil/core/util/recipe/RECIPES_Tools.java delete mode 100644 src/Java/miscutil/core/util/recipe/ShapedRecipeObject.java create mode 100644 src/Java/miscutil/core/util/recipe/UtilsRecipe.java (limited to 'src/Java/miscutil') diff --git a/src/Java/miscutil/core/block/heliumgen/tileentity/TileEntityHeliumGenerator.java b/src/Java/miscutil/core/block/heliumgen/tileentity/TileEntityHeliumGenerator.java index 75b1de7f5c..8793e06d4b 100644 --- a/src/Java/miscutil/core/block/heliumgen/tileentity/TileEntityHeliumGenerator.java +++ b/src/Java/miscutil/core/block/heliumgen/tileentity/TileEntityHeliumGenerator.java @@ -19,7 +19,7 @@ import miscutil.core.block.ModBlocks; import miscutil.core.block.heliumgen.slots.InvSlotRadiation; import miscutil.core.item.ModItems; import miscutil.core.util.Utils; -import miscutil.core.util.UtilsItems; +import miscutil.core.util.item.UtilsItems; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; diff --git a/src/Java/miscutil/core/common/CommonProxy.java b/src/Java/miscutil/core/common/CommonProxy.java index 0c772aa6bb..7c6b9b2d4f 100644 --- a/src/Java/miscutil/core/common/CommonProxy.java +++ b/src/Java/miscutil/core/common/CommonProxy.java @@ -10,9 +10,9 @@ import miscutil.core.item.ModItems; import miscutil.core.lib.CORE; import miscutil.core.lib.LoadedMods; import miscutil.core.tileentities.ModTileEntities; -import miscutil.core.util.PlayerCache; import miscutil.core.util.Utils; import miscutil.core.util.debug.DEBUG_INIT; +import miscutil.core.util.player.PlayerCache; import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; diff --git a/src/Java/miscutil/core/common/compat/COMPAT_CompactWindmills.java b/src/Java/miscutil/core/common/compat/COMPAT_CompactWindmills.java index 247463e975..0760696e86 100644 --- a/src/Java/miscutil/core/common/compat/COMPAT_CompactWindmills.java +++ b/src/Java/miscutil/core/common/compat/COMPAT_CompactWindmills.java @@ -2,8 +2,8 @@ package miscutil.core.common.compat; import static miscutil.core.handler.COMPAT_HANDLER.AddRecipeQueue; import static miscutil.core.handler.COMPAT_HANDLER.RemoveRecipeQueue; -import miscutil.core.util.UtilsItems; -import miscutil.core.util.recipe.ShapedRecipeObject; +import miscutil.core.recipe.ShapedRecipeObject; +import miscutil.core.util.item.UtilsItems; import net.minecraft.item.ItemStack; @@ -11,32 +11,32 @@ import net.minecraft.item.ItemStack; public class COMPAT_CompactWindmills { //Change IC2 Upgrades - public static ItemStack kineticWind = UtilsItems.getItemStack("IC2:blockKineticGenerator", 1); - public static ItemStack shaftIron = UtilsItems.getItemStack("IC2:itemRecipePart:11", 1); - public static ItemStack cableCopper = UtilsItems.getItemStack("gregtech:gt.blockmachines:1367", 1); - public static String plateRubber ="ore:plateRubber"; + public static ItemStack kineticWind = UtilsItems.simpleMetaStack("IC2:blockKineticGenerator", 0, 1); + public static ItemStack shaftIron = UtilsItems.simpleMetaStack("IC2:itemRecipePart", 11, 1); + public static ItemStack cableCopper = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 1367, 1); + public static String plateRubber = "ore:plateRubber"; //Machine Casings - public static ItemStack elvCasing = UtilsItems.getItemStack("gregtech:gt.blockcasings", 1); - public static ItemStack lvCasing = UtilsItems.getItemStack("gregtech:gt.blockcasings:1", 1); - public static ItemStack mvCasing = UtilsItems.getItemStack("gregtech:gt.blockcasings:2", 1); - public static ItemStack hvCasing = UtilsItems.getItemStack("gregtech:gt.blockcasings:3", 1); - public static ItemStack evCasing = UtilsItems.getItemStack("gregtech:gt.blockcasings:4", 1); - public static ItemStack ivCasing = UtilsItems.getItemStack("gregtech:gt.blockcasings:5", 1); + public static ItemStack elvCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 0, 1); + public static ItemStack lvCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 1, 1); + public static ItemStack mvCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 2, 1); + public static ItemStack hvCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 3, 1); + public static ItemStack evCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 4, 1); + public static ItemStack ivCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 5, 1); //GT Transformers - public static ItemStack elvTransformer = UtilsItems.getItemStack("gregtech:gt.blockmachines:20", 1); - public static ItemStack lvTransformer = UtilsItems.getItemStack("gregtech:gt.blockmachines:21", 1); - public static ItemStack mvTransformer = UtilsItems.getItemStack("gregtech:gt.blockmachines:22", 1); - public static ItemStack hvTransformer = UtilsItems.getItemStack("gregtech:gt.blockmachines:23", 1); - public static ItemStack evTransformer = UtilsItems.getItemStack("gregtech:gt.blockmachines:24", 1); + public static ItemStack elvTransformer = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 20, 1); + public static ItemStack lvTransformer = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 21, 1); + public static ItemStack mvTransformer = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 22, 1); + public static ItemStack hvTransformer = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 23, 1); + public static ItemStack evTransformer = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 24, 1); //Compact Windmills - public static ItemStack elvWindmill = UtilsItems.getItemStack("CompactWindmills:blockCompactWindmill", 1); - public static ItemStack lvWindmill = UtilsItems.getItemStack("CompactWindmills:blockCompactWindmill:1", 1); - public static ItemStack mvWindmill = UtilsItems.getItemStack("CompactWindmills:blockCompactWindmill:2", 1); - public static ItemStack hvWindmill = UtilsItems.getItemStack("CompactWindmills:blockCompactWindmill:3", 1); - public static ItemStack evWindmill = UtilsItems.getItemStack("CompactWindmills:blockCompactWindmill:4", 1); + public static ItemStack elvWindmill = UtilsItems.simpleMetaStack("CompactWindmills:blockCompactWindmill", 0, 1); + public static ItemStack lvWindmill = UtilsItems.simpleMetaStack("CompactWindmills:blockCompactWindmill", 1, 1); + public static ItemStack mvWindmill = UtilsItems.simpleMetaStack("CompactWindmills:blockCompactWindmill", 2, 1); + public static ItemStack hvWindmill = UtilsItems.simpleMetaStack("CompactWindmills:blockCompactWindmill", 3, 1); + public static ItemStack evWindmill = UtilsItems.simpleMetaStack("CompactWindmills:blockCompactWindmill", 4, 1); //Compact Rotors public static ItemStack rotor2 = UtilsItems.getItemStack("CompactWindmills:WOOL", 1); @@ -50,10 +50,10 @@ public class COMPAT_CompactWindmills { public static ItemStack rotorIC2 = UtilsItems.getItemStack("IC2:itemironrotor", 1); public static ItemStack rotorIC3 = UtilsItems.getItemStack("IC2:itemsteelrotor", 1); public static ItemStack rotorIC4 = UtilsItems.getItemStack("IC2:itemwcarbonrotor", 1); - public static ItemStack rotorBlade1 = UtilsItems.getItemStack("IC2:itemRecipePart:7", 1); - public static ItemStack rotorBlade2 = UtilsItems.getItemStack("IC2:itemRecipePart:8", 1); - public static ItemStack rotorBlade3 = UtilsItems.getItemStack("IC2:itemRecipePart:10", 1); - public static ItemStack rotorBlade4 = UtilsItems.getItemStack("IC2:itemRecipePart:9", 1); + public static ItemStack rotorBlade1 = UtilsItems.simpleMetaStack("IC2:itemRecipePart", 7, 1); + public static ItemStack rotorBlade2 = UtilsItems.simpleMetaStack("IC2:itemRecipePart", 8, 1); + public static ItemStack rotorBlade3 = UtilsItems.simpleMetaStack("IC2:itemRecipePart", 10, 1); + public static ItemStack rotorBlade4 = UtilsItems.simpleMetaStack("IC2:itemRecipePart", 9, 1); //Plates public static String plateTier1 = "ore:plateMagnalium"; diff --git a/src/Java/miscutil/core/common/compat/COMPAT_EnderIO.java b/src/Java/miscutil/core/common/compat/COMPAT_EnderIO.java index 1e87907358..8c0f1f72bc 100644 --- a/src/Java/miscutil/core/common/compat/COMPAT_EnderIO.java +++ b/src/Java/miscutil/core/common/compat/COMPAT_EnderIO.java @@ -2,7 +2,7 @@ package miscutil.core.common.compat; import gregtech.api.util.GT_OreDictUnificator; import miscutil.core.item.ModItems; -import miscutil.core.util.UtilsItems; +import miscutil.core.util.item.UtilsItems; import net.minecraft.item.ItemStack; public class COMPAT_EnderIO { diff --git a/src/Java/miscutil/core/common/compat/COMPAT_ExtraUtils.java b/src/Java/miscutil/core/common/compat/COMPAT_ExtraUtils.java index b719085006..04fa966f0d 100644 --- a/src/Java/miscutil/core/common/compat/COMPAT_ExtraUtils.java +++ b/src/Java/miscutil/core/common/compat/COMPAT_ExtraUtils.java @@ -2,7 +2,7 @@ package miscutil.core.common.compat; import gregtech.api.util.GT_OreDictUnificator; import miscutil.core.item.ModItems; -import miscutil.core.util.UtilsItems; +import miscutil.core.util.item.UtilsItems; import net.minecraft.item.ItemStack; public class COMPAT_ExtraUtils { diff --git a/src/Java/miscutil/core/common/compat/COMPAT_IC2.java b/src/Java/miscutil/core/common/compat/COMPAT_IC2.java index 7b5dcc670a..c0b52c5250 100644 --- a/src/Java/miscutil/core/common/compat/COMPAT_IC2.java +++ b/src/Java/miscutil/core/common/compat/COMPAT_IC2.java @@ -3,18 +3,16 @@ package miscutil.core.common.compat; import static miscutil.core.handler.COMPAT_HANDLER.AddRecipeQueue; import static miscutil.core.handler.COMPAT_HANDLER.RemoveRecipeQueue; -import miscutil.core.util.UtilsItems; -import miscutil.core.util.recipe.ShapedRecipeObject; +import miscutil.core.recipe.ShapedRecipeObject; +import miscutil.core.util.item.UtilsItems; import net.minecraft.item.ItemStack; public class COMPAT_IC2 { - private static ItemStack itemCropnalyzer = UtilsItems.getItemStack("IC2:itemCropnalyzer", 1); - private static ItemStack itemSolarHelmet = UtilsItems.getItemStack("IC2:itemSolarHelmet", 1); - private static ItemStack temp_3; - private static ItemStack temp_4; - private static ItemStack temp_5; + private static ItemStack itemCropnalyzer = UtilsItems.simpleMetaStack("IC2:itemCropnalyzer", 0, 1); + private static ItemStack itemSolarHelmet = UtilsItems.simpleMetaStack("IC2:itemSolarHelmet", 0, 1); + public static ShapedRecipeObject Cropnalyzer = new ShapedRecipeObject( "ore:cableGt02Copper", "ore:cableGt02Copper", null, "minecraft:redstone", "ore:blockGlass", "minecraft:redstone", diff --git a/src/Java/miscutil/core/common/compat/COMPAT_MorePlanets.java b/src/Java/miscutil/core/common/compat/COMPAT_MorePlanets.java index 69fefd3f52..855a5d8fc2 100644 --- a/src/Java/miscutil/core/common/compat/COMPAT_MorePlanets.java +++ b/src/Java/miscutil/core/common/compat/COMPAT_MorePlanets.java @@ -1,6 +1,6 @@ package miscutil.core.common.compat; -import miscutil.core.util.UtilsItems; +import miscutil.core.util.item.UtilsItems; public class COMPAT_MorePlanets { diff --git a/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java b/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java index 17741af194..3fbf3e409e 100644 --- a/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java +++ b/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java @@ -3,8 +3,7 @@ package miscutil.core.common.compat; import gregtech.api.util.GT_OreDictUnificator; import miscutil.core.item.ModItems; import miscutil.core.lib.LoadedMods; -import miscutil.core.util.Utils; -import miscutil.core.util.UtilsItems; +import miscutil.core.util.item.UtilsItems; import net.minecraft.item.ItemStack; public class COMPAT_Thaumcraft { @@ -18,22 +17,22 @@ public class COMPAT_Thaumcraft { GT_OreDictUnificator.registerOre("plateVoidMetal", new ItemStack(ModItems.itemPlateVoidMetal)); for(int i=0; i<=6; i++){ - Utils.LOG_INFO(""+i); + //Utils.LOG_INFO(""+i); UtilsItems.getItemForOreDict("Thaumcraft:ItemShard", "shardAny", "TC Shard "+i, i); GT_OreDictUnificator.registerOre("shardAny", UtilsItems.getItemStack("Thaumcraft:ItemShard:"+i, 1)); UtilsItems.getItemForOreDict("Thaumcraft:ItemShard", "gemInfusedAnything", "TC Shard "+i, i); GT_OreDictUnificator.registerOre("gemInfusedAnything", UtilsItems.getItemStack("Thaumcraft:ItemShard:"+i, 1)); - System.out.println("TC Shard registration count is: "+i); + //System.out.println("TC Shard registration count is: "+i); } if (LoadedMods.ForbiddenMagic){ for(int i=0; i<=6; i++){ - Utils.LOG_INFO(""+i); + //Utils.LOG_INFO(""+i); UtilsItems.getItemForOreDict("ForbiddenMagic:NetherShard", "shardAny", "FM Shard "+i, i); GT_OreDictUnificator.registerOre("shardAny", UtilsItems.getItemStack("ForbiddenMagic:NetherShard:"+i, 1)); UtilsItems.getItemForOreDict("ForbiddenMagic:NetherShard", "gemInfusedAnything", "FM Shard "+i, i); GT_OreDictUnificator.registerOre("gemInfusedAnything", UtilsItems.getItemStack("ForbiddenMagic:NetherShard:"+i, 1)); - System.out.println("TC Shard registration count is: "+i); + //System.out.println("TC Shard registration count is: "+i); } UtilsItems.getItemForOreDict("ForbiddenMagic:GluttonyShard", "shardAny", "FM Gluttony Shard", 0); GT_OreDictUnificator.registerOre("shardAny", UtilsItems.getItemStack("ForbiddenMagic:GluttonyShard", 1)); diff --git a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java index 49b7121465..9035039cdf 100644 --- a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java +++ b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java @@ -1,7 +1,6 @@ package miscutil.core.handler; import static miscutil.core.lib.LoadedMods.Gregtech; -import static miscutil.core.util.UtilsItems.removeCraftingRecipe; import gregtech.api.util.GT_OreDictUnificator; import java.util.LinkedList; @@ -30,10 +29,11 @@ import miscutil.core.handler.registration.gregtech.GregtechSteamCondenser; import miscutil.core.item.ModItems; import miscutil.core.lib.CORE; import miscutil.core.lib.LoadedMods; +import miscutil.core.recipe.RECIPES_GREGTECH; +import miscutil.core.recipe.ShapedRecipeObject; import miscutil.core.util.Utils; -import miscutil.core.util.UtilsItems; -import miscutil.core.util.recipe.RECIPES_GREGTECH; -import miscutil.core.util.recipe.ShapedRecipeObject; +import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.recipe.UtilsRecipe; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -120,7 +120,7 @@ public class COMPAT_HANDLER { public static void RemoveRecipesFromOtherMods(){ //Removal of Recipes for(Object item : RemoveRecipeQueue){ - removeCraftingRecipe(item); + UtilsRecipe.removeCraftingRecipe(item); } } diff --git a/src/Java/miscutil/core/handler/InitGregtech.java b/src/Java/miscutil/core/handler/InitGregtech.java deleted file mode 100644 index 13321b2b7b..0000000000 --- a/src/Java/miscutil/core/handler/InitGregtech.java +++ /dev/null @@ -1,7 +0,0 @@ -package miscutil.core.handler; - - -public class InitGregtech { - - -} diff --git a/src/Java/miscutil/core/handler/registration/LateRegistrationHandler.java b/src/Java/miscutil/core/handler/registration/LateRegistrationHandler.java index 207e3589c6..9fc339f512 100644 --- a/src/Java/miscutil/core/handler/registration/LateRegistrationHandler.java +++ b/src/Java/miscutil/core/handler/registration/LateRegistrationHandler.java @@ -1,8 +1,8 @@ package miscutil.core.handler.registration; import miscutil.core.handler.COMPAT_HANDLER; +import miscutil.core.recipe.ShapedRecipeObject; import miscutil.core.util.Utils; -import miscutil.core.util.recipe.ShapedRecipeObject; public class LateRegistrationHandler { @@ -22,7 +22,7 @@ public class LateRegistrationHandler { } catch (InterruptedException e) { Utils.LOG_INFO(e.toString()); } - Utils.LOG_INFO("Loaded: "+recipesSuccess+" Failed: "+recipesFailed); + Utils.LOG_INFO("Late Recipes Loaded: "+recipesSuccess+" Failed: "+recipesFailed); } } diff --git a/src/Java/miscutil/core/handler/registration/RegistrationHandler.java b/src/Java/miscutil/core/handler/registration/RegistrationHandler.java index 5a5be61933..ce7f24c2aa 100644 --- a/src/Java/miscutil/core/handler/registration/RegistrationHandler.java +++ b/src/Java/miscutil/core/handler/registration/RegistrationHandler.java @@ -1,10 +1,10 @@ package miscutil.core.handler.registration; import miscutil.core.handler.COMPAT_HANDLER; +import miscutil.core.recipe.RECIPES_Machines; +import miscutil.core.recipe.RECIPES_Shapeless; +import miscutil.core.recipe.RECIPES_Tools; import miscutil.core.util.Utils; -import miscutil.core.util.recipe.RECIPES_Machines; -import miscutil.core.util.recipe.RECIPES_Shapeless; -import miscutil.core.util.recipe.RECIPES_Tools; public class RegistrationHandler { diff --git a/src/Java/miscutil/core/item/general/fuelrods/FuelRod_Base.java b/src/Java/miscutil/core/item/general/fuelrods/FuelRod_Base.java index 56fe598a3b..20d6fcd08e 100644 --- a/src/Java/miscutil/core/item/general/fuelrods/FuelRod_Base.java +++ b/src/Java/miscutil/core/item/general/fuelrods/FuelRod_Base.java @@ -43,11 +43,11 @@ public class FuelRod_Base extends Item{ tempvar = 2500; } - if (fuelType == "Uranium"){ + else if (fuelType == "Uranium"){ tempvar = 5000; } - if (fuelType == "Plutonium"){ + else if (fuelType == "Plutonium"){ tempvar = 10000; } @@ -193,9 +193,9 @@ public class FuelRod_Base extends Item{ @Override public void onUpdate(ItemStack itemStack, World par2World, Entity par3Entity, int par4, boolean par5) { itemStack.stackTagCompound = new NBTTagCompound(); - itemStack.stackTagCompound.setInteger("fuelRemaining", fuelRemaining); + itemStack.stackTagCompound.setInteger("fuelRemaining", getFuelRemaining()); itemStack.stackTagCompound.setInteger("maximumFuel", maximumFuel); - itemStack.stackTagCompound.setFloat("heat", heat); + itemStack.stackTagCompound.setFloat("heat", getHeat()); itemStack.stackTagCompound.setFloat("maxHeat", getMaxHeat()); itemStack.stackTagCompound.setString("fuelType", fuelType); diff --git a/src/Java/miscutil/core/item/tool/staballoy/StaballoyPickaxe.java b/src/Java/miscutil/core/item/tool/staballoy/StaballoyPickaxe.java index 7f050a76f1..4ade1914d9 100644 --- a/src/Java/miscutil/core/item/tool/staballoy/StaballoyPickaxe.java +++ b/src/Java/miscutil/core/item/tool/staballoy/StaballoyPickaxe.java @@ -3,8 +3,8 @@ package miscutil.core.item.tool.staballoy; import java.util.List; import miscutil.core.lib.CORE; -import miscutil.core.util.UtilsMining; import miscutil.core.util.Utils; +import miscutil.core.util.player.UtilsMining; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java new file mode 100644 index 0000000000..3f3338b1d1 --- /dev/null +++ b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java @@ -0,0 +1,85 @@ +package miscutil.core.recipe; + +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.GT_OreDictUnificator; +import miscutil.core.lib.CORE; +import miscutil.core.util.Utils; +import miscutil.core.util.item.UtilsItems; + +public class RECIPES_GREGTECH { + + public static void run(){ + Utils.LOG_INFO("Loading Recipes through GregAPI for Industrial Multiblocks."); + execute(); + } + + private static void execute(){ + cokeOvenRecipes(); + assemblerRecipes(); + + } + + private static void cokeOvenRecipes(){ + Utils.LOG_INFO("Loading Recipes for Industrial Coking Oven."); + + try { + + //GT Logs to Charcoal Recipe + //With Sulfuric Acid + CORE.RA.addCokeOvenRecipe( + GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 2L), //Input 1 + GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 1L), //Input 2 + Materials.SulfuricAcid.getFluid(20L), //Fluid Input + Materials.Creosote.getFluid(175L), //Fluid Output + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 2L), //Item Output + 800, //Time in ticks + 30); //EU + }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + try { + + //Coal -> Coke Recipe + //With Sulfuric Acid + CORE.RA.addCokeOvenRecipe( + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 2L), //Input 1 + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1L), //Input 2 + Materials.SulfuricAcid.getFluid(60L), //Fluid Input + Materials.Creosote.getFluid(250L), //Fluid Output + UtilsItems.getItemStack("Railcraft:fuel.coke", 2), //Item Output + 600, //Time in ticks + 120); //EU + }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + + try { + //GT Logs to Charcoal Recipe + //Without Sulfuric Acid + CORE.RA.addCokeOvenRecipe( + GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 2L), //Input 1 + GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 1L), //Input 2 + Materials.SaltWater.getFluid(85L), //Fluid Input + Materials.Creosote.getFluid(145L), //Fluid Output + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 2L), //Item Output + 1200, //Time in ticks + 30); //EU + }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + + try { + //Coal -> Coke Recipe + //Without Sulfuric Acid + CORE.RA.addCokeOvenRecipe( + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 2L), //Input 1 + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1L), //Input 2 + Materials.SaltWater.getFluid(185L), //Fluid Input + Materials.Creosote.getFluid(200L), //Fluid Output + UtilsItems.getItemStack("Railcraft:fuel.coke", 2), //Item Output + 900, //Time in ticks + 120); //EU + }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + } + + private static void assemblerRecipes(){ + //GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6L), ItemList.Casing_Turbine.get(1L, new Object[0]), ItemList.Casing_Turbine2.get(1L, new Object[0]), 50, 16); + //GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6L), ItemList.Casing_Turbine.get(1L, new Object[0]), ItemList.Casing_Turbine3.get(1L, new Object[0]), 50, 16); + + } +} \ No newline at end of file diff --git a/src/Java/miscutil/core/recipe/RECIPES_MTWRAPPER.java b/src/Java/miscutil/core/recipe/RECIPES_MTWRAPPER.java new file mode 100644 index 0000000000..2f31d133db --- /dev/null +++ b/src/Java/miscutil/core/recipe/RECIPES_MTWRAPPER.java @@ -0,0 +1,114 @@ +package miscutil.core.recipe; + +import java.util.ArrayList; + +import miscutil.core.util.Utils; +import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.recipe.UtilsRecipe; +import miscutil.core.util.wrapper.var; +import net.minecraft.item.ItemStack; + +public class RECIPES_MTWRAPPER { + + public static int MT_RECIPES_LOADED = 0; + public static int MT_RECIPES_FAILED = 0; + + static var chestWood = new var("minecraft:chest>"); + static var slabWood = new var("ore:slabWood>"); + static var gemNetherQuartz = new var("ore:gemNetherQuartz>"); + static var glass = new var("ore:blockGlass>"); + static var sensorDaylight = new var("minecraft:daylight_detector>"); + static var blazeRod = new var("minecraft:blaze_rod>"); + static var saw = new var("ore:craftingToolSaw>"); + static var logWood = new var("ore:logWood>"); + static var button = new var("minecraft:stone_button>"); + static var stoneBlock = new var("minecraft:stone>"); + + public static void run(){ + /*addShaped(button.getStack(2), + null, stoneBlock, null, + null, stoneBlock, null, + null, null, null);*/ + /*addShaped(stoneStick.getStack(1), + stoneBlock, null, null, + stoneBlock, null, null, + null, null, null);*/ + addShaped(chestWood.getStack(2), + logWood, logWood, logWood, + logWood, null, logWood, + logWood, logWood, logWood); + addShaped(chestWood.getStack(4), + logWood, logWood, logWood, + logWood, saw, logWood, + logWood, logWood, logWood); + //Recipe Fixes + //remove(sensorDaylight); + addShaped(sensorDaylight.getStack(1), + glass, glass, glass, + gemNetherQuartz, gemNetherQuartz, gemNetherQuartz, + slabWood, slabWood, slabWood); + /*addShaped(ironBars .getStack( 8), + null, "", null, + "", "", "", + "", "", "");*/ + } + + + public static void addShaped(Object item_Output, + Object item_1, Object item_2, Object item_3, + Object item_4, Object item_5, Object item_6, + Object item_7, Object item_8, Object item_9){ + + + /* + * + * var item_1, var item_2, var item_3, + var item_4, var item_5, var item_6, + var item_7, var item_8, var item_9 + * + * + */ + + ItemStack outputItem = UtilsItems.getCorrectStacktype(item_Output, 1); + + ArrayList validSlots = new ArrayList(); + String a,b,c,d,e,f,g,h,i; + if (item_1 == null){ a = " ";} else { a = "1";validSlots.add('1');validSlots.add(item_1);} + if (item_2 == null){ b = " ";} else { b = "2";validSlots.add('2');validSlots.add(item_2);} + if (item_3 == null){ c = " ";} else { c = "3";validSlots.add('3');validSlots.add(item_3);} + if (item_4 == null){ d = " ";} else { d = "4";validSlots.add('4');validSlots.add(item_4);} + if (item_5 == null){ e = " ";} else { e = "5";validSlots.add('5');validSlots.add(item_5);} + if (item_6 == null){ f = " ";} else { f = "6";validSlots.add('6');validSlots.add(item_6);} + if (item_7 == null){ g = " ";} else { g = "7";validSlots.add('7');validSlots.add(item_7);} + if (item_8 == null){ h = " ";} else { h = "8";validSlots.add('8');validSlots.add(item_8);} + if (item_9 == null){ i = " ";} else { i = "9";validSlots.add('9');validSlots.add(item_9);} + + String lineOne = a+b+c; + String lineTwo = d+e+f; + String lineThree = g+h+i; + validSlots.add(0, lineOne); + validSlots.add(1, lineTwo); + validSlots.add(2, lineThree); + + try { + UtilsRecipe.recipeBuilder((Object[]) validSlots.toArray(), outputItem.copy()); + MT_RECIPES_LOADED++; + } + catch(NullPointerException | ClassCastException k){ + k.getMessage(); + k.getClass(); + k.printStackTrace(); + k.getLocalizedMessage(); + Utils.LOG_WARNING("@@@: Invalid Recipe detected for: "+((var) item_Output).getsanitizedName()); + MT_RECIPES_FAILED++; + } + } + + public static void addShapeless(){ + + } + + + +} + diff --git a/src/Java/miscutil/core/recipe/RECIPES_Machines.java b/src/Java/miscutil/core/recipe/RECIPES_Machines.java new file mode 100644 index 0000000000..ef57d44f44 --- /dev/null +++ b/src/Java/miscutil/core/recipe/RECIPES_Machines.java @@ -0,0 +1,459 @@ +package miscutil.core.recipe; + +import gregtech.api.enums.ItemList; +import miscutil.core.lib.LoadedMods; +import miscutil.core.util.Utils; +import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.recipe.UtilsRecipe; +import miscutil.gregtech.api.enums.GregtechItemList; +import net.minecraft.item.ItemStack; + +public class RECIPES_Machines { + + //Outputs + //static ItemStack RECIPE_BufferCore_ULV = new ItemStack(GregtechEnergyBuffer.itemBufferCore); + static ItemStack RECIPE_SteamCondenser = GregtechItemList.Condensor_MAX.get(1); + static ItemStack RECIPE_IronBlastFurnace = GregtechItemList.Machine_Iron_BlastFurnace.get(1); + static ItemStack RECIPE_IronPlatedBricks = GregtechItemList.Casing_IronPlatedBricks.get(1); + static ItemStack RECIPE_Buffer_ULV = GregtechItemList.Energy_Buffer_1by1_ULV.get(1); + static ItemStack RECIPE_Buffer_LV = GregtechItemList.Energy_Buffer_1by1_LV.get(1); + static ItemStack RECIPE_Buffer_MV = GregtechItemList.Energy_Buffer_1by1_MV.get(1); + static ItemStack RECIPE_Buffer_HV = GregtechItemList.Energy_Buffer_1by1_HV.get(1); + static ItemStack RECIPE_Buffer_EV = GregtechItemList.Energy_Buffer_1by1_EV.get(1); + static ItemStack RECIPE_Buffer_IV = GregtechItemList.Energy_Buffer_1by1_IV.get(1); + static ItemStack RECIPE_Buffer_LuV = GregtechItemList.Energy_Buffer_1by1_LuV.get(1); + static ItemStack RECIPE_Buffer_ZPM = GregtechItemList.Energy_Buffer_1by1_ZPM.get(1); + static ItemStack RECIPE_Buffer_UV = GregtechItemList.Energy_Buffer_1by1_UV.get(1); + static ItemStack RECIPE_Buffer_MAX = GregtechItemList.Energy_Buffer_1by1_MAX.get(1); + //Industrial Centrifuge + static ItemStack RECIPE_IndustrialCentrifugeController = GregtechItemList.Industrial_Centrifuge.get(1); + static ItemStack RECIPE_IndustrialCentrifugeCasing = GregtechItemList.Casing_Centrifuge1.get(1); + //Industrial Coke Oven + static ItemStack RECIPE_IndustrialCokeOvenController = GregtechItemList.Industrial_CokeOven.get(1); + static ItemStack RECIPE_IndustrialCokeOvenFrame = GregtechItemList.Casing_CokeOven.get(1); + static ItemStack RECIPE_IndustrialCokeOvenCasingA = GregtechItemList.Casing_CokeOven_Coil1.get(1); + static ItemStack RECIPE_IndustrialCokeOvenCasingB = GregtechItemList.Casing_CokeOven_Coil2.get(1); + + + //Buffer Cores + static ItemStack RECIPE_BufferCore_ULV = UtilsItems.getItemStack("miscutils:item.itemBufferCore1", 1); + static ItemStack RECIPE_BufferCore_LV = UtilsItems.getItemStack("miscutils:item.itemBufferCore2", 1); + static ItemStack RECIPE_BufferCore_MV = UtilsItems.getItemStack("miscutils:item.itemBufferCore3", 1); + static ItemStack RECIPE_BufferCore_HV = UtilsItems.getItemStack("miscutils:item.itemBufferCore4", 1); + static ItemStack RECIPE_BufferCore_EV = UtilsItems.getItemStack("miscutils:item.itemBufferCore5", 1); + static ItemStack RECIPE_BufferCore_IV = UtilsItems.getItemStack("miscutils:item.itemBufferCore6", 1); + static ItemStack RECIPE_BufferCore_LuV = UtilsItems.getItemStack("miscutils:item.itemBufferCore7", 1); + static ItemStack RECIPE_BufferCore_ZPM = UtilsItems.getItemStack("miscutils:item.itemBufferCore8", 1); + static ItemStack RECIPE_BufferCore_UV = UtilsItems.getItemStack("miscutils:item.itemBufferCore9", 1); + static ItemStack RECIPE_BufferCore_MAX = UtilsItems.getItemStack("miscutils:item.itemBufferCore10", 1); + + + //Wire + static String wireTier1 = "wireGt08Lead"; + static String wireTier2 = "wireGt08Tin"; + static String wireTier3 = "wireGt08Copper"; + static String wireTier4 = "wireGt08Gold"; + static String wireTier5 = "wireGt08Aluminium"; + static String wireTier6 = "wireGt08Tungsten"; + static String wireTier7 = "wireGt08Osmium"; + static String wireTier8 = "wireGt08Naquadah"; + static String wireTier9 = "wireGt08Superconductor"; + static String wireTier10 = "wireGt16Superconductor"; + + //Wire + static String cableTier1 = "cableGt04Lead"; + static String cableTier2 = "cableGt04Tin"; + static String cableTier3 = "cableGt04Copper"; + static String cableTier4 = "cableGt04Gold"; + static String cableTier5 = "cableGt04Aluminium"; + static String cableTier6 = "cableGt04Tungsten"; + static String cableTier7 = "cableGt04Osmium"; + static String cableTier8 = "cableGt04Naquadah"; + static String cableTier9 = "cableGt04NiobiumTitanium"; + static String cableTier10 = "cableGt08NiobiumTitanium"; + + + //Plates + static String plateTier1 = "plateLead"; + static String plateTier2 = "plateTin"; + static String plateTier3 = "plateCopper"; + static String plateTier4 = "plateGold"; + static String plateTier5 = "plateAluminium"; + static String plateTier6 = "plateThorium"; + static String plateTier7 = "plateTungsten"; + static String plateTier8 = "plateTungstenSteel"; + static String plateTier9 = "plateOsmium"; + static String plateTier10 = "plateNaquadah"; + static String plateTier11 = "plateNeutronium"; + + //rods + static String rodTier1 = "stickLead"; + static String rodTier2 = "stickTin"; + static String rodTier3 = "stickCopper"; + static String rodTier4 = "stickGold"; + static String rodTier5 = "stickAluminium"; + static String rodTier6 = "stickThorium"; + static String rodTier7 = "stickTungsten"; + static String rodTier8 = "stickTungstenSteel"; + static String rodTier9 = "stickOsmium"; + static String rodTier10 = "stickNaquadah"; + static String rodTier11 = "stickNeutronium"; + + + //Machine Casings + static ItemStack machineCasing_ULV = ItemList.Casing_ULV.get(1); + static ItemStack machineCasing_LV = ItemList.Casing_LV.get(1); + static ItemStack machineCasing_MV = ItemList.Casing_MV.get(1); + static ItemStack machineCasing_HV = ItemList.Casing_HV.get(1); + static ItemStack machineCasing_EV = ItemList.Casing_EV.get(1); + static ItemStack machineCasing_IV = ItemList.Casing_IV.get(1); + static ItemStack machineCasing_LuV = ItemList.Casing_LuV.get(1); + static ItemStack machineCasing_ZPM = ItemList.Casing_ZPM.get(1); + static ItemStack machineCasing_UV = ItemList.Casing_UV.get(1); + static ItemStack machineCasing_MAX = ItemList.Casing_MAX.get(1); + + //Gearbox Casings + static ItemStack gearboxCasing_Tier_1 = ItemList.Casing_Gearbox_Bronze.get(1); + static ItemStack gearboxCasing_Tier_2 = ItemList.Casing_Gearbox_Steel.get(1); + static ItemStack gearboxCasing_Tier_3 = ItemList.Casing_Gearbox_Titanium.get(1); + static ItemStack gearboxCasing_Tier_4 = ItemList.Casing_Gearbox_TungstenSteel.get(1); + + //Cables + static String cableGt02Electrum = "cableGt02Electrum"; + + + //Plates + static String plateElectricalSteel= "plateElectricalSteel"; + static String plateEnergeticAlloy= "plateEnergeticAlloy"; + static String plateCobalt = "plateCobalt"; + static String plateBronze = "plateBronze"; + static String plateSteel = "plateSteel"; + + //Pipes + static String pipeLargeCopper="pipeLargeCopper"; + static String pipeHugeSteel="pipeHugeSteel"; + static String pipeHugeStainlessSteel="pipeHugeStainlessSteel"; + static String pipeHugeTitanium="pipeHugeTitanium"; + + //Lava Boiler + static ItemStack boiler_Coal = ItemList.Machine_Bronze_Boiler.get(1); + static ItemStack blockBricks = UtilsItems.getItemStack("minecraft:brick_block", 1); + + //Batteries + static String batteryBasic = "batteryBasic"; + static String batteryAdvanced = "batteryAdvanced"; + static String batteryElite = "batteryElite"; + static String batteryMaster = "batteryMaster"; + static String batteryUltimate = "batteryUltimate"; + + //Circuits + static String circuitPrimitive = "circuitPrimitive"; + static String circuitBasic = "circuitBasic"; + static String circuitGood = "circuitGood"; + static String circuitAdvanced = "circuitAdvanced"; + static String circuitData = "circuitData"; + static String circuitElite = "circuitElite"; + static String circuitMaster = "circuitMaster"; + static String circuitUltimate = "circuitUltimate"; + + //Machine Components + static ItemStack electricMotor_LV = ItemList.Electric_Motor_LV.get(1); + static ItemStack electricMotor_MV = ItemList.Electric_Motor_MV.get(1); + static ItemStack electricMotor_HV = ItemList.Electric_Motor_HV.get(1); + static ItemStack electricMotor_EV = ItemList.Electric_Motor_EV.get(1); + static ItemStack electricMotor_IV = ItemList.Electric_Motor_IV.get(1); + static ItemStack electricPump_LV = ItemList.Electric_Pump_LV.get(1); + static ItemStack electricPump_MV = ItemList.Electric_Pump_MV.get(1); + static ItemStack electricPump_HV = ItemList.Electric_Pump_HV.get(1); + static ItemStack electricPump_EV = ItemList.Electric_Pump_EV.get(1); + static ItemStack electricPump_IV = ItemList.Electric_Pump_IV.get(1); + static ItemStack electricPiston_LV = ItemList.Electric_Piston_LV.get(1); + static ItemStack electricPiston_MV = ItemList.Electric_Piston_MV.get(1); + static ItemStack electricPiston_HV = ItemList.Electric_Piston_HV.get(1); + static ItemStack electricPiston_EV = ItemList.Electric_Piston_EV.get(1); + static ItemStack electricPiston_IV = ItemList.Electric_Piston_IV.get(1); + static ItemStack robotArm_LV = ItemList.Robot_Arm_LV.get(1); + static ItemStack robotArm_MV = ItemList.Robot_Arm_MV.get(1); + static ItemStack robotArm_HV = ItemList.Robot_Arm_HV.get(1); + static ItemStack robotArm_EV = ItemList.Robot_Arm_EV.get(1); + static ItemStack robotArm_IV = ItemList.Robot_Arm_IV.get(1); + static ItemStack conveyorModule_LV = ItemList.Conveyor_Module_LV.get(1); + static ItemStack conveyorModule_MV = ItemList.Conveyor_Module_MV.get(1); + static ItemStack conveyorModule_HV = ItemList.Conveyor_Module_HV.get(1); + static ItemStack conveyorModule_EV = ItemList.Conveyor_Module_EV.get(1); + static ItemStack conveyorModule_IV = ItemList.Conveyor_Module_IV.get(1); + static ItemStack emitter_LV = ItemList.Emitter_LV.get(1); + static ItemStack emitter_MV = ItemList.Emitter_MV.get(1); + static ItemStack emitter_HV = ItemList.Emitter_HV.get(1); + static ItemStack emitter_EV = ItemList.Emitter_EV.get(1); + static ItemStack emitter_IV = ItemList.Emitter_IV.get(1); + static ItemStack fieldGenerator_LV = ItemList.Field_Generator_LV.get(1); + static ItemStack fieldGenerator_MV = ItemList.Field_Generator_MV.get(1); + static ItemStack fieldGenerator_HV = ItemList.Field_Generator_HV.get(1); + static ItemStack fieldGenerator_EV = ItemList.Field_Generator_EV.get(1); + static ItemStack fieldGenerator_IV = ItemList.Field_Generator_IV.get(1); + static ItemStack sensor_LV = ItemList.Sensor_LV.get(1); + static ItemStack sensor_MV = ItemList.Sensor_MV.get(1); + static ItemStack sensor_HV = ItemList.Sensor_HV.get(1); + static ItemStack sensor_EV = ItemList.Sensor_EV.get(1); + static ItemStack sensor_IV = ItemList.Sensor_IV.get(1); + + //Misc + static ItemStack INPUT_RCCokeOvenBlock = UtilsItems.getItemStackWithMeta(LoadedMods.Railcraft, "Railcraft:machine.alpha", "Coke_Oven_RC", 7, 1); + + + + //RobotArm, Conveyor, Emitter, Sensor, Field Generator + + + public static final void RECIPES_LOAD(){ + run(); + Utils.LOG_INFO("Loading Recipes for the Various machine blocks."); + } + + private static void run(){ + //Staballoy Dust - TEMP + UtilsRecipe.recipeBuilder("dustTitanium", "dustUranium", "dustUranium", + "dustUranium", "dustUranium", "dustUranium", + "dustUranium", "dustUranium", "dustUranium", + RECIPES_Shapeless.dustStaballoy); + + //Buffer Core + UtilsRecipe.recipeBuilder( + plateTier1, cableTier1, plateTier1, + circuitPrimitive, batteryBasic, circuitPrimitive, + plateTier1, cableTier1, plateTier1, + RECIPE_BufferCore_ULV); + UtilsRecipe.recipeBuilder( + plateTier2, cableTier2, plateTier2, + circuitBasic, batteryBasic, circuitBasic, + plateTier2, cableTier2, plateTier2, + RECIPE_BufferCore_LV); + UtilsRecipe.recipeBuilder( + plateTier3, cableTier3, plateTier3, + circuitGood, batteryAdvanced, circuitGood, + plateTier3, cableTier3, plateTier3, + RECIPE_BufferCore_MV); + UtilsRecipe.recipeBuilder( + plateTier4, cableTier4, plateTier4, + circuitAdvanced, batteryAdvanced, circuitAdvanced, + plateTier4, cableTier4, plateTier4, + RECIPE_BufferCore_HV); + UtilsRecipe.recipeBuilder( + plateTier5, cableTier5, plateTier5, + circuitData, batteryElite, circuitData, + plateTier5, cableTier5, plateTier5, + RECIPE_BufferCore_EV); + + UtilsRecipe.recipeBuilder( + plateTier6, cableTier6, plateTier6, + circuitData, batteryElite, circuitElite, + plateTier6, cableTier6, plateTier6, + RECIPE_BufferCore_IV); + UtilsRecipe.recipeBuilder( + plateTier7, cableTier7, plateTier7, + circuitElite, batteryMaster, circuitElite, + plateTier7, cableTier7, plateTier7, + RECIPE_BufferCore_LuV); + UtilsRecipe.recipeBuilder( + plateTier8, cableTier8, plateTier8, + circuitMaster, batteryMaster, circuitMaster, + plateTier8, cableTier8, plateTier8, + RECIPE_BufferCore_ZPM); + UtilsRecipe.recipeBuilder( + plateTier9, cableTier9, plateTier9, + circuitMaster, batteryUltimate, circuitUltimate, + plateTier9, cableTier9, plateTier9, + RECIPE_BufferCore_UV); + UtilsRecipe.recipeBuilder( + plateTier10, cableTier10, plateTier10, + circuitUltimate, batteryUltimate, circuitUltimate, + plateTier10, cableTier10, plateTier10, + RECIPE_BufferCore_MAX); + + + + + + + + + + + + + //Battery Buffer #1 + UtilsRecipe.recipeBuilder( + wireTier1, RECIPE_BufferCore_ULV, wireTier1, + wireTier1, machineCasing_ULV, wireTier1, + circuitPrimitive, null, circuitPrimitive, + RECIPE_Buffer_ULV); + + //Battery Buffer + UtilsRecipe.recipeBuilder( + wireTier2, RECIPE_BufferCore_LV, wireTier2, + wireTier2, machineCasing_LV, wireTier2, + circuitPrimitive, circuitBasic, circuitPrimitive, + RECIPE_Buffer_LV); + //Battery Buffer + UtilsRecipe.recipeBuilder( + wireTier3, RECIPE_BufferCore_MV, wireTier3, + wireTier3, machineCasing_MV, wireTier3, + circuitBasic, circuitGood, circuitBasic, + RECIPE_Buffer_MV); + //Battery Buffer + UtilsRecipe.recipeBuilder( + wireTier4, RECIPE_BufferCore_HV, wireTier4, + wireTier4, machineCasing_HV, wireTier4, + circuitGood, circuitAdvanced, circuitGood, + RECIPE_Buffer_HV); + //Battery Buffer + UtilsRecipe.recipeBuilder( + wireTier5, RECIPE_BufferCore_EV, wireTier5, + wireTier5, machineCasing_EV, wireTier5, + circuitAdvanced, circuitElite, circuitAdvanced, + RECIPE_Buffer_EV); + //Battery Buffer + UtilsRecipe.recipeBuilder( + wireTier6, RECIPE_BufferCore_IV, wireTier6, + wireTier6, machineCasing_IV, wireTier6, + circuitElite, circuitMaster, circuitElite, + RECIPE_Buffer_IV); + //Battery Buffer + UtilsRecipe.recipeBuilder( + wireTier7, RECIPE_BufferCore_LuV, wireTier7, + wireTier7, machineCasing_LuV, wireTier7, + circuitMaster, circuitElite, circuitMaster, + RECIPE_Buffer_LuV); + //Battery Buffer + UtilsRecipe.recipeBuilder( + wireTier8, RECIPE_BufferCore_ZPM, wireTier8, + wireTier8, machineCasing_ZPM, wireTier8, + circuitMaster, circuitUltimate, circuitMaster, + RECIPE_Buffer_ZPM); + //Battery Buffer + UtilsRecipe.recipeBuilder( + wireTier9, RECIPE_BufferCore_UV, wireTier9, + wireTier9, machineCasing_UV, wireTier9, + circuitUltimate, circuitMaster, circuitUltimate, + RECIPE_Buffer_UV); + //Battery Buffer + UtilsRecipe.recipeBuilder( + wireTier10, RECIPE_BufferCore_MAX, wireTier10, + wireTier10, machineCasing_MAX, wireTier10, + circuitUltimate, plateTier11, circuitUltimate, + RECIPE_Buffer_MAX); + + + //Steam Condenser + UtilsRecipe.recipeBuilder( + pipeLargeCopper, pipeHugeSteel, pipeLargeCopper, + plateEnergeticAlloy, electricPump_HV, plateEnergeticAlloy, + plateEnergeticAlloy, pipeLargeCopper, plateEnergeticAlloy, + RECIPE_SteamCondenser); + + //Iron BF + UtilsRecipe.recipeBuilder( + "plateDoubleAnyIron", "craftingFurnace", "plateDoubleAnyIron", + boiler_Coal, machineCasing_ULV, boiler_Coal, + "plateDoubleAnyIron", "bucketLava", "plateDoubleAnyIron", + RECIPE_IronBlastFurnace); + + //Iron plated Bricks + UtilsRecipe.recipeBuilder( + "plateAnyIron", RECIPES_Tools.craftingToolHardHammer, "plateAnyIron", + "plateAnyIron", blockBricks, "plateAnyIron", + "plateAnyIron", RECIPES_Tools.craftingToolWrench, "plateAnyIron", + RECIPE_IronPlatedBricks); + + + + + //Industrial Centrifuge + UtilsRecipe.recipeBuilder( + circuitElite, pipeHugeStainlessSteel, circuitElite, + plateTier6, electricPump_EV, plateTier6, + plateTier8, machineCasing_EV, plateTier8, + RECIPE_IndustrialCentrifugeController); + + //Centrifuge Casing + UtilsRecipe.recipeBuilder( + plateTier6, "stickElectrum", plateTier6, + plateTier8, "stickElectrum", plateTier8, + plateTier6, "stickElectrum", plateTier6, + RECIPE_IndustrialCentrifugeCasing); + + //Industrial Coke Oven + UtilsRecipe.recipeBuilder( + plateCobalt, circuitAdvanced, plateCobalt, + machineCasing_HV, INPUT_RCCokeOvenBlock, machineCasing_HV, + plateCobalt, circuitAdvanced, plateCobalt, + RECIPE_IndustrialCokeOvenController); + + //Coke Oven Frame Casing + UtilsRecipe.recipeBuilder( + plateTier8, rodTier8, plateTier8, + rodTier8, "frameGtCobalt", rodTier8, + plateTier8, rodTier8, plateTier8, + RECIPE_IndustrialCokeOvenFrame); + + //Coke Oven Coil 1 + UtilsRecipe.recipeBuilder( + plateBronze, plateBronze, plateBronze, + "frameGtBronze", gearboxCasing_Tier_1, "frameGtBronze", + plateBronze, plateBronze, plateBronze, + RECIPE_IndustrialCokeOvenCasingA); + + //Coke Oven Coil 2 + UtilsRecipe.recipeBuilder( + plateSteel, plateSteel, plateSteel, + "frameGtSteel", gearboxCasing_Tier_2, "frameGtSteel", + plateSteel, plateSteel, plateSteel, + RECIPE_IndustrialCokeOvenCasingB); + + + + + + + + + + + + + + + + + + + + + + Utils.LOG_INFO("Done loading recipes for the Various machine blocks."); + + + + + + + + + + + + + + + + + + + + + + + + } +} diff --git a/src/Java/miscutil/core/recipe/RECIPES_Shapeless.java b/src/Java/miscutil/core/recipe/RECIPES_Shapeless.java new file mode 100644 index 0000000000..756955bb1a --- /dev/null +++ b/src/Java/miscutil/core/recipe/RECIPES_Shapeless.java @@ -0,0 +1,42 @@ +package miscutil.core.recipe; + +import gregtech.api.enums.ItemList; +import miscutil.core.lib.LoadedMods; +import miscutil.core.util.Utils; +import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.recipe.UtilsRecipe; +import net.minecraft.item.ItemStack; + +public class RECIPES_Shapeless { + + static ItemStack dustStaballoy = UtilsItems.getItemStackWithMeta(LoadedMods.Gregtech, "gregtech:gt.metaitem.01", "Staballoy Dust", 2319, 1); + + //Circuits + static String circuitPrimitive = "circuitPrimitive"; + static String circuitBasic = "circuitBasic"; + static String circuitGood = "circuitGood"; + static String circuitAdvanced = "circuitAdvanced"; + static String circuitData = "circuitData"; + static String circuitElite = "circuitElite"; + static String circuitMaster = "circuitMaster"; + static String circuitUltimate = "circuitUltimate"; + static ItemStack gearboxCasing_Tier_1 = ItemList.Casing_Gearbox_Bronze.get(1); + + public static final void RECIPES_LOAD(){ + //run(); + Utils.LOG_INFO("Loading Shapeless Recipes."); + } + + private static void run(){ + UtilsRecipe.shapelessBuilder(dustStaballoy, + "dustTitanium", "dustUranium", "dustUranium", + "dustUranium", "dustUranium", "dustUranium", + "dustUranium", "dustUranium", "dustUranium"); + + UtilsRecipe.shapelessBuilder(gearboxCasing_Tier_1, + circuitPrimitive, circuitPrimitive, circuitPrimitive, + circuitPrimitive, circuitPrimitive, circuitPrimitive, + circuitPrimitive, circuitPrimitive, circuitPrimitive); + } + +} diff --git a/src/Java/miscutil/core/recipe/RECIPES_Tools.java b/src/Java/miscutil/core/recipe/RECIPES_Tools.java new file mode 100644 index 0000000000..80919c961f --- /dev/null +++ b/src/Java/miscutil/core/recipe/RECIPES_Tools.java @@ -0,0 +1,177 @@ +package miscutil.core.recipe; + +import miscutil.core.item.ModItems; +import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.recipe.UtilsRecipe; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + +public class RECIPES_Tools { + + //Outputs + static ItemStack RECIPE_StaballoyPickaxe = new ItemStack(ModItems.itemStaballoyPickaxe); + static ItemStack RECIPE_StaballoyAxe = new ItemStack(ModItems.itemStaballoyAxe); + static ItemStack RECIPE_SandstoneHammer = new ItemStack(ModItems.itemSandstoneHammer); + static ItemStack RECIPE_StaballoyIngot = new ItemStack(ModItems.itemIngotStaballoy); + static ItemStack RECIPE_SandStone = new ItemStack(Blocks.sandstone, 2); + static ItemStack RECIPE_Sand = new ItemStack(Blocks.sand, 4); + + static ItemStack RECIPE_DivisionSigil = new ItemStack(UtilsItems.getItem("ExtraUtilities:divisionSigil")); + + //MC Items + static Item Apple = Items.apple; + + //MC Blocks + static Block CobbleStone = Blocks.cobblestone; + static Block Dirt = Blocks.dirt; + static Block Sand = Blocks.sand; + static Block Gravel = Blocks.gravel; + static Block Sandstone = Blocks.sandstone; + + //null + static String empty = " "; + + //Batteries + static String batteryBasic = "batteryBasic"; + static String batteryAdvanced = "batteryAdvanced"; + static String batteryElite = "batteryElite"; + static String batteryMaster = "batteryMaster"; + static String batteryUltimate = "batteryUltimate"; + + //Circuits + static String circuitPrimitive = "circuitPrimitive"; + static String circuitBasic = "circuitBasic"; + static String circuitGood = "circuitGood"; + static String circuitAdvanced = "circuitAdvanced"; + static String circuitElite = "circuitElite"; + static String circuitMaster = "circuitMaster"; + static String circuitUltimate = "circuitUltimate"; + + //Cables + static String cableGt01Electrum = "cableGt01Electrum"; + static String cableGt02Electrum = "cableGt02Electrum"; + static String cableGt01RedstoneAlloy = "cableGt01RedstoneAlloy"; + static String cableGt02RedstoneAlloy = "cableGt02RedstoneAlloy"; + static String cableGt01Copper = "cableGt01Copper"; + static String cableGt02Copper = "cableGt02Copper"; + static String cableGt01AnnealedCopper = "cableGt01AnnealedCopper"; + static String cableGt02AnnealedCopper = "cableGt02AnnealedCopper"; + + //Rods + static String stickStaballoy= "stickStaballoy"; + static String stickTitanium= "stickTitanium"; + static String stickIron= "stickIron"; + static String stickGold= "stickGold"; + static String stickSilver= "stickSilver"; + static String stickSteel= "stickSteel"; + static String stickBronze= "stickBronze"; + static String stickTungsten= "stickTungsten"; + static String stickRedAlloy= "stickRedAlloy"; + static String stickInvar= "stickInvar"; + static String stickElectrum= "stickElectrum"; + static String stickElectricalSteel= "stickElectricalSteel"; + + //Plates + static String plateStaballoy= "plateStaballoy"; + static String plateTitanium= "plateTitanium"; + static String plateIron= "plateIron"; + static String plateGold= "plateGold"; + static String plateSilver= "plateSilver"; + static String plateSteel= "plateSteel"; + static String plateBronze= "plateBronze"; + static String plateTungsten= "plateTungsten"; + static String plateRedAlloy= "plateRedAlloy"; + static String plateInvar= "plateInvar"; + static String plateElectrum= "plateElectrum"; + static String plateElectricalSteel= "plateElectricalSteel"; + + //Ingots + static String ingotStaballoy= "ingotStaballoy"; + static String ingotTitanium= "ingotTitanium"; + static String ingotIron= "ingotIron"; + static String ingotGold= "ingotGold"; + static String ingotSilver= "ingotSilver"; + static String ingotSteel= "ingotSteel"; + static String ingotBronze= "ingotBronze"; + static String ingotTungsten= "ingotTungsten"; + static String ingotRedAlloy= "ingotRedAlloy"; + static String ingotInvar= "ingotInvar"; + static String ingotElectrum= "ingotElectrum"; + static String ingotUranium= "ingotUranium"; + static String ingotElectricalSteel= "ingotElectricalSteel"; + + //Crafting Tools + static String craftingToolHardHammer = "craftingToolHardHammer"; + static String craftingToolSoftHammer = "craftingToolSoftHammer"; + static String craftingToolFile = "craftingToolFile"; + static String craftingToolSaw = "craftingToolSaw"; + static String craftingToolPickaxe = "craftingToolPickaxe"; + static String craftingToolWrench = "craftingToolWrench"; + static String craftingToolCrowbar = "craftingToolCrowbar"; + static String craftingToolKnife = "craftingToolKnife"; + static String craftingToolScrewdriver = "craftingToolScrewdriver"; + + static ItemStack sandHammer = new ItemStack (ModItems.itemSandstoneHammer, 1, OreDictionary.WILDCARD_VALUE); + static String craftingToolSandHammer = "craftingToolSandHammer"; + + public static final void RECIPES_LOAD(){ + + //plateStaballoy = new ItemStack(ModItems.itemPlateStaballoy); + //ingotStaballoy = new ItemStack(ModItems.itemIngotStaballoy); + + //Pickaxes + run(); + + } + + private static void run(){ + //Staballoy Pickaxe + UtilsRecipe.recipeBuilder( + plateStaballoy, plateStaballoy, ingotStaballoy, + craftingToolFile, stickTungsten, craftingToolHardHammer, + craftingToolWrench, stickTungsten, craftingToolHardHammer, + RECIPE_StaballoyPickaxe); + + //Staballoy Axe + UtilsRecipe.recipeBuilder( + plateStaballoy, ingotStaballoy, craftingToolHardHammer, + plateStaballoy, stickTungsten, craftingToolHardHammer, + craftingToolFile, stickTungsten, craftingToolWrench, + RECIPE_StaballoyAxe); + + //Cobble to Sand + UtilsRecipe.recipeBuilder( + CobbleStone, CobbleStone, CobbleStone, + CobbleStone, sandHammer, CobbleStone, + CobbleStone, CobbleStone, CobbleStone, + RECIPE_Sand); + + //Sand to Sandstone + UtilsRecipe.recipeBuilder( + Sand, Sand, Sand, + Sand, sandHammer, Sand, + Sand, Sand, Sand, + RECIPE_SandStone); + + //Sandstone Hammer + UtilsRecipe.recipeBuilder( + plateElectrum, ingotElectrum, plateElectrum, + craftingToolScrewdriver, stickBronze, craftingToolHardHammer, + null, stickSteel, null, + RECIPE_SandstoneHammer); + + //Division Sigil + UtilsRecipe.recipeBuilder( + "plateNetherStar", "gemIridium", "plateNetherStar", + "plateIridium", craftingToolHardHammer, "plateIridium", + "plateNetherStar", "gemIridium", "plateNetherStar", + RECIPE_DivisionSigil); + + + } + +} diff --git a/src/Java/miscutil/core/recipe/ShapedRecipeObject.java b/src/Java/miscutil/core/recipe/ShapedRecipeObject.java new file mode 100644 index 0000000000..bde574b3e6 --- /dev/null +++ b/src/Java/miscutil/core/recipe/ShapedRecipeObject.java @@ -0,0 +1,42 @@ +package miscutil.core.recipe; + +import miscutil.core.util.Utils; +import miscutil.core.util.recipe.UtilsRecipe; +import net.minecraft.item.ItemStack; + +public class ShapedRecipeObject { + + public Object object_A; + public Object object_B; + public Object object_C; + public Object object_D; + public Object object_E; + public Object object_F; + public Object object_G; + public Object object_H; + public Object object_I; + public ItemStack object_OUTPUT; + + public ShapedRecipeObject( + Object input_A,Object input_B,Object input_C, + Object input_D,Object input_E,Object input_F, + Object input_G,Object input_H,Object input_I, + ItemStack input_Output){ + this.object_A = input_A; + this.object_B = input_B; + this.object_C = input_C; + this.object_D = input_D; + this.object_E = input_E; + this.object_F = input_F; + this.object_G = input_G; + this.object_H = input_H; + this.object_I = input_I; + this.object_OUTPUT = input_Output; + Utils.LOG_SPECIFIC_WARNING("ShapedRecipeObject", "New object created.", 36); + } + + public void buildRecipe(){ + UtilsRecipe.recipeBuilder(object_A, object_B, object_C, object_D, object_E, object_F, object_G, object_H, object_I, object_OUTPUT); + } + +} diff --git a/src/Java/miscutil/core/tileentities/TileEntityNHG.java b/src/Java/miscutil/core/tileentities/TileEntityNHG.java index 6775fe515b..17dd8d4216 100644 --- a/src/Java/miscutil/core/tileentities/TileEntityNHG.java +++ b/src/Java/miscutil/core/tileentities/TileEntityNHG.java @@ -15,8 +15,8 @@ public class TileEntityNHG extends TileEntity implements IInventory { private ItemStack[] items = new ItemStack[19]; //18 private int progress = 1; - private int maxProgress = 1800; - private int heatCycleProgress = 120; + private int maxProgress = 180; + private int heatCycleProgress = 12; public float coreTemp; public float maxTemp = 10000; private boolean fuelrod_1 = false; @@ -49,7 +49,7 @@ public class TileEntityNHG extends TileEntity implements IInventory public boolean isValidFuelRod(ItemStack input){ if(!this.worldObj.isRemote){ if (input != null){ - if (input.getItem() instanceof FuelRod_Base){ + if (input.copy().getItem() instanceof FuelRod_Base){ int fuelRodFuelLevel = getRodFuelValue(input); float fuelRodHeatLevel = getRodHeatValue(input); Utils.LOG_WARNING("Fuel Left: "+fuelRodFuelLevel+" Current Temp: "+fuelRodHeatLevel); @@ -64,10 +64,10 @@ public class TileEntityNHG extends TileEntity implements IInventory public ItemStack doFuelRodHeatDamage(ItemStack input){ if(!this.worldObj.isRemote){ - if (input != null){ - if (isValidFuelRod(input)){ - int fuelRodFuelLevel = getRodFuelValue(input); - float fuelRodHeatLevel = getRodHeatValue(input); + if (input.copy() != null){ + if (isValidFuelRod(input.copy())){ + int fuelRodFuelLevel = getRodFuelValue(input.copy()); + float fuelRodHeatLevel = getRodHeatValue(input.copy()); if((fuelRodHeatLevel <= 0 || fuelRodHeatLevel == 0) && fuelRodFuelLevel > 0){ if(fuelRodFuelLevel <= 0 || fuelRodFuelLevel == 0){ @@ -100,21 +100,20 @@ public class TileEntityNHG extends TileEntity implements IInventory } public float getRodHeatValue(ItemStack value){ - if (value != null){ - if (value.stackTagCompound.getFloat("heat") != 0){ - return value.stackTagCompound.getFloat("heat"); + if (value.copy() != null){ + if (value.copy().stackTagCompound != null){ + return value.copy().stackTagCompound.getFloat("heat"); } - return 0f; } return 0f; } public int getRodFuelValue(ItemStack value){ - if (value != null){ - if (value.stackTagCompound.getInteger("fuelRemaining") != 0){ - return value.stackTagCompound.getInteger("fuelRemaining"); + if (value.copy() != null){ + if (value.copy().stackTagCompound != null){ + int tempInt = value.copy().stackTagCompound.getInteger("fuelRemaining"); + return tempInt; } - return 0; } return 0; } @@ -124,83 +123,101 @@ public class TileEntityNHG extends TileEntity implements IInventory if(!this.worldObj.isRemote){ for (int i = 0; i < getSizeInventory(); i++){ if (items[i] != null){ - if (items[i].getItem() instanceof FuelRod_Base){ - ItemStack fuelRodStack = getStackInSlot(i); + if (items[i].copy().getItem() instanceof FuelRod_Base){ + ItemStack fuelRodStack = getStackInSlot(i).copy(); //setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); if (i == 0){ fuelrod_1 = true; FuelRod_Base x = (FuelRod_Base) fuelRodStack.getItem(); x.addHeat(5); x.addFuel(-5); - setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); + ItemStack r = doFuelRodHeatDamage(fuelRodStack); + setInventorySlotContents(i, r); } else if (i == 1){ fuelrod_2 = true; - setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); + ItemStack r = doFuelRodHeatDamage(fuelRodStack); + setInventorySlotContents(i, r); } else if (i == 2){ fuelrod_3 = true; - setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); + ItemStack r = doFuelRodHeatDamage(fuelRodStack); + setInventorySlotContents(i, r); } else if (i == 3){ fuelrod_4 = true; - setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); + ItemStack r = doFuelRodHeatDamage(fuelRodStack); + setInventorySlotContents(i, r); } else if (i == 4){ fuelrod_5 = true; - setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); + ItemStack r = doFuelRodHeatDamage(fuelRodStack); + setInventorySlotContents(i, r); } else if (i == 5){ fuelrod_6 = true; - setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); + ItemStack r = doFuelRodHeatDamage(fuelRodStack); + setInventorySlotContents(i, r); } else if (i == 6){ fuelrod_7 = true; - setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); + ItemStack r = doFuelRodHeatDamage(fuelRodStack); + setInventorySlotContents(i, r); } else if (i == 7){ fuelrod_8 = true; - setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); + ItemStack r = doFuelRodHeatDamage(fuelRodStack); + setInventorySlotContents(i, r); } else if (i == 8){ fuelrod_9 = true; - setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); + ItemStack r = doFuelRodHeatDamage(fuelRodStack); + setInventorySlotContents(i, r); } else if (i == 9){ fuelrod_10 = true; - setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); + ItemStack r = doFuelRodHeatDamage(fuelRodStack); + setInventorySlotContents(i, r); } else if (i == 10){ fuelrod_11 = true; - setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); + ItemStack r = doFuelRodHeatDamage(fuelRodStack); + setInventorySlotContents(i, r); } else if (i == 11){