1.16.5対応

.github/workflows/build-test.yml

@@ -16,3 +16,7 @@ jobs:
       - run: java -version
       - run: mvn --version
       - run: mvn -B package
+      - name: Upload a Build Artifact
+        uses: actions/upload-artifact@v4.4.1
+        with:
+          path: /home/runner/work/RankingDisplayer/RankingDisplayer/target/

.gitignore

@@ -83,4 +83,7 @@ buildNumber.properties
 .mvn/timing.properties
 .mvn/wrapper/maven-wrapper.jar
 
-# End of https://www.gitignore.io/api/maven,eclipse
+# End of https://www.gitignore.io/api/maven,eclipse
+
+.idea/
+*.iml

README.md

@@ -0,0 +1,4 @@
+## RankingDisplayer
+
+## Supported Placeholders (PlaceholderAPI)
+- Under construction...

pom.xml

@@ -48,21 +48,25 @@
       <id>rayzr-repo</id>
       <url>https://raw.githubusercontent.com/Rayzr522/maven-repo/master/</url>
     </repository>
-    <repository>
-      <id>sk89q-repo</id>
-      <url>https://maven.sk89q.com/repo/</url>
-    </repository>
     <repository>
       <id>jitpack.io</id>
       <url>https://jitpack.io/</url>
     </repository>
+    <repository>
+      <id>codemc</id>
+      <url>https://repo.codemc.io/repository/maven-public/</url>
+    </repository>
+    <repository>
+      <id>placeholderapi</id>
+      <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
+    </repository>
   </repositories>
 
   <dependencies>
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot-api</artifactId>
-      <version>1.12.2-R0.1-SNAPSHOT</version>
+      <version>1.16.5-R0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.projectlombok</groupId>
@@ -79,5 +83,17 @@
       <artifactId>KDStatusReloaded</artifactId>
       <version>1.3.1</version>
     </dependency>
+    <dependency>
+      <groupId>com.github.decentsoftware-eu</groupId>
+      <artifactId>decentholograms</artifactId>
+      <version>2.8.11</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>me.clip</groupId>
+      <artifactId>placeholderapi</artifactId>
+      <version>2.11.6</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 </project>

src/main/java/jp/azisaba/lgw/rankingdisplayer/RankingDisplayer.java

@@ -1,52 +1,75 @@
 package jp.azisaba.lgw.rankingdisplayer;
 
-import java.io.File;
-import java.util.UUID;
-
+import jp.azisaba.lgw.rankingdisplayer.command.RankingHoloCommand;
+import jp.azisaba.lgw.rankingdisplayer.config.PluginConfig;
+import jp.azisaba.lgw.rankingdisplayer.holo.DHListener;
+import jp.azisaba.lgw.rankingdisplayer.integration.KDSAPI;
+import jp.azisaba.lgw.rankingdisplayer.integration.KDSPlaceholderExpansion;
+import jp.azisaba.lgw.rankingdisplayer.manager.RankingCacheManager;
+import jp.azisaba.lgw.rankingdisplayer.manager.RankingHideManager;
+import jp.azisaba.lgw.rankingdisplayer.ranking.RankingCommand;
+import jp.azisaba.lgw.rankingdisplayer.task.AfterWorldLoadTask;
+import net.md_5.bungee.api.ChatColor;
 import org.bukkit.Bukkit;
-import org.bukkit.World;
 import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import net.md_5.bungee.api.ChatColor;
+import java.io.File;
+import java.util.UUID;
 
 public class RankingDisplayer extends JavaPlugin {
 
     private static PluginConfig config;
-    private DisplayListener listener;
+    private DHListener dhListener;
 
     @Override
     public void onEnable() {
+        if (!Bukkit.getPluginManager().isPluginEnabled("KDStatusReloaded")) {
+            getLogger().severe("KDStatusReloaded is not loaded.");
+            Bukkit.getPluginManager().disablePlugin(this);
+        }
 
+        // Migrate
         convertSettingsFromLocalFile();
 
+        // Config
         RankingDisplayer.config = new PluginConfig(this);
         RankingDisplayer.config.loadConfig();
 
-        listener = new DisplayListener(this);
-        Bukkit.getPluginManager().registerEvents(listener, this);
+        // KDStatusReloaded API Setup
+        KDSAPI.loadPlugin(getLogger());
+
+        // Setup cacheManager's logger
+        RankingCacheManager.getInstance().setLogger(getLogger());
+        RankingCacheManager.getInstance().loadRanking();
+
+        // Events
+        dhListener = new DHListener();
+        Bukkit.getPluginManager().registerEvents(dhListener, this);
+
+        // Tasks
+        new AfterWorldLoadTask().runTaskLaterAsynchronously(this, 100);
 
+        // Commands
         Bukkit.getPluginCommand("ranking").setExecutor(new RankingCommand());
         Bukkit.getPluginCommand("ranking").setPermissionMessage(ChatColor.RED + "権限がありません！");
 
-        if ( Bukkit.getOnlinePlayers().size() > 0 ) {
-            for ( Player p : Bukkit.getOnlinePlayers() ) {
-                World world = p.getWorld();
-                if ( world == config.displayLocation.getWorld() ) {
-                    listener.displayRankingForPlayerAsync(p, false);
-                }
-            }
+        Bukkit.getPluginCommand("rankingholo").setExecutor(new RankingHoloCommand());
+        Bukkit.getPluginCommand("rankingholo").setPermissionMessage(ChatColor.RED + "権限がありません！");
+
+        if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) {
+            new KDSPlaceholderExpansion().register();
         }
 
+        // Finish message
         Bukkit.getLogger().info(getName() + " enabled.");
     }
 
     @Override
     public void onDisable() {
-        if ( listener != null ) {
-            listener.removeAllBoards();
-        }
+//        if (listener != null) {
+//            listener.removeAllBoards();
+//        }
 
         Bukkit.getLogger().info(getName() + " disabled.");
     }
@@ -66,21 +89,21 @@ public static PluginConfig getPluginConfig() {
     private void convertSettingsFromLocalFile() {
         File file = new File(getDataFolder(), "HideFromRanking.yml");
 
-        if ( !file.exists() ) {
+        if (!file.exists()) {
             return;
         }
 
         YamlConfiguration conf = YamlConfiguration.loadConfiguration(file);
 
-        if ( conf.getConfigurationSection("") == null || conf.getConfigurationSection("").getKeys(false) == null ) {
+        if (conf.getConfigurationSection("") == null || conf.getConfigurationSection("").getKeys(false) == null) {
             return;
         }
 
-        for ( String key : conf.getConfigurationSection("").getKeys(false) ) {
+        for (String key : conf.getConfigurationSection("").getKeys(false)) {
             UUID uuid = null;
             try {
                 uuid = UUID.fromString(key);
-            } catch ( Exception e ) {
+            } catch (Exception e) {
                 Bukkit.getLogger().warning("Could not parse String \"" + key + "\"");
                 continue;
             }

src/main/java/jp/azisaba/lgw/rankingdisplayer/command/RankingHoloCommand.java

@@ -0,0 +1,77 @@
+package jp.azisaba.lgw.rankingdisplayer.command;
+
+import jp.azisaba.lgw.rankingdisplayer.manager.HoloManager;
+import jp.azisaba.lgw.rankingdisplayer.manager.RankingCacheManager;
+import jp.azisaba.lgw.rankingdisplayer.ranking.RankingType;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabCompleter;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.*;
+
+public class RankingHoloCommand implements CommandExecutor, TabCompleter {
+    public static final List<String> modes = Arrays.asList("place", "remove", "remove-all", "list", "cache-update");
+
+    @Override
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String s, @NotNull String[] args) {
+        if (args.length < 1) {
+            return false;
+        }
+        String mode = args[0];
+        if (sender instanceof Player) {
+            Player player = (Player) sender;
+            switch (mode) {
+                case "place":
+                    sender.sendMessage("hologram was created!");
+                    HoloManager.addHolo(player.getLocation());
+                    return true;
+                case "remove":
+                    if (args.length != 2) {
+                        sender.sendMessage("/" + command.getName() + " remove <hologramName>");
+                        return true;
+                    }
+                    if (!HoloManager.getAllHoloNames().contains(args[1])) {
+                        sender.sendMessage("This hologramName is invalid.");
+                        return true;
+                    }
+                    HoloManager.removeHolo(args[1]);
+                    sender.sendMessage("Successfully to remove hologram (name:" + args[1] + ")");
+                    return true;
+                case "remove-all":
+                    HoloManager.removeAllHolo();
+                    sender.sendMessage("Successfully to remove all status holograms!");
+                    return true;
+                case "list":
+                    Set<String> names = HoloManager.getAllHoloNames();
+                    sender.sendMessage("Size: " + names.size());
+                    return true;
+                case "cache-update":
+                    for (RankingType type : RankingType.values()) {
+                        RankingCacheManager.getInstance().updateCache(type);
+                    }
+                    return true;
+            }
+        }
+        return false;
+    }
+
+    @Nullable
+    @Override
+    public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] args) {
+        if (args.length == 1) {
+            return modes;
+        }
+
+        if (args.length == 2) {
+            if (args[0].equals("remove")) {
+                return new ArrayList<>(HoloManager.getAllHoloNames());
+            }
+        }
+
+        return Collections.emptyList();
+    }
+}