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

1 files changed, 3 insertions, 621 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
index 4ccec0bb93..0aa7f8cee9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -14,8 +14,6 @@ import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.objects.GT_MultiTexture;
 import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.objects.ItemData;
-import gregtech.api.objects.MaterialStack;
 import gregtech.api.util.GT_FoodStat;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.common.covers.GT_Cover_Arm;
@@ -24,7 +22,6 @@ import gregtech.common.covers.GT_Cover_Pump;
 import gregtech.common.items.behaviors.Behaviour_DataOrb;
 import gregtech.common.items.behaviors.Behaviour_DataStick;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.handler.OldCircuitHandler;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.data.StringUtils;
@@ -54,572 +51,15 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
         int tLastID = 0;
 
         registerCustomCircuits();
-        OldCircuitHandler.addCircuitItems();
 
-        if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
-            Logger.INFO(
-                    "Gregtech 5.09 not found, using fallback components. (I like how I have to add compat to something I added first and had stolen.)");
-            GregtechItemList.Electric_Pump_LuV.set(
-                    this.addItem(
-                            tLastID = 0,
-                            "Electric Pump (LuV)",
-                            "163920 L/sec (as Cover)",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L),
-                                    getTcAspectStack(TC_Aspects.AQUA, 1L) }));
-            GregtechItemList.Electric_Pump_ZPM.set(
-                    this.addItem(
-                            tLastID = 1,
-                            "Electric Pump (ZPM)",
-                            "655680 L/sec (as Cover)",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 2L), getTcAspectStack(TC_Aspects.ITER, 2L),
-                                    getTcAspectStack(TC_Aspects.AQUA, 2L) }));
-            GregtechItemList.Electric_Pump_UV.set(
-                    this.addItem(
-                            tLastID = 2,
-                            "Electric Pump (UV)",
-                            "2622720 L/sec (as Cover)",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 4L), getTcAspectStack(TC_Aspects.ITER, 4L),
-                                    getTcAspectStack(TC_Aspects.AQUA, 4L) }));
-            GregtechItemList.Electric_Pump_MAX.set(
-                    this.addItem(
-                            tLastID = 3,
-                            "Electric Pump (MAX)",
-                            "10490880 L/sec (as Cover)",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.ITER, 8L),
-                                    getTcAspectStack(TC_Aspects.AQUA, 8L) }));
-            GregTech_API.registerCover(
-                    GregtechItemList.Electric_Pump_LuV.get(1L),
-                    new GT_MultiTexture(
-                            new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[5][0],
-                                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) }),
-                    new GT_Cover_Pump(8196));
-            GregTech_API.registerCover(
-                    GregtechItemList.Electric_Pump_ZPM.get(1L),
-                    new GT_MultiTexture(
-                            new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[6][0],
-                                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) }),
-                    new GT_Cover_Pump(32768));
-            GregTech_API.registerCover(
-                    GregtechItemList.Electric_Pump_UV.get(1L),
-                    new GT_MultiTexture(
-                            new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[7][0],
-                                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) }),
-                    new GT_Cover_Pump(131072));
-            GregTech_API.registerCover(
-                    GregtechItemList.Electric_Pump_MAX.get(1L),
-                    new GT_MultiTexture(
-                            new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[8][0],
-                                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) }),
-                    new GT_Cover_Pump(524288));
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Pump_LuV.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"SXO", "dPw", "OMW", Character.valueOf('M'),
-            // GregtechItemList.Electric_Motor_LuV, Character.valueOf('O'), OrePrefixes.ring.get(Materials.Rubber),
-            // Character.valueOf('X'), OrePrefixes.rotor.get(Materials.Tin), Character.valueOf('S'),
-            // OrePrefixes.screw.get(Materials.Tin), Character.valueOf('W'), OrePrefixes.cableGt01.get(Materials.Tin),
-            // Character.valueOf('P'), OrePrefixes.pipeMedium.get(Materials.Bronze)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Pump_ZPM.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"SXO", "dPw", "OMW", Character.valueOf('M'),
-            // GregtechItemList.Electric_Motor_ZPM, Character.valueOf('O'), OrePrefixes.ring.get(Materials.Rubber),
-            // Character.valueOf('X'), OrePrefixes.rotor.get(Materials.Bronze), Character.valueOf('S'),
-            // OrePrefixes.screw.get(Materials.Bronze), Character.valueOf('W'),
-            // OrePrefixes.cableGt01.get(Materials.AnyCopper), Character.valueOf('P'),
-            // OrePrefixes.pipeMedium.get(Materials.Steel)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Pump_UV.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"SXO", "dPw", "OMW", Character.valueOf('M'),
-            // GregtechItemList.Electric_Motor_UV, Character.valueOf('O'), OrePrefixes.ring.get(Materials.Rubber),
-            // Character.valueOf('X'), OrePrefixes.rotor.get(Materials.Steel), Character.valueOf('S'),
-            // OrePrefixes.screw.get(Materials.Steel), Character.valueOf('W'),
-            // OrePrefixes.cableGt01.get(Materials.Gold), Character.valueOf('P'),
-            // OrePrefixes.pipeMedium.get(Materials.StainlessSteel)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Pump_MAX.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"SXO", "dPw", "OMW", Character.valueOf('M'),
-            // GregtechItemList.Electric_Motor_MAX, Character.valueOf('O'), OrePrefixes.ring.get(Materials.Rubber),
-            // Character.valueOf('X'), OrePrefixes.rotor.get(Materials.StainlessSteel), Character.valueOf('S'),
-            // OrePrefixes.screw.get(Materials.StainlessSteel), Character.valueOf('W'),
-            // OrePrefixes.cableGt01.get(Materials.Aluminium), Character.valueOf('P'),
-            // OrePrefixes.pipeMedium.get(Materials.Titanium)});
-            tLastID = 4;
-            GregtechItemList.Electric_Motor_LuV.set(
-                    this.addItem(
-                            tLastID = 4,
-                            "Electric Motor (LuV)",
-                            "",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 1L),
-                                    getTcAspectStack(TC_Aspects.MOTUS, 1L) }));
-            GregtechItemList.Electric_Motor_ZPM.set(
-                    this.addItem(
-                            tLastID = 5,
-                            "Electric Motor (ZPM)",
-                            "",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 2L),
-                                    getTcAspectStack(TC_Aspects.MOTUS, 2L) }));
-            GregtechItemList.Electric_Motor_UV.set(
-                    this.addItem(
-                            tLastID = 6,
-                            "Electric Motor (UV)",
-                            "",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 4L),
-                                    getTcAspectStack(TC_Aspects.MOTUS, 4L) }));
-            GregtechItemList.Electric_Motor_MAX.set(
-                    this.addItem(
-                            tLastID = 7,
-                            "Electric Motor (MAX)",
-                            "",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 8L),
-                                    getTcAspectStack(TC_Aspects.MOTUS, 8L) }));
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Motor_LuV.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"CWR", "WIW", "RWC", Character.valueOf('I'),
-            // OrePrefixes.stick.get(Materials.IronMagnetic), Character.valueOf('R'),
-            // OrePrefixes.stick.get(Materials.AnyIron), Character.valueOf('W'),
-            // OrePrefixes.wireGt01.get(Materials.AnyCopper), Character.valueOf('C'),
-            // OrePrefixes.cableGt01.get(Materials.Tin)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Motor_ZPM.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"CWR", "WIW", "RWC", Character.valueOf('I'),
-            // OrePrefixes.stick.get(Materials.SteelMagnetic), Character.valueOf('R'),
-            // OrePrefixes.stick.get(Materials.Aluminium), Character.valueOf('W'),
-            // OrePrefixes.wireGt01.get(Materials.Electrum), Character.valueOf('C'),
-            // OrePrefixes.cableGt01.get(Materials.Silver)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Motor_UV.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"CWR", "WIW", "RWC", Character.valueOf('I'),
-            // OrePrefixes.stick.get(Materials.SteelMagnetic), Character.valueOf('R'),
-            // OrePrefixes.stick.get(Materials.StainlessSteel), Character.valueOf('W'),
-            // OrePrefixes.wireGt02.get(Materials.Cupronickel), Character.valueOf('C'),
-            // OrePrefixes.cableGt01.get(Materials.Gold)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Motor_MAX.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"CWR", "WIW", "RWC", Character.valueOf('I'),
-            // OrePrefixes.stick.get(Materials.NeodymiumMagnetic), Character.valueOf('R'),
-            // OrePrefixes.stick.get(Materials.Titanium), Character.valueOf('W'),
-            // OrePrefixes.wireGt02.get(Materials.TungstenSteel), Character.valueOf('C'),
-            // OrePrefixes.cableGt01.get(Materials.Nichrome)});
-
-            tLastID = 8;
-            GregtechItemList.Conveyor_Module_LuV.set(
-                    this.addItem(
-                            tLastID = 8,
-                            "Conveyor Module (LuV)",
-                            "1 Stack every 20 secs (as Cover)",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L) }));
-            GregtechItemList.Conveyor_Module_ZPM.set(
-                    this.addItem(
-                            tLastID = 9,
-                            "Conveyor Module (ZPM)",
-                            "1 Stack every 5 secs (as Cover)",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 2L), getTcAspectStack(TC_Aspects.ITER, 2L) }));
-            GregtechItemList.Conveyor_Module_UV.set(
-                    this.addItem(
-                            tLastID = 10,
-                            "Conveyor Module (UV)",
-                            "1 Stack every 1 sec (as Cover)",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 4L), getTcAspectStack(TC_Aspects.ITER, 4L) }));
-            GregtechItemList.Conveyor_Module_MAX.set(
-                    this.addItem(
-                            tLastID = 11,
-                            "Conveyor Module (MAX)",
-                            "1 Stack every 1/5 sec (as Cover)",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.ITER, 8L) }));
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Conveyor_Module_LuV.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"RRR", "MCM", "RRR", Character.valueOf('M'),
-            // GregtechItemList.Electric_Motor_LuV, Character.valueOf('C'), OrePrefixes.cableGt01.get(Materials.Tin),
-            // Character.valueOf('R'), OrePrefixes.plate.get(Materials.Rubber)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Conveyor_Module_ZPM.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"RRR", "MCM", "RRR", Character.valueOf('M'),
-            // GregtechItemList.Electric_Motor_ZPM, Character.valueOf('C'),
-            // OrePrefixes.cableGt01.get(Materials.AnyCopper), Character.valueOf('R'),
-            // OrePrefixes.plate.get(Materials.Rubber)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Conveyor_Module_UV.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"RRR", "MCM", "RRR", Character.valueOf('M'),
-            // GregtechItemList.Electric_Motor_UV, Character.valueOf('C'), OrePrefixes.cableGt01.get(Materials.Gold),
-            // Character.valueOf('R'), OrePrefixes.plate.get(Materials.Rubber)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Conveyor_Module_MAX.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"RRR", "MCM", "RRR", Character.valueOf('M'),
-            // GregtechItemList.Electric_Motor_MAX, Character.valueOf('C'),
-            // OrePrefixes.cableGt01.get(Materials.Aluminium), Character.valueOf('R'),
-            // OrePrefixes.plate.get(Materials.Rubber)});
-            GregTech_API.registerCover(
-                    GregtechItemList.Conveyor_Module_LuV.get(1L),
-                    new GT_MultiTexture(
-                            new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[1][0],
-                                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) }),
-                    new GT_Cover_Conveyor(400));
-            GregTech_API.registerCover(
-                    GregtechItemList.Conveyor_Module_ZPM.get(1L),
-                    new GT_MultiTexture(
-                            new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[2][0],
-                                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) }),
-                    new GT_Cover_Conveyor(100));
-            GregTech_API.registerCover(
-                    GregtechItemList.Conveyor_Module_UV.get(1L),
-                    new GT_MultiTexture(
-                            new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[3][0],
-                                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) }),
-                    new GT_Cover_Conveyor(20));
-            GregTech_API.registerCover(
-                    GregtechItemList.Conveyor_Module_MAX.get(1L),
-                    new GT_MultiTexture(
-                            new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[4][0],
-                                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) }),
-                    new GT_Cover_Conveyor(4));
-            tLastID = 12;
-            GregtechItemList.Electric_Piston_LuV.set(
-                    this.addItem(
-                            tLastID = 12,
-                            "Electric Piston (LuV)",
-                            "",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 2L),
-                                    getTcAspectStack(TC_Aspects.MOTUS, 1L) }));
-            GregtechItemList.Electric_Piston_ZPM.set(
-                    this.addItem(
-                            tLastID = 13,
-                            "Electric Piston (ZPM)",
-                            "",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 4L),
-                                    getTcAspectStack(TC_Aspects.MOTUS, 2L) }));
-            GregtechItemList.Electric_Piston_UV.set(
-                    this.addItem(
-                            tLastID = 14,
-                            "Electric Piston (UV)",
-                            "",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 8L),
-                                    getTcAspectStack(TC_Aspects.MOTUS, 4L) }));
-            GregtechItemList.Electric_Piston_MAX.set(
-                    this.addItem(
-                            tLastID = 15,
-                            "Electric Piston (MAX)",
-                            "",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 16L),
-                                    getTcAspectStack(TC_Aspects.MOTUS, 8L) }));
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Piston_LuV.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"PPP", "CSS", "CMG", Character.valueOf('P'),
-            // OrePrefixes.plate.get(Materials.Steel), Character.valueOf('S'), OrePrefixes.stick.get(Materials.Steel),
-            // Character.valueOf('G'), OrePrefixes.gearGtSmall.get(Materials.Steel), Character.valueOf('M'),
-            // GregtechItemList.Electric_Motor_LuV, Character.valueOf('C'), OrePrefixes.cableGt01.get(Materials.Tin)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Piston_ZPM.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"PPP", "CSS", "CMG", Character.valueOf('P'),
-            // OrePrefixes.plate.get(Materials.Aluminium), Character.valueOf('S'),
-            // OrePrefixes.stick.get(Materials.Aluminium), Character.valueOf('G'),
-            // OrePrefixes.gearGtSmall.get(Materials.Aluminium), Character.valueOf('M'),
-            // GregtechItemList.Electric_Motor_ZPM, Character.valueOf('C'),
-            // OrePrefixes.cableGt01.get(Materials.AnyCopper)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Piston_UV.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"PPP", "CSS", "CMG", Character.valueOf('P'),
-            // OrePrefixes.plate.get(Materials.StainlessSteel), Character.valueOf('S'),
-            // OrePrefixes.stick.get(Materials.StainlessSteel), Character.valueOf('G'),
-            // OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), Character.valueOf('M'),
-            // GregtechItemList.Electric_Motor_UV, Character.valueOf('C'), OrePrefixes.cableGt01.get(Materials.Gold)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Piston_MAX.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"PPP", "CSS", "CMG", Character.valueOf('P'),
-            // OrePrefixes.plate.get(Materials.Titanium), Character.valueOf('S'),
-            // OrePrefixes.stick.get(Materials.Titanium), Character.valueOf('G'),
-            // OrePrefixes.gearGtSmall.get(Materials.Titanium), Character.valueOf('M'),
-            // GregtechItemList.Electric_Motor_MAX, Character.valueOf('C'),
-            // OrePrefixes.cableGt01.get(Materials.Aluminium)});
-            tLastID = 16;
-            GregtechItemList.Robot_Arm_LuV.set(
-                    this.addItem(
-                            tLastID = 16,
-                            "Robot Arm (LuV)",
-                            "Inserts into specific Slots (as Cover)",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 2L), getTcAspectStack(TC_Aspects.MOTUS, 1L),
-                                    Utils.getTcAspectStack("COGNITIO", 1L) }));
-            GregtechItemList.Robot_Arm_ZPM.set(
-                    this.addItem(
-                            tLastID = 17,
-                            "Robot Arm (ZPM)",
-                            "Inserts into specific Slots (as Cover)",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 4L), getTcAspectStack(TC_Aspects.MOTUS, 2L),
-                                    getTcAspectStack("COGNITIO", 2L) }));
-            GregtechItemList.Robot_Arm_UV.set(
-                    this.addItem(
-                            tLastID = 18,
-                            "Robot Arm (UV)",
-                            "Inserts into specific Slots (as Cover)",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.MOTUS, 4L),
-                                    getTcAspectStack("COGNITIO", 4L) }));
-            GregtechItemList.Robot_Arm_MAX.set(
-                    this.addItem(
-                            tLastID = 19,
-                            "Robot Arm (MAX)",
-                            "Inserts into specific Slots (as Cover)",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 16L), getTcAspectStack(TC_Aspects.MOTUS, 8L),
-                                    getTcAspectStack("COGNITIO", 8L) }));
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Robot_Arm_LuV.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"CCC", "MSM", "PES", Character.valueOf('S'),
-            // OrePrefixes.stick.get(Materials.Steel), Character.valueOf('M'), GregtechItemList.Electric_Motor_LuV,
-            // Character.valueOf('P'), GregtechItemList.Electric_Piston_LuV, Character.valueOf('E'),
-            // OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('C'),
-            // OrePrefixes.cableGt01.get(Materials.Tin)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Robot_Arm_ZPM.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"CCC", "MSM", "PES", Character.valueOf('S'),
-            // OrePrefixes.stick.get(Materials.Aluminium), Character.valueOf('M'), GregtechItemList.Electric_Motor_ZPM,
-            // Character.valueOf('P'), GregtechItemList.Electric_Piston_ZPM, Character.valueOf('E'),
-            // OrePrefixes.circuit.get(Materials.Good), Character.valueOf('C'),
-            // OrePrefixes.cableGt01.get(Materials.AnyCopper)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Robot_Arm_UV.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"CCC", "MSM", "PES", Character.valueOf('S'),
-            // OrePrefixes.stick.get(Materials.StainlessSteel), Character.valueOf('M'),
-            // GregtechItemList.Electric_Motor_UV, Character.valueOf('P'), GregtechItemList.Electric_Piston_UV,
-            // Character.valueOf('E'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('C'),
-            // OrePrefixes.cableGt01.get(Materials.Gold)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Robot_Arm_MAX.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"CCC", "MSM", "PES", Character.valueOf('S'),
-            // OrePrefixes.stick.get(Materials.Titanium), Character.valueOf('M'), GregtechItemList.Electric_Motor_MAX,
-            // Character.valueOf('P'), GregtechItemList.Electric_Piston_MAX, Character.valueOf('E'),
-            // OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('C'),
-            // OrePrefixes.cableGt01.get(Materials.Aluminium)});
-            GregTech_API.registerCover(
-                    GregtechItemList.Robot_Arm_LuV.get(1L),
-                    new GT_MultiTexture(
-                            new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[1][0],
-                                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM) }),
-                    new GT_Cover_Arm(400));
-            GregTech_API.registerCover(
-                    GregtechItemList.Robot_Arm_ZPM.get(1L),
-                    new GT_MultiTexture(
-                            new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[2][0],
-                                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM) }),
-                    new GT_Cover_Arm(100));
-            GregTech_API.registerCover(
-                    GregtechItemList.Robot_Arm_UV.get(1L),
-                    new GT_MultiTexture(
-                            new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[3][0],
-                                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM) }),
-                    new GT_Cover_Arm(20));
-            GregTech_API.registerCover(
-                    GregtechItemList.Robot_Arm_MAX.get(1L),
-                    new GT_MultiTexture(
-                            new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[4][0],
-                                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM) }),
-                    new GT_Cover_Arm(4));
-            tLastID = 20;
-            GregtechItemList.Field_Generator_LuV.set(
-                    this.addItem(
-                            tLastID = 20,
-                            "Field Generator (LuV)",
-                            "",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 1L),
-                                    getTcAspectStack(TC_Aspects.TUTAMEN, 1L) }));
-            GregtechItemList.Field_Generator_ZPM.set(
-                    this.addItem(
-                            tLastID = 21,
-                            "Field Generator (ZPM)",
-                            "",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 2L),
-                                    getTcAspectStack(TC_Aspects.TUTAMEN, 2L) }));
-            GregtechItemList.Field_Generator_UV.set(
-                    this.addItem(
-                            tLastID = 22,
-                            "Field Generator (UV)",
-                            "",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 4L),
-                                    getTcAspectStack(TC_Aspects.TUTAMEN, 4L) }));
-            GregtechItemList.Field_Generator_MAX.set(
-                    this.addItem(
-                            tLastID = 23,
-                            "Field Generator (MAX)",
-                            "",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 16L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 8L),
-                                    getTcAspectStack(TC_Aspects.TUTAMEN, 8L) }));
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Field_Generator_LuV.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"WCW", "CGC", "WCW", Character.valueOf('G'),
-            // OrePrefixes.gem.get(Materials.EnderPearl), Character.valueOf('C'),
-            // OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('W'),
-            // OrePrefixes.wireGt01.get(Materials.Osmium)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Field_Generator_ZPM.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"WCW", "CGC", "WCW", Character.valueOf('G'),
-            // OrePrefixes.gem.get(Materials.EnderEye), Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good),
-            // Character.valueOf('W'), OrePrefixes.wireGt02.get(Materials.Osmium)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Field_Generator_UV.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"WCW", "CGC", "WCW", Character.valueOf('G'),
-            // OrePrefixes.gem.get(Materials.NetherStar), Character.valueOf('C'),
-            // OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('W'),
-            // OrePrefixes.wireGt04.get(Materials.Osmium)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Field_Generator_MAX.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"WCW", "CGC", "WCW", Character.valueOf('G'),
-            // OrePrefixes.gem.get(Materials.NetherStar), Character.valueOf('C'),
-            // OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('W'),
-            // OrePrefixes.wireGt08.get(Materials.Osmium)});
-            tLastID = 24;
-            GregtechItemList.Emitter_LuV.set(
-                    this.addItem(
-                            tLastID = 24,
-                            "Emitter (LuV)",
-                            "",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.LUX, 1L) }));
-            GregtechItemList.Emitter_ZPM.set(
-                    this.addItem(
-                            tLastID = 25,
-                            "Emitter (ZPM)",
-                            "",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 2L), getTcAspectStack(TC_Aspects.LUX, 2L) }));
-            GregtechItemList.Emitter_UV.set(
-                    this.addItem(
-                            tLastID = 26,
-                            "Emitter (UV)",
-                            "",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 4L), getTcAspectStack(TC_Aspects.LUX, 4L) }));
-            GregtechItemList.Emitter_MAX.set(
-                    this.addItem(
-                            tLastID = 27,
-                            "Emitter (MAX)",
-                            "",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.LUX, 8L) }));
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Emitter_LuV.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"SSC", "WQS", "CWS", Character.valueOf('Q'),
-            // OrePrefixes.gem.get(Materials.Quartzite), Character.valueOf('S'), OrePrefixes.stick.get(Materials.Brass),
-            // Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('W'),
-            // OrePrefixes.cableGt01.get(Materials.Tin)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Emitter_ZPM.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"SSC", "WQS", "CWS", Character.valueOf('Q'),
-            // OrePrefixes.gem.get(Materials.NetherQuartz), Character.valueOf('S'),
-            // OrePrefixes.stick.get(Materials.Electrum), Character.valueOf('C'),
-            // OrePrefixes.circuit.get(Materials.Good), Character.valueOf('W'),
-            // OrePrefixes.cableGt01.get(Materials.AnyCopper)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Emitter_UV.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"SSC", "WQS", "CWS", Character.valueOf('Q'),
-            // OrePrefixes.gem.get(Materials.Emerald), Character.valueOf('S'), OrePrefixes.stick.get(Materials.Chrome),
-            // Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('W'),
-            // OrePrefixes.cableGt01.get(Materials.Gold)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Emitter_MAX.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"SSC", "WQS", "CWS", Character.valueOf('Q'),
-            // OrePrefixes.gem.get(Materials.EnderPearl), Character.valueOf('S'),
-            // OrePrefixes.stick.get(Materials.Platinum), Character.valueOf('C'),
-            // OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('W'),
-            // OrePrefixes.cableGt01.get(Materials.Aluminium)});
-            tLastID = 28;
-            GregtechItemList.Sensor_LuV.set(
-                    this.addItem(
-                            tLastID = 28,
-                            "Sensor (LuV)",
-                            "",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 1L),
-                                    getTcAspectStack(TC_Aspects.SENSUS, 1L) }));
-            GregtechItemList.Sensor_ZPM.set(
-                    this.addItem(
-                            tLastID = 29,
-                            "Sensor (ZPM)",
-                            "",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 2L),
-                                    getTcAspectStack(TC_Aspects.SENSUS, 2L) }));
-            GregtechItemList.Sensor_UV.set(
-                    this.addItem(
-                            tLastID = 30,
-                            "Sensor (UV)",
-                            "",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 4L),
-                                    getTcAspectStack(TC_Aspects.SENSUS, 4L) }));
-            GregtechItemList.Sensor_MAX.set(
-                    this.addItem(
-                            tLastID = 31,
-                            "Sensor (MAX)",
-                            "",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 8L),
-                                    getTcAspectStack(TC_Aspects.SENSUS, 8L) }));
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Sensor_LuV.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"P Q", "PS ", "CPP", Character.valueOf('Q'),
-            // OrePrefixes.gem.get(Materials.Quartzite), Character.valueOf('S'), OrePrefixes.stick.get(Materials.Brass),
-            // Character.valueOf('P'), OrePrefixes.plate.get(Materials.Steel), Character.valueOf('C'),
-            // OrePrefixes.circuit.get(Materials.Basic)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Sensor_ZPM.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"P Q", "PS ", "CPP", Character.valueOf('Q'),
-            // OrePrefixes.gem.get(Materials.NetherQuartz), Character.valueOf('S'),
-            // OrePrefixes.stick.get(Materials.Electrum), Character.valueOf('P'),
-            // OrePrefixes.plate.get(Materials.Aluminium), Character.valueOf('C'),
-            // OrePrefixes.circuit.get(Materials.Good)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Sensor_UV.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"P Q", "PS ", "CPP", Character.valueOf('Q'),
-            // OrePrefixes.gem.get(Materials.Emerald), Character.valueOf('S'), OrePrefixes.stick.get(Materials.Chrome),
-            // Character.valueOf('P'), OrePrefixes.plate.get(Materials.StainlessSteel), Character.valueOf('C'),
-            // OrePrefixes.circuit.get(Materials.Advanced)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Sensor_MAX.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"P Q", "PS ", "CPP", Character.valueOf('Q'),
-            // OrePrefixes.gem.get(Materials.EnderPearl), Character.valueOf('S'),
-            // OrePrefixes.stick.get(Materials.Platinum), Character.valueOf('P'),
-            // OrePrefixes.plate.get(Materials.Titanium), Character.valueOf('C'),
-            // OrePrefixes.circuit.get(Materials.Elite)});
-
-            // Handler for ULV Components
-            registerComponents_ULV();
-
-        } else {
-            // Simplify life.
-            registerComponents_ULV();
-            registerComponents_MAX();
-        }
+        // Simplify life.
+        registerComponents_ULV();
+        registerComponents_MAX();
 
         // Extruder Shape
         GregtechItemList.Shape_Extruder_WindmillShaft
                 .set(this.addItem(tLastID = 40, "Extruder Shape (Shaft)", "Extruder Shape for making Windmill Shafts"));
 
-        // GTNH Already adds this.
-        if (!CORE.GTNH) {
-            GregtechItemList.Shape_Extruder_SmallGear
-                    .set(this.addItem(221, "Extruder Shape (Small Gear)", "Extruder Shape for making small gears"));
-        }
-
         // Batteries
         GregtechItemList.Battery_RE_EV_Sodium.set(
                 this.addItem(
@@ -756,64 +196,6 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
                                 getTcAspectStack(TC_Aspects.CORPUS, 1L), getTcAspectStack(TC_Aspects.FAMES, 1L),
                                 getTcAspectStack(TC_Aspects.IGNIS, 1L) }));
 
-        if (!CORE.GTNH) {
-            GregtechItemList.Fluid_Cell_144L.set(
-                    this.addItem(
-                            tLastID = 61,
-                            "144L Invar Fluid Cell",
-                            "Holds exactly one dust worth of liquid.",
-                            new Object[] {
-                                    new ItemData(
-                                            Materials.Invar,
-                                            (OrePrefixes.plate.mMaterialAmount * 8L)
-                                                    + (4L * OrePrefixes.ring.mMaterialAmount),
-                                            new MaterialStack[0]),
-                                    getTcAspectStack(TC_Aspects.VACUOS, 2L), getTcAspectStack(TC_Aspects.AQUA, 1L) }));
-            this.setFluidContainerStats(32000 + tLastID, 144L, 64L);
-
-            GregtechItemList.Fluid_Cell_36L.set(
-                    this.addItem(
-                            tLastID = 62,
-                            "36L Brass Fluid Cell",
-                            "Holds exactly one small dust worth of liquid.",
-                            new Object[] {
-                                    new ItemData(
-                                            Materials.Brass,
-                                            (OrePrefixes.plate.mMaterialAmount * 8L)
-                                                    + (4L * OrePrefixes.ring.mMaterialAmount),
-                                            new MaterialStack[0]),
-                                    getTcAspectStack(TC_Aspects.VACUOS, 2L), getTcAspectStack(TC_Aspects.AQUA, 1L) }));
-            this.setFluidContainerStats(32000 + tLastID, 36L, 64L);
-
-            GregtechItemList.Fluid_Cell_16L.set(
-                    this.addItem(
-                            tLastID = 63,
-                            "16L Bronze Fluid Cell",
-                            "Holds exactly one tiny dust / nugget worth of liquid.",
-                            new Object[] {
-                                    new ItemData(
-                                            Materials.Bronze,
-                                            (OrePrefixes.plate.mMaterialAmount * 8L)
-                                                    + (4L * OrePrefixes.ring.mMaterialAmount),
-                                            new MaterialStack[0]),
-                                    getTcAspectStack(TC_Aspects.VACUOS, 2L), getTcAspectStack(TC_Aspects.AQUA, 1L) }));
-            this.setFluidContainerStats(32000 + tLastID, 16L, 64L);
-
-            GregtechItemList.Fluid_Cell_1L.set(
-                    this.addItem(
-                            tLastID = 64,
-                            "1L Wrought Iron Fluid Cell",
-                            "Holds exactly one litre worth of liquid.",
-                            new Object[] {
-                                    new ItemData(
-                                            Materials.WroughtIron,
-                                            (OrePrefixes.plate.mMaterialAmount * 8L)
-                                                    + (4L * OrePrefixes.ring.mMaterialAmount),
-                                            new MaterialStack[0]),
-                                    getTcAspectStack(TC_Aspects.VACUOS, 2L), getTcAspectStack(TC_Aspects.AQUA, 1L) }));
-            this.setFluidContainerStats(32000 + tLastID, 1L, 64L);
-        }
-
         GregtechItemList.Cover_Overflow_ULV.set(
                 this.addItem(
                         71,