Sort ServerStatusInfo fields in the way they appear in the packet

GeyserMC · May 23, 2024 · 0fefe04 · 0fefe04
1 parent 4624099
commit 0fefe04
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/example/src/main/java/org/geysermc/mcprotocollib/protocol/example/MinecraftProtocolTest.java b/example/src/main/java/org/geysermc/mcprotocollib/protocol/example/MinecraftProtocolTest.java
@@ -61,9 +61,9 @@ public static void main(String[] args) {
             server.setGlobalFlag(MinecraftConstants.VERIFY_USERS_KEY, VERIFY_USERS);
             server.setGlobalFlag(MinecraftConstants.SERVER_INFO_BUILDER_KEY, session ->
                     new ServerStatusInfo(
-                            new VersionInfo(MinecraftCodec.CODEC.getMinecraftVersion(), MinecraftCodec.CODEC.getProtocolVersion()),
-                            new PlayerInfo(100, 0, new ArrayList<>()),
                             Component.text("Hello world!"),
+                            new PlayerInfo(100, 0, new ArrayList<>()),
+                            new VersionInfo(MinecraftCodec.CODEC.getMinecraftVersion(), MinecraftCodec.CODEC.getProtocolVersion()),
                             null,
                             false
                     )

diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/ServerListener.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/ServerListener.java
@@ -156,9 +156,9 @@ public void packetReceived(Session session, Packet packet) {
                 ServerInfoBuilder builder = session.getFlag(MinecraftConstants.SERVER_INFO_BUILDER_KEY);
                 if (builder == null) {
                     builder = $ -> new ServerStatusInfo(
-                            new VersionInfo(protocol.getCodec().getMinecraftVersion(), protocol.getCodec().getProtocolVersion()),
-                            new PlayerInfo(0, 20, new ArrayList<>()),
                             Component.text("A Minecraft Server"),
+                            new PlayerInfo(0, 20, new ArrayList<>()),
+                            new VersionInfo(protocol.getCodec().getMinecraftVersion(), protocol.getCodec().getProtocolVersion()),
                             null,
                             false
                     );

diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/status/ServerStatusInfo.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/status/ServerStatusInfo.java
@@ -12,9 +12,9 @@
 @Setter(AccessLevel.NONE)
 @AllArgsConstructor
 public class ServerStatusInfo {
-    private @Nullable VersionInfo versionInfo;
-    private @Nullable PlayerInfo playerInfo;
     private @NonNull Component description;
+    private @Nullable PlayerInfo playerInfo;
+    private @Nullable VersionInfo versionInfo;
     private byte[] iconPng;
     private boolean enforcesSecureChat;
 }
diff --git a/...rmc/mcprotocollib/protocol/packet/status/clientbound/ClientboundStatusResponsePacket.java b/...rmc/mcprotocollib/protocol/packet/status/clientbound/ClientboundStatusResponsePacket.java
@@ -83,7 +83,7 @@ public ServerStatusInfo parseInfo() {
             enforcesSecureChat = data.get("enforcesSecureChat").getAsBoolean();
         }
 
-        return new ServerStatusInfo(version, players, description, icon, enforcesSecureChat);
+        return new ServerStatusInfo(description, players, version, icon, enforcesSecureChat);
     }
 
     public ClientboundStatusResponsePacket withInfo(@NonNull ServerStatusInfo info) {

diff --git a/protocol/src/test/java/org/geysermc/mcprotocollib/protocol/MinecraftProtocolTest.java b/protocol/src/test/java/org/geysermc/mcprotocollib/protocol/MinecraftProtocolTest.java
@@ -33,9 +33,9 @@ public class MinecraftProtocolTest {
     private static final int PORT = 25562;
 
     private static final ServerStatusInfo SERVER_INFO = new ServerStatusInfo(
-            new VersionInfo(MinecraftCodec.CODEC.getMinecraftVersion(), MinecraftCodec.CODEC.getProtocolVersion()),
-            new PlayerInfo(100, 0, new ArrayList<>()),
             Component.text("Hello world!"),
+            new PlayerInfo(100, 0, new ArrayList<>()),
+            new VersionInfo(MinecraftCodec.CODEC.getMinecraftVersion(), MinecraftCodec.CODEC.getProtocolVersion()),
             null,
             false
     );

diff --git a/...mcprotocollib/protocol/packet/status/clientbound/ClientboundStatusResponsePacketTest.java b/...mcprotocollib/protocol/packet/status/clientbound/ClientboundStatusResponsePacketTest.java
@@ -18,11 +18,11 @@ public class ClientboundStatusResponsePacketTest extends PacketTest {
     public void setup() {
         this.setPackets(new ClientboundStatusResponsePacket(
                 new ServerStatusInfo(
-                        new VersionInfo(MinecraftCodec.CODEC.getMinecraftVersion(), MinecraftCodec.CODEC.getProtocolVersion()),
+                        Component.text("Description"),
                         new PlayerInfo(100, 10, new ArrayList<>(
-                                Collections.singleton(new GameProfile(UUID.randomUUID(), "Username"))
+                            Collections.singleton(new GameProfile(UUID.randomUUID(), "Username"))
                         )),
-                        Component.text("Description"),
+                        new VersionInfo(MinecraftCodec.CODEC.getMinecraftVersion(), MinecraftCodec.CODEC.getProtocolVersion()),
                         null,
                         false
                 )