merge client configs

src/main/java/gregtech/GTMod.java

@@ -15,6 +15,7 @@
 import java.util.Map;
 import java.util.function.Predicate;
 
+import gregtech.common.config.client.Client;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -81,11 +82,6 @@
 import gregtech.common.GTNetwork;
 import gregtech.common.GTProxy;
 import gregtech.common.RecipeAdder;
-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;
 import gregtech.common.config.gregtech.ConfigDebug;
 import gregtech.common.config.gregtech.ConfigFeatures;
 import gregtech.common.config.gregtech.ConfigGeneral;
@@ -190,11 +186,7 @@ public class GTMod implements IGTMod {
     static {
         try {
             // Client
-            ConfigurationManager.registerConfig(ConfigColorModulation.class);
-            ConfigurationManager.registerConfig(ConfigInterface.class);
-            ConfigurationManager.registerConfig(ConfigPreference.class);
-            ConfigurationManager.registerConfig(ConfigRender.class);
-            ConfigurationManager.registerConfig(ConfigWaila.class);
+            ConfigurationManager.registerConfig(Client.class);
 
             // GregTech.cfg
             ConfigurationManager.registerConfig(ConfigDebug.class);

src/main/java/gregtech/api/util/GTClientPreference.java

@@ -1,7 +1,6 @@
 package gregtech.api.util;
 
-import gregtech.common.config.client.ConfigPreference;
-import gregtech.common.config.client.ConfigWaila;
+import gregtech.common.config.client.Client;
 
 public class GTClientPreference {
 
@@ -19,10 +18,10 @@ public GTClientPreference(boolean mSingleBlockInitialFilter, boolean mSingleBloc
     }
 
     public GTClientPreference() {
-        this.mSingleBlockInitialFilter = ConfigPreference.singleBlockInitialFilter;
-        this.mSingleBlockInitialMultiStack = ConfigPreference.singleBlockInitialAllowMultiStack;
-        this.mInputBusInitialFilter = ConfigPreference.inputBusInitialFilter;
-        this.wailaAverageNS = ConfigWaila.wailaAverageNS;
+        this.mSingleBlockInitialFilter = Client.preference.singleBlockInitialFilter;
+        this.mSingleBlockInitialMultiStack = Client.preference.singleBlockInitialAllowMultiStack;
+        this.mInputBusInitialFilter = Client.preference.inputBusInitialFilter;
+        this.wailaAverageNS = Client.waila.wailaAverageNS;
     }
 
     public boolean isSingleBlockInitialFilterEnabled() {

src/main/java/gregtech/client/GTGUIClientConfig.java

@@ -2,28 +2,20 @@
 
 import static gregtech.api.enums.Mods.GregTech;
 
+import gregtech.common.config.client.Client;
 import net.minecraft.client.gui.GuiScreen;
 
 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 GTGUIClientConfig extends SimpleGuiConfig {
 
     public GTGUIClientConfig(GuiScreen parentScreen) throws ConfigException {
         super(
             parentScreen,
             GregTech.ID,
             "GregTech",
-            ConfigColorModulation.class,
-            ConfigInterface.class,
-            ConfigPreference.class,
-            ConfigRender.class,
-            ConfigWaila.class);
+            true,
+            Client.class);
     }
 }

src/main/java/gregtech/common/config/client/Client.java

@@ -0,0 +1,138 @@
+package gregtech.common.config.client;
+
+import com.gtnewhorizon.gtnhlib.config.Config;
+import gregtech.api.enums.Mods;
+
+@Config(
+    modid = Mods.Names.GREG_TECH,
+    category = "Client",
+    configSubDirectory = "GregTech",
+    filename = "Client")
+public class Client {
+
+    @Config.Comment("Color Modulation section")
+    @Config.LangKey("GT5U.gui.config.color_modulation")
+    public static final ColorModulation colorModulation = new ColorModulation();
+
+    @Config.Comment("Interface section")
+    @Config.LangKey("GT5U.gui.config.interface")
+    public static final Interface iface = new Interface();
+
+    @Config.Comment("Preference section")
+    @Config.LangKey("GT5U.gui.config.preference")
+    public static final Preference preference = new Preference();
+
+    @Config.Comment("Render section")
+    @Config.LangKey("GT5U.gui.config.render")
+    public static final Render render = new Render();
+
+    @Config.Comment("Waila section")
+    @Config.LangKey("GT5U.gui.config.waila")
+    public static final Waila waila = new Waila();
+
+    public static class ColorModulation {
+
+        @Config.Comment("hex value for the cable insulation color modulation.")
+        @Config.DefaultString("#404040")
+        public String cableInsulation;
+
+        @Config.Comment("hex value for the construction foam color modulation.")
+        @Config.DefaultString("#404040")
+        public String constructionFoam;
+
+        @Config.Comment("hex value for the machine metal color modulation.")
+        @Config.DefaultString("#D2DCFF")
+        public String machineMetal;
+    }
+
+    public static class Interface {
+
+        @Config.Comment("if true, makes cover tabs visible on GregTech machines.")
+        @Config.DefaultBoolean(true)
+        public boolean coverTabsVisible;
+
+        @Config.Comment("if true, puts the cover tabs display on the right of the UI instead of the left.")
+        @Config.DefaultBoolean(false)
+        public boolean coverTabsFlipped;
+
+        @Config.Comment("How verbose should tooltips be? 0: disabled, 1: one-line, 2: normal, 3+: extended.")
+        @Config.DefaultInt(2)
+        public int tooltipVerbosity;
+
+        @Config.Comment("How verbose should tooltips be when LSHIFT is held? 0: disabled, 1: one-line, 2: normal, 3+: extended.")
+        @Config.DefaultInt(3)
+        public int tooltipShiftVerbosity;
+
+        @Config.Comment("Which style to use for title tab on machine GUI? 0: text tab split-dark, 1: text tab unified, 2: item icon tab.")
+        @Config.DefaultInt(0)
+        public int titleTabStyle;
+    }
+    public static class Preference {
+
+        @Config.Comment("if true, input filter will initially be on when input buses are placed in the world.")
+        @Config.DefaultBoolean(false)
+        public boolean inputBusInitialFilter;
+
+        @Config.Comment("if true, allow multistacks on single blocks by default when they are first placed in the world.")
+        @Config.DefaultBoolean(false)
+        public boolean singleBlockInitialAllowMultiStack;
+
+        @Config.Comment("if true, input filter will initially be on when machines are placed in the world.")
+        @Config.DefaultBoolean(false)
+        public boolean singleBlockInitialFilter;
+    }
+
+    public static class Render {
+
+        @Config.Comment("if true, enables ambient-occlusion smooth lighting on tiles.")
+        @Config.DefaultBoolean(true)
+        public boolean renderTileAmbientOcclusion;
+
+        @Config.Comment("if true, enables glowing of the machine controllers.")
+        @Config.DefaultBoolean(true)
+        public boolean renderGlowTextures;
+
+        @Config.Comment("if true, render flipped machine with flipped textures.")
+        @Config.DefaultBoolean(true)
+        public boolean renderFlippedMachinesFlipped;
+
+        @Config.Comment("if true, render indicators on hatches.")
+        @Config.DefaultBoolean(true)
+        public boolean renderIndicatorsOnHatch;
+
+        @Config.Comment("if true, enables dirt particles when pollution reaches the threshold.")
+        @Config.DefaultBoolean(true)
+        public boolean renderDirtParticles;
+
+        @Config.Comment("if true, enables pollution fog when pollution reaches the threshold.")
+        @Config.DefaultBoolean(true)
+        public boolean renderPollutionFog;
+
+        @Config.Comment("if true, enables the green -> red durability for an item's damage value.")
+        @Config.DefaultBoolean(true)
+        public boolean renderItemDurabilityBar;
+
+        @Config.Comment("if true, enables the blue charge bar for an electric item's charge.")
+        @Config.DefaultBoolean(true)
+        public boolean renderItemChargeBar;
+
+        @Config.Comment("enables BaseMetaTileEntity block updates handled by BlockUpdateHandler.")
+        @Config.DefaultBoolean(false)
+        public boolean useBlockUpdateHandler;
+
+    }
+
+    public static class Waila {
+
+        /**
+         * This enables showing voltage tier of transformer for Waila, instead of raw voltage number
+         */
+        @Config.Comment("if true, enables showing voltage tier of transformer for Waila, instead of raw voltage number.")
+        @Config.DefaultBoolean(true)
+        public boolean wailaTransformerVoltageTier;
+
+        @Config.Comment("if true, enables showing voltage tier of transformer for Waila, instead of raw voltage number.")
+        @Config.DefaultBoolean(false)
+        public boolean wailaAverageNS;
+    }
+}