Added Minecraft 1.21.5 and Bedrock 1.21.70 support

README.md

@@ -6,16 +6,16 @@ Using it is very simple, just run the jar file, and it will start a user interfa
 For a full user guide go to the [Usage for Players](#usage-for-players-gui) section or the [Usage for Server Owners](#usage-for-server-owners-config) section.
 
 ## Supported Server versions
-- Release (1.0.0 - 1.21.4)
+- Release (1.0.0 - 1.21.5)
 - Beta (b1.0 - b1.8.1)
 - Alpha (a1.0.15 - a1.2.6)
 - Classic (c0.0.15 - c0.30 including [CPE](https://wiki.vg/Classic_Protocol_Extension))
 - April Fools (3D Shareware, 20w14infinite)
 - Combat Snapshots (Combat Test 8c)
-- Bedrock Edition 1.21.60 ([Some features are missing](https://github.com/RaphiMC/ViaBedrock#features))
+- Bedrock Edition 1.21.70 ([Some features are missing](https://github.com/RaphiMC/ViaBedrock#features))
 
 ## Supported Client versions
-- Release (1.7.2 - 1.21.4)
+- Release (1.7.2 - 1.21.5)
 - April Fools (3D Shareware)
 - Bedrock Edition (Requires the [Geyser plugin](https://geysermc.org/download))
 - Beta 1.7.3 (Requires the [Beta2Release plugin](https://github.com/ViaVersionAddons/ViaProxyBeta2Release))

build.gradle

@@ -61,16 +61,16 @@ repositories {
 }
 
 dependencies {
-    include "com.viaversion:viaversion-common:5.2.2-SNAPSHOT"
-    include "com.viaversion:viabackwards-common:5.2.2-SNAPSHOT"
-    include "com.viaversion:viarewind-common:4.0.6-SNAPSHOT"
-    include "net.raphimc:ViaLegacy:3.0.8-SNAPSHOT"
-    include "com.viaversion:viaaprilfools-common:4.0.1-SNAPSHOT"
-    include("net.raphimc:ViaBedrock:0.0.15-SNAPSHOT") {
+    include "com.viaversion:viaversion-common:5.3.0"
+    include "com.viaversion:viabackwards-common:5.3.0"
+    include "com.viaversion:viarewind-common:4.0.6"
+    include "net.raphimc:ViaLegacy:3.0.8"
+    include "com.viaversion:viaaprilfools-common:4.0.1"
+    include("net.raphimc:ViaBedrock:0.0.16-20250328.181745-1") {
         exclude group: "io.netty"
         exclude group: "io.jsonwebtoken"
     }
-    include("com.viaversion:vialoader:4.0.1-SNAPSHOT") {
+    include("com.viaversion:vialoader:4.0.1") {
         exclude group: "org.slf4j", module: "slf4j-api"
     }
 
@@ -95,7 +95,7 @@ dependencies {
         exclude group: "com.google.code.gson", module: "gson"
     }
     include "net.lenni0451.commons:swing:1.7.0"
-    include("net.raphimc.netminecraft:all:3.1.0-SNAPSHOT") {
+    include("net.raphimc.netminecraft:all:3.1.0") {
         exclude group: "com.google.code.gson", module: "gson"
     }
     include("net.raphimc:MinecraftAuth:4.1.1") {

src/main/java/net/raphimc/viaproxy/injection/mixins/MixinBlockItemPacketRewriter1_20_5.java

@@ -136,7 +136,7 @@ public abstract class MixinBlockItemPacketRewriter1_20_5 extends ItemRewriter<Cl
             if (user.getProtocolInfo().serverProtocolVersion().olderThanOrEqualTo(entry.getKey())) {
                 final ToolProperties toolProperties = entry.getValue().get(identifier);
                 if (toolProperties != null) {
-                    data.set(StructuredDataKey.TOOL, toolProperties);
+                    data.set(StructuredDataKey.TOOL1_20_5, toolProperties);
                     break;
                 }
             }

src/main/java/net/raphimc/viaproxy/proxy/packethandler/ChatSignaturePacketHandler.java

@@ -21,6 +21,7 @@ import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.PlayerMessageSignature;
 import com.viaversion.viaversion.api.minecraft.signature.model.MessageMetadata;
 import com.viaversion.viaversion.api.minecraft.signature.storage.ChatSession1_19_3;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.api.type.Types;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
@@ -76,6 +77,9 @@ public class ChatSignaturePacketHandler extends PacketHandler {
                 Types.OPTIONAL_SIGNATURE_BYTES.write(newChatMessageData, signature); // signature
                 PacketTypes.writeVarInt(newChatMessageData, 0); // offset
                 Types.ACKNOWLEDGED_BIT_SET.write(newChatMessageData, new BitSet(20)); // acknowledged
+                if (this.proxyConnection.getClientVersion().newerThanOrEqualTo(ProtocolVersion.v1_21_5)) {
+                    newChatMessageData.writeByte(0); // checksum
+                }
                 unknownPacket.data = ByteBufUtil.getBytes(newChatMessageData);
             }
         }

src/main/java/net/raphimc/viaproxy/proxy/packethandler/ResourcePackPacketHandler.java

@@ -20,7 +20,7 @@ package net.raphimc.viaproxy.proxy.packethandler;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import io.netty.channel.ChannelFutureListener;
-import net.lenni0451.mcstructs.text.ATextComponent;
+import net.lenni0451.mcstructs.text.TextComponent;
 import net.lenni0451.mcstructs.text.serializer.TextComponentSerializer;
 import net.raphimc.netminecraft.constants.ConnectionState;
 import net.raphimc.netminecraft.constants.MCPackets;
@@ -69,7 +69,7 @@ public class ResourcePackPacketHandler extends PacketHandler {
                 try {
                     final String url = ViaProxy.getConfig().getResourcePackUrl();
                     final boolean required = Via.getConfig().isForcedUse1_17ResourcePack();
-                    final ATextComponent message;
+                    final TextComponent message;
                     if (Via.getConfig().get1_17ResourcePackPrompt() != null) {
                         message = TextComponentSerializer.LATEST.deserialize(Via.getConfig().get1_17ResourcePackPrompt().toString());
                     } else {