diff options
| author | miozune <miozune@gmail.com> | 2023-02-05 01:40:43 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-04 17:40:43 +0100 |
| commit | bb9da48b9975cb27e3b7c538bff2853a34b36fcd (patch) | |
| tree | 9de91abf611bf119935df6322e27805cf835fafc /src/main/java/gtPlusPlus/core/recipe | |
| parent | 8792eb5d9b70cbb1dc0b444cfd8524dfb4a0aa0c (diff) | |
| download | GT5-Unofficial-bb9da48b9975cb27e3b7c538bff2853a34b36fcd.tar.gz GT5-Unofficial-bb9da48b9975cb27e3b7c538bff2853a34b36fcd.tar.bz2 GT5-Unofficial-bb9da48b9975cb27e3b7c538bff2853a34b36fcd.zip | |
Remove redundant flags (#529)
* Remove CORE.GTNH
* Remove LoadedMods.Gregtech
* Remove LoadedMods.IndustrialCraft2
* Remove LoadedMods.MiscUtils
* Remove CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK
* clean
* Remove mention to GT versions
* Fix assembler mode
Diffstat (limited to 'src/main/java/gtPlusPlus/core/recipe')
11 files changed, 2150 insertions, 3774 deletions
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 ff104057b1..aace371163 100644 --- a/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java +++ b/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java @@ -1,7 +1,6 @@ package gtPlusPlus.core.recipe; import gregtech.api.enums.ItemList; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; @@ -9,18 +8,9 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class LOADER_Machine_Components { public static void initialise() { - registerDefaultComponents(); - if (!CORE.GTNH) { - if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - registerGTExperimentalComponents(); - } else { - registerGTStandardComponents(); - } - } else { - registerGTNHComponents(); - } + registerGTNHComponents(); } private static void registerDefaultComponents() { @@ -65,13 +55,11 @@ public class LOADER_Machine_Components { CI.sensor_HV = ItemList.Sensor_HV.get(1); 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); } private static void registerGTExperimentalComponents() { @@ -101,11 +89,9 @@ public class LOADER_Machine_Components { CI.sensor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1); 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(); registerComponentsMAX(); @@ -145,11 +131,9 @@ public class LOADER_Machine_Components { CI.sensor_UV = GregtechItemList.Sensor_UV.get(1); 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(); } @@ -188,11 +172,9 @@ public class LOADER_Machine_Components { CI.sensor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1); CI.sensor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1); - if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - CI.fluidRegulator_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32665, 1); - CI.fluidRegulator_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32666, 1); - CI.fluidRegulator_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32667, 1); - } + CI.fluidRegulator_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32665, 1); + CI.fluidRegulator_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32666, 1); + CI.fluidRegulator_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32667, 1); // Thanks 0lafe CI.electricMotor_MAX = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32596, 1); diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Extruder.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Extruder.java deleted file mode 100644 index 524aa08f60..0000000000 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Extruder.java +++ /dev/null @@ -1,51 +0,0 @@ -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; - -public class RECIPES_Extruder implements IOreRecipeRegistrator { - - public RECIPES_Extruder() { - OrePrefixes.ingot.add((IOreRecipeRegistrator) this); - 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))) { - final long aMaterialMass = aMaterial.getMass(); - final int tAmount = (int) (aPrefix.mMaterialAmount / 3628800L); - if (tAmount > 0 && tAmount <= 64 && aPrefix.mMaterialAmount % 3628800L == 0L) { - int tVoltageMultiplier = (aMaterial.mBlastFurnaceTemp >= 2800) ? 64 : 16; - if (aMaterial.contains(SubTag.NO_SMASHING)) { - tVoltageMultiplier /= 4; - } else if (aPrefix.name().startsWith(OrePrefixes.dust.name())) { - return; - } - - GT_Values.RA.addExtruderRecipe( - 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), - ((int) Math.max(aMaterialMass * 5L * tAmount, tAmount) / 4), - 8 * tVoltageMultiplier); - GT_Values.RA.addAlloySmelterRecipe( - 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), - ((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 0dcdb008bb..3bf145f0b3 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -1,7 +1,5 @@ package gtPlusPlus.core.recipe; -import static gtPlusPlus.core.lib.CORE.GTNH; - import java.util.ArrayList; import net.minecraft.init.Blocks; @@ -30,7 +28,6 @@ import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.*; import gtPlusPlus.core.material.nuclear.FLUORIDES; import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.EnchantingUtils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -59,10 +56,8 @@ public class RECIPES_GREGTECH { dehydratorRecipes(); blastFurnaceRecipes(); - if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - largeChemReactorRecipes(); - fusionRecipes(); - } + largeChemReactorRecipes(); + fusionRecipes(); fissionFuelRecipes(); autoclaveRecipes(); @@ -359,80 +354,45 @@ 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), }; + ItemStack[] aCoilWire = new ItemStack[] { ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 0, 64), + ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 1, 64), + ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 2, 64), + ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 3, 64), }; // 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[] { ItemList.Field_Generator_IV.get(32), ItemList.Electric_Motor_EV.get(64), + ItemList.Energy_LapotronicOrb.get(32), CI.getTieredComponent(OrePrefixes.cableGt12, 7, 32), + CI.getTieredComponent(OrePrefixes.wireGt16, 6, 64), + ItemUtils.getOrePrefixStack(OrePrefixes.plate, Materials.Naquadria, 64), + ELEMENT.getInstance().GADOLINIUM.getDust(32), ELEMENT.getInstance().SAMARIUM.getDust(16), + ALLOY.ARCANITE.getGear(8), 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 FluidStack[] { ALLOY.NITINOL_60.getFluidStack(144 * 9 * 4), + ALLOY.ENERGYCRYSTAL.getFluidStack(144 * 9 * 8), ALLOY.TUMBAGA.getFluidStack(144 * 9 * 32), + ALLOY.NICHROME.getFluidStack(144 * 1 * 16), }, ItemUtils.getSimpleStack(ModBlocks.blockCasings3Misc, 15, 32), - 20 * 60 * 10 * (GTNH ? 2 : 1), + 20 * 60 * 10 * 2, (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)); - */ - - // 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)); - */ - // 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.getTieredMachineHull(8, 4), CI.getConveyor(8, 24), CI.getElectricMotor(7, 32), + CI.getElectricPiston(7, 16), CI.getEnergyCore(6, 8), CI.getPlate(8, 24), + CI.getTieredComponent(OrePrefixes.screw, 8, 48), CI.getTieredComponent(OrePrefixes.bolt, 7, 32), + CI.getTieredComponent(OrePrefixes.rod, 6, 12), new Object[] { CI.getTieredCircuitOreDictName(7), 20 }, - CI.getTieredComponent(OrePrefixes.rotor, 6, GTNH ? 16 : 8), }, + CI.getTieredComponent(OrePrefixes.rotor, 6, 16), }, 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), + 20 * 60 * 60 * 2, (int) MaterialUtils.getVoltageForTier(8)); /* @@ -452,13 +412,12 @@ public class RECIPES_GREGTECH { 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.cableGt08, j + 1, 32), 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 FluidStack[] { CI.getTieredFluid(j, 144 * 8), CI.getTertiaryTieredFluid(j - 2, 144 * 16), + CI.getAlternativeTieredFluid(j, 144 * 16), }, aGemCasings[aCasingSlot++], - 20 * 60 * 1 * (GTNH ? 2 : 1), + 20 * 60 * 1 * 2, (int) MaterialUtils.getVoltageForTier(j)); } @@ -481,15 +440,14 @@ public class RECIPES_GREGTECH { 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)), }, + CI.getTieredComponent(OrePrefixes.wireGt16, j + 1, 32), + CI.getTieredComponent(OrePrefixes.bolt, j, 8), + CI.getTieredComponent(OrePrefixes.screw, j - 1, 8), }, + new FluidStack[] { CI.getTieredFluid(j, 144 * 1 * 16), + CI.getTertiaryTieredFluid(j - 2, 144 * 2 * 16), CI.getAlternativeTieredFluid(j, 144 * 16), + CI.getTertiaryTieredFluid(j - 1, 144 * 16), }, aGemBatteries[aCasingSlot++], - 20 * 60 * 1 * (GTNH ? 2 : 1), + 20 * 60 * 1 * 2, (int) MaterialUtils.getVoltageForTier(j)); } @@ -498,20 +456,19 @@ 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[] { ItemUtils.getSimpleStack(aGemCasings[2], 4), + CI.getTieredComponent(OrePrefixes.plate, 8, 32), 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)), }, + CI.getTieredComponent(OrePrefixes.cableGt02, 7, 16), + CI.getTieredComponent(OrePrefixes.gearGt, 6, 6), + CI.getTieredComponent(OrePrefixes.screw, 7, 16), + CI.getTieredComponent(OrePrefixes.bolt, 5, 24), + CI.getTieredComponent(OrePrefixes.frameGt, 4, 12), aCoilWire[3] }, + new FluidStack[] { CI.getTieredFluid(7, 144 * 18 * 16), CI.getTertiaryTieredFluid(7, 144 * 18 * 16), + CI.getAlternativeTieredFluid(6, 144 * 18 * 16), + CI.getAlternativeTieredFluid(7, 144 * 18 * 16), }, ItemUtils.getItemStackFromFQRN("miscutils:personalHealingDevice", 1), - 20 * 60 * 30 * (GTNH ? 2 : 1), + 20 * 60 * 30 * 2, (int) MaterialUtils.getVoltageForTier(7)); // Charge Pack LuV-UV @@ -537,15 +494,14 @@ public class RECIPES_GREGTECH { 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)), }, + CI.getTieredComponent(OrePrefixes.screw, h, 16), + CI.getTieredComponent(OrePrefixes.bolt, h - 2, 32), CI.getFieldGenerator(h, 1), }, + new FluidStack[] { CI.getTieredFluid(h, 144 * 4 * 8), + CI.getTertiaryTieredFluid(h - 1, 144 * 4 * 8), + CI.getAlternativeTieredFluid(h - 1, 144 * 4 * 8), + CI.getAlternativeTieredFluid(h - 2, 144 * 4 * 8), }, aChargeOutputs[aCurrSlot], - 20 * 60 * 30 * (GTNH ? 2 : 1) * (aCurrSlot + 1), + 20 * 60 * 30 * 2 * (aCurrSlot + 1), (int) MaterialUtils.getVoltageForTier(h)); aCurrSlot++; } @@ -554,20 +510,19 @@ 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[] { ItemUtils.getSimpleStack(aGemCasings[3], 4), + CI.getTieredComponent(OrePrefixes.plate, 8, 32), 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)), }, + CI.getTieredComponent(OrePrefixes.cableGt04, 8, 16), + CI.getTieredComponent(OrePrefixes.gearGt, 7, 6), + CI.getTieredComponent(OrePrefixes.screw, 8, 16), + CI.getTieredComponent(OrePrefixes.bolt, 7, 24), + CI.getTieredComponent(OrePrefixes.frameGt, 5, 12), aCoilWire[3] }, + new FluidStack[] { CI.getTieredFluid(8, 144 * 18 * 16), CI.getTertiaryTieredFluid(8, 144 * 18 * 16), + CI.getAlternativeTieredFluid(7, 144 * 18 * 16), + CI.getAlternativeTieredFluid(8, 144 * 18 * 16), }, ItemUtils.getItemStackFromFQRN("miscutils:personalCloakingDevice", 1), - 20 * 60 * 30 * (GTNH ? 2 : 1), + 20 * 60 * 30 * 2, (int) MaterialUtils.getVoltageForTier(8)); } GT_Values.RA.addAssemblylineRecipe( @@ -723,7 +678,7 @@ public class RECIPES_GREGTECH { ItemUtils.getSimpleStack(ModItems.dustDecayedRadium226, 1), null, null, - FluidUtils.getFluidStack("radon", !GTNH ? 500 : 144), + FluidUtils.getFluidStack("radon", 144), null, null, null, @@ -751,20 +706,6 @@ public class RECIPES_GREGTECH { private static void blastSmelterRecipes() { - 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) }, - FluidUtils.getFluidStack("molten.trinium", 136 * 144), - 0, - 20 * 3000, - 2040 * 4); - } - // Eglin Steel CORE.RA.addBlastSmelterRecipe( new ItemStack[] { ItemUtils.getGregtechCircuit(6), ELEMENT.getInstance().IRON.getDust(4), @@ -941,19 +882,17 @@ public class RECIPES_GREGTECH { // Hydrofluoric Acid boolean addedGtExtraction = false; // Try use Internal GT Fluid first - if (Utils.getGregtechVersionAsInt() >= 50929) { - // Hydrofluoric Acid - CORE.RA.addFluidCannerRecipe( - ItemUtils.getSimpleStack(Items.glass_bottle), - ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion), - FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 250), - null); - addedGtExtraction = CORE.RA.addFluidCannerRecipe( - ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion), - ItemUtils.getSimpleStack(Items.glass_bottle), - null, - FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 250)); - } + // Hydrofluoric Acid + CORE.RA.addFluidCannerRecipe( + ItemUtils.getSimpleStack(Items.glass_bottle), + ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion), + FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 250), + null); + addedGtExtraction = CORE.RA.addFluidCannerRecipe( + ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion), + ItemUtils.getSimpleStack(Items.glass_bottle), + null, + FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 250)); // Add a Fill recipe for GT++ Acid CORE.RA.addFluidCannerRecipe( ItemUtils.getSimpleStack(Items.glass_bottle), @@ -1317,8 +1256,7 @@ public class RECIPES_GREGTECH { 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), + new ItemStack[] { aFluidReg1, CI.electricMotor_LV, CI.getTieredComponent(OrePrefixes.bolt, 1, 8), ItemUtils.getItemStackOfAmountFromOreDict("ringBrass", 1), ItemUtils.getItemStackOfAmountFromOreDict("stickBrass", 1), ItemUtils.getItemStackOfAmountFromOreDict("plateSteel", 2) }, @@ -1327,8 +1265,7 @@ public class RECIPES_GREGTECH { 10 * 20, 30); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { aFluidReg2, CI.electricMotor_MV, - CI.getTieredComponent(OrePrefixes.bolt, 2, GTNH ? 8 : 4), + new ItemStack[] { aFluidReg2, CI.electricMotor_MV, CI.getTieredComponent(OrePrefixes.bolt, 2, 8), ItemUtils.getItemStackOfAmountFromOreDict("ringInvar", 1), ItemUtils.getItemStackOfAmountFromOreDict("stickInvar", 1), ItemUtils.getItemStackOfAmountFromOreDict("plateAluminium", 2) }, @@ -1337,8 +1274,7 @@ public class RECIPES_GREGTECH { 10 * 20 * 2, 120); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { aFluidReg3, CI.electricMotor_HV, - CI.getTieredComponent(OrePrefixes.bolt, 3, GTNH ? 8 : 4), + new ItemStack[] { aFluidReg3, CI.electricMotor_HV, CI.getTieredComponent(OrePrefixes.bolt, 3, 8), ItemUtils.getItemStackOfAmountFromOreDict("ringChrome", 1), ItemUtils.getItemStackOfAmountFromOreDict("stickChrome", 1), ItemUtils.getItemStackOfAmountFromOreDict("plateStainlessSteel", 2) }, @@ -1348,8 +1284,7 @@ public class RECIPES_GREGTECH { 480); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { aFluidReg4, CI.electricMotor_EV, - CI.getTieredComponent(OrePrefixes.bolt, 4, GTNH ? 8 : 4), + new ItemStack[] { aFluidReg4, CI.electricMotor_EV, CI.getTieredComponent(OrePrefixes.bolt, 4, 8), ItemUtils.getItemStackOfAmountFromOreDict("ringTitanium", 1), ItemUtils.getItemStackOfAmountFromOreDict("stickTitanium", 1), ItemUtils.getItemStackOfAmountFromOreDict("plateTungstenSteel", 2) }, @@ -1411,79 +1346,21 @@ public class RECIPES_GREGTECH { CORE.RA.addSixSlotAssemblingRecipe( 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))), + aPackBatteries[aAS], CI.getSensor(i, 4), }, + CI.getTieredFluid(i, (144 * 4)), aPackOutput[aAS], 30 * 20 * i, (int) GT_Values.V[i]); } - if (!GTNH) { - if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - GT_Values.RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.WroughtIron, 1L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.WroughtIron, 2L), - GregtechItemList.Fluid_Cell_1L.get(1L, new Object[0]), - 50, - 32); - GT_Values.RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Bronze, 1L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Bronze, 2L), - GregtechItemList.Fluid_Cell_16L.get(1L, new Object[0]), - 50, - 32); - GT_Values.RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Brass, 1L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Brass, 2L), - GregtechItemList.Fluid_Cell_36L.get(1L, new Object[0]), - 75, - 32); - GT_Values.RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Invar, 1L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Invar, 2L), - GregtechItemList.Fluid_Cell_144L.get(1L, new Object[0]), - 75, - 32); - - } else { - GT_Values.RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 8L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.WroughtIron, 4L), - GregtechItemList.Fluid_Cell_1L.get(1L, new Object[0]), - 50, - 32); - GT_Values.RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Bronze, 8L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Bronze, 4L), - GregtechItemList.Fluid_Cell_16L.get(1L, new Object[0]), - 50, - 32); - GT_Values.RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Brass, 8L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Brass, 4L), - GregtechItemList.Fluid_Cell_36L.get(1L, new Object[0]), - 75, - 32); - GT_Values.RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Invar, 8L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Invar, 4L), - GregtechItemList.Fluid_Cell_144L.get(1L, new Object[0]), - 75, - 32); - } - } - if (LoadedMods.Baubles) { // 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) }, + ItemUtils.getItemStackOfAmountFromOreDict("plateTrinium", 64), CI.getSensor(6, 6), + CI.getBolt(7, 64), ItemUtils.getItemStackOfAmountFromOreDict("wireFinePlatinum", 64), + ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 12) }, CI.getAlternativeTieredFluid(7, 144 * 32), ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_8_TURBINE_AUTOMATION, 1), 20 * 60 * 5, @@ -1492,12 +1369,9 @@ 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) }, + ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR, 4), CI.getFieldGenerator(6, 16), + ItemUtils.getItemStackOfAmountFromOreDict("wireFinePalladium", 32), + ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 12) }, CI.getAlternativeTieredFluid(7, 144 * 32), ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_9_CLOAKING, 1), 20 * 60 * 10, @@ -1505,12 +1379,10 @@ 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, 32), + ItemUtils.getItemStackOfAmountFromOreDict("gearGtSmallWroughtIron", 8), + ItemUtils.getItemStackOfAmountFromOreDict("wireFineCopper", 32), + ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(1), 2) }, FluidUtils.getFluidStack("molten.rubber", 2000), ItemUtils.getSimpleStack(ModItems.itemPersonalFireProofDevice), 20 * 60 * 5, @@ -1562,27 +1434,11 @@ public class RECIPES_GREGTECH { null, 10 * 20, 60); - - if (!GTNH) { - final FluidStack[] sulfurdioxideOutput = { FluidUtils.getFluidStack("oxygen", 2000) }; - GT_Values.RA.addDistillationTowerRecipe( - FluidUtils.getFluidStack("sulfurdioxide", 144 * 3), - sulfurdioxideOutput, - ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 1), - 5 * 20, - 30); - } } private static void addFuels() { Logger.INFO("Registering New Fuels."); - if (!GTNH) { - GT_Values.RA.addFuel(ItemUtils.simpleMetaStack("EnderIO:bucketFire_water", 0, 1), null, 120, 0); - GT_Values.RA.addFuel(ItemUtils.simpleMetaStack("EnderIO:bucketRocket_fuel", 0, 1), null, 112, 0); - GT_Values.RA.addFuel(ItemUtils.simpleMetaStack("EnderIO:bucketHootch", 0, 1), null, 36, 0); - } - HotFuel.addNewHotFuel( FluidUtils.getLava(83), FluidUtils.getPahoehoeLava(83), @@ -1754,7 +1610,7 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict("dustGraphite", 8), ItemUtils.getItemStackOfAmountFromOreDict("dustSmallSilicon", 8), 60 * 20, - MaterialUtils.getVoltageForTier(GTNH ? 5 : 4), + MaterialUtils.getVoltageForTier(5), 4500); // Bomb Casings @@ -1766,7 +1622,7 @@ public class RECIPES_GREGTECH { GregtechItemList.Bomb_Cast_Molten.get(4), null, 4 * 60 * 20, - MaterialUtils.getVoltageForTier(GTNH ? 3 : 2), + MaterialUtils.getVoltageForTier(3), 2800); // Krypton Processing @@ -1971,20 +1827,20 @@ public class RECIPES_GREGTECH { // Graviton Smash CORE.RA.addCyclotronRecipe( CI.getNumberedCircuit(15), - FluidUtils.getFluidStack("plasma.hydrogen", GTNH ? 50 : 10), + FluidUtils.getFluidStack("plasma.hydrogen", 50), new ItemStack[] { Particle.getBaseParticle(Particle.GRAVITON), Particle.getBaseParticle(Particle.UNKNOWN) }, null, new int[] { 15, 100 }, - 20 * (GTNH ? 90 : 30), + 20 * (90), (int) MaterialUtils.getVoltageForTier(6), 1000 * 20); - FluidStack aPlasma = Materials.Duranium.getMolten(GTNH ? 40 : 10); + FluidStack aPlasma = Materials.Duranium.getMolten(40); FluidStack aPlasma_NULL = Materials._NULL.getPlasma(1); if (aPlasma == null || aPlasma.isFluidEqual(aPlasma_NULL)) { - aPlasma = Materials.Americium.getMolten(GTNH ? 20 : 5); + aPlasma = Materials.Americium.getMolten(20); } // Quantum Anomaly @@ -1994,7 +1850,7 @@ public class RECIPES_GREGTECH { new ItemStack[] { GregtechItemList.Laser_Lens_Special.get(1) }, null, new int[] { 100 }, - 20 * (GTNH ? 25 : 60), + 20 * (25), (int) MaterialUtils.getVoltageForTier(8), 500 * 20); @@ -2003,7 +1859,7 @@ public class RECIPES_GREGTECH { */ int IonCount = 2; - int tenCountA = (GTNH ? 2 : 1); + int tenCountA = 2; int tenCountB = 0; for (String y : IonParticles.MetaToNameMap.values()) { if (y.toLowerCase().contains("hydrogen")) { @@ -2127,50 +1983,7 @@ public class RECIPES_GREGTECH { private static void sifterRecipes() {} - private static void electroMagneticSeperatorRecipes() { - - if (!GTNH) { - // Trinium - GT_Values.RA.addElectromagneticSeparatorRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedNaquadah", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustNaquadah", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallNaquadahEnriched", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1), - new int[] { 10000, 2500, 5000 }, - 20 * 20, - 24); - - // Trinium - GT_Values.RA.addElectromagneticSeparatorRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedIridium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustIridium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallOsmium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1), - new int[] { 10000, 2500, 5000 }, - 20 * 20, - 24); - - // Trinium - GT_Values.RA.addElectromagneticSeparatorRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedWulfenite", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustWulfenite", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1), - new int[] { 10000, 3000, 3000 }, - 20 * 20, - 24); - } - } - - 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); - */ + private static void electroMagneticSeperatorRecipes() {} - } + private static void advancedMixerRecipes() {} } diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java index ee9d2c4d29..eb3f9ad2c3 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java @@ -1,6 +1,5 @@ package gtPlusPlus.core.recipe; -import static gtPlusPlus.core.lib.CORE.GTNH; import static gtPlusPlus.core.recipe.common.CI.bitsd; import static gtPlusPlus.core.util.minecraft.ItemUtils.getSimpleStack; import static gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits.generatePipeRecipes; @@ -12,7 +11,6 @@ import net.minecraft.item.ItemStack; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; @@ -48,21 +46,19 @@ public class RECIPES_General { static ItemStack RECIPE_HydrogenDust; public static void loadRecipes() { - if (LoadedMods.Gregtech) { - RECIPE_Paper = ItemUtils.getSimpleStack(Items.paper); - RECIPE_Dirt = ItemUtils.getSimpleStack(Blocks.dirt); - RECIPE_Snow = ItemUtils.getSimpleStack(Blocks.snow); - RECIPE_Obsidian = ItemUtils.getSimpleStack(Blocks.obsidian); - RECIPE_CraftingTable = ItemUtils.getSimpleStack(Blocks.crafting_table); - RECIPE_HydrogenDust = ItemUtils.getSimpleStack(ModItems.itemHydrogenBlob); - RECIPE_BasicCasingIC2 = ItemUtils.getItemStackFromFQRN("IC2:blockMachine", 1); - OUTPUT_Workbench_Bronze = GregtechItemList.GT4_Workbench_Bronze.get(1); - OUTPUT_Workbench_Advanced = GregtechItemList.GT4_Workbench_Advanced.get(1); - OUTPUT_Blueprint = ItemUtils.getSimpleStack(ModItems.itemBlueprintBase, 2); - run(); - addCompressedObsidian(); - migratedRecipes(); - } + RECIPE_Paper = ItemUtils.getSimpleStack(Items.paper); + RECIPE_Dirt = ItemUtils.getSimpleStack(Blocks.dirt); + RECIPE_Snow = ItemUtils.getSimpleStack(Blocks.snow); + RECIPE_Obsidian = ItemUtils.getSimpleStack(Blocks.obsidian); + RECIPE_CraftingTable = ItemUtils.getSimpleStack(Blocks.crafting_table); + RECIPE_HydrogenDust = ItemUtils.getSimpleStack(ModItems.itemHydrogenBlob); + RECIPE_BasicCasingIC2 = ItemUtils.getItemStackFromFQRN("IC2:blockMachine", 1); + OUTPUT_Workbench_Bronze = GregtechItemList.GT4_Workbench_Bronze.get(1); + OUTPUT_Workbench_Advanced = GregtechItemList.GT4_Workbench_Advanced.get(1); + OUTPUT_Blueprint = ItemUtils.getSimpleStack(ModItems.itemBlueprintBase, 2); + run(); + addCompressedObsidian(); + migratedRecipes(); } private static void run() { @@ -185,12 +181,7 @@ public class RECIPES_General { } // Iron bars - final ItemStack ironBars; - if (CORE.GTNH) { - ironBars = ItemUtils.getItemStackFromFQRN("dreamcraft:item.SteelBars", 1); - } else { - ironBars = ItemUtils.getItemStackFromFQRN("minecraft:iron_bars", 1); - } + final ItemStack ironBars = ItemUtils.getItemStackFromFQRN("dreamcraft:item.SteelBars", 1); // Fish Trap if (RecipeUtils.addShapedRecipe( @@ -207,38 +198,6 @@ public class RECIPES_General { Logger.INFO("Added a recipe for the Fish Trap."); } - // Small Gear Extruder Shape - if (!CORE.GTNH) { - GT_ModHandler.addCraftingRecipe( - GregtechItemList.Shape_Extruder_SmallGear.get(1L), - 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" }; - for (int y = 0; y < ironTypes.length; y++) { - // Iron bars - String ironRecipe = "stick" + ironTypes[y] + "Iron"; - if (RecipeUtils.addShapedRecipe( - null, - CI.craftingToolWrench, - null, - ironRecipe, - ironRecipe, - ironRecipe, - ironRecipe, - ironRecipe, - ironRecipe, - ItemUtils.getItemStackFromFQRN("minecraft:iron_bars", 8))) { - Logger.INFO("Re-added old GT recipe for Iron Bars."); - } - } - } - - // Shaped Crafting for ULV Material Dusts - // Potin if (RecipeUtils.addShapelessGregtechRecipe( new Object[] { "dustLead", "dustBronze", "dustTin", "dustLead", "dustBronze" }, @@ -449,8 +408,8 @@ 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), }, + CI.getPlate(2, 4), + ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(0), 2), }, FluidUtils.getHotWater(500), // Fluid ItemUtils.getSimpleStack(ModBlocks.blockPestKiller), // Output 20 * 60, // Dur diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java index bd5ac25bf3..65c7a1ca56 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java @@ -8,10 +8,8 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.everglades.dimension.Dimension_Everglades; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class RECIPES_LaserEngraver implements IOreRecipeRegistrator { @@ -22,197 +20,118 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator { @Override public void registerOre(final OrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName, final String aModName, final ItemStack aStack) { - 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 }), - GregtechItemList.Circuit_Parts_Wiring_IV.get(1L, new Object[0]), - 64, - 480); - } else { - Logger.INFO( - "foilYttriumBariumCuprate 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("foilVanadiumGallium", 1) != null) { - GT_Values.RA.addLaserEngraverRecipe( - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.VanadiumGallium, 2L), - GT_Utility.copyAmount(0L, new Object[] { aStack }), - GregtechItemList.Circuit_Parts_Wiring_IV.get(1L, new Object[0]), - 64, - 480); - } else { - Logger.INFO( - "foilVanadiumGallium 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("foilNiobiumTitanium", 1) != null) { - GT_Values.RA.addLaserEngraverRecipe( - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.NiobiumTitanium, 2L), - GT_Utility.copyAmount(0L, new Object[] { aStack }), - GregtechItemList.Circuit_Parts_Wiring_IV.get(1L, new Object[0]), - 64, - 480); - } else { - Logger.INFO( - "foilNiobiumTitanium 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 (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."); } - - } else if (aOreDictName.equals(OreDictNames.craftingLensYellow.toString())) { - if (CORE.ConfigSwitches.enableCustomCircuits && !CORE.GTNH) { - if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilOsmium", 1) != null) { - GT_Values.RA.addLaserEngraverRecipe( - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmium, 2L), - GT_Utility.copyAmount(0L, new Object[] { aStack }), - GregtechItemList.Circuit_Parts_Wiring_LuV.get(1L, new Object[0]), - 64, - 1024); - } else { - Logger.INFO( - "foilOsmium 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_MachineComponents.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java index 54f0fe7849..2b35ba70ab 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java @@ -1,12 +1,9 @@ package gtPlusPlus.core.recipe; import gregtech.api.enums.*; -import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.RecipeUtils; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class RECIPES_MachineComponents { @@ -95,389 +92,7 @@ public class RECIPES_MachineComponents { public static final void loadRecipes() { Logger.INFO("Loading Recipes for the Various Circuits and Machine components."); - if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - run(); - } else { - onlyULVComponents(); - if (!CORE.GTNH) { - onlyMaxComponents(); - } - } - gregtechMachinePhase(); - } - - private static void run() { - // Electric Motors - RecipeUtils.addShapedGregtechRecipe( - cableTier7, - wireTier7, - rodTier7a, - wireTier7, - rodTier7b, - wireTier7, - rodTier7a, - wireTier7, - cableTier7, - CI.electricMotor_LuV); - RecipeUtils.addShapedGregtechRecipe( - cableTier8, - wireTier8, - rodTier8a, - wireTier8, - rodTier8b, - wireTier8, - rodTier8a, - wireTier8, - cableTier8, - CI.electricMotor_ZPM); - RecipeUtils.addShapedGregtechRecipe( - cableTier9, - wireTier9, - rodTier9a, - wireTier9, - rodTier9b, - wireTier9, - rodTier9a, - wireTier9, - cableTier9, - CI.electricMotor_UV); - RecipeUtils.addShapedGregtechRecipe( - cableTier10, - wireTier10, - rodTier10a, - wireTier10, - rodTier10b, - wireTier10, - rodTier10a, - wireTier10, - cableTier10, - CI.electricMotor_MAX); - - // Electric Pump - RecipeUtils.addShapedGregtechRecipe( - cableTier7, - rotorTier7, - itemRubberRing, - CI.craftingToolScrewdriver, - pipeTier7, - CI.craftingToolWrench, - itemRubberRing, - CI.electricMotor_LuV, - cableTier7, - CI.electricPump_LuV); - RecipeUtils.addShapedGregtechRecipe( - cableTier8, - rotorTier8, - itemRubberRing, - CI.craftingToolScrewdriver, - pipeTier8, - CI.craftingToolWrench, - itemRubberRing, - CI.electricMotor_ZPM, - cableTier8, - CI.electricPump_ZPM); - RecipeUtils.addShapedGregtechRecipe( - cableTier9, - rotorTier9, - itemRubberRing, - CI.craftingToolScrewdriver, - pipeTier9, - CI.craftingToolWrench, - itemRubberRing, - CI.electricMotor_UV, - cableTier9, - CI.electricPump_UV); - RecipeUtils.addShapedGregtechRecipe( - cableTier10, - rotorTier10, - itemRubberRing, - CI.craftingToolScrewdriver, - pipeTier10, - CI.craftingToolWrench, - itemRubberRing, - CI.electricMotor_MAX, - cableTier10, - CI.electricPump_MAX); - - // Electric Pump - RecipeUtils.addShapedGregtechRecipe( - plateTier7, - plateTier7, - plateTier7, - cableTier7, - rodTier7a, - rodTier7a, - cableTier7, - CI.electricMotor_LuV, - smallGearTier7, - CI.electricPiston_LuV); - RecipeUtils.addShapedGregtechRecipe( - plateTier8, - plateTier8, - plateTier8, - cableTier8, - rodTier8a, - rodTier8a, - cableTier8, - CI.electricMotor_ZPM, - smallGearTier8, - CI.electricPiston_ZPM); - RecipeUtils.addShapedGregtechRecipe( - plateTier9, - plateTier9, - plateTier9, - cableTier9, - rodTier9a, - rodTier9a, - cableTier9, - CI.electricMotor_UV, - smallGearTier9, - CI.electricPiston_UV); - RecipeUtils.addShapedGregtechRecipe( - plateTier10, - plateTier10, - plateTier10, - cableTier10, - rodTier10a, - rodTier10a, - cableTier10, - CI.electricMotor_MAX, - smallGearTier10, - CI.electricPiston_MAX); - - // Robot Arms - RecipeUtils.addShapedGregtechRecipe( - cableTier7, - cableTier7, - cableTier7, - CI.electricMotor_LuV, - rodTier7a, - CI.electricMotor_LuV, - CI.electricPiston_LuV, - circuitTier7, - rodTier7a, - CI.robotArm_LuV); - RecipeUtils.addShapedGregtechRecipe( - cableTier8, - cableTier8, - cableTier8, - CI.electricMotor_ZPM, - rodTier8a, - CI.electricMotor_ZPM, - CI.electricPiston_ZPM, - circuitTier8, - rodTier8a, - CI.robotArm_ZPM); - RecipeUtils.addShapedGregtechRecipe( - cableTier9, - cableTier9, - cableTier9, - CI.electricMotor_UV, - rodTier9a, - CI.electricMotor_UV, - CI.electricPiston_UV, - circuitTier9, - rodTier9a, - CI.robotArm_UV); - RecipeUtils.addShapedGregtechRecipe( - cableTier10, - cableTier10, - cableTier10, - CI.electricMotor_MAX, - rodTier10a, - CI.electricMotor_MAX, - CI.electricPiston_MAX, - circuitTier10, - rodTier10a, - CI.robotArm_MAX); - - // Conveyor Modules - RecipeUtils.addShapedGregtechRecipe( - plateRubber, - plateRubber, - plateRubber, - CI.electricMotor_LuV, - cableTier7, - CI.electricMotor_LuV, - plateRubber, - plateRubber, - plateRubber, - CI.conveyorModule_LuV); - RecipeUtils.addShapedGregtechRecipe( - plateRubber, - plateRubber, - plateRubber, - CI.electricMotor_ZPM, - cableTier8, - CI.electricMotor_ZPM, - plateRubber, - plateRubber, - plateRubber, - CI.conveyorModule_ZPM); - RecipeUtils.addShapedGregtechRecipe( - plateRubber, - plateRubber, - plateRubber, - CI.electricMotor_UV, - cableTier9, - CI.electricMotor_UV, - plateRubber, - plateRubber, - plateRubber, - CI.conveyorModule_UV); - RecipeUtils.addShapedGregtechRecipe( - plateRubber, - plateRubber, - plateRubber, - CI.electricMotor_MAX, - cableTier10, - CI.electricMotor_MAX, - plateRubber, - plateRubber, - plateRubber, - CI.conveyorModule_MAX); - - // Emitter Modules - RecipeUtils.addShapedGregtechRecipe( - rodTier7c, - rodTier7c, - circuitTier7, - cableTier7, - circuitTier6, - rodTier7c, - circuitTier7, - cableTier7, - rodTier7c, - CI.emitter_LuV); - RecipeUtils.addShapedGregtechRecipe( - rodTier8c, - rodTier8c, - circuitTier8, - cableTier8, - circuitTier7, - rodTier8c, - circuitTier8, - cableTier8, - rodTier8c, - CI.emitter_ZPM); - RecipeUtils.addShapedGregtechRecipe( - rodTier9c, - rodTier9c, - circuitTier9, - cableTier9, - circuitTier8, - rodTier9c, - circuitTier9, - cableTier9, - rodTier9c, - CI.emitter_UV); - RecipeUtils.addShapedGregtechRecipe( - rodTier10c, - rodTier10c, - circuitTier10, - cableTier10, - circuitTier9, - rodTier10c, - circuitTier10, - cableTier10, - rodTier10c, - CI.emitter_MAX); - - // Field Generator Modules - RecipeUtils.addShapedGregtechRecipe( - wireTier7, - circuitTier7, - wireTier7, - circuitTier7, - circuitTier6, - circuitTier7, - wireTier7, - circuitTier7, - wireTier7, - CI.fieldGenerator_LuV); - RecipeUtils.addShapedGregtechRecipe( - wireTier8, - circuitTier8, - wireTier8, - circuitTier8, - circuitTier7, - circuitTier8, - wireTier8, - circuitTier8, - wireTier8, - CI.fieldGenerator_ZPM); - RecipeUtils.addShapedGregtechRecipe( - wireTier9, - circuitTier9, - wireTier9, - circuitTier9, - circuitTier8, - circuitTier9, - wireTier9, - circuitTier9, - wireTier9, - CI.fieldGenerator_UV); - RecipeUtils.addShapedGregtechRecipe( - wireTier10, - circuitTier10, - wireTier10, - circuitTier10, - circuitTier9, - circuitTier10, - wireTier10, - circuitTier10, - wireTier10, - CI.fieldGenerator_MAX); - - // Sensor Modules - RecipeUtils.addShapedRecipe( - plateTier7, - null, - circuitTier6, - plateTier7, - rodTier7c, - null, - circuitTier7, - plateTier7, - plateTier7, - CI.sensor_LuV); - RecipeUtils.addShapedRecipe( - plateTier8, - null, - circuitTier7, - plateTier8, - rodTier8c, - null, - circuitTier8, - plateTier8, - plateTier8, - CI.sensor_ZPM); - RecipeUtils.addShapedRecipe( - plateTier9, - null, - circuitTier8, - plateTier9, - rodTier9c, - null, - circuitTier9, - plateTier9, - plateTier9, - CI.sensor_UV); - RecipeUtils.addShapedRecipe( - plateTier10, - null, - circuitTier9, - plateTier10, - rodTier10c, - null, - circuitTier10, - plateTier10, - plateTier10, - CI.sensor_MAX); - onlyULVComponents(); - - Logger.INFO("Done loading recipes for the Various machine components."); } private static void onlyULVComponents() { @@ -577,179 +192,4 @@ public class RECIPES_MachineComponents { plateTier0, CI.sensor_ULV); } - - private static void onlyMaxComponents() { - RecipeUtils.addShapedGregtechRecipe( - cableTier10, - wireTier10, - rodTier10a, - wireTier10, - rodTier10b, - wireTier10, - rodTier10a, - wireTier10, - cableTier10, - CI.electricMotor_MAX); - RecipeUtils.addShapedGregtechRecipe( - cableTier10, - rotorTier10, - itemRubberRing, - CI.craftingToolScrewdriver, - pipeTier10, - CI.craftingToolWrench, - itemRubberRing, - CI.electricMotor_MAX, - cableTier10, - CI.electricPump_MAX); - RecipeUtils.addShapedGregtechRecipe( - plateTier10, - plateTier10, - plateTier10, - cableTier10, - rodTier10a, - rodTier10a, - cableTier10, - CI.electricMotor_MAX, - smallGearTier10, - CI.electricPiston_MAX); - RecipeUtils.addShapedGregtechRecipe( - cableTier10, - cableTier10, - cableTier10, - CI.electricMotor_MAX, - rodTier10a, - CI.electricMotor_MAX, - CI.electricPiston_MAX, - circuitTier10, - rodTier10a, - CI.robotArm_MAX); - RecipeUtils.addShapedGregtechRecipe( - plateRubber, - plateRubber, - plateRubber, - CI.electricMotor_MAX, - cableTier10, - CI.electricMotor_MAX, - plateRubber, - plateRubber, - plateRubber, - CI.conveyorModule_MAX); - RecipeUtils.addShapedGregtechRecipe( - rodTier10c, - rodTier10c, - circuitTier10, - cableTier10, - circuitTier9, - rodTier10c, - circuitTier10, - cableTier10, - rodTier10c, - CI.emitter_MAX); - RecipeUtils.addShapedGregtechRecipe( - wireTier10, - circuitTier10, - wireTier10, - circuitTier10, - circuitTier9, - circuitTier10, - wireTier10, - circuitTier10, - wireTier10, - CI.fieldGenerator_MAX); - RecipeUtils.addShapedRecipe( - plateTier10, - null, - circuitTier9, - plateTier10, - rodTier10c, - null, - circuitTier10, - plateTier10, - plateTier10, - CI.sensor_MAX); - } - - private static void gregtechMachinePhase() { - if (CORE.ConfigSwitches.enableCustomCircuits && !CORE.GTNH) { - Logger.INFO("Adding Gregtech machine recipes for the circuits."); - GT_Values.RA.addFormingPressRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 1L), - GregtechItemList.Circuit_Parts_Wiring_IV.get(4L, new Object[0]), - GregtechItemList.Circuit_Board_IV.get(1L, new Object[0]), - 30, - 240); - GT_Values.RA.addFormingPressRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 1L), - GregtechItemList.Circuit_Parts_Wiring_LuV.get(4L, new Object[0]), - GregtechItemList.Circuit_Board_LuV.get(1L, new Object[0]), - 60, - 480); - GT_Values.RA.addFormingPressRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 2L), - GregtechItemList.Circuit_Parts_Wiring_ZPM.get(4L, new Object[0]), - GregtechItemList.Circuit_Board_ZPM.get(1L, new Object[0]), - 90, - 1000); - GT_Values.RA.addFormingPressRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lazurite, 1L), - GregtechItemList.Circuit_Parts_Crystal_Chip_IV.get(3L, new Object[0]), - GregtechItemList.Circuit_Parts_IV.get(1L, new Object[0]), - 30, - 480); - GT_Values.RA.addFormingPressRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lazurite, 1L), - GregtechItemList.Circuit_Parts_Crystal_Chip_LuV.get(3L, new Object[0]), - GregtechItemList.Circuit_Parts_LuV.get(1L, new Object[0]), - 60, - 1000); - GT_Values.RA.addFormingPressRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lazurite, 1L), - GregtechItemList.Circuit_Parts_Crystal_Chip_ZPM.get(3L, new Object[0]), - GregtechItemList.Circuit_Parts_ZPM.get(1L, new Object[0]), - 90, - 2000); - GT_Values.RA.addForgeHammerRecipe( - ItemList.Circuit_Master.get(1L, new Object[0]), - GregtechItemList.Circuit_Parts_Crystal_Chip_IV.get(5L, new Object[0]), - 30, - 256); - GT_Values.RA.addForgeHammerRecipe( - GregtechItemList.Circuit_IV.get(1L, new Object[0]), - GregtechItemList.Circuit_Parts_Crystal_Chip_LuV.get(5L, new Object[0]), - 60, - 512); - GT_Values.RA.addForgeHammerRecipe( - GregtechItemList.Circuit_LuV.get(1L, new Object[0]), - GregtechItemList.Circuit_Parts_Crystal_Chip_ZPM.get(5L, new Object[0]), - 120, - 1024); - for (final Materials tMat : Materials.values()) { - if ((tMat.mStandardMoltenFluid != null) && (tMat.contains(SubTag.SOLDERING_MATERIAL))) { - final int tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD) ? 1 - : tMat.contains(SubTag.SOLDERING_MATERIAL_BAD) ? 4 : 2; - GT_Values.RA.addAssemblerRecipe( - GregtechItemList.Circuit_Board_IV.get(1L, new Object[0]), - GregtechItemList.Circuit_Parts_IV.get(1L, new Object[0]), - tMat.getMolten((144L * tMultiplier) / 4L), - GregtechItemList.Circuit_IV.get(1L, new Object[0]), - 30, - 480); - GT_Values.RA.addAssemblerRecipe( - GregtechItemList.Circuit_Board_LuV.get(1L, new Object[0]), - GregtechItemList.Circuit_Parts_LuV.get(1L, new Object[0]), - tMat.getMolten((144L * tMultiplier) / 4L), - GregtechItemList.Circuit_LuV.get(1L, new Object[0]), - 60, - 1000); - GT_Values.RA.addAssemblerRecipe( - GregtechItemList.Circuit_Board_ZPM.get(1L, new Object[0]), - GregtechItemList.Circuit_Parts_ZPM.get(1L, new Object[0]), - tMat.getMolten((144L * tMultiplier) / 4L), - GregtechItemList.Circuit_ZPM.get(1L, new Object[0]), - 90, - 2000); - } - } - } - } } diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 473a4899c1..40352de898 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -965,31 +965,26 @@ 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); - } - if (LoadedMods.Gregtech) { - - // Lava Boiler - boiler_Coal = ItemList.Machine_Bronze_Boiler.get(1); - - // IV/EV/HV MACHINES - IV_MACHINE_Electrolyzer = ItemList.Machine_IV_Electrolyzer.get(1); - IV_MACHINE_Centrifuge = ItemList.Machine_IV_Centrifuge.get(1); - IV_MACHINE_BendingMachine = ItemList.Machine_IV_Bender.get(1); - IV_MACHINE_Wiremill = ItemList.Machine_IV_Wiremill.get(1); - IV_MACHINE_Macerator = ItemList.Machine_IV_Macerator.get(1); - IV_MACHINE_Cutter = ItemList.Machine_IV_Cutter.get(1); - IV_MACHINE_Extruder = ItemList.Machine_IV_Extruder.get(1); - HV_MACHINE_Sifter = ItemList.Machine_HV_Sifter.get(1); - IV_MACHINE_ThermalCentrifuge = ItemList.Machine_IV_ThermalCentrifuge.get(1); - IV_MACHINE_OreWasher = ItemList.Machine_IV_OreWasher.get(1); - IV_MACHINE_AlloySmelter = ItemList.Machine_IV_AlloySmelter.get(1); - IV_MACHINE_Mixer = ItemList.Machine_IV_Mixer.get(1); - IV_MACHINE_ChemicalBath = ItemList.Machine_IV_ChemicalBath.get(1); - } + IC2MFE = ItemUtils.getItemStackWithMeta(true, "IC2:blockElectric", "IC2_MFE", 1, 1); + IC2MFSU = ItemUtils.getItemStackWithMeta(true, "IC2:blockElectric", "IC2_MFSU", 2, 1); + + // Lava Boiler + boiler_Coal = ItemList.Machine_Bronze_Boiler.get(1); + + // IV/EV/HV MACHINES + IV_MACHINE_Electrolyzer = ItemList.Machine_IV_Electrolyzer.get(1); + IV_MACHINE_Centrifuge = ItemList.Machine_IV_Centrifuge.get(1); + IV_MACHINE_BendingMachine = ItemList.Machine_IV_Bender.get(1); + IV_MACHINE_Wiremill = ItemList.Machine_IV_Wiremill.get(1); + IV_MACHINE_Macerator = ItemList.Machine_IV_Macerator.get(1); + IV_MACHINE_Cutter = ItemList.Machine_IV_Cutter.get(1); + IV_MACHINE_Extruder = ItemList.Machine_IV_Extruder.get(1); + HV_MACHINE_Sifter = ItemList.Machine_HV_Sifter.get(1); + IV_MACHINE_ThermalCentrifuge = ItemList.Machine_IV_ThermalCentrifuge.get(1); + IV_MACHINE_OreWasher = ItemList.Machine_IV_OreWasher.get(1); + IV_MACHINE_AlloySmelter = ItemList.Machine_IV_AlloySmelter.get(1); + IV_MACHINE_Mixer = ItemList.Machine_IV_Mixer.get(1); + IV_MACHINE_ChemicalBath = ItemList.Machine_IV_ChemicalBath.get(1); if (CORE.ConfigSwitches.enableMultiblock_IndustrialCokeOven) { if (LoadedMods.Railcraft) { // Misc @@ -1010,1024 +1005,1006 @@ public class RECIPES_Machines { } private static void runModRecipes() { - 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) }, - ELEMENT.getInstance().TANTALUM.getFluidStack(144 * 16), - GregtechItemList.Gregtech_Computer_Cube.get(1), - 60 * 20 * 3, - 8000); + // 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) }, + ELEMENT.getInstance().TANTALUM.getFluidStack(144 * 16), + GregtechItemList.Gregtech_Computer_Cube.get(1), + 60 * 20 * 3, + 8000); - // 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) }, - 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), - ItemUtils.getItemStackOfAmountFromOreDict("plateDenseLead", 9), - 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) }, - ALLOY.NIOBIUM_CARBIDE.getFluidStack(144 * 16), - GregtechItemList.RTG.get(1), - 60 * 20 * 10, - 8000); - - // Super Jukebox - CORE.RA.addSixSlotAssemblingRecipe( - 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); + // 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) }, + 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), + ItemUtils.getItemStackOfAmountFromOreDict("plateDenseLead", 9), + 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) }, + ALLOY.NIOBIUM_CARBIDE.getFluidStack(144 * 16), + GregtechItemList.RTG.get(1), + 60 * 20 * 10, + 8000); + + // Super Jukebox + CORE.RA.addSixSlotAssemblingRecipe( + 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 aFluidRegulator2 = ItemUtils.getValueOfItemList( - "FluidRegulator_IV", - 2, - ItemUtils.getValueOfItemList("Electric_Pump_LuV", 4, ItemList.Electric_Pump_IV)); + ItemStack aFluidRegulator1 = ItemUtils.getValueOfItemList("FluidRegulator_MV", 2, ItemList.Electric_Pump_HV); + ItemStack aFluidRegulator2 = ItemUtils.getValueOfItemList( + "FluidRegulator_IV", + 2, + ItemUtils.getValueOfItemList("Electric_Pump_LuV", 4, ItemList.Electric_Pump_IV)); - // 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) }, - ALLOY.TUMBAGA.getFluidStack(144 * 4), - ItemUtils.getSimpleStack(ModBlocks.blockPooCollector), - 20 * 60, - 30); + // 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) }, + ALLOY.TUMBAGA.getFluidStack(144 * 4), + ItemUtils.getSimpleStack(ModBlocks.blockPooCollector), + 20 * 60, + 30); - // 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) }, - CI.getAlternativeTieredFluid(5, 144 * 9), - ItemUtils.getSimpleStack(ModBlocks.blockPooCollector, 8, 1), - 20 * 60 * 5, - 500); + // 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) }, + CI.getAlternativeTieredFluid(5, 144 * 9), + ItemUtils.getSimpleStack(ModBlocks.blockPooCollector, 8, 1), + 20 * 60 * 5, + 500); + + // Basic Steam Turbine + RecipeUtils.addShapedGregtechRecipe( + CI.getTieredComponent(OrePrefixes.pipeSmall, 0, 1), + "circuitPrimitive", + CI.getTieredComponent(OrePrefixes.pipeSmall, 0, 1), + ALLOY.TUMBAGA.getRotor(1), + CI.machineCasing_ULV, + ALLOY.TUMBAGA.getRotor(1), + CI.getElectricMotor(0, 1), + "cableGt01RedAlloy", + CI.getElectricMotor(0, 1), + GregtechItemList.Generator_Steam_Turbine_ULV.get(1)); - // Basic Steam Turbine - RecipeUtils.addShapedGregtechRecipe( - CI.getTieredComponent(OrePrefixes.pipeSmall, 0, 1), - "circuitPrimitive", - CI.getTieredComponent(OrePrefixes.pipeSmall, 0, 1), - ALLOY.TUMBAGA.getRotor(1), - CI.machineCasing_ULV, - ALLOY.TUMBAGA.getRotor(1), - CI.getElectricMotor(0, 1), - "cableGt01RedAlloy", - CI.getElectricMotor(0, 1), - GregtechItemList.Generator_Steam_Turbine_ULV.get(1)); + // Basic Gas Turbine + RecipeUtils.addShapedGregtechRecipe( + "circuitPrimitive", + ALLOY.TUMBAGA.getRotor(1), + "circuitPrimitive", + ALLOY.TUMBAGA.getRotor(1), + CI.machineCasing_ULV, + ALLOY.TUMBAGA.getRotor(1), + CI.getElectricMotor(0, 1), + "cableGt01RedAlloy", + CI.getElectricMotor(0, 1), + GregtechItemList.Generator_Gas_Turbine_ULV.get(1)); - // Basic Gas Turbine + // Basic Combustion Turbine + RecipeUtils.addShapedGregtechRecipe( + CI.getElectricPiston(0, 1), + "circuitPrimitive", + CI.getElectricPiston(0, 1), + CI.getElectricMotor(0, 1), + CI.machineCasing_ULV, + CI.getElectricMotor(0, 1), + ALLOY.TUMBAGA.getGear(1), + "cableGt01RedAlloy", + ALLOY.TUMBAGA.getGear(1), + GregtechItemList.Generator_Diesel_ULV.get(1)); + + // Steam Condenser + if (CORE.ConfigSwitches.enableMachine_SteamConverter) { + RECIPE_SteamCondenser = GregtechItemList.Condensor_MAX.get(1); RecipeUtils.addShapedGregtechRecipe( - "circuitPrimitive", - ALLOY.TUMBAGA.getRotor(1), - "circuitPrimitive", - ALLOY.TUMBAGA.getRotor(1), - CI.machineCasing_ULV, - ALLOY.TUMBAGA.getRotor(1), - CI.getElectricMotor(0, 1), - "cableGt01RedAlloy", - CI.getElectricMotor(0, 1), - GregtechItemList.Generator_Gas_Turbine_ULV.get(1)); + pipeLargeCopper, + pipeHugeSteel, + pipeLargeCopper, + plateEnergeticAlloy, + CI.electricPump_HV, + plateEnergeticAlloy, + plateEnergeticAlloy, + pipeLargeCopper, + plateEnergeticAlloy, + RECIPE_SteamCondenser); + } - // Basic Combustion Turbine - RecipeUtils.addShapedGregtechRecipe( - CI.getElectricPiston(0, 1), - "circuitPrimitive", - CI.getElectricPiston(0, 1), - CI.getElectricMotor(0, 1), - CI.machineCasing_ULV, - CI.getElectricMotor(0, 1), - ALLOY.TUMBAGA.getGear(1), - "cableGt01RedAlloy", - ALLOY.TUMBAGA.getGear(1), - GregtechItemList.Generator_Diesel_ULV.get(1)); - - // Steam Condenser - if (CORE.ConfigSwitches.enableMachine_SteamConverter) { - RECIPE_SteamCondenser = GregtechItemList.Condensor_MAX.get(1); - RecipeUtils.addShapedGregtechRecipe( - pipeLargeCopper, - pipeHugeSteel, - pipeLargeCopper, - plateEnergeticAlloy, - CI.electricPump_HV, - plateEnergeticAlloy, - plateEnergeticAlloy, - pipeLargeCopper, - plateEnergeticAlloy, - RECIPE_SteamCondenser); - } + ItemStack aBronzeBricks = ItemUtils.simpleMetaStack(GregTech_API.sBlockCasings1, 10, 1); + // Steam Macerator Multi + RecipeUtils.addShapedGregtechRecipe( + aBronzeBricks, + "gemDiamond", + aBronzeBricks, + "craftingPiston", + ALLOY.TUMBAGA.getFrameBox(1), + "craftingPiston", + aBronzeBricks, + "gemDiamond", + aBronzeBricks, + GregtechItemList.Controller_SteamMaceratorMulti.get(1)); + // Steam Compressor Multi + RecipeUtils.addShapedGregtechRecipe( + aBronzeBricks, + "craftingPiston", + aBronzeBricks, + ALLOY.TUMBAGA.getGear(1), + ALLOY.TUMBAGA.getFrameBox(1), + ALLOY.TUMBAGA.getGear(1), + aBronzeBricks, + "craftingPiston", + aBronzeBricks, + GregtechItemList.Controller_SteamCompressorMulti.get(1)); + + // Steam Hatch + RecipeUtils.addShapedGregtechRecipe( + "plateBronze", + "pipeMediumBronze", + "plateBronze", + "plateBronze", + GregtechItemList.GT_FluidTank_ULV.get(1), + "plateBronze", + "plateBronze", + "pipeMediumBronze", + "plateBronze", + GregtechItemList.Hatch_Input_Steam.get(1)); + + // Steam Input Bus + RecipeUtils.addShapedGregtechRecipe( + "plateBronze", + ALLOY.TUMBAGA.getPlate(1), + "plateBronze", + "plateTin", + ItemUtils.getSimpleStack(Blocks.hopper), + "plateTin", + "plateBronze", + ALLOY.TUMBAGA.getPlate(1), + "plateBronze", + GregtechItemList.Hatch_Input_Bus_Steam.get(1)); - ItemStack aBronzeBricks = ItemUtils.simpleMetaStack(GregTech_API.sBlockCasings1, 10, 1); - // Steam Macerator Multi - RecipeUtils.addShapedGregtechRecipe( - aBronzeBricks, - "gemDiamond", - aBronzeBricks, - "craftingPiston", - ALLOY.TUMBAGA.getFrameBox(1), - "craftingPiston", - aBronzeBricks, - "gemDiamond", - aBronzeBricks, - GregtechItemList.Controller_SteamMaceratorMulti.get(1)); - // Steam Compressor Multi - RecipeUtils.addShapedGregtechRecipe( - aBronzeBricks, - "craftingPiston", - aBronzeBricks, - ALLOY.TUMBAGA.getGear(1), - ALLOY.TUMBAGA.getFrameBox(1), - ALLOY.TUMBAGA.getGear(1), - aBronzeBricks, - "craftingPiston", - aBronzeBricks, - GregtechItemList.Controller_SteamCompressorMulti.get(1)); - - // Steam Hatch - RecipeUtils.addShapedGregtechRecipe( - "plateBronze", - "pipeMediumBronze", - "plateBronze", - "plateBronze", - GregtechItemList.GT_FluidTank_ULV.get(1), - "plateBronze", - "plateBronze", - "pipeMediumBronze", - "plateBronze", - GregtechItemList.Hatch_Input_Steam.get(1)); - - // Steam Input Bus - RecipeUtils.addShapedGregtechRecipe( - "plateBronze", - ALLOY.TUMBAGA.getPlate(1), - "plateBronze", - "plateTin", - ItemUtils.getSimpleStack(Blocks.hopper), - "plateTin", - "plateBronze", - ALLOY.TUMBAGA.getPlate(1), - "plateBronze", - GregtechItemList.Hatch_Input_Bus_Steam.get(1)); - - // Steam Output Bus + // Steam Output Bus + RecipeUtils.addShapedGregtechRecipe( + "plateBronze", + "plateTin", + "plateBronze", + ALLOY.TUMBAGA.getPlate(1), + ItemUtils.getSimpleStack(Blocks.hopper), + ALLOY.TUMBAGA.getPlate(1), + "plateBronze", + "plateTin", + "plateBronze", + GregtechItemList.Hatch_Output_Bus_Steam.get(1)); + + // RF Convertor + if (LoadedMods.CoFHCore && CORE.ConfigSwitches.enableMachine_RF_Convetor) { RecipeUtils.addShapedGregtechRecipe( - "plateBronze", - "plateTin", - "plateBronze", - ALLOY.TUMBAGA.getPlate(1), - ItemUtils.getSimpleStack(Blocks.hopper), - ALLOY.TUMBAGA.getPlate(1), - "plateBronze", - "plateTin", - "plateBronze", - GregtechItemList.Hatch_Output_Bus_Steam.get(1)); - - // RF Convertor - if (LoadedMods.CoFHCore && CORE.ConfigSwitches.enableMachine_RF_Convetor) { - RecipeUtils.addShapedGregtechRecipe( - CI.getPlate(4, 1), - CI.getTieredCircuitOreDictName(5), - CI.getPlate(4, 1), - CI.getTransmissionComponent(3, 1), - CI.getTieredGTPPMachineCasing(4, 1), - CI.getTransmissionComponent(3, 1), - CI.getPlate(4, 1), - plateEnergeticAlloy, - CI.getPlate(4, 1), - GregtechItemList.Energy_Buffer_RF_Convertor.get(1)); - } + CI.getPlate(4, 1), + CI.getTieredCircuitOreDictName(5), + CI.getPlate(4, 1), + CI.getTransmissionComponent(3, 1), + CI.getTieredGTPPMachineCasing(4, 1), + CI.getTransmissionComponent(3, 1), + CI.getPlate(4, 1), + plateEnergeticAlloy, + CI.getPlate(4, 1), + GregtechItemList.Energy_Buffer_RF_Convertor.get(1)); + } - // Egg Box + // 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) }, + FluidUtils.getFluidStack("mobessence", 4096), + ItemUtils.getSimpleStack(ModBlocks.blockEggBox, 1), + 20 * 60, + 480); + + // Flask Configurator + if (Meta_GT_Proxy.sDoesVolumetricFlaskExist) { 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) }, - FluidUtils.getFluidStack("mobessence", 4096), - ItemUtils.getSimpleStack(ModBlocks.blockEggBox, 1), + 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, - 480); + 120); + } - // 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) }, - CI.getAlternativeTieredFluid(1, 144 * 8), - ItemUtils.getSimpleStack(ModBlocks.blockVolumetricFlaskSetter, 1), - 20 * 60, - 120); - } + if (CORE.ConfigSwitches.enableMultiblock_IronBlastFurnace) { - if (CORE.ConfigSwitches.enableMultiblock_IronBlastFurnace) { + RECIPE_IronBlastFurnace = GregtechItemList.Machine_Iron_BlastFurnace.get(1); + RECIPE_IronPlatedBricks = GregtechItemList.Casing_IronPlatedBricks.get(1); - RECIPE_IronBlastFurnace = GregtechItemList.Machine_Iron_BlastFurnace.get(1); - RECIPE_IronPlatedBricks = GregtechItemList.Casing_IronPlatedBricks.get(1); + // Iron BF + RecipeUtils.addShapedGregtechRecipe( + "plateDoubleAnyIron", + "craftingFurnace", + "plateDoubleAnyIron", + boiler_Coal, + CI.machineCasing_ULV, + boiler_Coal, + "plateDoubleAnyIron", + "bucketLava", + "plateDoubleAnyIron", + RECIPE_IronBlastFurnace); + // Iron plated Bricks + RecipeUtils.addShapedGregtechRecipe( + "plateAnyIron", + RECIPES_Tools.craftingToolHardHammer, + "plateAnyIron", + "plateAnyIron", + blockBricks, + "plateAnyIron", + "plateAnyIron", + RECIPES_Tools.craftingToolWrench, + "plateAnyIron", + RECIPE_IronPlatedBricks); + + // Add recycle recipes for the Iron Plated Bricks + // GT_ModHandler.addPulverisationRecipe(RECIPE_IronPlatedBricks, + // ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustIron", 6), + // ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustClay", 2), true); + CORE.RA.addPulverisationRecipe( + RECIPE_IronPlatedBricks, + ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustIron", 6), + ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustClay", 2), + null); + GT_Values.RA.addArcFurnaceRecipe( + RECIPE_IronPlatedBricks, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotWroughtIron", 6), + ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustAsh", 2) }, + new int[] { 0 }, + 32 * 20, + 32); + } - // Iron BF - RecipeUtils.addShapedGregtechRecipe( - "plateDoubleAnyIron", - "craftingFurnace", - "plateDoubleAnyIron", - boiler_Coal, - CI.machineCasing_ULV, - boiler_Coal, - "plateDoubleAnyIron", - "bucketLava", - "plateDoubleAnyIron", - RECIPE_IronBlastFurnace); - // Iron plated Bricks - RecipeUtils.addShapedGregtechRecipe( - "plateAnyIron", - RECIPES_Tools.craftingToolHardHammer, - "plateAnyIron", - "plateAnyIron", - blockBricks, - "plateAnyIron", - "plateAnyIron", - RECIPES_Tools.craftingToolWrench, - "plateAnyIron", - RECIPE_IronPlatedBricks); - - // Add recycle recipes for the Iron Plated Bricks - // GT_ModHandler.addPulverisationRecipe(RECIPE_IronPlatedBricks, - // ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustIron", 6), - // ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustClay", 2), true); - CORE.RA.addPulverisationRecipe( - RECIPE_IronPlatedBricks, - ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustIron", 6), - ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustClay", 2), - null); - GT_Values.RA.addArcFurnaceRecipe( - RECIPE_IronPlatedBricks, - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotWroughtIron", 6), - ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustAsh", 2) }, - new int[] { 0 }, - 32 * 20, - 32); - } + if (CORE.ConfigSwitches.enableMultiblock_IndustrialCentrifuge) { + // Industrial Centrifuge + RECIPE_IndustrialCentrifugeController = GregtechItemList.Industrial_Centrifuge.get(1); + RECIPE_IndustrialCentrifugeCasing = GregtechItemList.Casing_Centrifuge1.get(1); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialCentrifuge) { - // Industrial Centrifuge - RECIPE_IndustrialCentrifugeController = GregtechItemList.Industrial_Centrifuge.get(1); - RECIPE_IndustrialCentrifugeCasing = GregtechItemList.Casing_Centrifuge1.get(1); + // Industrial Centrifuge + RecipeUtils.addShapedGregtechRecipe( + CI.circuitTier5, + pipeHugeStainlessSteel, + CI.circuitTier5, + CI.component_Plate[6], + IV_MACHINE_Centrifuge, + CI.component_Plate[6], + CI.component_Plate[8], + CI.machineCasing_IV, + CI.component_Plate[8], + RECIPE_IndustrialCentrifugeController); + // Centrifuge Casing + RecipeUtils.addShapedGregtechRecipe( + CI.component_Plate[6], + "stickTumbaga", + CI.component_Plate[6], + CI.component_Plate[8], + "stickTumbaga", + CI.component_Plate[8], + CI.component_Plate[6], + "stickTumbaga", + 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), }, + GT_Values.NF, + RECIPE_IndustrialCentrifugeCasing, + 50, + 16); + } - // Industrial Centrifuge - RecipeUtils.addShapedGregtechRecipe( - CI.circuitTier5, - pipeHugeStainlessSteel, - CI.circuitTier5, - CI.component_Plate[6], - IV_MACHINE_Centrifuge, - CI.component_Plate[6], - CI.component_Plate[8], - CI.machineCasing_IV, - CI.component_Plate[8], - RECIPE_IndustrialCentrifugeController); - // Centrifuge Casing - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[6], - "stickTumbaga", - CI.component_Plate[6], - CI.component_Plate[8], - "stickTumbaga", - CI.component_Plate[8], - CI.component_Plate[6], - "stickTumbaga", - 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), }, - GT_Values.NF, - RECIPE_IndustrialCentrifugeCasing, - 50, - 16); - } + if (CORE.ConfigSwitches.enableMultiblock_IndustrialCokeOven) { + // Industrial Coke Oven + RECIPE_IndustrialCokeOvenController = GregtechItemList.Industrial_CokeOven.get(1); + RECIPE_IndustrialCokeOvenFrame = GregtechItemList.Casing_CokeOven.get(1); + RECIPE_IndustrialCokeOvenCasingA = GregtechItemList.Casing_CokeOven_Coil1.get(1); + RECIPE_IndustrialCokeOvenCasingB = GregtechItemList.Casing_CokeOven_Coil2.get(1); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialCokeOven) { + if (LoadedMods.Railcraft) { // Industrial Coke Oven - RECIPE_IndustrialCokeOvenController = GregtechItemList.Industrial_CokeOven.get(1); - RECIPE_IndustrialCokeOvenFrame = GregtechItemList.Casing_CokeOven.get(1); - RECIPE_IndustrialCokeOvenCasingA = GregtechItemList.Casing_CokeOven_Coil1.get(1); - RECIPE_IndustrialCokeOvenCasingB = GregtechItemList.Casing_CokeOven_Coil2.get(1); - - if (LoadedMods.Railcraft) { - // Industrial Coke Oven - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[7], - CI.circuitTier4, - CI.component_Plate[7], - CI.machineCasing_EV, - INPUT_RCCokeOvenBlock, - CI.machineCasing_EV, - CI.component_Plate[7], - CI.circuitTier4, - CI.component_Plate[7], - RECIPE_IndustrialCokeOvenController); - } - if (LoadedMods.ImmersiveEngineering) { - // Industrial Coke Oven - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[8], - CI.circuitTier4, - CI.component_Plate[8], - CI.machineCasing_EV, - INPUT_IECokeOvenBlock, - CI.machineCasing_EV, - CI.component_Plate[8], - CI.circuitTier4, - CI.component_Plate[8], - RECIPE_IndustrialCokeOvenController); - } - // Coke Oven Frame Casing RecipeUtils.addShapedGregtechRecipe( CI.component_Plate[7], - CI.component_Rod[7], + CI.circuitTier4, CI.component_Plate[7], - CI.component_Rod[7], - "frameGtTantalloy61", - CI.component_Rod[7], + CI.machineCasing_EV, + INPUT_RCCokeOvenBlock, + CI.machineCasing_EV, CI.component_Plate[7], - CI.component_Rod[7], + CI.circuitTier4, 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), }, - GT_Values.NF, - RECIPE_IndustrialCokeOvenFrame, - 50, - 16); - // Coke Oven Coil 1 - RecipeUtils.addShapedGregtechRecipe( - plateBronze, - plateBronze, - plateBronze, - "frameGtBronze", - CI.gearboxCasing_Tier_1, - "frameGtBronze", - plateBronze, - plateBronze, - plateBronze, - RECIPE_IndustrialCokeOvenCasingA); - // Coke Oven Coil 2 - RecipeUtils.addShapedGregtechRecipe( - plateSteel, - plateSteel, - plateSteel, - "frameGtSteel", - CI.gearboxCasing_Tier_2, - "frameGtSteel", - plateSteel, - plateSteel, - plateSteel, - RECIPE_IndustrialCokeOvenCasingB); + RECIPE_IndustrialCokeOvenController); } - - if (CORE.ConfigSwitches.enableMultiblock_IndustrialElectrolyzer) { - // Industrial Electrolyzer - RECIPE_IndustrialElectrolyzerController = GregtechItemList.Industrial_Electrolyzer.get(1); - RECIPE_IndustrialElectrolyzerFrame = GregtechItemList.Casing_Electrolyzer.get(1); - - // Electrolyzer Frame Casing - RecipeUtils.addShapedGregtechRecipe( - "platePotin", - "stickLongChrome", - "platePotin", - "stickLongPotin", - "frameGtPotin", - "stickLongPotin", - "platePotin", - "stickLongPotin", - "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), }, - GT_Values.NF, - RECIPE_IndustrialElectrolyzerFrame, - 50, - 16); - // Industrial Electrolyzer + if (LoadedMods.ImmersiveEngineering) { + // Industrial Coke Oven RecipeUtils.addShapedGregtechRecipe( - "plateStellite", - CI.circuitTier5, - "plateStellite", - CI.machineCasing_IV, - IV_MACHINE_Electrolyzer, - CI.machineCasing_IV, - "plateStellite", - "rotorStellite", - "plateStellite", - RECIPE_IndustrialElectrolyzerController); + CI.component_Plate[8], + CI.circuitTier4, + CI.component_Plate[8], + CI.machineCasing_EV, + INPUT_IECokeOvenBlock, + CI.machineCasing_EV, + CI.component_Plate[8], + CI.circuitTier4, + CI.component_Plate[8], + RECIPE_IndustrialCokeOvenController); } + // Coke Oven Frame Casing + RecipeUtils.addShapedGregtechRecipe( + CI.component_Plate[7], + CI.component_Rod[7], + CI.component_Plate[7], + CI.component_Rod[7], + "frameGtTantalloy61", + CI.component_Rod[7], + CI.component_Plate[7], + CI.component_Rod[7], + 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), }, + GT_Values.NF, + RECIPE_IndustrialCokeOvenFrame, + 50, + 16); + // Coke Oven Coil 1 + RecipeUtils.addShapedGregtechRecipe( + plateBronze, + plateBronze, + plateBronze, + "frameGtBronze", + CI.gearboxCasing_Tier_1, + "frameGtBronze", + plateBronze, + plateBronze, + plateBronze, + RECIPE_IndustrialCokeOvenCasingA); + // Coke Oven Coil 2 + RecipeUtils.addShapedGregtechRecipe( + plateSteel, + plateSteel, + plateSteel, + "frameGtSteel", + CI.gearboxCasing_Tier_2, + "frameGtSteel", + plateSteel, + plateSteel, + plateSteel, + RECIPE_IndustrialCokeOvenCasingB); + } - if (CORE.ConfigSwitches.enableMultiblock_IndustrialPlatePress) { - // Industrial Material Press - RECIPE_IndustrialMaterialPressController = GregtechItemList.Industrial_PlatePress.get(1); - RECIPE_IndustrialMaterialPressFrame = GregtechItemList.Casing_MaterialPress.get(1); + if (CORE.ConfigSwitches.enableMultiblock_IndustrialElectrolyzer) { + // Industrial Electrolyzer + RECIPE_IndustrialElectrolyzerController = GregtechItemList.Industrial_Electrolyzer.get(1); + RECIPE_IndustrialElectrolyzerFrame = GregtechItemList.Casing_Electrolyzer.get(1); - // Material Press Frame Casing - RecipeUtils.addShapedGregtechRecipe( - "plateTitanium", - "stickLongTumbaga", - "plateTitanium", - "stickTantalloy60", - "frameGtTumbaga", - "stickTantalloy60", - "plateTitanium", - "stickLongTumbaga", - "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), }, - GT_Values.NF, - RECIPE_IndustrialMaterialPressFrame, - 50, - 16); - // Industrial Material Press - RecipeUtils.addShapedGregtechRecipe( - "plateTitanium", - CI.circuitTier5, - "plateTitanium", - CI.machineCasing_IV, - IV_MACHINE_BendingMachine, - CI.machineCasing_IV, - "plateTitanium", - CI.circuitTier5, - "plateTitanium", - RECIPE_IndustrialMaterialPressController); - } + // Electrolyzer Frame Casing + RecipeUtils.addShapedGregtechRecipe( + "platePotin", + "stickLongChrome", + "platePotin", + "stickLongPotin", + "frameGtPotin", + "stickLongPotin", + "platePotin", + "stickLongPotin", + "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), }, + GT_Values.NF, + RECIPE_IndustrialElectrolyzerFrame, + 50, + 16); + // Industrial Electrolyzer + RecipeUtils.addShapedGregtechRecipe( + "plateStellite", + CI.circuitTier5, + "plateStellite", + CI.machineCasing_IV, + IV_MACHINE_Electrolyzer, + CI.machineCasing_IV, + "plateStellite", + "rotorStellite", + "plateStellite", + RECIPE_IndustrialElectrolyzerController); + } - if (CORE.ConfigSwitches.enableMultiblock_IndustrialMacerationStack) { - // Industrial Maceration Stack - RECIPE_IndustrialMacerationStackController = GregtechItemList.Industrial_MacerationStack.get(1); - RECIPE_IndustrialMacerationStackFrame = GregtechItemList.Casing_MacerationStack.get(1); + if (CORE.ConfigSwitches.enableMultiblock_IndustrialPlatePress) { + // Industrial Material Press + RECIPE_IndustrialMaterialPressController = GregtechItemList.Industrial_PlatePress.get(1); + RECIPE_IndustrialMaterialPressFrame = GregtechItemList.Casing_MaterialPress.get(1); - // Maceration Frame Casing - RecipeUtils.addShapedGregtechRecipe( - "platePalladium", - "platePalladium", - "platePalladium", - "stickPlatinum", - "frameGtInconel625", - "stickPlatinum", - "platePalladium", - "stickLongPalladium", - "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), }, - GT_Values.NF, - RECIPE_IndustrialMacerationStackFrame, - 50, - 16); - // Industrial Maceration stack - RecipeUtils.addShapedGregtechRecipe( - "plateTungstenCarbide", - IV_MACHINE_Macerator, - "plateTungstenCarbide", - IV_MACHINE_Macerator, - CI.circuitTier7, - IV_MACHINE_Macerator, - "plateTungstenCarbide", - IV_MACHINE_Macerator, - "plateTungstenCarbide", - RECIPE_IndustrialMacerationStackController); - } + // Material Press Frame Casing + RecipeUtils.addShapedGregtechRecipe( + "plateTitanium", + "stickLongTumbaga", + "plateTitanium", + "stickTantalloy60", + "frameGtTumbaga", + "stickTantalloy60", + "plateTitanium", + "stickLongTumbaga", + "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), }, + GT_Values.NF, + RECIPE_IndustrialMaterialPressFrame, + 50, + 16); + // Industrial Material Press + RecipeUtils.addShapedGregtechRecipe( + "plateTitanium", + CI.circuitTier5, + "plateTitanium", + CI.machineCasing_IV, + IV_MACHINE_BendingMachine, + CI.machineCasing_IV, + "plateTitanium", + CI.circuitTier5, + "plateTitanium", + RECIPE_IndustrialMaterialPressController); + } - if (CORE.ConfigSwitches.enableMultiblock_IndustrialWireMill) { - // Industrial Wire Factory - RECIPE_IndustrialWireFactoryController = GregtechItemList.Industrial_WireFactory.get(1); - RECIPE_IndustrialWireFactoryFrame = GregtechItemList.Casing_WireFactory.get(1); + if (CORE.ConfigSwitches.enableMultiblock_IndustrialMacerationStack) { + // Industrial Maceration Stack + RECIPE_IndustrialMacerationStackController = GregtechItemList.Industrial_MacerationStack.get(1); + RECIPE_IndustrialMacerationStackFrame = GregtechItemList.Casing_MacerationStack.get(1); - // Wire Factory Frame Casing - RecipeUtils.addShapedGregtechRecipe( - "plateBlueSteel", - "stickBlueSteel", - "plateBlueSteel", - "stickBlueSteel", - "frameGtBlueSteel", - "stickBlueSteel", - "plateBlueSteel", - "stickBlueSteel", - "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), }, - GT_Values.NF, - RECIPE_IndustrialWireFactoryFrame, - 50, - 16); - // Industrial Wire Factory - RecipeUtils.addShapedGregtechRecipe( - "plateZeron100", - CI.machineCasing_IV, - "plateZeron100", - CI.circuitTier5, - IV_MACHINE_Wiremill, - CI.circuitTier5, - "plateZeron100", - CI.machineCasing_IV, - "plateZeron100", - RECIPE_IndustrialWireFactoryController); - } + // Maceration Frame Casing + RecipeUtils.addShapedGregtechRecipe( + "platePalladium", + "platePalladium", + "platePalladium", + "stickPlatinum", + "frameGtInconel625", + "stickPlatinum", + "platePalladium", + "stickLongPalladium", + "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), }, + GT_Values.NF, + RECIPE_IndustrialMacerationStackFrame, + 50, + 16); + // Industrial Maceration stack + RecipeUtils.addShapedGregtechRecipe( + "plateTungstenCarbide", + IV_MACHINE_Macerator, + "plateTungstenCarbide", + IV_MACHINE_Macerator, + CI.circuitTier7, + IV_MACHINE_Macerator, + "plateTungstenCarbide", + IV_MACHINE_Macerator, + "plateTungstenCarbide", + RECIPE_IndustrialMacerationStackController); + } - // Tiered Tanks - if (CORE.ConfigSwitches.enableMachine_FluidTanks) { - CI.component_Plate[1] = "plateTin"; - pipeTier1 = "pipeLargeClay"; - CI.circuitTier1 = ItemList.Circuit_Primitive.get(1); - CI.component_Plate[2] = "plateCopper"; - pipeTier2 = "pipeHugeClay"; - CI.component_Plate[3] = "plateBronze"; - pipeTier3 = "pipeMediumBronze"; - CI.component_Plate[4] = "plateIron"; - pipeTier4 = "pipeMediumSteel"; - CI.component_Plate[5] = "plateSteel"; - CI.component_Plate[6] = "plateRedstone"; - CI.component_Plate[7] = "plateAluminium"; - CI.component_Plate[8] = "plateDarkSteel"; - 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 }; - for (GregtechItemList aTank : aTanks) { - RecipeUtils.addShapedGregtechRecipe( - aTank.get(1), - null, - null, - null, - null, - null, - null, - null, - null, - aTank.get(1)); - } + if (CORE.ConfigSwitches.enableMultiblock_IndustrialWireMill) { + // Industrial Wire Factory + RECIPE_IndustrialWireFactoryController = GregtechItemList.Industrial_WireFactory.get(1); + RECIPE_IndustrialWireFactoryFrame = GregtechItemList.Casing_WireFactory.get(1); + // Wire Factory Frame Casing + RecipeUtils.addShapedGregtechRecipe( + "plateBlueSteel", + "stickBlueSteel", + "plateBlueSteel", + "stickBlueSteel", + "frameGtBlueSteel", + "stickBlueSteel", + "plateBlueSteel", + "stickBlueSteel", + "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), }, + GT_Values.NF, + RECIPE_IndustrialWireFactoryFrame, + 50, + 16); + // Industrial Wire Factory + RecipeUtils.addShapedGregtechRecipe( + "plateZeron100", + CI.machineCasing_IV, + "plateZeron100", + CI.circuitTier5, + IV_MACHINE_Wiremill, + CI.circuitTier5, + "plateZeron100", + CI.machineCasing_IV, + "plateZeron100", + RECIPE_IndustrialWireFactoryController); + } + + // Tiered Tanks + if (CORE.ConfigSwitches.enableMachine_FluidTanks) { + CI.component_Plate[1] = "plateTin"; + pipeTier1 = "pipeLargeClay"; + CI.circuitTier1 = ItemList.Circuit_Primitive.get(1); + CI.component_Plate[2] = "plateCopper"; + pipeTier2 = "pipeHugeClay"; + CI.component_Plate[3] = "plateBronze"; + pipeTier3 = "pipeMediumBronze"; + CI.component_Plate[4] = "plateIron"; + pipeTier4 = "pipeMediumSteel"; + CI.component_Plate[5] = "plateSteel"; + CI.component_Plate[6] = "plateRedstone"; + CI.component_Plate[7] = "plateAluminium"; + CI.component_Plate[8] = "plateDarkSteel"; + 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 }; + for (GregtechItemList aTank : aTanks) { RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[1], - CI.component_Plate[5], - CI.component_Plate[1], - CI.component_Plate[4], - pipeTier1, - CI.component_Plate[4], - CI.component_Plate[4], - waterBucket, - CI.component_Plate[4], - GregtechItemList.GT_FluidTank_ULV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[5], - CI.component_Plate[4], - CI.component_Plate[5], - CI.component_Plate[3], - pipeTier2, - CI.component_Plate[3], - CI.component_Plate[3], - CI.electricPump_LV, - CI.component_Plate[3], - GregtechItemList.GT_FluidTank_LV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[8], - CI.component_Plate[3], - CI.component_Plate[8], - CI.component_Plate[5], - pipeTier3, - CI.component_Plate[5], - CI.component_Plate[5], - CI.electricPump_LV, - CI.component_Plate[5], - GregtechItemList.GT_FluidTank_MV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.circuitTier1, - CI.component_Plate[7], - CI.circuitTier1, - CI.component_Plate[8], - pipeTier4, - CI.component_Plate[8], - CI.circuitTier1, - CI.electricPump_MV, - CI.circuitTier1, - GregtechItemList.GT_FluidTank_HV.get(1)); + aTank.get(1), + null, + null, + null, + null, + null, + null, + null, + null, + aTank.get(1)); } - if (CORE.ConfigSwitches.enableMultiblock_MultiTank) { - // Industrial Multi Tank - // RECIPE_IndustrialMultiTankController = GregtechItemList.Industrial_MultiTank.get(1); - RECIPE_IndustrialMultiTankFrame = GregtechItemList.Casing_MultitankExterior.get(1); + RecipeUtils.addShapedGregtechRecipe( + CI.component_Plate[1], + CI.component_Plate[5], + CI.component_Plate[1], + CI.component_Plate[4], + pipeTier1, + CI.component_Plate[4], + CI.component_Plate[4], + waterBucket, + CI.component_Plate[4], + GregtechItemList.GT_FluidTank_ULV.get(1)); + RecipeUtils.addShapedGregtechRecipe( + CI.component_Plate[5], + CI.component_Plate[4], + CI.component_Plate[5], + CI.component_Plate[3], + pipeTier2, + CI.component_Plate[3], + CI.component_Plate[3], + CI.electricPump_LV, + CI.component_Plate[3], + GregtechItemList.GT_FluidTank_LV.get(1)); + RecipeUtils.addShapedGregtechRecipe( + CI.component_Plate[8], + CI.component_Plate[3], + CI.component_Plate[8], + CI.component_Plate[5], + pipeTier3, + CI.component_Plate[5], + CI.component_Plate[5], + CI.electricPump_LV, + CI.component_Plate[5], + GregtechItemList.GT_FluidTank_MV.get(1)); + RecipeUtils.addShapedGregtechRecipe( + CI.circuitTier1, + CI.component_Plate[7], + CI.circuitTier1, + CI.component_Plate[8], + pipeTier4, + CI.component_Plate[8], + CI.circuitTier1, + CI.electricPump_MV, + CI.circuitTier1, + GregtechItemList.GT_FluidTank_HV.get(1)); + } - // Industrial Multi Tank Casing - RecipeUtils.addShapedGregtechRecipe( - "stickGrisium", - "plateGrisium", - "stickGrisium", - "plateGrisium", - "frameGtGrisium", - "plateGrisium", - "plateGrisium", - "plateGrisium", - "plateGrisium", - RECIPE_IndustrialMultiTankFrame); - // Industrial Multi Tank - RecipeUtils.addShapedGregtechRecipe( - "pipeHugeTantalloy60", - "gearGrisium", - "pipeHugeTantalloy60", - CI.circuitTier4, - RECIPE_IndustrialMultiTankFrame, - CI.circuitTier4, - "plateDoubleGrisium", - "rotorGrisium", - "plateDoubleGrisium", - RECIPE_IndustrialMultiTankController); - } - // TODO - - // 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) }; - - // 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) }; - for (int o = 0; o < 5; o++) { - CORE.RA.addSixSlotAssemblingRecipe( - aSemiFluidInputs[o], - aSemiFluidFluidInputs[o], - aSemifluids[o], - 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) }); - - if (CORE.ConfigSwitches.enableMultiblock_AlloyBlastSmelter) { - // Industrial Blast Smelter - RECIPE_IndustrialBlastSmelterController = GregtechItemList.Industrial_AlloyBlastSmelter.get(1); - RECIPE_IndustrialBlastSmelterFrame = GregtechItemList.Casing_BlastSmelter.get(1); - RECIPE_IndustrialBlastSmelterCoil = GregtechItemList.Casing_Coil_BlastSmelter.get(1); - - // Blast Smelter - RecipeUtils.addShapedGregtechRecipe( - "plateZirconiumCarbide", - CI.circuitTier5, - "plateZirconiumCarbide", - cableTier6, - IV_MACHINE_AlloySmelter, - cableTier6, - "plateZirconiumCarbide", - CI.circuitTier5, - "plateZirconiumCarbide", - RECIPE_IndustrialBlastSmelterController); - // Blast Smelter Frame Casing - RecipeUtils.addShapedGregtechRecipe( - "plateZirconiumCarbide", - CI.craftingToolHammer_Hard, - "plateZirconiumCarbide", - "plateZirconiumCarbide", - "frameGtZirconiumCarbide", - "plateZirconiumCarbide", - "plateZirconiumCarbide", - CI.craftingToolWrench, - "plateZirconiumCarbide", - RECIPE_IndustrialBlastSmelterFrame); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { ALLOY.ZIRCONIUM_CARBIDE.getPlate(6), ALLOY.ZIRCONIUM_CARBIDE.getFrameBox(1), - GT_Utility.getIntegratedCircuit(1), }, - GT_Values.NF, - RECIPE_IndustrialBlastSmelterFrame, - 50, - 16); - // Blast Smelter Coil - RecipeUtils.addShapedGregtechRecipe( - "plateStaballoy", - "plateStaballoy", - "plateStaballoy", - "frameGtStaballoy", - CI.gearboxCasing_Tier_3, - "frameGtStaballoy", - "plateStaballoy", - "plateStaballoy", - "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), }, - GT_Values.NF, - RECIPE_IndustrialBlastSmelterCoil, - 50, - 16); - } + if (CORE.ConfigSwitches.enableMultiblock_MultiTank) { + // Industrial Multi Tank + // RECIPE_IndustrialMultiTankController = GregtechItemList.Industrial_MultiTank.get(1); + RECIPE_IndustrialMultiTankFrame = GregtechItemList.Casing_MultitankExterior.get(1); + // Industrial Multi Tank Casing + RecipeUtils.addShapedGregtechRecipe( + "stickGrisium", + "plateGrisium", + "stickGrisium", + "plateGrisium", + "frameGtGrisium", + "plateGrisium", + "plateGrisium", + "plateGrisium", + "plateGrisium", + RECIPE_IndustrialMultiTankFrame); + // Industrial Multi Tank + RecipeUtils.addShapedGregtechRecipe( + "pipeHugeTantalloy60", + "gearGrisium", + "pipeHugeTantalloy60", + CI.circuitTier4, + RECIPE_IndustrialMultiTankFrame, + CI.circuitTier4, + "plateDoubleGrisium", + "rotorGrisium", + "plateDoubleGrisium", + RECIPE_IndustrialMultiTankController); + } + // TODO + + // 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) }; + + // 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) }; + for (int o = 0; o < 5; o++) { 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) }, - ALLOY.QUANTUM.getFluidStack(144 * 4), - GregtechItemList.Casing_Coil_QuantumForceTransformer.get(1), - 60 * 30, - MaterialUtils.getVoltageForTier(6)); + aSemiFluidInputs[o], + aSemiFluidFluidInputs[o], + aSemifluids[o], + 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) }); + + if (CORE.ConfigSwitches.enableMultiblock_AlloyBlastSmelter) { + // Industrial Blast Smelter + RECIPE_IndustrialBlastSmelterController = GregtechItemList.Industrial_AlloyBlastSmelter.get(1); + RECIPE_IndustrialBlastSmelterFrame = GregtechItemList.Casing_BlastSmelter.get(1); + RECIPE_IndustrialBlastSmelterCoil = GregtechItemList.Casing_Coil_BlastSmelter.get(1); + + // Blast Smelter + RecipeUtils.addShapedGregtechRecipe( + "plateZirconiumCarbide", + CI.circuitTier5, + "plateZirconiumCarbide", + cableTier6, + IV_MACHINE_AlloySmelter, + cableTier6, + "plateZirconiumCarbide", + CI.circuitTier5, + "plateZirconiumCarbide", + RECIPE_IndustrialBlastSmelterController); + // Blast Smelter Frame Casing + RecipeUtils.addShapedGregtechRecipe( + "plateZirconiumCarbide", + CI.craftingToolHammer_Hard, + "plateZirconiumCarbide", + "plateZirconiumCarbide", + "frameGtZirconiumCarbide", + "plateZirconiumCarbide", + "plateZirconiumCarbide", + CI.craftingToolWrench, + "plateZirconiumCarbide", + RECIPE_IndustrialBlastSmelterFrame); + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { ALLOY.ZIRCONIUM_CARBIDE.getPlate(6), ALLOY.ZIRCONIUM_CARBIDE.getFrameBox(1), + GT_Utility.getIntegratedCircuit(1), }, + GT_Values.NF, + RECIPE_IndustrialBlastSmelterFrame, + 50, + 16); + // Blast Smelter Coil + RecipeUtils.addShapedGregtechRecipe( + "plateStaballoy", + "plateStaballoy", + "plateStaballoy", + "frameGtStaballoy", + CI.gearboxCasing_Tier_3, + "frameGtStaballoy", + "plateStaballoy", + "plateStaballoy", + "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), }, + GT_Values.NF, + RECIPE_IndustrialBlastSmelterCoil, + 50, + 16); + } - TT_recipeAdder.addResearchableAssemblylineRecipe( - GregtechItemList.Casing_Coil_QuantumForceTransformer.get(1), - 2048 * 120 * 20, - 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) }, - GregtechItemList.QuantumForceTransformer.get(1), - 1200 * 20, - (int) GT_Values.VP[11]); - - if (CORE.ConfigSwitches.enableMultiblock_MatterFabricator) { - // Industrial Matter Fabricator - RECIPE_IndustrialMatterFabController = GregtechItemList.Industrial_MassFab.get(1); - RECIPE_IndustrialMatterFabFrame = GregtechItemList.Casing_MatterFab.get(1); - RECIPE_IndustrialMatterFabCoil = GregtechItemList.Casing_MatterGen.get(1); - - // Matter Fabricator CPU - RecipeUtils.addShapedGregtechRecipe( - CI.getPlate(8, 1), - CI.circuitTier8, - CI.getPlate(8, 1), - GT_OreDictUnificator.get(OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), 1L), - CI.machineCasing_UV, - GT_OreDictUnificator.get(OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), 1L), - CI.getPlate(8, 1), - CI.circuitTier8, - CI.getPlate(8, 1), - RECIPE_IndustrialMatterFabController); - // Matter Fabricator Frame Casing - RecipeUtils.addShapedGregtechRecipe( - "plateNiobiumCarbide", - CI.component_Rod[8], - "plateNiobiumCarbide", - CI.component_Rod[8], - "frameGtInconel690", - CI.component_Rod[8], - "plateNiobiumCarbide", - CI.component_Rod[8], - "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), }, - GT_Values.NF, - RECIPE_IndustrialMatterFabFrame, - 50, - 16); - // Matter Fabricator Coil - RecipeUtils.addShapedGregtechRecipe( - CI.getPlate(6, 1), - CI.getPlate(7, 1), - CI.getPlate(6, 1), - "frameGtStellite", - CI.machineCasing_UV, - "frameGtStellite", - CI.getPlate(6, 1), - CI.getPlate(7, 1), - 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), }, - GT_Values.NF, - RECIPE_IndustrialMatterFabCoil, - 50, - 16); - } + 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) }, + ALLOY.QUANTUM.getFluidStack(144 * 4), + GregtechItemList.Casing_Coil_QuantumForceTransformer.get(1), + 60 * 30, + MaterialUtils.getVoltageForTier(6)); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialSifter) { - // Industrial Sieve - RECIPE_IndustrialSieveController = GregtechItemList.Industrial_Sifter.get(1); - RECIPE_IndustrialSieveFrame = GregtechItemList.Casing_Sifter.get(1); - RECIPE_IndustrialSieveGrate = GregtechItemList.Casing_SifterGrate.get(1); + TT_recipeAdder.addResearchableAssemblylineRecipe( + GregtechItemList.Casing_Coil_QuantumForceTransformer.get(1), + 2048 * 120 * 20, + 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) }, + GregtechItemList.QuantumForceTransformer.get(1), + 1200 * 20, + (int) GT_Values.VP[11]); + + if (CORE.ConfigSwitches.enableMultiblock_MatterFabricator) { + // Industrial Matter Fabricator + RECIPE_IndustrialMatterFabController = GregtechItemList.Industrial_MassFab.get(1); + RECIPE_IndustrialMatterFabFrame = GregtechItemList.Casing_MatterFab.get(1); + RECIPE_IndustrialMatterFabCoil = GregtechItemList.Casing_MatterGen.get(1); + + // Matter Fabricator CPU + RecipeUtils.addShapedGregtechRecipe( + CI.getPlate(8, 1), + CI.circuitTier8, + CI.getPlate(8, 1), + GT_OreDictUnificator.get(OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), 1L), + CI.machineCasing_UV, + GT_OreDictUnificator.get(OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), 1L), + CI.getPlate(8, 1), + CI.circuitTier8, + CI.getPlate(8, 1), + RECIPE_IndustrialMatterFabController); + // Matter Fabricator Frame Casing + RecipeUtils.addShapedGregtechRecipe( + "plateNiobiumCarbide", + CI.component_Rod[8], + "plateNiobiumCarbide", + CI.component_Rod[8], + "frameGtInconel690", + CI.component_Rod[8], + "plateNiobiumCarbide", + CI.component_Rod[8], + "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), }, + GT_Values.NF, + RECIPE_IndustrialMatterFabFrame, + 50, + 16); + // Matter Fabricator Coil + RecipeUtils.addShapedGregtechRecipe( + CI.getPlate(6, 1), + CI.getPlate(7, 1), + CI.getPlate(6, 1), + "frameGtStellite", + CI.machineCasing_UV, + "frameGtStellite", + CI.getPlate(6, 1), + CI.getPlate(7, 1), + 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), }, + GT_Values.NF, + RECIPE_IndustrialMatterFabCoil, + 50, + 16); + } - // Industrial Sieve - RecipeUtils.addShapedGregtechRecipe( - "plateEglinSteel", - CI.circuitTier3, - "plateEglinSteel", - cableTier4, - HV_MACHINE_Sifter, - cableTier4, - "plateEglinSteel", - CI.circuitTier3, - "plateEglinSteel", - RECIPE_IndustrialSieveController); - // Industrial Sieve Casing - RecipeUtils.addShapedGregtechRecipe( - "plateEglinSteel", - "plateEglinSteel", - "plateEglinSteel", - "plateEglinSteel", - "frameGtTumbaga", - "plateEglinSteel", - "plateEglinSteel", - "plateEglinSteel", - "plateEglinSteel", - RECIPE_IndustrialSieveFrame); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { ALLOY.EGLIN_STEEL.getPlate(8), ALLOY.TUMBAGA.getFrameBox(1), - GT_Utility.getIntegratedCircuit(1), }, - GT_Values.NF, - RECIPE_IndustrialSieveFrame, - 50, - 16); - // Industrial Sieve Grate - RecipeUtils.addShapedGregtechRecipe( - "frameGtEglinSteel", - "wireFineSteel", - "frameGtEglinSteel", - "wireFineSteel", - "wireFineSteel", - "wireFineSteel", - "frameGtEglinSteel", - "wireFineSteel", - "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), }, - GT_Values.NF, - RECIPE_IndustrialSieveGrate, - 50, - 16); - } + if (CORE.ConfigSwitches.enableMultiblock_IndustrialSifter) { + // Industrial Sieve + RECIPE_IndustrialSieveController = GregtechItemList.Industrial_Sifter.get(1); + RECIPE_IndustrialSieveFrame = GregtechItemList.Casing_Sifter.get(1); + RECIPE_IndustrialSieveGrate = GregtechItemList.Casing_SifterGrate.get(1); - if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer) { - // Industrial Tree Farmer - RECIPE_TreeFarmController = GregtechItemList.Industrial_TreeFarm.get(1); - RECIPE_TreeFarmFrame = GregtechItemList.Casing_PLACEHOLDER_TreeFarmer.get(1); - // Industrial Tree Farm Controller - RecipeUtils.addShapedGregtechRecipe( - ItemList.Field_Generator_IV.get(1), - ALLOY.INCOLOY_MA956.getRotor(1), - ItemList.Field_Generator_IV.get(1), - ALLOY.NITINOL_60.getPlate(1), - GregtechItemList.GTPP_Casing_IV.get(1), - ALLOY.NITINOL_60.getPlate(1), - ItemList.Field_Generator_IV.get(1), - ALLOY.INCONEL_792.getComponentByPrefix(OrePrefixes.pipeMedium, 1), - ItemList.Field_Generator_IV.get(1), - 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), }, - GT_ModHandler.getDistilledWater(2000), - RECIPE_TreeFarmFrame, - 200, - 64); - } + // Industrial Sieve + RecipeUtils.addShapedGregtechRecipe( + "plateEglinSteel", + CI.circuitTier3, + "plateEglinSteel", + cableTier4, + HV_MACHINE_Sifter, + cableTier4, + "plateEglinSteel", + CI.circuitTier3, + "plateEglinSteel", + RECIPE_IndustrialSieveController); + // Industrial Sieve Casing + RecipeUtils.addShapedGregtechRecipe( + "plateEglinSteel", + "plateEglinSteel", + "plateEglinSteel", + "plateEglinSteel", + "frameGtTumbaga", + "plateEglinSteel", + "plateEglinSteel", + "plateEglinSteel", + "plateEglinSteel", + RECIPE_IndustrialSieveFrame); + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { ALLOY.EGLIN_STEEL.getPlate(8), ALLOY.TUMBAGA.getFrameBox(1), + GT_Utility.getIntegratedCircuit(1), }, + GT_Values.NF, + RECIPE_IndustrialSieveFrame, + 50, + 16); + // Industrial Sieve Grate + RecipeUtils.addShapedGregtechRecipe( + "frameGtEglinSteel", + "wireFineSteel", + "frameGtEglinSteel", + "wireFineSteel", + "wireFineSteel", + "wireFineSteel", + "frameGtEglinSteel", + "wireFineSteel", + "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), }, + GT_Values.NF, + RECIPE_IndustrialSieveGrate, + 50, + 16); + } - if (CORE.ConfigSwitches.enableMachine_Tesseracts) { - // Tesseracts - RECIPE_TesseractGenerator = GregtechItemList.GT4_Tesseract_Generator.get(1); - RECIPE_TesseractTerminal = GregtechItemList.GT4_Tesseract_Terminal.get(1); - // Tesseract Generator - RecipeUtils.addShapedGregtechRecipe( - "plateTitanium", - "circuitMaster", - "plateTitanium", - "circuitMaster", - ItemUtils.getSimpleStack(Blocks.ender_chest), - "circuitMaster", - "plateTitanium", - GregtechItemList.Gregtech_Computer_Cube.get(1), - "plateTitanium", - RECIPE_TesseractGenerator); - // Tesseract Terminal - RecipeUtils.addShapedGregtechRecipe( - "plateTitanium", - "circuitElite", - "plateTitanium", - "circuitElite", - ItemUtils.getSimpleStack(Blocks.ender_chest), - "circuitElite", - "plateTitanium", - CI.machineHull_EV, - "plateTitanium", - RECIPE_TesseractTerminal); - } + if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer) { + // Industrial Tree Farmer + RECIPE_TreeFarmController = GregtechItemList.Industrial_TreeFarm.get(1); + RECIPE_TreeFarmFrame = GregtechItemList.Casing_PLACEHOLDER_TreeFarmer.get(1); + // Industrial Tree Farm Controller + RecipeUtils.addShapedGregtechRecipe( + ItemList.Field_Generator_IV.get(1), + ALLOY.INCOLOY_MA956.getRotor(1), + ItemList.Field_Generator_IV.get(1), + ALLOY.NITINOL_60.getPlate(1), + GregtechItemList.GTPP_Casing_IV.get(1), + ALLOY.NITINOL_60.getPlate(1), + ItemList.Field_Generator_IV.get(1), + ALLOY.INCONEL_792.getComponentByPrefix(OrePrefixes.pipeMedium, 1), + ItemList.Field_Generator_IV.get(1), + 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), }, + GT_ModHandler.getDistilledWater(2000), + RECIPE_TreeFarmFrame, + 200, + 64); + } - if (CORE.ConfigSwitches.enableMachine_SimpleWasher) { - ItemStack plateWrought = ItemUtils.getItemStackOfAmountFromOreDict("plateWroughtIron", 1); - ItemStack washerPipe; - - if (CORE.ConfigSwitches.enableCustom_Pipes) { - washerPipe = ItemUtils.getItemStackOfAmountFromOreDict("pipeLargeClay", 1); - RecipeUtils.addShapedGregtechRecipe( - plateWrought, - CI.electricPump_LV, - plateWrought, - plateWrought, - washerPipe, - plateWrought, - plateWrought, - CI.machineCasing_ULV, - plateWrought, - GregtechItemList.SimpleDustWasher_ULV.get(1)); - } - // Add Recipe - washerPipe = ItemUtils.getItemStackOfAmountFromOreDict("pipeLargeCopper", 1); + if (CORE.ConfigSwitches.enableMachine_Tesseracts) { + // Tesseracts + RECIPE_TesseractGenerator = GregtechItemList.GT4_Tesseract_Generator.get(1); + RECIPE_TesseractTerminal = GregtechItemList.GT4_Tesseract_Terminal.get(1); + // Tesseract Generator + RecipeUtils.addShapedGregtechRecipe( + "plateTitanium", + "circuitMaster", + "plateTitanium", + "circuitMaster", + ItemUtils.getSimpleStack(Blocks.ender_chest), + "circuitMaster", + "plateTitanium", + GregtechItemList.Gregtech_Computer_Cube.get(1), + "plateTitanium", + RECIPE_TesseractGenerator); + // Tesseract Terminal + RecipeUtils.addShapedGregtechRecipe( + "plateTitanium", + "circuitElite", + "plateTitanium", + "circuitElite", + ItemUtils.getSimpleStack(Blocks.ender_chest), + "circuitElite", + "plateTitanium", + CI.machineHull_EV, + "plateTitanium", + RECIPE_TesseractTerminal); + } + + if (CORE.ConfigSwitches.enableMachine_SimpleWasher) { + ItemStack plateWrought = ItemUtils.getItemStackOfAmountFromOreDict("plateWroughtIron", 1); + ItemStack washerPipe; + + if (CORE.ConfigSwitches.enableCustom_Pipes) { + washerPipe = ItemUtils.getItemStackOfAmountFromOreDict("pipeLargeClay", 1); RecipeUtils.addShapedGregtechRecipe( plateWrought, CI.electricPump_LV, @@ -2039,995 +2016,986 @@ public class RECIPES_Machines { CI.machineCasing_ULV, plateWrought, GregtechItemList.SimpleDustWasher_ULV.get(1)); - - int aSimpleWasherTier = 2; - 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) }; - for (int i = 0; i < 4; i++) { - - CORE.RA.addSixSlotAssemblingRecipe( - aInputsForSimpleWashers[aSlot], - CI.getTieredFluid(aSimpleWasherTier, 144 * aSimpleWasherTier), - aSimpleWashers[aSlot], - 20 * 15 * aSimpleWasherTier, - (int) GT_Values.V[aSimpleWasherTier]); - - aSimpleWasherTier += 2; - aSlot++; - } } + // Add Recipe + washerPipe = ItemUtils.getItemStackOfAmountFromOreDict("pipeLargeCopper", 1); + RecipeUtils.addShapedGregtechRecipe( + plateWrought, + CI.electricPump_LV, + plateWrought, + plateWrought, + washerPipe, + plateWrought, + plateWrought, + CI.machineCasing_ULV, + plateWrought, + GregtechItemList.SimpleDustWasher_ULV.get(1)); + + int aSimpleWasherTier = 2; + 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) }; + for (int i = 0; i < 4; i++) { - if (CORE.ConfigSwitches.enableMachine_Pollution && PollutionUtils.isPollutionEnabled()) { - - RecipeUtils.addShapedGregtechRecipe( - "plateCarbon", - "plateCarbon", - "plateCarbon", - "dustCarbon", - "dustCarbon", - "dustCarbon", - "plateCarbon", - "plateCarbon", - "plateCarbon", - ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1)); - - RecipeUtils.addShapedGregtechRecipe( - "plateCarbon", - "plateCarbon", - "plateCarbon", - "cellLithiumPeroxide", - "dustCarbon", - "cellLithiumPeroxide", - "plateCarbon", - "plateCarbon", - "plateCarbon", - ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 1, 1)); - - // Pollution Detector - RecipeUtils.addShapedGregtechRecipe( - "plateSteel", - CI.sensor_LV, - "plateSteel", - "plateSteel", - CI.electricMotor_LV, - "plateSteel", - CI.getTieredCircuit(1), - CI.machineHull_LV, - CI.getTieredCircuit(1), - GregtechItemList.Pollution_Detector.get(1)); - - // ULV - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[0], - ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1), - CI.component_Plate[0], - CI.component_Plate[0], - CI.electricMotor_ULV, - CI.component_Plate[0], - CI.getTieredCircuit(0), - CI.machineHull_ULV, - CI.getTieredCircuit(0), - GregtechItemList.Pollution_Cleaner_ULV.get(1)); - // LV - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[1], - ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1), - CI.component_Plate[1], - CI.component_Plate[1], - CI.electricMotor_LV, - CI.component_Plate[1], - CI.getTieredCircuit(1), - CI.machineHull_LV, - CI.getTieredCircuit(1), - GregtechItemList.Pollution_Cleaner_LV.get(1)); - // MV - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[2], - ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1), - CI.component_Plate[2], - CI.component_Plate[2], - CI.electricMotor_MV, - CI.component_Plate[2], - CI.getTieredCircuit(2), - CI.machineHull_MV, - CI.getTieredCircuit(2), - GregtechItemList.Pollution_Cleaner_MV.get(1)); - // HV - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[3], - ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1), - CI.component_Plate[3], - CI.component_Plate[3], - CI.electricMotor_HV, - CI.component_Plate[3], - CI.getTieredCircuit(3), - CI.machineHull_HV, - CI.getTieredCircuit(3), - GregtechItemList.Pollution_Cleaner_HV.get(1)); - // EV - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[4], - ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1), - CI.component_Plate[4], - CI.component_Plate[4], - CI.electricMotor_EV, - CI.component_Plate[4], - CI.getTieredCircuit(4), - CI.machineHull_EV, - CI.getTieredCircuit(4), - GregtechItemList.Pollution_Cleaner_EV.get(1)); - // IV - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[5], - ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 1, 1), - CI.component_Plate[5], - CI.component_Plate[5], - CI.electricMotor_IV, - CI.component_Plate[5], - CI.getTieredCircuit(5), - CI.machineHull_IV, - CI.getTieredCircuit(5), - GregtechItemList.Pollution_Cleaner_IV.get(1)); - // LuV - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[6], - ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 1, 1), - CI.component_Plate[6], - CI.component_Plate[6], - CI.electricMotor_LuV, - CI.component_Plate[6], - CI.getTieredCircuit(6), - CI.machineHull_LuV, - CI.getTieredCircuit(6), - GregtechItemList.Pollution_Cleaner_LuV.get(1)); - // ZPM - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[7], - ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 1, 1), - CI.component_Plate[7], - CI.component_Plate[7], - CI.electricMotor_ZPM, - CI.component_Plate[7], - CI.getTieredCircuit(7), - CI.machineHull_ZPM, - CI.getTieredCircuit(7), - GregtechItemList.Pollution_Cleaner_ZPM.get(1)); - // UV - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[8], - ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 1, 1), - CI.component_Plate[8], - CI.component_Plate[8], - CI.electricMotor_UV, - CI.component_Plate[8], - CI.getTieredCircuit(8), - CI.machineHull_UV, - CI.getTieredCircuit(8), - GregtechItemList.Pollution_Cleaner_UV.get(1)); - // MAX - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[9], - ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 1, 1), - CI.component_Plate[9], - CI.component_Plate[9], - CI.electricMotor_MAX, - CI.component_Plate[9], - CI.getTieredCircuit(9), - CI.machineHull_MAX, - CI.getTieredCircuit(9), - GregtechItemList.Pollution_Cleaner_MAX.get(1)); + CORE.RA.addSixSlotAssemblingRecipe( + aInputsForSimpleWashers[aSlot], + CI.getTieredFluid(aSimpleWasherTier, 144 * aSimpleWasherTier), + aSimpleWashers[aSlot], + 20 * 15 * aSimpleWasherTier, + (int) GT_Values.V[aSimpleWasherTier]); + + aSimpleWasherTier += 2; + aSlot++; } + } - if (CORE.ConfigSwitches.enableMultiblock_ThermalBoiler) { - RECIPE_ThermalBoilerController = GregtechItemList.GT4_Thermal_Boiler.get(1); - RECIPE_ThermalBoilerCasing = GregtechItemList.Casing_ThermalContainment.get(2); - ItemStack centrifugeEV = ItemList.Machine_EV_Centrifuge.get(1); - - RecipeUtils.addShapedGregtechRecipe( - "craftingGeothermalGenerator", - centrifugeEV, - "craftingGeothermalGenerator", - "gearGtTitanium", - CI.getTieredCircuitOreDictName(6), - "gearGtTitanium", - "craftingGeothermalGenerator", - centrifugeEV, - "craftingGeothermalGenerator", - RECIPE_ThermalBoilerController); - - RecipeUtils.addShapedGregtechRecipe( - "craftingGeothermalGenerator", - centrifugeEV, - "craftingGeothermalGenerator", - "gearGtTungstenSteel", - CI.getTieredCircuitOreDictName(5), - "gearGtTungstenSteel", - "craftingGeothermalGenerator", - centrifugeEV, - "craftingGeothermalGenerator", - RECIPE_ThermalBoilerController); + if (CORE.ConfigSwitches.enableMachine_Pollution && PollutionUtils.isPollutionEnabled()) { - RecipeUtils.addShapedGregtechRecipe( - ALLOY.MARAGING350.getPlate(1), - "plateStainlessSteel", - ALLOY.MARAGING350.getPlate(1), - "circuitAdvanced", - CI.machineCasing_HV, - "circuitAdvanced", - ALLOY.MARAGING350.getPlate(1), - ALLOY.MARAGING350.getPlate(1), - ALLOY.MARAGING350.getPlate(1), - RECIPE_ThermalBoilerCasing); - - // 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), }, - CI.getTieredFluid(3, 144), - ItemUtils.getSimpleStack(ModItems.itemLavaFilter, 16), - 1600, - 240); - } + RecipeUtils.addShapedGregtechRecipe( + "plateCarbon", + "plateCarbon", + "plateCarbon", + "dustCarbon", + "dustCarbon", + "dustCarbon", + "plateCarbon", + "plateCarbon", + "plateCarbon", + ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1)); - // 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); + RecipeUtils.addShapedGregtechRecipe( + "plateCarbon", + "plateCarbon", + "plateCarbon", + "cellLithiumPeroxide", + "dustCarbon", + "cellLithiumPeroxide", + "plateCarbon", + "plateCarbon", + "plateCarbon", + ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 1, 1)); + + // Pollution Detector + RecipeUtils.addShapedGregtechRecipe( + "plateSteel", + CI.sensor_LV, + "plateSteel", + "plateSteel", + CI.electricMotor_LV, + "plateSteel", + CI.getTieredCircuit(1), + CI.machineHull_LV, + CI.getTieredCircuit(1), + GregtechItemList.Pollution_Detector.get(1)); + + // ULV + RecipeUtils.addShapedGregtechRecipe( + CI.component_Plate[0], + ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1), + CI.component_Plate[0], + CI.component_Plate[0], + CI.electricMotor_ULV, + CI.component_Plate[0], + CI.getTieredCircuit(0), + CI.machineHull_ULV, + CI.getTieredCircuit(0), + GregtechItemList.Pollution_Cleaner_ULV.get(1)); + // LV + RecipeUtils.addShapedGregtechRecipe( + CI.component_Plate[1], + ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1), + CI.component_Plate[1], + CI.component_Plate[1], + CI.electricMotor_LV, + CI.component_Plate[1], + CI.getTieredCircuit(1), + CI.machineHull_LV, + CI.getTieredCircuit(1), + GregtechItemList.Pollution_Cleaner_LV.get(1)); + // MV + RecipeUtils.addShapedGregtechRecipe( + CI.component_Plate[2], + ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1), + CI.component_Plate[2], + CI.component_Plate[2], + CI.electricMotor_MV, + CI.component_Plate[2], + CI.getTieredCircuit(2), + CI.machineHull_MV, + CI.getTieredCircuit(2), + GregtechItemList.Pollution_Cleaner_MV.get(1)); + // HV + RecipeUtils.addShapedGregtechRecipe( + CI.component_Plate[3], + ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1), + CI.component_Plate[3], + CI.component_Plate[3], + CI.electricMotor_HV, + CI.component_Plate[3], + CI.getTieredCircuit(3), + CI.machineHull_HV, + CI.getTieredCircuit(3), + GregtechItemList.Pollution_Cleaner_HV.get(1)); + // EV + RecipeUtils.addShapedGregtechRecipe( + CI.component_Plate[4], + ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1), + CI.component_Plate[4], + CI.component_Plate[4], + CI.electricMotor_EV, + CI.component_Plate[4], + CI.getTieredCircuit(4), + CI.machineHull_EV, + CI.getTieredCircuit(4), + GregtechItemList.Pollution_Cleaner_EV.get(1)); + // IV + RecipeUtils.addShapedGregtechRecipe( + CI.component_Plate[5], + ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 1, 1), + CI.component_Plate[5], + CI.component_Plate[5], + CI.electricMotor_IV, + CI.component_Plate[5], + CI.getTieredCircuit(5), + CI.machineHull_IV, + CI.getTieredCircuit(5), + GregtechItemList.Pollution_Cleaner_IV.get(1)); + // LuV RecipeUtils.addShapedGregtechRecipe( CI.component_Plate[6], - ItemList.Casing_Grate.get(1), + ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 1, 1), CI.component_Plate[6], CI.component_Plate[6], - CI.getFluidRegulator(5, 1), + CI.electricMotor_LuV, CI.component_Plate[6], - CI.getTieredCircuit(5), - ItemList.Hatch_Input_IV.get(1), - CI.getTieredCircuit(5), - GregtechItemList.Hatch_Air_Intake.get(1)); + CI.getTieredCircuit(6), + CI.machineHull_LuV, + CI.getTieredCircuit(6), + GregtechItemList.Pollution_Cleaner_LuV.get(1)); + // ZPM + RecipeUtils.addShapedGregtechRecipe( + CI.component_Plate[7], + ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 1, 1), + CI.component_Plate[7], + CI.component_Plate[7], + CI.electricMotor_ZPM, + CI.component_Plate[7], + CI.getTieredCircuit(7), + CI.machineHull_ZPM, + CI.getTieredCircuit(7), + GregtechItemList.Pollution_Cleaner_ZPM.get(1)); + // UV + RecipeUtils.addShapedGregtechRecipe( + CI.component_Plate[8], + ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 1, 1), + CI.component_Plate[8], + CI.component_Plate[8], + CI.electricMotor_UV, + CI.component_Plate[8], + CI.getTieredCircuit(8), + CI.machineHull_UV, + CI.getTieredCircuit(8), + GregtechItemList.Pollution_Cleaner_UV.get(1)); + // MAX + RecipeUtils.addShapedGregtechRecipe( + CI.component_Plate[9], + ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 1, 1), + CI.component_Plate[9], + CI.component_Plate[9], + CI.electricMotor_MAX, + CI.component_Plate[9], + CI.getTieredCircuit(9), + CI.machineHull_MAX, + CI.getTieredCircuit(9), + GregtechItemList.Pollution_Cleaner_MAX.get(1)); + } + + if (CORE.ConfigSwitches.enableMultiblock_ThermalBoiler) { + RECIPE_ThermalBoilerController = GregtechItemList.GT4_Thermal_Boiler.get(1); + RECIPE_ThermalBoilerCasing = GregtechItemList.Casing_ThermalContainment.get(2); + ItemStack centrifugeEV = ItemList.Machine_EV_Centrifuge.get(1); + + RecipeUtils.addShapedGregtechRecipe( + "craftingGeothermalGenerator", + centrifugeEV, + "craftingGeothermalGenerator", + "gearGtTitanium", + CI.getTieredCircuitOreDictName(6), + "gearGtTitanium", + "craftingGeothermalGenerator", + centrifugeEV, + "craftingGeothermalGenerator", + RECIPE_ThermalBoilerController); + + RecipeUtils.addShapedGregtechRecipe( + "craftingGeothermalGenerator", + centrifugeEV, + "craftingGeothermalGenerator", + "gearGtTungstenSteel", + CI.getTieredCircuitOreDictName(5), + "gearGtTungstenSteel", + "craftingGeothermalGenerator", + centrifugeEV, + "craftingGeothermalGenerator", + RECIPE_ThermalBoilerController); + + RecipeUtils.addShapedGregtechRecipe( + ALLOY.MARAGING350.getPlate(1), + "plateStainlessSteel", + ALLOY.MARAGING350.getPlate(1), + "circuitAdvanced", + CI.machineCasing_HV, + "circuitAdvanced", + ALLOY.MARAGING350.getPlate(1), + ALLOY.MARAGING350.getPlate(1), + ALLOY.MARAGING350.getPlate(1), + RECIPE_ThermalBoilerCasing); + + // 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(true, "IC2:itemPartCarbonMesh", "RawCarbonMesh", 0, 64), }, + CI.getTieredFluid(3, 144), + ItemUtils.getSimpleStack(ModItems.itemLavaFilter, 16), + 1600, + 240); + } + + // Air Intake Hatch + ItemList FluidRegulator_IV = ItemUtils.getValueOfItemList("FluidRegulator_IV", ItemList.Pump_IV); + ItemStack aTieredFluidRegulator = FluidRegulator_IV.get(1); + RecipeUtils.addShapedGregtechRecipe( + CI.component_Plate[6], + ItemList.Casing_Grate.get(1), + CI.component_Plate[6], + CI.component_Plate[6], + CI.getFluidRegulator(5, 1), + CI.component_Plate[6], + CI.getTieredCircuit(5), + ItemList.Hatch_Input_IV.get(1), + CI.getTieredCircuit(5), + GregtechItemList.Hatch_Air_Intake.get(1)); + + RecipeUtils.addShapedGregtechRecipe( + CI.getPlate(7, 1), + GregtechItemList.Hatch_Air_Intake.get(1), + CI.getPlate(7, 1), + CI.getPlate(7, 1), + CI.getFluidRegulator(7, 1), + CI.getPlate(7, 1), + CI.getTieredCircuit(7), + ItemList.Hatch_Input_ZPM.get(1), + CI.getTieredCircuit(7), + GregtechItemList.Hatch_Air_Intake_Extreme.get(1)); + + if (CORE.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor) { + + // Thorium Reactor + RECIPE_LFTRController = GregtechItemList.ThoriumReactor.get(1); + RECIPE_LFTRInnerCasing = GregtechItemList.Casing_Reactor_II.get(1); // Zeron + RECIPE_LFTROuterCasing = GregtechItemList.Casing_Reactor_I.get(1); // Hastelloy + + ItemStack controlCircuit = ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR); + RecipeUtils.addShapedGregtechRecipe( + controlCircuit, + "cableGt12Naquadah", + controlCircuit, + "plateDoubleHastelloyN", + GregtechItemList.Gregtech_Computer_Cube.get(1), + "plateDoubleHastelloyN", + "plateThorium232", + CI.machineHull_IV, + "plateThorium232", + RECIPE_LFTRController); + RecipeUtils.addShapedGregtechRecipe( + "plateDoubleHastelloyC276", + CI.craftingToolScrewdriver, + "plateDoubleHastelloyC276", + "gearGtTalonite", + CI.fieldGenerator_MV, + "gearGtTalonite", + "plateDoubleHastelloyC276", + CI.craftingToolHammer_Hard, + "plateDoubleHastelloyC276", + RECIPE_LFTRInnerCasing); + + ItemStack IC2HeatPlate = ItemUtils.getItemStackFromFQRN("IC2:reactorPlatingHeat", 1); + RecipeUtils.addShapedGregtechRecipe( + "plateDoubleHastelloyN", + IC2HeatPlate, + "plateDoubleHastelloyN", + IC2HeatPlate, + "frameGtHastelloyC276", + IC2HeatPlate, + "plateDoubleHastelloyN", + IC2HeatPlate, + "plateDoubleHastelloyN", + RECIPE_LFTROuterCasing); + + // LFTR Control Circuit + CORE.RA.addSixSlotAssemblingRecipe( + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 1), + CI.fieldGenerator_HV }, + null, + controlCircuit, + 240 * 20, + 500); + + // Fission Fuel Plant + RecipeUtils.addShapedGregtechRecipe( + CI.getTieredCircuitOreDictName(5), + CI.craftingToolSolderingIron, + CI.getTieredCircuitOreDictName(5), + "plateDenseTungstenSteel", + GregtechItemList.Gregtech_Computer_Cube.get(1), + "plateDenseTungstenSteel", + "gearGtStellite", + CI.machineHull_IV, + "gearGtStellite", + GregtechItemList.Industrial_FuelRefinery.get(1)); + + ItemStack mInnerTank = ItemList.Quantum_Tank_LV.get(1); + + // Incoloy Casing + RecipeUtils.addShapedGregtechRecipe( + "plateIncoloyDS", + "pipeHugeStaballoy", + "plateIncoloyDS", + "gearGtIncoloyDS", + mInnerTank, + "gearGtIncoloyDS", + "plateIncoloyDS", + "pipeHugeStaballoy", + "plateIncoloyDS", + GregtechItemList.Casing_Refinery_Internal.get(1)); + + // Hastelloy-N Sealant Casing + RecipeUtils.addShapedGregtechRecipe( + "plateIncoloyMA956", + "plateHastelloyN", + "plateIncoloyMA956", + "plateHastelloyN", + "frameGtHastelloyC276", + "plateHastelloyN", + "plateIncoloyMA956", + "plateHastelloyN", + "plateIncoloyMA956", + GregtechItemList.Casing_Refinery_External.get(1)); + + // Hastelloy-X Structural Casing + RecipeUtils.addShapedGregtechRecipe( + "ringInconel792", + "gearGtHastelloyX", + CI.component_Plate[5], + CI.craftingToolHammer_Hard, + "frameGtHastelloyC276", + CI.craftingToolWrench, + CI.component_Plate[5], + CI.getTieredMachineCasing(4), + "ringInconel792", + GregtechItemList.Casing_Refinery_Structural.get(1)); RecipeUtils.addShapedGregtechRecipe( + CI.getPlate(5, 1), + ALLOY.HASTELLOY_X.getPlateDouble(1), + CI.getPlate(5, 1), + CI.getPlate(5, 1), + CI.getTieredMachineCasing(5), + CI.getPlate(5, 1), + CI.getRobotArm(5, 1), + ItemList.Casing_FrostProof.get(1), + CI.getRobotArm(5, 1), + GregtechItemList.ColdTrap_IV.get(1)); + RecipeUtils.addShapedGregtechRecipe( CI.getPlate(7, 1), - GregtechItemList.Hatch_Air_Intake.get(1), + ALLOY.HS188A.getPlateDouble(1), CI.getPlate(7, 1), CI.getPlate(7, 1), - CI.getFluidRegulator(7, 1), + GregtechItemList.ColdTrap_IV.get(1), CI.getPlate(7, 1), - CI.getTieredCircuit(7), - ItemList.Hatch_Input_ZPM.get(1), - CI.getTieredCircuit(7), - GregtechItemList.Hatch_Air_Intake_Extreme.get(1)); - - if (CORE.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor) { + CI.getRobotArm(7, 1), + ItemList.Casing_FrostProof.get(1), + CI.getRobotArm(7, 1), + GregtechItemList.ColdTrap_ZPM.get(1)); - // Thorium Reactor - RECIPE_LFTRController = GregtechItemList.ThoriumReactor.get(1); - RECIPE_LFTRInnerCasing = GregtechItemList.Casing_Reactor_II.get(1); // Zeron - RECIPE_LFTROuterCasing = GregtechItemList.Casing_Reactor_I.get(1); // Hastelloy + RecipeUtils.addShapedGregtechRecipe( + CI.getFieldGenerator(3, 1), + CI.getRobotArm(5, 1), + CI.getPlate(5, 1), + ALLOY.HASTELLOY_N.getPlateDouble(1), + ItemList.Machine_IV_ChemicalReactor.get(1), + ALLOY.HASTELLOY_N.getPlateDouble(1), + CI.getPlate(5, 1), + ALLOY.HASTELLOY_N.getPlateDouble(1), + CI.getFieldGenerator(3, 1), + GregtechItemList.ReactorProcessingUnit_IV.get(1)); + RecipeUtils.addShapedGregtechRecipe( + CI.getFieldGenerator(5, 1), + CI.getRobotArm(7, 1), + CI.getPlate(7, 1), + ALLOY.HS188A.getPlateDouble(1), + GregtechItemList.ReactorProcessingUnit_IV.get(1), + ALLOY.HS188A.getPlateDouble(1), + CI.getPlate(7, 1), + ALLOY.HS188A.getPlateDouble(1), + CI.getFieldGenerator(5, 1), + GregtechItemList.ReactorProcessingUnit_ZPM.get(1)); + } - ItemStack controlCircuit = ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR); - RecipeUtils.addShapedGregtechRecipe( - controlCircuit, - "cableGt12Naquadah", - controlCircuit, - "plateDoubleHastelloyN", - GregtechItemList.Gregtech_Computer_Cube.get(1), - "plateDoubleHastelloyN", - "plateThorium232", - CI.machineHull_IV, - "plateThorium232", - RECIPE_LFTRController); - RecipeUtils.addShapedGregtechRecipe( - "plateDoubleHastelloyC276", - CI.craftingToolScrewdriver, - "plateDoubleHastelloyC276", - "gearGtTalonite", - CI.fieldGenerator_MV, - "gearGtTalonite", - "plateDoubleHastelloyC276", - CI.craftingToolHammer_Hard, - "plateDoubleHastelloyC276", - RECIPE_LFTRInnerCasing); - - ItemStack IC2HeatPlate = ItemUtils.getItemStackFromFQRN("IC2:reactorPlatingHeat", 1); - RecipeUtils.addShapedGregtechRecipe( - "plateDoubleHastelloyN", - IC2HeatPlate, - "plateDoubleHastelloyN", - IC2HeatPlate, - "frameGtHastelloyC276", - IC2HeatPlate, - "plateDoubleHastelloyN", - IC2HeatPlate, - "plateDoubleHastelloyN", - RECIPE_LFTROuterCasing); - - // LFTR Control Circuit - CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 1), - CI.fieldGenerator_HV }, - null, - controlCircuit, - 240 * 20, - 500); + // Shelves + RecipeUtils.addShapedGregtechRecipe( + "screwWood", + "plateWood", + "screwWood", + CI.craftingToolHammer_Hard, + "frameGtWood", + CI.craftingToolHammer_Soft, + "plateWood", + "plateWood", + "plateWood", + GregtechItemList.GT4_Shelf.get(2)); + + RecipeUtils.addShapelessGregtechRecipe( + new ItemStack[] { GregtechItemList.GT4_Shelf.get(1) }, + GregtechItemList.GT4_Shelf_Compartment.get(1)); + RecipeUtils.addShapelessGregtechRecipe( + 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)); + RecipeUtils.addShapelessGregtechRecipe( + 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)); + + // Cyclotron + if (CORE.ConfigSwitches.enableMultiblock_Cyclotron) { + RECIPE_CyclotronController = GregtechItemList.COMET_Cyclotron.get(1); + RECIPE_CyclotronOuterCasing = GregtechItemList.Casing_Cyclotron_External.get(1); + RECIPE_CyclotronInnerCoil = GregtechItemList.Casing_Cyclotron_Coil.get(1); + + // 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) }, + ALLOY.ZIRCONIUM_CARBIDE.getFluidStack(144 * 8), // Input Fluid + RECIPE_CyclotronOuterCasing, + 30 * 20 * 2, + MaterialUtils.getVoltageForTier(4)); + + // 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) }, + ALLOY.HG1223.getFluidStack(144 * 5), // Input Fluid + RECIPE_CyclotronInnerCoil, + 60 * 20 * 2, + MaterialUtils.getVoltageForTier(5)); + + // 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) }, + ALLOY.INCOLOY_020.getFluidStack(144 * 9), // Input Fluid + RECIPE_CyclotronController, + 60 * 20 * 5, + MaterialUtils.getVoltageForTier(5)); + } - // Fission Fuel Plant - RecipeUtils.addShapedGregtechRecipe( - CI.getTieredCircuitOreDictName(5), - CI.craftingToolSolderingIron, - CI.getTieredCircuitOreDictName(5), - "plateDenseTungstenSteel", - GregtechItemList.Gregtech_Computer_Cube.get(1), - "plateDenseTungstenSteel", - "gearGtStellite", - CI.machineHull_IV, - "gearGtStellite", - GregtechItemList.Industrial_FuelRefinery.get(1)); + // 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) }); - ItemStack mInnerTank = ItemList.Quantum_Tank_LV.get(1); + if (CORE.ConfigSwitches.enableMultiblock_PowerSubstation) { + RecipeUtils.addShapedRecipe( + "screwTitanium", + "plateIncoloy020", + "screwTitanium", + "plateIncoloy020", + "frameGtIncoloyMA956", + "plateIncoloy020", + "screwTitanium", + "plateIncoloy020", + "screwTitanium", + GregtechItemList.Casing_Power_SubStation.get(1)); + + ItemStack mBattery = ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR); - // Incoloy Casing - RecipeUtils.addShapedGregtechRecipe( - "plateIncoloyDS", - "pipeHugeStaballoy", - "plateIncoloyDS", - "gearGtIncoloyDS", - mInnerTank, - "gearGtIncoloyDS", - "plateIncoloyDS", - "pipeHugeStaballoy", - "plateIncoloyDS", - GregtechItemList.Casing_Refinery_Internal.get(1)); - - // Hastelloy-N Sealant Casing - RecipeUtils.addShapedGregtechRecipe( - "plateIncoloyMA956", - "plateHastelloyN", - "plateIncoloyMA956", - "plateHastelloyN", - "frameGtHastelloyC276", - "plateHastelloyN", - "plateIncoloyMA956", - "plateHastelloyN", - "plateIncoloyMA956", - GregtechItemList.Casing_Refinery_External.get(1)); - - // Hastelloy-X Structural Casing - RecipeUtils.addShapedGregtechRecipe( - "ringInconel792", - "gearGtHastelloyX", - CI.component_Plate[5], - CI.craftingToolHammer_Hard, - "frameGtHastelloyC276", - CI.craftingToolWrench, - CI.component_Plate[5], - CI.getTieredMachineCasing(4), - "ringInconel792", - GregtechItemList.Casing_Refinery_Structural.get(1)); + RecipeUtils.addShapedRecipe( + "plateIncoloyMA956", + mBattery, + "plateIncoloyMA956", + GregtechItemList.Casing_Power_SubStation.get(1), + GregtechItemList.Casing_Vanadium_Redox.get(1), + GregtechItemList.Casing_Power_SubStation.get(1), + "plateIncoloy020", + "plateIncoloyMA956", + "plateIncoloy020", + GregtechItemList.PowerSubStation.get(1)); + } - RecipeUtils.addShapedGregtechRecipe( - CI.getPlate(5, 1), - ALLOY.HASTELLOY_X.getPlateDouble(1), - CI.getPlate(5, 1), - CI.getPlate(5, 1), - CI.getTieredMachineCasing(5), - CI.getPlate(5, 1), - CI.getRobotArm(5, 1), - ItemList.Casing_FrostProof.get(1), - CI.getRobotArm(5, 1), - GregtechItemList.ColdTrap_IV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.getPlate(7, 1), - ALLOY.HS188A.getPlateDouble(1), - CI.getPlate(7, 1), - CI.getPlate(7, 1), - GregtechItemList.ColdTrap_IV.get(1), - CI.getPlate(7, 1), - CI.getRobotArm(7, 1), - ItemList.Casing_FrostProof.get(1), - CI.getRobotArm(7, 1), - GregtechItemList.ColdTrap_ZPM.get(1)); + if (CORE.ConfigSwitches.enableMultiblock_IndustrialThermalCentrifuge) { + RecipeUtils.addShapedRecipe( + "plateRedSteel", + CI.craftingToolHammer_Hard, + "plateRedSteel", + "plateRedSteel", + "frameGtBlackSteel", + "plateRedSteel", + "plateRedSteel", + CI.craftingToolWrench, + "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), }, + GT_Values.NF, + GregtechItemList.Casing_ThermalCentrifuge.get(1L), + 50, + 16); - RecipeUtils.addShapedGregtechRecipe( - CI.getFieldGenerator(3, 1), - CI.getRobotArm(5, 1), - CI.getPlate(5, 1), - ALLOY.HASTELLOY_N.getPlateDouble(1), - ItemList.Machine_IV_ChemicalReactor.get(1), - ALLOY.HASTELLOY_N.getPlateDouble(1), - CI.getPlate(5, 1), - ALLOY.HASTELLOY_N.getPlateDouble(1), - CI.getFieldGenerator(3, 1), - GregtechItemList.ReactorProcessingUnit_IV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.getFieldGenerator(5, 1), - CI.getRobotArm(7, 1), - CI.getPlate(7, 1), - ALLOY.HS188A.getPlateDouble(1), - GregtechItemList.ReactorProcessingUnit_IV.get(1), - ALLOY.HS188A.getPlateDouble(1), - CI.getPlate(7, 1), - ALLOY.HS188A.getPlateDouble(1), - CI.getFieldGenerator(5, 1), - GregtechItemList.ReactorProcessingUnit_ZPM.get(1)); - } + RecipeUtils.addShapedRecipe( + "plateRedSteel", + "circuitElite", + "plateRedSteel", + "stickTalonite", + IV_MACHINE_ThermalCentrifuge, + "stickTalonite", + "plateRedSteel", + "gearGtTalonite", + "plateRedSteel", + GregtechItemList.Industrial_ThermalCentrifuge.get(1)); + } - // Shelves - RecipeUtils.addShapedGregtechRecipe( - "screwWood", - "plateWood", - "screwWood", + if (CORE.ConfigSwitches.enableMultiblock_IndustrialWashPlant) { + RecipeUtils.addShapedRecipe( + "plateGrisium", CI.craftingToolHammer_Hard, - "frameGtWood", - CI.craftingToolHammer_Soft, - "plateWood", - "plateWood", - "plateWood", - GregtechItemList.GT4_Shelf.get(2)); + "plateGrisium", + "plateTalonite", + "frameGtGrisium", + "plateTalonite", + "plateGrisium", + CI.craftingToolWrench, + "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), }, + GT_Values.NF, + GregtechItemList.Casing_WashPlant.get(1L), + 50, + 16); - RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] { GregtechItemList.GT4_Shelf.get(1) }, - GregtechItemList.GT4_Shelf_Compartment.get(1)); - RecipeUtils.addShapelessGregtechRecipe( - 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)); - RecipeUtils.addShapelessGregtechRecipe( - 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)); + RecipeUtils.addShapedRecipe( + "plateGrisium", + IV_MACHINE_OreWasher, + "plateGrisium", + "plateTalonite", + "circuitElite", + "plateTalonite", + "plateGrisium", + IV_MACHINE_ChemicalBath, + "plateGrisium", + GregtechItemList.Industrial_WashPlant.get(1)); + } - // Cyclotron - if (CORE.ConfigSwitches.enableMultiblock_Cyclotron) { - RECIPE_CyclotronController = GregtechItemList.COMET_Cyclotron.get(1); - RECIPE_CyclotronOuterCasing = GregtechItemList.Casing_Cyclotron_External.get(1); - RECIPE_CyclotronInnerCoil = GregtechItemList.Casing_Cyclotron_Coil.get(1); + if (CORE.ConfigSwitches.enableMultiblock_LargeAutoCrafter) { - // 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) }, - ALLOY.ZIRCONIUM_CARBIDE.getFluidStack(144 * 8), // Input Fluid - RECIPE_CyclotronOuterCasing, - 30 * 20 * 2, - MaterialUtils.getVoltageForTier(4)); - - // 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) }, - ALLOY.HG1223.getFluidStack(144 * 5), // Input Fluid - RECIPE_CyclotronInnerCoil, - 60 * 20 * 2, - MaterialUtils.getVoltageForTier(5)); - - // 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) }, - ALLOY.INCOLOY_020.getFluidStack(144 * 9), // Input Fluid - RECIPE_CyclotronController, - 60 * 20 * 5, - MaterialUtils.getVoltageForTier(5)); - } + ItemStack aCoreBlock = ItemUtils.getValueOfItemList( + "Block_IridiumTungstensteel", + 1, + ItemUtils.getItemStackOfAmountFromOreDict("blockOsmiridium", 1)); - // 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) }); - - if (CORE.ConfigSwitches.enableMultiblock_PowerSubstation) { - RecipeUtils.addShapedRecipe( - "screwTitanium", - "plateIncoloy020", - "screwTitanium", - "plateIncoloy020", - "frameGtIncoloyMA956", - "plateIncoloy020", - "screwTitanium", - "plateIncoloy020", - "screwTitanium", - GregtechItemList.Casing_Power_SubStation.get(1)); - - ItemStack mBattery = ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR); - - RecipeUtils.addShapedRecipe( - "plateIncoloyMA956", - mBattery, - "plateIncoloyMA956", - GregtechItemList.Casing_Power_SubStation.get(1), - GregtechItemList.Casing_Vanadium_Redox.get(1), - GregtechItemList.Casing_Power_SubStation.get(1), - "plateIncoloy020", - "plateIncoloyMA956", - "plateIncoloy020", - GregtechItemList.PowerSubStation.get(1)); - } + aCoreBlock.stackSize = 1; - if (CORE.ConfigSwitches.enableMultiblock_IndustrialThermalCentrifuge) { - RecipeUtils.addShapedRecipe( - "plateRedSteel", - CI.craftingToolHammer_Hard, - "plateRedSteel", - "plateRedSteel", - "frameGtBlackSteel", - "plateRedSteel", - "plateRedSteel", - CI.craftingToolWrench, - "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), }, - GT_Values.NF, - GregtechItemList.Casing_ThermalCentrifuge.get(1L), - 50, - 16); - - RecipeUtils.addShapedRecipe( - "plateRedSteel", - "circuitElite", - "plateRedSteel", - "stickTalonite", - IV_MACHINE_ThermalCentrifuge, - "stickTalonite", - "plateRedSteel", - "gearGtTalonite", - "plateRedSteel", - GregtechItemList.Industrial_ThermalCentrifuge.get(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), }, + CI.getTertiaryTieredFluid(6, 144 * (4)), + GregtechItemList.Casing_Autocrafter.get(1), + 20 * 60 * 2, + MaterialUtils.getVoltageForTier(5)); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialWashPlant) { - RecipeUtils.addShapedRecipe( - "plateGrisium", - CI.craftingToolHammer_Hard, - "plateGrisium", - "plateTalonite", - "frameGtGrisium", - "plateTalonite", - "plateGrisium", - CI.craftingToolWrench, - "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), }, - GT_Values.NF, - GregtechItemList.Casing_WashPlant.get(1L), - 50, - 16); - - RecipeUtils.addShapedRecipe( - "plateGrisium", - IV_MACHINE_OreWasher, - "plateGrisium", - "plateTalonite", - "circuitElite", - "plateTalonite", - "plateGrisium", - IV_MACHINE_ChemicalBath, - "plateGrisium", - GregtechItemList.Industrial_WashPlant.get(1)); - } + 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), }, + CI.getTieredFluid(7, 144 * 8), + GregtechItemList.GT4_Multi_Crafter.get(1), + 20 * 60 * 5, + MaterialUtils.getVoltageForTier(5)); - if (CORE.ConfigSwitches.enableMultiblock_LargeAutoCrafter) { + 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), }, + CI.getAlternativeTieredFluid(5, 144 * 4), + ItemUtils.getSimpleStack(ModBlocks.blockProjectTable), + 20 * 30 * 3, + MaterialUtils.getVoltageForTier(4)); + } - ItemStack aCoreBlock = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK - ? ItemUtils.getValueOfItemList( - "Block_IridiumTungstensteel", - 1, - ItemUtils.getItemStackOfAmountFromOreDict("blockOsmiridium", 1)) - : ItemUtils.getItemStackOfAmountFromOreDict("blockOsmiridium", 1); + if (CORE.ConfigSwitches.enableMultiblock_IndustrialCuttingMachine) { + ItemStack plate = ALLOY.MARAGING300.getPlate(1); + RecipeUtils.addShapedRecipe( + plate, + CI.craftingToolHammer_Hard, + plate, + "plateStellite", + "frameGtTalonite", + "plateStellite", + plate, + CI.craftingToolWrench, + 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), }, + GT_Values.NF, + GregtechItemList.Casing_CuttingFactoryFrame.get(1L), + 50, + 16); - aCoreBlock.stackSize = 1; + RecipeUtils.addShapedRecipe( + plate, + CI.getTieredCircuit(4), + plate, + "wireFinePlatinum", + IV_MACHINE_Cutter, + "wireFinePlatinum", + plate, + CI.getTieredCircuit(4), + plate, + GregtechItemList.Industrial_CuttingFactoryController.get(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), }, - CI.getTertiaryTieredFluid(6, 144 * (4)), - GregtechItemList.Casing_Autocrafter.get(1), - 20 * 60 * 2, - MaterialUtils.getVoltageForTier(5)); + // IV_MACHINE_Extruder + if (CORE.ConfigSwitches.enableMultiblock_IndustrialExtrudingMachine) { + ItemStack plate = ALLOY.INCONEL_690.getPlate(1); + RecipeUtils.addShapedRecipe( + plate, + CI.craftingToolHammer_Hard, + plate, + "plateTalonite", + "frameGtStaballoy", + "plateTalonite", + plate, + CI.craftingToolWrench, + 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), }, + GT_Values.NF, + GregtechItemList.Casing_Extruder.get(1L), + 50, + 16); - 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), }, - CI.getTieredFluid(7, 144 * 8), - GregtechItemList.GT4_Multi_Crafter.get(1), - 20 * 60 * 5, - MaterialUtils.getVoltageForTier(5)); + RecipeUtils.addShapedRecipe( + plate, + CI.getTieredCircuit(5), + plate, + CI.electricPiston_IV, + IV_MACHINE_Extruder, + CI.electricPiston_IV, + plate, + CI.getTieredCircuit(5), + plate, + GregtechItemList.Industrial_Extruder.get(1)); + } - 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), }, - CI.getAlternativeTieredFluid(5, 144 * 4), - ItemUtils.getSimpleStack(ModBlocks.blockProjectTable), - 20 * 30 * 3, - MaterialUtils.getVoltageForTier(4)); - } + if (CORE.ConfigSwitches.enableMultiblock_IndustrialFishingPort) { + ItemStack plate = ALLOY.AQUATIC_STEEL.getPlate(1); + RecipeUtils.addShapedRecipe( + plate, + CI.craftingToolHammer_Hard, + plate, + "plateEglinSteel", + "frameGtEglinSteel", + "plateEglinSteel", + plate, + CI.craftingToolWrench, + 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), }, + GT_Values.NF, + GregtechItemList.Casing_FishPond.get(1L), + 50, + 16); + RecipeUtils.addShapedRecipe( + plate, + CI.getTieredCircuit(5), + plate, + "wireFineElectrum", + ItemUtils.getSimpleStack(ModBlocks.blockFishTrap), + "wireFineElectrum", + plate, + CI.getTieredCircuit(5), + plate, + GregtechItemList.Industrial_FishingPond.get(1)); + } - if (CORE.ConfigSwitches.enableMultiblock_IndustrialCuttingMachine) { - ItemStack plate = ALLOY.MARAGING300.getPlate(1); - RecipeUtils.addShapedRecipe( - plate, - CI.craftingToolHammer_Hard, - plate, - "plateStellite", - "frameGtTalonite", - "plateStellite", - plate, - CI.craftingToolWrench, - 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), }, - GT_Values.NF, - GregtechItemList.Casing_CuttingFactoryFrame.get(1L), - 50, - 16); - - RecipeUtils.addShapedRecipe( - plate, - CI.getTieredCircuit(4), - plate, - "wireFinePlatinum", - IV_MACHINE_Cutter, - "wireFinePlatinum", - plate, - CI.getTieredCircuit(4), - plate, - GregtechItemList.Industrial_CuttingFactoryController.get(1)); - } + if (true) { + // Advanced Vacuum Freezer + ItemStack plate = ALLOY.HG1223.getPlateDouble(1); + ItemStack gear = ALLOY.INCOLOY_MA956.getGear(1); + ItemStack frame = ALLOY.LAFIUM.getFrameBox(1); + ItemStack cell1 = ItemList.Reactor_Coolant_He_6.get(1); + ItemStack cell2 = ItemList.Reactor_Coolant_NaK_6.get(1); - // IV_MACHINE_Extruder - if (CORE.ConfigSwitches.enableMultiblock_IndustrialExtrudingMachine) { - ItemStack plate = ALLOY.INCONEL_690.getPlate(1); - RecipeUtils.addShapedRecipe( - plate, - CI.craftingToolHammer_Hard, - plate, - "plateTalonite", - "frameGtStaballoy", - "plateTalonite", - plate, - CI.craftingToolWrench, - 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), }, - GT_Values.NF, - GregtechItemList.Casing_Extruder.get(1L), - 50, - 16); - - RecipeUtils.addShapedRecipe( - plate, - CI.getTieredCircuit(5), - plate, - CI.electricPiston_IV, - IV_MACHINE_Extruder, - CI.electricPiston_IV, - plate, - CI.getTieredCircuit(5), - plate, - GregtechItemList.Industrial_Extruder.get(1)); - } + RecipeUtils.addShapedRecipe( + plate, + gear, + plate, + cell1, + frame, + cell2, + plate, + gear, + plate, + GregtechItemList.Casing_AdvancedVacuum.get(1)); + RecipeUtils.addShapedRecipe( + gear, + CI.getTieredCircuit(6), + gear, + CI.electricPiston_IV, + GregtechItemList.Casing_AdvancedVacuum.get(1), + CI.electricPiston_IV, + plate, + GregtechItemList.Gregtech_Computer_Cube.get(1), + plate, + GregtechItemList.Industrial_Cryogenic_Freezer.get(1)); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialFishingPort) { - ItemStack plate = ALLOY.AQUATIC_STEEL.getPlate(1); - RecipeUtils.addShapedRecipe( - plate, - CI.craftingToolHammer_Hard, - plate, - "plateEglinSteel", - "frameGtEglinSteel", - "plateEglinSteel", - plate, - CI.craftingToolWrench, - 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), }, - GT_Values.NF, - GregtechItemList.Casing_FishPond.get(1L), - 50, - 16); - RecipeUtils.addShapedRecipe( - plate, - CI.getTieredCircuit(5), - plate, - "wireFineElectrum", - ItemUtils.getSimpleStack(ModBlocks.blockFishTrap), - "wireFineElectrum", - plate, - CI.getTieredCircuit(5), - plate, - GregtechItemList.Industrial_FishingPond.get(1)); - } + // Advanced Blast Furnace + plate = ALLOY.HASTELLOY_N.getPlateDouble(1); + gear = ALLOY.HASTELLOY_W.getGear(1); + frame = ALLOY.HASTELLOY_X.getFrameBox(1); + cell1 = ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1); + cell2 = ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1); + ItemStack cell3 = ItemUtils.simpleMetaStack("IC2:reactorVentDiamond:1:1", 1, 1); - if (true) { - // Advanced Vacuum Freezer - ItemStack plate = ALLOY.HG1223.getPlateDouble(1); - ItemStack gear = ALLOY.INCOLOY_MA956.getGear(1); - ItemStack frame = ALLOY.LAFIUM.getFrameBox(1); - ItemStack cell1 = ItemList.Reactor_Coolant_He_6.get(1); - ItemStack cell2 = ItemList.Reactor_Coolant_NaK_6.get(1); - - RecipeUtils.addShapedRecipe( - plate, - gear, - plate, - cell1, - frame, - cell2, - plate, - gear, - plate, - GregtechItemList.Casing_AdvancedVacuum.get(1)); - RecipeUtils.addShapedRecipe( - gear, - CI.getTieredCircuit(6), - gear, - CI.electricPiston_IV, - GregtechItemList.Casing_AdvancedVacuum.get(1), - CI.electricPiston_IV, - plate, - GregtechItemList.Gregtech_Computer_Cube.get(1), - plate, - GregtechItemList.Industrial_Cryogenic_Freezer.get(1)); - - // Advanced Blast Furnace - plate = ALLOY.HASTELLOY_N.getPlateDouble(1); - gear = ALLOY.HASTELLOY_W.getGear(1); - frame = ALLOY.HASTELLOY_X.getFrameBox(1); - cell1 = ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1); - cell2 = ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1); - ItemStack cell3 = ItemUtils.simpleMetaStack("IC2:reactorVentDiamond:1:1", 1, 1); - - RecipeUtils.addShapedRecipe( - plate, - cell1, - plate, - cell3, - frame, - cell2, - plate, - gear, - plate, - GregtechItemList.Casing_Adv_BlastFurnace.get(1)); - RecipeUtils.addShapedRecipe( - gear, - CI.getTieredCircuit(6), - gear, - CI.robotArm_IV, - GregtechItemList.Casing_Adv_BlastFurnace.get(1), - CI.robotArm_IV, - plate, - GregtechItemList.Gregtech_Computer_Cube.get(1), - plate, - 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), }, - 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), }, - GT_Values.NF, - GregtechItemList.Casing_Adv_BlastFurnace.get(1L), - 50, - 16); - - // Advanced Implosion Compressor - plate = ItemUtils.getItemStackOfAmountFromOreDict("plateAlloyIridium", 1); - gear = ALLOY.LEAGRISIUM.getGear(1); - frame = ALLOY.CINOBITE.getFrameBox(1); - cell1 = ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1); - cell2 = ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1); - - RecipeUtils.addShapedRecipe( - gear, - CI.getTieredCircuit(6), - gear, - CI.fieldGenerator_IV, - CI.machineHull_ZPM, - CI.robotArm_IV, - plate, - GregtechItemList.Gregtech_Computer_Cube.get(1), - plate, - GregtechItemList.Machine_Adv_ImplosionCompressor.get(1)); - - // Supply Depot - plate = ALLOY.TUNGSTEN_CARBIDE.getPlateDouble(1); - gear = ALLOY.TRINIUM_TITANIUM.getRing(1); - frame = ALLOY.TUNGSTEN_CARBIDE.getFrameBox(1); - 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)) - : ItemList.Machine_IV_Unboxinator.get(1); - - RecipeUtils.addShapedRecipe( - plate, - ItemUtils.getItemStackOfAmountFromOreDict("cableGt12VanadiumGallium", 1), - plate, - cell1, - frame, - cell2, - plate, - gear, - 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), }, - GT_Values.NF, - GregtechItemList.Casing_AmazonWarehouse.get(1L), - 50, - 16); - RecipeUtils.addShapedRecipe( - casingAmazon, - CI.getTieredCircuit(7), - casingAmazon, - CI.robotArm_LuV, - aTieredUnboxinator, - CI.robotArm_LuV, - CI.conveyorModule_LuV, - GregtechItemList.Gregtech_Computer_Cube.get(1), - CI.conveyorModule_LuV, - GregtechItemList.Amazon_Warehouse_Controller.get(1)); - - // Industrial Mixing Machine - RecipeUtils.addShapedRecipe( - "plateStaballoy", - CI.getTieredCircuit(5), - "plateStaballoy", - "plateZirconiumCarbide", - IV_MACHINE_Mixer, - "plateZirconiumCarbide", - "plateStaballoy", - CI.getTieredCircuit(5), - "plateStaballoy", - GregtechItemList.Industrial_Mixer.get(1)); - } + RecipeUtils.addShapedRecipe( + plate, + cell1, + plate, + cell3, + frame, + cell2, + plate, + gear, + plate, + GregtechItemList.Casing_Adv_BlastFurnace.get(1)); + RecipeUtils.addShapedRecipe( + gear, + CI.getTieredCircuit(6), + gear, + CI.robotArm_IV, + GregtechItemList.Casing_Adv_BlastFurnace.get(1), + CI.robotArm_IV, + plate, + GregtechItemList.Gregtech_Computer_Cube.get(1), + plate, + 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), }, + 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), }, + GT_Values.NF, + GregtechItemList.Casing_Adv_BlastFurnace.get(1L), + 50, + 16); + + // Advanced Implosion Compressor + plate = ItemUtils.getItemStackOfAmountFromOreDict("plateAlloyIridium", 1); + gear = ALLOY.LEAGRISIUM.getGear(1); + frame = ALLOY.CINOBITE.getFrameBox(1); + cell1 = ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1); + cell2 = ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialMultiMachine) { - ItemStack plate = ALLOY.STABALLOY.getPlate(1); - - ItemStack o_Compressor = ItemList.Machine_IV_Compressor.get(1); - ItemStack o_Lathe = ItemList.Machine_IV_Lathe.get(1); - ItemStack o_Electromagnet = ItemList.Machine_IV_Polarizer.get(1); - ItemStack o_Fermenter = ItemList.Machine_IV_Fermenter.get(1); - ItemStack o_Distillery = ItemList.Machine_IV_FluidExtractor.get(1); - ItemStack o_Extractor = ItemList.Machine_IV_Extractor.get(1); - - RecipeUtils.addShapedRecipe( - plate, - CI.craftingToolHammer_Hard, - plate, - "plateStainlessSteel", - "frameGtZirconiumCarbide", - "plateStainlessSteel", - plate, - CI.craftingToolWrench, - 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), }, - GT_Values.NF, - GregtechItemList.Casing_Multi_Use.get(1L), - 50, - 16); - - RecipeUtils.addShapedRecipe( - o_Compressor, - o_Lathe, - o_Electromagnet, - plate, - ItemUtils.getSimpleStack(ModBlocks.blockProjectTable), - plate, - o_Fermenter, - o_Distillery, - o_Extractor, - GregtechItemList.Industrial_MultiMachine.get(1)); - } + RecipeUtils.addShapedRecipe( + gear, + CI.getTieredCircuit(6), + gear, + CI.fieldGenerator_IV, + CI.machineHull_ZPM, + CI.robotArm_IV, + plate, + GregtechItemList.Gregtech_Computer_Cube.get(1), + plate, + GregtechItemList.Machine_Adv_ImplosionCompressor.get(1)); + + // Supply Depot + plate = ALLOY.TUNGSTEN_CARBIDE.getPlateDouble(1); + gear = ALLOY.TRINIUM_TITANIUM.getRing(1); + frame = ALLOY.TUNGSTEN_CARBIDE.getFrameBox(1); + cell1 = CI.conveyorModule_LuV; + cell2 = CI.electricMotor_LuV; + ItemStack casingAmazon = GregtechItemList.Casing_AmazonWarehouse.get(1); + ItemStack aTieredUnboxinator = ItemUtils + .getValueOfItemList("Machine_LuV_Unboxinator", 1, ItemList.Machine_IV_Unboxinator.get(1)); - /* - * 6/1/19 - Content additions - */ + RecipeUtils.addShapedRecipe( + plate, + ItemUtils.getItemStackOfAmountFromOreDict("cableGt12VanadiumGallium", 1), + plate, + cell1, + frame, + cell2, + plate, + gear, + 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), }, + GT_Values.NF, + GregtechItemList.Casing_AmazonWarehouse.get(1L), + 50, + 16); + RecipeUtils.addShapedRecipe( + casingAmazon, + CI.getTieredCircuit(7), + casingAmazon, + CI.robotArm_LuV, + aTieredUnboxinator, + CI.robotArm_LuV, + CI.conveyorModule_LuV, + GregtechItemList.Gregtech_Computer_Cube.get(1), + CI.conveyorModule_LuV, + GregtechItemList.Amazon_Warehouse_Controller.get(1)); - if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { + // Industrial Mixing Machine + RecipeUtils.addShapedRecipe( + "plateStaballoy", + CI.getTieredCircuit(5), + "plateStaballoy", + "plateZirconiumCarbide", + IV_MACHINE_Mixer, + "plateZirconiumCarbide", + "plateStaballoy", + CI.getTieredCircuit(5), + "plateStaballoy", + GregtechItemList.Industrial_Mixer.get(1)); + } - ItemStack aDrillController = ItemUtils.getValueOfItemList("OreDrill4", ItemList.Hull_UV).get(1); + if (CORE.ConfigSwitches.enableMultiblock_IndustrialMultiMachine) { + ItemStack plate = ALLOY.STABALLOY.getPlate(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)), }, - ALLOY.MARAGING350.getFluidStack(144 * 16 * (1)), - GregtechItemList.Casing_BedrockMiner.get(1), - (int) GT_Values.V[4], - (int) GT_Values.V[6]); - } + ItemStack o_Compressor = ItemList.Machine_IV_Compressor.get(1); + ItemStack o_Lathe = ItemList.Machine_IV_Lathe.get(1); + ItemStack o_Electromagnet = ItemList.Machine_IV_Polarizer.get(1); + ItemStack o_Fermenter = ItemList.Machine_IV_Fermenter.get(1); + ItemStack o_Distillery = ItemList.Machine_IV_FluidExtractor.get(1); + ItemStack o_Extractor = ItemList.Machine_IV_Extractor.get(1); + + RecipeUtils.addShapedRecipe( + plate, + CI.craftingToolHammer_Hard, + plate, + "plateStainlessSteel", + "frameGtZirconiumCarbide", + "plateStainlessSteel", + plate, + CI.craftingToolWrench, + 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), }, + GT_Values.NF, + GregtechItemList.Casing_Multi_Use.get(1L), + 50, + 16); + + RecipeUtils.addShapedRecipe( + o_Compressor, + o_Lathe, + o_Electromagnet, + plate, + ItemUtils.getSimpleStack(ModBlocks.blockProjectTable), + plate, + o_Fermenter, + o_Distillery, + o_Extractor, + GregtechItemList.Industrial_MultiMachine.get(1)); } + /* + * 6/1/19 - Content additions + */ + + // 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), }, + ALLOY.MARAGING350.getFluidStack(144 * 16 * 1), + GregtechItemList.Casing_BedrockMiner.get(1), + (int) GT_Values.V[4], + (int) GT_Values.V[6]); + int aCostMultiplier = 1; // Reservoir Hatch diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java deleted file mode 100644 index af4f9b90b8..0000000000 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java +++ /dev/null @@ -1,562 +0,0 @@ -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; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OreDictNames; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.SubTag; -import gregtech.api.interfaces.IOreRecipeRegistrator; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.minecraft.RecipeUtils; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; - -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) { - 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 }), - 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 }), - 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 }), - 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 }), - 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 }), - GregtechItemList.Old_Circuit_Parts_Wiring_Elite.get(1L, new Object[0]), - 64, - 480); - } else if (aOreDictName.equals(OreDictNames.craftingLensGreen.toString())) { - 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 }), - 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 }), - 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); - } - } - - 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) }); - - GT_Values.RA.addFormingPressRecipe( - GregtechItemList.Old_Empty_Board_Basic.get(1L, new Object[0]), - GregtechItemList.Old_Circuit_Parts_Wiring_Basic.get(4L, new Object[0]), - GregtechItemList.Old_Circuit_Board_Basic.get(1L, new Object[0]), - 32, - 16); - GT_Values.RA.addFormingPressRecipe( - GregtechItemList.Old_Empty_Board_Basic.get(1L, new Object[0]), - GregtechItemList.Old_Circuit_Parts_Wiring_Advanced.get(4L, new Object[0]), - GregtechItemList.Old_Circuit_Board_Advanced.get(1L, new Object[0]), - 32, - 64); - GT_Values.RA.addFormingPressRecipe( - GregtechItemList.Old_Empty_Board_Elite.get(1L, new Object[0]), - GregtechItemList.Old_Circuit_Parts_Wiring_Elite.get(4L, new Object[0]), - GregtechItemList.Old_Circuit_Board_Elite.get(1L, new Object[0]), - 32, - 256); - - GT_Values.RA.addFormingPressRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lapis, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L), - GregtechItemList.Old_Circuit_Parts_Advanced.get(2L, new Object[0]), - 32, - 64); - GT_Values.RA.addFormingPressRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lazurite, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L), - GregtechItemList.Old_Circuit_Parts_Advanced.get(2L, new Object[0]), - 32, - 64); - - int tMultiplier; - for (Materials tMat : Materials.values()) { - if ((tMat.mStandardMoltenFluid != null) && (tMat.contains(SubTag.SOLDERING_MATERIAL))) { - tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_BAD) ? 4 - : tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD) ? 1 : 2; - - GT_Values.RA.addAssemblerRecipe( - ItemList.IC2_Item_Casing_Steel.get(1L, new Object[0]), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 2L), - tMat.getMolten(144L * tMultiplier / 8L), - GregtechItemList.Old_Circuit_Primitive.get(1L, new Object[0]), - 16, - 8); - GT_Values.RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Plastic, 1L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1L), - tMat.getMolten(144L * tMultiplier / 8L), - GregtechItemList.Old_Circuit_Primitive.get(1L, new Object[0]), - 16, - 8); - GT_Values.RA.addAssemblerRecipe( - GregtechItemList.Old_Circuit_Board_Basic.get(1L, new Object[0]), - GregtechItemList.Old_Circuit_Primitive.get(2L, new Object[0]), - tMat.getMolten(144L * tMultiplier / 4L), - GregtechItemList.Old_Circuit_Basic.get(1L, new Object[0]), - 32, - 16); - GT_Values.RA.addAssemblerRecipe( - GregtechItemList.Old_Circuit_Basic.get(1L, new Object[0]), - GregtechItemList.Old_Circuit_Primitive.get(2L, new Object[0]), - tMat.getMolten(144L * tMultiplier / 4L), - GregtechItemList.Old_Circuit_Good.get(1L, new Object[0]), - 32, - 16); - GT_Values.RA.addAssemblerRecipe( - GregtechItemList.Old_Circuit_Board_Advanced.get(1L, new Object[0]), - GregtechItemList.Old_Circuit_Parts_Advanced.get(2L, new Object[0]), - tMat.getMolten(144L * tMultiplier / 2L), - GregtechItemList.Old_Circuit_Advanced.get(1L, new Object[0]), - 32, - 64); - GT_Values.RA.addAssemblerRecipe( - GregtechItemList.Old_Circuit_Board_Advanced.get(1L, new Object[0]), - GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Elite.get(1L, new Object[0]), - tMat.getMolten(144L * tMultiplier / 2L), - GregtechItemList.Old_Circuit_Data.get(1L, new Object[0]), - 32, - 64); - GT_Values.RA.addAssemblerRecipe( - GregtechItemList.Old_Circuit_Board_Elite.get(1L, new Object[0]), - GregtechItemList.Old_Circuit_Data.get(3L, new Object[0]), - tMat.getMolten(144L * tMultiplier / 1L), - GregtechItemList.Old_Circuit_Elite.get(1L, new Object[0]), - 32, - 256); - GT_Values.RA.addAssemblerRecipe( - GregtechItemList.Old_Circuit_Board_Elite.get(1L, new Object[0]), - ItemList.Circuit_Parts_Crystal_Chip_Master.get(3L, new Object[0]), - tMat.getMolten(144L * tMultiplier / 1L), - GregtechItemList.Old_Circuit_Master.get(1L, new Object[0]), - 32, - 256); - GT_Values.RA.addAssemblerRecipe( - GregtechItemList.Old_Circuit_Board_Elite.get(1L, new Object[0]), - GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Master.get(3L, new Object[0]), - tMat.getMolten(144L * tMultiplier / 1L), - GregtechItemList.Old_Circuit_Master.get(1L, new Object[0]), - 32, - 256); - GT_Values.RA.addAssemblerRecipe( - GregtechItemList.Old_Circuit_Data.get(1L, new Object[0]), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Plastic, 2L), - tMat.getMolten(144L * tMultiplier / 2L), - GregtechItemList.Old_Tool_DataStick.get(1L, new Object[0]), - 128, - 64); - } - } - - GT_Values.RA.addAssemblerRecipe( - GregtechItemList.Old_Circuit_Elite.get(2L, new Object[0]), - GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Elite.get(18L, new Object[0]), - GT_Values.NF, - GregtechItemList.Old_Tool_DataOrb.get(1L, new Object[0]), - 512, - 256); - GT_Values.RA.addAssemblerRecipe( - GregtechItemList.Old_Circuit_Master.get(2L, new Object[0]), - ItemList.Circuit_Parts_Crystal_Chip_Master.get(18L, new Object[0]), - GT_Values.NF, - ItemList.Energy_LapotronicOrb.get(1L, new Object[0]), - 512, - 1024); - GT_Values.RA.addAssemblerRecipe( - GregtechItemList.Old_Circuit_Master.get(2L, new Object[0]), - GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Master.get(18L, new Object[0]), - GT_Values.NF, - ItemList.Energy_LapotronicOrb.get(1L, new Object[0]), - 512, - 1024); - GT_Values.RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Plastic, 1L), - GregtechItemList.Old_Empty_Board_Basic.get(1L, new Object[0]), - 32, - 16); - - Materials plasticType = Materials.get("Polytetrafluoroethylene") != null - ? Materials.get("Polytetrafluoroethylene") - : Materials.Plastic; - GT_Values.RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 2L), - GT_OreDictUnificator.get(OrePrefixes.plate, plasticType, 1L), - GregtechItemList.Old_Empty_Board_Elite.get(1L, new Object[0]), - 32, - 256); - - return true; - } - - public static boolean handleCircuits() { - hideCircuitsNEI(); - addCircuitRecipes(); - removeNewCircuits(); - generateTradeRecipes(); - return true; - } - - private static boolean setItemList(ItemList Set, GregtechItemList Get) { - try { - Set.set(Get.get(1)); - return true; - } catch (Throwable t) {} - return false; - } - - private static boolean removeNewCircuits() { - Logger.INFO( - "[Old Feature - Circuits] Overriding .28+ circuit values in the GT5u Itemlist with values from GT++."); - - boolean newVersion = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && Utils.getGregtechSubVersion() >= 30; - - setItemList(ItemList.Circuit_Primitive, GregtechItemList.Old_Circuit_Primitive); - setItemList(ItemList.Circuit_Basic, GregtechItemList.Old_Circuit_Basic); - setItemList(ItemList.Circuit_Good, GregtechItemList.Old_Circuit_Good); - setItemList(ItemList.Circuit_Advanced, GregtechItemList.Old_Circuit_Advanced); - // ItemList.Circuit_Data, GregtechItemList.Old_Circuit_Data); - setItemList(ItemList.Circuit_Elite, GregtechItemList.Old_Circuit_Elite); - setItemList(ItemList.Circuit_Master, GregtechItemList.Old_Circuit_Master); - setItemList(ItemList.Circuit_Ultimate, GregtechItemList.Old_Circuit_Ultimate); - - /** - * Try Set New circuits to have old replacements - */ - - // Basic - if (newVersion) { - setItemList(ItemList.valueOf("Circuit_Microprocessor"), GregtechItemList.Old_Circuit_Basic); // NEW - } - // Good - if (newVersion) { - setItemList(ItemList.valueOf("Circuit_Integrated_Good"), GregtechItemList.Old_Circuit_Good); // New - } - // Advanced - if (newVersion) { - setItemList(ItemList.valueOf("Circuit_Nanoprocessor"), GregtechItemList.Old_Circuit_Advanced); - } - // Data - if (newVersion) { - setItemList(ItemList.valueOf("Circuit_Quantumprocessor"), GregtechItemList.Old_Circuit_Data); - } - if (newVersion) { - setItemList(ItemList.valueOf("Circuit_Nanocomputer"), GregtechItemList.Old_Circuit_Data); - } - // Elite - if (newVersion) { - setItemList(ItemList.valueOf("Circuit_Crystalprocessor"), GregtechItemList.Old_Circuit_Elite); - } - if (newVersion) { - setItemList(ItemList.valueOf("Circuit_Quantumcomputer"), GregtechItemList.Old_Circuit_Elite); - } - if (newVersion) { - setItemList(ItemList.valueOf("Circuit_Elitenanocomputer"), GregtechItemList.Old_Circuit_Elite); - } - // Master - if (newVersion) { - setItemList(ItemList.valueOf("Circuit_Neuroprocessor"), GregtechItemList.Old_Circuit_Master); - } - if (newVersion) { - setItemList(ItemList.valueOf("Circuit_Masterquantumcomputer"), GregtechItemList.Old_Circuit_Master); - } - // Ultimate - if (newVersion) { - setItemList(ItemList.valueOf("Circuit_Wetwarecomputer"), GregtechItemList.Old_Circuit_Ultimate); - } - if (newVersion) { - setItemList(ItemList.valueOf("Circuit_Ultimatecrystalcomputer"), GregtechItemList.Old_Circuit_Ultimate); - } - if (newVersion) { - setItemList(ItemList.valueOf("Circuit_Quantummainframe"), GregtechItemList.Old_Circuit_Ultimate); - } - // Superconductor - if (newVersion) { - setItemList(ItemList.valueOf("Circuit_Wetwaresupercomputer"), GregtechItemList.Circuit_IV); - } - if (newVersion) { - setItemList(ItemList.valueOf("Circuit_Crystalmainframe"), GregtechItemList.Circuit_IV); - } - // Infinite - if (newVersion) { - setItemList(ItemList.valueOf("Circuit_Wetwaremainframe"), GregtechItemList.Circuit_LuV); - } - - // set data orbs and sticks to their new replacements - setItemList(ItemList.Tool_DataStick, GregtechItemList.Old_Tool_DataStick); - setItemList(ItemList.Tool_DataOrb, GregtechItemList.Old_Tool_DataOrb); - - setItemList(ItemList.Circuit_Board_Basic, GregtechItemList.Old_Circuit_Board_Basic); - setItemList(ItemList.Circuit_Board_Advanced, GregtechItemList.Old_Circuit_Board_Advanced); - setItemList(ItemList.Circuit_Board_Elite, GregtechItemList.Old_Circuit_Board_Elite); - setItemList(ItemList.Circuit_Parts_Advanced, GregtechItemList.Old_Circuit_Parts_Advanced); - setItemList(ItemList.Circuit_Parts_Wiring_Basic, GregtechItemList.Old_Circuit_Parts_Wiring_Basic); - setItemList(ItemList.Circuit_Parts_Wiring_Advanced, GregtechItemList.Old_Circuit_Parts_Wiring_Advanced); - setItemList(ItemList.Circuit_Parts_Wiring_Elite, GregtechItemList.Old_Circuit_Parts_Wiring_Elite); - setItemList(ItemList.Circuit_Parts_Crystal_Chip_Elite, GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Elite); - setItemList(ItemList.Circuit_Parts_Crystal_Chip_Master, GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Master); - - return true; - } - - private static boolean generateTradeRecipes() { - - // Data stick and Data orbs. - // GT Type to GT++ Type - RecipeUtils.recipeBuilder( - CI.craftingToolScrewdriver, - null, - null, - ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32708", 32708, 1), - null, - null, - null, - null, - null, - GregtechItemList.Old_Tool_DataStick.get(1)); - RecipeUtils.recipeBuilder( - CI.craftingToolScrewdriver, - null, - null, - ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32707", 32707, 1), - null, - null, - null, - null, - null, - GregtechItemList.Old_Tool_DataOrb.get(1)); - - // GT++ Type to GT Type - RecipeUtils.recipeBuilder( - CI.craftingToolScrewdriver, - null, - null, - GregtechItemList.Old_Tool_DataStick.get(1), - null, - null, - null, - null, - null, - ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32708", 32708, 1)); - RecipeUtils.recipeBuilder( - CI.craftingToolScrewdriver, - null, - null, - GregtechItemList.Old_Tool_DataOrb.get(1), - null, - null, - null, - null, - null, - ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32707", 32707, 1)); - - // Primitive - RecipeUtils.addShapelessGregtechRecipe( - 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) }, - ItemUtils.getItemStackOfAmountFromOreDict("circuitBasic", 1)); - RecipeUtils.addShapelessGregtechRecipe( - 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) }, - ItemUtils.getItemStackOfAmountFromOreDict("circuitGood", 1)); - RecipeUtils.addShapelessGregtechRecipe( - 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) }, - ItemUtils.getItemStackOfAmountFromOreDict("circuitAdvanced", 1)); - RecipeUtils.addShapelessGregtechRecipe( - 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) }, - ItemUtils.getItemStackOfAmountFromOreDict("circuitData", 1)); - - // Elite - RecipeUtils.addShapelessGregtechRecipe( - 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) }, - ItemUtils.getItemStackOfAmountFromOreDict("circuitMaster", 1)); - - // Components - // Green Chip - RecipeUtils.addShapelessGregtechRecipe( - 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) }, - GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Master.get(1)); - - // Basic Board - RecipeUtils.addShapelessGregtechRecipe( - 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) }, - GregtechItemList.Old_Circuit_Board_Advanced.get(1)); - // Elite Board - RecipeUtils.addShapelessGregtechRecipe( - 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); } } - */ - - return true; - } - - private static boolean hideCircuitsNEI() { - 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" }; - - for (String component : CircuitToHide) { - try { - 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."); - } - } - } - return true; - } -} diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java deleted file mode 100644 index 0bfd3605b9..0000000000 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java +++ /dev/null @@ -1,32 +0,0 @@ -package gtPlusPlus.core.recipe; - -import net.minecraft.item.ItemStack; - -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.LoadedMods; - -public class RECIPES_Shapeless { - - static ItemStack dustStaballoy; - - // Circuits - static String circuitPrimitive = "circuitPrimitive"; - static String circuitBasic = "circuitBasic"; - static String circuitGood = "circuitGood"; - static String circuitAdvanced = "circuitAdvanced"; - static String circuitData = "circuitData"; - static String circuitElite = "circuitElite"; - static String circuitMaster = "circuitMaster"; - static String circuitUltimate = "circuitUltimate"; - static ItemStack gearboxCasing_Tier_1; - - public static final void loadRecipes() { - // run(); - Logger.INFO("Loading Shapeless Recipes."); - } - - private static void run() { - // Gregtech items - if (LoadedMods.Gregtech) {} - } -} diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPE_Batteries.java b/src/main/java/gtPlusPlus/core/recipe/RECIPE_Batteries.java index 44ae76b363..26b695804c 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPE_Batteries.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPE_Batteries.java @@ -3,7 +3,6 @@ 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; @@ -20,11 +19,8 @@ public class RECIPE_Batteries { static ItemStack machineTransformer_EV; public static void loadRecipes() { - - if (LoadedMods.Gregtech) { - machineTransformer_EV = ItemList.Transformer_EV_HV.get(1); - run(); - } + machineTransformer_EV = ItemList.Transformer_EV_HV.get(1); + run(); } private static void run() { diff --git a/src/main/java/gtPlusPlus/core/recipe/common/CI.java b/src/main/java/gtPlusPlus/core/recipe/common/CI.java index 486cbd97ca..03d4f66eb9 100644 --- a/src/main/java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/main/java/gtPlusPlus/core/recipe/common/CI.java @@ -13,7 +13,6 @@ import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.chemistry.AgriculturalChem; import gtPlusPlus.core.item.chemistry.GenericChem; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.material.Material; @@ -235,34 +234,7 @@ public class CI { } public static Object getTieredCircuit(int tier) { - if (CORE.ConfigSwitches.enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && !CORE.GTNH) { - if (tier == 0) { - return GregtechItemList.Old_Circuit_Primitive.get(1); - } else if (tier == 1) { - return GregtechItemList.Old_Circuit_Basic.get(1); - } else if (tier == 2) { - return GregtechItemList.Old_Circuit_Good.get(1); - } else if (tier == 3) { - return GregtechItemList.Old_Circuit_Advanced.get(1); - } else if (tier == 4) { - return GregtechItemList.Old_Circuit_Data.get(1); - } else if (tier == 5) { - return GregtechItemList.Old_Circuit_Elite.get(1); - } else if (tier == 6) { - return GregtechItemList.Old_Circuit_Master.get(1); - } else if (tier == 7) { - return GregtechItemList.Old_Circuit_Ultimate.get(1); - } else if (tier == 8) { - return GregtechItemList.Circuit_IV.get(1); - } else if (tier == 9) { - return GregtechItemList.Circuit_LuV.get(1); - } else if (tier == 10) { - return GregtechItemList.Circuit_ZPM.get(1); - } - } else { - return getTieredCircuitOreDictName(tier); - } - return _NULL; + return getTieredCircuitOreDictName(tier); } public static ItemStack[] getAllCircuitsOfTier(int tier) { @@ -352,19 +324,11 @@ public class CI { } public static ItemStack getDataOrb() { - if (CORE.ConfigSwitches.enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && !CORE.GTNH) { - return GregtechItemList.Old_Tool_DataOrb.get(1); - } else { - return ItemList.Tool_DataOrb.get(1); - } + return ItemList.Tool_DataOrb.get(1); } public static ItemStack getDataStick() { - if (CORE.ConfigSwitches.enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && !CORE.GTNH) { - return GregtechItemList.Old_Tool_DataStick.get(1); - } else { - return ItemList.Tool_DataStick.get(1); - } + return ItemList.Tool_DataStick.get(1); } public static final ItemStack getTieredMachineHull(int tier) { @@ -481,10 +445,9 @@ public class CI { 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_Cables = new Materials[] { 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, @@ -747,9 +710,6 @@ public class CI { } public static ItemStack getFluidRegulator(int aTier, int aSize) { - if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - return CI.getElectricPump(aTier, aSize); - } ItemStack aType; int aLazyTier = 0; if (aTier == aLazyTier++) { @@ -1011,26 +971,10 @@ public class CI { } public static ItemStack getHeatCoil(int i) { - if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - if (i == 1) { - return ItemList.Casing_Coil_Kanthal.get(1); - } else if (i == 2) { - return ItemList.Casing_Coil_Nichrome.get(1); - } else { - return ItemList.Casing_Coil_Cupronickel.get(1); - } - } else { - if (!CORE.GTNH) { - if (i > 6) { - i = 6; - } - } else { - if (i > 8) { - i = 8; - } - } - return ItemUtils.simpleMetaStack(StaticFields59.getBlockCasings5(), i, 1); + if (i > 8) { + i = 8; } + return ItemUtils.simpleMetaStack(StaticFields59.getBlockCasings5(), i, 1); } public static ItemStack getNumberedBioCircuit(int i) { |