Undo previous fix, add new placeholder for returning user's current nickname. Also adds cache so that papi isn't just, constantly reading the yml

Author: RhythmicSys

src/main/java/simplexity/simplenicks/SimpleNicks.java

@@ -16,7 +16,6 @@
 import simplexity.simplenicks.listener.LoginListener;
 import simplexity.simplenicks.util.Constants;
 import simplexity.simplenicks.util.NickHandler;
-import simplexity.simplenicks.util.PacketStuff;
 import simplexity.simplenicks.util.SNExpansion;
 
 import java.util.Collections;
@@ -52,9 +51,6 @@ public void onEnable() {
         if (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) {
             new SNExpansion().register();
         }
-        if (this.getServer().getPluginManager().isPluginEnabled("floodgate")) {
-            PacketStuff.registerPacketStuff();
-        }
         instance.getServer().getPluginManager().registerEvents(new LoginListener(), this);
         configReload();
     }

src/main/java/simplexity/simplenicks/listener/LoginListener.java

@@ -1,17 +1,24 @@
 package simplexity.simplenicks.listener;
 
 import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import simplexity.simplenicks.SimpleNicks;
+import simplexity.simplenicks.util.Cache;
 import simplexity.simplenicks.util.NickHandler;
 
 public class LoginListener implements Listener {
     @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
     public void onPlayerLogin(PlayerJoinEvent joinEvent) {
-        Bukkit.getScheduler().runTaskLater(SimpleNicks.getInstance(), () ->
-                NickHandler.getInstance().refreshNickname(joinEvent.getPlayer()), 20L);
+        Bukkit.getScheduler().runTaskLater(SimpleNicks.getInstance(), () -> {
+            Player player = joinEvent.getPlayer();
+            String nickname = NickHandler.getInstance().loadNickname(player);
+            if (nickname == null || nickname.isEmpty()) return;
+            Cache.nicknameCache.put(player.getUniqueId(), nickname);
+            NickHandler.getInstance().refreshNickname(joinEvent.getPlayer());
+        }, 20L);
     }
 }

src/main/java/simplexity/simplenicks/listener/NamePacketListener.java

@@ -0,0 +1,16 @@
+package simplexity.simplenicks.listener;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerQuitEvent;
+import simplexity.simplenicks.util.Cache;
+
+public class QuitListener implements Listener {
+
+    @EventHandler
+    public void onPlayerQuit(PlayerQuitEvent quitEvent) {
+        Player player = quitEvent.getPlayer();
+        Cache.nicknameCache.remove(player.getUniqueId());
+    }
+}

src/main/java/simplexity/simplenicks/listener/QuitListener.java

@@ -0,0 +1,9 @@
+package simplexity.simplenicks.util;
+
+import java.util.HashMap;
+import java.util.UUID;
+
+public class Cache {
+    // a;lskdjf;laskjdf
+    public static final HashMap<UUID, String> nicknameCache = new HashMap<>();
+}

src/main/java/simplexity/simplenicks/util/Cache.java

@@ -30,17 +30,23 @@ public static NickHandler getInstance() {
     }
 
     public String getNickname(OfflinePlayer player) {
+        return Cache.nicknameCache.get(player.getUniqueId());
+    }
+
+    public String loadNickname(OfflinePlayer player){
         return saveHandler.getNickname(player);
     }
 
     public boolean setNickname(OfflinePlayer player, String nickname) {
         if (!saveHandler.setNickname(player, nickname)) return false;
+        Cache.nicknameCache.put(player.getUniqueId(), nickname);
         refreshNickname(player);
         return true;
     }
 
     public boolean resetNickname(OfflinePlayer player) {
         if (!saveHandler.resetNickname(player)) return false;
+        Cache.nicknameCache.remove(player.getUniqueId());
         refreshNickname(player);
         return true;
     }

src/main/java/simplexity/simplenicks/util/NickHandler.java

@@ -1,8 +1,11 @@
 package simplexity.simplenicks.util;
 
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.bukkit.OfflinePlayer;
 import org.jetbrains.annotations.NotNull;
+import simplexity.simplenicks.SimpleNicks;
 
 public class SNExpansion extends PlaceholderExpansion {
     @Override
@@ -17,7 +20,7 @@ public class SNExpansion extends PlaceholderExpansion {
 
     @Override
     public @NotNull String getVersion() {
-        return "1.0.0";
+        return "2.0.0";
     }
 
     @Override
@@ -34,6 +37,14 @@ public String onRequest(OfflinePlayer player, @NotNull String params) {
             }
             return player.getName();
         }
+        if (params.equalsIgnoreCase("nickname")) {
+            String nickname = NickHandler.getInstance().getNickname(player);
+            if (nickname == null) {
+                return player.getName();
+            }
+            Component parsedNick = SimpleNicks.getMiniMessage().deserialize(nickname);
+            return LegacyComponentSerializer.legacySection().serialize(parsedNick);
+        }
         return null;
     }
 }