From 0669f5eb9d5029a8b94ec552171b0837605f7747 Mon Sep 17 00:00:00 2001 From: draknyte1 Date: Fri, 4 Nov 2016 15:23:26 +1000 Subject: $ Cleaned up the entire project. > Much neat, very nices. --- .../core/recipe/Gregtech_Recipe_Adder.java | 144 ++- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 607 +++++----- .../gtPlusPlus/core/recipe/RECIPES_General.java | 60 +- .../core/recipe/RECIPES_LaserEngraver.java | 34 +- .../gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java | 216 ++-- .../core/recipe/RECIPES_MachineComponents.java | 621 +++++----- .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 1259 ++++++++++---------- .../gtPlusPlus/core/recipe/RECIPES_Shapeless.java | 61 +- src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java | 317 +++-- .../gtPlusPlus/core/recipe/RECIPE_Batteries.java | 69 +- .../gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java | 218 ++-- .../gtPlusPlus/core/recipe/ShapedRecipeObject.java | 39 +- 12 files changed, 1879 insertions(+), 1766 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..bbd235d5dd 100644 --- a/src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java +++ b/src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java @@ -9,90 +9,88 @@ import net.minecraft.item.ItemStack; public class Gregtech_Recipe_Adder { - private static int euT; - private static int ticks; - private static ItemStack inputStack1; - private static ItemStack inputStack2; - private static ItemStack outputStack1; - 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){ - euT = euPerTick; - ticks = timeInTicks; - - resetVars(); - if (addMaceratorRecipe){ - inputStack1 = ItemUtils.getSimpleStack(maceratorInput, maceratorInputAmount1); - outputStack1 = ItemUtils.getSimpleStack(maceratorOutput, maceratorOutputAmount1); - addMaceratorRecipe(inputStack1, outputStack1); - } - resetVars(); - if (addCompressorRecipe){ - inputStack1 = ItemUtils.getSimpleStack(compressorInput, compressorInputAmount1); - outputStack1 = ItemUtils.getSimpleStack(compressorOutput, compressorOutputAmount1); - addCompressorRecipe(inputStack1, outputStack1); - } - resetVars(); - if (addBlastFurnaceRecipe){ - inputStack1 = ItemUtils.getSimpleStack(blastFurnaceInput, blastFurnaceInputAmount1); - inputStack2 = ItemUtils.getSimpleStack(blastFurnaceInput2, blastFurnaceInputAmount2); - outputStack1 = ItemUtils.getSimpleStack(blastFurnaceOutput, blastFurnaceOutputAmount1); - outputStack2 = ItemUtils.getSimpleStack(blastFurnaceOutput2, blastFurnaceOutputAmount2); - addBlastFurnaceRecipe(inputStack1, inputStack2, outputStack1, outputStack2, blastFurnaceTemp); - } - resetVars(); - if (addSmeltingRecipe){ - inputStack1 = ItemUtils.getSimpleStack(smeltingInput, smeltingInputAmount1); - outputStack1 = ItemUtils.getSimpleStack(smeltingOutput, smeltingOutputAmount1); - addSmeltingRecipe(inputStack1, outputStack1); - } - resetVars(); + private static int euT; + private static int ticks; + private static ItemStack inputStack1; + private static ItemStack inputStack2; + private static ItemStack outputStack1; + private static ItemStack outputStack2; + 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, input2, GT_Values.NF, GT_Values.NF, output1, output2, + Gregtech_Recipe_Adder.ticks, Gregtech_Recipe_Adder.euT, tempRequired); } - - private static void resetVars(){ - inputStack1 = null; - inputStack2 = null; - outputStack1 = null; - outputStack2 = null; + + private static void addCompressorRecipe(final ItemStack input1, final ItemStack output1) { + GT_ModHandler.addCompressionRecipe(input1, output1); } - 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){ - GT_ModHandler.addCompressionRecipe(input1, output1); - } + public static void addRecipe(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) { + Gregtech_Recipe_Adder.euT = euPerTick; + Gregtech_Recipe_Adder.ticks = timeInTicks; + + Gregtech_Recipe_Adder.resetVars(); + if (addMaceratorRecipe) { + Gregtech_Recipe_Adder.inputStack1 = ItemUtils.getSimpleStack(maceratorInput, maceratorInputAmount1); + Gregtech_Recipe_Adder.outputStack1 = ItemUtils.getSimpleStack(maceratorOutput, maceratorOutputAmount1); + Gregtech_Recipe_Adder.addMaceratorRecipe(Gregtech_Recipe_Adder.inputStack1, + Gregtech_Recipe_Adder.outputStack1); + } + Gregtech_Recipe_Adder.resetVars(); + if (addCompressorRecipe) { + Gregtech_Recipe_Adder.inputStack1 = ItemUtils.getSimpleStack(compressorInput, compressorInputAmount1); + Gregtech_Recipe_Adder.outputStack1 = ItemUtils.getSimpleStack(compressorOutput, compressorOutputAmount1); + Gregtech_Recipe_Adder.addCompressorRecipe(Gregtech_Recipe_Adder.inputStack1, + Gregtech_Recipe_Adder.outputStack1); + } + Gregtech_Recipe_Adder.resetVars(); + if (addBlastFurnaceRecipe) { + Gregtech_Recipe_Adder.inputStack1 = ItemUtils.getSimpleStack(blastFurnaceInput, blastFurnaceInputAmount1); + Gregtech_Recipe_Adder.inputStack2 = ItemUtils.getSimpleStack(blastFurnaceInput2, blastFurnaceInputAmount2); + Gregtech_Recipe_Adder.outputStack1 = ItemUtils.getSimpleStack(blastFurnaceOutput, + blastFurnaceOutputAmount1); + Gregtech_Recipe_Adder.outputStack2 = ItemUtils.getSimpleStack(blastFurnaceOutput2, + blastFurnaceOutputAmount2); + Gregtech_Recipe_Adder.addBlastFurnaceRecipe(Gregtech_Recipe_Adder.inputStack1, + Gregtech_Recipe_Adder.inputStack2, Gregtech_Recipe_Adder.outputStack1, + Gregtech_Recipe_Adder.outputStack2, blastFurnaceTemp); + } + Gregtech_Recipe_Adder.resetVars(); + if (addSmeltingRecipe) { + Gregtech_Recipe_Adder.inputStack1 = ItemUtils.getSimpleStack(smeltingInput, smeltingInputAmount1); + Gregtech_Recipe_Adder.outputStack1 = ItemUtils.getSimpleStack(smeltingOutput, smeltingOutputAmount1); + Gregtech_Recipe_Adder.addSmeltingRecipe(Gregtech_Recipe_Adder.inputStack1, + Gregtech_Recipe_Adder.outputStack1); + } + Gregtech_Recipe_Adder.resetVars(); - private static void addBlastFurnaceRecipe(ItemStack input1, ItemStack input2, ItemStack output1, ItemStack output2, int tempRequired){ - Utils.LOG_INFO("Registering Blast Furnace Recipes."); - GT_Values.RA.addBlastRecipe( - input1, - input2, - GT_Values.NF, GT_Values.NF, - output1, - output2, - ticks, - 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); } + private static void resetVars() { + Gregtech_Recipe_Adder.inputStack1 = null; + Gregtech_Recipe_Adder.inputStack2 = null; + Gregtech_Recipe_Adder.outputStack1 = null; + Gregtech_Recipe_Adder.outputStack2 = null; + } + } diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 1687064083..5ff8a1201e 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -15,326 +15,387 @@ import net.minecraft.item.ItemStack; public class RECIPES_GREGTECH { - public static void run(){ - Utils.LOG_INFO("Loading Recipes through GregAPI for Industrial Multiblocks."); - execute(); - } + private static void addFuels() { + Utils.LOG_INFO("Registering New Fuels."); + GT_Values.RA.addFuel(ItemUtils.simpleMetaStack("EnderIO:bucketFire_water", 0, 1), null, 120, 0); + GT_Values.RA.addFuel(ItemUtils.simpleMetaStack("EnderIO:bucketRocket_fuel", 0, 1), null, 112, 0); + GT_Values.RA.addFuel(ItemUtils.simpleMetaStack("EnderIO:bucketHootch", 0, 1), null, 36, 0); - private static void execute(){ - cokeOvenRecipes(); - matterFabRecipes(); - assemblerRecipes(); - distilleryRecipes(); - extractorRecipes(); - chemicalBathRecipes(); - chemicalReactorRecipes(); - dehydratorRecipes(); - blastFurnaceRecipes(); - addFuels(); + // CORE.RA.addFuel(UtilsItems.simpleMetaStack("EnderIO:bucketRocket_fuel", + // 0, 1), null, 112, 0); + GT_Values.RA.addFuel(ItemUtils.getSimpleStack(Items.lava_bucket), null, 32, 2); + GT_Values.RA.addFuel(ItemUtils.getIC2Cell(2), null, 32, 2); + GT_Values.RA.addFuel(ItemUtils.getIC2Cell(11), null, 24, 2); + // System.exit(1); } - private static void cokeOvenRecipes(){ - Utils.LOG_INFO("Loading Recipes for Industrial Coking Oven."); + private static void assemblerRecipes() { + // GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, + // Materials.Titanium, 6L), ItemList.Casing_Turbine.get(1L, new + // Object[0]), ItemList.Casing_Turbine2.get(1L, new Object[0]), 50, 16); + // GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, + // Materials.TungstenSteel, 6L), ItemList.Casing_Turbine.get(1L, new + // Object[0]), ItemList.Casing_Turbine3.get(1L, new Object[0]), 50, 16); - try { + } - //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 - 800, //Time in ticks - 30); //EU - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} - try { + private static void blastFurnaceRecipes() { + GT_Values.RA.addBlastRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 2), + ItemUtils.getItemStackOfAmountFromOreDict("dustBerylliumFluoride", 1), GT_Values.NF, GT_Values.NF, + ItemUtils.getItemStackOfAmountFromOreDict("dustLi2BeF4", 3), null, 60 * 20, 2000, 3000); + } - //Coal -> Coke Recipe - //With Sulfuric Acid - CORE.RA.addCokeOvenRecipe( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1L), //Input 1 - 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 - 600, //Time in ticks - 120); //EU - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + private static void chemicalBathRecipes() { + final int[] chances = { + 10000, 5000, 2500 + }; + GT_Values.RA.addChemicalBathRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 12), + FluidUtils.getFluidStack("chlorine", 2400), + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), chances, 30 * 20, 240); - try { - //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 - 1200, //Time in ticks - 30); //EU - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + GT_Values.RA.addChemicalBathRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 10), + FluidUtils.getFluidStack("hydrofluoricacid", 20000), + ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 5), null, null, new int[] {}, 90 * 20, + 500); + } - try { - //Coal -> Coke Recipe - //Without Sulfuric Acid - CORE.RA.addCokeOvenRecipe( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1L), //Input 1 - 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 - 900, //Time in ticks - 120); //EU - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + private static void chemicalReactorRecipes() { + GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 5), // Input + // Stack + // 1 + ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 5), // Input + // Stack + // 2 + null, // Fluid Input + null, // Fluid Output + ItemUtils.getItemStackOfAmountFromOreDict("dust2LiOHCaCO3", 10), // Output + // Stack + 600 * 20); + + GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 5), // Input + // Stack + // 1 + null, // Input Stack 2 + FluidUtils.getFluidStack("hydrofluoricacid", 2500), // Fluid + // Input + FluidUtils.getFluidStack("water", 2500), // Fluid Output + ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 5), // Output + // Stack + 600 * 20); } - private static void matterFabRecipes(){ - Utils.LOG_INFO("Loading Recipes for Matter Fabricator."); + private static void cokeOvenRecipes() { + Utils.LOG_INFO("Loading Recipes for Industrial Coking Oven."); try { - CORE.RA.addMatterFabricatorRecipe( - Materials.UUAmplifier.getFluid(1L), //Fluid Input - 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");} + // 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 + 800, // Time in ticks + 30); // EU + } + 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");} + // Coal -> Coke Recipe + // With Sulfuric Acid + CORE.RA.addCokeOvenRecipe(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1L), // Input + // 1 + 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 + 600, // Time in ticks + 120); // EU + } + catch (final NullPointerException e) { + Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } + try { + // GT Logs to Charcoal Recipe + // Without Sulfuric Acid + CORE.RA.addCokeOvenRecipe(GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 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 + 1200, // Time in ticks + 30); // EU + } + catch (final NullPointerException e) { + Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } + + try { + // Coal -> Coke Recipe + // Without Sulfuric Acid + CORE.RA.addCokeOvenRecipe(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1L), // Input + // 1 + 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 + 900, // Time in ticks + 120); // EU + } + catch (final NullPointerException e) { + Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } } - private static void dehydratorRecipes(){ + private static void dehydratorRecipes() { Utils.LOG_INFO("Loading Recipes for Chemical Dehydrator."); - /*try { - - //Makes Lithium Carbonate - CORE.RA.addDehydratorRecipe( - FluidUtils.getFluidStack("sulfuriclithium", 1000), //Item input (slot 1) - null, //Fluid Input - new ItemStack[]{ - UtilsItems.getItemStackOfAmountFromOreDict("dustSodium", 1), - UtilsItems.getItemStackOfAmountFromOreDict("dustCarbon", 1), - UtilsItems.getItemStackOfAmountFromOreDict("dustLithium", 1) - }, //Output Array of Items - Upto 9 - 10*20, //Time in ticks - 30); //EU - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}*/ + /* + * try { + * + * //Makes Lithium Carbonate CORE.RA.addDehydratorRecipe( + * FluidUtils.getFluidStack("sulfuriclithium", 1000), //Item input (slot + * 1) null, //Fluid Input new ItemStack[]{ + * UtilsItems.getItemStackOfAmountFromOreDict("dustSodium", 1), + * UtilsItems.getItemStackOfAmountFromOreDict("dustCarbon", 1), + * UtilsItems.getItemStackOfAmountFromOreDict("dustLithium", 1) }, + * //Output Array of Items - Upto 9 10*20, //Time in ticks 30); //EU + * }catch (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); + ItemStack cells = ItemUtils.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:itemCellEmpty", + "Empty Fluid Cells", 0, 12); - if (cells == null){ + if (cells == null) { cells = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 12); } - 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 - }, //Output Array of Items - Upto 9, - new int[]{0}, - 75*20, //Time in ticks - 1000); //EU - - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + 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 + }, // Output Array of Items - Upto 9, + new int[] { + 0 + }, 75 * 20, // Time in ticks + 1000); // EU + + } + catch (final NullPointerException e) { + Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } try { - CORE.RA.addDehydratorRecipe( - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 10) - }, //Item input (Array, up to 2) - FluidUtils.getFluidStack("uraniumtetrafluoride", 1440), //Fluid input (slot 1) - null, //Fluid output (slot 2) - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumTetrafluoride", 10), - ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 10) - }, //Output Array of Items - Upto 9, - new int[]{0}, - 150*20, //Time in ticks - 2000); //EU - - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + CORE.RA.addDehydratorRecipe(new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 10) + }, // Item input (Array, up to 2) + FluidUtils.getFluidStack("uraniumtetrafluoride", 1440), // Fluid + // input + // (slot + // 1) + null, // Fluid output (slot 2) + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumTetrafluoride", 10), + ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 10) + }, // Output Array of Items - Upto 9, + new int[] { + 0 + }, 150 * 20, // Time in ticks + 2000); // EU + + } + catch (final NullPointerException e) { + Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } try { - CORE.RA.addDehydratorRecipe( - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 10) - }, //Item input (Array, up to 2) - FluidUtils.getFluidStack("uraniumhexafluoride", 1440), //Fluid input (slot 1) - null, //Fluid output (slot 2) - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumHexafluoride", 10), - ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 10) - }, //Output Array of Items - Upto 9, - new int[]{0}, - 300*20, //Time in ticks - 4000); //EU - - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} - - //Raisins from Grapes + CORE.RA.addDehydratorRecipe(new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 10) + }, // Item input (Array, up to 2) + FluidUtils.getFluidStack("uraniumhexafluoride", 1440), // Fluid + // input + // (slot + // 1) + null, // Fluid output (slot 2) + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumHexafluoride", 10), + ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 10) + }, // Output Array of Items - Upto 9, + new int[] { + 0 + }, 300 * 20, // Time in ticks + 4000); // EU + + } + catch (final 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) - }, //Item input (Array, up to 2) - null, //Fluid input (slot 1) - null, //Fluid output (slot 2) - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("foodRaisins", 1) - }, //Output Array of Items - Upto 9, - new int[]{0}, - 10*20, //Time in ticks - 8); //EU - - }catch (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){ + + CORE.RA.addDehydratorRecipe(new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("cropGrape", 1) + }, // Item input (Array, up to 2) + null, // Fluid input (slot 1) + null, // Fluid output (slot 2) + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("foodRaisins", 1) + }, // Output Array of Items - Upto 9, + new int[] { + 0 + }, 10 * 20, // Time in ticks + 8); // EU + + } + 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) { try { - - CORE.RA.addDehydratorRecipe( - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 10) - }, //Item input (Array, up to 2) - FluidUtils.getFluidStack("water", 10000), //Fluid input (slot 1) - null, //Fluid output (slot 2) - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 20) - }, //Output Array of Items - Upto 9, - new int[]{0}, - 120*20, //Time in ticks - 120); //EU - - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} - - //2 LiOH + CaCO3 + + CORE.RA.addDehydratorRecipe(new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 10) + }, // Item input (Array, up to 2) + FluidUtils.getFluidStack("water", 10000), // Fluid input + // (slot 1) + null, // Fluid output (slot 2) + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 20) + }, // Output Array of Items - Upto 9, + new int[] { + 0 + }, 120 * 20, // Time in ticks + 120); // EU + + } + catch (final NullPointerException e) { + Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } + + // 2 LiOH + CaCO3 try { - - CORE.RA.addDehydratorRecipe( - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dust2LiOHCaCO3", 5) - }, //Item input (Array, up to 2) - null, //Fluid input (slot 1) - null, //Fluid output (slot 2) - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 3) - }, //Output Array of Items - Upto 9, - new int[]{0}, - 120*20, //Time in ticks - 1000); //EU - - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + + CORE.RA.addDehydratorRecipe(new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("dust2LiOHCaCO3", 5) + }, // Item input (Array, up to 2) + null, // Fluid input (slot 1) + null, // Fluid output (slot 2) + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 2), + ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 3) + }, // Output Array of Items - Upto 9, + new int[] { + 0 + }, 120 * 20, // Time in ticks + 1000); // EU + + } + catch (final NullPointerException e) { + Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } } - + } - private static void assemblerRecipes(){ - //GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6L), ItemList.Casing_Turbine.get(1L, new Object[0]), ItemList.Casing_Turbine2.get(1L, new Object[0]), 50, 16); - //GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6L), ItemList.Casing_Turbine.get(1L, new Object[0]), ItemList.Casing_Turbine3.get(1L, new Object[0]), 50, 16); + private static void distilleryRecipes() { + 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.itemHeliumBlob, 1), 200, + 60); + } + private static void execute() { + RECIPES_GREGTECH.cokeOvenRecipes(); + RECIPES_GREGTECH.matterFabRecipes(); + RECIPES_GREGTECH.assemblerRecipes(); + RECIPES_GREGTECH.distilleryRecipes(); + RECIPES_GREGTECH.extractorRecipes(); + RECIPES_GREGTECH.chemicalBathRecipes(); + RECIPES_GREGTECH.chemicalReactorRecipes(); + RECIPES_GREGTECH.dehydratorRecipes(); + RECIPES_GREGTECH.blastFurnaceRecipes(); + RECIPES_GREGTECH.addFuels(); } - private static void distilleryRecipes(){ - 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.itemHeliumBlob, 1), 200, 60); + private static void extractorRecipes() { + Utils.LOG_INFO("Registering Extractor Recipes."); + GT_ModHandler.addExtractionRecipe(GregtechItemList.Battery_RE_EV_Sodium.get(1L, new Object[0]), + ItemList.Battery_Hull_HV.get(4L, new Object[0])); + GT_ModHandler.addExtractionRecipe(GregtechItemList.Battery_RE_EV_Cadmium.get(1L, new Object[0]), + ItemList.Battery_Hull_HV.get(4L, new Object[0])); + GT_ModHandler.addExtractionRecipe(GregtechItemList.Battery_RE_EV_Lithium.get(1L, new Object[0]), + ItemList.Battery_Hull_HV.get(4L, new Object[0])); } - private static void addFuels(){ - Utils.LOG_INFO("Registering New Fuels."); - GT_Values.RA.addFuel(ItemUtils.simpleMetaStack("EnderIO:bucketFire_water", 0, 1), null, 120, 0); - GT_Values.RA.addFuel(ItemUtils.simpleMetaStack("EnderIO:bucketRocket_fuel", 0, 1), null, 112, 0); - GT_Values.RA.addFuel(ItemUtils.simpleMetaStack("EnderIO:bucketHootch", 0, 1), null, 36, 0); + private static void matterFabRecipes() { + Utils.LOG_INFO("Loading Recipes for Matter Fabricator."); + try { + CORE.RA.addMatterFabricatorRecipe(Materials.UUAmplifier.getFluid(1L), // Fluid + // Input + Materials.UUMatter.getFluid(1L), // Fluid Output + 800, // Time in ticks + 32); // EU + } + catch (final NullPointerException e) { + Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } + try { - //CORE.RA.addFuel(UtilsItems.simpleMetaStack("EnderIO:bucketRocket_fuel", 0, 1), null, 112, 0); - GT_Values.RA.addFuel(ItemUtils.getSimpleStack(Items.lava_bucket), null, 32, 2); - GT_Values.RA.addFuel(ItemUtils.getIC2Cell(2), null, 32, 2); - GT_Values.RA.addFuel(ItemUtils.getIC2Cell(11), null, 24, 2); - //System.exit(1); - } + CORE.RA.addMatterFabricatorRecipe(null, // Fluid Input + Materials.UUMatter.getFluid(1L), // Fluid Output + 3200, // Time in ticks + 32); // EU + } + catch (final NullPointerException e) { + Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } - private static void extractorRecipes(){ - Utils.LOG_INFO("Registering Extractor Recipes."); - GT_ModHandler.addExtractionRecipe(GregtechItemList.Battery_RE_EV_Sodium.get(1L, new Object[0]), ItemList.Battery_Hull_HV.get(4L, new Object[0])); - GT_ModHandler.addExtractionRecipe(GregtechItemList.Battery_RE_EV_Cadmium.get(1L, new Object[0]), ItemList.Battery_Hull_HV.get(4L, new Object[0])); - GT_ModHandler.addExtractionRecipe(GregtechItemList.Battery_RE_EV_Lithium.get(1L, new Object[0]), ItemList.Battery_Hull_HV.get(4L, new Object[0])); } - private static void chemicalBathRecipes(){ - int[] chances = {10000, 5000, 2500}; - GT_Values.RA.addChemicalBathRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 12), FluidUtils.getFluidStack("chlorine", 2400), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), - chances, - 30*20, - 240); - - GT_Values.RA.addChemicalBathRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 10), - FluidUtils.getFluidStack("hydrofluoricacid", 20000), - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 5), - null, - null, - new int[]{}, - 90*20, - 500); - } - - private static void chemicalReactorRecipes(){ - GT_Values.RA.addChemicalRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 5), //Input Stack 1 - ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 5), //Input Stack 2 - null, //Fluid Input - null, //Fluid Output - ItemUtils.getItemStackOfAmountFromOreDict("dust2LiOHCaCO3", 10), //Output Stack - 600*20 - ); - - GT_Values.RA.addChemicalRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 5), //Input Stack 1 - null, //Input Stack 2 - FluidUtils.getFluidStack("hydrofluoricacid", 2500), //Fluid Input - FluidUtils.getFluidStack("water", 2500), //Fluid Output - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 5), //Output Stack - 600*20 - ); - } - - private static void blastFurnaceRecipes(){ - GT_Values.RA.addBlastRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustBerylliumFluoride", 1), - GT_Values.NF, GT_Values.NF, - ItemUtils.getItemStackOfAmountFromOreDict("dustLi2BeF4", 3), - null, - 60*20, - 2000, - 3000); + public static void run() { + Utils.LOG_INFO("Loading Recipes through GregAPI for Industrial Multiblocks."); + RECIPES_GREGTECH.execute(); } - } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java index aa3026133e..e62931db25 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java @@ -12,37 +12,37 @@ import net.minecraft.item.ItemStack; public class RECIPES_General { - static ItemStack RECIPE_Paper = ItemUtils.getSimpleStack(Items.paper); - static String RECIPE_LapisDust = "dustLazurite"; - static ItemStack OUTPUT_Blueprint = ItemUtils.getSimpleStack(ModItems.itemBlueprintBase); - static ItemStack RECIPE_CraftingTable = ItemUtils.getSimpleStack(Item.getItemFromBlock(Blocks.crafting_table)); - static String RECIPE_BronzePlate = "plateAnyBronze"; - static ItemStack RECIPE_BasicCasingIC2; - static ItemStack OUTPUT_Workbench_Bronze = ItemUtils.getSimpleStack(Item.getItemFromBlock(ModBlocks.blockWorkbench)); - static ItemStack NULL = null; - - public static void RECIPES_LOAD(){ - - if (LoadedMods.Gregtech){ - RECIPE_BasicCasingIC2 = ItemUtils.getItemStack("IC2:blockMachine", 1); - run(); + static ItemStack RECIPE_Paper = ItemUtils.getSimpleStack(Items.paper); + static String RECIPE_LapisDust = "dustLazurite"; + static ItemStack OUTPUT_Blueprint = ItemUtils.getSimpleStack(ModItems.itemBlueprintBase); + static ItemStack RECIPE_CraftingTable = ItemUtils + .getSimpleStack(Item.getItemFromBlock(Blocks.crafting_table)); + static String RECIPE_BronzePlate = "plateAnyBronze"; + static ItemStack RECIPE_BasicCasingIC2; + static ItemStack OUTPUT_Workbench_Bronze = ItemUtils + .getSimpleStack(Item.getItemFromBlock(ModBlocks.blockWorkbench)); + static ItemStack NULL = null; + + public static void RECIPES_LOAD() { + + if (LoadedMods.Gregtech) { + RECIPES_General.RECIPE_BasicCasingIC2 = ItemUtils.getItemStack("IC2:blockMachine", 1); + RECIPES_General.run(); } } - - private static void run(){ - - - RecipeUtils.recipeBuilder( - RECIPE_Paper, RECIPE_LapisDust, NULL, - RECIPE_Paper, RECIPE_LapisDust, NULL, - RECIPE_LapisDust, RECIPE_LapisDust, NULL, - OUTPUT_Blueprint); - - RecipeUtils.recipeBuilder( - RECIPE_BronzePlate, RECIPE_CraftingTable, RECIPE_BronzePlate, - RECIPE_BronzePlate, RECIPE_BasicCasingIC2, RECIPE_BronzePlate, - RECIPE_BronzePlate, RECIPE_BronzePlate, RECIPE_BronzePlate, - OUTPUT_Workbench_Bronze); + + private static void run() { + + RecipeUtils.recipeBuilder(RECIPES_General.RECIPE_Paper, RECIPES_General.RECIPE_LapisDust, RECIPES_General.NULL, + RECIPES_General.RECIPE_Paper, RECIPES_General.RECIPE_LapisDust, RECIPES_General.NULL, + RECIPES_General.RECIPE_LapisDust, RECIPES_General.RECIPE_LapisDust, RECIPES_General.NULL, + RECIPES_General.OUTPUT_Blueprint); + + RecipeUtils.recipeBuilder(RECIPES_General.RECIPE_BronzePlate, RECIPES_General.RECIPE_CraftingTable, + RECIPES_General.RECIPE_BronzePlate, RECIPES_General.RECIPE_BronzePlate, + RECIPES_General.RECIPE_BasicCasingIC2, RECIPES_General.RECIPE_BronzePlate, + RECIPES_General.RECIPE_BronzePlate, RECIPES_General.RECIPE_BronzePlate, + RECIPES_General.RECIPE_BronzePlate, RECIPES_General.OUTPUT_Workbench_Bronze); } - + } diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java index a770f678c8..43d879bbd1 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java @@ -13,16 +13,32 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator { } @Override - public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(final OrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName, + final String aModName, final ItemStack aStack) { if (aOreDictName.equals(OreDictNames.craftingLensBlue.toString())) { - 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); - } else if (aOreDictName.equals(OreDictNames.craftingLensYellow.toString())) { - 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); - } else if (aOreDictName.equals(OreDictNames.craftingLensCyan.toString())) { - } else if (aOreDictName.equals(OreDictNames.craftingLensRed.toString())) { - } else if (aOreDictName.equals(OreDictNames.craftingLensGreen.toString())) { - GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 2L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GregtechItemList.Circuit_Parts_Wiring_ZPM.get(1L, new Object[0]), 64, 2000); - } else if (aOreDictName.equals(OreDictNames.craftingLensWhite.toString())) { + 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); + } + else if (aOreDictName.equals(OreDictNames.craftingLensYellow.toString())) { + 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); + } + else if (aOreDictName.equals(OreDictNames.craftingLensCyan.toString())) { + } + else if (aOreDictName.equals(OreDictNames.craftingLensRed.toString())) { + } + else if (aOreDictName.equals(OreDictNames.craftingLensGreen.toString())) { + GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 2L), + GT_Utility.copyAmount(0L, new Object[] { + aStack + }), GregtechItemList.Circuit_Parts_Wiring_ZPM.get(1L, new Object[0]), 64, 2000); + } + else if (aOreDictName.equals(OreDictNames.craftingLensWhite.toString())) { } } diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java index 9684893134..7c2bcc5d99 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java @@ -10,105 +10,163 @@ import net.minecraft.item.ItemStack; public class RECIPES_MTWRAPPER { - public static int MT_RECIPES_LOADED = 0; - public static int MT_RECIPES_FAILED = 0; - - static var chestWood = new var("minecraft:chest>"); - static var slabWood = new var("ore:slabWood>"); - static var gemNetherQuartz = new var("ore:gemNetherQuartz>"); - static var glass = new var("ore:blockGlass>"); - static var sensorDaylight = new var("minecraft:daylight_detector>"); - static var blazeRod = new var("minecraft:blaze_rod>"); - static var saw = new var("ore:craftingToolSaw>"); - static var logWood = new var("ore:logWood>"); - static var button = new var("minecraft:stone_button>"); - static var stoneBlock = new var("minecraft:stone>"); - - public static void run(){ - /*addShaped(button.getStack(2), - null, stoneBlock, null, - null, stoneBlock, null, - null, null, null);*/ - /*addShaped(stoneStick.getStack(1), - stoneBlock, null, null, - stoneBlock, null, null, - null, null, null);*/ - addShaped(chestWood.getStack(2), - logWood, logWood, logWood, - logWood, null, logWood, - logWood, logWood, logWood); - addShaped(chestWood.getStack(4), - logWood, logWood, logWood, - logWood, saw, logWood, - logWood, logWood, logWood); - //Recipe Fixes - //remove(sensorDaylight); - addShaped(sensorDaylight.getStack(1), - glass, glass, glass, - gemNetherQuartz, gemNetherQuartz, gemNetherQuartz, - slabWood, slabWood, slabWood); - /*addShaped(ironBars .getStack( 8), - null, "", null, - "", "", "", - "", "", "");*/ - } - - - public static void addShaped(Object item_Output, - Object item_1, Object item_2, Object item_3, - Object item_4, Object item_5, Object item_6, - Object item_7, Object item_8, Object item_9){ - + public static int MT_RECIPES_LOADED = 0; + public static int MT_RECIPES_FAILED = 0; + + static var chestWood = new var("minecraft:chest>"); + static var slabWood = new var("ore:slabWood>"); + static var gemNetherQuartz = new var("ore:gemNetherQuartz>"); + static var glass = new var("ore:blockGlass>"); + static var sensorDaylight = new var("minecraft:daylight_detector>"); + static var blazeRod = new var("minecraft:blaze_rod>"); + static var saw = new var("ore:craftingToolSaw>"); + static var logWood = new var("ore:logWood>"); + static var button = new var("minecraft:stone_button>"); + static var stoneBlock = new var("minecraft:stone>"); + + public static void 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 - * - * + * + * 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(); - String a,b,c,d,e,f,g,h,i; - if (item_1 == null){ a = " ";} else { a = "1";validSlots.add('1');validSlots.add(item_1);} - if (item_2 == null){ b = " ";} else { b = "2";validSlots.add('2');validSlots.add(item_2);} - if (item_3 == null){ c = " ";} else { c = "3";validSlots.add('3');validSlots.add(item_3);} - if (item_4 == null){ d = " ";} else { d = "4";validSlots.add('4');validSlots.add(item_4);} - if (item_5 == null){ e = " ";} else { e = "5";validSlots.add('5');validSlots.add(item_5);} - if (item_6 == null){ f = " ";} else { f = "6";validSlots.add('6');validSlots.add(item_6);} - if (item_7 == null){ g = " ";} else { g = "7";validSlots.add('7');validSlots.add(item_7);} - if (item_8 == null){ h = " ";} else { h = "8";validSlots.add('8');validSlots.add(item_8);} - if (item_9 == null){ i = " ";} else { i = "9";validSlots.add('9');validSlots.add(item_9);} + 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); + } + if (item_3 == null) { + c = " "; + } + else { + c = "3"; + validSlots.add('3'); + validSlots.add(item_3); + } + if (item_4 == null) { + d = " "; + } + else { + d = "4"; + validSlots.add('4'); + validSlots.add(item_4); + } + if (item_5 == null) { + e = " "; + } + else { + e = "5"; + validSlots.add('5'); + validSlots.add(item_5); + } + if (item_6 == null) { + f = " "; + } + else { + f = "6"; + validSlots.add('6'); + validSlots.add(item_6); + } + if (item_7 == null) { + g = " "; + } + else { + g = "7"; + validSlots.add('7'); + validSlots.add(item_7); + } + if (item_8 == null) { + h = " "; + } + else { + h = "8"; + validSlots.add('8'); + validSlots.add(item_8); + } + if (item_9 == null) { + i = " "; + } + else { + i = "9"; + validSlots.add('9'); + validSlots.add(item_9); + } - String lineOne = a+b+c; - String lineTwo = d+e+f; - String lineThree = g+h+i; + 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()); + RECIPES_MTWRAPPER.MT_RECIPES_LOADED++; } - catch(NullPointerException | ClassCastException k){ + catch (NullPointerException | ClassCastException k) { k.getMessage(); k.getClass(); k.printStackTrace(); k.getLocalizedMessage(); - Utils.LOG_WARNING("@@@: Invalid Recipe detected for: "+((var) item_Output).getsanitizedName()); - MT_RECIPES_FAILED++; - } + Utils.LOG_WARNING("@@@: Invalid Recipe detected for: " + ((var) item_Output).getsanitizedName()); + RECIPES_MTWRAPPER.MT_RECIPES_FAILED++; + } } - public static void addShapeless(){ + public static void addShapeless() { } - + public static void run() { + /* + * addShaped(button.getStack(2), null, stoneBlock, null, null, + * stoneBlock, null, null, null, null); + */ + /* + * addShaped(stoneStick.getStack(1), stoneBlock, null, null, stoneBlock, + * null, null, null, null, null); + */ + RECIPES_MTWRAPPER.addShaped(RECIPES_MTWRAPPER.chestWood.getStack(2), RECIPES_MTWRAPPER.logWood, + RECIPES_MTWRAPPER.logWood, RECIPES_MTWRAPPER.logWood, RECIPES_MTWRAPPER.logWood, null, + RECIPES_MTWRAPPER.logWood, RECIPES_MTWRAPPER.logWood, RECIPES_MTWRAPPER.logWood, + RECIPES_MTWRAPPER.logWood); + RECIPES_MTWRAPPER.addShaped(RECIPES_MTWRAPPER.chestWood.getStack(4), RECIPES_MTWRAPPER.logWood, + RECIPES_MTWRAPPER.logWood, RECIPES_MTWRAPPER.logWood, RECIPES_MTWRAPPER.logWood, RECIPES_MTWRAPPER.saw, + RECIPES_MTWRAPPER.logWood, RECIPES_MTWRAPPER.logWood, RECIPES_MTWRAPPER.logWood, + RECIPES_MTWRAPPER.logWood); + // Recipe Fixes + // remove(sensorDaylight); + RECIPES_MTWRAPPER.addShaped(RECIPES_MTWRAPPER.sensorDaylight.getStack(1), RECIPES_MTWRAPPER.glass, + RECIPES_MTWRAPPER.glass, RECIPES_MTWRAPPER.glass, RECIPES_MTWRAPPER.gemNetherQuartz, + RECIPES_MTWRAPPER.gemNetherQuartz, RECIPES_MTWRAPPER.gemNetherQuartz, RECIPES_MTWRAPPER.slabWood, + RECIPES_MTWRAPPER.slabWood, RECIPES_MTWRAPPER.slabWood); + /* + * addShaped(ironBars .getStack( 8), null, "", + * null, "", "", + * "", "", "", + * ""); + */ + } } - diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java index fd84b895a2..6df9618927 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java @@ -8,334 +8,371 @@ 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"; - static String wireTier8 = "wireGt08Naquadah"; - static String wireTier9 = "wireGt08Superconductor"; - static String wireTier10 = "wireGt16Superconductor"; - //Wire - static String cableTier6 = "cableGt04Tungsten"; - static String cableTier7 = "cableGt04NiobiumTitanium"; - static String cableTier8 = "cableGt04Osmium"; - static String cableTier9 = "cableGt04Naquadah"; - static String cableTier10 = "wireGt08Superconductor"; + // Wire + static String wireTier6 = "wireGt08NiobiumTitanium"; + static String wireTier7 = "wireGt08Osmium"; + static String wireTier8 = "wireGt08Naquadah"; + static String wireTier9 = "wireGt08Superconductor"; + static String wireTier10 = "wireGt16Superconductor"; - //Plates - static String plateTier7 = "plateChrome"; - static String plateTier8 = "plateIridium"; - static String plateTier9 = "plateOsmium"; - static String plateTier10 = "plateNeutronium"; + // Wire + static String cableTier6 = "cableGt04Tungsten"; + static String cableTier7 = "cableGt04NiobiumTitanium"; + static String cableTier8 = "cableGt04Osmium"; + static String cableTier9 = "cableGt04Naquadah"; + static String cableTier10 = "wireGt08Superconductor"; - //rods - static String rodTier7a = "stickChrome"; - static String rodTier8a = "stickIridium"; - static String rodTier9a = "stickOsmium"; - static String rodTier10a = "stickNeutronium"; - static String rodTier7b = "stickPlatinum"; - static String rodTier8b = "stickChrome"; - static String rodTier9b = "stickIridium"; - static String rodTier10b = "stickOsmium"; - static String rodTier7c = "stickTitanium"; - static String rodTier8c = "stickTungstenSteel"; - static String rodTier9c = "stickNaquadah"; - static String rodTier10c = "stickOsmium"; + // Plates + static String plateTier7 = "plateChrome"; + static String plateTier8 = "plateIridium"; + static String plateTier9 = "plateOsmium"; + static String plateTier10 = "plateNeutronium"; - //Screws - static String screwTier7 = "screwChrome"; - static String screwTier8 = "screwIridium"; - static String screwTier9 = "screwOsmium"; - static String screwTier10 = "screwNeutronium"; + // rods + static String rodTier7a = "stickChrome"; + static String rodTier8a = "stickIridium"; + static String rodTier9a = "stickOsmium"; + static String rodTier10a = "stickNeutronium"; + static String rodTier7b = "stickPlatinum"; + static String rodTier8b = "stickChrome"; + static String rodTier9b = "stickIridium"; + static String rodTier10b = "stickOsmium"; + static String rodTier7c = "stickTitanium"; + static String rodTier8c = "stickTungstenSteel"; + static String rodTier9c = "stickNaquadah"; + static String rodTier10c = "stickOsmium"; - //Rotors - static String rotorTier7 = "rotorChrome"; - static String rotorTier8 = "rotorIridium"; - static String rotorTier9 = "rotorOsmium"; - static String rotorTier10 = "rotorNeutronium"; + // Screws + static String screwTier7 = "screwChrome"; + static String screwTier8 = "screwIridium"; + static String screwTier9 = "screwOsmium"; + static String screwTier10 = "screwNeutronium"; - //Fluid Pipe - static String pipeTier7 = "pipeHugeSteel"; - static String pipeTier8 = "pipeHugeStainlessSteel"; - static String pipeTier9 = "pipeHugeTitanium"; - static String pipeTier10 = "pipeHugeTungstenSteel"; + // Rotors + static String rotorTier7 = "rotorChrome"; + static String rotorTier8 = "rotorIridium"; + static String rotorTier9 = "rotorOsmium"; + static String rotorTier10 = "rotorNeutronium"; - //Rubber Ring/Plate - static String itemRubberRing = "ringRubber"; - static String plateRubber = "plateRubber"; + // Fluid Pipe + static String pipeTier7 = "pipeHugeSteel"; + static String pipeTier8 = "pipeHugeStainlessSteel"; + static String pipeTier9 = "pipeHugeTitanium"; + static String pipeTier10 = "pipeHugeTungstenSteel"; - //Circuits - static String circuitTier6 = "circuitMaster"; - static String circuitTier7 = "circuitUltimate"; - static String circuitTier8 = "circuitSymbiotic"; - static String circuitTier9 = "circuitNeutronic"; - static String circuitTier10 = "circuitQuantum"; + // Rubber Ring/Plate + static String itemRubberRing = "ringRubber"; + static String plateRubber = "plateRubber"; - //small gears - static String smallGearTier7 = "gearGtSmallChrome"; - static String smallGearTier8 = "gearGtSmallIridium"; - static String smallGearTier9 = "gearGtSmallOsmium"; - static String smallGearTier10 = "gearGtSmallNeutronium"; + // Circuits + static String circuitTier6 = "circuitMaster"; + static String circuitTier7 = "circuitUltimate"; + static String circuitTier8 = "circuitSymbiotic"; + static String circuitTier9 = "circuitNeutronic"; + static String circuitTier10 = "circuitQuantum"; - //Crafting Tools - static String craftingToolWrench = "craftingToolWrench"; - static String craftingToolScrewdriver = "craftingToolScrewdriver"; + // small gears + static String smallGearTier7 = "gearGtSmallChrome"; + static String smallGearTier8 = "gearGtSmallIridium"; + static String smallGearTier9 = "gearGtSmallOsmium"; + static String smallGearTier10 = "gearGtSmallNeutronium"; - 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(); + // Crafting Tools + static String craftingToolWrench = "craftingToolWrench"; + static String craftingToolScrewdriver = "craftingToolScrewdriver"; + + private static void GregtechMachinePhase() { + Utils.LOG_INFO("Adding Gregtech machine recipes for the circuits."); + GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 1L), + GregtechItemList.Circuit_Parts_Wiring_IV.get(4L, new Object[0]), + GregtechItemList.Circuit_Board_IV.get(1L, new Object[0]), 32, 256); + GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 1L), + GregtechItemList.Circuit_Parts_Wiring_LuV.get(4L, new Object[0]), + GregtechItemList.Circuit_Board_LuV.get(1L, new Object[0]), 64, 512); + GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 2L), + GregtechItemList.Circuit_Parts_Wiring_ZPM.get(4L, new Object[0]), + GregtechItemList.Circuit_Board_ZPM.get(1L, new Object[0]), 96, 1024); + GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lazurite, 1L), + GregtechItemList.Circuit_Parts_Crystal_Chip_IV.get(3L, new Object[0]), + GregtechItemList.Circuit_Parts_IV.get(1L, new Object[0]), 32, 512); + GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lazurite, 1L), + GregtechItemList.Circuit_Parts_Crystal_Chip_LuV.get(3L, new Object[0]), + GregtechItemList.Circuit_Parts_LuV.get(1L, new Object[0]), 64, 1024); + GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lazurite, 1L), + GregtechItemList.Circuit_Parts_Crystal_Chip_ZPM.get(3L, new Object[0]), + GregtechItemList.Circuit_Parts_ZPM.get(1L, new Object[0]), 96, 2048); + 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 (final Materials tMat : Materials.values()) { + if (tMat.mStandardMoltenFluid != null && tMat.contains(SubTag.SOLDERING_MATERIAL)) { + 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); + + } + } + } + + private static void onlyMaxComponents() { + RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.cableTier10, RECIPES_MachineComponents.wireTier10, + RECIPES_MachineComponents.rodTier10a, RECIPES_MachineComponents.wireTier10, + RECIPES_MachineComponents.rodTier10b, RECIPES_MachineComponents.wireTier10, + RECIPES_MachineComponents.rodTier10a, RECIPES_MachineComponents.wireTier10, + RECIPES_MachineComponents.cableTier10, RECIPE_CONSTANTS.electricMotor_MAX); + RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.cableTier10, + RECIPES_MachineComponents.rotorTier10, RECIPES_MachineComponents.itemRubberRing, + RECIPES_MachineComponents.craftingToolScrewdriver, RECIPES_MachineComponents.pipeTier10, + RECIPES_MachineComponents.craftingToolWrench, RECIPES_MachineComponents.itemRubberRing, + RECIPE_CONSTANTS.electricMotor_MAX, RECIPES_MachineComponents.cableTier10, + RECIPE_CONSTANTS.electricPump_MAX); + RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.plateTier10, + RECIPES_MachineComponents.plateTier10, RECIPES_MachineComponents.plateTier10, + RECIPES_MachineComponents.cableTier10, RECIPES_MachineComponents.rodTier10a, + RECIPES_MachineComponents.rodTier10a, RECIPES_MachineComponents.cableTier10, + RECIPE_CONSTANTS.electricMotor_MAX, RECIPES_MachineComponents.smallGearTier10, + RECIPE_CONSTANTS.electricPiston_MAX); + RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.cableTier10, + RECIPES_MachineComponents.cableTier10, RECIPES_MachineComponents.cableTier10, + RECIPE_CONSTANTS.electricMotor_MAX, RECIPES_MachineComponents.rodTier10a, + RECIPE_CONSTANTS.electricMotor_MAX, RECIPE_CONSTANTS.electricPiston_MAX, + RECIPES_MachineComponents.circuitTier10, RECIPES_MachineComponents.rodTier10a, + RECIPE_CONSTANTS.robotArm_MAX); + RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.plateRubber, + RECIPES_MachineComponents.plateRubber, RECIPES_MachineComponents.plateRubber, + RECIPE_CONSTANTS.electricMotor_MAX, RECIPES_MachineComponents.cableTier10, + RECIPE_CONSTANTS.electricMotor_MAX, RECIPES_MachineComponents.plateRubber, + RECIPES_MachineComponents.plateRubber, RECIPES_MachineComponents.plateRubber, + RECIPE_CONSTANTS.conveyorModule_MAX); + RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.rodTier10c, RECIPES_MachineComponents.rodTier10c, + RECIPES_MachineComponents.circuitTier10, RECIPES_MachineComponents.cableTier10, + RECIPES_MachineComponents.circuitTier9, RECIPES_MachineComponents.rodTier10c, + RECIPES_MachineComponents.circuitTier10, RECIPES_MachineComponents.cableTier10, + RECIPES_MachineComponents.rodTier10c, RECIPE_CONSTANTS.emitter_MAX); + RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.wireTier10, + RECIPES_MachineComponents.circuitTier10, RECIPES_MachineComponents.wireTier10, + RECIPES_MachineComponents.circuitTier10, RECIPES_MachineComponents.circuitTier9, + RECIPES_MachineComponents.circuitTier10, RECIPES_MachineComponents.wireTier10, + RECIPES_MachineComponents.circuitTier10, RECIPES_MachineComponents.wireTier10, + RECIPE_CONSTANTS.fieldGenerator_MAX); + RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.plateTier10, null, + RECIPES_MachineComponents.circuitTier9, RECIPES_MachineComponents.plateTier10, + RECIPES_MachineComponents.rodTier10c, null, RECIPES_MachineComponents.circuitTier10, + RECIPES_MachineComponents.plateTier10, RECIPES_MachineComponents.plateTier10, + RECIPE_CONSTANTS.sensor_MAX); + } + + 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) { + RECIPES_MachineComponents.run(); } else { - onlyMaxComponents(); + RECIPES_MachineComponents.onlyMaxComponents(); } - GregtechMachinePhase(); + RECIPES_MachineComponents.GregtechMachinePhase(); } - private st