diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core/recipe')
12 files changed, 1780 insertions, 1882 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java b/src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java index bbd235d5dd..bb5732c319 100644 --- a/src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java +++ b/src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java @@ -9,88 +9,90 @@ 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; + 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); - } + 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 void addCompressorRecipe(final ItemStack input1, final ItemStack output1) { - GT_ModHandler.addCompressionRecipe(input1, output1); + } + + private static void resetVars(){ + inputStack1 = null; + inputStack2 = null; + outputStack1 = null; + outputStack2 = null; } - private static void addMaceratorRecipe(final ItemStack input1, final ItemStack output1) { + private static void addMaceratorRecipe(ItemStack input1, ItemStack output1){ GT_ModHandler.addPulverisationRecipe(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 addCompressorRecipe(ItemStack input1, ItemStack output1){ + GT_ModHandler.addCompressionRecipe(input1, output1); } - private static void addSmeltingRecipe(final ItemStack input1, final ItemStack output1) { - GT_ModHandler.addSmeltingRecipe(input1, output1); + 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 resetVars() { - Gregtech_Recipe_Adder.inputStack1 = null; - Gregtech_Recipe_Adder.inputStack2 = null; - Gregtech_Recipe_Adder.outputStack1 = null; - Gregtech_Recipe_Adder.outputStack2 = null; + private static void addSmeltingRecipe(ItemStack input1, 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 5ff8a1201e..46cf4e0a7d 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -1,6 +1,9 @@ package gtPlusPlus.core.recipe; -import gregtech.api.enums.*; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.item.ModItems; @@ -15,387 +18,326 @@ import net.minecraft.item.ItemStack; public class RECIPES_GREGTECH { - 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); - - // 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 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); - + public static void run(){ + Utils.LOG_INFO("Loading Recipes through GregAPI for Industrial Multiblocks."); + execute(); } - 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); + private static void execute(){ + cokeOvenRecipes(); + matterFabRecipes(); + assemblerRecipes(); + distilleryRecipes(); + extractorRecipes(); + chemicalBathRecipes(); + chemicalReactorRecipes(); + dehydratorRecipes(); + blastFurnaceRecipes(); + addFuels(); } - 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); + private static void cokeOvenRecipes(){ + Utils.LOG_INFO("Loading Recipes for Industrial Coking Oven."); - GT_Values.RA.addChemicalBathRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 10), - FluidUtils.getFluidStack("hydrofluoricacid", 20000), - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 5), null, null, new int[] {}, 90 * 20, - 500); - } + try { - 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); - } + //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 cokeOvenRecipes() { - Utils.LOG_INFO("Loading Recipes for Industrial Coking Oven."); + //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");} 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 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 { + //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");} + } - // 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"); - } + private static void matterFabRecipes(){ + Utils.LOG_INFO("Loading Recipes for Matter Fabricator."); 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"); - } + 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");} 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"); - } + + 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");} + } - 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); } - 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"); - } + 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");} 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 (final 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 (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 (final 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 (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 (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) { + + 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){ 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 (final 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 (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 (final 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 (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} } - + } - 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 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 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 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 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 matterFabRecipes() { - Utils.LOG_INFO("Loading Recipes for Matter Fabricator."); + 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); - 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.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"); - } + //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 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])); } - public static void run() { - Utils.LOG_INFO("Loading Recipes through GregAPI for Industrial Multiblocks."); - RECIPES_GREGTECH.execute(); + 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); + } + }
\ 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 e62931db25..aa3026133e 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) { - RECIPES_General.RECIPE_BasicCasingIC2 = ItemUtils.getItemStack("IC2:blockMachine", 1); - RECIPES_General.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){ + RECIPE_BasicCasingIC2 = ItemUtils.getItemStack("IC2:blockMachine", 1); + run(); } } - - 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); + + 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); } - + } diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java index 43d879bbd1..94a1d85ae3 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java @@ -1,6 +1,9 @@ package gtPlusPlus.core.recipe; -import gregtech.api.enums.*; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OreDictNames; +import gregtech.api.enums.OrePrefixes; import gregtech.api.interfaces.IOreRecipeRegistrator; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; @@ -13,32 +16,16 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator { } @Override - public void registerOre(final OrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName, - final String aModName, final ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, 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 7c2bcc5d99..14f4a1c998 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java @@ -1,172 +1,115 @@ package gtPlusPlus.core.recipe; -import java.util.ArrayList; - import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.recipe.RecipeUtils; import gtPlusPlus.core.util.wrapper.var; + +import java.util.ArrayList; + import net.minecraft.item.ItemStack; public class RECIPES_MTWRAPPER { - public static int MT_RECIPES_LOADED = 0; - public static int MT_RECIPES_FAILED = 0; + 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>"); + 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, "<ore:craftingToolWrench>", null, + "<ore:stickAnyIron>", "<ore:stickAnyIron>", "<ore:stickAnyIron>", + "<ore:stickAnyIron>", "<ore:stickAnyIron>", "<ore:stickAnyIron>");*/ + } + + + public static void addShaped(Object item_Output, + Object item_1, Object item_2, Object item_3, + Object item_4, Object item_5, Object item_6, + Object item_7, Object item_8, Object item_9){ - public static void addShaped(final Object item_Output, final Object item_1, final Object item_2, - final Object item_3, final Object item_4, final Object item_5, final Object item_6, final Object item_7, - final Object item_8, final Object item_9) { /* - * - * var item_1, var item_2, var item_3, var item_4, var item_5, var - * item_6, var item_7, var item_8, var item_9 - * - * + * + * 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 + * + * */ - final ItemStack outputItem = ItemUtils.getCorrectStacktype(item_Output, 1); + ItemStack outputItem = ItemUtils.getCorrectStacktype(item_Output, 1); - final ArrayList<Object> validSlots = new ArrayList<Object>(); - 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); - } + ArrayList<Object> validSlots = new ArrayList<Object>(); + 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 String lineOne = a + b + c; - final String lineTwo = d + e + f; - final String lineThree = g + h + i; + String lineOne = a+b+c; + String lineTwo = d+e+f; + String lineThree = g+h+i; validSlots.add(0, lineOne); validSlots.add(1, lineTwo); validSlots.add(2, lineThree); try { - RecipeUtils.recipeBuilder(validSlots.toArray(), outputItem.copy()); - RECIPES_MTWRAPPER.MT_RECIPES_LOADED++; + RecipeUtils.recipeBuilder((Object[]) validSlots.toArray(), outputItem.copy()); + 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()); - RECIPES_MTWRAPPER.MT_RECIPES_FAILED++; - } + Utils.LOG_WARNING("@@@: Invalid Recipe detected for: "+((var) item_Output).getsanitizedName()); + 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, "<ore:craftingToolWrench>", - * null, "<ore:stickAnyIron>", "<ore:stickAnyIron>", - * "<ore:stickAnyIron>", "<ore:stickAnyIron>", "<ore:stickAnyIron>", - * "<ore:stickAnyIron>"); - */ - } + } + diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java index 6df9618927..e3f47844c7 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java @@ -1,6 +1,10 @@ package gtPlusPlus.core.recipe; -import gregtech.api.enums.*; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.SubTag; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; @@ -8,371 +12,334 @@ 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 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 cableTier6 = "cableGt04Tungsten"; - static String cableTier7 = "cableGt04NiobiumTitanium"; - static String cableTier8 = "cableGt04Osmium"; - static String cableTier9 = "cableGt04Naquadah"; - static String cableTier10 = "wireGt08Superconductor"; + //Plates + static String plateTier7 = "plateChrome"; + static String plateTier8 = "plateIridium"; + static String plateTier9 = "plateOsmium"; + static String plateTier10 = "plateNeutronium"; - // Plates - static String plateTier7 = "plateChrome"; - static String plateTier8 = "plateIridium"; - static String plateTier9 = "plateOsmium"; - static String plateTier10 = "plateNeutronium"; + //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"; - // 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"; + //Screws + static String screwTier7 = "screwChrome"; + static String screwTier8 = "screwIridium"; + static String screwTier9 = "screwOsmium"; + static String screwTier10 = "screwNeutronium"; - // Screws - static String screwTier7 = "screwChrome"; - static String screwTier8 = "screwIridium"; - static String screwTier9 = "screwOsmium"; - static String screwTier10 = "screwNeutronium"; + //Rotors + static String rotorTier7 = "rotorChrome"; + static String rotorTier8 = "rotorIridium"; + static String rotorTier9 = "rotorOsmium"; + static String rotorTier10 = "rotorNeutronium"; - // Rotors - static String rotorTier7 = "rotorChrome"; - static String rotorTier8 = "rotorIridium"; - static String rotorTier9 = "rotorOsmium"; - static String rotorTier10 = "rotorNeutronium"; + //Fluid Pipe + static String pipeTier7 = "pipeHugeSteel"; + static String pipeTier8 = "pipeHugeStainlessSteel"; + static String pipeTier9 = "pipeHugeTitanium"; + static String pipeTier10 = "pipeHugeTungstenSteel"; - // Fluid Pipe - static String pipeTier7 = "pipeHugeSteel"; - static String pipeTier8 = "pipeHugeStainlessSteel"; - static String pipeTier9 = "pipeHugeTitanium"; - static String pipeTier10 = "pipeHugeTungstenSteel"; + //Rubber Ring/Plate + static String itemRubberRing = "ringRubber"; + static String plateRubber = "plateRubber"; - // Rubber Ring/Plate - static String itemRubberRing = "ringRubber"; - static String plateRubber = "plateRubber"; + //Circuits + static String circuitTier6 = "circuitMaster"; + static String circuitTier7 = "circuitUltimate"; + static String circuitTier8 = "circuitSymbiotic"; + static String circuitTier9 = "circuitNeutronic"; + static String circuitTier10 = "circuitQuantum"; - // Circuits - static String circuitTier6 = "circuitMaster"; - static String circuitTier7 = "circuitUltimate"; - static String circuitTier8 = "circuitSymbiotic"; - static String circuitTier9 = "circuitNeutronic"; - static String circuitTier10 = "circuitQuantum"; + //small gears + static String smallGearTier7 = "gearGtSmallChrome"; + static String smallGearTier8 = "gearGtSmallIridium"; + static String smallGearTier9 = "gearGtSmallOsmium"; + static String smallGearTier10 = "gearGtSmallNeutronium"; - // small gears - static String smallGearTier7 = "gearGtSmallChrome"; - static String smallGearTier8 = "gearGtSmallIridium"; - static String smallGearTier9 = "gearGtSmallOsmium"; - static String smallGearTier10 = "gearGtSmallNeutronium"; + //Crafting Tools + static String craftingToolWrench = "craftingToolWrench"; + static String craftingToolScrewdriver = "craftingToolScrewdriver"; - // 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(); + 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(); } else { - RECIPES_MachineComponents.onlyMaxComponents(); + onlyMaxComponents(); } - RECIPES_MachineComponents.GregtechMachinePhase(); + GregtechMachinePhase(); } - private static void run() { - // Electric Motors - RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.cableTier7, RECIPES_MachineComponents.wireTier7, - RECIPES_MachineComponents.rodTier7a, RECIPES_MachineComponents.wireTier7, - RECIPES_MachineComponents.rodTier7b, RECIPES_MachineComponents.wireTier7, - RECIPES_MachineComponents.rodTier7a, RECIPES_MachineComponents.wireTier7, - RECIPES_MachineComponents.cableTier7, RECIPE_CONSTANTS.electricMotor_LuV); - RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.cableTier8, RECIPES_MachineComponents.wireTier8, - RECIPES_MachineComponents.rodTier8a, RECIPES_MachineComponents.wireTier8, - RECIPES_MachineComponents.rodTier8b, RECIPES_MachineComponents.wireTier8, - RECIPES_MachineComponents.rodTier8a, RECIPES_MachineComponents.wireTier8, - RECIPES_MachineComponents.cableTier8, RECIPE_CONSTANTS.electricMotor_ZPM); - RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.cableTier9, RECIPES_MachineComponents.wireTier9, - RECIPES_MachineComponents.rodTier9a, RECIPES_MachineComponents.wireTier9, - RECIPES_MachineComponents.rodTier9b, RECIPES_MachineComponents.wireTier9, - RECIPES_MachineComponents.rodTier9a, RECIPES_MachineComponents.wireTier9, - RECIPES_MachineComponents.cableTier9, RECIPE_CONSTANTS.electricMotor_UV); - 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); + private static void run(){ + //Electric Motors + RecipeUtils.addShapedGregtechRecipe( + cableTier7, wireTier7, rodTier7a, + wireTier7, rodTier7b, wireTier7, + rodTier7a, wireTier7, cableTier7, + RECIPE_CONSTANTS.electricMotor_LuV); + RecipeUtils.addShapedGregtechRecipe( + cableTier8, wireTier8, rodTier8a, + wireTier8, rodTier8b, wireTier8, + rodTier8a, wireTier8, cableTier8, + RECIPE_CONSTANTS.electricMotor_ZPM); + RecipeUtils.addShapedGregtechRecipe( + cableTier9, wireTier9, rodTier9a, + wireTier9, rodTier9b, wireTier9, + rodTier9a, wireTier9, cableTier9, + RECIPE_CONSTANTS.electricMotor_UV); + RecipeUtils.addShapedGregtechRecipe( + cableTier10, wireTier10, rodTier10a, + wireTier10, rodTier10b, wireTier10, + rodTier10a, wireTier10, cableTier10, + RECIPE_CONSTANTS.electricMotor_MAX); - // Electric Pump - RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.cableTier7, RECIPES_MachineComponents.rotorTier7, - RECIPES_MachineComponents.itemRubberRing, RECIPES_MachineComponents.craftingToolScrewdriver, - RECIPES_MachineComponents.pipeTier7, RECIPES_MachineComponents.craftingToolWrench, - RECIPES_MachineComponents.itemRubberRing, RECIPE_CONSTANTS.electricMotor_LuV, - RECIPES_MachineComponents.cableTier7, RECIPE_CONSTANTS.electricPump_LuV); - RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.cableTier8, RECIPES_MachineComponents.rotorTier8, - RECIPES_MachineComponents.itemRubberRing, RECIPES_MachineComponents.craftingToolScrewdriver, - RECIPES_MachineComponents.pipeTier8, RECIPES_MachineComponents.craftingToolWrench, - RECIPES_MachineComponents.itemRubberRing, RECIPE_CONSTANTS.electricMotor_ZPM, - RECIPES_MachineComponents.cableTier8, RECIPE_CONSTANTS.electricPump_ZPM); - RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.cableTier9, RECIPES_MachineComponents.rotorTier9, - RECIPES_MachineComponents.itemRubberRing, RECIPES_MachineComponents.craftingToolScrewdriver, - RECIPES_MachineComponents.pipeTier9, RECIPES_MachineComponents.craftingToolWrench, - RECIPES_MachineComponents.itemRubberRing, RECIPE_CONSTANTS.electricMotor_UV, - RECIPES_MachineComponents.cableTier9, RECIPE_CONSTANTS.electricPump_UV); - 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, + //Electric Pump + RecipeUtils.addShapedGregtechRecipe( + cableTier7, rotorTier7, itemRubberRing, + craftingToolScrewdriver, pipeTier7, craftingToolWrench, + itemRubberRing, RECIPE_CONSTANTS.electricMotor_LuV, cableTier7, + RECIPE_CONSTANTS.electricPump_LuV); + RecipeUtils.addShapedGregtechRecipe( + cableTier8, rotorTier8, itemRubberRing, + craftingToolScrewdriver, pipeTier8, craftingToolWrench, + itemRubberRing, RECIPE_CONSTANTS.electricMotor_ZPM, cableTier8, + RECIPE_CONSTANTS.electricPump_ZPM); + RecipeUtils.addShapedGregtechRecipe( + cableTier9, rotorTier9, itemRubberRing, + craftingToolScrewdriver, pipeTier9, craftingToolWrench, + itemRubberRing, RECIPE_CONSTANTS.electricMotor_UV, cableTier9, + RECIPE_CONSTANTS.electricPump_UV); + RecipeUtils.addShapedGregtechRecipe( + cableTier10, rotorTier10, itemRubberRing, + craftingToolScrewdriver, pipeTier10, craftingToolWrench, + itemRubberRing, RECIPE_CONSTANTS.electricMotor_MAX, cableTier10, RECIPE_CONSTANTS.electricPump_MAX); - // Electric Pump - RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.plateTier7, RECIPES_MachineComponents.plateTier7, - RECIPES_MachineComponents.plateTier7, RECIPES_MachineComponents.cableTier7, - RECIPES_MachineComponents.rodTier7a, RECIPES_MachineComponents.rodTier7a, - RECIPES_MachineComponents.cableTier7, RECIPE_CONSTANTS.electricMotor_LuV, - RECIPES_MachineComponents.smallGearTier7, RECIPE_CONSTANTS.electricPiston_LuV); - RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.plateTier8, RECIPES_MachineComponents.plateTier8, - RECIPES_MachineComponents.plateTier8, RECIPES_MachineComponents.cableTier8, - RECIPES_MachineComponents.rodTier8a, RECIPES_MachineComponents.rodTier8a, - RECIPES_MachineComponents.cableTier8, RECIPE_CONSTANTS.electricMotor_ZPM, - RECIPES_MachineComponents.smallGearTier8, RECIPE_CONSTANTS.electricPiston_ZPM); - RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.plateTier9, RECIPES_MachineComponents.plateTier9, - RECIPES_MachineComponents.plateTier9, RECIPES_MachineComponents.cableTier9, - RECIPES_MachineComponents.rodTier9a, RECIPES_MachineComponents.rodTier9a, - RECIPES_MachineComponents.cableTier9, RECIPE_CONSTANTS.electricMotor_UV, - RECIPES_MachineComponents.smallGearTier9, RECIPE_CONSTANTS.electricPiston_UV); - 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, + //Electric Pump + RecipeUtils.addShapedGregtechRecipe( + plateTier7, plateTier7, plateTier7, + cableTier7, rodTier7a, rodTier7a, + cableTier7, RECIPE_CONSTANTS.electricMotor_LuV, smallGearTier7, + RECIPE_CONSTANTS.electricPiston_LuV); + RecipeUtils.addShapedGregtechRecipe( + plateTier8, plateTier8, plateTier8, + cableTier8, rodTier8a, rodTier8a, + cableTier8, RECIPE_CONSTANTS.electricMotor_ZPM, smallGearTier8, + RECIPE_CONSTANTS.electricPiston_ZPM); + RecipeUtils.addShapedGregtechRecipe( + plateTier9, plateTier9, plateTier9, + cableTier9, rodTier9a, rodTier9a, + cableTier9, RECIPE_CONSTANTS.electricMotor_UV, smallGearTier9, + RECIPE_CONSTANTS.electricPiston_UV); + RecipeUtils.addShapedGregtechRecipe( + plateTier10, plateTier10, plateTier10, + cableTier10, rodTier10a, rodTier10a, + cableTier10, RECIPE_CONSTANTS.electricMotor_MAX, smallGearTier10, RECIPE_CONSTANTS.electricPiston_MAX); - // Robot Arms - RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.cableTier7, RECIPES_MachineComponents.cableTier7, - RECIPES_MachineComponents.cableTier7, RECIPE_CONSTANTS.electricMotor_LuV, - RECIPES_MachineComponents.rodTier7a, RECIPE_CONSTANTS.electricMotor_LuV, - RECIPE_CONSTANTS.electricPiston_LuV, RECIPES_MachineComponents.circuitTier7, - RECIPES_MachineComponents.rodTier7a, RECIPE_CONSTANTS.robotArm_LuV); - RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.cableTier8, RECIPES_MachineComponents.cableTier8, - RECIPES_MachineComponents.cableTier8, RECIPE_CONSTANTS.electricMotor_ZPM, - RECIPES_MachineComponents.rodTier8a, RECIPE_CONSTANTS.electricMotor_ZPM, - RECIPE_CONSTANTS.electricPiston_ZPM, RECIPES_MachineComponents.circuitTier8, - RECIPES_MachineComponents.rodTier8a, RECIPE_CONSTANTS.robotArm_ZPM); - RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.cableTier9, RECIPES_MachineComponents.cableTier9, - RECIPES_MachineComponents.cableTier9, RECIPE_CONSTANTS.electricMotor_UV, - RECIPES_MachineComponents.rodTier9a, RECIPE_CONSTANTS.electricMotor_UV, - RECIPE_CONSTANTS.electricPiston_UV, RECIPES_MachineComponents.circuitTier9, - RECIPES_MachineComponents.rodTier9a, RECIPE_CONSTANTS.robotArm_UV); - 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, + //Robot Arms + RecipeUtils.addShapedGregtechRecipe( + cableTier7, cableTier7, cableTier7, + RECIPE_CONSTANTS.electricMotor_LuV, rodTier7a, RECIPE_CONSTANTS.electricMotor_LuV, + RECIPE_CONSTANTS.electricPiston_LuV, circuitTier7, rodTier7a, + RECIPE_CONSTANTS.robotArm_LuV); + RecipeUtils.addShapedGregtechRecipe( + cableTier8, cableTier8, cableTier8, + RECIPE_CONSTANTS.electricMotor_ZPM, rodTier8a, RECIPE_CONSTANTS.electricMotor_ZPM, + RECIPE_CONSTANTS.electricPiston_ZPM, circuitTier8, rodTier8a, + RECIPE_CONSTANTS.robotArm_ZPM); + RecipeUtils.addShapedGregtechRecipe( + cableTier9, cableTier9, cableTier9, + RECIPE_CONSTANTS.electricMotor_UV, rodTier9a, RECIPE_CONSTANTS.electricMotor_UV, + RECIPE_CONSTANTS.electricPiston_UV, circuitTier9, rodTier9a, + RECIPE_CONSTANTS.robotArm_UV); + RecipeUtils.addShapedGregtechRecipe( + cableTier10, cableTier10, cableTier10, + RECIPE_CONSTANTS.electricMotor_MAX, rodTier10a, RECIPE_CONSTANTS.electricMotor_MAX, + RECIPE_CONSTANTS.electricPiston_MAX, circuitTier10, rodTier10a, RECIPE_CONSTANTS.robotArm_MAX); - // Conveyor Modules - RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.plateRubber, - RECIPES_MachineComponents.plateRubber, RECIPES_MachineComponents.plateRubber, - RECIPE_CONSTANTS.electricMotor_LuV, RECIPES_MachineComponents.cableTier7, - RECIPE_CONSTANTS.electricMotor_LuV, RECIPES_MachineComponents.plateRubber, - RECIPES_MachineComponents.plateRubber, RECIPES_MachineComponents.plateRubber, + //Conveyor Modules + RecipeUtils.addShapedGregtechRecipe( + plateRubber, plateRubber, plateRubber, + RECIPE_CONSTANTS.electricMotor_LuV, cableTier7, RECIPE_CONSTANTS.electricMotor_LuV, + plateRubber, plateRubber, plateRubber, RECIPE_CONSTANTS.conveyorModule_LuV); - RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.plateRubber, - RECIPES_MachineComponents.plateRubber, RECIPES_MachineComponents.plateRubber, - RECIPE_CONSTANTS.electricMotor_ZPM, RECIPES_MachineComponents.cableTier8, - RECIPE_CONSTANTS.electricMotor_ZPM, RECIPES_MachineComponents.plateRubber, - RECIPES_MachineComponents.plateRubber, RECIPES_MachineComponents.plateRubber, + RecipeUtils.addShapedGregtechRecipe( + plateRubber, plateRubber, plateRubber, + RECIPE_CONSTANTS.electricMotor_ZPM, cableTier8, RECIPE_CONSTANTS.electricMotor_ZPM, + plateRubber, plateRubber, plateRubber, RECIPE_CONSTANTS.conveyorModule_ZPM); - RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.plateRubber, - RECIPES_MachineComponents.plateRubber, RECIPES_MachineComponents.plateRubber, - RECIPE_CONSTANTS.electricMotor_UV, RECIPES_MachineComponents.cableTier9, - RECIPE_CONSTANTS.electricMotor_UV, RECIPES_MachineComponents.plateRubber, - RECIPES_MachineComponents.plateRubber, RECIPES_MachineComponents.plateRubber, + RecipeUtils.addShapedGregtechRecipe( + plateRubber, plateRubber, plateRubber, + RECIPE_CONSTANTS.electricMotor_UV, cableTier9, RECIPE_CONSTANTS.electricMotor_UV, + plateRubber, plateRubber, plateRubber, RECIPE_CONSTANTS.conveyorModule_UV); - 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, + RecipeUtils.addShapedGregtechRecipe( + plateRubber, plateRubber, plateRubber, + RECIPE_CONSTANTS.electricMotor_MAX, cableTier10, RECIPE_CONSTANTS.electricMotor_MAX, + plateRubber, plateRubber, plateRubber, RECIPE_CONSTANTS.conveyorModule_MAX); - // Emitter Modules - RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.rodTier7c, RECIPES_MachineComponents.rodTier7c, - RECIPES_MachineComponents.circuitTier7, RECIPES_MachineComponents.cableTier7, - RECIPES_MachineComponents.circuitTier6, RECIPES_MachineComponents.rodTier7c, - RECIPES_MachineComponents.circuitTier7, RECIPES_MachineComponents.cableTier7, - RECIPES_MachineComponents.rodTier7c, RECIPE_CONSTANTS.emitter_LuV); - RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.rodTier8c, RECIPES_MachineComponents.rodTier8c, - RECIPES_MachineComponents.circuitTier8, RECIPES_MachineComponents.cableTier8, - RECIPES_MachineComponents.circuitTier7, RECIPES_MachineComponents.rodTier8c, - RECIPES_MachineComponents.circuitTier8, RECIPES_MachineComponents.cableTier8, - RECIPES_MachineComponents.rodTier8c, RECIPE_CONSTANTS.emitter_ZPM); - RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.rodTier9c, RECIPES_MachineComponents.rodTier9c, - RECIPES_MachineComponents.circuitTier9, RECIPES_MachineComponents.cableTier9, - RECIPES_MachineComponents.circuitTier8, RECIPES_MachineComponents.rodTier9c, - RECIPES_MachineComponents.circuitTier9, RECIPES_MachineComponents.cableTier9, - RECIPES_MachineComponents.rodTier9c, RECIPE_CONSTANTS.emitter_UV); - 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); + //Emitter Modules + RecipeUtils.addShapedGregtechRecipe( + rodTier7c, rodTier7c, circuitTier7, + cableTier7, circuitTier6, rodTier7c, + circuitTier7, cableTier7, rodTier7c, + RECIPE_CONSTANTS.emitter_LuV); + RecipeUtils.addShapedGregtechRecipe( + rodTier8c, rodTier8c, circuitTier8, + cableTier8, circuitTier7, rodTier8c, + circuitTier8, cableTier8, rodTier8c, + RECIPE_CONSTANTS.emitter_ZPM); + RecipeUtils.addShapedGregtechRecipe( + rodTier9c, rodTier9c, circuitTier9, + cableTier9, circuitTier8, rodTier9c, + circuitTier9, cableTier9, rodTier9c, + RECIPE_CONSTANTS.emitter_UV); + RecipeUtils.addShapedGregtechRecipe( + rodTier10c, rodTier10c, circuitTier10, + cableTier10, circuitTier9, rodTier10c, + circuitTier10, cableTier10, rodTier10c, + RECIPE_CONSTANTS.emitter_MAX); - // Field Generator Modules - RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.wireTier7, RECIPES_MachineComponents.circuitTier7, - RECIPES_MachineComponents.wireTier7, RECIPES_MachineComponents.circuitTier7, - RECIPES_MachineComponents.circuitTier6, RECIPES_MachineComponents.circuitTier7, - RECIPES_MachineComponents.wireTier7, RECIPES_MachineComponents.circuitTier7, - RECIPES_MachineComponents.wireTier7, RECIPE_CONSTANTS.fieldGenerator_LuV); - RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.wireTier8, RECIPES_MachineComponents.circuitTier8, - RECIPES_MachineComponents.wireTier8, RECIPES_MachineComponents.circuitTier8, - RECIPES_MachineComponents.circuitTier7, RECIPES_MachineComponents.circuitTier8, - RECIPES_MachineComponents.wireTier8, RECIPES_MachineComponents.circuitTier8, - RECIPES_MachineComponents.wireTier8, RECIPE_CONSTANTS.fieldGenerator_ZPM); - RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.wireTier9, RECIPES_MachineComponents.circuitTier9, - RECIPES_MachineComponents.wireTier9, RECIPES_MachineComponents.circuitTier9, - RECIPES_MachineComponents.circuitTier8, RECIPES_MachineComponents.circuitTier9, - RECIPES_MachineComponents.wireTier9, RECIPES_MachineComponents.circuitTier9, - RECIPES_MachineComponents.wireTier9, RECIPE_CONSTANTS.fieldGenerator_UV); - 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, + //Field Generator Modules + RecipeUtils.addShapedGregtechRecipe( + wireTier7, circuitTier7, wireTier7, + circuitTier7, circuitTier6, circuitTier7, + wireTier7, circuitTier7, wireTier7, + RECIPE_CONSTANTS.fieldGenerator_LuV); + RecipeUtils.addShapedGregtechRecipe( + wireTier8, circuitTier8, wireTier8, + circuitTier8, circuitTier7, circuitTier8, + wireTier8, circuitTier8, wireTier8, + RECIPE_CONSTANTS.fieldGenerator_ZPM); + RecipeUtils.addShapedGregtechRecipe( + wireTier9, circuitTier9, wireTier9, + circuitTier9, circuitTier8, circuitTier9, + wireTier9, circuitTier9, wireTier9, + RECIPE_CONSTANTS.fieldGenerator_UV); + RecipeUtils.addShapedGregtechRecipe( + wireTier10, circuitTier10, wireTier10, + circuitTier10, circuitTier9, circuitTier10, + wireTier10, circuitTier10, wireTier10, RECIPE_CONSTANTS.fieldGenerator_MAX); - // Sensor Modules - RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.plateTier7, null, - RECIPES_MachineComponents.circuitTier6, RECIPES_MachineComponents.plateTier7, - RECIPES_MachineComponents.rodTier7c, null, RECIPES_MachineComponents.circuitTier7, - RECIPES_MachineComponents.plateTier7, RECIPES_MachineComponents.plateTier7, + //Sensor Modules + RecipeUtils.addShapedGregtechRecipe( + plateTier7, null, circuitTier6, + plateTier7, rodTier7c, null, + circuitTier7, plateTier7, plateTier7, RECIPE_CONSTANTS.sensor_LuV); - RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.plateTier8, null, - RECIPES_MachineComponents.circuitTier7, RECIPES_MachineComponents.plateTier8, - RECIPES_MachineComponents.rodTier8c, null, RECIPES_MachineComponents.circuitTier8, - RECIPES_MachineComponents.plateTier8, RECIPES_MachineComponents.plateTier8, + RecipeUtils.addShapedGregtechRecipe( + plateTier8, null, circuitTier7, + plateTier8, rodTier8c, null, + circuitTier8, plateTier8, plateTier8, RECIPE_CONSTANTS.sensor_ZPM); - RecipeUtils.addShapedGregtechRecipe(RECIPES_MachineComponents.plateTier9, null, - RECIPES_MachineComponents.circuitTier8, RECIPES_MachineComponents.plateTier9, - RECIPES_MachineComponents.rodTier9c, null, RECIPES_MachineComponents.circuitTier9, - RECIPES_MachineComponents.plateTier9, RECIPES_MachineComponents.plateTier9, RECIPE_CONSTANTS.sensor_UV); - 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, + RecipeUtils.addShapedGregtechRecipe( + plateTier9, null, circuitTier8, + plateTier9, rodTier9c, null, + circuitTier9, plateTier9, plateTier9, + RECIPE_CONSTANTS.sensor_UV); + RecipeUtils.addShapedGregtechRecipe( + plateTier10, null, circuitTier9, + plateTier10, rodTier10c, null, + circuitTier10, plateTier10, plateTier10, RECIPE_CONSTANTS.sensor_MAX); Utils.LOG_INFO("Done loading recipes for the Various machine components."); + } + + private static void onlyMaxComponents(){ + RecipeUtils.addShapedGregtechRecipe( + cableTier10, wireTier10, rodTier10a, + wireTier10, rodTier10b, wireTier10, + rodTier10a, wireTier10, cableTier10, + RECIPE_CONSTANTS.electricMotor_MAX); + RecipeUtils.addShapedGregtechRecipe( + cableTier10, rotorTier10, itemRubberRing, + craftingToolScrewdriver, pipeTier10, craftingToolWrench, + itemRubberRing, RECIPE_CONSTANTS.electricMotor_MAX, cableTier10, + RECIPE_CONSTANTS.electricPump_MAX); + RecipeUtils.addShapedGregtechRecipe( + plateTier10, plateTier10, plateTier10, + cableTier10, rodTier10a, rodTier10a, + cableTier10, RECIPE_CONSTANTS.electricMotor_MAX, smallGearTier10, + RECIPE_CONSTANTS.electricPiston_MAX); + RecipeUtils.addShapedGregtechRecipe( + cableTier10, cableTier10, cableTier10, + RECIPE_CONSTANTS.electricMotor_MAX, rodTier10a, RECIPE_CONSTANTS.electricMotor_MAX, + RECIPE_CONSTANTS.electricPiston_MAX, circuitTier10, rodTier10a, + RECIPE_CONSTANTS.robotArm_MAX); + RecipeUtils.addShapedGregtechRecipe( + plateRubber, plateRubber, plateRubber, + RECIPE_CONSTANTS.electricMotor_MAX, cableTier10, RECIPE_CONSTANTS.electricMotor_MAX, + plateRubber, plateRubber, plateRubber, + RECIPE_CONSTANTS.conveyorModule_MAX); + RecipeUtils.addShapedGregtechRecipe( + rodTier10c, rodTier10c, circuitTier10, + cableTier10, circuitTier9, rodTier10c, + circuitTier10, cableTier10, rodTier10c, + RECIPE_CONSTANTS.emitter_MAX); + RecipeUtils.addShapedGregtechRecipe( + wireTier10, circuitTier10, wireTier10, + circuitTier10, circuitTier9, circuitTier10, + wireTier10, circuitTier10, wireTier10, + RECIPE_CONSTANTS.fieldGenerator_MAX); + RecipeUtils.addShapedGregtechRecipe( + plateTier10, null, circuitTier9, + plateTier10, rodTier10c, null, + circuitTier10, plateTier10, plateTier10, + RECIPE_CONSTANTS.sensor_MAX); + } + + 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 (Materials tMat : Materials.values()) { + if ((tMat.mStandardMoltenFluid != null) && (tMat.contains(SubTag.SOLDERING_MATERIAL))) { + int tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD) ? 1 : tMat.contains(SubTag.SOLDERING_MATERIAL_BAD) ? 4 : 2; + GT_Values.RA.addAssemblerRecipe(GregtechItemList.Circuit_Board_IV.get(1L, new Object[0]), GregtechItemList.Circuit_Parts_IV.get(1L, new Object[0]), tMat.getMolten(144L * tMultiplier / 4L), GregtechItemList.Circuit_IV.get(1L, new Object[0]), 32, 512); + GT_Values.RA.addAssemblerRecipe(GregtechItemList.Circuit_Board_LuV.get(1L, new Object[0]), GregtechItemList.Circuit_Parts_LuV.get(1L, new Object[0]), tMat.getMolten(144L * tMultiplier / 4L), GregtechItemList.Circuit_LuV.get(1L, new Object[0]), 64, 1024); + GT_Values.RA.addAssemblerRecipe(GregtechItemList.Circuit_Board_ZPM.get(1L, new Object[0]), GregtechItemList.Circuit_Parts_ZPM.get(1L, new Object[0]), tMat.getMolten(144L * tMultiplier / 4L), GregtechItemList.Circuit_ZPM.get(1L, new Object[0]), 96, 2048); + + } + } } } diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 83ecd14d46..c8aa454e9a 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -13,635 +13,682 @@ import net.minecraft.item.ItemStack; public class RECIPES_Machines { - // Outputs - // static ItemStack RECIPE_BufferCore_ULV = new - // ItemStack(GregtechEnergyBuffer.itemBufferCore); - static ItemStack RECIPE_SteamCondenser = GregtechItemList.Condensor_MAX.get(1); - static ItemStack RECIPE_IronBlastFurnace = GregtechItemList.Machine_Iron_BlastFurnace - .get(1); - static ItemStack RECIPE_IronPlatedBricks = GregtechItemList.Casing_IronPlatedBricks - .get(1); - static ItemStack RECIPE_Buffer_ULV = GregtechItemList.Energy_Buffer_1by1_ULV - .get(1); - static ItemStack RECIPE_Buffer_LV = GregtechItemList.Energy_Buffer_1by1_LV.get(1); - static ItemStack RECIPE_Buffer_MV = GregtechItemList.Energy_Buffer_1by1_MV.get(1); - static ItemStack RECIPE_Buffer_HV = GregtechItemList.Energy_Buffer_1by1_HV.get(1); - static ItemStack RECIPE_Buffer_EV = GregtechItemList.Energy_Buffer_1by1_EV.get(1); - static ItemStack RECIPE_Buffer_IV = GregtechItemList.Energy_Buffer_1by1_IV.get(1); - static ItemStack RECIPE_Buffer_LuV = GregtechItemList.Energy_Buffer_1by1_LuV - .get(1); - static ItemStack RECIPE_Buffer_ZPM = GregtechItemList.Energy_Buffer_1by1_ZPM - .get(1); - static ItemStack RECIPE_Buffer_UV = GregtechItemList.Energy_Buffer_1by1_UV.get(1); - static ItemStack RECIPE_Buffer_MAX = GregtechItemList.Energy_Buffer_1by1_MAX - .get(1); - // Industrial Centrifuge - static ItemStack RECIPE_IndustrialCentrifugeController = GregtechItemList.Industrial_Centrifuge.get(1); - static ItemStack RECIPE_IndustrialCentrifugeCasing = GregtechItemList.Casing_Centrifuge1.get(1); - // Industrial Coke Oven - static ItemStack RECIPE_IndustrialCokeOvenController = GregtechItemList.Industrial_CokeOven.get(1); - static ItemStack RECIPE_IndustrialCokeOvenFrame = GregtechItemList.Casing_CokeOven.get(1); - static ItemStack RECIPE_IndustrialCokeOvenCasingA = GregtechItemList.Casing_CokeOven_Coil1.get(1); - static ItemStack RECIPE_IndustrialCokeOvenCasingB = GregtechItemList.Casing_CokeOven_Coil2.get(1); + //Outputs + //static ItemStack RECIPE_BufferCore_ULV = new ItemStack(GregtechEnergyBuffer.itemBufferCore); + static ItemStack RECIPE_SteamCondenser = GregtechItemList.Condensor_MAX.get(1); + static ItemStack RECIPE_IronBlastFurnace = GregtechItemList.Machine_Iron_BlastFurnace.get(1); + static ItemStack RECIPE_IronPlatedBricks = GregtechItemList.Casing_IronPlatedBricks.get(1); + static ItemStack RECIPE_Buffer_ULV = GregtechItemList.Energy_Buffer_1by1_ULV.get(1); + static ItemStack RECIPE_Buffer_LV = GregtechItemList.Energy_Buffer_1by1_LV.get(1); + static ItemStack RECIPE_Buffer_MV = GregtechItemList.Energy_Buffer_1by1_MV.get(1); + static ItemStack RECIPE_Buffer_HV = GregtechItemList.Energy_Buffer_1by1_HV.get(1); + static ItemStack RECIPE_Buffer_EV = GregtechItemList.Energy_Buffer_1by1_EV.get(1); + static ItemStack RECIPE_Buffer_IV = GregtechItemList.Energy_Buffer_1by1_IV.get(1); + static ItemStack RECIPE_Buffer_LuV = GregtechItemList.Energy_Buffer_1by1_LuV.get(1); + static ItemStack RECIPE_Buffer_ZPM = GregtechItemList.Energy_Buffer_1by1_ZPM.get(1); + static ItemStack RECIPE_Buffer_UV = GregtechItemList.Energy_Buffer_1by1_UV.get(1); + static ItemStack RECIPE_Buffer_MAX = GregtechItemList.Energy_Buffer_1by1_MAX.get(1); + //Industrial Centrifuge + static ItemStack RECIPE_IndustrialCentrifugeController = GregtechItemList.Industrial_Centrifuge.get(1); + static ItemStack RECIPE_IndustrialCentrifugeCasing = GregtechItemList.Casing_Centrifuge1.get(1); + //Industrial Coke Oven + static ItemStack RECIPE_IndustrialCokeOvenController = GregtechItemList.Industrial_CokeOven.get(1); + static ItemStack RECIPE_IndustrialCokeOvenFrame = GregtechItemList.Casing_CokeOven.get(1); + static ItemStack RECIPE_IndustrialCokeOvenCasingA = GregtechItemList.Casing_CokeOven_Coil1.get(1); + static ItemStack RECIPE_IndustrialCokeOvenCasingB = GregtechItemList.Casing_CokeOven_Coil2.get(1); // - static ItemStack RECIPE_IndustrialElectrolyzerController = GregtechItemList.Industrial_Electrolyzer - .get(1); - static ItemStack RECIPE_IndustrialElectrolyzerFrame = GregtechItemList.Casing_Electrolyzer.get(1); + static ItemStack RECIPE_IndustrialElectrolyzerController = GregtechItemList.Industrial_Electrolyzer.get(1); + static ItemStack RECIPE_IndustrialElectrolyzerFrame = GregtechItemList.Casing_Electrolyzer.get(1); // - static ItemStack RECIPE_IndustrialMaterialPressController = GregtechItemList.Industrial_PlatePress.get(1); - static ItemStack RECIPE_IndustrialMaterialPressFrame = GregtechItemList.Casing_MaterialPress.get(1); + static ItemStack RECIPE_IndustrialMaterialPressController = GregtechItemList.Industrial_PlatePress.get(1); + static ItemStack RECIPE_IndustrialMaterialPressFrame = GregtechItemList.Casing_MaterialPress.get(1); // - static ItemStack RECIPE_IndustrialMacerationStackController = GregtechItemList.Industrial_MacerationStack - .get(1); - static ItemStack RECIPE_IndustrialMacerationStackFrame = GregtechItemList.Casing_MacerationStack - .get(1); + static ItemStack RECIPE_IndustrialMacerationStackController = GregtechItemList.Industrial_MacerationStack.get(1); + static ItemStack RECIPE_IndustrialMacerationStackFrame = GregtechItemList.Casing_MacerationStack.get(1); // - static ItemStack RECIPE_IndustrialWireFactoryController = GregtechItemList.Industrial_WireFactory - .get(1); - static ItemStack RECIPE_IndustrialWireFactoryFrame = GregtechItemList.Casing_WireFactory.get(1); - // Industrial Coke Oven - static ItemStack RECIPE_IndustrialBlastSmelterController = GregtechItemList.Industrial_AlloyBlastSmelter - .get(1); - static ItemStack RECIPE_IndustrialBlastSmelterFrame = GregtechItemList.Casing_BlastSmelter.get(1); - static ItemStack RECIPE_IndustrialBlastSmelterCoil = GregtechItemList.Casing_Coil_BlastSmelter - .get(1); - - // Buffer Cores - static ItemStack RECIPE_BufferCore_ULV = ItemUtils - .getItemStack("miscutils:item.itemBufferCore1", 1); - static ItemStack RECIPE_BufferCore_LV = ItemUtils - .getItemStack("miscutils:item.itemBufferCore2", 1); - static ItemStack RECIPE_BufferCore_MV = ItemUtils - .getItemStack("miscutils:item.itemBufferCore3", 1); - static ItemStack RECIPE_BufferCore_HV = ItemUtils - .getItemStack("miscutils:item.itemBufferCore4", 1); - static ItemStack RECIPE_BufferCore_EV = ItemUtils - .getItemStack("miscutils:item.itemBufferCore5", 1); - static ItemStack RECIPE_BufferCore_IV = ItemUtils - .getItemStack("miscutils:item.itemBufferCore6", 1); - static ItemStack RECIPE_BufferCore_LuV = ItemUtils - .getItemStack("miscutils:item.itemBufferCore7", 1); - static ItemStack RECIPE_BufferCore_ZPM = ItemUtils - .getItemStack("miscutils:item.itemBufferCore8", 1); - static ItemStack RECIPE_BufferCore_UV = ItemUtils - .getItemStack("miscutils:item.itemBufferCore9", 1); - static ItemStack RECIPE_BufferCore_MAX = ItemUtils - .getItemStack("miscutils:item.itemBufferCore10", 1); - - // Wire - static String wireTier1 = "wireGt08Lead"; - static String wireTier2 = "wireGt08Tin"; - static String wireTier3 = "wireGt08Copper"; - static String wireTier4 = "wireGt08Gold"; - static String wireTier5 = "wireGt08Aluminium"; - static String wireTier6 = "wireGt08Tungsten"; - static String wireTier7 = "wireGt08Naquadah"; - static String wireTier8 = "wireGt08Osmium"; - static String wireTier9 = "wireGt08Superconductor"; - static String wireTier10 = "wireGt16Superconductor"; - - // Wire - static String cableTier1 = "cableGt04Lead"; - static String cableTier2 = "cableGt04Tin"; - static String cableTier3 = "cableGt04Copper"; - static String cableTier4 = "cableGt04Gold"; - static String cableTier5 = "cableGt04Aluminium"; - static String cableTier6 = "cableGt04Tungsten"; - static String cableTier7 = "cableGt04Naquadah"; - static String cableTier8 = "cableGt04Osmium"; - static String cableTier9 = "cableGt04NiobiumTitanium"; - static String cableTier10 = "cableGt08NiobiumTitanium"; - - // Plates - static String plateTier1 = "plateLead"; - static String plateTier2 = "plateTin"; - static String plateTier3 = "plateCopper"; - static String plateTier4 = "plateGold"; - static String plateTier5 = "plateAluminium"; - static String plateTier6 = "plateMaragingSteel250"; - static String plateTier7 = "plateTantalloy61"; - static String plateTier8 = "plateInconel792"; - static String plateTier9 = "plateZeron100"; - static String plateTier10 = "plateNaquadahEnriched"; - static String plateTier11 = "plateNeutronium"; - - // rods - static String rodTier1 = "stickLead"; - static String rodTier2 = "stickTin"; - static String rodTier3 = "stickCopper"; - static String rodTier4 = "stickGold"; - static String rodTier5 = "stickAluminium"; - static String rodTier6 = "stickMaragingSteel250"; - static String rodTier7 = "stickTantalloy61"; - static String rodTier8 = "stickInconel792"; - static String rodTier9 = "stickZeron100"; - static String rodTier10 = "stickNaquadahEnriched"; - static String rodTier11 = "stickNeutronium"; - - static String pipeTier1 = "pipeHuge" + "Potin"; - static String pipeTier2 = "pipeHuge" + "Steel"; - static String pipeTier3 = "pipeHuge" + "StainlessSteel"; - static String pipeTier4 = "pipeHuge" + "Titanium"; - static String pipeTier5 = "pipeHuge" + "TungstenSteel"; - static String pipeTier6 = "pipeHuge" + "MaragingSteel300"; - static String pipeTier7 = "pipeHuge" + "Tantalloy60"; - static String pipeTier8 = "pipeHuge" + "Tantalloy61"; - static String pipeTier9 = "pipeHuge" + "Inconel792"; - static String pipeTier10 = "pipeHuge" + "HastelloyX"; - static String pipeTier11 = "pipeHuge" + "Europium"; - - // Machine Casings - static ItemStack machineCasing_ULV; - static ItemStack machineCasing_LV; - static ItemStack machineCasing_MV; - static ItemStack machineCasing_HV; - static ItemStack machineCasing_EV; - static ItemStack machineCasing_IV; - static ItemStack machineCasing_LuV; - static ItemStack machineCasing_ZPM; - static ItemStack machineCasing_UV; - static ItemStack machineCasing_MAX; - - // Gearbox Casings - static ItemStack gearboxCasing_Tier_1; - static ItemStack gearboxCasing_Tier_2; - static ItemStack gearboxCasing_Tier_3; - static ItemStack gearboxCasing_Tier_4; - - // IV MACHINES - public static ItemStack IV_MACHINE_Electrolyzer; - public static ItemStack IV_MACHINE_Centrifuge; - public static ItemStack IV_MACHINE_BendingMachine; - public static ItemStack IV_MACHINE_Wiremill; - public static ItemStack IV_MACHINE_Macerator; - public static ItemStack IV_MACHINE_MassFabricator; - - // Cables - static String cableGt02Electrum = "cableGt02Electrum"; - - // Plates - static String plateElectricalSteel = "plateElectricalSteel"; - static String plateEnergeticAlloy = "plateEnergeticAlloy"; - static String plateCobalt = "plateCobalt"; - static String plateBronze = "plateBronze"; - static String plateSteel = "plateSteel"; - - // Pipes - static String pipeLargeCopper = "pipeLargeCopper"; - static String pipeHugeSteel = "pipeHugeSteel"; - static String pipeHugeStainlessSteel = "pipeHugeStainlessSteel"; - static String pipeHugeTitanium = "pipeHugeTitanium"; - - // Lava Boiler - static ItemStack boiler_Coal; - static ItemStack blockBricks = ItemUtils - .getItemStack("minecraft:brick_block", 1); - - // Batteries - static String batteryBasic = "batteryBasic"; - static String batteryAdvanced = "batteryAdvanced"; - static String batteryElite = "batteryElite"; - static String batteryMaster = "batteryMaster"; - static String batteryUltimate = "batteryUltimate"; - static ItemStack IC2MFE; - static ItemStack IC2MFSU; - - // Circuits - static String circuitPrimitive = "circuitBasic"; - static String circuitTier1 = "circuitGood"; - static String circuitTier2 = "circuitAdvanced"; - static String circuitTier3 = "circuitData"; - static String circuitTier4 = "circuitElite"; - static String circuitTier5 = "circuitMaster"; - static String circuitTier6 = "circuitUltimate"; - static String circuitTier7 = "circuitSymbiotic"; - static String circuitTier8 = "circuitNeutronic"; - static String circuitTier9 = "circuitQuantum"; - - // Machine Components - static ItemStack electricMotor_LV; - static ItemStack electricMotor_MV; - static ItemStack electricMotor_HV; - static ItemStack electricMotor_EV; - static ItemStack electricMotor_IV; - static ItemStack electricPump_LV; - static ItemStack electricPump_MV; - static ItemStack electricPump_HV; - static ItemStack electricPump_EV; - static ItemStack electricPump_IV; - static ItemStack electricPiston_LV; - static ItemStack electricPiston_MV; - static ItemStack electricPiston_HV; - static ItemStack electricPiston_EV; - static ItemStack electricPiston_IV; - static ItemStack robotArm_LV; - static ItemStack robotArm_MV; - static ItemStack robotArm_HV; - static ItemStack robotArm_EV; - static ItemStack robotArm_IV; - static ItemStack conveyorModule_LV; - static ItemStack conveyorModule_MV; - static ItemStack conveyorModule_HV; - static ItemStack conveyorModule_EV; - static ItemStack conveyorModule_IV; - static ItemStack emitter_LV; - static ItemStack emitter_MV; - static ItemStack emitter_HV; - static ItemStack emitter_EV; - static ItemStack emitter_IV; - static ItemStack fieldGenerator_LV; - static ItemStack fieldGenerator_MV; - static ItemStack fieldGenerator_HV; - static ItemStack fieldGenerator_EV; - static ItemStack fieldGenerator_IV; - static ItemStack sensor_LV; - static ItemStack sensor_MV; - static ItemStack sensor_HV; - static ItemStack sensor_EV; - static ItemStack sensor_IV; - - // Misc - static ItemStack INPUT_RCCokeOvenBlock; - static ItemStack INPUT_IECokeOvenBlock; - - // RobotArm, Conveyor, Emitter, Sensor, Field Generator - - private static void initModItems() { - if (LoadedMods.IndustrialCraft2) { - RECIPES_Machines.IC2MFE = ItemUtils.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:blockElectric", - "IC2_MFE", 1, 1); - RECIPES_Machines.IC2MFSU = ItemUtils.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:blockElectric", - "IC2_MFSU", 2, 1); + static ItemStack RECIPE_IndustrialWireFactoryController = GregtechItemList.Industrial_WireFactory.get(1); + static ItemStack RECIPE_IndustrialWireFactoryFrame = GregtechItemList.Casing_WireFactory.get(1); + //Industrial Coke Oven + static ItemStack RECIPE_IndustrialBlastSmelterController = GregtechItemList.Industrial_AlloyBlastSmelter.get(1); + static ItemStack RECIPE_IndustrialBlastSmelterFrame = GregtechItemList.Casing_BlastSmelter.get(1); + static ItemStack RECIPE_IndustrialBlastSmelterCoil = GregtechItemList.Casing_Coil_BlastSmelter.get(1); + + + //Buffer Cores + static ItemStack RECIPE_BufferCore_ULV = ItemUtils.getItemStack("miscutils:item.itemBufferCore1", 1); + static ItemStack RECIPE_BufferCore_LV = ItemUtils.getItemStack("miscutils:item.itemBufferCore2", 1); + static ItemStack RECIPE_BufferCore_MV = ItemUtils.getItemStack("miscutils:item.itemBufferCore3", 1); + static ItemStack RECIPE_BufferCore_HV = ItemUtils.getItemStack("miscutils:item.itemBufferCore4", 1); + static ItemStack RECIPE_BufferCore_EV = ItemUtils.getItemStack("miscutils:item.itemBufferCore5", 1); + static ItemStack RECIPE_BufferCore_IV = ItemUtils.getItemStack("miscutils:item.itemBufferCore6", 1); + static ItemStack RECIPE_BufferCore_LuV = ItemUtils.getItemStack("miscutils:item.itemBufferCore7", 1); + static ItemStack RECIPE_BufferCore_ZPM = ItemUtils.getItemStack("miscutils:item.itemBufferCore8", 1); + static ItemStack RECIPE_BufferCore_UV = ItemUtils.getItemStack("miscutils:item.itemBufferCore9", 1); + static ItemStack RECIPE_BufferCore_MAX = ItemUtils.getItemStack("miscutils:item.itemBufferCore10", 1); + + + //Wire + static String wireTier1 = "wireGt08Lead"; + static String wireTier2 = "wireGt08Tin"; + static String wireTier3 = "wireGt08Copper"; + static String wireTier4 = "wireGt08Gold"; + static String wireTier5 = "wireGt08Aluminium"; + static String wireTier6 = "wireGt08Tungsten"; + static String wireTier7 = "wireGt08Naquadah"; + static String wireTier8 = "wireGt08Osmium"; + static String wireTier9 = "wireGt08Superconductor"; + static String wireTier10 = "wireGt16Superconductor"; + + //Wire + static String cableTier1 = "cableGt04Lead"; + static String cableTier2 = "cableGt04Tin"; + static String cableTier3 = "cableGt04Copper"; + static String cableTier4 = "cableGt04Gold"; + static String cableTier5 = "cableGt04Aluminium"; + static String cableTier6 = "cableGt04Tungsten"; + static String cableTier7 = "cableGt04Naquadah"; + static String cableTier8 = "cableGt04Osmium"; + static String cableTier9 = "cableGt04NiobiumTitanium"; + static String cableTier10 = "cableGt08NiobiumTitanium"; + + + //Plates + static String plateTier1 = "plateLead"; + static String plateTier2 = "plateTin"; + static String plateTier3 = "plateCopper"; + static String plateTier4 = "plateGold"; + static String plateTier5 = "plateAluminium"; + static String plateTier6 = "plateMaragingSteel250"; + static String plateTier7 = "plateTantalloy61"; + static String plateTier8 = "plateInconel792"; + static String plateTier9 = "plateZeron100"; + static String plateTier10 = "plateNaquadahEnriched"; + static String plateTier11 = "plateNeutronium"; + + //rods + static String rodTier1 = "stickLead"; + static String rodTier2 = "stickTin"; + static String rodTier3 = "stickCopper"; + static String rodTier4 = "stickGold"; + static String rodTier5 = "stickAluminium"; + static String rodTier6 = "stickMaragingSteel250"; + static String rodTier7 = "stickTantalloy61"; + static String rodTier8 = "stickInconel792"; + static String rodTier9 = "stickZeron100"; + static String rodTier10 = "stickNaquadahEnriched"; + static String rodTier11 = "stickNeutronium"; + + static String pipeTier1 = "pipeHuge"+"Potin"; + static String pipeTier2 = "pipeHuge"+"Steel"; + static String pipeTier3 = "pipeHuge"+"StainlessSteel"; + static String pipeTier4 = "pipeHuge"+"Titanium"; + static String pipeTier5 = "pipeHuge"+"TungstenSteel"; + static String pipeTier6 = "pipeHuge"+"MaragingSteel300"; + static String pipeTier7 = "pipeHuge"+"Tantalloy60"; + static String pipeTier8 = "pipeHuge"+"Tantalloy61"; + static String pipeTier9 = "pipeHuge"+"Inconel792"; + static String pipeTier10 = "pipeHuge"+"HastelloyX"; + static String pipeTier11 = "pipeHuge"+"Europium"; + + + //Machine Casings + static ItemStack machineCasing_ULV; + static ItemStack machineCasing_LV; + static ItemStack machineCasing_MV; + static ItemStack machineCasing_HV; + static ItemStack machineCasing_EV; + static ItemStack machineCasing_IV; + static ItemStack machineCasing_LuV; + static ItemStack machineCasing_ZPM; + static ItemStack machineCasing_UV; + static ItemStack machineCasing_MAX; + + //Gearbox Casings + static ItemStack gearboxCasing_Tier_1; + static ItemStack gearboxCasing_Tier_2; + static ItemStack gearboxCasing_Tier_3; + static ItemStack gearboxCasing_Tier_4; + + //IV MACHINES + public static ItemStack IV_MACHINE_Electrolyzer; + public static ItemStack IV_MACHINE_Centrifuge; + public static ItemStack IV_MACHINE_BendingMachine; + public static ItemStack IV_MACHINE_Wiremill; + public static ItemStack IV_MACHINE_Macerator; + public static ItemStack IV_MACHINE_MassFabricator; + + + //Cables + static String cableGt02Electrum = "cableGt02Electrum"; + + + //Plates + static String plateElectricalSteel= "plateElectricalSteel"; + static String plateEnergeticAlloy= "plateEnergeticAlloy"; + static String plateCobalt = "plateCobalt"; + static String plateBronze = "plateBronze"; + static String plateSteel = "plateSteel"; + + //Pipes + static String pipeLargeCopper="pipeLargeCopper"; + static String pipeHugeSteel="pipeHugeSteel"; + static String pipeHugeStainlessSteel="pipeHugeStainlessSteel"; + static String pipeHugeTitanium="pipeHugeTitanium"; + + //Lava Boiler + static ItemStack boiler_Coal; + static ItemStack blockBricks = ItemUtils.getItemStack("minecraft:brick_block", 1); + + //Batteries + static String batteryBasic = "batteryBasic"; + static String batteryAdvanced = "batteryAdvanced"; + static String batteryElite = "batteryElite"; + static String batteryMaster = "batteryMaster"; + static String batteryUltimate = "batteryUltimate"; + static ItemStack IC2MFE; + static ItemStack IC2MFSU; + + //Circuits + static String circuitPrimitive = "circuitBasic"; + static String circuitTier1 = "circuitGood"; + static String circuitTier2 = "circuitAdvanced"; + static String circuitTier3 = "circuitData"; + static String circuitTier4 = "circuitElite"; + static String circuitTier5 = "circuitMaster"; + static String circuitTier6 = "circuitUltimate"; + static String circuitTier7 = "circuitSymbiotic"; + static String circuitTier8 = "circuitNeutronic"; + static String circuitTier9 = "circuitQuantum"; + + //Machine Components + static ItemStack electricMotor_LV; + static ItemStack electricMotor_MV; + static ItemStack electricMotor_HV; + static ItemStack electricMotor_EV; + static ItemStack electricMotor_IV; + static ItemStack electricPump_LV; + static ItemStack electricPump_MV; + static ItemStack electricPump_HV; + static ItemStack electricPump_EV; + static ItemStack electricPump_IV; + static ItemStack electricPiston_LV; + static ItemStack electricPiston_MV; + static ItemStack electricPiston_HV; + static ItemStack electricPiston_EV; + static ItemStack electricPiston_IV; + static ItemStack robotArm_LV; + static ItemStack robotArm_MV; + static ItemStack robotArm_HV; + static ItemStack robotArm_EV; + static ItemStack robotArm_IV; + static ItemStack conveyorModule_LV; + static ItemStack conveyorModule_MV; + static ItemStack conveyorModule_HV; + static ItemStack conveyorModule_EV; + static ItemStack conveyorModule_IV; + static ItemStack emitter_LV; + static ItemStack emitter_MV; + static ItemStack emitter_HV; + static ItemStack emitter_EV; + static ItemStack emitter_IV; + static ItemStack fieldGenerator_LV; + static ItemStack fieldGenerator_MV; + static ItemStack fieldGenerator_HV; + static ItemStack fieldGenerator_EV; + static ItemStack fieldGenerator_IV; + static ItemStack sensor_LV; + static ItemStack sensor_MV; + static ItemStack sensor_HV; + static ItemStack sensor_EV; + static ItemStack sensor_IV; + + //Misc + static ItemStack INPUT_RCCokeOvenBlock; + static ItemStack INPUT_IECokeOvenBlock; + + + + //RobotArm, Conveyor, Emitter, Sensor, Field Generator + + + public static final void RECIPES_LOAD(){ + run(); + Utils.LOG_INFO("Loading Recipes for the Various machine blocks."); + } + + private static void run(){ + initModItems(); + } + + private static void initModItems(){ + if (LoadedMods.IndustrialCraft2){ + IC2MFE = ItemUtils.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:blockElectric", "IC2_MFE", 1, 1); + IC2MFSU = ItemUtils.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:blockElectric", "IC2_MFSU", 2, 1); } - if (LoadedMods.Gregtech) { - RECIPES_Shapeless.dustStaballoy = ItemUtils.getItemStackWithMeta(LoadedMods.MiscUtils, - "gregtech:gt.metaitem.01", "Staballoy Dust", 2319, 2); - RECIPES_Machines.machineCasing_ULV = ItemList.Casing_ULV.get(1); - RECIPES_Machines.machineCasing_LV = ItemList.Casing_LV.get(1); - RECIPES_Machines.machineCasing_MV = ItemList.Casing_MV.get(1); - RECIPES_Machines.machineCasing_HV = ItemList.Casing_HV.get(1); - RECIPES_Machines.machineCasing_EV = ItemList.Casing_EV.get(1); - RECIPES_Machines.machineCasing_IV = ItemList.Casing_IV.get(1); - RECIPES_Machines.machineCasing_LuV = ItemList.Casing_LuV.get(1); - RECIPES_Machines.machineCasing_ZPM = ItemList.Casing_ZPM.get(1); - RECIPES_Machines.machineCasing_UV = ItemList.Casing_UV.get(1); - RECIPES_Machines.machineCasing_MAX = ItemList.Casing_MAX.get(1); - - // Gearbox Casings - RECIPES_Machines.gearboxCasing_Tier_1 = ItemList.Casing_Gearbox_Bronze.get(1); - RECIPES_Machines.gearboxCasing_Tier_2 = ItemList.Casing_Gearbox_Steel.get(1); - RECIPES_Machines.gearboxCasing_Tier_3 = ItemList.Casing_Gearbox_Titanium.get(1); - RECIPES_Machines.gearboxCasing_Tier_4 = ItemList.Casing_Gearbox_TungstenSteel.get(1); - - // Lava Boiler - RECIPES_Machines.boiler_Coal = ItemList.Machine_Bronze_Boiler.get(1); - - // Machine Components - RECIPES_Machines.electricMotor_LV = ItemList.Electric_Motor_LV.get(1); - RECIPES_Machines.electricMotor_MV = ItemList.Electric_Motor_MV.get(1); - RECIPES_Machines.electricMotor_HV = ItemList.Electric_Motor_HV.get(1); - RECIPES_Machines.electricMotor_EV = ItemList.Electric_Motor_EV.get(1); - RECIPES_Machines.electricMotor_IV = ItemList.Electric_Motor_IV.get(1); - RECIPES_Machines.electricPump_LV = ItemList.Electric_Pump_LV.get(1); - RECIPES_Machines.electricPump_MV = ItemList.Electric_Pump_MV.get(1); - RECIPES_Machines.electricPump_HV = ItemList.Electric_Pump_HV.get(1); - RECIPES_Machines.electricPump_EV = ItemList.Electric_Pump_EV.get(1); - RECIPES_Machines.electricPump_IV = ItemList.Electric_Pump_IV.get(1); - RECIPES_Machines.electricPiston_LV = ItemList.Electric_Piston_LV.get(1); - RECIPES_Machines.electricPiston_MV = ItemList.Electric_Piston_MV.get(1); - RECIPES_Machines.electricPiston_HV = ItemList.Electric_Piston_HV.get(1); - RECIPES_Machines.electricPiston_EV = ItemList.Electric_Piston_EV.get(1); - RECIPES_Machines.electricPiston_IV = ItemList.Electric_Piston_IV.get(1); - RECIPES_Machines.robotArm_LV = ItemList.Robot_Arm_LV.get(1); - RECIPES_Machines.robotArm_MV = ItemList.Robot_Arm_MV.get(1); - RECIPES_Machines.robotArm_HV = ItemList.Robot_Arm_HV.get(1); - RECIPES_Machines.robotArm_EV = ItemList.Robot_Arm_EV.get(1); - RECIPES_Machines.robotArm_IV = ItemList.Robot_Arm_IV.get(1); - RECIPES_Machines.conveyorModule_LV = ItemList.Conveyor_Module_LV.get(1); - RECIPES_Machines.conveyorModule_MV = ItemList.Conveyor_Module_MV.get(1); - RECIPES_Machines.conveyorModule_HV = ItemList.Conveyor_Module_HV.get(1); - RECIPES_Machines.conveyorModule_EV = ItemList.Conveyor_Module_EV.get(1); - RECIPES_Machines.conveyorModule_IV = ItemList.Conveyor_Module_IV.get(1); - RECIPES_Machines.emitter_LV = ItemList.Emitter_LV.get(1); - RECIPES_Machines.emitter_MV = ItemList.Emitter_MV.get(1); - RECIPES_Machines.emitter_HV = ItemList.Emitter_HV.get(1); - RECIPES_Machines.emitter_EV = ItemList.Emitter_EV.get(1); - RECIPES_Machines.emitter_IV = ItemList.Emitter_IV.get(1); - RECIPES_Machines.fieldGenerator_LV = ItemList.Field_Generator_LV.get(1); - RECIPES_Machines.fieldGenerator_MV = ItemList.Field_Generator_MV.get(1); - RECIPES_Machines.fieldGenerator_HV = ItemList.Field_Generator_HV.get(1); - RECIPES_Machines.fieldGenerator_EV = ItemList.Field_Generator_EV.get(1); - RECIPES_Machines.fieldGenerator_IV = ItemList.Field_Generator_IV.get(1); - RECIPES_Machines.sensor_LV = ItemList.Sensor_LV.get(1); - RECIPES_Machines.sensor_MV = ItemList.Sensor_MV.get(1); - RECIPES_Machines.sensor_HV = ItemList.Sensor_HV.get(1); - RECIPES_Machines.sensor_EV = ItemList.Sensor_EV.get(1); - RECIPES_Machines.sensor_IV = ItemList.Sensor_IV.get(1); - - // IV MACHINES - RECIPES_Machines.IV_MACHINE_Electrolyzer = ItemList.Machine_IV_Electrolyzer.get(1); - RECIPES_Machines.IV_MACHINE_BendingMachine = ItemList.Machine_IV_Bender.get(1); - RECIPES_Machines.IV_MACHINE_Wiremill = ItemList.Machine_IV_Wiremill.get(1); - RECIPES_Machines.IV_MACHINE_Macerator = ItemList.Machine_IV_Macerator.get(1); - RECIPES_Machines.IV_MACHINE_MassFabricator = ItemList.Machine_IV_Massfab.get(1); - RECIPES_Machines.IV_MACHINE_Centrifuge = ItemList.Machine_IV_Centrifuge.get(1); + if (LoadedMods.Gregtech){ + RECIPES_Shapeless.dustStaballoy = ItemUtils.getItemStackWithMeta(LoadedMods.MiscUtils, "gregtech:gt.metaitem.01", "Staballoy Dust", 2319, 2); + machineCasing_ULV = ItemList.Casing_ULV.get(1); + machineCasing_LV = ItemList.Casing_LV.get(1); + machineCasing_MV = ItemList.Casing_MV.get(1); + machineCasing_HV = ItemList.Casing_HV.get(1); + machineCasing_EV = ItemList.Casing_EV.get(1); + machineCasing_IV = ItemList.Casing_IV.get(1); + machineCasing_LuV = ItemList.Casing_LuV.get(1); + machineCasing_ZPM = ItemList.Casing_ZPM.get(1); + machineCasing_UV = ItemList.Casing_UV.get(1); + machineCasing_MAX = ItemList.Casing_MAX.get(1); + + //Gearbox Casings + gearboxCasing_Tier_1 = ItemList.Casing_Gearbox_Bronze.get(1); + gearboxCasing_Tier_2 = ItemList.Casing_Gearbox_Steel.get(1); + gearboxCasing_Tier_3 = ItemList.Casing_Gearbox_Titanium.get(1); + gearboxCasing_Tier_4 = ItemList.Casing_Gearbox_TungstenSteel.get(1); + + //Lava Boiler + boiler_Coal = ItemList.Machine_Bronze_Boiler.get(1); + + //Machine Components + electricMotor_LV = ItemList.Electric_Motor_LV.get(1); + electricMotor_MV = ItemList.Electric_Motor_MV.get(1); + electricMotor_HV = ItemList.Electric_Motor_HV.get(1); + electricMotor_EV = ItemList.Electric_Motor_EV.get(1); + electricMotor_IV = ItemList.Electric_Motor_IV.get(1); + electricPump_LV = ItemList.Electric_Pump_LV.get(1); + electricPump_MV = ItemList.Electric_Pump_MV.get(1); + electricPump_HV = ItemList.Electric_Pump_HV.get(1); + electricPump_EV = ItemList.Electric_Pump_EV.get(1); + electricPump_IV = ItemList.Electric_Pump_IV.get(1); + electricPiston_LV = ItemList.Electric_Piston_LV.get(1); + electricPiston_MV = ItemList.Electric_Piston_MV.get(1); + electricPiston_HV = ItemList.Electric_Piston_HV.get(1); + electricPiston_EV = ItemList.Electric_Piston_EV.get(1); + electricPiston_IV = ItemList.Electric_Piston_IV.get(1); + robotArm_LV = ItemList.Robot_Arm_LV.get(1); + robotArm_MV = ItemList.Robot_Arm_MV.get(1); + robotArm_HV = ItemList.Robot_Arm_HV.get(1); + robotArm_EV = ItemList.Robot_Arm_EV.get(1); + robotArm_IV = ItemList.Robot_Arm_IV.get(1); + conveyorModule_LV = ItemList.Conveyor_Module_LV.get(1); + conveyorModule_MV = ItemList.Conveyor_Module_MV.get(1); + conveyorModule_HV = ItemList.Conveyor_Module_HV.get(1); + conveyorModule_EV = ItemList.Conveyor_Module_EV.get(1); + conveyorModule_IV = ItemList.Conveyor_Module_IV.get(1); + emitter_LV = ItemList.Emitter_LV.get(1); + emitter_MV = ItemList.Emitter_MV.get(1); + emitter_HV = ItemList.Emitter_HV.get(1); + emitter_EV = ItemList.Emitter_EV.get(1); + emitter_IV = ItemList.Emitter_IV.get(1); + fieldGenerator_LV = ItemList.Field_Generator_LV.get(1); + fieldGenerator_MV = ItemList.Field_Generator_MV.get(1); + fieldGenerator_HV = ItemList.Field_Generator_HV.get(1); + fieldGenerator_EV = ItemList.Field_Generator_EV.get(1); + fieldGenerator_IV = ItemList.Field_Generator_IV.get(1); + sensor_LV = ItemList.Sensor_LV.get(1); + sensor_MV = ItemList.Sensor_MV.get(1); + sensor_HV = ItemList.Sensor_HV.get(1); + sensor_EV = ItemList.Sensor_EV.get(1); + sensor_IV = ItemList.Sensor_IV.get(1); + + + //IV MACHINES + IV_MACHINE_Electrolyzer = ItemList.Machine_IV_Electrolyzer.get(1); + IV_MACHINE_BendingMachine= ItemList.Machine_IV_Bender.get(1); + IV_MACHINE_Wiremill= ItemList.Machine_IV_Wiremill.get(1); + IV_MACHINE_Macerator= ItemList.Machine_IV_Macerator.get(1); + IV_MACHINE_MassFabricator= ItemList.Machine_IV_Massfab.get(1); + IV_MACHINE_Centrifuge= ItemList.Machine_IV_Centrifuge.get(1); + } - if (LoadedMods.Railcraft) { - // Misc - RECIPES_Machines.INPUT_RCCokeOvenBlock = ItemUtils.getItemStackWithMeta(LoadedMods.Railcraft, - "Railcraft:machine.alpha", "Coke_Oven_RC", 7, 1); + if(LoadedMods.Railcraft){ + //Misc + INPUT_RCCokeOvenBlock = ItemUtils.getItemStackWithMeta(LoadedMods.Railcraft, "Railcraft:machine.alpha", "Coke_Oven_RC", 7, 1); } - if (LoadedMods.ImmersiveEngineering) { - // Misc - RECIPES_Machines.INPUT_IECokeOvenBlock = ItemUtils.getItemStackWithMeta(LoadedMods.ImmersiveEngineering, - "ImmersiveEngineering:stoneDecoration", "Coke_Oven_IE", 1, 1); + if(LoadedMods.ImmersiveEngineering){ + //Misc + INPUT_IECokeOvenBlock = ItemUtils.getItemStackWithMeta(LoadedMods.ImmersiveEngineering, "ImmersiveEngineering:stoneDecoration", "Coke_Oven_IE", 1, 1); } - RECIPES_Machines.runModRecipes(); - } + runModRecipes(); + } - public static final void RECIPES_LOAD() { - RECIPES_Machines.run(); - Utils.LOG_INFO("Loading Recipes for the Various machine blocks."); - } - - private static void run() { - RECIPES_Machines.initModItems(); - } + private static void runModRecipes(){ + if (LoadedMods.Gregtech){ - private static void runModRecipes() { - if (LoadedMods.Gregtech) { - - RecipeUtils.addShapedGregtechRecipe(ItemList.Electric_Piston_EV, - GregtechOrePrefixes.circuit.get(Materials.Ultimate), ItemList.Electric_Piston_EV, - ItemList.Electric_Motor_EV, RECIPES_Machines.machineCasing_EV, ItemList.Electric_Motor_EV, + RecipeUtils.addShapedGregtechRecipe( + ItemList.Electric_Piston_EV, GregtechOrePrefixes.circuit.get(Materials.Ultimate), ItemList.Electric_Piston_EV, + ItemList.Electric_Motor_EV, machineCasing_EV, ItemList.Electric_Motor_EV, "gearGtTitanium", "cableGt02Aluminium", "gearGtTitanium", ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 793, 1)); - RecipeUtils.addShapedGregtechRecipe(ItemList.Electric_Piston_IV, - GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic), ItemList.Electric_Piston_IV, - ItemList.Electric_Motor_IV, RECIPES_Machines.machineCasing_IV, ItemList.Electric_Motor_IV, + RecipeUtils.addShapedGregtechRecipe( + ItemList.Electric_Piston_IV, GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic), ItemList.Electric_Piston_IV, + ItemList.Electric_Motor_IV, machineCasing_IV, ItemList.Electric_Motor_IV, "gearGtTungstenSteel", "cableGt02Platinum", "gearGtTungstenSteel", ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 794, 1)); - RecipeUtils.addShapedGregtechRecipe(RECIPE_CONSTANTS.electricPiston_LuV, - GregtechOrePrefixes.circuit.get(GT_Materials.Neutronic), RECIPE_CONSTANTS.electricPiston_LuV, - RECIPE_CONSTANTS.electricMotor_LuV, RECIPES_Machines.machineCasing_LuV, - RECIPE_CONSTANTS.electricMotor_LuV, "gearGtChrome", "cableGt02Tungsten", "gearGtChrome", + RecipeUtils.addShapedGregtechRecipe( + RECIPE_CONSTANTS.electricPiston_LuV, GregtechOrePrefixes.circuit.get(GT_Materials.Neutronic), RECIPE_CONSTANTS.electricPiston_LuV, + RECIPE_CONSTANTS.electricMotor_LuV, machineCasing_LuV, RECIPE_CONSTANTS.electricMotor_LuV, + "gearGtChrome", "cableGt02Tungsten", "gearGtChrome", ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 795, 1)); - // Buffer Core - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.plateTier1, RECIPES_Machines.cableTier1, - RECIPES_Machines.plateTier1, RECIPES_Machines.circuitPrimitive, RECIPES_Machines.IC2MFE, - RECIPES_Machines.circuitPrimitive, RECIPES_Machines.plateTier1, RECIPES_Machines.cableTier1, - RECIPES_Machines.plateTier1, RECIPES_Machines.RECIPE_BufferCore_ULV); - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.plateTier2, RECIPES_Machines.cableTier2, - RECIPES_Machines.plateTier2, RECIPES_Machines.circuitTier1, RECIPES_Machines.IC2MFE, - RECIPES_Machines.circuitTier1, RECIPES_Machines.plateTier2, RECIPES_Machines.cableTier2, - RECIPES_Machines.plateTier2, RECIPES_Machines.RECIPE_BufferCore_LV); - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.plateTier3, RECIPES_Machines.cableTier3, - RECIPES_Machines.plateTier3, RECIPES_Machines.RECIPE_BufferCore_LV, RECIPES_Machines.circuitTier2, - RECIPES_Machines.RECIPE_BufferCore_LV, RECIPES_Machines.plateTier3, RECIPES_Machines.cableTier3, - RECIPES_Machines.plateTier3, RECIPES_Machines.RECIPE_BufferCore_MV); - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.plateTier4, RECIPES_Machines.cableTier4, - RECIPES_Machines.plateTier4, RECIPES_Machines.RECIPE_BufferCore_MV, RECIPES_Machines.circuitTier3, - RECIPES_Machines.RECIPE_BufferCore_MV, RECIPES_Machines.plateTier4, RECIPES_Machines.cableTier4, - RECIPES_Machines.plateTier4, RECIPES_Machines.RECIPE_BufferCore_HV); - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.plateTier5, RECIPES_Machines.cableTier5, - RECIPES_Machines.plateTier5, RECIPES_Machines.RECIPE_BufferCore_HV, RECIPES_Machines.circuitTier4, - RECIPES_Machines.RECIPE_BufferCore_HV, RECIPES_Machines.plateTier5, RECIPES_Machines.cableTier5, - RECIPES_Machines.plateTier5, RECIPES_Machines.RECIPE_BufferCore_EV); - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.plateTier6, RECIPES_Machines.cableTier6, - RECIPES_Machines.plateTier6, RECIPES_Machines.RECIPE_BufferCore_EV, RECIPES_Machines.circuitTier5, - RECIPES_Machines.RECIPE_BufferCore_EV, RECIPES_Machines.plateTier6, RECIPES_Machines.cableTier6, - RECIPES_Machines.plateTier6, RECIPES_Machines.RECIPE_BufferCore_IV); - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.plateTier7, RECIPES_Machines.cableTier7, - RECIPES_Machines.plateTier7, RECIPES_Machines.RECIPE_BufferCore_IV, RECIPES_Machines.circuitTier6, - RECIPES_Machines.RECIPE_BufferCore_IV, RECIPES_Machines.plateTier7, RECIPES_Machines.cableTier7, - RECIPES_Machines.plateTier7, RECIPES_Machines.RECIPE_BufferCore_LuV); - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.plateTier8, RECIPES_Machines.cableTier8, - RECIPES_Machines.plateTier8, RECIPES_Machines.RECIPE_BufferCore_LuV, RECIPES_Machines.circuitTier7, - RECIPES_Machines.RECIPE_BufferCore_LuV, RECIPES_Machines.plateTier8, RECIPES_Machines.cableTier8, - RECIPES_Machines.plateTier8, RECIPES_Machines.RECIPE_BufferCore_ZPM); - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.plateTier9, RECIPES_Machines.cableTier9, - RECIPES_Machines.plateTier9, RECIPES_Machines.RECIPE_BufferCore_ZPM, RECIPES_Machines.circuitTier8, - RECIPES_Machines.RECIPE_BufferCore_ZPM, RECIPES_Machines.plateTier9, RECIPES_Machines.cableTier9, - RECIPES_Machines.plateTier9, RECIPES_Machines.RECIPE_BufferCore_UV); - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.plateTier10, RECIPES_Machines.cableTier10, - RECIPES_Machines.plateTier10, RECIPES_Machines.RECIPE_BufferCore_UV, RECIPES_Machines.circuitTier9, - RECIPES_Machines.RECIPE_BufferCore_UV, RECIPES_Machines.plateTier10, RECIPES_Machines.cableTier10, - RECIPES_Machines.plateTier10, RECIPES_Machines.RECIPE_BufferCore_MAX); - - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.wireTier1, RECIPES_Machines.RECIPE_BufferCore_ULV, - RECIPES_Machines.wireTier1, RECIPES_Machines.wireTier1, RECIPES_Machines.machineCasing_ULV, - RECIPES_Machines.wireTier1, RECIPES_Machines.circuitPrimitive, RECIPES_Machines.circuitTier1, - RECIPES_Machines.circuitPrimitive, RECIPES_Machines.RECIPE_Buffer_ULV); - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.wireTier2, RECIPES_Machines.RECIPE_BufferCore_LV, - RECIPES_Machines.wireTier2, RECIPES_Machines.wireTier2, RECIPES_Machines.machineCasing_LV, - RECIPES_Machines.wireTier2, RECIPES_Machines.circuitTier1, RECIPES_Machines.RECIPE_BufferCore_LV, - RECIPES_Machines.circuitTier1, RECIPES_Machines.RECIPE_Buffer_LV); - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.wireTier3, RECIPES_Machines.RECIPE_BufferCore_MV, - RECIPES_Machines.wireTier3, RECIPES_Machines.wireTier3, RECIPES_Machines.machineCasing_MV, - RECIPES_Machines.wireTier3, RECIPES_Machines.circuitTier2, RECIPES_Machines.RECIPE_BufferCore_MV, - RECIPES_Machines.circuitTier2, RECIPES_Machines.RECIPE_Buffer_MV); - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.wireTier4, RECIPES_Machines.RECIPE_BufferCore_HV, - RECIPES_Machines.wireTier4, RECIPES_Machines.wireTier4, RECIPES_Machines.machineCasing_HV, - RECIPES_Machines.wireTier4, RECIPES_Machines.circuitTier3, RECIPES_Machines.RECIPE_BufferCore_HV, - RECIPES_Machines.circuitTier3, RECIPES_Machines.RECIPE_Buffer_HV); - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.wireTier5, RECIPES_Machines.RECIPE_BufferCore_EV, - RECIPES_Machines.wireTier5, RECIPES_Machines.wireTier5, RECIPES_Machines.machineCasing_EV, - RECIPES_Machines.wireTier5, RECIPES_Machines.circuitTier4, RECIPES_Machines.RECIPE_BufferCore_EV, - RECIPES_Machines.circuitTier4, RECIPES_Machines.RECIPE_Buffer_EV); - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.wireTier6, RECIPES_Machines.RECIPE_BufferCore_IV, - RECIPES_Machines.wireTier6, RECIPES_Machines.wireTier6, RECIPES_Machines.machineCasing_IV, - RECIPES_Machines.wireTier6, RECIPES_Machines.circuitTier5, RECIPES_Machines.RECIPE_BufferCore_IV, - RECIPES_Machines.circuitTier5, RECIPES_Machines.RECIPE_Buffer_IV); - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.wireTier7, RECIPES_Machines.RECIPE_BufferCore_LuV, - RECIPES_Machines.wireTier7, RECIPES_Machines.wireTier7, RECIPES_Machines.machineCasing_LuV, - RECIPES_Machines.wireTier7, RECIPES_Machines.circuitTier6, RECIPES_Machines.RECIPE_BufferCore_LuV, - RECIPES_Machines.circuitTier6, RECIPES_Machines.RECIPE_Buffer_LuV); - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.wireTier8, RECIPES_Machines.RECIPE_BufferCore_ZPM, - RECIPES_Machines.wireTier8, RECIPES_Machines.wireTier8, RECIPES_Machines.machineCasing_ZPM, - RECIPES_Machines.wireTier8, RECIPES_Machines.circuitTier7, RECIPES_Machines.RECIPE_BufferCore_ZPM, - RECIPES_Machines.circuitTier7, RECIPES_Machines.RECIPE_Buffer_ZPM); - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.wireTier9, RECIPES_Machines.RECIPE_BufferCore_UV, - RECIPES_Machines.wireTier9, RECIPES_Machines.wireTier9, RECIPES_Machines.machineCasing_UV, - RECIPES_Machines.wireTier9, RECIPES_Machines.circuitTier8, RECIPES_Machines.RECIPE_BufferCore_UV, - RECIPES_Machines.circuitTier8, RECIPES_Machines.RECIPE_Buffer_UV); - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.plateTier11, RECIPES_Machines.RECIPE_BufferCore_MAX, - RECIPES_Machines.plateTier11, RECIPES_Machines.wireTier10, RECIPES_Machines.machineCasing_MAX, - RECIPES_Machines.wireTier10, RECIPES_Machines.circuitTier9, RECIPES_Machines.RECIPE_BufferCore_MAX, - RECIPES_Machines.circuitTier9, RECIPES_Machines.RECIPE_Buffer_MAX); - - // Steam Condenser - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.pipeLargeCopper, RECIPES_Machines.pipeHugeSteel, - RECIPES_Machines.pipeLargeCopper, RECIPES_Machines.plateEnergeticAlloy, - RECIPES_Machines.electricPump_HV, RECIPES_Machines.plateEnergeticAlloy, - RECIPES_Machines.plateEnergeticAlloy, RECIPES_Machines.pipeLargeCopper, - RECIPES_Machines.plateEnergeticAlloy, RECIPES_Machines.RECIPE_SteamCondenser); - - // Iron BF - RecipeUtils.addShapedGregtechRecipe("plateDoubleAnyIron", "craftingFurnace", "plateDoubleAnyIron", - RECIPES_Machines.boiler_Coal, RECIPES_Machines.machineCasing_ULV, RECIPES_Machines.boiler_Coal, - "plateDoubleAnyIron", "bucketLava", "plateDoubleAnyIron", RECIPES_Machines.RECIPE_IronBlastFurnace); - // Iron plated Bricks - RecipeUtils.addShapedGregtechRecipe("plateAnyIron", RECIPES_Tools.craftingToolHardHammer, "plateAnyIron", - "plateAnyIron", RECIPES_Machines.blockBricks, "plateAnyIron", "plateAnyIron", - RECIPES_Tools.craftingToolWrench, "plateAnyIron", RECIPES_Machines.RECIPE_IronPlatedBricks); - - /* - * //Electrolyzer Frame Casing UtilsRecipe.addShapedGregtechRecipe( - * "platePotin", "stickLongChrome", "platePotin", "stickLongPotin", - * "frameGtPotin", "stickLongPotin", "platePotin", "stickLongPotin", - * "platePotin", RECIPE_IndustrialCentrifugeCasing); //Industrial - * Electrolyzer UtilsRecipe.addShapedGregtechRecipe( - * "plateStellite", circuitTier6, "plateStellite", machineCasing_EV, - * IV_MACHINE_Electrolyzer, machineCasing_EV, "plateStellite", - * "rotorStellite", "plateStellite", - * RECIPE_IndustrialCentrifugeController); - */ - - // Industrial Centrifuge - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.circuitTier6, RECIPES_Machines.pipeHugeStainlessSteel, - RECIPES_Machines.circuitTier6, RECIPES_Machines.plateTier6, RECIPES_Machines.IV_MACHINE_Centrifuge, - RECIPES_Machines.plateTier6, RECIPES_Machines.plateTier8, RECIPES_Machines.machineCasing_IV, - RECIPES_Machines.plateTier8, RECIPES_Machines.RECIPE_IndustrialCentrifugeController); - // Centrifuge Casing - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.plateTier6, "stickTumbaga", - RECIPES_Machines.plateTier6, RECIPES_Machines.plateTier8, "stickTumbaga", - RECIPES_Machines.plateTier8, RECIPES_Machines.plateTier6, "stickTumbaga", - RECIPES_Machines.plateTier6, RECIPES_Machines.RECIPE_IndustrialCentrifugeCasing); - - if (LoadedMods.Railcraft) { - // Industrial Coke Oven - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.plateCobalt, RECIPES_Machines.circuitTier4, - RECIPES_Machines.plateCobalt, RECIPES_Machines.machineCasing_HV, - RECIPES_Machines.INPUT_RCCokeOvenBlock, RECIPES_Machines.machineCasing_HV, - RECIPES_Machines.plateCobalt, RECIPES_Machines.circuitTier5, RECIPES_Machines.plateCobalt, - RECIPES_Machines.RECIPE_IndustrialCokeOvenController); + //Buffer Core + RecipeUtils.addShapedGregtechRecipe( + plateTier1, cableTier1, plateTier1, + circuitPrimitive, IC2MFE, circuitPrimitive, + plateTier1, cableTier1, plateTier1, + RECIPE_BufferCore_ULV); + RecipeUtils.addShapedGregtechRecipe( + plateTier2, cableTier2, plateTier2, + circuitTier1, IC2MFE, circuitTier1, + plateTier2, cableTier2, plateTier2, + RECIPE_BufferCore_LV); + RecipeUtils.addShapedGregtechRecipe( + plateTier3, cableTier3, plateTier3, + RECIPE_BufferCore_LV, circuitTier2, RECIPE_BufferCore_LV, + plateTier3, cableTier3, plateTier3, + RECIPE_BufferCore_MV); + RecipeUtils.addShapedGregtechRecipe( + plateTier4, cableTier4, plateTier4, + RECIPE_BufferCore_MV, circuitTier3, RECIPE_BufferCore_MV, + plateTier4, cableTier4, plateTier4, + RECIPE_BufferCore_HV); + RecipeUtils.addShapedGregtechRecipe( + plateTier5, cableTier5, plateTier5, + RECIPE_BufferCore_HV, circuitTier4, RECIPE_BufferCore_HV, + plateTier5, cableTier5, plateTier5, + RECIPE_BufferCore_EV); + RecipeUtils.addShapedGregtechRecipe( + plateTier6, cableTier6, plateTier6, + RECIPE_BufferCore_EV, circuitTier5, RECIPE_BufferCore_EV, + plateTier6, cableTier6, plateTier6, + RECIPE_BufferCore_IV); + RecipeUtils.addShapedGregtechRecipe( + plateTier7, cableTier7, plateTier7, + RECIPE_BufferCore_IV, circuitTier6, RECIPE_BufferCore_IV, + plateTier7, cableTier7, plateTier7, + RECIPE_BufferCore_LuV); + RecipeUtils.addShapedGregtechRecipe( + plateTier8, cableTier8, plateTier8, + RECIPE_BufferCore_LuV, circuitTier7, RECIPE_BufferCore_LuV, + plateTier8, cableTier8, plateTier8, + RECIPE_BufferCore_ZPM); + RecipeUtils.addShapedGregtechRecipe( + plateTier9, cableTier9, plateTier9, + RECIPE_BufferCore_ZPM, circuitTier8, RECIPE_BufferCore_ZPM, + plateTier9, cableTier9, plateTier9, + RECIPE_BufferCore_UV); + RecipeUtils.addShapedGregtechRecipe( + plateTier10, cableTier10, plateTier10, + RECIPE_BufferCore_UV, circuitTier9, RECIPE_BufferCore_UV, + plateTier10, cableTier10, plateTier10, + RECIPE_BufferCore_MAX); + + + RecipeUtils.addShapedGregtechRecipe( + wireTier1, RECIPE_BufferCore_ULV, wireTier1, + wireTier1, machineCasing_ULV, wireTier1, + circuitPrimitive, circuitTier1, circuitPrimitive, + RECIPE_Buffer_ULV); + RecipeUtils.addShapedGregtechRecipe( + wireTier2, RECIPE_BufferCore_LV, wireTier2, + wireTier2, machineCasing_LV, wireTier2, + circuitTier1, RECIPE_BufferCore_LV, circuitTier1, + RECIPE_Buffer_LV); + RecipeUtils.addShapedGregtechRecipe( + wireTier3, RECIPE_BufferCore_MV, wireTier3, + wireTier3, machineCasing_MV, wireTier3, + circuitTier2, RECIPE_BufferCore_MV, circuitTier2, + RECIPE_Buffer_MV); + RecipeUtils.addShapedGregtechRecipe( + wireTier4, RECIPE_BufferCore_HV, wireTier4, + wireTier4, machineCasing_HV, wireTier4, + circuitTier3, RECIPE_BufferCore_HV, circuitTier3, + RECIPE_Buffer_HV); + RecipeUtils.addShapedGregtechRecipe( + wireTier5, RECIPE_BufferCore_EV, wireTier5, + wireTier5, machineCasing_EV, wireTier5, + circuitTier4, RECIPE_BufferCore_EV, circuitTier4, + RECIPE_Buffer_EV); + RecipeUtils.addShapedGregtechRecipe( + wireTier6, RECIPE_BufferCore_IV, wireTier6, + wireTier6, machineCasing_IV, wireTier6, + circuitTier5, RECIPE_BufferCore_IV, circuitTier5, + RECIPE_Buffer_IV); + RecipeUtils.addShapedGregtechRecipe( + wireTier7, RECIPE_BufferCore_LuV, wireTier7, + wireTier7, machineCasing_LuV, wireTier7, + circuitTier6, RECIPE_BufferCore_LuV, circuitTier6, + RECIPE_Buffer_LuV); + RecipeUtils.addShapedGregtechRecipe( + wireTier8, RECIPE_BufferCore_ZPM, wireTier8, + wireTier8, machineCasing_ZPM, wireTier8, + circuitTier7, RECIPE_BufferCore_ZPM, circuitTier7, + RECIPE_Buffer_ZPM); + RecipeUtils.addShapedGregtechRecipe( + wireTier9, RECIPE_BufferCore_UV, wireTier9, + wireTier9, machineCasing_UV, wireTier9, + circuitTier8, RECIPE_BufferCore_UV, circuitTier8, + RECIPE_Buffer_UV); + RecipeUtils.addShapedGregtechRecipe( + plateTier11, RECIPE_BufferCore_MAX, plateTier11, + wireTier10, machineCasing_MAX, wireTier10, + circuitTier9, RECIPE_BufferCore_MAX, circuitTier9, + RECIPE_Buffer_MAX); + + //Steam Condenser + RecipeUtils.addShapedGregtechRecipe( + pipeLargeCopper, pipeHugeSteel, pipeLargeCopper, + plateEnergeticAlloy, electricPump_HV, plateEnergeticAlloy, + plateEnergeticAlloy, pipeLargeCopper, plateEnergeticAlloy, + RECIPE_SteamCondenser); + + //Iron BF + RecipeUtils.addShapedGregtechRecipe( + "plateDoubleAnyIron", "craftingFurnace", "plateDoubleAnyIron", + boiler_Coal, machineCasing_ULV, boiler_Coal, + "plateDoubleAnyIron", "bucketLava", "plateDoubleAnyIron", + RECIPE_IronBlastFurnace); + //Iron plated Bricks + RecipeUtils.addShapedGregtechRecipe( + "plateAnyIron", RECIPES_Tools.craftingToolHardHammer, "plateAnyIron", + "plateAnyIron", blockBricks, "plateAnyIron", + "plateAnyIron", RECIPES_Tools.craftingToolWrench, "plateAnyIron", + RECIPE_IronPlatedBricks); + + /*//Electrolyzer Frame Casing + UtilsRecipe.addShapedGregtechRecipe( + "platePotin", "stickLongChrome", "platePotin", + "stickLongPotin", "frameGtPotin", "stickLongPotin", + "platePotin", "stickLongPotin", "platePotin", + RECIPE_IndustrialCentrifugeCasing); + //Industrial Electrolyzer + UtilsRecipe.addShapedGregtechRecipe( + "plateStellite", circuitTier6, "plateStellite", + machineCasing_EV, IV_MACHINE_Electrolyzer, machineCasing_EV, + "plateStellite", "rotorStellite", "plateStellite", + RECIPE_IndustrialCentrifugeController);*/ + + //Industrial Centrifuge + RecipeUtils.addShapedGregtechRecipe( + circuitTier6, pipeHugeStainlessSteel, circuitTier6, + plateTier6, IV_MACHINE_Centrifuge, plateTier6, + plateTier8, machineCasing_IV, plateTier8, + RECIPE_IndustrialCentrifugeController); + //Centrifuge Casing + RecipeUtils.addShapedGregtechRecipe( + plateTier6, "stickTumbaga", plateTier6, + plateTier8, "stickTumbaga", plateTier8, + plateTier6, "stickTumbaga", plateTier6, + RECIPE_IndustrialCentrifugeCasing); + + if (LoadedMods.Railcraft){ + //Industrial Coke Oven + RecipeUtils.addShapedGregtechRecipe( + plateCobalt, circuitTier4, plateCobalt, + machineCasing_HV, INPUT_RCCokeOvenBlock, machineCasing_HV, + plateCobalt, circuitTier5, plateCobalt, + RECIPE_IndustrialCokeOvenController); } - if (LoadedMods.ImmersiveEngineering) { - // Industrial Coke Oven - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.plateTier8, RECIPES_Machines.circuitTier4, - RECIPES_Machines.plateTier8, RECIPES_Machines.machineCasing_HV, - RECIPES_Machines.INPUT_IECokeOvenBlock, RECIPES_Machines.machineCasing_HV, - RECIPES_Machines.plateTier8, RECIPES_Machines.circuitTier3, RECIPES_Machines.plateTier8, - RECIPES_Machines.RECIPE_IndustrialCokeOvenController); + if (LoadedMods.ImmersiveEngineering){ + //Industrial Coke Oven + RecipeUtils.addShapedGregtechRecipe( + plateTier8, circuitTier4, plateTier8, + machineCasing_HV, INPUT_IECokeOvenBlock, machineCasing_HV, + plateTier8, circuitTier3, plateTier8, + RECIPE_IndustrialCokeOvenController); } - // Coke Oven Frame Casing - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.plateTier7, RECIPES_Machines.rodTier7, - RECIPES_Machines.plateTier7, RECIPES_Machines.rodTier7, "frameGtTantalloy61", - RECIPES_Machines.rodTier7, RECIPES_Machines.plateTier7, RECIPES_Machines.rodTier7, - RECIPES_Machines.plateTier7, RECIPES_Machines.RECIPE_IndustrialCokeOvenFrame); - // Coke Oven Coil 1 - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.plateBronze, RECIPES_Machines.plateBronze, - RECIPES_Machines.plateBronze, "frameGtBronze", RECIPES_Machines.gearboxCasing_Tier_1, - "frameGtBronze", RECIPES_Machines.plateBronze, RECIPES_Machines.plateBronze, - RECIPES_Machines.plateBronze, RECIPES_Machines.RECIPE_IndustrialCokeOvenCasingA); - // Coke Oven Coil 2 - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.plateSteel, RECIPES_Machines.plateSteel, - RECIPES_Machines.plateSteel, "frameGtSteel", RECIPES_Machines.gearboxCasing_Tier_2, "frameGtSteel", - RECIPES_Machines.plateSteel, RECIPES_Machines.plateSteel, RECIPES_Machines.plateSteel, - RECIPES_Machines.RECIPE_IndustrialCokeOvenCasingB); - - // Electrolyzer Frame Casing - RecipeUtils.addShapedGregtechRecipe("platePotin", "stickLongChrome", "platePotin", "stickLongPotin", - "frameGtPotin", "stickLongPotin", "platePotin", "stickLongPotin", "platePotin", - RECIPES_Machines.RECIPE_IndustrialElectrolyzerFrame); - // Industrial Electrolyzer - RecipeUtils.addShapedGregtechRecipe("plateStellite", RECIPES_Machines.circuitTier6, "plateStellite", - RECIPES_Machines.machineCasing_EV, RECIPES_Machines.IV_MACHINE_Electrolyzer, - RECIPES_Machines.machineCasing_EV, "plateStellite", "rotorStellite", "plateStellite", - RECIPES_Machines.RECIPE_IndustrialElectrolyzerController); - - // Material Press Frame Casing - RecipeUtils.addShapedGregtechRecipe("plateTitanium", "stickLongTumbaga", "plateTitanium", - "stickTantalloy60", "frameGtTumbaga", "stickTantalloy60", "plateTitanium", "stickLongTumbaga", - "plateTitanium", RECIPES_Machines.RECIPE_IndustrialMaterialPressFrame); - // Industrial Material Press - RecipeUtils.addShapedGregtechRecipe("plateTitanium", RECIPES_Machines.circuitTier5, "plateTitanium", - RECIPES_Machines.machineCasing_EV, RECIPES_Machines.IV_MACHINE_BendingMachine, - RECIPES_Machines.machineCasing_EV, "plateTitanium", RECIPES_Machines.circuitTier5, "plateTitanium", - RECIPES_Machines.RECIPE_IndustrialMaterialPressController); - - // Maceration Frame Casing - RecipeUtils.addShapedGregtechRecipe("platePalladium", "platePalladium", "platePalladium", "stickPlatinum", - "frameGtInconel625", "stickPlatinum", "platePalladium", "stickLongPalladium", "platePalladium", - RECIPES_Machines.RECIPE_IndustrialMacerationStackFrame); - // Industrial Maceration stack - RecipeUtils.addShapedGregtechRecipe("plateTungstenCarbide", RECIPES_Machines.IV_MACHINE_Macerator, - "plateTungstenCarbide", RECIPES_Machines.IV_MACHINE_Macerator, RECIPES_Machines.circuitTier8, - RECIPES_Machines.IV_MACHINE_Macerator, "plateTungstenCarbide", RECIPES_Machines.machineCasing_IV, - "plateTungstenCarbide", RECIPES_Machines.RECIPE_IndustrialMacerationStackController); - - // Wire Factory Frame Casing - RecipeUtils.addShapedGregtechRecipe("plateBlueSteel", "stickBlueSteel", "plateBlueSteel", "stickBlueSteel", - "frameGtBlueSteel", "stickBlueSteel", "plateBlueSteel", "stickBlueSteel", "plateBlueSteel", - RECIPES_Machines.RECIPE_IndustrialWireFactoryFrame); - // Industrial Wire Factory - RecipeUtils.addShapedGregtechRecipe("plateZeron100", RECIPES_Machines.machineCasing_IV, "plateZeron100", - RECIPES_Machines.circuitTier6, RECIPES_Machines.IV_MACHINE_Wiremill, RECIPES_Machines.circuitTier6, - "plateZeron100", RECIPES_Machines.machineCasing_IV, "plateZeron100", - RECIPES_Machines.RECIPE_IndustrialWireFactoryController); - - // Tiered Tanks - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.plateTier1, RECIPES_Machines.plateTier1, - RECIPES_Machines.plateTier1, RECIPES_Machines.plateTier1, RECIPES_Machines.pipeTier1, - RECIPES_Machines.plateTier1, RECIPES_Machines.plateTier1, GregtechItemList.Fluid_Cell_144L.get(1), - RECIPES_Machines.plateTier1, GregtechItemList.GT_FluidTank_ULV.get(1)); - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.plateTier2, RECIPES_Machines.plateTier2, - RECIPES_Machines.plateTier2, RECIPES_Machines.plateTier2, RECIPES_Machines.pipeTier2, - RECIPES_Machines.plateTier2, RECIPES_Machines.plateTier2, RECIPES_Machines.electricPump_LV, - RECIPES_Machines.plateTier2, GregtechItemList.GT_FluidTank_LV.get(1)); - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.plateTier3, RECIPES_Machines.plateTier3, - RECIPES_Machines.plateTier3, RECIPES_Machines.plateTier3, RECIPES_Machines.pipeTier3, - RECIPES_Machines.plateTier3, RECIPES_Machines.plateTier3, RECIPES_Machines.electricPump_MV, - RECIPES_Machines.plateTier3, GregtechItemList.GT_FluidTank_MV.get(1)); - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.plateTier4, RECIPES_Machines.plateTier4, - RECIPES_Machines.plateTier4, RECIPES_Machines.plateTier4, RECIPES_Machines.pipeTier4, - RECIPES_Machines.plateTier4, RECIPES_Machines.plateTier4, RECIPES_Machines.electricPump_HV, - RECIPES_Machines.plateTier4, GregtechItemList.GT_FluidTank_HV.get(1)); - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.plateTier5, RECIPES_Machines.plateTier5, - RECIPES_Machines.plateTier5, RECIPES_Machines.plateTier5, RECIPES_Machines.pipeTier5, - RECIPES_Machines.plateTier5, RECIPES_Machines.plateTier5, RECIPES_Machines.electricPump_EV, - RECIPES_Machines.plateTier5, GregtechItemList.GT_FluidTank_EV.get(1)); - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.plateTier6, RECIPES_Machines.plateTier6, - RECIPES_Machines.plateTier6, RECIPES_Machines.plateTier6, RECIPES_Machines.pipeTier6, - RECIPES_Machines.plateTier6, RECIPES_Machines.plateTier6, RECIPES_Machines.electricPump_IV, - RECIPES_Machines.plateTier6, GregtechItemList.GT_FluidTank_IV.get(1)); - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.plateTier7, RECIPES_Machines.plateTier7, - RECIPES_Machines.plateTier7, RECIPES_Machines.plateTier7, RECIPES_Machines.pipeTier7, - RECIPES_Machines.plateTier7, RECIPES_Machines.plateTier7, RECIPE_CONSTANTS.electricPump_LuV, - RECIPES_Machines.plateTier7, GregtechItemList.GT_FluidTank_LuV.get(1)); - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.plateTier8, RECIPES_Machines.plateTier8, - RECIPES_Machines.plateTier8, RECIPES_Machines.plateTier8, RECIPES_Machines.pipeTier8, - RECIPES_Machines.plateTier8, RECIPES_Machines.plateTier8, RECIPE_CONSTANTS.electricPump_ZPM, - RECIPES_Machines.plateTier8, GregtechItemList.GT_FluidTank_ZPM.get(1)); - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.plateTier9, RECIPES_Machines.plateTier9, - RECIPES_Machines.plateTier9, RECIPES_Machines.plateTier9, RECIPES_Machines.pipeTier9, - RECIPES_Machines.plateTier9, RECIPES_Machines.plateTier9, RECIPE_CONSTANTS.electricPump_UV, - RECIPES_Machines.plateTier9, GregtechItemList.GT_FluidTank_UV.get(1)); - RecipeUtils.addShapedGregtechRecipe(RECIPES_Machines.plateTier10, RECIPES_Machines.plateTier10, - RECIPES_Machines.plateTier10, RECIPES_Machines.plateTier10, RECIPES_Machines.pipeTier10, - RECIPES_Machines.plateTier10, RECIPES_Machines.plateTier10, RECIPE_CONSTANTS.electricPump_MAX, - RECIPES_Machines.plateTier10, GregtechItemList.GT_FluidTank_MAX.get(1)); - - // Blast Smelter - RecipeUtils.addShapedGregtechRecipe("plateZirconiumCarbide", RECIPES_Machines.circuitTier4, - "plateZirconiumCarbide", RECIPES_Machines.cableTier4, RECIPES_Machines.machineCasing_EV, - RECIPES_Machines.cableTier4, "plateZirconiumCarbide", RECIPES_Machines.circuitTier3, - "plateZirconiumCarbide", RECIPES_Machines.RECIPE_IndustrialBlastSmelterController); - // Blast Smelter Frame Casing - RecipeUtils.addShapedGregtechRecipe("plateZirconiumCarbide", RECIPES_Machines.rodTier5, - "plateZirconiumCarbide", RECIPES_Machines.rodTier5, "frameGtTumbaga", RECIPES_Machines.rodTier5, - "plateZirconiumCarbide", RECIPES_Machines.rodTier5, "plateZirconiumCarbide", - RECIPES_Machines.RECIPE_IndustrialBlastSmelterFrame); - // Blast Smelter Coil - RecipeUtils.addShapedGregtechRecipe("plateStaballoy", "plateStaballoy", "plateStaballoy", - "frameGtStaballoy", RECIPES_Machines.gearboxCasing_Tier_3, "frameGtStaballoy", "plateStaballoy", - "plateStaballoy", "plateStaballoy", RECIPES_Machines.RECIPE_IndustrialBlastSmelterCoil); + //Coke Oven Frame Casing + RecipeUtils.addShapedGregtechRecipe( + plateTier7, rodTier7, plateTier7, + rodTier7, "frameGtTantalloy61", rodTier7, + plateTier7, rodTier7, plateTier7, + RECIPE_IndustrialCokeOvenFrame); + //Coke Oven Coil 1 + RecipeUtils.addShapedGregtechRecipe( + plateBronze, plateBronze, plateBronze, + "frameGtBronze", gearboxCasing_Tier_1, "frameGtBronze", + plateBronze, plateBronze, plateBronze, + RECIPE_IndustrialCokeOvenCasingA); + //Coke Oven Coil 2 + RecipeUtils.addShapedGregtechRecipe( + plateSteel, plateSteel, plateSteel, + "frameGtSteel", gearboxCasing_Tier_2, "frameGtSteel", + plateSteel, plateSteel, plateSteel, + RECIPE_IndustrialCokeOvenCasingB); + + //Electrolyzer Frame Casing + RecipeUtils.addShapedGregtechRecipe( + "platePotin", "stickLongChrome", "platePotin", + "stickLongPotin", "frameGtPotin", "stickLongPotin", + "platePotin", "stickLongPotin", "platePotin", + RECIPE_IndustrialElectrolyzerFrame); + //Industrial Electrolyzer + RecipeUtils.addShapedGregtechRecipe( + "plateStellite", circuitTier6, "plateStellite", + machineCasing_EV, IV_MACHINE_Electrolyzer, machineCasing_EV, + "plateStellite", "rotorStellite", "plateStellite", + RECIPE_IndustrialElectrolyzerController); + + //Material Press Frame Casing + RecipeUtils.addShapedGregtechRecipe( + "plateTitanium", "stickLongTumbaga", "plateTitanium", + "stickTantalloy60", "frameGtTumbaga", "stickTantalloy60", + "plateTitanium", "stickLongTumbaga", "plateTitanium", + RECIPE_IndustrialMaterialPressFrame); + //Industrial Material Press + RecipeUtils.addShapedGregtechRecipe( + "plateTitanium", circuitTier5, "plateTitanium", + machineCasing_EV, IV_MACHINE_BendingMachine, machineCasing_EV, + "plateTitanium", circuitTier5, "plateTitanium", + RECIPE_IndustrialMaterialPressController); + + //Maceration Frame Casing + RecipeUtils.addShapedGregtechRecipe( + "platePalladium", "platePalladium", "platePalladium", + "stickPlatinum", "frameGtInconel625", "stickPlatinum", + "platePalladium", "stickLongPalladium", "platePalladium", + RECIPE_IndustrialMacerationStackFrame); + //Industrial Maceration stack + RecipeUtils.addShapedGregtechRecipe( + "plateTungstenCarbide", IV_MACHINE_Macerator, "plateTungstenCarbide", + IV_MACHINE_Macerator, circuitTier8, IV_MACHINE_Macerator, + "plateTungstenCarbide", machineCasing_IV, "plateTungstenCarbide", + RECIPE_IndustrialMacerationStackController); + + //Wire Factory Frame Casing + RecipeUtils.addShapedGregtechRecipe( + "plateBlueSteel", "stickBlueSteel", "plateBlueSteel", + "stickBlueSteel", "frameGtBlueSteel", "stickBlueSteel", + "plateBlueSteel", "stickBlueSteel", "plateBlueSteel", + RECIPE_IndustrialWireFactoryFrame); + //Industrial Wire Factory + RecipeUtils.addShapedGregtechRecipe( + "plateZeron100", machineCasing_IV, "plateZeron100", + circuitTier6, IV_MACHINE_Wiremill, circuitTier6, + "plateZeron100", machineCasing_IV, "plateZeron100", + RECIPE_IndustrialWireFactoryController); + + + + //Tiered Tanks + RecipeUtils.addShapedGregtechRecipe( + plateTier1, plateTier1, plateTier1, + plateTier1, pipeTier1, plateTier1, + plateTier1, GregtechItemList.Fluid_Cell_144L.get(1), plateTier1, + GregtechItemList.GT_FluidTank_ULV.get(1)); + RecipeUtils.addShapedGregtechRecipe( + plateTier2, plateTier2, plateTier2, + plateTier2, pipeTier2, plateTier2, + plateTier2, electricPump_LV, plateTier2, + GregtechItemList.GT_FluidTank_LV.get(1)); + RecipeUtils.addShapedGregtechRecipe( + plateTier3, plateTier3, plateTier3, + plateTier3, pipeTier3, plateTier3, + plateTier3, electricPump_MV, plateTier3, + GregtechItemList.GT_FluidTank_MV.get(1)); + RecipeUtils.addShapedGregtechRecipe( + plateTier4, plateTier4, plateTier4, + plateTier4, pipeTier4, plateTier4, + plateTier4, electricPump_HV, plateTier4, + GregtechItemList.GT_FluidTank_HV.get(1)); + RecipeUtils.addShapedGregtechRecipe( + plateTier5, plateTier5, plateTier5, + plateTier5, pipeTier5, plateTier5, + plateTier5, electricPump_EV, plateTier5, + GregtechItemList.GT_FluidTank_EV.get(1)); + RecipeUtils.addShapedGregtechRecipe( + plateTier6, plateTier6, plateTier6, + plateTier6, pipeTier6, plateTier6, + plateTier6, electricPump_IV, plateTier6, + GregtechItemList.GT_FluidTank_IV.get(1)); + RecipeUtils.addShapedGregtechRecipe( + plateTier7, plateTier7, plateTier7, + plateTier7, pipeTier7, plateTier7, + plateTier7, RECIPE_CONSTANTS.electricPump_LuV, plateTier7, + GregtechItemList.GT_FluidTank_LuV.get(1)); + RecipeUtils.addShapedGregtechRecipe( + plateTier8, plateTier8, plateTier8, + plateTier8, pipeTier8, plateTier8, + plateTier8, RECIPE_CONSTANTS.electricPump_ZPM, plateTier8, + GregtechItemList.GT_FluidTank_ZPM.get(1)); + RecipeUtils.addShapedGregtechRecipe( + plateTier9, plateTier9, plateTier9, + plateTier9, pipeTier9, plateTier9, + plateTier9, RECIPE_CONSTANTS.electricPump_UV, plateTier9, + GregtechItemList.GT_FluidTank_UV.get(1)); + RecipeUtils.addShapedGregtechRecipe( + plateTier10, plateTier10, plateTier10, + plateTier10, pipeTier10, plateTier10, + plateTier10, RECIPE_CONSTANTS.electricPump_MAX, plateTier10, + GregtechItemList.GT_FluidTank_MAX.get(1)); + + + + + + //Blast Smelter + RecipeUtils.addShapedGregtechRecipe( + "plateZirconiumCarbide", circuitTier4, "plateZirconiumCarbide", + cableTier4, machineCasing_EV, cableTier4, + "plateZirconiumCarbide", circuitTier3, "plateZirconiumCarbide", + RECIPE_IndustrialBlastSmelterController); + //Blast Smelter Frame Casing + RecipeUtils.addShapedGregtechRecipe( + "plateZirconiumCarbide", rodTier5, "plateZirconiumCarbide", + rodTier5, "frameGtTumbaga", rodTier5, + "plateZirconiumCarbide", rodTier5, "plateZirconiumCarbide", + RECIPE_IndustrialBlastSmelterFrame); + //Blast Smelter Coil + RecipeUtils.addShapedGregtechRecipe( + "plateStaballoy", "plateStaballoy", "plateStaballoy", + "frameGtStaballoy", gearboxCasing_Tier_3, "frameGtStaballoy", + "plateStaballoy", "plateStaballoy", "plateStaballoy", + RECIPE_IndustrialBlastSmelterCoil); + } + Utils.LOG_INFO("Done loading recipes for the Various machine blocks."); } } diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java index b3c7d4e82c..fa11783f70 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java @@ -7,39 +7,40 @@ import gtPlusPlus.core.util.recipe.RecipeUtils; import net.minecraft.item.ItemStack; public class RECIPES_Shapeless { - - static ItemStack dustStaballoy; - - // Circuits - static String circuitPrimitive = "circuitPrimitive"; - static String circuitBasic = "circuitBasic"; - static String circuitGood = "circuitGood"; - static String circuitAdvanced = "circuitAdvanced"; - static String circuitData = "circuitData"; - static String circuitElite = "circuitElite"; - static String circuitMaster = "circuitMaster"; - static String circuitUltimate = "circuitUltimate"; - static ItemStack gearboxCasing_Tier_1; - - public static final void RECIPES_LOAD() { - // run(); + + static ItemStack dustStaballoy; + + //Circuits + static String circuitPrimitive = "circuitPrimitive"; + static String circuitBasic = "circuitBasic"; + static String circuitGood = "circuitGood"; + static String circuitAdvanced = "circuitAdvanced"; + static String circuitData = "circuitData"; + static String circuitElite = "circuitElite"; + static String circuitMaster = "circuitMaster"; + static String circuitUltimate = "circuitUltimate"; + static ItemStack gearboxCasing_Tier_1; + + public static final void RECIPES_LOAD(){ + //run(); Utils.LOG_INFO("Loading Shapeless Recipes."); } - private static void run() { - // Gregtech items - if (LoadedMods.Gregtech) { - RECIPES_Shapeless.gearboxCasing_Tier_1 = ItemList.Casing_Gearbox_Bronze.get(1); - - RecipeUtils.shapelessBuilder(RECIPES_Shapeless.dustStaballoy, "dustTitanium", "dustUranium", "dustUranium", - "dustUranium", "dustUranium", "dustUranium", "dustUranium", "dustUranium", "dustUranium"); - - RecipeUtils.shapelessBuilder(RECIPES_Shapeless.gearboxCasing_Tier_1, RECIPES_Shapeless.circuitPrimitive, - RECIPES_Shapeless.circuitPrimitive, RECIPES_Shapeless.circuitPrimitive, - RECIPES_Shapeless.circuitPrimitive, RECIPES_Shapeless.circuitPrimitive, - RECIPES_Shapeless.circuitPrimitive, RECIPES_Shapeless.circuitPrimitive, - RECIPES_Shapeless.circuitPrimitive, RECIPES_Shapeless.circuitPrimitive); + private static void run(){ + //Gregtech items + if (LoadedMods.Gregtech){ + gearboxCasing_Tier_1 = ItemList.Casing_Gearbox_Bronze.get(1); + + RecipeUtils.shapelessBuilder(dustStaballoy, + "dustTitanium", "dustUranium", "dustUranium", + "dustUranium", "dustUranium", "dustUranium", + "dustUranium", "dustUranium", "dustUranium"); + + RecipeUtils.shapelessBuilder(gearboxCasing_Tier_1, + circuitPrimitive, circuitPrimitive, circuitPrimitive, + circuitPrimitive, circuitPrimitive, circuitPrimitive, + circuitPrimitive, circuitPrimitive, circuitPrimitive); } } - + } diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java index 1c2625c8e8..17fa4ef93d 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java @@ -12,162 +12,169 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; public class RECIPES_Tools { - - // Outputs - public static ItemStack RECIPE_StaballoyPickaxe = new ItemStack(ModItems.itemStaballoyPickaxe); - public static ItemStack RECIPE_StaballoyAxe = new ItemStack(ModItems.itemStaballoyAxe); - public static ItemStack RECIPE_SandstoneHammer = new ItemStack(ModItems.itemSandstoneHammer); - // public static ItemStack RECIPE_StaballoyIngot = new - // ItemStack(ModItems.itemIngotStaballoy); - public static ItemStack RECIPE_SandStone = new ItemStack(Blocks.sandstone, 2); - public static ItemStack RECIPE_Sand = new ItemStack(Blocks.sand, 4); - - public static ItemStack RECIPE_DivisionSigil; - - // MC Items - public static Item Apple = Items.apple; - - // MC Blocks - public static Block CobbleStone = Blocks.cobblestone; - public static Block Dirt = Blocks.dirt; - public static Block Sand = Blocks.sand; - public static Block Gravel = Blocks.gravel; - public static Block Sandstone = Blocks.sandstone; - - // null - public static String empty = " "; - - // Batteries - public static String batteryBasic = "batteryBasic"; - public static String batteryAdvanced = "batteryAdvanced"; - public static String batteryElite = "batteryElite"; - public static String batteryMaster = "batteryMaster"; - public static String batteryUltimate = "batteryUltimate"; - - // Circuits - public static String circuitPrimitive = "circuitPrimitive"; - public static String circuitBasic = "circuitBasic"; - public static String circuitGood = "circuitGood"; - public static String circuitAdvanced = "circuitAdvanced"; - public static String circuitElite = "circuitElite"; - public static String circuitMaster = "circuitMaster"; - public static String circuitUltimate = "circuitUltimate"; - - // Cables - public static String cableGt01Electrum = "cableGt01Electrum"; - public static String cableGt02Electrum = "cableGt02Electrum"; - public static String cableGt01RedstoneAlloy = "cableGt01RedstoneAlloy"; - public static String cableGt02RedstoneAlloy = "cableGt02RedstoneAlloy"; - public static String cableGt01Copper = "cableGt01Copper"; - public static String cableGt02Copper = "cableGt02Copper"; - public static String cableGt01AnnealedCopper = "cableGt01AnnealedCopper"; - public static String cableGt02AnnealedCopper = "cableGt02AnnealedCopper"; - - // Rods - public static String stickStaballoy = "stickStaballoy"; - public static String stickTitanium = "stickTitanium"; - public static String stickIron = "stickIron"; - public static String stickGold = "stickGold"; - public static String stickSilver = "stickSilver"; - public static String stickSteel = "stickSteel"; - public static String stickBronze = "stickBronze"; - public static String stickTungsten = "stickTungsten"; - public static String stickRedAlloy = "stickRedAlloy"; - public static String stickInvar = "stickInvar"; - public static String stickElectrum = "stickElectrum"; - public static String stickElectricalSteel = "stickElectricalSteel"; - - // Plates - public static String plateStaballoy = "plateStaballoy"; - public static String plateTitanium = "plateTitanium"; - public static String plateIron = "plateIron"; - public static String plateGold = "plateGold"; - public static String plateSilver = "plateSilver"; - public static String plateSteel = "plateSteel"; - public static String plateBronze = "plateBronze"; - public static String plateTungsten = "plateTungsten"; - public static String plateRedAlloy = "plateRedAlloy"; - public static String plateInvar = "plateInvar"; - public static String plateElectrum = "plateElectrum"; - public static String plateElectricalSteel = "plateElectricalSteel"; - - // Ingots - public static String ingotStaballoy = "ingotStaballoy"; - public static String ingotTitanium = "ingotTitanium"; - public static String ingotIron = "ingotIron"; - public static String ingotGold = "ingotGold"; - public static String ingotSilver = "ingotSilver"; - public static String ingotSteel = "ingotSteel"; - public static String ingotBronze = "ingotBronze"; - public static String ingotTungsten = "ingotTungsten"; - public static String ingotRedAlloy = "ingotRedAlloy"; - public static String ingotInvar = "ingotInvar"; - public static String ingotElectrum = "ingotElectrum"; - public static String ingotUranium = "ingotUranium"; - public static String ingotElectricalSteel = "ingotElectricalSteel"; - - // Crafting Tools - public static String craftingToolHardHammer = "craftingToolHardHammer"; - public static String craftingToolSoftHammer = "craftingToolSoftHammer"; - public static String craftingToolFile = "craftingToolFile"; - public static String craftingToolSaw = "craftingToolSaw"; - public static String craftingToolPickaxe = "craftingToolPickaxe"; - public static String craftingToolWrench = "craftingToolWrench"; - public static String craftingToolCrowbar = "craftingToolCrowbar"; - public static String craftingToolKnife = "craftingToolKnife"; - public static String craftingToolScrewdriver = "craftingToolScrewdriver"; - - public static ItemStack sandHammer = new ItemStack(ModItems.itemSandstoneHammer, 1, - OreDictionary.WILDCARD_VALUE); - public static String craftingToolSandHammer = "craftingToolSandHammer"; - - public static ItemStack personalCloakingDevice = ItemUtils.getSimpleStack(ModItems.itemPersonalCloakingDevice); - public static String plateDoubleNiChrome = "plateDoubleNichrome"; - public static String plateIridiumAlloy = "plateAlloyIridium"; - - public static final void RECIPES_LOAD() { - - RECIPES_Tools.run(); - + + //Outputs + public static ItemStack RECIPE_StaballoyPickaxe = new ItemStack(ModItems.itemStaballoyPickaxe); + public static ItemStack RECIPE_StaballoyAxe = new ItemStack(ModItems.itemStaballoyAxe); + public static ItemStack RECIPE_SandstoneHammer = new ItemStack(ModItems.itemSandstoneHammer); + //public static ItemStack RECIPE_StaballoyIngot = new ItemStack(ModItems.itemIngotStaballoy); + public static ItemStack RECIPE_SandStone = new ItemStack(Blocks.sandstone, 2); + public static ItemStack RECIPE_Sand = new ItemStack(Blocks.sand, 4); + + public static ItemStack RECIPE_DivisionSigil; + + //MC Items + public static Item Apple = Items.apple; + + //MC Blocks + public static Block CobbleStone = Blocks.cobblestone; + public static Block Dirt = Blocks.dirt; + public static Block Sand = Blocks.sand; + public static Block Gravel = Blocks.gravel; + public static Block Sandstone = Blocks.sandstone; + + //null + public static String empty = " "; + + //Batteries + public static String batteryBasic = "batteryBasic"; + public static String batteryAdvanced = "batteryAdvanced"; + public static String batteryElite = "batteryElite"; + public static String batteryMaster = "batteryMaster"; + public static String batteryUltimate = "batteryUltimate"; + + //Circuits + public static String circuitPrimitive = "circuitPrimitive"; + public static String circuitBasic = "circuitBasic"; + public static String circuitGood = "circuitGood"; + public static String circuitAdvanced = "circuitAdvanced"; + public static String circuitElite = "circuitElite"; + public static String circuitMaster = "circuitMaster"; + public static String circuitUltimate = "circuitUltimate"; + + //Cables + public static String cableGt01Electrum = "cableGt01Electrum"; + public static String cableGt02Electrum = "cableGt02Electrum"; + public static String cableGt01RedstoneAlloy = "cableGt01RedstoneAlloy"; + public static String cableGt02RedstoneAlloy = "cableGt02RedstoneAlloy"; + public static String cableGt01Copper = "cableGt01Copper"; + public static String cableGt02Copper = "cableGt02Copper"; + public static String cableGt01AnnealedCopper = "cableGt01AnnealedCopper"; + public static String cableGt02AnnealedCopper = "cableGt02AnnealedCopper"; + + //Rods + public static String stickStaballoy= "stickStaballoy"; + public static String stickTitanium= "stickTitanium"; + public static String stickIron= "stickIron"; + public static String stickGold= "stickGold"; + public static String stickSilver= "stickSilver"; + public static String stickSteel= "stickSteel"; + public static String stickBronze= "stickBronze"; + public static String stickTungsten= "stickTungsten"; + public static String stickRedAlloy= "stickRedAlloy"; + public static String stickInvar= "stickInvar"; + public static String stickElectrum= "stickElectrum"; + public static String stickElectricalSteel= "stickElectricalSteel"; + + //Plates + public static String plateStaballoy= "plateStaballoy"; + public static String plateTitanium= "plateTitanium"; + public static String plateIron= "plateIron"; + public static String plateGold= "plateGold"; + public static String plateSilver= "plateSilver"; + public static String plateSteel= "plateSteel"; + public static String plateBronze= "plateBronze"; + public static String plateTungsten= "plateTungsten"; + public static String plateRedAlloy= "plateRedAlloy"; + public static String plateInvar= "plateInvar"; + public static String plateElectrum= "plateElectrum"; + public static String plateElectricalSteel= "plateElectricalSteel"; + + //Ingots + public static String ingotStaballoy= "ingotStaballoy"; + public static String ingotTitanium= "ingotTitanium"; + public static String ingotIron= "ingotIron"; + public static String ingotGold= "ingotGold"; + public static String ingotSilver= "ingotSilver"; + public static String ingotSteel= "ingotSteel"; + public static String ingotBronze= "ingotBronze"; + public static String ingotTungsten= "ingotTungsten"; + public static String ingotRedAlloy= "ingotRedAlloy"; + public static String ingotInvar= "ingotInvar"; + public static String ingotElectrum= "ingotElectrum"; + public static String ingotUranium= "ingotUranium"; + public static String ingotElectricalSteel= "ingotElectricalSteel"; + + //Crafting Tools + public static String craftingToolHardHammer = "craftingToolHardHammer"; + public static String craftingToolSoftHammer = "craftingToolSoftHammer"; + public static String craftingToolFile = "craftingToolFile"; + public static String craftingToolSaw = "craftingToolSaw"; + public static String craftingToolPickaxe = "craftingToolPickaxe"; + public static String craftingToolWrench = "craftingToolWrench"; + public static String craftingToolCrowbar = "craftingToolCrowbar"; + public static String craftingToolKnife = "craftingToolKnife"; + public static String craftingToolScrewdriver = "craftingToolScrewdriver"; + + public static ItemStack sandHammer = new ItemStack (ModItems.itemSandstoneHammer, 1, OreDictionary.WILDCARD_VALUE); + public static String craftingToolSandHammer = "craftingToolSandHammer"; + + public static ItemStack personalCloakingDevice = ItemUtils.getSimpleStack(ModItems.itemPersonalCloakingDevice); + public static String plateDoubleNiChrome = "plateDoubleNichrome"; + public static String plateIridiumAlloy = "plateAlloyIridium"; + + public static final void RECIPES_LOAD(){ + + + run(); + } - - private static void run() { - // Staballoy Pickaxe - RecipeUtils.recipeBuilder(RECIPES_Tools.plateStaballoy, RECIPES_Tools.plateStaballoy, - RECIPES_Tools.ingotStaballoy, RECIPES_Tools.craftingToolFile, RECIPES_Tools.stickTungsten, - RECIPES_Tools.craftingToolHardHammer, RECIPES_Tools.craftingToolWrench, RECIPES_Tools.stickTungsten, - RECIPES_Tools.craftingToolHardHammer, RECIPES_Tools.RECIPE_StaballoyPickaxe); - - // Staballoy Axe - RecipeUtils.recipeBuilder(RECIPES_Tools.plateStaballoy, RECIPES_Tools.ingotStaballoy, - RECIPES_Tools.craftingToolHardHammer, RECIPES_Tools.plateStaballoy, RECIPES_Tools.stickTungsten, - RECIPES_Tools.craftingToolHardHammer, RECIPES_Tools.craftingToolFile, RECIPES_Tools.stickTungsten, - RECIPES_Tools.craftingToolWrench, RECIPES_Tools.RECIPE_StaballoyAxe); - - // Cobble to Sand - RecipeUtils.recipeBuilder(RECIPES_Tools.CobbleStone, RECIPES_Tools.CobbleStone, RECIPES_Tools.CobbleStone, - RECIPES_Tools.CobbleStone, RECIPES_Tools.sandHammer, RECIPES_Tools.CobbleStone, - RECIPES_Tools.CobbleStone, RECIPES_Tools.CobbleStone, RECIPES_Tools.CobbleStone, - RECIPES_Tools.RECIPE_Sand); - - if (LoadedMods.Baubles) { - // Cloaking Device - RecipeUtils.recipeBuilder(RECIPES_Tools.plateDoubleNiChrome, RECIPES_Tools.plateIridiumAlloy, - RECIPES_Tools.plateDoubleNiChrome, RECIPES_Tools.plateIridiumAlloy, RECIPES_Tools.batteryUltimate, - RECIPES_Tools.plateIridiumAlloy, RECIPES_Tools.plateDoubleNiChrome, RECIPES_Tools.plateIridiumAlloy, - RECIPES_Tools.plateDoubleNiChrome, RECIPES_Tools.personalCloakingDevice); - + + private static void run(){ + //Staballoy Pickaxe + RecipeUtils.recipeBuilder( + plateStaballoy, plateStaballoy, ingotStaballoy, + craftingToolFile, stickTungsten, craftingToolHardHammer, + craftingToolWrench, stickTungsten, craftingToolHardHammer, + RECIPE_StaballoyPickaxe); + + //Staballoy Axe + RecipeUtils.recipeBuilder( + plateStaballoy, ingotStaballoy, craftingToolHardHammer, + plateStaballoy, stickTungsten, craftingToolHardHammer, + craftingToolFile, stickTungsten, craftingToolWrench, + RECIPE_StaballoyAxe); + + //Cobble to Sand + RecipeUtils.recipeBuilder( + CobbleStone, CobbleStone, CobbleStone, + CobbleStone, sandHammer, CobbleStone, + CobbleStone, CobbleStone, CobbleStone, + RECIPE_Sand); + + if (LoadedMods.Baubles){ + //Cloaking Device + RecipeUtils.recipeBuilder( + plateDoubleNiChrome, plateIridiumAlloy, plateDoubleNiChrome, + plateIridiumAlloy, batteryUltimate, plateIridiumAlloy, + plateDoubleNiChrome, plateIridiumAlloy, plateDoubleNiChrome, + personalCloakingDevice); + } - // Sand to Sandstone - RecipeUtils.recipeBuilder(RECIPES_Tools.Sand, RECIPES_Tools.Sand, RECIPES_Tools.Sand, RECIPES_Tools.Sand, - RECIPES_Tools.sandHammer, RECIPES_Tools.Sand, RECIPES_Tools.Sand, RECIPES_Tools.Sand, - RECIPES_Tools.Sand, RECIPES_Tools.RECIPE_SandStone); - - // Sandstone Hammer - RecipeUtils.recipeBuilder(RECIPES_Tools.plateElectrum, RECIPES_Tools.ingotElectrum, RECIPES_Tools.plateElectrum, - RECIPES_Tools.craftingToolScrewdriver, RECIPES_Tools.stickBronze, RECIPES_Tools.craftingToolHardHammer, - null, RECIPES_Tools.stickSteel, null, RECIPES_Tools.RECIPE_SandstoneHammer); - + //Sand to Sandstone + RecipeUtils.recipeBuilder( + Sand, Sand, Sand, + Sand, sandHammer, Sand, + Sand, Sand, Sand, + RECIPE_SandStone); + + //Sandstone Hammer + RecipeUtils.recipeBuilder( + plateElectrum, ingotElectrum, plateElectrum, + craftingToolScrewdriver, stickBronze, craftingToolHardHammer, + null, stickSteel, null, + RECIPE_SandstoneHammer); + } - + } diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPE_Batteries.java b/src/Java/gtPlusPlus/core/recipe/RECIPE_Batteries.java index 7be85973f9..440f8815bc 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPE_Batteries.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPE_Batteries.java @@ -8,41 +8,42 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import net.minecraft.item.ItemStack; public class RECIPE_Batteries { - - static ItemStack RECIPE_Battery_Sodium = GregtechItemList.Battery_RE_EV_Sodium.get(1); - static ItemStack RECIPE_Battery_Cadmium = GregtechItemList.Battery_RE_EV_Cadmium.get(1); - static ItemStack RECIPE_Battery_Lithium = GregtechItemList.Battery_RE_EV_Lithium.get(1); - static ItemStack GT_Battery_Sodium = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32539, 1); - static ItemStack GT_Battery_Cadmium = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32537, 1); - static ItemStack GT_Battery_Lithium = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32538, 1); - static ItemStack machineTransformer_EV; - - public static void RECIPES_LOAD() { - - if (LoadedMods.Gregtech) { - RECIPE_Batteries.machineTransformer_EV = ItemList.Transformer_EV_HV.get(1); - RECIPE_Batteries.run(); + + static ItemStack RECIPE_Battery_Sodium = GregtechItemList.Battery_RE_EV_Sodium.get(1); + static ItemStack RECIPE_Battery_Cadmium = GregtechItemList.Battery_RE_EV_Cadmium.get(1); + static ItemStack RECIPE_Battery_Lithium = GregtechItemList.Battery_RE_EV_Lithium.get(1); + static ItemStack GT_Battery_Sodium = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32539, 1); + static ItemStack GT_Battery_Cadmium = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32537, 1); + static ItemStack GT_Battery_Lithium = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32538, 1); + static ItemStack machineTransformer_EV; + + public static void RECIPES_LOAD(){ + + if (LoadedMods.Gregtech){ + machineTransformer_EV = ItemList.Transformer_EV_HV.get(1); + run(); } } - - private static void run() { - - RecipeUtils.addShapedGregtechRecipe(RECIPE_Batteries.GT_Battery_Sodium, RECIPES_Machines.cableTier4, - RECIPE_Batteries.GT_Battery_Sodium, RECIPES_Machines.circuitTier3, - RECIPE_Batteries.machineTransformer_EV, RECIPES_Machines.circuitTier3, - RECIPE_Batteries.GT_Battery_Sodium, RECIPES_Machines.cableTier4, RECIPE_Batteries.GT_Battery_Sodium, - RECIPE_Batteries.RECIPE_Battery_Sodium); - RecipeUtils.addShapedGregtechRecipe(RECIPE_Batteries.GT_Battery_Cadmium, RECIPES_Machines.cableTier4, - RECIPE_Batteries.GT_Battery_Cadmium, RECIPES_Machines.circuitTier3, - RECIPE_Batteries.machineTransformer_EV, RECIPES_Machines.circuitTier3, - RECIPE_Batteries.GT_Battery_Cadmium, RECIPES_Machines.cableTier4, RECIPE_Batteries.GT_Battery_Cadmium, - RECIPE_Batteries.RECIPE_Battery_Cadmium); - RecipeUtils.addShapedGregtechRecipe(RECIPE_Batteries.GT_Battery_Lithium, RECIPES_Machines.cableTier4, - RECIPE_Batteries.GT_Battery_Lithium, RECIPES_Machines.circuitTier3, - RECIPE_Batteries.machineTransformer_EV, RECIPES_Machines.circuitTier3, - RECIPE_Batteries.GT_Battery_Lithium, RECIPES_Machines.cableTier4, RECIPE_Batteries.GT_Battery_Lithium, - RECIPE_Batteries.RECIPE_Battery_Lithium); - + + private static void run(){ + + + RecipeUtils.addShapedGregtechRecipe( + GT_Battery_Sodium, RECIPES_Machines.cableTier4, GT_Battery_Sodium, + RECIPES_Machines.circuitTier3, machineTransformer_EV, RECIPES_Machines.circuitTier3, + GT_Battery_Sodium, RECIPES_Machines.cableTier4, GT_Battery_Sodium, + RECIPE_Battery_Sodium); + RecipeUtils.addShapedGregtechRecipe( + GT_Battery_Cadmium, RECIPES_Machines.cableTier4, GT_Battery_Cadmium, + RECIPES_Machines.circuitTier3, machineTransformer_EV, RECIPES_Machines.circuitTier3, + GT_Battery_Cadmium, RECIPES_Machines.cableTier4, GT_Battery_Cadmium, + RECIPE_Battery_Cadmium); + RecipeUtils.addShapedGregtechRecipe( + GT_Battery_Lithium, RECIPES_Machines.cableTier4, GT_Battery_Lithium, + RECIPES_Machines.circuitTier3, machineTransformer_EV, RECIPES_Machines.circuitTier3, + GT_Battery_Lithium, RECIPES_Machines.cableTier4, GT_Battery_Lithium, + RECIPE_Battery_Lithium); + } - + } diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java b/src/Java/gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java index 2cdf006307..c0548e9e74 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java @@ -7,120 +7,120 @@ import net.minecraft.item.ItemStack; public class RECIPE_CONSTANTS { - // Machine Components - public static ItemStack electricMotor_LuV; - public static ItemStack electricMotor_ZPM; - public static ItemStack electricMotor_UV; - public static ItemStack electricMotor_MAX; - public static ItemStack electricPump_LuV; - public static ItemStack electricPump_ZPM; - public static ItemStack electricPump_UV; - public static ItemStack electricPump_MAX; - public static ItemStack electricPiston_LuV; - public static ItemStack electricPiston_ZPM; - public static ItemStack electricPiston_UV; - public static ItemStack electricPiston_MAX; - public static ItemStack robotArm_LuV; - public static ItemStack robotArm_ZPM; - public static ItemStack robotArm_UV; - public static ItemStack robotArm_MAX; - public static ItemStack conveyorModule_LuV; - public static ItemStack conveyorModule_ZPM; - public static ItemStack conveyorModule_UV; - public static ItemStack conveyorModule_MAX; - public static ItemStack emitter_LuV; - public static ItemStack emitter_ZPM; - public static ItemStack emitter_UV; - public static ItemStack emitter_MAX; - public static ItemStack fieldGenerator_LuV; - public static ItemStack fieldGenerator_ZPM; - public static ItemStack fieldGenerator_UV; - public static ItemStack fieldGenerator_MAX; - public static ItemStack sensor_LuV; - public static ItemStack sensor_ZPM; - public static ItemStack sensor_UV; - public static ItemStack sensor_MAX; - - public static void initialise() { - if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - RECIPE_CONSTANTS.registerGTExperimentalComponents(); + //Machine Components + public static ItemStack electricMotor_LuV; + public static ItemStack electricMotor_ZPM; + public static ItemStack electricMotor_UV; + public static ItemStack electricMotor_MAX; + public static ItemStack electricPump_LuV; + public static ItemStack electricPump_ZPM; + public static ItemStack electricPump_UV; + public static ItemStack electricPump_MAX; + public static ItemStack electricPiston_LuV; + public static ItemStack electricPiston_ZPM; + public static ItemStack electricPiston_UV ; + public static ItemStack electricPiston_MAX; + public static ItemStack robotArm_LuV; + public static ItemStack robotArm_ZPM; + public static ItemStack robotArm_UV; + public static ItemStack robotArm_MAX; + public static ItemStack conveyorModule_LuV; + public static ItemStack conveyorModule_ZPM; + public static ItemStack conveyorModule_UV; + public static ItemStack conveyorModule_MAX; + public static ItemStack emitter_LuV; + public static ItemStack emitter_ZPM; + public static ItemStack emitter_UV; + public static ItemStack emitter_MAX; + public static ItemStack fieldGenerator_LuV; + public static ItemStack fieldGenerator_ZPM; + public static ItemStack fieldGenerator_UV; + public static ItemStack fieldGenerator_MAX; + public static ItemStack sensor_LuV; + public static ItemStack sensor_ZPM; + public static ItemStack sensor_UV; + public static ItemStack sensor_MAX; + + public static void initialise(){ + if(CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ + registerGTExperimentalComponents(); } else { - RECIPE_CONSTANTS.registerGTStandardComponents(); + registerGTStandardComponents(); } } - - private static void registerGTExperimentalComponents() { - // Machine Components - RECIPE_CONSTANTS.electricMotor_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32606, 1); - RECIPE_CONSTANTS.electricMotor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32607, 1); - RECIPE_CONSTANTS.electricMotor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32608, 1); - RECIPE_CONSTANTS.electricPump_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32620, 1); - RECIPE_CONSTANTS.electricPump_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32621, 1); - RECIPE_CONSTANTS.electricPump_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32622, 1); - RECIPE_CONSTANTS.electricPiston_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32645, 1); - RECIPE_CONSTANTS.electricPiston_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32646, 1); - RECIPE_CONSTANTS.electricPiston_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32647, 1); - RECIPE_CONSTANTS.robotArm_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32655, 1); - RECIPE_CONSTANTS.robotArm_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32656, 1); - RECIPE_CONSTANTS.robotArm_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32657, 1); - RECIPE_CONSTANTS.conveyorModule_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32636, 1); - RECIPE_CONSTANTS.conveyorModule_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32637, 1); - RECIPE_CONSTANTS.conveyorModule_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32638, 1); - RECIPE_CONSTANTS.emitter_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32685, 1); - RECIPE_CONSTANTS.emitter_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32686, 1); - RECIPE_CONSTANTS.emitter_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32687, 1); - RECIPE_CONSTANTS.fieldGenerator_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32675, 1); - RECIPE_CONSTANTS.fieldGenerator_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32676, 1); - RECIPE_CONSTANTS.fieldGenerator_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32677, 1); - RECIPE_CONSTANTS.sensor_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32695, 1); - RECIPE_CONSTANTS.sensor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1); - RECIPE_CONSTANTS.sensor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1); - - // Max Tier Components Blood Never added... Useless, lol. - RECIPE_CONSTANTS.electricMotor_MAX = GregtechItemList.Electric_Motor_MAX.get(1); - RECIPE_CONSTANTS.electricPump_MAX = GregtechItemList.Electric_Pump_MAX.get(1); - RECIPE_CONSTANTS.electricPiston_MAX = GregtechItemList.Electric_Piston_MAX.get(1); - RECIPE_CONSTANTS.robotArm_MAX = GregtechItemList.Robot_Arm_MAX.get(1); - RECIPE_CONSTANTS.conveyorModule_MAX = GregtechItemList.Conveyor_Module_MAX.get(1); - RECIPE_CONSTANTS.emitter_MAX = GregtechItemList.Emitter_MAX.get(1); - RECIPE_CONSTANTS.fieldGenerator_MAX = GregtechItemList.Field_Generator_MAX.get(1); - RECIPE_CONSTANTS.sensor_MAX = GregtechItemList.Sensor_MAX.get(1); + + private static void registerGTExperimentalComponents(){ + //Machine Components + electricMotor_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32606, 1); + electricMotor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32607, 1); + electricMotor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32608, 1); + electricPump_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32620, 1); + electricPump_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32621, 1); + electricPump_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32622, 1); + electricPiston_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32645, 1); + electricPiston_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32646, 1); + electricPiston_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32647, 1); + robotArm_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32655, 1); + robotArm_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32656, 1); + robotArm_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32657, 1); + conveyorModule_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32636, 1); + conveyorModule_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32637, 1); + conveyorModule_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32638, 1); + emitter_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32685, 1); + emitter_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32686, 1); + emitter_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32687, 1); + fieldGenerator_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32675, 1); + fieldGenerator_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32676, 1); + fieldGenerator_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32677, 1); + sensor_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32695, 1); + sensor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1); + sensor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1); + + //Max Tier Components Blood Never added... Useless, lol. + electricMotor_MAX = GregtechItemList.Electric_Motor_MAX.get(1); + electricPump_MAX = GregtechItemList.Electric_Pump_MAX.get(1); + electricPiston_MAX = GregtechItemList.Electric_Piston_MAX.get(1); + robotArm_MAX = GregtechItemList.Robot_Arm_MAX.get(1); + conveyorModule_MAX = GregtechItemList.Conveyor_Module_MAX.get(1); + emitter_MAX = GregtechItemList.Emitter_MAX.get(1); + fieldGenerator_MAX = GregtechItemList.Field_Generator_MAX.get(1); + sensor_MAX = GregtechItemList.Sensor_MAX.get(1); } - - private static void registerGTStandardComponents() { - RECIPE_CONSTANTS.electricMotor_LuV = GregtechItemList.Electric_Motor_LuV.get(1); - RECIPE_CONSTANTS.electricMotor_ZPM = GregtechItemList.Electric_Motor_ZPM.get(1); - RECIPE_CONSTANTS.electricMotor_UV = GregtechItemList.Electric_Motor_UV.get(1); - RECIPE_CONSTANTS.electricMotor_MAX = GregtechItemList.Electric_Motor_MAX.get(1); - RECIPE_CONSTANTS.electricPump_LuV = GregtechItemList.Electric_Pump_LuV.get(1); - RECIPE_CONSTANTS.electricPump_ZPM = GregtechItemList.Electric_Pump_ZPM.get(1); - RECIPE_CONSTANTS.electricPump_UV = GregtechItemList.Electric_Pump_UV.get(1); - RECIPE_CONSTANTS.electricPump_MAX = GregtechItemList.Electric_Pump_MAX.get(1); - RECIPE_CONSTANTS.electricPiston_LuV = GregtechItemList.Electric_Piston_LuV.get(1); - RECIPE_CONSTANTS.electricPiston_ZPM = GregtechItemList.Electric_Piston_ZPM.get(1); - RECIPE_CONSTANTS.electricPiston_UV = GregtechItemList.Electric_Piston_UV.get(1); - RECIPE_CONSTANTS.electricPiston_MAX = GregtechItemList.Electric_Piston_MAX.get(1); - RECIPE_CONSTANTS.robotArm_LuV = GregtechItemList.Robot_Arm_LuV.get(1); - RECIPE_CONSTANTS.robotArm_ZPM = GregtechItemList.Robot_Arm_ZPM.get(1); - RECIPE_CONSTANTS.robotArm_UV = GregtechItemList.Robot_Arm_UV.get(1); - RECIPE_CONSTANTS.robotArm_MAX = GregtechItemList.Robot_Arm_MAX.get(1); - RECIPE_CONSTANTS.conveyorModule_LuV = GregtechItemList.Conveyor_Module_LuV.get(1); - RECIPE_CONSTANTS.conveyorModule_ZPM = GregtechItemList.Conveyor_Module_ZPM.get(1); - RECIPE_CONSTANTS.conveyorModule_UV = GregtechItemList.Conveyor_Module_UV.get(1); - RECIPE_CONSTANTS.conveyorModule_MAX = GregtechItemList.Conveyor_Module_MAX.get(1); - RECIPE_CONSTANTS.emitter_LuV = GregtechItemList.Emitter_LuV.get(1); - RECIPE_CONSTANTS.emitter_ZPM = GregtechItemList.Emitter_ZPM.get(1); - RECIPE_CONSTANTS.emitter_UV = GregtechItemList.Emitter_UV.get(1); - RECIPE_CONSTANTS.emitter_MAX = GregtechItemList.Emitter_MAX.get(1); - RECIPE_CONSTANTS.fieldGenerator_LuV = GregtechItemList.Field_Generator_LuV.get(1); - RECIPE_CONSTANTS.fieldGenerator_ZPM = GregtechItemList.Field_Generator_ZPM.get(1); - RECIPE_CONSTANTS.fieldGenerator_UV = GregtechItemList.Field_Generator_UV.get(1); - RECIPE_CONSTANTS.fieldGenerator_MAX = GregtechItemList.Field_Generator_MAX.get(1); - RECIPE_CONSTANTS.sensor_LuV = GregtechItemList.Sensor_LuV.get(1); - RECIPE_CONSTANTS.sensor_ZPM = GregtechItemList.Sensor_ZPM.get(1); - RECIPE_CONSTANTS.sensor_UV = GregtechItemList.Sensor_UV.get(1); - RECIPE_CONSTANTS.sensor_MAX = GregtechItemList.Sensor_MAX.get(1); + + private static void registerGTStandardComponents(){ + electricMotor_LuV = GregtechItemList.Electric_Motor_LuV.get(1); + electricMotor_ZPM = GregtechItemList.Electric_Motor_ZPM.get(1); + electricMotor_UV = GregtechItemList.Electric_Motor_UV.get(1); + electricMotor_MAX = GregtechItemList.Electric_Motor_MAX.get(1); + electricPump_LuV = GregtechItemList.Electric_Pump_LuV.get(1); + electricPump_ZPM = GregtechItemList.Electric_Pump_ZPM.get(1); + electricPump_UV = GregtechItemList.Electric_Pump_UV.get(1); + electricPump_MAX = GregtechItemList.Electric_Pump_MAX.get(1); + electricPiston_LuV = GregtechItemList.Electric_Piston_LuV.get(1); + electricPiston_ZPM = GregtechItemList.Electric_Piston_ZPM.get(1); + electricPiston_UV = GregtechItemList.Electric_Piston_UV.get(1); + electricPiston_MAX = GregtechItemList.Electric_Piston_MAX.get(1); + robotArm_LuV = GregtechItemList.Robot_Arm_LuV.get(1); + robotArm_ZPM = GregtechItemList.Robot_Arm_ZPM.get(1); + robotArm_UV = GregtechItemList.Robot_Arm_UV.get(1); + robotArm_MAX = GregtechItemList.Robot_Arm_MAX.get(1); + conveyorModule_LuV = GregtechItemList.Conveyor_Module_LuV.get(1); + conveyorModule_ZPM = GregtechItemList.Conveyor_Module_ZPM.get(1); + conveyorModule_UV = GregtechItemList.Conveyor_Module_UV.get(1); + conveyorModule_MAX = GregtechItemList.Conveyor_Module_MAX.get(1); + emitter_LuV = GregtechItemList.Emitter_LuV.get(1); + emitter_ZPM = GregtechItemList.Emitter_ZPM.get(1); + emitter_UV = GregtechItemList.Emitter_UV.get(1); + emitter_MAX = GregtechItemList.Emitter_MAX.get(1); + fieldGenerator_LuV = GregtechItemList.Field_Generator_LuV.get(1); + fieldGenerator_ZPM = GregtechItemList.Field_Generator_ZPM.get(1); + fieldGenerator_UV = GregtechItemList.Field_Generator_UV.get(1); + fieldGenerator_MAX = GregtechItemList.Field_Generator_MAX.get(1); + sensor_LuV = GregtechItemList.Sensor_LuV.get(1); + sensor_ZPM = GregtechItemList.Sensor_ZPM.get(1); + sensor_UV = GregtechItemList.Sensor_UV.get(1); + sensor_MAX = GregtechItemList.Sensor_MAX.get(1); } } diff --git a/src/Java/gtPlusPlus/core/recipe/ShapedRecipeObject.java b/src/Java/gtPlusPlus/core/recipe/ShapedRecipeObject.java index 1d89d1bfa6..348f9907c0 100644 --- a/src/Java/gtPlusPlus/core/recipe/ShapedRecipeObject.java +++ b/src/Java/gtPlusPlus/core/recipe/ShapedRecipeObject.java @@ -6,20 +6,22 @@ import net.minecraft.item.ItemStack; public class ShapedRecipeObject { - public Object object_A; - public Object object_B; - public Object object_C; - public Object object_D; - public Object object_E; - public Object object_F; - public Object object_G; - public Object object_H; - public Object object_I; - public ItemStack object_OUTPUT; - - public ShapedRecipeObject(final Object input_A, final Object input_B, final Object input_C, final Object input_D, - final Object input_E, final Object input_F, final Object input_G, final Object input_H, - final Object input_I, final ItemStack input_Output) { + public Object object_A; + public Object object_B; + public Object object_C; + public Object object_D; + public Object object_E; + public Object object_F; + public Object object_G; + public Object object_H; + public Object object_I; + public ItemStack object_OUTPUT; + + public ShapedRecipeObject( + Object input_A,Object input_B,Object input_C, + Object input_D,Object input_E,Object input_F, + Object input_G,Object input_H,Object input_I, + ItemStack input_Output){ this.object_A = input_A; this.object_B = input_B; this.object_C = input_C; @@ -32,10 +34,9 @@ public class ShapedRecipeObject { this.object_OUTPUT = input_Output; Utils.LOG_SPECIFIC_WARNING("ShapedRecipeObject", "New object created.", 36); } - - public void buildRecipe() { - RecipeUtils.recipeBuilder(this.object_A, this.object_B, this.object_C, this.object_D, this.object_E, - this.object_F, this.object_G, this.object_H, this.object_I, this.object_OUTPUT); + + public void buildRecipe(){ + RecipeUtils.recipeBuilder(object_A, object_B, object_C, object_D, object_E, object_F, object_G, object_H, object_I, object_OUTPUT); } - + } |