Skip to content

Commit c54c432

Browse files
committed
Added Minecraft 1.21.5 and Bedrock 1.21.70 support
1 parent a00dc66 commit c54c432

File tree

5 files changed

+18
-14
lines changed

5 files changed

+18
-14
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ Using it is very simple, just run the jar file, and it will start a user interfa
66
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.
77

88
## Supported Server versions
9-
- Release (1.0.0 - 1.21.4)
9+
- Release (1.0.0 - 1.21.5)
1010
- Beta (b1.0 - b1.8.1)
1111
- Alpha (a1.0.15 - a1.2.6)
1212
- Classic (c0.0.15 - c0.30 including [CPE](https://wiki.vg/Classic_Protocol_Extension))
1313
- April Fools (3D Shareware, 20w14infinite)
1414
- Combat Snapshots (Combat Test 8c)
15-
- Bedrock Edition 1.21.60 ([Some features are missing](https://github.com/RaphiMC/ViaBedrock#features))
15+
- Bedrock Edition 1.21.70 ([Some features are missing](https://github.com/RaphiMC/ViaBedrock#features))
1616

1717
## Supported Client versions
18-
- Release (1.7.2 - 1.21.4)
18+
- Release (1.7.2 - 1.21.5)
1919
- April Fools (3D Shareware)
2020
- Bedrock Edition (Requires the [Geyser plugin](https://geysermc.org/download))
2121
- Beta 1.7.3 (Requires the [Beta2Release plugin](https://github.com/ViaVersionAddons/ViaProxyBeta2Release))

build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,16 @@ repositories {
6161
}
6262

6363
dependencies {
64-
include "com.viaversion:viaversion-common:5.2.2-SNAPSHOT"
65-
include "com.viaversion:viabackwards-common:5.2.2-SNAPSHOT"
66-
include "com.viaversion:viarewind-common:4.0.6-SNAPSHOT"
67-
include "net.raphimc:ViaLegacy:3.0.8-SNAPSHOT"
68-
include "com.viaversion:viaaprilfools-common:4.0.1-SNAPSHOT"
69-
include("net.raphimc:ViaBedrock:0.0.15-SNAPSHOT") {
64+
include "com.viaversion:viaversion-common:5.3.0"
65+
include "com.viaversion:viabackwards-common:5.3.0"
66+
include "com.viaversion:viarewind-common:4.0.6"
67+
include "net.raphimc:ViaLegacy:3.0.8"
68+
include "com.viaversion:viaaprilfools-common:4.0.1"
69+
include("net.raphimc:ViaBedrock:0.0.16-20250328.181745-1") {
7070
exclude group: "io.netty"
7171
exclude group: "io.jsonwebtoken"
7272
}
73-
include("com.viaversion:vialoader:4.0.1-SNAPSHOT") {
73+
include("com.viaversion:vialoader:4.0.1") {
7474
exclude group: "org.slf4j", module: "slf4j-api"
7575
}
7676

@@ -95,7 +95,7 @@ dependencies {
9595
exclude group: "com.google.code.gson", module: "gson"
9696
}
9797
include "net.lenni0451.commons:swing:1.7.0"
98-
include("net.raphimc.netminecraft:all:3.1.0-SNAPSHOT") {
98+
include("net.raphimc.netminecraft:all:3.1.0") {
9999
exclude group: "com.google.code.gson", module: "gson"
100100
}
101101
include("net.raphimc:MinecraftAuth:4.1.1") {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ private void appendItemDataFixComponents(UserConnection user, Item item, Callbac
136136
if (user.getProtocolInfo().serverProtocolVersion().olderThanOrEqualTo(entry.getKey())) {
137137
final ToolProperties toolProperties = entry.getValue().get(identifier);
138138
if (toolProperties != null) {
139-
data.set(StructuredDataKey.TOOL, toolProperties);
139+
data.set(StructuredDataKey.TOOL1_20_5, toolProperties);
140140
break;
141141
}
142142
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.viaversion.viaversion.api.minecraft.PlayerMessageSignature;
2222
import com.viaversion.viaversion.api.minecraft.signature.model.MessageMetadata;
2323
import com.viaversion.viaversion.api.minecraft.signature.storage.ChatSession1_19_3;
24+
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
2425
import com.viaversion.viaversion.api.type.Types;
2526
import io.netty.buffer.ByteBuf;
2627
import io.netty.buffer.ByteBufUtil;
@@ -76,6 +77,9 @@ public boolean handleC2P(Packet packet, List<ChannelFutureListener> listeners) t
7677
Types.OPTIONAL_SIGNATURE_BYTES.write(newChatMessageData, signature); // signature
7778
PacketTypes.writeVarInt(newChatMessageData, 0); // offset
7879
Types.ACKNOWLEDGED_BIT_SET.write(newChatMessageData, new BitSet(20)); // acknowledged
80+
if (this.proxyConnection.getClientVersion().newerThanOrEqualTo(ProtocolVersion.v1_21_5)) {
81+
newChatMessageData.writeByte(0); // checksum
82+
}
7983
unknownPacket.data = ByteBufUtil.getBytes(newChatMessageData);
8084
}
8185
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.viaversion.viaversion.api.Via;
2121
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
2222
import io.netty.channel.ChannelFutureListener;
23-
import net.lenni0451.mcstructs.text.ATextComponent;
23+
import net.lenni0451.mcstructs.text.TextComponent;
2424
import net.lenni0451.mcstructs.text.serializer.TextComponentSerializer;
2525
import net.raphimc.netminecraft.constants.ConnectionState;
2626
import net.raphimc.netminecraft.constants.MCPackets;
@@ -69,7 +69,7 @@ private void sendResourcePack() {
6969
try {
7070
final String url = ViaProxy.getConfig().getResourcePackUrl();
7171
final boolean required = Via.getConfig().isForcedUse1_17ResourcePack();
72-
final ATextComponent message;
72+
final TextComponent message;
7373
if (Via.getConfig().get1_17ResourcePackPrompt() != null) {
7474
message = TextComponentSerializer.LATEST.deserialize(Via.getConfig().get1_17ResourcePackPrompt().toString());
7575
} else {

0 commit comments

Comments
 (0)