diff options
| author | Jason Mitchell <mitchej@gmail.com> | 2023-01-28 19:32:44 -0800 |
|---|---|---|
| committer | Jason Mitchell <mitchej@gmail.com> | 2023-01-28 19:32:44 -0800 |
| commit | 55f64675b42ac8d3c557cc850f78664bee006f6f (patch) | |
| tree | 2afd26dd3d5e6f763119bc192b57c66a1a075922 /src/main/java/gtPlusPlus/core/recipe | |
| parent | 0f5dfd01b877b6a1019e0671b88d07974aae68c0 (diff) | |
| download | GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.tar.gz GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.tar.bz2 GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.zip | |
[ci skip] spotlessApply with the new settings
Diffstat (limited to 'src/main/java/gtPlusPlus/core/recipe')
17 files changed, 1887 insertions, 3300 deletions
diff --git a/src/main/java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java b/src/main/java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java index 9348584e34..0b2b452e43 100644 --- a/src/main/java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java +++ b/src/main/java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java @@ -1,11 +1,12 @@ package gtPlusPlus.core.recipe; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.util.GT_ModHandler; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.minecraft.ItemUtils; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; public class Gregtech_Recipe_Adder { @@ -16,35 +17,15 @@ public class Gregtech_Recipe_Adder { private static ItemStack outputStack1; private static ItemStack outputStack2; - 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) { + 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) { euT = euPerTick; ticks = timeInTicks; @@ -92,15 +73,11 @@ public class Gregtech_Recipe_Adder { GT_ModHandler.addCompressionRecipe(input1, output1); } - private static void addBlastFurnaceRecipe( - final ItemStack input1, - final ItemStack input2, - final ItemStack output1, - final ItemStack output2, - final int tempRequired) { + private static void addBlastFurnaceRecipe(final ItemStack input1, final ItemStack input2, final ItemStack output1, + final ItemStack output2, final int tempRequired) { Logger.INFO("Registering Blast Furnace Recipes."); - GT_Values.RA.addBlastRecipe( - input1, input2, GT_Values.NF, GT_Values.NF, output1, output2, ticks, euT, tempRequired); + GT_Values.RA + .addBlastRecipe(input1, input2, GT_Values.NF, GT_Values.NF, output1, output2, ticks, euT, tempRequired); } private static void addSmeltingRecipe(final ItemStack input1, final ItemStack output1) { diff --git a/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java b/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java index 07622ee65b..ff104057b1 100644 --- a/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java +++ b/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java @@ -66,16 +66,11 @@ public class LOADER_Machine_Components { CI.sensor_EV = ItemList.Sensor_EV.get(1); CI.sensor_IV = ItemList.Sensor_IV.get(1); if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - CI.fluidRegulator_LV = ItemUtils.getValueOfItemList("FluidRegulator_LV", ItemList.Pump_LV) - .get(1); - CI.fluidRegulator_MV = ItemUtils.getValueOfItemList("FluidRegulator_MV", ItemList.Pump_MV) - .get(1); - CI.fluidRegulator_HV = ItemUtils.getValueOfItemList("FluidRegulator_HV", ItemList.Pump_HV) - .get(1); - CI.fluidRegulator_EV = ItemUtils.getValueOfItemList("FluidRegulator_EV", ItemList.Pump_EV) - .get(1); - CI.fluidRegulator_IV = ItemUtils.getValueOfItemList("FluidRegulator_IV", ItemList.Pump_IV) - .get(1); + CI.fluidRegulator_LV = ItemUtils.getValueOfItemList("FluidRegulator_LV", ItemList.Pump_LV).get(1); + CI.fluidRegulator_MV = ItemUtils.getValueOfItemList("FluidRegulator_MV", ItemList.Pump_MV).get(1); + CI.fluidRegulator_HV = ItemUtils.getValueOfItemList("FluidRegulator_HV", ItemList.Pump_HV).get(1); + CI.fluidRegulator_EV = ItemUtils.getValueOfItemList("FluidRegulator_EV", ItemList.Pump_EV).get(1); + CI.fluidRegulator_IV = ItemUtils.getValueOfItemList("FluidRegulator_IV", ItemList.Pump_IV).get(1); } } @@ -107,12 +102,9 @@ public class LOADER_Machine_Components { CI.sensor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1); if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - CI.fluidRegulator_LuV = ItemUtils.getValueOfItemList("FluidRegulator_LuV", ItemList.Pump_LuV) - .get(1); - CI.fluidRegulator_ZPM = ItemUtils.getValueOfItemList("FluidRegulator_ZPM", ItemList.Pump_ZPM) - .get(1); - CI.fluidRegulator_UV = ItemUtils.getValueOfItemList("FluidRegulator_UV", ItemList.Pump_UV) - .get(1); + CI.fluidRegulator_LuV = ItemUtils.getValueOfItemList("FluidRegulator_LuV", ItemList.Pump_LuV).get(1); + CI.fluidRegulator_ZPM = ItemUtils.getValueOfItemList("FluidRegulator_ZPM", ItemList.Pump_ZPM).get(1); + CI.fluidRegulator_UV = ItemUtils.getValueOfItemList("FluidRegulator_UV", ItemList.Pump_UV).get(1); } registerComponentsULV(); @@ -154,12 +146,9 @@ public class LOADER_Machine_Components { CI.sensor_MAX = GregtechItemList.Sensor_MAX.get(1); if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - CI.fluidRegulator_LuV = ItemUtils.getValueOfItemList("FluidRegulator_LuV", ItemList.Pump_LuV) - .get(1); - CI.fluidRegulator_ZPM = ItemUtils.getValueOfItemList("FluidRegulator_ZPM", ItemList.Pump_ZPM) - .get(1); - CI.fluidRegulator_UV = ItemUtils.getValueOfItemList("FluidRegulator_UV", ItemList.Pump_UV) - .get(1); + CI.fluidRegulator_LuV = ItemUtils.getValueOfItemList("FluidRegulator_LuV", ItemList.Pump_LuV).get(1); + CI.fluidRegulator_ZPM = ItemUtils.getValueOfItemList("FluidRegulator_ZPM", ItemList.Pump_ZPM).get(1); + CI.fluidRegulator_UV = ItemUtils.getValueOfItemList("FluidRegulator_UV", ItemList.Pump_UV).get(1); } registerComponentsULV(); diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Extruder.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Extruder.java index 122a35f3a6..524aa08f60 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Extruder.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Extruder.java @@ -1,12 +1,13 @@ package gtPlusPlus.core.recipe; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.interfaces.IOreRecipeRegistrator; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import net.minecraft.item.ItemStack; public class RECIPES_Extruder implements IOreRecipeRegistrator { @@ -15,17 +16,11 @@ public class RECIPES_Extruder implements IOreRecipeRegistrator { OrePrefixes.dust.add((IOreRecipeRegistrator) this); } - public void registerOre( - final OrePrefixes aPrefix, - final Materials aMaterial, - final String aOreDictName, - final String aModName, - final ItemStack aStack) { - if (!CORE.GTNH - && ((aMaterial == Materials.Glass - || aMaterial == Materials.WroughtIron - || GT_OreDictUnificator.get(OrePrefixes.ingot, (Object) aMaterial, 1L) != null) - && !aMaterial.contains(SubTag.NO_SMELTING))) { + public void registerOre(final OrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName, + final String aModName, final ItemStack aStack) { + if (!CORE.GTNH && ((aMaterial == Materials.Glass || aMaterial == Materials.WroughtIron + || GT_OreDictUnificator.get(OrePrefixes.ingot, (Object) aMaterial, 1L) != null) + && !aMaterial.contains(SubTag.NO_SMELTING))) { final long aMaterialMass = aMaterial.getMass(); final int tAmount = (int) (aPrefix.mMaterialAmount / 3628800L); if (tAmount > 0 && tAmount <= 64 && aPrefix.mMaterialAmount % 3628800L == 0L) { @@ -37,17 +32,17 @@ public class RECIPES_Extruder implements IOreRecipeRegistrator { } GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, new Object[] {aStack}), + GT_Utility.copyAmount(1L, new Object[] { aStack }), GregtechItemList.Shape_Extruder_SmallGear.get(0L, new Object[0]), - GT_OreDictUnificator.get( - OrePrefixes.gearGtSmall, (Object) aMaterial.mSmeltInto, (long) tAmount), + GT_OreDictUnificator + .get(OrePrefixes.gearGtSmall, (Object) aMaterial.mSmeltInto, (long) tAmount), ((int) Math.max(aMaterialMass * 5L * tAmount, tAmount) / 4), 8 * tVoltageMultiplier); GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(2L, new Object[] {aStack}), + GT_Utility.copyAmount(2L, new Object[] { aStack }), ItemList.Shape_Mold_Gear_Small.get(0L, new Object[0]), - GT_OreDictUnificator.get( - OrePrefixes.gearGtSmall, (Object) aMaterial.mSmeltInto, (long) tAmount), + GT_OreDictUnificator + .get(OrePrefixes.gearGtSmall, (Object) aMaterial.mSmeltInto, (long) tAmount), ((int) Math.max(aMaterialMass * 10L * tAmount, tAmount) / 4), 2 * tVoltageMultiplier); } diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 41313c68c5..0dcdb008bb 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -2,6 +2,14 @@ package gtPlusPlus.core.recipe; import static gtPlusPlus.core.lib.CORE.GTNH; +import java.util.ArrayList; + +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + import cpw.mods.fml.common.Loader; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; @@ -30,12 +38,6 @@ import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.core.util.reflect.AddGregtechRecipe; import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import java.util.ArrayList; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; public class RECIPES_GREGTECH { @@ -128,77 +130,50 @@ public class RECIPES_GREGTECH { // Advanced method for Nitric Acid Production CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(17), CI.getPinkCatalyst(0), - }, - new FluidStack[] { - FluidUtils.getFluidStack(GenericChem.Nitrogen_Dioxide, 4000), - FluidUtils.getAir(4000), - FluidUtils.getWater(2000), - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(17), CI.getPinkCatalyst(0), }, + new FluidStack[] { FluidUtils.getFluidStack(GenericChem.Nitrogen_Dioxide, 4000), + FluidUtils.getAir(4000), FluidUtils.getWater(2000), }, new ItemStack[] {}, - new FluidStack[] { - FluidUtils.getFluidStack("nitricacid", 4000), - }, + new FluidStack[] { FluidUtils.getFluidStack("nitricacid", 4000), }, 10 * 20, 480, 3); // Advanced recipe for Fluorine Production CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(17), - CI.getPurpleCatalyst(0), - ItemUtils.getSimpleStack(Blocks.sandstone, 64), - ItemUtils.getSimpleStack(Blocks.sandstone, 64) - }, - new FluidStack[] {FluidUtils.getFluidStack("nitricacid", 4000), FluidUtils.getAir(8000)}, - new ItemStack[] { - FLUORIDES.FLUORITE.getOre(8), - FLUORIDES.FLUORITE.getOre(4), - FLUORIDES.FLUORITE.getOre(4), - FLUORIDES.FLUORITE.getOre(4), - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(17), CI.getPurpleCatalyst(0), + ItemUtils.getSimpleStack(Blocks.sandstone, 64), + ItemUtils.getSimpleStack(Blocks.sandstone, 64) }, + new FluidStack[] { FluidUtils.getFluidStack("nitricacid", 4000), FluidUtils.getAir(8000) }, + new ItemStack[] { FLUORIDES.FLUORITE.getOre(8), FLUORIDES.FLUORITE.getOre(4), + FLUORIDES.FLUORITE.getOre(4), FLUORIDES.FLUORITE.getOre(4), }, new FluidStack[] {}, - new int[] {0, 2500, 2000, 1500}, + new int[] { 0, 2500, 2000, 1500 }, 10 * 20, 1024, 5); // Advanced recipe for Fluorine Production CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(17), - CI.getPurpleCatalyst(0), - ItemUtils.getSimpleStack(Blocks.sand, 64), - ItemUtils.getSimpleStack(Blocks.sand, 64) - }, - new FluidStack[] {FluidUtils.getFluidStack("nitricacid", 5000), FluidUtils.getAir(12000)}, - new ItemStack[] { - FLUORIDES.FLUORITE.getOre(4), - FLUORIDES.FLUORITE.getOre(2), - FLUORIDES.FLUORITE.getOre(2), - FLUORIDES.FLUORITE.getOre(2), - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(17), CI.getPurpleCatalyst(0), + ItemUtils.getSimpleStack(Blocks.sand, 64), ItemUtils.getSimpleStack(Blocks.sand, 64) }, + new FluidStack[] { FluidUtils.getFluidStack("nitricacid", 5000), FluidUtils.getAir(12000) }, + new ItemStack[] { FLUORIDES.FLUORITE.getOre(4), FLUORIDES.FLUORITE.getOre(2), + FLUORIDES.FLUORITE.getOre(2), FLUORIDES.FLUORITE.getOre(2), }, new FluidStack[] {}, - new int[] {7500, 1500, 1000, 500}, + new int[] { 7500, 1500, 1000, 500 }, 10 * 20, 1024, 5); // 3NO2 + H2O = 2HNO3 + NO CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(16), CI.getPinkCatalyst(0), - }, - new FluidStack[] { - FluidUtils.getFluidStack(GenericChem.Nitrogen_Dioxide, 3000), FluidUtils.getDistilledWater(1000) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(16), CI.getPinkCatalyst(0), }, + new FluidStack[] { FluidUtils.getFluidStack(GenericChem.Nitrogen_Dioxide, 3000), + FluidUtils.getDistilledWater(1000) }, new ItemStack[] {}, - new FluidStack[] { - FluidUtils.getFluidStack("nitricacid", 2000), - FluidUtils.getFluidStack(GenericChem.Nitric_Oxide, 1000), - }, + new FluidStack[] { FluidUtils.getFluidStack("nitricacid", 2000), + FluidUtils.getFluidStack(GenericChem.Nitric_Oxide, 1000), }, 10 * 20, 480, 2); @@ -206,44 +181,34 @@ public class RECIPES_GREGTECH { // Produce Boric Acid // Na2B4O7ยท10H2O + 2HCl = 4B(OH)3 + 2NaCl + 5H2O CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(21), ItemUtils.getItemStackOfAmountFromOreDict("dustBorax", 23), - }, - new FluidStack[] {FluidUtils.getFluidStack(GenericChem.HydrochloricAcid, 2000)}, - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("dustSalt", 4), - }, - new FluidStack[] {FluidUtils.getFluidStack("boricacid", 4000), FluidUtils.getWater(5000)}, + new ItemStack[] { CI.getNumberedAdvancedCircuit(21), + ItemUtils.getItemStackOfAmountFromOreDict("dustBorax", 23), }, + new FluidStack[] { FluidUtils.getFluidStack(GenericChem.HydrochloricAcid, 2000) }, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustSalt", 4), }, + new FluidStack[] { FluidUtils.getFluidStack("boricacid", 4000), FluidUtils.getWater(5000) }, 20 * 30, MaterialUtils.getVoltageForTier(3), 3); // Produce Th232 CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(22), - ELEMENT.getInstance().THORIUM.getDust(16) - }, - new FluidStack[] {FluidUtils.getDistilledWater(2000), FluidUtils.getFluidStack("boricacid", 1500)}, - new ItemStack[] { - ELEMENT.getInstance().THORIUM.getSmallDust(32), - ELEMENT.getInstance().THORIUM232.getDust(2), - ELEMENT.getInstance().THORIUM232.getSmallDust(2), - ELEMENT.getInstance().URANIUM232.getDust(1), - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(22), ELEMENT.getInstance().THORIUM.getDust(16) }, + new FluidStack[] { FluidUtils.getDistilledWater(2000), FluidUtils.getFluidStack("boricacid", 1500) }, + new ItemStack[] { ELEMENT.getInstance().THORIUM.getSmallDust(32), + ELEMENT.getInstance().THORIUM232.getDust(2), ELEMENT.getInstance().THORIUM232.getSmallDust(2), + ELEMENT.getInstance().URANIUM232.getDust(1), }, new FluidStack[] {}, - new int[] {0, 0, 1000, 250}, + new int[] { 0, 0, 1000, 250 }, 20 * 300, MaterialUtils.getVoltageForTier(4), 4); // Modify Sapling into Pine Sapling CORE.RA.addChemicalPlantRecipe( - new ItemStack[] {CI.getNumberedBioCircuit(6), ItemUtils.getSimpleStack(Blocks.sapling, 32)}, - new FluidStack[] { - FluidUtils.getFluidStack("fluid.geneticmutagen", 2000), FluidUtils.getDistilledWater(8000) - }, - new ItemStack[] {ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Pine, 16)}, + new ItemStack[] { CI.getNumberedBioCircuit(6), ItemUtils.getSimpleStack(Blocks.sapling, 32) }, + new FluidStack[] { FluidUtils.getFluidStack("fluid.geneticmutagen", 2000), + FluidUtils.getDistilledWater(8000) }, + new ItemStack[] { ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Pine, 16) }, new FluidStack[] {}, 120 * 20, 64, @@ -252,34 +217,28 @@ public class RECIPES_GREGTECH { // Convert GT++ Plutonium239 into normal Plutonium if (Materials.Plutonium.mDefaultLocalName.equals("Plutonium 239")) { CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(16), - ELEMENT.getInstance().PLUTONIUM239.getDust(1) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(16), + ELEMENT.getInstance().PLUTONIUM239.getDust(1) }, new FluidStack[] {}, - new ItemStack[] {ItemUtils.getItemStackOfAmountFromOreDict("dustPlutonium", 1)}, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustPlutonium", 1) }, new FluidStack[] {}, 5 * 20, 1, 2); CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(16), - ELEMENT.getInstance().PLUTONIUM239.getSmallDust(1) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(16), + ELEMENT.getInstance().PLUTONIUM239.getSmallDust(1) }, new FluidStack[] {}, - new ItemStack[] {ItemUtils.getItemStackOfAmountFromOreDict("dustSmallPlutonium", 1)}, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustSmallPlutonium", 1) }, new FluidStack[] {}, 5 * 20, 1, 2); CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(16), - ELEMENT.getInstance().PLUTONIUM239.getTinyDust(1) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(16), + ELEMENT.getInstance().PLUTONIUM239.getTinyDust(1) }, new FluidStack[] {}, - new ItemStack[] {ItemUtils.getItemStackOfAmountFromOreDict("dustTinyPlutonium", 1)}, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustTinyPlutonium", 1) }, new FluidStack[] {}, 5 * 20, 1, @@ -289,18 +248,12 @@ public class RECIPES_GREGTECH { int aLaureniumTier = ALLOY.LAURENIUM.vTier; // Adding Recipes for Casings CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(12), - CI.getTieredMachineCasing(aLaureniumTier - 1), - ALLOY.LAURENIUM.getPlate(8), - CI.getGear(aLaureniumTier, 2) - }, - new FluidStack[] { - CI.getTieredFluid(aLaureniumTier, 2 * 144), - CI.getAlternativeTieredFluid(aLaureniumTier - 1, 4 * 144), - CI.getTertiaryTieredFluid(aLaureniumTier - 2, 6 * 144) - }, - new ItemStack[] {GregtechItemList.Casing_Machine_Custom_3.get(1)}, + new ItemStack[] { CI.getNumberedAdvancedCircuit(12), CI.getTieredMachineCasing(aLaureniumTier - 1), + ALLOY.LAURENIUM.getPlate(8), CI.getGear(aLaureniumTier, 2) }, + new FluidStack[] { CI.getTieredFluid(aLaureniumTier, 2 * 144), + CI.getAlternativeTieredFluid(aLaureniumTier - 1, 4 * 144), + CI.getTertiaryTieredFluid(aLaureniumTier - 2, 6 * 144) }, + new ItemStack[] { GregtechItemList.Casing_Machine_Custom_3.get(1) }, new FluidStack[] {}, 20 * 20, MaterialUtils.getVoltageForTier(aLaureniumTier - 2), @@ -309,18 +262,12 @@ public class RECIPES_GREGTECH { int aBotmiumTier = ALLOY.BOTMIUM.vTier; // Adding Recipes for Casings CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(12), - CI.getTieredMachineCasing(aBotmiumTier - 1), - ALLOY.BOTMIUM.getPlate(8), - CI.getGear(aBotmiumTier, 2) - }, - new FluidStack[] { - CI.getTieredFluid(aBotmiumTier, 2 * 144), - CI.getAlternativeTieredFluid(aBotmiumTier - 1, 4 * 144), - CI.getTertiaryTieredFluid(aBotmiumTier - 2, 6 * 144) - }, - new ItemStack[] {GregtechItemList.Casing_Machine_Custom_4.get(1)}, + new ItemStack[] { CI.getNumberedAdvancedCircuit(12), CI.getTieredMachineCasing(aBotmiumTier - 1), + ALLOY.BOTMIUM.getPlate(8), CI.getGear(aBotmiumTier, 2) }, + new FluidStack[] { CI.getTieredFluid(aBotmiumTier, 2 * 144), + CI.getAlternativeTieredFluid(aBotmiumTier - 1, 4 * 144), + CI.getTertiaryTieredFluid(aBotmiumTier - 2, 6 * 144) }, + new ItemStack[] { GregtechItemList.Casing_Machine_Custom_4.get(1) }, new FluidStack[] {}, 20 * 20, MaterialUtils.getVoltageForTier(aBotmiumTier - 2), @@ -329,12 +276,10 @@ public class RECIPES_GREGTECH { // Refine GT HF into GT++ HF if (FluidUtils.doesHydrofluoricAcidGtExist()) { CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(22), - }, - new FluidStack[] {FluidUtils.getHydrofluoricAcid(2000), FluidUtils.getHydrofluoricAcidGT(5000)}, + new ItemStack[] { CI.getNumberedAdvancedCircuit(22), }, + new FluidStack[] { FluidUtils.getHydrofluoricAcid(2000), FluidUtils.getHydrofluoricAcidGT(5000) }, new ItemStack[] {}, - new FluidStack[] {FluidUtils.getHydrofluoricAcid(4500)}, + new FluidStack[] { FluidUtils.getHydrofluoricAcid(4500) }, 30 * 20, 480, 3); @@ -343,18 +288,28 @@ public class RECIPES_GREGTECH { private static void fluidheaterRecipes() { GT_Values.RA.addFluidHeaterRecipe( - CI.getNumberedCircuit(20), FluidUtils.getWater(1000), FluidUtils.getHotWater(1000), 30, 30); + CI.getNumberedCircuit(20), + FluidUtils.getWater(1000), + FluidUtils.getHotWater(1000), + 30, + 30); } private static void vacuumFreezerRecipes() { GT_Values.RA.addVacuumFreezerRecipe( - GregtechItemList.Bomb_Cast_Molten.get(1), GregtechItemList.Bomb_Cast_Set.get(1), 20 * 30); + GregtechItemList.Bomb_Cast_Molten.get(1), + GregtechItemList.Bomb_Cast_Set.get(1), + 20 * 30); } private static void latheRecipes() { GT_Values.RA.addLatheRecipe( - ALLOY.EGLIN_STEEL.getBlock(1), GregtechItemList.Bomb_Cast_Mold.get(1), null, 20 * 60 * 15, 120); + ALLOY.EGLIN_STEEL.getBlock(1), + GregtechItemList.Bomb_Cast_Mold.get(1), + null, + 20 * 60 * 15, + 120); GT_Values.RA.addLatheRecipe( GregtechItemList.Bomb_Cast_Set.get(1), @@ -378,14 +333,10 @@ public class RECIPES_GREGTECH { */ // Hydrogen Plasma - /*CORE.RA.addFusionReactorRecipe( - Particle.getIon("Hydrogen", 0), - Particle.getIon("Hydrogen", 0), - Materials.Hydrogen.getPlasma(1), - 5000, - 16, - 4096, - 40000000);*/ + /* + * CORE.RA.addFusionReactorRecipe( Particle.getIon("Hydrogen", 0), Particle.getIon("Hydrogen", 0), + * Materials.Hydrogen.getPlasma(1), 5000, 16, 4096, 40000000); + */ // Hypogen Creation GT_Values.RA.addFusionReactorRecipe( @@ -409,115 +360,77 @@ public class RECIPES_GREGTECH { private static void assemblyLineRecipes() { ItemStack[] aCoilWire = new ItemStack[] { - ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 0, GTNH ? 64 : 32), - ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 1, GTNH ? 64 : 32), - ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 2, GTNH ? 64 : 32), - ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 3, GTNH ? 64 : 32), - }; + ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 0, GTNH ? 64 : 32), + ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 1, GTNH ? 64 : 32), + ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 2, GTNH ? 64 : 32), + ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 3, GTNH ? 64 : 32), }; // Containment Casings CORE.RA.addAssemblylineRecipe( ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_1_CONTAINMENT, 1), 20 * 60 * 30, - new Object[] { - ItemList.Field_Generator_IV.get(GTNH ? 32 : 16), - ItemList.Electric_Motor_EV.get(GTNH ? 64 : 32), - ItemList.Energy_LapotronicOrb.get(GTNH ? 32 : 16), - CI.getTieredComponent(OrePrefixes.cableGt12, 7, GTNH ? 32 : 16), - CI.getTieredComponent(OrePrefixes.wireGt16, 6, GTNH ? 64 : 32), - ItemUtils.getOrePrefixStack(OrePrefixes.plate, Materials.Naquadria, GTNH ? 64 : 16), - ELEMENT.getInstance().GADOLINIUM.getDust(GTNH ? 32 : 8), - ELEMENT.getInstance().SAMARIUM.getDust(GTNH ? 16 : 4), - ALLOY.ARCANITE.getGear(GTNH ? 8 : 2), - new Object[] {CI.getTieredCircuitOreDictName(5), 64}, - new Object[] {CI.getTieredCircuitOreDictName(6), 32}, - new Object[] {CI.getTieredCircuitOreDictName(7), 16}, - GregtechItemList.Laser_Lens_Special.get(1), - aCoilWire[3] - }, - new FluidStack[] { - ALLOY.NITINOL_60.getFluidStack(144 * 9 * (GTNH ? 4 : 2)), - ALLOY.ENERGYCRYSTAL.getFluidStack(144 * 9 * (GTNH ? 8 : 4)), - ALLOY.TUMBAGA.getFluidStack(144 * 9 * (GTNH ? 32 : 8)), - ALLOY.NICHROME.getFluidStack(144 * 1 * (GTNH ? 16 : 4)), - }, + new Object[] { ItemList.Field_Generator_IV.get(GTNH ? 32 : 16), + ItemList.Electric_Motor_EV.get(GTNH ? 64 : 32), + ItemList.Energy_LapotronicOrb.get(GTNH ? 32 : 16), + CI.getTieredComponent(OrePrefixes.cableGt12, 7, GTNH ? 32 : 16), + CI.getTieredComponent(OrePrefixes.wireGt16, 6, GTNH ? 64 : 32), + ItemUtils.getOrePrefixStack(OrePrefixes.plate, Materials.Naquadria, GTNH ? 64 : 16), + ELEMENT.getInstance().GADOLINIUM.getDust(GTNH ? 32 : 8), + ELEMENT.getInstance().SAMARIUM.getDust(GTNH ? 16 : 4), ALLOY.ARCANITE.getGear(GTNH ? 8 : 2), + new Object[] { CI.getTieredCircuitOreDictName(5), 64 }, + new Object[] { CI.getTieredCircuitOreDictName(6), 32 }, + new Object[] { CI.getTieredCircuitOreDictName(7), 16 }, + GregtechItemList.Laser_Lens_Special.get(1), aCoilWire[3] }, + new FluidStack[] { ALLOY.NITINOL_60.getFluidStack(144 * 9 * (GTNH ? 4 : 2)), + ALLOY.ENERGYCRYSTAL.getFluidStack(144 * 9 * (GTNH ? 8 : 4)), + ALLOY.TUMBAGA.getFluidStack(144 * 9 * (GTNH ? 32 : 8)), + ALLOY.NICHROME.getFluidStack(144 * 1 * (GTNH ? 16 : 4)), }, ItemUtils.getSimpleStack(ModBlocks.blockCasings3Misc, 15, 32), 20 * 60 * 10 * (GTNH ? 2 : 1), (int) MaterialUtils.getVoltageForTier(6)); // Slow Fusion Controller - /*CORE.RA.addAssemblylineRecipe( - GregtechItemList.COMET_Cyclotron.get(1), - 20 * 60 * 30, - new ItemStack[] { - CI.getFieldGenerator(6, GTNH ? 32 : 8), - ItemList.Electric_Motor_EV.get(GTNH ? 32 : 8), - ItemList.Tool_Scanner.get(GTNH ? 4 : 2), - CI.getTieredComponent(OrePrefixes.cableGt12, 6, GTNH ? 32 : 16), - CI.getTieredComponent(OrePrefixes.wireGt16, 5, GTNH ? 64 : 32), - CI.getTieredComponent(OrePrefixes.plate, 6, GTNH ? 64 : 32), - ELEMENT.getInstance().GADOLINIUM.getDust(GTNH ? 32 : 8), - ELEMENT.getInstance().SAMARIUM.getDust(GTNH ? 16 : 4), - ALLOY.INCOLOY_MA956.getGear(GTNH ? 8 : 2), - CI.getTieredComponent(OrePrefixes.circuit, 5, GTNH ? 64 : 32), - CI.getTieredComponent(OrePrefixes.circuit, 6, GTNH ? 32 : 16), - CI.getTieredComponent(OrePrefixes.circuit, 7, GTNH ? 16 : 8) - }, - new FluidStack[] { - CI.getTieredFluid(6, 144 * 9 * (GTNH ? 8 : 4)), - CI.getTertiaryTieredFluid(6, 144 * 9 * (GTNH ? 8 : 4)), - CI.getAlternativeTieredFluid(6, 144 * 9 * (GTNH ? 8 : 4)), - CI.getTieredFluid(5, 144 * 9 * (GTNH ? 16 : 8)), - }, - GregtechItemList.Miniature_Fusion.get(1), - 20 * 60 * 5 * (GTNH ? 2 : 1), - (int) MaterialUtils.getVoltageForTier(7));*/ + /* + * CORE.RA.addAssemblylineRecipe( GregtechItemList.COMET_Cyclotron.get(1), 20 * 60 * 30, new ItemStack[] { + * CI.getFieldGenerator(6, GTNH ? 32 : 8), ItemList.Electric_Motor_EV.get(GTNH ? 32 : 8), + * ItemList.Tool_Scanner.get(GTNH ? 4 : 2), CI.getTieredComponent(OrePrefixes.cableGt12, 6, GTNH ? 32 : 16), + * CI.getTieredComponent(OrePrefixes.wireGt16, 5, GTNH ? 64 : 32), CI.getTieredComponent(OrePrefixes.plate, 6, + * GTNH ? 64 : 32), ELEMENT.getInstance().GADOLINIUM.getDust(GTNH ? 32 : 8), + * ELEMENT.getInstance().SAMARIUM.getDust(GTNH ? 16 : 4), ALLOY.INCOLOY_MA956.getGear(GTNH ? 8 : 2), + * CI.getTieredComponent(OrePrefixes.circuit, 5, GTNH ? 64 : 32), CI.getTieredComponent(OrePrefixes.circuit, 6, + * GTNH ? 32 : 16), CI.getTieredComponent(OrePrefixes.circuit, 7, GTNH ? 16 : 8) }, new FluidStack[] { + * CI.getTieredFluid(6, 144 * 9 * (GTNH ? 8 : 4)), CI.getTertiaryTieredFluid(6, 144 * 9 * (GTNH ? 8 : 4)), + * CI.getAlternativeTieredFluid(6, 144 * 9 * (GTNH ? 8 : 4)), CI.getTieredFluid(5, 144 * 9 * (GTNH ? 16 : 8)), + * }, GregtechItemList.Miniature_Fusion.get(1), 20 * 60 * 5 * (GTNH ? 2 : 1), (int) + * MaterialUtils.getVoltageForTier(7)); + */ // Plasma Tank - /*CORE.RA.addAssemblylineRecipe( - ItemUtils.getOrePrefixStack(OrePrefixes.pipeMedium, Materials.Superconductor, 1), - 20 * 60 * 5, - new ItemStack[] { - CI.getTieredComponent(OrePrefixes.plate, 5, GTNH ? 32 : 16), - CI.getTieredComponent(OrePrefixes.circuit, 5, GTNH ? 16 : 4), - CI.getTieredComponent(OrePrefixes.pipeHuge, 5, GTNH ? 16 : 4), - CI.getTieredComponent(OrePrefixes.cableGt08, 7, GTNH ? 32 : 16), - CI.getTieredComponent(OrePrefixes.gearGt, 6, GTNH ? 8 : 4), - aCoilWire[2] - }, - new FluidStack[] { - CI.getTieredFluid(4, 144 * 9 * (GTNH ? 16 : 8)), - CI.getTertiaryTieredFluid(4, 144 * 9 * (GTNH ? 16 : 8)), - CI.getAlternativeTieredFluid(4, 144 * 9 * (GTNH ? 16 : 8)), - - }, - GregtechItemList.Plasma_Tank.get(1), - 20 * 60 * 1 * (GTNH ? 2 : 1), - (int) MaterialUtils.getVoltageForTier(5));*/ + /* + * CORE.RA.addAssemblylineRecipe( ItemUtils.getOrePrefixStack(OrePrefixes.pipeMedium, Materials.Superconductor, + * 1), 20 * 60 * 5, new ItemStack[] { CI.getTieredComponent(OrePrefixes.plate, 5, GTNH ? 32 : 16), + * CI.getTieredComponent(OrePrefixes.circuit, 5, GTNH ? 16 : 4), CI.getTieredComponent(OrePrefixes.pipeHuge, 5, + * GTNH ? 16 : 4), CI.getTieredComponent(OrePrefixes.cableGt08, 7, GTNH ? 32 : 16), + * CI.getTieredComponent(OrePrefixes.gearGt, 6, GTNH ? 8 : 4), aCoilWire[2] }, new FluidStack[] { + * CI.getTieredFluid(4, 144 * 9 * (GTNH ? 16 : 8)), CI.getTertiaryTieredFluid(4, 144 * 9 * (GTNH ? 16 : 8)), + * CI.getAlternativeTieredFluid(4, 144 * 9 * (GTNH ? 16 : 8)), }, GregtechItemList.Plasma_Tank.get(1), 20 * 60 * + * 1 * (GTNH ? 2 : 1), (int) MaterialUtils.getVoltageForTier(5)); + */ // Turbine Automation Port CORE.RA.addAssemblylineRecipe( ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_8_TURBINE_AUTOMATION, 1), 20 * 60 * 60 * 24, - new Object[] { - CI.getTieredMachineHull(8, 4), - CI.getConveyor(8, GTNH ? 24 : 12), - CI.getElectricMotor(7, GTNH ? 32 : 16), - CI.getElectricPiston(7, GTNH ? 16 : 4), - CI.getEnergyCore(6, GTNH ? 8 : 2), - CI.getPlate(8, GTNH ? 24 : 12), - CI.getTieredComponent(OrePrefixes.screw, 8, GTNH ? 48 : 24), - CI.getTieredComponent(OrePrefixes.bolt, 7, GTNH ? 32 : 16), - CI.getTieredComponent(OrePrefixes.rod, 6, GTNH ? 12 : 6), - new Object[] {CI.getTieredCircuitOreDictName(7), 20}, - CI.getTieredComponent(OrePrefixes.rotor, 6, GTNH ? 16 : 8), - }, - new FluidStack[] { - CI.getTieredFluid(8, 144 * 32), - CI.getAlternativeTieredFluid(7, 144 * 16), - CI.getTertiaryTieredFluid(7, 144 * 16), - ALLOY.BABBIT_ALLOY.getFluidStack(128 * 144) - }, + new Object[] { CI.getTieredMachineHull(8, 4), CI.getConveyor(8, GTNH ? 24 : 12), + CI.getElectricMotor(7, GTNH ? 32 : 16), CI.getElectricPiston(7, GTNH ? 16 : 4), + CI.getEnergyCore(6, GTNH ? 8 : 2), CI.getPlate(8, GTNH ? 24 : 12), + CI.getTieredComponent(OrePrefixes.screw, 8, GTNH ? 48 : 24), + CI.getTieredComponent(OrePrefixes.bolt, 7, GTNH ? 32 : 16), + CI.getTieredComponent(OrePrefixes.rod, 6, GTNH ? 12 : 6), + new Object[] { CI.getTieredCircuitOreDictName(7), 20 }, + CI.getTieredComponent(OrePrefixes.rotor, 6, GTNH ? 16 : 8), }, + new FluidStack[] { CI.getTieredFluid(8, 144 * 32), CI.getAlternativeTieredFluid(7, 144 * 16), + CI.getTertiaryTieredFluid(7, 144 * 16), ALLOY.BABBIT_ALLOY.getFluidStack(128 * 144) }, GregtechItemList.Hatch_Input_TurbineHousing.get(4), 20 * 60 * 60 * (GTNH ? 2 : 1), (int) MaterialUtils.getVoltageForTier(8)); @@ -526,35 +439,24 @@ public class RECIPES_GREGTECH { * Contianment casings */ - ItemStack[] aGemCasings = new ItemStack[] { - GregtechItemList.Battery_Casing_Gem_1.get(1), - GregtechItemList.Battery_Casing_Gem_2.get(1), - GregtechItemList.Battery_Casing_Gem_3.get(1), - GregtechItemList.Battery_Casing_Gem_4.get(1), - }; - ItemStack[] aResearch = new ItemStack[] { - Particle.getBaseParticle(Particle.UNKNOWN), - GregtechItemList.Battery_Casing_Gem_1.get(1), - GregtechItemList.Battery_Casing_Gem_2.get(1), - GregtechItemList.Battery_Casing_Gem_3.get(1), - }; + ItemStack[] aGemCasings = new ItemStack[] { GregtechItemList.Battery_Casing_Gem_1.get(1), + GregtechItemList.Battery_Casing_Gem_2.get(1), GregtechItemList.Battery_Casing_Gem_3.get(1), + GregtechItemList.Battery_Casing_Gem_4.get(1), }; + ItemStack[] aResearch = new ItemStack[] { Particle.getBaseParticle(Particle.UNKNOWN), + GregtechItemList.Battery_Casing_Gem_1.get(1), GregtechItemList.Battery_Casing_Gem_2.get(1), + GregtechItemList.Battery_Casing_Gem_3.get(1), }; int aCasingSlot = 0; for (int j = 6; j < 10; j++) { CORE.RA.addAssemblylineRecipe( aResearch[aCasingSlot], 20 * 60 * 60, - new ItemStack[] { - CI.getTieredComponent(OrePrefixes.plate, j - 1, 16), - CI.getTieredComponent(OrePrefixes.cableGt08, j + 1, (GTNH ? 32 : 16)), - CI.getTieredComponent(OrePrefixes.gearGt, j - 1, 4), - aCoilWire[aCasingSlot] - }, - new FluidStack[] { - CI.getTieredFluid(j, 144 * (GTNH ? 8 : 4)), - CI.getTertiaryTieredFluid(j - 2, 144 * (GTNH ? 16 : 8)), - CI.getAlternativeTieredFluid(j, 144 * (GTNH ? 16 : 12)), - }, + new ItemStack[] { CI.getTieredComponent(OrePrefixes.plate, j - 1, 16), + CI.getTieredComponent(OrePrefixes.cableGt08, j + 1, (GTNH ? 32 : 16)), + CI.getTieredComponent(OrePrefixes.gearGt, j - 1, 4), aCoilWire[aCasingSlot] }, + new FluidStack[] { CI.getTieredFluid(j, 144 * (GTNH ? 8 : 4)), + CI.getTertiaryTieredFluid(j - 2, 144 * (GTNH ? 16 : 8)), + CI.getAlternativeTieredFluid(j, 144 * (GTNH ? 16 : 12)), }, aGemCasings[aCasingSlot++], 20 * 60 * 1 * (GTNH ? 2 : 1), (int) MaterialUtils.getVoltageForTier(j)); @@ -564,39 +466,28 @@ public class RECIPES_GREGTECH { * Gem Battery Recipes */ - ItemStack[] aGemBatteries = new ItemStack[] { - GregtechItemList.Battery_Gem_1.get(1), - GregtechItemList.Battery_Gem_2.get(1), - GregtechItemList.Battery_Gem_3.get(1), - GregtechItemList.Battery_Gem_4.get(1), - }; - - ItemStack[] aExoticInputs = new ItemStack[] { - Particle.getBaseParticle(Particle.PROTON), - Particle.getBaseParticle(Particle.ELECTRON), - Particle.getBaseParticle(Particle.CHARM), - Particle.getBaseParticle(Particle.GRAVITON) - }; + ItemStack[] aGemBatteries = new ItemStack[] { GregtechItemList.Battery_Gem_1.get(1), + GregtechItemList.Battery_Gem_2.get(1), GregtechItemList.Battery_Gem_3.get(1), + GregtechItemList.Battery_Gem_4.get(1), }; + + ItemStack[] aExoticInputs = new ItemStack[] { Particle.getBaseParticle(Particle.PROTON), + Particle.getBaseParticle(Particle.ELECTRON), Particle.getBaseParticle(Particle.CHARM), + Particle.getBaseParticle(Particle.GRAVITON) }; aCasingSlot = 0; for (int j = 6; j < 10; j++) { CORE.RA.addAssemblylineRecipe( aExoticInputs[aCasingSlot], 20 * 60 * 60 * 5, - new Object[] { - aGemCasings[aCasingSlot], - ItemUtils.getSimpleStack(aExoticInputs[aCasingSlot], 16), - CI.getTieredComponent(OrePrefixes.plate, j, 16), - new Object[] {CI.getTieredCircuitOreDictName(j), 8}, - CI.getTieredComponent(OrePrefixes.wireGt16, j + 1, GTNH ? 32 : 16), - CI.getTieredComponent(OrePrefixes.bolt, j, GTNH ? 8 : 4), - CI.getTieredComponent(OrePrefixes.screw, j - 1, GTNH ? 8 : 4), - }, - new FluidStack[] { - CI.getTieredFluid(j, 144 * 1 * (GTNH ? 16 : 8)), - CI.getTertiaryTieredFluid(j - 2, 144 * 2 * (GTNH ? 16 : 8)), - CI.getAlternativeTieredFluid(j, 144 * (GTNH ? 16 : 8)), - CI.getTertiaryTieredFluid(j - 1, 144 * (GTNH ? 16 : 8)), - }, + new Object[] { aGemCasings[aCasingSlot], ItemUtils.getSimpleStack(aExoticInputs[aCasingSlot], 16), + CI.getTieredComponent(OrePrefixes.plate, j, 16), + new Object[] { CI.getTieredCircuitOreDictName(j), 8 }, + CI.getTieredComponent(OrePrefixes.wireGt16, j + 1, GTNH ? 32 : 16), + CI.getTieredComponent(OrePrefixes.bolt, j, GTNH ? 8 : 4), + CI.getTieredComponent(OrePrefixes.screw, j - 1, GTNH ? 8 : 4), }, + new FluidStack[] { CI.getTieredFluid(j, 144 * 1 * (GTNH ? 16 : 8)), + CI.getTertiaryTieredFluid(j - 2, 144 * 2 * (GTNH ? 16 : 8)), + CI.getAlternativeTieredFluid(j, 144 * (GTNH ? 16 : 8)), + CI.getTertiaryTieredFluid(j - 1, 144 * (GTNH ? 16 : 8)), }, aGemBatteries[aCasingSlot++], 20 * 60 * 1 * (GTNH ? 2 : 1), (int) MaterialUtils.getVoltageForTier(j)); @@ -607,23 +498,18 @@ public class RECIPES_GREGTECH { CORE.RA.addAssemblylineRecipe( ItemUtils.simpleMetaStack(Items.golden_apple, 1, 1), 20 * 60 * 10, - new Object[] { - ItemUtils.getSimpleStack(aGemCasings[2], GTNH ? 4 : 2), - CI.getTieredComponent(OrePrefixes.plate, 8, GTNH ? 32 : 16), - new Object[] {CI.getTieredCircuitOreDictName(7), 16}, - CI.getTieredComponent(OrePrefixes.cableGt02, 7, GTNH ? 16 : 8), - CI.getTieredComponent(OrePrefixes.gearGt, 6, GTNH ? 6 : 3), - CI.getTieredComponent(OrePrefixes.screw, 7, GTNH ? 16 : 8), - CI.getTieredComponent(OrePrefixes.bolt, 5, GTNH ? 24 : 12), - CI.getTieredComponent(OrePrefixes.frameGt, 4, GTNH ? 12 : 6), - aCoilWire[3] - }, - new FluidStack[] { - CI.getTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)), - CI.getTertiaryTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)), - CI.getAlternativeTieredFluid(6, 144 * 18 * (GTNH ? 16 : 8)), - CI.getAlternativeTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)), - }, + new Object[] { ItemUtils.getSimpleStack(aGemCasings[2], GTNH ? 4 : 2), + CI.getTieredComponent(OrePrefixes.plate, 8, GTNH ? 32 : 16), + new Object[] { CI.getTieredCircuitOreDictName(7), 16 }, + CI.getTieredComponent(OrePrefixes.cableGt02, 7, GTNH ? 16 : 8), + CI.getTieredComponent(OrePrefixes.gearGt, 6, GTNH ? 6 : 3), + CI.getTieredComponent(OrePrefixes.screw, 7, GTNH ? 16 : 8), + CI.getTieredComponent(OrePrefixes.bolt, 5, GTNH ? 24 : 12), + CI.getTieredComponent(OrePrefixes.frameGt, 4, GTNH ? 12 : 6), aCoilWire[3] }, + new FluidStack[] { CI.getTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)), + CI.getTertiaryTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)), + CI.getAlternativeTieredFluid(6, 144 * 18 * (GTNH ? 16 : 8)), + CI.getAlternativeTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)), }, ItemUtils.getItemStackFromFQRN("miscutils:personalHealingDevice", 1), 20 * 60 * 30 * (GTNH ? 2 : 1), (int) MaterialUtils.getVoltageForTier(7)); @@ -631,41 +517,33 @@ public class RECIPES_GREGTECH { // Charge Pack LuV-UV ItemStack[] aChargeResearch = new ItemStack[] { - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore7", 1), - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore8", 1), - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore9", 1), - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore10", 1), - }; - - ItemStack[] aChargeOutputs = new ItemStack[] { - ItemUtils.getSimpleStack(ModItems.itemChargePack_High_1, 1), - ItemUtils.getSimpleStack(ModItems.itemChargePack_High_2, 1), - ItemUtils.getSimpleStack(ModItems.itemChargePack_High_3, 1), - ItemUtils.getSimpleStack(ModItems.itemChargePack_High_4, 1), - }; + ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore7", 1), + ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore8", 1), + ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore9", 1), + ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore10", 1), }; + + ItemStack[] aChargeOutputs = new ItemStack[] { ItemUtils.getSimpleStack(ModItems.itemChargePack_High_1, 1), + ItemUtils.getSimpleStack(ModItems.itemChargePack_High_2, 1), + ItemUtils.getSimpleStack(ModItems.itemChargePack_High_3, 1), + ItemUtils.getSimpleStack(ModItems.itemChargePack_High_4, 1), }; int aCurrSlot = 0; for (int h = 6; h < 10; h++) { CORE.RA.addAssemblylineRecipe( aChargeResearch[aCurrSlot], 20 * 60 * 10 * (aCurrSlot + 1), - new Object[] { - ItemUtils.getSimpleStack(aGemBatteries[aCurrSlot], 2), - aCoilWire[aCurrSlot], - CI.getTieredComponent(OrePrefixes.plate, h, 8), - new Object[] {CI.getTieredCircuitOreDictName(h), 4}, - new Object[] {CI.getTieredCircuitOreDictName(h - 1), 8}, - CI.getTieredComponent(OrePrefixes.cableGt12, h - 1, 16), - CI.getTieredComponent(OrePrefixes.screw, h, GTNH ? 16 : 8), - CI.getTieredComponent(OrePrefixes.bolt, h - 2, GTNH ? 32 : 16), - CI.getFieldGenerator(h, 1), - }, - new FluidStack[] { - CI.getTieredFluid(h, 144 * 4 * (GTNH ? 8 : 4)), - CI.getTertiaryTieredFluid(h - 1, 144 * 4 * (GTNH ? 8 : 4)), - CI.getAlternativeTieredFluid(h - 1, 144 * 4 * (GTNH ? 8 : 4)), - CI.getAlternativeTieredFluid(h - 2, 144 * 4 * (GTNH ? 8 : 4)), - }, + new Object[] { ItemUtils.getSimpleStack(aGemBatteries[aCurrSlot], 2), aCoilWire[aCurrSlot], + CI.getTieredComponent(OrePrefixes.plate, h, 8), + new Object[] { CI.getTieredCircuitOreDictName(h), 4 }, + new Object[] { CI.getTieredCircuitOreDictName(h - 1), 8 }, + CI.getTieredComponent(OrePrefixes.cableGt12, h - 1, 16), + CI.getTieredComponent(OrePrefixes.screw, h, GTNH ? 16 : 8), + CI.getTieredComponent(OrePrefixes.bolt, h - 2, GTNH ? 32 : 16), + CI.getFieldGenerator(h, 1), }, + new FluidStack[] { CI.getTieredFluid(h, 144 * 4 * (GTNH ? 8 : 4)), + CI.getTertiaryTieredFluid(h - 1, 144 * 4 * (GTNH ? 8 : 4)), + CI.getAlternativeTieredFluid(h - 1, 144 * 4 * (GTNH ? 8 : 4)), + CI.getAlternativeTieredFluid(h - 2, 144 * 4 * (GTNH ? 8 : 4)), }, aChargeOutputs[aCurrSlot], 20 * 60 * 30 * (GTNH ? 2 : 1) * (aCurrSlot + 1), (int) MaterialUtils.getVoltageForTier(h)); @@ -676,23 +554,18 @@ public class RECIPES_GREGTECH { CORE.RA.addAssemblylineRecipe( ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_9_CLOAKING, 1), 20 * 60 * 10, - new Object[] { - ItemUtils.getSimpleStack(aGemCasings[3], GTNH ? 4 : 2), - CI.getTieredComponent(OrePrefixes.plate, 8, GTNH ? 32 : 16), - new Object[] {CI.getTieredCircuitOreDictName(7), 16}, - CI.getTieredComponent(OrePrefixes.cableGt04, 8, GTNH ? 16 : 8), - CI.getTieredComponent(OrePrefixes.gearGt, 7, GTNH ? 6 : 3), - CI.getTieredComponent(OrePrefixes.screw, 8, GTNH ? 16 : 8), - CI.getTieredComponent(OrePrefixes.bolt, 7, GTNH ? 24 : 12), - CI.getTieredComponent(OrePrefixes.frameGt, 5, GTNH ? 12 : 6), - aCoilWire[3] - }, - new FluidStack[] { - CI.getTieredFluid(8, 144 * 18 * (GTNH ? 16 : 8)), - CI.getTertiaryTieredFluid(8, 144 * 18 * (GTNH ? 16 : 8)), - CI.getAlternativeTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)), - CI.getAlternativeTieredFluid(8, 144 * 18 * (GTNH ? 16 : 8)), - }, + new Object[] { ItemUtils.getSimpleStack(aGemCasings[3], GTNH ? 4 : 2), + CI.getTieredComponent(OrePrefixes.plate, 8, GTNH ? 32 : 16), + new Object[] { CI.getTieredCircuitOreDictName(7), 16 }, + CI.getTieredComponent(OrePrefixes.cableGt04, 8, GTNH ? 16 : 8), + CI.getTieredComponent(OrePrefixes.gearGt, 7, GTNH ? 6 : 3), + CI.getTieredComponent(OrePrefixes.screw, 8, GTNH ? 16 : 8), + CI.getTieredComponent(OrePrefixes.bolt, 7, GTNH ? 24 : 12), + CI.getTieredComponent(OrePrefixes.frameGt, 5, GTNH ? 12 : 6), aCoilWire[3] }, + new FluidStack[] { CI.getTieredFluid(8, 144 * 18 * (GTNH ? 16 : 8)), + CI.getTertiaryTieredFluid(8, 144 * 18 * (GTNH ? 16 : 8)), + CI.getAlternativeTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)), + CI.getAlternativeTieredFluid(8, 144 * 18 * (GTNH ? 16 : 8)), }, ItemUtils.getItemStackFromFQRN("miscutils:personalCloakingDevice", 1), 20 * 60 * 30 * (GTNH ? 2 : 1), (int) MaterialUtils.getVoltageForTier(8)); @@ -700,24 +573,18 @@ public class RECIPES_GREGTECH { GT_Values.RA.addAssemblylineRecipe( GregtechItemList.Industrial_AlloyBlastSmelter.get(1, new Object() {}), 20 * 60 * 30, - new Object[] { - GregtechItemList.Industrial_AlloyBlastSmelter.get(64L, new Object() {}), - GregtechItemList.Industrial_AlloyBlastSmelter.get(64L, new Object() {}), - GregtechItemList.Industrial_AlloyBlastSmelter.get(64L, new Object() {}), - GregtechItemList.Industrial_AlloyBlastSmelter.get(64L, new Object() {}), - ItemList.UV_Coil.get(16L, new Object() {}), - ItemList.Conveyor_Module_UV.get(4L, new Object() {}), - new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 8}, - new Object[] {OrePrefixes.circuit.get(Materials.Ultimate), 16}, - ItemList.Circuit_Chip_PPIC.get(16, new Object() {}), - ALLOY.PIKYONIUM.getPlate(16), - ALLOY.CINOBITE.getScrew(32) - }, - new FluidStack[] { - ALLOY.PIKYONIUM.getFluidStack(144 * 8), - ALLOY.INDALLOY_140.getFluidStack(144 * 9), - Materials.SolderingAlloy.getMolten(144 * 10) - }, + new Object[] { GregtechItemList.Industrial_AlloyBlastSmelter.get(64L, new Object() {}), + GregtechItemList.Industrial_AlloyBlastSmelter.get(64L, new Object() {}), + GregtechItemList.Industrial_AlloyBlastSmelter.get(64L, new Object() {}), + GregtechItemList.Industrial_AlloyBlastSmelter.get(64L, new Object() {}), + ItemList.UV_Coil.get(16L, new Object() {}), + ItemList.Conveyor_Module_UV.get(4L, new Object() {}), + new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 8 }, + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 16 }, + ItemList.Circuit_Chip_PPIC.get(16, new Object() {}), ALLOY.PIKYONIUM.getPlate(16), + ALLOY.CINOBITE.getScrew(32) }, + new FluidStack[] { ALLOY.PIKYONIUM.getFluidStack(144 * 8), ALLOY.INDALLOY_140.getFluidStack(144 * 9), + Materials.SolderingAlloy.getMolten(144 * 10) }, GregtechItemList.Mega_AlloyBlastSmelter.get(1L), 60 * 20, 1000000); @@ -726,18 +593,12 @@ public class RECIPES_GREGTECH { private static void laserEngraverRecipes() { // Laser Sensors and Emitters together - GregtechItemList[] aTransParts = new GregtechItemList[] { - GregtechItemList.TransmissionComponent_ULV, - GregtechItemList.TransmissionComponent_LV, - GregtechItemList.TransmissionComponent_MV, - GregtechItemList.TransmissionComponent_HV, - GregtechItemList.TransmissionComponent_EV, - GregtechItemList.TransmissionComponent_IV, - GregtechItemList.TransmissionComponent_LuV, - GregtechItemList.TransmissionComponent_ZPM, - GregtechItemList.TransmissionComponent_UV, - GregtechItemList.TransmissionComponent_MAX, - }; + GregtechItemList[] aTransParts = new GregtechItemList[] { GregtechItemList.TransmissionComponent_ULV, + GregtechItemList.TransmissionComponent_LV, GregtechItemList.TransmissionComponent_MV, + GregtechItemList.TransmissionComponent_HV, GregtechItemList.TransmissionComponent_EV, + GregtechItemList.TransmissionComponent_IV, GregtechItemList.TransmissionComponent_LuV, + GregtechItemList.TransmissionComponent_ZPM, GregtechItemList.TransmissionComponent_UV, + GregtechItemList.TransmissionComponent_MAX, }; for (int i = 0; i < 10; i++) { GT_Values.RA.addLaserEngraverRecipe( CI.getEmitter(i, 2), @@ -747,12 +608,12 @@ public class RECIPES_GREGTECH { MaterialUtils.getVoltageForTier(i)); GT_Recipe.GT_Recipe_Map.sDisassemblerRecipes.addRecipe( false, - new ItemStack[] {aTransParts[i].get(1)}, - new ItemStack[] {CI.getEmitter(i, 2), CI.getSensor(i, 2)}, + new ItemStack[] { aTransParts[i].get(1) }, + new ItemStack[] { CI.getEmitter(i, 2), CI.getSensor(i, 2) }, null, null, - new FluidStack[] {GT_Values.NF}, - new FluidStack[] {GT_Values.NF}, + new FluidStack[] { GT_Values.NF }, + new FluidStack[] { GT_Values.NF }, Math.max(300 >> Math.max(i - 1, 0), 1), MaterialUtils.getVoltageForTier(i), 0); @@ -812,9 +673,19 @@ public class RECIPES_GREGTECH { private static void breweryRecipes() { CORE.RA.addBrewingRecipe( - 14, EnchantingUtils.getMobEssence(100), EnchantingUtils.getLiquidXP(1332), 100, 120, false); + 14, + EnchantingUtils.getMobEssence(100), + EnchantingUtils.getLiquidXP(1332), + 100, + 120, + false); CORE.RA.addBrewingRecipe( - 14, EnchantingUtils.getLiquidXP(1332), EnchantingUtils.getMobEssence(100), 100, 120, false); + 14, + EnchantingUtils.getLiquidXP(1332), + EnchantingUtils.getMobEssence(100), + 100, + 120, + false); CORE.RA.addBrewingRecipe( ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest), FluidUtils.getFluidStack("water", 100), @@ -883,17 +754,11 @@ public class RECIPES_GREGTECH { if (!GTNH) { // Trinium CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { - ItemUtils.getGregtechCircuit(8), - ELEMENT.getInstance().BISMUTH.getDust(8), - ELEMENT.getInstance().IRON.getDust(64), - ELEMENT.getInstance().CARBON.getDust(16), - ELEMENT.getInstance().GOLD.getDust(16), - ELEMENT.getInstance().SILVER.getDust(16), - ELEMENT.getInstance().OSMIUM.getDust(4), - ELEMENT.getInstance().IRIDIUM.getDust(4), - ELEMENT.getInstance().CERIUM.getDust(8) - }, + new ItemStack[] { ItemUtils.getGregtechCircuit(8), ELEMENT.getInstance().BISMUTH.getDust(8), + ELEMENT.getInstance().IRON.getDust(64), ELEMENT.getInstance().CARBON.getDust(16), + ELEMENT.getInstance().GOLD.getDust(16), ELEMENT.getInstance().SILVER.getDust(16), + ELEMENT.getInstance().OSMIUM.getDust(4), ELEMENT.getInstance().IRIDIUM.getDust(4), + ELEMENT.getInstance().CERIUM.getDust(8) }, FluidUtils.getFluidStack("molten.trinium", 136 * 144), 0, 20 * 3000, @@ -902,15 +767,9 @@ public class RECIPES_GREGTECH { // Eglin Steel CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { - ItemUtils.getGregtechCircuit(6), - ELEMENT.getInstance().IRON.getDust(4), - ALLOY.KANTHAL.getDust(1), - ALLOY.INVAR.getDust(5), - ELEMENT.getInstance().SULFUR.getDust(1), - ELEMENT.getInstance().CARBON.getDust(1), - ELEMENT.getInstance().SILICON.getDust(4) - }, + new ItemStack[] { ItemUtils.getGregtechCircuit(6), ELEMENT.getInstance().IRON.getDust(4), + ALLOY.KANTHAL.getDust(1), ALLOY.INVAR.getDust(5), ELEMENT.getInstance().SULFUR.getDust(1), + ELEMENT.getInstance().CARBON.getDust(1), ELEMENT.getInstance().SILICON.getDust(4) }, ALLOY.EGLIN_STEEL.getFluidStack(16 * 144), 0, 20 * 45, @@ -918,29 +777,20 @@ public class RECIPES_GREGTECH { // HG1223 CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { - ItemUtils.getGregtechCircuit(5), - ELEMENT.getInstance().BARIUM.getDust(2), - ELEMENT.getInstance().CALCIUM.getDust(2), - ELEMENT.getInstance().COPPER.getDust(3), - }, - new FluidStack[] { - ELEMENT.getInstance().OXYGEN.getFluidStack(8000), - ELEMENT.getInstance().MERCURY.getFluidStack(1000), - }, + new ItemStack[] { ItemUtils.getGregtechCircuit(5), ELEMENT.getInstance().BARIUM.getDust(2), + ELEMENT.getInstance().CALCIUM.getDust(2), ELEMENT.getInstance().COPPER.getDust(3), }, + new FluidStack[] { ELEMENT.getInstance().OXYGEN.getFluidStack(8000), + ELEMENT.getInstance().MERCURY.getFluidStack(1000), }, ALLOY.HG1223.getFluidStack(16 * 144), null, - new int[] {10000}, // Output Chance + new int[] { 10000 }, // Output Chance 20 * 120, 30720); // NITINOL_60 CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { - ItemUtils.getGregtechCircuit(2), - ELEMENT.getInstance().TITANIUM.getDust(3), - ELEMENT.getInstance().NICKEL.getDust(2) - }, + new ItemStack[] { ItemUtils.getGregtechCircuit(2), ELEMENT.getInstance().TITANIUM.getDust(3), + ELEMENT.getInstance().NICKEL.getDust(2) }, ALLOY.NITINOL_60.getFluidStack(5 * 144), 0, 20 * 75, @@ -948,14 +798,9 @@ public class RECIPES_GREGTECH { // INDALLOY_140 CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { - ItemUtils.getGregtechCircuit(5), - ELEMENT.getInstance().BISMUTH.getDust(47), - ELEMENT.getInstance().LEAD.getDust(25), - ELEMENT.getInstance().TIN.getDust(13), - ELEMENT.getInstance().CADMIUM.getDust(10), - ELEMENT.getInstance().INDIUM.getDust(5) - }, + new ItemStack[] { ItemUtils.getGregtechCircuit(5), ELEMENT.getInstance().BISMUTH.getDust(47), + ELEMENT.getInstance().LEAD.getDust(25), ELEMENT.getInstance().TIN.getDust(13), + ELEMENT.getInstance().CADMIUM.getDust(10), ELEMENT.getInstance().INDIUM.getDust(5) }, ALLOY.INDALLOY_140.getFluidStack(100 * 144), 0, 20 * 40, @@ -963,11 +808,9 @@ public class RECIPES_GREGTECH { // Germanium Roasting CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { - ItemUtils.getGregtechCircuit(15), - ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedSphalerite", 8), - ELEMENT.getInstance().CARBON.getDust(32), - }, + new ItemStack[] { ItemUtils.getGregtechCircuit(15), + ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedSphalerite", 8), + ELEMENT.getInstance().CARBON.getDust(32), }, Materials.SulfuricAcid.getFluid(2000), ELEMENT.getInstance().GERMANIUM.getFluidStack(288), 0, @@ -976,44 +819,36 @@ public class RECIPES_GREGTECH { // Ruthenium Roasting CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { - ItemUtils.getGregtechCircuit(19), - ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedIridium", 8), - ELEMENT.getInstance().CARBON.getDust(32), - }, + new ItemStack[] { ItemUtils.getGregtechCircuit(19), + ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedIridium", 8), + ELEMENT.getInstance().CARBON.getDust(32), }, Materials.SulfuricAcid.getFluid(2000), ELEMENT.getInstance().RUTHENIUM.getFluidStack(288), 0, 20 * 300, 8000); CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { - ItemUtils.getGregtechCircuit(19), - ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedOsmium", 8), - ELEMENT.getInstance().CARBON.getDust(32), - }, + new ItemStack[] { ItemUtils.getGregtechCircuit(19), + ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedOsmium", 8), + ELEMENT.getInstance().CARBON.getDust(32), }, Materials.SulfuricAcid.getFluid(2000), ELEMENT.getInstance().RUTHENIUM.getFluidStack(288), 0, 20 * 300, 8000); CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { - ItemUtils.getGregtechCircuit(19), - ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedPlatinum", 8), - ELEMENT.getInstance().CARBON.getDust(32), - }, + new ItemStack[] { ItemUtils.getGregtechCircuit(19), + ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedPlatinum", 8), + ELEMENT.getInstance().CARBON.getDust(32), }, Materials.SulfuricAcid.getFluid(2000), ELEMENT.getInstance().RUTHENIUM.getFluidStack(288), 0, 20 * 300, 8000); CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { - ItemUtils.getGregtechCircuit(19), - ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedCooperite", 8), - ELEMENT.getInstance().CARBON.getDust(32), - }, + new ItemStack[] { ItemUtils.getGregtechCircuit(19), + ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedCooperite", 8), + ELEMENT.getInstance().CARBON.getDust(32), }, Materials.SulfuricAcid.getFluid(8000), ELEMENT.getInstance().RUTHENIUM.getFluidStack(144), 0, @@ -1022,33 +857,27 @@ public class RECIPES_GREGTECH { // Rhenium Roasting CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { - ItemUtils.getGregtechCircuit(20), - ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedScheelite", 8), - ELEMENT.getInstance().CARBON.getDust(32), - }, + new ItemStack[] { ItemUtils.getGregtechCircuit(20), + ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedScheelite", 8), + ELEMENT.getInstance().CARBON.getDust(32), }, Materials.SulfuricAcid.getFluid(10000), ELEMENT.getInstance().RHENIUM.getFluidStack(144), 0, 20 * 300, 4000); CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { - ItemUtils.getGregtechCircuit(20), - ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedMolybdenite", 8), - ELEMENT.getInstance().CARBON.getDust(32), - }, + new ItemStack[] { ItemUtils.getGregtechCircuit(20), + ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedMolybdenite", 8), + ELEMENT.getInstance().CARBON.getDust(32), }, Materials.SulfuricAcid.getFluid(7500), ELEMENT.getInstance().RHENIUM.getFluidStack(144), 0, 20 * 300, 4000); CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { - ItemUtils.getGregtechCircuit(20), - ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedMolybdenum", 8), - ELEMENT.getInstance().CARBON.getDust(32), - }, + new ItemStack[] { ItemUtils.getGregtechCircuit(20), + ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedMolybdenum", 8), + ELEMENT.getInstance().CARBON.getDust(32), }, Materials.SulfuricAcid.getFluid(5000), ELEMENT.getInstance().RHENIUM.getFluidStack(288), 0, @@ -1057,16 +886,14 @@ public class RECIPES_GREGTECH { // Thallium Roasting CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { - ItemUtils.getGregtechCircuit(21), - ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedZinc", 3), - ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedPyrite", 4), - ELEMENT.getInstance().CARBON.getDust(16), - }, + new ItemStack[] { ItemUtils.getGregtechCircuit(21), + ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedZinc", 3), + ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedPyrite", 4), + ELEMENT.getInstance().CARBON.getDust(16), }, Materials.SulfuricAcid.getFluid(1250), ELEMENT.getInstance().THALLIUM.getFluidStack(288), new ItemStack[] {}, - new int[] {0}, + new int[] { 0 }, 20 * 75, 8000, 3700, @@ -1074,30 +901,23 @@ public class RECIPES_GREGTECH { // Strontium processing CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { - ItemUtils.getGregtechCircuit(21), - MISC_MATERIALS.STRONTIUM_OXIDE.getDust(8), - ELEMENT.getInstance().ALUMINIUM.getDust(8), - }, + new ItemStack[] { ItemUtils.getGregtechCircuit(21), MISC_MATERIALS.STRONTIUM_OXIDE.getDust(8), + ELEMENT.getInstance().ALUMINIUM.getDust(8), }, (FluidStack) null, ELEMENT.getInstance().OXYGEN.getFluidStack(8000), - new ItemStack[] { - ELEMENT.getInstance().ALUMINIUM.getIngot(8), - ELEMENT.getInstance().STRONTIUM.getIngot(8) - }, - new int[] {10000, 10000}, // Output Chance + new ItemStack[] { ELEMENT.getInstance().ALUMINIUM.getIngot(8), + ELEMENT.getInstance().STRONTIUM.getIngot(8) }, + new int[] { 10000, 10000 }, // Output Chance 20 * 120, 480 * 4); // molten botmium CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { - ItemUtils.getGregtechCircuit(4), - ItemUtils.getItemStackOfAmountFromOreDict("dustNitinol60", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustOsmium", 6), - ItemUtils.getItemStackOfAmountFromOreDict("dustRuthenium", 6), - ItemUtils.getItemStackOfAmountFromOreDict("dustThallium", 3) - }, + new ItemStack[] { ItemUtils.getGregtechCircuit(4), + ItemUtils.getItemStackOfAmountFromOreDict("dustNitinol60", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustOsmium", 6), + ItemUtils.getItemStackOfAmountFromOreDict("dustRuthenium", 6), + ItemUtils.getItemStackOfAmountFromOreDict("dustThallium", 3) }, GT_Values.NF, ALLOY.BOTMIUM.getFluidStack(2304), 0, @@ -1158,7 +978,10 @@ public class RECIPES_GREGTECH { // Ender Fluid CORE.RA.addFluidExtractionRecipe( - ItemUtils.getSimpleStack(Items.ender_pearl), FluidUtils.getFluidStack("ender", 250), 100, 30); + ItemUtils.getSimpleStack(Items.ender_pearl), + FluidUtils.getFluidStack("ender", 250), + 100, + 30); // Blazing Pyrotheum CORE.RA.addFluidExtractionRecipe( @@ -1237,46 +1060,41 @@ public class RECIPES_GREGTECH { ItemStack cropGrape = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cropGrape", 1); ItemStack foodRaisins = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foodRaisins", 1); - if (cropGrape != null && foodRaisins != null) - CORE.RA.addDehydratorRecipe( - new ItemStack[] {CI.getNumberedBioCircuit(20), cropGrape}, // Item - null, // Fluid input (slot 1) - null, // Fluid output (slot 2) - new ItemStack[] {foodRaisins}, // Output - new int[] {10000}, - 10, // Time in ticks - 2); // EU + if (cropGrape != null && foodRaisins != null) CORE.RA.addDehydratorRecipe( + new ItemStack[] { CI.getNumberedBioCircuit(20), cropGrape }, // Item + null, // Fluid input (slot 1) + null, // Fluid output (slot 2) + new ItemStack[] { foodRaisins }, // Output + new int[] { 10000 }, + 10, // Time in ticks + 2); // EU // Process Waste Water CORE.RA.addDehydratorRecipe( - new ItemStack[] {CI.getNumberedBioCircuit(21)}, + new ItemStack[] { CI.getNumberedBioCircuit(21) }, FluidUtils.getFluidStack("fluid.sludge", 1000), FluidUtils.getFluidStack("nitricacid", 10), - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIron", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCopper", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyTin", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyNickel", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCobalt", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAluminium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinySilver", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyGold", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIridium", 1) - }, - new int[] {10, 5, 5, 4, 4, 3, 2, 2, 1}, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIron", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCopper", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyTin", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyNickel", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCobalt", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAluminium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinySilver", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyGold", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIridium", 1) }, + new int[] { 10, 5, 5, 4, 4, 3, 2, 2, 1 }, 2 * 20, 500); // EU // C8H10 = C8H8 + 2H CORE.RA.addDehydratorRecipe( - new ItemStack[] {CI.getNumberedAdvancedCircuit(18), CI.emptyCells(3)}, + new ItemStack[] { CI.getNumberedAdvancedCircuit(18), CI.emptyCells(3) }, FluidUtils.getFluidStack("fluid.ethylbenzene", 1000), null, - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("cellStyrene", 1), - ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 2) - }, - new int[] {10000, 10000}, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellStyrene", 1), + ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 2) }, + new int[] { 10000, 10000 }, 3 * 20, 30); @@ -1288,24 +1106,22 @@ public class RECIPES_GREGTECH { aLeather1 = ItemUtils.getCorrectStacktype("harvestcraft:hardenedleatherItem", 1); aLeather2 = ItemUtils.getCorrectStacktype("Backpack:tannedLeather", 1); CORE.RA.addDehydratorRecipe( - new ItemStack[] {CI.getNumberedAdvancedCircuit(18), aLeather1}, + new ItemStack[] { CI.getNumberedAdvancedCircuit(18), aLeather1 }, FluidUtils.getFluidStack("fluid.ethylbenzene", 1000), null, - new ItemStack[] {aLeather2}, - new int[] {10000}, + new ItemStack[] { aLeather2 }, + new int[] { 10000 }, 5 * 20, 180); } // Alternative ACETIC ANHYDRIDE recipe for Kevlar Line // 2C2H4O2 = C4H6O3 + H2O CORE.RA.addDehydratorRecipe( - new ItemStack[] {CI.getNumberedAdvancedCircuit(18), CI.emptyCells(1)}, + new ItemStack[] { CI.getNumberedAdvancedCircuit(18), CI.emptyCells(1) }, FluidUtils.getFluidStack("aceticacid", 2000), MISC_MATERIALS.ACETIC_ANHYDRIDE.getFluidStack(1000), - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 1), - }, - new int[] {10000}, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 1), }, + new int[] { 10000 }, 30 * 20, 480); } @@ -1314,21 +1130,21 @@ public class RECIPES_GREGTECH { // Styrene // C8H10 = C8H8 + 2H CORE.RA.addMultiblockChemicalRecipe( - new ItemStack[] {CI.getNumberedCircuit(24)}, - new FluidStack[] {FluidUtils.getFluidStack("fluid.ethylbenzene", 1000)}, - new FluidStack[] {MaterialUtils.getMaterial("Styrene").getFluid(1000), Materials.Hydrogen.getGas(2000)}, + new ItemStack[] { CI.getNumberedCircuit(24) }, + new FluidStack[] { FluidUtils.getFluidStack("fluid.ethylbenzene", 1000) }, + new FluidStack[] { MaterialUtils.getMaterial("Styrene").getFluid(1000), + Materials.Hydrogen.getGas(2000) }, null, 30, 30); // Short-cut Styrene // C6H6 + C2H4 = C8H8 + 2H CORE.RA.addMultiblockChemicalRecipe( - new ItemStack[] {CI.getNumberedCircuit(24)}, - new FluidStack[] { - MaterialUtils.getMaterial("Ethylene").getGas(500), - MaterialUtils.getMaterial("Benzene").getFluid(500) - }, - new FluidStack[] {MaterialUtils.getMaterial("Styrene").getFluid(500), Materials.Hydrogen.getGas(1000)}, + new ItemStack[] { CI.getNumberedCircuit(24) }, + new FluidStack[] { MaterialUtils.getMaterial("Ethylene").getGas(500), + MaterialUtils.getMaterial("Benzene").getFluid(500) }, + new FluidStack[] { MaterialUtils.getMaterial("Styrene").getFluid(500), + Materials.Hydrogen.getGas(1000) }, null, 240, 120); @@ -1360,17 +1176,15 @@ public class RECIPES_GREGTECH { 120); /* - addAR(ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 1), - ItemUtils.getItemStackOfAmountFromOreDict("plateDenseLead", 4), FluidUtils.getFluidStack("oxygen", 16000), - ItemUtils.getSimpleStack(GregtechItemList.Casing_Vanadium_Redox.get(1), 1), 64, 240); + * addAR(ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 1), + * ItemUtils.getItemStackOfAmountFromOreDict("plateDenseLead", 4), FluidUtils.getFluidStack("oxygen", 16000), + * ItemUtils.getSimpleStack(GregtechItemList.Casing_Vanadium_Redox.get(1), 1), 64, 240); */ CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 1), - ItemUtils.getItemStackOfAmountFromOreDict("plateDenseLead", 4), - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(3), 4), - ItemUtils.getItemStackOfAmountFromOreDict("wireGt01SuperconductorHV", 2) - }, + new ItemStack[] { ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 1), + ItemUtils.getItemStackOfAmountFromOreDict("plateDenseLead", 4), + ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(3), 4), + ItemUtils.getItemStackOfAmountFromOreDict("wireGt01SuperconductorHV", 2) }, FluidUtils.getFluidStack("oxygen", 16000), ItemUtils.getSimpleStack(GregtechItemList.Casing_Vanadium_Redox.get(1), 1), 64, @@ -1385,87 +1199,62 @@ public class RECIPES_GREGTECH { ItemStack T6 = GregtechItemList.Casing_Vanadium_Redox_MAX.get(1); /* - addAR(T1, - ItemUtils.getItemStackOfAmountFromOreDict("plateDenseTitanium", 4), - FluidUtils.getFluidStack("nitrogen", 16000), - T2, 120, 2000); - */ + * addAR(T1, ItemUtils.getItemStackOfAmountFromOreDict("plateDenseTitanium", 4), + * FluidUtils.getFluidStack("nitrogen", 16000), T2, 120, 2000); + */ CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - T1, - ItemUtils.getItemStackOfAmountFromOreDict("plateDenseTitanium", 4), - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(4), 4), - ItemUtils.getItemStackOfAmountFromOreDict("wireGt01SuperconductorEV", 2) - }, + new ItemStack[] { T1, ItemUtils.getItemStackOfAmountFromOreDict("plateDenseTitanium", 4), + ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(4), 4), + ItemUtils.getItemStackOfAmountFromOreDict("wireGt01SuperconductorEV", 2) }, FluidUtils.getFluidStack("nitrogen", 16000), T2, 120, 2000); /* - addAR(T2, - ItemUtils.getItemStackOfAmountFromOreDict("plateDenseTungstenSteel", 4), - FluidUtils.getFluidStack("helium", 8000), - T3, 250, 8000); - */ + * addAR(T2, ItemUtils.getItemStackOfAmountFromOreDict("plateDenseTungstenSteel", 4), + * FluidUtils.getFluidStack("helium", 8000), T3, 250, 8000); + */ CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - T2, - ItemUtils.getItemStackOfAmountFromOreDict("plateDenseTungstenSteel", 4), - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(5), 4), - ItemUtils.getItemStackOfAmountFromOreDict("wireGt01SuperconductorIV", 2) - }, + new ItemStack[] { T2, ItemUtils.getItemStackOfAmountFromOreDict("plateDenseTungstenSteel", 4), + ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(5), 4), + ItemUtils.getItemStackOfAmountFromOreDict("wireGt01SuperconductorIV", 2) }, FluidUtils.getFluidStack("helium", 8000), T3, 250, 8000); /* - addAR(T3, - ItemUtils.getItemStackOfAmountFromOreDict("plateAlloyIridium", 16), - FluidUtils.getFluidStack("argon", 4000), - T4, 500, 32000); - */ + * addAR(T3, ItemUtils.getItemStackOfAmountFromOreDict("plateAlloyIridium", 16), + * FluidUtils.getFluidStack("argon", 4000), T4, 500, 32000); + */ CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - T3, - ItemUtils.getItemStackOfAmountFromOreDict("plateAlloyIridium", 16), - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 4), - ItemUtils.getItemStackOfAmountFromOreDict("wireGt01SuperconductorLuV", 2) - }, + new ItemStack[] { T3, ItemUtils.getItemStackOfAmountFromOreDict("plateAlloyIridium", 16), + ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 4), + ItemUtils.getItemStackOfAmountFromOreDict("wireGt01SuperconductorLuV", 2) }, FluidUtils.getFluidStack("argon", 4000), T4, 500, 32000); /* - addAR(T4, - ItemUtils.getItemStackOfAmountFromOreDict("plateDenseNaquadah", 4), - FluidUtils.getFluidStack("radon", 4000), - T5, 1000, 128000); - */ + * addAR(T4, ItemUtils.getItemStackOfAmountFromOreDict("plateDenseNaquadah", 4), + * FluidUtils.getFluidStack("radon", 4000), T5, 1000, 128000); + */ CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - T4, - ItemUtils.getItemStackOfAmountFromOreDict("plateDenseNaquadah", 4), - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 4), - ItemUtils.getItemStackOfAmountFromOreDict("wireGt01SuperconductorZPM", 2) - }, + new ItemStack[] { T4, ItemUtils.getItemStackOfAmountFromOreDict("plateDenseNaquadah", 4), + ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 4), + ItemUtils.getItemStackOfAmountFromOreDict("wireGt01SuperconductorZPM", 2) }, FluidUtils.getFluidStack("radon", 4000), T5, 1000, 128000); /* - addAR(T5, - ItemUtils.getItemStackOfAmountFromOreDict("plateDenseAmericium", 4), - FluidUtils.getFluidStack("krypton", 500), - T6, 2000, 512000); - */ + * addAR(T5, ItemUtils.getItemStackOfAmountFromOreDict("plateDenseAmericium", 4), + * FluidUtils.getFluidStack("krypton", 500), T6, 2000, 512000); + */ CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - T5, - ItemUtils.getItemStackOfAmountFromOreDict("plateDenseAmericium", 4), - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(8), 4), - ItemUtils.getItemStackOfAmountFromOreDict("wireGt01SuperconductorUV", 2) - }, + new ItemStack[] { T5, ItemUtils.getItemStackOfAmountFromOreDict("plateDenseAmericium", 4), + ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(8), 4), + ItemUtils.getItemStackOfAmountFromOreDict("wireGt01SuperconductorUV", 2) }, FluidUtils.getFluidStack("krypton", 500), T6, 2000, @@ -1486,111 +1275,84 @@ public class RECIPES_GREGTECH { 30, 120); - /*addAR(ItemUtils.getItemStackOfAmountFromOreDict("plateIncoloy020", 16), - ItemUtils.getItemStackOfAmountFromOreDict("frameGtIncoloyMA956", 4), null, - GregtechItemList.Casing_Power_SubStation.get(4), 80, 120);*/ - - /*CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] { - GregtechItemList.Casing_Multi_Use.get(1), - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 1), - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(4), 8), - CI.sensor_HV, - CI.emitter_HV, - CI.fieldGenerator_HV, - }, - null, - ItemUtils.getSimpleStack(Dimension_Everglades.blockPortalFrame), - 20*20, - 2048); - - */ + /* + * addAR(ItemUtils.getItemStackOfAmountFromOreDict("plateIncoloy020", 16), + * ItemUtils.getItemStackOfAmountFromOreDict("frameGtIncoloyMA956", 4), null, + * GregtechItemList.Casing_Power_SubStation.get(4), 80, 120); + */ + + /* + * CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] { GregtechItemList.Casing_Multi_Use.get(1), + * ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 1), + * ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(4), 8), CI.sensor_HV, CI.emitter_HV, + * CI.fieldGenerator_HV, }, null, ItemUtils.getSimpleStack(Dimension_Everglades.blockPortalFrame), 20*20, 2048); + */ CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] {ItemUtils.getSimpleStack(ModItems.itemRope, 6)}, + new ItemStack[] { ItemUtils.getSimpleStack(ModItems.itemRope, 6) }, null, ItemUtils.getSimpleStack(ModBlocks.blockNet, 2), 1 * 20, 8); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - ItemUtils.getSimpleStack(CI.explosiveITNT, 2), - ItemUtils.getSimpleStack(CI.explosiveTNT, 4), - ELEMENT.getInstance().SULFUR.getDust(2), - ELEMENT.getInstance().IRON.getFrameBox(1) - }, + new ItemStack[] { ItemUtils.getSimpleStack(CI.explosiveITNT, 2), + ItemUtils.getSimpleStack(CI.explosiveTNT, 4), ELEMENT.getInstance().SULFUR.getDust(2), + ELEMENT.getInstance().IRON.getFrameBox(1) }, null, ItemUtils.getSimpleStack(ModBlocks.blockMiningExplosive, 3), 5 * 20, 60); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - ItemUtils.getSimpleStack(Items.nether_star), - ItemUtils.getItemStackOfAmountFromOreDict("plateTungstenSteel", 8), - ItemUtils.getItemStackOfAmountFromOreDict("stickBlackSteel", 8) - }, + new ItemStack[] { ItemUtils.getSimpleStack(Items.nether_star), + ItemUtils.getItemStackOfAmountFromOreDict("plateTungstenSteel", 8), + ItemUtils.getItemStackOfAmountFromOreDict("stickBlackSteel", 8) }, null, ItemUtils.getSimpleStack(ModBlocks.blockWitherGuard, 64), 30 * 20, 500); - ItemStack aFluidReg1 = ItemUtils.getValueOfItemList("FluidRegulator_LV", ItemList.Pump_LV) - .get(1); - ItemStack aFluidReg2 = ItemUtils.getValueOfItemList("FluidRegulator_MV", ItemList.Pump_MV) - .get(1); - ItemStack aFluidReg3 = ItemUtils.getValueOfItemList("FluidRegulator_HV", ItemList.Pump_HV) - .get(1); - ItemStack aFluidReg4 = ItemUtils.getValueOfItemList("FluidRegulator_EV", ItemList.Pump_EV) - .get(1); + ItemStack aFluidReg1 = ItemUtils.getValueOfItemList("FluidRegulator_LV", ItemList.Pump_LV).get(1); + ItemStack aFluidReg2 = ItemUtils.getValueOfItemList("FluidRegulator_MV", ItemList.Pump_MV).get(1); + ItemStack aFluidReg3 = ItemUtils.getValueOfItemList("FluidRegulator_HV", ItemList.Pump_HV).get(1); + ItemStack aFluidReg4 = ItemUtils.getValueOfItemList("FluidRegulator_EV", ItemList.Pump_EV).get(1); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - aFluidReg1, - CI.electricMotor_LV, - CI.getTieredComponent(OrePrefixes.bolt, 1, GTNH ? 8 : 4), - ItemUtils.getItemStackOfAmountFromOreDict("ringBrass", 1), - ItemUtils.getItemStackOfAmountFromOreDict("stickBrass", 1), - ItemUtils.getItemStackOfAmountFromOreDict("plateSteel", 2) - }, + new ItemStack[] { aFluidReg1, CI.electricMotor_LV, + CI.getTieredComponent(OrePrefixes.bolt, 1, GTNH ? 8 : 4), + ItemUtils.getItemStackOfAmountFromOreDict("ringBrass", 1), + ItemUtils.getItemStackOfAmountFromOreDict("stickBrass", 1), + ItemUtils.getItemStackOfAmountFromOreDict("plateSteel", 2) }, null, ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 1, 1), 10 * 20, 30); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - aFluidReg2, - CI.electricMotor_MV, - CI.getTieredComponent(OrePrefixes.bolt, 2, GTNH ? 8 : 4), - ItemUtils.getItemStackOfAmountFromOreDict("ringInvar", 1), - ItemUtils.getItemStackOfAmountFromOreDict("stickInvar", 1), - ItemUtils.getItemStackOfAmountFromOreDict("plateAluminium", 2) - }, + new ItemStack[] { aFluidReg2, CI.electricMotor_MV, + CI.getTieredComponent(OrePrefixes.bolt, 2, GTNH ? 8 : 4), + ItemUtils.getItemStackOfAmountFromOreDict("ringInvar", 1), + ItemUtils.getItemStackOfAmountFromOreDict("stickInvar", 1), + ItemUtils.getItemStackOfAmountFromOreDict("plateAluminium", 2) }, null, ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 2, 1), 10 * 20 * 2, 120); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - aFluidReg3, - CI.electricMotor_HV, - CI.getTieredComponent(OrePrefixes.bolt, 3, GTNH ? 8 : 4), - ItemUtils.getItemStackOfAmountFromOreDict("ringChrome", 1), - ItemUtils.getItemStackOfAmountFromOreDict("stickChrome", 1), - ItemUtils.getItemStackOfAmountFromOreDict("plateStainlessSteel", 2) - }, + new ItemStack[] { aFluidReg3, CI.electricMotor_HV, + CI.getTieredComponent(OrePrefixes.bolt, 3, GTNH ? 8 : 4), + ItemUtils.getItemStackOfAmountFromOreDict("ringChrome", 1), + ItemUtils.getItemStackOfAmountFromOreDict("stickChrome", 1), + ItemUtils.getItemStackOfAmountFromOreDict("plateStainlessSteel", 2) }, null, ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 3, 1), 10 * 20 * 3, 480); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - aFluidReg4, - CI.electricMotor_EV, - CI.getTieredComponent(OrePrefixes.bolt, 4, GTNH ? 8 : 4), - ItemUtils.getItemStackOfAmountFromOreDict("ringTitanium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("stickTitanium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("plateTungstenSteel", 2) - }, + new ItemStack[] { aFluidReg4, CI.electricMotor_EV, + CI.getTieredComponent(OrePrefixes.bolt, 4, GTNH ? 8 : 4), + ItemUtils.getItemStackOfAmountFromOreDict("ringTitanium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("stickTitanium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("plateTungstenSteel", 2) }, null, ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 4, 1), 10 * 20 * 4, @@ -1623,58 +1385,33 @@ public class RECIPES_GREGTECH { // Low tier Charge Packs - final ItemStack[] aPackBatteries = new ItemStack[] { - ItemList.Battery_RE_LV_Lithium.get(4), - ItemList.Battery_RE_MV_Lithium.get(4), - ItemList.Battery_RE_HV_Lithium.get(4), - GregtechItemList.Battery_RE_EV_Lithium.get(4), - ItemList.Energy_LapotronicOrb.get(4), - }; - final ItemStack[] aPackPlates = new ItemStack[] { - CI.getPlate(1, 8), CI.getPlate(2, 8), CI.getPlate(3, 8), CI.getPlate(4, 8), CI.getPlate(5, 8), - }; - final ItemStack[] aPackWire = new ItemStack[] { - CI.getTieredComponent(OrePrefixes.wireGt02, 1, 6), - CI.getTieredComponent(OrePrefixes.wireGt04, 2, 6), - CI.getTieredComponent(OrePrefixes.wireGt08, 3, 6), - CI.getTieredComponent(OrePrefixes.wireGt12, 4, 6), - CI.getTieredComponent(OrePrefixes.wireGt16, 5, 6), - }; - final ItemStack[] aPackCircuit = new ItemStack[] { - CI.getTieredComponent(OrePrefixes.circuit, 1, 4), - CI.getTieredComponent(OrePrefixes.circuit, 2, 4), - CI.getTieredComponent(OrePrefixes.circuit, 3, 4), - CI.getTieredComponent(OrePrefixes.circuit, 4, 4), - CI.getTieredComponent(OrePrefixes.circuit, 5, 4), - }; - final ItemStack[] aPackRing = new ItemStack[] { - CI.getTieredComponent(OrePrefixes.ring, 1, 12), - CI.getTieredComponent(OrePrefixes.ring, 2, 12), - CI.getTieredComponent(OrePrefixes.ring, 3, 12), - CI.getTieredComponent(OrePrefixes.ring, 4, 12), - CI.getTieredComponent(OrePrefixes.ring, 5, 12), - }; - final ItemStack[] aPackOutput = new ItemStack[] { - ItemUtils.getSimpleStack(ModItems.itemChargePack_Low_1), - ItemUtils.getSimpleStack(ModItems.itemChargePack_Low_2), - ItemUtils.getSimpleStack(ModItems.itemChargePack_Low_3), - ItemUtils.getSimpleStack(ModItems.itemChargePack_Low_4), - ItemUtils.getSimpleStack(ModItems.itemChargePack_Low_5) - }; + final ItemStack[] aPackBatteries = new ItemStack[] { ItemList.Battery_RE_LV_Lithium.get(4), + ItemList.Battery_RE_MV_Lithium.get(4), ItemList.Battery_RE_HV_Lithium.get(4), + GregtechItemList.Battery_RE_EV_Lithium.get(4), ItemList.Energy_LapotronicOrb.get(4), }; + final ItemStack[] aPackPlates = new ItemStack[] { CI.getPlate(1, 8), CI.getPlate(2, 8), CI.getPlate(3, 8), + CI.getPlate(4, 8), CI.getPlate(5, 8), }; + final ItemStack[] aPackWire = new ItemStack[] { CI.getTieredComponent(OrePrefixes.wireGt02, 1, 6), + CI.getTieredComponent(OrePrefixes.wireGt04, 2, 6), CI.getTieredComponent(OrePrefixes.wireGt08, 3, 6), + CI.getTieredComponent(OrePrefixes.wireGt12, 4, 6), CI.getTieredComponent(OrePrefixes.wireGt16, 5, 6), }; + final ItemStack[] aPackCircuit = new ItemStack[] { CI.getTieredComponent(OrePrefixes.circuit, 1, 4), + CI.getTieredComponent(OrePrefixes.circuit, 2, 4), CI.getTieredComponent(OrePrefixes.circuit, 3, 4), + CI.getTieredComponent(OrePrefixes.circuit, 4, 4), CI.getTieredComponent(OrePrefixes.circuit, 5, 4), }; + final ItemStack[] aPackRing = new ItemStack[] { CI.getTieredComponent(OrePrefixes.ring, 1, 12), + CI.getTieredComponent(OrePrefixes.ring, 2, 12), CI.getTieredComponent(OrePrefixes.ring, 3, 12), + CI.getTieredComponent(OrePrefixes.ring, 4, 12), CI.getTieredComponent(OrePrefixes.ring, 5, 12), }; + final ItemStack[] aPackOutput = new ItemStack[] { ItemUtils.getSimpleStack(ModItems.itemChargePack_Low_1), + ItemUtils.getSimpleStack(ModItems.itemChargePack_Low_2), + ItemUtils.getSimpleStack(ModItems.itemChargePack_Low_3), + ItemUtils.getSimpleStack(ModItems.itemChargePack_Low_4), + ItemUtils.getSimpleStack(ModItems.itemChargePack_Low_5) }; for (int i = 1; i < 6; i++) { int aAS = i - 1; CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - aPackPlates[aAS], - aPackRing[aAS], - aPackWire[aAS], - aPackCircuit[aAS], - aPackBatteries[aAS], - CI.getSensor(i, GTNH ? 4 : 2), - }, + new ItemStack[] { aPackPlates[aAS], aPackRing[aAS], aPackWire[aAS], aPackCircuit[aAS], + aPackBatteries[aAS], CI.getSensor(i, GTNH ? 4 : 2), }, CI.getTieredFluid(i, (144 * (GTNH ? 4 : 2))), aPackOutput[aAS], 30 * 20 * i, @@ -1740,14 +1477,13 @@ public class RECIPES_GREGTECH { // Turbine Housing Research Page CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - ItemUtils.getGregtechCircuit(17), - ItemUtils.getItemStackOfAmountFromOreDict("plateTrinium", GTNH ? 64 : 32), - CI.getSensor(6, GTNH ? 6 : 3), - CI.getBolt(7, GTNH ? 64 : 32), - ItemUtils.getItemStackOfAmountFromOreDict("wireFinePlatinum", GTNH ? 64 : 32), - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), GTNH ? 12 : 6) - }, + new ItemStack[] { ItemUtils.getGregtechCircuit(17), + ItemUtils.getItemStackOfAmountFromOreDict("plateTrinium", GTNH ? 64 : 32), + CI.getSensor(6, GTNH ? 6 : 3), CI.getBolt(7, GTNH ? 64 : 32), + ItemUtils.getItemStackOfAmountFromOreDict("wireFinePlatinum", GTNH ? 64 : 32), + ItemUtils.getItemStackOfAmountFromOreDict( + CI.getTieredCircuitOreDictName(7), + GTNH ? 12 : 6) }, CI.getAlternativeTieredFluid(7, 144 * 32), ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_8_TURBINE_AUTOMATION, 1), 20 * 60 * 5, @@ -1755,13 +1491,13 @@ public class RECIPES_GREGTECH { // Cloaking Device Research Page CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - ItemUtils.getGregtechCircuit(17), - ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR, 4), - CI.getFieldGenerator(6, GTNH ? 16 : 8), - ItemUtils.getItemStackOfAmountFromOreDict("wireFinePalladium", GTNH ? 32 : 16), - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), GTNH ? 12 : 6) - }, + new ItemStack[] { ItemUtils.getGregtechCircuit(17), + ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR, 4), + CI.getFieldGenerator(6, GTNH ? 16 : 8), + ItemUtils.getItemStackOfAmountFromOreDict("wireFinePalladium", GTNH ? 32 : 16), + ItemUtils.getItemStackOfAmountFromOreDict( + CI.getTieredCircuitOreDictName(6), + GTNH ? 12 : 6) }, CI.getAlternativeTieredFluid(7, 144 * 32), ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_9_CLOAKING, 1), 20 * 60 * 10, @@ -1769,13 +1505,12 @@ public class RECIPES_GREGTECH { // Supreme Pizza Gloves CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - ItemUtils.getGregtechCircuit(19), - ItemUtils.getSimpleStack(ModItems.itemRope, GTNH ? 32 : 16), - ItemUtils.getItemStackOfAmountFromOreDict("gearGtSmallWroughtIron", GTNH ? 8 : 4), - ItemUtils.getItemStackOfAmountFromOreDict("wireFineCopper", GTNH ? 32 : 16), - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(1), GTNH ? 2 : 1) - }, + new ItemStack[] { ItemUtils.getGregtechCircuit(19), + ItemUtils.getSimpleStack(ModItems.itemRope, GTNH ? 32 : 16), + ItemUtils.getItemStackOfAmountFromOreDict("gearGtSmallWroughtIron", GTNH ? 8 : 4), + ItemUtils.getItemStackOfAmountFromOreDict("wireFineCopper", GTNH ? 32 : 16), + ItemUtils + .getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(1), GTNH ? 2 : 1) }, FluidUtils.getFluidStack("molten.rubber", 2000), ItemUtils.getSimpleStack(ModItems.itemPersonalFireProofDevice), 20 * 60 * 5, @@ -1783,13 +1518,8 @@ public class RECIPES_GREGTECH { } } - private static boolean addAR( - final ItemStack inputA, - final ItemStack inputB, - final FluidStack inputFluidA, - final ItemStack outputA, - final int seconds, - final int voltage) { + private static boolean addAR(final ItemStack inputA, final ItemStack inputB, final FluidStack inputFluidA, + final ItemStack outputA, final int seconds, final int voltage) { // return GT_Values.RA.addAssemblerRecipe(inputA, inputB, outputA, // seconds*20, voltage); return GT_Values.RA.addAssemblerRecipe(inputA, inputB, inputFluidA, outputA, seconds * 20, voltage); @@ -1813,25 +1543,28 @@ public class RECIPES_GREGTECH { // Apatite Distillation /* - * so if you dissolve aparite in sulphuric acid you'll get a mixture of - * SO2, H2O, HF and HCl + * so if you dissolve aparite in sulphuric acid you'll get a mixture of SO2, H2O, HF and HCl */ - final FluidStack[] apatiteOutput = { - FluidUtils.getFluidStack("sulfurousacid", 3800), - FluidUtils.getFluidStack("hydrogenchloride", 1000), - FluidUtils.getFluidStack("hydrofluoricacid", 400) - }; + final FluidStack[] apatiteOutput = { FluidUtils.getFluidStack("sulfurousacid", 3800), + FluidUtils.getFluidStack("hydrogenchloride", 1000), FluidUtils.getFluidStack("hydrofluoricacid", 400) }; GT_Values.RA.addDistillationTowerRecipe( - FluidUtils.getFluidStack("sulfuricapatite", 5200), apatiteOutput, null, 45 * 20, 120); + FluidUtils.getFluidStack("sulfuricapatite", 5200), + apatiteOutput, + null, + 45 * 20, + 120); - final FluidStack[] sulfurousacidOutput = { - FluidUtils.getFluidStack("sulfurdioxide", 500), FluidUtils.getFluidStack("water", 500) - }; + final FluidStack[] sulfurousacidOutput = { FluidUtils.getFluidStack("sulfurdioxide", 500), + FluidUtils.getFluidStack("water", 500) }; GT_Values.RA.addDistillationTowerRecipe( - FluidUtils.getFluidStack("sulfurousacid", 1000), sulfurousacidOutput, null, 10 * 20, 60); + FluidUtils.getFluidStack("sulfurousacid", 1000), + sulfurousacidOutput, + null, + 10 * 20, + 60); if (!GTNH) { - final FluidStack[] sulfurdioxideOutput = {FluidUtils.getFluidStack("oxygen", 2000)}; + final FluidStack[] sulfurdioxideOutput = { FluidUtils.getFluidStack("oxygen", 2000) }; GT_Values.RA.addDistillationTowerRecipe( FluidUtils.getFluidStack("sulfurdioxide", 144 * 3), sulfurdioxideOutput, @@ -1853,29 +1586,25 @@ public class RECIPES_GREGTECH { HotFuel.addNewHotFuel( FluidUtils.getLava(83), FluidUtils.getPahoehoeLava(83), - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("nuggetCopper", 1), - ItemUtils.getItemStackOfAmountFromOreDict("nuggetTin", 1), - ItemUtils.getItemStackOfAmountFromOreDict("nuggetGold", 1), - ItemUtils.getItemStackOfAmountFromOreDict("nuggetSilver", 1), - ItemUtils.getItemStackOfAmountFromOreDict("nuggetTantalum", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTungstate", 1), - ItemUtils.getSimpleStack(Blocks.obsidian) - }, - new int[] {2000, 1000, 250, 250, 250, 250, 500}, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("nuggetCopper", 1), + ItemUtils.getItemStackOfAmountFromOreDict("nuggetTin", 1), + ItemUtils.getItemStackOfAmountFromOreDict("nuggetGold", 1), + ItemUtils.getItemStackOfAmountFromOreDict("nuggetSilver", 1), + ItemUtils.getItemStackOfAmountFromOreDict("nuggetTantalum", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTungstate", 1), + ItemUtils.getSimpleStack(Blocks.obsidian) }, + new int[] { 2000, 1000, 250, 250, 250, 250, 500 }, 0); HotFuel.addNewHotFuel( FluidUtils.getPahoehoeLava(83), GT_Values.NF, - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("nuggetBronze", 1), - ItemUtils.getItemStackOfAmountFromOreDict("nuggetElectrum", 1), - ItemUtils.getItemStackOfAmountFromOreDict("nuggetTantalum", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTungstate", 1), - ItemUtils.getSimpleStack(Blocks.obsidian) - }, - new int[] {750, 250, 250, 250, 1850}, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("nuggetBronze", 1), + ItemUtils.getItemStackOfAmountFromOreDict("nuggetElectrum", 1), + ItemUtils.getItemStackOfAmountFromOreDict("nuggetTantalum", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTungstate", 1), + ItemUtils.getSimpleStack(Blocks.obsidian) }, + new int[] { 750, 250, 250, 250, 1850 }, 0); HotFuel.addNewHotFuel( @@ -1885,8 +1614,8 @@ public class RECIPES_GREGTECH { 0); /* - * HotFuel.addNewHotFuel( FluidUtils.getFluidStack("ic2hotcoolant", - * 100), GT_Values.NF, new ItemStack[]{}, new int[]{}, 0); + * HotFuel.addNewHotFuel( FluidUtils.getFluidStack("ic2hotcoolant", 100), GT_Values.NF, new ItemStack[]{}, new + * int[]{}, 0); */ ThermalFuel.addSteamTurbineFuel(FluidUtils.getFluidStack("steam", 1024)); @@ -2091,7 +1820,8 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 9)); GT_ModHandler.addPulverisationRecipe( - GregtechItemList.Bomb_Cast_Broken.get(1), ItemUtils.getItemStackOfAmountFromOreDict("dustClay", 3)); + GregtechItemList.Bomb_Cast_Broken.get(1), + ItemUtils.getItemStackOfAmountFromOreDict("dustClay", 3)); if (ItemUtils.simpleMetaStack("chisel:limestone", 0, 1) != null) { GT_ModHandler.addPulverisationRecipe( @@ -2106,9 +1836,9 @@ public class RECIPES_GREGTECH { CORE.RA.addCyclotronRecipe( CI.getNumberedCircuit(1), FluidUtils.getFluidStack("molten.bismuth", 1), - new ItemStack[] {GregtechItemList.Pellet_RTG_PO210.get(1)}, + new ItemStack[] { GregtechItemList.Pellet_RTG_PO210.get(1) }, null, - new int[] {100}, + new int[] { 100 }, 20 * 300 * 100, 2040 * 4, 500 * 20); @@ -2117,9 +1847,9 @@ public class RECIPES_GREGTECH { CORE.RA.addCyclotronRecipe( CI.getNumberedCircuit(1), FluidUtils.getFluidStack("molten.americium", 1), - new ItemStack[] {GregtechItemList.Pellet_RTG_AM241.get(4)}, + new ItemStack[] { GregtechItemList.Pellet_RTG_AM241.get(4) }, null, - new int[] {2500}, + new int[] { 2500 }, 20 * 300 * 100, 1020 * 4, 500 * 20); // PO Special Value @@ -2128,9 +1858,9 @@ public class RECIPES_GREGTECH { CORE.RA.addCyclotronRecipe( CI.getNumberedCircuit(1), FluidUtils.getFluidStack("molten.uranium235", 10), - new ItemStack[] {GregtechItemList.Pellet_RTG_SR90.get(1)}, + new ItemStack[] { GregtechItemList.Pellet_RTG_SR90.get(1) }, null, - new int[] {570}, + new int[] { 570 }, 20 * 300 * 100, 1020 * 4, 500 * 20); // PO Special Value @@ -2139,9 +1869,9 @@ public class RECIPES_GREGTECH { CORE.RA.addCyclotronRecipe( CI.getNumberedCircuit(1), FluidUtils.getFluidStack("molten.uranium233", 10), - new ItemStack[] {GregtechItemList.Pellet_RTG_SR90.get(1)}, + new ItemStack[] { GregtechItemList.Pellet_RTG_SR90.get(1) }, null, - new int[] {660}, + new int[] { 660 }, 20 * 300 * 100, 1020 * 4, 500 * 20); // PO Special Value @@ -2150,9 +1880,9 @@ public class RECIPES_GREGTECH { CORE.RA.addCyclotronRecipe( CI.getNumberedCircuit(1), FluidUtils.getFluidStack("molten.plutonium239", 10), - new ItemStack[] {GregtechItemList.Pellet_RTG_SR90.get(1)}, + new ItemStack[] { GregtechItemList.Pellet_RTG_SR90.get(1) }, null, - new int[] {220}, + new int[] { 220 }, 20 * 300 * 100, 1020 * 4, 500 * 20); // PO Special Value @@ -2161,20 +1891,20 @@ public class RECIPES_GREGTECH { CORE.RA.addCyclotronRecipe( CI.getNumberedCircuit(1), FluidUtils.getFluidStack("molten.plutonium238", 1), - new ItemStack[] {GregtechItemList.Pellet_RTG_PU238.get(2)}, + new ItemStack[] { GregtechItemList.Pellet_RTG_PU238.get(2) }, null, - new int[] {780}, + new int[] { 780 }, 20 * 300 * 100, 1020 * 4, 500 * 20); // PO Special Value // Neptunium CORE.RA.addCyclotronRecipe( - new ItemStack[] {ELEMENT.getInstance().URANIUM238.getDust(1)}, + new ItemStack[] { ELEMENT.getInstance().URANIUM238.getDust(1) }, FluidUtils.getFluidStack("deuterium", 400), - new ItemStack[] {ItemUtils.getSimpleStack(ModItems.dustNeptunium238)}, + new ItemStack[] { ItemUtils.getSimpleStack(ModItems.dustNeptunium238) }, null, - new int[] {500}, + new int[] { 500 }, 20 * 5, 500 * 4, 500 * 20); // PO Special Value @@ -2187,16 +1917,11 @@ public class RECIPES_GREGTECH { CORE.RA.addCyclotronRecipe( CI.getNumberedCircuit(3), FluidUtils.getFluidStack("plasma.hydrogen", 100), - new ItemStack[] { - Particle.getBaseParticle(Particle.UP), - Particle.getBaseParticle(Particle.DOWN), - Particle.getBaseParticle(Particle.CHARM), - Particle.getBaseParticle(Particle.STRANGE), - Particle.getBaseParticle(Particle.TOP), - Particle.getBaseParticle(Particle.BOTTOM), - }, + new ItemStack[] { Particle.getBaseParticle(Particle.UP), Particle.getBaseParticle(Particle.DOWN), + Particle.getBaseParticle(Particle.CHARM), Particle.getBaseParticle(Particle.STRANGE), + Particle.getBaseParticle(Particle.TOP), Particle.getBaseParticle(Particle.BOTTOM), }, null, - new int[] {50, 50, 50, 50, 50, 50}, + new int[] { 50, 50, 50, 50, 50, 50 }, 20 * 300 * 9, (int) MaterialUtils.getVoltageForTier(7), 750 * 20); @@ -2205,16 +1930,12 @@ public class RECIPES_GREGTECH { CORE.RA.addCyclotronRecipe( CI.getNumberedCircuit(6), FluidUtils.getFluidStack("plasma.helium", 1500), - new ItemStack[] { - Particle.getBaseParticle(Particle.ELECTRON), - Particle.getBaseParticle(Particle.MUON), - Particle.getBaseParticle(Particle.TAU), - Particle.getBaseParticle(Particle.ELECTRON_NEUTRINO), - Particle.getBaseParticle(Particle.MUON_NEUTRINO), - Particle.getBaseParticle(Particle.TAU_NEUTRINO), - }, + new ItemStack[] { Particle.getBaseParticle(Particle.ELECTRON), Particle.getBaseParticle(Particle.MUON), + Particle.getBaseParticle(Particle.TAU), Particle.getBaseParticle(Particle.ELECTRON_NEUTRINO), + Particle.getBaseParticle(Particle.MUON_NEUTRINO), + Particle.getBaseParticle(Particle.TAU_NEUTRINO), }, null, - new int[] {600, 40, 20, 15, 10, 5}, + new int[] { 600, 40, 20, 15, 10, 5 }, 20 * 300 * 8, (int) MaterialUtils.getVoltageForTier(7), 750 * 20); @@ -2223,15 +1944,11 @@ public class RECIPES_GREGTECH { CORE.RA.addCyclotronRecipe( CI.getNumberedCircuit(9), FluidUtils.getFluidStack("plasma.helium", 1500), - new ItemStack[] { - Particle.getBaseParticle(Particle.GLUON), - Particle.getBaseParticle(Particle.PHOTON), - Particle.getBaseParticle(Particle.Z_BOSON), - Particle.getBaseParticle(Particle.W_BOSON), - Particle.getBaseParticle(Particle.HIGGS_BOSON), - }, + new ItemStack[] { Particle.getBaseParticle(Particle.GLUON), Particle.getBaseParticle(Particle.PHOTON), + Particle.getBaseParticle(Particle.Z_BOSON), Particle.getBaseParticle(Particle.W_BOSON), + Particle.getBaseParticle(Particle.HIGGS_BOSON), }, null, - new int[] {160, 260, 150, 150, 1}, + new int[] { 160, 260, 150, 150, 1 }, 20 * 300 * 6, (int) MaterialUtils.getVoltageForTier(7), 750 * 20); @@ -2240,18 +1957,13 @@ public class RECIPES_GREGTECH { CORE.RA.addCyclotronRecipe( CI.getNumberedCircuit(12), FluidUtils.getFluidStack("plasma.beryllium", 2500), - new ItemStack[] { - Particle.getBaseParticle(Particle.GRAVITON), - Particle.getBaseParticle(Particle.ETA_MESON), - Particle.getBaseParticle(Particle.PION), - Particle.getBaseParticle(Particle.PROTON), - Particle.getBaseParticle(Particle.NEUTRON), - Particle.getBaseParticle(Particle.LAMBDA), - Particle.getBaseParticle(Particle.OMEGA), - Particle.getBaseParticle(Particle.HIGGS_BOSON), - }, + new ItemStack[] { Particle.getBaseParticle(Particle.GRAVITON), + Particle.getBaseParticle(Particle.ETA_MESON), Particle.getBaseParticle(Particle.PION), + Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.NEUTRON), + Particle.getBaseParticle(Particle.LAMBDA), Particle.getBaseParticle(Particle.OMEGA), + Particle.getBaseParticle(Particle.HIGGS_BOSON), }, null, - new int[] {10, 20, 20, 10, 10, 5, 5, 2}, + new int[] { 10, 20, 20, 10, 10, 5, 5, 2 }, 17 * 247 * 32, (int) MaterialUtils.getVoltageForTier(8), 750 * 20); @@ -2260,10 +1972,10 @@ public class RECIPES_GREGTECH { CORE.RA.addCyclotronRecipe( CI.getNumberedCircuit(15), FluidUtils.getFluidStack("plasma.hydrogen", GTNH ? 50 : 10), - new ItemStack[] {Particle.getBaseParticle(Particle.GRAVITON), Particle.getBaseParticle(Particle.UNKNOWN) - }, + new ItemStack[] { Particle.getBaseParticle(Particle.GRAVITON), + Particle.getBaseParticle(Particle.UNKNOWN) }, null, - new int[] {15, 100}, + new int[] { 15, 100 }, 20 * (GTNH ? 90 : 30), (int) MaterialUtils.getVoltageForTier(6), 1000 * 20); @@ -2277,13 +1989,11 @@ public class RECIPES_GREGTECH { // Quantum Anomaly CORE.RA.addCyclotronRecipe( - new ItemStack[] { - CI.getNumberedCircuit(24), Particle.getBaseParticle(Particle.UNKNOWN), - }, + new ItemStack[] { CI.getNumberedCircuit(24), Particle.getBaseParticle(Particle.UNKNOWN), }, aPlasma, - new ItemStack[] {GregtechItemList.Laser_Lens_Special.get(1)}, + new ItemStack[] { GregtechItemList.Laser_Lens_Special.get(1) }, null, - new int[] {100}, + new int[] { 100 }, 20 * (GTNH ? 25 : 60), (int) MaterialUtils.getVoltageForTier(8), 500 * 20); @@ -2309,19 +2019,11 @@ public class RECIPES_GREGTECH { CORE.RA.addCyclotronRecipe( CI.getNumberedCircuit(1 + (tenCountA - 1)), aPlasma2 != null ? aPlasma2 : aPlasma3, - new ItemStack[] { - Particle.getIon(y, 1), - Particle.getIon(y, 2), - Particle.getIon(y, 3), - Particle.getIon(y, -1), - Particle.getIon(y, -2), - Particle.getIon(y, -3), - Particle.getIon(y, 1), - Particle.getIon(y, 2), - Particle.getIon(y, -1), - }, + new ItemStack[] { Particle.getIon(y, 1), Particle.getIon(y, 2), Particle.getIon(y, 3), + Particle.getIon(y, -1), Particle.getIon(y, -2), Particle.getIon(y, -3), + Particle.getIon(y, 1), Particle.getIon(y, 2), Particle.getIon(y, -1), }, null, - new int[] {275, 250, 225, 275, 250, 225, 275, 250, 275}, + new int[] { 275, 250, 225, 275, 250, 225, 275, 250, 275 }, 20 * 20 * (IonCount++) * tenCountA, (int) MaterialUtils.getVoltageForTier(7), 1500 * 20 * tenCountA); @@ -2341,123 +2043,83 @@ public class RECIPES_GREGTECH { CORE.RA.addCyclotronRecipe( CI.getNumberedCircuit(24), FluidUtils.getWildcardFluidStack("hydrogen", 1000), - new ItemStack[] { - Particle.getIon("Hydrogen", 1), - Particle.getIon("Hydrogen", 2), - Particle.getIon("Hydrogen", 3), - Particle.getIon("Hydrogen", 1), - Particle.getIon("Hydrogen", 2), - Particle.getIon("Hydrogen", 3), - Particle.getIon("Hydrogen", -1), - Particle.getIon("Hydrogen", -2), - Particle.getIon("Hydrogen", -3) - }, + new ItemStack[] { Particle.getIon("Hydrogen", 1), Particle.getIon("Hydrogen", 2), + Particle.getIon("Hydrogen", 3), Particle.getIon("Hydrogen", 1), Particle.getIon("Hydrogen", 2), + Particle.getIon("Hydrogen", 3), Particle.getIon("Hydrogen", -1), + Particle.getIon("Hydrogen", -2), Particle.getIon("Hydrogen", -3) }, null, - new int[] {500, 500, 500, 500, 500, 500, 500, 500, 500}, + new int[] { 500, 500, 500, 500, 500, 500, 500, 500, 500 }, 20 * 20, (int) MaterialUtils.getVoltageForTier(6), 2500); // Generate Hydrogen Plasma Recipe CORE.RA.addCyclotronRecipe( - new ItemStack[] { - Particle.getIon("Hydrogen", 0), ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1) - }, + new ItemStack[] { Particle.getIon("Hydrogen", 0), + ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1) }, null, - new ItemStack[] { - Particle.getBaseParticle(Particle.PROTON), - Particle.getBaseParticle(Particle.NEUTRON), - Particle.getBaseParticle(Particle.ELECTRON), - Particle.getBaseParticle(Particle.UNKNOWN), - Particle.getBaseParticle(Particle.UNKNOWN), - Particle.getBaseParticle(Particle.UNKNOWN), - CI.emptyCells(1) - }, + new ItemStack[] { Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.NEUTRON), + Particle.getBaseParticle(Particle.ELECTRON), Particle.getBaseParticle(Particle.UNKNOWN), + Particle.getBaseParticle(Particle.UNKNOWN), Particle.getBaseParticle(Particle.UNKNOWN), + CI.emptyCells(1) }, FluidUtils.getFluidStack("plasma.hydrogen", 100), - new int[] {1250, 1250, 1250, 750, 750, 750, 10000}, + new int[] { 1250, 1250, 1250, 750, 750, 750, 10000 }, 20 * 60 * 2, (int) MaterialUtils.getVoltageForTier(6), 750 * 20); CORE.RA.addCyclotronRecipe( - new ItemStack[] { - CI.getNumberedCircuit(21), Particle.getIon("Hydrogen", 0), - }, + new ItemStack[] { CI.getNumberedCircuit(21), Particle.getIon("Hydrogen", 0), }, FluidUtils.getFluidStack("hydrogen", 1000), - new ItemStack[] { - Particle.getBaseParticle(Particle.PROTON), - Particle.getBaseParticle(Particle.NEUTRON), - Particle.getBaseParticle(Particle.ELECTRON), - Particle.getBaseParticle(Particle.UNKNOWN), - Particle.getBaseParticle(Particle.UNKNOWN), - Particle.getBaseParticle(Particle.UNKNOWN), - }, + new ItemStack[] { Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.NEUTRON), + Particle.getBaseParticle(Particle.ELECTRON), Particle.getBaseParticle(Particle.UNKNOWN), + Particle.getBaseParticle(Particle.UNKNOWN), Particle.getBaseParticle(Particle.UNKNOWN), }, FluidUtils.getFluidStack("plasma.hydrogen", 100), - new int[] {1250, 1250, 1250, 750, 750, 750}, + new int[] { 1250, 1250, 1250, 750, 750, 750 }, 20 * 60 * 2, (int) MaterialUtils.getVoltageForTier(6), 750 * 20); // Generate Protons Easily CORE.RA.addCyclotronRecipe( - new ItemStack[] {CI.getNumberedCircuit(20), Particle.getIon("Hydrogen", 0)}, + new ItemStack[] { CI.getNumberedCircuit(20), Particle.getIon("Hydrogen", 0) }, FluidUtils.getWildcardFluidStack("hydrogen", 100), - new ItemStack[] { - Particle.getBaseParticle(Particle.PROTON), - Particle.getBaseParticle(Particle.PROTON), - Particle.getBaseParticle(Particle.PROTON), - Particle.getBaseParticle(Particle.PROTON), - Particle.getBaseParticle(Particle.PROTON), - Particle.getBaseParticle(Particle.PROTON), - Particle.getBaseParticle(Particle.PROTON), - Particle.getBaseParticle(Particle.PROTON), - Particle.getBaseParticle(Particle.PROTON), - }, + new ItemStack[] { Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.PROTON), + Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.PROTON), + Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.PROTON), + Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.PROTON), + Particle.getBaseParticle(Particle.PROTON), }, null, - new int[] {750, 750, 750, 750, 750, 750, 750, 750, 750}, + new int[] { 750, 750, 750, 750, 750, 750, 750, 750, 750 }, 20 * 20, (int) MaterialUtils.getVoltageForTier(6), 1500); CORE.RA.addCyclotronRecipe( - new ItemStack[] { - CI.getNumberedCircuit(22), Particle.getBaseParticle(Particle.UNKNOWN), - }, + new ItemStack[] { CI.getNumberedCircuit(22), Particle.getBaseParticle(Particle.UNKNOWN), }, FluidUtils.getWildcardFluidStack("hydrogen", 100), - new ItemStack[] { - Particle.getBaseParticle(Particle.PROTON), - Particle.getBaseParticle(Particle.PROTON), - Particle.getBaseParticle(Particle.PROTON), - Particle.getBaseParticle(Particle.PROTON), - Particle.getBaseParticle(Particle.PROTON), - Particle.getBaseParticle(Particle.PROTON), - Particle.getBaseParticle(Particle.PROTON), - Particle.getBaseParticle(Particle.PROTON), - Particle.getBaseParticle(Particle.PROTON), - }, + new ItemStack[] { Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.PROTON), + Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.PROTON), + Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.PROTON), + Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.PROTON), + Particle.getBaseParticle(Particle.PROTON), }, null, - new int[] {375, 375, 375, 375, 375, 375, 375, 375, 375}, + new int[] { 375, 375, 375, 375, 375, 375, 375, 375, 375 }, 20 * 20, (int) MaterialUtils.getVoltageForTier(6), 1500); // Create Strange Dust CORE.RA.addCyclotronRecipe( - new ItemStack[] { - ELEMENT.getInstance().PLUTONIUM238.getDust(1), - Particle.getBaseParticle(Particle.UNKNOWN), - Particle.getBaseParticle(Particle.UNKNOWN), - Particle.getBaseParticle(Particle.UNKNOWN), - Particle.getBaseParticle(Particle.UNKNOWN), - Particle.getBaseParticle(Particle.UNKNOWN), - Particle.getBaseParticle(Particle.UNKNOWN), - Particle.getBaseParticle(Particle.UNKNOWN), - Particle.getBaseParticle(Particle.UNKNOWN), - }, + new ItemStack[] { ELEMENT.getInstance().PLUTONIUM238.getDust(1), + Particle.getBaseParticle(Particle.UNKNOWN), Particle.getBaseParticle(Particle.UNKNOWN), + Particle.getBaseParticle(Particle.UNKNOWN), Particle.getBaseParticle(Particle.UNKNOWN), + Particle.getBaseParticle(Particle.UNKNOWN), Particle.getBaseParticle(Particle.UNKNOWN), + Particle.getBaseParticle(Particle.UNKNOWN), Particle.getBaseParticle(Particle.UNKNOWN), }, FluidUtils.getFluidStack(FluidUtils.getWildcardFluidStack("ender", 1000), 1000), - new ItemStack[] {ORES.DEEP_EARTH_REACTOR_FUEL_DEPOSIT.getDust(1)}, + new ItemStack[] { ORES.DEEP_EARTH_REACTOR_FUEL_DEPOSIT.getDust(1) }, null, - new int[] {2500}, + new int[] { 2500 }, 20 * 60 * 15, (int) MaterialUtils.getVoltageForTier(7), 250); @@ -2474,7 +2136,7 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict("dustNaquadah", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustSmallNaquadahEnriched", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1), - new int[] {10000, 2500, 5000}, + new int[] { 10000, 2500, 5000 }, 20 * 20, 24); @@ -2484,7 +2146,7 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict("dustIridium", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustSmallOsmium", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1), - new int[] {10000, 2500, 5000}, + new int[] { 10000, 2500, 5000 }, 20 * 20, 24); @@ -2494,7 +2156,7 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict("dustWulfenite", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1), - new int[] {10000, 3000, 3000}, + new int[] { 10000, 3000, 3000 }, 20 * 20, 24); } @@ -2502,14 +2164,13 @@ public class RECIPES_GREGTECH { private static void advancedMixerRecipes() { // HgBa2Ca2Cu3O8 - /*CORE.RA.addMixerRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("cellMercury", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustBarium", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustCalcium", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3), - FluidUtils.getFluidStack("oxygen", 8000), - null, CI.emptyCells(1), ALLOY.HG1223.getDust(16), null, null, - 30 * 20, 500); */ + /* + * CORE.RA.addMixerRecipe( ItemUtils.getItemStackOfAmountFromOreDict("cellMercury", 1), + * ItemUtils.getItemStackOfAmountFromOreDict("dustBarium", 2), + * ItemUtils.getItemStackOfAmountFromOreDict("dustCalcium", 2), + * ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3), FluidUtils.getFluidStack("oxygen", 8000), null, + * CI.emptyCells(1), ALLOY.HG1223.getDust(16), null, null, 30 * 20, 500); + */ } } diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java index f2eb616df2..ee9d2c4d29 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java @@ -6,6 +6,10 @@ import static gtPlusPlus.core.util.minecraft.ItemUtils.getSimpleStack; import static gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits.generatePipeRecipes; import static gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits.generateWireRecipes; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; @@ -25,9 +29,6 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class RECIPES_General { @@ -155,13 +156,17 @@ public class RECIPES_General { ItemUtils.getSimpleStack(ModItems.shardAqua)); GT_ModHandler.addPulverisationRecipe( - ItemUtils.getSimpleStack(ModItems.shardAer), ItemUtils.getSimpleStack(ModItems.dustAer, 2)); + ItemUtils.getSimpleStack(ModItems.shardAer), + ItemUtils.getSimpleStack(ModItems.dustAer, 2)); GT_ModHandler.addPulverisationRecipe( - ItemUtils.getSimpleStack(ModItems.shardIgnis), ItemUtils.getSimpleStack(ModItems.dustIgnis, 2)); + ItemUtils.getSimpleStack(ModItems.shardIgnis), + ItemUtils.getSimpleStack(ModItems.dustIgnis, 2)); GT_ModHandler.addPulverisationRecipe( - ItemUtils.getSimpleStack(ModItems.shardTerra), ItemUtils.getSimpleStack(ModItems.dustTerra, 2)); + ItemUtils.getSimpleStack(ModItems.shardTerra), + ItemUtils.getSimpleStack(ModItems.dustTerra, 2)); GT_ModHandler.addPulverisationRecipe( - ItemUtils.getSimpleStack(ModItems.shardAqua), ItemUtils.getSimpleStack(ModItems.dustAqua, 2)); + ItemUtils.getSimpleStack(ModItems.shardAqua), + ItemUtils.getSimpleStack(ModItems.dustAqua, 2)); } // Rainforest oak Sapling @@ -206,22 +211,13 @@ public class RECIPES_General { if (!CORE.GTNH) { GT_ModHandler.addCraftingRecipe( GregtechItemList.Shape_Extruder_SmallGear.get(1L), - GT_ModHandler.RecipeBits.BUFFERED - | GT_ModHandler.RecipeBits.NOT_REMOVABLE + GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { - "hXS", - "XPX", - "fXd", - Character.valueOf('P'), - ItemList.Shape_Extruder_Gear, - Character.valueOf('X'), - OrePrefixes.plate.get(Materials.Steel), - Character.valueOf('S'), - OrePrefixes.screw.get(Materials.Steel) - }); - - String[] ironTypes = {"", "Wrought", "Pig", "Any"}; + new Object[] { "hXS", "XPX", "fXd", Character.valueOf('P'), ItemList.Shape_Extruder_Gear, + Character.valueOf('X'), OrePrefixes.plate.get(Materials.Steel), Character.valueOf('S'), + OrePrefixes.screw.get(Materials.Steel) }); + + String[] ironTypes = { "", "Wrought", "Pig", "Any" }; for (int y = 0; y < ironTypes.length; y++) { // Iron bars String ironRecipe = "stick" + ironTypes[y] + "Iron"; @@ -245,23 +241,21 @@ public class RECIPES_General { // Potin if (RecipeUtils.addShapelessGregtechRecipe( - new Object[] {"dustLead", "dustBronze", "dustTin", "dustLead", "dustBronze"}, ALLOY.POTIN.getDust(5))) { + new Object[] { "dustLead", "dustBronze", "dustTin", "dustLead", "dustBronze" }, + ALLOY.POTIN.getDust(5))) { Logger.INFO("Added shapeless recipe for Potin Dust."); } // Tumbaga if (RecipeUtils.addShapelessGregtechRecipe( - new Object[] {"dustGold", "dustGold", "dustCopper"}, + new Object[] { "dustGold", "dustGold", "dustCopper" }, ItemUtils.getSimpleStack(ModItems.dustTumbagaMix))) { Logger.INFO("Added shapeless recipe for Tumbaga Mix."); } if (RecipeUtils.addShapelessGregtechRecipe( - new Object[] { - ItemUtils.getSimpleStack(ModItems.dustTumbagaMix), - ItemUtils.getSimpleStack(ModItems.dustTumbagaMix), - ItemUtils.getSimpleStack(ModItems.dustTumbagaMix), - "dustGold" - }, + new Object[] { ItemUtils.getSimpleStack(ModItems.dustTumbagaMix), + ItemUtils.getSimpleStack(ModItems.dustTumbagaMix), + ItemUtils.getSimpleStack(ModItems.dustTumbagaMix), "dustGold" }, ALLOY.TUMBAGA.getDust(10))) { Logger.INFO("Added shapeless recipe for Tumbaga Dust."); } @@ -304,24 +298,17 @@ public class RECIPES_General { if (Meta_GT_Proxy.sDoesVolumetricFlaskExist) { CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(4), - ItemUtils.getSimpleStack(Blocks.glass, 16), - ItemUtils.getSimpleStack(Blocks.glowstone, 16), - ItemList.Large_Fluid_Cell_Steel.get(1) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(4), ItemUtils.getSimpleStack(Blocks.glass, 16), + ItemUtils.getSimpleStack(Blocks.glowstone, 16), ItemList.Large_Fluid_Cell_Steel.get(1) }, FluidUtils.getFluidStack("molten.borosilicateglass", 2000), VolumetricFlaskHelper.getLargeVolumetricFlask(2), 20 * 15, MaterialUtils.getVoltageForTier(3)); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(5), - ItemUtils.getSimpleStack(Blocks.glass, 64), - ItemUtils.getSimpleStack(Blocks.glowstone, 64), - ItemList.Large_Fluid_Cell_TungstenSteel.get(1) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(5), ItemUtils.getSimpleStack(Blocks.glass, 64), + ItemUtils.getSimpleStack(Blocks.glowstone, 64), + ItemList.Large_Fluid_Cell_TungstenSteel.get(1) }, FluidUtils.getFluidStack("molten.borosilicateglass", 8000), VolumetricFlaskHelper.getGiganticVolumetricFlask(2), 20 * 15, @@ -359,20 +346,15 @@ public class RECIPES_General { Logger.INFO("Added a recipe for The Alkalus Disk."); } - /*final String fancyGems[] = new String[]{"gemExquisiteDiamond", "gemExquisiteEmerald", "gemExquisiteRuby", "gemExquisiteSapphire"}; - final ItemStack gemShards[] = new ItemStack[]{ItemUtils.simpleMetaStack(ModItems.itemGemShards, 0, 1), - ItemUtils.simpleMetaStack(ModItems.itemGemShards, 1, 1), - ItemUtils.simpleMetaStack(ModItems.itemGemShards, 2, 1), - ItemUtils.simpleMetaStack(ModItems.itemGemShards, 3, 1)}; - - int l=0; - for (final String gem : fancyGems){ - GameRegistry.addShapelessRecipe( - gemShards[l], - ItemUtils.getItemStackOfAmountFromOreDict(gem, 1), - new ItemStack(ModItems.itemAlkalusDisk, 1, OreDictionary.WILDCARD_VALUE)); - l++; - }*/ + /* + * final String fancyGems[] = new String[]{"gemExquisiteDiamond", "gemExquisiteEmerald", "gemExquisiteRuby", + * "gemExquisiteSapphire"}; final ItemStack gemShards[] = new + * ItemStack[]{ItemUtils.simpleMetaStack(ModItems.itemGemShards, 0, 1), + * ItemUtils.simpleMetaStack(ModItems.itemGemShards, 1, 1), ItemUtils.simpleMetaStack(ModItems.itemGemShards, 2, + * 1), ItemUtils.simpleMetaStack(ModItems.itemGemShards, 3, 1)}; int l=0; for (final String gem : fancyGems){ + * GameRegistry.addShapelessRecipe( gemShards[l], ItemUtils.getItemStackOfAmountFromOreDict(gem, 1), new + * ItemStack(ModItems.itemAlkalusDisk, 1, OreDictionary.WILDCARD_VALUE)); l++; } + */ Logger.RECIPE("[Inspection] Wither Cage"); if (RecipeUtils.addShapedRecipe( @@ -389,30 +371,27 @@ public class RECIPES_General { Logger.INFO("Added a recipe for Wither Cages."); } - /*Logger.RECIPE("[Inspection] Xp Converter"); - if (RecipeUtils.addShapedRecipe( - getSimpleStack(Items.experience_bottle), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 2, 1), getSimpleStack(Items.experience_bottle), - ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 5, 1), getSimpleStack(Items.nether_star), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 5, 1), - getSimpleStack(Items.experience_bottle), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 2, 1), getSimpleStack(Items.experience_bottle), - ItemUtils.getSimpleStack(ModBlocks.blockXpConverter, 1))){ - Logger.INFO("Added a recipe for XP Converter."); - }*/ + /* + * Logger.RECIPE("[Inspection] Xp Converter"); if (RecipeUtils.addShapedRecipe( + * getSimpleStack(Items.experience_bottle), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 2, 1), + * getSimpleStack(Items.experience_bottle), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 5, 1), + * getSimpleStack(Items.nether_star), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 5, 1), + * getSimpleStack(Items.experience_bottle), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 2, 1), + * getSimpleStack(Items.experience_bottle), ItemUtils.getSimpleStack(ModBlocks.blockXpConverter, 1))){ + * Logger.INFO("Added a recipe for XP Converter."); } + */ // Rope/Fiber/Net if (RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDictNoBroken(CI.craftingToolKnife, 1), - ItemUtils.getSimpleStack(Items.reeds) - }, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDictNoBroken(CI.craftingToolKnife, 1), + ItemUtils.getSimpleStack(Items.reeds) }, ItemUtils.getSimpleStack(ModItems.itemFiber, 16))) { Logger.INFO("Added a recipe for Fiber."); } if (RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDictNoBroken(CI.craftingToolKnife, 1), - ItemUtils.getSimpleStack(Blocks.sapling) - }, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDictNoBroken(CI.craftingToolKnife, 1), + ItemUtils.getSimpleStack(Blocks.sapling) }, ItemUtils.getSimpleStack(ModItems.itemFiber, 32))) { Logger.INFO("Added a recipe for Fiber."); } @@ -448,12 +427,9 @@ public class RECIPES_General { // Slow Builders Ring CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - ItemUtils.getSimpleStack(Blocks.ice, 8), - ItemUtils.getSimpleStack(ModBlocks.blockNet, 8), - ItemUtils.getSimpleStack(Blocks.vine, 8), - ALLOY.TUMBAGA.getRing(1), - }, + new ItemStack[] { ItemUtils.getSimpleStack(Blocks.ice, 8), + ItemUtils.getSimpleStack(ModBlocks.blockNet, 8), ItemUtils.getSimpleStack(Blocks.vine, 8), + ALLOY.TUMBAGA.getRing(1), }, FluidUtils.getWater(1000), // Fluid ItemUtils.getItemStackFromFQRN("miscutils:SlowBuildingRing", 1), // Output 20 * 30, // Dur @@ -461,14 +437,10 @@ public class RECIPES_General { // Magic Feather CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - ItemUtils.getSimpleStack(Items.feather, 64), - ItemUtils.getSimpleStack(Blocks.emerald_block, 32), - ItemUtils.getSimpleStack(Blocks.diamond_block, 32), - Materials.Ruby.getBlocks(32), - Materials.Sapphire.getBlocks(32), - ItemUtils.getSimpleStack(Blocks.gold_block, 32), - }, + new ItemStack[] { ItemUtils.getSimpleStack(Items.feather, 64), + ItemUtils.getSimpleStack(Blocks.emerald_block, 32), + ItemUtils.getSimpleStack(Blocks.diamond_block, 32), Materials.Ruby.getBlocks(32), + Materials.Sapphire.getBlocks(32), ItemUtils.getSimpleStack(Blocks.gold_block, 32), }, Materials.Silver.getMolten(32 * 144), // Fluid ItemUtils.getSimpleStack(ModItems.itemMagicFeather, 1), // Output 20 * 120, // Dur @@ -476,13 +448,9 @@ public class RECIPES_General { // Pest Killer CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedCircuit(16), - CI.getTieredMachineCasing(1), - CI.getElectricPump(2, 1), - CI.getPlate(2, GTNH ? 4 : 2), - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(0), GTNH ? 2 : 1), - }, + new ItemStack[] { CI.getNumberedCircuit(16), CI.getTieredMachineCasing(1), CI.getElectricPump(2, 1), + CI.getPlate(2, GTNH ? 4 : 2), + ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(0), GTNH ? 2 : 1), }, FluidUtils.getHotWater(500), // Fluid ItemUtils.getSimpleStack(ModBlocks.blockPestKiller), // Output 20 * 60, // Dur @@ -528,7 +496,8 @@ public class RECIPES_General { Logger.INFO("Added a recipe for Compressed Obsidian [" + r + "]"); } - if (RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {output}, ItemUtils.getSimpleStack(input, 9))) { + if (RecipeUtils + .addShapelessGregtechRecipe(new ItemStack[] { output }, ItemUtils.getSimpleStack(input, 9))) { Logger.INFO("Added a shapeless recipe for Compressed Obsidian [" + r + "]"); } } @@ -553,7 +522,8 @@ public class RECIPES_General { Logger.INFO("Added a recipe for Compressed Glowstone [" + r + "]"); } - if (RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {output}, ItemUtils.getSimpleStack(input, 9))) { + if (RecipeUtils + .addShapelessGregtechRecipe(new ItemStack[] { output }, ItemUtils.getSimpleStack(input, 9))) { Logger.INFO("Added a shapeless recipe for Compressed Glowstone [" + r + "]"); } } @@ -572,19 +542,10 @@ public class RECIPES_General { generateWireRecipes(ALLOY.TRINIUM_TITANIUM); generateWireRecipes(ELEMENT.STANDALONE.HYPOGEN); - GT_Materials[] g = new GT_Materials[] { - GT_Materials.Staballoy, - GT_Materials.Tantalloy60, - GT_Materials.Tantalloy61, - GT_Materials.Void, - GT_Materials.Potin, - GT_Materials.MaragingSteel300, - GT_Materials.MaragingSteel350, - GT_Materials.Inconel690, - GT_Materials.Inconel792, - GT_Materials.HastelloyX, - GT_Materials.TriniumNaquadahCarbonite, - }; + GT_Materials[] g = new GT_Materials[] { GT_Materials.Staballoy, GT_Materials.Tantalloy60, + GT_Materials.Tantalloy61, GT_Materials.Void, GT_Materials.Potin, GT_Materials.MaragingSteel300, + GT_Materials.MaragingSteel350, GT_Materials.Inconel690, GT_Materials.Inconel792, + GT_Materials.HastelloyX, GT_Materials.TriniumNaquadahCarbonite, }; for (GT_Materials e : g) { if (e == GT_Materials.Void) { if (!LoadedMods.Thaumcraft) { @@ -595,9 +556,8 @@ public class RECIPES_General { generatePipeRecipes(e.mDefaultLocalName, e.getMass(), tVoltageMultiplier); } - Materials[] h = new Materials[] { - Materials.Europium, Materials.Tungsten, Materials.DarkSteel, Materials.Clay, Materials.Lead, - }; + Materials[] h = new Materials[] { Materials.Europium, Materials.Tungsten, Materials.DarkSteel, Materials.Clay, + Materials.Lead, }; for (Materials e : h) { if (e == Materials.DarkSteel) { @@ -647,86 +607,50 @@ public class RECIPES_General { if (PollutionUtils.isPollutionEnabled()) { GT_ModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Muffler_Adv_LV.get(1L, new Object[0]), bitsd, new Object[] { - "M", - "P", - Character.valueOf('M'), - ItemList.Hatch_Muffler_LV.get(1), - Character.valueOf('P'), - GregtechItemList.Pollution_Cleaner_LV.get(1) - }); + GregtechItemList.Hatch_Muffler_Adv_LV.get(1L, new Object[0]), + bitsd, + new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_LV.get(1), + Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_LV.get(1) }); GT_ModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Muffler_Adv_MV.get(1L, new Object[0]), bitsd, new Object[] { - "M", - "P", - Character.valueOf('M'), - ItemList.Hatch_Muffler_MV.get(1), - Character.valueOf('P'), - GregtechItemList.Pollution_Cleaner_MV.get(1) - }); + GregtechItemList.Hatch_Muffler_Adv_MV.get(1L, new Object[0]), + bitsd, + new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_MV.get(1), + Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_MV.get(1) }); GT_ModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Muffler_Adv_HV.get(1L, new Object[0]), bitsd, new Object[] { - "M", - "P", - Character.valueOf('M'), - ItemList.Hatch_Muffler_HV.get(1), - Character.valueOf('P'), - GregtechItemList.Pollution_Cleaner_HV.get(1) - }); + GregtechItemList.Hatch_Muffler_Adv_HV.get(1L, new Object[0]), + bitsd, + new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_HV.get(1), + Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_HV.get(1) }); GT_ModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Muffler_Adv_EV.get(1L, new Object[0]), bitsd, new Object[] { - "M", - "P", - Character.valueOf('M'), - ItemList.Hatch_Muffler_EV.get(1), - Character.valueOf('P'), - GregtechItemList.Pollution_Cleaner_EV.get(1) - }); + GregtechItemList.Hatch_Muffler_Adv_EV.get(1L, new Object[0]), + bitsd, + new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_EV.get(1), + Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_EV.get(1) }); GT_ModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Muffler_Adv_IV.get(1L, new Object[0]), bitsd, new Object[] { - "M", - "P", - Character.valueOf('M'), - ItemList.Hatch_Muffler_IV.get(1), - Character.valueOf('P'), - GregtechItemList.Pollution_Cleaner_IV.get(1) - }); + GregtechItemList.Hatch_Muffler_Adv_IV.get(1L, new Object[0]), + bitsd, + new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_IV.get(1), + Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_IV.get(1) }); GT_ModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Muffler_Adv_LuV.get(1L, new Object[0]), bitsd, new Object[] { - "M", - "P", - Character.valueOf('M'), - ItemList.Hatch_Muffler_LuV.get(1), - Character.valueOf('P'), - GregtechItemList.Pollution_Cleaner_LuV.get(1) - }); + GregtechItemList.Hatch_Muffler_Adv_LuV.get(1L, new Object[0]), + bitsd, + new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_LuV.get(1), + Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_LuV.get(1) }); GT_ModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Muffler_Adv_ZPM.get(1L, new Object[0]), bitsd, new Object[] { - "M", - "P", - Character.valueOf('M'), - ItemList.Hatch_Muffler_ZPM.get(1), - Character.valueOf('P'), - GregtechItemList.Pollution_Cleaner_ZPM.get(1) - }); + GregtechItemList.Hatch_Muffler_Adv_ZPM.get(1L, new Object[0]), + bitsd, + new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_ZPM.get(1), + Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_ZPM.get(1) }); GT_ModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Muffler_Adv_UV.get(1L, new Object[0]), bitsd, new Object[] { - "M", - "P", - Character.valueOf('M'), - ItemList.Hatch_Muffler_UV.get(1), - Character.valueOf('P'), - GregtechItemList.Pollution_Cleaner_UV.get(1) - }); + GregtechItemList.Hatch_Muffler_Adv_UV.get(1L, new Object[0]), + bitsd, + new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_UV.get(1), + Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_UV.get(1) }); GT_ModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Muffler_Adv_MAX.get(1L, new Object[0]), bitsd, new Object[] { - "M", - "P", - Character.valueOf('M'), - ItemList.Hatch_Muffler_MAX.get(1), - Character.valueOf('P'), - GregtechItemList.Pollution_Cleaner_MAX.get(1) - }); + GregtechItemList.Hatch_Muffler_Adv_MAX.get(1L, new Object[0]), + bitsd, + new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_MAX.get(1), + Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_MAX.get(1) }); } } } diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java index aab90619cb..bd5ac25bf3 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.recipe; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.interfaces.IOreRecipeRegistrator; import gregtech.api.util.GT_OreDictUnificator; @@ -10,27 +12,23 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.everglades.dimension.Dimension_Everglades; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import net.minecraft.item.ItemStack; public class RECIPES_LaserEngraver implements IOreRecipeRegistrator { + public RECIPES_LaserEngraver() { OrePrefixes.crafting.add(this); } @Override - public void registerOre( - final OrePrefixes aPrefix, - final Materials aMaterial, - final String aOreDictName, - final String aModName, - final ItemStack aStack) { + public void registerOre(final OrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName, + final String aModName, final ItemStack aStack) { if (aOreDictName.equals(OreDictNames.craftingLensBlue.toString())) { if (CORE.ConfigSwitches.enableCustomCircuits && !CORE.GTNH) { if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilYttriumBariumCuprate", 1) != null) { GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.foil, Materials.YttriumBariumCuprate, 2L), - GT_Utility.copyAmount(0L, new Object[] {aStack}), + GT_Utility.copyAmount(0L, new Object[] { aStack }), GregtechItemList.Circuit_Parts_Wiring_IV.get(1L, new Object[0]), 64, 480); @@ -43,7 +41,7 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator { if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilVanadiumGallium", 1) != null) { GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.foil, Materials.VanadiumGallium, 2L), - GT_Utility.copyAmount(0L, new Object[] {aStack}), + GT_Utility.copyAmount(0L, new Object[] { aStack }), GregtechItemList.Circuit_Parts_Wiring_IV.get(1L, new Object[0]), 64, 480); @@ -56,7 +54,7 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator { if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilNiobiumTitanium", 1) != null) { GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.foil, Materials.NiobiumTitanium, 2L), - GT_Utility.copyAmount(0L, new Object[] {aStack}), + GT_Utility.copyAmount(0L, new Object[] { aStack }), GregtechItemList.Circuit_Parts_Wiring_IV.get(1L, new Object[0]), 64, 480); @@ -73,7 +71,7 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator { if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilOsmium", 1) != null) { GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmium, 2L), - GT_Utility.copyAmount(0L, new Object[] {aStack}), + GT_Utility.copyAmount(0L, new Object[] { aStack }), GregtechItemList.Circuit_Parts_Wiring_LuV.get(1L, new Object[0]), 64, 1024); @@ -85,104 +83,136 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator { } } - } else if (aOreDictName.equals(OreDictNames.craftingLensCyan.toString())) { - } else if (aOreDictName.equals(OreDictNames.craftingLensRed.toString())) { - } else if (aOreDictName.equals(OreDictNames.craftingLensGreen.toString())) { - if (CORE.ConfigSwitches.enableCustomCircuits && !CORE.GTNH) { - if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilNaquadah", 1) != null) { - 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 { - Logger.INFO( - "foilNaquadah does not exist within Gregtech, please report this issue to Blood-asp on github."); - Logger.INFO( - "This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself."); - } - } - } else if (aOreDictName.equals(OreDictNames.craftingLensWhite.toString())) { - if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateLithium", 1) != null) { - GT_Values.RA.addLaserEngraverRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lithium, 2L), - GT_Utility.copyAmount(0L, new Object[] {aStack}), - ItemUtils.getItemStackOfAmountFromOreDict("plateDoubleLithium7", 1), - 4 * 60 * 20, - 2000); - } else { - Logger.INFO( - "plateLithium does not exist within Gregtech, please report this issue to Blood-asp on github."); - Logger.INFO( - "This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself."); - } - if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustLithium", 1) != null) { - GT_Values.RA.addLaserEngraverRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 3L), - GT_Utility.copyAmount(0L, new Object[] {aStack}), - ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 1), - 2 * 60 * 20, - 2000); - } else { - Logger.INFO( - "dustLithium does not exist within Gregtech, please report this issue to Blood-asp on github."); - Logger.INFO( - "This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself."); - } + } else if (aOreDictName.equals(OreDictNames.craftingLensCyan.toString())) {} else + if (aOreDictName.equals(OreDictNames.craftingLensRed.toString())) {} else + if (aOreDictName.equals(OreDictNames.craftingLensGreen.toString())) { + if (CORE.ConfigSwitches.enableCustomCircuits && !CORE.GTNH) { + if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilNaquadah", 1) != null) { + 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 { + Logger.INFO( + "foilNaquadah does not exist within Gregtech, please report this issue to Blood-asp on github."); + Logger.INFO( + "This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself."); + } + } + } else if (aOreDictName.equals(OreDictNames.craftingLensWhite.toString())) { + if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateLithium", 1) != null) { + GT_Values.RA.addLaserEngraverRecipe( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lithium, 2L), + GT_Utility.copyAmount(0L, new Object[] { aStack }), + ItemUtils.getItemStackOfAmountFromOreDict("plateDoubleLithium7", 1), + 4 * 60 * 20, + 2000); + } else { + Logger.INFO( + "plateLithium does not exist within Gregtech, please report this issue to Blood-asp on github."); + Logger.INFO( + "This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself."); + } + if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustLithium", 1) != null) { + GT_Values.RA.addLaserEngraverRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 3L), + GT_Utility.copyAmount(0L, new Object[] { aStack }), + ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 1), + 2 * 60 * 20, + 2000); + } else { + Logger.INFO( + "dustLithium does not exist within Gregtech, please report this issue to Blood-asp on github."); + Logger.INFO( + "This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself."); + } - } else if (aOreDictName.equals(OreDictNames.craftingLensLime.toString())) { - // Coil Wires - ItemStack coilWire1 = - ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire", "coilWire1", 0, 1); - ItemStack coilWire2 = - ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:1", "coilWire2", 1, 1); - ItemStack coilWire3 = - ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:2", "coilWire3", 2, 1); - ItemStack coilWire4 = - ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:3", "coilWire4", 3, 1); + } else if (aOreDictName.equals(OreDictNames.craftingLensLime.toString())) { + // Coil Wires + ItemStack coilWire1 = ItemUtils + .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire", "coilWire1", 0, 1); + ItemStack coilWire2 = ItemUtils + .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:1", "coilWire2", 1, 1); + ItemStack coilWire3 = ItemUtils + .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:2", "coilWire3", 2, 1); + ItemStack coilWire4 = ItemUtils + .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:3", "coilWire4", 3, 1); - // Simple Life - String wire = "wireGt02"; + // Simple Life + String wire = "wireGt02"; - // Wires to Laser - ItemStack wireT1a = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Aluminium", 1); - ItemStack wireT1b = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Nichrome", 1); - ItemStack wireT2a = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Osmium", 1); - ItemStack wireT2b = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Platinum", 1); - ItemStack wireT3a = ItemUtils.getItemStackOfAmountFromOreDict(wire + "VanadiumGallium", 1); - ItemStack wireT3b = ItemUtils.getItemStackOfAmountFromOreDict(wire + "YttriumBariumCuprate", 1); - ItemStack wireT3c = ItemUtils.getItemStackOfAmountFromOreDict(wire + "NiobiumTitanium", 1); - ItemStack wireT4a = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Naquadah", 1); + // Wires to Laser + ItemStack wireT1a = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Aluminium", 1); + ItemStack wireT1b = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Nichrome", 1); + ItemStack wireT2a = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Osmium", 1); + ItemStack wireT2b = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Platinum", 1); + ItemStack wireT3a = ItemUtils.getItemStackOfAmountFromOreDict(wire + "VanadiumGallium", 1); + ItemStack wireT3b = ItemUtils.getItemStackOfAmountFromOreDict(wire + "YttriumBariumCuprate", 1); + ItemStack wireT3c = ItemUtils.getItemStackOfAmountFromOreDict(wire + "NiobiumTitanium", 1); + ItemStack wireT4a = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Naquadah", 1); - // T1 - GT_Values.RA.addLaserEngraverRecipe( - wireT1a, GT_Utility.copyAmount(0L, new Object[] {aStack}), coilWire1, 10 * 20, 500); - GT_Values.RA.addLaserEngraverRecipe( - wireT1b, GT_Utility.copyAmount(0L, new Object[] {aStack}), coilWire1, 10 * 20, 500); - // T2 - GT_Values.RA.addLaserEngraverRecipe( - wireT2a, GT_Utility.copyAmount(0L, new Object[] {aStack}), coilWire2, 20 * 20, 2000); - GT_Values.RA.addLaserEngraverRecipe( - wireT2b, GT_Utility.copyAmount(0L, new Object[] {aStack}), coilWire2, 20 * 20, 2000); - // T3 - GT_Values.RA.addLaserEngraverRecipe( - wireT3a, GT_Utility.copyAmount(0L, new Object[] {aStack}), coilWire3, 30 * 20, 8000); - GT_Values.RA.addLaserEngraverRecipe( - wireT3b, GT_Utility.copyAmount(0L, new Object[] {aStack}), coilWire3, 30 * 20, 8000); - GT_Values.RA.addLaserEngraverRecipe( - wireT3c, GT_Utility.copyAmount(0L, new Object[] {aStack}), coilWire3, 30 * 20, 8000); - // T4 - GT_Values.RA.addLaserEngraverRecipe( - wireT4a, GT_Utility.copyAmount(0L, new Object[] {aStack}), coilWire4, 40 * 20, 32000); + // T1 + GT_Values.RA.addLaserEngraverRecipe( + wireT1a, + GT_Utility.copyAmount(0L, new Object[] { aStack }), + coilWire1, + 10 * 20, + 500); + GT_Values.RA.addLaserEngraverRecipe( + wireT1b, + GT_Utility.copyAmount(0L, new Object[] { aStack }), + coilWire1, + 10 * 20, + 500); + // T2 + GT_Values.RA.addLaserEngraverRecipe( + wireT2a, + GT_Utility.copyAmount(0L, new Object[] { aStack }), + coilWire2, + 20 * 20, + 2000); + GT_Values.RA.addLaserEngraverRecipe( + wireT2b, + GT_Utility.copyAmount(0L, new Object[] { aStack }), + coilWire2, + 20 * 20, + 2000); + // T3 + GT_Values.RA.addLaserEngraverRecipe( + wireT3a, + GT_Utility.copyAmount(0L, new Object[] { aStack }), + coilWire3, + 30 * 20, + 8000); + GT_Values.RA.addLaserEngraverRecipe( + wireT3b, + GT_Utility.copyAmount(0L, new Object[] { aStack }), + coilWire3, + 30 * 20, + 8000); + GT_Values.RA.addLaserEngraverRecipe( + wireT3c, + GT_Utility.copyAmount(0L, new Object[] { aStack }), + coilWire3, + 30 * 20, + 8000); + // T4 + GT_Values.RA.addLaserEngraverRecipe( + wireT4a, + GT_Utility.copyAmount(0L, new Object[] { aStack }), + coilWire4, + 40 * 20, + 32000); - } else if (aOreDictName.equals(OreDictNames.craftingLensOrange.toString())) { - GT_Values.RA.addLaserEngraverRecipe( - ItemUtils.getSimpleStack(ModItems.itemAlkalusDisk), - GT_Utility.copyAmount(0L, new Object[] {aStack}), - ItemUtils.getSimpleStack(Dimension_Everglades.portalItem), - 360 * 60 * 20, - 4096); - } + } else if (aOreDictName.equals(OreDictNames.craftingLensOrange.toString())) { + GT_Values.RA.addLaserEngraverRecipe( + ItemUtils.getSimpleStack(ModItems.itemAlkalusDisk), + GT_Utility.copyAmount(0L, new Object[] { aStack }), + ItemUtils.getSimpleStack(Dimension_Everglades.portalItem), + 360 * 60 * 20, + 4096); + } } } diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java index cac350b98e..ec23017166 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java @@ -7,17 +7,9 @@ public class RECIPES_MTWRAPPER { public static void run() {} - 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) {} + 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) {} public static void addShapeless() {} } diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java index 13abb8cfa5..54f0fe7849 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java @@ -725,8 +725,7 @@ public class RECIPES_MachineComponents { 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 + 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]), diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 78254859d4..cace9cff2c 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -1,7 +1,17 @@ package gtPlusPlus.core.recipe; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + import com.github.technus.tectech.recipe.TT_recipeAdder; import com.github.technus.tectech.thing.CustomItemList; + import cpw.mods.fml.common.Loader; import gregtech.api.GregTech_API; import gregtech.api.enums.*; @@ -31,14 +41,6 @@ import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; import gtPlusPlus.xmod.gregtech.common.covers.CoverManager; import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper; import gtPlusPlus.xmod.gregtech.common.items.MetaCustomCoverItem; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; public class RECIPES_Machines { @@ -130,8 +132,8 @@ public class RECIPES_Machines { public static ItemStack RECIPE_BufferCore_LuV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore7", 1); public static ItemStack RECIPE_BufferCore_ZPM = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore8", 1); public static ItemStack RECIPE_BufferCore_UV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore9", 1); - public static ItemStack RECIPE_BufferCore_MAX = - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore10", 1); + public static ItemStack RECIPE_BufferCore_MAX = ItemUtils + .getItemStackFromFQRN("miscutils:item.itemBufferCore10", 1); // Wire public static String wireTier1 = "wireGt08Lead"; @@ -281,25 +283,16 @@ public class RECIPES_Machines { private static void advHeatExchanger() { CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(18), - ItemList.Machine_Multi_HeatExchanger.get(1), - CI.getDoublePlate(6, 8), - CI.getScrew(6, 16), - CI.getCircuit(5, 8) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(18), ItemList.Machine_Multi_HeatExchanger.get(1), + CI.getDoublePlate(6, 8), CI.getScrew(6, 16), CI.getCircuit(5, 8) }, CI.tieredMaterials[5].getMolten(144 * 8), GregtechItemList.XL_HeatExchanger.get(1), 20 * 60, MaterialUtils.getVoltageForTier(6)); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(18), - ItemList.Casing_StableTitanium.get(1), - CI.getPlate(5, 4), - CI.getScrew(5, 8), - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(18), ItemList.Casing_StableTitanium.get(1), + CI.getPlate(5, 4), CI.getScrew(5, 8), }, CI.tieredMaterials[5].getMolten(144 * 2), GregtechItemList.Casing_XL_HeatExchanger.get(1), 20 * 5, @@ -309,14 +302,9 @@ public class RECIPES_Machines { private static void computerCube() { CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(20), - CI.getTieredGTPPMachineCasing(4, 1), - CI.getCircuit(4, 8), - CI.getFieldGenerator(2, 4), - CI.getDoublePlate(4, 8), - CI.getRobotArm(4, 8) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(20), CI.getTieredGTPPMachineCasing(4, 1), + CI.getCircuit(4, 8), CI.getFieldGenerator(2, 4), CI.getDoublePlate(4, 8), + CI.getRobotArm(4, 8) }, Materials.Redstone.getMolten(144 * 32), GregtechItemList.Gregtech_Computer_Cube_Machine.get(1), 20 * 60 * 10, @@ -325,18 +313,14 @@ public class RECIPES_Machines { private static void gt4FarmManager() { - ItemList[] aInputHatches = new ItemList[] { - ItemList.Hatch_Input_LV, ItemList.Hatch_Input_MV, ItemList.Hatch_Input_HV, - ItemList.Hatch_Input_EV, ItemList.Hatch_Input_IV, ItemList.Hatch_Input_LuV, - ItemList.Hatch_Input_ZPM, ItemList.Hatch_Input_UV - }; - GregtechItemList[] aOutputMachines = new GregtechItemList[] { - GregtechItemList.GT4_Crop_Harvester_LV, GregtechItemList.GT4_Crop_Harvester_MV, - GregtechItemList.GT4_Crop_Harvester_HV, - GregtechItemList.GT4_Crop_Harvester_EV, GregtechItemList.GT4_Crop_Harvester_IV, - GregtechItemList.GT4_Crop_Harvester_LuV, - GregtechItemList.GT4_Crop_Harvester_ZPM, GregtechItemList.GT4_Crop_Harvester_UV - }; + ItemList[] aInputHatches = new ItemList[] { ItemList.Hatch_Input_LV, ItemList.Hatch_Input_MV, + ItemList.Hatch_Input_HV, ItemList.Hatch_Input_EV, ItemList.Hatch_Input_IV, ItemList.Hatch_Input_LuV, + ItemList.Hatch_Input_ZPM, ItemList.Hatch_Input_UV }; + GregtechItemList[] aOutputMachines = new GregtechItemList[] { GregtechItemList.GT4_Crop_Harvester_LV, + GregtechItemList.GT4_Crop_Harvester_MV, GregtechItemList.GT4_Crop_Harvester_HV, + GregtechItemList.GT4_Crop_Harvester_EV, GregtechItemList.GT4_Crop_Harvester_IV, + GregtechItemList.GT4_Crop_Harvester_LuV, GregtechItemList.GT4_Crop_Harvester_ZPM, + GregtechItemList.GT4_Crop_Harvester_UV }; int aTier = 1; for (int i = 0; i < 8; i++) { @@ -427,7 +411,7 @@ public class RECIPES_Machines { GregtechItemList.GT4_Redstone_Scale.get(8)); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] {CI.getTieredMachineHull(1), ItemUtils.getSimpleStack(Blocks.stone_button, 16)}, + new ItemStack[] { CI.getTieredMachineHull(1), ItemUtils.getSimpleStack(Blocks.stone_button, 16) }, null, GregtechItemList.GT4_Redstone_Button_Panel.get(1), 800, @@ -459,25 +443,21 @@ public class RECIPES_Machines { private static void gt4Inventory() { - ItemList[] aEnergyHatches = new ItemList[] { - ItemList.Hatch_Energy_LV, ItemList.Hatch_Energy_MV, ItemList.Hatch_Energy_HV, - ItemList.Hatch_Energy_EV, ItemList.Hatch_Energy_IV, ItemList.Hatch_Energy_LuV, - ItemList.Hatch_Energy_ZPM, ItemList.Hatch_Energy_UV - }; + ItemList[] aEnergyHatches = new ItemList[] { ItemList.Hatch_Energy_LV, ItemList.Hatch_Energy_MV, + ItemList.Hatch_Energy_HV, ItemList.Hatch_Energy_EV, ItemList.Hatch_Energy_IV, ItemList.Hatch_Energy_LuV, + ItemList.Hatch_Energy_ZPM, ItemList.Hatch_Energy_UV }; - ItemList[] aRegulators = new ItemList[] { - ItemList.Automation_Regulator_LV, ItemList.Automation_Regulator_MV, ItemList.Automation_Regulator_HV, - ItemList.Automation_Regulator_EV, ItemList.Automation_Regulator_IV, ItemList.Automation_Regulator_LuV, - ItemList.Automation_Regulator_ZPM, ItemList.Automation_Regulator_UV - }; + ItemList[] aRegulators = new ItemList[] { ItemList.Automation_Regulator_LV, ItemList.Automation_Regulator_MV, + ItemList.Automation_Regulator_HV, ItemList.Automation_Regulator_EV, ItemList.Automation_Regulator_IV, + ItemList.Automation_Regulator_LuV, ItemList.Automation_Regulator_ZPM, + ItemList.Automation_Regulator_UV }; GregtechItemList[] aOutputInventoryManager = new GregtechItemList[] { - GregtechItemList.GT4_Electric_Inventory_Manager_LV, GregtechItemList.GT4_Electric_Inventory_Manager_MV, - GregtechItemList.GT4_Electric_Inventory_Manager_HV, - GregtechItemList.GT4_Electric_Inventory_Manager_EV, GregtechItemList.GT4_Electric_Inventory_Manager_IV, - GregtechItemList.GT4_Electric_Inventory_Manager_LuV, - GregtechItemList.GT4_Electric_Inventory_Manager_ZPM, GregtechItemList.GT4_Electric_Inventory_Manager_UV - }; + GregtechItemList.GT4_Electric_Inventory_Manager_LV, GregtechItemList.GT4_Electric_Inventory_Manager_MV, + GregtechItemList.GT4_Electric_Inventory_Manager_HV, GregtechItemList.GT4_Electric_Inventory_Manager_EV, + GregtechItemList.GT4_Electric_Inventory_Manager_IV, GregtechItemList.GT4_Electric_Inventory_Manager_LuV, + GregtechItemList.GT4_Electric_Inventory_Manager_ZPM, + GregtechItemList.GT4_Electric_Inventory_Manager_UV }; int aTier = 1; for (int i = 0; i < 8; i++) { @@ -496,12 +476,10 @@ public class RECIPES_Machines { } GregtechItemList[] aOutputElectricCraftingTable = new GregtechItemList[] { - GregtechItemList.GT4_Electric_Auto_Workbench_LV, GregtechItemList.GT4_Electric_Auto_Workbench_MV, - GregtechItemList.GT4_Electric_Auto_Workbench_HV, - GregtechItemList.GT4_Electric_Auto_Workbench_EV, GregtechItemList.GT4_Electric_Auto_Workbench_IV, - GregtechItemList.GT4_Electric_Auto_Workbench_LuV, - GregtechItemList.GT4_Electric_Auto_Workbench_ZPM, GregtechItemList.GT4_Electric_Auto_Workbench_UV - }; + GregtechItemList.GT4_Electric_Auto_Workbench_LV, GregtechItemList.GT4_Electric_Auto_Workbench_MV, + GregtechItemList.GT4_Electric_Auto_Workbench_HV, GregtechItemList.GT4_Electric_Auto_Workbench_EV, + GregtechItemList.GT4_Electric_Auto_Workbench_IV, GregtechItemList.GT4_Electric_Auto_Workbench_LuV, + GregtechItemList.GT4_Electric_Auto_Workbench_ZPM, GregtechItemList.GT4_Electric_Auto_Workbench_UV }; aTier = 1; for (int i = 0; i < 8; i++) { @@ -522,65 +500,39 @@ public class RECIPES_Machines { private static void multiGeneratorArray() { - GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_Array_Controller.get(1L), CI.bitsd, new Object[] { - "CTC", - "FMF", - "CBC", - 'M', - CI.getTieredGTPPMachineCasing(4, 1), - 'B', - OrePrefixes.pipeHuge.get(Materials.StainlessSteel), - 'C', - OrePrefixes.circuit.get(Materials.Data), - 'F', - ItemList.Electric_Pump_EV, - 'T', - CI.getSensor(4, 1) - }); + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Generator_Array_Controller.get(1L), + CI.bitsd, + new Object[] { "CTC", "FMF", "CBC", 'M', CI.getTieredGTPPMachineCasing(4, 1), 'B', + OrePrefixes.pipeHuge.get(Materials.StainlessSteel), 'C', + OrePrefixes.circuit.get(Materials.Data), 'F', ItemList.Electric_Pump_EV, 'T', + CI.getSensor(4, 1) }); } private static void multiForgeHammer() { CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - ItemUtils.getSimpleStack(CI.machineHull_IV, 2), - ItemList.Machine_IV_Hammer.get(1), - CI.getPlate(4, 8), - CI.getBolt(5, 32), - ELEMENT.getInstance().ZIRCONIUM.getFineWire(32), - ItemUtils.getItemStackOfAmountFromOreDict("circuitElite", 4) - }, + new ItemStack[] { ItemUtils.getSimpleStack(CI.machineHull_IV, 2), ItemList.Machine_IV_Hammer.get(1), + CI.getPlate(4, 8), CI.getBolt(5, 32), ELEMENT.getInstance().ZIRCONIUM.getFineWire(32), + ItemUtils.getItemStackOfAmountFromOreDict("circuitElite", 4) }, CI.getTieredFluid(4, 144 * 12), GregtechItemList.Controller_IndustrialForgeHammer.get(1), 20 * 30, MaterialUtils.getVoltageForTier(5)); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Casing_IndustrialForgeHammer.get(1), CI.bitsd, new Object[] { - "IBI", - "HCH", - "IHI", - 'I', - CI.getPlate(4, 1), - 'B', - ALLOY.BABBIT_ALLOY.getPlate(1), - 'C', - ItemList.Casing_HeatProof.get(1), - 'H', - ALLOY.HASTELLOY_X.getRod(1) - }); + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Casing_IndustrialForgeHammer.get(1), + CI.bitsd, + new Object[] { "IBI", "HCH", "IHI", 'I', CI.getPlate(4, 1), 'B', ALLOY.BABBIT_ALLOY.getPlate(1), 'C', + ItemList.Casing_HeatProof.get(1), 'H', ALLOY.HASTELLOY_X.getRod(1) }); } private static void multiMolecularTransformer() { CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getTieredGTPPMachineCasing(6, 1), - CI.getPlate(5, 16), - CI.getBolt(5, 32), - ALLOY.HG1223.getFineWire(64), - CI.getEmitter(4, 8), - ItemUtils.getItemStackOfAmountFromOreDict("circuitMaster", 10) - }, + new ItemStack[] { CI.getTieredGTPPMachineCasing(6, 1), CI.getPlate(5, 16), CI.getBolt(5, 32), + ALLOY.HG1223.getFineWire(64), CI.getEmitter(4, 8), + ItemUtils.getItemStackOfAmountFromOreDict("circuitMaster", 10) }, CI.getTieredFluid(5, 144 * 16), ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_11_MOLECULAR_TRANSFORMER, 1), 20 * 60, @@ -589,68 +541,43 @@ public class RECIPES_Machines { CORE.RA.addAssemblylineRecipe( ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_11_MOLECULAR_TRANSFORMER, 1), 20 * 60 * 30, - new Object[] { - ALLOY.HG1223.getFineWire(64), - ALLOY.HG1223.getFineWire(64), - ItemList.Electric_Motor_IV.get(16), - ItemList.Energy_LapotronicOrb.get(16), - CI.getTieredComponent(OrePrefixes.cableGt12, 6, 16), - CI.getTieredComponent(OrePrefixes.wireGt16, 5, 32), - ALLOY.ZERON_100.getFrameBox(4), - ALLOY.ZIRCONIUM_CARBIDE.getPlateDouble(32), - ALLOY.BABBIT_ALLOY.getPlate(64), - ALLOY.LEAGRISIUM.getGear(8), - new Object[] {CI.getTieredCircuitOreDictName(4), 64}, - new Object[] {CI.getTieredCircuitOreDictName(5), 32}, - new Object[] {CI.getTieredCircuitOreDictName(6), 16}, - GregtechItemList.Laser_Lens_WoodsGlass.get(1), - }, - new FluidStack[] { - ALLOY.NITINOL_60.getFluidStack(144 * 9 * (2)), - ALLOY.INCOLOY_MA956.getFluidStack(144 * 9 * (8)), - ALLOY.KANTHAL.getFluidStack(144 * 1 * (4)), - }, + new Object[] { ALLOY.HG1223.getFineWire(64), ALLOY.HG1223.getFineWire(64), + ItemList.Electric_Motor_IV.get(16), ItemList.Energy_LapotronicOrb.get(16), + CI.getTieredComponent(OrePrefixes.cableGt12, 6, 16), + CI.getTieredComponent(OrePrefixes.wireGt16, 5, 32), ALLOY.ZERON_100.getFrameBox(4), + ALLOY.ZIRCONIUM_CARBIDE.getPlateDouble(32), ALLOY.BABBIT_ALLOY.getPlate(64), + ALLOY.LEAGRISIUM.getGear(8), new Object[] { CI.getTieredCircuitOreDictName(4), 64 }, + new Object[] { CI.getTieredCircuitOreDictName(5), 32 }, + new Object[] { CI.getTieredCircuitOreDictName(6), 16 }, + GregtechItemList.Laser_Lens_WoodsGlass.get(1), }, + new FluidStack[] { ALLOY.NITINOL_60.getFluidStack(144 * 9 * (2)), + ALLOY.INCOLOY_MA956.getFluidStack(144 * 9 * (8)), ALLOY.KANTHAL.getFluidStack(144 * 1 * (4)), }, GregtechItemList.Controller_MolecularTransformer.get(1), 20 * 60 * 10 * (1), (int) MaterialUtils.getVoltageForTier(6)); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(16), - CI.getPlate(6, 4), - CI.getScrew(6, 8), - ELEMENT.getInstance().PALLADIUM.getFineWire(16), - CI.getSensor(5, 2), - ItemUtils.getItemStackOfAmountFromOreDict("circuitElite", 4) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(16), CI.getPlate(6, 4), CI.getScrew(6, 8), + ELEMENT.getInstance().PALLADIUM.getFineWire(16), CI.getSensor(5, 2), + ItemUtils.getItemStackOfAmountFromOreDict("circuitElite", 4) }, CI.getTieredFluid(5, 144 * 4), GregtechItemList.Casing_Molecular_Transformer_1.get(1), 20 * 20, MaterialUtils.getVoltageForTier(5)); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(16), - CI.getPlate(5, 4), - CI.getScrew(5, 8), - ItemList.Casing_Coil_Nichrome.get(2), - CI.getFieldGenerator(3, 2), - ItemUtils.getItemStackOfAmountFromOreDict("circuitData", 8) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(16), CI.getPlate(5, 4), CI.getScrew(5, 8), + ItemList.Casing_Coil_Nichrome.get(2), CI.getFieldGenerator(3, 2), + ItemUtils.getItemStackOfAmountFromOreDict("circuitData", 8) }, CI.getTieredFluid(5, 144 * 4), GregtechItemList.Casing_Molecular_Transformer_2.get(1), 20 * 20, MaterialUtils.getVoltageForTier(5)); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(16), - ItemUtils.getSimpleStack(Blocks.glowstone, 16), - CI.getGear(5, 8), - ELEMENT.getInstance().TITANIUM.getWire04(4), - CI.getFieldGenerator(4, 2), - ItemUtils.getItemStackOfAmountFromOreDict("circuitData", 8) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(16), ItemUtils.getSimpleStack(Blocks.glowstone, 16), + CI.getGear(5, 8), ELEMENT.getInstance().TITANIUM.getWire04(4), CI.getFieldGenerator(4, 2), + ItemUtils.getItemStackOfAmountFromOreDict("circuitData", 8) }, CI.getTieredFluid(5, 144 * 4), GregtechItemList.Casing_Molecular_Transformer_3.get(1), 20 * 60, @@ -672,14 +599,8 @@ public class RECIPES_Machines { GregtechItemList.Casing_Turbine_Shaft.get(1)); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(18), - ItemList.Casing_Turbine.get(1), - CI.getPlate(4, 4), - CI.getScrew(4, 8), - CI.getCircuit(4, 4), - CI.getGear(3, 8) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(18), ItemList.Casing_Turbine.get(1), CI.getPlate(4, 4), + CI.getScrew(4, 8), CI.getCircuit(4, 4), CI.getGear(3, 8) }, CI.tieredMaterials[3].getMolten(144 * 8), GregtechItemList.Hatch_Turbine_Rotor.get(1), 20 * 60, @@ -687,25 +608,15 @@ public class RECIPES_Machines { // Steam CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(18), - ItemList.Casing_Turbine.get(1), - CI.getPlate(3, 4), - CI.getScrew(3, 8), - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(18), ItemList.Casing_Turbine.get(1), CI.getPlate(3, 4), + CI.getScrew(3, 8), }, CI.tieredMaterials[2].getMolten(144 * 2), GregtechItemList.Casing_Turbine_LP.get(1), 20 * 5, MaterialUtils.getVoltageForTier(3)); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(18), - ItemList.LargeSteamTurbine.get(1), - CI.getPlate(4, 8), - CI.getScrew(4, 16), - CI.getGear(4, 4), - CI.getCircuit(4, 8) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(18), ItemList.LargeSteamTurbine.get(1), + CI.getPlate(4, 8), CI.getScrew(4, 16), CI.getGear(4, 4), CI.getCircuit(4, 8) }, CI.tieredMaterials[4].getMolten(144 * 8), GregtechItemList.Large_Steam_Turbine.get(1), 20 * 60, @@ -713,25 +624,15 @@ public class RECIPES_Machines { // Gas CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(18), - ItemList.Casing_Turbine1.get(1), - CI.getPlate(4, 4), - CI.getScrew(4, 8), - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(18), ItemList.Casing_Turbine1.get(1), CI.getPlate(4, 4), + CI.getScrew(4, 8), }, CI.tieredMaterials[3].getMolten(144 * 2), GregtechItemList.Casing_Turbine_Gas.get(1), 20 * 5, MaterialUtils.getVoltageForTier(4)); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(18), - ItemList.LargeGasTurbine.get(1), - CI.getPlate(5, 8), - CI.getScrew(5, 16), - CI.getGear(5, 4), - CI.getCircuit(5, 8) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(18), ItemList.LargeGasTurbine.get(1), CI.getPlate(5, 8), + CI.getScrew(5, 16), CI.getGear(5, 4), CI.getCircuit(5, 8) }, CI.tieredMaterials[5].getMolten(144 * 8), GregtechItemList.Large_Gas_Turbine.get(1), 20 * 60, @@ -739,25 +640,15 @@ public class RECIPES_Machines { // HP Steam CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(18), - ItemList.Casing_Turbine2.get(1), - CI.getPlate(5, 4), - CI.getScrew(5, 8), - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(18), ItemList.Casing_Turbine2.get(1), CI.getPlate(5, 4), + CI.getScrew(5, 8), }, CI.tieredMaterials[4].getMolten(144 * 2), GregtechItemList.Casing_Turbine_HP.get(1), 20 * 5, MaterialUtils.getVoltageForTier(5)); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(18), - ItemList.LargeHPSteamTurbine.get(1), - CI.getPlate(6, 8), - CI.getScrew(6, 16), - CI.getGear(6, 4), - CI.getCircuit(6, 8) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(18), ItemList.LargeHPSteamTurbine.get(1), + CI.getPlate(6, 8), CI.getScrew(6, 16), CI.getGear(6, 4), CI.getCircuit(6, 8) }, CI.tieredMaterials[6].getMolten(144 * 8), GregtechItemList.Large_HPSteam_Turbine.get(1), 20 * 60, @@ -765,50 +656,36 @@ public class RECIPES_Machines { // Plasma CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(18), - ItemList.Casing_Turbine3.get(1), - CI.getPlate(6, 4), - CI.getScrew(6, 8), - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(18), ItemList.Casing_Turbine3.get(1), CI.getPlate(6, 4), + CI.getScrew(6, 8), }, CI.tieredMaterials[5].getMolten(144 * 2), GregtechItemList.Casing_Turbine_Plasma.get(1), 20 * 5, MaterialUtils.getVoltageForTier(6)); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(18), - ItemList.LargePlasmaTurbine.get(1), - CI.getPlate(7, 8), - CI.getScrew(7, 16), - CI.getGear(7, 4), - CI.getCircuit(7, 8) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(18), ItemList.LargePlasmaTurbine.get(1), + CI.getPlate(7, 8), CI.getScrew(7, 16), CI.getGear(7, 4), CI.getCircuit(7, 8) }, CI.tieredMaterials[7].getMolten(144 * 8), GregtechItemList.Large_Plasma_Turbine.get(1), 20 * 60, MaterialUtils.getVoltageForTier(7)); if (LoadedMods.GoodGenerator) { GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(18), - GT_ModHandler.getModItem("GoodGenerator", "supercriticalFluidTurbineCasing", 1), - GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedplate", 4, 10101), - GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedscrew", 8, 10101) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(18), + GT_ModHandler.getModItem("GoodGenerator", "supercriticalFluidTurbineCasing", 1), + GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedplate", 4, 10101), + GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedscrew", 8, 10101) }, FluidRegistry.getFluidStack("molten.adamantium alloy", 144 * 2), GregtechItemList.Casing_Turbine_SC.get(1), 20 * 5, MaterialUtils.getVoltageForTier(6)); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(18), - GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 32016), - GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedplate", 8, 10104), - GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedscrew", 16, 10104), - GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedgearGt", 4, 10104), - CI.getCircuit(7, 8) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(18), + GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 32016), + GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedplate", 8, 10104), + GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedscrew", 16, 10104), + GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedgearGt", 4, 10104), + CI.getCircuit(7, 8) }, FluidRegistry.getFluidStack("molten.hikarium", 144 * 8), GregtechItemList.Large_SCSteam_Turbine.get(1), 20 * 60, @@ -819,65 +696,42 @@ public class RECIPES_Machines { private static void multiSolarTower() { CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(17), - CI.getTieredGTPPMachineCasing(3, 4), - ALLOY.MARAGING250.getPlate(8), - ALLOY.MARAGING250.getBolt(8), - ALLOY.MARAGING250.getScrew(8), - CI.getCircuit(5, 8) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(17), CI.getTieredGTPPMachineCasing(3, 4), + ALLOY.MARAGING250.getPlate(8), ALLOY.MARAGING250.getBolt(8), ALLOY.MARAGING250.getScrew(8), + CI.getCircuit(5, 8) }, CI.getTieredFluid(3, 144 * 16), GregtechItemList.Industrial_Solar_Tower.get(1), 20 * 30, MaterialUtils.getVoltageForTier(4)); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(17), - ALLOY.MARAGING350.getFrameBox(1), - ALLOY.STAINLESS_STEEL.getPlate(4), - ALLOY.MARAGING350.getScrew(8) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(17), ALLOY.MARAGING350.getFrameBox(1), + ALLOY.STAINLESS_STEEL.getPlate(4), ALLOY.MARAGING350.getScrew(8) }, CI.getTieredFluid(3, 144 * 4), GregtechItemList.Casing_SolarTower_Structural.get(1), 20 * 30, MaterialUtils.getVoltageForTier(3)); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(17), - ALLOY.MARAGING250.getFrameBox(1), - ALLOY.STAINLESS_STEEL.getPlate(4), - ALLOY.MARAGING250.getBolt(16), - ELEMENT.getInstance().ALUMINIUM.getScrew(8) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(17), ALLOY.MARAGING250.getFrameBox(1), + ALLOY.STAINLESS_STEEL.getPlate(4), ALLOY.MARAGING250.getBolt(16), + ELEMENT.getInstance().ALUMINIUM.getScrew(8) }, CI.getTieredFluid(3, 144 * 4), GregtechItemList.Casing_SolarTower_SaltContainment.get(1), 20 * 30, MaterialUtils.getVoltageForTier(3)); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(17), - ALLOY.MARAGING250.getFrameBox(1), - ALLOY.STEEL_BLACK.getPlate(4), - ALLOY.MARAGING250.getScrew(8) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(17), ALLOY.MARAGING250.getFrameBox(1), + ALLOY.STEEL_BLACK.getPlate(4), ALLOY.MARAGING250.getScrew(8) }, CI.getAlternativeTieredFluid(3, 144 * 4), GregtechItemList.Casing_SolarTower_HeatContainment.get(1), 20 * 30, MaterialUtils.getVoltageForTier(3)); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(17), - CI.getTieredGTPPMachineCasing(2, 1), - CI.getPlate(3, 2), - CI.getGear(3, 4), - CI.getElectricMotor(3, 2), - CI.getCircuit(3, 4) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(17), CI.getTieredGTPPMachineCasing(2, 1), + CI.getPlate(3, 2), CI.getGear(3, 4), CI.getElectricMotor(3, 2), CI.getCircuit(3, 4) }, CI.getTertiaryTieredFluid(3, 144 * 4), GregtechItemList.Solar_Tower_Reflector.get(1), 20 * 60, @@ -889,26 +743,13 @@ public class RECIPES_Machines { CORE.RA.addAssemblylineRecipe( ItemList.Machine_IV_Replicator.get(1), 20 * 60 * 60 * 12, - new Object[] { - CI.getTieredMachineHull(7, 4), - CI.getFieldGenerator(5, 16), - CI.getElectricMotor(7, 16), - CI.getElectricPiston(7, 4), - CI.getEnergyCore(6, 2), - CI.getPlate(7, 16), - CI.getScrew(7, 32), - CI.getBolt(6, 32), - CI.getTieredComponent(OrePrefixes.rod, 6, 10), - new Object[] {CI.getTieredCircuitOreDictName(7), 20}, - ItemList.Tool_DataOrb.get(32), - GregtechItemList.Laser_Lens_Special.get(1) - }, - new FluidStack[] { - CI.getTieredFluid(7, 144 * 32), - CI.getAlternativeTieredFluid(6, 144 * 16), - CI.getTertiaryTieredFluid(6, 144 * 16), - ALLOY.BABBIT_ALLOY.getFluidStack(128 * 144), - }, + new Object[] { CI.getTieredMachineHull(7, 4), CI.getFieldGenerator(5, 16), CI.getElectricMotor(7, 16), + CI.getElectricPiston(7, 4), CI.getEnergyCore(6, 2), CI.getPlate(7, 16), CI.getScrew(7, 32), + CI.getBolt(6, 32), CI.getTieredComponent(OrePrefixes.rod, 6, 10), + new Object[] { CI.getTieredCircuitOreDictName(7), 20 }, ItemList.Tool_DataOrb.get(32), + GregtechItemList.Laser_Lens_Special.get(1) }, + new FluidStack[] { CI.getTieredFluid(7, 144 * 32), CI.getAlternativeTieredFluid(6, 144 * 16), + CI.getTertiaryTieredFluid(6, 144 * 16), ALLOY.BABBIT_ALLOY.getFluidStack(128 * 144), }, GregtechItemList.Controller_ElementalDuplicator.get(1), 20 * 60 * 60, (int) MaterialUtils.getVoltageForTier(7)); @@ -916,23 +757,12 @@ public class RECIPES_Machines { CORE.RA.addAssemblylineRecipe( GregtechItemList.Modulator_III.get(1), 20 * 60 * 60 * 4, - new Object[] { - CI.getTieredGTPPMachineCasing(7, 2), - CI.getFieldGenerator(4, 4), - CI.getEnergyCore(4, 2), - CI.getPlate(7, 8), - CI.getScrew(6, 16), - CI.getBolt(6, 16), - CI.getTieredComponent(OrePrefixes.rod, 5, 16), - new Object[] {CI.getTieredCircuitOreDictName(6), 32}, - ItemList.Tool_DataOrb.get(32), - }, - new FluidStack[] { - CI.getTieredFluid(6, 144 * 16), - CI.getAlternativeTieredFluid(5, 144 * 8), - CI.getTertiaryTieredFluid(5, 144 * 8), - ALLOY.BABBIT_ALLOY.getFluidStack(64 * 144), - }, + new Object[] { CI.getTieredGTPPMachineCasing(7, 2), CI.getFieldGenerator(4, 4), CI.getEnergyCore(4, 2), + CI.getPlate(7, 8), CI.getScrew(6, 16), CI.getBolt(6, 16), + CI.getTieredComponent(OrePrefixes.rod, 5, 16), + new Object[] { CI.getTieredCircuitOreDictName(6), 32 }, ItemList.Tool_DataOrb.get(32), }, + new FluidStack[] { CI.getTieredFluid(6, 144 * 16), CI.getAlternativeTieredFluid(5, 144 * 8), + CI.getTertiaryTieredFluid(5, 144 * 8), ALLOY.BABBIT_ALLOY.getFluidStack(64 * 144), }, GregtechItemList.Hatch_Input_Elemental_Duplicator.get(1), 20 * 60 * 60 * (2), (int) MaterialUtils.getVoltageForTier(6)); @@ -940,23 +770,12 @@ public class RECIPES_Machines { CORE.RA.addAssemblylineRecipe( GregtechItemList.ResonanceChamber_III.get(1), 20 * 60 * 60 * 2, - new Object[] { - CI.getTieredMachineHull(6, 5), - CI.getFieldGenerator(3, 16), - CI.getEnergyCore(2, 2), - CI.getPlate(7, 4), - CI.getScrew(7, 4), - CI.getBolt(6, 8), - CI.getTieredComponent(OrePrefixes.rod, 5, 4), - new Object[] {CI.getTieredCircuitOreDictName(5), 4}, - ItemList.Tool_DataStick.get(4), - }, - new FluidStack[] { - CI.getTieredFluid(5, 144 * 16), - CI.getAlternativeTieredFluid(4, 144 * 8), - CI.getTertiaryTieredFluid(4, 144 * 8), - ALLOY.BABBIT_ALLOY.getFluidStack(16 * 144), - }, + new Object[] { CI.getTieredMachineHull(6, 5), CI.getFieldGenerator(3, 16), CI.getEnergyCore(2, 2), + CI.getPlate(7, 4), CI.getScrew(7, 4), CI.getBolt(6, 8), + CI.getTieredComponent(OrePrefixes.rod, 5, 4), + new Object[] { CI.getTieredCircuitOreDictName(5), 4 }, ItemList.Tool_DataStick.get(4), }, + new FluidStack[] { CI.getTieredFluid(5, 144 * 16), CI.getAlternativeTieredFluid(4, 144 * 8), + CI.getTertiaryTieredFluid(4, 144 * 8), ALLOY.BABBIT_ALLOY.getFluidStack(16 * 144), }, GregtechItemList.Casing_ElementalDuplicator.get(1), 20 * 60 * (10), (int) MaterialUtils.getVoltageForTier(6)); @@ -1002,14 +821,9 @@ public class RECIPES_Machines { private static void zyngen() { CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(6), - CI.getTieredMachineHull(4), - ItemList.Machine_IV_AlloySmelter.get(1), - CI.getGear(3, 16), - CI.getBolt(3, 64), - CI.getPlate(4, 16) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(6), CI.getTieredMachineHull(4), + ItemList.Machine_IV_AlloySmelter.get(1), CI.getGear(3, 16), CI.getBolt(3, 64), + CI.getPlate(4, 16) }, CI.getAlternativeTieredFluid(4, 144 * 8), GregtechItemList.Industrial_AlloySmelter.get(1), 20 * 30, @@ -1019,50 +833,34 @@ public class RECIPES_Machines { private static void chemPlant() { GT_ModHandler.addCraftingRecipe( - GregtechItemList.Casing_Machine_Custom_1.get(2L, new Object[0]), CI.bits, new Object[] { - "PhP", - "PFP", - "PwP", - 'P', - OrePrefixes.plate.get(Materials.Bronze), - 'F', - OrePrefixes.frameGt.get(Materials.Bronze) - }); + GregtechItemList.Casing_Machine_Custom_1.get(2L, new Object[0]), + CI.bits, + new Object[] { "PhP", "PFP", "PwP", 'P', OrePrefixes.plate.get(Materials.Bronze), 'F', + OrePrefixes.frameGt.get(Materials.Bronze) }); GT_ModHandler.addCraftingRecipe( - GregtechItemList.Casing_Machine_Custom_2.get(2L, new Object[0]), CI.bits, new Object[] { - "PPP", - "hFw", - "PPP", - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'F', - OrePrefixes.frameGt.get(Materials.Aluminium) - }); + GregtechItemList.Casing_Machine_Custom_2.get(2L, new Object[0]), + CI.bits, + new Object[] { "PPP", "hFw", "PPP", 'P', OrePrefixes.plate.get(Materials.Aluminium), 'F', + OrePrefixes.frameGt.get(Materials.Aluminium) }); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedBioCircuit(19), - CI.getTieredGTPPMachineCasing(2, 4), - CI.getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.gearGt, 4), - CI.getTieredComponentOfMaterial(Materials.AnnealedCopper, OrePrefixes.plate, 16), - CI.getTieredComponentOfMaterial(Materials.Plastic, OrePrefixes.pipeLarge, 4), - CI.getTieredComponent(OrePrefixes.frameGt, 2, 4), - }, + new ItemStack[] { CI.getNumberedBioCircuit(19), CI.getTieredGTPPMachineCasing(2, 4), + CI.getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.gearGt, 4), + CI.getTieredComponentOfMaterial(Materials.AnnealedCopper, OrePrefixes.plate, 16), + CI.getTieredComponentOfMaterial(Materials.Plastic, OrePrefixes.pipeLarge, 4), + CI.getTieredComponent(OrePrefixes.frameGt, 2, 4), }, ALLOY.STEEL_BLACK.getFluidStack(2 * (144 * 4)), GregtechItemList.ChemicalPlant_Controller.get(1), 120 * 20, MaterialUtils.getVoltageForTier(2)); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedBioCircuit(15), - CI.getTieredGTPPMachineCasing(1, 2), - ItemList.Hatch_Input_Bus_MV.get(1), - CI.getTieredComponentOfMaterial(Materials.Bronze, OrePrefixes.gearGt, 8), - CI.getTieredComponentOfMaterial(Materials.Lead, OrePrefixes.plate, 48), - CI.getTieredComponentOfMaterial(Materials.SolderingAlloy, OrePrefixes.wireFine, 16), - }, + new ItemStack[] { CI.getNumberedBioCircuit(15), CI.getTieredGTPPMachineCasing(1, 2), + ItemList.Hatch_Input_Bus_MV.get(1), + CI.getTieredComponentOfMaterial(Materials.Bronze, OrePrefixes.gearGt, 8), + CI.getTieredComponentOfMaterial(Materials.Lead, OrePrefixes.plate, 48), + CI.getTieredComponentOfMaterial(Materials.SolderingAlloy, OrePrefixes.wireFine, 16), }, ALLOY.BRONZE.getFluidStack(2 * (144 * 4)), GregtechItemList.Bus_Catalysts.get(1), 60 * 20, @@ -1082,14 +880,11 @@ public class RECIPES_Machines { false); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedBioCircuit(21), - CI.getTieredGTPPMachineCasing(0, 4), - CI.getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.rod, 12), - CI.getTieredComponentOfMaterial(Materials.Wood, OrePrefixes.plate, 32), - CI.getTieredComponentOfMaterial(Materials.Steel, OrePrefixes.bolt, 16), - CI.getTieredComponentOfMaterial(Materials.Redstone, OrePrefixes.dust, 32), - }, + new ItemStack[] { CI.getNumberedBioCircuit(21), CI.getTieredGTPPMachineCasing(0, 4), + CI.getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.rod, 12), + CI.getTieredComponentOfMaterial(Materials.Wood, OrePrefixes.plate, 32), + CI.getTieredComponentOfMaterial(Materials.Steel, OrePrefixes.bolt, 16), + CI.getTieredComponentOfMaterial(Materials.Redstone, OrePrefixes.dust, 32), }, ALLOY.POTIN.getFluidStack(2 * (144 * 4)), GregtechItemList.AlgaeFarm_Controller.get(1), 60 * 20, @@ -1099,19 +894,12 @@ public class RECIPES_Machines { private static void distillus() { CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(19), - ItemList.Distillation_Tower.get(2), - GregtechItemList.GTPP_Casing_IV.get(16), - CI.getTieredComponent(OrePrefixes.circuit, 6, 8) - }, - new FluidStack[] { - ALLOY.AQUATIC_STEEL.getFluidStack(144 * 32), - ALLOY.BABBIT_ALLOY.getFluidStack(144 * 16), - ALLOY.BRONZE.getFluidStack(144 * 64), - ALLOY.KANTHAL.getFluidStack(144 * 16), - }, - new ItemStack[] {GregtechItemList.Machine_Adv_DistillationTower.get(1)}, + new ItemStack[] { CI.getNumberedAdvancedCircuit(19), ItemList.Distillation_Tower.get(2), + GregtechItemList.GTPP_Casing_IV.get(16), CI.getTieredComponent(OrePrefixes.circuit, 6, 8) }, + new FluidStack[] { ALLOY.AQUATIC_STEEL.getFluidStack(144 * 32), + ALLOY.BABBIT_ALLOY.getFluidStack(144 * 16), ALLOY.BRONZE.getFluidStack(144 * 64), + ALLOY.KANTHAL.getFluidStack(144 * 16), }, + new ItemStack[] { GregtechItemList.Machine_Adv_DistillationTower.get(1) }, new FluidStack[] {}, 20 * 600, MaterialUtils.getVoltageForTier(6), @@ -1120,11 +908,8 @@ public class RECIPES_Machines { private static void chunkloaders() { - ItemStack aOutputs[] = new ItemStack[] { - GregtechItemList.GT_Chunkloader_HV.get(1L), - GregtechItemList.GT_Chunkloader_IV.get(1L), - GregtechItemList.GT_Chunkloader_ZPM.get(1L), - }; + ItemStack aOutputs[] = new ItemStack[] { GregtechItemList.GT_Chunkloader_HV.get(1L), + GregtechItemList.GT_Chunkloader_IV.get(1L), GregtechItemList.GT_Chunkloader_ZPM.get(1L), }; int aIndex = 0; @@ -1133,14 +918,9 @@ public class RECIPES_Machines { continue; } CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(21), - CI.getElectricPiston(i, 10), - CI.getFieldGenerator(i + 1, 6), - CI.getPlate(i, 16), - CI.getTransmissionComponent(i - 1, 8), - CI.getTieredComponent(OrePrefixes.cableGt08, i, 16) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(21), CI.getElectricPiston(i, 10), + CI.getFieldGenerator(i + 1, 6), CI.getPlate(i, 16), CI.getTransmissionComponent(i - 1, 8), + CI.getTieredComponent(OrePrefixes.cableGt08, i, 16) }, ALLOY.EGLIN_STEEL.getFluidStack(i * (144 * 4)), aOutputs[aIndex++].copy(), 300 * 20, @@ -1149,23 +929,15 @@ public class RECIPES_Machines { } private static void overflowValveCovers() { - ItemStack aOutputs[] = new ItemStack[] { - GregtechItemList.Cover_Overflow_ULV.get(1L), - GregtechItemList.Cover_Overflow_LV.get(1L), - GregtechItemList.Cover_Overflow_MV.get(1L), - GregtechItemList.Cover_Overflow_HV.get(1L), - GregtechItemList.Cover_Overflow_EV.get(1L), - GregtechItemList.Cover_Overflow_IV.get(1L), - }; + ItemStack aOutputs[] = new ItemStack[] { GregtechItemList.Cover_Overflow_ULV.get(1L), + GregtechItemList.Cover_Overflow_LV.get(1L), GregtechItemList.Cover_Overflow_MV.get(1L), + GregtechItemList.Cover_Overflow_HV.get(1L), GregtechItemList.Cover_Overflow_EV.get(1L), + GregtechItemList.Cover_Overflow_IV.get(1L), }; for (int i = 0; i < 6; i++) { CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedBioCircuit(19), - CI.getElectricPump(i, 2), - CI.getElectricMotor(i, 2), - CI.getPlate(i, 4) - }, + new ItemStack[] { CI.getNumberedBioCircuit(19), CI.getElectricPump(i, 2), CI.getElectricMotor(i, 2), + CI.getPlate(i, 4) }, Materials.SolderingAlloy.getFluid(i * (144 * 1)), aOutputs[i].copy(), 20 * 20, @@ -1175,29 +947,16 @@ public class RECIPES_Machines { private static void tieredMachineHulls() { - GregtechItemList[] aHulls = new GregtechItemList[] { - GregtechItemList.GTPP_Casing_ULV, - GregtechItemList.GTPP_Casing_LV, - GregtechItemList.GTPP_Casing_MV, - GregtechItemList.GTPP_Casing_HV, - GregtechItemList.GTPP_Casing_EV, - GregtechItemList.GTPP_Casing_IV, - GregtechItemList.GTPP_Casing_LuV, - GregtechItemList.GTPP_Casing_ZPM, - GregtechItemList.GTPP_Casing_UV, - GregtechItemList.GTPP_Casing_MAX - }; + GregtechItemList[] aHulls = new GregtechItemList[] { GregtechItemList.GTPP_Casing_ULV, + GregtechItemList.GTPP_Casing_LV, GregtechItemList.GTPP_Casing_MV, GregtechItemList.GTPP_Casing_HV, + GregtechItemList.GTPP_Casing_EV, GregtechItemList.GTPP_Casing_IV, GregtechItemList.GTPP_Casing_LuV, + GregtechItemList.GTPP_Casing_ZPM, GregtechItemList.GTPP_Casing_UV, GregtechItemList.GTPP_Casing_MAX }; for (int i = 0; i < 10; i++) { CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedBioCircuit(20), - CI.getTieredMachineCasing(i), - CI.getPlate(i, 8), - CI.getGear(i, 2), - CI.getTieredComponent(OrePrefixes.cableGt02, i, 4), - CI.getTieredComponent(OrePrefixes.circuit, i, 2) - }, + new ItemStack[] { CI.getNumberedBioCircuit(20), CI.getTieredMachineCasing(i), CI.getPlate(i, 8), + CI.getGear(i, 2), CI.getTieredComponent(OrePrefixes.cableGt02, i, 4), + CI.getTieredComponent(OrePrefixes.circuit, i, 2) }, CI.getAlternativeTieredFluid(i, 144 * (i + 1) * 2), aHulls[i].get(1), 20 * 20, @@ -1208,8 +967,8 @@ public class RECIPES_Machines { 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); + IC2MFSU = ItemUtils + .getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:blockElectric", "IC2_MFSU", 2, 1); } if (LoadedMods.Gregtech) { @@ -1234,13 +993,17 @@ public class RECIPES_Machines { if (CORE.ConfigSwitches.enableMultiblock_IndustrialCokeOven) { if (LoadedMods.Railcraft) { // Misc - INPUT_RCCokeOvenBlock = ItemUtils.getItemStackWithMeta( - LoadedMods.Railcraft, "Railcraft:machine.alpha", "Coke_Oven_RC", 7, 1); + INPUT_RCCokeOvenBlock = ItemUtils + .getItemStackWithMeta(LoadedMods.Railcraft, "Railcraft:machine.alpha", "Coke_Oven_RC", 7, 1); } if (LoadedMods.ImmersiveEngineering) { // Misc INPUT_IECokeOvenBlock = ItemUtils.getItemStackWithMeta( - LoadedMods.ImmersiveEngineering, "ImmersiveEngineering:stoneDecoration", "Coke_Oven_IE", 1, 1); + LoadedMods.ImmersiveEngineering, + "ImmersiveEngineering:stoneDecoration", + "Coke_Oven_IE", + 1, + 1); } } runModRecipes(); @@ -1250,12 +1013,9 @@ public class RECIPES_Machines { if (LoadedMods.Gregtech) { // Computer Cube CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - ItemUtils.getSimpleStack(CI.getDataOrb(), 4 * (1)), - ItemList.Cover_Screen.get(4), - CI.machineHull_IV, - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 2) - }, + new ItemStack[] { ItemUtils.getSimpleStack(CI.getDataOrb(), 4 * (1)), ItemList.Cover_Screen.get(4), + CI.machineHull_IV, + ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 2) }, ELEMENT.getInstance().TANTALUM.getFluidStack(144 * 16), GregtechItemList.Gregtech_Computer_Cube.get(1), 60 * 20 * 3, @@ -1263,42 +1023,32 @@ public class RECIPES_Machines { // Circuit programmer CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - ItemUtils.getSimpleStack(CI.robotArm_LV, 4 * (1)), - ItemList.Cover_Controller.get(1, CI.electricMotor_MV), - CI.machineHull_MV, - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(1), 2), - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(2), 2) - }, + new ItemStack[] { ItemUtils.getSimpleStack(CI.robotArm_LV, 4 * (1)), + ItemList.Cover_Controller.get(1, CI.electricMotor_MV), CI.machineHull_MV, + ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(1), 2), + ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(2), 2) }, ELEMENT.getInstance().IRON.getFluidStack(144 * 4), ItemUtils.getSimpleStack(ModBlocks.blockCircuitProgrammer), 60 * 10 * 1, 30); // Lead Lined Chest - for (ItemStack plateRubber : OreDictionary.getOres("plateAnyRubber")) - CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.machineHull_LV, - GT_Utility.copyAmount(32, plateRubber), + for (ItemStack plateRubber : OreDictionary.getOres("plateAnyRubber")) CORE.RA.addSixSlotAssemblingRecipe( + new ItemStack[] { CI.machineHull_LV, GT_Utility.copyAmount(32, plateRubber), ItemUtils.getItemStackOfAmountFromOreDict("plateDenseLead", 9), - ItemUtils.getSimpleStack(Blocks.chest) - }, - ELEMENT.getInstance().LEAD.getFluidStack(144 * 16), - ItemUtils.getSimpleStack(ModBlocks.blockDecayablesChest), - 60 * 10 * 3, - 60); + ItemUtils.getSimpleStack(Blocks.chest) }, + ELEMENT.getInstance().LEAD.getFluidStack(144 * 16), + ItemUtils.getSimpleStack(ModBlocks.blockDecayablesChest), + 60 * 10 * 3, + 60); // RTG CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - ItemUtils.getItemStackWithMeta(true, "IC2:blockGenerator:6", "IC2-RTG", 6, 1), - ALLOY.NITINOL_60.getPlate(8), - ALLOY.MARAGING350.getGear(4), - ItemUtils.getSimpleStack(CI.fieldGenerator_EV, 8), - ItemUtils.getItemStackOfAmountFromOreDict("wireFinePlatinum", 32), - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 4) - }, + new ItemStack[] { ItemUtils.getItemStackWithMeta(true, "IC2:blockGenerator:6", "IC2-RTG", 6, 1), + ALLOY.NITINOL_60.getPlate(8), ALLOY.MARAGING350.getGear(4), + ItemUtils.getSimpleStack(CI.fieldGenerator_EV, 8), + ItemUtils.getItemStackOfAmountFromOreDict("wireFinePlatinum", 32), + ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 4) }, ALLOY.NIOBIUM_CARBIDE.getFluidStack(144 * 16), GregtechItemList.RTG.get(1), 60 * 20 * 10, @@ -1306,19 +1056,16 @@ public class RECIPES_Machines { // Super Jukebox CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.machineHull_LV, - ItemUtils.getItemStackOfAmountFromOreDict("circuitBasic", 4), - ItemUtils.getItemStackOfAmountFromOreDict("plateTumbaga", 8), - ItemUtils.getSimpleStack(Blocks.jukebox) - }, + new ItemStack[] { CI.machineHull_LV, ItemUtils.getItemStackOfAmountFromOreDict("circuitBasic", 4), + ItemUtils.getItemStackOfAmountFromOreDict("plateTumbaga", 8), + ItemUtils.getSimpleStack(Blocks.jukebox) }, ELEMENT.getInstance().COPPER.getFluidStack(144 * 2), ItemUtils.getSimpleStack(ModBlocks.blockCustomJukebox), 20 * 30, 30); - ItemStack aFluidRegulator1 = - ItemUtils.getValueOfItemList("FluidRegulator_MV", 2, ItemList.Electric_Pump_HV); + ItemStack aFluidRegulator1 = ItemUtils + .getValueOfItemList("FluidRegulator_MV", 2, ItemList.Electric_Pump_HV); ItemStack aFluidRegulator2 = ItemUtils.getValueOfItemList( "FluidRegulator_IV", 2, @@ -1326,13 +1073,9 @@ public class RECIPES_Machines { // Poo Collector CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.machineHull_MV, - aFluidRegulator1, - CI.getTieredComponent(OrePrefixes.pipeMedium, 2, 2), - ALLOY.EGLIN_STEEL.getPlate(4), - ALLOY.POTIN.getScrew(6) - }, + new ItemStack[] { CI.machineHull_MV, aFluidRegulator1, + CI.getTieredComponent(OrePrefixes.pipeMedium, 2, 2), ALLOY.EGLIN_STEEL.getPlate(4), + ALLOY.POTIN.getScrew(6) }, ALLOY.TUMBAGA.getFluidStack(144 * 4), ItemUtils.getSimpleStack(ModBlocks.blockPooCollector), 20 * 60, @@ -1340,13 +1083,10 @@ public class RECIPES_Machines { // Adv. Poo Collector CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getTieredMachineHull(-1), - ItemUtils.getSimpleStack(ModBlocks.blockPooCollector), - aFluidRegulator2, - CI.getTieredComponent(OrePrefixes.pipeHuge, 6, 4), - CI.getTieredComponent(OrePrefixes.screw, 6, 16) - }, + new ItemStack[] { CI.getTieredMachineHull(-1), + ItemUtils.getSimpleStack(ModBlocks.blockPooCollector), aFluidRegulator2, + CI.getTieredComponent(OrePrefixes.pipeHuge, 6, 4), + CI.getTieredComponent(OrePrefixes.screw, 6, 16) }, CI.getAlternativeTieredFluid(5, 144 * 9), ItemUtils.getSimpleStack(ModBlocks.blockPooCollector, 8, 1), 20 * 60 * 5, @@ -1489,13 +1229,9 @@ public class RECIPES_Machines { // Egg Box CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(8), - CI.getTieredMachineHull(3), - ItemUtils.getSimpleStack(Items.egg, 64), - ItemUtils.getSimpleStack(ModItems.itemRope, 32), - CI.getPlate(4, 8) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(8), CI.getTieredMachineHull(3), + ItemUtils.getSimpleStack(Items.egg, 64), ItemUtils.getSimpleStack(ModItems.itemRope, 32), + CI.getPlate(4, 8) }, FluidUtils.getFluidStack("mobessence", 4096), ItemUtils.getSimpleStack(ModBlocks.blockEggBox, 1), 20 * 60, @@ -1504,14 +1240,10 @@ public class RECIPES_Machines { // Flask Configurator if (Meta_GT_Proxy.sDoesVolumetricFlaskExist) { CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(8), - CI.getTieredMachineHull(2), - ItemUtils.getSimpleStack(ModBlocks.blockCircuitProgrammer), - VolumetricFlaskHelper.getVolumetricFlask(8), - CI.getTieredComponent(OrePrefixes.pipeSmall, 2, 2), - CI.getPlate(2, 4) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(8), CI.getTieredMachineHull(2), + ItemUtils.getSimpleStack(ModBlocks.blockCircuitProgrammer), + VolumetricFlaskHelper.getVolumetricFlask(8), + CI.getTieredComponent(OrePrefixes.pipeSmall, 2, 2), CI.getPlate(2, 4) }, CI.getAlternativeTieredFluid(1, 144 * 8), ItemUtils.getSimpleStack(ModBlocks.blockVolumetricFlaskSetter, 1), 20 * 60, @@ -1559,11 +1291,9 @@ public class RECIPES_Machines { null); GT_Values.RA.addArcFurnaceRecipe( RECIPE_IronPlatedBricks, - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotWroughtIron", 6), - ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustAsh", 2) - }, - new int[] {0}, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotWroughtIron", 6), + ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustAsh", 2) }, + new int[] { 0 }, 32 * 20, 32); } @@ -1598,12 +1328,8 @@ public class RECIPES_Machines { CI.component_Plate[6], RECIPE_IndustrialCentrifugeCasing); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ALLOY.MARAGING250.getPlate(4), - ALLOY.INCONEL_792.getPlate(2), - ALLOY.TUMBAGA.getRod(3), - GT_Utility.getIntegratedCircuit(1), - }, + new ItemStack[] { ALLOY.MARAGING250.getPlate(4), ALLOY.INCONEL_792.getPlate(2), + ALLOY.TUMBAGA.getRod(3), GT_Utility.getIntegratedCircuit(1), }, GT_Values.NF, RECIPE_IndustrialCentrifugeCasing, 50, @@ -1658,12 +1384,8 @@ public class RECIPES_Machines { CI.component_Plate[7], RECIPE_IndustrialCokeOvenFrame); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ALLOY.TANTALLOY_61.getPlate(4), - ALLOY.TANTALLOY_61.getRod(4), - ALLOY.TANTALLOY_61.getFrameBox(1), - GT_Utility.getIntegratedCircuit(1), - }, + new ItemStack[] { ALLOY.TANTALLOY_61.getPlate(4), ALLOY.TANTALLOY_61.getRod(4), + ALLOY.TANTALLOY_61.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), }, GT_Values.NF, RECIPE_IndustrialCokeOvenFrame, 50, @@ -1712,13 +1434,9 @@ public class RECIPES_Machines { "platePotin", RECIPE_IndustrialElectrolyzerFrame); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ALLOY.POTIN.getPlate(4), - ALLOY.POTIN.getLongRod(3), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Chrome, 1), - ALLOY.POTIN.getFrameBox(1), - GT_Utility.getIntegratedCircuit(1), - }, + new ItemStack[] { ALLOY.POTIN.getPlate(4), ALLOY.POTIN.getLongRod(3), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Chrome, 1), + ALLOY.POTIN.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), }, GT_Values.NF, RECIPE_IndustrialElectrolyzerFrame, 50, @@ -1755,13 +1473,9 @@ public class RECIPES_Machines { "plateTitanium", RECIPE_IndustrialMaterialPressFrame); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 4), - ALLOY.TANTALLOY_60.getRod(2), - ALLOY.TUMBAGA.getLongRod(2), - ALLOY.TUMBAGA.getFrameBox(1), - GT_Utility.getIntegratedCircuit(1), - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 4), + ALLOY.TANTALLOY_60.getRod(2), ALLOY.TUMBAGA.getLongRod(2), ALLOY.TUMBAGA.getFrameBox(1), + GT_Utility.getIntegratedCircuit(1), }, GT_Values.NF, RECIPE_IndustrialMaterialPressFrame, 50, @@ -1798,13 +1512,10 @@ public class RECIPES_Machines { "platePalladium", RECIPE_IndustrialMacerationStackFrame); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 5), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Platinum, 2), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Palladium, 1), - ALLOY.INCONEL_625.getFrameBox(1), - GT_Utility.getIntegratedCircuit(1), - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 5), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Platinum, 2), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Palladium, 1), + ALLOY.INCONEL_625.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), }, GT_Values.NF, RECIPE_IndustrialMacerationStackFrame, 50, @@ -1841,12 +1552,10 @@ public class RECIPES_Machines { "plateBlueSteel", RECIPE_IndustrialWireFactoryFrame); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlueSteel, 4), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.BlueSteel, 4), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlueSteel, 1), - GT_Utility.getIntegratedCircuit(1), - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlueSteel, 4), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.BlueSteel, 4), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlueSteel, 1), + GT_Utility.getIntegratedCircuit(1), }, GT_Values.NF, RECIPE_IndustrialWireFactoryFrame, 50, @@ -1883,15 +1592,21 @@ public class RECIPES_Machines { ItemStack waterBucket = ItemUtils.getSimpleStack(Items.water_bucket); // Allows clearing stored fluids. - GregtechItemList[] aTanks = new GregtechItemList[] { - GregtechItemList.GT_FluidTank_ULV, - GregtechItemList.GT_FluidTank_LV, - GregtechItemList.GT_FluidTank_MV, - GregtechItemList.GT_FluidTank_HV - }; + GregtechItemList[] aTanks = new GregtechItemList[] { GregtechItemList.GT_FluidTank_ULV, + GregtechItemList.GT_FluidTank_LV, GregtechItemList.GT_FluidTank_MV, + GregtechItemList.GT_FluidTank_HV }; for (GregtechItemList aTank : aTanks) { RecipeUtils.addShapedGregtechRecipe( - aTank.get(1), null, null, null, null, null, null, null, null, aTank.get(1)); + aTank.get(1), + null, + null, + null, + null, + null, + null, + null, + null, + aTank.get(1)); } RecipeUtils.addShapedGregtechRecipe( @@ -1974,67 +1689,34 @@ public class RECIPES_Machines { // Semi-Fluid Generators ItemStack[][] aSemiFluidInputs = new ItemStack[5][10]; - aSemiFluidInputs[0] = new ItemStack[] { - CI.getNumberedBioCircuit(14), - CI.getTieredMachineHull(1, 1), - CI.getElectricMotor(1, 2), - CI.getElectricPiston(1, 2), - CI.getTieredComponent(OrePrefixes.cableGt01, 1, 1), - CI.getTieredComponent(OrePrefixes.circuit, 1, 1), - CI.getGear(1, 2) - }; - aSemiFluidInputs[1] = new ItemStack[] { - CI.getNumberedBioCircuit(14), - CI.getTieredMachineHull(2, 1), - CI.getElectricMotor(2, 2), - CI.getElectricPiston(2, 2), - CI.getTieredComponent(OrePrefixes.cableGt01, 2, 1), - CI.getTieredComponent(OrePrefixes.circuit, 2, 1), - CI.getGear(2, 2) - }; - aSemiFluidInputs[2] = new ItemStack[] { - CI.getNumberedBioCircuit(14), - CI.getTieredMachineHull(3, 1), - CI.getElectricMotor(3, 2), - CI.getElectricPiston(3, 2), - CI.getTieredComponent(OrePrefixes.cableGt01, 3, 1), - CI.getTieredComponent(OrePrefixes.circuit, 3, 1), - CI.getGear(3, 2) - }; - aSemiFluidInputs[3] = new ItemStack[] { - CI.getNumberedBioCircuit(14), - CI.getTieredMachineHull(4, 1), - CI.getElectricMotor(4, 2), - CI.getElectricPiston(4, 2), - CI.getTieredComponent(OrePrefixes.cableGt01, 4, 1), - CI.getTieredComponent(OrePrefixes.circuit, 4, 1), - CI.getGear(4, 2) - }; - aSemiFluidInputs[4] = new ItemStack[] { - CI.getNumberedBioCircuit(14), - CI.getTieredMachineHull(5, 1), - CI.getElectricMotor(5, 2), - CI.getElectricPiston(5, 2), - CI.getTieredComponent(OrePrefixes.cableGt01, 5, 1), - CI.getTieredComponent(OrePrefixes.circuit, 5, 1), - CI.getGear(5, 2) - }; - FluidStack[] aSemiFluidFluidInputs = new FluidStack[] { - ALLOY.POLYETHYLENE.getFluidStack(144), - ALLOY.POLYETHYLENE.getFluidStack(144), - ALLOY.POLYETHYLENE.getFluidStack(144), - ALLOY.POLYETHYLENE.getFluidStack(144), - ALLOY.POLYTETRAFLUOROETHYLENE.getFluidStack(144) - }; + aSemiFluidInputs[0] = new ItemStack[] { CI.getNumberedBioCircuit(14), CI.getTieredMachineHull(1, 1), + CI.getElectricMotor(1, 2), CI.getElectricPiston(1, 2), + CI.getTieredComponent(OrePrefixes.cableGt01, 1, 1), + CI.getTieredComponent(OrePrefixes.circuit, 1, 1), CI.getGear(1, 2) }; + aSemiFluidInputs[1] = new ItemStack[] { CI.getNumberedBioCircuit(14), CI.getTieredMachineHull(2, 1), + CI.getElectricMotor(2, 2), CI.getElectricPiston(2, 2), + CI.getTieredComponent(OrePrefixes.cableGt01, 2, 1), + CI.getTieredComponent(OrePrefixes.circuit, 2, 1), CI.getGear(2, 2) }; + aSemiFluidInputs[2] = new ItemStack[] { CI.getNumberedBioCircuit(14), CI.getTieredMachineHull(3, 1), + CI.getElectricMotor(3, 2), CI.getElectricPiston(3, 2), + CI.getTieredComponent(OrePrefixes.cableGt01, 3, 1), + CI.getTieredComponent(OrePrefixes.circuit, 3, 1), CI.getGear(3, 2) }; + aSemiFluidInputs[3] = new ItemStack[] { CI.getNumberedBioCircuit(14), CI.getTieredMachineHull(4, 1), + CI.getElectricMotor(4, 2), CI.getElectricPiston(4, 2), + CI.getTieredComponent(OrePrefixes.cableGt01, 4, 1), + CI.getTieredComponent(OrePrefixes.circuit, 4, 1), CI.getGear(4, 2) }; + aSemiFluidInputs[4] = new ItemStack[] { CI.getNumberedBioCircuit(14), CI.getTieredMachineHull(5, 1), + CI.getElectricMotor(5, 2), CI.getElectricPiston(5, 2), + CI.getTieredComponent(OrePrefixes.cableGt01, 5, 1), + CI.getTieredComponent(OrePrefixes.circuit, 5, 1), CI.getGear(5, 2) }; + FluidStack[] aSemiFluidFluidInputs = new FluidStack[] { ALLOY.POLYETHYLENE.getFluidStack(144), + ALLOY.POLYETHYLENE.getFluidStack(144), ALLOY.POLYETHYLENE.getFluidStack(144), + ALLOY.POLYETHYLENE.getFluidStack(144), ALLOY.POLYTETRAFLUOROETHYLENE.getFluidStack(144) }; // ItemUtils.simpleMetaStack("IC2:blockGenerator:7", 7, 1); - ItemStack[] aSemifluids = new ItemStack[] { - GregtechItemList.Generator_SemiFluid_LV.get(1), - GregtechItemList.Generator_SemiFluid_MV.get(1), - GregtechItemList.Generator_SemiFluid_HV.get(1), - GregtechItemList.Generator_SemiFluid_EV.get(1), - GregtechItemList.Generator_SemiFluid_IV.get(1) - }; + ItemStack[] aSemifluids = new ItemStack[] { GregtechItemList.Generator_SemiFluid_LV.get(1), + GregtechItemList.Generator_SemiFluid_MV.get(1), GregtechItemList.Generator_SemiFluid_HV.get(1), + GregtechItemList.Generator_SemiFluid_EV.get(1), GregtechItemList.Generator_SemiFluid_IV.get(1) }; for (int o = 0; o < 5; o++) { CORE.RA.addSixSlotAssemblingRecipe( aSemiFluidInputs[o], @@ -2043,91 +1725,31 @@ public class RECIPES_Machines { 20 * 30, MaterialUtils.getVoltageForTier(o + 1)); } - GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_SemiFluid_LV.get(1L), new Object[] { - "PCP", - "EME", - "GWG", - 'M', - ItemList.Hull_LV, - 'P', - ItemList.Electric_Piston_LV, - 'E', - ItemList.Electric_Motor_LV, - 'C', - OrePrefixes.circuit.get(Materials.Basic), - 'W', - OrePrefixes.cableGt01.get(Materials.Tin), - 'G', - ALLOY.TUMBAGA.getGear(2) - }); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_SemiFluid_MV.get(1L), new Object[] { - "PCP", - "EME", - "GWG", - 'M', - ItemList.Hull_MV, - 'P', - ItemList.Electric_Piston_MV, - 'E', - ItemList.Electric_Motor_MV, - 'C', - OrePrefixes.circuit.get(Materials.Good), - 'W', - OrePrefixes.cableGt01.get(Materials.AnyCopper), - 'G', - ALLOY.EGLIN_STEEL.getGear(2) - }); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_SemiFluid_HV.get(1L), new Object[] { - "PCP", - "EME", - "GWG", - 'M', - ItemList.Hull_HV, - 'P', - ItemList.Electric_Piston_HV, - 'E', - ItemList.Electric_Motor_HV, - 'C', - OrePrefixes.circuit.get(Materials.Advanced), - 'W', - OrePrefixes.cableGt01.get(Materials.Gold), - 'G', - ALLOY.INCONEL_625.getGear(2) - }); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_SemiFluid_EV.get(1L), new Object[] { - "PCP", - "EME", - "GWG", - 'M', - ItemList.Hull_EV, - 'P', - ItemList.Electric_Piston_EV, - 'E', - ItemList.Electric_Motor_EV, - 'C', - OrePrefixes.circuit.get(Materials.Data), - 'W', - OrePrefixes.cableGt01.get(Materials.Aluminium), - 'G', - ALLOY.INCOLOY_DS.getGear(1) - }); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_SemiFluid_IV.get(1L), new Object[] { - "PCP", - "EME", - "GWG", - 'M', - ItemList.Hull_IV, - 'P', - ItemList.Electric_Piston_IV, - 'E', - ItemList.Electric_Motor_IV, - 'C', - OrePrefixes.circuit.get(Materials.Elite), - 'W', - OrePrefixes.cableGt01.get(Materials.Tungsten), - 'G', - ALLOY.NITINOL_60.getGear(1) - }); + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Generator_SemiFluid_LV.get(1L), + new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_LV, 'P', ItemList.Electric_Piston_LV, 'E', + ItemList.Electric_Motor_LV, 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', + OrePrefixes.cableGt01.get(Materials.Tin), 'G', ALLOY.TUMBAGA.getGear(2) }); + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Generator_SemiFluid_MV.get(1L), + new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_MV, 'P', ItemList.Electric_Piston_MV, 'E', + ItemList.Electric_Motor_MV, 'C', OrePrefixes.circuit.get(Materials.Good), 'W', + OrePrefixes.cableGt01.get(Materials.AnyCopper), 'G', ALLOY.EGLIN_STEEL.getGear(2) }); + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Generator_SemiFluid_HV.get(1L), + new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_HV, 'P', ItemList.Electric_Piston_HV, 'E', + ItemList.Electric_Motor_HV, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', + OrePrefixes.cableGt01.get(Materials.Gold), 'G', ALLOY.INCONEL_625.getGear(2) }); + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Generator_SemiFluid_EV.get(1L), + new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Piston_EV, 'E', + ItemList.Electric_Motor_EV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W', + OrePrefixes.cableGt01.get(Materials.Aluminium), 'G', ALLOY.INCOLOY_DS.getGear(1) }); + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Generator_SemiFluid_IV.get(1L), + new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_IV, 'P', ItemList.Electric_Piston_IV, 'E', + ItemList.Electric_Motor_IV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', + OrePrefixes.cableGt01.get(Materials.Tungsten), 'G', ALLOY.NITINOL_60.getGear(1) }); if (CORE.ConfigSwitches.enableMultiblock_AlloyBlastSmelter) { // Industrial Blast Smelter @@ -2160,11 +1782,8 @@ public class RECIPES_Machines { "plateZirconiumCarbide", RECIPE_IndustrialBlastSmelterFrame); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ALLOY.ZIRCONIUM_CARBIDE.getPlate(6), - ALLOY.ZIRCONIUM_CARBIDE.getFrameBox(1), - GT_Utility.getIntegratedCircuit(1), - }, + new ItemStack[] { ALLOY.ZIRCONIUM_CARBIDE.getPlate(6), ALLOY.ZIRCONIUM_CARBIDE.getFrameBox(1), + GT_Utility.getIntegratedCircuit(1), }, GT_Values.NF, RECIPE_IndustrialBlastSmelterFrame, 50, @@ -2182,12 +1801,8 @@ public class RECIPES_Machines { "plateStaballoy", RECIPE_IndustrialBlastSmelterCoil); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ALLOY.STABALLOY.getPlate(6), - ALLOY.STABALLOY.getFrameBox(2), - CI.gearboxCasing_Tier_3, - GT_Utility.getIntegratedCircuit(1), - }, + new ItemStack[] { ALLOY.STABALLOY.getPlate(6), ALLOY.STABALLOY.getFrameBox(2), + CI.gearboxCasing_Tier_3, GT_Utility.getIntegratedCircuit(1), }, GT_Values.NF, RECIPE_IndustrialBlastSmelterCoil, 50, @@ -2195,12 +1810,8 @@ public class RECIPES_Machines { } CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - ItemList.Casing_Coil_Infinity.get(1), - ItemList.Reactor_Coolant_Sp_6.get(4), - ALLOY.LAURENIUM.getPlateDouble(2), - CustomItemList.eM_Coil.get(1) - }, + new ItemStack[] { ItemList.Casing_Coil_Infinity.get(1), ItemList.Reactor_Coolant_Sp_6.get(4), + ALLOY.LAURENIUM.getPlateDouble(2), CustomItemList.eM_Coil.get(1) }, ALLOY.QUANTUM.getFluidStack(144 * 4), GregtechItemList.Casing_Coil_QuantumForceTransformer.get(1), 60 * 30, @@ -2212,18 +1823,13 @@ public class RECIPES_Machines { 2048, (int) GT_Values.VP[11], 16, - new Object[] { - GregtechItemList.Controller_MolecularTransformer.get(1), - GT_ModHandler.getModItem("eternalsingularity", "eternal_singularity", 1), - new Object[] {OrePrefixes.circuit.get(Materials.Bio), 8}, - ItemList.Electric_Pump_UEV.get(4), - ItemList.Field_Generator_UEV.get(4), - GregtechItemList.Laser_Lens_Special.get(1) - }, - new FluidStack[] { - MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 10), - ALLOY.PIKYONIUM.getFluidStack(144 * 32) - }, + new Object[] { GregtechItemList.Controller_MolecularTransformer.get(1), + GT_ModHandler.getModItem("eternalsingularity", "eternal_singularity", 1), + new Object[] { OrePrefixes.circuit.get(Materials.Bio), 8 }, + ItemList.Electric_Pump_UEV.get(4), ItemList.Field_Generator_UEV.get(4), + GregtechItemList.Laser_Lens_Special.get(1) }, + new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 10), + ALLOY.PIKYONIUM.getFluidStack(144 * 32) }, GregtechItemList.QuantumForceTransformer.get(1), 1200 * 20, (int) GT_Values.VP[11]); @@ -2259,12 +1865,8 @@ public class RECIPES_Machines { "plateNiobiumCarbide", RECIPE_IndustrialMatterFabFrame); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ALLOY.NIOBIUM_CARBIDE.getPlate(4), - ALLOY.INCONEL_792.getRod(4), - ALLOY.INCONEL_690.getFrameBox(1), - GT_Utility.getIntegratedCircuit(1), - }, + new ItemStack[] { ALLOY.NIOBIUM_CARBIDE.getPlate(4), ALLOY.INCONEL_792.getRod(4), + ALLOY.INCONEL_690.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), }, GT_Values.NF, RECIPE_IndustrialMatterFabFrame, 50, @@ -2282,13 +1884,8 @@ public class RECIPES_Machines { CI.getPlate(6, 1), RECIPE_IndustrialMatterFabCoil); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CI.machineCasing_UV, - ALLOY.ZERON_100.getPlate(4), - ALLOY.PIKYONIUM.getPlate(2), - ALLOY.STELLITE.getFrameBox(2), - GT_Utility.getIntegratedCircuit(1), - }, + new ItemStack[] { CI.machineCasing_UV, ALLOY.ZERON_100.getPlate(4), ALLOY.PIKYONIUM.getPlate(2), + ALLOY.STELLITE.getFrameBox(2), GT_Utility.getIntegratedCircuit(1), }, GT_Values.NF, RECIPE_IndustrialMatterFabCoil, 50, @@ -2326,11 +1923,8 @@ public class RECIPES_Machines { "plateEglinSteel", RECIPE_IndustrialSieveFrame); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ALLOY.EGLIN_STEEL.getPlate(8), - ALLOY.TUMBAGA.getFrameBox(1), - GT_Utility.getIntegratedCircuit(1), - }, + new ItemStack[] { ALLOY.EGLIN_STEEL.getPlate(8), ALLOY.TUMBAGA.getFrameBox(1), + GT_Utility.getIntegratedCircuit(1), }, GT_Values.NF, RECIPE_IndustrialSieveFrame, 50, @@ -2348,11 +1942,8 @@ public class RECIPES_Machines { "frameGtEglinSteel", RECIPE_IndustrialSieveGrate); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 5), - ALLOY.EGLIN_STEEL.getFrameBox(4), - GT_Utility.getIntegratedCircuit(1), - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 5), + ALLOY.EGLIN_STEEL.getFrameBox(4), GT_Utility.getIntegratedCircuit(1), }, GT_Values.NF, RECIPE_IndustrialSieveGrate, 50, @@ -2377,14 +1968,10 @@ public class RECIPES_Machines { RECIPE_TreeFarmController); // Industrial Tree Farm Frame GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(2), - ALLOY.TUMBAGA.getFrameBox(1), - ItemUtils.getItemStackOfAmountFromOreDict("pipeTinySteel", 1), - ItemList.MV_Coil.get(1), - ItemList.IC2_Plantball.get(4), - GT_OreDictUnificator.get(OrePrefixes.plank, Materials.Wood, 8), - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(2), ALLOY.TUMBAGA.getFrameBox(1), + ItemUtils.getItemStackOfAmountFromOreDict("pipeTinySteel", 1), ItemList.MV_Coil.get(1), + ItemList.IC2_Plantball.get(4), + GT_OreDictUnificator.get(OrePrefixes.plank, Materials.Wood, 8), }, GT_ModHandler.getDistilledWater(2000), RECIPE_TreeFarmFrame, 200, @@ -2457,41 +2044,26 @@ public class RECIPES_Machines { int aSlot = 0; ItemStack[][] aInputsForSimpleWashers = new ItemStack[4][6]; - aInputsForSimpleWashers[0] = new ItemStack[] { - CI.getTieredMachineHull(2), - CI.getTieredComponent(OrePrefixes.screw, 2, 8), - CI.getTieredComponent(OrePrefixes.plate, 1, 4), - CI.getTieredComponent(OrePrefixes.rod, 2, 2), - CI.getTieredComponent(OrePrefixes.circuit, 2, 1), - }; - aInputsForSimpleWashers[1] = new ItemStack[] { - CI.getTieredMachineHull(4), - CI.getTieredComponent(OrePrefixes.screw, 4, 12), - CI.getTieredComponent(OrePrefixes.plate, 3, 6), - CI.getTieredComponent(OrePrefixes.rod, 4, 3), - CI.getTieredComponent(OrePrefixes.circuit, 4, 2), - }; - aInputsForSimpleWashers[2] = new ItemStack[] { - CI.getTieredMachineHull(6), - CI.getTieredComponent(OrePrefixes.screw, 6, 24), - CI.getTieredComponent(OrePrefixes.plate, 5, 8), - CI.getTieredComponent(OrePrefixes.rod, 6, 4), - CI.getTieredComponent(OrePrefixes.circuit, 6, 3), - }; - aInputsForSimpleWashers[3] = new ItemStack[] { - CI.getTieredMachineHull(8), - CI.getTieredComponent(OrePrefixes.screw, 8, 32), - CI.getTieredComponent(OrePrefixes.plate, 7, 16), - CI.getTieredComponent(OrePrefixes.rod, 8, 5), - CI.getTieredComponent(OrePrefixes.circuit, 8, 4), - }; - - ItemStack[] aSimpleWashers = new ItemStack[] { - GregtechItemList.SimpleDustWasher_MV.get(1), - GregtechItemList.SimpleDustWasher_EV.get(1), - GregtechItemList.SimpleDustWasher_LuV.get(1), - GregtechItemList.SimpleDustWasher_UV.get(1) - }; + aInputsForSimpleWashers[0] = new ItemStack[] { CI.getTieredMachineHull(2), + CI.getTieredComponent(OrePrefixes.screw, 2, 8), CI.getTieredComponent(OrePrefixes.plate, 1, 4), + CI.getTieredComponent(OrePrefixes.rod, 2, 2), + CI.getTieredComponent(OrePrefixes.circuit, 2, 1), }; + aInputsForSimpleWashers[1] = new ItemStack[] { CI.getTieredMachineHull(4), + CI.getTieredComponent(OrePrefixes.screw, 4, 12), CI.getTieredComponent(OrePrefixes.plate, 3, 6), + CI.getTieredComponent(OrePrefixes.rod, 4, 3), + CI.getTieredComponent(OrePrefixes.circuit, 4, 2), }; + aInputsForSimpleWashers[2] = new ItemStack[] { CI.getTieredMachineHull(6), + CI.getTieredComponent(OrePrefixes.screw, 6, 24), CI.getTieredComponent(OrePrefixes.plate, 5, 8), + CI.getTieredComponent(OrePrefixes.rod, 6, 4), + CI.getTieredComponent(OrePrefixes.circuit, 6, 3), }; + aInputsForSimpleWashers[3] = new ItemStack[] { CI.getTieredMachineHull(8), + CI.getTieredComponent(OrePrefixes.screw, 8, 32), + CI.getTieredComponent(OrePrefixes.plate, 7, 16), CI.getTieredComponent(OrePrefixes.rod, 8, 5), + CI.getTieredComponent(OrePrefixes.circuit, 8, 4), }; + + ItemStack[] aSimpleWashers = new ItemStack[] { GregtechItemList.SimpleDustWasher_MV.get(1), + GregtechItemList.SimpleDustWasher_EV.get(1), GregtechItemList.SimpleDustWasher_LuV.get(1), + GregtechItemList.SimpleDustWasher_UV.get(1) }; for (int i = 0; i < 4; i++) { CORE.RA.addSixSlotAssemblingRecipe( @@ -2710,15 +2282,17 @@ public class RECIPES_Machines { // Lava Filter Recipe CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedCircuit(18), - ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 32), - ItemUtils.getItemStackOfAmountFromOreDict("wireFineSteel", 32), - ItemUtils.getItemStackOfAmountFromOreDict("ringTumbaga", 16), - ItemUtils.getItemStackOfAmountFromOreDict("foilCopper", 4), - ItemUtils.getItemStackWithMeta( - LoadedMods.IndustrialCraft2, "IC2:itemPartCarbonMesh", "RawCarbonMesh", 0, 64), - }, + new ItemStack[] { CI.getNumberedCircuit(18), + ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 32), + ItemUtils.getItemStackOfAmountFromOreDict("wireFineSteel", 32), + ItemUtils.getItemStackOfAmountFromOreDict("ringTumbaga", 16), + ItemUtils.getItemStackOfAmountFromOreDict("foilCopper", 4), + ItemUtils.getItemStackWithMeta( + LoadedMods.IndustrialCraft2, + "IC2:itemPartCarbonMesh", + "RawCarbonMesh", + 0, + 64), }, CI.getTieredFluid(3, 144), ItemUtils.getSimpleStack(ModItems.itemLavaFilter, 16), 1600, @@ -2727,8 +2301,8 @@ public class RECIPES_Machines { // Air Intake Hatch ItemList FluidRegulator_IV = ItemUtils.getValueOfItemList("FluidRegulator_IV", ItemList.Pump_IV); - ItemStack aTieredFluidRegulator = - CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK ? FluidRegulator_IV.get(1) : ItemList.Pump_IV.get(1); + ItemStack aTieredFluidRegulator = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK ? FluidRegulator_IV.get(1) + : ItemList.Pump_IV.get(1); RecipeUtils.addShapedGregtechRecipe( CI.component_Plate[6], ItemList.Casing_Grate.get(1), @@ -2812,9 +2386,8 @@ public class RECIPES_Machines { // LFTR Control Circuit CORE.RA.addSixSlotAssemblingRecipe( new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 1), - CI.fieldGenerator_HV - }, + ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 1), + CI.fieldGenerator_HV }, null, controlCircuit, 240 * 20, @@ -2935,17 +2508,20 @@ public class RECIPES_Machines { GregtechItemList.GT4_Shelf.get(2)); RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] {GregtechItemList.GT4_Shelf.get(1)}, GregtechItemList.GT4_Shelf_Compartment.get(1)); + new ItemStack[] { GregtechItemList.GT4_Shelf.get(1) }, + GregtechItemList.GT4_Shelf_Compartment.get(1)); RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] {GregtechItemList.GT4_Shelf_Compartment.get(1)}, + new ItemStack[] { GregtechItemList.GT4_Shelf_Compartment.get(1) }, GregtechItemList.GT4_Shelf_Desk.get(1)); RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] {GregtechItemList.GT4_Shelf_Desk.get(1)}, GregtechItemList.GT4_Shelf_Iron.get(1)); + new ItemStack[] { GregtechItemList.GT4_Shelf_Desk.get(1) }, + GregtechItemList.GT4_Shelf_Iron.get(1)); RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] {GregtechItemList.GT4_Shelf_Iron.get(1)}, + new ItemStack[] { GregtechItemList.GT4_Shelf_Iron.get(1) }, GregtechItemList.GT4_Shelf_FileCabinet.get(1)); RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] {GregtechItemList.GT4_Shelf_FileCabinet.get(1)}, GregtechItemList.GT4_Shelf.get(1)); + new ItemStack[] { GregtechItemList.GT4_Shelf_FileCabinet.get(1) }, + GregtechItemList.GT4_Shelf.get(1)); // Cyclotron if (CORE.ConfigSwitches.enableMultiblock_Cyclotron) { @@ -2955,14 +2531,10 @@ public class RECIPES_Machines { // Outer Casing CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - ItemList.Casing_FrostProof.get(1), - ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 0, 4), - ALLOY.INCOLOY_DS.getPlate(8), - ALLOY.INCONEL_690.getScrew(16), - ALLOY.EGLIN_STEEL.getLongRod(4), - CI.getElectricPiston(3, 2) - }, + new ItemStack[] { ItemList.Casing_FrostProof.get(1), + ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 0, 4), + ALLOY.INCOLOY_DS.getPlate(8), ALLOY.INCONEL_690.getScrew(16), + ALLOY.EGLIN_STEEL.getLongRod(4), CI.getElectricPiston(3, 2) }, ALLOY.ZIRCONIUM_CARBIDE.getFluidStack(144 * 8), // Input Fluid RECIPE_CyclotronOuterCasing, 30 * 20 * 2, @@ -2970,14 +2542,10 @@ public class RECIPES_Machines { // Inner Coil CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - ItemList.Casing_Coil_Nichrome.get(1), - ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 1, 8), - ALLOY.INCOLOY_MA956.getPlate(8), - ALLOY.TANTALLOY_61.getBolt(16), - ALLOY.INCOLOY_020.getScrew(32), - CI.getFieldGenerator(4, 1) - }, + new ItemStack[] { ItemList.Casing_Coil_Nichrome.get(1), + ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 1, 8), + ALLOY.INCOLOY_MA956.getPlate(8), ALLOY.TANTALLOY_61.getBolt(16), + ALLOY.INCOLOY_020.getScrew(32), CI.getFieldGenerator(4, 1) }, ALLOY.HG1223.getFluidStack(144 * 5), // Input Fluid RECIPE_CyclotronInnerCoil, 60 * 20 * 2, @@ -2985,14 +2553,10 @@ public class RECIPES_Machines { // Controller CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.machineHull_IV, - ItemUtils.getSimpleStack(RECIPE_CyclotronInnerCoil, 2), - ALLOY.INCOLOY_020.getPlate(8), - ALLOY.TANTALLOY_61.getGear(2), - ALLOY.INCOLOY_MA956.getScrew(16), - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(5), 16) - }, + new ItemStack[] { CI.machineHull_IV, ItemUtils.getSimpleStack(RECIPE_CyclotronInnerCoil, 2), + ALLOY.INCOLOY_020.getPlate(8), ALLOY.TANTALLOY_61.getGear(2), + ALLOY.INCOLOY_MA956.getScrew(16), + ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(5), 16) }, ALLOY.INCOLOY_020.getFluidStack(144 * 9), // Input Fluid RECIPE_CyclotronController, 60 * 20 * 5, @@ -3001,23 +2565,11 @@ public class RECIPES_Machines { // Mazut GT_ModHandler.addCraftingRecipe( - GregtechItemList.Controller_LargeSemifluidGenerator.get(1L), CI.bitsd, new Object[] { - "PCP", - "EME", - "GWG", - 'M', - ItemList.Hull_EV, - 'P', - ItemList.Electric_Piston_EV, - 'E', - ItemList.Electric_Pump_EV, - 'C', - OrePrefixes.circuit.get(Materials.Data), - 'W', - OrePrefixes.cableGt08.get(Materials.Electrum), - 'G', - ALLOY.INCONEL_792.getGear(1) - }); + GregtechItemList.Controller_LargeSemifluidGenerator.get(1L), + CI.bitsd, + new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Piston_EV, 'E', + ItemList.Electric_Pump_EV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W', + OrePrefixes.cableGt08.get(Materials.Electrum), 'G', ALLOY.INCONEL_792.getGear(1) }); if (CORE.ConfigSwitches.enableMultiblock_PowerSubstation) { RecipeUtils.addShapedRecipe( @@ -3060,11 +2612,9 @@ public class RECIPES_Machines { "plateRedSteel", GregtechItemList.Casing_ThermalCentrifuge.get(1)); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedSteel, 6), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1), - GT_Utility.getIntegratedCircuit(1), - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedSteel, 6), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1), + GT_Utility.getIntegratedCircuit(1), }, GT_Values.NF, GregtechItemList.Casing_ThermalCentrifuge.get(1L), 50, @@ -3096,12 +2646,8 @@ public class RECIPES_Machines { "plateGrisium", GregtechItemList.Casing_WashPlant.get(1)); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ALLOY.LEAGRISIUM.getPlate(4), - ALLOY.TALONITE.getPlate(2), - ALLOY.LEAGRISIUM.getFrameBox(1), - GT_Utility.getIntegratedCircuit(1), - }, + new ItemStack[] { ALLOY.LEAGRISIUM.getPlate(4), ALLOY.TALONITE.getPlate(2), + ALLOY.LEAGRISIUM.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), }, GT_Values.NF, GregtechItemList.Casing_WashPlant.get(1L), 50, @@ -3132,41 +2678,32 @@ public class RECIPES_Machines { aCoreBlock.stackSize = 1; CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), 1), - aCoreBlock, - CI.getTieredComponent(OrePrefixes.circuit, 2, 16), - CI.getTieredComponent(OrePrefixes.screw, 5, 32), - CI.getTieredComponent(OrePrefixes.bolt, 5, 12), - CI.getTieredComponent(OrePrefixes.plate, 6, 8), - }, + new ItemStack[] { ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), 1), + aCoreBlock, CI.getTieredComponent(OrePrefixes.circuit, 2, 16), + CI.getTieredComponent(OrePrefixes.screw, 5, 32), + CI.getTieredComponent(OrePrefixes.bolt, 5, 12), + CI.getTieredComponent(OrePrefixes.plate, 6, 8), }, CI.getTertiaryTieredFluid(6, 144 * (4)), GregtechItemList.Casing_Autocrafter.get(1), 20 * 60 * 2, MaterialUtils.getVoltageForTier(5)); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - GregtechItemList.Casing_Refinery_Structural.get(4), - ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR, 1), - CI.getTieredComponent(OrePrefixes.cableGt08, 6, 16), - CI.getTransmissionComponent(5, 2), - GregtechItemList.Gregtech_Computer_Cube.get(1), - }, + new ItemStack[] { GregtechItemList.Casing_Refinery_Structural.get(4), + ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR, 1), + CI.getTieredComponent(OrePrefixes.cableGt08, 6, 16), CI.getTransmissionComponent(5, 2), + GregtechItemList.Gregtech_Computer_Cube.get(1), }, CI.getTieredFluid(7, 144 * 8), GregtechItemList.GT4_Multi_Crafter.get(1), 20 * 60 * 5, MaterialUtils.getVoltageForTier(5)); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), 1), - CI.getEmitter(4, 2), - CI.getRobotArm(4, 2), - CI.getTieredComponent(OrePrefixes.circuit, 2, 8), - CI.getTieredComponent(OrePrefixes.screw, 3, 8), - CI.getTieredComponent(OrePrefixes.plate, 5, 4), - }, + new ItemStack[] { ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), 1), + CI.getEmitter(4, 2), CI.getRobotArm(4, 2), + CI.getTieredComponent(OrePrefixes.circuit, 2, 8), + CI.getTieredComponent(OrePrefixes.screw, 3, 8), + CI.getTieredComponent(OrePrefixes.plate, 5, 4), }, CI.getAlternativeTieredFluid(5, 144 * 4), ItemUtils.getSimpleStack(ModBlocks.blockProjectTable), 20 * 30 * 3, @@ -3187,12 +2724,8 @@ public class RECIPES_Machines { plate, GregtechItemList.Casing_CuttingFactoryFrame.get(1)); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ALLOY.MARAGING300.getPlate(4), - ALLOY.STELLITE.getPlate(2), - ALLOY.TALONITE.getFrameBox(1), - GT_Utility.getIntegratedCircuit(1), - }, + new ItemStack[] { ALLOY.MARAGING300.getPlate(4), ALLOY.STELLITE.getPlate(2), + ALLOY.TALONITE.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), }, GT_Values.NF, GregtechItemList.Casing_CuttingFactoryFrame.get(1L), 50, @@ -3226,12 +2759,8 @@ public class RECIPES_Machines { plate, GregtechItemList.Casing_Extruder.get(1)); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ALLOY.INCONEL_690.getPlate(4), - ALLOY.TALONITE.getPlate(2), - ALLOY.STABALLOY.getFrameBox(1), - GT_Utility.getIntegratedCircuit(1), - }, + new ItemStack[] { ALLOY.INCONEL_690.getPlate(4), ALLOY.TALONITE.getPlate(2), + ALLOY.STABALLOY.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), }, GT_Values.NF, GregtechItemList.Casing_Extruder.get(1L), 50, @@ -3264,12 +2793,8 @@ public class RECIPES_Machines { plate, GregtechItemList.Casing_FishPond.get(1)); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ALLOY.AQUATIC_STEEL.getPlate(4), - ALLOY.EGLIN_STEEL.getPlate(2), - ALLOY.EGLIN_STEEL.getFrameBox(1), - GT_Utility.getIntegratedCircuit(1), - }, + new ItemStack[] { ALLOY.AQUATIC_STEEL.getPlate(4), ALLOY.EGLIN_STEEL.getPlate(2), + ALLOY.EGLIN_STEEL.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), }, GT_Values.NF, GregtechItemList.Casing_FishPond.get(1L), 50, @@ -3350,29 +2875,23 @@ public class RECIPES_Machines { GregtechItemList.Machine_Adv_BlastFurnace.get(1)); // Hatch_Input_Pyrotheum GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Input_IV.get(1), - GregtechItemList.Casing_Adv_BlastFurnace.get(1), - ALLOY.MARAGING250.getPlate(4), - ALLOY.MARAGING300.getGear(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 2), - GT_Utility.getIntegratedCircuit(1), - }, + new ItemStack[] { ItemList.Hatch_Input_IV.get(1), + GregtechItemList.Casing_Adv_BlastFurnace.get(1), ALLOY.MARAGING250.getPlate(4), + ALLOY.MARAGING300.getGear(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 2), + GT_Utility.getIntegratedCircuit(1), }, GT_Values.NF, GregtechItemList.Hatch_Input_Pyrotheum.get(1L), 50, 16); // Casing_Adv_BlastFurnace GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ALLOY.HASTELLOY_X.getFrameBox(1), - ALLOY.HASTELLOY_N.getPlateDouble(4), - ALLOY.HASTELLOY_W.getGear(1), - ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1), - ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1), - ItemUtils.simpleMetaStack("IC2:reactorVentDiamond:1:1", 1, 1), - GT_Utility.getIntegratedCircuit(1), - }, + new ItemStack[] { ALLOY.HASTELLOY_X.getFrameBox(1), ALLOY.HASTELLOY_N.getPlateDouble(4), + ALLOY.HASTELLOY_W.getGear(1), + ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1), + ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1), + ItemUtils.simpleMetaStack("IC2:reactorVentDiamond:1:1", 1, 1), + GT_Utility.getIntegratedCircuit(1), }, GT_Values.NF, GregtechItemList.Casing_Adv_BlastFurnace.get(1L), 50, @@ -3404,9 +2923,8 @@ public class RECIPES_Machines { cell1 = CI.conveyorModule_LuV; cell2 = CI.electricMotor_LuV; ItemStack casingAmazon = GregtechItemList.Casing_AmazonWarehouse.get(1); - ItemStack aTieredUnboxinator = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK - ? ItemUtils.getValueOfItemList( - "Machine_LuV_Unboxinator", 1, ItemList.Machine_IV_Unboxinator.get(1)) + ItemStack aTieredUnboxinator = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK ? ItemUtils + .getValueOfItemList("Machine_LuV_Unboxinator", 1, ItemList.Machine_IV_Unboxinator.get(1)) : ItemList.Machine_IV_Unboxinator.get(1); RecipeUtils.addShapedRecipe( @@ -3421,15 +2939,11 @@ public class RECIPES_Machines { plate, GregtechItemList.Casing_AmazonWarehouse.get(1)); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ALLOY.TUNGSTEN_CARBIDE.getFrameBox(1), - ALLOY.TUNGSTEN_CARBIDE.getPlateDouble(4), - ALLOY.TRINIUM_TITANIUM.getRing(1), - ItemList.Electric_Motor_LuV.get(1), - ItemList.Conveyor_Module_LuV.get(1), - ItemUtils.getItemStackOfAmountFromOreDict("cableGt12VanadiumGallium", 1), - GT_Utility.getIntegratedCircuit(1), - }, + new ItemStack[] { ALLOY.TUNGSTEN_CARBIDE.getFrameBox(1), + ALLOY.TUNGSTEN_CARBIDE.getPlateDouble(4), ALLOY.TRINIUM_TITANIUM.getRing(1), + ItemList.Electric_Motor_LuV.get(1), ItemList.Conveyor_Module_LuV.get(1), + ItemUtils.getItemStackOfAmountFromOreDict("cableGt12VanadiumGallium", 1), + GT_Utility.getIntegratedCircuit(1), }, GT_Values.NF, GregtechItemList.Casing_AmazonWarehouse.get(1L), 50, @@ -3482,12 +2996,9 @@ public class RECIPES_Machines { plate, GregtechItemList.Casing_Multi_Use.get(1)); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ALLOY.STABALLOY.getPlate(4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2), - ALLOY.ZIRCONIUM_CARBIDE.getFrameBox(1), - GT_Utility.getIntegratedCircuit(1), - }, + new ItemStack[] { ALLOY.STABALLOY.getPlate(4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2), + ALLOY.ZIRCONIUM_CARBIDE.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), }, GT_Values.NF, GregtechItemList.Casing_Multi_Use.get(1L), 50, @@ -3512,18 +3023,16 @@ public class RECIPES_Machines { if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - ItemStack aDrillController = ItemUtils.getValueOfItemList("OreDrill4", ItemList.Hull_UV) - .get(1); + ItemStack aDrillController = ItemUtils.getValueOfItemList("OreDrill4", ItemList.Hull_UV).get(1); // Drilling Platform Casings CORE.RA.addSixSlotAssemblingRecipe( new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("frameGtTriniumNaquadahCarbonite", 4), - ItemUtils.getItemStackOfAmountFromOreDict("plateDoubleTriniumTitaniumAlloy", 1 * (1)), - ItemUtils.getItemStackOfAmountFromOreDict("gearGtPikyonium64B", 2 * (1)), - ALLOY.TRINIUM_REINFORCED_STEEL.getPlateDouble(4 * (1)), - ItemUtils.getSimpleStack((CI.machineHull_LuV), 1 * (1)), - }, + ItemUtils.getItemStackOfAmountFromOreDict("frameGtTriniumNaquadahCarbonite", 4), + ItemUtils.getItemStackOfAmountFromOreDict("plateDoubleTriniumTitaniumAlloy", 1 * (1)), + ItemUtils.getItemStackOfAmountFromOreDict("gearGtPikyonium64B", 2 * (1)), + ALLOY.TRINIUM_REINFORCED_STEEL.getPlateDouble(4 * (1)), + ItemUtils.getSimpleStack((CI.machineHull_LuV), 1 * (1)), }, ALLOY.MARAGING350.getFluidStack(144 * 16 * (1)), GregtechItemList.Casing_BedrockMiner.get(1), (int) GT_Values.V[4], @@ -3535,15 +3044,12 @@ public class RECIPES_Machines { // Mystic Frame CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - GregtechItemList.Casing_Multi_Use.get(1), - ItemList.Field_Generator_MV.get(1, CI.circuitTier7), - ItemList.Field_Generator_HV.get(1, CI.circuitTier7), - ItemList.Emitter_HV.get(1, CI.circuitTier7), - ItemList.Sensor_HV.get(1, CI.circuitTier7), - CI.getTieredComponent(OrePrefixes.plate, 7, 8 * aCostMultiplier), - CI.getTieredComponent(OrePrefixes.wireGt08, 8, 4 * aCostMultiplier), - }, + new ItemStack[] { GregtechItemList.Casing_Multi_Use.get(1), + ItemList.Field_Generator_MV.get(1, CI.circuitTier7), + ItemList.Field_Generator_HV.get(1, CI.circuitTier7), + ItemList.Emitter_HV.get(1, CI.circuitTier7), ItemList.Sensor_HV.get(1, CI.circuitTier7), + CI.getTieredComponent(OrePrefixes.plate, 7, 8 * aCostMultiplier), + CI.getTieredComponent(OrePrefixes.wireGt08, 8, 4 * aCostMultiplier), }, CI.getTieredFluid(6, (144 * 8)), // Input Fluid ItemUtils.getSimpleStack(Dimension_Everglades.blockPortalFrame, 2), 45 * 20 * 1 * (6), @@ -3551,31 +3057,22 @@ public class RECIPES_Machines { GT_MetaTileEntity_Disassembler.addBlacklist(ItemUtils.getSimpleStack(Dimension_Everglades.blockPortalFrame, 1)); // Player Doors - ItemStack[] aDoorInputs = new ItemStack[] { - ItemUtils.getSimpleStack(Blocks.log2), - ItemUtils.getSimpleStack(Blocks.iron_block), - ItemUtils.getSimpleStack(Blocks.glass), - ItemUtils.getSimpleStack(Blocks.packed_ice), - ItemUtils.getSimpleStack(Blocks.cactus), - }; - ItemStack[] aDoorOutputs = new ItemStack[] { - ItemUtils.getSimpleStack(ModBlocks.blockPlayerDoorWooden), - ItemUtils.getSimpleStack(ModBlocks.blockPlayerDoorIron), - ItemUtils.getSimpleStack(ModBlocks.blockPlayerDoorCustom_Glass), - ItemUtils.getSimpleStack(ModBlocks.blockPlayerDoorCustom_Ice), - ItemUtils.getSimpleStack(ModBlocks.blockPlayerDoorCustom_Cactus), - }; + ItemStack[] aDoorInputs = new ItemStack[] { ItemUtils.getSimpleStack(Blocks.log2), + ItemUtils.getSimpleStack(Blocks.iron_block), ItemUtils.getSimpleStack(Blocks.glass), + ItemUtils.getSimpleStack(Blocks.packed_ice), ItemUtils.getSimpleStack(Blocks.cactus), }; + ItemStack[] aDoorOutputs = new ItemStack[] { ItemUtils.getSimpleStack(ModBlocks.blockPlayerDoorWooden), + ItemUtils.getSimpleStack(ModBlocks.blockPlayerDoorIron), + ItemUtils.getSimpleStack(ModBlocks.blockPlayerDoorCustom_Glass), + ItemUtils.getSimpleStack(ModBlocks.blockPlayerDoorCustom_Ice), + ItemUtils.getSimpleStack(ModBlocks.blockPlayerDoorCustom_Cactus), }; for (int y = 0; y < aDoorInputs.length; y++) { CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - ItemUtils.getSimpleStack(Items.iron_door), - aDoorInputs[y], - ItemList.Sensor_LV.get(1, CI.circuitTier7), - CI.getTieredComponent(OrePrefixes.plate, 1, 2 * aCostMultiplier), - CI.getTieredComponent(OrePrefixes.wireGt02, 1, 2 * aCostMultiplier), - ItemUtils.getSimpleStack(Items.redstone, 16) - }, + new ItemStack[] { ItemUtils.getSimpleStack(Items.iron_door), aDoorInputs[y], + ItemList.Sensor_LV.get(1, CI.circuitTier7), + CI.getTieredComponent(OrePrefixes.plate, 1, 2 * aCostMultiplier), + CI.getTieredComponent(OrePrefixes.wireGt02, 1, 2 * aCostMultiplier), + ItemUtils.getSimpleStack(Items.redstone, 16) }, CI.getTieredFluid(1, (144 * 2)), // Input Fluid aDoorOutputs[y], 100, @@ -3587,66 +3084,32 @@ public class RECIPES_Machines { private static void controlCores() { - Material[] aMat_A = new Material[] { - ALLOY.POTIN, - ALLOY.ZIRCONIUM_CARBIDE, - ALLOY.TANTALLOY_61, - ALLOY.INCONEL_792, - ALLOY.STABALLOY, - ALLOY.TALONITE, - ALLOY.HASTELLOY_N, - ALLOY.HG1223, - ALLOY.LAFIUM, - ALLOY.PIKYONIUM - }; - Material[] aMat_B = new Material[] { - ALLOY.TUMBAGA, - ALLOY.SILICON_CARBIDE, - ALLOY.EGLIN_STEEL, - ALLOY.NICHROME, - ALLOY.TUNGSTEN_CARBIDE, - ALLOY.STELLITE, - ALLOY.HASTELLOY_C276, - ALLOY.NITINOL_60, - ALLOY.ZERON_100, - ALLOY.CINOBITE - }; + Material[] aMat_A = new Material[] { ALLOY.POTIN, ALLOY.ZIRCONIUM_CARBIDE, ALLOY.TANTALLOY_61, + ALLOY.INCONEL_792, ALLOY.STABALLOY, ALLOY.TALONITE, ALLOY.HASTELLOY_N, ALLOY.HG1223, ALLOY.LAFIUM, + ALLOY.PIKYONIUM }; + Material[] aMat_B = new Material[] { ALLOY.TUMBAGA, ALLOY.SILICON_CARBIDE, ALLOY.EGLIN_STEEL, ALLOY.NICHROME, + ALLOY.TUNGSTEN_CARBIDE, ALLOY.STELLITE, ALLOY.HASTELLOY_C276, ALLOY.NITINOL_60, ALLOY.ZERON_100, + ALLOY.CINOBITE }; Item aBaseCore = ModItems.itemControlCore; ItemStack[] aInputPrevTier = new ItemStack[] { - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore2", 1), - ItemUtils.simpleMetaStack(aBaseCore, 0, 1), - ItemUtils.simpleMetaStack(aBaseCore, 1, 1), - ItemUtils.simpleMetaStack(aBaseCore, 2, 1), - ItemUtils.simpleMetaStack(aBaseCore, 3, 1), - ItemUtils.simpleMetaStack(aBaseCore, 4, 1), - ItemUtils.simpleMetaStack(aBaseCore, 5, 1), - ItemUtils.simpleMetaStack(aBaseCore, 6, 1), - ItemUtils.simpleMetaStack(aBaseCore, 7, 1), - ItemUtils.simpleMetaStack(aBaseCore, 8, 1), - }; - ItemStack[] aOutput = new ItemStack[] { - ItemUtils.simpleMetaStack(aBaseCore, 0, 1), - ItemUtils.simpleMetaStack(aBaseCore, 1, 1), - ItemUtils.simpleMetaStack(aBaseCore, 2, 1), - ItemUtils.simpleMetaStack(aBaseCore, 3, 1), - ItemUtils.simpleMetaStack(aBaseCore, 4, 1), - ItemUtils.simpleMetaStack(aBaseCore, 5, 1), - ItemUtils.simpleMetaStack(aBaseCore, 6, 1), - ItemUtils.simpleMetaStack(aBaseCore, 7, 1), - ItemUtils.simpleMetaStack(aBaseCore, 8, 1), - ItemUtils.simpleMetaStack(aBaseCore, 9, 1), - }; + ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore2", 1), + ItemUtils.simpleMetaStack(aBaseCore, 0, 1), ItemUtils.simpleMetaStack(aBaseCore, 1, 1), + ItemUtils.simpleMetaStack(aBaseCore, 2, 1), ItemUtils.simpleMetaStack(aBaseCore, 3, 1), + ItemUtils.simpleMetaStack(aBaseCore, 4, 1), ItemUtils.simpleMetaStack(aBaseCore, 5, 1), + ItemUtils.simpleMetaStack(aBaseCore, 6, 1), ItemUtils.simpleMetaStack(aBaseCore, 7, 1), + ItemUtils.simpleMetaStack(aBaseCore, 8, 1), }; + ItemStack[] aOutput = new ItemStack[] { ItemUtils.simpleMetaStack(aBaseCore, 0, 1), + ItemUtils.simpleMetaStack(aBaseCore, 1, 1), ItemUtils.simpleMetaStack(aBaseCore, 2, 1), + ItemUtils.simpleMetaStack(aBaseCore, 3, 1), ItemUtils.simpleMetaStack(aBaseCore, 4, 1), + ItemUtils.simpleMetaStack(aBaseCore, 5, 1), ItemUtils.simpleMetaStack(aBaseCore, 6, 1), + ItemUtils.simpleMetaStack(aBaseCore, 7, 1), ItemUtils.simpleMetaStack(aBaseCore, 8, 1), + ItemUtils.simpleMetaStack(aBaseCore, 9, 1), }; CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.machineHull_HV, - aOutput[1], - aMat_A[1].getGear(2), - aMat_B[2].getPlateDouble(8), - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + ("1"), 2), - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(2), 5) - }, + new ItemStack[] { CI.machineHull_HV, aOutput[1], aMat_A[1].getGear(2), aMat_B[2].getPlateDouble(8), + ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + ("1"), 2), + ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(2), 5) }, aMat_B[3].getFluidStack(144 * 8), // Input Fluid GregtechItemList.Hatch_Control_Core.get(1), 60 * 20 * 5, @@ -3678,15 +3141,10 @@ public class RECIPES_Machines { } CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getEnergyCore(i, 4), - aPlateStack, - aGearStack, - aRodStack, - aScrewStack, - ItemUtils.getItemStackOfAmountFromOreDict( - CI.getTieredCircuitOreDictName((int) (4 + Math.ceil((double) i / (double) 2))), i * 2) - }, + new ItemStack[] { CI.getEnergyCore(i, 4), aPlateStack, aGearStack, aRodStack, aScrewStack, + ItemUtils.getItemStackOfAmountFromOreDict( + CI.getTieredCircuitOreDictName((int) (4 + Math.ceil((double) i / (double) 2))), + i * 2) }, CI.getTieredFluid(i, 144 * 4 * (i + 1)), // Input Fluid aOutput[i], 60 * 20 * 1 * (i + 1), @@ -3696,31 +3154,21 @@ public class RECIPES_Machines { private static void energyCores() { - ItemStack[] aBufferOutput = new ItemStack[] { - RECIPE_Buffer_ULV, - RECIPE_Buffer_LV, - RECIPE_Buffer_MV, - RECIPE_Buffer_HV, - RECIPE_Buffer_EV, - RECIPE_Buffer_IV, - RECIPE_Buffer_LuV, - RECIPE_Buffer_ZPM, - RECIPE_Buffer_UV, - RECIPE_Buffer_MAX - }; + ItemStack[] aBufferOutput = new ItemStack[] { RECIPE_Buffer_ULV, RECIPE_Buffer_LV, RECIPE_Buffer_MV, + RECIPE_Buffer_HV, RECIPE_Buffer_EV, RECIPE_Buffer_IV, RECIPE_Buffer_LuV, RECIPE_Buffer_ZPM, + RECIPE_Buffer_UV, RECIPE_Buffer_MAX }; ItemStack[] aOutput = new ItemStack[] { - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "1", 1), - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "2", 1), - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "3", 1), - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "4", 1), - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "5", 1), - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "6", 1), - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "7", 1), - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "8", 1), - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "9", 1), - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "10", 1) - }; + ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "1", 1), + ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "2", 1), + ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "3", 1), + ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "4", 1), + ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "5", 1), + ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "6", 1), + ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "7", 1), + ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "8", 1), + ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "9", 1), + ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "10", 1) }; for (int i = 0; i < 10; i++) { @@ -3728,14 +3176,11 @@ public class RECIPES_Machines { aPrevTier.stackSize = 1; int aTier = (i + 1); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - aPrevTier, - CI.getTieredComponent(OrePrefixes.plate, aTier, 4), - CI.getTieredComponent(OrePrefixes.cableGt04, i, 2), - CI.getTieredComponent(OrePrefixes.circuit, aTier, 2), - CI.getTieredComponent(OrePrefixes.screw, aTier, 6), - CI.getTieredComponent(OrePrefixes.bolt, i, 12), - }, + new ItemStack[] { aPrevTier, CI.getTieredComponent(OrePrefixes.plate, aTier, 4), + CI.getTieredComponent(OrePrefixes.cableGt04, i, 2), + CI.getTieredComponent(OrePrefixes.circuit, aTier, 2), + CI.getTieredComponent(OrePrefixes.screw, aTier, 6), + CI.getTieredComponent(OrePrefixes.bolt, i, 12), }, CI.getTieredFluid(i, (144 * 4 * aTier)), // Input Fluid aOutput[i], 45 * 10 * 1 * (aTier), @@ -3743,14 +3188,12 @@ public class RECIPES_Machines { // Energy Buffer CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - ItemUtils.getSimpleStack(aOutput[i], 4), - CI.getTieredComponent(OrePrefixes.plate, aTier, 8), - CI.getTieredComponent(OrePrefixes.wireGt08, i, 4), - CI.getTieredComponent(OrePrefixes.circuit, i, 4), - CI.getTieredComponent(OrePrefixes.stickLong, aTier, 4), - CI.getTieredComponent(OrePrefixes.gearGt, i, 5), - }, + new ItemStack[] { ItemUtils.getSimpleStack(aOutput[i], 4), + CI.getTieredComponent(OrePrefixes.plate, aTier, 8), + CI.getTieredComponent(OrePrefixes.wireGt08, i, 4), + CI.getTieredComponent(OrePrefixes.circuit, i, 4), + CI.getTieredComponent(OrePrefixes.stickLong, aTier, 4), + CI.getTieredComponent(OrePrefixes.gearGt, i, 5), }, CI.getTieredFluid(aTier, (144 * 16 * aTier)), // Input Fluid aBufferOutput[i], 45 * 20 * 1 * (aTier), @@ -3760,31 +3203,20 @@ public class RECIPES_Machines { private static void wirelessChargers() { - ItemStack[] aChargers = new ItemStack[] { - null, - GregtechItemList.Charger_LV.get(1), - GregtechItemList.Charger_MV.get(1), - GregtechItemList.Charger_HV.get(1), - GregtechItemList.Charger_EV.get(1), - GregtechItemList.Charger_IV.get(1), - GregtechItemList.Charger_LuV.get(1), - GregtechItemList.Charger_ZPM.get(1), - GregtechItemList.Charger_UV.get(1), - GregtechItemList.Charger_MAX.get(1) - }; + ItemStack[] aChargers = new ItemStack[] { null, GregtechItemList.Charger_LV.get(1), + GregtechItemList.Charger_MV.get(1), GregtechItemList.Charger_HV.get(1), + GregtechItemList.Charger_EV.get(1), GregtechItemList.Charger_IV.get(1), + GregtechItemList.Charger_LuV.get(1), GregtechItemList.Charger_ZPM.get(1), + GregtechItemList.Charger_UV.get(1), GregtechItemList.Charger_MAX.get(1) }; for (int i = 0; i < 10; i++) { if (i == 0) { continue; } int aTier = (i + 1); - ItemStack[] aInputs = new ItemStack[] { - CI.getTieredMachineHull(i, 1), - CI.getTransmissionComponent(i, 2), - CI.getFieldGenerator(i, 1), - CI.getTieredComponent(OrePrefixes.plate, aTier, 4), - CI.getTieredComponent(OrePrefixes.circuit, aTier, 2), - }; + ItemStack[] aInputs = new ItemStack[] { CI.getTieredMachineHull(i, 1), CI.getTransmissionComponent(i, 2), + CI.getFieldGenerator(i, 1), CI.getTieredComponent(OrePrefixes.plate, aTier, 4), + CI.getTieredComponent(OrePrefixes.circuit, aTier, 2), }; CORE.RA.addSixSlotAssemblingRecipe( aInputs, CI.getAlternativeTieredFluid(i, (144 * 2 * aTier)), // Input Fluid @@ -3797,26 +3229,21 @@ public class RECIPES_Machines { private static void largeArcFurnace() { int aCostMultiplier = 1; CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getTieredMachineHull(-1, 1 * aCostMultiplier), - CI.getTransmissionComponent(2, 2 * aCostMultiplier), - CI.getElectricPiston(4, 2 * aCostMultiplier), - CI.getTieredComponent(OrePrefixes.plate, 5, 4 * aCostMultiplier), - CI.getTieredComponent(OrePrefixes.pipeSmall, 4, 1 * aCostMultiplier), - }, + new ItemStack[] { CI.getTieredMachineHull(-1, 1 * aCostMultiplier), + CI.getTransmissionComponent(2, 2 * aCostMultiplier), + CI.getElectricPiston(4, 2 * aCostMultiplier), + CI.getTieredComponent(OrePrefixes.plate, 5, 4 * aCostMultiplier), + CI.getTieredComponent(OrePrefixes.pipeSmall, 4, 1 * aCostMultiplier), }, CI.getAlternativeTieredFluid(5, (144 * 2 * 4)), // Input Fluid GregtechItemList.Casing_Industrial_Arc_Furnace.get(1), 20 * 10 * 1 * (6), MaterialUtils.getVoltageForTier(5)); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - GregtechItemList.Casing_Industrial_Arc_Furnace.get(1), - CI.getFieldGenerator(4, 2 * aCostMultiplier), - CI.getRobotArm(5, 4 * aCostMultiplier), - CI.getEnergyCore(4, 2 * aCostMultiplier), - CI.getTieredComponent(OrePrefixes.plate, 6, 8 * aCostMultiplier), - CI.getTieredComponent(OrePrefixes.circuit, 5, 8 * aCostMultiplier), - }, + new ItemStack[] { GregtechItemList.Casing_Industrial_Arc_Furnace.get(1), + CI.getFieldGenerator(4, 2 * aCostMultiplier), CI.getRobotArm(5, 4 * aCostMultiplier), + CI.getEnergyCore(4, 2 * aCostMultiplier), + CI.getTieredComponent(OrePrefixes.plate, 6, 8 * aCostMultiplier), + CI.getTieredComponent(OrePrefixes.circuit, 5, 8 * aCostMultiplier), }, CI.getAlternativeTieredFluid(6, (144 * 4 * 5)), // Input Fluid GregtechItemList.Industrial_Arc_Furnace.get(1), 60 * 20 * 8, @@ -3826,13 +3253,9 @@ public class RECIPES_Machines { private static void industrialVacuumFurnace() { CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getTieredMachineHull(-1, 1), - CI.getHeatCoil(2), - CI.getElectricPiston(3, 2), - CI.getTieredComponent(OrePrefixes.plate, 6, 4), - CI.getTieredComponent(OrePrefixes.gearGt, 6, 2), - }, + new ItemStack[] { CI.getTieredMachineHull(-1, 1), CI.getHeatCoil(2), CI.getElectricPiston(3, 2), + CI.getTieredComponent(OrePrefixes.plate, 6, 4), + CI.getTieredComponent(OrePrefixes.gearGt, 6, 2), }, CI.getTertiaryTieredFluid(5, (144 * 2 * 4)), // Input Fluid GregtechItemList.Casing_Vacuum_Furnace.get(1), 20 * 10 * 6, @@ -3841,14 +3264,10 @@ public class RECIPES_Machines { ; CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - GregtechItemList.Casing_Vacuum_Furnace.get(1), - CI.getTieredComponent(OrePrefixes.wireGt16, 7, 4), - CI.getEnergyCore(6, 1), - CI.getRobotArm(4, 4), - CI.getTieredComponent(OrePrefixes.plate, 7, 8), - CI.getTieredComponent(OrePrefixes.circuit, 6, 8), - }, + new ItemStack[] { GregtechItemList.Casing_Vacuum_Furnace.get(1), + CI.getTieredComponent(OrePrefixes.wireGt16, 7, 4), CI.getEnergyCore(6, 1), CI.getRobotArm(4, 4), + CI.getTieredComponent(OrePrefixes.plate, 7, 8), + CI.getTieredComponent(OrePrefixes.circuit, 6, 8), }, CI.getTieredFluid(7, (144 * 4 * 5)), // Input Fluid GregtechItemList.Controller_Vacuum_Furnace.get(1), 60 * 20 * 12, @@ -3857,51 +3276,37 @@ public class RECIPES_Machines { private static void milling() { - /*public static ItemStack RECIPE_ISAMill_Controller; - public static ItemStack RECIPE_ISAMill_Gearbox; - public static ItemStack RECIPE_ISAMill_Casing; - public static ItemStack RECIPE_ISAMill_Hatch; - public static ItemStack RECIPE_Flotation_Controller; - public static ItemStack RECIPE_Flotation_Casing;*/ + /* + * public static ItemStack RECIPE_ISAMill_Controller; public static ItemStack RECIPE_ISAMill_Gearbox; public + * static ItemStack RECIPE_ISAMill_Casing; public static ItemStack RECIPE_ISAMill_Hatch; public static ItemStack + * RECIPE_Flotation_Controller; public static ItemStack RECIPE_Flotation_Casing; + */ // Isa Mill Controller CORE.RA.addAssemblylineRecipe( ItemList.Machine_IV_Macerator.get(1), 20 * 60 * 20, - new Object[] { - GregtechItemList.Casing_IsaMill_Gearbox.get(4), - CI.getTieredGTPPMachineCasing(6, 4), - ItemList.Component_Grinder_Tungsten.get(16), - new Object[] {CI.getTieredCircuitOreDictName(6), 8}, - ALLOY.INCONEL_625.getGear(8), - ALLOY.INCONEL_625.getPlate(32), - ALLOY.ZERON_100.getPlateDouble(8), - ALLOY.ZERON_100.getPlateDouble(8), - ALLOY.ZERON_100.getScrew(64), - CI.getTieredComponentOfMaterial(Materials.NiobiumTitanium, OrePrefixes.wireFine, 32), - CI.getTieredComponentOfMaterial(Materials.NiobiumTitanium, OrePrefixes.wireFine, 32), - CI.getTieredComponentOfMaterial(Materials.Titanium, OrePrefixes.foil, 16), - CI.getTieredComponentOfMaterial(Materials.Titanium, OrePrefixes.foil, 16), - }, - new FluidStack[] { - CI.getTieredFluid(6, 16 * 144), - CI.getAlternativeTieredFluid(6, 32 * 144), - CI.getTertiaryTieredFluid(6, 32 * 144) - }, + new Object[] { GregtechItemList.Casing_IsaMill_Gearbox.get(4), CI.getTieredGTPPMachineCasing(6, 4), + ItemList.Component_Grinder_Tungsten.get(16), + new Object[] { CI.getTieredCircuitOreDictName(6), 8 }, ALLOY.INCONEL_625.getGear(8), + ALLOY.INCONEL_625.getPlate(32), ALLOY.ZERON_100.getPlateDouble(8), + ALLOY.ZERON_100.getPlateDouble(8), ALLOY.ZERON_100.getScrew(64), + CI.getTieredComponentOfMaterial(Materials.NiobiumTitanium, OrePrefixes.wireFine, 32), + CI.getTieredComponentOfMaterial(Materials.NiobiumTitanium, OrePrefixes.wireFine, 32), + CI.getTieredComponentOfMaterial(Materials.Titanium, OrePrefixes.foil, 16), + CI.getTieredComponentOfMaterial(Materials.Titanium, OrePrefixes.foil, 16), }, + new FluidStack[] { CI.getTieredFluid(6, 16 * 144), CI.getAlternativeTieredFluid(6, 32 * 144), + CI.getTertiaryTieredFluid(6, 32 * 144) }, GregtechItemList.Controller_IsaMill.get(1), 20 * 60 * 10, MaterialUtils.getVoltageForTier(6)); // Isa Mill Gearbox CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(7), - ItemList.Casing_Gearbox_Titanium.get(2), - ALLOY.INCONEL_625.getGear(4), - CI.getTieredComponentOfMaterial(Materials.HSSE, OrePrefixes.gearGtSmall, 8), - ALLOY.INCONEL_625.getPlate(16), - ALLOY.ZERON_100.getBolt(16), - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(7), ItemList.Casing_Gearbox_Titanium.get(2), + ALLOY.INCONEL_625.getGear(4), + CI.getTieredComponentOfMaterial(Materials.HSSE, OrePrefixes.gearGtSmall, 8), + ALLOY.INCONEL_625.getPlate(16), ALLOY.ZERON_100.getBolt(16), }, ALLOY.TUNGSTENSTEEL.getFluidStack(8 * 144), GregtechItemList.Casing_IsaMill_Gearbox.get(1), 60 * 20 * 2, @@ -3909,14 +3314,10 @@ public class RECIPES_Machines { // Isa Mill Casing CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(7), - CI.getTieredGTPPMachineCasing(5, 1), - ALLOY.INCONEL_625.getPlate(8), - ALLOY.ZERON_100.getRod(4), - CI.getTieredComponentOfMaterial(Materials.HSSG, OrePrefixes.gearGtSmall, 4), - ALLOY.ZERON_100.getScrew(8), - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(7), CI.getTieredGTPPMachineCasing(5, 1), + ALLOY.INCONEL_625.getPlate(8), ALLOY.ZERON_100.getRod(4), + CI.getTieredComponentOfMaterial(Materials.HSSG, OrePrefixes.gearGtSmall, 4), + ALLOY.ZERON_100.getScrew(8), }, ELEMENT.getInstance().TITANIUM.getFluidStack(4 * 144), GregtechItemList.Casing_IsaMill_Casing.get(1), 60 * 20 * 2, @@ -3924,14 +3325,10 @@ public class RECIPES_Machines { // Isa Mill Pipe CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(7), - CI.getTieredGTPPMachineCasing(4, 2), - ALLOY.INCONEL_625.getPlateDouble(4), - ALLOY.INCOLOY_MA956.getRing(8), - CI.getTieredComponentOfMaterial(Materials.HSSE, OrePrefixes.plate, 8), - ALLOY.INCOLOY_MA956.getBolt(16), - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(7), CI.getTieredGTPPMachineCasing(4, 2), + ALLOY.INCONEL_625.getPlateDouble(4), ALLOY.INCOLOY_MA956.getRing(8), + CI.getTieredComponentOfMaterial(Materials.HSSE, OrePrefixes.plate, 8), + ALLOY.INCOLOY_MA956.getBolt(16), }, ELEMENT.getInstance().ALUMINIUM.getFluidStack(8 * 144), GregtechItemList.Casing_IsaMill_Pipe.get(1), 60 * 20 * 8, @@ -3941,40 +3338,26 @@ public class RECIPES_Machines { CORE.RA.addAssemblylineRecipe( ItemList.Distillation_Tower.get(1), 20 * 60 * 20, - new Object[] { - GregtechItemList.Casing_Flotation_Cell.get(4), - CI.getTieredGTPPMachineCasing(5, 4), - ItemList.Machine_IV_Distillery.get(1), - new Object[] {CI.getTieredCircuitOreDictName(6), 8}, - ALLOY.STELLITE.getGear(8), - ALLOY.STELLITE.getPlate(32), - ALLOY.HASTELLOY_N.getPlateDouble(8), - ALLOY.HASTELLOY_N.getPlateDouble(8), - ALLOY.HASTELLOY_N.getScrew(64), - CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64), - CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64), - CI.getTieredComponentOfMaterial(Materials.Platinum, OrePrefixes.foil, 32), - CI.getTieredComponentOfMaterial(Materials.Platinum, OrePrefixes.foil, 32), - }, - new FluidStack[] { - CI.getTieredFluid(5, 16 * 144), - CI.getAlternativeTieredFluid(4, 32 * 144), - CI.getTertiaryTieredFluid(4, 32 * 144) - }, + new Object[] { GregtechItemList.Casing_Flotation_Cell.get(4), CI.getTieredGTPPMachineCasing(5, 4), + ItemList.Machine_IV_Distillery.get(1), new Object[] { CI.getTieredCircuitOreDictName(6), 8 }, + ALLOY.STELLITE.getGear(8), ALLOY.STELLITE.getPlate(32), ALLOY.HASTELLOY_N.getPlateDouble(8), + ALLOY.HASTELLOY_N.getPlateDouble(8), ALLOY.HASTELLOY_N.getScrew(64), + CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64), + CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64), + CI.getTieredComponentOfMaterial(Materials.Platinum, OrePrefixes.foil, 32), + CI.getTieredComponentOfMaterial(Materials.Platinum, OrePrefixes.foil, 32), }, + new FluidStack[] { CI.getTieredFluid(5, 16 * 144), CI.getAlternativeTieredFluid(4, 32 * 144), + CI.getTertiaryTieredFluid(4, 32 * 144) }, GregtechItemList.Controller_Flotation_Cell.get(1), 20 * 60 * 10, MaterialUtils.getVoltageForTier(6)); // Flotation Cell Casing CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(7), - CI.getTieredGTPPMachineCasing(4, 1), - ALLOY.AQUATIC_STEEL.getPlate(8), - ALLOY.STELLITE.getRing(8), - CI.getTieredComponentOfMaterial(Materials.HSSG, OrePrefixes.plateDouble, 4), - ALLOY.HASTELLOY_N.getScrew(8), - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(7), CI.getTieredGTPPMachineCasing(4, 1), + ALLOY.AQUATIC_STEEL.getPlate(8), ALLOY.STELLITE.getRing(8), + CI.getTieredComponentOfMaterial(Materials.HSSG, OrePrefixes.plateDouble, 4), + ALLOY.HASTELLOY_N.getScrew(8), }, ALLOY.STAINLESS_STEEL.getFluidStack(8 * 144), GregtechItemList.Casing_Flotation_Cell.get(1), 60 * 20 * 2, @@ -3982,14 +3365,11 @@ public class RECIPES_Machines { // Milling Bus CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(7), - CI.getTieredGTPPMachineCasing(5, 1), - ItemList.Hatch_Input_Bus_EV.get(1), - CI.getTieredComponentOfMaterial(Materials.Titanium, OrePrefixes.gearGt, 8), - CI.getTieredComponentOfMaterial(Materials.TungstenSteel, OrePrefixes.plate, 32), - CI.getTieredComponentOfMaterial(Materials.SolderingAlloy, OrePrefixes.wireFine, 16), - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(7), CI.getTieredGTPPMachineCasing(5, 1), + ItemList.Hatch_Input_Bus_EV.get(1), + CI.getTieredComponentOfMaterial(Materials.Titanium, OrePrefixes.gearGt, 8), + CI.getTieredComponentOfMaterial(Materials.TungstenSteel, OrePrefixes.plate, 32), + CI.getTieredComponentOfMaterial(Materials.SolderingAlloy, OrePrefixes.wireFine, 16), }, ELEMENT.getInstance().TUNGSTEN.getFluidStack(8 * 144), GregtechItemList.Bus_Milling_Balls.get(1), 60 * 20 * 4, @@ -4000,13 +3380,9 @@ public class RECIPES_Machines { // Sparge Tower Research CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(8), - ELEMENT.getInstance().HELIUM.getCell(8), - ELEMENT.getInstance().FLUORINE.getCell(8), - ALLOY.HS188A.getIngot(8), - ItemList.Distillation_Tower.get(1) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(8), ELEMENT.getInstance().HELIUM.getCell(8), + ELEMENT.getInstance().FLUORINE.getCell(8), ALLOY.HS188A.getIngot(8), + ItemList.Distillation_Tower.get(1) }, null, ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_10_SPARGING, 1), 60 * 20 * 5, @@ -4016,40 +3392,27 @@ public class RECIPES_Machines { CORE.RA.addAssemblylineRecipe( ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_10_SPARGING, 1), 20 * 60 * 20, - new Object[] { - GregtechItemList.Casing_Sparge_Tower_Exterior.get(4), - CI.getTieredGTPPMachineCasing(4, 4), - ItemList.Machine_IV_Distillery.get(1), - new Object[] {CI.getTieredCircuitOreDictName(5), 8}, - ALLOY.HS188A.getGear(8), - ALLOY.HS188A.getPlate(32), - ALLOY.HASTELLOY_N.getPlateDouble(8), - ALLOY.HASTELLOY_N.getPlateDouble(8), - ALLOY.HASTELLOY_N.getScrew(64), - CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64), - CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64), - CI.getTieredComponentOfMaterial(Materials.Platinum, OrePrefixes.foil, 32), - CI.getTieredComponentOfMaterial(Materials.Platinum, OrePrefixes.foil, 32), - }, - new FluidStack[] { - CI.getTieredFluid(4, 16 * 144), - CI.getAlternativeTieredFluid(3, 32 * 144), - CI.getTertiaryTieredFluid(3, 32 * 144) - }, + new Object[] { GregtechItemList.Casing_Sparge_Tower_Exterior.get(4), + CI.getTieredGTPPMachineCasing(4, 4), ItemList.Machine_IV_Distillery.get(1), + new Object[] { CI.getTieredCircuitOreDictName(5), 8 }, ALLOY.HS188A.getGear(8), + ALLOY.HS188A.getPlate(32), ALLOY.HASTELLOY_N.getPlateDouble(8), + ALLOY.HASTELLOY_N.getPlateDouble(8), ALLOY.HASTELLOY_N.getScrew(64), + CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64), + CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64), + CI.getTieredComponentOfMaterial(Materials.Platinum, OrePrefixes.foil, 32), + CI.getTieredComponentOfMaterial(Materials.Platinum, OrePrefixes.foil, 32), }, + new FluidStack[] { CI.getTieredFluid(4, 16 * 144), CI.getAlternativeTieredFluid(3, 32 * 144), + CI.getTertiaryTieredFluid(3, 32 * 144) }, GregtechItemList.Controller_Sparge_Tower.get(1), 20 * 60 * 10, MaterialUtils.getVoltageForTier(6)); // Sparge Tower Casing CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(8), - CI.getTieredGTPPMachineCasing(3, 1), - ALLOY.HS188A.getPlate(8), - ALLOY.HASTELLOY_N.getRing(4), - CI.getTieredComponentOfMaterial(Materials.TungstenSteel, OrePrefixes.plateDouble, 4), - ALLOY.HASTELLOY_N.getScrew(4), - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(8), CI.getTieredGTPPMachineCasing(3, 1), + ALLOY.HS188A.getPlate(8), ALLOY.HASTELLOY_N.getRing(4), + CI.getTieredComponentOfMaterial(Materials.TungstenSteel, OrePrefixes.plateDouble, 4), + ALLOY.HASTELLOY_N.getScrew(4), }, ALLOY.STAINLESS_STEEL.getFluidStack(8 * 144), GregtechItemList.Casing_Sparge_Tower_Exterior.get(1), 60 * 20 * 2, @@ -4057,21 +3420,12 @@ public class RECIPES_Machines { } private static void chisels() { - ItemStack[] aChisels = new ItemStack[] { - GregtechItemList.GT_Chisel_LV.get(1), - GregtechItemList.GT_Chisel_MV.get(1), - GregtechItemList.GT_Chisel_HV.get(1), - }; + ItemStack[] aChisels = new ItemStack[] { GregtechItemList.GT_Chisel_LV.get(1), + GregtechItemList.GT_Chisel_MV.get(1), GregtechItemList.GT_Chisel_HV.get(1), }; for (int i = 1; i < 4; i++) { CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedBioCircuit(10 + i), - CI.getTieredMachineCasing(i), - CI.getPlate(i, 4), - CI.getElectricMotor(i, 2), - CI.getConveyor(i, 2), - CI.getRobotArm(i, 1) - }, + new ItemStack[] { CI.getNumberedBioCircuit(10 + i), CI.getTieredMachineCasing(i), CI.getPlate(i, 4), + CI.getElectricMotor(i, 2), CI.getConveyor(i, 2), CI.getRobotArm(i, 1) }, CI.getTieredFluid(i, 144 * 4), aChisels[i - 1], 20 * 20, @@ -4079,28 +3433,17 @@ public class RECIPES_Machines { } CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedBioCircuit(14), - aChisels[2], - CI.getPlate(4, 8), - CI.getElectricMotor(4, 8), - CI.getConveyor(4, 8), - CI.getRobotArm(4, 4) - }, + new ItemStack[] { CI.getNumberedBioCircuit(14), aChisels[2], CI.getPlate(4, 8), + CI.getElectricMotor(4, 8), CI.getConveyor(4, 8), CI.getRobotArm(4, 4) }, CI.getTieredFluid(4, 144 * 8), GregtechItemList.Controller_IndustrialAutoChisel.get(1), 20 * 20, MaterialUtils.getVoltageForTier(4)); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedBioCircuit(14), - ItemList.Casing_SolidSteel.get(2), - CI.getPlate(4, 2), - CI.getTieredComponent(OrePrefixes.plate, 3, 4), - CI.getTieredComponent(OrePrefixes.ring, 3, 8), - CI.getTieredComponent(OrePrefixes.rod, 2, 4), - }, + new ItemStack[] { CI.getNumberedBioCircuit(14), ItemList.Casing_SolidSteel.get(2), CI.getPlate(4, 2), + CI.getTieredComponent(OrePrefixes.plate, 3, 4), CI.getTieredComponent(OrePrefixes.ring, 3, 8), + CI.getTieredComponent(OrePrefixes.rod, 2, 4), }, CI.getTieredFluid(2, 144 * 2), GregtechItemList.Casing_IndustrialAutoChisel.get(1), 20 * 20, @@ -4110,14 +3453,10 @@ public class RECIPES_Machines { private static void rockBreaker() { CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(12), - ItemList.Machine_EV_RockBreaker.get(1), - ALLOY.STAINLESS_STEEL.getPlate(8), - ALLOY.STAINLESS_STEEL.getRing(4), - CI.getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.plateDouble, 8), - ALLOY.EGLIN_STEEL.getScrew(8), - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(12), ItemList.Machine_EV_RockBreaker.get(1), + ALLOY.STAINLESS_STEEL.getPlate(8), ALLOY.STAINLESS_STEEL.getRing(4), + CI.getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.plateDouble, 8), + ALLOY.EGLIN_STEEL.getScrew(8), }, ELEMENT.getInstance().ALUMINIUM.getFluidStack(144 * 8), GregtechItemList.Controller_IndustrialRockBreaker.get(1), 60 * 20 * 2, @@ -4125,18 +3464,12 @@ public class RECIPES_Machines { } private static void fakeMachineCasingCovers() { - GregtechItemList[] mMachineCasingCovers = new GregtechItemList[] { - GregtechItemList.FakeMachineCasingPlate_ULV, - GregtechItemList.FakeMachineCasingPlate_LV, - GregtechItemList.FakeMachineCasingPlate_MV, - GregtechItemList.FakeMachineCasingPlate_HV, - GregtechItemList.FakeMachineCasingPlate_EV, - GregtechItemList.FakeMachineCasingPlate_IV, - GregtechItemList.FakeMachineCasingPlate_LuV, - GregtechItemList.FakeMachineCasingPlate_ZPM, - GregtechItemList.FakeMachineCasingPlate_UV, - GregtechItemList.FakeMachineCasingPlate_MAX, - }; + GregtechItemList[] mMachineCasingCovers = new GregtechItemList[] { GregtechItemList.FakeMachineCasingPlate_ULV, + GregtechItemList.FakeMachineCasingPlate_LV, GregtechItemList.FakeMachineCasingPlate_MV, + GregtechItemList.FakeMachineCasingPlate_HV, GregtechItemList.FakeMachineCasingPlate_EV, + GregtechItemList.FakeMachineCasingPlate_IV, GregtechItemList.FakeMachineCasingPlate_LuV, + GregtechItemList.FakeMachineCasingPlate_ZPM, GregtechItemList.FakeMachineCasingPlate_UV, + GregtechItemList.FakeMachineCasingPlate_MAX, }; int aMaxTier = GT_Values.VOLTAGE_NAMES.length; ItemStack aTier[] = new ItemStack[aMaxTier]; for (int i = 0; i < aMaxTier; i++) { @@ -4145,12 +3478,13 @@ public class RECIPES_Machines { // Deprecate old recipes for (int i = 0; i < 10; i++) { RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] {mMachineCasingCovers[i].get(1)}, ItemUtils.getSimpleStack(aTier[i], 1)); + new ItemStack[] { mMachineCasingCovers[i].get(1) }, + ItemUtils.getSimpleStack(aTier[i], 1)); } // Add recipes for new ones for (int i = 0; i < aMaxTier; i++) { - GT_Values.RA.addCutterRecipe( - CI.getTieredMachineCasing(i), aTier[i], null, 20 * 5 * i, (int) GT_Values.V[i]); + GT_Values.RA + .addCutterRecipe(CI.getTieredMachineCasing(i), aTier[i], null, 20 * 5 * i, (int) GT_Values.V[i]); } } @@ -4168,20 +3502,10 @@ public class RECIPES_Machines { // "agon", "iszm", "korp", "jelt", "bitt" - ItemStack[] aBlocks = new ItemStack[] { - ItemUtils.getSimpleStack(agon), - ItemUtils.getSimpleStack(iszm), - ItemUtils.getSimpleStack(korp), - ItemUtils.getSimpleStack(jelt), - ItemUtils.getSimpleStack(bitt) - }; - MetaCustomCoverItem[] aCovers = new MetaCustomCoverItem[] { - CoverManager.Cover_Agon, - CoverManager.Cover_Iszm, - CoverManager.Cover_Korp, - CoverManager.Cover_Jelt, - CoverManager.Cover_Bitt - }; + ItemStack[] aBlocks = new ItemStack[] { ItemUtils.getSimpleStack(agon), ItemUtils.getSimpleStack(iszm), + ItemUtils.getSimpleStack(korp), ItemUtils.getSimpleStack(jelt), ItemUtils.getSimpleStack(bitt) }; + MetaCustomCoverItem[] aCovers = new MetaCustomCoverItem[] { CoverManager.Cover_Agon, CoverManager.Cover_Iszm, + CoverManager.Cover_Korp, CoverManager.Cover_Jelt, CoverManager.Cover_Bitt }; ItemStack aInputs[][] = new ItemStack[5][16]; ItemStack aOutputs[][] = new ItemStack[5][16]; @@ -4194,78 +3518,44 @@ public class RECIPES_Machines { } private static void superBuses() { - GregtechItemList[] mSuperBusesInput = new GregtechItemList[] { - GregtechItemList.Hatch_SuperBus_Input_ULV, - GregtechItemList.Hatch_SuperBus_Input_LV, - GregtechItemList.Hatch_SuperBus_Input_MV, - GregtechItemList.Hatch_SuperBus_Input_HV, - GregtechItemList.Hatch_SuperBus_Input_EV, - GregtechItemList.Hatch_SuperBus_Input_IV, - GregtechItemList.Hatch_SuperBus_Input_LuV, - GregtechItemList.Hatch_SuperBus_Input_ZPM, - GregtechItemList.Hatch_SuperBus_Input_UV, - GregtechItemList.Hatch_SuperBus_Input_MAX, - }; - - GregtechItemList[] mSuperBusesOutput = new GregtechItemList[] { - GregtechItemList.Hatch_SuperBus_Output_ULV, - GregtechItemList.Hatch_SuperBus_Output_LV, - GregtechItemList.Hatch_SuperBus_Output_MV, - GregtechItemList.Hatch_SuperBus_Output_HV, - GregtechItemList.Hatch_SuperBus_Output_EV, - GregtechItemList.Hatch_SuperBus_Output_IV, - GregtechItemList.Hatch_SuperBus_Output_LuV, - GregtechItemList.Hatch_SuperBus_Output_ZPM, - GregtechItemList.Hatch_SuperBus_Output_UV, - GregtechItemList.Hatch_SuperBus_Output_MAX, - }; - - ItemStack[] mInputHatch = new ItemStack[] { - ItemList.Hatch_Input_Bus_EV.get(1), - ItemList.Hatch_Input_Bus_IV.get(1), - ItemList.Hatch_Input_Bus_LuV.get(1), - ItemList.Hatch_Input_Bus_ZPM.get(1), - ItemList.Hatch_Input_Bus_UV.get(1), - ItemList.Hatch_Input_Bus_MAX.get(1), - GregtechItemList.Hatch_SuperBus_Input_LV.get(1), - GregtechItemList.Hatch_SuperBus_Input_MV.get(1), - GregtechItemList.Hatch_SuperBus_Input_HV.get(1), - GregtechItemList.Hatch_SuperBus_Input_EV.get(1), - }; - - ItemStack[] mOutputHatch = new ItemStack[] { - ItemList.Hatch_Output_Bus_EV.get(1), - ItemList.Hatch_Output_Bus_IV.get(1), - ItemList.Hatch_Output_Bus_LuV.get(1), - ItemList.Hatch_Output_Bus_ZPM.get(1), - ItemList.Hatch_Output_Bus_UV.get(1), - ItemList.Hatch_Output_Bus_MAX.get(1), - GregtechItemList.Hatch_SuperBus_Output_LV.get(1), - GregtechItemList.Hatch_SuperBus_Output_MV.get(1), - GregtechItemList.Hatch_SuperBus_Output_HV.get(1), - GregtechItemList.Hatch_SuperBus_Output_EV.get(1), - }; + GregtechItemList[] mSuperBusesInput = new GregtechItemList[] { GregtechItemList.Hatch_SuperBus_Input_ULV, + GregtechItemList.Hatch_SuperBus_Input_LV, GregtechItemList.Hatch_SuperBus_Input_MV, + GregtechItemList.Hatch_SuperBus_Input_HV, GregtechItemList.Hatch_SuperBus_Input_EV, + GregtechItemList.Hatch_SuperBus_Input_IV, GregtechItemList.Hatch_SuperBus_Input_LuV, + GregtechItemList.Hatch_SuperBus_Input_ZPM, GregtechItemList.Hatch_SuperBus_Input_UV, + GregtechItemList.Hatch_SuperBus_Input_MAX, }; + + GregtechItemList[] mSuperBusesOutput = new GregtechItemList[] { GregtechItemList.Hatch_SuperBus_Output_ULV, + GregtechItemList.Hatch_SuperBus_Output_LV, GregtechItemList.Hatch_SuperBus_Output_MV, + GregtechItemList.Hatch_SuperBus_Output_HV, GregtechItemList.Hatch_SuperBus_Output_EV, + GregtechItemList.Hatch_SuperBus_Output_IV, GregtechItemList.Hatch_SuperBus_Output_LuV, + GregtechItemList.Hatch_SuperBus_Output_ZPM, GregtechItemList.Hatch_SuperBus_Output_UV, + GregtechItemList.Hatch_SuperBus_Output_MAX, }; + + ItemStack[] mInputHatch = new ItemStack[] { ItemList.Hatch_Input_Bus_EV.get(1), + ItemList.Hatch_Input_Bus_IV.get(1), ItemList.Hatch_Input_Bus_LuV.get(1), + ItemList.Hatch_Input_Bus_ZPM.get(1), ItemList.Hatch_Input_Bus_UV.get(1), + ItemList.Hatch_Input_Bus_MAX.get(1), GregtechItemList.Hatch_SuperBus_Input_LV.get(1), + GregtechItemList.Hatch_SuperBus_Input_MV.get(1), GregtechItemList.Hatch_SuperBus_Input_HV.get(1), + GregtechItemList.Hatch_SuperBus_Input_EV.get(1), }; + + ItemStack[] mOutputHatch = new ItemStack[] { ItemList.Hatch_Output_Bus_EV.get(1), + ItemList.Hatch_Output_Bus_IV.get(1), ItemList.Hatch_Output_Bus_LuV.get(1), + ItemList.Hatch_Output_Bus_ZPM.get(1), ItemList.Hatch_Output_Bus_UV.get(1), + ItemList.Hatch_Output_Bus_MAX.get(1), GregtechItemList.Hatch_SuperBus_Output_LV.get(1), + GregtechItemList.Hatch_SuperBus_Output_MV.get(1), GregtechItemList.Hatch_SuperBus_Output_HV.get(1), + GregtechItemList.Hatch_SuperBus_Output_EV.get(1), }; // Special Case recipes for ULV buses { int i = 0; - ItemStack[] aInputs1 = new ItemStack[] { - CI.getNumberedCircuit(17), - mInputHatch[i], - CI.getElectricMotor(i, 2), - CI.getConveyor(i, 5), - CI.getBolt(i, 16), - CI.getTieredComponent(OrePrefixes.circuit, i, 2) - }; + ItemStack[] aInputs1 = new ItemStack[] { CI.getNumberedCircuit(17), mInputHatch[i], + CI.getElectricMotor(i, 2), CI.getConveyor(i, 5), CI.getBolt(i, 16), + CI.getTieredComponent(OrePrefixes.circuit, i, 2) }; Logger.INFO("[FIND] " + ItemUtils.getArrayStackNames(aInputs1)); - ItemStack[] aOutputs1 = new ItemStack[] { - CI.getNumberedCircuit(18), - mOutputHatch[i], - CI.getElectricPiston(i, 2), - CI.getConveyor(i, 5), - CI.getGear(i, 3), - CI.getTieredComponent(OrePrefixes.circuit, i, 2) - }; + ItemStack[] aOutputs1 = new ItemStack[] { CI.getNumberedCircuit(18), mOutputHatch[i], + CI.getElectricPiston(i, 2), CI.getConveyor(i, 5), CI.getGear(i, 3), + CI.getTieredComponent(OrePrefixes.circuit, i, 2) }; Logger.INFO("[FIND] " + ItemUtils.getArrayStackNames(aOutputs1)); FluidStack a1 = CI.getAlternativeTieredFluid(i, 144 * 8); @@ -4275,23 +3565,25 @@ public class RECIPES_Machines { Logger.INFO("[FIND] Output Bus Fluid: " + ItemUtils.getFluidName(a2)); CORE.RA.addSixSlotAssemblingRecipe( - aInputs1, a1, mSuperBusesInput[i].get(1), 20 * 30 * 2 * i, (int) GT_Values.V[i]); + aInputs1, + a1, + mSuperBusesInput[i].get(1), + 20 * 30 * 2 * i, + (int) GT_Values.V[i]); CORE.RA.addSixSlotAssemblingRecipe( - aOutputs1, a2, mSuperBusesOutput[i].get(1), 20 * 30 * 2 * i, (int) GT_Values.V[i]); + aOutputs1, + a2, + mSuperBusesOutput[i].get(1), + 20 * 30 * 2 * i, + (int) GT_Values.V[i]); } // Input Buses for (int i = 1; i < 10; i++) { CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedCircuit(17), - mInputHatch[i], - CI.getElectricMotor(i, 2), - CI.getConveyor(i, 5), - CI.getBolt(i, 16), - CI.getTieredComponent(OrePrefixes.circuit, i, 2) - }, + new ItemStack[] { CI.getNumberedCircuit(17), mInputHatch[i], CI.getElectricMotor(i, 2), + CI.getConveyor(i, 5), CI.getBolt(i, 16), CI.getTieredComponent(OrePrefixes.circuit, i, 2) }, CI.getAlternativeTieredFluid(i, 144 * 8), mSuperBusesInput[i].get(1), 20 * 30 * 2, @@ -4300,14 +3592,8 @@ public class RECIPES_Machines { // Output Buses for (int i = 1; i < 10; i++) { CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedCircuit(18), - mOutputHatch[i], - CI.getElectricPiston(i, 2), - CI.getConveyor(i, 5), - CI.getGear(i, 3), - CI.getTieredComponent(OrePrefixes.circuit, i, 2) - }, + new ItemStack[] { CI.getNumberedCircuit(18), mOutputHatch[i], CI.getElectricPiston(i, 2), + CI.getConveyor(i, 5), CI.getGear(i, 3), CI.getTieredComponent(OrePrefixes.circuit, i, 2) }, CI.getTertiaryTieredFluid(i, 144 * 8), mSuperBusesOutput[i].get(1), 20 * 30 * 2, @@ -4329,23 +3615,18 @@ public class RECIPES_Machines { ItemUtils.getSimpleStack(Blocks.hopper), ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 0, 1)); - ItemStack[] aRobinators = new ItemStack[] { - ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 0, 1), - ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 1, 1), - ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 2, 1), - ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 3, 1), - ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 4, 1), - }; + ItemStack[] aRobinators = new ItemStack[] { ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 0, 1), + ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 1, 1), + ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 2, 1), + ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 3, 1), + ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 4, 1), }; for (int i = 0; i < 5; i++) { if (i == 0) { CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedCircuit(17), - CI.getTieredMachineCasing(0), - ItemUtils.getSimpleStack(Blocks.hopper, 4), - CI.getTieredComponent(OrePrefixes.circuit, 0, 2) - }, + new ItemStack[] { CI.getNumberedCircuit(17), CI.getTieredMachineCasing(0), + ItemUtils.getSimpleStack(Blocks.hopper, 4), + CI.getTieredComponent(OrePrefixes.circuit, 0, 2) }, GT_Values.NF, // Input Fluid aRobinators[i], 45 * 10 * 1, @@ -4353,14 +3634,10 @@ public class RECIPES_Machines { continue; } int aTier = i + 1; - ItemStack[] aInputs = new ItemStack[] { - aRobinators[i - 1], - CI.getTieredMachineHull(aTier, 1), - CI.getConveyor(aTier, 2), - CI.getElectricMotor(aTier, 2), - CI.getTieredComponent(OrePrefixes.plate, aTier, 4), - CI.getTieredComponent(OrePrefixes.circuit, i, 2), - }; + ItemStack[] aInputs = new ItemStack[] { aRobinators[i - 1], CI.getTieredMachineHull(aTier, 1), + CI.getConveyor(aTier, 2), CI.getElectricMotor(aTier, 2), + CI.getTieredComponent(OrePrefixes.plate, aTier, 4), + CI.getTieredComponent(OrePrefixes.circuit, i, 2), }; CORE.RA.addSixSlotAssemblingRecipe( aInputs, diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java index 953345141b..af4f9b90b8 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.recipe; +import net.minecraft.item.ItemStack; + import cpw.mods.fml.common.Loader; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; @@ -18,49 +20,45 @@ import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import net.minecraft.item.ItemStack; public class RECIPES_Old_Circuits implements IOreRecipeRegistrator { + public RECIPES_Old_Circuits() { OrePrefixes.crafting.add(this); } @Override - public void registerOre( - final OrePrefixes aPrefix, - final Materials aMaterial, - final String aOreDictName, - final String aModName, - final ItemStack aStack) { + public void registerOre(final OrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName, + final String aModName, final ItemStack aStack) { if (aOreDictName.equals(OreDictNames.craftingLensRed.toString())) { Logger.INFO("[Old Feature - Circuits] Adding recipes for old circuits. (Part 2)"); GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Copper, 1L), - GT_Utility.copyAmount(0L, new Object[] {aStack}), + GT_Utility.copyAmount(0L, new Object[] { aStack }), GregtechItemList.Old_Circuit_Parts_Wiring_Basic.get(1L, new Object[0]), 64, 30); GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.foil, Materials.AnnealedCopper, 1L), - GT_Utility.copyAmount(0L, new Object[] {aStack}), + GT_Utility.copyAmount(0L, new Object[] { aStack }), GregtechItemList.Old_Circuit_Parts_Wiring_Basic.get(1L, new Object[0]), 64, 30); GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gold, 1L), - GT_Utility.copyAmount(0L, new Object[] {aStack}), + GT_Utility.copyAmount(0L, new Object[] { aStack }), GregtechItemList.Old_Circuit_Parts_Wiring_Advanced.get(1L, new Object[0]), 64, 120); GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 1L), - GT_Utility.copyAmount(0L, new Object[] {aStack}), + GT_Utility.copyAmount(0L, new Object[] { aStack }), GregtechItemList.Old_Circuit_Parts_Wiring_Advanced.get(1L, new Object[0]), 64, 120); GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 1L), - GT_Utility.copyAmount(0L, new Object[] {aStack}), + GT_Utility.copyAmount(0L, new Object[] { aStack }), GregtechItemList.Old_Circuit_Parts_Wiring_Elite.get(1L, new Object[0]), 64, 480); @@ -68,82 +66,52 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator { Logger.INFO("[Old Feature - Circuits] Adding recipes for old circuits. (Part 3)"); GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Olivine, 1L), - GT_Utility.copyAmount(0L, new Object[] {aStack}), + GT_Utility.copyAmount(0L, new Object[] { aStack }), GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Elite.get(1L, new Object[0]), 256, 480); GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Emerald, 1L), - GT_Utility.copyAmount(0L, new Object[] {aStack}), + GT_Utility.copyAmount(0L, new Object[] { aStack }), GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Elite.get(1L, new Object[0]), 256, 480); } else if (aOreDictName.equals(OreDictNames.craftingLensBlue.toString()) || aOreDictName.equals(OreDictNames.craftingLensCyan.toString()) || aOreDictName.equals(OreDictNames.craftingLensLightBlue.toString())) { - Logger.INFO("[Old Feature - Circuits] Adding recipes for old circuits. (Part 4)"); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.IC2_LapotronCrystal.getWildcard(1L, new Object[0]), - GT_Utility.copyAmount(0L, new Object[] {aStack}), - GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Master.get(3L, new Object[0]), - 256, - 480); - } + Logger.INFO("[Old Feature - Circuits] Adding recipes for old circuits. (Part 4)"); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.IC2_LapotronCrystal.getWildcard(1L, new Object[0]), + GT_Utility.copyAmount(0L, new Object[] { aStack }), + GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Master.get(3L, new Object[0]), + 256, + 480); + } } private static boolean addCircuitRecipes() { Logger.INFO("[Old Feature - Circuits] Adding recipes for old circuits. (Part 1)"); GT_ModHandler.addShapelessCraftingRecipe( - GregtechItemList.Old_Circuit_Primitive.get(1L, new Object[0]), new Object[] { - GT_ModHandler.getIC2Item("casingadviron", 1L), - OrePrefixes.wireGt01.get(Materials.RedAlloy), - OrePrefixes.wireGt01.get(Materials.RedAlloy), - OrePrefixes.wireGt01.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Old_Circuit_Basic.get(1L, new Object[0]), new Object[] { - "WWW", - "CPC", - "WWW", - 'C', - OrePrefixes.circuit.get(Materials.Primitive), - 'W', - OreDictNames.craftingWireCopper, - 'P', - OrePrefixes.plate.get(Materials.Steel) - }); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Old_Circuit_Basic.get(1L, new Object[0]), new Object[] { - "WCW", - "WPW", - "WCW", - 'C', - OrePrefixes.circuit.get(Materials.Primitive), - 'W', - OreDictNames.craftingWireCopper, - 'P', - OrePrefixes.plate.get(Materials.Steel) - }); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Old_Circuit_Basic.get(1L, new Object[0]), new Object[] { - "WWW", - "CPC", - "WWW", - 'C', - OrePrefixes.circuit.get(Materials.Primitive), - 'W', - OrePrefixes.cableGt01.get(Materials.RedAlloy), - 'P', - OrePrefixes.plate.get(Materials.Steel) - }); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Old_Circuit_Basic.get(1L, new Object[0]), new Object[] { - "WCW", - "WPW", - "WCW", - 'C', - OrePrefixes.circuit.get(Materials.Primitive), - 'W', - OrePrefixes.cableGt01.get(Materials.RedAlloy), - 'P', - OrePrefixes.plate.get(Materials.Steel) - }); + GregtechItemList.Old_Circuit_Primitive.get(1L, new Object[0]), + new Object[] { GT_ModHandler.getIC2Item("casingadviron", 1L), + OrePrefixes.wireGt01.get(Materials.RedAlloy), OrePrefixes.wireGt01.get(Materials.RedAlloy), + OrePrefixes.wireGt01.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Old_Circuit_Basic.get(1L, new Object[0]), + new Object[] { "WWW", "CPC", "WWW", 'C', OrePrefixes.circuit.get(Materials.Primitive), 'W', + OreDictNames.craftingWireCopper, 'P', OrePrefixes.plate.get(Materials.Steel) }); + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Old_Circuit_Basic.get(1L, new Object[0]), + new Object[] { "WCW", "WPW", "WCW", 'C', OrePrefixes.circuit.get(Materials.Primitive), 'W', + OreDictNames.craftingWireCopper, 'P', OrePrefixes.plate.get(Materials.Steel) }); + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Old_Circuit_Basic.get(1L, new Object[0]), + new Object[] { "WWW", "CPC", "WWW", 'C', OrePrefixes.circuit.get(Materials.Primitive), 'W', + OrePrefixes.cableGt01.get(Materials.RedAlloy), 'P', OrePrefixes.plate.get(Materials.Steel) }); + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Old_Circuit_Basic.get(1L, new Object[0]), + new Object[] { "WCW", "WPW", "WCW", 'C', OrePrefixes.circuit.get(Materials.Primitive), 'W', + OrePrefixes.cableGt01.get(Materials.RedAlloy), 'P', OrePrefixes.plate.get(Materials.Steel) }); GT_Values.RA.addFormingPressRecipe( GregtechItemList.Old_Empty_Board_Basic.get(1L, new Object[0]), @@ -180,8 +148,7 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator { int tMultiplier; for (Materials tMat : Materials.values()) { if ((tMat.mStandardMoltenFluid != null) && (tMat.contains(SubTag.SOLDERING_MATERIAL))) { - tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_BAD) - ? 4 + tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_BAD) ? 4 : tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD) ? 1 : 2; GT_Values.RA.addAssemblerRecipe( @@ -310,8 +277,7 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator { try { Set.set(Get.get(1)); return true; - } catch (Throwable t) { - } + } catch (Throwable t) {} return false; } @@ -462,108 +428,88 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator { // Primitive RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32700", 32700, 1)}, + new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32700", 32700, 1) }, ItemUtils.getItemStackOfAmountFromOreDict("circuitPrimitive", 1)); // Basic RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32701", 32701, 1)}, + new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32701", 32701, 1) }, ItemUtils.getItemStackOfAmountFromOreDict("circuitBasic", 1)); RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.03:32078", 32078, 1)}, + new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.03:32078", 32078, 1) }, ItemUtils.getItemStackOfAmountFromOreDict("circuitBasic", 1)); // Good RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32702", 32702, 1)}, + new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32702", 32702, 1) }, ItemUtils.getItemStackOfAmountFromOreDict("circuitGood", 1)); RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32702", 32702, 1)}, + new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32702", 32702, 1) }, ItemUtils.getItemStackOfAmountFromOreDict("circuitGood", 1)); // Advanced RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32703", 32703, 1)}, + new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32703", 32703, 1) }, ItemUtils.getItemStackOfAmountFromOreDict("circuitAdvanced", 1)); RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32703", 32703, 1)}, + new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32703", 32703, 1) }, ItemUtils.getItemStackOfAmountFromOreDict("circuitAdvanced", 1)); // Data RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32704", 32704, 1)}, + new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32704", 32704, 1) }, ItemUtils.getItemStackOfAmountFromOreDict("circuitData", 1)); // Elite RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32705", 32705, 1)}, + new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32705", 32705, 1) }, ItemUtils.getItemStackOfAmountFromOreDict("circuitElite", 1)); // Master RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32706", 32706, 1)}, + new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32706", 32706, 1) }, ItemUtils.getItemStackOfAmountFromOreDict("circuitMaster", 1)); // Components // Green Chip RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32713", 32713, 1)}, + new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32713", 32713, 1) }, GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Elite.get(1)); // Blue Chip RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32714", 32714, 1)}, + new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32714", 32714, 1) }, GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Master.get(1)); // Basic Board RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32710", 32710, 1)}, + new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32710", 32710, 1) }, GregtechItemList.Old_Circuit_Board_Basic.get(1)); // Advanced Board RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32711", 32711, 1)}, + new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32711", 32711, 1) }, GregtechItemList.Old_Circuit_Board_Advanced.get(1)); // Elite Board RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32712", 32712, 1)}, + new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32712", 32712, 1) }, GregtechItemList.Old_Circuit_Board_Elite.get(1)); // remove a few recipes - /*GT_ModHandler.removeRecipeByOutput(ItemUtils.simpleMetaStack("gregtech:gt.metaitem.03:32070", 32070, 1)); - GT_ModHandler.removeRecipeByOutput(ItemUtils.simpleMetaStack("gregtech:gt.metaitem.03:32069", 32069, 1)); - if (LoadedMods.Extra_Utils){ - ItemStack EQU = ItemUtils.simpleMetaStack("ExtraUtilities:enderQuarryUpgrade", 0, 1); - if (EQU != null){ - GT_ModHandler.removeRecipeByOutput(EQU); - GT_Values.RA.addAssemblerRecipe( - ItemUtils.simpleMetaStack("ExtraUtilities:decorativeBlock1:12", 12, 1), - GregtechItemList.Old_Circuit_Master.get(1), - EQU, - 80*20, - 2); - } - } - if (LoadedMods.GalacticraftCore){ - ItemStack ACW = ItemUtils.simpleMetaStack("GalacticraftCore:item.basicItem:14", 14, 1); - if (ACW != null){ - GT_ModHandler.removeRecipeByOutput(ACW); - GT_Values.RA.addAssemblerRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("gemDiamond", 1), - GregtechItemList.Old_Circuit_Board_Advanced.get(1), - ACW, - 160*20, - 4); - } - ItemStack ACW2 = ItemUtils.simpleMetaStack("GalacticraftCore:item.basicItem:13", 13, 1); - if (ACW2 != null){ - GT_ModHandler.removeRecipeByOutput(ACW2); - GT_Values.RA.addAssemblerRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("gemDiamond", 1), - GregtechItemList.Old_Circuit_Board_Basic.get(1), - ACW2, - 80*20, - 2); - } - }*/ + /* + * GT_ModHandler.removeRecipeByOutput(ItemUtils.simpleMetaStack("gregtech:gt.metaitem.03:32070", 32070, 1)); + * GT_ModHandler.removeRecipeByOutput(ItemUtils.simpleMetaStack("gregtech:gt.metaitem.03:32069", 32069, 1)); if + * (LoadedMods.Extra_Utils){ ItemStack EQU = ItemUtils.simpleMetaStack("ExtraUtilities:enderQuarryUpgrade", 0, + * 1); if (EQU != null){ GT_ModHandler.removeRecipeByOutput(EQU); GT_Values.RA.addAssemblerRecipe( + * ItemUtils.simpleMetaStack("ExtraUtilities:decorativeBlock1:12", 12, 1), + * GregtechItemList.Old_Circuit_Master.get(1), EQU, 80*20, 2); } } if (LoadedMods.GalacticraftCore){ ItemStack + * ACW = ItemUtils.simpleMetaStack("GalacticraftCore:item.basicItem:14", 14, 1); if (ACW != null){ + * GT_ModHandler.removeRecipeByOutput(ACW); GT_Values.RA.addAssemblerRecipe( + * ItemUtils.getItemStackOfAmountFromOreDict("gemDiamond", 1), + * GregtechItemList.Old_Circuit_Board_Advanced.get(1), ACW, 160*20, 4); } ItemStack ACW2 = + * ItemUtils.simpleMetaStack("GalacticraftCore:item.basicItem:13", 13, 1); if (ACW2 != null){ + * GT_ModHandler.removeRecipeByOutput(ACW2); GT_Values.RA.addAssemblerRecipe( + * ItemUtils.getItemStackOfAmountFromOreDict("gemDiamond", 1), GregtechItemList.Old_Circuit_Board_Basic.get(1), + * ACW2, 80*20, 2); } } + */ return true; } @@ -572,103 +518,39 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator { Boolean isNEILoaded = Loader.isModLoaded("NotEnoughItems"); if (isNEILoaded && !CORE.ConfigSwitches.showHiddenNEIItems) { Logger.INFO("[Old Feature - Circuits] Hiding .28+ circuits in NEI."); - String[] CircuitToHide = { - "Circuit_Board_Basic", - "Circuit_Board_Advanced", - "Circuit_Board_Elite", - "Circuit_Parts_Advanced", - "Circuit_Parts_Wiring_Basic", - "Circuit_Parts_Wiring_Advanced", - "Circuit_Parts_Wiring_Elite", - "Circuit_Parts_Crystal_Chip_Elite", - "Circuit_Parts_Crystal_Chip_Master", - "Circuit_Primitive", - "Circuit_Basic", - "Circuit_Integrated_Good", - "Circuit_Good", - "Circuit_Advanced", - "Circuit_Data", - "Circuit_Elite", - "Circuit_Master", - "Circuit_Ultimate", - "Circuit_Board_Coated", - "Circuit_Board_Phenolic", - "Circuit_Board_Epoxy", - "Circuit_Board_Fiberglass", - "Circuit_Board_Multifiberglass", - "Circuit_Board_Wetware", - "Circuit_Parts_Resistor", - "Circuit_Parts_ResistorSMD", - "Circuit_Parts_Glass_Tube", - "Circuit_Parts_Vacuum_Tube", - "Circuit_Parts_Coil", - "Circuit_Parts_Diode", - "Circuit_Parts_DiodeSMD", - "Circuit_Parts_Transistor", - "Circuit_Parts_TransistorSMD", - "Circuit_Parts_Capacitor", - "Circuit_Parts_CapacitorSMD", - "Circuit_Silicon_Ingot", - "Circuit_Silicon_Ingot2", - "Circuit_Silicon_Ingot3", - "Circuit_Silicon_Wafer", - "Circuit_Silicon_Wafer2", - "Circuit_Silicon_Wafer3", - "Circuit_Wafer_ILC", - "Circuit_Chip_ILC", - "Circuit_Wafer_Ram", - "Circuit_Chip_Ram", - "Circuit_Wafer_NAND", - "Circuit_Chip_NAND", - "Circuit_Wafer_NOR", - "Circuit_Chip_NOR", - "Circuit_Wafer_CPU", - "Circuit_Chip_CPU", - "Circuit_Wafer_SoC", - "Circuit_Chip_SoC", - "Circuit_Wafer_SoC2", - "Circuit_Chip_SoC2", - "Circuit_Wafer_PIC", - "Circuit_Chip_PIC", - "Circuit_Wafer_HPIC", - "Circuit_Chip_HPIC", - "Circuit_Wafer_NanoCPU", - "Circuit_Chip_NanoCPU", - "Circuit_Wafer_QuantumCPU", - "Circuit_Chip_QuantumCPU", - "Circuit_Chip_CrystalCPU", - "Circuit_Chip_CrystalSoC", - "Circuit_Chip_NeuroCPU", - "Circuit_Chip_Stemcell", - "Circuit_Processor", - "Circuit_Computer", - "Circuit_Nanoprocessor", - "Circuit_Nanocomputer", - "Circuit_Elitenanocomputer", - "Circuit_Quantumprocessor", - "Circuit_Quantumcomputer", - "Circuit_Masterquantumcomputer", - "Circuit_Quantummainframe", - "Circuit_Crystalprocessor", - "Circuit_Crystalcomputer", - "Circuit_Ultimatecrystalcomputer", - "Circuit_Crystalmainframe", - "Circuit_Neuroprocessor", - "Circuit_Wetwarecomputer", - "Circuit_Wetwaresupercomputer", - "Circuit_Wetwaremainframe", - "Circuit_Parts_RawCrystalChip", - // Circuits Additions in .30/.31 - "Circuit_Board_Plastic", - "Circuit_Parts_GlassFiber", - "Circuit_Parts_PetriDish", - "Circuit_Microprocessor" - }; + String[] CircuitToHide = { "Circuit_Board_Basic", "Circuit_Board_Advanced", "Circuit_Board_Elite", + "Circuit_Parts_Advanced", "Circuit_Parts_Wiring_Basic", "Circuit_Parts_Wiring_Advanced", + "Circuit_Parts_Wiring_Elite", "Circuit_Parts_Crystal_Chip_Elite", + "Circuit_Parts_Crystal_Chip_Master", "Circuit_Primitive", "Circuit_Basic", + "Circuit_Integrated_Good", "Circuit_Good", "Circuit_Advanced", "Circuit_Data", "Circuit_Elite", + "Circuit_Master", "Circuit_Ultimate", "Circuit_Board_Coated", "Circuit_Board_Phenolic", + "Circuit_Board_Epoxy", "Circuit_Board_Fiberglass", "Circuit_Board_Multifiberglass", + "Circuit_Board_Wetware", "Circuit_Parts_Resistor", "Circuit_Parts_ResistorSMD", + "Circuit_Parts_Glass_Tube", "Circuit_Parts_Vacuum_Tube", "Circuit_Parts_Coil", + "Circuit_Parts_Diode", "Circuit_Parts_DiodeSMD", "Circuit_Parts_Transistor", + "Circuit_Parts_TransistorSMD", "Circuit_Parts_Capacitor", "Circuit_Parts_CapacitorSMD", + "Circuit_Silicon_Ingot", "Circuit_Silicon_Ingot2", "Circuit_Silicon_Ingot3", + "Circuit_Silicon_Wafer", "Circuit_Silicon_Wafer2", "Circuit_Silicon_Wafer3", "Circuit_Wafer_ILC", + "Circuit_Chip_ILC", "Circuit_Wafer_Ram", "Circuit_Chip_Ram", "Circuit_Wafer_NAND", + "Circuit_Chip_NAND", "Circuit_Wafer_NOR", "Circuit_Chip_NOR", "Circuit_Wafer_CPU", + "Circuit_Chip_CPU", "Circuit_Wafer_SoC", "Circuit_Chip_SoC", "Circuit_Wafer_SoC2", + "Circuit_Chip_SoC2", "Circuit_Wafer_PIC", "Circuit_Chip_PIC", "Circuit_Wafer_HPIC", + "Circuit_Chip_HPIC", "Circuit_Wafer_NanoCPU", "Circuit_Chip_NanoCPU", "Circuit_Wafer_QuantumCPU", + "Circuit_Chip_QuantumCPU", "Circuit_Chip_CrystalCPU", "Circuit_Chip_CrystalSoC", + "Circuit_Chip_NeuroCPU", "Circuit_Chip_Stemcell", "Circuit_Processor", "Circuit_Computer", + "Circuit_Nanoprocessor", "Circuit_Nanocomputer", "Circuit_Elitenanocomputer", + "Circuit_Quantumprocessor", "Circuit_Quantumcomputer", "Circuit_Masterquantumcomputer", + "Circuit_Quantummainframe", "Circuit_Crystalprocessor", "Circuit_Crystalcomputer", + "Circuit_Ultimatecrystalcomputer", "Circuit_Crystalmainframe", "Circuit_Neuroprocessor", + "Circuit_Wetwarecomputer", "Circuit_Wetwaresupercomputer", "Circuit_Wetwaremainframe", + "Circuit_Parts_RawCrystalChip", + // Circuits Additions in .30/.31 + "Circuit_Board_Plastic", "Circuit_Parts_GlassFiber", "Circuit_Parts_PetriDish", + "Circuit_Microprocessor" }; for (String component : CircuitToHide) { try { - ItemUtils.hideItemFromNEI( - ItemUtils.getValueOfItemList(component, null).get(1L, new Object[0])); + ItemUtils.hideItemFromNEI(ItemUtils.getValueOfItemList(component, null).get(1L, new Object[0])); } catch (IllegalArgumentException I) { Logger.INFO("Could not find " + component + " in the Gregtech item list."); Logger.INFO("This is NOT an error, simply a notification."); diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java index b55bb260dd..12792ab8ea 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java @@ -9,6 +9,10 @@ import static gtPlusPlus.core.material.MISC_MATERIALS.SALT_WATER; import static gtPlusPlus.core.material.MISC_MATERIALS.SODIUM_CHLORIDE; import static gtPlusPlus.core.material.MISC_MATERIALS.SODIUM_HYDROXIDE; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; @@ -22,9 +26,6 @@ import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; public class RECIPES_RareEarthProcessing { @@ -109,7 +110,7 @@ public class RECIPES_RareEarthProcessing { null, null, null, - new int[] {10000, 10000, 10000}, + new int[] { 10000, 10000, 10000 }, 20 * 30, 120); @@ -174,7 +175,7 @@ public class RECIPES_RareEarthProcessing { RARE_EARTH_LOW.getCrushed(2), RARE_EARTH_LOW.getCrushed(2), RARE_EARTH_LOW.getCrushed(2), - new int[] {10000, 10000, 10000}, + new int[] { 10000, 10000, 10000 }, 20 * 30, MaterialUtils.getVoltageForTier(1)); @@ -185,7 +186,7 @@ public class RECIPES_RareEarthProcessing { RARE_EARTH_MID.getCrushed(4), RARE_EARTH_MID.getCrushed(4), RARE_EARTH_MID.getCrushed(4), - new int[] {10000, 9000, 8000}, + new int[] { 10000, 9000, 8000 }, 20 * 30, MaterialUtils.getVoltageForTier(3)); @@ -196,7 +197,7 @@ public class RECIPES_RareEarthProcessing { RARE_EARTH_HIGH.getCrushed(6), RARE_EARTH_HIGH.getCrushed(6), RARE_EARTH_HIGH.getCrushed(6), - new int[] {10000, 9000, 8000}, + new int[] { 10000, 9000, 8000 }, 20 * 30, MaterialUtils.getVoltageForTier(5)); @@ -208,7 +209,7 @@ public class RECIPES_RareEarthProcessing { RARE_EARTH_HIGH.getCrushed(6), RARE_EARTH_HIGH.getCrushed(6), RARE_EARTH_HIGH.getCrushed(6), - new int[] {9000, 8000, 7000}, + new int[] { 9000, 8000, 7000 }, 20 * 30, MaterialUtils.getVoltageForTier(5)); } @@ -217,22 +218,16 @@ public class RECIPES_RareEarthProcessing { public static void processCopperRecipes() { // Rare Earth Processing - /*GT_Values.RA.addSifterRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustRareEarth", 1), - new ItemStack[] { - ELEMENT.getInstance().YTTRIUM.getSmallDust(1), - ELEMENT.getInstance().NEODYMIUM.getSmallDust(1), - ELEMENT.getInstance().LANTHANUM.getSmallDust(1), - ELEMENT.getInstance().CERIUM.getSmallDust(1), - ELEMENT.getInstance().CADMIUM.getSmallDust(1), - ELEMENT.getInstance().CAESIUM.getSmallDust(1), - ORES.SAMARSKITE_YB.getSmallDust(1), - ORES.FLORENCITE.getSmallDust(1), - ORES.FLUORCAPHITE.getSmallDust(1), - //ELEMENT.getInstance().YTTERBIUM.getTinyDust(1), - //ELEMENT.getInstance().SAMARIUM.getTinyDust(1), - //ELEMENT.getInstance().GADOLINIUM.getTinyDust(1) - }, - new int[] { 2000, 2000, 2000, 2000, 2000, 2000, 2000, 2000, 2000 }, 20 * 30, 500);*/ + /* + * GT_Values.RA.addSifterRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustRareEarth", 1), new ItemStack[] { + * ELEMENT.getInstance().YTTRIUM.getSmallDust(1), ELEMENT.getInstance().NEODYMIUM.getSmallDust(1), + * ELEMENT.getInstance().LANTHANUM.getSmallDust(1), ELEMENT.getInstance().CERIUM.getSmallDust(1), + * ELEMENT.getInstance().CADMIUM.getSmallDust(1), ELEMENT.getInstance().CAESIUM.getSmallDust(1), + * ORES.SAMARSKITE_YB.getSmallDust(1), ORES.FLORENCITE.getSmallDust(1), ORES.FLUORCAPHITE.getSmallDust(1), + * //ELEMENT.getInstance().YTTERBIUM.getTinyDust(1), //ELEMENT.getInstance().SAMARIUM.getTinyDust(1), + * //ELEMENT.getInstance().GADOLINIUM.getTinyDust(1) }, new int[] { 2000, 2000, 2000, 2000, 2000, 2000, 2000, + * 2000, 2000 }, 20 * 30, 500); + */ } } diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java index 16e34826e5..f08ded35c0 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.recipe; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gtPlusPlus.core.lib.CORE; @@ -10,8 +13,6 @@ import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.core.util.reflect.AddGregtechRecipe; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class RECIPES_SeleniumProcessing { @@ -45,149 +46,107 @@ public class RECIPES_SeleniumProcessing { // Make Selenium CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { - ItemUtils.getGregtechCircuit(14), - ELEMENT.getInstance().CARBON.getDust(16), - }, - new FluidStack[] { - MISC_MATERIALS.SELENIOUS_ACID.getFluidStack(750), Materials.SulfuricAcid.getFluid(8000), - }, + new ItemStack[] { ItemUtils.getGregtechCircuit(14), ELEMENT.getInstance().CARBON.getDust(16), }, + new FluidStack[] { MISC_MATERIALS.SELENIOUS_ACID.getFluidStack(750), + Materials.SulfuricAcid.getFluid(8000), }, ELEMENT.getInstance().SELENIUM.getFluidStack(144 * 1), - new ItemStack[] { - ELEMENT.getInstance().SELENIUM.getIngot(1), - ELEMENT.getInstance().SELENIUM.getIngot(1), - }, - new int[] {10000, 2000, 2000}, + new ItemStack[] { ELEMENT.getInstance().SELENIUM.getIngot(1), + ELEMENT.getInstance().SELENIUM.getIngot(1), }, + new int[] { 10000, 2000, 2000 }, 20 * 300, 7200); - /*// Old recipes for Selenium Roasting - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { - ItemUtils.getGregtechCircuit(16), - ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedPyrite", 8), - ELEMENT.getInstance().CARBON.getDust(32), - }, - Materials.SulfuricAcid.getFluid(4000), - ELEMENT.getInstance().SELENIUM.getFluid(144), - 0, - 20 * 300, - 2000); - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { - ItemUtils.getGregtechCircuit(17), - ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedChalcopyrite", 8), - ELEMENT.getInstance().CARBON.getDust(32), - }, - Materials.SulfuricAcid.getFluid(4000), - ELEMENT.getInstance().SELENIUM.getFluid(144), - 0, - 20 * 300, - 2000); - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { - ItemUtils.getGregtechCircuit(18), - ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedGalena", 8), - ELEMENT.getInstance().CARBON.getDust(32), - }, - Materials.SulfuricAcid.getFluid(4000), - ELEMENT.getInstance().SELENIUM.getFluid(144), - 0, - 20 * 300, - 2000);*/ + /* + * // Old recipes for Selenium Roasting CORE.RA.addBlastSmelterRecipe( new ItemStack[] { + * ItemUtils.getGregtechCircuit(16), ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedPyrite", 8), + * ELEMENT.getInstance().CARBON.getDust(32), }, Materials.SulfuricAcid.getFluid(4000), + * ELEMENT.getInstance().SELENIUM.getFluid(144), 0, 20 * 300, 2000); CORE.RA.addBlastSmelterRecipe( new + * ItemStack[] { ItemUtils.getGregtechCircuit(17), + * ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedChalcopyrite", 8), + * ELEMENT.getInstance().CARBON.getDust(32), }, Materials.SulfuricAcid.getFluid(4000), + * ELEMENT.getInstance().SELENIUM.getFluid(144), 0, 20 * 300, 2000); CORE.RA.addBlastSmelterRecipe( new + * ItemStack[] { ItemUtils.getGregtechCircuit(18), + * ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedGalena", 8), + * ELEMENT.getInstance().CARBON.getDust(32), }, Materials.SulfuricAcid.getFluid(4000), + * ELEMENT.getInstance().SELENIUM.getFluid(144), 0, 20 * 300, 2000); + */ } public static void processCopperRecipes() { // Copper CORE.RA.addDehydratorRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(23), - ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Copper, 1), // Item Input + new ItemStack[] { CI.getNumberedAdvancedCircuit(23), + ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Copper, 1), // Item Input }, FluidUtils.getHotWater(1000), // Fluid MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(20), // Fluid - new ItemStack[] { - ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Copper, 1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - }, // Output - new int[] {10000, 100, 100, 500, 500, 500, 1000, 1000, 1000}, + new ItemStack[] { ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Copper, 1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), }, // Output + new int[] { 10000, 100, 100, 500, 500, 500, 1000, 1000, 1000 }, 40 * 20, // Time in ticks 1024); // EU // Tetra CORE.RA.addDehydratorRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(23), - ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Tetrahedrite, 1), // Item Input + new ItemStack[] { CI.getNumberedAdvancedCircuit(23), + ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Tetrahedrite, 1), // Item + // Input }, FluidUtils.getHotWater(1000), // Fluid MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(10), // Fluid new ItemStack[] { - ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Tetrahedrite, 1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - }, // Output - new int[] {10000, 100, 100, 300, 300, 300, 800, 800, 800}, + ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Tetrahedrite, 1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), }, // Output + new int[] { 10000, 100, 100, 300, 300, 300, 800, 800, 800 }, 40 * 20, // Time in ticks 1024); // EU // Chalco CORE.RA.addDehydratorRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(23), - ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Chalcopyrite, 1), // Item Input + new ItemStack[] { CI.getNumberedAdvancedCircuit(23), + ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Chalcopyrite, 1), // Item + // Input }, FluidUtils.getHotWater(1000), // Fluid MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(10), // Fluid new ItemStack[] { - ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Chalcopyrite, 1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - }, // Output - new int[] {10000, 100, 100, 300, 300, 300, 800, 800, 800}, + ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Chalcopyrite, 1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), }, // Output + new int[] { 10000, 100, 100, 300, 300, 300, 800, 800, 800 }, 40 * 20, // Time in ticks 1024); // EU // Malachite CORE.RA.addDehydratorRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(23), - ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Malachite, 1), // Item Input + new ItemStack[] { CI.getNumberedAdvancedCircuit(23), + ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Malachite, 1), // Item Input }, FluidUtils.getHotWater(1000), // Fluid MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(10), // Fluid - new ItemStack[] { - ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Malachite, 1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - }, // Output - new int[] {10000, 100, 100, 300, 300, 300, 800, 800, 800}, + new ItemStack[] { ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Malachite, 1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), }, // Output + new int[] { 10000, 100, 100, 300, 300, 300, 800, 800, 800 }, 40 * 20, // Time in ticks 1024); // EU } diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java index b561de2e43..0bfd3605b9 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java @@ -1,8 +1,9 @@ package gtPlusPlus.core.recipe; +import net.minecraft.item.ItemStack; + import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.LoadedMods; -import net.minecraft.item.ItemStack; public class RECIPES_Shapeless { diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Tools.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Tools.java index 38832b07fe..54deeab3a8 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Tools.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Tools.java @@ -1,8 +1,5 @@ package gtPlusPlus.core.recipe; -import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.minecraft.RecipeUtils; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -10,6 +7,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import gtPlusPlus.core.item.ModItems; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.util.minecraft.RecipeUtils; + public class RECIPES_Tools { // Outputs diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPE_Batteries.java b/src/main/java/gtPlusPlus/core/recipe/RECIPE_Batteries.java index 62cd9f3800..44ae76b363 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPE_Batteries.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPE_Batteries.java @@ -1,12 +1,13 @@ package gtPlusPlus.core.recipe; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.ItemList; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import net.minecraft.item.ItemStack; public class RECIPE_Batteries { diff --git a/src/main/java/gtPlusPlus/core/recipe/ShapedRecipeObject.java b/src/main/java/gtPlusPlus/core/recipe/ShapedRecipeObject.java index 67cf787b13..e805e97a64 100644 --- a/src/main/java/gtPlusPlus/core/recipe/ShapedRecipeObject.java +++ b/src/main/java/gtPlusPlus/core/recipe/ShapedRecipeObject.java @@ -1,8 +1,9 @@ package gtPlusPlus.core.recipe; +import net.minecraft.item.ItemStack; + import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.minecraft.RecipeUtils; -import net.minecraft.item.ItemStack; public class ShapedRecipeObject { @@ -17,17 +18,9 @@ public class ShapedRecipeObject { 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 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) { this.object_A = input_A; this.object_B = input_B; this.object_C = input_C; diff --git a/src/main/java/gtPlusPlus/core/recipe/common/CI.java b/src/main/java/gtPlusPlus/core/recipe/common/CI.java index 8718cd05fd..486cbd97ca 100644 --- a/src/main/java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/main/java/gtPlusPlus/core/recipe/common/CI.java @@ -1,5 +1,10 @@ package gtPlusPlus.core.recipe.common; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; @@ -19,10 +24,6 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.StaticFields59; import ic2.core.Ic2Items; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class CI { @@ -30,11 +31,9 @@ public class CI { public static ItemStack _NULL = ItemUtils.getErrorStack(1); // bits - public static long bits = GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE + public static long bits = GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED; - public static long bitsd = GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.NOT_REMOVABLE + public static long bitsd = GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED; @@ -193,59 +192,34 @@ public class CI { public static ItemStack explosiveTNT; public static ItemStack explosiveITNT; - public static Materials[] tieredMaterials = new Materials[] { - Materials.Iron, Materials.Steel, Materials.Aluminium, - Materials.StainlessSteel, Materials.Titanium, Materials.TungstenSteel, - Materials.Chrome, Materials.Iridium, Materials.Osmium, - Materials.Neutronium - }; - ; + public static Materials[] tieredMaterials = new Materials[] { Materials.Iron, Materials.Steel, Materials.Aluminium, + Materials.StainlessSteel, Materials.Titanium, Materials.TungstenSteel, Materials.Chrome, Materials.Iridium, + Materials.Osmium, Materials.Neutronium };; public static void preInit() { // Tiered Components - component_Plate = new String[] { - getTieredComponent(OrePrefixes.plate, 0), - getTieredComponent(OrePrefixes.plate, 1), - getTieredComponent(OrePrefixes.plate, 2), - getTieredComponent(OrePrefixes.plate, 3), - getTieredComponent(OrePrefixes.plate, 4), - getTieredComponent(OrePrefixes.plate, 5), - getTieredComponent(OrePrefixes.plate, 6), - getTieredComponent(OrePrefixes.plate, 7), - getTieredComponent(OrePrefixes.plate, 8), - getTieredComponent(OrePrefixes.plate, 9), - getTieredComponent(OrePrefixes.plate, 10), - getTieredComponent(OrePrefixes.plate, 11) - }; - component_Rod = new String[] { - getTieredComponent(OrePrefixes.stick, 0), - getTieredComponent(OrePrefixes.stick, 1), - getTieredComponent(OrePrefixes.stick, 2), - getTieredComponent(OrePrefixes.stick, 3), - getTieredComponent(OrePrefixes.stick, 4), - getTieredComponent(OrePrefixes.stick, 5), - getTieredComponent(OrePrefixes.stick, 6), - getTieredComponent(OrePrefixes.stick, 7), - getTieredComponent(OrePrefixes.stick, 8), - getTieredComponent(OrePrefixes.stick, 9), - getTieredComponent(OrePrefixes.stick, 10), - getTieredComponent(OrePrefixes.stick, 11) - }; - component_Ingot = new String[] { - getTieredComponent(OrePrefixes.ingot, 0), - getTieredComponent(OrePrefixes.ingot, 1), - getTieredComponent(OrePrefixes.ingot, 2), - getTieredComponent(OrePrefixes.ingot, 3), - getTieredComponent(OrePrefixes.ingot, 4), - getTieredComponent(OrePrefixes.ingot, 5), - getTieredComponent(OrePrefixes.ingot, 6), - getTieredComponent(OrePrefixes.ingot, 7), - getTieredComponent(OrePrefixes.ingot, 8), - getTieredComponent(OrePrefixes.ingot, 9), - getTieredComponent(OrePrefixes.ingot, 10), - getTieredComponent(OrePrefixes.ingot, 11) - }; + component_Plate = new String[] { getTieredComponent(OrePrefixes.plate, 0), + getTieredComponent(OrePrefixes.plate, 1), getTieredComponent(OrePrefixes.plate, 2), + getTieredComponent(OrePrefixes.plate, 3), getTieredComponent(OrePrefixes.plate, 4), + getTieredComponent(OrePrefixes.plate, 5), getTieredComponent(OrePrefixes.plate, 6), + getTieredComponent(OrePrefixes.plate, 7), getTieredComponent(OrePrefixes.plate, 8), + getTieredComponent(OrePrefixes.plate, 9), getTieredComponent(OrePrefixes.plate, 10), + getTieredComponent(OrePrefixes.plate, 11) }; + component_Rod = new String[] { getTieredComponent(OrePrefixes.stick, 0), + getTieredComponent(OrePrefixes.stick, 1), getTieredComponent(OrePrefixes.stick, 2), + getTieredComponent(OrePrefixes.stick, 3), getTieredComponent(OrePrefixes.stick, 4), + getTieredComponent(OrePrefixes.stick, 5), getTieredComponent(OrePrefixes.stick, 6), + getTieredComponent(OrePrefixes.stick, 7), getTieredComponent(OrePrefixes.stick, 8), + getTieredComponent(OrePrefixes.stick, 9), getTieredComponent(OrePrefixes.stick, 10), + getTieredComponent(OrePrefixes.stick, 11) }; + component_Ingot = new String[] { getTieredComponent(OrePrefixes.ingot, 0), + getTieredComponent(OrePrefixes.ingot, 1), getTieredComponent(OrePrefixes.ingot, 2), + getTieredComponent(OrePrefixes.ingot, 3), getTieredComponent(OrePrefixes.ingot, 4), + getTieredComponent(OrePrefixes.ingot, 5), getTieredComponent(OrePrefixes.ingot, 6), + getTieredComponent(OrePrefixes.ingot, 7), getTieredComponent(OrePrefixes.ingot, 8), + getTieredComponent(OrePrefixes.ingot, 9), getTieredComponent(OrePrefixes.ingot, 10), + getTieredComponent(OrePrefixes.ingot, 11) }; // Circuits circuitPrimitive = getTieredCircuit(0); @@ -450,8 +424,8 @@ public class CI { public static void init() { // Set Explosives - explosivePowderKeg = - ItemUtils.getValueOfItemList("Block_Powderbarrel", 1, ItemUtils.getSimpleStack(Items.gunpowder, 16)); + explosivePowderKeg = ItemUtils + .getValueOfItemList("Block_Powderbarrel", 1, ItemUtils.getSimpleStack(Items.gunpowder, 16)); explosiveTNT = ItemUtils.getSimpleStack(Blocks.tnt).copy(); explosiveITNT = Ic2Items.industrialTnt.copy(); @@ -493,81 +467,31 @@ public class CI { return ItemUtils.getEmptyCell(i); } - private static final Material[] aMaterial_Main = new Material[] { - ALLOY.POTIN, - ALLOY.TUMBAGA, - ALLOY.EGLIN_STEEL, - ALLOY.INCONEL_625, - ALLOY.INCOLOY_DS, - ALLOY.NITINOL_60, - ALLOY.ZERON_100, - ALLOY.PIKYONIUM, - ELEMENT.STANDALONE.ADVANCED_NITINOL, - ALLOY.ABYSSAL, - ALLOY.QUANTUM, - ELEMENT.STANDALONE.HYPOGEN - }; - - private static final Material[] aMaterial_Secondary = new Material[] { - ALLOY.STEEL, - ALLOY.SILICON_CARBIDE, - ALLOY.BLOODSTEEL, - ALLOY.TANTALUM_CARBIDE, - ALLOY.INCONEL_792, - ALLOY.ARCANITE, - ALLOY.LAFIUM, - ALLOY.CINOBITE, - ALLOY.TITANSTEEL, - ALLOY.OCTIRON, - ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN, - ELEMENT.STANDALONE.HYPOGEN - }; - - private static final Material[] aMaterial_Tertiary = new Material[] { - ELEMENT.getInstance().LEAD, - ELEMENT.getInstance().ALUMINIUM, - ELEMENT.STANDALONE.BLACK_METAL, - ELEMENT.getInstance().TITANIUM, - ALLOY.HASTELLOY_N, - ALLOY.ENERGYCRYSTAL, - ALLOY.TRINIUM_NAQUADAH_CARBON, - ALLOY.TRINIUM_REINFORCED_STEEL, // Arceus - ALLOY.TITANSTEEL, - ELEMENT.STANDALONE.ASTRAL_TITANIUM, - ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN, - ELEMENT.STANDALONE.HYPOGEN - }; - - private static final Materials[] aMaterial_Cables = new Materials[] { - !CORE.GTNH ? Materials.Lead : Materials.Tin, - Materials.Cobalt, - Materials.AnnealedCopper, - Materials.Gold, - Materials.Titanium, - Materials.Nichrome, - Materials.Platinum, - Materials.YttriumBariumCuprate, - Materials.Naquadah, - Materials.Duranium, - Materials.Superconductor, - }; - - private static final Materials[] aMaterial_Circuits = new Materials[] { - Materials.Primitive, - Materials.Basic, - Materials.Good, - Materials.Advanced, - Materials.Data, - Materials.Data, - Materials.Elite, - Materials.Master, - Materials.Ultimate, - Materials.Superconductor, - Materials.Infinite, - }; - - private static final Material[][] aMaster = - new Material[][] {aMaterial_Main, aMaterial_Secondary, aMaterial_Tertiary}; + private static final Material[] aMaterial_Main = new Material[] { ALLOY.POTIN, ALLOY.TUMBAGA, ALLOY.EGLIN_STEEL, + ALLOY.INCONEL_625, ALLOY.INCOLOY_DS, ALLOY.NITINOL_60, ALLOY.ZERON_100, ALLOY.PIKYONIUM, + ELEMENT.STANDALONE.ADVANCED_NITINOL, ALLOY.ABYSSAL, ALLOY.QUANTUM, ELEMENT.STANDALONE.HYPOGEN }; + + private static final Material[] aMaterial_Secondary = new Material[] { ALLOY.STEEL, ALLOY.SILICON_CARBIDE, + ALLOY.BLOODSTEEL, ALLOY.TANTALUM_CARBIDE, ALLOY.INCONEL_792, ALLOY.ARCANITE, ALLOY.LAFIUM, ALLOY.CINOBITE, + ALLOY.TITANSTEEL, ALLOY.OCTIRON, ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN, ELEMENT.STANDALONE.HYPOGEN }; + + private static final Material[] aMaterial_Tertiary = new Material[] { ELEMENT.getInstance().LEAD, + ELEMENT.getInstance().ALUMINIUM, ELEMENT.STANDALONE.BLACK_METAL, ELEMENT.getInstance().TITANIUM, + ALLOY.HASTELLOY_N, ALLOY.ENERGYCRYSTAL, ALLOY.TRINIUM_NAQUADAH_CARBON, ALLOY.TRINIUM_REINFORCED_STEEL, // Arceus + ALLOY.TITANSTEEL, ELEMENT.STANDALONE.ASTRAL_TITANIUM, ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN, + ELEMENT.STANDALONE.HYPOGEN }; + + private static final Materials[] aMaterial_Cables = new Materials[] { !CORE.GTNH ? Materials.Lead : Materials.Tin, + Materials.Cobalt, Materials.AnnealedCopper, Materials.Gold, Materials.Titanium, Materials.Nichrome, + Materials.Platinum, Materials.YttriumBariumCuprate, Materials.Naquadah, Materials.Duranium, + Materials.Superconductor, }; + + private static final Materials[] aMaterial_Circuits = new Materials[] { Materials.Primitive, Materials.Basic, + Materials.Good, Materials.Advanced, Materials.Data, Materials.Data, Materials.Elite, Materials.Master, + Materials.Ultimate, Materials.Superconductor, Materials.Infinite, }; + + private static final Material[][] aMaster = new Material[][] { aMaterial_Main, aMaterial_Secondary, + aMaterial_Tertiary }; public static FluidStack getTieredFluid(int aTier, int aAmount) { return getTieredFluid(aTier, aAmount, 0); @@ -583,11 +507,11 @@ public class CI { public static FluidStack getTieredFluid(int aTier, int aAmount, int aType) { // Weird Legacy handling - /*ItemStack aCell = getTieredComponent(OrePrefixes.liquid, aTier, 1); - FluidStack a = GT_Utility.getFluidForFilledItem(aCell, true); - if (a == null) { - a = aMaster[aType][aTier].getFluid(aAmount); - }*/ + /* + * ItemStack aCell = getTieredComponent(OrePrefixes.liquid, aTier, 1); FluidStack a = + * GT_Utility.getFluidForFilledItem(aCell, true); if (a == null) { a = aMaster[aType][aTier].getFluid(aAmount); + * } + */ // Modern Handling FluidStack a = aMaster[aType][aTier].getFluidStack(aAmount); @@ -603,17 +527,16 @@ public class CI { public static ItemStack getEnergyCore(int aTier, int aAmount) { ItemStack[] aOutput = new ItemStack[] { - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "1", 1), - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "2", 1), - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "3", 1), - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "4", 1), - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "5", 1), - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "6", 1), - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "7", 1), - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "8", 1), - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "9", 1), - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "10", 1) - }; + ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "1", 1), + ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "2", 1), + ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "3", 1), + ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "4", 1), + ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "5", 1), + ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "6", 1), + ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "7", 1), + ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "8", 1), + ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "9", 1), + ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "10", 1) }; return ItemUtils.getSimpleStack(aOutput[MathUtils.balance(aTier, 0, 9)], aAmount); } @@ -651,26 +574,22 @@ public class CI { Material m = null; if (aPrefix == OrePrefixes.liquid) { - int aMatID = (aTier == 0 || aTier == 2 || aTier == 5 || aTier == 8 - ? 0 + int aMatID = (aTier == 0 || aTier == 2 || aTier == 5 || aTier == 8 ? 0 : (aTier == 1 || aTier == 3 || aTier == 6 || aTier == 9 ? 1 : 2)); ItemStack aCell = aMaster[aMatID][aTier].getCell(aAmount); return aCell; } if (aPrefix == OrePrefixes.circuit) { - /*if (aTier == 4) { - return ItemUtils.getSimpleStack(CI.getDataStick(), aAmount); - } - else if (aTier == 5) { - return ItemUtils.getSimpleStack(CI.getDataOrb(), aAmount); - }*/ + /* + * if (aTier == 4) { return ItemUtils.getSimpleStack(CI.getDataStick(), aAmount); } else if (aTier == 5) { + * return ItemUtils.getSimpleStack(CI.getDataOrb(), aAmount); } + */ return ItemUtils.getOrePrefixStack(OrePrefixes.circuit, aMaterial_Circuits[aTier], aAmount); } // Check for Cables first, catch SuperConductor case and swap to wire. - if (aPrefix == OrePrefixes.cableGt01 - || aPrefix == OrePrefixes.cableGt02 + if (aPrefix == OrePrefixes.cableGt01 || aPrefix == OrePrefixes.cableGt02 || aPrefix == OrePrefixes.cableGt04 || aPrefix == OrePrefixes.cableGt08 || aPrefix == OrePrefixes.cableGt12) { @@ -691,8 +610,7 @@ public class CI { return ItemUtils.getOrePrefixStack(aPrefix, aMaterial_Cables[aTier], aAmount); } } - if (aPrefix == OrePrefixes.wireGt01 - || aPrefix == OrePrefixes.wireGt02 + if (aPrefix == OrePrefixes.wireGt01 || aPrefix == OrePrefixes.wireGt02 || aPrefix == OrePrefixes.wireGt04 || aPrefix == OrePrefixes.wireGt08 || aPrefix == OrePrefixes.wireGt12 @@ -700,8 +618,7 @@ public class CI { return ItemUtils.getOrePrefixStack(aPrefix, aMaterial_Cables[aTier], aAmount); } - if (aPrefix == OrePrefixes.pipeTiny - || aPrefix == OrePrefixes.pipeSmall + if (aPrefix == OrePrefixes.pipeTiny || aPrefix == OrePrefixes.pipeSmall || aPrefix == OrePrefixes.pipe || aPrefix == OrePrefixes.pipeMedium || aPrefix == OrePrefixes.pipeLarge @@ -790,8 +707,8 @@ public class CI { // All Invalid? Ok, shit. // Let's add a special error ingot. if (!ItemUtils.checkForInvalidItems(aReturn)) { - aReturn = ItemUtils.getErrorStack( - 1, (aPrefix.toString() + m.getLocalizedName() + " x" + aAmount)); + aReturn = ItemUtils + .getErrorStack(1, (aPrefix.toString() + m.getLocalizedName() + " x" + aAmount)); } } } @@ -1125,18 +1042,10 @@ public class CI { } public static ItemStack getTieredGTPPMachineCasing(int aTier, int aAmount) { - GregtechItemList[] aHulls = new GregtechItemList[] { - GregtechItemList.GTPP_Casing_ULV, - GregtechItemList.GTPP_Casing_LV, - GregtechItemList.GTPP_Casing_MV, - GregtechItemList.GTPP_Casing_HV, - GregtechItemList.GTPP_Casing_EV, - GregtechItemList.GTPP_Casing_IV, - GregtechItemList.GTPP_Casing_LuV, - GregtechItemList.GTPP_Casing_ZPM, - GregtechItemList.GTPP_Casing_UV, - GregtechItemList.GTPP_Casing_MAX - }; + GregtechItemList[] aHulls = new GregtechItemList[] { GregtechItemList.GTPP_Casing_ULV, + GregtechItemList.GTPP_Casing_LV, GregtechItemList.GTPP_Casing_MV, GregtechItemList.GTPP_Casing_HV, + GregtechItemList.GTPP_Casing_EV, GregtechItemList.GTPP_Casing_IV, GregtechItemList.GTPP_Casing_LuV, + GregtechItemList.GTPP_Casing_ZPM, GregtechItemList.GTPP_Casing_UV, GregtechItemList.GTPP_Casing_MAX }; return aHulls[aTier].get(aAmount); } @@ -1145,18 +1054,12 @@ public class CI { } public static ItemStack getTransmissionComponent(int aTier, int aAmount) { - GregtechItemList[] aTransParts = new GregtechItemList[] { - GregtechItemList.TransmissionComponent_ULV, - GregtechItemList.TransmissionComponent_LV, - GregtechItemList.TransmissionComponent_MV, - GregtechItemList.TransmissionComponent_HV, - GregtechItemList.TransmissionComponent_EV, - GregtechItemList.TransmissionComponent_IV, - GregtechItemList.TransmissionComponent_LuV, - GregtechItemList.TransmissionComponent_ZPM, - GregtechItemList.TransmissionComponent_UV, - GregtechItemList.TransmissionComponent_MAX, - }; + GregtechItemList[] aTransParts = new GregtechItemList[] { GregtechItemList.TransmissionComponent_ULV, + GregtechItemList.TransmissionComponent_LV, GregtechItemList.TransmissionComponent_MV, + GregtechItemList.TransmissionComponent_HV, GregtechItemList.TransmissionComponent_EV, + GregtechItemList.TransmissionComponent_IV, GregtechItemList.TransmissionComponent_LuV, + GregtechItemList.TransmissionComponent_ZPM, GregtechItemList.TransmissionComponent_UV, + GregtechItemList.TransmissionComponent_MAX, }; return aTransParts[aTier].get(aAmount); } @@ -1166,6 +1069,7 @@ public class CI { /** * Aluminium + Silver Catalyst + * * @param aAmount - Stacksize * @return - A Catalyst stack of given size */ @@ -1175,6 +1079,7 @@ public class CI { /** * Iron + Copper Catalyst + * * @param aAmount - Stacksize * @return - A Catalyst stack of given size */ @@ -1184,6 +1089,7 @@ public class CI { /** * Tungsten + Nickel Catalyst + * * @param aAmount - Stacksize * @return - A Catalyst stack of given size */ @@ -1193,6 +1099,7 @@ public class CI { /** * Cobalt + Titanium Catalyst + * * @param aAmount - Stacksize * @return - A Catalyst stack of given size */ @@ -1202,6 +1109,7 @@ public class CI { /** * Vanadium + Palladium Catalyst + * * @param aAmount - Stacksize * @return - A Catalyst stack of given size */ @@ -1211,6 +1119,7 @@ public class CI { /** * Iridium + Ruthenium Catalyst + * * @param aAmount - Stacksize * @return - A Catalyst stack of given size */ @@ -1220,6 +1129,7 @@ public class CI { /** * Aluminium + Nickel Catalyst + * * @param aAmount - Stacksize * @return - A Catalyst stack of given size */ @@ -1229,6 +1139,7 @@ public class CI { /** * Platinum + Rhodium Catalyst + * * @param aAmount - Stacksize * @return - A Catalyst stack of given size */ |