feat(folia): add folia support

Jsinco · Jsinco · commit c4a5b98a0ba0 · 2026-02-08T12:04:47.000-05:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 }
 
 val isSnapshot: Boolean = project.hasProperty("snapshot") || System.getProperty("snapshot")?.toBoolean() == true
-val stable = "1.1.0"
+val stable = "1.2.0"
 
 allprojects {
     apply(plugin = "java")
diff --git a/main/src/main/java/me/outspending/biomesapi/BiomeUpdater.java b/main/src/main/java/me/outspending/biomesapi/BiomeUpdater.java
@@ -11,17 +11,18 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * Utility class for updating biomes in Minecraft.
  * This class provides methods for updating the biomes of chunks and regions in a Minecraft world.
  * It uses the UnsafeValues instance to perform unsafe operations.
  *
- * @version 0.0.15
+ * @version 1.2.0
  * @since 0.0.1
  * @author Outspending
  */
-@AsOf("0.0.15")
+@AsOf("1.2.0")
 public interface BiomeUpdater {
 
     /**
@@ -44,21 +45,21 @@ public interface BiomeUpdater {
      * @param from The starting location.
      * @param to The ending location.
      * @return A list of chunks between the two locations.
-     * @version 0.0.1
+     * @since 0.0.1
      */
-    @AsOf("0.0.1")
-    default @NotNull List<Chunk> getChunksBetweenLocations(@NotNull Location from, @NotNull Location to) {
+    @AsOf("1.2.0")
+    default @NotNull List<CompletableFuture<Chunk>> getChunksBetweenLocations(@NotNull Location from, @NotNull Location to) {
         if (!from.getWorld().equals(to.getWorld())) {
             throw new IllegalArgumentException("Locations must be in the same world.");
         }
 
-        List<Chunk> chunks = new ArrayList<>();
+        List<CompletableFuture<Chunk>> chunks = new ArrayList<>();
 
         PointRange2D range = PointRange2D.of(from, to);
         World world = from.getWorld();
         for (int x = range.minX(); x <= range.maxX(); x += 16) {
             for (int z = range.minZ(); z <= range.maxZ(); z += 16) {
-                chunks.add(world.getChunkAt(x >> 4, z >> 4));
+                chunks.add(world.getChunkAtAsync(x >> 4, z >> 4));
             }
         }
 
@@ -70,10 +71,10 @@ public interface BiomeUpdater {
      * This method is a convenience method that calls the updateChunks method with a list containing the chunk.
      *
      * @param chunk The chunk to update.
-     * @version 0.0.1
+     * @since 0.0.1
      */
-    @AsOf("0.0.1")
-    void updateChunk(@NotNull Chunk chunk);
+    @AsOf("1.2.0")
+    void updateChunk(@NotNull CompletableFuture<Chunk> chunk);
 
     /**
      * Updates the biomes of the chunks between two locations.
@@ -93,10 +94,10 @@ public interface BiomeUpdater {
      * The update packet contains the new biome data for the chunk.
      *
      * @param chunks The chunks to update.
-     * @version 0.0.1
+     * @since 0.0.1
      */
-    @AsOf("0.0.1")
-    void updateChunks(@NotNull List<Chunk> chunks);
+    @AsOf("1.2.0")
+    void updateChunks(@NotNull List<CompletableFuture<Chunk>> chunks);
 
 
     /**
diff --git a/main/src/main/java/me/outspending/biomesapi/BiomeUpdaterImpl.java b/main/src/main/java/me/outspending/biomesapi/BiomeUpdaterImpl.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * Implementation of the BiomeUpdater interface.
@@ -22,7 +23,7 @@
 public class BiomeUpdaterImpl implements BiomeUpdater {
 
     @Override
-    public void updateChunk(@NotNull Chunk chunk) {
+    public void updateChunk(@NotNull CompletableFuture<Chunk> chunk) {
         updateChunks(List.of(chunk));
     }
 
@@ -31,28 +32,28 @@ public void updateChunks(Location from, Location to) {
         if (from == null || to == null) {
             throw new IllegalArgumentException("Locations cannot be null.");
         } else {
-            List<Chunk> updateChunks = getChunksBetweenLocations(from, to);
+            List<CompletableFuture<Chunk>> updateChunks = getChunksBetweenLocations(from, to);
 
             updateChunks(updateChunks);
         }
     }
 
     @Override
-    public void updateChunks(@NotNull List<Chunk> chunks) {
+    public void updateChunks(@NotNull List<CompletableFuture<Chunk>> chunks) {
         UnsafeNMSHandler.executeNMS(nms -> nms.updateChunks(chunks));
     }
 
 
     @Override
     public void updateChunkRadius(@NotNull Chunk chunk, int radius) {
-        List<Chunk> chunks = new ArrayList<>();
+        List<CompletableFuture<Chunk>> chunks = new ArrayList<>();
         World world = chunk.getWorld();
         int chunkX = chunk.getX();
         int chunkZ = chunk.getZ();
 
         for (int x = chunkX - radius; x <= chunkX + radius; x++) {
             for (int z = chunkZ - radius; z <= chunkZ + radius; z++) {
-                chunks.add(world.getChunkAt(x, z));
+                chunks.add(world.getChunkAtAsync(x, z));
             }
         }
         updateChunks(chunks);
@@ -66,10 +67,10 @@ public void updateChunksForPlayer(@NotNull Player player) {
 
         int playerChunkX = playerLocation.getBlockX() >> 4;
         int playerChunkZ = playerLocation.getBlockZ() >> 4;
-        List<Chunk> chunksToUpdate = new ArrayList<>();
+        List<CompletableFuture<Chunk>> chunksToUpdate = new ArrayList<>();
         for (int x = playerChunkX - viewDistance; x <= playerChunkX + viewDistance; x++) {
             for (int z = playerChunkZ - viewDistance; z <= playerChunkZ + viewDistance; z++) {
-                chunksToUpdate.add(world.getChunkAt(x, z));
+                chunksToUpdate.add(world.getChunkAtAsync(x, z));
             }
         }
 
diff --git a/main/src/main/java/me/outspending/biomesapi/renderer/packet/data/ChunkLocation.java b/main/src/main/java/me/outspending/biomesapi/renderer/packet/data/ChunkLocation.java
@@ -8,15 +8,17 @@
 import org.bukkit.block.Block;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.concurrent.CompletableFuture;
+
 /**
  * A data class representing a chunk location.
  * @param x the chunk x coordinate
  * @param z the chunk z coordinate
- * @version 0.0.11
+ * @version 1.2.0
  * @since 0.0.6
  * @author Jsinco
  */
-@AsOf("0.0.11")
+@AsOf("1.2.0")
 public record ChunkLocation(int x, int z) {
 
     /**
@@ -122,8 +124,8 @@ public boolean isWithinRadius(ChunkLocation other, int radius) {
      * @return the Bukkit Chunk at this ChunkLocation in the given world
      */
     @AsOf("1.2.0")
-    public @NotNull Chunk toBukkitChunk(World world) {
-        return world.getChunkAt(x, z);
+    public @NotNull CompletableFuture<Chunk> toBukkitChunk(World world) {
+        return world.getChunkAtAsync(x, z);
     }
 
     /**
@@ -132,9 +134,8 @@ public boolean isWithinRadius(ChunkLocation other, int radius) {
      * @return the center block of this chunk in the given world
      */
     @AsOf("1.2.0")
-    public @NotNull Block centerBlock(@NotNull World world) {
-        Chunk chunk = toBukkitChunk(world);
-        return chunk.getBlock(7, 0, 7); // starts at 0, so 7 is the center block in a 16x16 chunk
+    public @NotNull CompletableFuture<Block> centerBlock(@NotNull World world) {
+        return toBukkitChunk(world).thenApply(chunk -> chunk.getBlock(7, 0, 7));
     }
 
     /**
@@ -143,9 +144,8 @@ public boolean isWithinRadius(ChunkLocation other, int radius) {
      * @return the biome of the center block of this chunk in the given world
      */
     @AsOf("1.2.0")
-    public @NotNull Biome getCenterBiome(@NotNull World world) {
-        Block centerBlock = centerBlock(world);
-        return centerBlock.getBiome();
+    public @NotNull CompletableFuture<Biome> getCenterBiome(@NotNull World world) {
+        return centerBlock(world).thenApply(Block::getBiome);
     }
 
     @Override
diff --git a/main/src/main/java/me/outspending/biomesapi/renderer/setter/GlobalBiomeSetter.java b/main/src/main/java/me/outspending/biomesapi/renderer/setter/GlobalBiomeSetter.java
@@ -15,6 +15,8 @@
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.concurrent.CompletableFuture;
+
 /**
  * This class provides methods to set the biome of blocks, chunks, and regions in the game.
  *
@@ -43,7 +45,7 @@ public void setBlockBiome(@NotNull Block block, @NotNull CustomBiome customBiome
         accessor.setBiome(location.getBlockX(), location.getBlockY(), location.getBlockZ(), customBiome.toBukkitBiome());
 
         if (updateBiome) {
-            BIOME_UPDATER.updateChunk(location.getChunk());
+            BIOME_UPDATER.updateChunk(location.getWorld().getChunkAtAsync(location));
         }
     }
 
@@ -92,7 +94,7 @@ public void setChunkBiome(@NotNull Chunk chunk, int minHeight, int maxHeight, @N
         }
 
         if (updateBiome) {
-            BIOME_UPDATER.updateChunk(chunk);
+            BIOME_UPDATER.updateChunk(CompletableFuture.completedFuture(chunk));
         }
     }
 
diff --git a/minecraft/1_21_11/src/main/java/me/outspending/biomesapi/UnsafeNMS_v1_21_11.java b/minecraft/1_21_11/src/main/java/me/outspending/biomesapi/UnsafeNMS_v1_21_11.java
@@ -63,18 +63,25 @@ public class UnsafeNMS_v1_21_11 implements UnsafeNMS {
      * @param chunks The chunks to update.
      */
     @Override
-    public void updateChunks(@NotNull List<Chunk> chunks) {
+    public void updateChunks(@NotNull List<CompletableFuture<Chunk>> chunks) {
         CompletableFuture.runAsync(() -> {
-            for (Chunk chunk : chunks) {
-                LevelChunk levelChunk = (LevelChunk) ((CraftChunk) chunk).getHandle(ChunkStatus.BIOMES);
-                LevelLightEngine levelLightEngine = levelChunk.getLevel().getLightEngine();
-
-                ClientboundLevelChunkWithLightPacket packet = new ClientboundLevelChunkWithLightPacket(levelChunk, levelLightEngine, null, null, true);
-                for (Player player : getPlayersInDistance(chunk)) {
-                    ((CraftPlayer) player).getHandle().connection.send(packet);
-                }
+            for (CompletableFuture<Chunk> chunkFuture : chunks) {
+                chunkFuture.thenAccept(chunk -> {
+                    LevelChunk levelChunk = (LevelChunk) ((CraftChunk) chunk).getHandle(ChunkStatus.BIOMES);
+                    LevelLightEngine levelLightEngine = levelChunk.getLevel().getLightEngine();
+
+                    ClientboundLevelChunkWithLightPacket packet = new ClientboundLevelChunkWithLightPacket(levelChunk, levelLightEngine, null, null, true);
+                    for (Player player : getPlayersInDistance(chunk)) {
+                        ((CraftPlayer) player).getHandle().connection.send(packet);
+                    }
+                }).exceptionally(ex -> {
+                    ex.printStackTrace();
+                    return null;
+                });
             }
-
+        }).exceptionally(ex -> {
+            ex.printStackTrace();
+            return null;
         });
     }
 
@@ -161,10 +168,14 @@ public void updateBiome(@NotNull Location minLoc, @NotNull Location maxLoc, @Not
             for (int x = minLoc.getBlockX(); x <= maxLoc.getBlockX(); x++) {
                 for (int y = minLoc.getBlockY(); y <= maxLoc.getBlockY(); y++) {
                     for (int z = minLoc.getBlockZ(); z <= maxLoc.getBlockZ(); z++) {
-                        Chunk chunk = minLoc.getWorld().getChunkAt(x, z);
-                        LevelChunk levelChunk = (LevelChunk) ((CraftChunk) chunk).getHandle(ChunkStatus.BIOMES);
-
-                        levelChunk.setBiome(x, y, z, biome);
+                        final int finalX = x;
+                        final int finalY = y;
+                        final int finalZ = z;
+
+                        minLoc.getWorld().getChunkAtAsync(x, z).thenAccept(chunk -> {
+                            LevelChunk levelChunk = (LevelChunk) ((CraftChunk) chunk).getHandle(ChunkStatus.BIOMES);
+                            levelChunk.setBiome(finalX, finalY, finalZ, biome);
+                        });
                     }
                 }
             }
diff --git a/minecraft/Wrapper/src/main/java/me/outspending/biomesapi/unsafe/UnsafeNMS.java b/minecraft/Wrapper/src/main/java/me/outspending/biomesapi/unsafe/UnsafeNMS.java
@@ -9,6 +9,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 import java.util.function.Supplier;
 
 public interface UnsafeNMS {
@@ -55,7 +56,7 @@ default List<Player> getPlayersInDistance(@NotNull Chunk chunk) {
      *
      * @param chunks The chunks to update.
      */
-    void updateChunks(@NotNull List<Chunk> chunks);
+    void updateChunks(@NotNull List<CompletableFuture<Chunk>> chunks);
 
     /**
      * Locks or unlocks the biome registry.

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ plugins {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`val isSnapshot: Boolean = project.hasProperty("snapshot") \|\| System.getProperty("snapshot")?.toBoolean() == true`
`11`		`-val stable = "1.1.0"`
	`11`	`+val stable = "1.2.0"`
`12`	`12`
`13`	`13`	`allprojects {`
`14`	`14`	`apply(plugin = "java")`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`	`import org.bukkit.util.Vector;`
`16`	`16`	`import org.jetbrains.annotations.NotNull;`
`17`	`17`
	`18`	`+import java.util.concurrent.CompletableFuture;`
	`19`	`+`
`18`	`20`	`/**`
`19`	`21`	`* This class provides methods to set the biome of blocks, chunks, and regions in the game.`
`20`	`22`	`*`
`@@ -43,7 +45,7 @@ public void setBlockBiome(@NotNull Block block, @NotNull CustomBiome customBiome`
`43`	`45`	`accessor.setBiome(location.getBlockX(), location.getBlockY(), location.getBlockZ(), customBiome.toBukkitBiome());`
`44`	`46`
`45`	`47`	`if (updateBiome) {`
`46`		`- BIOME_UPDATER.updateChunk(location.getChunk());`
	`48`	`+ BIOME_UPDATER.updateChunk(location.getWorld().getChunkAtAsync(location));`
`47`	`49`	`}`
`48`	`50`	`}`
`49`	`51`
`@@ -92,7 +94,7 @@ public void setChunkBiome(@NotNull Chunk chunk, int minHeight, int maxHeight, @N`
`92`	`94`	`}`
`93`	`95`
`94`	`96`	`if (updateBiome) {`
`95`		`- BIOME_UPDATER.updateChunk(chunk);`
	`97`	`+ BIOME_UPDATER.updateChunk(CompletableFuture.completedFuture(chunk));`
`96`	`98`	`}`
`97`	`99`	`}`
`98`	`100`