Work on v0.6

1 files changed, 15 insertions, 15 deletions

diff --git a/src/main/java/net/uomc/mineshaft/PickaxeCommand.java b/src/main/java/net/uomc/mineshaft/PickaxeCommand.java
index 31ac11c..a81ccd1 100644
--- a/src/main/java/net/uomc/mineshaft/PickaxeCommand.java
+++ b/src/main/java/net/uomc/mineshaft/PickaxeCommand.java
@@ -13,6 +13,7 @@ import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import net.uomc.mineshaft.blacksmith.Pickaxe;
 
 public class PickaxeCommand extends DetailedCommand {
 
@@ -26,10 +27,11 @@ public class PickaxeCommand extends DetailedCommand {
     @Override
     public void execute(MessageReceivedEvent e, CustomBot b, String[] args) throws CommandFail  {
         if (args.length > 0 && "upgrade".equalsIgnoreCase(args[0])) {
-            int level = bot.getPickaxes().getPickaxeLevel(e.getMember());
-            Map<MineshaftItem, Long> upgradeCost = upgradeCost(e.getMember());
+            Pickaxe pick = bot.getPickaxe(e.getMember());
+            int level = pick.getLevel();
+            Map<MineshaftItem, Long> upgradeCost = upgradeCost(pick);
 
-            if (level >= bot.getPickaxes().getMaPickaxeLevel()) {
+            if (level >= pick.getMaxLevel()) {
                 bot.sendErrorMessage(e, ":x: Your pickaxe is already at the maximum level");
                 return;
             }
@@ -42,31 +44,29 @@ public class PickaxeCommand extends DetailedCommand {
             }
 
             bot.removeItems(e.getMember(), upgradeCost);
-            bot.getPickaxes().setLevel(e.getMember(), level + 1);
-            String pickName = bot.getPickaxes().getPickaxeName(e.getMember());
+            pick.setLevel(level + 1);
+            String pickName = pick.getName();
             bot.sendSuccessMessage(e, "Your pickaxe has been upgraded to a **" + pickName + " Pickaxe**");
             return;
         }
 
-        String pickName = bot.getPickaxes().getPickaxeName(e.getMember());
-        String nextPick = bot.getPickaxes().getNextPickaxeName(e.getMember());
-        String pickImage = bot.getPickaxes().getPickaxeImage(e.getMember());
-        int fortune = bot.getPickaxes().getPickaxeFortune(e.getMember());
-        int efficiency = bot.getPickaxes().getPickaxeEfficiency(e.getMember());
-
         Member target = PeelingUtils.getSingleMentionFromArgs(e);
         String p1 = target.equals(e.getMember()) ? "You currently have" : String.format("%s currently has", e.getMember().getEffectiveName());
         String p2 = target.equals(e.getMember()) ? "Your pickaxe" : String.format("%s's pickaxe", e.getMember().getEffectiveName());
 
+        Pickaxe pick = bot.getPickaxe(target);
+        String pickName = pick.getName();
+        String nextPick = pick.getNextName();
+        String pickImage = pick.getImage();
 
-        Map<MineshaftItem, Long> upgradeCost = upgradeCost(target);
+        Map<MineshaftItem, Long> upgradeCost = upgradeCost(pick);
 
         String upgradeString = "\n\nTo upgrade to a **" + nextPick + " Pickaxe **, use `" + bot.getCommandController().getPrefix() + "pickaxe upgrade`.\nUpgrade cost: **" + String.join(",", bot.createItemList(upgradeCost).split("\n")) + "**";
         if (!target.equals(e.getMember())){
             upgradeString = "";
         }
 
-        String enchants = String.format("\n%s ", p2) + bot.getEnchantCommand().getPickaxeEnchantmentsString(fortune, efficiency);
+        String enchants = String.format("\n%s ", p2) + pick.getEnchantmentString();
 
         EmbedBuilder em = new EmbedBuilder();
         em.setTitle(p2);
@@ -76,10 +76,10 @@ public class PickaxeCommand extends DetailedCommand {
         e.getMessage().replyEmbeds(em.build()).queue();
     }
 
-    private Map<MineshaftItem, Long> upgradeCost(Member m) {
+    private Map<MineshaftItem, Long> upgradeCost(Pickaxe pick) {
         Map<MineshaftItem, Long> cost = new HashMap<>();
 
-        int level = bot.getPickaxes().getPickaxeLevel(m);
+        int level = pick.getLevel();
 
         switch ((int) level) {
             case 0: