(Release) 1.21.90 Support1.57

5 files changed, 9 insertions, 6 deletions

diff --git a/.github/assets/supportedVersion b/.github/assets/supportedVersion
index ba57f14..14e9a47 100644
--- a/.github/assets/supportedVersion
+++ b/.github/assets/supportedVersion
@@ -1 +1 @@
-1.21.84.1
+1.21.90.4
diff --git a/serverlist-server/pom.xml b/serverlist-server/pom.xml
index ac8a5f3..3f05c8e 100644
--- a/serverlist-server/pom.xml
+++ b/serverlist-server/pom.xml
@@ -86,7 +86,7 @@
         <dependency>
             <groupId>org.cloudburstmc.protocol</groupId>
             <artifactId>bedrock-connection</artifactId>
-            <version>3.0.0.Beta6-SNAPSHOT</version>
+            <version>3.0.0.Beta7-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
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 487a2bd..ba11ede 100644
--- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BedrockConnect.java
+++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BedrockConnect.java
@@ -19,7 +19,7 @@ import java.sql.SQLException;
 import java.util.*;
 
 public class BedrockConnect {
-    private static String release = "1.56";
+    private static String release = "1.57";
 
     private static Config config;
     private static Database database;
diff --git a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/BedrockProtocol.java b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/BedrockProtocol.java
index 6c73786..b79a67f 100644
--- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/BedrockProtocol.java
+++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/BedrockProtocol.java
@@ -13,6 +13,7 @@ import org.cloudburstmc.protocol.bedrock.codec.v766.Bedrock_v766;
 import org.cloudburstmc.protocol.bedrock.codec.v776.Bedrock_v776;
 import org.cloudburstmc.protocol.bedrock.codec.v786.Bedrock_v786;
 import org.cloudburstmc.protocol.bedrock.codec.v800.Bedrock_v800;
+import org.cloudburstmc.protocol.bedrock.codec.v818.Bedrock_v818;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,7 +25,7 @@ public class BedrockProtocol {
     /**
      * Latest available version
      */
-    public static final BedrockCodec DEFAULT_BEDROCK_CODEC = Bedrock_v800.CODEC;
+    public static final BedrockCodec DEFAULT_BEDROCK_CODEC = Bedrock_v818.CODEC;
 
 
     /**
@@ -54,6 +55,7 @@ public class BedrockProtocol {
                 .minecraftVersion("1.21.60")
                 .build());
         SUPPORTED_BEDROCK_CODECS.add(Bedrock_v786.CODEC);
+        SUPPORTED_BEDROCK_CODECS.add(Bedrock_v800.CODEC);
         SUPPORTED_BEDROCK_CODECS.add(DEFAULT_BEDROCK_CODEC);
     }
 
diff --git a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/PacketHandler.java b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/PacketHandler.java
index 752200c..752d249 100644
--- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/PacketHandler.java
+++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/PacketHandler.java
@@ -503,6 +503,7 @@ public class PacketHandler implements BedrockPacketHandler {
                 //rs.setExperimental(false);
                 rs.setForcedToAccept(false);
                 rs.setGameVersion("*");
+                rs.setForcedToAccept(false);
                 session.sendPacket(rs);
                 break;
             default:
@@ -516,7 +517,7 @@ public class PacketHandler implements BedrockPacketHandler {
     @Override
     public PacketSignal handle(LoginPacket packet) {
         try {
-            ChainValidationResult chain = EncryptionUtils.validateChain(packet.getChain());
+            ChainValidationResult chain = EncryptionUtils.validatePayload(packet.getAuthPayload());
             JsonNode payload = Server.JSON_MAPPER.valueToTree(chain.rawIdentityClaims());
 
             if (payload.get("extraData").getNodeType() != JsonNodeType.OBJECT) {
@@ -530,7 +531,7 @@ public class PacketHandler implements BedrockPacketHandler {
             }
             ECPublicKey identityPublicKey = EncryptionUtils.parseKey(payload.get("identityPublicKey").textValue());
 
-            String clientJwt = packet.getExtra();
+            String clientJwt = packet.getClientJwt();
             verifyJwt(clientJwt, identityPublicKey);
 
             BedrockConnect.logger.debug("Player made it through login: " + extraData.get("displayName") + " (xuid: " + extraData.get("identity") + ")");