1.8.5v1.8.5

Merge pull request #79 from bowser0000/development

16 files changed, 658 insertions, 228 deletions

diff --git a/src/main/java/me/Danker/commands/DHelpCommand.java b/src/main/java/me/Danker/commands/DHelpCommand.java
index ee5958c..bcaf8b0 100644
--- a/src/main/java/me/Danker/commands/DHelpCommand.java
+++ b/src/main/java/me/Danker/commands/DHelpCommand.java
@@ -34,14 +34,14 @@ public class DHelpCommand extends CommandBase {
 													EnumChatFormatting.GOLD + " Commands, " + EnumChatFormatting.GREEN + " Keybinds.\n" +
 													EnumChatFormatting.GOLD + " /dhelp" + EnumChatFormatting.AQUA + " - Returns this message.\n" +
 													EnumChatFormatting.GOLD + " /dsm" + EnumChatFormatting.AQUA + " - Opens the GUI for Danker's Skyblock Mod.\n" +
-													EnumChatFormatting.GOLD + " /toggle <gparty/coords/golden/slayercount/rngesusalerts/splitfishing/chatmaddox/spiritbearalerts/aotd/lividdagger/sceptremessages/midasstaffmessages/implosionmessages/healmessages/petcolors/dungeontimer/golemalerts/expertiselore/skill50display/outlinetext/caketimer/lowhealthnotify/lividsolver/threemanpuzzle/oruopuzzle/blazepuzzle/creeperpuzzle/waterpuzzle/tictactoepuzzle/startswithterminal/selectallterminal/itemframeonsealanterns/ultrasequencer/chronomatron/superpairs/list>" + EnumChatFormatting.AQUA + " - Toggles features. /toggle list returns values of every toggle.\n" +
+													EnumChatFormatting.GOLD + " /toggle <gparty/coords/golden/slayercount/rngesusalerts/splitfishing/chatmaddox/spiritbearalerts/aotd/lividdagger/flowerweapons/sceptremessages/midasstaffmessages/implosionmessages/healmessages/petcolors/dungeontimer/golemalerts/expertiselore/skill50display/outlinetext/caketimer/lowhealthnotify/lividsolver/stopsalvagestarred/notifyslayerslain/autoskilltracker/necronnotifications/bonzotimer/threemanpuzzle/oruopuzzle/blazepuzzle/creeperpuzzle/waterpuzzle/tictactoepuzzle/watchermessage/startswithterminal/selectallterminal/clickinorderterminal/blockwrongterminalclicks/itemframeonsealanterns/ultrasequencer/chronomatron/superpairs/hidetooltipsinaddons/pickblock/list>" + EnumChatFormatting.AQUA + " - Toggles features. /toggle list returns values of every toggle.\n" +
 													EnumChatFormatting.GOLD + " /setkey <key>" + EnumChatFormatting.AQUA + " - Sets API key.\n" +
 													EnumChatFormatting.GOLD + " /getkey" + EnumChatFormatting.AQUA + " - Returns key set with /setkey and copies it to your clipboard.\n" +
 													EnumChatFormatting.GOLD + " /loot <zombie/spider/wolf/fishing/catacombs/mythological/> [winter/festival/spooky/f(1-7)/session]" + EnumChatFormatting.AQUA + " - Returns loot received from slayer quests or fishing stats. /loot fishing winter returns winter sea creatures instead.\n" +
 													EnumChatFormatting.GOLD + " /display <zombie/spider/wolf/fishing/catacombs/mythological/auto/off> [winter/festival/spooky/f(1-7)/session]" + EnumChatFormatting.AQUA + " - Text display for trackers. /display fishing winter displays winter sea creatures instead. /display auto automatically displays the loot for the slayer quest you have active.\n" +
 													EnumChatFormatting.GOLD + " /resetloot <zombie/spider/wolf/fishing/catacombs/mythological/confirm/cancel>" + EnumChatFormatting.AQUA + " - Resets loot for trackers. /resetloot confirm confirms the reset.\n" +
-													EnumChatFormatting.GOLD + " /move <coords/display/dungeontimer/skill50/lividhp/caketimer/skilltracker/wateranswer> <x> <y>" + EnumChatFormatting.AQUA + " - Moves text display to specified X and Y coordinates.\n" +
-													EnumChatFormatting.GOLD + " /scale <coords/display/dungeontimer/skill50/lividhp/caketimer/skilltracker/wateranswer> <scale (0.1 - 10)>" + EnumChatFormatting.AQUA + " - Scales text display to a specified multipler between 0.1x and 10x.\n" +
+													EnumChatFormatting.GOLD + " /move <coords/display/dungeontimer/skill50/lividhp/caketimer/skilltracker/wateranswer/bonzotimer> <x> <y>" + EnumChatFormatting.AQUA + " - Moves text display to specified X and Y coordinates.\n" +
+													EnumChatFormatting.GOLD + " /scale <coords/display/dungeontimer/skill50/lividhp/caketimer/skilltracker/wateranswer/bonzotimer> <scale (0.1 - 10)>" + EnumChatFormatting.AQUA + " - Scales text display to a specified multipler between 0.1x and 10x.\n" +
 													EnumChatFormatting.GOLD + " /slayer [player]" + EnumChatFormatting.AQUA + " - Uses API to get slayer xp of a person. If no name is provided, it checks yours.\n" +
 													EnumChatFormatting.GOLD + " /skills [player]" + EnumChatFormatting.AQUA + " - Uses API to get skill levels of a person. If no name is provided, it checks yours.\n" +
 													EnumChatFormatting.GOLD + " /lobbyskills" + EnumChatFormatting.AQUA + " - Uses API to find the average skills of the lobby, as well the three players with the highest skill average.\n" +
diff --git a/src/main/java/me/Danker/commands/DankerGuiCommand.java b/src/main/java/me/Danker/commands/DankerGuiCommand.java
index 18230e6..a6b200f 100644
--- a/src/main/java/me/Danker/commands/DankerGuiCommand.java
+++ b/src/main/java/me/Danker/commands/DankerGuiCommand.java
@@ -1,9 +1,16 @@
 package me.Danker.commands;
 
 import me.Danker.DankersSkyblockMod;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.ResourcePackRepository;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.StringUtils;
+
+import java.awt.*;
+import java.awt.datatransfer.StringSelection;
 
 public class DankerGuiCommand extends CommandBase {
 
@@ -24,6 +31,84 @@ public class DankerGuiCommand extends CommandBase {
 	
 	@Override
 	public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
+		if (arg1.length > 0 && arg1[0].equalsIgnoreCase("debug")) {
+			StringBuilder debug = new StringBuilder();
+			debug.append("```md\n");
+			debug.append("# Toggles\n");
+			debug.append("[gparty][").append(ToggleCommand.gpartyToggled).append("]\n");
+			debug.append("[coords][").append(ToggleCommand.coordsToggled).append("]\n");
+			debug.append("[golden][").append(ToggleCommand.goldenToggled).append("]\n");
+			debug.append("[slayercount][").append(ToggleCommand.slayerCountTotal).append("]\n");
+			debug.append("[rngesusalerts][").append(ToggleCommand.rngesusAlerts).append("]\n");
+			debug.append("[splitfishing][").append(ToggleCommand.splitFishing).append("]\n");
+			debug.append("[chatmaddox][").append(ToggleCommand.chatMaddoxToggled).append("]\n");
+			debug.append("[spiritbearalerts][").append(ToggleCommand.spiritBearAlerts).append("]\n");
+			debug.append("[aotd][").append(ToggleCommand.aotdToggled).append("]\n");
+			debug.append("[lividdagger][").append(ToggleCommand.lividDaggerToggled).append("]\n");
+			debug.append("[flowerweapons][").append(ToggleCommand.flowerWeaponsToggled).append("]\n");
+			debug.append("[sceptremessages][").append(ToggleCommand.sceptreMessages).append("]\n");
+			debug.append("[petcolors][").append(ToggleCommand.petColoursToggled).append("]\n");
+			debug.append("[dungeontimer][").append(ToggleCommand.dungeonTimerToggled).append("]\n");
+			debug.append("[golemalerts][").append(ToggleCommand.golemAlertToggled).append("]\n");
+			debug.append("[expertiselore][").append(ToggleCommand.expertiseLoreToggled).append("]\n");
+			debug.append("[skill50display][").append(ToggleCommand.skill50DisplayToggled).append("]\n");
+			debug.append("[outlinetext][").append(ToggleCommand.outlineTextToggled).append("]\n");
+			debug.append("[midasstaffmessages][").append(ToggleCommand.midasStaffMessages).append("]\n");
+			debug.append("[implosionmessages][").append(ToggleCommand.implosionMessages).append("]\n");
+			debug.append("[healmessages][").append(ToggleCommand.healMessages).append("]\n");
+			debug.append("[caketimer][").append(ToggleCommand.cakeTimerToggled).append("]\n");
+			debug.append("[lowhealthnotify][").append(ToggleCommand.lowHealthNotifyToggled).append("]\n");
+			debug.append("[lividsolver][").append(ToggleCommand.lividSolverToggled).append("]\n");
+			debug.append("[stopsalvagestarred][").append(ToggleCommand.stopSalvageStarredToggled).append("]\n");
+			debug.append("[notifyslayerslain][").append(ToggleCommand.notifySlayerSlainToggled).append("]\n");
+			debug.append("[necronnotifications][").append(ToggleCommand.necronNotificationsToggled).append("]\n");
+			debug.append("[bonzotimer][").append(ToggleCommand.bonzoTimerToggled).append("]\n");
+			debug.append("[autoskilltracker][").append(ToggleCommand.autoSkillTrackerToggled).append("]\n");
+			debug.append("[threemanpuzzle][").append(ToggleCommand.threeManToggled).append("]\n");
+			debug.append("[oruopuzzle][").append(ToggleCommand.oruoToggled).append("]\n");
+			debug.append("[blazepuzzle][").append(ToggleCommand.blazeToggled).append("]\n");
+			debug.append("[creeperpuzzle][").append(ToggleCommand.creeperToggled).append("]\n");
+			debug.append("[waterpuzzle][").append(ToggleCommand.waterToggled).append("]\n");
+			debug.append("[tictactoepuzzle][").append(ToggleCommand.ticTacToeToggled).append("]\n");
+			debug.append("[watchermessage][").append(ToggleCommand.watcherReadyToggled).append("]\n");
+			debug.append("[startswithterminal][").append(ToggleCommand.startsWithToggled).append("]\n");
+			debug.append("[selectallterminal][").append(ToggleCommand.selectAllToggled).append("]\n");
+			debug.append("[clickinorderterminal][").append(ToggleCommand.clickInOrderToggled).append("]\n");
+			debug.append("[blockwrongterminalclicks][").append(ToggleCommand.blockWrongTerminalClicksToggled).append("]\n");
+			debug.append("[itemframeonsealanterns][").append(ToggleCommand.itemFrameOnSeaLanternsToggled).append("]\n");
+			debug.append("[ultrasequencer][").append(ToggleCommand.ultrasequencerToggled).append("]\n");
+			debug.append("[chronomatron][").append(ToggleCommand.chronomatronToggled).append("]\n");
+			debug.append("[superpairs][").append(ToggleCommand.superpairsToggled).append("]\n");
+			debug.append("[hidetooltipsinaddons][").append(ToggleCommand.hideTooltipsInExperimentAddonsToggled).append("]\n");
+			debug.append("[pickblock][").append(ToggleCommand.swapToPickBlockToggled).append("]\n");
+			debug.append("# Locations\n");
+			debug.append("[coords][").append(MoveCommand.coordsXY[0]).append(", ").append(MoveCommand.coordsXY[1]).append("]\n");
+			debug.append("[display][").append(MoveCommand.displayXY[0]).append(", ").append(MoveCommand.displayXY[1]).append("]\n");
+			debug.append("[dungeontimer][").append(MoveCommand.dungeonTimerXY[0]).append(", ").append(MoveCommand.dungeonTimerXY[1]).append("]\n");
+			debug.append("[skill50][").append(MoveCommand.skill50XY[0]).append(", ").append(MoveCommand.skill50XY[1]).append("]\n");
+			debug.append("[lividhp][").append(MoveCommand.lividHpXY[0]).append(", ").append(MoveCommand.lividHpXY[1]).append("]\n");
+			debug.append("[caketimer][").append(MoveCommand.cakeTimerXY[0]).append(", ").append(MoveCommand.cakeTimerXY[1]).append("]\n");
+			debug.append("[skilltracker][").append(MoveCommand.skillTrackerXY[0]).append(", ").append(MoveCommand.skillTrackerXY[1]).append("]\n");
+			debug.append("[wateranswer][").append(MoveCommand.waterAnswerXY[0]).append(", ").append(MoveCommand.waterAnswerXY[1]).append("]\n");
+			debug.append("# Other Settings\n");
+			debug.append("[Current Display][").append(DisplayCommand.display).append("]\n");
+			debug.append("[Auto Display][").append(DisplayCommand.auto).append("]\n");
+			debug.append("[Skill Tracker Visible][").append(DankersSkyblockMod.showSkillTracker).append("]\n");
+			debug.append("# Resource Packs\n");
+			if (Minecraft.getMinecraft().getResourcePackRepository().getRepositoryEntries().size() == 0) {
+				debug.append("<None>\n");
+			} else {
+				for (ResourcePackRepository.Entry resource : Minecraft.getMinecraft().getResourcePackRepository().getRepositoryEntries()) {
+					debug.append("< ").append(StringUtils.stripControlCodes(resource.getResourcePackName())).append(" >\n");
+				}
+			}
+			debug.append("```");
+			StringSelection clipboard = new StringSelection(debug.toString());
+			Toolkit.getDefaultToolkit().getSystemClipboard().setContents(clipboard, clipboard);
+			Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Debug stats copied to clipboard."));
+			return;
+		}
+
 		DankersSkyblockMod.guiToOpen = "dankergui1";
 	}
 
diff --git a/src/main/java/me/Danker/commands/DungeonsCommand.java b/src/main/java/me/Danker/commands/DungeonsCommand.java
index bdc1403..f9ad93e 100644
--- a/src/main/java/me/Danker/commands/DungeonsCommand.java
+++ b/src/main/java/me/Danker/commands/DungeonsCommand.java
@@ -9,6 +9,7 @@ import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.event.HoverEvent;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.EnumChatFormatting;
@@ -77,6 +78,14 @@ public class DungeonsCommand extends CommandBase {
 				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "Failed with reason: " + reason));
 				return;
 			}
+
+			String playerURL = "https://api.hypixel.net/player?uuid=" + uuid + "&key=" + key;
+			System.out.println("Fetching player data...");
+			JsonObject playerResponse = APIHandler.getResponse(playerURL);
+			if(!playerResponse.get("success").getAsBoolean()){
+				String reason = playerResponse.get("cause").getAsString();
+				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "This player has not played on Hypixel."));
+			}
 			
 			System.out.println("Fetching dungeon stats...");
 			JsonObject dungeonsObject = profileResponse.get("profile").getAsJsonObject().get("members").getAsJsonObject().get(uuid).getAsJsonObject().get("dungeons").getAsJsonObject();
@@ -84,25 +93,56 @@ public class DungeonsCommand extends CommandBase {
 				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "This player has not played dungeons."));
 				return;
 			}
-			
-			double catacombs = Utils.xpToDungeonsLevel(dungeonsObject.get("dungeon_types").getAsJsonObject().get("catacombs").getAsJsonObject().get("experience").getAsDouble());
+
+			JsonObject catacombsObject = dungeonsObject.get("dungeon_types").getAsJsonObject().get("catacombs").getAsJsonObject();
+			double catacombs = Utils.xpToDungeonsLevel(catacombsObject.get("experience").getAsDouble());
 			double healer = Utils.xpToDungeonsLevel(dungeonsObject.get("player_classes").getAsJsonObject().get("healer").getAsJsonObject().get("experience").getAsDouble());
 			double mage = Utils.xpToDungeonsLevel(dungeonsObject.get("player_classes").getAsJsonObject().get("mage").getAsJsonObject().get("experience").getAsDouble());
 			double berserk = Utils.xpToDungeonsLevel(dungeonsObject.get("player_classes").getAsJsonObject().get("berserk").getAsJsonObject().get("experience").getAsDouble());
 			double archer = Utils.xpToDungeonsLevel(dungeonsObject.get("player_classes").getAsJsonObject().get("archer").getAsJsonObject().get("experience").getAsDouble());
 			double tank = Utils.xpToDungeonsLevel(dungeonsObject.get("player_classes").getAsJsonObject().get("tank").getAsJsonObject().get("experience").getAsDouble());
 			String selectedClass = Utils.capitalizeString(dungeonsObject.get("selected_dungeon_class").getAsString());
-			
-			player.addChatMessage(new ChatComponentText(DankersSkyblockMod.DELIMITER_COLOUR + "" + EnumChatFormatting.BOLD + "-------------------\n" +
-														EnumChatFormatting.RED + " Catacombs Level: " + catacombs + "\n" +
-														EnumChatFormatting.GOLD + " Selected Class: " + selectedClass + "\n\n" +
-														EnumChatFormatting.YELLOW + " Healer Level: " + healer + "\n" +
-														EnumChatFormatting.LIGHT_PURPLE + " Mage Level: " + mage + "\n" +
-														EnumChatFormatting.RED + " Berserk Level: " + berserk + "\n" +
-														EnumChatFormatting.GREEN + " Archer Level: " + archer + "\n" +
-														EnumChatFormatting.BLUE + " Tank Level: " + tank + "\n" +
-														DankersSkyblockMod.DELIMITER_COLOUR + " " + EnumChatFormatting.BOLD + "-------------------"));
+			int secrets = playerResponse.get("player").getAsJsonObject().get("achievements").getAsJsonObject().get("skyblock_treasure_hunter").getAsInt();
+
+			int highestFloor = catacombsObject.get("highest_tier_completed").getAsInt();
+			JsonObject completionObj = catacombsObject.get("tier_completions").getAsJsonObject();
+
+			String delimiter = DankersSkyblockMod.DELIMITER_COLOUR + "" + EnumChatFormatting.BOLD + "-------------------";
+
+			ChatComponentText classLevels = new ChatComponentText(
+					EnumChatFormatting.GOLD + " Selected Class: " + selectedClass + "\n\n" +
+						 EnumChatFormatting.RED + " Catacombs Level: " + catacombs + "\n" +
+						 EnumChatFormatting.YELLOW + " Healer Level: " + healer + "\n" +
+						 EnumChatFormatting.LIGHT_PURPLE + " Mage Level: " + mage + "\n" +
+						 EnumChatFormatting.RED + " Berserk Level: " + berserk + "\n" +
+						 EnumChatFormatting.GREEN + " Archer Level: " + archer + "\n" +
+						 EnumChatFormatting.BLUE + " Tank Level: " + tank + "\n\n" +
+						 EnumChatFormatting.WHITE + " Secrets Found: " + secrets + "\n\n");
+
+			StringBuilder completionsHoverString = new StringBuilder();
+
+			for (int i = 0; i <= highestFloor; i++) {
+				completionsHoverString
+						.append(EnumChatFormatting.GOLD)
+						.append(i == 0 ? "Entrance: " : "Floor " + i + ": ")
+						.append(EnumChatFormatting.RESET)
+						.append(completionObj.get(String.valueOf(i)).getAsInt())
+						.append(i < highestFloor ? "\n": "");
+			}
+
+			ChatComponentText completions = new ChatComponentText(EnumChatFormatting.GOLD + " Highest Floor Completed: " + highestFloor);
+
+			completions.setChatStyle(completions.getChatStyle().setChatHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ChatComponentText(completionsHoverString.toString()))));
+
+
+			player.addChatMessage(
+					new ChatComponentText(delimiter)
+					.appendText("\n")
+					.appendSibling(classLevels)
+					.appendSibling(completions)
+					.appendText("\n")
+					.appendSibling(new ChatComponentText(delimiter))
+				);
 		}).start();
 	}
-
 }
diff --git a/src/main/java/me/Danker/commands/FairySoulsCommand.java b/src/main/java/me/Danker/commands/FairySoulsCommand.java
new file mode 100644
index 0000000..77a7586
--- /dev/null
+++ b/src/main/java/me/Danker/commands/FairySoulsCommand.java
@@ -0,0 +1,92 @@
+package me.Danker.commands;
+
+import com.google.gson.JsonObject;
+import me.Danker.DankersSkyblockMod;
+import me.Danker.handlers.APIHandler;
+import me.Danker.handlers.ConfigHandler;
+import me.Danker.utils.Utils;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ChatComponentText;
+
+import java.util.List;
+
+public class FairySoulsCommand extends CommandBase {
+    @Override
+    public String getCommandName() {
+        return "fairysouls";
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender sender) {
+        return "/" + getCommandName() + "[name]";
+    }
+
+    @Override
+    public int getRequiredPermissionLevel() {
+        return 0;
+    }
+
+    @Override
+    public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
+        if (args.length == 1) {
+            return Utils.getMatchingPlayers(args[0]);
+        }
+        return null;
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) throws CommandException {
+        EntityPlayer player = ((EntityPlayer) sender);
+        // MULTI THREAD DRIFTING
+        new Thread(() -> {
+
+            // Check key
+            String key = ConfigHandler.getString("api", "APIKey");
+            if(key.equals("")) {
+                player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "API key not set. Use /setkey."));
+            }
+
+            // Get UUID for Hypixel API requests
+            String username;
+            String uuid;
+            if(args.length == 0) {
+                username = player.getName();
+                uuid = APIHandler.getUUID(username);
+                player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Checking fairy souls of " + DankersSkyblockMod.SECONDARY_COLOUR + username));
+            } else {
+                username = args[0];
+                player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Checking fairy souls of " + DankersSkyblockMod.SECONDARY_COLOUR + username));
+                uuid = APIHandler.getUUID(username);
+            }
+
+            // Find fairy souls of latest profile
+            String latestProfile = APIHandler.getLatestProfileID(uuid, key);
+            if (latestProfile == null) return;
+
+            String profileURL = "https://api.hypixel.net/skyblock/profile?profile=" + latestProfile + "&key=" + key;
+            System.out.println("Fetching profile...");
+
+            JsonObject profileResponse = APIHandler.getResponse(profileURL);
+            if (!profileResponse.get("success").getAsBoolean()) {
+                String reason = profileResponse.get("cause").getAsString();
+                player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "Failed with reason: " + reason));
+                return;
+            }
+
+            // Extracting the fairy souls from the json data
+            System.out.println("Fetching fairy souls");
+            JsonObject userObject = profileResponse.get("profile").getAsJsonObject().get("members").getAsJsonObject().get(uuid).getAsJsonObject();
+
+            int fairy_souls = userObject.get("fairy_souls_collected").getAsInt();
+            System.out.println(fairy_souls);
+
+            player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "The player " + username + " has " + DankersSkyblockMod.VALUE_COLOUR + fairy_souls + DankersSkyblockMod.MAIN_COLOUR + "/220" + " collected"));
+
+        }).start();
+
+    }
+}
diff --git a/src/main/java/me/Danker/commands/LobbySkillsCommand.java b/src/main/java/me/Danker/commands/LobbySkillsCommand.java
index e5bf98c..61ceea7 100644
--- a/src/main/java/me/Danker/commands/LobbySkillsCommand.java
+++ b/src/main/java/me/Danker/commands/LobbySkillsCommand.java
@@ -100,7 +100,7 @@ public class LobbySkillsCommand extends CommandBase {
 							farmingLevel = (double) Math.round(farmingLevel * 100) / 100;
 						}
 						if (latestProfile.has("experience_skill_mining")) {
-							miningLevel = Utils.xpToSkillLevel(latestProfile.get("experience_skill_mining").getAsDouble(), 50);
+							miningLevel = Utils.xpToSkillLevel(latestProfile.get("experience_skill_mining").getAsDouble(), 60);
 							miningLevel = (double) Math.round(miningLevel * 100) / 100;
 						}
 						if (latestProfile.has("experience_skill_combat")) {
@@ -143,7 +143,7 @@ public class LobbySkillsCommand extends CommandBase {
 							farmingLevel = achievementObject.get("skyblock_harvester").getAsInt();
 						}
 						if (achievementObject.has("skyblock_excavator")) {
-							miningLevel = Math.min(achievementObject.get("skyblock_excavator").getAsInt(), 50);
+							miningLevel = achievementObject.get("skyblock_excavator").getAsInt();
 						}
 						if (achievementObject.has("skyblock_combat")) {
 							combatLevel = Math.min(achievementObject.get("skyblock_combat").getAsInt(), 50);
diff --git a/src/main/java/me/Danker/commands/MoveCommand.java b/src/main/java/me/Danker/commands/MoveCommand.java
index e9bfe61..55ad695 100644
--- a/src/main/java/me/Danker/commands/MoveCommand.java
+++ b/src/main/java/me/Danker/commands/MoveCommand.java
@@ -21,7 +21,8 @@ public class MoveCommand extends CommandBase {
 	public static int[] cakeTimerXY = {0, 0};
 	public static int[] skillTrackerXY = {0, 0};
 	public static int[] waterAnswerXY = {0, 0};
-	
+	public static int[] bonzoTimerXY = {0, 0};
+
 	@Override
 	public String getCommandName() {
 		return "move";
@@ -29,7 +30,7 @@ public class MoveCommand extends CommandBase {
 
 	@Override
 	public String getCommandUsage(ICommandSender arg0) {
-		return "/" + getCommandName() + " <coords/display/dungeontimer/skill50/lividhp/caketimer/skilltracker/wateranswer> <x> <y>";
+		return "/" + getCommandName() + " <coords/display/dungeontimer/skill50/lividhp/caketimer/skilltracker/wateranswer/bonzotimer> <x> <y>";
 	}
 	
 	@Override
@@ -40,7 +41,7 @@ public class MoveCommand extends CommandBase {
 	@Override
 	public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
 		if (args.length == 1) {
-			return getListOfStringsMatchingLastWord(args, "coords", "display", "dungeontimer", "skill50", "lividhp", "caketimer", "skilltracker", "wateranswer");
+			return getListOfStringsMatchingLastWord(args, "coords", "display", "dungeontimer", "skill50", "lividhp", "caketimer", "skilltracker", "wateranswer", "bonzotimer");
 		}
 		return null;
 	}
@@ -111,6 +112,13 @@ public class MoveCommand extends CommandBase {
 				ConfigHandler.writeIntConfig("locations", "waterAnswerY", waterAnswerXY[1]);
 				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Water solver answer has been moved to " + DankersSkyblockMod.SECONDARY_COLOUR + arg1[1] + ", " + arg1[2]));
 				break;
+			case "bonzotimer":
+				bonzoTimerXY[0] = Integer.parseInt(arg1[1]);
+				bonzoTimerXY[1] = Integer.parseInt(arg1[2]);
+				ConfigHandler.writeIntConfig("locations", "bonzoTimerX", bonzoTimerXY[0]);
+				ConfigHandler.writeIntConfig("locations", "bonzoTimerX", bonzoTimerXY[1]);
+				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Bonzo's Mask timer has been moved to " + DankersSkyblockMod.SECONDARY_COLOUR + arg1[1] + ", " + arg1[2]));
+				break;
 			default:
 				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "Usage: " + getCommandUsage(arg0)));
 		}
diff --git a/src/main/java/me/Danker/commands/PetsCommand.java b/src/main/java/me/Danker/commands/PetsCommand.java
index 7b1b52f..a7824e4 100644
--- a/src/main/java/me/Danker/commands/PetsCommand.java
+++ b/src/main/java/me/Danker/commands/PetsCommand.java
@@ -16,20 +16,21 @@ import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.EnumChatFormatting;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 
 public class PetsCommand extends CommandBase {
 
 	static int petXpToLevel(double xp, String rarity) {
 		int[] xpPerLevel = {100, 110, 120, 130, 145, 160, 175, 190, 210, 230, 250, 275, 300, 330, 360, 400, 440, 490, 540, 600, 660, 730,
-							800, 880, 960, 1050, 1150, 1260, 1380, 1510, 1650, 1800, 1960, 2130, 2310, 2500, 2700, 2920, 3160, 3420, 3700,
-							4000, 4350, 4750, 5200, 5700, 6300, 7000, 7800, 8700, 9700, 10800, 12000, 13300, 14700, 16200, 17800, 19500,
-							21300, 23200, 25200, 27400, 29800, 32400, 35200, 38200, 41400, 44800, 48400, 52200, 56200, 60400, 64800, 69400,
-							74200, 79200, 84700, 90700, 97200, 104200, 111700, 119700, 128200, 137200, 146700, 156700, 167700, 179700, 192700,
-							206700, 221700, 237700, 254700, 272700, 291700, 311700, 333700, 357700, 383700, 411700, 441700, 476700, 516700,
-							561700, 611700, 666700, 726700, 791700, 861700, 936700, 1016700, 1101700, 1191700, 1286700, 1386700, 1496700,
-							1616700, 1746700, 1886700};
-		
+				800, 880, 960, 1050, 1150, 1260, 1380, 1510, 1650, 1800, 1960, 2130, 2310, 2500, 2700, 2920, 3160, 3420, 3700,
+				4000, 4350, 4750, 5200, 5700, 6300, 7000, 7800, 8700, 9700, 10800, 12000, 13300, 14700, 16200, 17800, 19500,
+				21300, 23200, 25200, 27400, 29800, 32400, 35200, 38200, 41400, 44800, 48400, 52200, 56200, 60400, 64800, 69400,
+				74200, 79200, 84700, 90700, 97200, 104200, 111700, 119700, 128200, 137200, 146700, 156700, 167700, 179700, 192700,
+				206700, 221700, 237700, 254700, 272700, 291700, 311700, 333700, 357700, 383700, 411700, 441700, 476700, 516700,
+				561700, 611700, 666700, 726700, 791700, 861700, 936700, 1016700, 1101700, 1191700, 1286700, 1386700, 1496700,
+				1616700, 1746700, 1886700};
+
 		int levelOffset = 0;
 		switch (rarity) {
 			case "UNCOMMON":
@@ -44,8 +45,11 @@ public class PetsCommand extends CommandBase {
 			case "LEGENDARY":
 				levelOffset = 20;
 				break;
+			case "MYTHIC":
+				levelOffset = 20;
+				break;
 		}
-		
+
 		for (int i = levelOffset, xpAdded = 0; i < levelOffset + 99; i++) {
 			xpAdded += xpPerLevel[i];
 			if (xp < xpAdded) {
@@ -54,7 +58,67 @@ public class PetsCommand extends CommandBase {
 		}
 		return 100;
 	}
-	
+
+	enum Rarity {
+		COMMON,
+		UNCOMMON,
+		RARE,
+		EPIC,
+		LEGENDARY,
+		MYTHIC;
+
+		public Rarity nextRarity() {
+			if (this.ordinal() == Rarity.values().length) return this;
+			return Rarity.values()[this.ordinal() + 1];
+		}
+
+		public EnumChatFormatting getChatColor() {
+			if (this == Rarity.COMMON) return EnumChatFormatting.WHITE;
+			if (this == Rarity.UNCOMMON) return EnumChatFormatting.GREEN;
+			if (this == Rarity.RARE) return EnumChatFormatting.BLUE;
+			if (this == Rarity.EPIC) return EnumChatFormatting.DARK_PURPLE;
+			if (this == Rarity.LEGENDARY) return EnumChatFormatting.GOLD;
+			if (this == Rarity.MYTHIC) return EnumChatFormatting.LIGHT_PURPLE;
+			return null;
+		}
+	}
+
+	class Pet {
+
+		public Rarity rarity;
+		public double xp;
+		public boolean active;
+		public boolean rarityBoosted = false;
+		public String name;
+
+		Pet(JsonObject pet) {
+			Rarity rarity = Rarity.valueOf(pet.get("tier").getAsString());
+			if (!pet.get("heldItem").isJsonNull()) {
+				String petItemID = pet.get("heldItem").getAsString();
+				switch (petItemID) {
+					case "PET_ITEM_VAMPIRE_FANG":
+					case "PET_ITEM_TOY_JERRY":
+					case "PET_ITEM_TIER_BOOST":
+						rarityBoosted = true;
+						rarity = rarity.nextRarity();
+				}
+			}
+			this.active = pet.get("active").getAsBoolean();
+			this.name = Utils.capitalizeString(pet.get("type").getAsString());;
+			this.rarity = rarity;
+			this.xp = pet.get("exp").getAsDouble();
+		}
+
+		public String getStringToAdd() {
+			int level = petXpToLevel(this.xp, this.rarity.name());
+
+			String messageToAdd = rarity.getChatColor() + " " + (this.active ? EnumChatFormatting.BOLD + ">>> " : "") + Utils.capitalizeString(this.rarity.name()) + (this.rarityBoosted ? " ⇑" : "")  + " " + this.name + " (" + level + ")" + (this.active ? " <<<" : "");
+
+			return messageToAdd + "\n";
+		}
+
+	}
+
 	@Override
 	public String getCommandName() {
 		return "petsof";
@@ -64,12 +128,12 @@ public class PetsCommand extends CommandBase {
 	public String getCommandUsage(ICommandSender arg0) {
 		return "/" + getCommandName() + " [name]";
 	}
-	
+
 	@Override
 	public int getRequiredPermissionLevel() {
 		return 0;
 	}
-	
+
 	@Override
 	public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
 		if (args.length == 1) {
@@ -83,13 +147,13 @@ public class PetsCommand extends CommandBase {
 		// MULTI THREAD DRIFTING
 		new Thread(() -> {
 			EntityPlayer player = (EntityPlayer) arg0;
-			
+
 			// Check key
 			String key = ConfigHandler.getString("api", "APIKey");
 			if (key.equals("")) {
 				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "API key not set. Use /setkey."));
 			}
-			
+
 			// Get UUID for Hypixel API requests
 			String username;
 			String uuid;
@@ -102,11 +166,11 @@ public class PetsCommand extends CommandBase {
 				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Checking pets of " + DankersSkyblockMod.SECONDARY_COLOUR + username));
 				uuid = APIHandler.getUUID(username);
 			}
-			
+
 			// Find stats of latest profile
 			String latestProfile = APIHandler.getLatestProfileID(uuid, key);
 			if (latestProfile == null) return;
-			
+
 			String profileURL = "https://api.hypixel.net/skyblock/profile?profile=" + latestProfile + "&key=" + key;
 			System.out.println("Fetching profile...");
 			JsonObject profileResponse = APIHandler.getResponse(profileURL);
@@ -115,137 +179,41 @@ public class PetsCommand extends CommandBase {
 				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "Failed with reason: " + reason));
 				return;
 			}
-			
+
 			System.out.println("Fetching pets...");
 			JsonArray petsArray = profileResponse.get("profile").getAsJsonObject().get("members").getAsJsonObject().get(uuid).getAsJsonObject().get("pets").getAsJsonArray();
 			if (petsArray.size() == 0) {
 				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + username + " has no pets."));
 				return;
 			}
-			
+
 			System.out.println("Looping through pets...");
 			// Push each pet into list
-			List<JsonElement> sortedPets = new ArrayList<>();
+			List<Pet> pets = new ArrayList<>();
 			for (JsonElement petElement : petsArray) {
-				sortedPets.add(petElement);
+				pets.add(new Pet(petElement.getAsJsonObject()));
 			}
-			
-			// Sort pets by exp
-			sortedPets.sort((pet1, pet2) -> {
-				double petXp1 = pet1.getAsJsonObject().get("exp").getAsDouble();
-				double petXp2 = pet2.getAsJsonObject().get("exp").getAsDouble();
-				return -Double.compare(petXp1, petXp2);
+
+			// Sort pets by exp and rarity
+			pets.sort((pet1, pet2) -> {
+				int rarity = pet1.rarity.compareTo(pet2.rarity);
+				int xp = Double.compare(pet1.xp, pet2.xp);
+				if (rarity != 0) return -rarity;
+				return -xp;
 			});
-			
-			// Sort pets into rarities
-			List<JsonObject> commonPets = new ArrayList<>();
-			List<JsonObject> uncommonPets = new ArrayList<>();
-			List<JsonObject> rarePets = new ArrayList<>();
-			List<JsonObject> epicPets = new ArrayList<>();
-			List<JsonObject> legendaryPets = new ArrayList<>();
-			
-			for (JsonElement petElement : sortedPets) {
-				JsonObject pet = petElement.getAsJsonObject();
-				String rarity = pet.get("tier").getAsString();
-
-				switch (rarity) {
-					case "COMMON":
-						commonPets.add(pet);
-						break;
-					case "UNCOMMON":
-						uncommonPets.add(pet);
-						break;
-					case "RARE":
-						rarePets.add(pet);
-						break;
-					case "EPIC":
-						epicPets.add(pet);
-						break;
-					case "LEGENDARY":
-						legendaryPets.add(pet);
-						break;
-				}
-			}
-			
-			int totalPets = commonPets.size() + uncommonPets.size() + rarePets.size() + epicPets.size() + legendaryPets.size();
+
 			String finalMessage = DankersSkyblockMod.DELIMITER_COLOUR + "" + EnumChatFormatting.BOLD + "-------------------\n" +
-					  			  EnumChatFormatting.AQUA + " " + username + "'s Pets (" + totalPets + "):\n";
-			
-			// Loop through pet rarities
-			for (JsonObject legPet : legendaryPets) {
-				String petName = Utils.capitalizeString(legPet.get("type").getAsString());
-				int level = petXpToLevel(legPet.get("exp").getAsDouble(), "LEGENDARY");
-				
-				String messageToAdd;
-				if (legPet.get("active").getAsBoolean()) {
-					messageToAdd = EnumChatFormatting.GOLD + " " + EnumChatFormatting.BOLD + ">>> Legendary " + petName + " (" + level + ") <<<";
-				} else {
-					messageToAdd = EnumChatFormatting.GOLD + " Legendary " + petName + " (" + level