From e3c7fd8cc59e89e02abecab1d60841dd127c79ef Mon Sep 17 00:00:00 2001 From: Outfluencer Date: Wed, 12 Mar 2025 23:19:09 +0100 Subject: [PATCH] #3801: Add support for 1.21.5-pre2 --- .../net/md_5/bungee/protocol/ProtocolConstants.java | 2 +- .../net/md_5/bungee/protocol/packet/ClientChat.java | 11 +++++++++++ .../md_5/bungee/protocol/packet/ClientCommand.java | 11 +++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java index c2f7994d..ed61d6b9 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java @@ -49,7 +49,7 @@ public class ProtocolConstants public static final int MINECRAFT_1_21 = 767; public static final int MINECRAFT_1_21_2 = 768; public static final int MINECRAFT_1_21_4 = 769; - public static final int MINECRAFT_1_21_5 = 1073742062; + public static final int MINECRAFT_1_21_5 = 1073742064; public static final List SUPPORTED_VERSIONS; public static final List SUPPORTED_VERSION_IDS; diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientChat.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientChat.java index 105c8276..86bb03cf 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientChat.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientChat.java @@ -25,6 +25,7 @@ public class ClientChat extends DefinedPacket private boolean signedPreview; private ChatChain chain; private SeenMessages seenMessages; + private byte checksum; @Override public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion) @@ -57,6 +58,11 @@ public class ClientChat extends DefinedPacket chain = new ChatChain(); chain.read( buf, direction, protocolVersion ); } + + if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_21_5 ) + { + checksum = buf.readByte(); + } } @Override @@ -87,6 +93,11 @@ public class ClientChat extends DefinedPacket { chain.write( buf, direction, protocolVersion ); } + + if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_21_5 ) + { + buf.writeByte( checksum ); + } } @Override diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientCommand.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientCommand.java index 33c838f9..f86fcd08 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientCommand.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientCommand.java @@ -28,6 +28,7 @@ public class ClientCommand extends DefinedPacket private boolean signedPreview; private ChatChain chain; private SeenMessages seenMessages; + private byte checksum; @Override public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion) @@ -68,6 +69,11 @@ public class ClientCommand extends DefinedPacket chain = new ChatChain(); chain.read( buf, direction, protocolVersion ); } + + if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_21_5 ) + { + checksum = buf.readByte(); + } } @Override @@ -101,6 +107,11 @@ public class ClientCommand extends DefinedPacket { chain.write( buf, direction, protocolVersion ); } + + if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_21_5 ) + { + buf.writeByte( checksum ); + } } @Override