feat: works correctly

sysnote8main · sysnote8main · commit 926c0ad35d90 · 2025-09-10T17:00:03.000+09:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -85,6 +85,22 @@ tasks {
     runServer {
         minecraftVersion("1.16.5")
         ignoreUnsupportedJvm()
+        downloadPlugins {
+            modrinth("decentholograms", libs.versions.decentHolograms.get())
+            modrinth("placeholderapi", libs.versions.placeholderApi.get())
+            github(
+                "AzisabaNetwork",
+                "PlayerSettings",
+                "v1.1.0",
+                "PlayerSettings.jar",
+            )
+//            github(
+//                "AzisabaNetwork",
+//                "KDStatusReloaded",
+//                libs.versions.kdStatusReloaded.get(),
+//                "KDStatusReloaded-${libs.versions.kdStatusReloaded.get()}-all.jar",
+//            )
+        }
     }
 
     compileJava {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -7,7 +7,7 @@ runPaper = "3.0.0"
 spigotApi = "1.16.5-R0.1-SNAPSHOT"
 configLib = "4.6.1"
 caffeine = "3.2.2"
-kdStatusReloaded = "2.1.0"
+kdStatusReloaded = "2.1.1"
 playerSettings = "1.0.0"
 decentHolograms = "2.8.11"
 placeholderApi = "2.11.6"
diff --git a/src/main/java/net/azisaba/rankingdisplayer/RankingDisplayer.java b/src/main/java/net/azisaba/rankingdisplayer/RankingDisplayer.java
@@ -97,7 +97,7 @@ public void run() {
 
     @Override
     public void onDisable() {
-        leaderboardCache.shutdown();
+        if(leaderboardCache != null) leaderboardCache.shutdown();
         PlayerRankCache.shutdown();
     }
 
diff --git a/src/main/java/net/azisaba/rankingdisplayer/config/RDConfig.java b/src/main/java/net/azisaba/rankingdisplayer/config/RDConfig.java
@@ -16,6 +16,17 @@ public static class ChatConfig {
 
     @Configuration
     public static class HoloConfig {
-        public Location displayLocation = new Location(Bukkit.getWorld("world"), 0, 0, 0);
+        public LocationData displayLocation = new LocationData("world", 0, 0, 0);
+    }
+
+    public record LocationData(
+            String worldName,
+            int x,
+            int y,
+            int z
+    ) {
+        public Location toLocation() {
+            return new Location(Bukkit.getWorld(worldName), x, y, z);
+        }
     }
 }
diff --git a/src/main/java/net/azisaba/rankingdisplayer/holo/decent/DHHoloManager.java b/src/main/java/net/azisaba/rankingdisplayer/holo/decent/DHHoloManager.java
@@ -34,7 +34,7 @@ public static boolean addHolo(Location holoLocation) {
     }
 
     public static boolean placeFromConfig() {
-        return addHolo(RankingDisplayer.getRdConfig().holo.displayLocation);
+        return addHolo(RankingDisplayer.getRdConfig().holo.displayLocation.toLocation());
     }
 
     public static void getAllHolo() {
diff --git a/src/main/java/net/azisaba/rankingdisplayer/holo/decent/RankingHolo.java b/src/main/java/net/azisaba/rankingdisplayer/holo/decent/RankingHolo.java
@@ -15,8 +15,8 @@ public class RankingHolo {
     public static final List<String> pageNames = Arrays.asList("Daily", "Monthly", "Total");
     private static final String STATUS_HEADER = ChatColor.AQUA + Strings.repeat("=", 8) + ChatColor.GOLD + " Kill Ranking " + ChatColor.AQUA + Strings.repeat("=", 8);
     private static final String STATUS_FOOTER = ChatColor.AQUA + Strings.repeat("=", 25);
-    private static final String USER_STATUS = ChatColor.BLUE + "YOU " + ChatColor.RED + ">> " + ChatColor.YELLOW + "%rankingdisplayer_player_ranking_{timeunit}%位 " + ChatColor.GOLD + "{player}" + ChatColor.RED + ": " + ChatColor.AQUA + "%rankingdisplayer_player_kill_count_{timeunit}%" + " kill(s)";
-    private static final String LAST_UPDATED = ChatColor.RED + "ランキング最終更新: " + ChatColor.GREEN + "%rankingdisplayer_last_update_{timeunit}%秒前";
+    private static final String USER_STATUS = ChatColor.BLUE + "YOU " + ChatColor.RED + ">> " + ChatColor.YELLOW + "%rankingdisplayer_playerranking_{timeunit}%位 " + ChatColor.GOLD + "{player}" + ChatColor.RED + ": " + ChatColor.AQUA + "%rankingdisplayer_playerkillcount_{timeunit}%" + " kill(s)";
+    private static final String LAST_UPDATED = ChatColor.RED + "ランキング最終更新: " + ChatColor.GREEN + "%rankingdisplayer_lastupdate_{timeunit}%秒前";
     private static final int RANKING_SIZE = 7;
 
     /**
@@ -51,6 +51,6 @@ private static void setRankingLines(HologramPage targetPage, int maxSize, String
         }
         targetPage.addLine(new HologramLine(targetPage, targetPage.getNextLineLocation(), STATUS_FOOTER));
         targetPage.addLine(new HologramLine(targetPage, targetPage.getNextLineLocation(), USER_STATUS.replace("{timeunit}", timeUnitName)));
-        targetPage.addLine(new HologramLine(targetPage, targetPage.getNextLineLocation(), LAST_UPDATED.replace("{timeunit}", timeUnitName)));
+//        targetPage.addLine(new HologramLine(targetPage, targetPage.getNextLineLocation(), LAST_UPDATED.replace("{timeunit}", timeUnitName)));
     }
 }
diff --git a/src/main/java/net/azisaba/rankingdisplayer/holo/leaderboard/LeaderboardCache.java b/src/main/java/net/azisaba/rankingdisplayer/holo/leaderboard/LeaderboardCache.java
@@ -1,5 +1,6 @@
 package net.azisaba.rankingdisplayer.holo.leaderboard;
 
+import net.azisaba.kdstatusreloaded.KDStatusReloaded;
 import net.azisaba.kdstatusreloaded.api.KDSAPI;
 import net.azisaba.kdstatusreloaded.playerkd.model.KDUserData;
 import net.azisaba.rankingdisplayer.RankingDisplayer;
@@ -10,6 +11,7 @@
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Logger;
 
 public class LeaderboardCache {
     private static final int RANKING_SIZE = 7;
@@ -21,12 +23,13 @@ public LeaderboardCache(RankingDisplayer plugin) {
         updater = new BukkitRunnable() {
             @Override
             public void run() {
+                KDStatusReloaded.getPlugin().getLogger().info("Updating...");
                 doUpdate();
             }
         };
 
         // Update leaderboard every 30 seconds
-        updater.runTaskTimerAsynchronously(plugin, 1, 20 * 30);
+        updater.runTaskTimerAsynchronously(plugin, 10, 20*30);
     }
 
     public void shutdown() {
@@ -38,22 +41,29 @@ public List<LeaderboardLineData> getLines(RankingType type) {
     }
 
     protected void doUpdate() {
+        Logger logger = KDStatusReloaded.getPlugin().getLogger();
         for (RankingType type : RankingType.values()) {
             List<KDUserData> topList = KDSAPI.getTops(type.killCountType, RANKING_SIZE);
+            logger.info("Processing for " + type.name() + " / size: " + topList.size());
 
             List<LeaderboardLineData> rankingList = new ArrayList<>();
+            logger.info("===== Result =====");
             for (int i = 0; i < RANKING_SIZE; i++) {
-                if (rankingList.size() >= i) {
+                if (topList.size() <= i) {
+                    logger.info(String.format("%d: %s", i+1, "なし"));
                     // If not available
                     rankingList.add(RankingEntryLine.getLine(
                             EMPTY_UUID,
+                            "",
                             i + 1,
                             -1
                     ));
                 } else {
                     KDUserData kdUserData = topList.get(i);
+                    logger.info(String.format("%d: %s", i+1, kdUserData.name));
                     rankingList.add(RankingEntryLine.getLine(
                             kdUserData.uuid,
+                            kdUserData.name,
                             i + 1,
                             type.getKill(kdUserData)
                     ));
diff --git a/src/main/java/net/azisaba/rankingdisplayer/holo/leaderboard/LeaderboardLineData.java b/src/main/java/net/azisaba/rankingdisplayer/holo/leaderboard/LeaderboardLineData.java
@@ -7,25 +7,27 @@
 
 public record LeaderboardLineData(
         UUID uuid,
+        String dataPlayerName,
         boolean isNothing,
         String rankPrefix,
         String killSuffix
 ) {
-    public String getLine(UUID playerUuid, String playerName) {
+    public String getLine(String playerName) {
         boolean isHiding = RankingHideManager.isHiding(uuid);
         if (isNothing) return rankPrefix;
 
         StringBuilder builder = new StringBuilder(rankPrefix);
-        if (uuid == playerUuid) {
+        boolean isMe = dataPlayerName.equals(playerName);
+        if (isMe) {
             // もし、自分自身なら先頭に"YOU"をついかする
             builder.insert(0, ChatColor.BLUE + "YOU" + ChatColor.RED + " » ");
             if (isHiding) builder.insert(0, ChatColor.DARK_RED + "(Hide) ");
         }
-        if (isHiding && uuid != playerUuid) {
+        if (isHiding && !isMe) {
             // 非公開 + 自分自身ではない 場合に"匿名プレイヤー"にする。
             builder.append(ChatColor.DARK_RED).append("{匿名プレイヤー}");
         } else {
-            builder.append(playerName);
+            builder.append(dataPlayerName);
         }
         builder.append(killSuffix);
         return builder.toString();
diff --git a/src/main/java/net/azisaba/rankingdisplayer/holo/leaderboard/RankingEntryLine.java b/src/main/java/net/azisaba/rankingdisplayer/holo/leaderboard/RankingEntryLine.java
@@ -5,17 +5,18 @@
 import java.util.UUID;
 
 public class RankingEntryLine {
-    public static LeaderboardLineData getLine(UUID uuid, int rank, int kill) {
+    public static LeaderboardLineData getLine(UUID uuid, String name, int rank, int kill) {
         boolean isNothing = kill <= 0;
-        String rankPrefix = ChatColor.YELLOW + String.format("%d位", rank);
+        String rankPrefix = ChatColor.YELLOW + String.format("%d位", rank) + " ";
         if (isNothing) {
             // If not available
-            rankPrefix += ChatColor.GOLD + " なし";
+            rankPrefix += ChatColor.GOLD + "なし";
         }
 
         String killSuffix = ChatColor.RED + ": " + ChatColor.AQUA + kill + " kill(s)";
         return new LeaderboardLineData(
                 uuid,
+                name,
                 isNothing,
                 rankPrefix,
                 killSuffix
diff --git a/src/main/java/net/azisaba/rankingdisplayer/holo/placeholder/RankingExpansion.java b/src/main/java/net/azisaba/rankingdisplayer/holo/placeholder/RankingExpansion.java
@@ -33,27 +33,31 @@ public boolean persist() {
     public @Nullable String onRequest(OfflinePlayer player, @NonNull String name) {
 
         String[] args = name.split("_");
-        if (args.length < 3) return null;
+//        System.out.println("Got " + name);
+        if (args.length < 2) return null;
 
-        String type = args[1];
-        RankingType rankingType = RankingType.getType(args[2]);
+        String type = args[0];
+        RankingType rankingType = RankingType.getType(args[1]);
         if (rankingType == null) return null;
 
         switch (type) {
             // %rankingdisplay_killranking_{timeUnitName}_{order}%
             case Names.KILL_RANKING -> {
-                if (args.length != 4) return null;
+                if (args.length != 3) return null;
                 try {
-                    int order = Integer.parseInt(args[3]);
-                    return RankingDisplayer.getLeaderboardCache().getLines(rankingType).get(order).getLine(player.getUniqueId(), player.getName());
+                    int order = Integer.parseInt(args[2]);
+                    return RankingDisplayer.getLeaderboardCache().getLines(rankingType).get(order-1).getLine(player.getName());
                 } catch (NumberFormatException e) {
                     return null;
                 }
             }
+
             // %rankingdisplay_playerranking_{timeunit}%
             case Names.PLAYER_RANKING -> {
-                return "" + KDSAPI.getPlayerRanking(rankingType.killCountType, player.getUniqueId());
+                int rank = KDSAPI.getPlayerRanking(rankingType.killCountType, player.getUniqueId());
+                return "" + (rank == -1 ? "?": rank);
             }
+
             // %rankingdisplay_playerkillcount_{timeunit}%
             case Names.PLAYER_KILL_COUNT -> {
                 return "" + rankingType.getKill(KDSAPI.getPlayerData(player.getUniqueId()));
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -5,7 +5,7 @@ authors: [siloneco, sysnote8main]
 api-version: 1.16
 description: '${description}'
 website: '${websiteUrl}'
-depend: ["PlayerSettings", "KDStatusReloaded", "DecentHolograms"]
+depend: ["PlayerSettings", "KDStatusReloaded", "DecentHolograms", "PlaceholderAPI"]
 commands:
   ranking:
     usage: /ranking
@@ -18,4 +18,4 @@ commands:
     permission: rankingdisplayer.command.rankingdisplayer
 permissions:
   rankingdisplayer.command.ranking:
-    default: true
+    default: true

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public void run() {`
`97`	`97`
`98`	`98`	`@Override`
`99`	`99`	`public void onDisable() {`
`100`		`- leaderboardCache.shutdown();`
	`100`	`+ if(leaderboardCache != null) leaderboardCache.shutdown();`
`101`	`101`	`PlayerRankCache.shutdown();`
`102`	`102`	`}`
`103`	`103`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public static boolean addHolo(Location holoLocation) {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`public static boolean placeFromConfig() {`
`37`		`- return addHolo(RankingDisplayer.getRdConfig().holo.displayLocation);`
	`37`	`+ return addHolo(RankingDisplayer.getRdConfig().holo.displayLocation.toLocation());`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`public static void getAllHolo() {`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ public class RankingHolo {`
`15`	`15`	`public static final List<String> pageNames = Arrays.asList("Daily", "Monthly", "Total");`
`16`	`16`	`private static final String STATUS_HEADER = ChatColor.AQUA + Strings.repeat("=", 8) + ChatColor.GOLD + " Kill Ranking " + ChatColor.AQUA + Strings.repeat("=", 8);`
`17`	`17`	`private static final String STATUS_FOOTER = ChatColor.AQUA + Strings.repeat("=", 25);`
`18`		`- private static final String USER_STATUS = ChatColor.BLUE + "YOU " + ChatColor.RED + ">> " + ChatColor.YELLOW + "%rankingdisplayer_player_ranking_{timeunit}%位 " + ChatColor.GOLD + "{player}" + ChatColor.RED + ": " + ChatColor.AQUA + "%rankingdisplayer_player_kill_count_{timeunit}%" + " kill(s)";`
`19`		`- private static final String LAST_UPDATED = ChatColor.RED + "ランキング最終更新: " + ChatColor.GREEN + "%rankingdisplayer_last_update_{timeunit}%秒前";`
	`18`	`+ private static final String USER_STATUS = ChatColor.BLUE + "YOU " + ChatColor.RED + ">> " + ChatColor.YELLOW + "%rankingdisplayer_playerranking_{timeunit}%位 " + ChatColor.GOLD + "{player}" + ChatColor.RED + ": " + ChatColor.AQUA + "%rankingdisplayer_playerkillcount_{timeunit}%" + " kill(s)";`
	`19`	`+ private static final String LAST_UPDATED = ChatColor.RED + "ランキング最終更新: " + ChatColor.GREEN + "%rankingdisplayer_lastupdate_{timeunit}%秒前";`
`20`	`20`	`private static final int RANKING_SIZE = 7;`
`21`	`21`
`22`	`22`	`/**`
`@@ -51,6 +51,6 @@ private static void setRankingLines(HologramPage targetPage, int maxSize, String`
`51`	`51`	`}`
`52`	`52`	`targetPage.addLine(new HologramLine(targetPage, targetPage.getNextLineLocation(), STATUS_FOOTER));`
`53`	`53`	`targetPage.addLine(new HologramLine(targetPage, targetPage.getNextLineLocation(), USER_STATUS.replace("{timeunit}", timeUnitName)));`
`54`		`- targetPage.addLine(new HologramLine(targetPage, targetPage.getNextLineLocation(), LAST_UPDATED.replace("{timeunit}", timeUnitName)));`
	`54`	`+// targetPage.addLine(new HologramLine(targetPage, targetPage.getNextLineLocation(), LAST_UPDATED.replace("{timeunit}", timeUnitName)));`
`55`	`55`	`}`
`56`	`56`	`}`