Add mythological event tracker that *might* work, bug fixes and changes

Fix Wither Cloak triggering creeper solver
Update README with more better information
Replace most else ifs with switch statements
Add Necron's Handle to /resetloot catacombs
Update trivia answers

8 files changed, 1032 insertions, 828 deletions

diff --git a/src/main/java/me/Danker/commands/BlockSlayerCommand.java b/src/main/java/me/Danker/commands/BlockSlayerCommand.java
index 96ea530..d2144f6 100644
--- a/src/main/java/me/Danker/commands/BlockSlayerCommand.java
+++ b/src/main/java/me/Danker/commands/BlockSlayerCommand.java
@@ -50,21 +50,25 @@ public class BlockSlayerCommand extends CommandBase {
 			return;
 		}
 		
-		if (arg1[0].equalsIgnoreCase("zombie")) {
-			onlySlayerName = "Revenant Horror";
-		} else if (arg1[0].equalsIgnoreCase("spider")) {
-			onlySlayerName = "Tarantula Broodfather";
-		} else if (arg1[0].equalsIgnoreCase("wolf")) {
-			onlySlayerName = "Sven Packmaster";
-		} else if (arg1[0].equalsIgnoreCase("off")) {
-			onlySlayerName = "";
-			onlySlayerNumber = "";
-			ConfigHandler.writeStringConfig("toggles", "BlockSlayer", "");
-			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Slayer blocking turned off."));
-			return;
-		} else {
-			player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "Usage: " + getCommandUsage(arg0)));
-			return;
+		switch (arg1[0].toLowerCase()) {
+			case "zombie":
+				onlySlayerName = "Revenant Horror";
+				break;
+			case "spider":
+				onlySlayerName = "Tarantula Broodfather";
+				break;
+			case "wolf":
+				onlySlayerName = "Sven Packmaster";
+				break;
+			case "off":
+				onlySlayerName = "";
+				onlySlayerNumber = "";
+				ConfigHandler.writeStringConfig("toggles", "BlockSlayer", "");
+				player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Slayer blocking turned off."));
+				return;
+			default:
+				player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "Usage: " + getCommandUsage(arg0)));
+				return;
 		}
 		
 		int slayerNumber = Integer.parseInt(arg1[1]);
diff --git a/src/main/java/me/Danker/commands/DHelpCommand.java b/src/main/java/me/Danker/commands/DHelpCommand.java
index d514fbd..e900c57 100644
--- a/src/main/java/me/Danker/commands/DHelpCommand.java
+++ b/src/main/java/me/Danker/commands/DHelpCommand.java
@@ -37,9 +37,9 @@ public class DHelpCommand extends CommandBase {
 													EnumChatFormatting.GOLD + " /toggle <gparty/coords/golden/slayercount/rngesusalerts/splitfishing/chatmaddox/spiritbearalerts/aotd/lividdagger/sceptremessages/petcolors/dungeontimer/golemalerts/expertiselore/skill50display/outlinetext/threemanpuzzle/midasstaffmessages/healmessages/caketimer/lividsolver/oruopuzzle/blazepuzzle/creeperpuzzle/waterpuzzle/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> [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/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/confirm/cancel>" + EnumChatFormatting.AQUA + " - Resets loot for trackers. /resetloot confirm confirms the reset.\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> <x> <y>" + EnumChatFormatting.AQUA + " - Moves text display to specified X and Y coordinates.\n" +
 													EnumChatFormatting.GOLD + " /scale <coords/display/dungeontimer/skill50/lividhp/caketimer/skilltracker> <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" +
diff --git a/src/main/java/me/Danker/commands/DisplayCommand.java b/src/main/java/me/Danker/commands/DisplayCommand.java
index 8ee18ec..1cd8c80 100644
--- a/src/main/java/me/Danker/commands/DisplayCommand.java
+++ b/src/main/java/me/Danker/commands/DisplayCommand.java
@@ -22,7 +22,7 @@ public class DisplayCommand extends CommandBase {
 
 	@Override
 	public String getCommandUsage(ICommandSender arg0) {
-		return "/" + getCommandName() + " <zombie/spider/wolf/fishing/catacombs/auto/off> [winter/festival/spooky/session/f(1-7)]";
+		return "/" + getCommandName() + " <zombie/spider/wolf/fishing/catacombs/mythological/auto/off> [winter/festival/spooky/session/f(1-7)]";
 	}
 
 	@Override
@@ -33,7 +33,7 @@ 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", "catacombs", "auto", "off");
+			return getListOfStringsMatchingLastWord(args, "wolf", "spider", "zombie", "fishing", "catacombs", "mythological", "auto", "off");
 		} else if (args.length == 2 && args[0].equalsIgnoreCase("fishing")) {
 			return getListOfStringsMatchingLastWord(args, "winter", "festival", "spooky", "session");
 		} else if (args.length == 2 && args[0].equalsIgnoreCase("catacombs")) {
@@ -57,42 +57,57 @@ public class DisplayCommand extends CommandBase {
 		
 		if (arg1[arg1.length - 1].equalsIgnoreCase("session")) showSession = true;
 		
-		if (arg1[0].equalsIgnoreCase("wolf")) {
+		switch (arg1[0].toLowerCase()) {
+		case "wolf":
 			if (showSession) {
 				display = "wolf_session";
 			} else {
 				display = "wolf";
 			}
-		} else if (arg1[0].equalsIgnoreCase("spider")) {
+			break;
+		case "spider":
 			if (showSession) {
 				display = "spider_session";
 			} else {
 				display = "spider";
 			}
-		} else if (arg1[0].equalsIgnoreCase("zombie")) {
+		case "zombie":
 			if (showSession) {
 				display = "zombie_session";
 			} else {
 				display = "zombie";
 			}
-		} else if (arg1[0].equalsIgnoreCase("fishing")) {
-			if (arg1.length > 1 && arg1[1].equalsIgnoreCase("winter")) {
-				if (showSession) {
-					display = "fishing_winter_session";
-				} else {
-					display = "fishing_winter";
-				}
-			} else if (arg1.length > 1 && arg1[1].equalsIgnoreCase("festival")) {
-				if (showSession) {
-					display = "fishing_festival_session";
-				} else {
-					display = "fishing_festival";
-				}
-			} else if (arg1.length > 1 && arg1[1].equalsIgnoreCase("spooky")) { 
-				if (showSession) {
-					display = "fishing_spooky_session";
-				} else {
-					display = "fishing_spooky";
+			break;
+		case "fishing":
+			if (arg1.length > 1) {
+				switch (arg1[1].toLowerCase()) {
+					case "winter":
+						if (showSession) {
+							display = "fishing_winter_session";
+						} else {
+							display = "fishing_winter";
+						}
+						break;
+					case "festival":
+						if (showSession) {
+							display = "fishing_festival_session";
+						} else {
+							display = "fishing_festival";
+						}
+						break;
+					case "spooky":
+						if (showSession) {
+							display = "fishing_spooky_session";
+						} else {
+							display = "fishing_spooky";
+						}
+						break;
+					default:
+						if (showSession) {
+							display = "fishing_session";
+						} else {
+							display = "fishing";
+						}
 				}
 			} else {
 				if (showSession) {
@@ -100,69 +115,96 @@ public class DisplayCommand extends CommandBase {
 				} else {
 					display = "fishing";
 				}
-			} 
-		} else if (arg1[0].equalsIgnoreCase("catacombs")) {
-			if (arg1.length == 1) {
-				player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "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 if (arg1[1].equalsIgnoreCase("f5") || arg1[1].equalsIgnoreCase("floor5")) {
-				if (showSession) {
-					display = "catacombs_floor_five_session";
-				} else {
-					display = "catacombs_floor_five";
-				}
-			} else if (arg1[1].equalsIgnoreCase("f6") || arg1[1].equalsIgnoreCase("floor6")) {
-				if (showSession) {
-					display = "catacombs_floor_six_session";
-				} else {
-					display = "catacombs_floor_six";
-				}
-			} else if (arg1[1].equalsIgnoreCase("f7") || arg1[1].equalsIgnoreCase("floor7")) {
-				if (showSession) {
-					display = "catacombs_floor_seven_session";
-				} else {
-					display = "catacombs_floor_seven";
-				}
+			break;
+		case "mythological":
+			if (showSession) {
+				display = "mythological_session";
 			} else {
-				player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "Usage: /display catacombs <f1/f2/f3/f4/f5/f6>"));
+				display = "mythological";
+			}
+			break;
+		case "catacombs":
+			if (arg1.length == 1) {
+				player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "Usage: /display catacombs <f1/f2/f3/f4f5/f6/f7>"));
 				return;
 			}
-		} else if (arg1[0].equalsIgnoreCase("auto")) {
+			
+			switch (arg1[1].toLowerCase()) {
+				case "f1":
+				case "floor1":
+					if (showSession) {
+						display = "catacombs_floor_one_session";
+					} else {
+						display = "catacombs_floor_one";
+					}
+					break;
+				case "f2":
+				case "floor2":
+					if (showSession) {
+						display = "catacombs_floor_two_session";
+					} else {
+						display = "catacombs_floor_two";
+					}
+					break;
+				case "f3":
+				case "floor3":
+					if (showSession) {
+						display = "catacombs_floor_three_session";
+					} else {
+						display = "catacombs_floor_three";
+					}
+					break;
+				case "f4":
+				case "floor4":
+					if (showSession) {
+						display = "catacombs_floor_four_session";
+					} else {
+						display = "catacombs_floor_four";
+					}
+					break;
+				case "f5":
+				case "floor5":
+					if (showSession) {
+						display = "catacombs_floor_five_session";
+					} else {
+						display = "catacombs_floor_five";
+					}
+					break;
+				case "f6":
+				case "floor6":
+					if (showSession) {
+						display = "catacombs_floor_six_session";
+					} else {
+						display = "catacombs_floor_six";
+					}
+					break;
+				case "f7":
+				case "floor7":
+					if (showSession) {
+						display = "catacombs_floor_seven_session";
+					} else {
+						display = "catacombs_floor_seven";
+					}
+					break;
+				default:
+					player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "Usage: /display catacombs <f1/f2/f3/f4/f5/f6/f7>"));
+					return;
+			}
+			break;
+		case "auto":
 			auto = true;
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Display set to " + TheMod.SECONDARY_COLOUR + "auto" + TheMod.MAIN_COLOUR + "."));
 			ConfigHandler.writeBooleanConfig("misc", "autoDisplay", true);
 			return;
-		} else if (arg1[0].equalsIgnoreCase("off")) {
+		case "off":
 			display = "off";
-		} else {
+			break;
+		default:
 			player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "Usage: " + getCommandUsage(arg0)));
 			return;
 		}
+		
 		auto = false;
 		player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Display set to " + TheMod.SECONDARY_COLOUR + display + TheMod.MAIN_COLOUR + "."));
 		ConfigHandler.writeBooleanConfig("misc", "autoDisplay", false);
diff --git a/src/main/java/me/Danker/commands/LootCommand.java b/src/main/java/me/Danker/commands/LootCommand.java
index f66d0c4..ffe5e49 100644
--- a/src/main/java/me/Danker/commands/LootCommand.java
+++ b/src/main/java/me/Danker/commands/LootCommand.java
@@ -96,6 +96,18 @@ public class LootCommand extends CommandBase {
 	public static int phantomFishers;
 	public static int grimReapers;
 	
+	// Mythological
+	public static double mythCoins;
+	public static int griffinFeathers;
+	public static int crownOfGreeds;
+	public static int washedUpSouvenirs;
+	public static int minosHunters;
+	public static int siameseLynxes;
+	public static int minotaurs;
+	public static int gaiaConstructs;
+	public static int minosChampions;
+	public static int minosInquisitors;
+	
 	// Catacombs Dungeons
 	public static int recombobulators;
 	public static int fumingPotatoBooks;
@@ -244,6 +256,18 @@ public class LootCommand extends CommandBase {
 	public static int phantomFishersSession = 0;
 	public static int grimReapersSession = 0;
 	
+	// Mythological
+	public static double mythCoinsSession = 0;
+	public static int griffinFeathersSession = 0;
+	public static int crownOfGreedsSession = 0;
+	public static int washedUpSouvenirsSession = 0;
+	public static int minosHuntersSession = 0;
+	public static int siameseLynxesSession = 0;
+	public static int minotaursSession = 0;
+	public static int gaiaConstructsSession = 0;
+	public static int minosChampionsSession = 0;
+	public static int minosInquisitorsSession = 0;
+	
 	// Catacombs Dungeons
 	public static int recombobulatorsSession = 0;
 	public static int fumingPotatoBooksSession = 0;
@@ -317,7 +341,7 @@ public class LootCommand extends CommandBase {
 
 	@Override
 	public String getCommandUsage(ICommandSender arg0) {
-		return "/" + getCommandName() + " <zombie/spider/wolf/fishing/catacombs> [winter/festival/spooky/f(1-7)/session]";
+		return "/" + getCommandName() + " <zombie/spider/wolf/fishing/catacombs/mythological> [winter/festival/spooky/f(1-7)/session]";
 	}
 	
 	@Override
@@ -328,7 +352,7 @@ 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", "catacombs");
+			return getListOfStringsMatchingLastWord(args, "wolf", "spider", "zombie", "fishing", "catacombs", "mythological");
 		} else if (args.length == 2 && args[0].equalsIgnoreCase("fishing")) {
 			return getListOfStringsMatchingLastWord(args, "winter", "festival", "spooky", "session");
 		} else if (args.length == 2 && args[0].equalsIgnoreCase("catacombs")) {
@@ -357,584 +381,636 @@ public class LootCommand extends CommandBase {
 		
 		if (arg1[arg1.length - 1].equalsIgnoreCase("session")) showSession = true;
 
-		if (arg1[0].equalsIgnoreCase("wolf")) {
-			if (showSession) {
-				if (wolfTimeSession == -1) {
+		switch (arg1[0].toLowerCase()) {
+			case "wolf":
+				if (showSession) {
+					if (wolfTimeSession == -1) {
+						timeBetween = "Never";
+					} else {
+						timeBetween = Utils.getTimeBetween(wolfTimeSession, timeNow);
+					}
+					if (wolfBossesSession == -1) {
+						bossesBetween = "Never";
+					} else {
+						bossesBetween = nf.format(wolfBossesSession);
+					}
+					if (ToggleCommand.slayerCountTotal) {
+						drop20 = nf.format(wolfWheelsSession);
+					} else {
+						drop20 = nf.format(wolfWheelsDropsSession) + " times";
+					}
+					
+					player.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------\n" +
+																EnumChatFormatting.DARK_AQUA + EnumChatFormatting.BOLD + "  Sven Loot Summary (Current Session):\n" +
+																EnumChatFormatting.GOLD + "    Svens Killed: " + nf.format(wolfSvensSession) + "\n" +
+																EnumChatFormatting.GREEN + "    Wolf Teeth: " + nf.format(wolfTeethSession) + "\n" +
+																EnumChatFormatting.BLUE + "    Hamster Wheels: " + drop20 + "\n" +
+																EnumChatFormatting.AQUA + "    Spirit Runes: " + wolfSpiritsSession + "\n" + 
+																EnumChatFormatting.WHITE + "    Critical VI Books: " + wolfBooksSession + "\n" +
+																EnumChatFormatting.DARK_RED + "    Red Claw Eggs: " + wolfEggsSession + "\n" +
+																EnumChatFormatting.GOLD + "    Couture Runes: " + wolfCouturesSession + "\n" +
+																EnumChatFormatting.AQUA + "    Grizzly Baits: " + wolfBaitsSession + "\n" +
+																EnumChatFormatting.DARK_PURPLE + "    Overfluxes: " + wolfFluxesSession + "\n" +
+																EnumChatFormatting.AQUA + "    Time Since RNG: " + timeBetween + "\n" +
+																EnumChatFormatting.AQUA + "    Bosses Since RNG: " + bossesBetween + "\n" +
+																EnumChatFormatting.AQUA + EnumChatFormatting.BOLD + " -------------------"));
+					return;
+				}
+				
+				if (wolfTime == -1) {
 					timeBetween = "Never";
 				} else {
-					timeBetween = Utils.getTimeBetween(wolfTimeSession, timeNow);
+					timeBetween = Utils.getTimeBetween(wolfTime, timeNow);
 				}
-				if (wolfBossesSession == -1) {
+				if (wolfBosses == -1) {
 					bossesBetween = "Never";
 				} else {
-					bossesBetween = nf.format(wolfBossesSession);
+					bossesBetween = nf.format(wolfBosses);
 				}
 				if (ToggleCommand.slayerCountTotal) {
-					drop20 = nf.format(wolfWheelsSession);
+					drop20 = nf.format(wolfWheels);
 				} else {
-					drop20 = nf.format(wolfWheelsDropsSession) + " times";
+					drop20 = nf.format(wolfWheelsDrops) + " times";
 				}
 				
 				player.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------\n" +
-															EnumChatFormatting.DARK_AQUA + EnumChatFormatting.BOLD + "  Sven Loot Summary (Current Session):\n" +
-															EnumChatFormatting.GOLD + "    Svens Killed: " + nf.format(wolfSvensSession) + "\n" +
-															EnumChatFormatting.GREEN + "    Wolf Teeth: " + nf.format(wolfTeethSession) + "\n" +
+															EnumChatFormatting.DARK_AQUA + EnumChatFormatting.BOLD + "  Sven Loot Summary:\n" +
+															EnumChatFormatting.GOLD + "    Svens Killed: " + nf.format(wolfSvens) + "\n" +
+															EnumChatFormatting.GREEN + "    Wolf Teeth: " + nf.format(wolfTeeth) + "\n" +
 															EnumChatFormatting.BLUE + "    Hamster Wheels: " + drop20 + "\n" +
-															EnumChatFormatting.AQUA + "    Spirit Runes: " + wolfSpiritsSession + "\n" + 
-															EnumChatFormatting.WHITE + "    Critical VI Books: " + wolfBooksSession + "\n" +
-															EnumChatFormatting.DARK_RED + "    Red Claw Eggs: " + wolfEggsSession + "\n" +
-															EnumChatFormatting.GOLD + "    Couture Runes: " + wolfCouturesSession + "\n" +
-															EnumChatFormatting.AQUA + "    Grizzly Baits: " + wolfBaitsSession + "\n" +
-															EnumChatFormatting.DARK_PURPLE + "    Overfluxes: " + wolfFluxesSession + "\n" +
+															EnumChatFormatting.AQUA + "    Spirit Runes: " + wolfSpirits + "\n" + 
+															EnumChatFormatting.WHITE + "    Critical VI Books: " + wolfBooks + "\n" +
+															EnumChatFormatting.DARK_RED + "    Red Claw Eggs: " + wolfEggs + "\n" +
+															EnumChatFormatting.GOLD + "    Couture Runes: " + wolfCoutures + "\n" +
+															EnumChatFormatting.AQUA + "    Grizzly Baits: " + wolfBaits + "\n" +
+															EnumChatFormatting.DARK_PURPLE + "    Overfluxes: " + wolfFluxes + "\n" +
 															EnumChatFormatting.AQUA + "    Time Since RNG: " + timeBetween + "\n" +
 															EnumChatFormatting.AQUA + "    Bosses Since RNG: " + bossesBetween + "\n" +
 															EnumChatFormatting.AQUA + EnumChatFormatting.BOLD + " -------------------"));
-				return;
-			}
-			
-			if (wolfTime == -1) {
-				timeBetween = "Never";
-			} else {
-				timeBetween = Utils.getTimeBetween(wolfTime, timeNow);
-			}
-			if (wolfBosses == -1) {
-				bossesBetween = "Never";
-			} else {
-				bossesBetween = nf.format(wolfBosses);
-			}
-			if (ToggleCommand.slayerCountTotal) {
-				drop20 = nf.format(wolfWheels);
-			} else {
-				drop20 = nf.format(wolfWheelsDrops) + " times";
-			}
-			
-			player.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------\n" +
-														EnumChatFormatting.DARK_AQUA + EnumChatFormatting.BOLD + "  Sven Loot Summary:\n" +
-														EnumChatFormatting.GOLD + "    Svens Killed: " + nf.format(wolfSvens) + "\n" +
-														EnumChatFormatting.GREEN + "    Wolf Teeth: " + nf.format(wolfTeeth) + "\n" +
-														EnumChatFormatting.BLUE + "    Hamster Wheels: " + drop20 + "\n" +
-														EnumChatFormatting.AQUA + "    Spirit Runes: " + wolfSpirits + "\n" + 
-														EnumChatFormatting.WHITE + "    Critical VI Books: " + wolfBooks + "\n" +
-														EnumChatFormatting.DARK_RED + "    Red Claw Eggs: " + wolfEggs + "\n" +
-														EnumChatFormatting.GOLD + "    Couture Runes: " + wolfCoutures + "\n" +
-														EnumChatFormatting.AQUA + "    Grizzly Baits: " + wolfBaits + "\n" +
-														EnumChatFormatting.DARK_PURPLE + "    Overfluxes: " + wolfFluxes + "\n" +
-														EnumChatFormatting.AQUA + "    Time Since RNG: " + timeBetween + "\n" +
-														EnumChatFormatting.AQUA + "    Bosses Since RNG: " + bossesBetween + "\n" +
-														EnumChatFormatting.AQUA + EnumChatFormatting.BOLD + " -------------------"));
-		} else if (arg1[0].equalsIgnoreCase("spider")) {
-			if (showSession) {
-				if (spiderTimeSession == -1) {
+				break;
+			case "spider":
+				if (showSession) {
+					if (spiderTimeSession == -1) {
+						timeBetween = "Never";
+					} else {
+						timeBetween = Utils.getTimeBetween(spiderTimeSession, timeNow);
+					}
+					if (spiderBossesSession == -1) {
+						bossesBetween = "Never";
+					} else {
+						bossesBetween = nf.format(spiderBossesSession);
+					}
+					if (ToggleCommand.slayerCountTotal) {
+						drop20 = nf.format(spiderTAPSession);
+					} else {
+						drop20 = nf.format(spiderTAPDropsSession) + " times";
+					}
+					
+					player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
+																EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + "  Spider Loot Summary (Current Session):\n" +
+																EnumChatFormatting.GOLD + "    Tarantulas Killed: " + nf.format(spiderTarantulasSession) + "\n" +
+																EnumChatFormatting.GREEN + "    Tarantula Webs: " + nf.format(spiderWebsSession) + "\n" +
+																EnumChatFormatting.DARK_GREEN + "    Arrow Poison: " + drop20 + "\n" +
+																EnumChatFormatting.DARK_GRAY + "    Bite Runes: " + spiderBitesSession + "\n" + 
+																EnumChatFormatting.WHITE + "    Bane VI Books: " + spiderBooksSession + "\n" +
+																EnumChatFormatting.AQUA + "    Spider Catalysts: " + spiderCatalystsSession + "\n" +
+																EnumChatFormatting.DARK_PURPLE + "    Tarantula Talismans: " + spiderTalismansSession + "\n" +
+																EnumChatFormatting.LIGHT_PURPLE + "    Fly Swatters: " + spiderSwattersSession + "\n" +
+																EnumChatFormatting.GOLD + "    Digested Mosquitos: " + spiderMosquitosSession + "\n" +
+																EnumChatFormatting.AQUA + "    Time Since RNG: " + timeBetween + "\n" +
+																EnumChatFormatting.AQUA + "    Bosses Since RNG: " + bossesBetween + "\n" +
+																EnumChatFormatting.RED + EnumChatFormatting.BOLD + " -------------------"));
+					return;
+				}
+				
+				if (spiderTime == -1) {
 					timeBetween = "Never";
 				} else {
-					timeBetween = Utils.getTimeBetween(spiderTimeSession, timeNow);
+					timeBetween = Utils.getTimeBetween(spiderTime, timeNow);
 				}
-				if (spiderBossesSession == -1) {
+				if (spiderBosses == -1) {
 					bossesBetween = "Never";
 				} else {
-					bossesBetween = nf.format(spiderBossesSession);
+					bossesBetween = nf.format(spiderBosses);
 				}
 				if (ToggleCommand.slayerCountTotal) {
-					drop20 = nf.format(spiderTAPSession);
+					drop20 = nf.format(spiderTAP);
 				} else {
-					drop20 = nf.format(spiderTAPDropsSession) + " times";
+					drop20 = nf.format(spiderTAPDrops) + " times";
 				}
 				
 				player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
-															EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + "  Spider Loot Summary (Current Session):\n" +
-															EnumChatFormatting.GOLD + "    Tarantulas Killed: " + nf.format(spiderTarantulasSession) + "\n" +
-															EnumChatFormatting.GREEN + "    Tarantula Webs: " + nf.format(spiderWebsSession) + "\n" +
+															EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + "  Spider Loot Summary:\n" +
+															EnumChatFormatting.GOLD + "    Tarantulas Killed: " + nf.format(spiderTarantulas) + "\n" +
+															EnumChatFormatting.GREEN + "    Tarantula Webs: " + nf.format(spiderWebs) + "\n" +
 															EnumChatFormatting.DARK_GREEN + "    Arrow Poison: " + drop20 + "\n" +
-															EnumChatFormatting.DARK_GRAY + "    Bite Runes: " + spiderBitesSession + "\n" + 
-															EnumChatFormatting.WHITE + "    Bane VI Books: " + spiderBooksSession + "\n" +
-															EnumChatFormatting.AQUA + "    Spider Catalysts: " + spiderCatalystsSession + "\n" +
-															EnumChatFormatting.DARK_PURPLE + "    Tarantula Talismans: " + spiderTalismansSession + "\n" +
-															EnumChatFormatting.LIGHT_PURPLE + "    Fly Swatters: " + spiderSwattersSession + "\n" +
-															EnumChatFormatting.GOLD + "    Digested Mosquitos: " + spiderMosquitosSession + "\n" +
+															EnumChatFormatting.DARK_GRAY + "    Bite Runes: " + spiderBites + "\n" + 
+															EnumChatFormatting.WHITE + "    Bane VI Books: " + spiderBooks + "\n" +
+															EnumChatFormatting.AQUA + "    Spider Catalysts: " + spiderCatalysts + "\n" +
+															EnumChatFormatting.DARK_PURPLE + "    Tarantula Talismans: " + spiderTalismans + "\n" +
+															EnumChatFormatting.LIGHT_PURPLE + "    Fly Swatters: " + spiderSwatters + "\n" +
+															EnumChatFormatting.GOLD + "    Digested Mosquitos: " + spiderMosquitos + "\n" +
 															EnumChatFormatting.AQUA + "    Time Since RNG: " + timeBetween + "\n" +
 															EnumChatFormatting.AQUA + "    Bosses Since RNG: " + bossesBetween + "\n" +
 															EnumChatFormatting.RED + EnumChatFormatting.BOLD + " -------------------"));
-				return;
-			}
-			
-			if (spiderTime == -1) {
-				timeBetween = "Never";
-			} else {
-				timeBetween = Utils.getTimeBetween(spiderTime, timeNow);
-			}
-			if (spiderBosses == -1) {
-				bossesBetween = "Never";
-			} else {
-				bossesBetween = nf.format(spiderBosses);
-			}
-			if (ToggleCommand.slayerCountTotal) {
-				drop20 = nf.format(spiderTAP);
-			} else {
-				drop20 = nf.format(spiderTAPDrops) + " times";
-			}
-			
-			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
-														EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + "  Spider Loot Summary:\n" +
-														EnumChatFormatting.GOLD + "    Tarantulas Killed: " + nf.format(spiderTarantulas) + "\n" +
-														EnumChatFormatting.GREEN + "    Tarantula Webs: " + nf.format(spiderWebs) + "\n" +
-														EnumChatFormatting.DARK_GREEN + "    Arrow Poison: " + drop20 + "\n" +
-														EnumChatFormatting.DARK_GRAY + "    Bite Runes: " + spiderBites + "\n" + 
-														EnumChatFormatting.WHITE + "    Bane VI Books: " + spiderBooks + "\n" +
-														EnumChatFormatting.AQUA + "    Spider Catalysts: " + spiderCatalysts + "\n" +
-														EnumChatFormatting.DARK_PURPLE + "    Tarantula Talismans: " + spiderTalismans + "\n" +
-														EnumChatFormatting.LIGHT_PURPLE + "    Fly Swatters: " + spiderSwatters + "\n" +
-														EnumChatFormatting.GOLD + "    Digested Mosquitos: " + spiderMosquitos + "\n" +
-														EnumChatFormatting.AQUA + "    Time Since RNG: " + timeBetween + "\n" +
-														EnumChatFormatting.AQUA + "    Bosses Since RNG: " + bossesBetween + "\n" +
-														EnumChatFormatting.RED + EnumChatFormatting.BOLD + " -------------------"));
-		} else if (arg1[0].equalsIgnoreCase("zombie")) {
-			if (showSession) {
-				if (zombieTimeSession == -1) {
+				break;
+			case "zombie":
+				if (showSession) {
+					if (zombieTimeSession == -1) {
+						timeBetween = "Never";
+					} else {
+						timeBetween = Utils.getTimeBetween(zombieTimeSession, timeNow);
+					}
+					if (zombieBossesSession == -1) {
+						bossesBetween = "Never";
+					} else {
+						bossesBetween = nf.format(zombieBossesSession);
+					}
+					if (ToggleCommand.slayerCountTotal) {
+						drop20 = nf.format(zombieFoulFleshSession);
+					} else {
+						drop20 = nf.format(zombieFoulFleshDropsSession) + " times";
+					}
+					
+					player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "" + EnumChatFormatting.BOLD + "-------------------\n" +
+																EnumChatFormatting.DARK_GREEN + EnumChatFormatting.BOLD + "  Zombie Loot Summary (Current Session):\n" +
+																EnumChatFormatting.GOLD + "    Revs Killed: " + nf.format(zombieRevsSession) + "\n" +
+																EnumChatFormatting.GREEN + "    Revenant Flesh: " + nf.format(zombieRevFleshSession) + "\n" +
+																EnumChatFormatting.BLUE + "    Foul Flesh: " + drop20 + "\n" +
+																EnumChatFormatting.DARK_GREEN + "    Pestilence Runes: " + zombiePestilencesSession + "\n" + 
+																EnumChatFormatting.WHITE + "    Smite VI Books: " + zombieBooksSession + "\n" +
+																EnumChatFormatting.AQUA + "    Undead Catalysts: " + zombieUndeadCatasSession + "\n" +
+																EnumChatFormatting.DARK_PURPLE + "    Beheaded Horrors: " + zombieBeheadedsSession + "\n" +
+																EnumChatFormatting.RED + "    Revenant Catalysts: " + zombieRevCatasSession + "\n" +
+																EnumChatFormatting.DARK_GREEN + "    Snake Runes: " + zombieSnakesSession + "\n" +
+																EnumChatFormatting.GOLD + "    Scythe Blades: " + zombieScythesSession + "\n" +
+																EnumChatFormatting.AQUA + "    Time Since RNG: " + timeBetween + "\n" +
+																EnumChatFormatting.AQUA + "    Bosses Since RNG: " + bossesBetween + "\n" +
+																EnumChatFormatting.GREEN + EnumChatFormatting.BOLD + " -------------------"));
+					return;
+				}
+				
+				if (zombieTime == -1) {
 					timeBetween = "Never";
 				} else {
-					timeBetween = Utils.getTimeBetween(zombieTimeSession, timeNow);
+					timeBetween = Utils.getTimeBetween(zombieTime, timeNow);
 				}
-				if (zombieBossesSession == -1) {
+				if (zombieBosses == -1) {
 					bossesBetween = "Never";
 				} else {
-					bossesBetween = nf.format(zombieBossesSession);
+					bossesBetween = nf.format(zombieBosses);
 				}
 				if (ToggleCommand.slayerCountTotal) {
-					drop20 = nf.format(zombieFoulFleshSession);
+					drop20 = nf.format(zombieFoulFlesh);
 				} else {
-					drop20 = nf.format(zombieFoulFleshDropsSession) + " times";
+					drop20 = nf.format(zombieFoulFleshDrops) + " times";
 				}
 				
 				player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "" + EnumChatFormatting.BOLD + "-------------------\n" +
-															EnumChatFormatting.DARK_GREEN + EnumChatFormatting.BOLD + "  Zombie Loot Summary (Current Session):\n" +
-															EnumChatFormatting.GOLD + "    Revs Killed: " + nf.format(zombieRevsSession) + "\n" +
-															EnumChatFormatting.GREEN + "    Revenant Flesh: " + nf.format(zombieRevFleshSession) + "\n" +
+															EnumChatFormatting.DARK_GREEN + EnumChatFormatting.BOLD + "  Zombie Loot Summary:\n" +
+															EnumChatFormatting.GOLD + "    Revs Killed: " + nf.format(zombieRevs) + "\n" +
+															EnumChatFormatting.GREEN + "    Revenant Flesh: " + nf.format(zombieRevFlesh) + "\n" +
 															EnumChatFormatting.BLUE + "    Foul Flesh: " + drop20 + "\n" +
-															EnumChatFormatting.DARK_GREEN + "    Pestilence Runes: " + zombiePestilencesSession + "\n" + 
-															EnumChatFormatting.WHITE + "    Smite VI Books: " + zombieBooksSession + "\n" +
-															EnumChatFormatting.AQUA + "    Undead Catalysts: " + zombieUndeadCatasSession + "\n" +
-															EnumChatFormatting.DARK_PURPLE + "    Beheaded Horrors: " + zombieBeheadedsSession + "\n" +
-															EnumChatFormatting.RED + "    Revenant Catalysts: " + zombieRevCatasSession + "\n" +
-															EnumChatFormatting.DARK_GREEN + "    Snake Runes: " + zombieSnakesSession + "\n" +
-															EnumChatFormatting.GOLD + "    Scythe Blades: " + zombieScythesSession + "\n" +
+															EnumChatFormatting.DARK_GREEN + "    Pestilence Runes: " + zombiePestilences + "\n" + 
+															EnumChatFormatting.WHITE + "    Smite VI Books: " + zombieBooks + "\n" +
+															EnumChatFormatting.AQUA + "    Undead Catalysts: " + zombieUndeadCatas + "\n" +
+															EnumChatFormatting.DARK_PURPLE + "    Beheaded Horrors: " + zombieBeheadeds + "\n" +
+															EnumChatFormatting.RED + "    Revenant Catalysts: " + zombieRevCatas + "\n" +
+															EnumChatFormatting.DARK_GREEN + "    Snake Runes: " + zombieSnakes + "\n" +
+															EnumChatFormatting.GOLD + "    Scythe Blades: " + zombieScythes + "\n" +
 															EnumChatFormatting.AQUA + "    Time Since RNG: " + timeBetween + "\n" +
 															EnumChatFormatting.AQUA + "    Bosses Since RNG: " + bossesBetween + "\n" +
 															EnumChatFormatting.GREEN + EnumChatFormatting.BOLD + " -------------------"));
-				return;
-			}
-			
-			if (zombieTime == -1) {
-				timeBetween = "Never";
-			} else {
-				timeBetween = Utils.getTimeBetween(zombieTime, timeNow);
-			}
-			if (zombieBosses == -1) {
-				bossesBetween = "Never";
-			} else {
-				bossesBetween = nf.format(zombieBosses);
-			}
-			if (ToggleCommand.slayerCountTotal) {
-				drop20 = nf.format(zombieFoulFlesh);
-			} else {
-				drop20 = nf.format(zombieFoulFleshDrops) + " times";
-			}
-			
-			player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "" + EnumChatFormatting.BOLD + "-------------------\n" +
-														EnumChatFormatting.DARK_GREEN + EnumChatFormatting.BOLD + "  Zombie Loot Summary:\n" +
-														EnumChatFormatting.GOLD + "    Revs Killed: " + nf.format(zombieRevs) + "\n" +
-														EnumChatFormatting.GREEN + "    Revenant Flesh: " + nf.format(zombieRevFlesh) + "\n" +
-														EnumChatFormatting.BLUE + "    Foul Flesh: " + drop20 + "\n" +
-														EnumChatFormatting.DARK_GREEN + "    Pestilence Runes: " + zombiePestilences + "\n" + 
-														EnumChatFormatting.WHITE + "    Smite VI Books: " + zombieBooks + "\n" +
-														EnumChatFormatting.AQUA + "    Undead Catalysts: " + zombieUndeadCatas + "\n" +
-														EnumChatFormatting.DARK_PURPLE + "    Beheaded Horrors: " + zombieBeheadeds + "\n" +
-