Add master mode loot tracker

7 files changed, 234 insertions, 61 deletions

diff --git a/src/main/java/me/Danker/commands/DisplayCommand.java b/src/main/java/me/Danker/commands/DisplayCommand.java
index e248888..d335a8a 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/enderman/fishing/catacombs/mythological/ghost/auto/off> [winter/festival/spooky/session/f(1-7)]";
+		return "/" + getCommandName() + " <zombie/spider/wolf/enderman/fishing/catacombs/mythological/ghost/auto/off> [winter/festival/spooky/session/f(1-7)/mm]";
 	}
 
 	public static String usage(ICommandSender arg0) {
@@ -40,7 +40,7 @@ public class DisplayCommand extends CommandBase {
 		} 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")) {
-			return getListOfStringsMatchingLastWord(args, "f1", "floor1", "f2", "floor2", "f3", "floor3", "f4", "floor4", "f5", "floor5", "f6", "floor6", "f7", "floor7");
+			return getListOfStringsMatchingLastWord(args, "f1", "floor1", "f2", "floor2", "f3", "floor3", "f4", "floor4", "f5", "floor5", "f6", "floor6", "f7", "floor7", "mm", "master");
 		} else if (args.length > 1) {
 			return getListOfStringsMatchingLastWord(args, "session");
 		}
@@ -198,6 +198,13 @@ public class DisplayCommand extends CommandBase {
 						LootDisplay.display = "catacombs_floor_seven";
 					}
 					break;
+				case "mm":
+				case "master":
+					if (showSession) {
+						LootDisplay.display = "catacombs_master_session";
+					} else {
+						LootDisplay.display = "catacombs_master";
+					}
 				default:
 					player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "Usage: /display catacombs <f1/f2/f3/f4/f5/f6/f7>"));
 					return;
diff --git a/src/main/java/me/Danker/commands/LootCommand.java b/src/main/java/me/Danker/commands/LootCommand.java
index 617a957..1437b36 100644
--- a/src/main/java/me/Danker/commands/LootCommand.java
+++ b/src/main/java/me/Danker/commands/LootCommand.java
@@ -24,7 +24,7 @@ public class LootCommand extends CommandBase {
 
 	@Override
 	public String getCommandUsage(ICommandSender arg0) {
-		return "/" + getCommandName() + " <zombie/spider/wolf/enderman/fishing/catacombs/mythological> [winter/festival/spooky/f(1-7)/session]";
+		return "/" + getCommandName() + " <zombie/spider/wolf/enderman/fishing/catacombs/mythological> [winter/festival/spooky/f(1-7)/mm/session]";
 	}
 
 	public static String usage(ICommandSender arg0) {
@@ -43,7 +43,7 @@ public class LootCommand extends CommandBase {
 		} 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")) {
-			return getListOfStringsMatchingLastWord(args, "f1", "floor1", "f2", "floor2", "f3", "floor3", "f4", "floor4", "f5", "floor5", "f6", "floor6", "f7", "floor7");
+			return getListOfStringsMatchingLastWord(args, "f1", "floor1", "f2", "floor2", "f3", "floor3", "f4", "floor4", "f5", "floor5", "f6", "floor6", "f7", "floor7", "mm", "master");
 		} else if (args.length > 1) {
 			return getListOfStringsMatchingLastWord(args, "session");
 		}
@@ -803,6 +803,39 @@ public class LootCommand extends CommandBase {
 																	EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, CatacombsTracker.f7TimeSpent) + "\n" +
 																	EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
 						break;
+					case "mm":
+					case "master":
+						if (showSession) {
+							player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
+																		EnumChatFormatting.RED + EnumChatFormatting.BOLD + "  Catacombs MM Summary (Current Session):\n" +
+																		EnumChatFormatting.GOLD + "    S Runs:" + nf.format(CatacombsTracker.masterSSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Recombobulators:" + nf.format(CatacombsTracker.recombobulatorsSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books:" + nf.format(CatacombsTracker.fumingPotatoBooksSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    1st Master Stars:" + nf.format(CatacombsTracker.firstStarsSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    2nd Master Stars:" + nf.format(CatacombsTracker.secondStarsSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    3rd Master Stars:" + nf.format(CatacombsTracker.thirdStarsSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    4th Master Stars:" + nf.format(CatacombsTracker.fourthStarsSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    5th Master Stars:" + nf.format(CatacombsTracker.fifthStarsSession) + "\n" +
+																		EnumChatFormatting.WHITE + "    Rerolls:" + nf.format(CatacombsTracker.masterRerollsSession) + "\n" +
+																		EnumChatFormatting.AQUA + "    Coins Spent:" + nf.format(CatacombsTracker.masterCoinsSpentSession) + "\n" +
+																		EnumChatFormatting.AQUA + "    Time Spent:" + nf.format(CatacombsTracker.masterTimeSpentSession) + "\n" +
+																		EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
+							return;
+						}
+						player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
+																	EnumChatFormatting.RED + EnumChatFormatting.BOLD + "  Catacombs MM Summary:\n" +
+																	EnumChatFormatting.GOLD + "    S Runs:" + nf.format(CatacombsTracker.masterS) + "\n" +
+																	EnumChatFormatting.GOLD + "    Recombobulators:" + nf.format(CatacombsTracker.recombobulators) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books:" + nf.format(CatacombsTracker.fumingPotatoBooks) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    1st Master Stars:" + nf.format(CatacombsTracker.firstStars) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    2nd Master Stars:" + nf.format(CatacombsTracker.secondStars) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    3rd Master Stars:" + nf.format(CatacombsTracker.thirdStars) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    4th Master Stars:" + nf.format(CatacombsTracker.fourthStars) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    5th Master Stars:" + nf.format(CatacombsTracker.fifthStars) + "\n" +
+																	EnumChatFormatting.WHITE + "    Rerolls:" + nf.format(CatacombsTracker.masterRerolls) + "\n" +
+																	EnumChatFormatting.AQUA + "    Coins Spent:" + nf.format(CatacombsTracker.masterCoinsSpent) + "\n" +
+																	EnumChatFormatting.AQUA + "    Time Spent:" + nf.format(CatacombsTracker.masterTimeSpent) + "\n" +
+																	EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
 					default:
 						player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "Usage: /loot catacombs <f1/f2/f3/f4/f5/f6/f7>"));
 				}
diff --git a/src/main/java/me/Danker/features/AutoDisplay.java b/src/main/java/me/Danker/features/AutoDisplay.java
index 89b1750..8dbe359 100644
--- a/src/main/java/me/Danker/features/AutoDisplay.java
+++ b/src/main/java/me/Danker/features/AutoDisplay.java
@@ -59,6 +59,8 @@ public class AutoDisplay {
                             LootDisplay.display = "catacombs_floor_six";
                         } else if (sCleaned.contains("F7")) {
                             LootDisplay.display = "catacombs_floor_seven";
+                        } else if (sCleaned.contains("(M")) {
+                            LootDisplay.display = "catacombs_master";
                         }
                         found = true;
                     }
diff --git a/src/main/java/me/Danker/features/loot/CatacombsTracker.java b/src/main/java/me/Danker/features/loot/CatacombsTracker.java
index ddcb7d5..86770d6 100644
--- a/src/main/java/me/Danker/features/loot/CatacombsTracker.java
+++ b/src/main/java/me/Danker/features/loot/CatacombsTracker.java
@@ -88,6 +88,16 @@ public class CatacombsTracker {
     public static int f7Rerolls;
     public static double f7CoinsSpent;
     public static double f7TimeSpent;
+    // MM
+    public static int masterS;
+    public static int firstStars;
+    public static int secondStars;
+    public static int thirdStars;
+    public static int fourthStars;
+    public static int fifthStars;
+    public static int masterRerolls;
+    public static double masterCoinsSpent;
+    public static double masterTimeSpent;
 
     // Catacombs Dungeons
     public static int recombobulatorsSession = 0;
@@ -163,6 +173,16 @@ public class CatacombsTracker {
     public static int f7RerollsSession = 0;
     public static double f7CoinsSpentSession = 0;
     public static double f7TimeSpentSession = 0;
+    // MM
+    public static int masterSSession = 0;
+    public static int firstStarsSession = 0;
+    public static int secondStarsSession = 0;
+    public static int thirdStarsSession = 0;
+    public static int fourthStarsSession = 0;
+    public static int fifthStarsSession = 0;
+    public static int masterRerollsSession = 0;
+    public static double masterCoinsSpentSession = 0;
+    public static double masterTimeSpentSession = 0;
 
     @SubscribeEvent
     public void onChat(ClientChatReceivedEvent event) {
@@ -173,37 +193,48 @@ public class CatacombsTracker {
 
         if (message.contains("    Team Score: ") && message.contains("(S+)")) {
             List<String> scoreboard = ScoreboardHandler.getSidebarLines();
-            for (String s : scoreboard) {
-                String sCleaned = ScoreboardHandler.cleanSB(s);
-                if (sCleaned.contains("The Catacombs (")) {
-                    if (sCleaned.contains("F1")) {
-                        f1SPlus++;
-                        f1SPlusSession++;
-                        ConfigHandler.writeIntConfig("catacombs", "floorOneSPlus", f1SPlus);
-                    } else if (sCleaned.contains("F2")) {
-                        f2SPlus++;
-                        f2SPlusSession++;
-                        ConfigHandler.writeIntConfig("catacombs", "floorTwoSPlus", f2SPlus);
-                    } else if (sCleaned.contains("F3")) {
-                        f3SPlus++;
-                        f3SPlusSession++;
-                        ConfigHandler.writeIntConfig("catacombs", "floorThreeSPlus", f3SPlus);
-                    } else if (sCleaned.contains("F4")) {
-                        f4SPlus++;
-                        f4SPlusSession++;
-                        ConfigHandler.writeIntConfig("catacombs", "floorFourSPlus", f4SPlus);
-                    } else if (sCleaned.contains("F5")) {
-                        f5SPlus++;
-                        f5SPlusSession++;
-                        ConfigHandler.writeIntConfig("catacombs", "floorFiveSPlus", f5SPlus);
-                    } else if (sCleaned.contains("F6")) {
-                        f6SPlus++;
-                        f6SPlusSession++;
-                        ConfigHandler.writeIntConfig("catacombs", "floorSixSPlus", f6SPlus);
-                    } else if (sCleaned.contains("F7")) {
-                        f7SPlus++;
-                        f7SPlusSession++;
-                        ConfigHandler.writeIntConfig("catacombs", "floorSevenSPlus", f7SPlus);
+            if (message.contains("(S+)")) {
+                for (String s : scoreboard) {
+                    String sCleaned = ScoreboardHandler.cleanSB(s);
+                    if (sCleaned.contains("The Catacombs (")) {
+                        if (sCleaned.contains("F1")) {
+                            f1SPlus++;
+                            f1SPlusSession++;
+                            ConfigHandler.writeIntConfig("catacombs", "floorOneSPlus", f1SPlus);
+                        } else if (sCleaned.contains("F2")) {
+                            f2SPlus++;
+                            f2SPlusSession++;
+                            ConfigHandler.writeIntConfig("catacombs", "floorTwoSPlus", f2SPlus);
+                        } else if (sCleaned.contains("F3")) {
+                            f3SPlus++;
+                            f3SPlusSession++;
+                            ConfigHandler.writeIntConfig("catacombs", "floorThreeSPlus", f3SPlus);
+                        } else if (sCleaned.contains("F4")) {
+                            f4SPlus++;
+                            f4SPlusSession++;
+                            ConfigHandler.writeIntConfig("catacombs", "floorFourSPlus", f4SPlus);
+                        } else if (sCleaned.contains("F5")) {
+                            f5SPlus++;
+                            f5SPlusSession++;
+                            ConfigHandler.writeIntConfig("catacombs", "floorFiveSPlus", f5SPlus);
+                        } else if (sCleaned.contains("F6")) {
+                            f6SPlus++;
+                            f6SPlusSession++;
+                            ConfigHandler.writeIntConfig("catacombs", "floorSixSPlus", f6SPlus);
+                        } else if (sCleaned.contains("F7")) {
+                            f7SPlus++;
+                            f7SPlusSession++;
+                            ConfigHandler.writeIntConfig("catacombs", "floorSevenSPlus", f7SPlus);
+                        }
+                    }
+                }
+            } else if (message.contains("(S)")) {
+                for (String s : scoreboard) {
+                    String sCleaned = ScoreboardHandler.cleanSB(s);
+                    if (sCleaned.contains("The Catacombs (M")) {
+                        masterS++;
+                        masterSSession++;
+                        ConfigHandler.writeIntConfig("catacombs", "masterS", masterS);
                     }
                 }
             }
@@ -384,6 +415,26 @@ public class CatacombsTracker {
                 witherBoots++;
                 witherBootsSession++;
                 ConfigHandler.writeIntConfig("catacombs", "witherBoot", witherBoots);
+            } else if (message.contains("First Master Star")) {
+                firstStars++;
+                firstStarsSession++;
+                ConfigHandler.writeIntConfig("catacombs", "firstStar", firstStars);
+            } else if (message.contains("Second Master Star")) {
+                secondStars++;
+                secondStarsSession++;
+                ConfigHandler.writeIntConfig("catacombs", "secondStar", secondStars);
+            } else if (message.contains("Third Master Star")) {
+                thirdStars++;
+                thirdStarsSession++;
+                ConfigHandler.writeIntConfig("catacombs", "thirdStar", thirdStars);
+            } else if (message.contains("Fourth Master Star")) {
+                fourthStars++;
+                fourthStarsSession++;
+                ConfigHandler.writeIntConfig("catacombs", "fourthStar", fourthStars);
+            } else if (message.contains("Fifth Master Star")) {
+                fifthStars++;
+                fifthStarsSession++;
+                ConfigHandler.writeIntConfig("catacombs", "fifthStar", fifthStars);
             }
         }
 
@@ -422,6 +473,10 @@ public class CatacombsTracker {
                         f7TimeSpent = Math.floor(f7TimeSpent + timeToAdd);
                         f7TimeSpentSession = Math.floor(f7TimeSpentSession + timeToAdd);
                         ConfigHandler.writeDoubleConfig("catacombs", "floorSevenTime", f7TimeSpent);
+                    } else if (sCleaned.contains("(M")) {
+                        masterTimeSpent = Math.floor(masterTimeSpent + timeToAdd);
+                        masterTimeSpentSession = Math.floor(masterTimeSpentSession + timeToAdd);
+                        ConfigHandler.writeDoubleConfig("catacombs", "masterTime", masterTimeSpent);
                     }
                 } else if (sCleaned.contains("Time Elapsed:")) {
                     // Get floor time
@@ -481,6 +536,10 @@ public class CatacombsTracker {
                                     f7CoinsSpent += coinsSpent;
                                     f7CoinsSpentSession += coinsSpent;
                                     ConfigHandler.writeDoubleConfig("catacombs", "floorSevenCoins", f7CoinsSpent);
+                                } else if (sCleaned.contains("(M")) {
+                                    masterCoinsSpent += coinsSpent;
+                                    masterCoinsSpentSession += coinsSpent;
+                                    ConfigHandler.writeDoubleConfig("catacombs", "masterCoins", masterCoinsSpent);
                                 }
                             }
                             break;
@@ -500,6 +559,10 @@ public class CatacombsTracker {
                             f7Rerolls++;
                             f7RerollsSession++;
                             ConfigHandler.writeDoubleConfig("catacombs", "floorSevenRerolls", f7Rerolls);
+                        } else if (sCleaned.contains("(M")) {
+                            masterRerolls++;
+                            masterRerollsSession++;
+                            ConfigHandler.writeDoubleConfig("catacombs", "masterRerolls", masterRerolls);
                         }
                         break;
                     }
diff --git a/src/main/java/me/Danker/features/loot/LootDisplay.java b/src/main/java/me/Danker/features/loot/LootDisplay.java
index d7a5f74..1878b47 100644
--- a/src/main/java/me/Danker/features/loot/LootDisplay.java
+++ b/src/main/java/me/Danker/features/loot/LootDisplay.java
@@ -1064,6 +1064,54 @@ public class LootDisplay {
                             EnumChatFormatting.AQUA + Utils.getMoneySpent(CatacombsTracker.f7CoinsSpentSession) + "\n" +
                             EnumChatFormatting.AQUA + Utils.getTimeBetween(0, CatacombsTracker.f7TimeSpentSession);
                     break;
+                case "catacombs_master":
+                    dropsText = EnumChatFormatting.GOLD + "S Runs:\n" +
+                            EnumChatFormatting.GOLD + "Recombobulators:\n" +
+                            EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
+                            EnumChatFormatting.DARK_PURPLE + "1st Master Stars:\n" +
+                            EnumChatFormatting.DARK_PURPLE + "2nd Master Stars:\n" +
+                            EnumChatFormatting.DARK_PURPLE + "3rd Master Stars:\n" +
+                            EnumChatFormatting.DARK_PURPLE + "4th Master Stars:\n" +
+                            EnumChatFormatting.DARK_PURPLE + "5th Master Stars:\n" +
+                            EnumChatFormatting.WHITE + "Rerolls:\n" +
+                            EnumChatFormatting.AQUA + "Coins Spent:\n" +
+                            EnumChatFormatting.AQUA + "Time Spent:";
+                    countText = EnumChatFormatting.GOLD + nf.format(CatacombsTracker.masterS) + "\n" +
+                            EnumChatFormatting.GOLD + nf.format(CatacombsTracker.recombobulators) + "\n" +
+                            EnumChatFormatting.DARK_PURPLE + nf.format(CatacombsTracker.fumingPotatoBooks) + "\n" +
+                            EnumChatFormatting.DARK_PURPLE + nf.format(CatacombsTracker.firstStars) + "\n" +
+                            EnumChatFormatting.DARK_PURPLE + nf.format(CatacombsTracker.secondStars) + "\n" +
+                            EnumChatFormatting.DARK_PURPLE + nf.format(CatacombsTracker.thirdStars) + "\n" +
+                            EnumChatFormatting.DARK_PURPLE + nf.format(CatacombsTracker.fourthStars) + "\n" +
+                            EnumChatFormatting.DARK_PURPLE + nf.format(CatacombsTracker.fifthStars) + "\n" +
+                            EnumChatFormatting.WHITE + nf.format(CatacombsTracker.masterRerolls) + "\n" +
+                            EnumChatFormatting.AQUA + Utils.getMoneySpent(CatacombsTracker.masterCoinsSpent) + "\n" +
+                            EnumChatFormatting.AQUA + Utils.getTimeBetween(0, CatacombsTracker.masterTimeSpent);
+                    break;
+                case "catacombs_master_session":
+                    dropsText = EnumChatFormatting.GOLD + "S Runs:\n" +
+                            EnumChatFormatting.GOLD + "Recombobulators:\n" +
+                            EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
+                            EnumChatFormatting.DARK_PURPLE + "1st Master Stars:\n" +
+                            EnumChatFormatting.DARK_PURPLE + "2nd Master Stars:\n" +
+                            EnumChatFormatting.DARK_PURPLE + "3rd Master Stars:\n" +
+                            EnumChatFormatting.DARK_PURPLE + "4th Master Stars:\n" +
+                            EnumChatFormatting.DARK_PURPLE + "5th Master Stars:\n" +
+                            EnumChatFormatting.WHITE + "Rerolls:\n" +
+                            EnumChatFormatting.AQUA + "Coins Spent:\n" +
+                            EnumChatFormatting.AQUA + "Time Spent:";
+                    countText = EnumChatFormatting.GOLD + nf.format(CatacombsTracker.masterSSession) + "\n" +
+                            EnumChatFormatting.GOLD + nf.format(CatacombsTracker.recombobulatorsSession) + "\n" +
+                            EnumChatFormatting.DARK_PURPLE + nf.format(CatacombsTracker.fumingPotatoBooksSession) + "\n" +
+                            EnumChatFormatting.DARK_PURPLE + nf.format(CatacombsTracker.firstStarsSession) + "\n" +
+                            EnumChatFormatting.DARK_PURPLE + nf.format(CatacombsTracker.secondStarsSession) + "\n" +
+                            EnumChatFormatting.DARK_PURPLE + nf.format(CatacombsTracker.thirdStarsSession) + "\n" +
+                            EnumChatFormatting.DARK_PURPLE + nf.format(CatacombsTracker.fourthStarsSession) + "\n" +
+                            EnumChatFormatting.DARK_PURPLE + nf.format(CatacombsTracker.fifthStarsSession) + "\n" +
+                            EnumChatFormatting.WHITE + nf.format(CatacombsTracker.masterRerollsSession) + "\n" +
+                            EnumChatFormatting.AQUA + Utils.getMoneySpent(CatacombsTracker.masterCoinsSpentSession) + "\n" +
+                            EnumChatFormatting.AQUA + Utils.getTimeBetween(0, CatacombsTracker.masterTimeSpentSession);
+                    break;
                 case "ghost_session":
                     dropsText = EnumChatFormatting.GOLD + "Bags of Cash:\n" +
                             EnumChatFormatting.BLUE + "Sorrows:\n" +
diff --git a/src/main/java/me/Danker/gui/DisplayGui.java b/src/main/java/me/Danker/gui/DisplayGui.java
index c6b1381..06239b1 100644
--- a/src/main/java/me/Danker/gui/DisplayGui.java
+++ b/src/main/java/me/Danker/gui/DisplayGui.java
@@ -34,6 +34,7 @@ public class DisplayGui extends GuiScreen {
 	private GuiButton catacombsF5;
 	private GuiButton catacombsF6;
 	private GuiButton catacombsF7;
+	private GuiButton catacombsMM;
 	private GuiButton ghost;
 	
 	@Override
@@ -63,13 +64,14 @@ public class DisplayGui extends GuiScreen {
 		fishingSpooky = new GuiButton(0, width / 2 + 130, (int) (height * 0.4), 100, 20, "Fishing Spooky");
 		mythological = new GuiButton(0, width / 2 - 100, (int) (height * 0.5), 95, 20, "Mythological");
 		ghost = new GuiButton(0, width / 2 + 5, (int) (height * 0.5), 95, 20, "Ghost");
-		catacombsF1 = new GuiButton(0, width / 2 - 205, (int) (height * 0.65), 50, 20, "F1");
-		catacombsF2 = new GuiButton(0, width / 2 - 145, (int) (height * 0.65), 50, 20, "F2");
-		catacombsF3 = new GuiButton(0, width / 2 - 85, (int) (height * 0.65), 50, 20, "F3");
-		catacombsF4 = new GuiButton(0, width / 2 - 25, (int) (height * 0.65), 50, 20, "F4");
-		catacombsF5 = new GuiButton(0, width / 2 + 35, (int) (height * 0.65), 50, 20, "F5");
-		catacombsF6 = new GuiButton(0, width / 2 + 95, (int) (height * 0.65), 50, 20, "F6");
-		catacombsF7 = new GuiButton(0, width / 2 + 155, (int) (height * 0.65), 50, 20, "F7");
+		catacombsF1 = new GuiButton(0, width / 2 - 235, (int) (height * 0.65), 50, 20, "F1");
+		catacombsF2 = new GuiButton(0, width / 2 - 175, (int) (height * 0.65), 50, 20, "F2");
+		catacombsF3 = new GuiButton(0, width / 2 - 115, (int) (height * 0.65), 50, 20, "F3");
+		catacombsF4 = new GuiButton(0, width / 2 - 55, (int) (height * 0.65), 50, 20, "F4");
+		catacombsF5 = new GuiButton(0, width / 2 + 5, (int) (height * 0.65), 50, 20, "F5");
+		catacombsF6 = new GuiButton(0, width / 2 + 65, (int) (height * 0.65), 50, 20, "F6");
+		catacombsF7 = new GuiButton(0, width / 2 + 125, (int) (height * 0.65), 50, 20, "F7");
+		catacombsMM = new GuiButton(0, width / 2 + 185, (int) (height * 0.65), 50, 20, "MM");
 
 		this.buttonList.add(showSession);
 		this.buttonList.add(off);
@@ -90,6 +92,7 @@ public class DisplayGui extends GuiScreen {
 		this.buttonList.add(catacombsF5);
 		this.buttonList.add(catacombsF6);
 		this.buttonList.add(catacombsF7);
+		this.buttonList.add(catacombsMM);
 		this.buttonList.add(ghost);
 		this.buttonList.add(goBack);
 	}
@@ -125,44 +128,47 @@ public class DisplayGui extends GuiScreen {
 		} else if (button == off) {
 			setDisplay("off", true);
 		} else if (button == zombie) {
-			setDisplay("zombie", false);
+			setDisplay("zombie");
 		} else if (button == spider) {
-			setDisplay("spider", false);
+			setDisplay("spider");
 		} else if (button == wolf) {
-			setDisplay("wolf", false);
+			setDisplay("wolf");
 		} else if (button == enderman) {
-			setDisplay("enderman", false);
+			setDisplay("enderman");
 		} else if (button == auto) {
 			LootDisplay.auto = true;
 			ConfigHandler.writeBooleanConfig("misc", "autoDisplay", true);
 		} else if (button == fishing) {
-			setDisplay("fishing", false);
+			setDisplay("fishing");
 		} else if (button == fishingWinter) {
-			setDisplay("fishing_winter", false);
+			setDisplay("fishing_winter");
 		} else if (button == fishingFestival) {
-			setDisplay("fishing_festival", false);
+			setDisplay("fishing_festival");
 		} else if (button == fishingSpooky) {
-			setDisplay("fishing_spooky", false);
+			setDisplay("fishing_spooky");
 		} else if (button == mythological) {
-			setDisplay("mythological", false);
+			setDisplay("mythological");
 		} else if (button == catacombsF1) {
-			setDisplay("catacombs_floor_one", false);
+			setDisplay("catacombs_floor_one");
 		} else if (button == catacombsF2) {
-			setDisplay("catacombs_floor_two", false);
+			setDisplay("catacombs_floor_two");
 		} else if (button == catacombsF3) {
-			setDisplay("catacombs_floor_three", false);
+			setDisplay("catacombs_floor_three");
 		} else if (button == catacombsF4) {
-			setDisplay("catacombs_floor_four", false);
+			setDisplay("catacombs_floor_four");
 		} else if (button == catacombsF5) {
-			setDisplay("catacombs_floor_five", false);
+			setDisplay("catacombs_floor_five");
 		} else if (button == catacombsF6) {
-			setDisplay("catacombs_floor_six", false);
+			setDisplay("catacombs_floor_six");
 		} else if (button == catacombsF7) {
-			setDisplay("catacombs_floor_seven", false);
-		} else if (button == ghost)
-			setDisplay("ghost",false);
+			setDisplay("catacombs_floor_seven");
+		} else if (button == catacombsMM) {
+			setDisplay("catacombs_master");
+		} else if (button == ghost) {
+			setDisplay("ghost");
+		}
 	}
-	
+
 	public void setDisplay(String display, boolean forceNoSession) {
 		if (!forceNoSession && addSession) display += "_session";
 		LootDisplay.auto = false;
@@ -170,5 +176,9 @@ public class DisplayGui extends GuiScreen {
 		ConfigHandler.writeBooleanConfig("misc", "autoDisplay", false);
 		ConfigHandler.writeStringConfig("misc", "display", display);
 	}
+
+	public void setDisplay(String display) {
+		setDisplay(display, false);
+	}
 	
 }
diff --git a/src/main/java/me/Danker/handlers/ConfigHandler.java b/src/main/java/me/Danker/handlers/ConfigHandler.java
index c785ff1..112d86d 100644
--- a/src/main/java/me/Danker/handlers/ConfigHandler.java
+++ b/src/main/java/me/Danker/handlers/ConfigHandler.java
@@ -504,6 +504,16 @@ public class ConfigHandler {
 		CatacombsTracker.f7Rerolls = initInt("catacombs", "floorSevenRerolls", 0);
 		CatacombsTracker.f7CoinsSpent = initDouble("catacombs", "floorSevenCoins", 0);
 		CatacombsTracker.f7TimeSpent = initDouble("catacombs", "floorSevenTime", 0);
+		// MM
+		CatacombsTracker.masterS = initInt("catacombs", "masterS", 0);
+		CatacombsTracker.firstStars = initInt("catacombs", "firstStar", 0);
+		CatacombsTracker.secondStars = initInt("catacombs", "secondStar", 0);
+		CatacombsTracker.thirdStars = initInt("catacombs", "thirdStar", 0);
+		CatacombsTracker.fourthStars = initInt("catacombs", "fourthStar", 0);
+		CatacombsTracker.fifthStars = initInt("catacombs", "fifthStar", 0);
+		CatacombsTracker.masterRerolls = initInt("catacombs", "masterRerolls", 0);
+		CatacombsTracker.masterCoinsSpent = initDouble("catacombs", "masterCoins", 0);
+		CatacombsTracker.masterTimeSpent = initDouble("catacombs", "masterTime", 0);
 
 		// Ghost
 		GhostTracker.sorrows = initInt("ghosts", "sorrow", 0);