aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java72
1 files changed, 37 insertions, 35 deletions
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
index e194fdb388..72d1fb1a26 100644
--- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
@@ -1934,6 +1934,8 @@ public class GT_MachineRecipeLoader implements Runnable {
//addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, ItemStack[] aInputs, FluidStack[] aFluidInputs, ItemStack aOutput1, int aDuration, int aEUt);
+ Fluid solderIndalloy = FluidRegistry.getFluid("molten.indalloy140") != null ? FluidRegistry.getFluid("molten.indalloy140") : FluidRegistry.getFluid("molten.solderingalloy");
+
//Motors
GT_Values.RA.addAssemblylineRecipe(ItemList.Electric_Motor_IV.get(1, new Object(){}),144000,new ItemStack[]{
GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1L),
@@ -1941,7 +1943,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L),
GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 2L)}, new FluidStack[]{
- Materials.SolderingAlloy.getMolten(144),
+ new FluidStack(solderIndalloy, 144),
Materials.Lubricant.getFluid(250)}, ItemList.Electric_Motor_LuV.get(1), 600, 6000);
GT_Values.RA.addAssemblylineRecipe(ItemList.Electric_Motor_LuV.get(1, new Object(){}),144000,new ItemStack[]{
@@ -1953,7 +1955,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64L),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 2L)}, new FluidStack[]{
- Materials.SolderingAlloy.getMolten(288),
+ new FluidStack(solderIndalloy, 288),
Materials.Lubricant.getFluid(750)}, ItemList.Electric_Motor_ZPM.get(1), 600, 24000);
GT_Values.RA.addAssemblylineRecipe(ItemList.Electric_Motor_ZPM.get(1, new Object(){}),288000,new ItemStack[]{
@@ -1969,7 +1971,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 2L)}, new FluidStack[]{
Materials.Naquadria.getMolten(1296),
- Materials.SolderingAlloy.getMolten(1296),
+ new FluidStack(solderIndalloy, 1296),
Materials.Lubricant.getFluid(2000)}, ItemList.Electric_Motor_UV.get(1), 600, 100000);
//Pumps
@@ -1981,7 +1983,7 @@ public class GT_MachineRecipeLoader implements Runnable {
new Object[]{OrePrefixes.ring.get(Materials.AnySyntheticRubber), 4L},
GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.HSSS, 2L),
GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 2L)}, new FluidStack[]{
- Materials.SolderingAlloy.getMolten(144),
+ new FluidStack(solderIndalloy, 144),
Materials.Lubricant.getFluid(250)}, ItemList.Electric_Pump_LuV.get(1), 600, 6000);
GT_Values.RA.addAssemblylineRecipe(ItemList.Electric_Pump_LuV.get(1, new Object(){}),144000,new Object[]{
@@ -1992,7 +1994,7 @@ public class GT_MachineRecipeLoader implements Runnable {
new Object[]{OrePrefixes.ring.get(Materials.AnySyntheticRubber), 8L},
GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.NaquadahAlloy, 2L),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 2L)}, new FluidStack[]{
- Materials.SolderingAlloy.getMolten(288),
+ new FluidStack(solderIndalloy, 288),
Materials.Lubricant.getFluid(750)}, ItemList.Electric_Pump_ZPM.get(1), 600, 24000);
GT_Values.RA.addAssemblylineRecipe(ItemList.Electric_Pump_ZPM.get(1, new Object(){}),288000,new Object[]{
@@ -2004,7 +2006,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Neutronium, 2L),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 2L)}, new FluidStack[]{
Materials.Naquadria.getMolten(1296),
- Materials.SolderingAlloy.getMolten(1296),
+ new FluidStack(solderIndalloy, 1296),
Materials.Lubricant.getFluid(2000)}, ItemList.Electric_Pump_UV.get(1), 600, 100000);
//Conveyors
@@ -2015,7 +2017,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.round, Materials.HSSS, 32L),
GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 2L),
new Object[]{OrePrefixes.plate.get(Materials.AnySyntheticRubber), 10L},}, new FluidStack[]{
- Materials.SolderingAlloy.getMolten(144),
+ new FluidStack(solderIndalloy, 144),
Materials.Lubricant.getFluid(250)},ItemList.Conveyor_Module_LuV.get(1), 600, 6000);
GT_Values.RA.addAssemblylineRecipe(ItemList.Conveyor_Module_LuV.get(1, new Object(){}),144000,new Object[]{
@@ -2025,7 +2027,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.round, Materials.NaquadahAlloy, 32L),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 2L),
new Object[]{OrePrefixes.plate.get(Materials.AnySyntheticRubber), 20L},}, new FluidStack[]{
- Materials.SolderingAlloy.getMolten(288),
+ new FluidStack(solderIndalloy, 288),
Materials.Lubricant.getFluid(750)}, ItemList.Conveyor_Module_ZPM.get(1), 600, 24000);
GT_Values.RA.addAssemblylineRecipe(ItemList.Conveyor_Module_ZPM.get(1, new Object(){}),288000,new Object[]{
@@ -2036,7 +2038,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 2L),
new Object[]{OrePrefixes.plate.get(Materials.AnySyntheticRubber), 40L}}, new FluidStack[]{
Materials.Naquadria.getMolten(1296),
- Materials.SolderingAlloy.getMolten(1296),
+ new FluidStack(solderIndalloy, 1296),
Materials.Lubricant.getFluid(2000)}, ItemList.Conveyor_Module_UV.get(1), 600, 100000);
//Pistons
@@ -2049,7 +2051,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.gear, Materials.HSSS, 1L),
GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.HSSS, 2L),
GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 4L)}, new FluidStack[]{
- Materials.SolderingAlloy.getMolten(144),
+ new FluidStack(solderIndalloy, 144),
Materials.Lubricant.getFluid(250)}, ItemList.Electric_Piston_LuV.get(1), 600, 6000);
@@ -2062,7 +2064,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.gear, Materials.NaquadahAlloy, 1L),
GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.NaquadahAlloy, 2L),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 4L)}, new FluidStack[]{
- Materials.SolderingAlloy.getMolten(288),
+ new FluidStack(solderIndalloy, 288),
Materials.Lubricant.getFluid(750)}, ItemList.Electric_Piston_ZPM.get(1), 600, 24000);
GT_Values.RA.addAssemblylineRecipe(ItemList.Electric_Piston_ZPM.get(1, new Object(){}),288000,new ItemStack[]{
@@ -2089,7 +2091,7 @@ public class GT_MachineRecipeLoader implements Runnable {
new Object[]{OrePrefixes.circuit.get(Materials.Elite), 4},
new Object[]{OrePrefixes.circuit.get(Materials.Data), 8},
GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 6L)}, new FluidStack[]{
- Materials.SolderingAlloy.getMolten(576),
+ new FluidStack(solderIndalloy, 576),
Materials.Lubricant.getFluid(250)}, ItemList.Robot_Arm_LuV.get(1), 600, 6000);
GT_Values.RA.addAssemblylineRecipe(ItemList.Robot_Arm_LuV.get(1, new Object(){}),144000,new Object[]{
@@ -2102,7 +2104,7 @@ public class GT_MachineRecipeLoader implements Runnable {
new Object[]{OrePrefixes.circuit.get(Materials.Master), 4},
new Object[]{OrePrefixes.circuit.get(Materials.Elite), 8},
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 6L)}, new FluidStack[]{
- Materials.SolderingAlloy.getMolten(1152),
+ new FluidStack(solderIndalloy, 1152),
Materials.Lubricant.getFluid(750)}, ItemList.Robot_Arm_ZPM.get(1), 600, 24000);
GT_Values.RA.addAssemblylineRecipe(ItemList.Robot_Arm_ZPM.get(1, new Object(){}),288000,new Object[]{
@@ -2116,7 +2118,7 @@ public class GT_MachineRecipeLoader implements Runnable {
new Object[]{OrePrefixes.circuit.get(Materials.Master), 8},
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 6L)}, new FluidStack[]{
Materials.Naquadria.getMolten(1296),
- Materials.SolderingAlloy.getMolten(2304),
+ new FluidStack(solderIndalloy, 2304),
Materials.Lubricant.getFluid(2000)}, ItemList.Robot_Arm_UV.get(1), 600, 100000);
//Emitters
@@ -2130,7 +2132,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64L),
GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 7L)}, new FluidStack[]{
- Materials.SolderingAlloy.getMolten(576)},
+ new FluidStack(solderIndalloy, 576)},
ItemList.Emitter_LuV.get(1), 600, 6000);
GT_Values.RA.addAssemblylineRecipe(ItemList.Emitter_LuV.get(1, new Object(){}),144000,new Object[]{
@@ -2143,7 +2145,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64L),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 7L)}, new FluidStack[]{
- Materials.SolderingAlloy.getMolten(1152)},
+ new FluidStack(solderIndalloy, 1152)},
ItemList.Emitter_ZPM.get(1), 600, 24000);
GT_Values.RA.addAssemblylineRecipe(ItemList.Emitter_ZPM.get(1, new Object(){}),288000,new Object[]{
@@ -2157,7 +2159,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64L),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 7L)}, new FluidStack[]{
Materials.Naquadria.getMolten(1296),
- Materials.SolderingAlloy.getMolten(2304)},
+ new FluidStack(solderIndalloy, 2304)},
ItemList.Emitter_UV.get(1), 600, 100000);
//Sensors
@@ -2171,7 +2173,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64L),
GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 7L)}, new FluidStack[]{
- Materials.SolderingAlloy.getMolten(576)},
+ new FluidStack(solderIndalloy, 576)},
ItemList.Sensor_LuV.get(1), 600, 6000);
GT_Values.RA.addAssemblylineRecipe(ItemList.Sensor_LuV.get(1, new Object(){}),144000,new Object[]{
@@ -2184,7 +2186,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64L),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 7L)}, new FluidStack[]{
- Materials.SolderingAlloy.getMolten(1152)},
+ new FluidStack(solderIndalloy, 1152)},
ItemList.Sensor_ZPM.get(1), 600, 24000);
GT_Values.RA.addAssemblylineRecipe(ItemList.Sensor_ZPM.get(1, new Object(){}),288000,new Object[]{
@@ -2198,7 +2200,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64L),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 7L)}, new FluidStack[]{
Materials.Naquadria.getMolten(1296),
- Materials.SolderingAlloy.getMolten(2304)},
+ new FluidStack(solderIndalloy, 2304)},
ItemList.Sensor_UV.get(1), 600, 100000);
//Field Generators
@@ -2213,7 +2215,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L),
GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 8L)}, new FluidStack[]{
- Materials.SolderingAlloy.getMolten(576)},
+ new FluidStack(solderIndalloy, 576)},
ItemList.Field_Generator_LuV.get(1), 600, 6000);
GT_Values.RA.addAssemblylineRecipe(ItemList.Field_Generator_LuV.get(1, new Object(){}),144000,new Object[]{
@@ -2227,7 +2229,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64L),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 8L)}, new FluidStack[]{
- Materials.SolderingAlloy.getMolten(1152)},
+ new FluidStack(solderIndalloy, 1152)},
ItemList.Field_Generator_ZPM.get(1), 600, 24000);
GT_Values.RA.addAssemblylineRecipe(ItemList.Field_Generator_ZPM.get(1, new Object(){}),288000,new Object[]{
@@ -2244,8 +2246,8 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 8L)},
new FluidStack[]{
- Materials.Naquadria.getMolten(1296),
- Materials.SolderingAlloy.getMolten(2304)},
+ Materials.Naquadria.getMolten(1296),
+ new FluidStack(solderIndalloy, 2304)},
ItemList.Field_Generator_UV.get(1), 600, 100000);
//Energy Hatches Luv-UV
@@ -2260,7 +2262,7 @@ public class GT_MachineRecipeLoader implements Runnable {
ItemList.Electric_Pump_LuV.get(1L, new Object(){})},
new FluidStack[]{
new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000),
- Materials.SolderingAlloy.getMolten(720)},
+ new FluidStack(solderIndalloy, 720)},
ItemList.Hatch_Energy_LuV.get(1), 400, 30720);
@@ -2275,7 +2277,7 @@ public class GT_MachineRecipeLoader implements Runnable {
ItemList.Electric_Pump_ZPM.get(1L, new Object(){})},
new FluidStack[]{
new FluidStack(FluidRegistry.getFluid("ic2coolant"), 4000),
- Materials.SolderingAlloy.getMolten(1440)},
+ new FluidStack(solderIndalloy, 1440)},
ItemList.Hatch_Energy_ZPM.get(1), 600, 122880);
GT_Values.RA.addAssemblylineRecipe(ItemList.Hatch_Energy_ZPM.get(1, new Object(){}),288000,new Object[]{
@@ -2291,7 +2293,7 @@ public class GT_MachineRecipeLoader implements Runnable {
ItemList.Electric_Pump_UV.get(1L, new Object(){})},
new FluidStack[]{
new FluidStack(FluidRegistry.getFluid("ic2coolant"), 8000),
- Materials.SolderingAlloy.getMolten(2880)},
+ new FluidStack(solderIndalloy, 2880)},
ItemList.Hatch_Energy_UV.get(1), 800, 500000);
//Dynamo Hatches Luv-UV
@@ -2306,7 +2308,7 @@ public class GT_MachineRecipeLoader implements Runnable {
ItemList.Electric_Pump_LuV.get(1L, new Object(){})},
new FluidStack[]{
new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000),
- Materials.SolderingAlloy.getMolten(720)},
+ new FluidStack(solderIndalloy, 720)},
ItemList.Hatch_Dynamo_LuV.get(1), 400, 30720);
@@ -2321,7 +2323,7 @@ public class GT_MachineRecipeLoader implements Runnable {
ItemList.Electric_Pump_ZPM.get(1L, new Object(){})},
new FluidStack[]{
new FluidStack(FluidRegistry.getFluid("ic2coolant"), 4000),
- Materials.SolderingAlloy.getMolten(1440)},
+ new FluidStack(solderIndalloy, 1440)},
ItemList.Hatch_Dynamo_ZPM.get(1), 600, 122880);
GT_Values.RA.addAssemblylineRecipe(ItemList.Hatch_Dynamo_ZPM.get(1, new Object(){}),288000,new Object[]{
@@ -2337,7 +2339,7 @@ public class GT_MachineRecipeLoader implements Runnable {
ItemList.Electric_Pump_UV.get(1L, new Object(){})},
new FluidStack[]{
new FluidStack(FluidRegistry.getFluid("ic2coolant"), 8000),
- Materials.SolderingAlloy.getMolten(2880)},
+ new FluidStack(solderIndalloy, 2880)},
ItemList.Hatch_Dynamo_UV.get(1), 800, 500000);
GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_LapotronicOrb2.get(1), 288000, new Object[]{
@@ -2353,7 +2355,7 @@ public class GT_MachineRecipeLoader implements Runnable {
ItemList.Circuit_Parts_DiodeASMD.get(8),
GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 32)},
new FluidStack[]{
- Materials.SolderingAlloy.getMolten(2880), new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000)},
+ new FluidStack(solderIndalloy, 2880), new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000)},
ItemList.Energy_Module.get(1), 2000, 100000);
GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_Module.get(1), 288000, new Object[]{
@@ -2369,7 +2371,7 @@ public class GT_MachineRecipeLoader implements Runnable {
ItemList.Circuit_Parts_DiodeASMD.get(16),
GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 32),},
new FluidStack[]{
- Materials.SolderingAlloy.getMolten(2880),
+ new FluidStack(solderIndalloy, 2880),
new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000)},
ItemList.Energy_Cluster.get(1), 2000, 200000);
@@ -2385,7 +2387,7 @@ public class GT_MachineRecipeLoader implements Runnable {
ItemList.Circuit_Wafer_UHPIC.get(32),
GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 32),
}, new FluidStack[]{
- Materials.SolderingAlloy.getMolten(2880),
+ new FluidStack(solderIndalloy, 2880),
Materials.VanadiumGallium.getMolten(1152L),
}, ItemList.FusionComputer_LuV.get(1), 1000, 30000);
@@ -2400,7 +2402,7 @@ public class GT_MachineRecipeLoader implements Runnable {
ItemList.Circuit_Wafer_PPIC.get(48),
GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 32),
}, new FluidStack[]{
- Materials.SolderingAlloy.getMolten(2880),
+ new FluidStack(solderIndalloy, 2880),
Materials.NiobiumTitanium.getMolten(1152L),
}, ItemList.FusionComputer_ZPMV.get(1), 1000, 60000);
@@ -2415,7 +2417,7 @@ public class GT_MachineRecipeLoader implements Runnable {
ItemList.Circuit_Wafer_QPIC.get(64),
GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUV, 32),
}, new FluidStack[]{
- Materials.SolderingAlloy.getMolten(2880),
+ new FluidStack(solderIndalloy, 2880),
Materials.ElectrumFlux.getMolten(1152L),
}, ItemList.FusionComputer_UV.get(1), 1000, 90000);
generated by cgit (git 2.46.0) at 2025-03-06 20:23:40 +0000