update config lib

- fix a few other issues

Author: moehreag

build.gradle

@@ -65,7 +65,7 @@ dependencies {
 	implementation('org.apache.logging.log4j:log4j-core:2.19.0')
 
 	modImplementation include("com.github.moehreag:search-in-resources:1.0.2")
-	modImplementation include('io.github.axolotlclient:AxolotlClient-config:1.0.9+1.8.9')
+	modImplementation include('io.github.axolotlclient:AxolotlClient-config:1.0.11+1.8.9')
 }
 
 // More hacks that make mac os work

src/main/java/io/github/axolotlclient/AxolotlClient.java

@@ -2,8 +2,10 @@
 
 import com.mojang.blaze3d.platform.GlStateManager;
 import io.github.axolotlclient.AxolotlclientConfig.AxolotlClientConfigManager;
-import io.github.axolotlclient.config.ConfigManager;
+import io.github.axolotlclient.AxolotlclientConfig.ConfigManager;
+import io.github.axolotlclient.AxolotlclientConfig.DefaultConfigManager;
 import io.github.axolotlclient.AxolotlclientConfig.options.BooleanOption;
+import io.github.axolotlclient.AxolotlclientConfig.options.Identifiable;
 import io.github.axolotlclient.AxolotlclientConfig.options.OptionCategory;
 import io.github.axolotlclient.config.AxolotlClientConfig;
 import io.github.axolotlclient.modules.AbstractModule;
@@ -67,7 +69,15 @@ public void onInitializeClient() {
         CONFIG.config.addAll(CONFIG.getCategories());
         CONFIG.config.add(config);
 
-        AxolotlClientConfigManager.registerConfig(modid, CONFIG, configManager = new ConfigManager());
+        AxolotlClientConfigManager.registerConfig(modid, CONFIG, configManager = new DefaultConfigManager(modid, FabricLoader.getInstance().getConfigDir().resolve("AxolotlClient.json"), CONFIG.config){
+            @Override
+            public String getName(Identifiable t) {
+                if(super.getName(t).startsWith("axolotlclient.")){
+                    return super.getName(t).substring(14);
+                }
+                return super.getName(t);
+            }
+        });
 
         modules.forEach(AbstractModule::lateInit);
 

src/main/java/io/github/axolotlclient/config/ConfigManager.java

@@ -20,6 +20,7 @@ public void freePlayerData(CallbackInfo ci){
         if(HypixelMods.getInstance().cacheMode.get()!=null && Objects.equals(HypixelMods.getInstance().cacheMode.get(), HypixelMods.HypixelApiCacheMode.ON_CLIENT_DISCONNECT.toString())) {
             HypixelAbstractionLayer.clearPlayerData();
         }
+        FeatureDisabler.clear();
     }
 
     @Inject(method = "connect(Lnet/minecraft/client/network/ServerInfo;)V", at = @At("HEAD"))

src/main/java/io/github/axolotlclient/mixin/MultiplayerScreenMixin.java

@@ -2,10 +2,7 @@
 
 import com.mojang.blaze3d.platform.GlStateManager;
 import io.github.axolotlclient.AxolotlclientConfig.Color;
-import io.github.axolotlclient.AxolotlclientConfig.options.BooleanOption;
-import io.github.axolotlclient.AxolotlclientConfig.options.DoubleOption;
-import io.github.axolotlclient.AxolotlclientConfig.options.OptionBase;
-import io.github.axolotlclient.AxolotlclientConfig.options.OptionCategory;
+import io.github.axolotlclient.AxolotlclientConfig.options.*;
 import io.github.axolotlclient.modules.hud.gui.component.HudEntry;
 import io.github.axolotlclient.modules.hud.util.DefaultOptions;
 import io.github.axolotlclient.modules.hud.util.DrawPosition;
@@ -196,8 +193,8 @@ public void setBounds(float scale) {
      * @return List of options
      */
     @Override
-    public List<OptionBase<?>> getConfigurationOptions() {
-        List<OptionBase<?>> options = new ArrayList<>();
+    public List<Option<?>> getConfigurationOptions() {
+        List<Option<?>> options = new ArrayList<>();
         options.add(enabled);
         options.add(scale);
         return options;
@@ -209,8 +206,8 @@ public List<OptionBase<?>> getConfigurationOptions() {
      * @return
      */
     @Override
-    public List<OptionBase<?>> getSaveOptions() {
-        List<OptionBase<?>> options = getConfigurationOptions();
+    public List<Option<?>> getSaveOptions() {
+        List<Option<?>> options = getConfigurationOptions();
         options.add(x);
         options.add(y);
         return options;
@@ -222,7 +219,7 @@ public OptionCategory getOptionsAsCategory(){
         return cat;
     }
     public OptionCategory getAllOptions() {
-        List<OptionBase<?>> options = getSaveOptions();
+        List<Option<?>> options = getSaveOptions();
         OptionCategory cat = new OptionCategory(getNameKey());
         cat.add(options);
         return cat;

src/main/java/io/github/axolotlclient/modules/hud/gui/AbstractHudEntry.java

@@ -1,6 +1,6 @@
 package io.github.axolotlclient.modules.hud.gui.component;
 
-import io.github.axolotlclient.AxolotlclientConfig.options.OptionBase;
+import io.github.axolotlclient.AxolotlclientConfig.options.Option;
 import io.github.axolotlclient.AxolotlclientConfig.options.OptionCategory;
 
 import java.util.List;
@@ -18,14 +18,14 @@ public interface Configurable {
      *
      * @return List of configurable options
      */
-    List<OptionBase<?>> getConfigurationOptions();
+    List<Option<?>> getConfigurationOptions();
 
     /**
      * Returns a list of options that should be saved. By default, this includes {@link #getConfigurationOptions()}
      *
      * @return Options to save within a config
      */
-    default List<OptionBase<?>> getSaveOptions() {
+    default List<Option<?>> getSaveOptions() {
         return getConfigurationOptions();
     }
 

src/main/java/io/github/axolotlclient/modules/hud/gui/component/Configurable.java

@@ -4,6 +4,7 @@
 import io.github.axolotlclient.AxolotlclientConfig.Color;
 import io.github.axolotlclient.AxolotlclientConfig.options.BooleanOption;
 import io.github.axolotlclient.AxolotlclientConfig.options.ColorOption;
+import io.github.axolotlclient.AxolotlclientConfig.options.Option;
 import io.github.axolotlclient.AxolotlclientConfig.options.OptionBase;
 import io.github.axolotlclient.modules.hud.gui.AbstractHudEntry;
 
@@ -37,8 +38,8 @@ public BoxHudEntry(int width, int height, boolean backgroundAllowed) {
     }
 
     @Override
-    public List<OptionBase<?>> getConfigurationOptions() {
-        List<OptionBase<?>> options = super.getConfigurationOptions();
+    public List<Option<?>> getConfigurationOptions() {
+        List<Option<?>> options = super.getConfigurationOptions();
         if (backgroundAllowed) {
             options.add(background);
             options.add(backgroundColor);

src/main/java/io/github/axolotlclient/modules/hud/gui/entry/BoxHudEntry.java

@@ -4,6 +4,7 @@
 import io.github.axolotlclient.AxolotlclientConfig.Color;
 import io.github.axolotlclient.AxolotlclientConfig.options.EnumOption;
 import io.github.axolotlclient.AxolotlclientConfig.options.IntegerOption;
+import io.github.axolotlclient.AxolotlclientConfig.options.Option;
 import io.github.axolotlclient.AxolotlclientConfig.options.OptionBase;
 import io.github.axolotlclient.modules.hud.gui.component.DynamicallyPositionable;
 import io.github.axolotlclient.modules.hud.gui.layout.AnchorPoint;
@@ -88,8 +89,8 @@ public void renderPlaceholderComponent(float delta) {
     }
 
     @Override
-    public List<OptionBase<?>> getConfigurationOptions() {
-        List<OptionBase<?>> options = super.getConfigurationOptions();
+    public List<Option<?>> getConfigurationOptions() {
+        List<Option<?>> options = super.getConfigurationOptions();
         options.add(justification);
         options.add(anchor);
         options.add(minWidth);

src/main/java/io/github/axolotlclient/modules/hud/gui/entry/SimpleTextHudEntry.java

@@ -3,6 +3,7 @@
 import io.github.axolotlclient.AxolotlclientConfig.Color;
 import io.github.axolotlclient.AxolotlclientConfig.options.BooleanOption;
 import io.github.axolotlclient.AxolotlclientConfig.options.ColorOption;
+import io.github.axolotlclient.AxolotlclientConfig.options.Option;
 import io.github.axolotlclient.AxolotlclientConfig.options.OptionBase;
 
 import java.util.List;
@@ -27,8 +28,8 @@ public TextHudEntry(int width, int height, boolean backgroundAllowed) {
     }
 
     @Override
-    public List<OptionBase<?>> getConfigurationOptions() {
-        List<OptionBase<?>> options = super.getConfigurationOptions();
+    public List<Option<?>> getConfigurationOptions() {
+        List<Option<?>> options = super.getConfigurationOptions();
         options.add(textColor);
         options.add(shadow);
         return options;

src/main/java/io/github/axolotlclient/modules/hud/gui/entry/TextHudEntry.java

@@ -1,13 +1,8 @@
 package io.github.axolotlclient.modules.hud.gui.hud;
 
 import com.mojang.blaze3d.platform.GlStateManager;
-import io.github.axolotlclient.AxolotlclientConfig.options.BooleanOption;
-import io.github.axolotlclient.AxolotlclientConfig.options.ColorOption;
-import io.github.axolotlclient.AxolotlclientConfig.options.IntegerOption;
-import io.github.axolotlclient.AxolotlclientConfig.options.OptionBase;
+import io.github.axolotlclient.AxolotlclientConfig.options.*;
 import io.github.axolotlclient.mixin.ChatHudAccessor;
-import io.github.axolotlclient.modules.hud.gui.AbstractHudEntry;
-import io.github.axolotlclient.modules.hud.gui.entry.BoxHudEntry;
 import io.github.axolotlclient.modules.hud.gui.entry.TextHudEntry;
 import io.github.axolotlclient.modules.hud.util.DrawPosition;
 import io.github.axolotlclient.modules.hud.util.DrawUtil;
@@ -192,8 +187,8 @@ public boolean movable() {
     }
 
     @Override
-    public List<OptionBase<?>> getConfigurationOptions() {
-        List<OptionBase<?>> options = super.getConfigurationOptions();
+    public List<Option<?>> getConfigurationOptions() {
+        List<Option<?>> options = super.getConfigurationOptions();
         options.add(shadow);
         options.add(background);
         options.add(bgColor);