Create Enum for gt++ and GG IDs (#2685)

* enum for goodgen ids

* enum for gt++ ids

* spotlessApply

4 files changed, 309 insertions, 113 deletions

diff --git a/src/main/java/goodgenerator/loader/IDs_GoodGenerator.java b/src/main/java/goodgenerator/loader/IDs_GoodGenerator.java
new file mode 100644
index 0000000000..a6dc54e3e1
--- /dev/null
+++ b/src/main/java/goodgenerator/loader/IDs_GoodGenerator.java
@@ -0,0 +1,46 @@
+package goodgenerator.loader;
+
+public enum IDs_GoodGenerator {
+
+    DieselGeneratorEV(1113),
+    DieselGeneratorIV(1114),
+    MultiNqGenerator(12732),
+    FuelRefineFactory(16999),
+    PipeIncoloy903(30995),
+    UniversalChemicalFuelEngine(32001),
+    LargeEssentiaGenerator(32002),
+    NeutronAcceleratorULV(32003),
+    NeutronAcceleratorLV(32004),
+    NeutronAcceleratorMV(32005),
+    NeutronAcceleratorHV(32006),
+    NeutronAcceleratorEV(32007),
+    NeutronAcceleratorIV(32008),
+    NeutronAcceleratorLuV(32009),
+    NeutronAcceleratorZPM(32010),
+    NeutronAcceleratorUV(32011),
+    NeutronSensor(32012),
+    NeutronActivator(32013),
+    YottaFluidTank(32014),
+    YottaHatch(32015),
+    SupercriticalFluidTurbine(32016),
+    ExtremeHeatExchanger(32017),
+    PreciseAssembler(32018),
+    LargeFusionComputer1(32019),
+    LargeFusionComputer2(32020),
+    LargeFusionComputer3(32021),
+    LargeFusionComputer4(32022),
+    LargeFusionComputer5(32023),
+    LargeEssentiaSmeltery(32024),
+    CoolantTower(32025),
+    ComponentAssemblyLine(32026),
+    WireSignalium(32749),
+    WireLumiium(32737),
+
+    ;
+
+    public final int ID;
+
+    IDs_GoodGenerator(int ID) {
+        this.ID = ID;
+    }
+}
diff --git a/src/main/java/goodgenerator/loader/Loaders.java b/src/main/java/goodgenerator/loader/Loaders.java
index 3ecaf74c23..11875703a3 100644
--- a/src/main/java/goodgenerator/loader/Loaders.java
+++ b/src/main/java/goodgenerator/loader/Loaders.java
@@ -59,7 +59,6 @@ import gregtech.api.render.TextureFactory;
 
 public class Loaders {
 
-    public static final int IDOffset = 32001;
     public static final byte GoodGeneratorTexturePage = 12;
 
     public static final Item _null_ = new MyItems("_null_", null);
@@ -264,67 +263,87 @@ public class Loaders {
     // public static Item Isotope = new NuclearMetaItemGenerator();
 
     public static void GTMetaTileRegister() {
-        Loaders.MAR = new MultiNqGenerator(12732, "NaG", "Large Naquadah Reactor").getStackForm(1L);
-        Loaders.FRF = new FuelRefineFactory(16999, "FRF", "Naquadah Fuel Refinery").getStackForm(1L);
+        Loaders.MAR = new MultiNqGenerator(IDs_GoodGenerator.MultiNqGenerator.ID, "NaG", "Large Naquadah Reactor")
+            .getStackForm(1L);
+        Loaders.FRF = new FuelRefineFactory(IDs_GoodGenerator.FuelRefineFactory.ID, "FRF", "Naquadah Fuel Refinery")
+            .getStackForm(1L);
         Loaders.UCFE = new UniversalChemicalFuelEngine(
-            IDOffset,
+            IDs_GoodGenerator.UniversalChemicalFuelEngine.ID,
             "UniversalChemicalFuelEngine",
             "Universal Chemical Fuel Engine").getStackForm(1L);
+        int[] neutronAcceleratorIDs = new int[] { IDs_GoodGenerator.NeutronAcceleratorULV.ID,
+            IDs_GoodGenerator.NeutronAcceleratorLV.ID, IDs_GoodGenerator.NeutronAcceleratorMV.ID,
+            IDs_GoodGenerator.NeutronAcceleratorHV.ID, IDs_GoodGenerator.NeutronAcceleratorEV.ID,
+            IDs_GoodGenerator.NeutronAcceleratorIV.ID, IDs_GoodGenerator.NeutronAcceleratorLuV.ID,
+            IDs_GoodGenerator.NeutronAcceleratorZPM.ID, IDs_GoodGenerator.NeutronAcceleratorUV.ID, };
         for (int i = 0; i < 9; i++) {
             Loaders.NeutronAccelerators[i] = new NeutronAccelerator(
-                IDOffset + 2 + i,
+                neutronAcceleratorIDs[i],
                 "Neutron Accelerator " + GT_Values.VN[i],
                 "Neutron Accelerator " + GT_Values.VN[i],
                 i).getStackForm(1L);
         }
-        Loaders.NS = new NeutronSensor(IDOffset + 11, "Neutron Sensor", "Neutron Sensor", 5).getStackForm(1L);
-        Loaders.NA = new NeutronActivator(IDOffset + 12, "NeutronActivator", "Neutron Activator").getStackForm(1L);
-        Loaders.YFT = new YottaFluidTank(IDOffset + 13, "YottaFluidTank", "YOTTank").getStackForm(1L);
-        Loaders.YFH = new YOTTAHatch(IDOffset + 14, "YottaFluidTankHatch", "YOTHatch", 5).getStackForm(1L);
+        Loaders.NS = new NeutronSensor(IDs_GoodGenerator.NeutronSensor.ID, "Neutron Sensor", "Neutron Sensor", 5)
+            .getStackForm(1L);
+        Loaders.NA = new NeutronActivator(
+            IDs_GoodGenerator.NeutronActivator.ID,
+            "NeutronActivator",
+            "Neutron Activator").getStackForm(1L);
+        Loaders.YFT = new YottaFluidTank(IDs_GoodGenerator.YottaFluidTank.ID, "YottaFluidTank", "YOTTank")
+            .getStackForm(1L);
+        Loaders.YFH = new YOTTAHatch(IDs_GoodGenerator.YottaHatch.ID, "YottaFluidTankHatch", "YOTHatch", 5)
+            .getStackForm(1L);
         Loaders.SCTurbine = new SupercriticalFluidTurbine(
-            IDOffset + 15,
+            IDs_GoodGenerator.SupercriticalFluidTurbine.ID,
             "SupercriticalSteamTurbine",
             "SC Steam Turbine").getStackForm(1L);
-        Loaders.XHE = new ExtremeHeatExchanger(IDOffset + 16, "ExtremeHeatExchanger", "Extreme Heat Exchanger")
-            .getStackForm(1L);
-        Loaders.PA = new PreciseAssembler(IDOffset + 17, "PreciseAssembler", "Precise Auto-Assembler MT-3662")
-            .getStackForm(1L);
+        Loaders.XHE = new ExtremeHeatExchanger(
+            IDs_GoodGenerator.ExtremeHeatExchanger.ID,
+            "ExtremeHeatExchanger",
+            "Extreme Heat Exchanger").getStackForm(1L);
+        Loaders.PA = new PreciseAssembler(
+            IDs_GoodGenerator.PreciseAssembler.ID,
+            "PreciseAssembler",
+            "Precise Auto-Assembler MT-3662").getStackForm(1L);
         Loaders.LFC[0] = new LargeFusionComputer1(
-            IDOffset + 18,
+            IDs_GoodGenerator.LargeFusionComputer1.ID,
             "LargeFusionComputer1",
             "Compact Fusion Computer MK-I Prototype").getStackForm(1);
         Loaders.LFC[1] = new LargeFusionComputer2(
-            IDOffset + 19,
+            IDs_GoodGenerator.LargeFusionComputer2.ID,
             "LargeFusionComputer2",
             "Compact Fusion Computer MK-II").getStackForm(1L);
         Loaders.LFC[2] = new LargeFusionComputer3(
-            IDOffset + 20,
+            IDs_GoodGenerator.LargeFusionComputer3.ID,
             "LargeFusionComputer3",
             "Compact Fusion Computer MK-III").getStackForm(1L);
         Loaders.LFC[3] = new LargeFusionComputer4(
-            IDOffset + 21,
+            IDs_GoodGenerator.LargeFusionComputer4.ID,
             "LargeFusionComputer4",
             "Compact Fusion Computer MK-IV Prototype").getStackForm(1L);
-        Loaders.LFC[4] = new LargeFusionComputer5(IDOffset + 22, "LargeFusionComputer5", "Compact Fusion Computer MK-V")
-            .getStackForm(1L);
+        Loaders.LFC[4] = new LargeFusionComputer5(
+            IDs_GoodGenerator.LargeFusionComputer5.ID,
+            "LargeFusionComputer5",
+            "Compact Fusion Computer MK-V").getStackForm(1L);
         Loaders.Generator_Diesel[0] = new DieselGenerator(
-            1113,
+            IDs_GoodGenerator.DieselGeneratorEV.ID,
             "basicgenerator.diesel.tier.04",
             "Turbo Supercharging Combustion Generator",
             4).getStackForm(1L);
         Loaders.Generator_Diesel[1] = new DieselGenerator(
-            1114,
+            IDs_GoodGenerator.DieselGeneratorIV.ID,
             "basicgenerator.diesel.tier.05",
             "Ultimate Chemical Energy Releaser",
             5).getStackForm(1L);
-        Loaders.CT = new CoolantTower(IDOffset + 24, "CoolantTower", "Coolant Tower").getStackForm(1L);
+        Loaders.CT = new CoolantTower(IDs_GoodGenerator.CoolantTower.ID, "CoolantTower", "Coolant Tower")
+            .getStackForm(1L);
         Loaders.CompAssline = new ComponentAssemblyLine(
-            IDOffset + 25,
+            IDs_GoodGenerator.ComponentAssemblyLine.ID,
             "ComponentAssemblyLine",
             "Component Assembly Line").getStackForm(1L);
-        CrackRecipeAdder.registerPipe(30995, MyMaterial.incoloy903, 15000, 8000, true);
-        CrackRecipeAdder.registerWire(32749, MyMaterial.signalium, 12, 131072, 16, true);
-        CrackRecipeAdder.registerWire(32737, MyMaterial.lumiium, 8, 524288, 64, true);
+        CrackRecipeAdder.registerPipe(IDs_GoodGenerator.PipeIncoloy903.ID, MyMaterial.incoloy903, 15000, 8000, true);
+        CrackRecipeAdder.registerWire(IDs_GoodGenerator.WireSignalium.ID, MyMaterial.signalium, 12, 131072, 16, true);
+        CrackRecipeAdder.registerWire(IDs_GoodGenerator.WireLumiium.ID, MyMaterial.lumiium, 8, 524288, 64, true);
     }
 
     public static void Register() {
@@ -392,10 +411,14 @@ public class Loaders {
             GameRegistry.registerTileEntity(EssentiaHatch.class, "EssentiaHatch");
             GameRegistry.registerTileEntity(EssentiaOutputHatch.class, "EssentiaOutputHatch");
             GameRegistry.registerTileEntity(EssentiaOutputHatch_ME.class, "EssentiaOutputHatch_ME");
-            Loaders.LEG = new LargeEssentiaGenerator(IDOffset + 1, "LargeEssentiaGenerator", "Large Essentia Generator")
-                .getStackForm(1L);
-            Loaders.LES = new LargeEssentiaSmeltery(IDOffset + 23, "LargeEssentiaSmeltery", "Large Essentia Smeltery")
-                .getStackForm(1L);
+            Loaders.LEG = new LargeEssentiaGenerator(
+                IDs_GoodGenerator.LargeEssentiaGenerator.ID,
+                "LargeEssentiaGenerator",
+                "Large Essentia Generator").getStackForm(1L);
+            Loaders.LES = new LargeEssentiaSmeltery(
+                IDs_GoodGenerator.LargeEssentiaSmeltery.ID,
+                "LargeEssentiaSmeltery",
+                "Large Essentia Smeltery").getStackForm(1L);
             essentiaHatch = new TEBlock("essentiaHatch", new String[] { GoodGenerator.MOD_ID + ":essentiaHatch" }, 1);
             essentiaOutputHatch = new TEBlock(
                 "essentiaOutputHatch",
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/Ids_MetaGeneratedGregtechItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/Ids_MetaGeneratedGregtechItems.java
new file mode 100644
index 0000000000..5a9e9db772
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/Ids_MetaGeneratedGregtechItems.java
@@ -0,0 +1,47 @@
+package gtPlusPlus.xmod.gregtech.common.items;
+
+public enum Ids_MetaGeneratedGregtechItems {
+
+    Shape_Extruder_WindmillShaft(40),
+    Pellet_RTG_PU238(41),
+    Pellet_RTG_SR90(42),
+    Pellet_RTG_PO210(43),
+    Pellet_RTG_AM241(44),
+    Battery_RE_EV_Sodium(50),
+    Battery_RE_EV_Cadmium(52),
+    Battery_RE_EV_Lithium(54),
+    Gregtech_Computer_Cube(55),
+    Battery_Gem_1(66),
+    Battery_Gem_2(68),
+    Battery_Gem_3(70),
+    Cover_Overflow_LV(72),
+    Cover_Overflow_MV(73),
+    Cover_Overflow_HV(74),
+    Cover_Overflow_EV(75),
+    Cover_Overflow_IV(76),
+    Compressed_Fusion_Reactor(100),
+    Laser_Lens_Special(105),
+    Battery_Casing_Gem_1(106),
+    Battery_Casing_Gem_2(107),
+    Battery_Casing_Gem_3(108),
+    Battery_Casing_Gem_4(109),
+    Battery_Gem_4(110),
+    Laser_Lens_WoodsGlass(140),
+    TransmissionComponent_LV(142),
+    TransmissionComponent_MV(143),
+    TransmissionComponent_HV(144),
+    TransmissionComponent_EV(145),
+    TransmissionComponent_IV(146),
+    TransmissionComponent_LuV(147),
+    TransmissionComponent_ZPM(148),
+    TransmissionComponent_UV(149),
+    TransmissionComponent_UHV(150),
+    Distillus_Upgrade_Chip(151),
+    Maceration_Upgrade_Chip(152);
+
+    public final int ID;
+
+    Ids_MetaGeneratedGregtechItems(int ID) {
+        this.ID = ID;
+    }
+}
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 8173a868aa..8eba4c5526 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -3,6 +3,42 @@ package gtPlusPlus.xmod.gregtech.common.items;
 import static gregtech.client.GT_TooltipHandler.Tier.EV;
 import static gregtech.client.GT_TooltipHandler.registerTieredTooltip;
 import static gtPlusPlus.core.util.Utils.getTcAspectStack;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Casing_Gem_1;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Casing_Gem_2;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Casing_Gem_3;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Casing_Gem_4;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Gem_1;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Gem_2;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Gem_3;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Gem_4;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_RE_EV_Cadmium;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_RE_EV_Lithium;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_RE_EV_Sodium;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Compressed_Fusion_Reactor;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Cover_Overflow_EV;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Cover_Overflow_HV;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Cover_Overflow_IV;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Cover_Overflow_LV;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Cover_Overflow_MV;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Distillus_Upgrade_Chip;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Gregtech_Computer_Cube;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Laser_Lens_Special;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Laser_Lens_WoodsGlass;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Maceration_Upgrade_Chip;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Pellet_RTG_AM241;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Pellet_RTG_PO210;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Pellet_RTG_PU238;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Pellet_RTG_SR90;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Shape_Extruder_WindmillShaft;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_EV;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_HV;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_IV;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_LV;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_LuV;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_MV;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_UHV;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_UV;
+import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_ZPM;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
@@ -33,167 +69,162 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
     }
 
     public void generateMetaItems() {
-        int tLastID = 0;
 
         // Extruder Shape
-        GregtechItemList.Shape_Extruder_WindmillShaft
-            .set(this.addItem(40, "Extruder Shape (Shaft)", "Extruder Shape for making Windmill Shafts"));
+        GregtechItemList.Shape_Extruder_WindmillShaft.set(
+            this.addItem(
+                Shape_Extruder_WindmillShaft.ID,
+                "Extruder Shape (Shaft)",
+                "Extruder Shape for making Windmill Shafts"));
 
         // Batteries
         GregtechItemList.Battery_RE_EV_Sodium.set(
             this.addItem(
-                tLastID = 50,
+                Battery_RE_EV_Sodium.ID,
                 "Quad Cell Sodium Battery",
                 "Reusable",
                 getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
                 getTcAspectStack(TC_Aspects.METALLUM, 2L),
                 getTcAspectStack(TC_Aspects.POTENTIA, 2L)));
-        this.setElectricStats(32000 + tLastID, 3200000L, GT_Values.V[4], 4L, -3L, true);
-        registerTieredTooltip(GregtechItemList.Battery_RE_EV_Sodium.get(1), EV);
 
         GregtechItemList.Battery_RE_EV_Cadmium.set(
             this.addItem(
-                tLastID = 52,
+                Battery_RE_EV_Cadmium.ID,
                 "Quad Cell Cadmium Battery",
                 "Reusable",
                 getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
                 getTcAspectStack(TC_Aspects.METALLUM, 1L),
                 getTcAspectStack(TC_Aspects.POTENTIA, 1L)));
-        this.setElectricStats(32000 + tLastID, 4800000L, GT_Values.V[4], 4L, -3L, true);
-        registerTieredTooltip(GregtechItemList.Battery_RE_EV_Cadmium.get(1), EV);
 
         GregtechItemList.Battery_RE_EV_Lithium.set(
             this.addItem(
-                tLastID = 54,
+                Battery_RE_EV_Lithium.ID,
                 "Quad Cell Lithium Battery",
                 "Reusable",
                 getTcAspectStack(TC_Aspects.ELECTRUM, 3L),
                 getTcAspectStack(TC_Aspects.METALLUM, 3L),
                 getTcAspectStack(TC_Aspects.POTENTIA, 3L)));
-        this.setElectricStats(32000 + tLastID, 6400000L, GT_Values.V[4], 4L, -3L, true);
-        registerTieredTooltip(GregtechItemList.Battery_RE_EV_Lithium.get(1), EV);
 
         /**
          * Power Gems
          */
         GregtechItemList.Battery_Gem_1.set(
             this.addItem(
-                tLastID = 66,
+                Battery_Gem_1.ID,
                 "Proton Cell",
                 "Reusable",
                 getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
                 getTcAspectStack(TC_Aspects.METALLUM, 24L),
                 getTcAspectStack(TC_Aspects.POTENTIA, 16L)));
-        this.setElectricStats(32000 + tLastID, GT_Values.V[6] * 20 * 300 / 4, GT_Values.V[6], 6L, -3L, false);
+
         GregtechItemList.Battery_Gem_2.set(
             this.addItem(
-                tLastID = 68,
+                Battery_Gem_2.ID,
                 "Electron Cell",
                 "Reusable",
                 getTcAspectStack(TC_Aspects.ELECTRUM, 16L),
                 getTcAspectStack(TC_Aspects.METALLUM, 32L),
                 getTcAspectStack(TC_Aspects.POTENTIA, 32L)));
-        this.setElectricStats(32000 + tLastID, GT_Values.V[7] * 20 * 300 / 4, GT_Values.V[7], 7L, -3L, false);
+
         GregtechItemList.Battery_Gem_3.set(
             this.addItem(
-                tLastID = 70,
+                Battery_Gem_3.ID,
                 "Quark Entanglement",
                 "Reusable",
                 getTcAspectStack(TC_Aspects.ELECTRUM, 32L),
                 getTcAspectStack(TC_Aspects.METALLUM, 48L),
                 getTcAspectStack(TC_Aspects.POTENTIA, 64L)));
-        this.setElectricStats(32000 + tLastID, GT_Values.V[8] * 20 * 300 / 4, GT_Values.V[8], 8L, -3L, false);
 
         // RTG Pellet
         GregtechItemList.Pellet_RTG_PU238.set(
             this.addItem(
-                41,
+                Pellet_RTG_PU238.ID,
                 StringUtils.superscript("238") + "Pu Pellet",
                 "",
                 getTcAspectStack(TC_Aspects.RADIO, 4L),
                 getTcAspectStack(TC_Aspects.POTENTIA, 2L),
                 getTcAspectStack(TC_Aspects.METALLUM, 2L)));
+
         GregtechItemList.Pellet_RTG_SR90.set(
             this.addItem(
-                42,
+                Pellet_RTG_SR90.ID,
                 StringUtils.superscript("90") + "Sr Pellet",
                 "",
                 getTcAspectStack(TC_Aspects.RADIO, 4L),
                 getTcAspectStack(TC_Aspects.POTENTIA, 2L),
                 getTcAspectStack(TC_Aspects.METALLUM, 2L)));
+
         GregtechItemList.Pellet_RTG_PO210.set(
             this.addItem(
-                43,
+                Pellet_RTG_PO210.ID,
                 StringUtils.superscript("210") + "Po Pellet",
                 "",
                 getTcAspectStack(TC_Aspects.RADIO, 4L),
                 getTcAspectStack(TC_Aspects.POTENTIA, 2L),
                 getTcAspectStack(TC_Aspects.METALLUM, 2L)));
+
         GregtechItemList.Pellet_RTG_AM241.set(
             this.addItem(
-                44,
+                Pellet_RTG_AM241.ID,
                 StringUtils.superscript("241") + "Am Pellet",
                 "",
                 getTcAspectStack(TC_Aspects.RADIO, 4L),
                 getTcAspectStack(TC_Aspects.POTENTIA, 2L),
                 getTcAspectStack(TC_Aspects.METALLUM, 2L)));
 
-        CORE.RA.addFuelForRTG(GregtechItemList.Pellet_RTG_PU238.get(1), MathUtils.roundToClosestInt(87.7f), 64);
-        CORE.RA.addFuelForRTG(GregtechItemList.Pellet_RTG_SR90.get(1), MathUtils.roundToClosestInt(28.8f), 32);
-        CORE.RA.addFuelForRTG(GregtechItemList.Pellet_RTG_PO210.get(1), 1, 512);
-        CORE.RA.addFuelForRTG(GregtechItemList.Pellet_RTG_AM241.get(1), 216, 16);
-        CORE.RA.addFuelForRTG(GT_ModHandler.getIC2Item("RTGPellets", 1), MathUtils.roundToClosestInt(2.6f), 8);
-
         // Computer Cube
         GregtechItemList.Gregtech_Computer_Cube.set(
             this.addItem(
-                tLastID = 55,
+                Gregtech_Computer_Cube.ID,
                 "Gregtech Computer Cube",
                 "Reusable",
                 getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
                 getTcAspectStack(TC_Aspects.METALLUM, 8L),
                 getTcAspectStack(TC_Aspects.POTENTIA, 8L)));
-        this.setElectricStats(32000 + tLastID, GT_Values.V[6] * 10 * 60 * 20, GT_Values.V[5], 5L, -3L, false);
 
         GregtechItemList.Cover_Overflow_LV.set(
             this.addItem(
-                72,
+                Cover_Overflow_LV.ID,
                 "Overflow Valve (LV)",
                 "Maximum void amount: 64,000",
                 getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
                 getTcAspectStack(TC_Aspects.MACHINA, 1L),
                 getTcAspectStack(TC_Aspects.ITER, 1L),
                 getTcAspectStack(TC_Aspects.AQUA, 1L)));
+
         GregtechItemList.Cover_Overflow_MV.set(
             this.addItem(
-                73,
+                Cover_Overflow_MV.ID,
                 "Overflow Valve (MV)",
                 "Maximum void amount: 512,000",
                 getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
                 getTcAspectStack(TC_Aspects.MACHINA, 1L),
                 getTcAspectStack(TC_Aspects.ITER, 1L),
                 getTcAspectStack(TC_Aspects.AQUA, 1L)));
+
         GregtechItemList.Cover_Overflow_HV.set(
             this.addItem(
-                74,
+                Cover_Overflow_HV.ID,
                 "Overflow Valve (HV)",
                 "Maximum void amount: 4,096,000",
                 getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
                 getTcAspectStack(TC_Aspects.MACHINA, 1L),
                 getTcAspectStack(TC_Aspects.ITER, 1L),
                 getTcAspectStack(TC_Aspects.AQUA, 1L)));
+
         GregtechItemList.Cover_Overflow_EV.set(
             this.addItem(
-                75,
+                Cover_Overflow_EV.ID,
                 "Overflow Valve (EV)",
                 "Maximum void amount: 32,768,000",
                 getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
                 getTcAspectStack(TC_Aspects.MACHINA, 1L),
                 getTcAspectStack(TC_Aspects.ITER, 1L),
                 getTcAspectStack(TC_Aspects.AQUA, 1L)));
+
         GregtechItemList.Cover_Overflow_IV.set(
             this.addItem(
-                76,
+                Cover_Overflow_IV.ID,
                 "Overflow Valve (IV)",
                 "Maximum void amount: 262,144,000",
                 getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
@@ -201,80 +232,57 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
                 getTcAspectStack(TC_Aspects.ITER, 1L),
                 getTcAspectStack(TC_Aspects.AQUA, 1L)));
 
-        GregTech_API.registerCover(
-            GregtechItemList.Cover_Overflow_LV.get(1L),
-            new GT_MultiTexture(
-                Textures.BlockIcons.MACHINE_CASINGS[4][0],
-                new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
-            new GTPP_Cover_Overflow(64));
-        GregTech_API.registerCover(
-            GregtechItemList.Cover_Overflow_MV.get(1L),
-            new GT_MultiTexture(
-                Textures.BlockIcons.MACHINE_CASINGS[5][0],
-                new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
-            new GTPP_Cover_Overflow(512));
-        GregTech_API.registerCover(
-            GregtechItemList.Cover_Overflow_HV.get(1L),
-            new GT_MultiTexture(
-                Textures.BlockIcons.MACHINE_CASINGS[5][0],
-                new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
-            new GTPP_Cover_Overflow(4096));
-        GregTech_API.registerCover(
-            GregtechItemList.Cover_Overflow_EV.get(1L),
-            new GT_MultiTexture(
-                Textures.BlockIcons.MACHINE_CASINGS[8][0],
-                new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
-            new GTPP_Cover_Overflow(32768));
-        GregTech_API.registerCover(
-            GregtechItemList.Cover_Overflow_IV.get(1L),
-            new GT_MultiTexture(
-                Textures.BlockIcons.MACHINE_CASINGS[8][0],
-                new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
-            new GTPP_Cover_Overflow(262144));
-
         // Fusion Reactor MK4 Singularity
         GregtechItemList.Compressed_Fusion_Reactor.set(
             this.addItem(
-                100,
+                Compressed_Fusion_Reactor.ID,
                 "Hypervisor Matrix (Fusion)",
                 "A memory unit containing an RI (Restricted Intelligence)"));
 
         GregtechItemList.Laser_Lens_Special
-            .set(this.addItem(105, "Quantum Anomaly", "Probably should shoot it with lasers"));
+            .set(this.addItem(Laser_Lens_Special.ID, "Quantum Anomaly", "Probably should shoot it with lasers"));
 
-        GregtechItemList.Battery_Casing_Gem_1.set(this.addItem(106, "Containment Unit I", "Used in crafting"));
-        GregtechItemList.Battery_Casing_Gem_2.set(this.addItem(107, "Containment Unit II", "Used in crafting"));
-        GregtechItemList.Battery_Casing_Gem_3.set(this.addItem(108, "Advanced Containment Unit", "Used in crafting"));
-        GregtechItemList.Battery_Casing_Gem_4.set(this.addItem(109, "Exotic Containment Unit", "Used in crafting"));
+        GregtechItemList.Battery_Casing_Gem_1
+            .set(this.addItem(Battery_Casing_Gem_1.ID, "Containment Unit I", "Used in crafting"));
+        GregtechItemList.Battery_Casing_Gem_2
+            .set(this.addItem(Battery_Casing_Gem_2.ID, "Containment Unit II", "Used in crafting"));
+        GregtechItemList.Battery_Casing_Gem_3
+            .set(this.addItem(Battery_Casing_Gem_3.ID, "Advanced Containment Unit", "Used in crafting"));
+        GregtechItemList.Battery_Casing_Gem_4
+            .set(this.addItem(Battery_Casing_Gem_4.ID, "Exotic Containment Unit", "Used in crafting"));
 
         GregtechItemList.Battery_Gem_4.set(
             this.addItem(
-                tLastID = 110,
+                Battery_Gem_4.ID,
                 "Graviton Anomaly",
                 "Reusable",
                 getTcAspectStack(TC_Aspects.ELECTRUM, 64L),
                 getTcAspectStack(TC_Aspects.METALLUM, 64L),
                 getTcAspectStack(TC_Aspects.POTENTIA, 64L)));
-        this.setElectricStats(32000 + tLastID, (64000000000L * 16), GT_Values.V[9], 9L, -3L, false);
 
         /*
          * High Tier 'Saws' for the tree Farm
          */
 
         GregtechItemList.Laser_Lens_WoodsGlass.set(
-            this.addItem(140, "Wood's Glass Lens", "Allows UV & IF to pass through, blocks visible light spectrums"));
+            this.addItem(
+                Laser_Lens_WoodsGlass.ID,
+                "Wood's Glass Lens",
+                "Allows UV & IF to pass through, blocks visible light spectrums"));
 
-        // 141 now unused, was the ulv transmission component
-        int aStartID = 142;
         GregtechItemList[] aTransParts = new GregtechItemList[] { GregtechItemList.TransmissionComponent_LV,
             GregtechItemList.TransmissionComponent_MV, GregtechItemList.TransmissionComponent_HV,
             GregtechItemList.TransmissionComponent_EV, GregtechItemList.TransmissionComponent_IV,
             GregtechItemList.TransmissionComponent_LuV, GregtechItemList.TransmissionComponent_ZPM,
             GregtechItemList.TransmissionComponent_UV, GregtechItemList.TransmissionComponent_UHV, };
+
+        int[] IDs = new int[] { TransmissionComponent_LV.ID, TransmissionComponent_MV.ID, TransmissionComponent_HV.ID,
+            TransmissionComponent_EV.ID, TransmissionComponent_IV.ID, TransmissionComponent_LuV.ID,
+            TransmissionComponent_ZPM.ID, TransmissionComponent_UV.ID, TransmissionComponent_UHV.ID, };
         for (int tier = 1; tier < aTransParts.length + 1; tier++) {
             aTransParts[tier - 1].set(
                 this.addItem(
-                    aStartID++,
+                    IDs[tier - 1],
                     "Transmission Component (" + GT_Values.VN[tier] + ")",
                     "",
                     getTcAspectStack(TC_Aspects.ELECTRUM, tier),
@@ -283,10 +291,82 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
         }
 
         // Distillus Chip
-        GregtechItemList.Distillus_Upgrade_Chip
-            .set(this.addItem(151, "Distillus Upgrade Chip", "Used to upgrade Distillus to Tier 2"));
-        GregtechItemList.Maceration_Upgrade_Chip
-            .set(this.addItem(152, "Maceration Upgrade Chip", "Used to upgrade Maceration Stack to Tier 2"));
+        GregtechItemList.Distillus_Upgrade_Chip.set(
+            this.addItem(Distillus_Upgrade_Chip.ID, "Distillus Upgrade Chip", "Used to upgrade Distillus to Tier 2"));
+        GregtechItemList.Maceration_Upgrade_Chip.set(
+            this.addItem(
+                Maceration_Upgrade_Chip.ID,
+                "Maceration Upgrade Chip",
+                "Used to upgrade Maceration Stack to Tier 2"));
+
+        setAllElectricStats();
+        registerTieredTooltips();
+        registerFuelRTGRecipes();
+        registerCovers();
+    }
+
+    private void setAllElectricStats() {
+        this.setElectricStats(32000 + Battery_RE_EV_Cadmium.ID, 4800000L, GT_Values.V[4], 4L, -3L, true);
+        this.setElectricStats(32000 + Battery_RE_EV_Sodium.ID, 3200000L, GT_Values.V[4], 4L, -3L, true);
+        this.setElectricStats(32000 + Battery_RE_EV_Lithium.ID, 6400000L, GT_Values.V[4], 4L, -3L, true);
+        this.setElectricStats(32000 + Battery_Gem_1.ID, GT_Values.V[6] * 20 * 300 / 4, GT_Values.V[6], 6L, -3L, false);
+        this.setElectricStats(32000 + Battery_Gem_2.ID, GT_Values.V[7] * 20 * 300 / 4, GT_Values.V[7], 7L, -3L, false);
+        this.setElectricStats(32000 + Battery_Gem_3.ID, GT_Values.V[8] * 20 * 300 / 4, GT_Values.V[8], 8L, -3L, false);
+        this.setElectricStats(32000 + Battery_Casing_Gem_4.ID, (64000000000L * 16), GT_Values.V[9], 9L, -3L, false);
+        this.setElectricStats(
+            32000 + Gregtech_Computer_Cube.ID,
+            GT_Values.V[6] * 10 * 60 * 20,
+            GT_Values.V[5],
+            5L,
+            -3L,
+            false);
+    }
+
+    private void registerTieredTooltips() {
+        registerTieredTooltip(GregtechItemList.Battery_RE_EV_Sodium.get(1), EV);
+        registerTieredTooltip(GregtechItemList.Battery_RE_EV_Cadmium.get(1), EV);
+        registerTieredTooltip(GregtechItemList.Battery_RE_EV_Lithium.get(1), EV);
+    }
+
+    private void registerFuelRTGRecipes() {
+        CORE.RA.addFuelForRTG(GregtechItemList.Pellet_RTG_PU238.get(1), MathUtils.roundToClosestInt(87.7f), 64);
+        CORE.RA.addFuelForRTG(GregtechItemList.Pellet_RTG_SR90.get(1), MathUtils.roundToClosestInt(28.8f), 32);
+        CORE.RA.addFuelForRTG(GregtechItemList.Pellet_RTG_PO210.get(1), 1, 512);
+        CORE.RA.addFuelForRTG(GregtechItemList.Pellet_RTG_AM241.get(1), 216, 16);
+        CORE.RA.addFuelForRTG(GT_ModHandler.getIC2Item("RTGPellets", 1), MathUtils.roundToClosestInt(2.6f), 8);
+    }
+
+    private void registerCovers() {
+        GregTech_API.registerCover(
+            GregtechItemList.Cover_Overflow_LV.get(1L),
+            new GT_MultiTexture(
+                Textures.BlockIcons.MACHINE_CASINGS[4][0],
+                new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
+            new GTPP_Cover_Overflow(64));
+        GregTech_API.registerCover(
+            GregtechItemList.Cover_Overflow_MV.get(1L),
+            new GT_MultiTexture(
+                Textures.BlockIcons.MACHINE_CASINGS[5][0],
+                new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
+            new GTPP_Cover_Overflow(512));
+        GregTech_API.registerCover(
+            GregtechItemList.Cover_Overflow_HV.get(1L),
+            new GT_MultiTexture(
+                Textures.BlockIcons.MACHINE_CASINGS[5][0],
+                new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
+            new GTPP_Cover_Overflow(4096));
+        GregTech_API.registerCover(
+            GregtechItemList.Cover_Overflow_EV.get(1L),
+            new GT_MultiTexture(
+                Textures.BlockIcons.MACHINE_CASINGS[8][0],
+                new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
+            new GTPP_Cover_Overflow(32768));
+        GregTech_API.registerCover(
+            GregtechItemList.Cover_Overflow_IV.get(1L),
+            new GT_MultiTexture(
+                Textures.BlockIcons.MACHINE_CASINGS[8][0],
+                new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
+            new GTPP_Cover_Overflow(262144));
     }
 
 }