Merge pull request #4188 from ZockiRR/v3.0

Async chunk loading for spigot/paper 1.21.3/1.21.4

Author: mikeprimm

bukkit-helper-121-3/src/main/java/org/dynmap/bukkit/helper/v121_3/BukkitVersionHelperSpigot121_3.java

@@ -67,7 +67,7 @@ public class BukkitVersionHelperSpigot121_3 extends BukkitVersionHelper {
 
     @Override
     public boolean isUnsafeAsync() {
-        return true;
+        return false;
     }
 
      /**

bukkit-helper-121-3/src/main/java/org/dynmap/bukkit/helper/v121_3/MapChunkCache121_3.java

@@ -6,7 +6,9 @@
 import net.minecraft.world.level.biome.BiomeFog;
 import net.minecraft.world.level.chunk.Chunk;
 import net.minecraft.world.level.chunk.storage.SerializableChunkData;
+import org.bukkit.Bukkit;
 import org.bukkit.World;
+import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
 import org.bukkit.craftbukkit.v1_21_R2.CraftWorld;
 import org.dynmap.DynmapChunk;
 import org.dynmap.bukkit.helper.BukkitWorld;
@@ -17,7 +19,10 @@
 
 import java.util.List;
 import java.util.NoSuchElementException;
+import java.util.Optional;
 import java.util.concurrent.CancellationException;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Supplier;
 
 /**
  * Container for managing chunks - dependent upon using chunk snapshots, since rendering is off server thread
@@ -31,6 +36,19 @@ public MapChunkCache121_3(GenericChunkCache cc) {
         super(cc);
     }
 
+    @Override
+    protected Supplier<GenericChunk> getLoadedChunkAsync(DynmapChunk chunk) {
+        CompletableFuture<Optional<SerializableChunkData>> chunkData = CompletableFuture.supplyAsync(() -> {
+            CraftWorld cw = (CraftWorld) w;
+            Chunk c = cw.getHandle().getChunkIfLoaded(chunk.x, chunk.z);
+            if (c == null || !c.q) { // !c.loaded
+                return Optional.empty();
+            }
+            return Optional.of(SerializableChunkData.a(cw.getHandle(), c)); // SerializableChunkData.copyOf
+        }, ((CraftServer) Bukkit.getServer()).getServer());
+        return () -> chunkData.join().map(SerializableChunkData::a).map(NBT.NBTCompound::new).map(this::parseChunkFromNBT).orElse(null); // SerializableChunkData::write
+    }
+
     protected GenericChunk getLoadedChunk(DynmapChunk chunk) {
         CraftWorld cw = (CraftWorld) w;
         if (!cw.isChunkLoaded(chunk.x, chunk.z)) return null;
@@ -41,6 +59,13 @@ protected GenericChunk getLoadedChunk(DynmapChunk chunk) {
         return nbt != null ? parseChunkFromNBT(new NBT.NBTCompound(nbt)) : null;
     }
 
+    @Override
+    protected Supplier<GenericChunk> loadChunkAsync(DynmapChunk chunk) {
+        CraftWorld cw = (CraftWorld) w;
+        CompletableFuture<Optional<NBTTagCompound>> genericChunk = cw.getHandle().m().a.d(new ChunkCoordIntPair(chunk.x, chunk.z)); // WorldServer.getChunkSource().chunkMap.read(new ChunkCoordIntPair(chunk.x, chunk.z))
+        return () -> genericChunk.join().map(NBT.NBTCompound::new).map(this::parseChunkFromNBT).orElse(null);
+    }
+
     protected GenericChunk loadChunk(DynmapChunk chunk) {
         CraftWorld cw = (CraftWorld) w;
         NBTTagCompound nbt = null;

bukkit-helper-121-4/src/main/java/org/dynmap/bukkit/helper/v121_4/BukkitVersionHelperSpigot121_4.java

@@ -67,7 +67,7 @@ public class BukkitVersionHelperSpigot121_4 extends BukkitVersionHelper {
 
     @Override
     public boolean isUnsafeAsync() {
-        return true;
+        return false;
     }
 
      /**

bukkit-helper-121-4/src/main/java/org/dynmap/bukkit/helper/v121_4/MapChunkCache121_4.java

@@ -6,7 +6,9 @@
 import net.minecraft.world.level.biome.BiomeFog;
 import net.minecraft.world.level.chunk.Chunk;
 import net.minecraft.world.level.chunk.storage.SerializableChunkData;
+import org.bukkit.Bukkit;
 import org.bukkit.World;
+import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
 import org.bukkit.craftbukkit.v1_21_R3.CraftWorld;
 import org.dynmap.DynmapChunk;
 import org.dynmap.bukkit.helper.BukkitWorld;
@@ -17,7 +19,10 @@
 
 import java.util.List;
 import java.util.NoSuchElementException;
+import java.util.Optional;
 import java.util.concurrent.CancellationException;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Supplier;
 
 /**
  * Container for managing chunks - dependent upon using chunk snapshots, since rendering is off server thread
@@ -31,6 +36,19 @@ public MapChunkCache121_4(GenericChunkCache cc) {
         super(cc);
     }
 
+    @Override
+    protected Supplier<GenericChunk> getLoadedChunkAsync(DynmapChunk chunk) {
+        CompletableFuture<Optional<SerializableChunkData>> chunkData = CompletableFuture.supplyAsync(() -> {
+            CraftWorld cw = (CraftWorld) w;
+            Chunk c = cw.getHandle().getChunkIfLoaded(chunk.x, chunk.z);
+            if (c == null || !c.q) { // !c.loaded
+                return Optional.empty();
+            }
+            return Optional.of(SerializableChunkData.a(cw.getHandle(), c)); // SerializableChunkData.copyOf
+        }, ((CraftServer) Bukkit.getServer()).getServer());
+        return () -> chunkData.join().map(SerializableChunkData::a).map(NBT.NBTCompound::new).map(this::parseChunkFromNBT).orElse(null); // SerializableChunkData::write
+    }
+
     protected GenericChunk getLoadedChunk(DynmapChunk chunk) {
         CraftWorld cw = (CraftWorld) w;
         if (!cw.isChunkLoaded(chunk.x, chunk.z)) return null;
@@ -41,6 +59,13 @@ protected GenericChunk getLoadedChunk(DynmapChunk chunk) {
         return nbt != null ? parseChunkFromNBT(new NBT.NBTCompound(nbt)) : null;
     }
 
+    @Override
+    protected Supplier<GenericChunk> loadChunkAsync(DynmapChunk chunk) {
+        CraftWorld cw = (CraftWorld) w;
+        CompletableFuture<Optional<NBTTagCompound>> genericChunk = cw.getHandle().m().a.d(new ChunkCoordIntPair(chunk.x, chunk.z)); // WorldServer.getChunkSource().chunkMap.read(new ChunkCoordIntPair(chunk.x, chunk.z))
+        return () -> genericChunk.join().map(NBT.NBTCompound::new).map(this::parseChunkFromNBT).orElse(null);
+    }
+
     protected GenericChunk loadChunk(DynmapChunk chunk) {
         CraftWorld cw = (CraftWorld) w;
         NBTTagCompound nbt = null;