Merge branch 'improve/extra-options' into feature/updater

LunarClient · Sep 21, 2023 · b71a9a8 · b71a9a8
2 parents c70c810 + c2e1291
commit b71a9a8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/common/src/main/java/com/lunarclient/apollo/ApolloManager.java b/common/src/main/java/com/lunarclient/apollo/ApolloManager.java
@@ -106,7 +106,7 @@ public static void bootstrap(ApolloPlatform platform) {
      * @since 1.0.0
      */
     public static void registerOptions(Option<?, ?, ?>... options) {
-        optionKeys.addAll(Arrays.asList(options));
+        ApolloManager.optionKeys.addAll(Arrays.asList(options));
     }
 
     /**
@@ -144,7 +144,7 @@ public static void saveConfiguration() {
                 return;
             }
 
-            ConfigOptions.saveOptions(ApolloManager.platform.getOptions(), ApolloManager.configurationNode);
+            ConfigOptions.saveOptions(ApolloManager.platform.getOptions(), ApolloManager.configurationNode, ApolloManager.optionKeys);
 
             CommentedConfigurationNode modules = ApolloManager.configurationNode.node("modules");
 

diff --git a/common/src/main/java/com/lunarclient/apollo/module/ApolloModuleManagerImpl.java b/common/src/main/java/com/lunarclient/apollo/module/ApolloModuleManagerImpl.java
@@ -151,7 +151,7 @@ public void saveConfiguration(CommentedConfigurationNode node) {
             CommentedConfigurationNode moduleNode = node.node(module.getId().toLowerCase(Locale.ENGLISH));
 
             Options optionsContainer = module.getOptions();
-            ConfigOptions.saveOptions(optionsContainer, moduleNode);
+            ConfigOptions.saveOptions(optionsContainer, moduleNode, module.getOptionKeys());
         }
     }
 

diff --git a/common/src/main/java/com/lunarclient/apollo/option/ConfigOptions.java b/common/src/main/java/com/lunarclient/apollo/option/ConfigOptions.java
@@ -64,11 +64,12 @@ public static void loadOptions(Options options, CommentedConfigurationNode node,
      *
      * @param options the options container
      * @param node the configuration node
+     * @param optionKeys the option keys
      * @since 1.0.0
      */
     @SuppressWarnings("unchecked")
-    public static void saveOptions(Options options, CommentedConfigurationNode node) {
-        for (Option<?, ?, ?> option : options) {
+    public static void saveOptions(Options options, CommentedConfigurationNode node, List<Option<?, ?, ?>> optionKeys) {
+        for (Option<?, ?, ?> option : optionKeys) {
             CommentedConfigurationNode optionNode = node.node((Object[]) option.getPath());
             if (optionNode == null) {
                 continue;