feat: improved configuration handling

4drian3d · Mar 11, 2023 · f87051c · f87051c
1 parent 63f7af9
commit f87051c
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 61 deletions.
diff --git a/.../java/io/github/_4drian3d/authmevelocity/common/configuration/ConfigurationContainer.java b/.../java/io/github/_4drian3d/authmevelocity/common/configuration/ConfigurationContainer.java
@@ -17,40 +17,68 @@
 
 package io.github._4drian3d.authmevelocity.common.configuration;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.spongepowered.configurate.CommentedConfigurationNode;
 import org.spongepowered.configurate.ConfigurateException;
 import org.spongepowered.configurate.hocon.HoconConfigurationLoader;
 
 public final class ConfigurationContainer<C> {
-    private C config;
+    private final AtomicReference<C> config;
     private final HoconConfigurationLoader loader;
     private final Class<C> clazz;
 
-    public ConfigurationContainer(
+    private ConfigurationContainer(
         final C config,
         final Class<C> clazz,
         final HoconConfigurationLoader loader
     ) {
-        this.config = config;
+        this.config = new AtomicReference<>(config);
         this.loader = loader;
         this.clazz = clazz;
     }
 
     public C get() {
-        return this.config;
+        return this.config.get();
     }
 
     public CompletableFuture<Void> reload() {
         return CompletableFuture.runAsync(() -> {
             try {
                 final CommentedConfigurationNode node = loader.load();
-                config = node.get(clazz);
+                config.set(node.get(clazz));
             } catch (ConfigurateException exception) {
                 throw new CompletionException("Could not load config.conf file", exception);
             }
         });
     }
+
+    public static <C> ConfigurationContainer<C> load(Path path, Class<C> clazz) throws IOException {
+        path = path.resolve("config.conf");
+        final boolean firstCreation = Files.notExists(path);
+        final HoconConfigurationLoader loader = HoconConfigurationLoader.builder()
+                .defaultOptions(opts -> opts
+                        .shouldCopyDefaults(true)
+                        .header("""
+                    AuthMeVelocity | by Glyart & 4drian3d
+                    """)
+                )
+                .path(path)
+                .build();
+
+
+        final CommentedConfigurationNode node = loader.load();
+        final C config = node.get(clazz);
+        if (firstCreation) {
+            node.set(clazz, config);
+            loader.save(node);
+        }
+
+        return new ConfigurationContainer<>(config, clazz, loader);
+    }
 }
diff --git a/common/src/main/java/io/github/_4drian3d/authmevelocity/common/configuration/Loader.java b/common/src/main/java/io/github/_4drian3d/authmevelocity/common/configuration/Loader.java
diff --git a/paper/src/main/java/io/github/_4drian3d/authmevelocity/paper/AuthMeVelocityPlugin.java b/paper/src/main/java/io/github/_4drian3d/authmevelocity/paper/AuthMeVelocityPlugin.java
@@ -22,7 +22,6 @@
 import io.github._4drian3d.authmevelocity.common.LibsManager;
 import io.github._4drian3d.authmevelocity.common.MessageType;
 import io.github._4drian3d.authmevelocity.common.configuration.ConfigurationContainer;
-import io.github._4drian3d.authmevelocity.common.configuration.Loader;
 import io.github._4drian3d.authmevelocity.common.configuration.PaperConfiguration;
 import io.github._4drian3d.authmevelocity.paper.listeners.AuthMeListener;
 import io.github._4drian3d.authmevelocity.paper.listeners.MessageListener;
@@ -44,7 +43,7 @@ public void onEnable() {
         new LibsManager(new BukkitLibraryManager(this)).loadLibraries();
 
         try {
-            this.config = Loader.loadMainConfig(getDataFolder().toPath(), PaperConfiguration.class);
+            this.config = ConfigurationContainer.load(getDataFolder().toPath(), PaperConfiguration.class);
         } catch (Exception e) {
             getLogger().log(Level.SEVERE, "Could not load config.conf file", e);
             getServer().getPluginManager().disablePlugin(this);

diff --git a/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/AuthMeVelocityPlugin.java b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/AuthMeVelocityPlugin.java
@@ -38,7 +38,6 @@
 import io.github._4drian3d.authmevelocity.common.Constants;
 import io.github._4drian3d.authmevelocity.common.LibsManager;
 import io.github._4drian3d.authmevelocity.common.configuration.ConfigurationContainer;
-import io.github._4drian3d.authmevelocity.common.configuration.Loader;
 import io.github._4drian3d.authmevelocity.common.configuration.ProxyConfiguration;
 import io.github._4drian3d.authmevelocity.velocity.commands.AuthMeCommand;
 import io.github._4drian3d.authmevelocity.velocity.listener.ConnectListener;
@@ -110,7 +109,7 @@ public void onProxyInitialization(ProxyInitializeEvent event) {
         libraries.loadLibraries();
 
         try {
-            this.config = Loader.loadMainConfig(pluginDirectory, ProxyConfiguration.class);
+            this.config = ConfigurationContainer.load(pluginDirectory, ProxyConfiguration.class);
         } catch (Exception e) {
             logger.error("Could not load config.conf file", e);
             return;