Add Necron Dye to MM tracker

Also fix /loot catacombs mm issues

4 files changed, 61 insertions, 48 deletions

diff --git a/src/main/java/me/Danker/commands/LootCommand.java b/src/main/java/me/Danker/commands/LootCommand.java
index bfef29d..5edc5f4 100644
--- a/src/main/java/me/Danker/commands/LootCommand.java
+++ b/src/main/java/me/Danker/commands/LootCommand.java
@@ -834,61 +834,63 @@ public class LootCommand extends CommandBase {
 						if (showSession) {
 							player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																		EnumChatFormatting.RED + EnumChatFormatting.BOLD + "  Catacombs MM Summary (Current Session):\n" +
-																		EnumChatFormatting.GOLD + "    Master One S Runs:" + nf.format(CatacombsTracker.m1SSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Master One S+ Runs:" + nf.format(CatacombsTracker.m1SPlusSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Master Two S Runs:" + nf.format(CatacombsTracker.m2SSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Master Two S+ Runs:" + nf.format(CatacombsTracker.m2SPlusSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Master Three S Runs:" + nf.format(CatacombsTracker.m3SSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Master Three S+ Runs:" + nf.format(CatacombsTracker.m3SPlusSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Master Four S Runs:" + nf.format(CatacombsTracker.m4SSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Master Four S+ Runs:" + nf.format(CatacombsTracker.m4SPlusSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Master Five S Runs:" + nf.format(CatacombsTracker.m5SSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Master Five S+ Runs:" + nf.format(CatacombsTracker.m5SPlusSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Master Six S Runs:" + nf.format(CatacombsTracker.m6SSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Master Six S+ Runs:" + nf.format(CatacombsTracker.m6SPlusSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Master Seven S Runs:" + nf.format(CatacombsTracker.m7SSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Master Seven S+ Runs:" + nf.format(CatacombsTracker.m7SPlusSession) + "\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.GOLD + "    Master One S Runs: " + nf.format(CatacombsTracker.m1SSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Master One S+ Runs: " + nf.format(CatacombsTracker.m1SPlusSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Master Two S Runs: " + nf.format(CatacombsTracker.m2SSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Master Two S+ Runs: " + nf.format(CatacombsTracker.m2SPlusSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Master Three S Runs: " + nf.format(CatacombsTracker.m3SSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Master Three S+ Runs: " + nf.format(CatacombsTracker.m3SPlusSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Master Four S Runs: " + nf.format(CatacombsTracker.m4SSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Master Four S+ Runs: " + nf.format(CatacombsTracker.m4SPlusSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Master Five S Runs: " + nf.format(CatacombsTracker.m5SSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Master Five S+ Runs: " + nf.format(CatacombsTracker.m5SPlusSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Master Six S Runs: " + nf.format(CatacombsTracker.m6SSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Master Six S+ Runs: " + nf.format(CatacombsTracker.m6SPlusSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Master Seven S Runs: " + nf.format(CatacombsTracker.m7SSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Master Seven S+ Runs: " + nf.format(CatacombsTracker.m7SPlusSession) + "\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.GOLD + "    Necron Dyes: " + nf.format(CatacombsTracker.necronDyesSession) + "\n" +
 																		EnumChatFormatting.GOLD + "    Dark Claymores: " + nf.format(CatacombsTracker.darkClaymoresSession) + "\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.WHITE + "    Rerolls: " + nf.format(CatacombsTracker.masterRerollsSession) + "\n" +
+																		EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(CatacombsTracker.masterCoinsSpentSession) + "\n" +
+																		EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, 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 + "    Master One S Runs:" + nf.format(CatacombsTracker.m1S) + "\n" +
-																	EnumChatFormatting.GOLD + "    Master One S+ Runs:" + nf.format(CatacombsTracker.m1SPlus) + "\n" +
-																	EnumChatFormatting.GOLD + "    Master Two S Runs:" + nf.format(CatacombsTracker.m2S) + "\n" +
-																	EnumChatFormatting.GOLD + "    Master Two S+ Runs:" + nf.format(CatacombsTracker.m2SPlus) + "\n" +
-																	EnumChatFormatting.GOLD + "    Master Three S Runs:" + nf.format(CatacombsTracker.m3S) + "\n" +
-																	EnumChatFormatting.GOLD + "    Master Three S+ Runs:" + nf.format(CatacombsTracker.m3SPlus) + "\n" +
-																	EnumChatFormatting.GOLD + "    Master Four S Runs:" + nf.format(CatacombsTracker.m4S) + "\n" +
-																	EnumChatFormatting.GOLD + "    Master Four S+ Runs:" + nf.format(CatacombsTracker.m4SPlus) + "\n" +
-																	EnumChatFormatting.GOLD + "    Master Five S Runs:" + nf.format(CatacombsTracker.m5S) + "\n" +
-																	EnumChatFormatting.GOLD + "    Master Five S+ Runs:" + nf.format(CatacombsTracker.m5SPlus) + "\n" +
-																	EnumChatFormatting.GOLD + "    Master Six S Runs:" + nf.format(CatacombsTracker.m6S) + "\n" +
-																	EnumChatFormatting.GOLD + "    Master Six S+ Runs:" + nf.format(CatacombsTracker.m6SPlus) + "\n" +
-																	EnumChatFormatting.GOLD + "    Master Seven S Runs:" + nf.format(CatacombsTracker.m7S) + "\n" +
-																	EnumChatFormatting.GOLD + "    Master Seven S+ Runs:" + nf.format(CatacombsTracker.m7SPlus) + "\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.GOLD + "    Master One S Runs: " + nf.format(CatacombsTracker.m1S) + "\n" +
+																	EnumChatFormatting.GOLD + "    Master One S+ Runs: " + nf.format(CatacombsTracker.m1SPlus) + "\n" +
+																	EnumChatFormatting.GOLD + "    Master Two S Runs: " + nf.format(CatacombsTracker.m2S) + "\n" +
+																	EnumChatFormatting.GOLD + "    Master Two S+ Runs: " + nf.format(CatacombsTracker.m2SPlus) + "\n" +
+																	EnumChatFormatting.GOLD + "    Master Three S Runs: " + nf.format(CatacombsTracker.m3S) + "\n" +
+																	EnumChatFormatting.GOLD + "    Master Three S+ Runs: " + nf.format(CatacombsTracker.m3SPlus) + "\n" +
+																	EnumChatFormatting.GOLD + "    Master Four S Runs: " + nf.format(CatacombsTracker.m4S) + "\n" +
+																	EnumChatFormatting.GOLD + "    Master Four S+ Runs: " + nf.format(CatacombsTracker.m4SPlus) + "\n" +
+																	EnumChatFormatting.GOLD + "    Master Five S Runs: " + nf.format(CatacombsTracker.m5S) + "\n" +
+																	EnumChatFormatting.GOLD + "    Master Five S+ Runs: " + nf.format(CatacombsTracker.m5SPlus) + "\n" +
+																	EnumChatFormatting.GOLD + "    Master Six S Runs: " + nf.format(CatacombsTracker.m6S) + "\n" +
+																	EnumChatFormatting.GOLD + "    Master Six S+ Runs: " + nf.format(CatacombsTracker.m6SPlus) + "\n" +
+																	EnumChatFormatting.GOLD + "    Master Seven S Runs: " + nf.format(CatacombsTracker.m7S) + "\n" +
+																	EnumChatFormatting.GOLD + "    Master Seven S+ Runs: " + nf.format(CatacombsTracker.m7SPlus) + "\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.GOLD + "    Necron Dyes: " + nf.format(CatacombsTracker.necronDyes) + "\n" +
 																	EnumChatFormatting.GOLD + "    Dark Claymores: " + nf.format(CatacombsTracker.darkClaymores) + "\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.WHITE + "    Rerolls: " + nf.format(CatacombsTracker.masterRerolls) + "\n" +
+																	EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(CatacombsTracker.masterCoinsSpent) + "\n" +
+																	EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, CatacombsTracker.masterTimeSpent) + "\n" +
 																	EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
 						break;
 					default:
diff --git a/src/main/java/me/Danker/features/loot/CatacombsTracker.java b/src/main/java/me/Danker/features/loot/CatacombsTracker.java
index 8d50ab3..634c7ad 100644
--- a/src/main/java/me/Danker/features/loot/CatacombsTracker.java
+++ b/src/main/java/me/Danker/features/loot/CatacombsTracker.java
@@ -108,6 +108,7 @@ public class CatacombsTracker {
     public static int thirdStars;
     public static int fourthStars;
     public static int fifthStars;
+    public static int necronDyes;
     public static int darkClaymores;
     public static int masterRerolls;
     public static double masterCoinsSpent;
@@ -207,6 +208,7 @@ public class CatacombsTracker {
     public static int thirdStarsSession = 0;
     public static int fourthStarsSession = 0;
     public static int fifthStarsSession = 0;
+    public static int necronDyesSession = 0;
     public static int darkClaymoresSession = 0;
     public static int masterRerollsSession = 0;
     public static double masterCoinsSpentSession = 0;
@@ -554,6 +556,10 @@ public class CatacombsTracker {
                 darkClaymores++;
                 darkClaymoresSession++;
                 ConfigHandler.writeIntConfig("catacombs", "darkClaymore", darkClaymores);
+            } else if (message.contains("Necron Dye")) {
+                necronDyes++;
+                necronDyesSession++;
+                ConfigHandler.writeIntConfig("catacombs", "necronDye", necronDyes);
             }
         }
 
diff --git a/src/main/java/me/Danker/features/loot/LootDisplay.java b/src/main/java/me/Danker/features/loot/LootDisplay.java
index 16e64f6..aabdbd9 100644
--- a/src/main/java/me/Danker/features/loot/LootDisplay.java
+++ b/src/main/java/me/Danker/features/loot/LootDisplay.java
@@ -1151,6 +1151,7 @@ public class LootDisplay {
                             EnumChatFormatting.DARK_PURPLE + "3rd Master Stars:\n" +
                             EnumChatFormatting.DARK_PURPLE + "4th Master Stars:\n" +
                             EnumChatFormatting.DARK_PURPLE + "5th Master Stars:\n" +
+                            EnumChatFormatting.GOLD + "Necron Dyes:\n" +
                             EnumChatFormatting.GOLD + "Dark Claymores:\n" +
                             EnumChatFormatting.WHITE + "Rerolls:\n" +
                             EnumChatFormatting.AQUA + "Coins Spent:\n" +
@@ -1163,6 +1164,7 @@ public class LootDisplay {
                             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.GOLD + nf.format(CatacombsTracker.necronDyes) + "\n" +
                             EnumChatFormatting.GOLD + nf.format(CatacombsTracker.darkClaymores) + "\n" +
                             EnumChatFormatting.WHITE + nf.format(CatacombsTracker.masterRerolls) + "\n" +
                             EnumChatFormatting.AQUA + Utils.getMoneySpent(CatacombsTracker.masterCoinsSpent) + "\n" +
@@ -1209,6 +1211,7 @@ public class LootDisplay {
                             EnumChatFormatting.DARK_PURPLE + "3rd Master Stars:\n" +
                             EnumChatFormatting.DARK_PURPLE + "4th Master Stars:\n" +
                             EnumChatFormatting.DARK_PURPLE + "5th Master Stars:\n" +
+                            EnumChatFormatting.GOLD + "Necron Dyes:\n" +
                             EnumChatFormatting.GOLD + "Dark Claymores:\n" +
                             EnumChatFormatting.WHITE + "Rerolls:\n" +
                             EnumChatFormatting.AQUA + "Coins Spent:\n" +
@@ -1221,6 +1224,7 @@ public class LootDisplay {
                             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.GOLD + nf.format(CatacombsTracker.necronDyesSession) + "\n" +
                             EnumChatFormatting.GOLD + nf.format(CatacombsTracker.darkClaymoresSession) + "\n" +
                             EnumChatFormatting.WHITE + nf.format(CatacombsTracker.masterRerollsSession) + "\n" +
                             EnumChatFormatting.AQUA + Utils.getMoneySpent(CatacombsTracker.masterCoinsSpentSession) + "\n" +
diff --git a/src/main/java/me/Danker/handlers/ConfigHandler.java b/src/main/java/me/Danker/handlers/ConfigHandler.java
index 25988a6..dc57e91 100644
--- a/src/main/java/me/Danker/handlers/ConfigHandler.java
+++ b/src/main/java/me/Danker/handlers/ConfigHandler.java
@@ -534,6 +534,7 @@ public class ConfigHandler {
 		CatacombsTracker.thirdStars = initInt("catacombs", "thirdStar", 0);
 		CatacombsTracker.fourthStars = initInt("catacombs", "fourthStar", 0);
 		CatacombsTracker.fifthStars = initInt("catacombs", "fifthStar", 0);
+		CatacombsTracker.necronDyes = initInt("catacombs", "necronDye", 0);
 		CatacombsTracker.darkClaymores = initInt("catacombs", "darkClaymore", 0);
 		CatacombsTracker.masterRerolls = initInt("catacombs", "masterRerolls", 0);
 		CatacombsTracker.masterCoinsSpent = initDouble("catacombs", "masterCoins", 0);