From 8037e6e46b0cc63160e32b20057a20a7b312556c Mon Sep 17 00:00:00 2001 From: Mattie Date: Tue, 13 Aug 2024 15:01:07 -0400 Subject: [PATCH] Update support version 1.21.20 --- .github/assets/supportedVersion | 2 +- serverlist-server/pom.xml | 2 +- .../pugmatt/bedrockconnect/BedrockConnect.java | 2 +- .../bedrockconnect/utils/BedrockProtocol.java | 13 ++++++++----- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/assets/supportedVersion b/.github/assets/supportedVersion index 510dddb..8229bf4 100644 --- a/.github/assets/supportedVersion +++ b/.github/assets/supportedVersion @@ -1 +1 @@ -1.21.3.01 +1.21.20.03 diff --git a/serverlist-server/pom.xml b/serverlist-server/pom.xml index 00dbe69..279a789 100644 --- a/serverlist-server/pom.xml +++ b/serverlist-server/pom.xml @@ -86,7 +86,7 @@ org.cloudburstmc.protocol bedrock-connection - 3.0.0.Beta2-SNAPSHOT + 3.0.0.Beta3-SNAPSHOT compile diff --git a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BedrockConnect.java b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BedrockConnect.java index a637bb9..3c27515 100644 --- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BedrockConnect.java +++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BedrockConnect.java @@ -46,7 +46,7 @@ public class BedrockConnect { public static int globalPacketLimit = RakConstants.DEFAULT_GLOBAL_PACKET_LIMIT; - public static String release = "1.48"; + public static String release = "1.49"; public static HashMap featuredServerIps; diff --git a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/utils/BedrockProtocol.java b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/utils/BedrockProtocol.java index 9b6b1d3..308bb0b 100644 --- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/utils/BedrockProtocol.java +++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/utils/BedrockProtocol.java @@ -19,6 +19,8 @@ import org.cloudburstmc.protocol.bedrock.codec.v662.Bedrock_v662; import org.cloudburstmc.protocol.bedrock.codec.v671.Bedrock_v671; import org.cloudburstmc.protocol.bedrock.codec.v685.Bedrock_v685; +import org.cloudburstmc.protocol.bedrock.codec.v686.Bedrock_v686; +import org.cloudburstmc.protocol.bedrock.codec.v712.Bedrock_v712; import java.util.ArrayList; import java.util.List; @@ -26,15 +28,13 @@ // Referenced from: https://github.com/GeyserMC/Geyser/blob/master/connector/src/main/java/org/geysermc/connector/network/BedrockProtocol.java public class BedrockProtocol { - private static final BedrockCodec BEDROCK_V686 = Bedrock_v685.CODEC.toBuilder() - .protocolVersion(686) - .minecraftVersion("1.21.2") - .build(); /** * Latest available version */ - public static final BedrockCodec DEFAULT_BEDROCK_CODEC = BEDROCK_V686; + public static final BedrockCodec DEFAULT_BEDROCK_CODEC = Bedrock_v712.CODEC.toBuilder() + .minecraftVersion("1.21.20") + .build(); /** @@ -83,6 +83,9 @@ public class BedrockProtocol { .build()); SUPPORTED_BEDROCK_CODECS.add(Bedrock_v685.CODEC.toBuilder() .build()); + SUPPORTED_BEDROCK_CODECS.add(Bedrock_v686.CODEC.toBuilder() + .minecraftVersion("1.21.2/1.21.3") + .build()); SUPPORTED_BEDROCK_CODECS.add(DEFAULT_BEDROCK_CODEC); }