Update spawn storage save & Logger

Author: Dreeam-qwq

Common/src/main/java/systems/kscott/randomspawnplus/RandomSpawnPlus.java

@@ -20,9 +20,11 @@
 
 public final class RandomSpawnPlus extends JavaPlugin {
 
+    public static final Logger LOGGER = LogManager.getLogger(RandomSpawnPlus.class.getSimpleName());
+
     private static RandomSpawnPlus INSTANCE;
     private static HookInstance hookInstance;
-    public static final Logger LOGGER = LogManager.getLogger(RandomSpawnPlus.class.getSimpleName());
+
     private BukkitAudiences adventure;
     public FoliaLib foliaLib = new FoliaLib(this);
 
@@ -57,7 +59,11 @@ public void onDisable() {
             this.adventure = null;
         }
 
-        //SpawnCacher.getInstance().save();
+        try {
+            Config.getSpawnStorage().saveConfig();
+        } catch (IOException e) {
+            LOGGER.error("Failed to save " + Config.SPAWN_STORAGE_FILE_NAME + "!", e);
+        }
     }
 
     private void registerEvents() {

Common/src/main/java/systems/kscott/randomspawnplus/config/Config.java

@@ -21,7 +21,6 @@
 
 public class Config {
 
-    public static final Logger LOGGER = LogManager.getLogger(Config.class.getSimpleName());
     private static final String CURRENT_REGION = Locale.getDefault().getCountry().toUpperCase(Locale.ROOT);
     private static final String GLOBAL_CONFIG_FILE_NAME = "config.yml";
     private static final String LANG_CONFIG_FILE_NAME = "lang.yml";
@@ -49,13 +48,13 @@ public class Config {
                 loadGlobalConfig(pluginFolder, false);
             } catch (Exception e) {
                 MessageUtil.broadcastCommandMessage(sender, Component.text("Failed to reload " + GLOBAL_CONFIG_FILE_NAME + ". See error in console!", NamedTextColor.RED));
-                LOGGER.error(e);
+                RandomSpawnPlus.LOGGER.error(e);
             }
             try {
                 loadLangConfig(pluginFolder, false);
             } catch (Exception e) {
                 MessageUtil.broadcastCommandMessage(sender, Component.text("Failed to reload " + LANG_CONFIG_FILE_NAME + ". See error in console!", NamedTextColor.RED));
-                LOGGER.error(e);
+                RandomSpawnPlus.LOGGER.error(e);
             }
 
             final String success = String.format("Successfully reloaded config in %sms.", (System.nanoTime() - begin) / 1_000_000);
@@ -65,32 +64,32 @@ public class Config {
 
     public static void loadConfig(Plugin instance) {
         long begin = System.nanoTime();
-        LOGGER.info("Loading config...");
+        RandomSpawnPlus.LOGGER.info("Loading config...");
 
         final File pluginFolder = instance.getDataFolder();
 
         try {
             createDirectory(pluginFolder);
         } catch (Exception e) {
-            LOGGER.error("Failed to create <{}> plugin folder!", pluginFolder.getAbsolutePath(), e);
+            RandomSpawnPlus.LOGGER.error("Failed to create <{}> plugin folder!", pluginFolder.getAbsolutePath(), e);
         }
         try {
             loadGlobalConfig(pluginFolder, true);
         } catch (Exception e) {
-            LOGGER.error("Failed to load " + GLOBAL_CONFIG_FILE_NAME + "!", e);
+            RandomSpawnPlus.LOGGER.error("Failed to load " + GLOBAL_CONFIG_FILE_NAME + "!", e);
         }
         try {
             loadLangConfig(pluginFolder, true);
         } catch (Exception e) {
-            LOGGER.error("Failed to load " + LANG_CONFIG_FILE_NAME + "!", e);
+            RandomSpawnPlus.LOGGER.error("Failed to load " + LANG_CONFIG_FILE_NAME + "!", e);
         }
         try {
             loadSpawnStorage(pluginFolder, true);
         } catch (Exception e) {
-            LOGGER.error("Failed to load " + SPAWN_STORAGE_FILE_NAME + "!", e);
+            RandomSpawnPlus.LOGGER.error("Failed to load " + SPAWN_STORAGE_FILE_NAME + "!", e);
         }
 
-        LOGGER.info("Successfully loaded config in {}ms.", (System.nanoTime() - begin) / 1_000_000);
+        RandomSpawnPlus.LOGGER.info("Successfully loaded config in {}ms.", (System.nanoTime() - begin) / 1_000_000);
     }
 
     private static void loadGlobalConfig(File pluginFolder, boolean init) throws Exception {
@@ -108,7 +107,7 @@ private static void loadLangConfig(File pluginFolder, boolean init) throws Excep
     private static void loadSpawnStorage(File pluginFolder, boolean init) throws Exception {
         spawnStorage = new SpawnStorage(pluginFolder, SPAWN_STORAGE_FILE_NAME, init);
 
-        spawnStorage.saveConfig(pluginFolder);
+        spawnStorage.saveConfig();
     }
 
     public static void createDirectory(File dir) throws IOException {

Common/src/main/java/systems/kscott/randomspawnplus/config/SpawnStorage.java

@@ -33,9 +33,9 @@ public void reloadConfig() throws IOException, InvalidConfigurationException {
         config.load(customConfigFile);
     }
 
-    public void saveConfig(File pluginFolder) throws IOException {
+    public void saveConfig() throws IOException {
         // TODO: Check here, better way?
-        String path = Paths.get(pluginFolder.getAbsolutePath(), configFileName).toString();
+        String path = Paths.get(RandomSpawnPlus.getInstance().getDataFolder().getAbsolutePath(), configFileName).toString();
         config.save(path);
     }
 

Common/src/main/java/systems/kscott/randomspawnplus/spawn/SpawnFinder.java

@@ -221,9 +221,9 @@ public static void deleteSpawn(Location location) {
         cachedSpawns.removeIf(locationString -> Locations.serializeString(location).equals(locationString));
         Config.getSpawnStorage().get().set("spawns", cachedSpawns);
         try {
-            Config.getSpawnStorage().saveConfig(RandomSpawnPlus.getInstance().getDataFolder());
+            Config.getSpawnStorage().saveConfig();
         } catch (IOException e) {
-            Config.LOGGER.error("Failed to save " + Config.SPAWN_STORAGE_FILE_NAME + "!", e);
+            RandomSpawnPlus.LOGGER.error("Failed to save " + Config.SPAWN_STORAGE_FILE_NAME + "!", e);
         }
     }