Improve configuration system

Author: ishland

src/main/java/org/yatopiamc/c2me/common/config/C2MEConfig.java

@@ -22,8 +22,10 @@ public class C2MEConfig {
                 .build();
         config.load();
 
-        asyncIoConfig = new AsyncIoConfig(ConfigUtils.getValue(config, "asyncIO", CommentedConfig::inMemory, "Configuration for async io system"));
-        threadedWorldGenConfig = new ThreadedWorldGenConfig(ConfigUtils.getValue(config, "threadedWorldGen", CommentedConfig::inMemory, "Configuration for threaded world generation"));
+        final ConfigUtils.ConfigScope configScope = new ConfigUtils.ConfigScope(config);
+        asyncIoConfig = new AsyncIoConfig(ConfigUtils.getValue(configScope, "asyncIO", CommentedConfig::inMemory, "Configuration for async io system"));
+        threadedWorldGenConfig = new ThreadedWorldGenConfig(ConfigUtils.getValue(configScope, "threadedWorldGen", CommentedConfig::inMemory, "Configuration for threaded world generation"));
+        configScope.removeUnusedKeys();
         config.save();
         config.close();
         C2MEMod.LOGGER.info("Configuration loaded successfully after {}ms", (System.nanoTime() - startTime) / 1_000_000.0);
@@ -35,8 +37,10 @@ public static class AsyncIoConfig {
 
         public AsyncIoConfig(CommentedConfig config) {
             Preconditions.checkNotNull(config, "asyncIo config is not present");
-            this.serializerParallelism = ConfigUtils.getValue(config, "serializerParallelism", () -> Math.min(2, Runtime.getRuntime().availableProcessors()), "IO worker executor parallelism", ConfigUtils.CheckType.THREAD_COUNT);
-            this.ioWorkerParallelism = ConfigUtils.getValue(config, "ioWorkerParallelism", () -> Math.min(6, Runtime.getRuntime().availableProcessors()), "Serializer executor parallelism", ConfigUtils.CheckType.THREAD_COUNT);
+            final ConfigUtils.ConfigScope configScope = new ConfigUtils.ConfigScope(config);
+            this.serializerParallelism = ConfigUtils.getValue(configScope, "serializerParallelism", () -> Math.min(2, Runtime.getRuntime().availableProcessors()), "IO worker executor parallelism", ConfigUtils.CheckType.THREAD_COUNT);
+            this.ioWorkerParallelism = ConfigUtils.getValue(configScope, "ioWorkerParallelism", () -> Math.min(6, Runtime.getRuntime().availableProcessors()), "Serializer executor parallelism", ConfigUtils.CheckType.THREAD_COUNT);
+            configScope.removeUnusedKeys();
         }
     }
 
@@ -47,9 +51,11 @@ public static class ThreadedWorldGenConfig {
 
         public ThreadedWorldGenConfig(CommentedConfig config) {
             Preconditions.checkNotNull(config, "threadedWorldGen config is not present");
-            this.enabled = ConfigUtils.getValue(config, "enabled", () -> true, "Whether to enable this feature");
-            this.parallelism = ConfigUtils.getValue(config, "parallelism", () -> Math.min(6, Runtime.getRuntime().availableProcessors()), "World generation worker executor parallelism", ConfigUtils.CheckType.THREAD_COUNT);
-            this.allowThreadedFeatures = ConfigUtils.getValue(config, "allowThreadedFeatures", () -> false, "Whether to allow feature generation (world decorations like trees, ores and etc.) run in parallel");
+            final ConfigUtils.ConfigScope configScope = new ConfigUtils.ConfigScope(config);
+            this.enabled = ConfigUtils.getValue(configScope, "enabled", () -> true, "Whether to enable this feature");
+            this.parallelism = ConfigUtils.getValue(configScope, "parallelism", () -> Math.min(6, Runtime.getRuntime().availableProcessors()), "World generation worker executor parallelism", ConfigUtils.CheckType.THREAD_COUNT);
+            this.allowThreadedFeatures = ConfigUtils.getValue(configScope, "allowThreadedFeatures", () -> false, "Whether to allow feature generation (world decorations like trees, ores and etc.) run in parallel");
+            configScope.removeUnusedKeys();
         }
     }
 

src/main/java/org/yatopiamc/c2me/common/config/ConfigUtils.java

@@ -1,26 +1,48 @@
 package org.yatopiamc.c2me.common.config;
 
 import com.electronwill.nightconfig.core.CommentedConfig;
+import com.electronwill.nightconfig.core.Config;
 import com.google.common.base.Preconditions;
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
 
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.Objects;
-import java.util.function.Supplier;
+import java.util.Set;
 
 public class ConfigUtils {
 
-    public static <T> T getValue(CommentedConfig config, String key, Supplier<T> def, String comment, CheckType... checks) {
+    public static <T> T getValue(ConfigScope config, String key, Supplier<T> deff, String comment, CheckType... checks) {
         Preconditions.checkNotNull(config);
         Preconditions.checkNotNull(key);
         Preconditions.checkArgument(!key.isEmpty());
-        Preconditions.checkNotNull(def);
-        if (!config.contains(key) || (checks.length != 0 && Arrays.stream(checks).anyMatch(checkType -> !checkType.check(config.get(key))))) config.set(key, def.get());
-        config.setComment(key, " " + comment);
-        return Objects.requireNonNull(config.get(key));
+        Preconditions.checkNotNull(deff);
+        Supplier<T> def = Suppliers.memoize(deff);
+        config.processedKeys.add(key);
+        if (!config.config.contains(key) || (checks.length != 0 && Arrays.stream(checks).anyMatch(checkType -> !checkType.check(config.config.get(key)))))
+            config.config.set(key, def.get());
+        if (def.get() instanceof Config) config.config.setComment(key, String.format(" %s", comment));
+        else config.config.setComment(key, String.format(" (Default: %s) %s", def.get(), comment));
+        return Objects.requireNonNull(config.config.get(key));
+    }
+
+    static class ConfigScope {
+        final CommentedConfig config;
+        final Set<String> processedKeys;
+
+        ConfigScope(CommentedConfig config) {
+            this.config = config;
+            this.processedKeys = new HashSet<>();
+        }
+
+        void removeUnusedKeys() {
+            config.entrySet().removeIf(entry -> !processedKeys.contains(entry.getKey()));
+        }
     }
 
     public enum CheckType {
-        THREAD_COUNT {
+        THREAD_COUNT() {
             @Override
             public <T> boolean check(T value) {
                 return value instanceof Number && ((Number) value).intValue() >= 1 && ((Number) value).intValue() <= 0x7fff;