Some work

Author: Dreeam-qwq

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

@@ -9,6 +9,7 @@
 import systems.kscott.randomspawnplus.RandomSpawnPlus;
 import systems.kscott.randomspawnplus.util.MessageUtil;
 import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.plugin.Plugin;
 
 import java.io.File;
@@ -24,7 +25,7 @@ public class Config {
     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";
-    private static final String SPAWN_STORAGE_FILE_NAME = "spawns.yml";
+    public static final String SPAWN_STORAGE_FILE_NAME = "spawns.yml"; // public since used in other classes
 
     private static ConfigLocale configLocale;
     private static GlobalConfig globalConfig;
@@ -107,7 +108,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();
+        spawnStorage.saveConfig(pluginFolder);
     }
 
     public static void createDirectory(File dir) throws IOException {
@@ -134,6 +135,10 @@ public static LangConfig getLangConfig() {
         return langConfig;
     }
 
+    public static SpawnStorage getSpawnStorage() {
+        return spawnStorage;
+    }
+
     public static void getLastConfigVersion(String lastConfigVer) {
         // If last is null, then it means the plugin is fist loaded, fallback to current config version
         if (lastConfigVer == null) lastConfigVer = currConfigVer;

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

@@ -1,24 +1,49 @@
 package systems.kscott.randomspawnplus.config;
 
-import io.github.thatsmusic99.configurationmaster.api.ConfigFile;
+import systems.kscott.randomspawnplus.RandomSpawnPlus;
+
+import org.bukkit.configuration.InvalidConfigurationException;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.file.Paths;
 
 public class SpawnStorage {
 
-    private static ConfigFile configFile;
+    private FileConfiguration config;
+    private final String configFileName;
 
     public SpawnStorage(File pluginFolder, String configFileName, boolean init) throws Exception {
-        configFile = ConfigFile.loadConfig(new File(pluginFolder, configFileName));
+        this.configFileName = configFileName;
 
         // Init value for config keys
-        initConfig();
+        reloadConfig();
+    }
+
+    public FileConfiguration get() {
+        return config;
+    }
+
+    public void reloadConfig() throws IOException, InvalidConfigurationException {
+        File customConfigFile = createFile();
+        config = new YamlConfiguration();
+
+        config.load(customConfigFile);
     }
 
-    private void initConfig() {
+    public void saveConfig(File pluginFolder) throws IOException {
+        // TODO: Check here, better way?
+        String path = Paths.get(pluginFolder.getAbsolutePath(), configFileName).toString();
+        config.save(path);
     }
 
-    public void saveConfig() throws Exception {
-        configFile.save();
+    private File createFile() {
+        File customConfigFile = new File(RandomSpawnPlus.getInstance().getDataFolder(), configFileName);
+        if (!customConfigFile.exists() || customConfigFile.getParentFile().mkdirs()) {
+            RandomSpawnPlus.getInstance().saveResource(configFileName, false);
+        }
+        return customConfigFile;
     }
 }

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

@@ -2,9 +2,17 @@
 
 import org.bukkit.Material;
 
-import java.util.ArrayList;
+import java.util.Set;
 
 public class SpawnData {
 
-    private static ArrayList<Material> unsafeBlocks;
+    private static Set<Material> unsafeBlocks;
+
+    public static Set<Material> getUnsafeBlocks() {
+        return unsafeBlocks;
+    }
+
+    public static void setUnsafeBlocks(Set<Material> blocks) {
+        unsafeBlocks = blocks;
+    }
 }