1 files changed, 13 insertions, 8 deletions

diff --git a/src/main/java/net/uomc/mineshaft/MineshaftLeaderBoardCommand.java b/src/main/java/net/uomc/mineshaft/MineshaftLeaderBoardCommand.java
index 91c9ef6..722b873 100644
--- a/src/main/java/net/uomc/mineshaft/MineshaftLeaderBoardCommand.java
+++ b/src/main/java/net/uomc/mineshaft/MineshaftLeaderBoardCommand.java
@@ -14,6 +14,7 @@ import com.mouldycheerio.dbot.commands.DetailedCommand;
 import com.mouldycheerio.dbot.util.PeelingUtils;
 
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import net.uomc.mineshaft.blacksmith.Pickaxe;
 import net.uomc.mineshaft.resources.Resource;
 
 public class MineshaftLeaderBoardCommand extends DetailedCommand {
@@ -33,26 +34,30 @@ public class MineshaftLeaderBoardCommand extends DetailedCommand {
             if (resource == null) {
                 if (args[0].equalsIgnoreCase("pickaxes") || args[0].equalsIgnoreCase("pickaxe")) {
                     bot.sendMessage(e, "Leaderboard", makeMessage(
-                            bot.getPickaxes().getMembers(e.getGuild()), "pickaxe level",
+                            bot.getPlayerStats().getStat(Pickaxe.LEVEL_TABLE).getMembers(e.getGuild()), "pickaxe level",
                             entry -> {
                                 String ench = "";
-                                long level = bot.getPickaxes().getLevel(entry.getKey(), e.getGuild().getId());
-                                long fortune = bot.getPickaxes().getFortune(entry.getKey(), e.getGuild().getId());
-                                long efficiency = bot.getPickaxes().getEfficiency(entry.getKey(), e.getGuild().getId());
+                                long level = bot.getPlayerStats().getStat(Pickaxe.LEVEL_TABLE).get(entry.getKey(), e.getGuild().getId());
+                                long fortune = bot.getPlayerStats().getStat(Pickaxe.FORTUNE_TABLE).get(entry.getKey(), e.getGuild().getId());
+                                long efficiency = bot.getPlayerStats().getStat(Pickaxe.FORTUNE_TABLE).get(entry.getKey(), e.getGuild().getId());
 
                                 if (fortune > 0 || efficiency > 0) {
                                     ench = String.format("(Eff%s,Fort%s)", efficiency, fortune);
                                 }
-                                return Pickaxes.pickaxeLevelToName(level) + ench ;
+                                return Pickaxe.pickaxeLevelToName(level) + ench ;
                             },
-                            user -> bot.getPickaxes().getLevel(user, e.getGuild().getId()) + bot.getPickaxes().getEfficiency(user, e.getGuild().getId()) + bot.getPickaxes().getFortune(user, e.getGuild().getId())));
+                            user -> bot.getPlayerStats().getStat(Pickaxe.LEVEL_TABLE).get(user, e.getGuild().getId())
+                                    + bot.getPlayerStats().getStat(Pickaxe.EFFICIENCY_TABLE).get(user,
+                                            e.getGuild().getId())
+                                    + bot.getPlayerStats().getStat(Pickaxe.FORTUNE_TABLE).get(user,
+                                            e.getGuild().getId())));
                     return;
                 }
                 if (args[0].equalsIgnoreCase("farm") || args[0].equalsIgnoreCase("farmlevel")) {
                     bot.sendMessage(e, "Leaderboard", makeMessage(
-                            bot.getPickaxes().getMembers(e.getGuild()), "farm level",
+                            bot.getPlayerStats().getStat(PlayerStats.FARM_LEVEL_TABLE).getMembers(e.getGuild()), "farm level",
                             entry -> PeelingUtils.amountToString(entry.getValue()),
-                            user -> bot.getPickaxes().getFarmLevel(user, e.getGuild().getId())
+                            user -> bot.getPlayerStats().getFarmLevel(user, e.getGuild().getId())
                                 ));
                     return;
                 }