Remove mod options loading logic from auto gen

ItsNature · ItsNature · commit 8f7b48f11b33 · 2025-10-21T00:43:40.000+02:00
diff --git a/api/src/main/java/com/lunarclient/apollo/mods/Mods.java b/api/src/main/java/com/lunarclient/apollo/mods/Mods.java
@@ -110,12 +110,8 @@
 import com.lunarclient.apollo.mods.impl.ModWeatherChanger;
 import com.lunarclient.apollo.mods.impl.ModWorldeditCui;
 import com.lunarclient.apollo.mods.impl.ModZoom;
-import com.lunarclient.apollo.option.Option;
-import java.lang.reflect.Field;
 import java.util.Arrays;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Mod container.
@@ -124,8 +120,6 @@
  */
 public final class Mods {
 
-    private static final Map<String, Option<?, ?, ?>> OPTIONS = Mods.collectModOptions();
-
     /**
      * List of all current mod classes.
      *
@@ -221,36 +215,6 @@ public final class Mods {
         ModRadio.class
     );
 
-    /**
-     * Returns a new map containing all mod options.
-     *
-     * @return a linked hash map of mod option keys to options
-     * @since 1.2.1
-     */
-    public static Map<String, Option<?, ?, ?>> getOptions() {
-        return new LinkedHashMap<>(OPTIONS);
-    }
-
-    private static Map<String, Option<?, ?, ?>> collectModOptions() {
-        Map<String, Option<?, ?, ?>> options = new LinkedHashMap<>();
-
-        for (Class<?> mod : Mods.ALL_MODS) {
-            Field[] fields = mod.getDeclaredFields();
-
-            for (Field field : fields) {
-                try {
-                    field.setAccessible(true);
-                    Option<?, ?, ?> option = (Option<?, ?, ?>) field.get(Option.class);
-                    options.put(option.getKey(), option);
-                } catch (IllegalAccessException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        return options;
-    }
-
     private Mods() {
     }
 
diff --git a/api/src/main/java/com/lunarclient/apollo/module/modsetting/ModSettingModule.java b/api/src/main/java/com/lunarclient/apollo/module/modsetting/ModSettingModule.java
@@ -24,24 +24,21 @@
 package com.lunarclient.apollo.module.modsetting;
 
 import com.lunarclient.apollo.ApolloPlatform;
-import com.lunarclient.apollo.mods.Mods;
 import com.lunarclient.apollo.module.ApolloModule;
 import com.lunarclient.apollo.module.ModuleDefinition;
 import com.lunarclient.apollo.util.ConfigTarget;
 import java.util.Arrays;
 import java.util.Collection;
+import org.jetbrains.annotations.ApiStatus;
 
 /**
  * Represents the mod settings module.
  *
  * @since 1.0.0
  */
+@ApiStatus.NonExtendable
 @ModuleDefinition(id = "mod_setting", name = "Mod Setting", configTarget = ConfigTarget.MOD_SETTINGS)
-public final class ModSettingModule extends ApolloModule {
-
-    ModSettingModule() {
-        this.registerOptions(Mods.getOptions().values());
-    }
+public abstract class ModSettingModule extends ApolloModule {
 
     @Override
     public Collection<ApolloPlatform.Kind> getSupportedPlatforms() {
diff --git a/api/src/main/java/com/lunarclient/apollo/option/Option.java b/api/src/main/java/com/lunarclient/apollo/option/Option.java
@@ -43,7 +43,7 @@
 @Getter
 @EqualsAndHashCode
 @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-public abstract class Option<V, M extends OptionBuilder<V, M, I>, I extends Option<V, M, I>> {
+public abstract class Option<V, M extends OptionBuilder<V, M, I>, I extends Option<V, M, I>> implements Cloneable {
 
     /**
      * Returns a new {@link SimpleOption.SimpleOptionBuilder}.
@@ -149,4 +149,14 @@ public String getKey() {
         return String.join(".", this.getPath());
     }
 
+    @Override
+    @SuppressWarnings("unchecked")
+    public Option<V, M, I> clone() {
+        try {
+            return (Option<V, M, I>) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new AssertionError(e);
+        }
+    }
+
 }
diff --git a/common/src/main/java/com/lunarclient/apollo/mods/ApolloModsManager.java b/common/src/main/java/com/lunarclient/apollo/mods/ApolloModsManager.java
@@ -29,19 +29,25 @@
 import com.lunarclient.apollo.event.Listen;
 import com.lunarclient.apollo.option.Option;
 import com.lunarclient.apollo.option.Options;
-import com.lunarclient.apollo.option.OptionsImpl;
 import com.lunarclient.apollo.option.StatusOptionsImpl;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 
 /**
  * Manages Apollo mods for players.
  *
  * @since 1.2.1
  */
+@Getter
 public final class ApolloModsManager implements ApolloListener {
 
-    @Getter private final Options playerOptions;
+    private final Container container;
+    private final Options playerOptions;
 
     /**
      * Constructs the {@link ApolloModsManager}.
@@ -51,16 +57,78 @@ public final class ApolloModsManager implements ApolloListener {
     public ApolloModsManager() {
         EventBus.getBus().register(this);
 
+        this.container = ApolloModsManager.loadModOptions();
         this.playerOptions = new StatusOptionsImpl();
 
-        for (Option<?, ?, ?> option : Mods.getOptions().values()) {
+        for (Option<?, ?, ?> option : this.container.getModStatusOptions().values()) {
             this.playerOptions.set(option, option.getDefaultValue());
         }
+    }
+
+    /**
+     * Load all options from auto-generated mod classes into a {@link Container} object.
+     *
+     * @return the container
+     * @since 1.2.1
+     */
+    public static Container loadModOptions() {
+        Map<String, Option<?, ?, ?>> modStatusOptions = new LinkedHashMap<>();
+        List<Option<?, ?, ?>> modSettingsOptions = new ArrayList<>();
+
+        try {
+            Field defaultValueField = Option.class.getDeclaredField("defaultValue");
+            defaultValueField.setAccessible(true);
+
+            for (Class<?> mod : Mods.ALL_MODS) {
+                Field[] fields = mod.getDeclaredFields();
+
+                for (Field field : fields) {
+                    field.setAccessible(true);
+                    Option<?, ?, ?> option = (Option<?, ?, ?>) field.get(null);
+
+                    if (option == null) {
+                        continue;
+                    }
+
+                    modStatusOptions.put(option.getKey(), option);
 
-        OptionsImpl impl = ((OptionsImpl) this.playerOptions);
-        for (Map.Entry<Option<?, ?, ?>, Object> entry : impl.getOptions().entrySet()) {
-            System.out.println(entry.getKey().getKey() + ": " + entry.getValue());
+                    Option<?, ?, ?> copy = option.clone();
+                    defaultValueField.set(copy, null);
+                    modSettingsOptions.add(copy);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
+
+        return new Container(modStatusOptions, modSettingsOptions);
+    }
+
+    /**
+     * Holds the loaded options.
+     *
+     * @since 1.2.1
+     */
+    @Getter
+    @RequiredArgsConstructor
+    public static class Container {
+
+        /**
+         * Returns all registered mod options with default values.
+         *
+         * @return the map of option key to option
+         * @since 1.2.1
+         */
+        private final Map<String, Option<?, ?, ?>> modStatusOptions;
+
+        /**
+         * Returns all registered mod options with default values removed.
+         *
+         * @return the list of options without default values
+         * @since 1.2.1
+         */
+        private final List<Option<?, ?, ?>> modSettingsOptions;
+
     }
 
     @Listen
diff --git a/common/src/main/java/com/lunarclient/apollo/module/modsettings/ModSettingsModuleImpl.java b/common/src/main/java/com/lunarclient/apollo/module/modsettings/ModSettingsModuleImpl.java
@@ -0,0 +1,46 @@
+/*
+ * This file is part of Apollo, licensed under the MIT License.
+ *
+ * Copyright (c) 2023 Moonsworth
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.lunarclient.apollo.module.modsettings;
+
+import com.lunarclient.apollo.ApolloManager;
+import com.lunarclient.apollo.module.modsetting.ModSettingModule;
+
+/**
+ * Provides the mod settings module.
+ *
+ * @since 1.2.1
+ */
+public final class ModSettingsModuleImpl extends ModSettingModule {
+
+    /**
+     * Creates a new instance of {@link ModSettingsModuleImpl}.
+     *
+     * @since 1.2.1
+     */
+    public ModSettingsModuleImpl() {
+        super();
+        this.registerOptions(ApolloManager.getModsManager().getContainer().getModSettingsOptions());
+    }
+
+}
diff --git a/common/src/main/java/com/lunarclient/apollo/option/config/CommonSerializers.java b/common/src/main/java/com/lunarclient/apollo/option/config/CommonSerializers.java
@@ -59,27 +59,31 @@ public Color deserialize(Type type, ConfigurationNode node) throws Serialization
                 stringValue = stringValue.substring(1);
             }
 
-            if (stringValue.length() != 8) {
-                throw new NumberFormatException("Invalid color string length: " + stringValue);
+            if (stringValue.length() == 6) {
+                return new Color(Integer.parseInt(stringValue, 16));
             }
 
-            long rgba = Long.parseLong(stringValue, 16);
-            int alpha = (int) ((rgba >> 24) & 0xFF);
-            int red = (int) ((rgba >> 16) & 0xFF);
-            int green = (int) ((rgba >> 8) & 0xFF);
-            int blue = (int) (rgba & 0xFF);
+            if (stringValue.length() == 8) {
+                long rgba = Long.parseLong(stringValue, 16);
+                int alpha = (int) ((rgba >> 24) & 0xFF);
+                int red = (int) ((rgba >> 16) & 0xFF);
+                int green = (int) ((rgba >> 8) & 0xFF);
+                int blue = (int) (rgba & 0xFF);
 
-            return new Color(red, green, blue, alpha);
+                return new Color(red, green, blue, alpha);
+            }
+
+            throw new NumberFormatException("Invalid color string length: " + stringValue);
         }
 
         @Override
         public void serialize(Type type, @Nullable Color color, ConfigurationNode node) throws SerializationException {
             if (color == null) {
-                node.set("#FFFFFF");
+                node.set(null);
                 return;
             }
 
-            node.set(String.format("#%06X", (0xFFFFFF & color.getRGB())));
+            node.set(String.format("#%08X", color.getRGB()));
         }
     }
 
diff --git a/platform/bukkit/src/main/java/com/lunarclient/apollo/ApolloBukkitPlatform.java b/platform/bukkit/src/main/java/com/lunarclient/apollo/ApolloBukkitPlatform.java
@@ -54,6 +54,7 @@
 import com.lunarclient.apollo.module.limb.LimbModule;
 import com.lunarclient.apollo.module.limb.LimbModuleImpl;
 import com.lunarclient.apollo.module.modsetting.ModSettingModule;
+import com.lunarclient.apollo.module.modsettings.ModSettingsModuleImpl;
 import com.lunarclient.apollo.module.nametag.NametagModule;
 import com.lunarclient.apollo.module.nametag.NametagModuleImpl;
 import com.lunarclient.apollo.module.nickhider.NickHiderModule;
@@ -141,7 +142,7 @@ public void onEnable() {
             .addModule(HologramModule.class, new HologramModuleImpl())
             .addModule(InventoryModule.class)
             .addModule(LimbModule.class, new LimbModuleImpl())
-            .addModule(ModSettingModule.class)
+            .addModule(ModSettingModule.class, new ModSettingsModuleImpl())
             .addModule(NametagModule.class, new NametagModuleImpl())
             .addModule(NickHiderModule.class, new NickHiderModuleImpl())
             .addModule(NotificationModule.class, new NotificationModuleImpl())
diff --git a/platform/bungee/src/main/java/com/lunarclient/apollo/ApolloBungeePlatform.java b/platform/bungee/src/main/java/com/lunarclient/apollo/ApolloBungeePlatform.java
@@ -49,6 +49,7 @@
 import com.lunarclient.apollo.module.limb.LimbModule;
 import com.lunarclient.apollo.module.limb.LimbModuleImpl;
 import com.lunarclient.apollo.module.modsetting.ModSettingModule;
+import com.lunarclient.apollo.module.modsettings.ModSettingsModuleImpl;
 import com.lunarclient.apollo.module.nametag.NametagModule;
 import com.lunarclient.apollo.module.nametag.NametagModuleImpl;
 import com.lunarclient.apollo.module.notification.NotificationModule;
@@ -122,7 +123,7 @@ public void onEnable() {
             .addModule(EntityModule.class, new EntityModuleImpl())
             .addModule(HologramModule.class, new HologramModuleImpl())
             .addModule(LimbModule.class, new LimbModuleImpl())
-            .addModule(ModSettingModule.class)
+            .addModule(ModSettingModule.class, new ModSettingsModuleImpl())
             .addModule(NametagModule.class, new NametagModuleImpl())
             .addModule(NotificationModule.class, new NotificationModuleImpl())
             .addModule(RichPresenceModule.class, new RichPresenceModuleImpl())
diff --git a/platform/folia/src/main/java/com/lunarclient/apollo/ApolloFoliaPlatform.java b/platform/folia/src/main/java/com/lunarclient/apollo/ApolloFoliaPlatform.java
@@ -51,6 +51,7 @@
 import com.lunarclient.apollo.module.limb.LimbModule;
 import com.lunarclient.apollo.module.limb.LimbModuleImpl;
 import com.lunarclient.apollo.module.modsetting.ModSettingModule;
+import com.lunarclient.apollo.module.modsettings.ModSettingsModuleImpl;
 import com.lunarclient.apollo.module.nametag.NametagModule;
 import com.lunarclient.apollo.module.nametag.NametagModuleImpl;
 import com.lunarclient.apollo.module.nickhider.NickHiderModule;
@@ -129,7 +130,7 @@ public void onEnable() {
             .addModule(GlowModule.class, new GlowModuleImpl())
             .addModule(HologramModule.class, new HologramModuleImpl())
             .addModule(LimbModule.class, new LimbModuleImpl())
-            .addModule(ModSettingModule.class)
+            .addModule(ModSettingModule.class, new ModSettingsModuleImpl())
             .addModule(NametagModule.class, new NametagModuleImpl())
             .addModule(NickHiderModule.class, new NickHiderModuleImpl())
             .addModule(NotificationModule.class, new NotificationModuleImpl())
diff --git a/platform/minestom/src/main/java/com/lunarclient/apollo/ApolloMinestomPlatform.java b/platform/minestom/src/main/java/com/lunarclient/apollo/ApolloMinestomPlatform.java
@@ -53,6 +53,7 @@
 import com.lunarclient.apollo.module.limb.LimbModule;
 import com.lunarclient.apollo.module.limb.LimbModuleImpl;
 import com.lunarclient.apollo.module.modsetting.ModSettingModule;
+import com.lunarclient.apollo.module.modsettings.ModSettingsModuleImpl;
 import com.lunarclient.apollo.module.nametag.NametagModule;
 import com.lunarclient.apollo.module.nametag.NametagModuleImpl;
 import com.lunarclient.apollo.module.nickhider.NickHiderModule;
@@ -163,7 +164,7 @@ public static void init(ApolloMinestomProperties properties) {
             .addModule(HologramModule.class, new HologramModuleImpl())
             .addModule(InventoryModule.class)
             .addModule(LimbModule.class, new LimbModuleImpl())
-            .addModule(ModSettingModule.class)
+            .addModule(ModSettingModule.class, new ModSettingsModuleImpl())
             .addModule(NametagModule.class, new NametagModuleImpl())
             .addModule(NickHiderModule.class, new NickHiderModuleImpl())
             .addModule(NotificationModule.class, new NotificationModuleImpl())
diff --git a/platform/velocity/src/main/java/com/lunarclient/apollo/ApolloVelocityPlatform.java b/platform/velocity/src/main/java/com/lunarclient/apollo/ApolloVelocityPlatform.java
@@ -49,6 +49,7 @@
 import com.lunarclient.apollo.module.limb.LimbModule;
 import com.lunarclient.apollo.module.limb.LimbModuleImpl;
 import com.lunarclient.apollo.module.modsetting.ModSettingModule;
+import com.lunarclient.apollo.module.modsettings.ModSettingsModuleImpl;
 import com.lunarclient.apollo.module.nametag.NametagModule;
 import com.lunarclient.apollo.module.nametag.NametagModuleImpl;
 import com.lunarclient.apollo.module.notification.NotificationModule;
@@ -187,7 +188,7 @@ public void onProxyInitialization(ProxyInitializeEvent event) {
             .addModule(EntityModule.class, new EntityModuleImpl())
             .addModule(HologramModule.class, new HologramModuleImpl())
             .addModule(LimbModule.class, new LimbModuleImpl())
-            .addModule(ModSettingModule.class)
+            .addModule(ModSettingModule.class, new ModSettingsModuleImpl())
             .addModule(NametagModule.class, new NametagModuleImpl())
             .addModule(NotificationModule.class, new NotificationModuleImpl())
             .addModule(RichPresenceModule.class, new RichPresenceModuleImpl())
