Merge pull request #4 from ChafficPlugins/patch

Patch 1.2.1

Author: Chafficui

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>de.chafficplugins</groupId>
     <artifactId>MiningLevels</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
     <packaging>jar</packaging>
 
     <name>MiningLevels</name>
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>com.github.Chafficui</groupId>
             <artifactId>CrucialAPI</artifactId>
-            <version>2.1.3</version>
+            <version>2.1.4</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

src/main/java/de/chafficplugins/mininglevels/api/MiningPlayer.java

@@ -8,6 +8,7 @@
 import io.github.chafficui.CrucialAPI.io.Json;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.boss.BarColor;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
@@ -121,6 +122,13 @@ public Player getPlayer() {
         return Bukkit.getPlayer(uuid);
     }
 
+    /**
+     * @return The bukkit player of the MiningPlayer.
+     */
+    public OfflinePlayer getOfflinePlayer() {
+        return Bukkit.getOfflinePlayer(uuid);
+    }
+
     /**
      * Calculates if the player needs to level up or not.
      * Sends a status message to the player.
@@ -210,25 +218,6 @@ public static void init() throws IOException {
         }
     }
 
-    /**
-     * Reloads the MiningPlayers from the file FileManager.PLAYERS and adds all new players to the static ArrayList miningPlayers.
-     * Also saves this new list to the file FileManager.PLAYERS.
-     * @throws IOException If the file FileManager.PLAYERS is not found.
-     */
-    public static void reload() throws IOException {
-        ArrayList<MiningPlayer> mPs = Json.fromJson(FileManager.PLAYERS, new TypeToken<ArrayList<MiningPlayer>>() {
-        }.getType());
-        if(mPs == null) mPs = new ArrayList<>();
-        for (MiningPlayer miningPlayer : miningPlayers) {
-            if(!mPs.contains(miningPlayer)) {
-                mPs.add(miningPlayer);
-            }
-        }
-
-        FileManager.saveFile(FileManager.PLAYERS, mPs);
-        init();
-    }
-
     /**
      * A method to save all the MiningPlayers in the static ArrayList miningPlayers to the file FileManager.PLAYERS.
      * @throws IOException If the file FileManager.PLAYERS is not found.
@@ -285,6 +274,18 @@ public void showLevelProgress() {
         }
     }
 
+    public static List<MiningPlayer> getSortedPlayers() {
+        List<MiningPlayer> miningPlayers = MiningPlayer.miningPlayers;
+        miningPlayers.sort((o1, o2) -> {
+            if(o1.getLevel().getOrdinal() == o2.getLevel().getOrdinal()) {
+                return o2.getXp() - o1.getXp();
+            } else {
+                return o1.getLevel().getOrdinal() - o2.getLevel().getOrdinal();
+            }
+        });
+        return miningPlayers;
+    }
+
     public void showMessage(String key, String... values) {
         showMessage(key, ChatColor.RESET, values);
     }

src/main/java/de/chafficplugins/mininglevels/gui/leaderboard/LeaderboardList.java

@@ -0,0 +1,35 @@
+package de.chafficplugins.mininglevels.gui.leaderboard;
+
+import de.chafficplugins.mininglevels.api.MiningPlayer;
+import io.github.chafficui.CrucialAPI.Utils.customItems.Stack;
+import io.github.chafficui.CrucialAPI.Utils.player.inventory.InventoryItem;
+import io.github.chafficui.CrucialAPI.Utils.player.inventory.Page;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.List;
+
+public class LeaderboardList extends Page {
+
+    public LeaderboardList() {
+        super(6, "Leaderboard", Material.WHITE_STAINED_GLASS_PANE);
+    }
+
+    @Override
+    public void populate() {
+        List<MiningPlayer> miningPlayers = MiningPlayer.getSortedPlayers();
+
+        for (int i = 0; i < 53; i++) {
+            if (i < miningPlayers.size()) {
+                MiningPlayer miningPlayer = miningPlayers.get(i);
+                if (miningPlayer == null) continue;
+                ItemStack stack = Stack.getStack(miningPlayer.getUUID(), i + 1 + ". " + miningPlayer.getOfflinePlayer().getName(), List.of(
+                        "§7Level: §e" + miningPlayer.getLevel().getName(),
+                        "§7XP: §e" + miningPlayer.getXp() + " / " + miningPlayer.getLevel().getNextLevelXP()
+                ));
+
+                addItem(new InventoryItem(i, stack));
+            }
+        }
+    }
+}

src/main/java/de/chafficplugins/mininglevels/listeners/MiningLevelsCommandListener.java

@@ -70,7 +70,6 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
                             plugin.reloadConfig();
                             MiningLevel.reload();
                             MiningBlock.reload();
-                            MiningPlayer.reload();
                             try {
                                 MiningLevels.lvlUpSound = Sound.valueOf(plugin.getConfigString(LVL_UP_SOUND).toUpperCase(Locale.ROOT));
                             } catch (NullPointerException | IllegalArgumentException e) {

src/main/java/de/chafficplugins/mininglevels/listeners/commands/LevelingCommands.java

@@ -2,13 +2,15 @@
 
 import de.chafficplugins.mininglevels.api.MiningLevel;
 import de.chafficplugins.mininglevels.api.MiningPlayer;
+import de.chafficplugins.mininglevels.gui.leaderboard.LeaderboardList;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import java.util.List;
 
+import static de.chafficplugins.mininglevels.api.MiningPlayer.getSortedPlayers;
 import static de.chafficplugins.mininglevels.utils.ConfigStrings.*;
 import static de.chafficplugins.mininglevels.utils.SenderUtils.sendMessage;
 
@@ -73,21 +75,23 @@ public static void level(CommandSender sender, String[] args) {
     }
 
     public static void leaderboard(CommandSender sender) {
-        sendMessage(sender, LEADERBOARD_HEADER);
         //sort miningPlayers by level and xp
-        List<MiningPlayer> miningPlayers = MiningPlayer.miningPlayers;
-        miningPlayers.sort((o1, o2) -> {
-            if(o1.getLevel().getOrdinal() == o2.getLevel().getOrdinal()) {
-                return o2.getXp() - o1.getXp();
-            } else {
-                return o1.getLevel().getOrdinal() - o2.getLevel().getOrdinal();
-            }
-        });
+        List<MiningPlayer> miningPlayers = getSortedPlayers();
+
+        if(sender instanceof Player) {
+            Player player = (Player) sender;
+
+            new LeaderboardList().open(player);
+
+            return;
+        }
+        sendMessage(sender, LEADERBOARD_HEADER);
 
         for(int i = 0; i < 5; i++) {
             if(i < miningPlayers.size()) {
                 MiningPlayer miningPlayer = miningPlayers.get(i);
-                sender.sendMessage(PREFIX + ChatColor.YELLOW + (i + 1) + ChatColor.RESET + ". " + ChatColor.GREEN + miningPlayer.getPlayer().getDisplayName() + ChatColor.RESET + " | " + miningPlayer.getLevel().getName() + " (" + miningPlayer.getXp() + "xp)");
+                if(miningPlayer == null) break;
+                sender.sendMessage(PREFIX + ChatColor.YELLOW + (i + 1) + ChatColor.RESET + ". " + ChatColor.GREEN + miningPlayer.getOfflinePlayer().getName() + ChatColor.RESET + " | " + miningPlayer.getLevel().getName() + " (" + miningPlayer.getXp() + "xp)");
             }
         }
     }

src/main/java/de/chafficplugins/mininglevels/placeholders/LevelPlaceholders.java

@@ -2,10 +2,15 @@
 
 import de.chafficplugins.mininglevels.MiningLevels;
 import de.chafficplugins.mininglevels.api.MiningPlayer;
+import de.chafficplugins.mininglevels.listeners.commands.LevelingCommands;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import org.bukkit.OfflinePlayer;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.List;
+
+import static de.chafficplugins.mininglevels.api.MiningPlayer.getSortedPlayers;
+
 public class LevelPlaceholders extends PlaceholderExpansion {
     private static final MiningLevels plugin = MiningLevels.getPlugin(MiningLevels.class);
 
@@ -56,7 +61,42 @@ public String onRequest(OfflinePlayer player, @NotNull String identifier) {
                 return String.valueOf(miningPlayer.getLevel().getHasteLevel());
             }
             default -> {
-                return null;
+                if(identifier.startsWith("rank")) {
+                    List<MiningPlayer> miningPlayers = getSortedPlayers();
+                    if(identifier.equals("rank")) {
+                        return String.valueOf(miningPlayers.indexOf(miningPlayer) + 1);
+                    } else if(identifier.split("_").length == 3) {
+                        try {
+                            int index = Integer.parseInt(identifier.split("_")[1]);
+                            if(index > 0 && index <= miningPlayers.size()) {
+                                MiningPlayer rankedPlayer = miningPlayers.get(index - 1);
+                                if(rankedPlayer == null) return "error";
+                                switch (identifier.split("_")[2]) {
+                                    case "level" -> {
+                                        return rankedPlayer.getLevel().getName();
+                                    }
+                                    case "xp" -> {
+                                        return String.valueOf(rankedPlayer.getXp());
+                                    }
+                                    case "name" -> {
+                                        return rankedPlayer.getOfflinePlayer().getName();
+                                    }
+                                    default -> {
+                                        return "error";
+                                    }
+                                }
+                            } else {
+                                return "error";
+                            }
+                        } catch (NumberFormatException e) {
+                            return "error";
+                        }
+                    } else {
+                        return null;
+                    }
+                } else {
+                    return null;
+                }
             }
         }
     }

src/main/java/de/chafficplugins/mininglevels/utils/ConfigStrings.java

@@ -3,7 +3,7 @@
 public class ConfigStrings {
     public final static int SPIGOT_ID = 100886;
     public final static int BSTATS_ID = 14709;
-    public final static String CRUCIAL_API_VERSION = "2.1.3";
+    public final static String CRUCIAL_API_VERSION = "2.1.4";
     public final static String LOCALIZED_IDENTIFIER = "mininglevels";
 
     public static String PREFIX = "§8[§6ML§8] §r";