feat: support minecraft 1.21.3

gradle/libs.versions.toml

@@ -71,14 +71,15 @@ limboloohp = "0.7.9-ALPHA"
 vault = "1.7.1"
 adventure = "4.17.0"
 modlauncher = "8.1.3"
-npcLib = "3.0.0-beta9"
+npcLib = "3.0.0-beta10"
+packetEvents = "2.6.0"
 placeholderApi = "2.11.6"
 adventure-serializer-bungee = "4.3.4"
 luckPermsApi = "5.4"
 
 # fabric platform special dependencies
-minecraft = "1.21.1"
-fabricLoader = "0.16.7"
+minecraft = "1.21.3"
+fabricLoader = "0.16.9"
 
 
 [libraries]
@@ -167,7 +168,7 @@ spigot = { group = "org.spigotmc", name = "spigot-api", version.ref = "spigot" }
 sponge = { group = "org.spongepowered", name = "spongeapi", version.ref = "sponge" }
 bungeecord = { group = "net.md-5", name = "bungeecord-api", version.ref = "bungeecord" }
 minestom = { group = "net.minestom", name = "minestom-snapshots", version.ref = "minestom" }
-minestomExtensions = { group = "dev.hollowcube", name = "minestom-ce-extensions", version.ref = "minestomExtensions"}
+minestomExtensions = { group = "dev.hollowcube", name = "minestom-ce-extensions", version.ref = "minestomExtensions" }
 velocity = { group = "com.velocitypowered", name = "velocity-api", version.ref = "velocity" }
 waterdogpe = { group = "dev.waterdog.waterdogpe", name = "waterdog", version.ref = "waterdogpe" }
 limboloohp = { group = "com.loohp", name = "Limbo", version.ref = "limboloohp" }
@@ -185,6 +186,7 @@ bungeecordChat = { group = "net.md-5", name = "bungeecord-chat", version.ref = "
 placeholderApi = { group = "me.clip", name = "placeholderapi", version.ref = "placeholderApi" }
 
 npcLib = { group = "io.github.juliarn", name = "npc-lib-bukkit", version.ref = "npcLib" }
+packetEvents = { group = "com.github.retrooper", name = "packetevents-spigot", version.ref = "packetEvents" }
 npcLibLabymod = { group = "io.github.juliarn", name = "npc-lib-labymod", version.ref = "npcLib" }
 luckPermsApi = { group = "net.luckperms", name = "api", version.ref = "luckPermsApi" }
 

modules/npcs/build.gradle.kts

@@ -57,10 +57,11 @@ repositories {
 dependencies {
   "compileOnly"(projects.wrapperJvm)
   "compileOnly"(projects.modules.bridge)
-  "implementation"(projects.ext.bukkitCommand)
-
   "compileOnly"(libs.bundles.serverPlatform)
 
+  "implementation"(libs.packetEvents)
+  "implementation"(projects.ext.bukkitCommand)
+
   "api"(libs.bundles.npcLib)
 }
 

modules/npcs/src/main/java/eu/cloudnetservice/modules/npc/platform/bukkit/BukkitPlatformNPCManagement.java

@@ -23,6 +23,8 @@
 import com.github.juliarn.npclib.bukkit.BukkitWorldAccessor;
 import com.github.juliarn.npclib.bukkit.protocol.BukkitProtocolAdapter;
 import com.github.juliarn.npclib.ext.labymod.LabyModExtension;
+import com.github.retrooper.packetevents.manager.server.ServerVersion;
+import com.github.retrooper.packetevents.util.PEVersion;
 import com.google.common.base.Preconditions;
 import eu.cloudnetservice.driver.ComponentInfo;
 import eu.cloudnetservice.driver.event.EventManager;
@@ -279,17 +281,15 @@ protected void startEmoteTask(boolean force) {
   }
 
   protected @NonNull PlatformPacketAdapter<World, Player, ItemStack, Plugin> resolvePacketAdapter() {
-    var protocolLibAdapter = BukkitProtocolAdapter.protocolLib();
-    try {
-      //noinspection DataFlowIssue
-      protocolLibAdapter.createCustomPayloadPacket("minecraft:test", new byte[0]).schedule((Player) null, null);
-      return protocolLibAdapter;
-    } catch (NullPointerException _) {
-      // the above test code will always throw an NPE if the test passes. We need to handle this as success.
-      return protocolLibAdapter;
-    } catch (Throwable _) {
-      // protocollib is not working, fallback to packet events
-      return BukkitProtocolAdapter.packetEvents();
+    var bukkitVersion = this.server.getBukkitVersion();
+    var parsedVersion = PEVersion.fromString(bukkitVersion.substring(0, bukkitVersion.indexOf("-")));
+    var latestPEVersion = PEVersion.fromString(ServerVersion.getLatest().getReleaseName());
+    if (parsedVersion.isNewerThan(latestPEVersion)) {
+      this.plugin.getLogger().info("NPCs using ProtocolLib for version " + bukkitVersion);
+      return BukkitProtocolAdapter.protocolLib();
     }
+
+    this.plugin.getLogger().info("NPCs using PacketEvents for version " + bukkitVersion);
+    return BukkitProtocolAdapter.packetEvents();
   }
 }

node/src/main/resources/files/versions.json

@@ -89,8 +89,7 @@
       "website": "https://papermc.io",
       "versions": [
         {
-          "name": "latest",
-          "cacheFiles": false,
+          "name": "1.21.3",
           "properties": {
             "copy": {
               "cache/.*": "/",
@@ -101,7 +100,7 @@
               "-Dpaperclip.patchonly=true"
             ],
             "fetchOverPaperApi": true,
-            "versionGroup": "1.21.1"
+            "versionGroup": "1.21.3"
           }
         },
         {
@@ -317,7 +316,7 @@
       "versions": [
         {
           "name": "latest",
-          "url": "https://api.purpurmc.org/v2/purpur/1.21.1/latest/download",
+          "url": "https://api.purpurmc.org/v2/purpur/1.21.3/latest/download",
           "cacheFiles": false,
           "properties": {
             "copy": {
@@ -330,6 +329,20 @@
             ]
           }
         },
+        {
+          "name": "1.21.3",
+          "url": "https://api.purpurmc.org/v2/purpur/1.21.3/latest/download",
+          "properties": {
+            "copy": {
+              "cache/.*": "/",
+              "versions/.*": "/",
+              "purpur\\.jar": "paper.jar"
+            },
+            "jvmOptions": [
+              "-Dpaperclip.patchonly=true"
+            ]
+          }
+        },
         {
           "name": "1.21.1",
           "url": "https://api.purpurmc.org/v2/purpur/1.21.1/latest/download",
@@ -514,7 +527,7 @@
       "website": "https://fabricmc.net",
       "versions": [
         {
-          "name": "1.21.1",
+          "name": "1.21.3",
           "cacheFiles": false,
           "properties": {
             "copy": {
@@ -557,7 +570,21 @@
             },
             "fetchOverSpongeApi": true,
             "artifact": "spongevanilla",
-            "mcVersion": "1.21.1"
+            "mcVersion": "1.21.3"
+          },
+          "minJavaVersion": 21
+        },
+        {
+          "name": "1.21.3",
+          "properties": {
+            "copy": {
+              "libraries/.*": "/",
+              "launcher\\.conf": "/",
+              "spongevanilla\\.jar": "/"
+            },
+            "fetchOverSpongeApi": true,
+            "artifact": "spongevanilla",
+            "mcVersion": "1.21.3"
           },
           "minJavaVersion": 21
         },
@@ -674,7 +701,7 @@
           "cacheFiles": false,
           "properties": {
             "fetchOverPaperApi": true,
-            "versionGroup": "3.3.0-SNAPSHOT"
+            "versionGroup": "3.4.0-SNAPSHOT"
           }
         }
       ]
@@ -703,9 +730,8 @@
       ],
       "versions": [
         {
-          "name": "latest",
-          "url": "https://ci.loohpjames.com/job/Limbo/46/artifact/target/Limbo-0.7.10-ALPHA-1.21.1.jar",
-          "cacheFiles": false
+          "name": "1.21.3",
+          "url": "https://ci.loohpjames.com/job/Limbo/47/artifact/target/Limbo-0.7.11-ALPHA-1.21.3.jar"
         },
         {
           "name": "1.21.1",