Relocate PlayerIdentity and synchronize access

Signed-off-by: applenick <applenick@users.noreply.github.com>

Author: applenick

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

@@ -1,6 +1,6 @@
 package dev.pgm.community;
 
-import static dev.pgm.community.nick.PlayerIdentity.PLAYER_IDENTITY;
+import static dev.pgm.community.nick.identity.PlayerIdentity.PLAYER_IDENTITY;
 
 import dev.pgm.community.commands.graph.CommunityCommandGraph;
 import dev.pgm.community.events.CommunityEvent;

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.nick.PlayerIdentity.PLAYER_IDENTITY;
+import static dev.pgm.community.nick.identity.PlayerIdentity.PLAYER_IDENTITY;
 import static net.kyori.adventure.text.Component.text;
 
 import dev.pgm.community.utils.PGMUtils;

…v/pgm/community/nick/PlayerIdentity.java …munity/nick/identity/PlayerIdentity.javacore/src/main/java/dev/pgm/community/nick/PlayerIdentity.java renamed to core/src/main/java/dev/pgm/community/nick/identity/PlayerIdentity.java core/src/main/java/dev/pgm/community/nick/PlayerIdentity.java renamed to core/src/main/java/dev/pgm/community/nick/identity/PlayerIdentity.java

@@ -1,4 +1,4 @@
-package dev.pgm.community.nick;
+package dev.pgm.community.nick.identity;
 
 import static dev.pgm.community.util.PlayerUtils.PLAYER_UTILS;
 
@@ -25,7 +25,7 @@ public final class PlayerIdentity {
 
   private PlayerIdentity() {}
 
-  public void set(
+  public synchronized void set(
       Player player,
       Player viewer,
       @Nullable String displayName,
@@ -63,7 +63,7 @@ public static void validateNick(@Nullable String name) {
     }
   }
 
-  public void clearPlayer(UUID playerId, String realName) {
+  public synchronized void clearPlayer(UUID playerId, String realName) {
     playerSkins.remove(playerId);
     playerNames.remove(playerId);
     playerDisplayNames.remove(playerId);
@@ -73,7 +73,7 @@ public void clearPlayer(UUID playerId, String realName) {
     });
   }
 
-  public void clearViewer(UUID viewerId) {
+  public synchronized void clearViewer(UUID viewerId) {
     clearViewer(playerSkins, viewerId);
     clearViewer(playerNames, viewerId);
     clearViewer(playerDisplayNames, viewerId);
@@ -88,15 +88,15 @@ private static <T> void clearViewer(Map<UUID, Map<UUID, T>> identities, UUID vie
     });
   }
 
-  public void clearAll() {
+  public synchronized void clearAll() {
     playerSkins.clear();
     playerNames.clear();
     playerDisplayNames.clear();
     viewerTeamEntries.clear();
     viewerVisibleNames.clear();
   }
 
-  public @Nullable String getVisibleName(UUID viewerId, String realName) {
+  public synchronized @Nullable String getVisibleName(UUID viewerId, String realName) {
     Map<String, String> visibleNames = viewerVisibleNames.get(viewerId);
     return visibleNames == null ? null : visibleNames.get(realName);
   }
@@ -118,7 +118,7 @@ private void clearVisibleName(UUID viewerId, String realName) {
     if (visibleNames.isEmpty()) viewerVisibleNames.remove(viewerId);
   }
 
-  public @Nullable String getTeamName(UUID viewerId, String entry) {
+  public synchronized @Nullable String getTeamName(UUID viewerId, String entry) {
     Map<String, HashSet<String>> teamEntries = viewerTeamEntries.get(viewerId);
     if (teamEntries == null) return null;
 
@@ -129,28 +129,29 @@ private void clearVisibleName(UUID viewerId, String realName) {
     return null;
   }
 
-  public boolean hasTeamEntry(UUID viewerId, String teamName, String entry) {
+  public synchronized boolean hasTeamEntry(UUID viewerId, String teamName, String 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) {
+  public synchronized void createTeam(UUID viewerId, String teamName, Collection<String> entries) {
     removeTeam(viewerId, teamName);
     addTeamEntries(viewerId, teamName, entries);
   }
 
-  public void removeTeam(UUID viewerId, String teamName) {
+  public synchronized void removeTeam(UUID viewerId, String teamName) {
     Map<String, HashSet<String>> teamEntries = viewerTeamEntries.get(viewerId);
     if (teamEntries == null) return;
 
     teamEntries.remove(teamName);
     if (teamEntries.isEmpty()) viewerTeamEntries.remove(viewerId);
   }
 
-  public void addTeamEntries(UUID viewerId, String teamName, Collection<String> entries) {
+  public synchronized void addTeamEntries(
+      UUID viewerId, String teamName, Collection<String> entries) {
     if (entries.isEmpty()) return;
 
     Map<String, HashSet<String>> teamEntries =
@@ -160,7 +161,8 @@ public void addTeamEntries(UUID viewerId, String teamName, Collection<String> en
     teamEntries.computeIfAbsent(teamName, k -> new HashSet<>()).addAll(entries);
   }
 
-  public void removeTeamEntries(UUID viewerId, String teamName, Collection<String> entries) {
+  public synchronized void removeTeamEntries(
+      UUID viewerId, String teamName, Collection<String> entries) {
     Map<String, HashSet<String>> teamEntries = viewerTeamEntries.get(viewerId);
     if (teamEntries == null) return;
 
@@ -172,36 +174,36 @@ public void removeTeamEntries(UUID viewerId, String teamName, Collection<String>
     if (teamEntries.isEmpty()) viewerTeamEntries.remove(viewerId);
   }
 
-  public String getDisplayName(Player player, Player viewer) {
+  public synchronized String getDisplayName(Player player, Player viewer) {
     String displayName = get(playerDisplayNames, player.getUniqueId(), viewer.getUniqueId());
     if (displayName != null) return displayName;
 
     return player.getDisplayName();
   }
 
-  public boolean hasDisplayName(Player player, Player viewer) {
+  public synchronized boolean hasDisplayName(Player player, Player viewer) {
     return get(playerDisplayNames, player.getUniqueId(), viewer.getUniqueId()) != null;
   }
 
-  public String getName(Player player, Player viewer) {
+  public synchronized 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) {
+  public synchronized boolean hasName(Player player, Player viewer) {
     return get(playerNames, player.getUniqueId(), viewer.getUniqueId()) != null;
   }
 
-  public Skin getSkin(Player player, Player viewer) {
+  public synchronized 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) {
+  public synchronized boolean hasSkin(Player player, Player viewer) {
     Skin skin = get(playerSkins, player.getUniqueId(), viewer.getUniqueId());
     return skin != null && !skin.isEmpty();
   }

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.nick.PlayerIdentity.PLAYER_IDENTITY;
+import static dev.pgm.community.nick.identity.PlayerIdentity.PLAYER_IDENTITY;
 import static dev.pgm.community.util.PlayerUtils.PLAYER_UTILS;
 
 import com.google.common.cache.Cache;
@@ -126,6 +126,8 @@ private void refreshFakeName(Player player, Player viewer) {
     if (nicked && !canSeeRealName) {
       String nick = Integration.getNick(player);
       MatchPlayer matchPlayer = PGM.get().getMatchManager().getPlayer(player);
+      if (matchPlayer == null) return;
+
       String displayName = PGM.get()
           .getNameDecorationRegistry()
           .getDecoratedName(player, matchPlayer.getParty().getColor());

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.nick.PlayerIdentity.PLAYER_IDENTITY;
+import static dev.pgm.community.nick.identity.PlayerIdentity.PLAYER_IDENTITY;
 
 import dev.pgm.community.Community;
 import org.bukkit.entity.Player;

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.nick.PlayerIdentity.PLAYER_IDENTITY;
+import static dev.pgm.community.nick.identity.PlayerIdentity.PLAYER_IDENTITY;
 import static dev.pgm.community.util.Supports.Variant.PAPER;
 
 import com.destroystokyo.paper.profile.CraftPlayerProfile;

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.nick.PlayerIdentity.PLAYER_IDENTITY;
+import static dev.pgm.community.nick.identity.PlayerIdentity.PLAYER_IDENTITY;
 
 import com.github.retrooper.packetevents.event.PacketListenerCommon;
 import com.github.retrooper.packetevents.event.PacketListenerPriority;

platform/platform-sportpaper/src/main/java/dev/pgm/community/platform/sportpaper/SpPlayerUtils.java

@@ -1,6 +1,6 @@
 package dev.pgm.community.platform.sportpaper;
 
-import static dev.pgm.community.nick.PlayerIdentity.PLAYER_IDENTITY;
+import static dev.pgm.community.nick.identity.PlayerIdentity.PLAYER_IDENTITY;
 import static dev.pgm.community.util.Supports.Variant.SPORTPAPER;
 
 import com.mojang.authlib.GameProfile;