migrate GT++ config to GTNHLib (#3193)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>

38 files changed, 397 insertions, 401 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 02141388bb..48874d1d3e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
@@ -23,7 +23,6 @@ import static gregtech.api.enums.MetaTileEntityIDs.GT4_Thermal_Boiler;
 
 import gregtech.api.GregTechAPI;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.automation.MTEElectricAutoWorkbench;
 import gtPlusPlus.xmod.gregtech.common.tileentities.automation.MTETesseractGenerator;
@@ -115,12 +114,11 @@ public class Gregtech4Content {
 
     private static void thermalBoiler() {
         // Gregtech 4 Thermal Boiler
-        if (GTPPCore.ConfigSwitches.enableMultiblock_ThermalBoiler) {
-            Logger.INFO("Gregtech 4 Content | Registering Thermal Boiler.");
-            GregtechItemList.GT4_Thermal_Boiler.set(
-                new MTEThermalBoiler(GT4_Thermal_Boiler.ID, "gtplusplus.thermal.boiler", "Thermal Boiler")
-                    .getStackForm(1L));
-        }
+        Logger.INFO("Gregtech 4 Content | Registering Thermal Boiler.");
+        GregtechItemList.GT4_Thermal_Boiler.set(
+            new MTEThermalBoiler(GT4_Thermal_Boiler.ID, "gtplusplus.thermal.boiler", "Thermal Boiler")
+                .getStackForm(1L));
+
     }
 
     private static void multiCrafter() {
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 ec9eff9ebe..b331479028 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
@@ -19,7 +19,6 @@ import gregtech.api.metatileentity.implementations.MTEFluid;
 import gregtech.api.util.GTOreDictUnificator;
 import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialsAlloy;
 import gtPlusPlus.core.material.MaterialsElements;
@@ -41,13 +40,9 @@ public class GregtechConduits {
     private static int BasePipeHexadecupleID = 30100;
 
     public static void run() {
-        if (GTPPCore.ConfigSwitches.enableCustom_Cables) {
-            run1();
-        }
-        if (GTPPCore.ConfigSwitches.enableCustom_Pipes) {
-            run2();
-            run3();
-        }
+        run1();
+        run2();
+        run3();
     }
 
     private static void run3() {
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 2781730229..58d1abc73b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java
@@ -1,5 +1,12 @@
 package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
+import static gregtech.api.enums.MetaTileEntityIDs.GT_MetaTileEntity_ChiselBus_HV;
+import static gregtech.api.enums.MetaTileEntityIDs.GT_MetaTileEntity_ChiselBus_LV;
+import static gregtech.api.enums.MetaTileEntityIDs.GT_MetaTileEntity_ChiselBus_MV;
+import static gregtech.api.enums.MetaTileEntityIDs.GT_MetaTileEntity_Solidifier_I;
+import static gregtech.api.enums.MetaTileEntityIDs.GT_MetaTileEntity_Solidifier_II;
+import static gregtech.api.enums.MetaTileEntityIDs.GT_MetaTileEntity_Solidifier_III;
+import static gregtech.api.enums.MetaTileEntityIDs.GT_MetaTileEntity_Solidifier_IV;
 import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Air_Intake;
 import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Air_Intake_Extreme;
 import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Input_Cryotheum;
@@ -10,17 +17,36 @@ import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Input_TurbineHousing;
 import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_EV;
 import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_HV;
 import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_IV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_LV;
 import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_LuV;
 import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_MAX;
 import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_MV;
 import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_UV;
 import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_ZPM;
 import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Reservoir;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Input_EV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Input_HV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Input_IV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Input_LV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Input_LuV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Input_MV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Input_UHV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Input_UV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Input_ZPM;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Output_EV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Output_HV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Output_IV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Output_LV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Output_LuV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Output_MV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Output_UHV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Output_UV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Output_ZPM;
 
+import gregtech.GTMod;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.METHatchAirIntake;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchAirIntakeExtreme;
@@ -39,7 +65,7 @@ public class GregtechCustomHatches {
     public static void run() {
         Logger.INFO("Gregtech5u Content | Registering Custom Fluid Hatches.");
         run1();
-        if (PollutionUtils.isPollutionEnabled()) {
+        if (GTMod.gregtechproxy.mPollution) {
             run2();
         }
         run3();
@@ -116,8 +142,11 @@ public class GregtechCustomHatches {
 
     private static void run2() {
         GregtechItemList.Hatch_Muffler_Adv_LV.set(
-            (new MTEHatchMufflerAdvanced(30001, "hatch.muffler.adv.tier.01", "Advanced Muffler Hatch (LV)", 1))
-                .getStackForm(1L));
+            (new MTEHatchMufflerAdvanced(
+                Hatch_Muffler_Adv_LV.ID,
+                "hatch.muffler.adv.tier.01",
+                "Advanced Muffler Hatch (LV)",
+                1)).getStackForm(1L));
         GregtechItemList.Hatch_Muffler_Adv_MV.set(
             (new MTEHatchMufflerAdvanced(
                 Hatch_Muffler_Adv_MV.ID,
@@ -169,71 +198,115 @@ public class GregtechCustomHatches {
     }
 
     private static void run3() {
-        /*
-         * Super Input Busses
-         */
-
-        int aStartID = 30022;
-
         GregtechItemList.Hatch_SuperBus_Input_LV.set(
-            ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.01", "Super Bus (I) (LV)", 1))
-                .getStackForm(1L));
+            ((IMetaTileEntity) makeInputBus(
+                Hatch_SuperBus_Input_LV.ID,
+                "hatch.superbus.input.tier.01",
+                "Super Bus (I) (LV)",
+                1)).getStackForm(1L));
         GregtechItemList.Hatch_SuperBus_Input_MV.set(
-            ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.02", "Super Bus (I) (MV)", 2))
-                .getStackForm(1L));
+            ((IMetaTileEntity) makeInputBus(
+                Hatch_SuperBus_Input_MV.ID,
+                "hatch.superbus.input.tier.02",
+                "Super Bus (I) (MV)",
+                2)).getStackForm(1L));
         GregtechItemList.Hatch_SuperBus_Input_HV.set(
-            ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.03", "Super Bus (I) (HV)", 3))
-                .getStackForm(1L));
+            ((IMetaTileEntity) makeInputBus(
+                Hatch_SuperBus_Input_HV.ID,
+                "hatch.superbus.input.tier.03",
+                "Super Bus (I) (HV)",
+                3)).getStackForm(1L));
         GregtechItemList.Hatch_SuperBus_Input_EV.set(
-            ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.04", "Super Bus (I) (EV)", 4))
-                .getStackForm(1L));
+            ((IMetaTileEntity) makeInputBus(
+                Hatch_SuperBus_Input_EV.ID,
+                "hatch.superbus.input.tier.04",
+                "Super Bus (I) (EV)",
+                4)).getStackForm(1L));
         GregtechItemList.Hatch_SuperBus_Input_IV.set(
-            ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.05", "Super Bus (I) (IV)", 5))
-                .getStackForm(1L));
+            ((IMetaTileEntity) makeInputBus(
+                Hatch_SuperBus_Input_IV.ID,
+                "hatch.superbus.input.tier.05",
+                "Super Bus (I) (IV)",
+                5)).getStackForm(1L));
         GregtechItemList.Hatch_SuperBus_Input_LuV.set(
-            ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.06", "Super Bus (I) (LuV)", 6))
-                .getStackForm(1L));
+            ((IMetaTileEntity) makeInputBus(
+                Hatch_SuperBus_Input_LuV.ID,
+                "hatch.superbus.input.tier.06",
+                "Super Bus (I) (LuV)",
+                6)).getStackForm(1L));
         GregtechItemList.Hatch_SuperBus_Input_ZPM.set(
-            ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.07", "Super Bus (I) (ZPM)", 7))
-                .getStackForm(1L));
+            ((IMetaTileEntity) makeInputBus(
+                Hatch_SuperBus_Input_ZPM.ID,
+                "hatch.superbus.input.tier.07",
+                "Super Bus (I) (ZPM)",
+                7)).getStackForm(1L));
         GregtechItemList.Hatch_SuperBus_Input_UV.set(
-            ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.08", "Super Bus (I) (UV)", 8))
-                .getStackForm(1L));
+            ((IMetaTileEntity) makeInputBus(
+                Hatch_SuperBus_Input_UV.ID,
+                "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) (UHV)", 9))
-                .getStackForm(1L));
+            ((IMetaTileEntity) makeInputBus(
+                Hatch_SuperBus_Input_UHV.ID,
+                "hatch.superbus.input.tier.09",
+                "Super Bus (I) (UHV)",
+                9)).getStackForm(1L));
 
-        /*
-         * Super Output Busses
-         */
-        aStartID = 30032;
         GregtechItemList.Hatch_SuperBus_Output_LV.set(
-            ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.01", "Super Bus (O) (LV)", 1))
-                .getStackForm(1L));
+            ((IMetaTileEntity) makeOutputBus(
+                Hatch_SuperBus_Output_LV.ID,
+                "hatch.superbus.output.tier.01",
+                "Super Bus (O) (LV)",
+                1)).getStackForm(1L));
         GregtechItemList.Hatch_SuperBus_Output_MV.set(
-            ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.02", "Super Bus (O) (MV)", 2))
-                .getStackForm(1L));
+            ((IMetaTileEntity) makeOutputBus(
+                Hatch_SuperBus_Output_MV.ID,
+                "hatch.superbus.output.tier.02",
+                "Super Bus (O) (MV)",
+                2)).getStackForm(1L));
         GregtechItemList.Hatch_SuperBus_Output_HV.set(
-            ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.03", "Super Bus (O) (HV)", 3))
-                .getStackForm(1L));
+            ((IMetaTileEntity) makeOutputBus(
+                Hatch_SuperBus_Output_HV.ID,
+                "hatch.superbus.output.tier.03",
+                "Super Bus (O) (HV)",
+                3)).getStackForm(1L));
         GregtechItemList.Hatch_SuperBus_Output_EV.set(
-            ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.04", "Super Bus (O) (EV)", 4))
-                .getStackForm(1L));
+            ((IMetaTileEntity) makeOutputBus(
+                Hatch_SuperBus_Output_EV.ID,
+                "hatch.superbus.output.tier.04",
+                "Super Bus (O) (EV)",
+                4)).getStackForm(1L));
         GregtechItemList.Hatch_SuperBus_Output_IV.set(
-            ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.05", "Super Bus (O) (IV)", 5))
-                .getStackForm(1L));
+            ((IMetaTileEntity) makeOutputBus(
+                Hatch_SuperBus_Output_IV.ID,
+                "hatch.superbus.output.tier.05",
+                "Super Bus (O) (IV)",
+                5)).getStackForm(1L));
         GregtechItemList.Hatch_SuperBus_Output_LuV.set(
-            ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.06", "Super Bus (O) (LuV)", 6))
-                .getStackForm(1L));
+            ((IMetaTileEntity) makeOutputBus(
+                Hatch_SuperBus_Output_LuV.ID,
+                "hatch.superbus.output.tier.06",
+                "Super Bus (O) (LuV)",
+                6)).getStackForm(1L));
         GregtechItemList.Hatch_SuperBus_Output_ZPM.set(
-            ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.07", "Super Bus (O) (ZPM)", 7))
-                .getStackForm(1L));
+            ((IMetaTileEntity) makeOutputBus(
+                Hatch_SuperBus_Output_ZPM.ID,
+                "hatch.superbus.output.tier.07",
+                "Super Bus (O) (ZPM)",
+                7)).getStackForm(1L));
         GregtechItemList.Hatch_SuperBus_Output_UV.set(
-            ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.08", "Super Bus (O) (UV)", 8))
-                .getStackForm(1L));
+            ((IMetaTileEntity) makeOutputBus(
+                Hatch_SuperBus_Output_UV.ID,
+                "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) (UHV)", 9))
-                .getStackForm(1L));
+            ((IMetaTileEntity) makeOutputBus(
+                Hatch_SuperBus_Output_UHV.ID,
+                "hatch.superbus.output.tier.09",
+                "Super Bus (O) (UHV)",
+                9)).getStackForm(1L));
     }
 
     private static MTEHatchSuperBusInput makeInputBus(int id, String unlocalizedName, String localizedName, int tier) {
@@ -249,28 +322,43 @@ public class GregtechCustomHatches {
     }
 
     private static void run4() {
-        int aID = 31778; // 31778 - 31780
-
-        GregtechItemList.GT_MetaTileEntity_ChiselBus_LV
-            .set((makeChiselBus(aID++, "hatch.chisel.tier.01", "Chisel Bus I", 1)).getStackForm(1L));
-        GregtechItemList.GT_MetaTileEntity_ChiselBus_MV
-            .set((makeChiselBus(aID++, "hatch.chisel.tier.02", "Chisel Bus II", 2)).getStackForm(1L));
-        GregtechItemList.GT_MetaTileEntity_ChiselBus_HV
-            .set((makeChiselBus(aID++, "hatch.chisel.tier.03", "Chisel Bus III", 3)).getStackForm(1L));
+        GregtechItemList.GT_MetaTileEntity_ChiselBus_LV.set(
+            (makeChiselBus(GT_MetaTileEntity_ChiselBus_LV.ID, "hatch.chisel.tier.01", "Chisel Bus I", 1))
+                .getStackForm(1L));
+        GregtechItemList.GT_MetaTileEntity_ChiselBus_MV.set(
+            (makeChiselBus(GT_MetaTileEntity_ChiselBus_MV.ID, "hatch.chisel.tier.02", "Chisel Bus II", 2))
+                .getStackForm(1L));
+        GregtechItemList.GT_MetaTileEntity_ChiselBus_HV.set(
+            (makeChiselBus(GT_MetaTileEntity_ChiselBus_HV.ID, "hatch.chisel.tier.03", "Chisel Bus III", 3))
+                .getStackForm(1L));
 
     }
 
     private static void run6() {
-        int aID = 31781; // 31781-31784
-
-        GregtechItemList.GT_MetaTileEntity_Solidifier_I
-            .set(new MTEHatchSolidifier(aID++, "hatch.solidifier.tier.05", "Solidifier Hatch I", 5).getStackForm(1L));
-        GregtechItemList.GT_MetaTileEntity_Solidifier_II
-            .set(new MTEHatchSolidifier(aID++, "hatch.solidifier.tier.06", "Solidifier Hatch II", 6).getStackForm(1L));
-        GregtechItemList.GT_MetaTileEntity_Solidifier_III
-            .set(new MTEHatchSolidifier(aID++, "hatch.solidifier.tier.07", "Solidifier Hatch III", 7).getStackForm(1L));
-        GregtechItemList.GT_MetaTileEntity_Solidifier_IV
-            .set(new MTEHatchSolidifier(aID, "hatch.solidifier.tier.08", "Solidifier Hatch IV", 8).getStackForm(1L));
+        GregtechItemList.GT_MetaTileEntity_Solidifier_I.set(
+            new MTEHatchSolidifier(
+                GT_MetaTileEntity_Solidifier_I.ID,
+                "hatch.solidifier.tier.05",
+                "Solidifier Hatch I",
+                5).getStackForm(1L));
+        GregtechItemList.GT_MetaTileEntity_Solidifier_II.set(
+            new MTEHatchSolidifier(
+                GT_MetaTileEntity_Solidifier_II.ID,
+                "hatch.solidifier.tier.06",
+                "Solidifier Hatch II",
+                6).getStackForm(1L));
+        GregtechItemList.GT_MetaTileEntity_Solidifier_III.set(
+            new MTEHatchSolidifier(
+                GT_MetaTileEntity_Solidifier_III.ID,
+                "hatch.solidifier.tier.07",
+                "Solidifier Hatch III",
+                7).getStackForm(1L));
+        GregtechItemList.GT_MetaTileEntity_Solidifier_IV.set(
+            new MTEHatchSolidifier(
+                GT_MetaTileEntity_Solidifier_IV.ID,
+                "hatch.solidifier.tier.08",
+                "Solidifier Hatch IV",
+                8).getStackForm(1L));
     }
 
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
index 85d87cb706..11ead9b3fd 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
@@ -35,9 +35,7 @@ public class GregtechDehydrator {
 
     public static void run() {
         Logger.INFO("Gregtech5u Content | Registering Chemical Dehydrators.");
-        if (GTPPCore.ConfigSwitches.enableMachine_Dehydrators) {
-            run1();
-        }
+        run1();
     }
 
     private static void run1() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
index 528efc5712..6dd9c7170c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
@@ -179,14 +179,5 @@ public class GregtechEnergyBuffer {
                 | GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "WTW", "WMW", 'M', ItemList.Hull_MAX, 'W',
                 OrePrefixes.wireGt08.get(Materials.SuperconductorUHV), 'T', GregtechOreDictNames.buffer_core });
-        /*
-         * GTModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]),
-         * GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE |
-         * GTModHandler.RecipeBits.REVERSIBLE | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW",
-         * Character.valueOf('M'), ItemList.Hull_MAX, Character.valueOf('W'),
-         * OrePrefixes.wireGt08.get(Materials.Superconductor), Character.valueOf('T'), GregtechOreDictNames.buffer_core
-         * });
-         */
-
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java
index 0be94d63c9..963551a2a3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java
@@ -11,7 +11,6 @@ import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GTModHandler;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.material.MaterialsAlloy;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
@@ -21,9 +20,7 @@ public class GregtechGeothermalThermalGenerator {
 
     public static void run() {
         Logger.INFO("Gregtech5u Content | Registering Industrial Geothermal Engines.");
-        if (GTPPCore.ConfigSwitches.enableMachine_GeothermalEngines) {
-            run1();
-        }
+        run1();
     }
 
     private static void run1() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java
index 956193bef2..6756c09898 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java
@@ -4,7 +4,6 @@ import static gregtech.api.enums.MetaTileEntityIDs.Industrial_AlloyBlastSmelter;
 import static gregtech.api.enums.MetaTileEntityIDs.Mega_AlloyBlastSmelter;
 
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTEAlloyBlastSmelter;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.mega.MTEMegaAlloyBlastSmelter;
@@ -13,9 +12,7 @@ public class GregtechIndustrialBlastSmelter {
 
     public static void run() {
         Logger.INFO("Gregtech5u Content | Registering Industrial Alloy Blast Smelter Multiblock.");
-        if (GTPPCore.ConfigSwitches.enableMultiblock_AlloyBlastSmelter) {
-            run1();
-        }
+        run1();
     }
 
     private static void run1() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java
index 4a0da61dbd..dc800db078 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java
+++ b/