Fix WrappedServerPing#getPlayers in 1.21.10

Fixes #3570

Author: dmulloy2

build.gradle.kts

@@ -14,7 +14,7 @@ plugins {
 group = "net.dmulloy2"
 description = "Provides access to the Minecraft protocol"
 
-val mcVersion = "1.21.9"
+val mcVersion = "1.21.10"
 val isSnapshot = version.toString().endsWith("-SNAPSHOT")
 val commitHash = System.getenv("COMMIT_SHA") ?: ""
 val isCI = commitHash.isNotEmpty()

src/main/java/com/comphenix/protocol/utility/MinecraftVersion.java

@@ -36,6 +36,11 @@
  * @author Kristian
  */
 public final class MinecraftVersion implements Comparable<MinecraftVersion>, Serializable {
+    /**
+     * Version 1.21.10 - hotfix for 1.21.9
+     */
+    public static final MinecraftVersion v1_21_10 = new MinecraftVersion("1.21.10");
+
     /**
      * Version 1.21.9 - the copper age drop
      */
@@ -174,7 +179,7 @@ public final class MinecraftVersion implements Comparable<MinecraftVersion>, Ser
     /**
      * The latest release version of minecraft.
      */
-    public static final MinecraftVersion LATEST = v1_21_9;
+    public static final MinecraftVersion LATEST = v1_21_10;
 
     // used when serializing
     private static final long serialVersionUID = -8695133558996459770L;

src/main/java/com/comphenix/protocol/wrappers/ping/ServerPingRecord.java

@@ -7,6 +7,8 @@
 import com.comphenix.protocol.reflect.accessors.ConstructorAccessor;
 import com.comphenix.protocol.reflect.accessors.FieldAccessor;
 import com.comphenix.protocol.reflect.accessors.MethodAccessor;
+import com.comphenix.protocol.reflect.instances.DefaultInstances;
+import com.comphenix.protocol.reflect.instances.MinecraftGenerator;
 import com.comphenix.protocol.utility.MinecraftProtocolVersion;
 import com.comphenix.protocol.utility.MinecraftReflection;
 import com.comphenix.protocol.utility.MinecraftVersion;
@@ -23,6 +25,7 @@ public final class ServerPingRecord implements ServerPingImpl {
     private static Class<?> SERVER_PING;
     private static Class<?> PLAYER_SAMPLE_CLASS;
     private static Class<?> SERVER_DATA_CLASS;
+    private static Class<?> NAME_AND_ID_CLASS;
 
     private static Class<?> GSON_CLASS;
     private static MethodAccessor GSON_TO_JSON;
@@ -62,7 +65,31 @@ private static void initialize() {
                 SAMPLE_WRAPPER = AutoWrapper.wrap(PlayerSample.class, PLAYER_SAMPLE_CLASS);
                 FAVICON_WRAPPER = AutoWrapper.wrap(Favicon.class, MinecraftReflection.getMinecraftClass("network.protocol.status.ServerPing$a", "network.protocol.status.ServerStatus$Favicon"));
 
-                PROFILE_LIST_CONVERTER = BukkitConverters.getListConverter(BukkitConverters.getWrappedGameProfileConverter());
+                if (MinecraftVersion.v1_21_10.atOrAbove()) {
+                    NAME_AND_ID_CLASS = MinecraftReflection.getMinecraftClass("server.players.NameAndId");
+                    NAME_AND_ID_WRAPPER = AutoWrapper.wrap(NameAndId.class, NAME_AND_ID_CLASS);
+
+                    PROFILE_LIST_CONVERTER = BukkitConverters.getListConverter(new EquivalentConverter<>() {
+                        @Override
+                        public Object getGeneric(WrappedGameProfile specific) {
+                            NameAndId wrapper = new NameAndId(specific.getUUID(), specific.getName());
+                            return NAME_AND_ID_WRAPPER.getGeneric(wrapper);
+                        }
+
+                        @Override
+                        public WrappedGameProfile getSpecific(Object generic) {
+                            NameAndId wrapper = NAME_AND_ID_WRAPPER.getSpecific(generic);
+                            return new WrappedGameProfile(wrapper.id, wrapper.name);
+                        }
+
+                        @Override
+                        public Class<WrappedGameProfile> getSpecificType() {
+                            return WrappedGameProfile.class;
+                        }
+                    });
+                } else {
+                    PROFILE_LIST_CONVERTER = BukkitConverters.getListConverter(BukkitConverters.getWrappedGameProfileConverter());
+                }
 
                 DEFAULT_DESCRIPTION = WrappedChatComponent.fromLegacyText("A Minecraft Server");
 
@@ -124,11 +151,24 @@ public Favicon() {
         }
     }
 
-    private static AutoWrapper<PlayerSample> SAMPLE_WRAPPER;
+    public static final class NameAndId {
+        public UUID id;
+        public String name;
 
-    private static AutoWrapper<ServerData> DATA_WRAPPER;
+        public NameAndId(UUID id, String name) {
+            this.id = id;
+            this.name = name;
+        }
 
+        public NameAndId() {
+            this(MinecraftGenerator.SYS_UUID, "");
+        }
+    }
+
+    private static AutoWrapper<PlayerSample> SAMPLE_WRAPPER;
+    private static AutoWrapper<ServerData> DATA_WRAPPER;
     private static AutoWrapper<Favicon> FAVICON_WRAPPER;
+    private static AutoWrapper<NameAndId> NAME_AND_ID_WRAPPER;
 
     private WrappedChatComponent description;
     private PlayerSample playerSample;

src/test/java/com/comphenix/protocol/wrappers/WrappedServerPingTest.java

@@ -1,7 +1,9 @@
 package com.comphenix.protocol.wrappers;
 
 import java.io.IOException;
+import java.util.List;
 import java.util.Optional;
+import java.util.UUID;
 
 import com.comphenix.protocol.BukkitInitialization;
 import com.comphenix.protocol.PacketType;
@@ -11,6 +13,10 @@
 
 import com.google.common.io.Resources;
 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.protocol.status.ClientboundStatusResponsePacket;
+import net.minecraft.network.protocol.status.ServerStatus;
+import net.minecraft.server.players.NameAndId;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -77,6 +83,25 @@ public void fullTest() throws IOException  {
         assertArrayEquals(copy.getData(), roundTrip.getFavicon().getData());
     }
 
+    @Test
+    public void testGetPlayers() {
+        ClientboundStatusResponsePacket packet = new ClientboundStatusResponsePacket(new ServerStatus(
+                Component.literal("A Minecraft Server"),
+                Optional.of(new ServerStatus.Players(2, 2, List.of(
+                        new NameAndId(UUID.randomUUID(), "Player1"),
+                        new NameAndId(UUID.randomUUID(), "Player2")
+                ))),
+                Optional.empty(),
+                Optional.empty(),
+                false
+        ));
+
+        PacketContainer container = PacketContainer.fromPacket(packet);
+
+        WrappedServerPing wrappedServerStatus = container.getServerPings().read(0);
+        assertEquals(2, wrappedServerStatus.getPlayers().size());
+    }
+
     @Test
     public void testDefaultData() {
         PacketContainer packet = new PacketContainer(PacketType.Status.Server.SERVER_INFO);