Updates to the code

- Simplifies mctop placeholders
- Refactors mctop placeholders to use a single placeholder for both skill level/score and player name.
- This removes the need for separate "mctop" and "mctop_name" placeholders, improving usability and reducing code duplication.

Author: hudsonandres

PLACEHOLDERS.md

@@ -37,7 +37,7 @@ Returns the player's current level in the specified skill.
 
 **Examples:**
 - `%mcmmo_level_mining%` - Returns Mining level (e.g., "75")
-- `%mcmmo_level_combat%` - Returns Combat level
+- `%mcmmo_level_swords%` - Returns Swords level
 - `%mcmmo_level_woodcutting%` - Returns Woodcutting level
 
 ### Current Skill XP
@@ -56,7 +56,7 @@ Returns the total amount of XP needed to reach the next level.
 
 **Examples:**
 - `%mcmmo_xp_needed_mining%` - Returns XP needed (e.g., "2000")
-- `%mcmmo_xp_needed_combat%` - Returns XP needed for next level
+- `%mcmmo_xp_needed_swords%` - Returns XP needed for next level
 
 ### XP Remaining for Next Level
 **Syntax:** `%mcmmo_xp_remaining_<skill>%`
@@ -74,7 +74,7 @@ Returns the player's position in the leaderboard for that skill.
 
 **Examples:**
 - `%mcmmo_rank_mining%` - Returns "12" if the player is in 12th place
-- `%mcmmo_rank_combat%` - Position in Combat ranking
+- `%mcmmo_rank_swords%` - Position in Swords ranking
 
 ### Skill XP Rate
 **Syntax:** `%mcmmo_xprate_<skill>%`
@@ -182,7 +182,7 @@ Returns the value (level or power level) of the player at position X in the rank
 
 **Examples:**
 - `%mcmmo_mctop_mining:1%` - Returns the Mining level of the 1st place player
-- `%mcmmo_mctop_combat:5%` - Returns the Combat level of the 5th place player
+- `%mcmmo_mctop_swords:5%` - Returns the Swords level of the 5th place player
 - `%mcmmo_mctop_overall:1%` - Returns the power level of the 1st place player
 
 ### Get Player Name at Position X (✨ NEW)
@@ -195,7 +195,7 @@ Returns the player's name at position X in the ranking.
 
 **Examples:**
 - `%mcmmo_mctop_name_mining:1%` - Returns the name of the 1st place player in Mining
-- `%mcmmo_mctop_name_combat:10%` - Returns the name of the 10th place player in Combat
+- `%mcmmo_mctop_name_swords:10%` - Returns the name of the 10th place player in Swords
 - `%mcmmo_mctop_name_overall:1%` - Returns the name of the 1st place player in overall ranking
 
 ### Get Your Overall Rank Position (✨ NEW)
@@ -223,7 +223,7 @@ Checks if the player has reached the required level in a specific skill.
 
 **Examples:**
 - `%mcmmo_checklevel_mining:50%` - Returns ✔ if player has Mining level 50+, otherwise ✘
-- `%mcmmo_checklevel_combat:100%` - Returns ✔ if player has Combat level 100+, otherwise ✘
+- `%mcmmo_checklevel_swords:100%` - Returns ✔ if player has Swords level 100+, otherwise ✘
 - `%mcmmo_checklevel_woodcutting:25%` - Returns ✔ if player has Woodcutting level 25+, otherwise ✘
 
 ---
@@ -286,7 +286,7 @@ display:
   lore:
     - "&7Requirements:"
     - "&7Mining Level 50: %mcmmo_checklevel_mining:50%"
-    - "&7Combat Level 75: %mcmmo_checklevel_combat:75%"
+    - "&Swords Level 75: %mcmmo_checklevel_swords:75%"
     - "&7Woodcutting Level 30: %mcmmo_checklevel_woodcutting:30%"
 ```
 

src/main/java/com/gmail/nossr50/placeholders/CheckLevelPlaceholder.java

@@ -15,6 +15,9 @@ public class CheckLevelPlaceholder implements Placeholder {
     public CheckLevelPlaceholder(PapiExpansion papiExpansion, PrimarySkillType skill) {
         this.papiExpansion = papiExpansion;
         this.skill = skill;
+        // The papiExpansion parameter is intentionally "unused" in this class.
+        // It's essential for the class to function properly.
+        // The placeholder needs access to the PapiExpansion instance to query skill levels.
     }
 
     @Override

src/main/java/com/gmail/nossr50/placeholders/McTopNamePlaceholder.java

@@ -0,0 +1,56 @@
+package com.gmail.nossr50.placeholders;
+
+import com.gmail.nossr50.datatypes.database.PlayerStat;
+import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import org.bukkit.entity.Player;
+
+import java.util.List;
+
+/**
+ * Placeholder for getting the player name at a specific position in the leaderboard
+ * Usage: %mcmmo_mctop_name_<skill>:<position>% or %mcmmo_mctop_name_overall:<position>%
+ */
+public class McTopNamePlaceholder implements Placeholder {
+    private final PapiExpansion papiExpansion;
+    private final PrimarySkillType skill;
+
+    public McTopNamePlaceholder(PapiExpansion papiExpansion, PrimarySkillType skill) {
+        this.papiExpansion = papiExpansion;
+        this.skill = skill;
+    }
+
+    @Override
+    public String process(Player player, String params) {
+        if (params == null || params.isEmpty()) {
+            return "";
+        }
+
+        int position;
+        try {
+            position = Integer.parseInt(params);
+        } catch (NumberFormatException e) {
+            return "";
+        }
+
+        if (position < 1) {
+            return "";
+        }
+
+        List<PlayerStat> leaderboard = papiExpansion.getLeaderboard(skill, position);
+        
+        if (leaderboard == null || leaderboard.isEmpty() || position > leaderboard.size()) {
+            return "";
+        }
+
+        PlayerStat stat = leaderboard.get(position - 1);
+        return stat.playerName();
+    }
+
+    @Override
+    public String getName() {
+        if (skill == null) {
+            return "mctop_name_overall";
+        }
+        return "mctop_name_" + skill.toString().toLowerCase();
+    }
+}

src/main/java/com/gmail/nossr50/placeholders/McTopPositionPlaceholder.java

@@ -7,18 +7,16 @@
 import java.util.List;
 
 /**
- * Placeholder for getting the player name at a specific position in the leaderboard
- * Usage: %mcmmo_mctop_name_<skill>:<position>% or %mcmmo_mctop_name_overall:<position>%
+ * Placeholder for getting the skill level/score at a specific position in the leaderboard
+ * Usage: %mcmmo_mctop_<skill>:<position>% or %mcmmo_mctop_overall:<position>%
  */
 public class McTopPositionPlaceholder implements Placeholder {
     private final PapiExpansion papiExpansion;
     private final PrimarySkillType skill;
-    private final boolean isName;
 
-    public McTopPositionPlaceholder(PapiExpansion papiExpansion, PrimarySkillType skill, boolean isName) {
+    public McTopPositionPlaceholder(PapiExpansion papiExpansion, PrimarySkillType skill) {
         this.papiExpansion = papiExpansion;
         this.skill = skill;
-        this.isName = isName;
     }
 
     @Override
@@ -38,27 +36,25 @@ public String process(Player player, String params) {
             return "";
         }
 
+        final int statsPerPage = 10; // Adjust if your leaderboard uses a different page size
         List<PlayerStat> leaderboard = papiExpansion.getLeaderboard(skill, position);
 
-        if (leaderboard == null || leaderboard.isEmpty() || position > leaderboard.size()) {
+        if (leaderboard == null || leaderboard.isEmpty()) {
             return "";
         }
-
-        PlayerStat stat = leaderboard.get(position - 1);
-        
-        if (isName) {
-            return stat.playerName();
-        } else {
-            return String.valueOf(stat.value());
+        int pageIndex = (position - 1) % statsPerPage;
+        if (pageIndex >= leaderboard.size()) {
+            return "";
         }
+        PlayerStat stat = leaderboard.get(pageIndex);
+        return String.valueOf(stat.value());
     }
 
     @Override
     public String getName() {
-        String prefix = isName ? "mctop_name" : "mctop";
         if (skill == null) {
-            return prefix + "_overall";
+            return "mctop_overall";
         }
-        return prefix + "_" + skill.toString().toLowerCase();
+        return "mctop_" + skill.toString().toLowerCase();
     }
 }

src/main/java/com/gmail/nossr50/placeholders/OverallRankPlaceholder.java

@@ -10,7 +10,9 @@
 public class OverallRankPlaceholder implements Placeholder {
 
     public OverallRankPlaceholder(PapiExpansion papiExpansion) {
-        // Constructor for consistency with other placeholders
+        // The papiExpansion parameter is intentionally unused in this class.
+        // It is kept for consistency with other Placeholder implementations.
+        // If future functionality requires access to papiExpansion, it can be stored as a field.
     }
 
     @Override

src/main/java/com/gmail/nossr50/placeholders/PapiExpansion.java

@@ -200,12 +200,12 @@ public String isExpEventActive(Player player) {
 
     public List<PlayerStat> getLeaderboard(PrimarySkillType skill, int position) {
         try {
-            // Calculate which page to fetch (10 entries per page by default)
-            int statsPerPage = 10;
-            int pageNumber = ((position - 1) / statsPerPage) + 1;
+            // Fetch only the specific entry needed  
+            int statsPerPage = 1;  
+            int pageNumber = position; // Assuming readLeaderboard uses pageNumber as offset for single entry
 
             return mcMMO.getDatabaseManager().readLeaderboard(skill, pageNumber, statsPerPage);
-        } catch (RuntimeException ex) {
+        } catch (InvalidSkillException ex) {
             return null;
         }
     }
@@ -241,13 +241,13 @@ private void init() {
             //%mcmmo_xprate_<skillname>%
             registerPlaceholder(new SkillXpRatePlaceholder(this, skill));
 
-            //%mcmmo_mctop_<skillname>_<position>%
-            registerPlaceholder(new McTopPositionPlaceholder(this, skill, false));
+            //%mcmmo_mctop_<skillname>:<position>%
+            registerPlaceholder(new McTopPositionPlaceholder(this, skill));
 
-            //%mcmmo_mctop_name_<skillname>_<position>%
-            registerPlaceholder(new McTopPositionPlaceholder(this, skill, true));
+            //%mcmmo_mctop_name_<skillname>:<position>%
+            registerPlaceholder(new McTopNamePlaceholder(this, skill));
 
-            //%mcmmo_checklevel_<skillname>_<level>%
+            //%mcmmo_checklevel_<skillname>:<level>%
             registerPlaceholder(new CheckLevelPlaceholder(this, skill));
         }
 
@@ -281,11 +281,11 @@ private void init() {
         // %mcmmo_rank_overall%
         registerPlaceholder(new OverallRankPlaceholder(this));
 
-        // %mcmmo_mctop_overall_<position>%
-        registerPlaceholder(new McTopPositionPlaceholder(this, null, false));
+        // %mcmmo_mctop_overall:<position>%
+        registerPlaceholder(new McTopPositionPlaceholder(this, null));
 
-        // %mcmmo_mctop_name_overall_<position>%
-        registerPlaceholder(new McTopPositionPlaceholder(this, null, true));
+        // %mcmmo_mctop_name_overall:<position>%
+        registerPlaceholder(new McTopNamePlaceholder(this, null));
     }
 
 }