Refactor

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

Author: calcastor

buildSrc/src/main/kotlin/buildlogic.java-conventions.gradle.kts

@@ -16,16 +16,28 @@ repositories {
     maven("https://repo.papermc.io/repository/maven-public/") // Paper builds & paperweight plugin
     maven("https://repo.aikar.co/content/groups/aikar/") // Aikar repo
     maven("https://repo.codemc.io/repository/maven-releases/") // PacketEvents
+    exclusiveContent {
+        forRepository {
+            maven("https://jitpack.io")
+        }
+        filter {
+            includeGroup("com.github.OvercastCommunity.adventure-platform")
+            includeGroup("com.github.MinusKube")
+        }
+    }
     mavenLocal() // Local last
 }
 
 dependencies {
     api("com.zaxxer:HikariCP:2.4.1") { isTransitive = false }
-    api("fr.minuskube.inv:smart-invs:1.2.7") { isTransitive = false }
+    // Latest SmartInvs commit
+    api("com.github.MinusKube:SmartInvs:9c9dbbee16") { isTransitive = false }
     api("redis.clients:jedis:3.5.1")
     api("net.kyori:adventure-api:4.26.1")
     api("net.kyori:adventure-text-serializer-plain:4.26.1")
-    api("net.kyori:adventure-platform-bukkit:4.4.1")
+    // adventure-platform fork with ViaVersion and 1.21.11+ fixes
+    // https://github.com/OvercastCommunity/adventure-platform
+    api("com.github.OvercastCommunity.adventure-platform:adventure-platform-bukkit:32fc5eaf06")
     api("org.reflections:reflections:0.10.2")
 
     // Annotations

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

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

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.PlayerUtils.PLAYER_UTILS;
+import static dev.pgm.community.util.FakeIdentityStore.fakeIdentityStore;
 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 PLAYER_UTILS.getPlayerSkin(player, viewer);
+    return fakeIdentityStore.getSkin(player, viewer);
   }
 
   public void cancelTask() {

core/src/main/java/dev/pgm/community/nick/feature/types/NickFeatureCore.java

@@ -86,9 +86,21 @@ public SkinManager getSkinManager() {
   @Override
   public void enable() {
     super.enable();
+    skins.enable();
     integrate();
   }
 
+  @Override
+  public void disable() {
+    if (pgmNicks != null) {
+      pgmNicks.cancelTask();
+      pgmNicks = null;
+    }
+
+    skins.disable();
+    super.disable();
+  }
+
   private void integrate() {
     if (isPGMEnabled()) {
       pgmNicks = new PGMNickIntegration(this);
@@ -183,12 +195,12 @@ public void onJoin(PlayerJoinEvent event) {
                 .thenAcceptAsync(name -> this.setNick(player.getUniqueId(), name)
                     .thenAcceptAsync(success -> {
                       if (success) {
-                        nickedPlayers.put(player.getUniqueId(), nick.getName());
+                        nickedPlayers.put(player.getUniqueId(), name);
                         Audience.get(player)
                             .sendWarning(text(
                                 "You had no nickname, so a random one has been assigned",
                                 NamedTextColor.GREEN));
-                        sendLoginNotification(player, nick.getName(), true);
+                        sendLoginNotification(player, name, true);
                       }
                     }));
           }

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

@@ -1,5 +1,6 @@
 package dev.pgm.community.nick.skin;
 
+import static dev.pgm.community.util.FakeIdentityStore.fakeIdentityStore;
 import static dev.pgm.community.util.PlayerUtils.PLAYER_UTILS;
 
 import com.google.common.cache.Cache;
@@ -66,6 +67,12 @@ public void onPlayerQuit(PlayerQuitEvent event) {
     if (canUseSkin(player)) {
       offlineSkins.put(player.getUniqueId(), PLAYER_UTILS.getPlayerSkin(player));
     }
+
+    fakeIdentityStore.clearViewer(player.getUniqueId());
+    UUID playerId = player.getUniqueId();
+    String playerName = player.getName();
+    Bukkit.getScheduler()
+        .runTask(Community.get(), () -> fakeIdentityStore.clearPlayer(playerId, playerName));
   }
 
   @EventHandler(priority = EventPriority.LOW)
@@ -78,9 +85,6 @@ public void refreshNamesOnLogin(PlayerJoinEvent event) {
     refreshPlayer(event.getPlayer());
   }
 
-  // SPORTPAPER STUFF - TODO: Add alternative method and check if server is running SportPaper to
-  // enable
-
   private void refreshAllViewers(Player player) {
     Bukkit.getOnlinePlayers().forEach(viewer -> refreshFakeName(player, viewer));
   }
@@ -108,7 +112,6 @@ private void refreshSelfView(Player viewer) {
     Bukkit.getOnlinePlayers().forEach(other -> refreshFakeName(other, viewer));
   }
 
-  // TODO: Figure out how to use without SPORTPAPER API
   private void refreshFakeName(Player player, Player viewer) {
     boolean nicked = Integration.getNick(player) != null;
     boolean areFriends = Integration.isFriend(player, viewer);

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

@@ -1,19 +1,39 @@
 package dev.pgm.community.nick.skin;
 
+import static dev.pgm.community.util.FakeIdentityStore.fakeIdentityStore;
+
 import dev.pgm.community.Community;
 import org.bukkit.entity.Player;
+import org.bukkit.event.HandlerList;
 import tc.oc.pgm.util.skin.Skin;
 
 public class SkinManager {
 
   private final SkinCache cache;
+  private boolean registered;
 
   public SkinManager() {
     this.cache = new SkinCache();
+    enable();
+  }
+
+  public void enable() {
+    if (registered) return;
+
     Community.get().registerListener(cache);
+    registered = true;
   }
 
   public void setSkin(Player player, Skin skin) {
     cache.onSkinRefresh(player, skin);
   }
+
+  public void disable() {
+    if (registered) {
+      HandlerList.unregisterAll(cache);
+      registered = false;
+    }
+
+    fakeIdentityStore.clearAll();
+  }
 }

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

@@ -1,5 +1,6 @@
 package dev.pgm.community.platform.modern;
 
+import static dev.pgm.community.util.FakeIdentityStore.fakeIdentityStore;
 import static dev.pgm.community.util.Supports.Variant.PAPER;
 
 import com.destroystokyo.paper.profile.CraftPlayerProfile;
@@ -13,9 +14,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.UUID;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.bukkit.Material;
@@ -25,7 +24,7 @@
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.SkullMeta;
 import org.bukkit.profile.PlayerTextures;
-import org.bukkit.scoreboard.Team;
+import org.jspecify.annotations.NonNull;
 import tc.oc.pgm.platform.modern.util.Skins;
 import tc.oc.pgm.util.skin.Skin;
 
@@ -37,37 +36,32 @@ public Skin getPlayerSkin(Player player) {
     return Skins.fromProfile(craftPlayer.getProfile());
   }
 
-  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<>();
-
   @Override
   public void setFakeNameAndSkin(
       Player player, Player viewer, String displayName, String nick, Skin skin) {
-    String oldName = getPlayerName(player, viewer);
+    String oldName = fakeIdentityStore.getName(player, viewer);
 
-    playerSkins
-        .computeIfAbsent(player.getUniqueId(), k -> new HashMap<>())
-        .put(viewer.getUniqueId(), skin);
-    playerNames
-        .computeIfAbsent(player.getUniqueId(), k -> new HashMap<>())
-        .put(viewer.getUniqueId(), nick);
-    playerDisplayNames
-        .computeIfAbsent(player.getUniqueId(), k -> new HashMap<>())
-        .put(viewer.getUniqueId(), displayName);
+    fakeIdentityStore.set(player, viewer, displayName, nick, skin);
 
-    String newName = getPlayerName(player, viewer);
+    String newName = fakeIdentityStore.getName(player, viewer);
 
     if (!oldName.equals(newName)) {
-      Team team = viewer.getScoreboard().getEntryTeam(player.getName());
-      if (team != null) {
-        // Skip handler in PacketManipulations
-        sendTeamPacketSilently(viewer, team.getName(), TeamMode.REMOVE_ENTITIES, List.of(oldName));
-        sendTeamPacketSilently(viewer, team.getName(), TeamMode.ADD_ENTITIES, List.of(newName));
-      }
+      updateTeamEntry(viewer, oldName, newName);
     }
   }
 
+  private void updateTeamEntry(@NonNull Player viewer, String oldName, String newName) {
+    UUID viewerId = viewer.getUniqueId();
+    String teamName = fakeIdentityStore.getTeamName(viewerId, oldName);
+    if (teamName == null) return;
+
+    sendTeamPacketSilently(viewer, teamName, TeamMode.REMOVE_ENTITIES, List.of(oldName));
+    fakeIdentityStore.removeTeamEntries(viewerId, teamName, List.of(oldName));
+
+    sendTeamPacketSilently(viewer, teamName, TeamMode.ADD_ENTITIES, List.of(newName));
+    fakeIdentityStore.addTeamEntries(viewerId, teamName, List.of(newName));
+  }
+
   private void sendTeamPacketSilently(
       Player viewer, String teamName, TeamMode mode, java.util.Collection<String> names) {
     PacketEvents.getAPI()
@@ -79,40 +73,7 @@ private void sendTeamPacketSilently(
   }
 
   @Override
-  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());
-      if (displayName != null) return displayName;
-    }
-
-    return LegacyComponentSerializer.legacySection().serialize(player.displayName());
-  }
-
-  @Override
-  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());
-      if (name != null) return name;
-    }
-
-    return player.getName();
-  }
-
-  @Override
-  public Skin getPlayerSkin(Player player, Player viewer) {
-    if (playerSkins.containsKey(player.getUniqueId())) {
-      Map<UUID, Skin> uuidSkinMap = playerSkins.get(player.getUniqueId());
-      Skin skin = uuidSkinMap.get(viewer.getUniqueId());
-      if (skin != null && !skin.isEmpty()) return skin;
-    }
-
-    return getPlayerSkin(player);
-  }
-
-  @Override
-  public ItemStack customSkull(String url, String displayName, String... lore) {
+  public ItemStack customSkull(@NonNull String url, String displayName, String... lore) {
     ItemStack head = new ItemStack(Material.PLAYER_HEAD);
     if (url.isEmpty()) {
       return head;