From ae21012d216df71f31aed6fbc9d76215fc24ceed Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sat, 4 Mar 2017 12:58:47 +1000 Subject: + New texture for the slow builders ring. + Added the Alkalus Disk. $ Fixed Frame Box Assembler Recipes. $ Fixed Missing 7Li material. $ Fixed Tiered Tanks not showing their capacity in the tooltip. $ Fixed tooltips for alloys containing Bronze or Steel. $ Fixed Clay Pipe Extruder Recipes. - Removed a handful of Plasma cells for misc. materials. % Changed the Industrial Coke Oven's tooltip, to better describe the input/output requirements. % Cleaned up The Entire Project. --- .../core/recipe/Gregtech_Recipe_Adder.java | 40 +-- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 288 ++++++++++----------- .../gtPlusPlus/core/recipe/RECIPES_General.java | 2 +- .../core/recipe/RECIPES_LaserEngraver.java | 12 +- .../gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java | 47 ++-- .../core/recipe/RECIPES_MachineComponents.java | 24 +- .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 143 +++++----- .../gtPlusPlus/core/recipe/RECIPES_Shapeless.java | 50 ++-- src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java | 4 +- .../gtPlusPlus/core/recipe/RECIPE_Batteries.java | 16 +- .../gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java | 8 +- .../gtPlusPlus/core/recipe/ShapedRecipeObject.java | 16 +- 12 files changed, 325 insertions(+), 325 deletions(-) (limited to 'src/Java/gtPlusPlus/core/recipe') diff --git a/src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java b/src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java index bb5732c319..f9db59ddb4 100644 --- a/src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java +++ b/src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java @@ -17,22 +17,22 @@ public class Gregtech_Recipe_Adder { private static ItemStack outputStack2; public static void addRecipe( - Item maceratorInput, int maceratorInputAmount1, - Item maceratorOutput, int maceratorOutputAmount1, - Item compressorInput, int compressorInputAmount1, - Item compressorOutput, int compressorOutputAmount1, - Item blastFurnaceInput, int blastFurnaceInputAmount1, - Item blastFurnaceOutput, int blastFurnaceOutputAmount1, - Item blastFurnaceInput2, int blastFurnaceInputAmount2, - Item blastFurnaceOutput2, int blastFurnaceOutputAmount2, - Item smeltingInput, int smeltingInputAmount1, - Item smeltingOutput, int smeltingOutputAmount1, - - int euPerTick, int timeInTicks, - boolean addMaceratorRecipe, boolean addCompressorRecipe, boolean addBlastFurnaceRecipe, int blastFurnaceTemp, boolean addSmeltingRecipe, boolean addMixerRecipe){ + final Item maceratorInput, final int maceratorInputAmount1, + final Item maceratorOutput, final int maceratorOutputAmount1, + final Item compressorInput, final int compressorInputAmount1, + final Item compressorOutput, final int compressorOutputAmount1, + final Item blastFurnaceInput, final int blastFurnaceInputAmount1, + final Item blastFurnaceOutput, final int blastFurnaceOutputAmount1, + final Item blastFurnaceInput2, final int blastFurnaceInputAmount2, + final Item blastFurnaceOutput2, final int blastFurnaceOutputAmount2, + final Item smeltingInput, final int smeltingInputAmount1, + final Item smeltingOutput, final int smeltingOutputAmount1, + + final int euPerTick, final int timeInTicks, + final boolean addMaceratorRecipe, final boolean addCompressorRecipe, final boolean addBlastFurnaceRecipe, final int blastFurnaceTemp, final boolean addSmeltingRecipe, final boolean addMixerRecipe){ euT = euPerTick; ticks = timeInTicks; - + resetVars(); if (addMaceratorRecipe){ inputStack1 = ItemUtils.getSimpleStack(maceratorInput, maceratorInputAmount1); @@ -62,7 +62,7 @@ public class Gregtech_Recipe_Adder { resetVars(); } - + private static void resetVars(){ inputStack1 = null; inputStack2 = null; @@ -70,15 +70,15 @@ public class Gregtech_Recipe_Adder { outputStack2 = null; } - private static void addMaceratorRecipe(ItemStack input1, ItemStack output1){ + private static void addMaceratorRecipe(final ItemStack input1, final ItemStack output1){ GT_ModHandler.addPulverisationRecipe(input1, output1); } - private static void addCompressorRecipe(ItemStack input1, ItemStack output1){ + private static void addCompressorRecipe(final ItemStack input1, final ItemStack output1){ GT_ModHandler.addCompressionRecipe(input1, output1); } - private static void addBlastFurnaceRecipe(ItemStack input1, ItemStack input2, ItemStack output1, ItemStack output2, int tempRequired){ + private static void addBlastFurnaceRecipe(final ItemStack input1, final ItemStack input2, final ItemStack output1, final ItemStack output2, final int tempRequired){ Utils.LOG_INFO("Registering Blast Furnace Recipes."); GT_Values.RA.addBlastRecipe( input1, @@ -87,11 +87,11 @@ public class Gregtech_Recipe_Adder { output1, output2, ticks, - euT, + euT, tempRequired); } - private static void addSmeltingRecipe(ItemStack input1, ItemStack output1){ + private static void addSmeltingRecipe(final ItemStack input1, final ItemStack output1){ GT_ModHandler.addSmeltingRecipe(input1, output1); } diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 85ae1873f8..617850105b 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -48,17 +48,17 @@ public class RECIPES_GREGTECH { try { - //GT Logs to Charcoal Recipe + //GT Logs to Charcoal Recipe //With Sulfuric Acid CORE.RA.addCokeOvenRecipe( GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 1L), //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 + 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");} + }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} try { //Coal -> Coke Recipe @@ -68,23 +68,23 @@ public class RECIPES_GREGTECH { GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1L), //Input 2 Materials.SulfuricAcid.getFluid(60L), //Fluid Input Materials.Creosote.getFluid(250L), //Fluid Output - ItemUtils.getItemStack("Railcraft:fuel.coke", 2), //Item Output + ItemUtils.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");} + 120); //EU + }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} try { - //GT Logs to Charcoal Recipe + //GT Logs to Charcoal Recipe //Without Sulfuric Acid CORE.RA.addCokeOvenRecipe( GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 1L), //Input 1 GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 1L), //Input 2 FluidUtils.getFluidStack("oxygen", 80), //Fluid Input Materials.Creosote.getFluid(145L), //Fluid Output - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 2L), //Item 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");} + }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} try { //Coal -> Coke Recipe @@ -94,10 +94,10 @@ public class RECIPES_GREGTECH { GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1L), //Input 2 FluidUtils.getFluidStack("oxygen", 185), //Fluid Input Materials.Creosote.getFluid(200L), //Fluid Output - ItemUtils.getItemStack("Railcraft:fuel.coke", 2), //Item Output + ItemUtils.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");} + }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} } private static void matterFabRecipes(){ @@ -110,15 +110,15 @@ public class RECIPES_GREGTECH { Materials.UUMatter.getFluid(1L), //Fluid Output 800, //Time in ticks 32); //EU - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} try { CORE.RA.addMatterFabricatorRecipe( null, //Fluid Input Materials.UUMatter.getFluid(1L), //Fluid Output 3200, //Time in ticks - 32); //EU - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + 32); //EU + }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} } @@ -131,16 +131,16 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricLithium", 1), //Item Input FluidUtils.getFluidStack("sulfuriclithium", 440), //Fluid input (slot 1) new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 3), - ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustSodium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 3) - }, //Output Array of Items - Upto 9 + ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 3), + ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustSodium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 3) + }, //Output Array of Items - Upto 9 30*20, //Time in ticks - 30); //EU - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + 30); //EU + }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} try { ItemStack cells = ItemUtils.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:itemCellEmpty", "Empty Fluid Cells", 0, 12); @@ -149,24 +149,24 @@ public class RECIPES_GREGTECH { cells = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 12); } - ItemStack[] input = {cells, ItemUtils.getItemStackOfAmountFromOreDict("dustLepidolite", 20)}; + final ItemStack[] input = {cells, ItemUtils.getItemStackOfAmountFromOreDict("dustLepidolite", 20)}; CORE.RA.addDehydratorRecipe( input, //Item input (Array, up to 2) FluidUtils.getFluidStack("sulfuricacid", 10000), //Fluid input (slot 1) FluidUtils.getFluidStack("sulfuriclithium", 10000), //Fluid output (slot 2) new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustPotassium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustAluminium", 4), - ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 10), - ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 3), //LithiumCarbonate + ItemUtils.getItemStackOfAmountFromOreDict("dustPotassium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustAluminium", 4), + ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 10), + ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 2), + ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 3), //LithiumCarbonate }, //Output Array of Items - Upto 9, new int[]{0}, 75*20, //Time in ticks - 1000); //EU + 1000); //EU - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} try { CORE.RA.addDehydratorRecipe( @@ -176,14 +176,14 @@ public class RECIPES_GREGTECH { FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 1440), //Fluid input (slot 1) null, //Fluid output (slot 2) new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumTetrafluoride", 10), - ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 10) + ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumTetrafluoride", 10), + ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 10) }, //Output Array of Items - Upto 9, new int[]{0}, 150*20, //Time in ticks - 2000); //EU + 2000); //EU - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} try { CORE.RA.addDehydratorRecipe( @@ -193,18 +193,18 @@ public class RECIPES_GREGTECH { FluidUtils.getFluidStack("molten.uraniumhexafluoride", 1440), //Fluid input (slot 1) null, //Fluid output (slot 2) new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumHexafluoride", 10), - ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 10) + ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumHexafluoride", 10), + ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 10) }, //Output Array of Items - Upto 9, new int[]{0}, 300*20, //Time in ticks - 4000); //EU + 4000); //EU + + }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} - //Raisins from Grapes try { - + CORE.RA.addDehydratorRecipe( new ItemStack[]{ ItemUtils.getItemStackOfAmountFromOreDict("cropGrape", 1) @@ -212,18 +212,18 @@ public class RECIPES_GREGTECH { null, //Fluid input (slot 1) null, //Fluid output (slot 2) new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("foodRaisins", 1) + ItemUtils.getItemStackOfAmountFromOreDict("foodRaisins", 1) }, //Output Array of Items - Upto 9, new int[]{0}, 10*20, //Time in ticks - 8); //EU + 8); //EU - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} //Calcium Hydroxide - if (ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1).getItem() != ModItems.AAA_Broken || LoadedMods.IHL){ + if ((ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1).getItem() != ModItems.AAA_Broken) || LoadedMods.IHL){ try { - + CORE.RA.addDehydratorRecipe( new ItemStack[]{ ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 10) @@ -231,17 +231,17 @@ public class RECIPES_GREGTECH { FluidUtils.getFluidStack("water", 10000), //Fluid input (slot 1) null, //Fluid output (slot 2) new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 20) + ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 20) }, //Output Array of Items - Upto 9, new int[]{0}, 120*20, //Time in ticks - 120); //EU + 120); //EU + + }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} - //2 LiOH + CaCO3 try { - + CORE.RA.addDehydratorRecipe( new ItemStack[]{ ItemUtils.getItemStackOfAmountFromOreDict("dustLi2CO3CaOH2", 5) @@ -249,18 +249,18 @@ public class RECIPES_GREGTECH { null, //Fluid input (slot 1) null, //Fluid output (slot 2) new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 3) + ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 2), + ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 3) }, //Output Array of Items - Upto 9, new int[]{0}, 120*20, //Time in ticks - 1000); //EU + 1000); //EU + + }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} - //LiOH Liquid to Dust try { - + CORE.RA.addDehydratorRecipe( new ItemStack[]{ ItemUtils.getGregtechCircuit(0) @@ -268,17 +268,17 @@ public class RECIPES_GREGTECH { FluidUtils.getFluidStack("lithiumhydroxide", 144), //Fluid input (slot 1) null, //Fluid output (slot 2) new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 1) + ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 1) }, //Output Array of Items - Upto 9, new int[]{0}, 1*20, //Time in ticks - 64); //EU + 64); //EU + + }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} - //Zirconium Chloride -> TetraFluoride try { - + CORE.RA.addDehydratorRecipe( new ItemStack[]{ ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9), @@ -287,18 +287,18 @@ public class RECIPES_GREGTECH { FluidUtils.getFluidStack("hydrofluoricacid", 9*144), //Fluid input (slot 1) null, //Fluid output (slot 2) new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 9), - ItemUtils.getItemStackOfAmountFromOreDict("dustZrF4", 9) + ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 9), + ItemUtils.getItemStackOfAmountFromOreDict("dustZrF4", 9) }, //Output Array of Items - Upto 9, new int[]{0}, 120*20, //Time in ticks - 500); //EU + 500); //EU + + }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} - //CaF2 + H2SO4 → CaSO4(solid) + 2 HF try { - + CORE.RA.addDehydratorRecipe( new ItemStack[]{ ItemUtils.getItemStackOfAmountFromOreDict("dustFluorite", 37), @@ -307,26 +307,26 @@ public class RECIPES_GREGTECH { FluidUtils.getFluidStack("sulfuricacid", 56*144), //Fluid input (slot 1) null, //Fluid output (slot 2) new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumSulfate", 30), - ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 16), - ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 2) + ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumSulfate", 30), + ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 16), + ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 2), + ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 2) }, //Output Array of Items - Upto 9, new int[]{0, 0, 100, 100, 300, 200}, 10*60*20, //Time in ticks - 230); //EU + 230); //EU - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} } - + } - + private static void lftrRecipes(){ - try { - - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + try { + + }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} try { //Fli2BeF4 + Thorium TetraFluoride = Uranium233 CORE.RA.addLFTRRecipe( @@ -334,9 +334,9 @@ public class RECIPES_GREGTECH { FluidUtils.getFluidStack("molten.li2bef4", 1200), //Fluid output (slot 2) FluidUtils.getFluidStack("molten.uraniumhexafluoride", (1200+(144*4))), //Output Array of Items - Upto 9, 300*60*20, //Time in ticks - 3500); //EU - - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + 3500); //EU + + }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} try { //Fli2BeF4 + Uranium235 = 1x Uranium233 CORE.RA.addLFTRRecipe( @@ -344,8 +344,8 @@ public class RECIPES_GREGTECH { FluidUtils.getFluidStack("molten.li2bef4", 144*12), //Fluid output (slot 2) FluidUtils.getFluidStack("molten.uraniumhexafluoride", 3*144), //Output Array of Items - Upto 9, 120*60*20, //Time in ticks - 8000); //EU - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + 8000); //EU + }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} try { //Fli2BeF4 + Uranium233 TetraFluoride = Uranium233 CORE.RA.addLFTRRecipe( @@ -353,29 +353,29 @@ public class RECIPES_GREGTECH { FluidUtils.getFluidStack("molten.li2bef4", 500), //Fluid output (slot 2) FluidUtils.getFluidStack("molten.uraniumhexafluoride", 1288), //Output Array of Items - Upto 9, 420*60*20, //Time in ticks - 4000); //EU + 4000); //EU - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} } - + private static void fissionFuelRecipes(){ try { - - String salt_LiFBeF2ThF4UF4 = "LiFBeF2ThF4UF4".toLowerCase(); - String salt_LiFBeF2ZrF4U235 = "LiFBeF2ZrF4U235".toLowerCase(); - String salt_LiFBeF2ZrF4UF4 = "LiFBeF2ZrF4UF4".toLowerCase(); - - FluidStack LithiumFluoride = FluidUtils.getFluidStack("molten.lithiumtetrafluoride", 100); //Re-usable FluidStacks - FluidStack BerylliumFluoride = FluidUtils.getFluidStack("molten.berylliumtetrafluoride", 100); //Re-usable FluidStacks - FluidStack ThoriumFluoride = FluidUtils.getFluidStack("molten.thoriumtetrafluoride", 100); //Re-usable FluidStacks - FluidStack ZirconiumFluoride = FluidUtils.getFluidStack("molten.zirconiumtetrafluoride", 100); //Re-usable FluidStacks - FluidStack UraniumTetraFluoride = FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 100); //Re-usable FluidStacks - FluidStack Uranium235 = FluidUtils.getFluidStack("molten.uranium235", 1000); //Re-usable FluidStacks - - FluidStack LiFBeF2ThF4UF4 = FluidUtils.getFluidStack("molten."+salt_LiFBeF2ThF4UF4, 100); //Re-usable FluidStacks - FluidStack LiFBeF2ZrF4U235 = FluidUtils.getFluidStack("molten."+salt_LiFBeF2ZrF4U235, 100); //Re-usable FluidStacks - FluidStack LiFBeF2ZrF4UF4 = FluidUtils.getFluidStack("molten."+salt_LiFBeF2ZrF4UF4, 100); //Re-usable FluidStacks - + + final String salt_LiFBeF2ThF4UF4 = "LiFBeF2ThF4UF4".toLowerCase(); + final String salt_LiFBeF2ZrF4U235 = "LiFBeF2ZrF4U235".toLowerCase(); + final String salt_LiFBeF2ZrF4UF4 = "LiFBeF2ZrF4UF4".toLowerCase(); + + final FluidStack LithiumFluoride = FluidUtils.getFluidStack("molten.lithiumtetrafluoride", 100); //Re-usable FluidStacks + final FluidStack BerylliumFluoride = FluidUtils.getFluidStack("molten.berylliumtetrafluoride", 100); //Re-usable FluidStacks + final FluidStack ThoriumFluoride = FluidUtils.getFluidStack("molten.thoriumtetrafluoride", 100); //Re-usable FluidStacks + final FluidStack ZirconiumFluoride = FluidUtils.getFluidStack("molten.zirconiumtetrafluoride", 100); //Re-usable FluidStacks + final FluidStack UraniumTetraFluoride = FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 100); //Re-usable FluidStacks + final FluidStack Uranium235 = FluidUtils.getFluidStack("molten.uranium235", 1000); //Re-usable FluidStacks + + final FluidStack LiFBeF2ThF4UF4 = FluidUtils.getFluidStack("molten."+salt_LiFBeF2ThF4UF4, 100); //Re-usable FluidStacks + final FluidStack LiFBeF2ZrF4U235 = FluidUtils.getFluidStack("molten."+salt_LiFBeF2ZrF4U235, 100); //Re-usable FluidStacks + final FluidStack LiFBeF2ZrF4UF4 = FluidUtils.getFluidStack("molten."+salt_LiFBeF2ZrF4UF4, 100); //Re-usable FluidStacks + //7LiF - BeF2 - ZrF4 - UF4 - 650C CORE.RA.addFissionFuel( FluidUtils.getFluidStack(LithiumFluoride, 6500), //Input A @@ -387,7 +387,7 @@ public class RECIPES_GREGTECH { null, //Output Fluid 2 60*60*20, //Duration 4740); - + //7LiF - BeF2 - ZrF4 - U235 - 590C CORE.RA.addFissionFuel( FluidUtils.getFluidStack(LithiumFluoride, 5500), //Input A @@ -399,7 +399,7 @@ public class RECIPES_GREGTECH { null, //Output Fluid 2 45*60*20, //Duration 4740); - + //7liF - BeF2 - ThF4 - UF4 - 566C CORE.RA.addFissionFuel( FluidUtils.getFluidStack(LithiumFluoride, 6200), //Input A @@ -410,9 +410,9 @@ public class RECIPES_GREGTECH { FluidUtils.getFluidStack(LiFBeF2ThF4UF4, 10000), //Output Fluid 1 null, //Output Fluid 2 60*60*20, //Duration - 4740); + 4740); - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} } private static void assemblerRecipes(){ @@ -425,13 +425,13 @@ public class RECIPES_GREGTECH { Utils.LOG_INFO("Registering Distillery/Distillation Tower Recipes."); GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 4L, new Object[0]), FluidUtils.getFluidStack("air", 1000), FluidUtils.getFluidStack("helium", 1), 400, 30, false); GT_Values.RA.addDistillationTowerRecipe(FluidUtils.getFluidStack("air", 20000), FluidUtils.getFluidStackArray("helium", 25), ItemUtils.getSimpleStack(ModItems.itemHydrogenBlob, 1), 200, 60); - + //Apatite Distillation /* * so if you dissolve aparite in sulphuric acid * you'll get a mixture of SO2, H2O, HF and HCl */ - FluidStack[] apatiteOutput = { + final FluidStack[] apatiteOutput = { FluidUtils.getFluidStack("sulfurousacid", 3800), FluidUtils.getFluidStack("hydrogenchloride", 1000), FluidUtils.getFluidStack("hydrofluoricacid", 400) @@ -443,7 +443,7 @@ public class RECIPES_GREGTECH { 45*20, 256); - FluidStack[] sulfurousacidOutput = { + final FluidStack[] sulfurousacidOutput = { FluidUtils.getFluidStack("sulfurdioxide", 500), FluidUtils.getFluidStack("water", 500) }; @@ -454,7 +454,7 @@ public class RECIPES_GREGTECH { 10*20, 60); - FluidStack[] sulfurdioxideOutput = { + final FluidStack[] sulfurdioxideOutput = { FluidUtils.getFluidStack("oxygen", 144*2) }; GT_Values.RA.addDistillationTowerRecipe( @@ -488,28 +488,28 @@ public class RECIPES_GREGTECH { } private static void chemicalBathRecipes(){ - int[] chances = {}; + final int[] chances = {}; GT_Values.RA.addChemicalBathRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 12), FluidUtils.getFluidStack("chlorine", 2400), ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 3), ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 3), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 3), + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 3), chances, 30*20, 240); - + GT_Values.RA.addChemicalBathRecipe( ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 10), FluidUtils.getFluidStack("hydrofluoricacid", 20000), ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumTetrafluoride", 5), null, - null, + null, new int[]{}, 90*20, 500); - - + + } - + private static void centrifugeRecipes(){ GT_Values.RA.addCentrifugeRecipe( ItemUtils.getItemStackOfAmountFromOreDict("dustThorium", 8), @@ -525,15 +525,15 @@ public class RECIPES_GREGTECH { new int[]{0, 0, 10}, 500*20, 2000); - + } - + private static void mixerRecipes(){ GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 1), null, null, null, FluidUtils.getFluidStack("oxygen", 288), FluidUtils.getFluidStack("sulfurdioxide", 432), null, 600, 60); GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustUranium233", 4), ItemUtils.getItemStackOfAmountFromOreDict("dustUranium235", 1), null, null, FluidUtils.getFluidStack("hydrofluoricacid", 2000), FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 144*3), null, 3000, 500); //GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 1), ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 1), null, null, FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 720), FluidUtils.getFluidStack("molten.uraniumhexafluoride", 288), null, 5000, 2000); } - + private static void chemicalReactorRecipes(){ GT_Values.RA.addChemicalRecipe( ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 5), //Input Stack 1 @@ -542,8 +542,8 @@ public class RECIPES_GREGTECH { null, //Fluid Output ItemUtils.getItemStackOfAmountFromOreDict("dustLi2CO3CaOH2", 10), //Output Stack 600*20 - ); - + ); + GT_Values.RA.addChemicalRecipe( ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 5), //Input Stack 1 null, //Input Stack 2 @@ -551,33 +551,33 @@ public class RECIPES_GREGTECH { FluidUtils.getFluidStack("water", 2500), //Fluid Output ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumTetrafluoride", 5), //Output Stack 600*20 - ); - + ); + GT_Values.RA.addChemicalRecipe( ItemUtils.getItemStackOfAmountFromOreDict("dustApatite", 16), null, - FluidUtils.getFluidStack("sulfuricacid", 144*32), + FluidUtils.getFluidStack("sulfuricacid", 144*32), FluidUtils.getFluidStack("sulfuricapatite", 144*4), - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallSulfur", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustSmallSulfur", 1), 20*20); - + GT_Values.RA.addChemicalRecipe( ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 1), null, - FluidUtils.getFluidStack("sulfuricacid", 144*8), + FluidUtils.getFluidStack("sulfuricacid", 144*8), FluidUtils.getFluidStack("sulfuriclithium", 144*2), - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallLithium7", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustSmallLithium7", 1), 20*20); - + GT_Values.RA.addChemicalRecipe( ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 16), - FluidUtils.getFluidStack("water", 1000), + FluidUtils.getFluidStack("water", 1000), FluidUtils.getFluidStack("lithiumhydroxide", 144*4), - null, + null, 300*20); } - + private static void blastFurnaceRecipes(){ GT_Values.RA.addBlastRecipe( ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumTetrafluoride", 2), @@ -586,7 +586,7 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict("dustLi2BeF4", 3), null, 60*20, - 2000, + 2000, 3000); GT_Values.RA.addBlastRecipe( ItemUtils.getItemStackOfAmountFromOreDict("dustZrCl4", 1), @@ -595,10 +595,10 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 1), null, 60*20, - 340, + 340, 300); } - + private static void autoclaveRecipes(){ GT_Values.RA.addAutoclaveRecipe( ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 9), @@ -608,7 +608,7 @@ public class RECIPES_GREGTECH { 120*20, 30); } - + private static void macerationRecipes(){ GT_ModHandler.addPulverisationRecipe( ItemUtils.getItemStackOfAmountFromOreDict("pelletZirconium", 1), @@ -617,20 +617,20 @@ public class RECIPES_GREGTECH { ItemUtils.getSimpleStack(Item.getItemFromBlock(ModBlocks.blockOreFluorite)), ItemUtils.getItemStackOfAmountFromOreDict("dustFluorite", 4)); } - - public static boolean addPulverisationRecipe(ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3) { + + public static boolean addPulverisationRecipe(final ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2, final ItemStack aOutput3) { aOutput1 = GT_OreDictUnificator.get(true, aOutput1); aOutput2 = GT_OreDictUnificator.get(true, aOutput2); if ((GT_Utility.isStackInvalid(aInput)) || (GT_Utility.isStackInvalid(aOutput1))){ return false; } if (GT_Utility.getContainerItem(aInput, false) == null) { - + if (GregTech_API.sRecipeFile.get(ConfigCategories.Machines.maceration, aInput, true)) { GT_Utility.addSimpleIC2MachineRecipe(aInput, GT_ModHandler.getMaceratorRecipeList(), null, new Object[] { aOutput1 }); } GT_Values.RA.addPulveriserRecipe(aInput, new ItemStack[] { - aOutput1, aOutput2, aOutput3 }, + aOutput1, aOutput2, aOutput3 }, new int[] {10000, 10000, 10000}, 400, 2); diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java index 53ad2e3ba1..5c58e1ec3f 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java @@ -39,7 +39,7 @@ public class RECIPES_General { RECIPE_Paper, RECIPE_LapisDust, NULL, RECIPE_Paper, RECIPE_LapisDust, NULL, RECIPE_LapisDust, RECIPE_LapisDust, NULL, - OUTPUT_Blueprint); + OUTPUT_Blueprint); //Bronze Workbench RecipeUtils.recipeBuilder( diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java index c55b32cbfc..c3726dbddc 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java @@ -15,8 +15,8 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator { } @Override - public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - if (aOreDictName.equals(OreDictNames.craftingLensBlue.toString())) { + public void registerOre(final OrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName, final String aModName, final ItemStack aStack) { + if (aOreDictName.equals(OreDictNames.craftingLensBlue.toString())) { if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilYttriumBariumCuprate", 1) != null){ GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.YttriumBariumCuprate, 2L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GregtechItemList.Circuit_Parts_Wiring_IV.get(1L, new Object[0]), 64, 480); } @@ -39,8 +39,8 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator { Utils.LOG_INFO("This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself."); } - - } else if (aOreDictName.equals(OreDictNames.craftingLensYellow.toString())) { + + } else if (aOreDictName.equals(OreDictNames.craftingLensYellow.toString())) { if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilOsmium", 1) != null){ GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmium, 2L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GregtechItemList.Circuit_Parts_Wiring_LuV.get(1L, new Object[0]), 64, 1024); } @@ -48,7 +48,7 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator { Utils.LOG_INFO("foilOsmium does not exist within Gregtech, please report this issue to Blood-asp on github."); Utils.LOG_INFO("This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself."); } - + } else if (aOreDictName.equals(OreDictNames.craftingLensCyan.toString())) { } else if (aOreDictName.equals(OreDictNames.craftingLensRed.toString())) { } else if (aOreDictName.equals(OreDictNames.craftingLensGreen.toString())) { @@ -75,7 +75,7 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator { Utils.LOG_INFO("dustLithium does not exist within Gregtech, please report this issue to Blood-asp on github."); Utils.LOG_INFO("This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself."); } - + } } } diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java index 14f4a1c998..8f7304588d 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java @@ -1,12 +1,11 @@ package gtPlusPlus.core.recipe; +import java.util.ArrayList; + import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.recipe.RecipeUtils; import gtPlusPlus.core.util.wrapper.var; - -import java.util.ArrayList; - import net.minecraft.item.ItemStack; public class RECIPES_MTWRAPPER { @@ -26,53 +25,53 @@ public class RECIPES_MTWRAPPER { static var stoneBlock = new var("minecraft:stone>"); public static void run(){ - /*addShaped(button.getStack(2), + /*addShaped(button.getStack(2), null, stoneBlock, null, null, stoneBlock, null, null, null, null);*/ - /*addShaped(stoneStick.getStack(1), + /*addShaped(stoneStick.getStack(1), stoneBlock, null, null, stoneBlock, null, null, null, null, null);*/ - addShaped(chestWood.getStack(2), + addShaped(chestWood.getStack(2), logWood, logWood, logWood, logWood, null, logWood, logWood, logWood, logWood); - addShaped(chestWood.getStack(4), + addShaped(chestWood.getStack(4), logWood, logWood, logWood, logWood, saw, logWood, logWood, logWood, logWood); //Recipe Fixes //remove(sensorDaylight); - addShaped(sensorDaylight.getStack(1), + addShaped(sensorDaylight.getStack(1), glass, glass, glass, gemNetherQuartz, gemNetherQuartz, gemNetherQuartz, slabWood, slabWood, slabWood); - /*addShaped(ironBars .getStack( 8), + /*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){ + public static void addShaped(final Object item_Output, + final Object item_1, final Object item_2, final Object item_3, + final Object item_4, final Object item_5, final Object item_6, + final Object item_7, final Object item_8, final 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 = ItemUtils.getCorrectStacktype(item_Output, 1); + final ItemStack outputItem = ItemUtils.getCorrectStacktype(item_Output, 1); - ArrayList validSlots = new ArrayList(); + final 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);} @@ -84,16 +83,16 @@ public class RECIPES_MTWRAPPER { 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; + final String lineOne = a+b+c; + final String lineTwo = d+e+f; + final String lineThree = g+h+i; validSlots.add(0, lineOne); validSlots.add(1, lineTwo); validSlots.add(2, lineThree); try { - RecipeUtils.recipeBuilder((Object[]) validSlots.toArray(), outputItem.copy()); - MT_RECIPES_LOADED++; + RecipeUtils.recipeBuilder(validSlots.toArray(), outputItem.copy()); + MT_RECIPES_LOADED++; } catch(NullPointerException | ClassCastException k){ k.getMessage(); @@ -102,7 +101,7 @@ public class RECIPES_MTWRAPPER { 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/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java index fd84b895a2..fa8dad30b5 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java @@ -8,7 +8,7 @@ import gtPlusPlus.core.util.recipe.RecipeUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class RECIPES_MachineComponents { - + //Wire static String wireTier6 = "wireGt08NiobiumTitanium"; static String wireTier7 = "wireGt08Osmium"; @@ -82,10 +82,10 @@ public class RECIPES_MachineComponents { static String craftingToolWrench = "craftingToolWrench"; static String craftingToolScrewdriver = "craftingToolScrewdriver"; - public static final void RECIPES_LOAD(){ - Utils.LOG_INFO("Loading Recipes for the Various Circuits and Machine components."); + public static final void RECIPES_LOAD(){ + Utils.LOG_INFO("Loading Recipes for the Various Circuits and Machine components."); if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ - run(); + run(); } else { onlyMaxComponents(); @@ -272,8 +272,8 @@ public class RECIPES_MachineComponents { Utils.LOG_INFO("Done loading recipes for the Various machine components."); - } - + } + private static void onlyMaxComponents(){ RecipeUtils.addShapedGregtechRecipe( cableTier10, wireTier10, rodTier10a, @@ -328,14 +328,14 @@ public class RECIPES_MachineComponents { GT_Values.RA.addForgeHammerRecipe(ItemList.Circuit_Master.get(1L, new Object[0]), GregtechItemList.Circuit_Parts_Crystal_Chip_IV.get(5L, new Object[0]), 32, 256); GT_Values.RA.addForgeHammerRecipe(GregtechItemList.Circuit_IV.get(1L, new Object[0]), GregtechItemList.Circuit_Parts_Crystal_Chip_LuV.get(5L, new Object[0]), 64, 512); GT_Values.RA.addForgeHammerRecipe(GregtechItemList.Circuit_LuV.get(1L, new Object[0]), GregtechItemList.Circuit_Parts_Crystal_Chip_ZPM.get(5L, new Object[0]), 128, 1024); - for (Materials tMat : Materials.values()) { + for (final Materials tMat : Materials.values()) { if ((tMat.mStandardMoltenFluid != null) && (tMat.contains(SubTag.SOLDERING_MATERIAL))) { - int tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD) ? 1 : tMat.contains(SubTag.SOLDERING_MATERIAL_BAD) ? 4 : 2; - GT_Values.RA.addAssemblerRecipe(GregtechItemList.Circuit_Board_IV.get(1L, new Object[0]), GregtechItemList.Circuit_Parts_IV.get(1L, new Object[0]), tMat.getMolten(144L * tMultiplier / 4L), GregtechItemList.Circuit_IV.get(1L, new Object[0]), 32, 512); - GT_Values.RA.addAssemblerRecipe(GregtechItemList.Circuit_Board_LuV.get(1L, new Object[0]), GregtechItemList.Circuit_Parts_LuV.get(1L, new Object[0]), tMat.getMolten(144L * tMultiplier / 4L), GregtechItemList.Circuit_LuV.get(1L, new Object[0]), 64, 1024); - GT_Values.RA.addAssemblerRecipe(GregtechItemList.Circuit_Board_ZPM.get(1L, new Object[0]), GregtechItemList.Circuit_Parts_ZPM.get(1L, new Object[0]), tMat.getMolten(144L * tMultiplier / 4L), GregtechItemList.Circuit_ZPM.get(1L, new Object[0]), 96, 2048); + final int tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD) ? 1 : tMat.contains(SubTag.SOLDERING_MATERIAL_BAD) ? 4 : 2; + GT_Values.RA.addAssemblerRecipe(GregtechItemList.Circuit_Board_IV.get(1L, new Object[0]), GregtechItemList.Circuit_Parts_IV.get(1L, new Object[0]), tMat.getMolten((144L * tMultiplier) / 4L), GregtechItemList.Circuit_IV.get(1L, new Object[0]), 32, 512); + GT_Values.RA.addAssemblerRecipe(GregtechItemList.Circuit_Board_LuV.get(1L, new Object[0]), GregtechItemList.Circuit_Parts_LuV.get(1L, new Object[0]), tMat.getMolten((144L * tMultiplier) / 4L), GregtechItemList.Circuit_LuV.get(1L, new Object[0]), 64, 1024); + GT_Values.RA.addAssemblerRecipe(GregtechItemList.Circuit_Board_ZPM.get(1L, new Object[0]), GregtechItemList.Circuit_Parts_ZPM.get(1L, new Object[0]), tMat.getMolten((144L * tMultiplier) / 4L), GregtechItemList.Circuit_ZPM.get(1L, new Object[0]), 96, 2048); } - } + } } } diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 296b3d4199..507e09153a 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -6,7 +6,8 @@ import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.recipe.RecipeUtils; -import gtPlusPlus.xmod.gregtech.api.enums.*; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import net.minecraft.item.ItemStack; @@ -138,14 +139,14 @@ public class RECIPES_Machines { //Machine Casings - static ItemStack machineCasing_ULV; - static ItemStack machineCasing_LV; + static ItemStack machineCasing_ULV; + static ItemStack machineCasing_LV; static ItemStack machineCasing_MV; static ItemStack machineCasing_HV; static ItemStack machineCasing_EV; static ItemStack machineCasing_IV; - static ItemStack machineCasing_LuV; - static ItemStack machineCasing_ZPM; + static ItemStack machineCasing_LuV; + static ItemStack machineCasing_ZPM; static ItemStack machineCasing_UV; static ItemStack machineCasing_MAX; @@ -155,7 +156,7 @@ public class RECIPES_Machines { static ItemStack gearboxCasing_Tier_3; static ItemStack gearboxCasing_Tier_4; - //IV MACHINES + //IV MACHINES public static ItemStack IV_MACHINE_Electrolyzer; public static ItemStack IV_MACHINE_Centrifuge; public static ItemStack IV_MACHINE_BendingMachine; @@ -170,7 +171,7 @@ public class RECIPES_Machines { //Plates - static String plateElectricalSteel= "plateElectricalSteel"; + static String plateElectricalSteel= "plateElectricalSteel"; static String plateEnergeticAlloy= "plateEnergeticAlloy"; static String plateCobalt = "plateCobalt"; static String plateBronze = "plateBronze"; @@ -265,7 +266,7 @@ public class RECIPES_Machines { private static void run(){ initModItems(); - } + } private static void initModItems(){ if (LoadedMods.IndustrialCraft2){ @@ -337,7 +338,7 @@ public class RECIPES_Machines { sensor_IV = ItemList.Sensor_IV.get(1); - //IV MACHINES + //IV MACHINES IV_MACHINE_Electrolyzer = ItemList.Machine_IV_Electrolyzer.get(1); IV_MACHINE_BendingMachine= ItemList.Machine_IV_Bender.get(1); IV_MACHINE_Wiremill= ItemList.Machine_IV_Wiremill.get(1); @@ -358,10 +359,10 @@ public class RECIPES_Machines { INPUT_IECokeOvenBlock = ItemUtils.getItemStackWithMeta(LoadedMods.ImmersiveEngineering, "ImmersiveEngineering:stoneDecoration", "Coke_Oven_IE", 1, 1); } runModRecipes(); - } + } private static void runModRecipes(){ - if (LoadedMods.Gregtech){ + if (LoadedMods.Gregtech){ RecipeUtils.addShapedGregtechRecipe( ItemList.Electric_Piston_EV, GregtechOrePrefixes.circuit.get(Materials.Ultimate), ItemList.Electric_Piston_EV, @@ -502,7 +503,7 @@ public class RECIPES_Machines { "plateAnyIron", blockBricks, "plateAnyIron", "plateAnyIron", RECIPES_Tools.craftingToolWrench, "plateAnyIron", RECIPE_IronPlatedBricks); - + //Add recycle recipes for the Iron Plated Bricks //GT_ModHandler.addPulverisationRecipe(RECIPE_IronPlatedBricks, ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustIron", 6), ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustClay", 2), true); RECIPES_GREGTECH.addPulverisationRecipe( @@ -511,7 +512,7 @@ public class RECIPES_Machines { ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustClay", 2), null); GT_Values.RA.addArcFurnaceRecipe(RECIPE_IronPlatedBricks, new ItemStack[]{ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotWroughtIron", 6), ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustAsh", 2)}, new int[]{0}, 32*20, 32); - + /*//Electrolyzer Frame Casing UtilsRecipe.addShapedGregtechRecipe( "platePotin", "stickLongChrome", "platePotin", @@ -605,7 +606,7 @@ public class RECIPES_Machines { "stickPlatinum", "frameGtInconel625", "stickPlatinum", "platePalladium", "stickLongPalladium", "platePalladium", RECIPE_IndustrialMacerationStackFrame); - //Industrial Maceration stack + //Industrial Maceration stack RecipeUtils.addShapedGregtechRecipe( "plateTungstenCarbide", IV_MACHINE_Macerator, "plateTungstenCarbide", EV_MACHINE_Macerator, circuitTier7, EV_MACHINE_Macerator, @@ -630,59 +631,59 @@ public class RECIPES_Machines { //Tiered Tanks Utils.LOG_INFO("Is New Horizons Loaded? "+CORE.GTNH); if (!CORE.GTNH){ - RecipeUtils.addShapedGregtechRecipe( - plateTier1, plateTier1, plateTier1, - plateTier1, pipeTier1, plateTier1, - plateTier1, GregtechItemList.Fluid_Cell_144L.get(1), plateTier1, - GregtechItemList.GT_FluidTank_ULV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - plateTier2, plateTier2, plateTier2, - plateTier2, pipeTier2, plateTier2, - plateTier2, electricPump_LV, plateTier2, - GregtechItemList.GT_FluidTank_LV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - plateTier3, plateTier3, plateTier3, - plateTier3, pipeTier3, plateTier3, - plateTier3, electricPump_MV, plateTier3, - GregtechItemList.GT_FluidTank_MV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - plateTier4, plateTier4, plateTier4, - plateTier4, pipeTier4, plateTier4, - plateTier4, electricPump_HV, plateTier4, - GregtechItemList.GT_FluidTank_HV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - plateTier5, plateTier5, plateTier5, - plateTier5, pipeTier5, plateTier5, - plateTier5, electricPump_EV, plateTier5, - GregtechItemList.GT_FluidTank_EV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - plateTier6, plateTier6, plateTier6, - plateTier6, pipeTier6, plateTier6, - plateTier6, electricPump_IV, plateTier6, - GregtechItemList.GT_FluidTank_IV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - plateTier7, plateTier7, plateTier7, - plateTier7, pipeTier7, plateTier7, - plateTier7, RECIPE_CONSTANTS.electricPump_LuV, plateTier7, - GregtechItemList.GT_FluidTank_LuV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - plateTier8, plateTier8, plateTier8, - plateTier8, pipeTier8, plateTier8, - plateTier8, RECIPE_CONSTANTS.electricPump_ZPM, plateTier8, - GregtechItemList.GT_FluidTank_ZPM.get(1)); - RecipeUtils.addShapedGregtechRecipe( - plateTier9, plateTier9, plateTier9, - plateTier9, pipeTier9, plateTier9, - plateTier9, RECIPE_CONSTANTS.electricPump_UV, plateTier9, - GregtechItemList.GT_FluidTank_UV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - plateTier10, plateTier10, plateTier10, - plateTier10, pipeTier10, plateTier10, - plateTier10, RECIPE_CONSTANTS.electricPump_MAX, plateTier10, - GregtechItemList.GT_FluidTank_MAX.get(1)); + RecipeUtils.addShapedGregtechRecipe( + plateTier1, plateTier1, plateTier1, + plateTier1, pipeTier1, plateTier1, + plateTier1, GregtechItemList.Fluid_Cell_144L.get(1), plateTier1, + GregtechItemList.GT_FluidTank_ULV.get(1)); + RecipeUtils.addShapedGregtechRecipe( + plateTier2, plateTier2, plateTier2, + plateTier2, pipeTier2, plateTier2, + plateTier2, electricPump_LV, plateTier2, + GregtechItemList.GT_FluidTank_LV.get(1)); + RecipeUtils.addShapedGregtechRecipe( + plateTier3, plateTier3, plateTier3, + plateTier3, pipeTier3, plateTier3, + plateTier3, electricPump_MV, plateTier3, + GregtechItemList.GT_FluidTank_MV.get(1)); + RecipeUtils.addShapedGregtechRecipe( + plateTier4, plateTier4, plateTier4, + plateTier4, pipeTier4, plateTier4, + plateTier4, electricPump_HV, plateTier4, + GregtechItemList.GT_FluidTank_HV.get(1)); + RecipeUtils.addShapedGregtechRecipe( + plateTier5, plateTier5, plateTier5, + plateTier5, pipeTier5, plateTier5, + plateTier5, electricPump_EV, plateTier5, + GregtechItemList.GT_FluidTank_EV.get(1)); + RecipeUtils.addShapedGregtechRecipe( + plateTier6, plateTier6, plateTier6, + plateTier6, pipeTier6, plateTier6, + plateTier6, electricPump_IV, plateTier6, + GregtechItemList.GT_FluidTank_IV.get(1)); + RecipeUtils.addShapedGregtechRecipe( + plateTier7, plateTier7, plateTier7, + plateTier7, pipeTier7, plateTier7, + plateTier7, RECIPE_CONSTANTS.electricPump_LuV, plateTier7, + GregtechItemList.GT_FluidTank_LuV.get(1)); + RecipeUtils.addShapedGregtechRecipe( + plateTier8, plateTier8, plateTier8, + plateTier8, pipeTier8, plateTier8, + plateTier8, RECIPE_CONSTANTS.electricPump_ZPM, plateTier8, + GregtechItemList.GT_FluidTank_ZPM.get(1)); + RecipeUtils.addShapedGregtechRecipe( + plateTier9, plateTier9, plateTier9, + plateTier9, pipeTier9, plateTier9, + plateTier9, RECIPE_CONSTANTS.electricPump_UV, plateTier9, + GregtechItemList.GT_FluidTank_UV.get(1)); + RecipeUtils.addShapedGregtechRecipe( + plateTier10, plateTier10, plateTier10, + plateTier10, pipeTier10, plateTier10, + plateTier10, RECIPE_CONSTANTS.electricPump_MAX, plateTier10, + GregtechItemList.GT_FluidTank_MAX.get(1)); } else { - + plateTier1 = "plateTin"; pipeTier1 = "pipeLargeClay"; plateTier2 = "plateCopper"; @@ -695,7 +696,7 @@ public class RECIPES_Machines { pipeTier5 = "pipeLargeBronze"; plateTier6 = "plateAluminium"; pipeTier6 = "pipeMediumSteel"; - + Utils.LOG_INFO("Loading New Horizon Tanks, with custom recipes."); Utils.LOG_INFO("Using "+plateTier1+" with "+pipeTier1); Utils.LOG_INFO("Using "+plateTier2+" with "+pipeTier2); @@ -703,7 +704,7 @@ public class RECIPES_Machines { Utils.LOG_INFO("Using "+plateTier4+" with "+pipeTier4); Utils.LOG_INFO("Using "+plateTier5+" with "+pipeTier5); Utils.LOG_INFO("Using "+plateTier6+" with "+pipeTier6); - + RecipeUtils.addShapedGregtechRecipe( plateTier1, plateTier1, plateTier1, plateTier1, pipeTier1, plateTier1, @@ -762,14 +763,14 @@ public class RECIPES_Machines { rodTier5, "frameGtTumbaga", rodTier5, "plateZirconiumCarbide", rodTier5, "plateZirconiumCarbide", RECIPE_IndustrialBlastSmelterFrame); - //Blast Smelter Coil + //Blast Smelter Coil RecipeUtils.addShapedGregtechRecipe( "plateStaballoy", "plateStaballoy", "plateStaballoy", "frameGtStaballoy", gearboxCasing_Tier_3, "frameGtStaballoy", "plateStaballoy", "plateStaballoy", "plateStaballoy", RECIPE_IndustrialBlastSmelterCoil); - - + + //Matter Fabricator CPU RecipeUtils.addShapedGregtechRecipe( "plateDoubleQuantum", circuitTier5, "plateDoubleQuantum", @@ -782,7 +783,7 @@ public class RECIPES_Machines { rodTier8, "frameGtInconel690", rodTier8, "plateNiobiumCarbide", rodTier8, "plateNiobiumCarbide", RECIPE_IndustrialMatterFabFrame); - //Matter Fabricator Coil + //Matter Fabricator Coil RecipeUtils.addShapedGregtechRecipe( "plateQuantum", "plateQuantum", "plateQuantum", "frameGtStellite", machineCasing_UV, "frameGtStellite", diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java index fa11783f70..640a524a21 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java @@ -7,20 +7,20 @@ import gtPlusPlus.core.util.recipe.RecipeUtils; import net.minecraft.item.ItemStack; public class RECIPES_Shapeless { - + static ItemStack dustStaballoy; - + //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; - + 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; + public static final void RECIPES_LOAD(){ //run(); Utils.LOG_INFO("Loading Shapeless Recipes."); @@ -28,19 +28,19 @@ public class RECIPES_Shapeless { private static void run(){ //Gregtech items - if (LoadedMods.Gregtech){ - gearboxCasing_Tier_1 = ItemList.Casing_Gearbox_Bronze.get(1); - - RecipeUtils.shapelessBuilder(dustStaballoy, - "dustTitanium", "dustUranium", "dustUranium", - "dustUranium", "dustUranium", "dustUranium", - "dustUranium", "dustUranium", "dustUranium"); - - RecipeUtils.shapelessBuilder(gearboxCasing_Tier_1, - circuitPrimitive, circuitPrimitive, circuitPrimitive, - circuitPrimitive, circuitPrimitive, circuitPrimitive, - circuitPrimitive, circuitPrimitive, circuitPrimitive); + if (LoadedMods.Gregtech){ + gearboxCasing_Tier_1 = ItemList.Casing_Gearbox_Bronze.get(1); + + RecipeUtils.shapelessBuilder(dustStaballoy, + "dustTitanium", "dustUranium", "dustUranium", + "dustUranium", "dustUranium", "dustUranium", + "dustUranium", "dustUranium", "dustUranium"); + + RecipeUtils.shapelessBuilder(gearboxCasing_Tier_1, + circuitPrimitive, circuitPrimitive, circuitPrimitive, + circuitPrimitive, circuitPrimitive, circuitPrimitive, + circuitPrimitive, circuitPrimitive, circuitPrimitive); } } - + } diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java index 0393dc4e46..b45e2ba92f 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java @@ -125,7 +125,7 @@ public class RECIPES_Tools { public static String plateDoubleNiChrome = "plateDoubleNichrome"; public static String plateIridiumAlloy = "plateAlloyIridium"; - public static final void RECIPES_LOAD(){ + public static final void RECIPES_LOAD(){ run(); @@ -175,7 +175,7 @@ public class RECIPES_Tools { plateElectrum, ingotElectrum, plateElectrum, craftingToolScrewdriver, stickBronze, craftingToolHardHammer, null, stickSteel, null, - RECIPE_SandstoneHammer); + RECIPE_SandstoneHammer); //Basic Firemaker RecipeUtils.recipeBuilder( diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPE_Batteries.java b/src/Java/gtPlusPlus/core/recipe/RECIPE_Batteries.java index 440f8815bc..3d59742805 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPE_Batteries.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPE_Batteries.java @@ -8,7 +8,7 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import net.minecraft.item.ItemStack; public class RECIPE_Batteries { - + static ItemStack RECIPE_Battery_Sodium = GregtechItemList.Battery_RE_EV_Sodium.get(1); static ItemStack RECIPE_Battery_Cadmium = GregtechItemList.Battery_RE_EV_Cadmium.get(1); static ItemStack RECIPE_Battery_Lithium = GregtechItemList.Battery_RE_EV_Lithium.get(1); @@ -18,16 +18,16 @@ public class RECIPE_Batteries { static ItemStack machineTransformer_EV; public static void RECIPES_LOAD(){ - + if (LoadedMods.Gregtech){ machineTransformer_EV = ItemList.Transformer_EV_HV.get(1); - run(); + run(); } } - + private static void run(){ - - + + RecipeUtils.addShapedGregtechRecipe( GT_Battery_Sodium, RECIPES_Machines.cableTier4, GT_Battery_Sodium, RECIPES_Machines.circuitTier3, machineTransformer_EV, RECIPES_Machines.circuitTier3, @@ -43,7 +43,7 @@ public class RECIPE_Batteries { RECIPES_Machines.circuitTier3, machineTransformer_EV, RECIPES_Machines.circuitTier3, GT_Battery_Lithium, RECIPES_Machines.cableTier4, GT_Battery_Lithium, RECIPE_Battery_Lithium); - + } - + } diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java b/src/Java/gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java index c0548e9e74..dec8de8755 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java @@ -40,7 +40,7 @@ public class RECIPE_CONSTANTS { public static ItemStack sensor_ZPM; public static ItemStack sensor_UV; public static ItemStack sensor_MAX; - + public static void initialise(){ if(CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ registerGTExperimentalComponents(); @@ -49,7 +49,7 @@ public class RECIPE_CONSTANTS { registerGTStandardComponents(); } } - + private static void registerGTExperimentalComponents(){ //Machine Components electricMotor_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32606, 1); @@ -76,7 +76,7 @@ public class RECIPE_CONSTANTS { sensor_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32695, 1); sensor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1); sensor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1); - + //Max Tier Components Blood Never added... Useless, lol. electricMotor_MAX = GregtechItemList.Electric_Motor_MAX.get(1); electricPump_MAX = GregtechItemList.Electric_Pump_MAX.get(1); @@ -87,7 +87,7 @@ public class RECIPE_CONSTANTS { fieldGenerator_MAX = GregtechItemList.Field_Generator_MAX.get(1); sensor_MAX = GregtechItemList.Sensor_MAX.get(1); } - + private static void registerGTStandardComponents(){ electricMotor_LuV = GregtechItemList.Electric_Motor_LuV.get(1); electricMotor_ZPM = GregtechItemList.Electric_Motor_ZPM.get(1); diff --git a/src/Java/gtPlusPlus/core/recipe/ShapedRecipeObject.java b/src/Java/gtPlusPlus/core/recipe/ShapedRecipeObject.java index 348f9907c0..9719416766 100644 --- a/src/Java/gtPlusPlus/core/recipe/ShapedRecipeObject.java +++ b/src/Java/gtPlusPlus/core/recipe/ShapedRecipeObject.java @@ -16,12 +16,12 @@ public class ShapedRecipeObject { 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){ + final Object input_A,final Object input_B,final Object input_C, + final Object input_D,final Object input_E,final Object input_F, + final Object input_G,final Object input_H,final Object input_I, + final ItemStack input_Output){ this.object_A = input_A; this.object_B = input_B; this.object_C = input_C; @@ -34,9 +34,9 @@ public class ShapedRecipeObject { this.object_OUTPUT = input_Output; Utils.LOG_SPECIFIC_WARNING("ShapedRecipeObject", "New object created.", 36); } - + public void buildRecipe(){ - RecipeUtils.recipeBuilder(object_A, object_B, object_C, object_D, object_E, object_F, object_G, object_H, object_I, object_OUTPUT); + RecipeUtils.recipeBuilder(this.object_A, this.object_B, this.object_C, this.object_D, this.object_E, this.object_F, this.object_G, this.object_H, this.object_I, this.object_OUTPUT); } - + } -- cgit