Add Chunky to load spawn chunks

Author: Dreeam-qwq

Common/build.gradle.kts

@@ -26,6 +26,7 @@ dependencies {
     }
     compileOnly("net.luckperms:api:5.5")
     compileOnly("com.github.MilkBowl:VaultAPI:1.7.1")
+    compileOnly("org.popcraft:chunky-common:1.4.40")
 
     api("net.kyori:adventure-platform-bukkit:4.4.1")
     api("net.kyori:adventure-api:$adventureVersion")

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

@@ -208,7 +208,7 @@ private ConfigLocale getConfigLocale() {
         return locale;
     }
 
-    enum ConfigLocale {
+    private enum ConfigLocale {
         ENGLISH,
         CHINESE,
         RUSSIAN

Common/src/main/java/systems/kscott/randomspawnplus/hooks/HookInstance.java

@@ -4,7 +4,9 @@
 import net.luckperms.api.LuckPerms;
 import net.milkbowl.vault.economy.Economy;
 import org.bstats.bukkit.Metrics;
+import org.popcraft.chunky.api.ChunkyAPI;
 import systems.kscott.randomspawnplus.RandomSpawnPlus;
+import org.bukkit.Bukkit;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.RegisteredServiceProvider;
 
@@ -14,7 +16,8 @@ public class HookInstance {
 
     private IEssentials essentials;
     private LuckPerms luckPerms;
-    private static Economy economy;
+    private Economy economy;
+    private ChunkyAPI chunky;
 
     public HookInstance(RandomSpawnPlus pluginInstance) {
         instance = pluginInstance;
@@ -32,43 +35,37 @@ private void registerHooks() {
         }
 
         if (instance.getServer().getPluginManager().getPlugin("LuckPerms") != null) {
-            try {
-                setupPermissions();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+            setupPermissions();
         } else {
             RandomSpawnPlus.LOGGER.warn("The LuckPerms API is not detected, so the 'remove-permission-on-first-use' config option will not be enabled.");
         }
 
         if (instance.getServer().getPluginManager().getPlugin("Vault") != null) {
-            try {
-                setupEconomy();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+            setupEconomy();
         } else {
             RandomSpawnPlus.LOGGER.warn("The Vault API is not detected, so /wild cost will not be enabled.");
         }
+
+        if (instance.getServer().getPluginManager().getPlugin("Chunky") != null) {
+            chunky = Bukkit.getServer().getServicesManager().load(ChunkyAPI.class);
+        } else {
+            RandomSpawnPlus.LOGGER.warn("You need to have Chunky installed to use RandomSpawnPlus.");
+            RandomSpawnPlus.getInstance().getPluginLoader().disablePlugin(instance);
+        }
     }
 
     private void setupPermissions() {
         RegisteredServiceProvider<LuckPerms> rsp = instance.getServer().getServicesManager().getRegistration(LuckPerms.class);
         if (rsp != null) {
             luckPerms = rsp.getProvider();
-        } else {
-            luckPerms = null;
         }
     }
 
-    private boolean setupEconomy() {
+    private void setupEconomy() {
         RegisteredServiceProvider<Economy> rsp = instance.getServer().getServicesManager().getRegistration(Economy.class);
-
-        if (rsp == null) return false;
-
-        economy = rsp.getProvider();
-
-        return economy != null;
+        if (rsp != null) {
+            economy = rsp.getProvider();
+        }
     }
 
     public HookInstance getInstance() {
@@ -86,4 +83,8 @@ public LuckPerms getLuckPerms() {
     public Economy getEconomy() {
         return economy;
     }
+
+    public ChunkyAPI getChunky() {
+        return chunky;
+    }
 }

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

@@ -1,11 +1,14 @@
 package systems.kscott.randomspawnplus.spawn;
 
 import it.unimi.dsi.fastutil.longs.LongArrayList;
+import org.popcraft.chunky.api.ChunkyAPI;
 import systems.kscott.randomspawnplus.RandomSpawnPlus;
 import systems.kscott.randomspawnplus.config.Config;
+import systems.kscott.randomspawnplus.hooks.HookInstance;
 import systems.kscott.randomspawnplus.util.Locations;
 import systems.kscott.randomspawnplus.util.PlatformUtil;
 import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
@@ -47,11 +50,23 @@ private static void initSpawnChunks() {
         long start = System.currentTimeMillis();
         CompletableFuture<LongArrayList> prepareChunksTask = PlatformUtil.getPlatform().collectNonGeneratedChunksAsync(spawnLevel, minX, minZ, maxX, maxZ);
 
-        prepareChunksTask.thenAccept($ -> {
-            initSpawnPoints();
-            // TODO: change to logger or remove
+        prepareChunksTask.thenAccept(chunks -> {
+            if (chunks.isEmpty()) return;
+
+            System.out.println("Found non-generated chunks: " + chunks.size());
             System.out.println("Prepare chunks took " + (System.currentTimeMillis() - start) + "ms");
+
+            generateSpawnChunks(worldStr, minX, minZ, maxX, maxZ);
+        });
+    }
+
+    private static void generateSpawnChunks(String spawnLevel, int minX, int minZ, int maxX, int maxZ) {
+        ChunkyAPI chunky = RandomSpawnPlus.getHooks().getChunky();
+        chunky.startTask(spawnLevel, "square", minX, minZ, maxX, maxZ, "concentric");
+        chunky.onGenerationComplete(event -> {
+            RandomSpawnPlus.LOGGER.info("Generation completed for {}", event.world());
             SpawnData.finalizeSpawnChunksGeneration();
+            initSpawnPoints();
         });
     }
 

Common/src/main/resources/plugin.yml

@@ -7,6 +7,7 @@ softdepend:
   - Essentials
   - Vault
   - LuckPerms
+  - Chunky
 authors:
   - 89apt89
   - Dreeam-qwq

build-logic/src/main/kotlin/cn.dreeam.rsp.wrapper.gradle.kts

@@ -27,6 +27,12 @@ repositories {
         url = uri("https://repo.bsdevelopment.org/releases")
     }
 
+    // Chunky
+    maven {
+        name = "CodeMC-repo"
+        url = uri("https://repo.codemc.io/repository/maven-public")
+    }
+
     // JitPack
     maven {
         name = "jitpack.io"