Move to spawn generator

Author: Dreeam-qwq

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

@@ -1,8 +1,11 @@
 package systems.kscott.randomspawnplus.spawn;
 
+import com.tcoded.folialib.wrapper.task.WrappedTask;
 import it.unimi.dsi.fastutil.longs.LongArrayList;
 import org.bukkit.Material;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Set;
 
 public class SpawnData {
@@ -14,6 +17,8 @@ public class SpawnData {
     // Unsafe blocks
     private static Set<Material> unsafeBlocks;
 
+    public static final List<String> cachedSpawns = new ArrayList<>();
+    public static WrappedTask cacheSpawnTask;
 
     // Check whether need to use method, or public field to access directly.
     // Or move to interface as default?

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

@@ -20,9 +20,6 @@
 
 public class SpawnFinder {
 
-    private static final List<String> cachedSpawns = new ArrayList<>();
-    private WrappedTask cacheSpawnTask;
-
     public static Location getRandomSpawn() throws Exception {
         boolean valid = false;
         Location location = null;
@@ -33,11 +30,11 @@ public static Location getRandomSpawn() throws Exception {
             if (tries >= 30) {
                 throw new Exception();
             }
-            if (cachedSpawns.isEmpty()) {
+            if (SpawnData.cachedSpawns.isEmpty()) {
                 String msg = Config.getLangConfig().noSpawnFound;
                 RandomSpawnPlus.getInstance().getLogger().severe(msg);
             }
-            if (!cachedSpawns.isEmpty()) {
+            if (!SpawnData.cachedSpawns.isEmpty()) {
                 location = getRandomSpawn2();
             } else {
                 location = getCandidateLocation();
@@ -166,59 +163,14 @@ public static boolean checkSpawn(Location location) {
         return isValid;
     }
 
-    private void cacheSpawns() {
-        List<String> locationStrings = Config.getSpawnStorage().get().getStringList("spawns");
-
-        cachedSpawns.addAll(locationStrings);
-
-        int missingLocations = Config.getGlobalConfig().spawnCacheCount - locationStrings.size();
-
-        if (missingLocations <= 0) {
-            return;
-        }
-
-        List<String> newLocations = new ArrayList<>();
-
-        Bukkit.getLogger().info("Caching " + missingLocations + " spawns.");
-        for (int i = 0; i <= missingLocations; i++) {
-            RandomSpawnPlus.getInstance().foliaLib.getScheduler().runLater(() -> {
-                Location location = null;
-                boolean valid = false;
-
-                while (!valid) {
-                    location = getCandidateLocation();
-                    valid = checkSpawn(location);
-                }
-
-                newLocations.add(Locations.serializeString(location));
-            }, 1);
-        }
-
-        cacheSpawnTask = RandomSpawnPlus.getInstance().foliaLib.getScheduler().runTimer(() -> {
-            // Wait for all spawns to be cached
-            if (newLocations.size() <= missingLocations) {
-                if (RandomSpawnPlus.getInstance().getConfig().getBoolean("debug-mode")) {
-                    System.out.println(newLocations.size() + ", " + missingLocations);
-                }
-            } else {
-                cachedSpawns.addAll(newLocations);
-                // Save spawns to file
-                Config.getSpawnStorage().get().set("spawns", cachedSpawns);
-                RandomSpawnPlus.getInstance().saveConfig();
-
-                RandomSpawnPlus.getInstance().foliaLib.getScheduler().cancelTask(cacheSpawnTask);
-            }
-        }, 10, 10);
-    }
-
     public static Location getRandomSpawn2() {
-        int element = ThreadLocalRandom.current().nextInt(cachedSpawns.size());
-        return Locations.deserializeLocationString(cachedSpawns.get(element));
+        int element = ThreadLocalRandom.current().nextInt(SpawnData.cachedSpawns.size());
+        return Locations.deserializeLocationString(SpawnData.cachedSpawns.get(element));
     }
 
     public static void deleteSpawn(Location location) {
-        cachedSpawns.removeIf(locationString -> Locations.serializeString(location).equals(locationString));
-        Config.getSpawnStorage().get().set("spawns", cachedSpawns);
+        SpawnData.cachedSpawns.removeIf(locationString -> Locations.serializeString(location).equals(locationString));
+        Config.getSpawnStorage().get().set("spawns", SpawnData.cachedSpawns);
         try {
             Config.getSpawnStorage().saveConfig();
         } catch (IOException e) {

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

@@ -1,12 +1,16 @@
 package systems.kscott.randomspawnplus.spawn;
 
 import it.unimi.dsi.fastutil.longs.LongArrayList;
+import systems.kscott.randomspawnplus.RandomSpawnPlus;
 import systems.kscott.randomspawnplus.config.Config;
+import systems.kscott.randomspawnplus.util.Locations;
 import systems.kscott.randomspawnplus.util.PlatformUtil;
 import org.bukkit.Bukkit;
+import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
 
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -44,13 +48,51 @@ private static void initSpawnChunks() {
         CompletableFuture<LongArrayList> prepareChunksTask = PlatformUtil.getPlatform().collectNonGeneratedChunksAsync(spawnLevel, minX, minZ, maxX, maxZ);
 
         prepareChunksTask.thenAccept($ -> {
+            initSpawnPoints();
             // TODO: change to logger or remove
             System.out.println("Prepare chunks took " + (System.currentTimeMillis() - start) + "ms");
             SpawnData.finalizeSpawnChunksGeneration();
         });
     }
 
     private static void initSpawnPoints() {
+        List<String> locationStrings = Config.getSpawnStorage().get().getStringList("spawns");
 
+        SpawnData.cachedSpawns.addAll(locationStrings);
+
+        int missingLocations = Config.getGlobalConfig().spawnCacheCount - locationStrings.size();
+
+        if (missingLocations <= 0) {
+            return;
+        }
+
+        List<String> newLocations = new ArrayList<>();
+
+        Bukkit.getLogger().info("Caching " + missingLocations + " spawns.");
+        for (int i = 0; i <= missingLocations; i++) {
+            RandomSpawnPlus.getInstance().foliaLib.getScheduler().runLater(() -> {
+                Location location = null;
+                boolean valid = false;
+
+                while (!valid) {
+                    location = SpawnFinder.getCandidateLocation();
+                    valid = SpawnFinder.checkSpawn(location);
+                }
+
+                newLocations.add(Locations.serializeString(location));
+            }, 1);
+        }
+
+        SpawnData.cacheSpawnTask = RandomSpawnPlus.getInstance().foliaLib.getScheduler().runTimer(() -> {
+            // Wait for all spawns to be cached
+            if (newLocations.size() > missingLocations) {
+                SpawnData.cachedSpawns.addAll(newLocations);
+                // Save spawns to file
+                Config.getSpawnStorage().get().set("spawns", SpawnData.cachedSpawns);
+                RandomSpawnPlus.getInstance().saveConfig();
+
+                RandomSpawnPlus.getInstance().foliaLib.getScheduler().cancelTask(SpawnData.cacheSpawnTask);
+            }
+        }, 10, 10);
     }
 }