From c9fd77fa440349741a980ee7b21ed6ba95d2e1b9 Mon Sep 17 00:00:00 2001
From: Tim203 <mctim203@gmail.com>
Date: Mon, 5 Jul 2021 16:21:01 +0200
Subject: [PATCH] Made Floodgate-Fabric build again

---
 .../geysermc/floodgate/addon/data/FabricDataAddon.java |  5 -----
 .../floodgate/pluginmessage/FabricSkinApplier.java     | 10 +++-------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/geysermc/floodgate/addon/data/FabricDataAddon.java b/src/main/java/org/geysermc/floodgate/addon/data/FabricDataAddon.java
index 9a40c865..385403eb 100644
--- a/src/main/java/org/geysermc/floodgate/addon/data/FabricDataAddon.java
+++ b/src/main/java/org/geysermc/floodgate/addon/data/FabricDataAddon.java
@@ -34,11 +34,6 @@ public final class FabricDataAddon implements InjectorAddon {
         );
     }
 
-    @Override
-    public void onLoginDone(Channel channel) {
-        onRemoveInject(channel);
-    }
-
     @Override
     public void onChannelClosed(Channel channel) {
         FloodgatePlayer player = channel.attr(playerAttribute).get();
diff --git a/src/main/java/org/geysermc/floodgate/pluginmessage/FabricSkinApplier.java b/src/main/java/org/geysermc/floodgate/pluginmessage/FabricSkinApplier.java
index ad63321a..549d9cb4 100644
--- a/src/main/java/org/geysermc/floodgate/pluginmessage/FabricSkinApplier.java
+++ b/src/main/java/org/geysermc/floodgate/pluginmessage/FabricSkinApplier.java
@@ -1,7 +1,6 @@
 package org.geysermc.floodgate.pluginmessage;
 
 import com.google.common.collect.Lists;
-import com.google.gson.JsonObject;
 import com.mojang.authlib.properties.Property;
 import com.mojang.authlib.properties.PropertyMap;
 import com.mojang.datafixers.util.Pair;
@@ -16,6 +15,7 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ServerPlayerEntity;
 import org.geysermc.floodgate.api.player.FloodgatePlayer;
 import org.geysermc.floodgate.skin.SkinApplier;
+import org.geysermc.floodgate.skin.SkinData;
 
 import java.util.Collection;
 import java.util.List;
@@ -26,7 +26,7 @@ public final class FabricSkinApplier implements SkinApplier {
     private static MinecraftServer SERVER;
 
     @Override
-    public void applySkin(FloodgatePlayer floodgatePlayer, JsonObject skinResult) {
+    public void applySkin(FloodgatePlayer floodgatePlayer, SkinData skinData) {
         SERVER.execute(() -> {
             ServerPlayerEntity bedrockPlayer = SERVER.getPlayerManager().getPlayer(floodgatePlayer.getCorrectUniqueId());
             if (bedrockPlayer == null) {
@@ -38,11 +38,7 @@ public final class FabricSkinApplier implements SkinApplier {
             PropertyMap properties = bedrockPlayer.getGameProfile().getProperties();
 
             properties.removeAll("textures");
-            Property property = new Property(
-                    "textures",
-                    skinResult.get("value").getAsString(),
-                    skinResult.get("signature").getAsString());
-            properties.put("textures", property);
+            properties.put("textures", new Property("textures", skinData.getValue(), skinData.getSignature()));
 
             // Skin is applied - now it's time to refresh the player for everyone. Oof.
             for (ServerPlayerEntity otherPlayer : SERVER.getPlayerManager().getPlayerList()) {