v1.7v1.7

Merge pull request #13 from bowser0000/development

14 files changed, 602 insertions, 290 deletions

diff --git a/src/main/java/me/Danker/commands/BankCommand.java b/src/main/java/me/Danker/commands/BankCommand.java
index e32e66f..952929f 100644
--- a/src/main/java/me/Danker/commands/BankCommand.java
+++ b/src/main/java/me/Danker/commands/BankCommand.java
@@ -3,6 +3,7 @@ package me.Danker.commands;
 import java.text.NumberFormat;
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 
 import com.google.gson.JsonObject;
 
@@ -25,8 +26,7 @@ public class BankCommand extends CommandBase {
 	}
 	
 	@Override
-	public List<String> getCommandAliases()
-    {
+	public List<String> getCommandAliases() {
         return Collections.singletonList("purse");
     }
 
@@ -91,6 +91,7 @@ public class BankCommand extends CommandBase {
 			System.out.println("Fetching bank + purse coins...");
 			double purseCoins = profileResponse.get("profile").getAsJsonObject().get("members").getAsJsonObject().get(uuid).getAsJsonObject().get("coin_purse").getAsDouble();
 			purseCoins = (double) Math.floor(purseCoins * 100.0) / 100.0;
+			NumberFormat nf = NumberFormat.getIntegerInstance(Locale.US);
 			
 			// Check for bank api
 			if (profileResponse.get("profile").getAsJsonObject().has("banking")) {
@@ -99,14 +100,14 @@ public class BankCommand extends CommandBase {
 				
 				player.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 															EnumChatFormatting.AQUA + " " + username + "'s Coins:\n" +
-															EnumChatFormatting.GREEN + " Bank: " + EnumChatFormatting.GOLD + NumberFormat.getInstance().format(bankCoins) + "\n" +
-															EnumChatFormatting.GREEN + " Purse: " + EnumChatFormatting.GOLD + NumberFormat.getInstance().format(purseCoins) + "\n" +
+															EnumChatFormatting.GREEN + " Bank: " + EnumChatFormatting.GOLD + nf.format(bankCoins) + "\n" +
+															EnumChatFormatting.GREEN + " Purse: " + EnumChatFormatting.GOLD + nf.format(purseCoins) + "\n" +
 															EnumChatFormatting.AQUA + " " + EnumChatFormatting.BOLD + "-------------------"));
 			} else {
 				player.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 															EnumChatFormatting.AQUA + " " + username + "'s Coins:\n" +
 															EnumChatFormatting.GREEN + " Bank: " + EnumChatFormatting.RED + "Bank API disabled.\n" +
-															EnumChatFormatting.GREEN + " Purse: " + EnumChatFormatting.GOLD + NumberFormat.getInstance().format(purseCoins) + "\n" +
+															EnumChatFormatting.GREEN + " Purse: " + EnumChatFormatting.GOLD + nf.format(purseCoins) + "\n" +
 															EnumChatFormatting.AQUA + " " + EnumChatFormatting.BOLD + "-------------------"));
 			}
 		}).start();
diff --git a/src/main/java/me/Danker/commands/ChatMaddoxCommand.java b/src/main/java/me/Danker/commands/ChatMaddoxCommand.java
new file mode 100644
index 0000000..518f26f
--- /dev/null
+++ b/src/main/java/me/Danker/commands/ChatMaddoxCommand.java
@@ -0,0 +1,33 @@
+package me.Danker.commands;
+
+import me.Danker.TheMod;
+import net.minecraft.client.Minecraft;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayer;
+
+public class ChatMaddoxCommand extends CommandBase {
+
+	@Override
+	public String getCommandName() {
+		return "dmodopenmaddoxmenu";
+	}
+
+	@Override
+	public String getCommandUsage(ICommandSender arg0) {
+		return null;
+	}
+	
+	@Override
+	public int getRequiredPermissionLevel() {
+		return 0;
+	}
+
+	@Override
+	public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
+		if (!ToggleCommand.chatMaddoxToggled) return;
+		Minecraft.getMinecraft().thePlayer.sendChatMessage(TheMod.lastMaddoxCommand);
+	}
+
+}
diff --git a/src/main/java/me/Danker/commands/DHelpCommand.java b/src/main/java/me/Danker/commands/DHelpCommand.java
index 9ca6a6e..52db06b 100644
--- a/src/main/java/me/Danker/commands/DHelpCommand.java
+++ b/src/main/java/me/Danker/commands/DHelpCommand.java
@@ -31,22 +31,25 @@ public class DHelpCommand extends CommandBase {
 		
 		player.addChatMessage(new ChatComponentText("\n" + EnumChatFormatting.GOLD + " " + TheMod.MODID + " Version " + TheMod.VERSION + "\n" +
 													EnumChatFormatting.AQUA + " <> = Mandatory parameter. [] = Optional parameter.\n" +
+													EnumChatFormatting.GOLD + " Commands, " + EnumChatFormatting.GREEN + " Keybinds.\n" +
 													EnumChatFormatting.GOLD + " /dhelp" + EnumChatFormatting.AQUA + " - Returns this message.\n" +
-													EnumChatFormatting.GOLD + " /toggle <gparty/coords/golden/slayercount/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/sceptremessages/petcolors/dungeontimer/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.\n" +
-													EnumChatFormatting.GOLD + " /loot <zombie/spider/wolf/fishing> [winter/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/off> [winter/session]" + EnumChatFormatting.AQUA + " - Text display for trackers. /display fishing winter displays winter sea creatures instead.\n" +
-													EnumChatFormatting.GOLD + " /resetloot <zombie/spider/wolf/fishing/confirm/cancel>" + EnumChatFormatting.AQUA + " - Resets loot for trackers. /resetloot confirm confirms the reset.\n" +
-													EnumChatFormatting.GOLD + " /move <coords/display> <x> <y>" + EnumChatFormatting.AQUA + " - Moves text display to specified X and Y coordinates.\n" +
-													EnumChatFormatting.GOLD + " /scale <coords/display> <scale (0.1 - 10)" + EnumChatFormatting.AQUA + " - Scales text display to a specified multipler between 0.1x and 10x.\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> [winter/f(1-4)/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/off> [winter/f(1-4)/session]" + EnumChatFormatting.AQUA + " - Text display for trackers. /display fishing winter displays winter sea creatures instead.\n" +
+													EnumChatFormatting.GOLD + " /resetloot <zombie/spider/wolf/fishing/catacombs/confirm/cancel>" + EnumChatFormatting.AQUA + " - Resets loot for trackers. /resetloot confirm confirms the reset.\n" +
+													EnumChatFormatting.GOLD + " /move <coords/display/dungeontimer> <x> <y>" + EnumChatFormatting.AQUA + " - Moves text display to specified X and Y coordinates.\n" +
+													EnumChatFormatting.GOLD + " /scale <coords/display/dungeontimer> <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 + " /guildof [player]" + EnumChatFormatting.AQUA + " - Uses API to get guild name and guild master of a person. If no name is provided, it checks yours.\n" +
 													EnumChatFormatting.GOLD + " /petsof [player]" + EnumChatFormatting.AQUA + " - Uses API to get pets of a person. If no name is provided, it checks yours.\n" +
 													EnumChatFormatting.GOLD + " /bank [player]" + EnumChatFormatting.AQUA + " - Uses API to get bank and purse coins of a person. If no name is provided, it checks yours.\n" +
 													EnumChatFormatting.GOLD + " /armor [player]" + EnumChatFormatting.AQUA + " - Uses API to get armour of a person. If no name is provided, it checks yours.\n" +
-													EnumChatFormatting.GOLD + " /importfishing" + EnumChatFormatting.AQUA + " - Imports your fishing stats from your latest profile to your fishing tracker using the API.\n"));
+													EnumChatFormatting.GOLD + " /importfishing" + EnumChatFormatting.AQUA + " - Imports your fishing stats from your latest profile to your fishing tracker using the API.\n" +
+													EnumChatFormatting.GOLD + " /sbplayers" + EnumChatFormatting.AQUA + " - Uses API to find how many players are on each Skyblock island.\n" +
+													EnumChatFormatting.GREEN + " Open Maddox Menu" + EnumChatFormatting.AQUA + " - M by default.\n"));
 	}
 
 }
diff --git a/src/main/java/me/Danker/commands/DisplayCommand.java b/src/main/java/me/Danker/commands/DisplayCommand.java
index 916245e..2f7690d 100644
--- a/src/main/java/me/Danker/commands/DisplayCommand.java
+++ b/src/main/java/me/Danker/commands/DisplayCommand.java
@@ -21,7 +21,7 @@ public class DisplayCommand extends CommandBase {
 
 	@Override
 	public String getCommandUsage(ICommandSender arg0) {
-		return getCommandName() + " <zombie/spider/wolf/fishing/off> [winter/session]";
+		return getCommandName() + " <zombie/spider/wolf/fishing/catacombs/off> [winter/session/f(1-4)]";
 	}
 
 	@Override
@@ -32,10 +32,12 @@ public class DisplayCommand extends CommandBase {
 	@Override
 	public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
 		if (args.length == 1) {
-			return getListOfStringsMatchingLastWord(args, "wolf", "spider", "zombie", "fishing", "off");
+			return getListOfStringsMatchingLastWord(args, "wolf", "spider", "zombie", "fishing", "catacombs", "off");
 		} else if (args.length == 2 && args[0].equalsIgnoreCase("fishing")) {
 			return getListOfStringsMatchingLastWord(args, "winter", "session");
-		} else if (args.length == 2 || (args.length == 3 && args[0].equalsIgnoreCase("fishing") && args[1].equalsIgnoreCase("winter"))) { 
+		} else if (args.length == 2 && args[0].equalsIgnoreCase("catacombs")) {
+			return getListOfStringsMatchingLastWord(args, "f1", "floor1", "f2", "floor2", "f3", "floor3", "f4", "floor4");
+		} else if (args.length > 1 || (args.length == 3 && args[0].equalsIgnoreCase("fishing") && args[1].equalsIgnoreCase("winter"))) { 
 			return getListOfStringsMatchingLastWord(args, "session");
 		}
 		return null;
@@ -46,22 +48,14 @@ public class DisplayCommand extends CommandBase {
 		final EntityPlayer player = (EntityPlayer) arg0;
 		
 		if (arg1.length == 0) {
-			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /display <zombie/spider/wolf/fishing/off> [winter/session]"));
+			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: <zombie/spider/wolf/fishing/catacombs/off> [winter/session/f(1-4)]"));
 			return;
 		}
 		
 		final ConfigHandler cf = new ConfigHandler();
 		boolean showSession = false;
 		
-		if (arg1.length > 1) {
-			if (arg1[1].equalsIgnoreCase("session")) {
-				showSession = true;
-			} else if (arg1.length > 2) {
-				if (arg1[2].equalsIgnoreCase("session")) {
-					showSession = true;
-				}
-			}
-		}
+		if (arg1[arg1.length - 1].equalsIgnoreCase("session")) showSession = true;
 		
 		if (arg1[0].equalsIgnoreCase("wolf")) {
 			if (showSession) {
@@ -95,10 +89,43 @@ public class DisplayCommand extends CommandBase {
 					display = "fishing";
 				}
 			} 
+		} else if (arg1[0].equalsIgnoreCase("catacombs")) {
+			if (arg1.length == 1) {
+				player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /display catacombs <f1/f2/f3/f4>"));
+				return;
+			}
+			if (arg1[1].equalsIgnoreCase("f1") || arg1[1].equalsIgnoreCase("floor1")) {
+				if (showSession) {
+					display = "catacombs_floor_one_session";
+				} else {
+					display = "catacombs_floor_one";
+				}
+			} else if (arg1[1].equalsIgnoreCase("f2") || arg1[1].equalsIgnoreCase("floor2")) {
+				if (showSession) {
+					display = "catacombs_floor_two_session";
+				} else {
+					display = "catacombs_floor_two";
+				}
+			} else if (arg1[1].equalsIgnoreCase("f3") || arg1[1].equalsIgnoreCase("floor3")) {
+				if (showSession) {
+					display = "catacombs_floor_three_session";
+				} else {
+					display = "catacombs_floor_three";
+				}
+			} else if (arg1[1].equalsIgnoreCase("f4") || arg1[1].equalsIgnoreCase("floor4")) {
+				if (showSession) {
+					display = "catacombs_floor_four_session";
+				} else {
+					display = "catacombs_floor_four";
+				}
+			} else {
+				player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /display catacombs <f1/f2/f3/f4>"));
+				return;
+			}
 		} else if (arg1[0].equalsIgnoreCase("off")) {
 			display = "off";
 		} else {
-			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /display <zombie/spider/wolf/fishing/off> [winter/session]"));
+			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: <zombie/spider/wolf/fishing/catacombs/off> [winter/session/f(1-4)]"));
 			return;
 		}
 		player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Display set to " + EnumChatFormatting.DARK_GREEN + display + EnumChatFormatting.GREEN + "."));
diff --git a/src/main/java/me/Danker/commands/GetkeyCommand.java b/src/main/java/me/Danker/commands/GetkeyCommand.java
index 80354fe..f06e66f 100644
--- a/src/main/java/me/Danker/commands/GetkeyCommand.java
+++ b/src/main/java/me/Danker/commands/GetkeyCommand.java
@@ -1,5 +1,9 @@
 package me.Danker.commands;
 
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.StringSelection;
+
 import me.Danker.handlers.ConfigHandler;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
@@ -28,14 +32,19 @@ public class GetkeyCommand extends CommandBase implements ICommand {
 
 	@Override
 	public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
-		final EntityPlayer player = (EntityPlayer)arg0;
-		final ConfigHandler cf = new ConfigHandler();
-		
-		if (cf.getString("api", "APIKey").equals("")) {
-			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "API key not set. Set your API key using /setkey."));
-		} else {
-			player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Your set API key is " + EnumChatFormatting.DARK_GREEN + cf.getString("api", "APIKey")));
-		}
+	    EntityPlayer player = (EntityPlayer)arg0;
+	    ConfigHandler cf = new ConfigHandler();
+	    Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
+	    StringSelection stringSelection = new StringSelection(cf.getString("api", "APIKey"));
+	    
+	    if (cf.getString("api", "APIKey").equals("")) {
+	      player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "API key not set. Set your API key using /setkey."));
+	    }
+	    
+	    clipboard.setContents(stringSelection, null);
+		player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Your set API key is " + EnumChatFormatting.DARK_GREEN + cf.getString("api", "APIKey") + "\n" +
+													EnumChatFormatting.GREEN + "Your set API key has been copied to the clipboard."));
+
 	}
 
 }
diff --git a/src/main/java/me/Danker/commands/LootCommand.java b/src/main/java/me/Danker/commands/LootCommand.java
index d64e9d9..a877a8d 100644
--- a/src/main/java/me/Danker/commands/LootCommand.java
+++ b/src/main/java/me/Danker/commands/LootCommand.java
@@ -4,6 +4,7 @@ import java.text.NumberFormat;
 import java.util.List;
 import java.util.Locale;
 
+import me.Danker.utils.Utils;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
@@ -80,6 +81,38 @@ public class LootCommand extends CommandBase {
 	public static int frostyTheSnowmans;
 	public static int grinches;
 	public static int yetis;
+	public static double yetiTime;
+	public static int yetiSCs;
+	
+	// Catacombs Dungeons
+	public static int recombobulators;
+	public static int fumingPotatoBooks;
+	// F1
+	public static int bonzoStaffs;
+	public static double f1CoinsSpent;
+	public static double f1TimeSpent;
+	// F2
+	public static int scarfStudies;
+	public static double f2CoinsSpent;
+	public static double f2TimeSpent;
+	// F3
+	public static int adaptiveHelms;
+	public static int adaptiveChests;
+	public static int adaptiveLegs;
+	public static int adaptiveBoots;
+	public static int adaptiveSwords;
+	public static double f3CoinsSpent;
+	public static double f3TimeSpent;
+	// F4
+	public static int spiritWings;
+	public static int spiritBones;
+	public static int spiritBoots;
+	public static int spiritSwords;
+	public static int spiritBows;
+	public static int epicSpiritPets;
+	public static int legSpiritPets;
+	public static double f4CoinsSpent;
+	public static double f4TimeSpent;
 	
 	// Single sessions (No config saves)
 	// Wolf
@@ -149,35 +182,38 @@ public class LootCommand extends CommandBase {
 	public static int frostyTheSnowmansSession = 0;
 	public static int grinchesSession = 0;
 	public static int yetisSession = 0;
+	public static double yetiTimeSession = 0;
+	public static int yetiSCsSession = 0;
 	
-	public String getTimeBetween(double timeOne, double timeTwo) {
-		double secondsBetween = Math.floor(timeTwo - timeOne);
-		
-		String timeFormatted = "";
-		int days;
-		int hours;
-		int minutes;
-		int seconds;
-		
-		if (secondsBetween > 86400) {
-			// More than 1d, display #d#h
-			days = (int) (secondsBetween / 86400);
-			hours = (int) (secondsBetween % 86400 / 3600);
-			timeFormatted = days + "d" + hours + "h";
-		} else if (secondsBetween > 3600) {
-			// More than 1h, display #h#m
-			hours = (int) (secondsBetween / 3600);
-			minutes = (int) (secondsBetween % 3600 / 60);
-			timeFormatted = hours + "h" + minutes + "m";
-		} else {
-			// Display #m#s
-			minutes = (int) (secondsBetween / 60);
-			seconds = (int) (secondsBetween % 60);
-			timeFormatted = minutes + "m" + seconds + "s";
-		}
-		
-		return timeFormatted;
-	}
+	// Catacombs Dungeons
+	public static int recombobulatorsSession = 0;
+	public static int fumingPotatoBooksSession = 0;
+	// F1
+	public static int bonzoStaffsSession = 0;
+	public static double f1CoinsSpentSession = 0;
+	public static double f1TimeSpentSession = 0;
+	// F2
+	public static int scarfStudiesSession = 0;
+	public static double f2CoinsSpentSession = 0;
+	public static double f2TimeSpentSession = 0;
+	// F3
+	public static int adaptiveHelmsSession = 0;
+	public static int adaptiveChestsSession = 0;
+	public static int adaptiveLegsSession = 0;
+	public static int adaptiveBootsSession = 0;
+	public static int adaptiveSwordsSession = 0;
+	public static double f3CoinsSpentSession = 0;
+	public static double f3TimeSpentSession = 0;
+	// F4
+	public static int spiritWingsSession = 0;
+	public static int spiritBonesSession = 0;
+	public static int spiritBootsSession = 0;
+	public static int spiritSwordsSession = 0;
+	public static int spiritBowsSession = 0;
+	public static int epicSpiritPetsSession = 0;
+	public static int legSpiritPetsSession = 0;
+	public static double f4CoinsSpentSession = 0;
+	public static double f4TimeSpentSession = 0;
 	
 	@Override
 	public String getCommandName() {
@@ -186,7 +222,7 @@ public class LootCommand extends CommandBase {
 
 	@Override
 	public String getCommandUsage(ICommandSender arg0) {
-		return getCommandName() + " <zombie/spider/wolf/fishing> [winter/session]";
+		return getCommandName() + " <zombie/spider/wolf/fishing/catacombs> [winter/f(1-4)/session]";
 	}
 	
 	@Override
@@ -197,10 +233,12 @@ public class LootCommand extends CommandBase {
 	@Override
 	public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
 		if (args.length == 1) {
-			return getListOfStringsMatchingLastWord(args, "wolf", "spider", "zombie", "fishing");
+			return getListOfStringsMatchingLastWord(args, "wolf", "spider", "zombie", "fishing", "catacombs");
 		} else if (args.length == 2 && args[0].equalsIgnoreCase("fishing")) {
 			return getListOfStringsMatchingLastWord(args, "winter", "session");
-		} else if (args.length == 2 || (args.length == 3 && args[0].equalsIgnoreCase("fishing") && args[1].equalsIgnoreCase("winter"))) { 
+		} else if (args.length == 2 && args[0].equalsIgnoreCase("catacombs")) {
+			return getListOfStringsMatchingLastWord(args, "f1", "floor1", "f2", "floor2", "f3", "floor3", "f4", "floor4");
+		} else if (args.length > 1 || (args.length == 3 && args[0].equalsIgnoreCase("fishing") && args[1].equalsIgnoreCase("winter"))) { 
 			return getListOfStringsMatchingLastWord(args, "session");
 		}
 		return null;
@@ -211,7 +249,7 @@ public class LootCommand extends CommandBase {
 		final EntityPlayer player = (EntityPlayer) arg0;
 		
 		if (arg1.length == 0) {
-			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /loot <zombie/spider/wolf/fishing> [winter/session]"));
+			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /loot <zombie/spider/wolf/fishing/catacombs> [winter/f(1-4)/session]"));
 			return;
 		}
 		
@@ -222,22 +260,14 @@ public class LootCommand extends CommandBase {
 		NumberFormat nf = NumberFormat.getIntegerInstance(Locale.US);
 		boolean showSession = false;
 		
-		if (arg1.length > 1) {
-			if (arg1[1].equalsIgnoreCase("session")) {
-				showSession = true;
-			} else if (arg1.length > 2) {
-				if (arg1[2].equalsIgnoreCase("session")) {
-					showSession = true;
-				}
-			}
-		}
-		
+		if (arg1[arg1.length - 1].equalsIgnoreCase("session")) showSession = true;
+
 		if (arg1[0].equalsIgnoreCase("wolf")) {
 			if (showSession) {
 				if (wolfTimeSession == -1) {
 					timeBetween = "Never";
 				} else {
-					timeBetween = getTimeBetween(wolfTimeSession, timeNow);
+					timeBetween = Utils.getTimeBetween(wolfTimeSession, timeNow);
 				}
 				if (wolfBossesSession == -1) {
 					bossesBetween = "Never";
@@ -270,7 +300,7 @@ public class LootCommand extends CommandBase {
 			if (wolfTime == -1) {
 				timeBetween = "Never";
 			} else {
-				timeBetween = getTimeBetween(wolfTime, timeNow);
+				timeBetween = Utils.getTimeBetween(wolfTime, timeNow);
 			}
 			if (wolfBosses == -1) {
 				bossesBetween = "Never";
@@ -302,7 +332,7 @@ public class LootCommand extends CommandBase {
 				if (spiderTimeSession == -1) {
 					timeBetween = "Never";
 				} else {
-					timeBetween = getTimeBetween(spiderTimeSession, timeNow);
+					timeBetween = Utils.getTimeBetween(spiderTimeSession, timeNow);
 				}
 				if (spiderBossesSession == -1) {
 					bossesBetween = "Never";
@@ -335,7 +365,7 @@ public class LootCommand extends CommandBase {
 			if (spiderTime == -1) {
 				timeBetween = "Never";
 			} else {
-				timeBetween = getTimeBetween(spiderTime, timeNow);
+				timeBetween = Utils.getTimeBetween(spiderTime, timeNow);
 			}
 			if (spiderBosses == -1) {
 				bossesBetween = "Never";
@@ -367,7 +397,7 @@ public class LootCommand extends CommandBase {
 				if (zombieTimeSession == -1) {
 					timeBetween = "Never";
 				} else {
-					timeBetween = getTimeBetween(zombieTimeSession, timeNow);
+					timeBetween = Utils.getTimeBetween(zombieTimeSession, timeNow);
 				}
 				if (zombieBossesSession == -1) {
 					bossesBetween = "Never";
@@ -401,7 +431,7 @@ public class LootCommand extends CommandBase {
 			if (zombieTime == -1) {
 				timeBetween = "Never";
 			} else {
-				timeBetween = getTimeBetween(zombieTime, timeNow);
+				timeBetween = Utils.getTimeBetween(zombieTime, timeNow);
 			}
 			if (zombieBosses == -1) {
 				bossesBetween = "Never";
@@ -433,22 +463,48 @@ public class LootCommand extends CommandBase {
 			if (arg1.length > 1) {
 				if (arg1[1].equalsIgnoreCase("winter")) {
 					if (showSession) {
+						if (yetiTimeSession == -1) {
+							timeBetween = "Never";
+						} else {
+							timeBetween = Utils.getTimeBetween(yetiTimeSession, timeNow);
+						}
+						if (yetiSCsSession == -1) {
+							bossesBetween = "Never";
+						} else {
+							bossesBetween = nf.format(yetiSCsSession);
+						}
+						
 						player.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 								EnumChatFormatting.WHITE + EnumChatFormatting.BOLD + "  Winter Fishing Summary (Current Session):\n" +
 								EnumChatFormatting.AQUA + "    Frozen Steves: " + nf.format(frozenStevesSession) + "\n" +
 								EnumChatFormatting.WHITE + "    Snowmans: " + nf.format(frostyTheSnowmansSession) + "\n" +
 								EnumChatFormatting.DARK_GREEN + "    Grinches: " + nf.format(grinchesSession) + "\n" +
 								EnumChatFormatting.GOLD + "    Yetis: " + nf.format(yetisSession) + "\n" +
+								EnumChatFormatting.AQUA + "    Time Since Yeti: " + timeBetween + "\n" +
+								EnumChatFormatting.AQUA + "    Creatures Since Yeti: " + bossesBetween + "\n" +
 								EnumChatFormatting.AQUA + EnumChatFormatting.BOLD + " -------------------"));
 						return;
 					}
 					
+					if (yetiTime == -1) {
+						timeBetween = "Never";
+					} else {
+						timeBetween = Utils.getTimeBetween(yetiTime, timeNow);
+					}
+					if (yetiSCs == -1) {
+						bossesBetween = "Never";
+					} else {
+						bossesBetween = nf.format(yetiSCs);
+					}
+					
 					player.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																EnumChatFormatting.WHITE + EnumChatFormatting.BOLD + "  Winter Fishing Summary:\n" +
 																EnumChatFormatting.AQUA + "    Frozen Steves: " + nf.format(frozenSteves) + "\n" +
 																EnumChatFormatting.WHITE + "    Snowmans: " + nf.format(frostyTheSnowmans) + "\n" +
 																EnumChatFormatting.DARK_GREEN + "    Grinches: " + nf.format(grinches) + "\n" +
 																EnumChatFormatting.GOLD + "    Yetis: " + nf.format(yetis) + "\n" +
+																EnumChatFormatting.AQUA + "    Time Since Yeti: " + timeBetween + "\n" +
+																EnumChatFormatting.AQUA + "    Creatures Since Yeti: " + bossesBetween + "\n" +
 																EnumChatFormatting.AQUA + EnumChatFormatting.BOLD + " -------------------"));
 					return;
 				}
@@ -458,7 +514,7 @@ public class LootCommand extends CommandBase {
 				if (empTimeSession == -1) {
 					timeBetween = "Never";
 				} else {
-					timeBetween = getTimeBetween(empTimeSession, timeNow);
+					timeBetween = Utils.getTimeBetween(empTimeSession, timeNow);
 				}
 				if (empSCsSession == -1) {
 					bossesBetween = "Never";
@@ -494,7 +550,7 @@ public class LootCommand extends CommandBase {
 			if (empTime == -1) {
 				timeBetween = "Never";
 			} else {
-				timeBetween = getTimeBetween(empTime, timeNow);
+				timeBetween = Utils.getTimeBetween(empTime, timeNow);
 			}
 			if (empSCs == -1) {
 				bossesBetween = "Never";
@@ -524,8 +580,116 @@ public class LootCommand extends CommandBase {
 														EnumChatFormatting.AQUA + "    Time Since Sea Emperor: " + timeBetween + "\n" +
 														EnumChatFormatting.AQUA + "    Sea Creatures Since Sea Emperor: " + bossesBetween + "\n" +
 														EnumChatFormatting.DARK_AQUA + EnumChatFormatting.BOLD + " -------------------"));
+		} else if (arg1[0].equalsIgnoreCase("catacombs")) {
+			if (arg1.length == 1) {
+				player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /loot catacombs <f1/f2/f3/f4>"));
+				return;
+			}
+			if (arg1[1].equalsIgnoreCase("f1") || arg1[1].equalsIgnoreCase("floor1")) {
+				if (showSession) {
+					player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
+																EnumChatFormatting.RED + EnumChatFormatting.BOLD + "  Catacombs F1 Summary (Current Session):\n" +
+																EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(recombobulatorsSession) + "\n" +
+																EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(fumingPotatoBooksSession) + "\n" +
+																EnumChatFormatting.BLUE + "    Bonzo's Staffs: " + nf.format(bonzoStaffsSession) + "\n" +
+																EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f1CoinsSpentSession) + "\n" +
+																EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f1TimeSpentSession) + "\n" +
+																EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
+					return;
+				}
+				player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
+															EnumChatFormatting.RED + EnumChatFormatting.BOLD + "  Catacombs F1 Summary:\n" +
+															EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(recombobulators) + "\n" +
+															EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(fumingPotatoBooks) + "\n" +
+															EnumChatFormatting.BLUE + "    Bonzo's Staffs: " + nf.format(bonzoStaffs) + "\n" +
+															EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f1CoinsSpent) + "\n" +
+															EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f1TimeSpent) + "\n" +
+															EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
+			} else if (arg1[1].equalsIgnoreCase("f2") || arg1[1].equalsIgnoreCase("floor2")) {
+				if (showSession) {
+					player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
+																EnumChatFormatting.RED + EnumChatFormatting.BOLD + "  Catacombs F2 Summary (Current Session):\n" +
+																EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(recombobulatorsSession) + "\n" +
+																EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(fumingPotatoBooksSession) + "\n" +
+																EnumChatFormatting.BLUE + "    Scarf's Studies: " + nf.format(scarfStudiesSession) + "\n" +
+																EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f2CoinsSpentSession) + "\n" +
+																EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f2TimeSpentSession) + "\n" +
+																EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
+					return;
+				}
+				player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
+															EnumChatFormatting.RED + EnumChatFormatting.BOLD + "  Catacombs F2 Summary:\n" +
+															EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(recombobulators) + "\n" +
+															EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(fumingPotatoBooks) + "\n" +
+															EnumChatFormatting.BLUE + "    Scarf's Studies: " + nf.format(scarfStudies) + "\n" +
+															EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f2CoinsSpent) + "\n" +
+															EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f2TimeSpent) + "\n" +
+															EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
+			} else if (arg1[1].equalsIgnoreCase("f3") || arg1[1].equalsIgnoreCase("floor3")) {
+				if (showSession) {
+					player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
+																EnumChatFormatting.RED + EnumChatFormatting.BOLD + "  Catacombs F3 Summary (Current Session):\n" +
+																EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(recombobulatorsSession) + "\n" +
+																EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(fumingPotatoBooksSession) + "\n" +
+																EnumChatFormatting.DARK_PURPLE + "    Adaptive Helmets: " + nf.format(adaptiveHelmsSession) + "\n" +
+																EnumChatFormatting.DARK_PURPLE + "    Adaptive Chestplates: " + nf.format(adaptiveChestsSession) + "\n" +
+																EnumChatFormatting.DARK_PURPLE + "    Adaptive Leggings: " + nf.format(adaptiveLegsSession) + "\n" +
+																EnumChatFormatting.DARK_PURPLE + "    Adaptive Boots: " + nf.format(adaptiveBootsSession) + "\n" +
+																EnumChatFormatting.DARK_PURPLE + "    Adaptive Blades: " + nf.format(adaptiveSwordsSession) + "\n" +
+																EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f3CoinsSpentSession) + "\n" +
+																EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f3TimeSpentSession) + "\n" +
+																EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
+					return;
+				}
+				player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
+															EnumChatFormatting.RED + EnumChatFormatting.BOLD + "  Catacombs F3 Summary:\n" +
+															EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(recombobulators) + "\n" +
+															EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(fumingPotatoBooks) + "\n" +
+															EnumChatFormatting.DARK_PURPLE + "    Adaptive Helmets: " + nf.format(adaptiveHelms) + "\n" +
+															EnumChatFormatting.DARK_PURPLE + "    Adaptive Chestplates: " + nf.format(adaptiveChests) + "\n" +
+															EnumChatFormatting.DARK_PURPLE + "    Adaptive Leggings: " + nf.format(adaptiveLegs) + "\n" +
+															EnumChatFormatting.DARK_PURPLE + "    Adaptive Boots: " + nf.format(adaptiveBoots) + "\n" +
+															EnumChatFormatting.DARK_PURPLE + "    Adaptive Blades: " + nf.format(adaptiveSwords) + "\n" +
+															EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f3CoinsSpent) + "\n" +
+															EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f3TimeSpent) + "\n" +
+															EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
+			} else if (arg1[1].equalsIgnoreCase("f4") || arg1[1].equalsIgnoreCase("floor4")) {
+				if (showSession) {
+					player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
+																EnumChatFormatting.RED + EnumChatFormatting.BOLD + "  Catacombs F4 Summary (Current Session):\n" +
+																EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(recombobulatorsSession) + "\n" +
+																EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(fumingPotatoBooksSession) + "\n" +
+																EnumChatFormatting.DARK_PURPLE + "    Spirit Wings: " + nf.format(spiritWingsSession) + "\n" +
+																EnumChatFormatting.DARK_PURPLE + "    Spirit Bones: " + nf.format(spiritBonesSession) + "\n" +
+																EnumChatFormatting.DARK_PURPLE + "    Spirit Boots: " + nf.format(spiritBootsSession) + "\n" +
+																EnumChatFormatting.DARK_PURPLE + "    Spirit Swords: " + nf.format(spiritSwordsSession) + "\n" +
+																EnumChatFormatting.GOLD + "    Spirit Bows: " + nf.format(spiritBowsSession) + "\n" +
+																EnumChatFormatting.DARK_PURPLE + "    Epic Spirit Pets: " + nf.format(epicSpiritPetsSession) + "\n" +
+																EnumChatFormatting.GOLD + "    Leg Spirit Pets: " + nf.format(legSpiritPetsSession) + "\n" +
+																EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f4CoinsSpentSession) + "\n" +
+																EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f4TimeSpentSession) + "\n" +
+																EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
+					return;
+				}
+				player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
+															EnumChatFormatting.RED + EnumChatFormatting.BOLD + "  Catacombs F4 Summary:\n" +
+															EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(recombobulators) + "\n" +
+															EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(fumingPotatoBooks) + "\n" +
+															EnumChatFormatting.DARK_PURPLE + "    Spirit Wings: " + nf.format(spiritWings) + "\n" +
+															EnumChatFormatting.DARK_PURPLE + "    Spirit Bones: " + nf.format(spiritBones) + "\n" +
+															EnumChatFormatting.DARK_PURPLE + "    Spirit Boots: " + nf.format(spiritBoots) + "\n" +
+															EnumChatFormatting.DARK_PURPLE + "    Spirit Swords: " + nf.format(spiritSwords) + "\n" +
+															EnumChatFormatting.GOLD + "    Spirit Bows: " + nf.format(spiritBows) + "\n" +
+															EnumChatFormatting.DARK_PURPLE + "    Epic Spirit Pets: " + nf.format(epicSpiritPets) + "\n" +
+															EnumChatFormatting.GOLD + "    Leg Spirit Pets: " + nf.format(legSpiritPets) + "\n" +
+															EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f4CoinsSpent) + "\n" +
+															EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f4TimeSpent) + "\n" +
+															EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
+			} else {
+				player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /loot catacombs <f1/f2/f3/f4>"));
+			}
 		} else {
-			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /loot <zombie/spider/wolf/fishing> [winter/session]"));
+			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /loot <zombie/spider/wolf/fishing/catacombs> [winter/f(1-4)/session]"));
 		}
 
 	}
diff --git a/src/main/java/me/Danker/commands/MoveCommand.java b/src/main/java/me/Danker/commands/MoveCommand.java
index 1232e18..24396ff 100644
--- a/src/main/java/me/Danker/commands/MoveCommand.java
+++ b/src/main/java/me/Danker/commands/MoveCommand.java
@@ -15,6 +15,7 @@ public class MoveCommand extends CommandBase {
 
 	public static int[] coordsXY = {0, 0};
 	public static int[] displayXY = {0, 0};
+	public static int[] dungeonTimerXY = {0, 0};
 	
 	@Override
 	public String getCommandName() {
@@ -23,7 +24,7 @@ public class MoveCommand extends CommandBase {
 
 	@Override
 	public String getCommandUsage(ICommandSender arg0) {
-		return getCommandName() + " <coords/display> <x> <y>";
+		return getCommandName() + " <coords/display/dungeontimer> <x> <y>";
 	}
 	
 	@Override
@@ -34,7 +35,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");
+			return getListOfStringsMatchingLastWord(args, "coords", "display", "dungeontimer");
 		}
 		return null;
 	}
@@ -45,7 +46,7 @@ public class MoveCommand extends CommandBase {
 		final ConfigHandler cf = new ConfigHandler();
 		
 		if (arg1.length < 2) {
-			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /move <coords/display> <x> <y>"));
+			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /move <coords/display/dungeontimer> <x> <y>"));
 			return;
 		}
 		
@@ -61,8 +62,14 @@ public class MoveCommand extends CommandBase {
 			cf.writeIntConfig("locations", "displayX", displayXY[0]);
 			cf.writeIntConfig("locations", "displayY", displayXY[1]);
 			player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Tracker display has been moved to " + EnumChatFormatting.DARK_GREEN + arg1[1] + ", " + arg1[2]));
+		} else if (arg1[0].equalsIgnoreCase("dungeontimer")) {
+			dungeonTimerXY[0] = Integer.parseInt(arg1[1]);
+			dungeonTimerXY[1] = Integer.parseInt(arg1[2]);
+			cf.writeIntConfig("locations", "dungeonTimerX", dungeonTimerXY[0]);
+			cf.writeIntConfig("locations", "dungeonTimerY", dungeonTimerXY[1]);
+			player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Dungeon timer has been moved to " + EnumChatFormatting.DARK_GREEN + arg1[1] + ", " + arg1[2]));
 		} else {
-			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /move <coords/display> <x> <y>"));
+			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /move <coords/display/dungeontimer> <x> <y>"));
 		}
 	}
 
diff --git a/src/main/java/me/Danker/commands/PetsCommand.java b/src/main/java/me/Danker/commands/PetsCommand.java
index 75367ab..c697689 100644
--- a/src/main/java/me/Danker/commands/PetsCommand.java
+++ b/src/main/java/me/Danker/commands/PetsCommand.java
@@ -23,7 +23,7 @@ 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, 860, 1050, 1150, 1260, 1380, 1510, 1650, 1800, 1960, 2130, 2310, 2500, 2700, 2920, 3160, 3420, 3700,
+							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,
@@ -51,11 +51,6 @@ public class PetsCommand extends CommandBase {
 		return 100;
 	}
 	
-	static String capitalize(String string) {
-		String capitalized = string.substring(0, 1).toUpperCase() + string.substring(1).toLowerCase();
-		return capitalized;
-	}
-	
 	@Override
 	public String getCommandName() {
 		return "petsof";
@@ -169,7 +164,7 @@ public class PetsCommand extends CommandBase {
 			
 			// Loop through pet rarities
 			for (JsonObject legPet : legendaryPets) {
-				String petName = capitalize(legPet.get("type").getAsString());
+				String petName = Utils.capitalizeString(legPet.get("type").getAsString());
 				int level = petXpToLevel(legPet.get("exp").getAsDouble(), "LEGENDARY");
 				
 				String messageToAdd = "";
@@ -183,7 +178,7 @@ public class PetsCommand extends CommandBase {
 			}
 			
 			for (JsonObject epicPet: epicPets) {
-				String petName = capitalize(epicPet.get("type").getAsString());
+				String petName = Utils.capitalizeString(epicPet.get("type").getAsString());
 				int level = petXpToLevel(epicPet.get("exp").getAsDouble(), "EPIC");
 				
 				String messageToAdd = "";
@@ -197,7 +192,7 @@ public class PetsCommand extends CommandBase {
 			}
 			
 			for (JsonObject rarePet: rarePets) {
-				String petName = capitalize(rarePet.get("type").getAsString());
+				String petName = Utils.capitalizeString(rarePet.get("type").getAsString());
 				int level = petXpToLevel(rarePet.get("exp").getAsDouble(), "RARE");
 				
 				String messageToAdd = "";
@@ -211,7 +206,7 @@ public class PetsCommand extends CommandBase {
 			}
 			
 			for (JsonObject uncommonPet: uncommonPets) {
-				String petName = capitalize(uncommonPet.get("type").getAsString());
+				String petName = Utils.capitalizeString(uncommonPet.get("type").getAsString());
 				int level = petXpToLevel(uncommonPet.get("exp").getAsDouble(), "UNCOMMON");
 				
 				String messageToAdd = "";
@@ -225,7 +220,7 @@ public class PetsCommand extends CommandBase {
 			}
 			
 			for (JsonObject commonPet: commonPets) {
-				String petName = capitalize(commonPet.get("type").getAsString());
+				String petName = Utils.capitalizeString(commonPet.get("type").getAsString());
 				int level = petXpToLevel(commonPet.get("exp").getAsDouble(), "COMMON");
 				
 				String messageToAdd = "";
diff --git a/src/main/java/me/Danker/commands/ResetLootCommand.java b/src/main/java/me/Danker/commands/ResetLootCommand.java
index 1afc204..dd540d6 100644
--- a/src/main/java/me/Danker/commands/ResetLootCommand.java
+++ b/src/main/java/me/Danker/commands/ResetLootCommand.java
@@ -23,7 +23,7 @@ public class ResetLootCommand extends CommandBase {
 
 	@Override
 	public String getCommandUsage(ICommandSender arg0) {
-		return getCommandName() + "<zombie/spider/wolf/fishing/confirm/cancel>";
+		return getCommandName() + "<zombie/spider/wolf/fishing/catacombs/confirm/cancel>";
 	}
 
 	@Override
@@ -38,7 +38,7 @@ public class ResetLootCommand extends CommandBase {
 		if (confirmReset) {
 			return getListOfStringsMatchingLastWord(args, "confirm", "cancel");
 		} else {
-			return getListOfStringsMatchingLastWord(args, "zombie", "spider", "wolf", "fishing");
+			return getListOfStringsMatchingLastWord(args, "zombie", "spider", "wolf", "fishing", "catacombs");
 		}
 	}
 	
@@ -47,7 +47,7 @@ public class ResetLootCommand extends CommandBase {
 		final EntityPlayer player = (EntityPlayer) arg0;
 		
 		if (arg1.length == 0) {
-			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /resetloot <zombie/spider/wolf/fishing>"));
+			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /resetloot <zombie/spider/wolf/fishing/catacombs>"));
 			return;
 		}
 		
@@ -63,6 +63,8 @@ public class ResetLootCommand extends CommandBase {
 					resetWolf();
 				} else if (resetOption.equalsIgnoreCase("fishing")) {
 					resetFishing();
+				} else if (resetOption.equalsIgnoreCase("catacombs")) {
+					resetCatacombs();
 				}
 				player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Reset complete."));
 			} else if (arg1[0].equalsIgnoreCase("cancel")) {
@@ -73,7 +75,7 @@ public class ResetLootCommand extends CommandBase {
 															EnumChatFormatting.RED + " Cancel by using /resetloot cancel."));
 			}
 		} else {
-			if (arg1[0].equalsIgnoreCase("zombie") || arg1[0].equalsIgnoreCase("spider") || arg1[0].equalsIgnoreCase("wolf") || arg1[0].equalsIgnoreCase("fishing")) {
+			if (arg1[0].equalsIgnoreCase("zombie") || arg1[0].equalsIgnoreCase("spider") || arg1[0].equalsIgnoreCase("wolf") || arg1[0].equalsIgnoreCase("fishing") || arg1[0].equalsIgnoreCase("catacombs")) {
 				resetOption = arg1[0];
 				player.addChatMessage(new ChatComponentText(EnumChatFormatting.YELLOW + "Are you sure you want to reset the " + resetOption + " tracker?" + 
 															" Confirm with " + EnumChatFormatting.GREEN + "/resetloot confirm" + EnumChatFormatting.YELLOW + "." + 
@@ -82,7 +84,7 @@ public class ResetLootCommand extends CommandBase {
 			} else if (arg1[0].equalsIgnoreCase("confirm") || arg1[0].equalsIgnoreCase("cancel")) {
 				player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Pick something to reset first."));
 			} else {
-				player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /resetloot <zombie/spider/wolf/fishing>"));
+				player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /resetloot <zombie/spider/wolf/fishing/catacombs>"));
 			}
 		}
 	}
@@ -174,8 +176,39 @@ public class ResetLootCommand extends CommandBase {
 		lc.frostyTheSnowmansSession = 0;
 		lc.grinchesSession = 0;
 		lc.yetisSession = 0;
+		lc.yetiTimeSession = -1;
+		lc.yetiSCsSession = -1;
 		cf.deleteCategory("fishing");
 		cf.reloadConfig();
 	}
+	
+	static void resetCatacombs() {
+		LootCommand lc = new LootCommand();
+		ConfigHandler cf = new ConfigHandler();
+		lc.recombobulatorsSession = 0;
+		lc.fumingPotatoBooksSession = 0;
+		lc.bonzoStaffsSession = 0;
+		lc.f1CoinsSpentSession = 0;
+		lc.f1TimeSpentSession = 0;
+		lc.scarfStudiesSession = 0;
+		lc.f2CoinsSpentSession = 0;
+		lc.f2TimeSpentSession = 0;
+		lc.adaptiveHelmsSession = 0;
+		lc.adaptiveChestsSession = 0;
+		lc.adaptiveLegsSession = 0;
+		lc.adaptiveBootsSession = 0;
+		lc.adaptiveSwordsSession = 0;
+		lc.f3CoinsSpentSession = 0;
+		lc.f3TimeSpentSession = 0;
+		lc.spiritWingsSession = 0;
+		lc.spiritBonesSession = 0;
+		lc.spiritBootsSession = 0;
+		lc.spiritSwordsSession = 0;
+		lc.epicSpiritPetsSession = 0;
+		lc.f4CoinsSpentSession = 0;
+		lc.f4TimeSpentSession = 0;
+		cf.deleteCategory("catacombs");
+		cf.reloadConfig();
+	}
 
 }
diff --git a/src/main/java/me/Danker/commands/ScaleCommand.java b/src/main/java/me/Danker/commands/ScaleCommand.java
index f8c73c9..7b56b6d 100644
--- a/src/main/java/me/Danker/commands/ScaleCommand.java
+++ b/src/main/java/me/Danker/commands/ScaleCommand.java
@@ -15,6 +15,7 @@ public class ScaleCommand extends CommandBase {
 
 	public static double coordsScale;
 	public static double displayScale;
+	public static double dungeonTimerScale;
 	
 	@Override
 	public String getCommandName() {
@@ -23,7 +24,7 @@ public class ScaleCommand extends CommandBase {
 
 	@Override
 	public String getCommandUsage(ICommandSender arg0) {
-		return getCommandName() + " <coords/display> <size (0.1 - 10)>";
+		return getCommandName() + " <coords/display/dungeontimer> <size (0.1 - 10)>";
 	}
 	
 	@Override
@@ -34,7 +35,7 @@ public class ScaleCommand extends CommandBase {
 	@Override
 	public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
 		if (args.length == 1) {
-			return getListOfStringsMatchingLastWord(args, "coords", "display");
+			return getListOfStringsMatchingLastWord(args, "coords", "display", "dungeontimer");
 		}
 		return null;
 	}
@@ -44,11 +45,11 @@ public class ScaleCommand extends CommandBase {
 		final EntityPlayer player = (EntityPlayer) arg0;
 		
 		if (arg1.length < 2) {
-			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /scale <coords/display> <size (0.1 - 10)>"));
+			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /scale <coords/display/dungeontimer> <size (0.1 - 10)>"));
 			return;
 		}
 		
-		double scaleAmount = (double) Math.floor(Double.parseDouble(arg1[1]) * 10.0) / 10.0;
+		double scaleAmount = (double) Math.floor(Double.parseDouble(arg1[1]) * 100.0) / 100.0;
 		if (scaleAmount < 0.1 || scaleAmount > 10.0) {
 			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Scale multipler can only be between 0.1x and 10x."));
 			return;
@@ -62,8 +63,12 @@ public class ScaleCommand extends CommandBase {
 			displayScale = scaleAmount;
 			ConfigHandler.writeDoubleConfig("scales", "displayScale", displayScale);
 			player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Display has been scaled to " + EnumChatFormatting.DARK_GREEN + displayScale + "x"));
+		} else if (arg1[0].equalsIgnoreCase("dungeontimer")) {
+			dungeonTimerScale = scaleAmount;
+			ConfigHandler.writeDoubleConfig("scales", "dungeonTimerScale", dungeonTimerScale);
+			player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Dungeon timer has been scaled to " + EnumChatFormatting.DARK_GREEN + dungeonTimerScale + "x"));
 		} else {
-			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /scale <coords/display> <size (0.1 - 10)>"));
+			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /scale <coords/display/dungeontimer> <size (0.1 - 10)>"));
 		}
 	}
 
diff --git a/src/main/java/me/Danker/commands/SkillsCommand.java b/src/main/java/me/Danker/commands/SkillsCommand.java
index 5818772..8128c90 100644
--- a/src/main/java/me/Danker/commands/SkillsCommand.java
+++ b/src/main/java/me/Danker/commands/SkillsCommand.java
@@ -16,168 +16,6 @@ import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.EnumChatFormatting;
 
 public class SkillsCommand extends CommandBase {
-
-	static double xpToLevel(double xp) {
-		int level;
-		double progress;
-		
-		if (xp < 50) {
-			level = 0;
-			progress = xp / 50;
-		} else if (xp < 175) {
-			level = 1;
-			progress = (xp - 50) / 125;
-		} else if (xp < 375) {
-			level = 2;
-			progress = (xp - 175) / 200;
-		} else if (xp < 675) {
-			level = 3;
-			progress = (xp - 375) / 300;
-		} else if (xp < 1175) {
-			level = 4;
-			progress = (xp - 675) / 500;
-		} else if (xp < 1925) {
-			level = 5;
-			progress = (xp - 1175) / 750;
-		} else if (xp < 2925) {
-			level = 6;
-			progress = (xp - 1925) / 1000;
-		} else if (xp < 4425) {
-			level = 7;
-			progress = (xp - 2925) / 1500;
-		} else if (xp < 6425) {
-			level = 8;
-			progress = (xp - 4425) / 2000;
-		} else if (xp < 9925) {
-			level = 9;
-			progress = (xp - 6425) / 3500;
-		} else if (xp < 14925) {
-			level = 10;
-			progress = (xp - 9925) / 5000;
-		} else if (xp < 22425) {
-			level = 11;
-			progress = (xp - 14925) / 7500;
-		} else if (xp < 32425) {
-			level = 12;
-			progress = (xp - 22425) / 10000;
-		} else if (xp < 47425) {
-			level = 13;
-			progress = (xp - 32425) / 15000;
-		} else if (xp < 67425) {
-			level = 14;
-			progress = (xp - 47425) / 20000;
-		} else if (xp < 97425) {
-			level = 15;
-			progress = (xp - 67425) / 30000;
-		} else if (xp < 147425) {
-			level = 16;
-			progress = (xp - 97425) / 50000;
-		} else if (xp < 222425) {
-			level = 17;
-			progress = (xp - 147425) / 75000;
-		} else if (xp < 322425) {
-			level = 18;
-			progress = (xp - 222425) / 100000;
-		} else if (xp < 522425) {
-			level = 19;
-			progress = (xp - 322425) / 200000;
-		} else if (xp < 822425) {
-			level = 20;
-			progress = (xp - 522425) / 300000;
-		} else if (xp < 1222425) {
-			level = 21;
-			progress = (xp - 822425) / 400000;
-		} else if (xp < 1722425) {
-			level = 22;
-			progress = (xp - 1222425) / 500000;
-		} else if (xp < 2322425) {
-			level = 23;
-			progress = (xp - 1722425) / 600000;
-		} else if (xp < 3022425) {
-			level = 24;
-			progress = (xp - 2322425) / 700000;
-		} else if (xp < 3822425) {
-			level = 25;
-			progress = (xp - 3022425) / 800000;
-		} else if (xp < 4722425) {
-			level = 26;
-			progress = (xp - 3822425) / 900000;
-		} else if (xp < 5722425) {
-			level = 27;
-			progress = (xp - 4722425) / 1000000;
-		} else if (xp < 6822425) {
-			level = 28;
-			progress = (xp - 5722425) / 1100000;
-		} else if (xp < 8022425) {
-			level = 29;
-			progress = (xp - 6822425) / 1200000;
-		} else if (xp < 9322425) {
-			level = 30;
-			progress = (xp - 8022425) / 1300000;
-		} else if (xp < 10722425) {
-			level = 31;
-			progress = (xp - 9322425) / 1400000;
-		} else if (xp < 12222425) {
-			level = 32;
-			progress = (xp - 10722425) / 1500000;
-		} else if (xp < 13822425) {
-			level = 33;
-			progress = (xp - 12222425) / 1600000;
-		} else if (xp < 15522425) {
-			level = 34;
-			progress = (xp - 13822425) / 1700000;
-		} else if (xp < 17322425) {
-			level = 35;
-			progress = (xp - 15522425) / 1800000;
-		} else if (xp < 19222425) {
-			level = 36;
-			progress = (xp - 17322425) / 1900000;
-		} else if (xp < 21222425) {
-			level = 37;
-			progress = (xp - 19222425) / 2000000;
-		} else if (xp < 23322425) {
-			level = 38;
-			progress = (xp - 21222425) / 2100000;
-		} else if (xp < 25522425) {
-			level = 39;
-			progress = (xp - 23322425) / 2200000;
-		} else if (xp < 27822425) {
-			level = 40;
-			progress = (xp - 25522425) / 2300000;
-		} else if (xp < 30222425) {
-			level = 41;
-			progress = (xp - 27822425) / 2400000;
-		} else if (xp < 32722425) {
-			level = 42;
-			progress = (xp - 30222425) / 2500000;
-		} else if (xp < 35322425) {
-			level = 43;
-			progress = (xp - 32722425) / 2600000;
-		} else if (xp < 38072425) {
-			level = 44;
-			progress = (xp - 35322425) / 2750000;
-		} else if (xp < 40972425) {
-			level = 45;
-			progress = (xp - 38072425) / 2900000;
-		} else if (xp < 44072425) {
-			level = 46;
-			progress = (xp - 40972425) / 3100000;
-		} else if (xp < 47472425) {
-			level = 47;
-			progress = (xp - 44072425) / 3400000;
-		} else if (xp < 51172425) {
-			level = 48;
-			progress = (xp - 47472425) / 3700000;
-		} else if (xp < 55172425) {
-			level = 49;
-			progress = (xp - 51172425) / 4000000;
-		} else {
-			level = 50;
-			progress = 0;
-		}
-		
-		return level + progress;
-	}
 	
 	@Override
 	public String getCommandName() {
@@ -256,35 +94,35 @@ public class SkillsCommand extends CommandBase {
 			
 			if (userObject.has("experience_skill_farming") || userObject.has("experience_skill_mining") || userObject.has("experience_skill_combat") || userObject.has("experience_skill_foraging") || userObject.has("experience_skill_fishing") || userObject.has("experience_skill_enchanting") || userObject.has("experience_skill_alchemy")) {
 				if (userObject.has("experience_skill_farming")) {
-					farmingLevel = xpToLevel(userObject.get("experience_skill_farming").getAsDouble());
+					farmingLevel = Utils.xpToSkillLevel(userObject.get("experience_skill_farming").getAsDouble());
 					farmingLevel = (double) Math.round(farmingLevel * 100) / 100;
 				}
 				if (userObject.has("experience_skill_mining")) {
-					miningLevel = xpToLevel(userObject.get("experience_skill_mining").getAsDouble());
+					miningLevel = Utils.xpToSkillLevel(userObject.get("experience_skill_mining").getAsDouble());
 					miningLevel = (double) Math.round(miningLevel * 100) / 100;
 				}
 				if (userObject.has("experience_skill_combat")) {
-					combatLevel = xpToLevel(userObject.get("experience_skill_combat").getAsDouble());
+					combatLevel = Utils.xpToSkillLevel(userObject.get("experience_skill_combat").getAsDouble());
 					combatLevel = (double) Math.round(combatLevel * 100) / 100;
 				}
 				if (userObject.has("experience_skill_foraging")) {
-					foragingLevel = xpToLevel(userObject.get("experience_skill_foraging").getAsDouble());
+					foragingLevel = Utils.xpToSkillLevel(userObject.get("experience_skill_foraging").getAsDouble());
 					foragingLevel = (double) Math.round(foragingLevel * 100) / 100;
 				}
 				if (userObject.has("experience_skill_fishing")) {
-					fishingLevel = xpToLevel(userObject.get("experience_skill_fishing").getAsDouble());
+					fishingLevel = Utils.xpToSkillLevel(userObject.get("experience_skill_fishing").getAsDouble());
 					fishingLevel = (double) Math.round(fishingLevel * 100) / 100;
 				}
 				if (userObject.has("experience_skill_enchanting")) {
-					enchantingLevel = xpToLevel(userObject.get("experience_skill_enchanting").getAsDouble());
+					enchantingLevel = Utils.xpToSkillLevel(userObject.get("experience_skill_enchanting").getAsDouble());
 					enchantingLevel = (double) Math.round(enchantingLevel * 100) / 100;
 				}
 				if (userObject.has("experience_skill_alchemy")) {
-					alchemyLevel = xpToLevel(userObject.get("experience_skill_alchemy").getAsDouble());
+					alchemyLevel = Utils.xpToSkillLevel(userObject.get("experience_skill_alchemy").getAsDouble());
 					alchemyLevel = (double) Math.round(alchemyLevel * 100) / 100;
 				}
 				if (userObject.has("experience_skill_taming")) {
-					tamingLevel = xpToLevel(userObject.get("experience_skill_taming").getAsDouble());
+					tamingLevel = Utils.xpToSkillLevel(userObject.get("experience_skill_taming").getAsDouble());
 					tamingLevel = (double) Math.round(tamingLevel * 100) / 100;
 				}
 			} else {
diff --git a/src/main/java/me/Danker/commands/SkyblockPlayersCommand.java b/src/main/java/me/Danker/commands/SkyblockPlayersCommand.java
new file mode 100644
index 0000000..ee3c522
--- /dev/null
+++ b/src/main/java/me/Danker/commands/SkyblockPlayersCommand.java
@@ -0,0 +1,151 @@
+package me.Danker.commands;
+
+import java.text.NumberFormat;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+
+import com.google.gson.JsonObject;
+
+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.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
+
+public class SkyblockPlayersCommand extends CommandBase {
+
+	@Override
+	public String getCommandName() {
+		return "sbplayers";
+	}
+	
+	@Override
+	public List<String> getCommandAliases() {
+        return Collections.singletonList("skyblockplayers");
+    }
+
+	@Override
+	public String getCommandUsage(ICommandSender arg0) {
+		return null;
+	}
+	
+	@Override
+	public int getRequiredPermissionLevel() {
+		return 0;
+	}
+
+	@Override
+	public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
+		// MULTI THREAD DRIFTING
+		new Thread(() -> {
+			APIHandler ah = new APIHandler();
+			ConfigHandler cf = new ConfigHandler();
+			EntityPlayer player = (EntityPlayer) arg0;
+			
+			// Check key
+			String key = cf.getString("api", "APIKey");
+			if (key.equals("")) {
+				player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "API key not set. Use /setkey."));
+			}
+			
+			String playersURL = "https://api.hypixel.net/gameCounts?key=" + key;
+			System.out.println("Fetching player count...");
+			JsonObject playersResponse = ah.getResponse(playersURL);
+			if (!playersResponse.get("success").getAsBoolean()) {
+				String reason = playersResponse.get("cause").getAsString();
+				player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Failed with reason: " + reason));
+				return;
+			}
+			
+			int totalPlayers = playersResponse.get("playerCount").getAsInt();
+			// Skyblock players, comments show JSON key
+			int skyblockTotalPlayers = 0; // players
+			int privateIsland = 0; // dynamic
+			int hub = 0; // hub
+			int barn = 0; // farming_1
+			int mushroomDesert = 0; // farming_2
+			int park = 0; // foraging_1
+			int goldMine = 0; // mining_1
+			int deepCaverns = 0; // mining_2
+			int spidersDen = 0; // combat_1
+			int blazingFortress = 0; // combat_2
+			int end = 0; // combat_3
+			int dungeonsHub = 0; // dungeon_hub
+			int dungeons = 0; // dungeon
+			int darkAuction = 0; // dark_auction
+			int jerry = 0; // winter
+			if (playersResponse.get("games").getAsJsonObject().get("SKYBLOCK").getAsJsonObject().has("modes")) {
+				JsonObject skyblockPlayers = playersResponse.get("games").getAsJsonObject().get("SKYBLOCK").getAsJsonObject().get("modes").getAsJsonObject();
+				skyblockTotalPlayers = playersResponse.get("games").getAsJsonObject().get("SKYBLOCK").getAsJsonObject().get("players").getAsInt();
+				if (skyblockPlayers.has("dynamic")) {
+					privateIsland = skyblockPlayers.get("dynamic").getAsInt();
+				}
+				if (skyblockPlayers.has("hub")) {
+					hub = skyblockPlayers.get("hub").getAsInt();
+				}
+				if (skyblockPlayers.has("farming_1")) {
+					barn = skyblockPlayers.get("farming_1").getAsInt();
+				}
+				if (skyblockPlayers.has("farming_2")) {
+					mushroomDesert = skyblockPlayers.get("farming_2").getAsInt();
+				}
+				if (skyblockPlayers.has("foraging_1")) {
+					park = skyblockPlayers.get("foraging_1").getAsInt();
+				}
+				if (skyblockPlayers.has("mining_1")) {
+					goldMine = skyblockPlayers.get("mining_1").getAsInt();
+				}
+				if (skyblockPlayers.has("mining_2")) {
+					deepCaverns = skyblockPlayers.get("mining_2").getAsInt();
+				}
+				if (skyblockPlayers.has("combat_1")) {
+					spidersDen = skyblockPlayers.get("combat_1").getAsInt();
+				}
+				if (skyblockPlayers.has("combat_2")) {
+					blazingFortress = skyblockPlayers.get("combat_2").getAsInt();
+				}
+				if (skyblockPlayers.has("combat_3")) {
+					end = skyblockPlayers.get("combat_3").getAsInt();
+				}
+				if (skyblockPlayers.has("dungeon_hub")) {
+					dungeonsHub = skyblockPlayers.get("dungeon_hub").getAsInt();
+				}
+				if (skyblockPlayers.has("dungeon")) {
+					dungeons = skyblockPlayers.get("dungeon").getAsInt();
+				}
+				if (skyblockPlayers.has("dark_auction")) {
+					darkAuction = skyblockPlayers.get("dark_auction").getAsInt();
+				}
+				if (skyblockPlayers.has("winter")) {
+					jerry = skyblockPlayers.get("winter").getAsInt();
+				}
+			}
+			
+			NumberFormat nf = NumberFormat.getIntegerInstance(Locale.US);
+			player.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------\n" +
+														EnumChatFormatting.GREEN + " Hypixel: " + EnumChatFormatting.DARK_GREEN + nf.format(totalPlayers) + "\n" +
+														EnumChatFormatting.GREEN + " Skyblock: " + EnumChatFormatting.DARK_GREEN + nf.format(skyblockTotalPlayers) + " / " + Utils.getPercentage(skyblockTotalPlayers, totalPlayers) + "%\n" +
+														EnumChatFormatting.GREEN + " Private Island: " + EnumChatFormatting.DARK_GREEN + nf.format(privateIsland) + " / " + Utils.getPercentage(privateIsland, skyblockTotalPlayers) + "%\n" +
+														EnumChatFormatting.GREEN + " Hub: " + EnumChatFormatting.DARK_GREEN + nf.format(hub) + " / " + Utils.getPercentage(hub, skyblockTotalPlayers) + "%\n" +
+														EnumChatFormatting.GREEN + " Barn: " + EnumChatFormatting.DARK_GREEN + nf.format(barn) + " / " + Utils.getPercentage(barn, skyblockTotalPlayers) + "%\n" +
+														EnumChatFormatting.GREEN + " Mushroom Desert: " + EnumChatFormatting.DARK_GREEN + nf.format(mushroomDesert) + " / " + Utils.getPercentage(mushroomDesert, skyblockTotalPlayers) + "%\n" +
+														EnumChatFormatting.GREEN + " Park: " + EnumChatFormatting.DARK_GREEN + nf.format(park) + " / " + Utils.getPercentage(park, skyblockTotalPlayers) + "%\n" +
+														EnumChatFormatting.GREEN + " Gold Mine: " + EnumChatFormatting.DARK_GREEN + nf.format(goldMine) + " / " + Utils.getPercentage(goldMine, skyblockTotalPlayers) + "%\n" +
+														EnumChatFormatting.GREEN + " Deep Caverns: " + EnumChatFormatting.DARK_GREEN + nf.format(deepCaverns) + " / " + Utils.getPercentage(deepCaverns, skyblockTotalPlayers) + "%\n" +
+														EnumChatFormatting.GREEN + " Spider's Den: " + EnumChatFormatting.DARK_GREEN + nf.format(spidersDen) + " / " + Utils.getPercentage(spidersDen, skyblockTotalPlayers) + "%\n" +
+														EnumChatFormatting.GREEN + " Blazing Fortress: " + EnumChatFormatting.DARK_GREEN + nf.format(blazingFortress) + " / " + Utils.getPercentage(blazingFortress, skyblockTotalPlayers) + "%\n" +
+														EnumChatFormatting.GREEN + " The End: " + EnumChatFormatting.DARK_GREEN + nf.format(end) + " / " + Utils.getPercentage(end, skyblockTotalPlayers) + "%\n" +
+														EnumChatFormatting.GREEN + " Dungeons Hub: " + EnumChatFormatting.DARK_GREEN + nf.format(dungeonsHub) + " / " + Utils.getPercentage(dungeonsHub, skyblockTotalPlayers) + "%\n" +
+														EnumChatFormatting.GREEN + " Dungeons: " + EnumChatFormatting.DARK_GREEN + nf.format(dungeons) + " / " + Utils.getPercentage(dungeons, skyblockTotalPlayers) + "%\n" +
+														EnumChatFormatting.GREEN + " Dark Auction: " + EnumChatFormatting.DARK_GREEN + nf.format(darkAuction) + " / " + Utils.getPercentage(darkAuction, skyblockTotalPlayers) + "%\n" +
+														EnumChatFormatting.GREEN + " Jerry's Workshop: " + EnumChatFormatting.DARK_GREEN + nf.format(jerry) + " / " + Utils.getPercentage(jerry, skyblockTotalPlayers) + "%\n" +
+														EnumChatFormatting.AQUA + EnumChatFormatting.BOLD + " -------------------"));
+		}).start();
+	}
+
+}
diff --git a/src/main/java/me/Danker/commands/SlayerCommand.java b/src/main/java/me/Danker/commands/SlayerCommand.java
index f8100b4..0aba569 100644
--- a/src/main/java/me/Danker/commands/SlayerCommand.java
+++ b/src/main/java/me/Danker/commands/SlayerCommand.java
@@ -2,6 +2,7 @@ package me.Danker.commands;
 
 import java.text.NumberFormat;
 import java.util.List;
+import java.util.Locale;
 
 import com.google.gson.JsonObject;
 
@@ -99,11 +100,12 @@ public class SlayerCommand extends CommandBase {
 				wolfXP = slayersObject.get("wolf").getAsJsonObject().get("xp").getAsInt();
 			}
 			
+			NumberFormat nf = NumberFormat.getIntegerInstance(Locale.US);
 			player.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------\n" +
-														EnumChatFormatting.AQUA + " " + username + "'s Total XP: " + EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + NumberFormat.getIntegerInstance().format(zombieXP + spiderXP + wolfXP) + "\n" +
-														EnumChatFormatting.AQUA + " Zombie XP: " + EnumChatFormatting.BLUE + EnumChatFormatting.BOLD + NumberFormat.getIntegerInstance().format(zombieXP) + "\n" +
-														EnumChatFormatting.AQUA + " Spider XP: " + EnumChatFormatting.BLUE + EnumChatFormatting.BOLD + NumberFormat.getIntegerInstance().format(spiderXP) + "\n" +
-														EnumChatFormatting.AQUA + " Wolf XP: " + EnumChatFormatting.BLUE + EnumChatFormatting.BOLD + NumberFormat.getIntegerInstance().format(wolfXP) + "\n" +
+														EnumChatFormatting.AQUA + " " + username + "'s Total XP: " + EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + nf.format(zombieXP + spiderXP + wolfXP) + "\n" +
+														EnumChatFormatting.AQUA + " Zombie XP: " + EnumChatFormatting.BLUE + EnumChatFormatting.BOLD + nf.format(zombieXP) + "\n" +
+														EnumChatFormatting.AQUA + " Spider XP: " + EnumChatFormatting.BLUE + EnumChatFormatting.BOLD + nf.format(spiderXP) + "\n" +
+														EnumChatFormatting.AQUA + " Wolf XP: " + EnumChatFormatting.BLUE + EnumChatFormatting.BOLD + nf.format(wolfXP) + "\n" +
 														EnumChatFormatting.AQUA + " " + EnumChatFormatting.BOLD + "-------------------"));
 			
 		}).start();
diff --git a/src/main/java/me/Danker/commands/ToggleCommand.java b/src/main/java/me/Danker/commands/ToggleCommand.java
index decf99a..b1e5270 100644
--- a/src/main/java/me/Danker/commands/ToggleCommand.java
+++ b/src/main/java/me/Danker/commands/ToggleCommand.java
@@ -18,6 +18,13 @@ public class ToggleCommand extends CommandBase implements ICommand {
 	public static boolean goldenToggled;
 	public static boolean slayerCountTotal;
 	public static boolean rngesusAlerts;
+	public static boolean splitFishing;
+	public static boolean chatMaddoxToggled;
+	public static boolean spiritBearAlerts;
+	public static boolean aotdToggled;
+	public static boolean sceptreMessages;
+	public static boolean petColoursToggled;
+	public static boolean dungeonTimerToggled;
 	
 	@Override
 	public String getCommandName() {
@@ -26,7 +33,7 @@ public class ToggleCommand extends CommandBase implements ICommand {
 
 	@Override
 	public String getCommandUsage(ICommandSender arg0) {
-		return getCommandName() + " <gparty/coords/golden/slayercount/rngesusalerts/list>";
+		return getCommandName() + " <gparty/coords/golden/slayercount/rngesusalerts/splitfishing/chatmaddox/spiritbearalert/aotd/sceptremessages/petcolors/dungeontimer/list>";
 	}
 
 	@Override
@@ -37,7 +44,7 @@ public class ToggleCommand extends CommandBase implements ICommand {
 	@Override
 	public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
 		if (args.length == 1) {
-			return getListOfStringsMatchingLastWord(args, "gparty", "coords", "golden", "slayercount", "rngesusalerts", "list");
+			return getListOfStringsMatchingLastWord(args, "gparty", "coords", "golden", "slayercount", "rngesusalerts", "splitfishing", "chatmaddox", "spiritbearalerts", "aotd", "sceptremessages", "petcolors", "dungeontimer", "list");
 		}
 		return null;
 	}
@@ -48,7 +55,7 @@ public class ToggleCommand extends CommandBase implements ICommand {
 		final ConfigHandler cf = new ConfigHandler();
 		
 		if (arg1.length == 0) {
-			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /toggle <gparty/coords/golden/slayercount/rngesusalerts/list>"));
+			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /toggle <gparty/coords/golden/slayercount/rngesusalerts/splitfishing/chatmaddox/spiritbearalerts/aotd/sceptremessages/petcolors/dungeontimer/list>"));
 			return;
 		}
 		
@@ -66,18 +73,55 @@ public class ToggleCommand extends CommandBase implements ICommand {
 			player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Golden T6 enchants has been set to " + EnumChatFormatting.DARK_GREEN + goldenToggled + EnumChatFormatting.GREEN + "."));
 		} else if (arg1[0].equalsIgnoreCase("slayercount")) {
 			slayerCountTotal = !slayerCountTotal;
+			cf.writeBooleanConfig("toggles", "SlayerCount", slayerCountTotal);
 			player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Counting total 20% slayer drops has been set to " + EnumChatFormatting.DARK_GREEN + slayerCountTotal + EnumChatFormatting.GREEN + "."));
 		} else if (arg1[0].equalsIgnoreCase("rngesusalerts")) {
 			rngesusAlerts = !rngesusAlerts;
+			cf.writeBooleanConfig("toggles", "RNGesusAlerts", rngesusAlerts);
 			player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Slayer RNGesus alerts has been set to " + EnumChatFormatting.DARK_GREEN + rngesusAlerts + EnumChatFormatting.GREEN + "."));
+		} else if (arg1[0].equalsIgnoreCase("splitfishing")) {
+			splitFishing = !splitFishing;
+			cf.writeBooleanConfig("toggles", "SplitFishing", splitFishing);
+			player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Split fishing display has been set to " + EnumChatFormatting.DARK_GREEN + splitFishing + EnumChatFormatting.GREEN + "."));
+		} else if (arg1[0].equalsIgnoreCase("chatmaddox")) {
+			chatMaddoxToggled = !chatMaddoxToggled;
+			cf.writeBooleanConfig("toggles", "ChatMaddox", chatMaddoxToggled);
+			player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Chat Maddox menu has been set to " + EnumChatFormatting.DARK_GREEN + chatMaddoxToggled + EnumChatFormatting.GREEN + "."));
+		} else if (arg1[0].equalsIgnoreCase("spiritbearalerts")) { 
+			spiritBearAlerts = !spiritBearAlerts;
+			cf.writeBooleanConfig("toggles", "SpiritBearAlerts", spiritBearAlerts);
+			player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Spirit Bear alerts have been set to " + EnumChatFormatting.DARK_GREEN + spiritBearAlerts + EnumChatFormatting.GREEN + "."));
+		} else if (arg1[0].equalsIgnoreCase("aotd")) {
+			aotdToggled = !aotdToggled;
+			cf.writeBooleanConfig("toggles", "AOTD", aotdToggled);
+			player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Block AOTD ability been set to " + EnumChatFormatting.DARK_GREEN + aotdToggled + EnumChatFormatting.GREEN + "."));
+		} else if (arg1[0].equalsIgnoreCase("sceptremessages")) {
+			sceptreMessages = !sceptreMessages;
+			cf.writeBooleanConfig("toggles", "SceptreMessages", sceptreMessages);
+			player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Spirit Sceptre messages have been set to " + EnumChatFormatting.DARK_GREEN + sceptreMessages + EnumChatFormatting.GREEN + "."));
+		} else if (arg1[0].equalsIgnoreCase("petcolors") || arg1[0].equalsIgnoreCase("petcolours")) {
+			petColoursToggled = !petColoursToggled;
+			cf.writeBooleanConfig("toggles", "PetColors", petColoursToggled);
+			player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Pet colours have been set to " + EnumChatFormatting.DARK_GREEN + petColoursToggled + EnumChatFormatting.GREEN + "."));
+		} else if (arg1[0].equalsIgnoreCase("dungeontimer")) {
+			dungeonTimerToggled = !dungeonTimerToggled;
+			cf.writeBooleanConfig("toggles", "DungeonTimer", dungeonTimerToggled);
+			player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Dungeon timer has been set to " + EnumChatFormatting.DARK_GREEN + dungeonTimerToggled + EnumChatFormatting.GREEN + "."));
 		} else if (arg1[0].equalsIgnoreCase("list")) {
 			player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Guild party notifications: " + EnumChatFormatting.DARK_GREEN + gpartyToggled + "\n" +
 														EnumChatFormatting.GREEN + " Coord/Angle display: " + EnumChatFormatting.DARK_GREEN + coordsToggled + "\n" +
 														EnumChatFormatting.GREEN + " Golden T6 enchants: " + EnumChatFormatting.DARK_GREEN + goldenToggled + "\n" +
 														EnumChatFormatting.GREEN + " Counting total 20% slayer drops: " + EnumChatFormatting.DARK_GREEN + slayerCountTotal + "\n" +
-														EnumChatFormatting.GREEN + " Slayer RNGesus alerts: " + EnumChatFormatting.DARK_GREEN + rngesusAlerts));
+														EnumChatFormatting.GREEN + " Slayer RNGesus alerts: " + EnumChatFormatting.DARK_GREEN + rngesusAlerts + "\n" +
+														EnumChatFormatting.GREEN + " Split fishing display: " + EnumChatFormatting.DARK_GREEN + splitFishing + "\n" +
+														EnumChatFormatting.GREEN + " Chat Maddox menu: " + EnumChatFormatting.DARK_GREEN + chatMaddoxToggled + "\n" +
+														EnumChatFormatting.GREEN + " Spirit Bear alerts: " + EnumChatFormatting.DARK_GREEN + spiritBearAlerts + "\n" +
+														EnumChatFormatting.GREEN + " Block AOTD ability: " + EnumChatFormatting.DARK_GREEN + aotdToggled + "\n" +
+														EnumChatFormatting.GREEN + " Spirit Sceptre messages: " + EnumChatFormatting.DARK_GREEN + sceptreMessages + "\n" +
+														EnumChatFormatting.GREEN + " Pet colours: " + EnumChatFormatting.DARK_GREEN + petColoursToggled + "\n" +
+														EnumChatFormatting.GREEN + " Dungeon timer: " + EnumChatFormatting.DARK_GREEN + dungeonTimerToggled));
 		} else {
-			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /toggle <gparty/coords/golden/slayercount/rngesusalerts/list>"));
+			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /toggle <gparty/coords/golden/slayercount/rngesusalerts/splitfishing/chatmaddox/spiritbearalerts/aotd/sceptremessages/petcolors/dungeontimer/list>"));
 		}
 	}
 }