final optimizations

Author: dragon731012

dependency-reduced-pom.xml

@@ -61,9 +61,9 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot-api</artifactId>
-      <version>1.21.8-R0.1-SNAPSHOT</version>
+      <groupId>io.papermc.paper</groupId>
+      <artifactId>paper-api</artifactId>
+      <version>1.21-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -80,7 +80,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <java.version>17</java.version>
+    <java.version>21</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>

pom.xml

@@ -13,7 +13,7 @@
     <description>A plugin to send below-Y0 block data to Eaglercraft clients.</description>
 
     <properties>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -91,11 +91,10 @@
     </repositories>
 
     <dependencies>
-        <!-- Spigot API -->
         <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>1.21.8-R0.1-SNAPSHOT</version>
+            <groupId>io.papermc.paper</groupId>
+            <artifactId>paper-api</artifactId>
+            <version>1.21-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 

src/main/java/net/potato/tuff/TuffX.java

@@ -67,6 +67,7 @@ public class TuffX extends JavaPlugin implements Listener, PluginMessageListener
     private final ThreadLocal<short[]> threadLocalBlockArray = ThreadLocal.withInitial(() -> new short[4096]);
     private final ThreadLocal<byte[]> threadLocalLightArray = ThreadLocal.withInitial(() -> new byte[4096]);
     private final ThreadLocal<ByteArrayOutputStream> threadLocalOutStream = ThreadLocal.withInitial(() -> new ByteArrayOutputStream(8256));
+    private final Set<WorldChunkKey> pendingChunkLoads = ConcurrentHashMap.newKeySet();
 
     private void logDebug(String message) {
         if (debug) getLogger().log(Level.INFO, "[TuffX-Debug] " + message);
@@ -253,42 +254,20 @@ public void run() {
                         if (cachedData != null) {
                             sendPayloadsToPlayer(player, cachedData);
                             checkIfInitialLoadComplete(player);
-                            continue;
-                        }
-
-                        if (world.isChunkLoaded(key.x(), key.z())) {
-                            processAndSendChunk(player, world.getChunkAt(key.x(), key.z()));
                         } else {
-                            queue.add(vec);
+                            if (world.isChunkLoaded(key.x(), key.z())) {
+                                processAndSendChunk(player, world.getChunkAt(key.x(), key.z()));
+                            } else {
+                                world.loadChunk(key.x(), key.z(), true);
+                                queue.add(vec);
+                            }
                         }
                     }
                 }
             }
         }.runTaskTimer(this, 0L, 1L);
     }
 
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onPlayerChangeWorld(PlayerChangedWorldEvent event) {
-        Player player = event.getPlayer();
-        UUID playerId = player.getUniqueId();
-
-        Queue<Vector> playerQueue = requestQueue.get(playerId);
-        if (playerQueue != null && !playerQueue.isEmpty()) {
-            logDebug("Player " + player.getName() + " changed worlds. Clearing " + playerQueue.size() + " pending chunk requests.");
-            playerQueue.clear();
-        }
-        
-        if (initialChunksToProcess.remove(playerId) != null) {
-            logDebug("Player " + player.getName() + " was in the middle of an initial chunk load. The process has been cancelled.");
-            awaitingInitialBatch.remove(playerId);
-            player.sendPluginMessage(this, CHANNEL, createLoadFinishedPayload());
-        }
-
-        player.sendPluginMessage(this, CHANNEL, createDimensionPayload());
-
-        player.sendPluginMessage(this, CHANNEL, createBelowY0StatusPayload(enabledWorlds.contains(player.getWorld().getName())));
-    }
-
     private void processAndSendChunk(final Player player, final Chunk chunk) {
         if (chunk == null || !player.isOnline() || chunkProcessorPool.isShutdown()) {
             return;
@@ -301,10 +280,9 @@ private void processAndSendChunk(final Player player, final Chunk chunk) {
             final ChunkSnapshot snapshot = chunk.getChunkSnapshot(true, false, false);
             final Map<BlockData, int[]> conversionCache = threadLocalConversionCache.get();
             conversionCache.clear(); 
-
             for (int sectionY = -4; sectionY < 0; sectionY++) {
                 if (!player.isOnline()) {
-                    return;
+                    return; 
                 }
                 try {
                     byte[] payload = createSectionPayload(snapshot, chunk.getX(), chunk.getZ(), sectionY, conversionCache);
@@ -322,16 +300,36 @@ private void processAndSendChunk(final Player player, final Chunk chunk) {
                 @Override
                 public void run() {
                     if (player.isOnline()) {
-                        for (byte[] payload : processedPayloads) {
-                            player.sendPluginMessage(TuffX.this, CHANNEL, payload);
-                        }
+                        sendPayloadsToPlayer(player, processedPayloads);
                         checkIfInitialLoadComplete(player);
                     }
                 }
             }.runTask(this);
         });
     }
 
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onPlayerChangeWorld(PlayerChangedWorldEvent event) {
+        Player player = event.getPlayer();
+        UUID playerId = player.getUniqueId();
+
+        Queue<Vector> playerQueue = requestQueue.get(playerId);
+        if (playerQueue != null && !playerQueue.isEmpty()) {
+            logDebug("Player " + player.getName() + " changed worlds. Clearing " + playerQueue.size() + " pending chunk requests.");
+            playerQueue.clear();
+        }
+        
+        if (initialChunksToProcess.remove(playerId) != null) {
+            logDebug("Player " + player.getName() + " was in the middle of an initial chunk load. The process has been cancelled.");
+            awaitingInitialBatch.remove(playerId);
+            player.sendPluginMessage(this, CHANNEL, createLoadFinishedPayload());
+        }
+
+        player.sendPluginMessage(this, CHANNEL, createDimensionPayload());
+
+        player.sendPluginMessage(this, CHANNEL, createBelowY0StatusPayload(enabledWorlds.contains(player.getWorld().getName())));
+    }
+
     private void sendPayloadsToPlayer(Player player, List<byte[]> payloads) {
         new BukkitRunnable() {
             @Override