Fix runtime packet handling, swimming state, tests, and add Folia-compatible scheduler

build.gradle

@@ -46,13 +46,15 @@ dependencies {
     annotationProcessor 'org.projectlombok:lombok:1.18.30'
 
     // Tests
-    testImplementation 'com.viaversion:viaversion:5.9.1'
-    testImplementation 'com.viaversion:viabackwards:5.3.2'
-    testImplementation 'io.netty:netty-all:4.1.97.Final'
+    testImplementation 'com.github.seeseemelk:MockBukkit-v1.18:2.85.2'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.0'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-    testImplementation 'com.github.seeseemelk:MockBukkit-v1.18:2.85.2'
+    testRuntimeOnly 'org.spigotmc:spigot-api:1.18.2-R0.1-SNAPSHOT'
+    testRuntimeOnly 'io.netty:netty-all:4.1.97.Final'
+    testRuntimeOnly 'it.unimi.dsi:fastutil:8.5.16'
+    testRuntimeOnly 'com.viaversion:viaversion:5.9.1'
+    testRuntimeOnly 'com.viaversion:viabackwards:5.3.2'
 }
 
 processResources {
@@ -96,4 +98,4 @@ test {
         events "passed", "skipped", "failed"
         exceptionFormat = "full"
     }
-}
+}

src/main/java/tf/tuff/ServerRegistry.java

@@ -5,12 +5,14 @@
 import org.java_websocket.handshake.ServerHandshake;
 import java.net.URI;
 
+import tf.tuff.util.SchedulerCompat;
+
 public class ServerRegistry {
     private final JavaPlugin p;
     private final String wsUrl;
     private final String server;
     private WebSocketClient client;
-    private boolean running = true;
+    private volatile boolean running = true;
 
     public ServerRegistry(JavaPlugin pl, String registryUrl, String serverAddr) {
         p = pl;
@@ -19,7 +21,7 @@ public ServerRegistry(JavaPlugin pl, String registryUrl, String serverAddr) {
     }
 
     public void connect() {
-        p.getServer().getScheduler().runTaskAsynchronously(p, this::doConnect);
+        SchedulerCompat.runAsync(p, this::doConnect);
     }
 
     private void doConnect() {
@@ -40,7 +42,7 @@ public void onMessage(String msg) {
                 @Override
                 public void onClose(int code, String reason, boolean remote) {
                     if (running) {
-                        p.getServer().getScheduler().runTaskLaterAsynchronously(p, () -> doConnect(), 100L);
+                        SchedulerCompat.runAsyncLater(p, ServerRegistry.this::doConnect, 100L);
                     }
                 }
 
@@ -52,7 +54,7 @@ public void onError(Exception e) {
             client.connect();
         } catch (Exception e) {
             if (running) {
-                p.getServer().getScheduler().runTaskLaterAsynchronously(p, () -> doConnect(), 100L);
+                SchedulerCompat.runAsyncLater(p, this::doConnect, 100L);
             }
         }
     }

src/main/java/tf/tuff/TuffX.java

@@ -26,6 +26,7 @@
 
 import tf.tuff.netty.ChunkInjector;
 import tf.tuff.tuffactions.TuffActions;
+import tf.tuff.util.SchedulerCompat;
 import tf.tuff.viablocks.ViaBlocksPlugin;
 import tf.tuff.viaentities.ViaEntitiesPlugin;
 import tf.tuff.y0.Y0Plugin;
@@ -39,11 +40,13 @@ public class TuffX extends JavaPlugin implements Listener, PluginMessageListener
     public TuffActions tuffActions;
     public ViaEntitiesPlugin viaEntitiesPlugin;
     private ChunkInjector chunkInjector;
+    private boolean packetEventsEnabled;
 
     // required by MockBukkit
     public TuffX(JavaPluginLoader loader, PluginDescriptionFile description, File dataFolder, File file) {
         super(loader, description, dataFolder, file);
     }
+    public TuffX() { super(); }
 
     @Override
     public void onLoad() {
@@ -52,18 +55,29 @@ public void onLoad() {
         this.tuffActions = new TuffActions(this);
         this.viaEntitiesPlugin = new ViaEntitiesPlugin(this);
 
-        PacketEvents.setAPI(SpigotPacketEventsBuilder.build(this));
-        PacketEvents.getAPI().getSettings().reEncodeByDefault(false)
-                .checkForUpdates(false);
-        PacketEvents.getAPI().load();
+        if (shouldBootstrapPacketEvents()) {
+            PacketEvents.setAPI(SpigotPacketEventsBuilder.build(this));
+            PacketEvents.getAPI().getSettings().reEncodeByDefault(false)
+                    .checkForUpdates(false);
+            PacketEvents.getAPI().load();
+            packetEventsEnabled = true;
+        }
     }
 
     @Override
     public void onEnable() {
-        PacketEvents.getAPI().init();
+        if (packetEventsEnabled && PacketEvents.getAPI() != null) {
+            PacketEvents.getAPI().init();
+        } else {
+            packetEventsEnabled = false;
+        }
 
         saveDefaultConfig();
 
+        getLogger().info(SchedulerCompat.isFolia()
+            ? "Folia detected. Using region and entity schedulers."
+            : "Using standard Bukkit-compatible schedulers.");
+
         y0Plugin.onTuffXEnable();
         tuffActions.onTuffXEnable();
         viaBlocksPlugin.onTuffXEnable();
@@ -76,9 +90,11 @@ public void onEnable() {
         getConfig().options().copyDefaults(true);
         saveConfig();
 
-        PacketEvents.getAPI().getEventManager().registerListener(
-            new NetworkListener(this), PacketListenerPriority.NORMAL
-        );
+        if (packetEventsEnabled) {
+            PacketEvents.getAPI().getEventManager().registerListener(
+                new NetworkListener(this), PacketListenerPriority.NORMAL
+            );
+        }
 
         getServer().getPluginManager().registerEvents(this, this);
 
@@ -109,12 +125,20 @@ public void onDisable() {
             serverRegistry = null;
         }
 
-        PacketEvents.getAPI().terminate();
+        if (packetEventsEnabled && PacketEvents.getAPI() != null) {
+            PacketEvents.getAPI().terminate();
+        }
+        packetEventsEnabled = false;
 
         getServer().getMessenger().unregisterIncomingPluginChannel(this);
         getServer().getMessenger().unregisterOutgoingPluginChannel(this);
     }
 
+    private boolean shouldBootstrapPacketEvents() {
+        return getServer() == null
+            || !getServer().getClass().getName().startsWith("be.seeseemelk.mockbukkit");
+    }
+
     public void reloadTuffX(){
         saveDefaultConfig();
         reloadConfig();