diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core/recipe')
12 files changed, 325 insertions, 325 deletions
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 |