Added support for Bedrock 1.21

GeyserMC · Jun 21, 2024 · a3903ad · a3903ad
1 parent d100b1b
commit a3903ad
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,8 +1,8 @@
 [versions]
 gson = "2.10.1"
-protocol = "3.0.0.Beta2-20240423.201358-2"
-raknet = "1.0.0.CR1-20240330.103819-16"
-netty = "4.1.80.Final"
+protocol = "3.0.0.Beta2-20240616.144648-10"
+raknet = "1.0.0.CR3-20240416.144209-1"
+netty = "4.1.110.Final"
 fastutil = "8.5.2"
 mcprotocollib = "1.20.4-1"
 adventure-text = "4.15.0-20231207.074016-23" # Match version to MCPL

diff --git a/src/main/java/org/geysermc/globallinkserver/bedrock/BedrockPlayer.java b/src/main/java/org/geysermc/globallinkserver/bedrock/BedrockPlayer.java
@@ -147,6 +147,10 @@ public void sendStartGame() {
         startGamePacket.setRewindHistorySize(0);
         startGamePacket.setServerAuthoritativeBlockBreaking(false);
 
+        startGamePacket.setServerId("");
+        startGamePacket.setWorldId("");
+        startGamePacket.setScenarioId("");
+
         session.sendPacket(startGamePacket);
 
         // Send an empty chunk

diff --git a/src/main/java/org/geysermc/globallinkserver/bedrock/util/BedrockVersionUtils.java b/src/main/java/org/geysermc/globallinkserver/bedrock/util/BedrockVersionUtils.java
@@ -35,6 +35,7 @@
 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;
+import org.cloudburstmc.protocol.bedrock.codec.v685.Bedrock_v685;
 
 /**
  * Contains information about the supported Bedrock protocols in GlobalLinkServer.
@@ -45,7 +46,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_v671.CODEC;
+    public static final BedrockCodec LATEST_CODEC = Bedrock_v685.CODEC;
 
     /**
      * A list of all supported Bedrock versions that can join GlobalLinkServer
@@ -60,6 +61,7 @@ public class BedrockVersionUtils {
         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(Bedrock_v671.CODEC);
         SUPPORTED_BEDROCK_CODECS.add(LATEST_CODEC);
     }