Work on v0.6

1 files changed, 9 insertions, 11 deletions

diff --git a/src/main/java/net/uomc/mineshaft/MineCommand.java b/src/main/java/net/uomc/mineshaft/MineCommand.java
index 03207e3..dc9ae6d 100644
--- a/src/main/java/net/uomc/mineshaft/MineCommand.java
+++ b/src/main/java/net/uomc/mineshaft/MineCommand.java
@@ -4,16 +4,13 @@ package net.uomc.mineshaft;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 
 import org.json.JSONObject;
 
-import com.mouldycheerio.dbot.CustomBot;
 import com.mouldycheerio.dbot.commands.CommandDetails;
 import com.mouldycheerio.dbot.commands.cooldowns.CooldownCommand;
 import com.mouldycheerio.dbot.util.EventWaiter;
@@ -23,11 +20,9 @@ import com.vdurmont.emoji.EmojiParser;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
-import net.uomc.mineshaft.resources.ResourceManager;
 
 public class MineCommand extends CooldownCommand {
 
@@ -50,6 +45,8 @@ public class MineCommand extends CooldownCommand {
     private static final double SKULL_SPAWN_AMOUNT = 1;
     private static final double NETHERITE_SPAWN_AMOUNT = 1;
 
+	private static final String MINED_STAT = "times_mined";
+
     private Map<String, String> ores;
     private List<String> oresList;
     private List<String> netherOresList;
@@ -138,7 +135,7 @@ public class MineCommand extends CooldownCommand {
     }
 
     public  MineshaftItem getOre(Member m, boolean nether) {
-        int pickaxe = m == null ? Pickaxes.MAX_PICKAXE_LEVEL : bot.getPickaxes().getPickaxeLevel(m);
+        int pickaxe = m == null ? bot.getPickaxe(m).getMaxLevel() : bot.getPickaxe(m).getLevel();
         double random = Math.random();
         int maxOre = levelToMaxOre(pickaxe);
 
@@ -156,7 +153,7 @@ public class MineCommand extends CooldownCommand {
     @Override
     public boolean trigger(MessageReceivedEvent e) {
 
-        boolean nether = bot.getPickaxes().isNether(e.getMember());
+        boolean nether = bot.getPlayerStats().isNether(e.getMember());
         MineshaftItem ore = getOre(e.getMember(), nether);
         int i;
         if (nether) {
@@ -181,7 +178,7 @@ public class MineCommand extends CooldownCommand {
                         if (!e.getMessage().getContentRaw().equalsIgnoreCase(getPickString(ore)))
                             return false;
 
-                        if (oreLevel > levelToMaxOre(bot.getPickaxes().getPickaxeLevel(e.getMember())))
+                        if (oreLevel > levelToMaxOre(bot.getPickaxe(e.getMember()).getLevel()))
                             return false;
 
                         return true;
@@ -235,6 +232,7 @@ public class MineCommand extends CooldownCommand {
         Map<MineshaftItem, Long> awards = getAwards(member, ore);
 
         bot.addItems(member, awards);
+        bot.getPlayerStats().getStat(MINED_STAT).increment(member);
         String awardsList = bot.createItemList(awards, "+%s");
 
         embedBuilder.setDescription(member.getAsMention() + " mined the ore!\n " + awardsList);
@@ -333,11 +331,11 @@ public class MineCommand extends CooldownCommand {
     }
 
     public double getEfficiencyCurve(Member m) {
-        return 1 + Math.pow(0.5, bot.getPickaxes().getPickaxeEfficiency(m) / 2);
-
+        return 1 + Math.pow(0.5, bot.getPickaxe(m).getEfficiency() / 2);
     }
+
     private double getPickaxeFortuneCurve(Member m) {
-        int fortune = bot.getPickaxes().getPickaxeFortune(m);
+        int fortune = bot.getPickaxe(m).getFortune();
         return fortune + Math.pow(1.2, fortune + 1);
     }