optimizations + other stuff

Author: dragon731012

dependency-reduced-pom.xml

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

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

@@ -24,6 +24,8 @@
 import org.bukkit.util.Vector;
 import org.bukkit.event.block.BlockPhysicsEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
+import org.bukkit.event.block.BlockExplodeEvent;
+import org.bukkit.event.block.BlockFromToEvent;
 import org.bukkit.event.player.PlayerChangedWorldEvent;
 
 import java.util.concurrent.ExecutorService;
@@ -67,7 +69,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 final Set<WorldChunkKey> pendingGeneration = ConcurrentHashMap.newKeySet();
 
     private void logDebug(String message) {
         if (debug) getLogger().log(Level.INFO, "[TuffX-Debug] " + message);
@@ -252,6 +254,12 @@ public void run() {
                                 World world = player.getWorld();
 
                                 WorldChunkKey key = new WorldChunkKey(world.getName(), vec.getBlockX(), vec.getBlockZ());
+
+                                if (pendingGeneration.contains(key)) {
+                                    queue.add(vec);
+                                    continue;
+                                }
+
                                 List<byte[]> cachedData = chunkPayloadCache.getIfPresent(key);
                                 if (cachedData != null) {
                                     sendPayloadsToPlayer(player, cachedData);
@@ -263,7 +271,20 @@ public void run() {
                                     processAndSendChunk(player, world.getChunkAt(vec.getBlockX(), vec.getBlockZ()));
                                 } else {
                                     world.loadChunk(vec.getBlockX(), vec.getBlockZ(), true);
-                                    queue.add(vec); 
+                                    pendingGeneration.add(key);
+                                    
+                                    new BukkitRunnable() {
+                                        @Override
+                                        public void run() {
+                                            if (player.isOnline() && world.isChunkLoaded(vec.getBlockX(), vec.getBlockZ())) {
+                                                processAndSendChunk(player, world.getChunkAt(vec.getBlockX(), vec.getBlockZ()));
+                                            } else {
+                                                logDebug("Chunk " + key + " was not ready after delay, re-queueing.");
+                                                queue.add(vec);
+                                            }
+                                            pendingGeneration.remove(key); 
+                                        }
+                                    }.runTaskLater(TuffX.this, 5L); 
                                 }
                             }
                         }
@@ -477,39 +498,85 @@ public void onBlockPlace(BlockPlaceEvent event) {
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onBlockPhysics(BlockPhysicsEvent event) { 
-        Block block = event.getBlock(); 
+    public void onBlockPhysics(BlockPhysicsEvent event) {
+        final Block block = event.getBlock();
+        if (block.getY() < 0) {
+            final Location loc = block.getLocation();
+            final World world = loc.getWorld();
+
+            new BukkitRunnable() {
+                @Override
+                public void run() {
+                    BlockData updatedData = world.getBlockData(loc);
+                    sendSingleBlockUpdate(loc, updatedData);
+                    invalidateChunkCache(world, loc.getBlockX(), loc.getBlockZ());
+                }
+            }.runTask(this);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onBlockExplode(BlockExplodeEvent event) {
+        final Set<WorldChunkKey> affectedChunks = new HashSet<>();
+        final List<Block> blocksToUpdate = new ArrayList<>(event.blockList());
+
+        new BukkitRunnable() {
+            @Override
+            public void run() {
+                for (Block block : blocksToUpdate) {
+                    if (block.getY() < 0) {
+                        sendSingleBlockUpdate(block.getLocation(), Material.AIR.createBlockData());
+                        affectedChunks.add(new WorldChunkKey(block.getWorld().getName(), block.getX() >> 4, block.getZ() >> 4));
+                    }
+                }
+
+                if (!affectedChunks.isEmpty()) {
+                    logDebug("Explosion updated " + affectedChunks.size() + " chunks below y=0.");
+                    affectedChunks.forEach(chunkPayloadCache::invalidate);
+                }
+            }
+        }.runTask(this);
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onBlockFromTo(BlockFromToEvent event) {
+        final Block block = event.getToBlock();
+
         if (block.getY() < 0) {
-            sendSingleBlockUpdate(block.getLocation(), block.getBlockData());
-            //sendLightingUpdate(block.getLocation()); 
-            invalidateChunkCache(block.getWorld(), block.getX(), block.getZ());
+            new BukkitRunnable() {
+                @Override
+                public void run() {
+                    sendSingleBlockUpdate(block.getLocation(), block.getBlockData());
+                    invalidateChunkCache(block.getWorld(), block.getX(), block.getZ());
+                }
+            }.runTask(this);
         }
     }
 
     private void sendSingleBlockUpdate(Location loc, BlockData data) {
         try (ByteArrayOutputStream bout = new ByteArrayOutputStream(64);
             DataOutputStream out = new DataOutputStream(bout)) {
-            
+
             out.writeUTF("block_update");
             out.writeInt(loc.getBlockX());
             out.writeInt(loc.getBlockY());
             out.writeInt(loc.getBlockZ());
-            
+
             int[] legacyData = viablockids.toLegacy(data);
             out.writeShort((short) ((legacyData[1] << 12) | (legacyData[0] & 0xFFF)));
-            
+
             byte[] payload = bout.toByteArray();
-            
+
             new BukkitRunnable() {
                 @Override
                 public void run() {
                     for (Player p : loc.getWorld().getPlayers()) {
-                        if (p.getLocation().distanceSquared(loc) < 4096) { 
+                        if (p.getLocation().distanceSquared(loc) < 4096) {
                             p.sendPluginMessage(TuffX.this, CHANNEL, payload);
                         }
                     }
                 }
-            }.runTaskAsynchronously(this);
+            }.runTask(this);
 
         } catch (IOException e) {
             getLogger().severe("Failed to create single block update payload: " + e.getMessage());

src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: TuffX
-version: 1.0.4
+version: 1.0.5
 main: net.potato.tuff.TuffX
 author: Potato
 api-version: 1.21

src/main/resources/version-remote.json

@@ -1,4 +1,4 @@
 {
-  "latestVersion": "1.0.4",
+  "latestVersion": "1.0.5",
   "downloadUrl": "https://verytuffautoupdater.netlify.app/TuffX.jar"
 }