diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/core/recipe')
| -rw-r--r-- | src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java | 1030 |
1 files changed, 358 insertions, 672 deletions
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java index af2f62e608..f06c4904f7 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -1,7 +1,7 @@ package gtPlusPlus.core.recipe; -import static gtPlusPlus.core.lib.CORE.GTNH; - +import com.github.technus.tectech.recipe.TT_recipeAdder; +import com.github.technus.tectech.thing.CustomItemList; import cpw.mods.fml.common.Loader; import gregtech.api.GregTech_API; import gregtech.api.enums.*; @@ -19,6 +19,7 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.material.MISC_MATERIALS; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.*; @@ -214,9 +215,6 @@ public class RECIPES_Machines { public static ItemStack INPUT_RCCokeOvenBlock; public static ItemStack INPUT_IECokeOvenBlock; - // Output Determiner - public static int Casing_Amount; - public static final void loadRecipes() { run(); Logger.INFO("Loading Recipes for the Various machine blocks."); @@ -224,13 +222,6 @@ public class RECIPES_Machines { private static void run() { - // Determines Casing Recipe Output - if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && !GTNH) { - Casing_Amount = 2; - } else { - Casing_Amount = 1; - } - initModItems(); tieredMachineHulls(); controlCores(); @@ -600,26 +591,26 @@ public class RECIPES_Machines { new Object[] { ALLOY.HG1223.getFineWire(64), ALLOY.HG1223.getFineWire(64), - ItemList.Electric_Motor_IV.get(GTNH ? 32 : 16), - ItemList.Energy_LapotronicOrb.get(GTNH ? 32 : 16), - CI.getTieredComponent(OrePrefixes.cableGt12, 6, GTNH ? 32 : 16), - CI.getTieredComponent(OrePrefixes.wireGt16, 5, GTNH ? 64 : 32), + ItemList.Electric_Motor_IV.get(16), + ItemList.Energy_LapotronicOrb.get(16), + CI.getTieredComponent(OrePrefixes.cableGt12, 6, 16), + CI.getTieredComponent(OrePrefixes.wireGt16, 5, 32), ALLOY.ZERON_100.getFrameBox(4), ALLOY.ZIRCONIUM_CARBIDE.getPlateDouble(32), ALLOY.BABBIT_ALLOY.getPlate(64), - ALLOY.LEAGRISIUM.getGear(GTNH ? 16 : 8), + ALLOY.LEAGRISIUM.getGear(8), new Object[] {CI.getTieredCircuitOreDictName(4), 64}, new Object[] {CI.getTieredCircuitOreDictName(5), 32}, new Object[] {CI.getTieredCircuitOreDictName(6), 16}, GregtechItemList.Laser_Lens_WoodsGlass.get(1), }, new FluidStack[] { - ALLOY.NITINOL_60.getFluidStack(144 * 9 * (GTNH ? 4 : 2)), - ALLOY.INCOLOY_MA956.getFluidStack(144 * 9 * (GTNH ? 32 : 8)), - ALLOY.KANTHAL.getFluidStack(144 * 1 * (GTNH ? 16 : 4)), + ALLOY.NITINOL_60.getFluidStack(144 * 9 * (2)), + ALLOY.INCOLOY_MA956.getFluidStack(144 * 9 * (8)), + ALLOY.KANTHAL.getFluidStack(144 * 1 * (4)), }, GregtechItemList.Controller_MolecularTransformer.get(1), - 20 * 60 * 10 * (GTNH ? 2 : 1), + 20 * 60 * 10 * (1), (int) MaterialUtils.getVoltageForTier(6)); CORE.RA.addSixSlotAssemblingRecipe( @@ -899,14 +890,14 @@ public class RECIPES_Machines { 20 * 60 * 60 * 12, new Object[] { CI.getTieredMachineHull(7, 4), - CI.getFieldGenerator(5, GTNH ? 32 : 16), - CI.getElectricMotor(7, GTNH ? 32 : 16), - CI.getElectricPiston(7, GTNH ? 16 : 4), - CI.getEnergyCore(6, GTNH ? 8 : 2), - CI.getPlate(7, GTNH ? 32 : 16), - CI.getScrew(7, GTNH ? 64 : 32), - CI.getBolt(6, GTNH ? 64 : 32), - CI.getTieredComponent(OrePrefixes.rod, 6, GTNH ? 20 : 10), + CI.getFieldGenerator(5, 16), + CI.getElectricMotor(7, 16), + CI.getElectricPiston(7, 4), + CI.getEnergyCore(6, 2), + CI.getPlate(7, 16), + CI.getScrew(7, 32), + CI.getBolt(6, 32), + CI.getTieredComponent(OrePrefixes.rod, 6, 10), new Object[] {CI.getTieredCircuitOreDictName(7), 20}, ItemList.Tool_DataOrb.get(32), GregtechItemList.Laser_Lens_Special.get(1) @@ -918,7 +909,7 @@ public class RECIPES_Machines { ALLOY.BABBIT_ALLOY.getFluidStack(128 * 144), }, GregtechItemList.Controller_ElementalDuplicator.get(1), - 20 * 60 * 60 * (GTNH ? 2 : 1), + 20 * 60 * 60, (int) MaterialUtils.getVoltageForTier(7)); CORE.RA.addAssemblylineRecipe( @@ -926,12 +917,12 @@ public class RECIPES_Machines { 20 * 60 * 60 * 4, new Object[] { CI.getTieredGTPPMachineCasing(7, 2), - CI.getFieldGenerator(4, GTNH ? 8 : 4), - CI.getEnergyCore(4, GTNH ? 8 : 2), - CI.getPlate(7, GTNH ? 16 : 8), - CI.getScrew(6, GTNH ? 32 : 16), - CI.getBolt(6, GTNH ? 32 : 16), - CI.getTieredComponent(OrePrefixes.rod, 5, GTNH ? 32 : 16), + CI.getFieldGenerator(4, 4), + CI.getEnergyCore(4, 2), + CI.getPlate(7, 8), + CI.getScrew(6, 16), + CI.getBolt(6, 16), + CI.getTieredComponent(OrePrefixes.rod, 5, 16), new Object[] {CI.getTieredCircuitOreDictName(6), 32}, ItemList.Tool_DataOrb.get(32), }, @@ -942,7 +933,7 @@ public class RECIPES_Machines { ALLOY.BABBIT_ALLOY.getFluidStack(64 * 144), }, GregtechItemList.Hatch_Input_Elemental_Duplicator.get(1), - 20 * 60 * 60 * (GTNH ? 4 : 2), + 20 * 60 * 60 * (2), (int) MaterialUtils.getVoltageForTier(6)); CORE.RA.addAssemblylineRecipe( @@ -950,12 +941,12 @@ public class RECIPES_Machines { 20 * 60 * 60 * 2, new Object[] { CI.getTieredMachineHull(6, 5), - CI.getFieldGenerator(3, GTNH ? 32 : 16), - CI.getEnergyCore(2, GTNH ? 8 : 2), - CI.getPlate(7, GTNH ? 8 : 4), - CI.getScrew(7, GTNH ? 8 : 4), - CI.getBolt(6, GTNH ? 16 : 8), - CI.getTieredComponent(OrePrefixes.rod, 5, GTNH ? 8 : 4), + CI.getFieldGenerator(3, 16), + CI.getEnergyCore(2, 2), + CI.getPlate(7, 4), + CI.getScrew(7, 4), + CI.getBolt(6, 8), + CI.getTieredComponent(OrePrefixes.rod, 5, 4), new Object[] {CI.getTieredCircuitOreDictName(5), 4}, ItemList.Tool_DataStick.get(4), }, @@ -966,7 +957,7 @@ public class RECIPES_Machines { ALLOY.BABBIT_ALLOY.getFluidStack(16 * 144), }, GregtechItemList.Casing_ElementalDuplicator.get(1), - 20 * 60 * (GTNH ? 20 : 10), + 20 * 60 * (10), (int) MaterialUtils.getVoltageForTier(6)); } @@ -1256,11 +1247,10 @@ public class RECIPES_Machines { private static void runModRecipes() { if (LoadedMods.Gregtech) { - // Computer Cube CORE.RA.addSixSlotAssemblingRecipe( new ItemStack[] { - ItemUtils.getSimpleStack(CI.getDataOrb(), 4 * (GTNH ? 2 : 1)), + ItemUtils.getSimpleStack(CI.getDataOrb(), 4 * (1)), ItemList.Cover_Screen.get(4), CI.machineHull_IV, ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 2) @@ -1273,7 +1263,7 @@ public class RECIPES_Machines { // Circuit programmer CORE.RA.addSixSlotAssemblingRecipe( new ItemStack[] { - ItemUtils.getSimpleStack(CI.robotArm_LV, 4 * (GTNH ? 2 : 1)), + ItemUtils.getSimpleStack(CI.robotArm_LV, 4 * (1)), ItemList.Cover_Controller.get(1, CI.electricMotor_MV), CI.machineHull_MV, ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(1), 2), @@ -1301,12 +1291,11 @@ public class RECIPES_Machines { CORE.RA.addSixSlotAssemblingRecipe( new ItemStack[] { ItemUtils.getItemStackWithMeta(true, "IC2:blockGenerator:6", "IC2-RTG", 6, 1), - ALLOY.NITINOL_60.getPlate(GTNH ? 32 : 8), - ALLOY.MARAGING350.getGear(GTNH ? 16 : 4), - ItemUtils.getSimpleStack(GTNH ? CI.fieldGenerator_IV : CI.fieldGenerator_EV, 8), - ItemUtils.getItemStackOfAmountFromOreDict("wireFinePlatinum", GTNH ? 64 : 32), - ItemUtils.getItemStackOfAmountFromOreDict( - CI.getTieredCircuitOreDictName(GTNH ? 7 : 6), GTNH ? 5 : 4) + 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), @@ -1327,20 +1316,20 @@ public class RECIPES_Machines { 30); ItemStack aFluidRegulator1 = - ItemUtils.getValueOfItemList("FluidRegulator_MV", GTNH ? 4 : 2, ItemList.Electric_Pump_HV); + ItemUtils.getValueOfItemList("FluidRegulator_MV", 2, ItemList.Electric_Pump_HV); ItemStack aFluidRegulator2 = ItemUtils.getValueOfItemList( "FluidRegulator_IV", - GTNH ? 4 : 2, - ItemUtils.getValueOfItemList("Electric_Pump_LuV", GTNH ? 8 : 4, ItemList.Electric_Pump_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, GTNH ? 4 : 2), - ALLOY.EGLIN_STEEL.getPlate(GTNH ? 8 : 4), - ALLOY.POTIN.getScrew(GTNH ? 12 : 6) + CI.getTieredComponent(OrePrefixes.pipeMedium, 2, 2), + ALLOY.EGLIN_STEEL.getPlate(4), + ALLOY.POTIN.getScrew(6) }, ALLOY.TUMBAGA.getFluidStack(144 * 4), ItemUtils.getSimpleStack(ModBlocks.blockPooCollector), @@ -1353,8 +1342,8 @@ public class RECIPES_Machines { CI.getTieredMachineHull(-1), ItemUtils.getSimpleStack(ModBlocks.blockPooCollector), aFluidRegulator2, - CI.getTieredComponent(OrePrefixes.pipeHuge, 6, GTNH ? 8 : 4), - CI.getTieredComponent(OrePrefixes.screw, 6, GTNH ? 32 : 16) + CI.getTieredComponent(OrePrefixes.pipeHuge, 6, 4), + CI.getTieredComponent(OrePrefixes.screw, 6, 16) }, CI.getAlternativeTieredFluid(5, 144 * 9), ItemUtils.getSimpleStack(ModBlocks.blockPooCollector, 8, 1), @@ -1503,7 +1492,7 @@ public class RECIPES_Machines { CI.getTieredMachineHull(3), ItemUtils.getSimpleStack(Items.egg, 64), ItemUtils.getSimpleStack(ModItems.itemRope, 32), - CI.getPlate(4, GTNH ? 16 : 8) + CI.getPlate(4, 8) }, FluidUtils.getFluidStack("mobessence", 4096), ItemUtils.getSimpleStack(ModBlocks.blockEggBox, 1), @@ -1518,8 +1507,8 @@ public class RECIPES_Machines { CI.getTieredMachineHull(2), ItemUtils.getSimpleStack(ModBlocks.blockCircuitProgrammer), VolumetricFlaskHelper.getVolumetricFlask(8), - CI.getTieredComponent(OrePrefixes.pipeSmall, 2, GTNH ? 4 : 2), - CI.getPlate(2, GTNH ? 8 : 4) + CI.getTieredComponent(OrePrefixes.pipeSmall, 2, 2), + CI.getPlate(2, 4) }, CI.getAlternativeTieredFluid(1, 144 * 8), ItemUtils.getSimpleStack(ModBlocks.blockVolumetricFlaskSetter, 1), @@ -1530,7 +1519,7 @@ public class RECIPES_Machines { if (CORE.ConfigSwitches.enableMultiblock_IronBlastFurnace) { RECIPE_IronBlastFurnace = GregtechItemList.Machine_Iron_BlastFurnace.get(1); - RECIPE_IronPlatedBricks = GregtechItemList.Casing_IronPlatedBricks.get(Casing_Amount); + RECIPE_IronPlatedBricks = GregtechItemList.Casing_IronPlatedBricks.get(1); // Iron BF RecipeUtils.addShapedGregtechRecipe( @@ -1580,7 +1569,7 @@ public class RECIPES_Machines { if (CORE.ConfigSwitches.enableMultiblock_IndustrialCentrifuge) { // Industrial Centrifuge RECIPE_IndustrialCentrifugeController = GregtechItemList.Industrial_Centrifuge.get(1); - RECIPE_IndustrialCentrifugeCasing = GregtechItemList.Casing_Centrifuge1.get(Casing_Amount); + RECIPE_IndustrialCentrifugeCasing = GregtechItemList.Casing_Centrifuge1.get(1); // Industrial Centrifuge RecipeUtils.addShapedGregtechRecipe( @@ -1622,9 +1611,9 @@ public class RECIPES_Machines { if (CORE.ConfigSwitches.enableMultiblock_IndustrialCokeOven) { // Industrial Coke Oven RECIPE_IndustrialCokeOvenController = GregtechItemList.Industrial_CokeOven.get(1); - RECIPE_IndustrialCokeOvenFrame = GregtechItemList.Casing_CokeOven.get(Casing_Amount); - RECIPE_IndustrialCokeOvenCasingA = GregtechItemList.Casing_CokeOven_Coil1.get(Casing_Amount); - RECIPE_IndustrialCokeOvenCasingB = GregtechItemList.Casing_CokeOven_Coil2.get(Casing_Amount); + 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 @@ -1706,7 +1695,7 @@ public class RECIPES_Machines { if (CORE.ConfigSwitches.enableMultiblock_IndustrialElectrolyzer) { // Industrial Electrolyzer RECIPE_IndustrialElectrolyzerController = GregtechItemList.Industrial_Electrolyzer.get(1); - RECIPE_IndustrialElectrolyzerFrame = GregtechItemList.Casing_Electrolyzer.get(Casing_Amount); + RECIPE_IndustrialElectrolyzerFrame = GregtechItemList.Casing_Electrolyzer.get(1); // Electrolyzer Frame Casing RecipeUtils.addShapedGregtechRecipe( @@ -1749,7 +1738,7 @@ public class RECIPES_Machines { if (CORE.ConfigSwitches.enableMultiblock_IndustrialPlatePress) { // Industrial Material Press RECIPE_IndustrialMaterialPressController = GregtechItemList.Industrial_PlatePress.get(1); - RECIPE_IndustrialMaterialPressFrame = GregtechItemList.Casing_MaterialPress.get(Casing_Amount); + RECIPE_IndustrialMaterialPressFrame = GregtechItemList.Casing_MaterialPress.get(1); // Material Press Frame Casing RecipeUtils.addShapedGregtechRecipe( @@ -1792,7 +1781,7 @@ public class RECIPES_Machines { if (CORE.ConfigSwitches.enableMultiblock_IndustrialMacerationStack) { // Industrial Maceration Stack RECIPE_IndustrialMacerationStackController = GregtechItemList.Industrial_MacerationStack.get(1); - RECIPE_IndustrialMacerationStackFrame = GregtechItemList.Casing_MacerationStack.get(Casing_Amount); + RECIPE_IndustrialMacerationStackFrame = GregtechItemList.Casing_MacerationStack.get(1); // Maceration Frame Casing RecipeUtils.addShapedGregtechRecipe( @@ -1835,7 +1824,7 @@ public class RECIPES_Machines { if (CORE.ConfigSwitches.enableMultiblock_IndustrialWireMill) { // Industrial Wire Factory RECIPE_IndustrialWireFactoryController = GregtechItemList.Industrial_WireFactory.get(1); - RECIPE_IndustrialWireFactoryFrame = GregtechItemList.Casing_WireFactory.get(Casing_Amount); + RECIPE_IndustrialWireFactoryFrame = GregtechItemList.Casing_WireFactory.get(1); // Wire Factory Frame Casing RecipeUtils.addShapedGregtechRecipe( @@ -1876,214 +1865,83 @@ public class RECIPES_Machines { // Tiered Tanks if (CORE.ConfigSwitches.enableMachine_FluidTanks) { - Logger.WARNING("Is New Horizons Loaded? " + GTNH); - if (!GTNH) { - - // Allows clearing stored fluids. - GregtechItemList[] aTanks = new GregtechItemList[] { - GregtechItemList.GT_FluidTank_ULV, GregtechItemList.GT_FluidTank_LV, - GregtechItemList.GT_FluidTank_MV, - GregtechItemList.GT_FluidTank_HV, GregtechItemList.GT_FluidTank_EV, - GregtechItemList.GT_FluidTank_IV, - GregtechItemList.GT_FluidTank_LuV, GregtechItemList.GT_FluidTank_ZPM, - GregtechItemList.GT_FluidTank_UV, - GregtechItemList.GT_FluidTank_MAX - }; - for (GregtechItemList aTank : aTanks) { - RecipeUtils.addShapedGregtechRecipe( - aTank.get(1), null, null, null, null, null, null, null, null, aTank.get(1)); - } - - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[1], - CI.component_Plate[1], - CI.component_Plate[1], - CI.component_Plate[1], - pipeTier1, - CI.component_Plate[1], - CI.component_Plate[1], - GregtechItemList.Fluid_Cell_144L.get(1), - CI.component_Plate[1], - GregtechItemList.GT_FluidTank_ULV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[2], - CI.component_Plate[2], - CI.component_Plate[2], - CI.component_Plate[2], - pipeTier2, - CI.component_Plate[2], - CI.component_Plate[2], - CI.electricPump_LV, - CI.component_Plate[2], - GregtechItemList.GT_FluidTank_LV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[3], - CI.component_Plate[3], - CI.component_Plate[3], - CI.component_Plate[3], - pipeTier3, - CI.component_Plate[3], - CI.component_Plate[3], - CI.electricPump_MV, - CI.component_Plate[3], - GregtechItemList.GT_FluidTank_MV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[4], - CI.component_Plate[4], - CI.component_Plate[4], - CI.component_Plate[4], - pipeTier4, - CI.component_Plate[4], - CI.component_Plate[4], - CI.electricPump_HV, - CI.component_Plate[4], - GregtechItemList.GT_FluidTank_HV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[5], - CI.component_Plate[5], - CI.component_Plate[5], - CI.component_Plate[5], - pipeTier5, - CI.component_Plate[5], - CI.component_Plate[5], - CI.electricPump_EV, - CI.component_Plate[5], - GregtechItemList.GT_FluidTank_EV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[6], - CI.component_Plate[6], - CI.component_Plate[6], - CI.component_Plate[6], - pipeTier6, - CI.component_Plate[6], - CI.component_Plate[6], - CI.electricPump_IV, - CI.component_Plate[6], - GregtechItemList.GT_FluidTank_IV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[7], - CI.component_Plate[7], - CI.component_Plate[7], - CI.component_Plate[7], - pipeTier7, - CI.component_Plate[7], - CI.component_Plate[7], - CI.electricPump_LuV, - CI.component_Plate[7], - GregtechItemList.GT_FluidTank_LuV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[8], - CI.component_Plate[8], - CI.component_Plate[8], - CI.component_Plate[8], - pipeTier8, - CI.component_Plate[8], - CI.component_Plate[8], - CI.electricPump_ZPM, - CI.component_Plate[8], - GregtechItemList.GT_FluidTank_ZPM.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[9], - CI.component_Plate[9], - CI.component_Plate[9], - CI.component_Plate[9], - pipeTier9, - CI.component_Plate[9], - CI.component_Plate[9], - CI.electricPump_UV, - CI.component_Plate[9], - GregtechItemList.GT_FluidTank_UV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[10], - CI.component_Plate[10], - CI.component_Plate[10], - CI.component_Plate[10], - pipeTier10, - CI.component_Plate[10], - CI.component_Plate[10], - CI.electricPump_MAX, - CI.component_Plate[10], - GregtechItemList.GT_FluidTank_MAX.get(1)); - } else { - - 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)); - } - - 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)); + 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.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)); } + + 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)); } if (CORE.ConfigSwitches.enableMultiblock_MultiTank) { // Industrial Multi Tank // RECIPE_IndustrialMultiTankController = GregtechItemList.Industrial_MultiTank.get(1); - RECIPE_IndustrialMultiTankFrame = GregtechItemList.Casing_MultitankExterior.get(Casing_Amount); + RECIPE_IndustrialMultiTankFrame = GregtechItemList.Casing_MultitankExterior.get(1); // Industrial Multi Tank Casing RecipeUtils.addShapedGregtechRecipe( @@ -2139,8 +1997,8 @@ public class RECIPES_Machines { CI.getGear(3, 2) }; FluidStack[] aSemiFluidFluidInputs = new FluidStack[] { - ELEMENT.getInstance().TIN.getFluidStack(144 * 4), - ALLOY.STEEL.getFluidStack(144 * 6), + ALLOY.BRONZE.getFluidStack(144 * 8), + ALLOY.STEEL.getFluidStack(144 * 8), ELEMENT.getInstance().ALUMINIUM.getFluidStack(144 * 8), }; @@ -2162,8 +2020,8 @@ public class RECIPES_Machines { if (CORE.ConfigSwitches.enableMultiblock_AlloyBlastSmelter) { // Industrial Blast Smelter RECIPE_IndustrialBlastSmelterController = GregtechItemList.Industrial_AlloyBlastSmelter.get(1); - RECIPE_IndustrialBlastSmelterFrame = GregtechItemList.Casing_BlastSmelter.get(Casing_Amount); - RECIPE_IndustrialBlastSmelterCoil = GregtechItemList.Casing_Coil_BlastSmelter.get(Casing_Amount); + RECIPE_IndustrialBlastSmelterFrame = GregtechItemList.Casing_BlastSmelter.get(1); + RECIPE_IndustrialBlastSmelterCoil = GregtechItemList.Casing_Coil_BlastSmelter.get(1); // Blast Smelter RecipeUtils.addShapedGregtechRecipe( @@ -2224,11 +2082,45 @@ public class RECIPES_Machines { 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)); + + 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(Casing_Amount); - RECIPE_IndustrialMatterFabCoil = GregtechItemList.Casing_MatterGen.get(Casing_Amount); + RECIPE_IndustrialMatterFabFrame = GregtechItemList.Casing_MatterFab.get(1); + RECIPE_IndustrialMatterFabCoil = GregtechItemList.Casing_MatterGen.get(1); // Matter Fabricator CPU RecipeUtils.addShapedGregtechRecipe( @@ -2294,8 +2186,8 @@ public class RECIPES_Machines { if (CORE.ConfigSwitches.enableMultiblock_IndustrialSifter) { // Industrial Sieve RECIPE_IndustrialSieveController = GregtechItemList.Industrial_Sifter.get(1); - RECIPE_IndustrialSieveFrame = GregtechItemList.Casing_Sifter.get(Casing_Amount); - RECIPE_IndustrialSieveGrate = GregtechItemList.Casing_SifterGrate.get(Casing_Amount); + RECIPE_IndustrialSieveFrame = GregtechItemList.Casing_Sifter.get(1); + RECIPE_IndustrialSieveGrate = GregtechItemList.Casing_SifterGrate.get(1); // Industrial Sieve RecipeUtils.addShapedGregtechRecipe( @@ -2358,33 +2250,19 @@ public class RECIPES_Machines { if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer) { // Industrial Tree Farmer RECIPE_TreeFarmController = GregtechItemList.Industrial_TreeFarm.get(1); - RECIPE_TreeFarmFrame = GregtechItemList.Casing_PLACEHOLDER_TreeFarmer.get(Casing_Amount); + RECIPE_TreeFarmFrame = GregtechItemList.Casing_PLACEHOLDER_TreeFarmer.get(1); // Industrial Tree Farm Controller - if (!GTNH) { - RecipeUtils.addShapedGregtechRecipe( - "plateEglinSteel", - "rotorEglinSteel", - "plateEglinSteel", - "cableGt02Steel", - "pipeMediumSteel", - "cableGt02Steel", - "plateEglinSteel", - CI.machineCasing_MV, - "plateEglinSteel", - RECIPE_TreeFarmController); - } else { - 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); - } + 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[] { @@ -2469,31 +2347,31 @@ public class RECIPES_Machines { aInputsForSimpleWashers[0] = new ItemStack[] { CI.getTieredMachineHull(2), - CI.getTieredComponent(OrePrefixes.screw, 2, GTNH ? 16 : 8), - CI.getTieredComponent(OrePrefixes.plate, 1, GTNH ? 8 : 4), - CI.getTieredComponent(OrePrefixes.rod, 2, GTNH ? 4 : 2), - CI.getTieredComponent(OrePrefixes.circuit, 2, GTNH ? 3 : 1), + 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, GTNH ? 24 : 12), - CI.getTieredComponent(OrePrefixes.plate, 3, GTNH ? 12 : 6), - CI.getTieredComponent(OrePrefixes.rod, 4, GTNH ? 6 : 3), - CI.getTieredComponent(OrePrefixes.circuit, 4, GTNH ? 4 : 2), + 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, GTNH ? 48 : 24), - |