feat: add name in data

Author: sysnote8main

src/main/java/net/azisaba/kdstatusreloaded/playerkd/cache/KDCache.java

@@ -2,11 +2,13 @@
 
 import net.azisaba.kdstatusreloaded.playerkd.model.KDUserData;
 import net.azisaba.kdstatusreloaded.playerkd.db.KDUserDataRepository;
+import org.bukkit.Bukkit;
 import org.jspecify.annotations.NullMarked;
 
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.UUID;
+import java.util.function.Supplier;
 
 @NullMarked
 public class KDCache {
@@ -19,24 +21,32 @@ public KDCache(KDUserDataRepository dataRepository) {
     }
 
     public KDUserData getData(UUID uuid) {
-        return get(uuid).clone();
+        return get(uuid, () -> {
+            var findResult = Bukkit.getOnlinePlayers().stream().filter(p -> p.getUniqueId() == uuid).findFirst();
+            if(findResult.isEmpty()) throw new RuntimeException("Failed to get name for " + uuid);
+            return findResult.get().getName();
+        }).clone();
     }
 
     // For internal
-    protected KDUserData get(UUID uuid) {
+    protected KDUserData get(UUID uuid, String name) {
+        return get(uuid, () -> name);
+    }
+
+    protected KDUserData get(UUID uuid, Supplier<String> nameSupplier) {
         if (!cacheMap.containsKey(uuid)) {
             cacheMap.put(
                     uuid,
-                    dataRepository.findById(uuid).orElse(new KDUserData(uuid, ""))
+                    dataRepository.findById(uuid).orElse(new KDUserData(uuid, nameSupplier.get()))
             );
         }
         return cacheMap.get(uuid);
     }
 
-    public void store(UUID uuid) {
+    public void store(UUID uuid, String name) {
         cacheMap.put(
                 uuid,
-                dataRepository.findById(uuid).orElse(new KDUserData(uuid, ""))
+                dataRepository.findById(uuid).orElse(new KDUserData(uuid, name))
         );
     }
 
@@ -57,8 +67,8 @@ public void removeAll() {
     }
 
     // 責務を超えてしまうが、ここにkill/deathのincrement処理を追記する。
-    public void addKill(UUID uuid, int count) {
-        KDUserData kdUserData = get(uuid);
+    public void addKill(UUID uuid, String name, int count) {
+        KDUserData kdUserData = get(uuid, name);
         kdUserData.totalKills += count;
 
         fixCorrectValue(kdUserData);
@@ -69,8 +79,8 @@ public void addKill(UUID uuid, int count) {
         updateTimestamp(kdUserData);
     }
 
-    public void addDeath(UUID uuid, int count) {
-        KDUserData kdUserData = get(uuid);
+    public void addDeath(UUID uuid, String name, int count) {
+        KDUserData kdUserData = get(uuid, name);
         kdUserData.deaths += count;
 
         updateTimestamp(kdUserData);

src/main/java/net/azisaba/kdstatusreloaded/playerkd/listener/PlayerEventListener.java

@@ -28,7 +28,8 @@ public PlayerEventListener(KDCache kdCache, KDConfig.KillDeathConfig killDeathCo
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerJoin(PlayerJoinEvent e) {
-        kdCache.store(e.getPlayer().getUniqueId());
+        Player p = e.getPlayer();
+        kdCache.store(p.getUniqueId(), p.getName());
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
@@ -48,7 +49,7 @@ public void onPlayerDeath(PlayerDeathEvent e) {
                 logger.info(Chat.f("{0}のデス数加算をキャンセル (\"{1}\" が無効化にするワールドに指定されているため)", victim.getName(), victimWorld.getName()));
             }
         } else {
-            kdCache.addDeath(victim.getUniqueId(), 1);
+            kdCache.addDeath(victim.getUniqueId(), victim.getName(), 1);
         }
 
         // increment kill count
@@ -59,7 +60,7 @@ public void onPlayerDeath(PlayerDeathEvent e) {
                     logger.info(Chat.f("{0}のキル数加算をキャンセル (\"{1}\" が無効にするワールドに指定されているため)", killer.getName(), killerWorld.getName()));
                 }
             } else {
-                kdCache.addKill(killer.getUniqueId(), 1);
+                kdCache.addKill(killer.getUniqueId(), killer.getName(), 1);
             }
         }
     }