2 files changed, 18 insertions, 68 deletions

diff --git a/src/main/java/gregtech/client/GT_GUI_ClientConfig.java b/src/main/java/gregtech/client/GT_GUI_ClientConfig.java
index 1e9841369b..dfb4b2800c 100644
--- a/src/main/java/gregtech/client/GT_GUI_ClientConfig.java
+++ b/src/main/java/gregtech/client/GT_GUI_ClientConfig.java
@@ -2,62 +2,28 @@ package gregtech.client;
 
 import static gregtech.api.enums.Mods.GregTech;
 
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 import net.minecraft.client.gui.GuiScreen;
-import net.minecraftforge.common.config.ConfigCategory;
-import net.minecraftforge.common.config.ConfigElement;
-import net.minecraftforge.common.config.Configuration;
-import net.minecraftforge.common.config.Property;
 
-import cpw.mods.fml.client.config.GuiConfig;
-import cpw.mods.fml.client.config.IConfigElement;
-import gregtech.api.GregTech_API;
+import com.gtnewhorizon.gtnhlib.config.ConfigException;
+import com.gtnewhorizon.gtnhlib.config.SimpleGuiConfig;
+
+import gregtech.common.config.client.ConfigColorModulation;
+import gregtech.common.config.client.ConfigInterface;
+import gregtech.common.config.client.ConfigPreference;
+import gregtech.common.config.client.ConfigRender;
+import gregtech.common.config.client.ConfigWaila;
 
-public class GT_GUI_ClientConfig extends GuiConfig {
+public class GT_GUI_ClientConfig extends SimpleGuiConfig {
 
-    public GT_GUI_ClientConfig(GuiScreen parentScreen) {
+    public GT_GUI_ClientConfig(GuiScreen parentScreen) throws ConfigException {
         super(
             parentScreen,
-            getConfigElements(),
             GregTech.ID,
-            "client",
-            false,
-            false,
-            getAbridgedConfigPath(GregTech_API.sClientDataFile.mConfig.toString()));
-    }
-
-    @SuppressWarnings("rawtypes")
-    private static List<IConfigElement> getConfigElements() {
-        final Configuration config = GregTech_API.sClientDataFile.mConfig;
-        setLanguageKeys(config);
-        return config.getCategoryNames()
-            .stream()
-            .filter(name -> name.indexOf('.') == -1)
-            .map(name -> new ConfigElement(config.getCategory(name)))
-            .collect(Collectors.toList());
-    }
-
-    private static void setLanguageKeys(Configuration config) {
-        for (String categoryName : config.getCategoryNames()) {
-            ConfigCategory category = config.getCategory(categoryName);
-            category.setLanguageKey("GT5U.config." + categoryName);
-            for (Map.Entry<String, Property> entry : category.entrySet()) {
-                // drop the default value in name
-                String name = entry.getKey();
-                int defaultStart = name.lastIndexOf('_');
-                String realName = defaultStart >= 0 ? name.substring(0, defaultStart) : name;
-                if (categoryName.equals("nei.recipe_categories")) {
-                    // reuse existing translation for RecipeCategory
-                    entry.getValue()
-                        .setLanguageKey(name);
-                } else {
-                    entry.getValue()
-                        .setLanguageKey(String.format("%s.%s", category.getLanguagekey(), realName));
-                }
-            }
-        }
+            "GregTech",
+            ConfigColorModulation.class,
+            ConfigInterface.class,
+            ConfigPreference.class,
+            ConfigRender.class,
+            ConfigWaila.class);
     }
 }
diff --git a/src/main/java/gregtech/client/GT_GuiFactory.java b/src/main/java/gregtech/client/GT_GuiFactory.java
index 3c8e5cd52c..ecf317a6fa 100644
--- a/src/main/java/gregtech/client/GT_GuiFactory.java
+++ b/src/main/java/gregtech/client/GT_GuiFactory.java
@@ -1,29 +1,13 @@
 package gregtech.client;
 
-import java.util.Set;
-
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 
-import cpw.mods.fml.client.IModGuiFactory;
-
-public class GT_GuiFactory implements IModGuiFactory {
+import com.gtnewhorizon.gtnhlib.config.SimpleGuiFactory;
 
-    @Override
-    public void initialize(Minecraft minecraftInstance) {}
+public class GT_GuiFactory implements SimpleGuiFactory {
 
     @Override
     public Class<? extends GuiScreen> mainConfigGuiClass() {
         return GT_GUI_ClientConfig.class;
     }
-
-    @Override
-    public Set<RuntimeOptionCategoryElement> runtimeGuiCategories() {
-        return null;
-    }
-
-    @Override
-    public RuntimeOptionGuiHandler getHandlerFor(RuntimeOptionCategoryElement element) {
-        return null;
-    }
 }