Merge pull request #23

Update to support Bedrock 1.20.80
GeyserMC · Apr 25, 2024 · d100b1b · d100b1b
2 parents c78edda + 641f391
commit d100b1b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,6 @@
 [versions]
 gson = "2.10.1"
-protocol = "3.0.0.Beta1-20240401.132829-127"
-protocol-connection = "3.0.0.Beta1-20240401.132829-126"
+protocol = "3.0.0.Beta2-20240423.201358-2"
 raknet = "1.0.0.CR1-20240330.103819-16"
 netty = "4.1.80.Final"
 fastutil = "8.5.2"
@@ -14,8 +13,8 @@ indra = "3.1.2"
 [libraries]
 gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 protocol-codec = { module = "org.cloudburstmc.protocol:bedrock-codec", version.ref = "protocol" }
-protocol-connection = { module = "org.cloudburstmc.protocol:bedrock-connection", version.ref = "protocol-connection" }
-protocol-common = { module = "org.cloudburstmc.protocol:common", version.ref = "protocol-connection" }
+protocol-connection = { module = "org.cloudburstmc.protocol:bedrock-connection", version.ref = "protocol" }
+protocol-common = { module = "org.cloudburstmc.protocol:common", version.ref = "protocol" }
 raknet = { group = "org.cloudburstmc.netty", name = "netty-transport-raknet", version.ref = "raknet" }
 
 netty-handler = { group = "io.netty", name = "netty-handler", version.ref = "netty" }

diff --git a/src/main/java/org/geysermc/globallinkserver/bedrock/util/BedrockVersionUtils.java b/src/main/java/org/geysermc/globallinkserver/bedrock/util/BedrockVersionUtils.java
@@ -34,6 +34,7 @@
 import org.cloudburstmc.protocol.bedrock.codec.v630.Bedrock_v630;
 import org.cloudburstmc.protocol.bedrock.codec.v649.Bedrock_v649;
 import org.cloudburstmc.protocol.bedrock.codec.v662.Bedrock_v662;
+import org.cloudburstmc.protocol.bedrock.codec.v671.Bedrock_v671;
 
 /**
  * Contains information about the supported Bedrock protocols in GlobalLinkServer.
@@ -44,7 +45,7 @@ public class BedrockVersionUtils {
      * Default Bedrock codec that should act as a fallback. Should represent the latest available
      * release of the game that GlobalLinkServer supports.
      */
-    public static final BedrockCodec LATEST_CODEC = Bedrock_v662.CODEC;
+    public static final BedrockCodec LATEST_CODEC = Bedrock_v671.CODEC;
 
     /**
      * A list of all supported Bedrock versions that can join GlobalLinkServer
@@ -58,6 +59,7 @@ public class BedrockVersionUtils {
         SUPPORTED_BEDROCK_CODECS.add(Bedrock_v622.CODEC);
         SUPPORTED_BEDROCK_CODECS.add(Bedrock_v630.CODEC);
         SUPPORTED_BEDROCK_CODECS.add(Bedrock_v649.CODEC);
+        SUPPORTED_BEDROCK_CODECS.add(Bedrock_v662.CODEC);
         SUPPORTED_BEDROCK_CODECS.add(LATEST_CODEC);
     }