Wip

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

Author: calcastor

core/src/main/java/dev/pgm/community/Community.java

@@ -1,6 +1,6 @@
 package dev.pgm.community;
 
-import static dev.pgm.community.util.FakeIdentityStore.fakeIdentityStore;
+import static dev.pgm.community.nick.PlayerIdentity.PLAYER_IDENTITY;
 
 import dev.pgm.community.commands.graph.CommunityCommandGraph;
 import dev.pgm.community.events.CommunityEvent;
@@ -67,7 +67,7 @@ public void onEnable() {
   public void onDisable() {
     Platform.MANIFEST.onDisable();
     if (features != null) features.disable();
-    fakeIdentityStore.clearAll();
+    PLAYER_IDENTITY.clearAll();
     dev.pgm.community.database.DatabaseExecutor.shutdown();
   }
 

…gm/community/util/FakeIdentityStore.java …v/pgm/community/nick/PlayerIdentity.javautil/src/main/java/dev/pgm/community/util/FakeIdentityStore.java renamed to core/src/main/java/dev/pgm/community/nick/PlayerIdentity.java util/src/main/java/dev/pgm/community/util/FakeIdentityStore.java renamed to core/src/main/java/dev/pgm/community/nick/PlayerIdentity.java

@@ -1,9 +1,10 @@
-package dev.pgm.community.util;
+package dev.pgm.community.nick;
 
 import static dev.pgm.community.util.PlayerUtils.PLAYER_UTILS;
 
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.UUID;
 import org.bukkit.entity.Player;
@@ -12,23 +13,26 @@
 import tc.oc.pgm.util.skin.Skin;
 
 @NullMarked
-public final class FakeIdentityStore {
-  public static final FakeIdentityStore fakeIdentityStore = new FakeIdentityStore();
+public final class PlayerIdentity {
+  public static final int MAX_NICK_LENGTH = 16;
+  public static final PlayerIdentity PLAYER_IDENTITY = new PlayerIdentity();
 
   private final Map<UUID, Map<UUID, Skin>> playerSkins = new HashMap<>();
   private final Map<UUID, Map<UUID, String>> playerNames = new HashMap<>();
   private final Map<UUID, Map<UUID, String>> playerDisplayNames = new HashMap<>();
-  private final Map<UUID, Map<String, String>> viewerEntryTeams = new HashMap<>();
+  private final Map<UUID, Map<String, HashSet<String>>> viewerTeamEntries = new HashMap<>();
   private final Map<UUID, Map<String, String>> viewerVisibleNames = new HashMap<>();
 
-  private FakeIdentityStore() {}
+  private PlayerIdentity() {}
 
   public void set(
       Player player,
       Player viewer,
       @Nullable String displayName,
       @Nullable String nick,
       @Nullable Skin skin) {
+    validateNick(nick);
+
     UUID playerId = player.getUniqueId();
     UUID viewerId = viewer.getUniqueId();
 
@@ -52,6 +56,13 @@ private static <T> void set(
     identities.computeIfAbsent(playerId, k -> new HashMap<>()).put(viewerId, value);
   }
 
+  public static void validateNick(@Nullable String name) {
+    if (name != null && name.length() > MAX_NICK_LENGTH) {
+      throw new IllegalArgumentException(
+          "Player nick names are limited to " + MAX_NICK_LENGTH + " characters in length");
+    }
+  }
+
   public void clearPlayer(UUID playerId, String realName) {
     playerSkins.remove(playerId);
     playerNames.remove(playerId);
@@ -66,7 +77,7 @@ public void clearViewer(UUID viewerId) {
     clearViewer(playerSkins, viewerId);
     clearViewer(playerNames, viewerId);
     clearViewer(playerDisplayNames, viewerId);
-    viewerEntryTeams.remove(viewerId);
+    viewerTeamEntries.remove(viewerId);
     viewerVisibleNames.remove(viewerId);
   }
 
@@ -81,7 +92,7 @@ public void clearAll() {
     playerSkins.clear();
     playerNames.clear();
     playerDisplayNames.clear();
-    viewerEntryTeams.clear();
+    viewerTeamEntries.clear();
     viewerVisibleNames.clear();
   }
 
@@ -108,12 +119,22 @@ private void clearVisibleName(UUID viewerId, String realName) {
   }
 
   public @Nullable String getTeamName(UUID viewerId, String entry) {
-    Map<String, String> entryTeams = viewerEntryTeams.get(viewerId);
-    return entryTeams == null ? null : entryTeams.get(entry);
+    Map<String, HashSet<String>> teamEntries = viewerTeamEntries.get(viewerId);
+    if (teamEntries == null) return null;
+
+    for (Map.Entry<String, HashSet<String>> team : teamEntries.entrySet()) {
+      if (team.getValue().contains(entry)) return team.getKey();
+    }
+
+    return null;
   }
 
   public boolean hasTeamEntry(UUID viewerId, String teamName, String entry) {
-    return teamName.equals(getTeamName(viewerId, entry));
+    Map<String, HashSet<String>> teamEntries = viewerTeamEntries.get(viewerId);
+    if (teamEntries == null) return false;
+
+    HashSet<String> entries = teamEntries.get(teamName);
+    return entries != null && entries.contains(entry);
   }
 
   public void createTeam(UUID viewerId, String teamName, Collection<String> entries) {
@@ -122,27 +143,33 @@ public void createTeam(UUID viewerId, String teamName, Collection<String> entrie
   }
 
   public void removeTeam(UUID viewerId, String teamName) {
-    Map<String, String> entryTeams = viewerEntryTeams.get(viewerId);
-    if (entryTeams == null) return;
+    Map<String, HashSet<String>> teamEntries = viewerTeamEntries.get(viewerId);
+    if (teamEntries == null) return;
 
-    entryTeams.values().removeIf(teamName::equals);
-    if (entryTeams.isEmpty()) viewerEntryTeams.remove(viewerId);
+    teamEntries.remove(teamName);
+    if (teamEntries.isEmpty()) viewerTeamEntries.remove(viewerId);
   }
 
   public void addTeamEntries(UUID viewerId, String teamName, Collection<String> entries) {
     if (entries.isEmpty()) return;
 
-    Map<String, String> entryTeams =
-        viewerEntryTeams.computeIfAbsent(viewerId, k -> new HashMap<>());
-    entries.forEach(entry -> entryTeams.put(entry, teamName));
+    Map<String, HashSet<String>> teamEntries =
+        viewerTeamEntries.computeIfAbsent(viewerId, k -> new HashMap<>());
+    teamEntries.values().forEach(team -> team.removeAll(entries));
+    teamEntries.values().removeIf(Collection::isEmpty);
+    teamEntries.computeIfAbsent(teamName, k -> new HashSet<>()).addAll(entries);
   }
 
   public void removeTeamEntries(UUID viewerId, String teamName, Collection<String> entries) {
-    Map<String, String> entryTeams = viewerEntryTeams.get(viewerId);
-    if (entryTeams == null) return;
+    Map<String, HashSet<String>> teamEntries = viewerTeamEntries.get(viewerId);
+    if (teamEntries == null) return;
 
-    entries.forEach(entry -> entryTeams.remove(entry, teamName));
-    if (entryTeams.isEmpty()) viewerEntryTeams.remove(viewerId);
+    HashSet<String> team = teamEntries.get(teamName);
+    if (team == null) return;
+
+    team.removeAll(entries);
+    if (team.isEmpty()) teamEntries.remove(teamName);
+    if (teamEntries.isEmpty()) viewerTeamEntries.remove(viewerId);
   }
 
   public String getDisplayName(Player player, Player viewer) {
@@ -152,20 +179,33 @@ public String getDisplayName(Player player, Player viewer) {
     return player.getDisplayName();
   }
 
+  public boolean hasDisplayName(Player player, Player viewer) {
+    return get(playerDisplayNames, player.getUniqueId(), viewer.getUniqueId()) != null;
+  }
+
   public String getName(Player player, Player viewer) {
     String name = get(playerNames, player.getUniqueId(), viewer.getUniqueId());
     if (name != null) return name;
 
     return player.getName();
   }
 
+  public boolean hasName(Player player, Player viewer) {
+    return get(playerNames, player.getUniqueId(), viewer.getUniqueId()) != null;
+  }
+
   public Skin getSkin(Player player, Player viewer) {
     Skin skin = get(playerSkins, player.getUniqueId(), viewer.getUniqueId());
     if (skin != null && !skin.isEmpty()) return skin;
 
     return PLAYER_UTILS.getPlayerSkin(player);
   }
 
+  public boolean hasSkin(Player player, Player viewer) {
+    Skin skin = get(playerSkins, player.getUniqueId(), viewer.getUniqueId());
+    return skin != null && !skin.isEmpty();
+  }
+
   private static <T> @Nullable T get(
       Map<UUID, Map<UUID, T>> identities, UUID playerId, UUID viewerId) {
     Map<UUID, T> viewers = identities.get(playerId);

core/src/main/java/dev/pgm/community/nick/feature/PGMNickIntegration.java

@@ -1,6 +1,6 @@
 package dev.pgm.community.nick.feature;
 
-import static dev.pgm.community.util.FakeIdentityStore.fakeIdentityStore;
+import static dev.pgm.community.nick.PlayerIdentity.PLAYER_IDENTITY;
 import static net.kyori.adventure.text.Component.text;
 
 import dev.pgm.community.utils.PGMUtils;
@@ -41,7 +41,7 @@ public String getNick(Player player) {
 
   @Override
   public Skin getPlayerSkin(@NonNull Player player, Player viewer) {
-    return fakeIdentityStore.getSkin(player, viewer);
+    return PLAYER_IDENTITY.getSkin(player, viewer);
   }
 
   public void cancelTask() {

core/src/main/java/dev/pgm/community/nick/skin/SkinCache.java

@@ -1,6 +1,6 @@
 package dev.pgm.community.nick.skin;
 
-import static dev.pgm.community.util.FakeIdentityStore.fakeIdentityStore;
+import static dev.pgm.community.nick.PlayerIdentity.PLAYER_IDENTITY;
 import static dev.pgm.community.util.PlayerUtils.PLAYER_UTILS;
 
 import com.google.common.cache.Cache;
@@ -68,11 +68,14 @@ public void onPlayerQuit(PlayerQuitEvent event) {
       offlineSkins.put(player.getUniqueId(), PLAYER_UTILS.getPlayerSkin(player));
     }
 
-    fakeIdentityStore.clearViewer(player.getUniqueId());
+    PLAYER_IDENTITY.clearViewer(player.getUniqueId());
     UUID playerId = player.getUniqueId();
     String playerName = player.getName();
-    Bukkit.getScheduler()
-        .runTask(Community.get(), () -> fakeIdentityStore.clearPlayer(playerId, playerName));
+    Bukkit.getScheduler().runTask(Community.get(), () -> {
+      if (Bukkit.getPlayer(playerId) == null) {
+        PLAYER_IDENTITY.clearPlayer(playerId, playerName);
+      }
+    });
   }
 
   @EventHandler(priority = EventPriority.LOW)

core/src/main/java/dev/pgm/community/nick/skin/SkinManager.java

@@ -1,6 +1,6 @@
 package dev.pgm.community.nick.skin;
 
-import static dev.pgm.community.util.FakeIdentityStore.fakeIdentityStore;
+import static dev.pgm.community.nick.PlayerIdentity.PLAYER_IDENTITY;
 
 import dev.pgm.community.Community;
 import org.bukkit.entity.Player;
@@ -34,6 +34,6 @@ public void disable() {
       registered = false;
     }
 
-    fakeIdentityStore.clearAll();
+    PLAYER_IDENTITY.clearAll();
   }
 }

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

@@ -1,6 +1,6 @@
 package dev.pgm.community.platform.modern;
 
-import static dev.pgm.community.util.FakeIdentityStore.fakeIdentityStore;
+import static dev.pgm.community.nick.PlayerIdentity.PLAYER_IDENTITY;
 import static dev.pgm.community.util.Supports.Variant.PAPER;
 
 import com.destroystokyo.paper.profile.CraftPlayerProfile;
@@ -39,11 +39,11 @@ public Skin getPlayerSkin(Player player) {
   @Override
   public void setFakeNameAndSkin(
       Player player, Player viewer, String displayName, String nick, Skin skin) {
-    String oldName = fakeIdentityStore.getName(player, viewer);
+    String oldName = PLAYER_IDENTITY.getName(player, viewer);
 
-    fakeIdentityStore.set(player, viewer, displayName, nick, skin);
+    PLAYER_IDENTITY.set(player, viewer, displayName, nick, skin);
 
-    String newName = fakeIdentityStore.getName(player, viewer);
+    String newName = PLAYER_IDENTITY.getName(player, viewer);
 
     if (!oldName.equals(newName)) {
       updateTeamEntry(viewer, oldName, newName);
@@ -52,14 +52,14 @@ public void setFakeNameAndSkin(
 
   private void updateTeamEntry(@NonNull Player viewer, String oldName, String newName) {
     UUID viewerId = viewer.getUniqueId();
-    String teamName = fakeIdentityStore.getTeamName(viewerId, oldName);
+    String teamName = PLAYER_IDENTITY.getTeamName(viewerId, oldName);
     if (teamName == null) return;
 
     sendTeamPacketSilently(viewer, teamName, TeamMode.REMOVE_ENTITIES, List.of(oldName));
-    fakeIdentityStore.removeTeamEntries(viewerId, teamName, List.of(oldName));
+    PLAYER_IDENTITY.removeTeamEntries(viewerId, teamName, List.of(oldName));
 
     sendTeamPacketSilently(viewer, teamName, TeamMode.ADD_ENTITIES, List.of(newName));
-    fakeIdentityStore.addTeamEntries(viewerId, teamName, List.of(newName));
+    PLAYER_IDENTITY.addTeamEntries(viewerId, teamName, List.of(newName));
   }
 
   private void sendTeamPacketSilently(

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

@@ -1,6 +1,6 @@
 package dev.pgm.community.platform.modern;
 
-import static dev.pgm.community.util.FakeIdentityStore.fakeIdentityStore;
+import static dev.pgm.community.nick.PlayerIdentity.PLAYER_IDENTITY;
 
 import com.github.retrooper.packetevents.event.PacketListenerCommon;
 import com.github.retrooper.packetevents.event.PacketListenerPriority;
@@ -57,25 +57,36 @@ private void handlePlayerInfo(@NonNull PacketSendEvent event) {
       Player player = Bukkit.getPlayer(entry.getProfileId());
       if (player == null || player.equals(viewer)) continue;
 
-      String playerDisplayName = fakeIdentityStore.getDisplayName(player, viewer);
-      String playerName = fakeIdentityStore.getName(player, viewer);
+      boolean hasName = PLAYER_IDENTITY.hasName(player, viewer);
+      boolean hasSkin = PLAYER_IDENTITY.hasSkin(player, viewer);
+      boolean hasDisplayName = PLAYER_IDENTITY.hasDisplayName(player, viewer);
 
-      if (StringUtils.isBlank(playerName) || StringUtils.isBlank(playerDisplayName)) continue;
+      if (!hasName && !hasSkin && !hasDisplayName) continue;
 
-      if (hasAddPlayer) {
+      if (hasAddPlayer && (hasName || hasSkin)) {
         UserProfile profile = entry.getGameProfile();
-        profile.setName(playerName);
+        if (hasName) {
+          String playerName = PLAYER_IDENTITY.getName(player, viewer);
+          if (StringUtils.isBlank(playerName)) continue;
 
-        Skin skin = fakeIdentityStore.getSkin(player, viewer);
-        profile.getTextureProperties().clear();
-        profile
-            .getTextureProperties()
-            .add(new TextureProperty("textures", skin.getData(), skin.getSignature()));
+          profile.setName(playerName);
+        }
+
+        if (hasSkin) {
+          Skin skin = PLAYER_IDENTITY.getSkin(player, viewer);
+          profile.getTextureProperties().clear();
+          profile
+              .getTextureProperties()
+              .add(new TextureProperty("textures", skin.getData(), skin.getSignature()));
+        }
 
         entry.setGameProfile(profile);
       }
 
-      if (hasUpdateDisplayName) {
+      if (hasUpdateDisplayName && hasDisplayName) {
+        String playerDisplayName = PLAYER_IDENTITY.getDisplayName(player, viewer);
+        if (StringUtils.isBlank(playerDisplayName)) continue;
+
         entry.setDisplayName(
             LegacyComponentSerializer.legacySection().deserialize(playerDisplayName));
       }
@@ -102,18 +113,20 @@ private void handleScoreboardTeams(@NonNull PacketSendEvent event) {
     boolean modified = false;
     for (int i = 0; i < players.size(); i++) {
       String entry = players.get(i);
-      String visibleName = fakeIdentityStore.getVisibleName(viewerId, entry);
+      String visibleName = PLAYER_IDENTITY.getVisibleName(viewerId, entry);
       if (mode == TeamMode.REMOVE_ENTITIES) {
-        String removeEntry = StringUtils.isBlank(visibleName) ? entry : visibleName;
-        if (!fakeIdentityStore.hasTeamEntry(viewerId, teamName, removeEntry)) {
-          players.remove(i--);
-          modified = true;
+        if (!StringUtils.isBlank(visibleName)
+            && PLAYER_IDENTITY.hasTeamEntry(viewerId, teamName, visibleName)) {
+          if (!visibleName.equals(entry)) {
+            players.set(i, visibleName);
+            modified = true;
+          }
           continue;
         }
 
-        if (removeEntry.equals(entry)) continue;
+        if (PLAYER_IDENTITY.hasTeamEntry(viewerId, teamName, entry)) continue;
 
-        players.set(i, removeEntry);
+        players.remove(i--);
         modified = true;
         continue;
       }
@@ -140,10 +153,10 @@ private void handleScoreboardTeams(@NonNull PacketSendEvent event) {
   private void trackTeamPacket(
       UUID viewerId, String teamName, TeamMode mode, List<String> players) {
     switch (mode) {
-      case CREATE -> fakeIdentityStore.createTeam(viewerId, teamName, players);
-      case REMOVE -> fakeIdentityStore.removeTeam(viewerId, teamName);
-      case ADD_ENTITIES -> fakeIdentityStore.addTeamEntries(viewerId, teamName, players);
-      case REMOVE_ENTITIES -> fakeIdentityStore.removeTeamEntries(viewerId, teamName, players);
+      case CREATE -> PLAYER_IDENTITY.createTeam(viewerId, teamName, players);
+      case REMOVE -> PLAYER_IDENTITY.removeTeam(viewerId, teamName);
+      case ADD_ENTITIES -> PLAYER_IDENTITY.addTeamEntries(viewerId, teamName, players);
+      case REMOVE_ENTITIES -> PLAYER_IDENTITY.removeTeamEntries(viewerId, teamName, players);
       case UPDATE -> {
         // Team metadata update; membership is unchanged.
       }