Cleaning up (#767)

* Kill playerAPI

* Gut more events and compat that is now obsolete

* Remove commented out code

* Remove final modifier from methods

* Make more stuff final

* Remove slow building ring

* Protected -> private in final classes

* More cleaning

* More cleaning v2

* Purging

* Clean DevHelper

* Clean DevHelper 2

* delete DevHelper

* remove useless IFMLLoadingPlugin.MCVersion annotation from @Mod files

* check for obfuscation only once in the IFMLloadingPlugin.injectData

* don't instantiate the static class ASMConfig

* delete unused and empty implementation of IFMLCallHook

* delete empty class

* delete ClassesToTransform class that just holds the class names constants

* delete unused methods and unsless logging in dummymod container

* delete unused transformer ClassTransformer_TT_ThaumicRestorer

* spotless

* Clean

* Clean utils

* Build checkpoint

* Purge

* Stage 2

* Stage 3

* Stage 4

* Stage 5

* Stage 6

* Spotless

* Imports

* Stage idk

* Stage 1

* Fix issue

* Spotless

* Format numbers

---------

Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: Alexdoru <57050655+Alexdoru@users.noreply.github.com>
Co-authored-by: Connor Colenso <colen@CONNORSPC>

10 files changed, 12 insertions, 206 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
index 19f6f42f64..fcdd93d0fd 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
@@ -5,19 +5,11 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_ElectricAutoWorkbench;
-import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_ElectricInventoryManager;
 import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractGenerator;
 import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractTerminal;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_CropHarvestor;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GT4Entity_AutoCrafter;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GT4Entity_ThermalBoiler;
-import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.GT_MetaTileEntity_RedstoneButtonPanel;
-import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.GT_MetaTileEntity_RedstoneCircuitBlock;
-import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.GT_MetaTileEntity_RedstoneLamp;
-import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.GT_MetaTileEntity_RedstoneStrengthDisplay;
-import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.GT_MetaTileEntity_RedstoneStrengthScale;
-import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_AdvancedCraftingTable;
-import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_BronzeCraftingTable;
 
 public class Gregtech4Content {
 
@@ -25,47 +17,11 @@ public class Gregtech4Content {
 
     public static void run() {
         Logger.INFO("Max MTE: " + GregTech_API.METATILEENTITIES.length + " | " + GregTech_API.MAXIMUM_METATILE_IDS);
-        workbenches();
         thermalBoiler();
         multiCrafter();
         tesseracts();
         basic();
         automation();
-        redstone();
-    }
-
-    private static void workbenches() {
-        // Gregtech 4 Workbenches
-        Logger.INFO("Gregtech 4 Content | Registering Workbenches.");
-        GregtechItemList.GT4_Workbench_Bronze.set(
-                new GT_MetaTileEntity_BronzeCraftingTable(
-                        31081,
-                        "workbench.basic",
-                        "Bronze Workbench",
-                        0,
-                        "Stores 16000L of fluid").getStackForm(1L));
-        GregtechItemList.GT4_Workbench_Advanced.set(
-                new GT_MetaTileEntity_AdvancedCraftingTable(
-                        31082,
-                        "workbench.advanced",
-                        "Advanced Workbench",
-                        3,
-                        "Stores 64000L of fluid").getStackForm(1L));
-    }
-
-    private static void redstone() {
-        Logger.INFO("Gregtech 4 Content | Registering Redstone Blocks.");
-        GregtechItemList.GT4_Redstone_Lamp.set(new GT_MetaTileEntity_RedstoneLamp(31120).getStackForm(1L));
-        GregtechItemList.GT4_Redstone_Button_Panel
-                .set(new GT_MetaTileEntity_RedstoneButtonPanel(31121).getStackForm(1L));
-        GregtechItemList.GT4_Redstone_Scale.set(new GT_MetaTileEntity_RedstoneStrengthScale(31122).getStackForm(1L));
-        GregtechItemList.GT4_Redstone_Display.set(
-                new GT_MetaTileEntity_RedstoneStrengthDisplay(
-                        31123,
-                        "redstone.display.strength",
-                        "Redstone Display",
-                        "Displays Redstone Strength").getStackForm(1L));
-        GregtechItemList.GT4_Redstone_Circuit.set(new GT_MetaTileEntity_RedstoneCircuitBlock(31124).getStackForm(1L));
     }
 
     private static void automation() {
@@ -87,31 +43,6 @@ public class Gregtech4Content {
         GregtechItemList.GT4_Electric_Auto_Workbench_UV.set(
                 new GT_MetaTileEntity_ElectricAutoWorkbench(31098, 8, "Automatic crafting machine").getStackForm(1L));
 
-        Logger.INFO("Gregtech 4 Content | Registering Inventory Managers.");
-        GregtechItemList.GT4_Electric_Inventory_Manager_LV.set(
-                new GT_MetaTileEntity_ElectricInventoryManager(31101, 1, "Manages your inventory and stuff")
-                        .getStackForm(1L));
-        GregtechItemList.GT4_Electric_Inventory_Manager_MV.set(
-                new GT_MetaTileEntity_ElectricInventoryManager(31102, 2, "Manages your inventory and stuff")
-                        .getStackForm(1L));
-        GregtechItemList.GT4_Electric_Inventory_Manager_HV.set(
-                new GT_MetaTileEntity_ElectricInventoryManager(31103, 3, "Manages your inventory and stuff")
-                        .getStackForm(1L));
-        GregtechItemList.GT4_Electric_Inventory_Manager_EV.set(
-                new GT_MetaTileEntity_ElectricInventoryManager(31104, 4, "Manages your inventory and stuff")
-                        .getStackForm(1L));
-        GregtechItemList.GT4_Electric_Inventory_Manager_IV.set(
-                new GT_MetaTileEntity_ElectricInventoryManager(31105, 5, "Manages your inventory and stuff")
-                        .getStackForm(1L));
-        GregtechItemList.GT4_Electric_Inventory_Manager_LuV.set(
-                new GT_MetaTileEntity_ElectricInventoryManager(31106, 6, "Manages your inventory and stuff")
-                        .getStackForm(1L));
-        GregtechItemList.GT4_Electric_Inventory_Manager_ZPM.set(
-                new GT_MetaTileEntity_ElectricInventoryManager(31107, 7, "Manages your inventory and stuff")
-                        .getStackForm(1L));
-        GregtechItemList.GT4_Electric_Inventory_Manager_UV.set(
-                new GT_MetaTileEntity_ElectricInventoryManager(31108, 8, "Manages your inventory and stuff")
-                        .getStackForm(1L));
     }
 
     private static void basic() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java
index 7fd68be584..67d70e45e4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java
@@ -18,7 +18,7 @@ public class GregtechBufferDynamos {
         run2();
     }
 
-    private static final void run2() {
+    private static void run2() {
         GregtechItemList.Hatch_Buffer_Dynamo_ULV.set(
                 new GT_MetaTileEntity_Hatch_DynamoBuffer(
                         mID++,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
index 6c05c6e79f..0b615b9c3d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
@@ -648,9 +648,6 @@ public class GregtechConduits {
             Logger.ERROR(Material.name() + " has defaulted to 8v.");
             V = 0;
         }
-        // makeWires(T, ID, 2L, 4L, 2L, GT_Values.V[V], true, false);
-        // makeSuperConductors(T, ID, insulatedLoss, uninsulatedLoss, Amps, GT_Values.V[V], true, false);
-        // makeWires(T, ID, bEC ? 2L : 2L, bEC ? 4L : 4L, 2L, gregtech.api.enums.GT_Values.V[V], true, false);
     }
 
     private static void generateGTFluidPipes(final Materials material, final int startID, final int transferRatePerSec,
@@ -949,8 +946,8 @@ public class GregtechConduits {
         String tName = aName.toString();
         if (GT_Utility.isStringInvalid(tName)) return false;
         ArrayList<ItemStack> tList = GT_OreDictUnificator.getOres(tName);
-        for (int i = 0; i < tList.size(); ++i)
-            if (GT_Utility.areStacksEqual((ItemStack) tList.get(i), aStack, true)) return false;
+        for (ItemStack itemStack : tList)
+            if (GT_Utility.areStacksEqual((ItemStack) itemStack, aStack, true)) return false;
         OreDictionary.registerOre(tName, GT_Utility.copyAmount(1L, new Object[] { aStack }));
         return true;
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java
index 7878709095..f8c36eb37b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java
@@ -163,11 +163,8 @@ public class GregtechCustomHatches {
          * Super Input Busses
          */
 
-        int aStartID = 30021;
+        int aStartID = 30022;
 
-        GregtechItemList.Hatch_SuperBus_Input_ULV.set(
-                ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.00", "Super Bus (I) (ULV)", 0))
-                        .getStackForm(1L));
         GregtechItemList.Hatch_SuperBus_Input_LV.set(
                 ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.01", "Super Bus (I) (LV)", 1))
                         .getStackForm(1L));
@@ -193,16 +190,13 @@ public class GregtechCustomHatches {
                 ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.08", "Super Bus (I) (UV)", 8))
                         .getStackForm(1L));
         GregtechItemList.Hatch_SuperBus_Input_MAX.set(
-                ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.09", "Super Bus (I) (MAX)", 9))
+                ((IMetaTileEntity) makeInputBus(aStartID, "hatch.superbus.input.tier.09", "Super Bus (I) (MAX)", 9))
                         .getStackForm(1L));
 
         /*
          * Super Output Busses
          */
-
-        GregtechItemList.Hatch_SuperBus_Output_ULV.set(
-                ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.00", "Super Bus (O) (ULV)", 0))
-                        .getStackForm(1L));
+        aStartID = 30031;
         GregtechItemList.Hatch_SuperBus_Output_LV.set(
                 ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.01", "Super Bus (O) (LV)", 1))
                         .getStackForm(1L));
@@ -228,7 +222,7 @@ public class GregtechCustomHatches {
                 ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.08", "Super Bus (O) (UV)", 8))
                         .getStackForm(1L));
         GregtechItemList.Hatch_SuperBus_Output_MAX.set(
-                ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.09", "Super Bus (O) (MAX)", 9))
+                ((IMetaTileEntity) makeOutputBus(aStartID, "hatch.superbus.output.tier.09", "Super Bus (O) (MAX)", 9))
                         .getStackForm(1L));
     }
 
@@ -248,15 +242,13 @@ public class GregtechCustomHatches {
     }
 
     private static void run5() {
-        int aID = 31777;
+        int aID = 31778;
 
-        GregtechItemList.GT_MetaTileEntity_ChiselBus_I
-                .set((makeChiselBus(aID++, "hatch.chisel.tier.00", "Chisel Bus I", 0)).getStackForm(1L));
-        GregtechItemList.GT_MetaTileEntity_ChiselBus_II
+        GregtechItemList.GT_MetaTileEntity_ChiselBus_LV
                 .set((makeChiselBus(aID++, "hatch.chisel.tier.01", "Chisel Bus II", 1)).getStackForm(1L));
-        GregtechItemList.GT_MetaTileEntity_ChiselBus_III
+        GregtechItemList.GT_MetaTileEntity_ChiselBus_MV
                 .set((makeChiselBus(aID++, "hatch.chisel.tier.02", "Chisel Bus III", 2)).getStackForm(1L));
-        GregtechItemList.GT_MetaTileEntity_ChiselBus_IV
+        GregtechItemList.GT_MetaTileEntity_ChiselBus_HV
                 .set((makeChiselBus(aID++, "hatch.chisel.tier.03", "Chisel Bus IV", 3)).getStackForm(1L));
 
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV.java
deleted file mode 100644
index bc05640e70..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package gtPlusPlus.xmod.gregtech.registration.gregtech;
-
-import static gtPlusPlus.core.recipe.common.CI.bitsd;
-
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_ModHandler;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV.GT_MetaTileEntity_ULV_CombustionGenerator;
-import gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV.GT_MetaTileEntity_ULV_GasTurbine;
-import gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV.GT_MetaTileEntity_ULV_SteamTurbine;
-
-public class GregtechGeneratorsULV {
-
-    public static void run() {
-
-        GregtechItemList.Generator_Diesel_ULV.set(
-                new GT_MetaTileEntity_ULV_CombustionGenerator(
-                        960,
-                        "basicgenerator.diesel.tier.00",
-                        "Simple Combustion Generator",
-                        0).getStackForm(1L));
-        GregtechItemList.Generator_Gas_Turbine_ULV.set(
-                new GT_MetaTileEntity_ULV_GasTurbine(961, "basicgenerator.gas.tier.00", "Simple Gas Turbine", 0)
-                        .getStackForm(1L));
-        GregtechItemList.Generator_Steam_Turbine_ULV.set(
-                new GT_MetaTileEntity_ULV_SteamTurbine(962, "basicgenerator.steam.tier.00", "Simple Steam Turbine")
-                        .getStackForm(1L));
-
-        GT_ModHandler.addCraftingRecipe(
-                GregtechItemList.Generator_Diesel_ULV.get(1L, new Object[0]),
-                bitsd,
-                new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_ULV, 'P', GregtechItemList.Electric_Piston_ULV,
-                        'E', GregtechItemList.Electric_Motor_ULV, 'C', OrePrefixes.circuit.get(Materials.Primitive),
-                        'W', OrePrefixes.cableGt01.get(Materials.RedAlloy), 'G',
-                        OrePrefixes.gearGt.get(Materials.Bronze) });
-        GT_ModHandler.addCraftingRecipe(
-                GregtechItemList.Generator_Gas_Turbine_ULV.get(1L, new Object[0]),
-                bitsd,
-                new Object[] { "CRC", "RMR", "EWE", 'M', ItemList.Hull_ULV, 'E', GregtechItemList.Electric_Motor_ULV,
-                        'R', OrePrefixes.rotor.get(Materials.Tin), 'C', OrePrefixes.circuit.get(Materials.Primitive),
-                        'W', OrePrefixes.cableGt01.get(Materials.RedAlloy) });
-        GT_ModHandler.addCraftingRecipe(
-                GregtechItemList.Generator_Steam_Turbine_ULV.get(1L, new Object[0]),
-                bitsd,
-                new Object[] { "PCP", "RMR", "EWE", 'M', ItemList.Hull_ULV, 'E', GregtechItemList.Electric_Motor_ULV,
-                        'R', OrePrefixes.rotor.get(Materials.Tin), 'C', OrePrefixes.circuit.get(Materials.Primitive),
-                        'W', OrePrefixes.cableGt01.get(Materials.RedAlloy), 'P',
-                        OrePrefixes.pipeMedium.get(Materials.Copper) });
-    }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java
index 02e397ca35..e6c1febd66 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java
@@ -37,12 +37,6 @@ public class GregtechPollutionDevices {
                             "Polluting the skies.",
                             0).getStackForm(1L));
 
-            GregtechItemList.Pollution_Cleaner_ULV.set(
-                    new GregtechMetaAtmosphericReconditioner(
-                            757,
-                            "pollutioncleaner.01.tier.single",
-                            "Pollution Scrubber",
-                            0).getStackForm(1L));
             GregtechItemList.Pollution_Cleaner_LV.set(
                     new GregtechMetaAtmosphericReconditioner(
                             758,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java
deleted file mode 100644
index 0d52cc0fcb..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package gtPlusPlus.xmod.gregtech.registration.gregtech;
-
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaCondensor;
-
-public class GregtechSteamCondenser {
-
-    public static void run() {
-        Logger.INFO("Gregtech5u Content | Registering Steam Condensor.");
-        if (CORE.ConfigSwitches.enableMachine_SteamConverter) {
-            run1();
-        }
-    }
-
-    private static void run1() {
-        // Steam Condensors
-        GregtechItemList.Condensor_MAX.set(
-                new GregtechMetaCondensor(769, "steamcondensor.01.tier.single", "Steam Condensor").getStackForm(1L));
-    }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java
index ccd7d6cbf7..08ce02b5fa 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java
@@ -1,6 +1,5 @@
 package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
-import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredChest;
 
@@ -27,12 +26,5 @@ public class GregtechSuperChests {
                 (new GT_MetaTileEntity_TieredChest(mId++, "super.chest.gtpp.tier.05", "Super Chest V" + aSuffix, 5))
                         .getStackForm(1L));
 
-        // Do not add Recipes for GTNH, hide them from NEI instead.
-        ItemUtils.hideItemFromNEI(GregtechItemList.Super_Chest_LV.get(1L));
-        ItemUtils.hideItemFromNEI(GregtechItemList.Super_Chest_MV.get(1L));
-        ItemUtils.hideItemFromNEI(GregtechItemList.Super_Chest_HV.get(1L));
-        ItemUtils.hideItemFromNEI(GregtechItemList.Super_Chest_EV.get(1L));
-        ItemUtils.hideItemFromNEI(GregtechItemList.Super_Chest_IV.get(1L));
-
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java
deleted file mode 100644
index 0d560610ff..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package gtPlusPlus.xmod.gregtech.registration.gregtech;
-
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntityChunkLoader;
-
-public class GregtechTieredChunkloaders {
-
-    public static void run() {
-        Logger.INFO("Gregtech5u Content | Registering Chunk Loaders.");
-        run1();
-    }
-
-    private static void run1() {
-        int ID = 943;
-        GregtechItemList.GT_Chunkloader_HV.set(
-                new GregtechMetaTileEntityChunkLoader(ID++, "chunkloader.tier.01", "Chunkloader MK I", 3)
-                        .getStackForm(1L));
-        GregtechItemList.GT_Chunkloader_IV.set(
-                new GregtechMetaTileEntityChunkLoader(ID++, "chunkloader.tier.02", "Chunkloader MK II", 5)
-                        .getStackForm(1L));
-        GregtechItemList.GT_Chunkloader_ZPM.set(
-                new GregtechMetaTileEntityChunkLoader(ID++, "chunkloader.tier.03", "Chunkloader MK III", 7)
-                        .getStackForm(1L));
-    }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java
index fe7628933e..43645b16fb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java
@@ -84,7 +84,7 @@ public class GregtechWirelessChargers {
                         8,
                         "Hopefully won't give you cancer.",
                         0).getStackForm(1L));
-        GregtechItemList.Charger_MAX.set(
+        GregtechItemList.Charger_UHV.set(
                 new GregtechMetaWirelessCharger(
                         mID++,
                         "wificharger.09.tier.single",