Implement and use getPlayerSkin?

Signed-off-by: BT (calcastor/mame) <43831917+calcastor@users.noreply.github.com>

Author: calcastor

platform/platform-modern/src/main/java/dev/pgm/community/platform/modern/ModernPlayerUtils.java

@@ -56,7 +56,7 @@ public String getPlayerDisplayName(Player player, Player viewer) {
     if (playerDisplayNames.containsKey(player.getUniqueId())) {
       Map<UUID, String> uuidStringMap = playerDisplayNames.get(player.getUniqueId());
       String displayName = uuidStringMap.get(viewer.getUniqueId());
-      return displayName == null ? player.getDisplayName() : displayName;
+      if (displayName != null) return displayName;
     }
     return player.getDisplayName();
   }
@@ -66,23 +66,19 @@ public String getPlayerName(Player player, Player viewer) {
     if (playerNames.containsKey(player.getUniqueId())) {
       Map<UUID, String> uuidStringMap = playerNames.get(player.getUniqueId());
       String name = uuidStringMap.get(viewer.getUniqueId());
-      return name == null ? player.getName() : name;
+      if (name != null) return name;
     }
     return player.getName();
   }
 
   @Override
   public Skin getPlayerSkin(Player player, Player viewer) {
-    return null;
-    //    if (playerSkins.containsKey(player.getUniqueId())) {
-    //      Map<UUID, Skin> uuidSkinMap = playerSkins.get(player.getUniqueId());
-    //      Skin skin = uuidSkinMap.get(viewer.getUniqueId());
-    //      if (skin == null) {
-    //        return new Skin(player.getPlayerProfile().getTextures())
-    //      }
-    //      return skin == null ? Skin.EMPTY : skin;
-    //    }
-    //    return Skin.EMPTY;
+    if (playerSkins.containsKey(player.getUniqueId())) {
+      Map<UUID, Skin> uuidSkinMap = playerSkins.get(player.getUniqueId());
+      Skin skin = uuidSkinMap.get(viewer.getUniqueId());
+      if (skin != null) return skin;
+    }
+    return getPlayerSkin(player);
   }
 
   @Override

platform/platform-modern/src/main/java/dev/pgm/community/platform/modern/PacketManipulations.java

@@ -9,6 +9,7 @@
 import com.comphenix.protocol.wrappers.PlayerInfoData;
 import com.comphenix.protocol.wrappers.WrappedChatComponent;
 import com.comphenix.protocol.wrappers.WrappedGameProfile;
+import com.comphenix.protocol.wrappers.WrappedSignedProperty;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -19,6 +20,7 @@
 import org.bukkit.plugin.Plugin;
 import tc.oc.pgm.platform.modern.packets.PacketSender;
 import tc.oc.pgm.platform.modern.util.Packets;
+import tc.oc.pgm.util.skin.Skin;
 
 public class PacketManipulations implements PacketSender {
 
@@ -47,7 +49,7 @@ private void handlePlayerInfo(PacketEvent event) {
           .write(
               0,
               infoList.stream()
-                  .map((playerInfoData -> {
+                  .map(playerInfoData -> {
                     UUID playerId = playerInfoData.getProfileId();
                     Player player = Bukkit.getPlayer(playerId);
                     if (player == null || player.equals(viewer) || !player.isOnline()) {
@@ -63,11 +65,13 @@ private void handlePlayerInfo(PacketEvent event) {
 
                     WrappedGameProfile playerProfile =
                         playerInfoData.getProfile().withName(playerName);
-                    playerInfoData
-                        .getProfile()
+                    Skin skin = PLAYER_UTILS.getPlayerSkin(player, viewer);
+                    playerProfile
                         .getProperties()
-                        .forEach(
-                            (key, property) -> playerProfile.getProperties().put(key, property));
+                        .put(
+                            "textures",
+                            new WrappedSignedProperty(
+                                "textures", skin.getData(), skin.getSignature()));
 
                     return new PlayerInfoData(
                         playerId,
@@ -76,7 +80,7 @@ private void handlePlayerInfo(PacketEvent event) {
                         playerInfoData.getGameMode(),
                         playerProfile,
                         WrappedChatComponent.fromLegacyText(playerDisplayName));
-                  }))
+                  })
                   .toList());
     }
   }