From bb45676d89bb23bc76b7bb6eadd276f46b378cca Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Mon, 19 Dec 2022 14:56:20 -0500
Subject: [PATCH] Update to 1.19.3

---
 build.gradle                                             | 4 ++--
 gradle.properties                                        | 6 +++---
 .../floodgate/pluginmessage/FabricSkinApplier.java       | 9 ++++++---
 src/main/resources/fabric.mod.json                       | 2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7dd52402..fa7f8359 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,11 +40,11 @@ dependencies {
         exclude group: 'it.unimi.dsi.fastutil', module: "*"
     }
 
-    include(modImplementation('cloud.commandframework:cloud-fabric:1.7.0-SNAPSHOT') {
+    include(modImplementation('cloud.commandframework:cloud-fabric:1.8.0-SNAPSHOT') {
         because "Commands library implementation for Fabric"
     })
 
-    include(modImplementation('net.kyori:adventure-platform-fabric:5.4.0-SNAPSHOT') {
+    include(modImplementation('net.kyori:adventure-platform-fabric:5.6.0-SNAPSHOT') {
         because "Chat library implementation for Fabric that includes methods for communicating with the server"
         // Thanks to zml for this fix
         // The package modifies Brigadier which causes a LinkageError at runtime if included
diff --git a/gradle.properties b/gradle.properties
index 0c43ff6a..6f7b3a32 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,14 +2,14 @@
 org.gradle.jvmargs=-Xmx2G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.19
-loader_version=0.14.6
+minecraft_version=1.19.3
+loader_version=0.14.11
 # Mod Properties
 mod_version=2.2.0-SNAPSHOT
 maven_group=org.geysermc.floodgate
 archives_base_name=floodgate-fabric
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.55.3+1.19
+fabric_version=0.68.1+1.19.3
 # Our stuff
 lombok_version=1.18.20
diff --git a/src/main/java/org/geysermc/floodgate/pluginmessage/FabricSkinApplier.java b/src/main/java/org/geysermc/floodgate/pluginmessage/FabricSkinApplier.java
index 56264559..e7fd4163 100644
--- a/src/main/java/org/geysermc/floodgate/pluginmessage/FabricSkinApplier.java
+++ b/src/main/java/org/geysermc/floodgate/pluginmessage/FabricSkinApplier.java
@@ -2,7 +2,8 @@ package org.geysermc.floodgate.pluginmessage;
 
 import com.mojang.authlib.properties.Property;
 import com.mojang.authlib.properties.PropertyMap;
-import net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket;
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoRemovePacket;
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket;
 import net.minecraft.server.level.ChunkMap;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
@@ -12,6 +13,8 @@ import org.geysermc.floodgate.mixin.ChunkMapMixin;
 import org.geysermc.floodgate.skin.SkinApplier;
 import org.geysermc.floodgate.skin.SkinData;
 
+import java.util.Collections;
+
 public final class FabricSkinApplier implements SkinApplier {
 
     @Override
@@ -40,8 +43,8 @@ public final class FabricSkinApplier implements SkinApplier {
                     entry.removePlayer(otherPlayer);
                 }
 
-                otherPlayer.connection.send(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.REMOVE_PLAYER, bedrockPlayer));
-                otherPlayer.connection.send(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.ADD_PLAYER, bedrockPlayer));
+                otherPlayer.connection.send(new ClientboundPlayerInfoRemovePacket(Collections.singletonList(bedrockPlayer.getUUID())));
+                otherPlayer.connection.send(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER, bedrockPlayer));
                 if (samePlayer) {
                     continue;
                 }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 7f2a1fcd..454d7f8f 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -26,6 +26,6 @@
   "depends": {
     "fabricloader": ">=0.14.6",
     "fabric": "*",
-    "minecraft": ">=1.19"
+    "minecraft": ">=1.19.3"
   }
 }