From e57133b5986efd0aa9b391f22e7665c6c0fa2d01 Mon Sep 17 00:00:00 2001
From: Mattie <pugmatt@gmail.com>
Date: Thu, 15 Sep 2022 04:35:49 -0400
Subject: Add support for 1.19.30 clients

---
 serverlist-server/pom.xml                               | 16 ++++++----------
 .../pugmatt/bedrockconnect/listeners/PacketHandler.java | 17 +++++++++++++++++
 .../pugmatt/bedrockconnect/utils/BedrockProtocol.java   |  8 +++++---
 3 files changed, 28 insertions(+), 13 deletions(-)

(limited to 'serverlist-server')

diff --git a/serverlist-server/pom.xml b/serverlist-server/pom.xml
index 1e30e60..bca00d2 100644
--- a/serverlist-server/pom.xml
+++ b/serverlist-server/pom.xml
@@ -60,16 +60,12 @@
 
     <repositories>
         <repository>
-            <id>opencollab-repo</id>
-            <url>https://repo.opencollab.dev/snapshot</url>
+            <id>opencollab-releases</id>
+            <url>https://repo.opencollab.dev/maven-releases/</url>
         </repository>
         <repository>
-            <id>nukkitx-repo-release</id>
-            <url>https://repo.nukkitx.com/maven-releases/</url>
-        </repository>
-        <repository>
-            <id>nukkitx-repo-snapshot</id>
-            <url>https://repo.nukkitx.com/maven-snapshots/</url>
+            <id>opencollab-snapshots</id>
+            <url>https://repo.opencollab.dev/maven-snapshots/</url>
         </repository>
     </repositories>
 
@@ -95,8 +91,8 @@
         </dependency>
         <dependency>
             <groupId>com.nukkitx.protocol</groupId>
-            <artifactId>bedrock-v544</artifactId>
-            <version>2.9.11-SNAPSHOT</version>
+            <artifactId>bedrock-v553</artifactId>
+            <version>2.9.12-SNAPSHOT</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
diff --git a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/listeners/PacketHandler.java b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/listeners/PacketHandler.java
index 66828c3..95eed55 100644
--- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/listeners/PacketHandler.java
+++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/listeners/PacketHandler.java
@@ -6,6 +6,7 @@ import com.nukkitx.math.vector.Vector3f;
 import com.nukkitx.network.util.Preconditions;
 import com.nukkitx.protocol.bedrock.BedrockPacketCodec;
 import com.nukkitx.protocol.bedrock.data.AttributeData;
+import com.nukkitx.protocol.bedrock.data.PacketCompressionAlgorithm;
 import com.nukkitx.protocol.bedrock.packet.*;
 import com.nimbusds.jose.JOSEException;
 import com.nimbusds.jose.JWSObject;
@@ -14,6 +15,7 @@ import com.nukkitx.protocol.bedrock.BedrockServerSession;
 import com.nukkitx.protocol.bedrock.handler.BedrockPacketHandler;
 import com.nukkitx.protocol.bedrock.packet.LoginPacket;
 import com.nukkitx.protocol.bedrock.util.EncryptionUtils;
+import com.nukkitx.protocol.bedrock.v553.Bedrock_v553;
 import main.com.pyratron.pugmatt.bedrockconnect.*;
 import main.com.pyratron.pugmatt.bedrockconnect.gui.MainFormButton;
 import main.com.pyratron.pugmatt.bedrockconnect.gui.ManageFormButton;
@@ -297,6 +299,7 @@ public class PacketHandler implements BedrockPacketHandler {
                             player.setEditingServer(chosen);
 
                             session.sendPacketImmediately(UIForms.createEditServer(ip, port, name));
+                            player.setCurrentForm(UIForms.EDIT_SERVER);
                         }
                     }
                     break;
@@ -396,7 +399,21 @@ public class PacketHandler implements BedrockPacketHandler {
         return false;
     }
 
+    @Override
+    public boolean handle(RequestNetworkSettingsPacket packet) {
+        PacketCompressionAlgorithm algorithm = PacketCompressionAlgorithm.ZLIB;
+
+        NetworkSettingsPacket responsePacket = new NetworkSettingsPacket();
+        responsePacket.setCompressionAlgorithm(algorithm);
+        responsePacket.setCompressionThreshold(512);
+        session.sendPacketImmediately(responsePacket);
+
+        session.setCompression(algorithm);
+        return false;
+    }
+
     public PacketHandler(BedrockServerSession session, Server server, boolean packetListening) {
+        session.setPacketCodec(BedrockProtocol.DEFAULT_BEDROCK_CODEC);
         this.session = session;
         this.server = server;
 
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 e7f4fe4..8f2c76e 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
@@ -15,6 +15,7 @@ import com.nukkitx.protocol.bedrock.v503.Bedrock_v503;
 import com.nukkitx.protocol.bedrock.v527.Bedrock_v527;
 import com.nukkitx.protocol.bedrock.v534.Bedrock_v534;
 import com.nukkitx.protocol.bedrock.v544.Bedrock_v544;
+import com.nukkitx.protocol.bedrock.v553.Bedrock_v553;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -25,9 +26,9 @@ public class BedrockProtocol {
     /**
      * Latest available version
      */
-    public static final BedrockPacketCodec DEFAULT_BEDROCK_CODEC = Bedrock_v544.V544_CODEC.toBuilder()
-        .minecraftVersion("1.19.21")
-        .protocolVersion(545)
+    public static final BedrockPacketCodec DEFAULT_BEDROCK_CODEC = Bedrock_v553.V553_CODEC.toBuilder()
+        .minecraftVersion("1.19.30")
+        .protocolVersion(553)
         .build();
 
     /**
@@ -58,6 +59,7 @@ public class BedrockProtocol {
             .minecraftVersion("1.19.21")
             .protocolVersion(545)
             .build());
+        SUPPORTED_BEDROCK_CODECS.add(Bedrock_v553.V553_CODEC);
     }
 
     /**
-- 
cgit v1.2.1