diff options
Diffstat (limited to 'src/Java/miscutil')
29 files changed, 420 insertions, 410 deletions
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/util/recipe/RECIPES_GREGTECH.java b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java index b6f6e778de..3f3338b1d1 100644 --- a/src/Java/miscutil/core/util/recipe/RECIPES_GREGTECH.java +++ b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java @@ -1,11 +1,11 @@ -package miscutil.core.util.recipe; +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.UtilsItems; +import miscutil.core.util.item.UtilsItems; public class RECIPES_GREGTECH { diff --git a/src/Java/miscutil/core/util/recipe/RECIPES_MTWRAPPER.java b/src/Java/miscutil/core/recipe/RECIPES_MTWRAPPER.java index e30b3f1c04..2f31d133db 100644 --- a/src/Java/miscutil/core/util/recipe/RECIPES_MTWRAPPER.java +++ b/src/Java/miscutil/core/recipe/RECIPES_MTWRAPPER.java @@ -1,9 +1,10 @@ -package miscutil.core.util.recipe; +package miscutil.core.recipe; import java.util.ArrayList; import miscutil.core.util.Utils; -import miscutil.core.util.UtilsItems; +import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.recipe.UtilsRecipe; import miscutil.core.util.wrapper.var; import net.minecraft.item.ItemStack; @@ -90,7 +91,7 @@ public class RECIPES_MTWRAPPER { validSlots.add(2, lineThree); try { - UtilsItems.recipeBuilder((Object[]) validSlots.toArray(), outputItem.copy()); + UtilsRecipe.recipeBuilder((Object[]) validSlots.toArray(), outputItem.copy()); MT_RECIPES_LOADED++; } catch(NullPointerException | ClassCastException k){ diff --git a/src/Java/miscutil/core/util/recipe/RECIPES_Machines.java b/src/Java/miscutil/core/recipe/RECIPES_Machines.java index 9d324e69f0..ef57d44f44 100644 --- a/src/Java/miscutil/core/util/recipe/RECIPES_Machines.java +++ b/src/Java/miscutil/core/recipe/RECIPES_Machines.java @@ -1,9 +1,10 @@ -package miscutil.core.util.recipe; +package miscutil.core.recipe; import gregtech.api.enums.ItemList; import miscutil.core.lib.LoadedMods; import miscutil.core.util.Utils; -import miscutil.core.util.UtilsItems; +import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.recipe.UtilsRecipe; import miscutil.gregtech.api.enums.GregtechItemList; import net.minecraft.item.ItemStack; @@ -212,59 +213,59 @@ public class RECIPES_Machines { private static void run(){ //Staballoy Dust - TEMP - UtilsItems.recipeBuilder("dustTitanium", "dustUranium", "dustUranium", + UtilsRecipe.recipeBuilder("dustTitanium", "dustUranium", "dustUranium", "dustUranium", "dustUranium", "dustUranium", "dustUranium", "dustUranium", "dustUranium", RECIPES_Shapeless.dustStaballoy); //Buffer Core - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateTier1, cableTier1, plateTier1, circuitPrimitive, batteryBasic, circuitPrimitive, plateTier1, cableTier1, plateTier1, RECIPE_BufferCore_ULV); - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateTier2, cableTier2, plateTier2, circuitBasic, batteryBasic, circuitBasic, plateTier2, cableTier2, plateTier2, RECIPE_BufferCore_LV); - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateTier3, cableTier3, plateTier3, circuitGood, batteryAdvanced, circuitGood, plateTier3, cableTier3, plateTier3, RECIPE_BufferCore_MV); - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateTier4, cableTier4, plateTier4, circuitAdvanced, batteryAdvanced, circuitAdvanced, plateTier4, cableTier4, plateTier4, RECIPE_BufferCore_HV); - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateTier5, cableTier5, plateTier5, circuitData, batteryElite, circuitData, plateTier5, cableTier5, plateTier5, RECIPE_BufferCore_EV); - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateTier6, cableTier6, plateTier6, circuitData, batteryElite, circuitElite, plateTier6, cableTier6, plateTier6, RECIPE_BufferCore_IV); - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateTier7, cableTier7, plateTier7, circuitElite, batteryMaster, circuitElite, plateTier7, cableTier7, plateTier7, RECIPE_BufferCore_LuV); - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateTier8, cableTier8, plateTier8, circuitMaster, batteryMaster, circuitMaster, plateTier8, cableTier8, plateTier8, RECIPE_BufferCore_ZPM); - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateTier9, cableTier9, plateTier9, circuitMaster, batteryUltimate, circuitUltimate, plateTier9, cableTier9, plateTier9, RECIPE_BufferCore_UV); - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateTier10, cableTier10, plateTier10, circuitUltimate, batteryUltimate, circuitUltimate, plateTier10, cableTier10, plateTier10, @@ -282,62 +283,62 @@ public class RECIPES_Machines { //Battery Buffer #1 - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( wireTier1, RECIPE_BufferCore_ULV, wireTier1, wireTier1, machineCasing_ULV, wireTier1, circuitPrimitive, null, circuitPrimitive, RECIPE_Buffer_ULV); //Battery Buffer - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( wireTier2, RECIPE_BufferCore_LV, wireTier2, wireTier2, machineCasing_LV, wireTier2, circuitPrimitive, circuitBasic, circuitPrimitive, RECIPE_Buffer_LV); //Battery Buffer - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( wireTier3, RECIPE_BufferCore_MV, wireTier3, wireTier3, machineCasing_MV, wireTier3, circuitBasic, circuitGood, circuitBasic, RECIPE_Buffer_MV); //Battery Buffer - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( wireTier4, RECIPE_BufferCore_HV, wireTier4, wireTier4, machineCasing_HV, wireTier4, circuitGood, circuitAdvanced, circuitGood, RECIPE_Buffer_HV); //Battery Buffer - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( wireTier5, RECIPE_BufferCore_EV, wireTier5, wireTier5, machineCasing_EV, wireTier5, circuitAdvanced, circuitElite, circuitAdvanced, RECIPE_Buffer_EV); //Battery Buffer - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( wireTier6, RECIPE_BufferCore_IV, wireTier6, wireTier6, machineCasing_IV, wireTier6, circuitElite, circuitMaster, circuitElite, RECIPE_Buffer_IV); //Battery Buffer - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( wireTier7, RECIPE_BufferCore_LuV, wireTier7, wireTier7, machineCasing_LuV, wireTier7, circuitMaster, circuitElite, circuitMaster, RECIPE_Buffer_LuV); //Battery Buffer - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( wireTier8, RECIPE_BufferCore_ZPM, wireTier8, wireTier8, machineCasing_ZPM, wireTier8, circuitMaster, circuitUltimate, circuitMaster, RECIPE_Buffer_ZPM); //Battery Buffer - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( wireTier9, RECIPE_BufferCore_UV, wireTier9, wireTier9, machineCasing_UV, wireTier9, circuitUltimate, circuitMaster, circuitUltimate, RECIPE_Buffer_UV); //Battery Buffer - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( wireTier10, RECIPE_BufferCore_MAX, wireTier10, wireTier10, machineCasing_MAX, wireTier10, circuitUltimate, plateTier11, circuitUltimate, @@ -345,21 +346,21 @@ public class RECIPES_Machines { //Steam Condenser - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( pipeLargeCopper, pipeHugeSteel, pipeLargeCopper, plateEnergeticAlloy, electricPump_HV, plateEnergeticAlloy, plateEnergeticAlloy, pipeLargeCopper, plateEnergeticAlloy, RECIPE_SteamCondenser); //Iron BF - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( "plateDoubleAnyIron", "craftingFurnace", "plateDoubleAnyIron", boiler_Coal, machineCasing_ULV, boiler_Coal, "plateDoubleAnyIron", "bucketLava", "plateDoubleAnyIron", RECIPE_IronBlastFurnace); //Iron plated Bricks - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( "plateAnyIron", RECIPES_Tools.craftingToolHardHammer, "plateAnyIron", "plateAnyIron", blockBricks, "plateAnyIron", "plateAnyIron", RECIPES_Tools.craftingToolWrench, "plateAnyIron", @@ -369,42 +370,42 @@ public class RECIPES_Machines { //Industrial Centrifuge - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( circuitElite, pipeHugeStainlessSteel, circuitElite, plateTier6, electricPump_EV, plateTier6, plateTier8, machineCasing_EV, plateTier8, RECIPE_IndustrialCentrifugeController); //Centrifuge Casing - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateTier6, "stickElectrum", plateTier6, plateTier8, "stickElectrum", plateTier8, plateTier6, "stickElectrum", plateTier6, RECIPE_IndustrialCentrifugeCasing); //Industrial Coke Oven - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateCobalt, circuitAdvanced, plateCobalt, machineCasing_HV, INPUT_RCCokeOvenBlock, machineCasing_HV, plateCobalt, circuitAdvanced, plateCobalt, RECIPE_IndustrialCokeOvenController); //Coke Oven Frame Casing - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateTier8, rodTier8, plateTier8, rodTier8, "frameGtCobalt", rodTier |