From 23f91d2bbba3294dd64c66be705e4a46e2bea3af Mon Sep 17 00:00:00 2001 From: Dream-MasterXXL Date: Fri, 20 Apr 2018 23:58:21 +0700 Subject: recipes for machine parts --- .../loaders/postload/GT_MachineRecipeLoader.java | 150 ++++++++++++++++++--- 1 file changed, 131 insertions(+), 19 deletions(-) (limited to 'src/main/java/gregtech/loaders/postload') diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index a0c775358a..a1420dc927 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -2143,7 +2143,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SamariumMagnetic, 2L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Neutronium, 4L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Neutronium, 4L), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.Neutronium, 16), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.Neutronium, 16L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 64L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.NaquadahAlloy, 64L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.NaquadahAlloy, 64L), @@ -2154,8 +2154,22 @@ public class GT_MachineRecipeLoader implements Runnable { Materials.SolderingAlloy.getMolten(1296), Materials.Lubricant.getFluid(2000)}, ItemList.Electric_Motor_UV.get(1, new Object[]{}), 600, 100000); - - + GT_Values.RA.addAssemblylineRecipe(ItemList.Electric_Motor_UV.get(1, new Object(){}),576000,new ItemStack[]{ + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SamariumMagnetic, 4L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Neutronium, 8L), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Neutronium, 8L), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.Neutronium, 32L), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Superconductor, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Bedrockium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Bedrockium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Bedrockium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Bedrockium, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 2L)}, new FluidStack[]{ + Materials.Naquadria.getMolten(2592), + Materials.SolderingAlloy.getMolten(2592), + Materials.Lubricant.getFluid(4000)}, ItemList.Electric_Motor_UHV.get(1, new Object[]{}), 800, 200000); + + // Pump //LUV Palladium Plat, VanadiumGallium, topazes alduorite, chrome Naquadah @@ -2166,7 +2180,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addAssemblylineRecipe(ItemList.Electric_Pump_IV.get(1, new Object(){}),144000,new ItemStack[]{ ItemList.Electric_Motor_LuV.get(1, new Object(){}), - GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.Ultimate, 2L), + GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.NiobiumTitanium, 2L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSG, 2L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.HSSG, 8L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.AnySyntheticRubber, 4L), @@ -2177,7 +2191,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addAssemblylineRecipe(ItemList.Electric_Pump_LuV.get(1, new Object(){}),144000,new ItemStack[]{ ItemList.Electric_Motor_ZPM.get(1, new Object(){}), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Ultimate, 2L), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Enderium, 2L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSE, 2L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.HSSE, 8L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.AnySyntheticRubber, 16L), @@ -2188,7 +2202,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addAssemblylineRecipe(ItemList.Electric_Pump_ZPM.get(1, new Object(){}),288000,new ItemStack[]{ ItemList.Electric_Motor_UV.get(1, new Object(){}), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Ultimate, 2L), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 2L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 8L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.AnySyntheticRubber, 32L), @@ -2198,6 +2212,18 @@ public class GT_MachineRecipeLoader implements Runnable { Materials.SolderingAlloy.getMolten(1296), Materials.Lubricant.getFluid(2000)}, ItemList.Electric_Pump_UV.get(1, new Object[]{}), 600, 100000); + GT_Values.RA.addAssemblylineRecipe(ItemList.Electric_Pump_UV.get(1, new Object(){}),576000,new ItemStack[]{ + ItemList.Electric_Motor_UHV.get(1, new Object(){}), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Neutronium, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Bedrockium, 4L), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 16L), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.AnySyntheticRubber, 32L), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Neutronium, 4L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 2L)}, new FluidStack[]{ + Materials.Naquadria.getMolten(2592), + Materials.SolderingAlloy.getMolten(2592), + Materials.Lubricant.getFluid(4000)}, ItemList.Electric_Pump_UHV.get(1, new Object[]{}), 800, 200000); + // Conveyor GT_Values.RA.addAssemblylineRecipe(ItemList.Conveyor_Module_IV.get(1, new Object(){}),144000,new ItemStack[]{ @@ -2231,6 +2257,17 @@ public class GT_MachineRecipeLoader implements Runnable { Materials.Lubricant.getFluid(2000), Materials.StyreneButadieneRubber.getMolten(5760)}, ItemList.Conveyor_Module_UV.get(1, new Object[]{}), 600, 100000); + GT_Values.RA.addAssemblylineRecipe(ItemList.Conveyor_Module_UV.get(1, new Object(){}),576000,new ItemStack[]{ + ItemList.Electric_Motor_UHV.get(2, new Object(){}), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Bedrockium, 2L), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Neutronium, 8L), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.Neutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 2L)}, new FluidStack[]{ + Materials.Naquadria.getMolten(2592), + Materials.SolderingAlloy.getMolten(2592), + Materials.Lubricant.getFluid(4000), + Materials.StyreneButadieneRubber.getMolten(11520)}, ItemList.Conveyor_Module_UHV.get(1, new Object[]{}), 800, 200000); + // Piston GT_Values.RA.addAssemblylineRecipe(ItemList.Electric_Piston_IV.get(1, new Object(){}),144000,new ItemStack[]{ @@ -2258,18 +2295,31 @@ public class GT_MachineRecipeLoader implements Runnable { Materials.SolderingAlloy.getMolten(288), Materials.Lubricant.getFluid(750)}, ItemList.Electric_Piston_ZPM.get(1, new Object[]{}), 600, 24000); - GT_Values.RA.addAssemblylineRecipe(ItemList.Electric_Piston_ZPM.get(1, new Object(){}),288000,new ItemStack[]{ - ItemList.Electric_Motor_UV.get(1, new Object(){}), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Neutronium, 4L), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.Neutronium, 32L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Neutronium, 4L), - GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Neutronium, 1L), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 2L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 4L)}, new FluidStack[]{ + GT_Values.RA.addAssemblylineRecipe(ItemList.Electric_Piston_ZPM.get(1, new Object(){}),288000,new ItemStack[]{ + ItemList.Electric_Motor_UV.get(1, new Object(){}), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6L), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Neutronium, 4L), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.Neutronium, 32L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Neutronium, 4L), + GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Neutronium, 1L), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 2L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 4L)}, new FluidStack[]{ Materials.Naquadria.getMolten(1296), - Materials.SolderingAlloy.getMolten(1296), - Materials.Lubricant.getFluid(2000)}, ItemList.Electric_Piston_UV.get(1, new Object[]{}), 600, 100000); + Materials.SolderingAlloy.getMolten(1296), + Materials.Lubricant.getFluid(2000)}, ItemList.Electric_Piston_UV.get(1, new Object[]{}), 600, 100000); + + GT_Values.RA.addAssemblylineRecipe(ItemList.Electric_Piston_UV.get(1, new Object(){}),576000,new ItemStack[]{ + ItemList.Electric_Motor_UV.get(1, new Object(){}), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Bedrockium, 6L), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Neutronium, 8L), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.Neutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Neutronium, 8L), + GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Neutronium, 2L), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 4L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 4L)}, new FluidStack[]{ + Materials.Naquadria.getMolten(2592), + Materials.SolderingAlloy.getMolten(2592), + Materials.Lubricant.getFluid(4000)}, ItemList.Electric_Piston_UHV.get(1, new Object[]{}), 800, 200000); // RobotArm @@ -2314,6 +2364,19 @@ public class GT_MachineRecipeLoader implements Runnable { Materials.SolderingAlloy.getMolten(2304), Materials.Lubricant.getFluid(2000)}, ItemList.Robot_Arm_UV.get(1, new Object[]{}), 600, 100000); + GT_Values.RA.addAssemblylineRecipe(ItemList.Robot_Arm_UV.get(1, new Object(){}),576000,new Object[]{ + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Neutronium, 8L), + GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Neutronium, 2L), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 6L), + ItemList.Electric_Motor_UHV.get(2, new Object(){}), + ItemList.Electric_Piston_UHV.get(1, new Object(){}), + new Object[]{OrePrefixes.circuit.get(Materials.Infinite), 2}, + new Object[]{OrePrefixes.circuit.get(Materials.Superconductor), 4}, + new Object[]{OrePrefixes.circuit.get(Materials.Ultimate), 8}, + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 6L)}, new FluidStack[]{ + Materials.Naquadria.getMolten(2592), + Materials.SolderingAlloy.getMolten(4608), + Materials.Lubricant.getFluid(4000)}, ItemList.Robot_Arm_UHV.get(1, new Object[]{}), 800, 200000); // Emitter //LUV Palladium Plat, VanadiumGallium, topazes alduorite, chrome Naquadah @@ -2362,6 +2425,21 @@ public class GT_MachineRecipeLoader implements Runnable { Materials.SolderingAlloy.getMolten(2304)}, ItemList.Emitter_UV.get(1, new Object[]{}), 600, 100000); + GT_Values.RA.addAssemblylineRecipe(ItemList.Emitter_UV.get(1, new Object(){}),576000,new Object[]{ + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Europium, 1L), + ItemList.Electric_Motor_UV.get(1, new Object(){}), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Adamantium, 8L), + ItemList.Gravistar.get(8, new Object(){}), + new Object[]{OrePrefixes.circuit.get(Materials.Infinite), 4}, + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Adamantium, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Adamantium, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Neutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Neutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 7L)}, new FluidStack[]{ + Materials.Naquadria.getMolten(2592), + Materials.SolderingAlloy.getMolten(4608)}, + ItemList.Emitter_UHV.get(1, new Object[]{}), 800, 200000); + // Sensor GT_Values.RA.addAssemblylineRecipe(ItemList.Sensor_IV.get(1, new Object(){}),144000,new Object[]{ @@ -2404,6 +2482,21 @@ public class GT_MachineRecipeLoader implements Runnable { Materials.SolderingAlloy.getMolten(2304)}, ItemList.Sensor_UV.get(1, new Object[]{}), 600, 100000); + GT_Values.RA.addAssemblylineRecipe(ItemList.Sensor_UV.get(1, new Object(){}),576000,new Object[]{ + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Europium, 1L), + ItemList.Electric_Motor_UHV.get(1, new Object(){}), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Bedrockium, 8L), + ItemList.Gravistar.get(8, new Object(){}), + new Object[]{OrePrefixes.circuit.get(Materials.Infinite), 4}, + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Adamantium, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Adamantium, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Neutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Neutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 7L)}, new FluidStack[]{ + Materials.Naquadria.getMolten(2592), + Materials.SolderingAlloy.getMolten(4608)}, + ItemList.Sensor_UHV.get(1, new Object[]{}), 800, 200000); + // Field Generator GT_Values.RA.addAssemblylineRecipe(ItemList.Field_Generator_IV.get(1, new Object(){}),144000,new Object[]{ @@ -2457,9 +2550,28 @@ public class GT_MachineRecipeLoader implements Runnable { Materials.Naquadria.getMolten(1296), Materials.SolderingAlloy.getMolten(2304)}, ItemList.Field_Generator_UV.get(1, new Object[]{}), 600, 100000); - - Object o = new Object[0]; + GT_Values.RA.addAssemblylineRecipe(ItemList.Field_Generator_UV.get(1, new Object(){}),576000,new Object[]{ + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Europium, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Bedrockium, 6L), + ItemList.Gravistar.get(4, new Object(){}), + ItemList.Emitter_UHV.get(4, new Object(){}), + new ItemStack[]{ItemList.Circuit_Crystalmainframe.get(16, new Object(){}), ItemList.Circuit_Wetwaresupercomputer.get(16, new Object(){})}, + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Adamantium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Adamantium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Adamantium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Adamantium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 8L)}, + new FluidStack[]{ + Materials.Naquadria.getMolten(2592), + Materials.SolderingAlloy.getMolten(4608)}, + ItemList.Field_Generator_UV.get(1, new Object[]{}), 800, 200000); + + Object o = new Object[0]; GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_LapotronicOrb2.get(1, o), 288000, new ItemStack[]{ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 16L), -- cgit From dcf9bd144dc6cd5e1bf6785aa99bfb8eb794c4e6 Mon Sep 17 00:00:00 2001 From: Dream-MasterXXL Date: Sat, 21 Apr 2018 00:16:18 +0700 Subject: recipe fixes --- .../java/gregtech/loaders/postload/GT_MachineRecipeLoader.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/java/gregtech/loaders/postload') diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index a1420dc927..0d370c8763 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -2160,10 +2160,10 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Neutronium, 8L), GT_OreDictUnificator.get(OrePrefixes.round, Materials.Neutronium, 32L), GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Superconductor, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Bedrockium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Bedrockium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Bedrockium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Bedrockium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 2L)}, new FluidStack[]{ Materials.Naquadria.getMolten(2592), Materials.SolderingAlloy.getMolten(2592), -- cgit From 4c7794fbf8223657c3f27a66fb5d6cbd2e37d43d Mon Sep 17 00:00:00 2001 From: Dream-MasterXXL Date: Sat, 21 Apr 2018 13:08:54 +0700 Subject: Add localizer for Nei fix a few recipe deps and descriptions. --- .../gregtech/common/items/GT_MetaGenerated_Item_01.java | 2 +- .../loaders/postload/GT_MachineRecipeLoader.java | 2 +- src/main/resources/assets/gregtech/lang/en_US.lang | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) (limited to 'src/main/java/gregtech/loaders/postload') diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 876806b158..2b5155b2a9 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -660,7 +660,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Field_Generator_LuV.set(addItem(675, "Field Generator (Tier VI)", "", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 32L), new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 32L)})); ItemList.Field_Generator_ZPM.set(addItem(676, "Field Generator (Tier VII)", "", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 128L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 64L)})); ItemList.Field_Generator_UV.set(addItem(677, "Field Generator (Tier VIII)", "", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 256L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 128L), new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 128L)})); - ItemList.Field_Generator_UHV.set(addItem(678, "Field Generator (Tier VIII)", "", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 256L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 128L), new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 128L)})); + ItemList.Field_Generator_UHV.set(addItem(678, "Field Generator (Tier IX)", "", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 256L), new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 256L)})); ItemList.Emitter_LV.set(addItem(680, "Emitter (LV)", "", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.LUX, 1L)})); ItemList.Emitter_MV.set(addItem(681, "Emitter (MV)", "", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.LUX, 2L)})); diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 0d370c8763..632d6d436b 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -2569,7 +2569,7 @@ public class GT_MachineRecipeLoader implements Runnable { new FluidStack[]{ Materials.Naquadria.getMolten(2592), Materials.SolderingAlloy.getMolten(4608)}, - ItemList.Field_Generator_UV.get(1, new Object[]{}), 800, 200000); + ItemList.Field_Generator_UHV.get(1, new Object[]{}), 800, 200000); Object o = new Object[0]; diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index a4e3cd39fd..4fdcaa3c4a 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -619,6 +619,8 @@ achievement.gt.metaitem.01.32607=Electric Motor ZPM tier achievement.gt.metaitem.01.32607.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32608=Electric Motor UV tier achievement.gt.metaitem.01.32608.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.01.32596=Electric Motor UHV tier +achievement.gt.metaitem.01.32596.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32615=Electric Pump LuV tier achievement.gt.metaitem.01.32615.desc=Pickup this item to see the recipe in NEI @@ -626,6 +628,8 @@ achievement.gt.metaitem.01.32616=Electric Pump ZPM tier achievement.gt.metaitem.01.32616.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32617=Electric Pump UV tier achievement.gt.metaitem.01.32617.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.01.32617=Electric Pump UHV tier +achievement.gt.metaitem.01.32618.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32635=Conveyor Module LuV tier achievement.gt.metaitem.01.32635.desc=Pickup this item to see the recipe in NEI @@ -633,6 +637,8 @@ achievement.gt.metaitem.01.32636=Conveyor Module ZPM tier achievement.gt.metaitem.01.32636.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32637=Conveyor Module UV tier achievement.gt.metaitem.01.32637.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.01.32638=Conveyor Module UHV tier +achievement.gt.metaitem.01.32638.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32645=Electric Piston LuV tier achievement.gt.metaitem.01.32645.desc=Pickup this item to see the recipe in NEI @@ -640,6 +646,8 @@ achievement.gt.metaitem.01.32646=Electric Piston ZPM tier achievement.gt.metaitem.01.32646.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32647=Electric Piston UV tier achievement.gt.metaitem.01.32647.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.01.32648=Electric Piston UHV tier +achievement.gt.metaitem.01.32648.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32655=Robot Arm LuV tier achievement.gt.metaitem.01.32655.desc=Pickup this item to see the recipe in NEI @@ -647,6 +655,8 @@ achievement.gt.metaitem.01.32656=Robot Arm ZPM tier achievement.gt.metaitem.01.32656.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32657=Robot Arm UV tier achievement.gt.metaitem.01.32657.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.01.32658=Robot Arm UHV tier +achievement.gt.metaitem.01.32658.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32675=Field Generator tier VI achievement.gt.metaitem.01.32675.desc=Pickup this item to see the recipe in NEI @@ -654,6 +664,8 @@ achievement.gt.metaitem.01.32676=Field Generator tier VII achievement.gt.metaitem.01.32676.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32677=Field Generator tier VIII achievement.gt.metaitem.01.32677.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.01.32678=Field Generator tier IX +achievement.gt.metaitem.01.32678.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32685=Emitter LuV tier achievement.gt.metaitem.01.32685.desc=Pickup this item to see the recipe in NEI @@ -661,6 +673,8 @@ achievement.gt.metaitem.01.32686=Emitter ZPM tier achievement.gt.metaitem.01.32686.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32687=Emitter UV tier achievement.gt.metaitem.01.32687.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.01.32688=Emitter UHV tier +achievement.gt.metaitem.01.32688.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32695=Sensor LuV tier achievement.gt.metaitem.01.32695.desc=Pickup this item to see the recipe in NEI @@ -668,6 +682,8 @@ achievement.gt.metaitem.01.32696=Sensor ZPM tier achievement.gt.metaitem.01.32696.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32697=Sensor UV tier achievement.gt.metaitem.01.32697.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.01.32698=Sensor UHV tier +achievement.gt.metaitem.01.32698.desc=Pickup this item to see the recipe in NEI achievement.gt.blockmachines.fusioncomputer.tier.06=Fusion Computer Mark I achievement.gt.blockmachines.fusioncomputer.tier.06.desc=Pickup this item to see the recipe in NEI -- cgit