feat: add support for 1.21.2/1.21.3

Author: vytskalt

README.md

@@ -23,7 +23,7 @@ Join the [Discord](https://discord.gg/v7nmTDTW8W) or create an issue for support
 
 ## Available Packet Adapters
 
-- **modern.** Supports 1.17-1.21.1. Can take advantage of [Paper](https://papermc.io)'s native adventure support to be more efficient.
+- **modern.** Supports 1.17-1.21.3. Can take advantage of [Paper](https://papermc.io)'s native adventure support to be more efficient.
 - **legacy.** Supports 1.7.10-1.12.2.
 - **PacketEvents.** Supports 1.8+. Requires [PacketEvents 2.0](https://github.com/retrooper/packetevents/tree/2.0) to be shaded or installed as a plugin.
 

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 adventure = "4.17.0"
-junitJupiter = "5.11.2"
-devBundle = "1.21-R0.1-20240810.100446-132" # find latest here: https://repo.papermc.io/repository/maven-snapshots/io/papermc/paper/dev-bundle/1.21-R0.1-SNAPSHOT/maven-metadata.xml
+junitJupiter = "5.11.3"
+devBundle = "1.21.3-R0.1-20241101.150401-13" # find latest here: https://repo.papermc.io/repository/maven-snapshots/io/papermc/paper/dev-bundle/1.21.3-R0.1-SNAPSHOT/maven-metadata.xml
 
 [libraries]
 spigotApi = "org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT" # do not update
@@ -18,7 +18,7 @@ junitJupiterEngine = { module = "org.junit.jupiter:junit-jupiter-engine", versio
 
 [plugins]
 kotlin = "org.jetbrains.kotlin.jvm:2.0.21"
-paperweight = "io.papermc.paperweight.userdev:1.7.3"
+paperweight = "io.papermc.paperweight.userdev:1.7.4"
 
 [bundles]
 adventure = [ "adventureApi", "adventureTextSerializerGson", "adventureTextSerializerLegacy" ]

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/PacketAdapterLoader.java

@@ -87,6 +87,8 @@ private PacketAdapterLoader() {
       case "1.20.6":
       case "1.21":
       case "1.21.1":
+      case "1.21.2":
+      case "1.21.3":
         return tryLoadImplementationClass(MODERN);
       default:
         // Hide from relocation checkers

versions/modern/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/modern/util/PacketUtil.java

@@ -9,6 +9,7 @@
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
+import java.lang.reflect.Field;
 
 public final class PacketUtil {
   private static final MethodHandle GET_HANDLE;
@@ -36,19 +37,20 @@ private PacketUtil() {
       throw new ExceptionInInitializerError(e);
     }
 
-    MethodHandle playerConnection;
-    try {
-      playerConnection = lookup.findGetter(ServerPlayer.class, "c", ServerGamePacketListenerImpl.class);
-    } catch (NoSuchFieldException e) {
-      try {
-        playerConnection = lookup.findGetter(ServerPlayer.class, "b", ServerGamePacketListenerImpl.class);
-      } catch (NoSuchFieldException | IllegalAccessException ex) {
-        throw new ExceptionInInitializerError(ex);
+    MethodHandle playerConnection = null;
+    for (Field field : ServerPlayer.class.getFields()) {
+      if (field.getType() == ServerGamePacketListenerImpl.class) {
+        try {
+          playerConnection = lookup.unreflectGetter(field);
+        } catch (IllegalAccessException e) {
+          throw new ExceptionInInitializerError(e);
+        }
       }
-    } catch (IllegalAccessException e) {
-      throw new ExceptionInInitializerError(e);
     }
-
+    
+    if (playerConnection == null) {
+      throw new ExceptionInInitializerError("failed to find player connection field");
+    }
     PLAYER_CONNECTION = playerConnection;
 
     MethodType sendMethodType = MethodType.methodType(void.class, Packet.class);