improve config loadup

xGinko · Dec 20, 2023 · 20be5b0 · 20be5b0
1 parent f621515
commit 20be5b0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 20 deletions.
diff --git a/AnarchyExploitFixesFolia/src/main/java/me/moomoo/anarchyexploitfixes/config/Config.java b/AnarchyExploitFixesFolia/src/main/java/me/moomoo/anarchyexploitfixes/config/Config.java
@@ -15,13 +15,19 @@ public class Config {
 
     private final ConfigFile config;
     public final Locale default_lang;
+    public final Component cmd_say_format;
+    public final int nether_ceiling_max_y;
     public final boolean auto_lang, protocolLib_IsDisabled, connectionMsgsAreOnByDefault,
             cmd_say_enabled, cmd_help_enabled, cmd_toggleConMsgs_enabled;
-    public final int nether_ceiling_max_y;
-    public final Component cmd_say_format;
 
     public Config() throws Exception {
-        this.config = loadConfig(new File(AnarchyExploitFixes.getInstance().getDataFolder(), "config.yml"));
+        // Create plugin folder first if it does not exist yet
+        File pluginFolder = AnarchyExploitFixes.getInstance().getDataFolder();
+        if (!pluginFolder.exists() && !pluginFolder.mkdir())
+            AnarchyExploitFixes.getLog().severe("Failed to create plugin folder.");
+        // Load config.yml with ConfigMaster
+        this.config = ConfigFile.loadConfig(new File(pluginFolder, "config.yml"));
+        // Pre-structure to force order
         structureConfig();
 
         // Language Settings
@@ -49,13 +55,6 @@ public Config() throws Exception {
         config.addDefault("misc.join-leave-messages.show-in-console", false); // add default here so show-in-console option is not misplaced.
     }
 
-    private ConfigFile loadConfig(File ymlFile) throws Exception {
-        File parent = ymlFile.getParentFile();
-        if (!parent.exists() && !parent.mkdir())
-            AnarchyExploitFixes.getLog().severe("Unable to create plugin directory.");
-        return ConfigFile.loadConfig(ymlFile);
-    }
-
     public void saveConfig() {
         try {
             config.save();

diff --git a/AnarchyExploitFixesLegacy/src/main/java/me/moomoo/anarchyexploitfixes/config/Config.java b/AnarchyExploitFixesLegacy/src/main/java/me/moomoo/anarchyexploitfixes/config/Config.java
@@ -12,13 +12,19 @@ public class Config {
 
     private final ConfigFile config;
     public final Locale default_lang;
+    public final String cmd_say_format;
+    public final int nether_ceiling_max_y, nether_floor_min_y, overworld_floor_min_y;
     public final boolean auto_lang, protocolLib_IsDisabled, connectionMsgsAreOnByDefault,
             cmd_say_enabled, cmd_help_enabled, cmd_toggleConMsgs_enabled;
-    public final int nether_ceiling_max_y, nether_floor_min_y, overworld_floor_min_y;
-    public final String cmd_say_format;
 
     public Config() throws Exception {
-        config = loadConfig(new File(AnarchyExploitFixes.getInstance().getDataFolder(), "config.yml"));
+        // Create plugin folder first if it does not exist yet
+        File pluginFolder = AnarchyExploitFixes.getInstance().getDataFolder();
+        if (!pluginFolder.exists() && !pluginFolder.mkdir())
+            AnarchyExploitFixes.getLog().severe("Failed to create plugin folder.");
+        // Load config.yml with ConfigMaster
+        this.config = ConfigFile.loadConfig(new File(pluginFolder, "config.yml"));
+        // Pre-structure to force order
         structureConfig();
 
         // Language Settings
@@ -48,13 +54,6 @@ public Config() throws Exception {
         config.addDefault("misc.join-leave-messages.show-in-console", false); // add default here so show-in-console option is not misplaced.
     }
 
-    private ConfigFile loadConfig(File ymlFile) throws Exception {
-        File parent = ymlFile.getParentFile();
-        if (!parent.exists() && !parent.mkdir())
-            AnarchyExploitFixes.getLog().severe("Unable to create plugin directory.");
-        return ConfigFile.loadConfig(ymlFile);
-    }
-
     public void saveConfig() {
         try {
             config.save();