Add chat maddox menu and dungeons tracker

Don't have strings for Spirit Bone, Spirit Boots or Spirit Pet. Hoping that Spirit Pet tracking works.

10 files changed, 540 insertions, 47 deletions

diff --git a/README.md b/README.md
index 2240195..ce76f57 100644
--- a/README.md
+++ b/README.md
@@ -9,19 +9,20 @@ Discord Server: https://discord.gg/QsEkNQS
 - Golden T10/T6/T4 enchant display (toggleable)
 - Slayer item tracker (with graphic display) (scalable)
 - Fishing tracker (with graphic display) (scalable)
+- Dungeons tracker (with graphic display) (scalable)
 - API commands
 - Update checker
 
 ## Commands
 - /dhelp - Returns this message in-game.
-- /toggle <gparty/coords/golden/slayercount/rngesusalerts/splitfishing/list> - Toggles features. /toggle list returns values of every toggle.
+- /toggle <gparty/coords/golden/slayercount/rngesusalerts/splitfishing/chatmaddox/list> - Toggles features. /toggle list returns values of every toggle.
 - /setkey <key> - Sets API key.
 - /getkey - Returns key set with /setkey.
-- /loot <zombie/spider/wolf/fishing> [winter/session] - Returns loot received from slayer quests or fishing stats. /loot fishing winter returns winter sea creatures instead.
-- /display <zombie/spider/wolf/fishing/off> [winter/session] - Text display for trackers. /display fishing winter displays winter sea creatures instead.
+- /loot <zombie/spider/wolf/fishing/catacombs> [winter/f(1-4)/session] - Returns loot received from slayer quests or fishing stats. /loot fishing winter returns winter sea creatures instead.
+- /display <zombie/spider/wolf/fishing/catacombs> [winter/f(1-4)/session] - Text display for trackers. /display fishing winter displays winter sea creatures instead.
 - /move <coords/display> <x> <y> - Moves text display to specified X and Y coordinates.
 - /scale <coords/display> <scale (0.1 - 10)> - Scales text display to a specified multipler between 0.1x and 10x.
-- /resetloot <zombie/spider/wolf/fishing/confirm/cancel> -  - Resets loot for trackers. /resetloot confirm confirms the reset.
+- /resetloot <zombie/spider/wolf/fishing/catacombs/confirm/cancel> -  - Resets loot for trackers. /resetloot confirm confirms the reset.
 - /slayer [player] - Uses API to get slayer xp of a person. If no name is provided, it checks yours.
 - /skills [player] - Uses API to get skill levels of a person. If no name is provided, it checks yours.
 - /guildof [player] - Uses API to get guild name and guild master of a person. If no name is provided, it checks yours.
diff --git a/src/main/java/me/Danker/TheMod.java b/src/main/java/me/Danker/TheMod.java
index bdc19d3..ca8eaae 100644
--- a/src/main/java/me/Danker/TheMod.java
+++ b/src/main/java/me/Danker/TheMod.java
@@ -15,6 +15,7 @@ import com.google.gson.JsonObject;
 
 import me.Danker.commands.ArmourCommand;
 import me.Danker.commands.BankCommand;
+import me.Danker.commands.ChatMaddoxCommand;
 import me.Danker.commands.DHelpCommand;
 import me.Danker.commands.DisplayCommand;
 import me.Danker.commands.GetkeyCommand;
@@ -36,11 +37,13 @@ import me.Danker.handlers.ScoreboardHandler;
 import me.Danker.handlers.TextRenderer;
 import me.Danker.utils.Utils;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.event.ClickEvent;
 import net.minecraft.event.ClickEvent.Action;
 import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
 import net.minecraftforge.client.ClientCommandHandler;
 import net.minecraftforge.client.event.ClientChatReceivedEvent;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
@@ -72,6 +75,8 @@ public class TheMod
     public static int titleTimer = -1;
     public static boolean showTitle = false;
     public static String titleText = "";
+    static int tickAmount = 1;
+    public static String lastMaddoxCommand = "/cb placeholdervalue";
     
     @EventHandler
     public void init(FMLInitializationEvent event)
@@ -135,6 +140,7 @@ public class TheMod
     	ClientCommandHandler.instance.registerCommand(new ImportFishingCommand());
     	ClientCommandHandler.instance.registerCommand(new ResetLootCommand());
     	ClientCommandHandler.instance.registerCommand(new ScaleCommand());
+    	ClientCommandHandler.instance.registerCommand(new ChatMaddoxCommand());
     }
     
     // Update checker
@@ -178,6 +184,19 @@ public class TheMod
     	final ToggleCommand tc = new ToggleCommand();
     	String message = event.message.getUnformattedText();
     	
+    	if (event.type == 2) return;
+    	if (!Utils.inSkyblock) return;
+    	
+    	// Replace chat messages with Maddox command
+        List<IChatComponent> chatSiblings = event.message.getSiblings();
+        for (IChatComponent sibling : chatSiblings) {
+        	if (sibling.getChatStyle().getChatClickEvent() == null) {
+        		sibling.setChatStyle(sibling.getChatStyle().setChatClickEvent(new ClickEvent(Action.RUN_COMMAND, "/dmodopenmaddoxmenu")));
+        	}
+        }
+    	
+    	System.out.println(event.message);
+    	
     	if (message.contains(":")) return;
     	
 		if (tc.gpartyToggled) {
@@ -197,7 +216,7 @@ public class TheMod
 				}
 			}
 		}
-
+		
 		final LootCommand lc = new LootCommand();
 		final ConfigHandler cf = new ConfigHandler();
 		boolean wolfRNG = false;
@@ -635,6 +654,100 @@ public class TheMod
 			cf.writeIntConfig("fishing", "seaCreature", lc.seaCreatures);
 			cf.writeIntConfig("fishing", "milestone", lc.fishingMilestone);
 		}
+		
+		// Catacombs Dungeons
+		if (message.contains("    RARE REWARD! Recombobulator 3000")) {
+			lc.recombobulators++;
+			lc.recombobulatorsSession++;
+			cf.writeIntConfig("catacombs", "recombobulator", lc.recombobulators);
+		}
+		if (message.contains("    RARE REWARD! FUMING POTATO BOOK PLACEHOLDER")) {
+			
+		}
+		// F1
+		if (message.contains("    RARE REWARD! Bonzo's Staff")) {
+			lc.bonzoStaffs++;
+			lc.bonzoStaffsSession++;
+			cf.writeIntConfig("catacombs", "bonzoStaff", lc.bonzoStaffs);
+		}
+		// F2
+		if (message.contains("    RARE REWARD! Scarf's Studies")) {
+			lc.scarfStudies++;
+			lc.scarfStudiesSession++;
+			cf.writeIntConfig("catacombs", "scarfStudies", lc.scarfStudies);
+		}
+		// F3
+		if (message.contains("    RARE REWARD! Adaptive Helmet")) {
+			lc.adaptiveHelms++;
+			lc.adaptiveHelmsSession++;
+			cf.writeIntConfig("catacombs", "adaptiveHelm", lc.adaptiveHelms);
+		}
+		if (message.contains("    RARE REWARD! Adaptive Chestplate")) {
+			lc.adaptiveChests++;
+			lc.adaptiveChestsSession++;
+			cf.writeIntConfig("catacombs", "adaptiveChest", lc.adaptiveChests);
+		}
+		if (message.contains("    RARE REWARD! Adaptive Leggings")) {
+			lc.adaptiveLegs++;
+			lc.adaptiveLegsSession++;
+			cf.writeIntConfig("catacombs", "adaptiveLegging", lc.adaptiveLegs);
+		}
+		if (message.contains("    RARE REWARD! Adaptive Boots")) {
+			lc.adaptiveBoots++;
+			lc.adaptiveBootsSession++;
+			cf.writeIntConfig("catacombs", "adaptiveBoot", lc.adaptiveBoots);
+		}
+		if (message.contains("    RARE REWARD! Adaptive Blade")) {
+			lc.adaptiveSwords++;
+			lc.adaptiveSwordsSession++;
+			cf.writeIntConfig("catacombs", "adaptiveSword", lc.adaptiveSwords);
+		}
+		// F4
+		if (message.contains("    Spirit Wing")) {
+			lc.spiritWings++;
+			lc.spiritWingsSession++;
+			cf.writeIntConfig("catacombs", "spiritWing", lc.spiritWings);
+		}
+		// TODO
+		// Fix strings for Spirit Bone, Spirit Boots, Spirit Pet
+		if (message.contains("    ") && message.contains("Spirit Bone")) {
+			lc.spiritBones++;
+			lc.spiritBonesSession++;
+			cf.writeIntConfig("catacombs", "spiritBone", lc.spiritBones);
+		}
+		if (message.contains("    ") && message.contains("Spirit Boots")) {
+			lc.spiritBoots++;
+			lc.spiritBootsSession++;
+			cf.writeIntConfig("catacombs", "spiritBoot", lc.spiritBoots);
+		}
+		if (message.contains("    ") && message.contains("Spirit Pet")) {
+			String formattedMessage = event.message.getFormattedText();
+			if (formattedMessage.contains("§5Spirit Pet")) {
+				lc.epicSpiritPets++;
+				lc.epicSpiritPetsSession++;
+				cf.writeIntConfig("catacombs", "spiritPetEpic", lc.epicSpiritPets);
+			} else if (formattedMessage.contains("§6Spirit Pet")) {
+				lc.legSpiritPets++;
+				lc.legSpiritPetsSession++;
+				cf.writeIntConfig("catacombs", "spiritPetLeg", lc.legSpiritPets);
+			} 
+		}
+		if (message.contains("    Spirit Sword")) {
+			lc.spiritSwords++;
+			lc.spiritSwordsSession++;
+			cf.writeIntConfig("catacombs", "spiritSword", lc.spiritSwords);
+		}
+		
+		// Chat Maddox
+		if (message.contains("[OPEN MENU]")) {
+			List<IChatComponent> listOfSiblings = event.message.getSiblings();
+			for (IChatComponent sibling : listOfSiblings) {
+				if (sibling.getUnformattedText().contains("[OPEN MENU]")) {
+					lastMaddoxCommand = sibling.getChatStyle().getChatClickEvent().getValue();
+				}
+			}
+			if (tc.chatMaddoxToggled) Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Click anywhere in chat to open Maddox"));
+		}
     }
     
     @SubscribeEvent
@@ -1060,6 +1173,98 @@ public class TheMod
 							EnumChatFormatting.WHITE + nf.format(lc.frostyTheSnowmansSession) + "\n" +
 							EnumChatFormatting.DARK_GREEN + nf.format(lc.grinchesSession) + "\n" +
 							EnumChatFormatting.GOLD + nf.format(lc.yetisSession);
+    		} else if (ds.display.equals("catacombs_floor_one")) {
+    			dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
+    						EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
+    						EnumChatFormatting.BLUE + "Bonzo's Staffs:";
+    			countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulators) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooks) + "\n" +
+							EnumChatFormatting.BLUE + nf.format(lc.bonzoStaffs);
+    		} else if (ds.display.equals("catacombs_floor_one_session")) {
+    			dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
+							EnumChatFormatting.BLUE + "Bonzo's Staffs:";
+				countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulatorsSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooksSession) + "\n" +
+							EnumChatFormatting.BLUE + nf.format(lc.bonzoStaffsSession);
+    		} else if (ds.display.equals("catacombs_floor_two")) {
+    			dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
+							EnumChatFormatting.BLUE + "Scarf's Studies:";
+				countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulators) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooks) + "\n" +
+							EnumChatFormatting.BLUE + nf.format(lc.scarfStudies);
+    		} else if (ds.display.equals("catacombs_floor_two_session")) {
+    			dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
+							EnumChatFormatting.BLUE + "Scarf's Studies:";
+				countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulatorsSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooksSession) + "\n" +
+							EnumChatFormatting.BLUE + nf.format(lc.scarfStudiesSession);
+    		} else if (ds.display.equals("catacombs_floor_three")) {
+    			dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Adaptive Helmets:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Adaptive Chestplates:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Adaptive Leggings:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Adaptive Boots:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Adaptive Blades:";
+				countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulators) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooks) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(lc.adaptiveHelms) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(lc.adaptiveChests) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(lc.adaptiveLegs) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(lc.adaptiveBoots) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(lc.adaptiveSwords);	
+    		} else if (ds.display.equals("catacombs_floor_three_session")) {
+    			dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Adaptive Helmets:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Adaptive Chestplates:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Adaptive Leggings:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Adaptive Boots:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Adaptive Blades:";
+				countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulatorsSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooksSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(lc.adaptiveHelmsSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(lc.adaptiveChestsSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(lc.adaptiveLegsSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(lc.adaptiveBootsSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(lc.adaptiveSwordsSession);
+    		} else if (ds.display.equals("catacombs_floor_four")) {
+    			dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Spirit Wings:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Spirit Bones:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Spirit Boots:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Spirit Swords:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Epic Spirit Pets:\n" +
+							EnumChatFormatting.GOLD + "Leg Spirit Pets:";
+				countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulators) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooks) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(lc.spiritWings) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(lc.spiritBones) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(lc.spiritBoots) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(lc.spiritSwords) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(lc.epicSpiritPets) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(lc.legSpiritPets);
+    		} else if (ds.display.equals("catacombs_floor_four_session")) {
+    			dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Spirit Wings:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Spirit Bones:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Spirit Boots:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Spirit Swords:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Epic Spirit Pets:\n" +
+							EnumChatFormatting.GOLD + "Leg Spirit Pets:";
+				countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulatorsSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooksSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(lc.spiritWingsSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(lc.spiritBonesSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(lc.spiritBootsSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(lc.spiritSwordsSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(lc.epicSpiritPetsSession) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(lc.legSpiritPetsSession);
     		} else {
     			ConfigHandler cf = new ConfigHandler();
     			
@@ -1142,6 +1347,16 @@ public class TheMod
     
     @SubscribeEvent
     public void onTick(TickEvent.ClientTickEvent event) {
+    	// Check if player is in Skyblock every second
+    	tickAmount++;
+    	if (tickAmount % 20 == 0) {
+    		EntityPlayerSP player = Minecraft.getMinecraft().thePlayer;
+    		if (player != null) {
+        		Utils.checkForSkyblock();
+    		}
+    		tickAmount = 1;
+    	}
+    	
     	if (titleTimer >= 0) {
     		if (titleTimer == 0) {
     			showTitle = false;
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 fac8202..0a48213 100644
--- a/src/main/java/me/Danker/commands/DHelpCommand.java
+++ b/src/main/java/me/Danker/commands/DHelpCommand.java
@@ -32,12 +32,12 @@ 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 + " /dhelp" + EnumChatFormatting.AQUA + " - Returns this message.\n" +
-													EnumChatFormatting.GOLD + " /toggle <gparty/coords/golden/slayercount/rngesusalerts/splitfishing/list>" + EnumChatFormatting.AQUA + " - Toggles features. /toggle list returns values of every toggle.\n" +
+													EnumChatFormatting.GOLD + " /toggle <gparty/coords/golden/slayercount/rngesusalerts/splitfishing/chatmaddox/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 + " /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> <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 + " /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 916245e..7707442 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
@@ -35,7 +35,9 @@ public class DisplayCommand extends CommandBase {
 			return getListOfStringsMatchingLastWord(args, "wolf", "spider", "zombie", "fishing", "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/LootCommand.java b/src/main/java/me/Danker/commands/LootCommand.java
index d64e9d9..1142f4e 100644
--- a/src/main/java/me/Danker/commands/LootCommand.java
+++ b/src/main/java/me/Danker/commands/LootCommand.java
@@ -81,6 +81,27 @@ public class LootCommand extends CommandBase {
 	public static int grinches;
 	public static int yetis;
 	
+	// Catacombs Dungeons
+	public static int recombobulators;
+	public static int fumingPotatoBooks;
+	// F1
+	public static int bonzoStaffs;
+	// F2
+	public static int scarfStudies;
+	// F3
+	public static int adaptiveHelms;
+	public static int adaptiveChests;
+	public static int adaptiveLegs;
+	public static int adaptiveBoots;
+	public static int adaptiveSwords;
+	// F4
+	public static int spiritWings;
+	public static int spiritBones;
+	public static int spiritBoots;
+	public static int spiritSwords;
+	public static int epicSpiritPets;
+	public static int legSpiritPets;
+	
 	// Single sessions (No config saves)
 	// Wolf
 	public static int wolfSvensSession = 0;
@@ -150,6 +171,27 @@ public class LootCommand extends CommandBase {
 	public static int grinchesSession = 0;
 	public static int yetisSession = 0;
 	
+	// Catacombs Dungeons
+	public static int recombobulatorsSession = 0;
+	public static int fumingPotatoBooksSession = 0;
+	// F1
+	public static int bonzoStaffsSession = 0;
+	// F2
+	public static int scarfStudiesSession = 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;
+	// F4
+	public static int spiritWingsSession = 0;
+	public static int spiritBonesSession = 0;
+	public static int spiritBootsSession = 0;
+	public static int spiritSwordsSession = 0;
+	public static int epicSpiritPetsSession = 0;
+	public static int legSpiritPetsSession = 0;
+	
 	public String getTimeBetween(double timeOne, double timeTwo) {
 		double secondsBetween = Math.floor(timeTwo - timeOne);
 		
@@ -186,7 +228,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
@@ -200,7 +242,9 @@ public class LootCommand extends CommandBase {
 			return getListOfStringsMatchingLastWord(args, "wolf", "spider", "zombie", "fishing");
 		} 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 +255,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,16 +266,8 @@ 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) {
@@ -524,8 +560,98 @@ 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.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.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.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.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.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.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.DARK_PURPLE + "    Epic Spirit Pets: " + nf.format(epicSpiritPetsSession) + "\n" +
+																EnumChatFormatting.GOLD + "    Leg Spirit Pets: " + nf.format(legSpiritPetsSession) + "\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.DARK_PURPLE + "    Epic Spirit Pets: " + nf.format(epicSpiritPets) + "\n" +
+															EnumChatFormatting.GOLD + "    Leg Spirit Pets: " + nf.format(legSpiritPets) + "\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/ResetLootCommand.java b/src/main/java/me/Danker/commands/ResetLootCommand.java
index 1afc204..97ac151 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>"));
 			}
 		}
 	}
@@ -177,5 +179,26 @@ public class ResetLootCommand extends CommandBase {
 		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.scarfStudiesSession = 0;
+		lc.adaptiveHelmsSession = 0;
+		lc.adaptiveChestsSession = 0;
+		lc.adaptiveLegsSession = 0;
+		lc.adaptiveBootsSession = 0;
+		lc.adaptiveSwordsSession = 0;
+		lc.spiritWingsSession = 0;
+		lc.spiritBonesSession = 0;
+		lc.spiritBootsSession = 0;
+		lc.spiritSwordsSession = 0;
+		lc.epicSpiritPetsSession = 0;
+		cf.deleteCategory("catacombs");
+		cf.reloadConfig();
+	}
 
 }
diff --git a/src/main/java/me/Danker/commands/ToggleCommand.java b/src/main/java/me/Danker/commands/ToggleCommand.java
index 8870e9b..17f48d7 100644
--- a/src/main/java/me/Danker/commands/ToggleCommand.java
+++ b/src/main/java/me/Danker/commands/ToggleCommand.java
@@ -19,6 +19,7 @@ public class ToggleCommand extends CommandBase implements ICommand {
 	public static boolean slayerCountTotal;
 	public static boolean rngesusAlerts;
 	public static boolean splitFishing;
+	public static boolean chatMaddoxToggled;
 	
 	@Override
 	public String getCommandName() {
@@ -27,7 +28,7 @@ public class ToggleCommand extends CommandBase implements ICommand {
 
 	@Override
 	public String getCommandUsage(ICommandSender arg0) {
-		return getCommandName() + " <gparty/coords/golden/slayercount/rngesusalerts/splitfishing/list>";
+		return getCommandName() + " <gparty/coords/golden/slayercount/rngesusalerts/splitfishing/chatmaddox/list>";
 	}
 
 	@Override
@@ -38,7 +39,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", "splitfishing", "list");
+			return getListOfStringsMatchingLastWord(args, "gparty", "coords", "golden", "slayercount", "rngesusalerts", "splitfishing", "chatmaddox", "list");
 		}
 		return null;
 	}
@@ -49,7 +50,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/splitfishing/list>"));
+			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /toggle <gparty/coords/golden/slayercount/rngesusalerts/splitfishing/chatmaddox/list>"));
 			return;
 		}
 		
@@ -77,15 +78,20 @@ public class ToggleCommand extends CommandBase implements ICommand {
 			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("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 + "\n" +
-														EnumChatFormatting.GREEN + " Split fishing display: " + EnumChatFormatting.DARK_GREEN + splitFishing));
+														EnumChatFormatting.GREEN + " Split fishing display: " + EnumChatFormatting.DARK_GREEN + splitFishing + "\n" +
+														EnumChatFormatting.GREEN + " Chat Maddox menu: " + EnumChatFormatting.DARK_GREEN + chatMaddoxToggled));
 		} else {
-			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /toggle <gparty/coords/golden/slayercount/rngesusalerts/splitfishing/list>"));
+			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /toggle <gparty/coords/golden/slayercount/rngesusalerts/splitfishing/chatmaddox/list>"));
 		}
 	}
 }
diff --git a/src/main/java/me/Danker/handlers/ConfigHandler.java b/src/main/java/me/Danker/handlers/ConfigHandler.java
index d393740..8a3c35e 100644
--- a/src/main/java/me/Danker/handlers/ConfigHandler.java
+++ b/src/main/java/me/Danker/handlers/ConfigHandler.java
@@ -175,6 +175,7 @@ public class ConfigHandler {
 		if (!hasKey("toggles", "SlayerCount")) writeBooleanConfig("toggles", "SlayerCount", true);
 		if (!hasKey("toggles", "RNGesusAlerts")) writeBooleanConfig("toggles", "RNGesusAlerts", true);
 		if (!hasKey("toggles", "SplitFishing")) writeBooleanConfig("toggles", "SplitFishing", true);
+		if (!hasKey("toggles", "ChatMaddox")) writeBooleanConfig("toggles", "ChatMaddox", true);
 		if (!hasKey("api", "APIKey")) writeStringConfig("api", "APIKey", "");
 		
 		// Wolf Loot
@@ -245,6 +246,27 @@ public class ConfigHandler {
 		if (!hasKey("fishing", "grinch")) writeIntConfig("fishing", "grinch", 0);
 		if (!hasKey("fishing", "yeti")) writeIntConfig("fishing", "yeti", 0);
 		
+		// Dungeons
+		if (!hasKey("catacombs", "recombobulator")) writeIntConfig("catacombs", "recombobulator", 0);
+		if (!hasKey("catacombs", "fumingBooks")) writeIntConfig("catacombs", "fumingBooks", 0);
+		// F1
+		if (!hasKey("catacombs", "bonzoStaff")) writeIntConfig("catacombs", "bonzoStaff", 0);
+		// F2
+		if (!hasKey("catacombs", "scarfStudies")) writeIntConfig("catacombs", "scarfStudies", 0);
+		// F3
+		if (!hasKey("catacombs", "adaptiveHelm")) writeIntConfig("catacombs", "adaptiveHelm", 0);
+		if (!hasKey("catacombs", "adaptiveChest")) writeIntConfig("catacombs", "adaptiveChest", 0);
+		if (!hasKey("catacombs", "adaptiveLegging")) writeIntConfig("catacombs", "adaptiveLegging", 0);
+		if (!hasKey("catacombs", "adaptiveBoot")) writeIntConfig("catacombs", "adaptiveBoot", 0);
+		if (!hasKey("catacombs", "adaptiveSword")) writeIntConfig("catacombs", "adaptiveSword", 0);
+		// F4
+		if (!hasKey("catacombs", "spiritWing")) writeIntConfig("catacombs", "spiritWing", 0);
+		if (!hasKey("catacombs", "spiritBone")) writeIntConfig("catacombs", "spiritBone", 0);
+		if (!hasKey("catacombs", "spiritBoot")) writeIntConfig("catacombs", "spiritBoot", 0);
+		if (!hasKey("catacombs", "spiritSword")) writeIntConfig("catacombs", "spiritSword", 0);
+		if (!hasKey("catacombs", "spiritPetEpic")) writeIntConfig("catacombs", "spiritPetEpic", 0);
+		if (!hasKey("catacombs", "spiritPetLeg")) writeIntConfig("catacombs", "spiritPetLeg", 0);
+		
 		if (!hasKey("misc", "display")) writeStringConfig("misc", "display", "off");
 		
 		ScaledResolution scaled = new ScaledResolution(Minecraft.getMinecraft());
@@ -263,6 +285,7 @@ public class ConfigHandler {
 		tf.slayerCountTotal = getBoolean("toggles", "SlayerCount");
 		tf.rngesusAlerts = getBoolean("toggles", "RNGesusAlerts");
 		tf.splitFishing = getBoolean("toggles", "SplitFishing");
+		tf.chatMaddoxToggled = getBoolean("toggles", "ChatMaddox");
 		
 		final LootCommand lc = new LootCommand();
 		// Wolf
@@ -332,6 +355,27 @@ public class ConfigHandler {
 		lc.grinches = getInt("fishing", "grinch");
 		lc.yetis = getInt("fishing", "yeti");
 		
+		// Dungeons
+		lc.recombobulators =  getInt("catacombs", "recombobulator");
+		lc.fumingPotatoBooks = getInt("catacombs", "fumingBooks");
+		// F1
+		lc.bonzoStaffs = getInt("catacombs", "bonzoStaff");
+		// F2
+		lc.scarfStudies = getInt("catacombs", "scarfStudies");
+		// F3
+		lc.adaptiveHelms = getInt("catacombs", "adaptiveHelm");
+		lc.adaptiveChests = getInt("catacombs", "adaptiveChest");
+		lc.adaptiveLegs = getInt("catacombs", "adaptiveLegging");
+		lc.adaptiveBoots = getInt("catacombs", "adaptiveBoot");
+		lc.adaptiveSwords = getInt("catacombs", "adaptiveSword");
+		// F4
+		lc.spiritWings = getInt("catacombs", "spiritWing");
+		lc.spiritBones = getInt("catacombs", "spiritBone");
+		lc.spiritBoots = getInt("catacombs", "spiritBoot");
+		lc.spiritSwords = getInt("catacombs", "spiritSword");
+		lc.epicSpiritPets = getInt("catacombs", "spiritPetEpic");
+		lc.legSpiritPets = getInt("catacombs", "spiritPetLeg");
+		
 		final DisplayCommand ds = new DisplayCommand();
 		ds.display = getString("misc", "display");
 		
diff --git a/src/main/java/me/Danker/utils/Utils.java b/src/main/java/me/Danker/utils/Utils.java
index 4749305..5dc30c6 100644
--- a/src/main/java/me/Danker/utils/Utils.java
+++ b/src/main/java/me/Danker/utils/Utils.java
@@ -5,17 +5,20 @@ import java.util.List;
 import java.util.regex.Matcher;
 
 import me.Danker.TheMod;
+import me.Danker.handlers.ScoreboardHandler;
 import me.Danker.handlers.TextRenderer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.scoreboard.ScoreObjective;
 import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.StringUtils;
 
 public class Utils {
 	
+	public static boolean inSkyblock = false;
+	
     public static int getItems(String item) {
     	Minecraft mc = Minecraft.getMinecraft();
     	EntityPlayer player = mc.thePlayer;
@@ -85,4 +88,19 @@ public class Utils {
 		new TextRenderer(mc, text, titleX, titleY, scale);
 	}
 	
+	public static void checkForSkyblock() {
+		Minecraft mc = Minecraft.getMinecraft();
+		if (mc != null && mc.theWorld != null && !mc.isSingleplayer()) {
+			ScoreObjective scoreboardObj = mc.theWorld.getScoreboard().getObjectiveInDisplaySlot(1);
+			if (scoreboardObj != null) {
+				String scObjName = ScoreboardHandler.cleanSB(scoreboardObj.getDisplayName());
+				if (scObjName.contains("SKYBLOCK")) {
+					inSkyblock = true;
+					return;
+				}
+			}
+		}
+		inSkyblock = false;
+	}
+	
 }