Add (untested) coins spent in dungeons

4 files changed, 126 insertions, 32 deletions

diff --git a/src/main/java/me/Danker/TheMod.java b/src/main/java/me/Danker/TheMod.java
index 4b60669..b24f48e 100644
--- a/src/main/java/me/Danker/TheMod.java
+++ b/src/main/java/me/Danker/TheMod.java
@@ -12,6 +12,7 @@ import java.util.Map;
 import java.util.regex.Pattern;
 
 import org.lwjgl.input.Keyboard;
+import org.lwjgl.input.Mouse;
 
 import com.google.gson.JsonObject;
 
@@ -89,6 +90,7 @@ public class TheMod
     static int tickAmount = 1;
     public static String lastMaddoxCommand = "/cb placeholdervalue";
     static KeyBinding[] keyBindings = new KeyBinding[1];
+    static int lastMouse = -1;
     
     @EventHandler
     public void init(FMLInitializationEvent event)
@@ -1283,46 +1285,46 @@ public class TheMod
     			dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
     						EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
     						EnumChatFormatting.BLUE + "Bonzo's Staffs:\n" +
-    						EnumChatFormatting.GREEN + "Coins Spent:\n" +
-    						EnumChatFormatting.GREEN + "Time Spent:\n";
+    						EnumChatFormatting.AQUA + "Coins Spent:\n" +
+    						EnumChatFormatting.AQUA + "Time Spent:\n";
     			countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulators) + "\n" +
 							EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooks) + "\n" +
 							EnumChatFormatting.BLUE + nf.format(lc.bonzoStaffs) + "\n" +
-							EnumChatFormatting.GREEN + nf.format(lc.f1CoinsSpent) + "\n" +
-							EnumChatFormatting.GREEN + Utils.getTimeBetween(0, lc.f1TimeSpent);
+							EnumChatFormatting.AQUA + Utils.getMoneySpent(lc.f1CoinsSpent) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, lc.f1TimeSpent);
     		} 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:\n" +
-    						EnumChatFormatting.GREEN + "Coins Spent:\n" +
-    						EnumChatFormatting.GREEN + "Time Spent:\n";
+    						EnumChatFormatting.AQUA + "Coins Spent:\n" +
+    						EnumChatFormatting.AQUA + "Time Spent:\n";
 				countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulatorsSession) + "\n" +
 							EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooksSession) + "\n" +
 							EnumChatFormatting.BLUE + nf.format(lc.bonzoStaffsSession) + "\n" +
-							EnumChatFormatting.GREEN + nf.format(lc.f1CoinsSpentSession) + "\n" +
-							EnumChatFormatting.GREEN + Utils.getTimeBetween(0, lc.f1TimeSpentSession);
+							EnumChatFormatting.AQUA + Utils.getMoneySpent(lc.f1CoinsSpentSession) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, lc.f1TimeSpentSession);
     		} 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:\n" +
-		    				EnumChatFormatting.GREEN + "Coins Spent:\n" +
-		    				EnumChatFormatting.GREEN + "Time Spent:\n";
+		    				EnumChatFormatting.AQUA + "Coins Spent:\n" +
+		    				EnumChatFormatting.AQUA + "Time Spent:\n";
 				countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulators) + "\n" +
 							EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooks) + "\n" +
 							EnumChatFormatting.BLUE + nf.format(lc.scarfStudies) + "\n" +
-							EnumChatFormatting.GREEN + nf.format(lc.f2CoinsSpent) + "\n" +
-							EnumChatFormatting.GREEN + Utils.getTimeBetween(0, lc.f2TimeSpent);
+							EnumChatFormatting.AQUA + Utils.getMoneySpent(lc.f2CoinsSpent) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, lc.f2TimeSpent);
     		} 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:\n" +
-		    				EnumChatFormatting.GREEN + "Coins Spent:\n" +
-		    				EnumChatFormatting.GREEN + "Time Spent:\n";
+		    				EnumChatFormatting.AQUA + "Coins Spent:\n" +
+		    				EnumChatFormatting.AQUA + "Time Spent:\n";
 				countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulatorsSession) + "\n" +
 							EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooksSession) + "\n" +
 							EnumChatFormatting.BLUE + nf.format(lc.scarfStudiesSession) + "\n" +
-							EnumChatFormatting.GREEN + nf.format(lc.f2CoinsSpentSession) + "\n" +
-							EnumChatFormatting.GREEN + Utils.getTimeBetween(0, lc.f2TimeSpentSession);
+							EnumChatFormatting.AQUA + Utils.getMoneySpent(lc.f2CoinsSpentSession) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, lc.f2TimeSpentSession);
     		} else if (ds.display.equals("catacombs_floor_three")) {
     			dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
 							EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
@@ -1331,8 +1333,8 @@ public class TheMod
 							EnumChatFormatting.DARK_PURPLE + "Adaptive Leggings:\n" +
 							EnumChatFormatting.DARK_PURPLE + "Adaptive Boots:\n" +
 							EnumChatFormatting.DARK_PURPLE + "Adaptive Blades\n:" +
-		    				EnumChatFormatting.GREEN + "Coins Spent:\n" +
-		    				EnumChatFormatting.GREEN + "Time Spent:\n";
+		    				EnumChatFormatting.AQUA + "Coins Spent:\n" +
+		    				EnumChatFormatting.AQUA + "Time Spent:\n";
 				countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulators) + "\n" +
 							EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooks) + "\n" +
 							EnumChatFormatting.DARK_PURPLE + nf.format(lc.adaptiveHelms) + "\n" +
@@ -1340,8 +1342,8 @@ public class TheMod
 							EnumChatFormatting.DARK_PURPLE + nf.format(lc.adaptiveLegs) + "\n" +
 							EnumChatFormatting.DARK_PURPLE + nf.format(lc.adaptiveBoots) + "\n" +
 							EnumChatFormatting.DARK_PURPLE + nf.format(lc.adaptiveSwords) + "\n" +
-							EnumChatFormatting.GREEN + nf.format(lc.f3CoinsSpent) + "\n" +
-							EnumChatFormatting.GREEN + Utils.getTimeBetween(0, lc.f3TimeSpent);
+							EnumChatFormatting.AQUA + Utils.getMoneySpent(lc.f3CoinsSpent) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, lc.f3TimeSpent);
     		} else if (ds.display.equals("catacombs_floor_three_session")) {
     			dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
 							EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
@@ -1350,8 +1352,8 @@ public class TheMod
 							EnumChatFormatting.DARK_PURPLE + "Adaptive Leggings:\n" +
 							EnumChatFormatting.DARK_PURPLE + "Adaptive Boots:\n" +
 							EnumChatFormatting.DARK_PURPLE + "Adaptive Blades\n:" +
-		    				EnumChatFormatting.GREEN + "Coins Spent:\n" +
-		    				EnumChatFormatting.GREEN + "Time Spent:\n";
+		    				EnumChatFormatting.AQUA + "Coins Spent:\n" +
+		    				EnumChatFormatting.AQUA + "Time Spent:\n";
 				countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulatorsSession) + "\n" +
 							EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooksSession) + "\n" +
 							EnumChatFormatting.DARK_PURPLE + nf.format(lc.adaptiveHelmsSession) + "\n" +
@@ -1359,8 +1361,8 @@ public class TheMod
 							EnumChatFormatting.DARK_PURPLE + nf.format(lc.adaptiveLegsSession) + "\n" +
 							EnumChatFormatting.DARK_PURPLE + nf.format(lc.adaptiveBootsSession) + "\n" +
 							EnumChatFormatting.DARK_PURPLE + nf.format(lc.adaptiveSwordsSession) + "\n" +
-							EnumChatFormatting.GREEN + nf.format(lc.f3CoinsSpentSession) + "\n" +
-							EnumChatFormatting.GREEN + Utils.getTimeBetween(0, lc.f3TimeSpentSession);
+							EnumChatFormatting.AQUA + Utils.getMoneySpent(lc.f3CoinsSpentSession) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, lc.f3TimeSpentSession);
     		} else if (ds.display.equals("catacombs_floor_four")) {
     			dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
 							EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
@@ -1371,8 +1373,8 @@ public class TheMod
 							EnumChatFormatting.GOLD + "Spirit Bows:\n" +
 							EnumChatFormatting.DARK_PURPLE + "Epic Spirit Pets:\n" +
 							EnumChatFormatting.GOLD + "Leg Spirit Pets:\n" +
-		    				EnumChatFormatting.GREEN + "Coins Spent:\n" +
-		    				EnumChatFormatting.GREEN + "Time Spent:\n";
+		    				EnumChatFormatting.AQUA + "Coins Spent:\n" +
+		    				EnumChatFormatting.AQUA + "Time Spent:\n";
 				countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulators) + "\n" +
 							EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooks) + "\n" +
 							EnumChatFormatting.DARK_PURPLE + nf.format(lc.spiritWings) + "\n" +
@@ -1382,8 +1384,8 @@ public class TheMod
 							EnumChatFormatting.GOLD + nf.format(lc.spiritBows) + "\n" +
 							EnumChatFormatting.DARK_PURPLE + nf.format(lc.epicSpiritPets) + "\n" +
 							EnumChatFormatting.GOLD + nf.format(lc.legSpiritPets) + "\n" +
-							EnumChatFormatting.GREEN + nf.format(lc.f4CoinsSpent) + "\n" +
-							EnumChatFormatting.GREEN + Utils.getTimeBetween(0, lc.f4TimeSpent);
+							EnumChatFormatting.AQUA + Utils.getMoneySpent(lc.f4CoinsSpent) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, lc.f4TimeSpent);
     		} else if (ds.display.equals("catacombs_floor_four_session")) {
     			dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
 							EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
@@ -1394,8 +1396,8 @@ public class TheMod
 							EnumChatFormatting.GOLD + "Spirit Bows:\n" +
 							EnumChatFormatting.DARK_PURPLE + "Epic Spirit Pets:\n" +
 							EnumChatFormatting.GOLD + "Leg Spirit Pets:\n" +
-		    				EnumChatFormatting.GREEN + "Coins Spent:\n" +
-		    				EnumChatFormatting.GREEN + "Time Spent:\n";
+		    				EnumChatFormatting.AQUA + "Coins Spent:\n" +
+		    				EnumChatFormatting.AQUA + "Time Spent:\n";
 				countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulatorsSession) + "\n" +
 							EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooksSession) + "\n" +
 							EnumChatFormatting.DARK_PURPLE + nf.format(lc.spiritWingsSession) + "\n" +
@@ -1405,8 +1407,8 @@ public class TheMod
 							EnumChatFormatting.GOLD + nf.format(lc.spiritBowsSession) + "\n" +
 							EnumChatFormatting.DARK_PURPLE + nf.format(lc.epicSpiritPetsSession) + "\n" +
 							EnumChatFormatting.GOLD + nf.format(lc.legSpiritPetsSession) + "\n" +
-							EnumChatFormatting.GREEN + nf.format(lc.f4CoinsSpentSession) + "\n" +
-							EnumChatFormatting.GREEN + Utils.getTimeBetween(0, lc.f4TimeSpentSession);
+							EnumChatFormatting.AQUA + Utils.getMoneySpent(lc.f4CoinsSpentSession) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, lc.f4TimeSpentSession);
     		} else {
     			ConfigHandler cf = new ConfigHandler();
     			
@@ -1529,6 +1531,60 @@ public class TheMod
     }
     
     @SubscribeEvent
+    public void onGuiMouseInput(GuiScreenEvent.MouseInputEvent.Pre event) {
+    	if (!Utils.inSkyblock) return;
+    	if (Mouse.getEventButton() != 0 && Mouse.getEventButton() != 1) return; // Left click or right click
+    	if (Mouse.getEventButton() == lastMouse) return;
+    	lastMouse = Mouse.getEventButton();
+    	
+    	if (event.gui instanceof GuiChest) {
+    		LootCommand lc = new LootCommand();
+    		ConfigHandler cf = new ConfigHandler();
+    		GuiChest inventory = (GuiChest) event.gui;
+    		Slot mouseSlot = inventory.getSlotUnderMouse();
+			if (mouseSlot == null || mouseSlot.getStack() == null) return;
+			ItemStack item = mouseSlot.getStack();
+			
+			if (item.getDisplayName().contains("Open Reward Chest")) {
+				List<String> tooltip = item.getTooltip(Minecraft.getMinecraft().thePlayer, Minecraft.getMinecraft().gameSettings.advancedItemTooltips);
+				for (String line : tooltip) {
+					if (line.contains("FREE")) {
+						break;
+					} else if (line.contains(" Coins")) {
+						int coinsSpent = Integer.parseInt(line.substring(0, line.indexOf(" ")).replaceAll(",", ""));
+						
+						List<String> scoreboard = ScoreboardHandler.getSidebarLines();
+						for (String s : scoreboard) {
+							String sCleaned = ScoreboardHandler.cleanSB(s);
+							if (sCleaned.contains("The Catacombs (")) {
+								if (sCleaned.contains("F1")) {
+									lc.f1CoinsSpent += coinsSpent;
+									lc.f1CoinsSpentSession += coinsSpent;
+									cf.writeDoubleConfig("catacombs", "floorOneCoins", lc.f1CoinsSpent);
+								} else if (sCleaned.contains("F2")) {
+									lc.f2CoinsSpent += coinsSpent;
+									lc.f2CoinsSpentSession += coinsSpent;
+									cf.writeDoubleConfig("catacombs", "floorTwoCoins", lc.f2CoinsSpent);
+								} else if (sCleaned.contains("F3")) {
+									lc.f3CoinsSpent += coinsSpent;
+									lc.f3CoinsSpentSession += coinsSpent;
+									cf.writeDoubleConfig("catacombs", "floorThreeCoins", lc.f3CoinsSpent);
+								} else if (sCleaned.contains("F4")) {
+									lc.f4CoinsSpent += coinsSpent;
+									lc.f4CoinsSpentSession += coinsSpent;
+									cf.writeDoubleConfig("catacombs", "floorFourCoins", lc.f4CoinsSpent);
+								}
+								break;
+							}
+							break;
+						}
+					}
+				}
+			}
+    	}
+    }
+    
+    @SubscribeEvent
     public void onGuiRender(GuiScreenEvent.BackgroundDrawnEvent event) {
     	if (!Utils.inSkyblock) return;
     	if (ToggleCommand.petColoursToggled && event.gui instanceof GuiChest) {
diff --git a/src/main/java/me/Danker/commands/LootCommand.java b/src/main/java/me/Danker/commands/LootCommand.java
index 97db73d..3e9d0ba 100644
--- a/src/main/java/me/Danker/commands/LootCommand.java
+++ b/src/main/java/me/Danker/commands/LootCommand.java
@@ -592,6 +592,8 @@ public class LootCommand extends CommandBase {
 																EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(recombobulatorsSession) + "\n" +
 																EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(fumingPotatoBooksSession) + "\n" +
 																EnumChatFormatting.BLUE + "    Bonzo's Staffs: " + nf.format(bonzoStaffsSession) + "\n" +
+																EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f1CoinsSpentSession) + "\n" +
+																EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f1TimeSpentSession) + "\n" +
 																EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
 					return;
 				}
@@ -600,6 +602,8 @@ public class LootCommand extends CommandBase {
 															EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(recombobulators) + "\n" +
 															EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(fumingPotatoBooks) + "\n" +
 															EnumChatFormatting.BLUE + "    Bonzo's Staffs: " + nf.format(bonzoStaffs) + "\n" +
+															EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f1CoinsSpent) + "\n" +
+															EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f1TimeSpent) + "\n" +
 															EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
 			} else if (arg1[1].equalsIgnoreCase("f2") || arg1[1].equalsIgnoreCase("floor2")) {
 				if (showSession) {
@@ -608,6 +612,8 @@ public class LootCommand extends CommandBase {
 																EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(recombobulatorsSession) + "\n" +
 																EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(fumingPotatoBooksSession) + "\n" +
 																EnumChatFormatting.BLUE + "    Scarf's Studies: " + nf.format(scarfStudiesSession) + "\n" +
+																EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f2CoinsSpentSession) + "\n" +
+																EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f2TimeSpentSession) + "\n" +
 																EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
 					return;
 				}
@@ -616,6 +622,8 @@ public class LootCommand extends CommandBase {
 															EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(recombobulators) + "\n" +
 															EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(fumingPotatoBooks) + "\n" +
 															EnumChatFormatting.BLUE + "    Scarf's Studies: " + nf.format(scarfStudies) + "\n" +
+															EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f2CoinsSpent) + "\n" +
+															EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f2TimeSpent) + "\n" +
 															EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
 			} else if (arg1[1].equalsIgnoreCase("f3") || arg1[1].equalsIgnoreCase("floor3")) {
 				if (showSession) {
@@ -628,6 +636,8 @@ public class LootCommand extends CommandBase {
 																EnumChatFormatting.DARK_PURPLE + "    Adaptive Leggings: " + nf.format(adaptiveLegsSession) + "\n" +
 																EnumChatFormatting.DARK_PURPLE + "    Adaptive Boots: " + nf.format(adaptiveBootsSession) + "\n" +
 																EnumChatFormatting.DARK_PURPLE + "    Adaptive Blades: " + nf.format(adaptiveSwordsSession) + "\n" +
+																EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f3CoinsSpentSession) + "\n" +
+																EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f3TimeSpentSession) + "\n" +
 																EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
 					return;
 				}
@@ -640,6 +650,8 @@ public class LootCommand extends CommandBase {
 															EnumChatFormatting.DARK_PURPLE + "    Adaptive Leggings: " + nf.format(adaptiveLegs) + "\n" +
 															EnumChatFormatting.DARK_PURPLE + "    Adaptive Boots: " + nf.format(adaptiveBoots) + "\n" +
 															EnumChatFormatting.DARK_PURPLE + "    Adaptive Blades: " + nf.format(adaptiveSwords) + "\n" +
+															EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f3CoinsSpent) + "\n" +
+															EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f3TimeSpent) + "\n" +
 															EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
 			} else if (arg1[1].equalsIgnoreCase("f4") || arg1[1].equalsIgnoreCase("floor4")) {
 				if (showSession) {
@@ -654,6 +666,8 @@ public class LootCommand extends CommandBase {
 																EnumChatFormatting.GOLD + "    Spirit Bows: " + nf.format(spiritBowsSession) + "\n" +
 																EnumChatFormatting.DARK_PURPLE + "    Epic Spirit Pets: " + nf.format(epicSpiritPetsSession) + "\n" +
 																EnumChatFormatting.GOLD + "    Leg Spirit Pets: " + nf.format(legSpiritPetsSession) + "\n" +
+																EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f4CoinsSpentSession) + "\n" +
+																EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f4TimeSpentSession) + "\n" +
 																EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
 					return;
 				}
@@ -668,6 +682,8 @@ public class LootCommand extends CommandBase {
 															EnumChatFormatting.GOLD + "    Spirit Bows: " + nf.format(spiritBows) + "\n" +
 															EnumChatFormatting.DARK_PURPLE + "    Epic Spirit Pets: " + nf.format(epicSpiritPets) + "\n" +
 															EnumChatFormatting.GOLD + "    Leg Spirit Pets: " + nf.format(legSpiritPets) + "\n" +
+															EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f4CoinsSpent) + "\n" +
+															EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f4TimeSpent) + "\n" +
 															EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
 			} else {
 				player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /loot catacombs <f1/f2/f3/f4>"));
diff --git a/src/main/java/me/Danker/handlers/ConfigHandler.java b/src/main/java/me/Danker/handlers/ConfigHandler.java
index 6671677..1955b3d 100644
--- a/src/main/java/me/Danker/handlers/ConfigHandler.java
+++ b/src/main/java/me/Danker/handlers/ConfigHandler.java
@@ -258,14 +258,20 @@ public class ConfigHandler {
 		if (!hasKey("catacombs", "fumingBooks")) writeIntConfig("catacombs", "fumingBooks", 0);
 		// F1
 		if (!hasKey("catacombs", "bonzoStaff")) writeIntConfig("catacombs", "bonzoStaff", 0);
+		if (!hasKey("catacombs", "floorOneCoins")) writeDoubleConfig("catacombs", "floorOneCoins", 0);
+		if (!hasKey("catacombs", "floorOneTime")) writeDoubleConfig("catacombs", "floorOneTime", 0);
 		// F2
 		if (!hasKey("catacombs", "scarfStudies")) writeIntConfig("catacombs", "scarfStudies", 0);
+		if (!hasKey("catacombs", "floorTwoCoins")) writeDoubleConfig("catacombs", "floorTwoCoins", 0);
+		if (!hasKey("catacombs", "floorTwoTime")) writeDoubleConfig("catacombs", "floorTwoTime", 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);
+		if (!hasKey("catacombs", "floorThreeCoins")) writeDoubleConfig("catacombs", "floorThreeCoins", 0);
+		if (!hasKey("catacombs", "floorThreeTime")) writeDoubleConfig("catacombs", "floorThreeTime", 0);
 		// F4
 		if (!hasKey("catacombs", "spiritWing")) writeIntConfig("catacombs", "spiritWing", 0);
 		if (!hasKey("catacombs", "spiritBone")) writeIntConfig("catacombs", "spiritBone", 0);
@@ -274,6 +280,8 @@ public class ConfigHandler {
 		if (!hasKey("catacombs", "spiritBow")) writeIntConfig("catacombs", "spiritBow", 0);
 		if (!hasKey("catacombs", "spiritPetEpic")) writeIntConfig("catacombs", "spiritPetEpic", 0);
 		if (!hasKey("catacombs", "spiritPetLeg")) writeIntConfig("catacombs", "spiritPetLeg", 0);
+		if (!hasKey("catacombs", "floorFourCoins")) writeDoubleConfig("catacombs", "floorFourCoins", 0);
+		if (!hasKey("catacombs", "floorFourTime")) writeDoubleConfig("catacombs", "floorFourTime", 0);
 		
 		if (!hasKey("misc", "display")) writeStringConfig("misc", "display", "off");
 		
@@ -375,14 +383,20 @@ public class ConfigHandler {
 		lc.fumingPotatoBooks = getInt("catacombs", "fumingBooks");
 		// F1
 		lc.bonzoStaffs = getInt("catacombs", "bonzoStaff");
+		lc.f1CoinsSpent = getDouble("catacombs", "floorOneCoins");
+		lc.f1TimeSpent = getDouble("catacombs", "floorOneTime");
 		// F2
 		lc.scarfStudies = getInt("catacombs", "scarfStudies");
+		lc.f2CoinsSpent = getDouble("catacombs", "floorTwoCoins");
+		lc.f2TimeSpent = getDouble("catacombs", "floorTwoTime");
 		// 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");
+		lc.f3CoinsSpent = getDouble("catacombs", "floorThreeCoins");
+		lc.f3TimeSpent = getDouble("catacombs", "floorThreeTime");
 		// F4
 		lc.spiritWings = getInt("catacombs", "spiritWing");
 		lc.spiritBones = getInt("catacombs", "spiritBone");
@@ -391,6 +405,8 @@ public class ConfigHandler {
 		lc.spiritBows = getInt("catacombs", "spiritBow");
 		lc.epicSpiritPets = getInt("catacombs", "spiritPetEpic");
 		lc.legSpiritPets = getInt("catacombs", "spiritPetLeg");
+		lc.f4CoinsSpent = getDouble("catacombs", "floorFourCoins");
+		lc.f4TimeSpent = getDouble("catacombs", "floorFourTime");
 		
 		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 2dfa9c3..67f8439 100644
--- a/src/main/java/me/Danker/utils/Utils.java
+++ b/src/main/java/me/Danker/utils/Utils.java
@@ -171,6 +171,12 @@ public class Utils {
 		return timeFormatted;
 	}
 	
+	public static String getMoneySpent(double coins) {
+		double coinsSpentMillions = coins / 1000000D;
+		coinsSpentMillions = Math.floor(coinsSpentMillions * 100D) / 100D;
+		return coinsSpentMillions + "M";
+	}
+	
 	public static double xpToSkillLevel(double xp) {
 		for (int i = 0, xpAdded = 0; i < skillXPPerLevel.length; i++) {
 			xpAdded += skillXPPerLevel[i];