From 9208943ac643bea69d1e85dd6b535ce3ea70b8c9 Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Wed, 17 Feb 2021 18:00:53 -0500
Subject: [PATCH] Bump Network and Netty dependencies (#1775)

---
 connector/pom.xml                             | 57 +++++++++++++++++--
 .../network/session/GeyserSession.java        |  9 ++-
 .../session/auth/BedrockClientData.java       |  2 +
 .../player/BedrockActionTranslator.java       |  3 +-
 .../geysermc/connector/skin/SkinManager.java  |  2 +-
 .../connector/skin/SkullSkinManager.java      |  2 +-
 6 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/connector/pom.xml b/connector/pom.xml
index 77da3e4f2..8b1bfe510 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -10,6 +10,10 @@
     </parent>
     <artifactId>connector</artifactId>
 
+    <properties>
+        <netty.version>4.1.59.Final</netty.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.geysermc</groupId>
@@ -26,14 +30,13 @@
         <dependency>
             <groupId>com.github.CloudburstMC.Protocol</groupId>
             <artifactId>bedrock-v422</artifactId>
-            <version>d41b84e86c</version>
+            <version>294e7e5</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
                     <groupId>net.sf.trove4j</groupId>
                     <artifactId>trove</artifactId>
                 </exclusion>
-                <!-- Stay on the older version of Network while it's rewritten -->
                 <exclusion>
                     <groupId>com.nukkitx.network</groupId>
                     <artifactId>raknet</artifactId>
@@ -41,10 +44,16 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>com.nukkitx.network</groupId>
+            <groupId>com.github.CloudburstMC.Network</groupId>
             <artifactId>raknet</artifactId>
-            <version>1.6.20</version>
+            <version>a94d2dd</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.nukkitx.fastutil</groupId>
@@ -147,15 +156,51 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-resolver-dns</artifactId>
-            <version>4.1.43.Final</version>
+            <version>${netty.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-resolver-dns-native-macos</artifactId>
+            <version>${netty.version}</version>
+            <scope>compile</scope>
+            <classifier>osx-x86_64</classifier>
+        </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-codec-haproxy</artifactId>
-            <version>4.1.56.Final</version>
+            <version>${netty.version}</version>
             <scope>compile</scope>
         </dependency>
+        <!-- Network dependencies we are updating ourselves -->
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-handler</artifactId>
+            <version>${netty.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport-native-epoll</artifactId>
+            <version>${netty.version}</version>
+            <scope>compile</scope>
+            <classifier>linux-x86_64</classifier>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport-native-epoll</artifactId>
+            <version>${netty.version}</version>
+            <scope>compile</scope>
+            <classifier>linux-aarch_64</classifier>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport-native-kqueue</artifactId>
+            <version>${netty.version}</version>
+            <scope>compile</scope>
+            <classifier>osx-x86_64</classifier>
+        </dependency>
+        <!-- End -->
         <dependency>
             <groupId>org.reflections</groupId>
             <artifactId>reflections</artifactId>
diff --git a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java b/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
index 2f15cab75..999a2a50a 100644
--- a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
+++ b/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
@@ -839,7 +839,14 @@ public class GeyserSession implements CommandSender {
         startGamePacket.setMultiplayerCorrelationId("");
         startGamePacket.setItemEntries(ItemRegistry.ITEMS);
         startGamePacket.setVanillaVersion("*");
-        startGamePacket.setAuthoritativeMovementMode(AuthoritativeMovementMode.CLIENT);
+        startGamePacket.setAuthoritativeMovementMode(AuthoritativeMovementMode.CLIENT); // can be removed once 1.16.200 support is dropped
+
+        SyncedPlayerMovementSettings settings = new SyncedPlayerMovementSettings();
+        settings.setMovementMode(AuthoritativeMovementMode.CLIENT);
+        settings.setRewindHistorySize(0);
+        settings.setServerAuthoritativeBlockBreaking(false);
+        startGamePacket.setPlayerMovementSettings(settings);
+
         upstream.sendPacket(startGamePacket);
     }
 
diff --git a/connector/src/main/java/org/geysermc/connector/network/session/auth/BedrockClientData.java b/connector/src/main/java/org/geysermc/connector/network/session/auth/BedrockClientData.java
index 10075a9a4..16e06c066 100644
--- a/connector/src/main/java/org/geysermc/connector/network/session/auth/BedrockClientData.java
+++ b/connector/src/main/java/org/geysermc/connector/network/session/auth/BedrockClientData.java
@@ -103,6 +103,8 @@ public class BedrockClientData {
     private String skinColor;
     @JsonProperty(value = "ThirdPartyNameOnly")
     private boolean thirdPartyNameOnly;
+    @JsonProperty(value = "PlayFabId")
+    private String playFabId;
 
     public enum UIProfile {
         @JsonEnumDefaultValue
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockActionTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockActionTranslator.java
index 789df85c2..c248b57a5 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockActionTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockActionTranslator.java
@@ -37,6 +37,7 @@ import com.github.steveice10.mc.protocol.packet.ingame.client.player.ClientPlaye
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.nukkitx.math.vector.Vector3i;
 import com.nukkitx.protocol.bedrock.data.LevelEventType;
+import com.nukkitx.protocol.bedrock.data.PlayerActionType;
 import com.nukkitx.protocol.bedrock.data.entity.EntityEventType;
 import com.nukkitx.protocol.bedrock.packet.EntityEventPacket;
 import com.nukkitx.protocol.bedrock.packet.LevelEventPacket;
@@ -64,7 +65,7 @@ public class BedrockActionTranslator extends PacketTranslator<PlayerActionPacket
             return;
 
         // Send book update before any player action
-        if (packet.getAction() != PlayerActionPacket.Action.RESPAWN) {
+        if (packet.getAction() != PlayerActionType.RESPAWN) {
             session.getBookEditCache().checkForSend();
         }
 
diff --git a/connector/src/main/java/org/geysermc/connector/skin/SkinManager.java b/connector/src/main/java/org/geysermc/connector/skin/SkinManager.java
index fb8336aca..5a0e41ed5 100644
--- a/connector/src/main/java/org/geysermc/connector/skin/SkinManager.java
+++ b/connector/src/main/java/org/geysermc/connector/skin/SkinManager.java
@@ -81,7 +81,7 @@ public class SkinManager {
                                                                  String capeId, byte[] capeData,
                                                                  SkinProvider.SkinGeometry geometry) {
         SerializedSkin serializedSkin = SerializedSkin.of(
-                skinId, geometry.getGeometryName(), ImageData.of(skinData), Collections.emptyList(),
+                skinId, "", geometry.getGeometryName(), ImageData.of(skinData), Collections.emptyList(),
                 ImageData.of(capeData), geometry.getGeometryData(), "", true, false,
                 !capeId.equals(SkinProvider.EMPTY_CAPE.getCapeId()), capeId, skinId
         );
diff --git a/connector/src/main/java/org/geysermc/connector/skin/SkullSkinManager.java b/connector/src/main/java/org/geysermc/connector/skin/SkullSkinManager.java
index 562e2c50f..7481b70bc 100644
--- a/connector/src/main/java/org/geysermc/connector/skin/SkullSkinManager.java
+++ b/connector/src/main/java/org/geysermc/connector/skin/SkullSkinManager.java
@@ -42,7 +42,7 @@ public class SkullSkinManager extends SkinManager {
         // Prevents https://cdn.discordapp.com/attachments/613194828359925800/779458146191147008/unknown.png
         skinId = skinId + "_skull";
         return SerializedSkin.of(
-                skinId, SkinProvider.SKULL_GEOMETRY.getGeometryName(), ImageData.of(skinData), Collections.emptyList(),
+                skinId, "", SkinProvider.SKULL_GEOMETRY.getGeometryName(), ImageData.of(skinData), Collections.emptyList(),
                 ImageData.of(SkinProvider.EMPTY_CAPE.getCapeData()), SkinProvider.SKULL_GEOMETRY.getGeometryData(),
                 "", true, false, false, SkinProvider.EMPTY_CAPE.getCapeId(), skinId
         );