ConfigAutoFIx, Fix

Author: FungY911

src/main/java/tk/fungy/wsformc/Main.java

@@ -28,6 +28,7 @@ public void onEnable() {
         } catch (UnknownHostException e) {
             getLogger().warning("Failed to found IP of this server, please set this manually.");
         }
+        new ConfigFixManager().autofixConfig();
         new FileManager().removeLogFile();
         getLogger().info("Loading Assets.");
         getInstance().getCommand("wsm").setExecutor(new WSMCommand());

src/main/java/tk/fungy/wsformc/managers/ConfigFixManager.java

@@ -1,11 +1,24 @@
 package tk.fungy.wsformc.managers;
 
+import org.bukkit.Bukkit;
+import org.bukkit.command.ConsoleCommandSender;
+import org.bukkit.configuration.file.YamlConfiguration;
 import tk.fungy.wsformc.Main;
 
+import java.io.File;
 import java.io.IOException;
 
+import static tk.fungy.wsformc.managers.FileManager.config;
+import static tk.fungy.wsformc.managers.FileManager.configFile;
+
 public class ConfigFixManager {
     public void autofixConfig() {
+        /**
+         * if config is null, load it
+         */
+        if (config == null) {
+            config = new YamlConfiguration().loadConfiguration(configFile);
+        }
         /**
          * WebServer.port to 8080 as Integer
          */
@@ -39,24 +52,26 @@ public void autofixConfig() {
          */
         setString("Version", Main.getInstance().getDescription().getVersion());
         save();
+
+        //Bukkit.dispatchCommand(Bukkit.getServer().getConsoleSender(), "restart");
     }
 
     private void save() {
         /**
          * Save the config
          */
         try {
-            FileManager.config.save(FileManager.configFile);
+            config.save(configFile);
         } catch (IOException e) {
             Main.getInstance().getLogger().warning("----------------------------------------------------------------");
-            Main.getInstance().getLogger().warning("Failed to config fix, please report error bottom in our discord!\n");
+            Main.getInstance().getLogger().warning("Failed to save config, please report error bottom in our discord!\n");
             e.printStackTrace();
             Main.getInstance().getLogger().warning("\nEnd of error.");
             Main.getInstance().getLogger().warning("----------------------------------------------------------------");
         }
     }
-    private void setInt(String s, int var) { if (!FileManager.config.contains(s)) { FileManager.config.set(s, var); } save(); }
-    private void setString(String s, String var) { if (!FileManager.config.contains(s)) { FileManager.config.set(s, var); } save(); }
-    private void setBoolean(String s, boolean var) { if (!FileManager.config.contains(s)) { FileManager.config.set(s, var); } save(); }
+    private void setInt(String s, int var) { if (!config.contains(s)) { config.set(s, var); } save(); }
+    private void setString(String s, String var) { if (!config.contains(s)) { config.set(s, var); } save(); }
+    private void setBoolean(String s, boolean var) { if (!config.contains(s)) { config.set(s, var); } save(); }
 
 }

src/main/java/tk/fungy/wsformc/managers/FileManager.java

@@ -60,7 +60,6 @@ public void startup() throws UnknownHostException {
         if(!configFile.exists()) {
             Main.getInstance().saveResource("config.yml", true);
             config = new YamlConfiguration().loadConfiguration(configFile);
-            new ConfigFixManager().autofixConfig();
             String domain = getStringFromConfig("WebServer.domain");
             if (domain.equalsIgnoreCase("CHANGE_ME")) {
                 try {
@@ -75,8 +74,6 @@ public void startup() throws UnknownHostException {
                     ipaddr.replace("[STDOUT]", "");
                 FileManager.setStringInConfig("WebServer.domain", ipaddr);
             }
-            File cfgFile = new File(Main.getInstance().getDataFolder(), "config.yml");
-            config = YamlConfiguration.loadConfiguration(cfgFile);
         }
         if (!logsFolder.exists()) logsFolder.mkdir();
         if(!webFolder.exists()) webFolder.mkdir();

src/main/java/tk/fungy/wsformc/managers/WebServerManager.java

@@ -110,9 +110,9 @@ public void start() {
         }
         FileManager.setBooleanInConfig("WebServer.isRunning", true);
         if (new FileManager().getBooleanFromConfig("WebServerManager.ssl")) {
-            Main.getInstance().getLogger().warning("Running! https://" + new FileManager().getStringFromConfig("WebServerManager.domain") + ":" + Integer.valueOf(new FileManager().getStringFromConfig("WebServerManager.port")) + "/");
+            Main.getInstance().getLogger().warning("Running! https://" + new FileManager().getStringFromConfig("WebServer.domain") + ":" + Integer.valueOf(new FileManager().getStringFromConfig("WebServer.port")) + "/");
         } else {
-            Main.getInstance().getLogger().warning("Running! http://" + new FileManager().getStringFromConfig("WebServerManager.domain") + ":" + Integer.valueOf(new FileManager().getStringFromConfig("WebServerManager.port")) + "/");
+            Main.getInstance().getLogger().warning("Running! http://" + new FileManager().getStringFromConfig("WebServer.domain") + ":" + Integer.valueOf(new FileManager().getStringFromConfig("WebServer.port")) + "/");
         }
         Main.tc.reset();
         Main.tc.start();