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>

2 files changed, 34 insertions, 2 deletions

diff --git a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java
index 721cb36457..f815f60cad 100644
--- a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java
+++ b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java
@@ -1822,6 +1822,24 @@ public enum MetaTileEntityIDs {
     Hatch_Muffler_Adv_UV(30008),
     Hatch_Muffler_Adv_MAX(30009),
     Hatch_Turbine_Rotor(30010),
+    Hatch_SuperBus_Input_LV(30022),
+    Hatch_SuperBus_Input_MV(30023),
+    Hatch_SuperBus_Input_HV(30024),
+    Hatch_SuperBus_Input_EV(30025),
+    Hatch_SuperBus_Input_IV(30026),
+    Hatch_SuperBus_Input_LuV(30027),
+    Hatch_SuperBus_Input_ZPM(30028),
+    Hatch_SuperBus_Input_UV(30029),
+    Hatch_SuperBus_Input_UHV(30030),
+    Hatch_SuperBus_Output_LV(30032),
+    Hatch_SuperBus_Output_MV(30033),
+    Hatch_SuperBus_Output_HV(30034),
+    Hatch_SuperBus_Output_EV(30035),
+    Hatch_SuperBus_Output_IV(30036),
+    Hatch_SuperBus_Output_LuV(30037),
+    Hatch_SuperBus_Output_ZPM(30038),
+    Hatch_SuperBus_Output_UV(30039),
+    Hatch_SuperBus_Output_UHV(30040),
     PipeIncoloy903(30995),
     Infinite_Item_Chest(31010),
     SimpleDustWasher_MV(31017),
@@ -1884,10 +1902,23 @@ public enum MetaTileEntityIDs {
     GT4_Crop_Harvester_UV(31118),
     Mega_AlloyBlastSmelter(31150),
     QuantumForceTransformer(31151),
+    GT_MetaTileEntity_ChiselBus_LV(31778),
+    GT_MetaTileEntity_ChiselBus_MV(31779),
+    GT_MetaTileEntity_ChiselBus_HV(31780),
+    GT_MetaTileEntity_Solidifier_I(31781),
+    GT_MetaTileEntity_Solidifier_II(31782),
+    GT_MetaTileEntity_Solidifier_III(31783),
+    GT_MetaTileEntity_Solidifier_IV(31784),
     SimpleDustWasher_LV(31790),
     SimpleDustWasher_HV(31791),
     SimpleDustWasher_IV(31792),
     SimpleDustWasher_ZPM(31793),
+    RedstoneButtonPanel(31800),
+    RedstoneCircuitBlock(31801),
+    RedstoneLamp(31803),
+    RedstoneStrengthDisplay(31804),
+    RedstoneStrengthScale(31805),
+    WaterPump(31085),
     UniversalChemicalFuelEngine(32001),
     LargeEssentiaGenerator(32002),
     NeutronAcceleratorULV(32003),
diff --git a/src/main/java/gregtech/asm/GTCorePlugin.java b/src/main/java/gregtech/asm/GTCorePlugin.java
index 38d7548836..30bc193701 100644
--- a/src/main/java/gregtech/asm/GTCorePlugin.java
+++ b/src/main/java/gregtech/asm/GTCorePlugin.java
@@ -13,8 +13,8 @@ import bartworks.common.configs.Configuration;
 import cpw.mods.fml.relauncher.FMLInjectionData;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
 import gregtech.mixin.Mixin;
+import gtPlusPlus.core.config.ASMConfiguration;
 import gtPlusPlus.preloader.PreloaderCore;
-import gtPlusPlus.preloader.asm.AsmConfig;
 import gtPlusPlus.preloader.asm.PreloaderDummyContainer;
 import gtPlusPlus.preloader.asm.transformers.Preloader_Transformer_Handler;
 
@@ -27,6 +27,7 @@ public class GTCorePlugin implements IFMLLoadingPlugin, IEarlyMixinLoader {
     static {
         try {
             ConfigurationManager.registerConfig(Configuration.class);
+            ConfigurationManager.registerConfig(ASMConfiguration.class);
         } catch (ConfigException e) {
             throw new RuntimeException(e);
         }
@@ -64,7 +65,7 @@ public class GTCorePlugin implements IFMLLoadingPlugin, IEarlyMixinLoader {
         if (mcDir != null && mcDir.exists()) {
             PreloaderCore.setMinecraftDirectory(mcDir);
         }
-        PreloaderCore.DEBUG_MODE = AsmConfig.debugMode;
+        PreloaderCore.DEBUG_MODE = ASMConfiguration.debug.debugMode;
     }
 
     @Override