Merge branch 'development' into development

8 files changed, 536 insertions, 496 deletions

diff --git a/src/main/java/me/Danker/features/loot/BlazeTracker.java b/src/main/java/me/Danker/features/loot/BlazeTracker.java
index 896f65f..955f83c 100644
--- a/src/main/java/me/Danker/features/loot/BlazeTracker.java
+++ b/src/main/java/me/Danker/features/loot/BlazeTracker.java
@@ -89,7 +89,7 @@ public class BlazeTracker {
             splashPotions++;
             splashPotionsSession++;
             ConfigHandler.writeIntConfig("blaze", "splashPotions", splashPotions);
-        } else if (message.contains("RARE DROP!  (Bundle of Magma Arrows)")) {
+        } else if (message.contains("RARE DROP! (Bundle of Magma Arrows)")) {
             magmaArrows++;
             magmaArrowsSession++;
             ConfigHandler.writeIntConfig("blaze", "magmaArrows", magmaArrows);
@@ -105,25 +105,30 @@ public class BlazeTracker {
             kelvinInverters++;
             kelvinInvertersSession++;
             ConfigHandler.writeIntConfig("blaze", "kelvinInverters", kelvinInverters);
-        } else if (message.contains("VERY RARE DROP!  (Blaze Rod Distillate)")) {
-            blazeRodDistillates++;
-            blazeRodDistillatesSession++;
+        } else if (message.contains("VERY RARE DROP!  (") && message.contains("Blaze Rod Distillate)")) {
+            int amount = LootTracker.getAmountfromMessage(message);
+            blazeRodDistillates += amount;
+            blazeRodDistillatesSession += amount;
             ConfigHandler.writeIntConfig("blaze", "blazeRodDistillates", blazeRodDistillates);
-        } else if (message.contains("VERY RARE DROP!  (Glowstone Distillate)")) {
-            glowstoneDistillates++;
-            glowstoneDistillatesSession++;
+        } else if (message.contains("VERY RARE DROP!  (") && message.contains("Glowstone Distillate)")) {
+            int amount = LootTracker.getAmountfromMessage(message);
+            glowstoneDistillates += amount;
+            glowstoneDistillatesSession += amount;
             ConfigHandler.writeIntConfig("blaze", "glowstoneDistillates", glowstoneDistillates);
-        } else if (message.contains("VERY RARE DROP!  (Magma Cream Distillate)")) {
-            magmaCreamDistillates++;
-            magmaCreamDistillatesSession++;
+        } else if (message.contains("VERY RARE DROP!  (") && message.contains("Magma Cream Distillate)")) {
+            int amount = LootTracker.getAmountfromMessage(message);
+            magmaCreamDistillates += amount;
+            magmaCreamDistillatesSession += amount;
             ConfigHandler.writeIntConfig("blaze", "magmaCreamDistillates", magmaCreamDistillates);
-        } else if (message.contains("VERY RARE DROP!  (Nether Wart Distillate)")) {
-            netherWartDistillates++;
-            netherWartDistillatesSession++;
+        } else if (message.contains("VERY RARE DROP!  (") && message.contains("Nether Wart Distillate)")) {
+            int amount = LootTracker.getAmountfromMessage(message);
+            netherWartDistillates += amount;
+            netherWartDistillatesSession += amount;
             ConfigHandler.writeIntConfig("blaze", "netherWartDistillates", netherWartDistillates);
-        } else if (message.contains("VERY RARE DROP!  (Gabagool Distillate)")) {
-            gabagoolDistillates++;
-            gabagoolDistillatesSession++;
+        } else if (message.contains("VERY RARE DROP!  (") && message.contains("Gabagool Distillate)")) {
+            int amount = LootTracker.getAmountfromMessage(message);
+            gabagoolDistillates += amount;
+            gabagoolDistillatesSession += amount;
             ConfigHandler.writeIntConfig("blaze", "gabagoolDistillates", gabagoolDistillates);
         } else if (message.contains("VERY RARE DROP!  (Scorched Power Crystal)")) {
             scorchedPowerCrystals++;
@@ -140,8 +145,9 @@ public class BlazeTracker {
             ConfigHandler.writeIntConfig("blaze", "fieryBurstRunes", fieryBurstRunes);
             if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.RED + "FIERY BURST RUNE!", 5);
         } else if (message.contains("VERY RARE DROP!  (") && message.contains(" Flawed Opal Gemstone)")) {
-            opalGems++;
-            opalGemsSession++;
+            int amount = LootTracker.getAmountfromMessage(message);
+            opalGems += amount;
+            opalGemsSession += amount;
             ConfigHandler.writeIntConfig("blaze", "opalGems", opalGems);
         } else if (message.contains("VERY RARE DROP!  (Archfiend Dice)")) {
             archfiendDice++;
diff --git a/src/main/java/me/Danker/features/loot/EndermanTracker.java b/src/main/java/me/Danker/features/loot/EndermanTracker.java
index 38b22f9..1cc46db 100644
--- a/src/main/java/me/Danker/features/loot/EndermanTracker.java
+++ b/src/main/java/me/Danker/features/loot/EndermanTracker.java
@@ -10,51 +10,53 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
 public class EndermanTracker {
 
-    public static int endermanVoidglooms;
-    public static int endermanNullSpheres;
-    public static int endermanTAP;
-    public static int endermanTAPDrops;
-    public static int endermanEndersnakes;
-    public static int endermanSummoningEyes;
-    public static int endermanManaBooks;
-    public static int endermanTuners;
-    public static int endermanAtoms;
-    public static int endermanEspressoMachines;
-    public static int endermanSmartyBooks;
-    public static int endermanEndRunes;
-    public static int endermanChalices;
-    public static int endermanDice;
-    public static int endermanArtifacts;
-    public static int endermanSkins;
-    public static int endermanMergers;
-    public static int endermanCores;
-    public static int endermanEnchantRunes;
-    public static int endermanEnderBooks;
-    public static double endermanTime;
-    public static int endermanBosses;
+    public static int voidglooms;
+    public static int nullSpheres;
+    public static int TAP;
+    public static int TAPDrops;
+    public static int endersnakes;
+    public static int summoningEyes;
+    public static int manaBooks;
+    public static int tuners;
+    public static int atoms;
+    public static int hazmats;
+    public static int espressoMachines;
+    public static int smartyBooks;
+    public static int endRunes;
+    public static int chalices;
+    public static int dice;
+    public static int artifacts;
+    public static int skins;
+    public static int mergers;
+    public static int cores;
+    public static int enchantRunes;
+    public static int enderBooks;
+    public static double time;
+    public static int bosses;
 
-    public static int endermanVoidgloomsSession = 0;
-    public static int endermanNullSpheresSession = 0;
-    public static int endermanTAPSession = 0;
-    public static int endermanTAPDropsSession = 0;
-    public static int endermanEndersnakesSession = 0;
-    public static int endermanSummoningEyesSession = 0;
-    public static int endermanManaBooksSession = 0;
-    public static int endermanTunersSession = 0;
-    public static int endermanAtomsSession = 0;
-    public static int endermanEspressoMachinesSession = 0;
-    public static int endermanSmartyBooksSession = 0;
-    public static int endermanEndRunesSession = 0;
-    public static int endermanChalicesSession = 0;
-    public static int endermanDiceSession = 0;
-    public static int endermanArtifactsSession = 0;
-    public static int endermanSkinsSession = 0;
-    public static int endermanMergersSession = 0;
-    public static int endermanCoresSession = 0;
-    public static int endermanEnchantRunesSession = 0;
-    public static int endermanEnderBooksSession = 0;
-    public static double endermanTimeSession = -1;
-    public static int endermanBossesSession = -1;
+    public static int voidgloomsSession = 0;
+    public static int nullSpheresSession = 0;
+    public static int TAPSession = 0;
+    public static int TAPDropsSession = 0;
+    public static int endersnakesSession = 0;
+    public static int summoningEyesSession = 0;
+    public static int manaBooksSession = 0;
+    public static int tunersSession = 0;
+    public static int atomsSession = 0;
+    public static int hazmatsSession = 0;
+    public static int espressoMachinesSession = 0;
+    public static int smartyBooksSession = 0;
+    public static int endRunesSession = 0;
+    public static int chalicesSession = 0;
+    public static int diceSession = 0;
+    public static int artifactsSession = 0;
+    public static int skinsSession = 0;
+    public static int mergersSession = 0;
+    public static int coresSession = 0;
+    public static int enchantRunesSession = 0;
+    public static int enderBooksSession = 0;
+    public static double timeSession = -1;
+    public static int bossesSession = -1;
 
     @SubscribeEvent
     public void onChat(ClientChatReceivedEvent event) {
@@ -67,110 +69,114 @@ public class EndermanTracker {
         boolean rng = false;
 
         if (message.contains("   Enderman Slayer LVL ")) {
-            endermanVoidglooms++;
-            endermanVoidgloomsSession++;
-            if (endermanBosses != -1) {
-                endermanBosses++;
+            voidglooms++;
+            voidgloomsSession++;
+            if (bosses != -1) {
+                bosses++;
             }
-            if (endermanBossesSession != -1) {
-                endermanBossesSession++;
+            if (bossesSession != -1) {
+                bossesSession++;
             }
-            ConfigHandler.writeIntConfig("enderman", "voidglooms", endermanVoidglooms);
-            ConfigHandler.writeIntConfig("enderman", "bossRNG", endermanBosses);
+            ConfigHandler.writeIntConfig("enderman", "voidglooms", voidglooms);
+            ConfigHandler.writeIntConfig("enderman", "bossRNG", bosses);
         } else if (message.contains("RARE DROP! (") && message.contains("Twilight Arrow Poison)")) {
             int amount = LootTracker.getAmountfromMessage(message);
-            endermanTAP += amount;
-            endermanTAPSession += amount;
-            endermanTAPDrops++;
-            endermanTAPDropsSession++;
-            ConfigHandler.writeIntConfig("enderman", "tap", endermanTAP);
-            ConfigHandler.writeIntConfig("enderman", "tapDrops", endermanTAPDrops);
+            TAP += amount;
+            TAPSession += amount;
+            TAPDrops++;
+            TAPDropsSession++;
+            ConfigHandler.writeIntConfig("enderman", "tap", TAP);
+            ConfigHandler.writeIntConfig("enderman", "tapDrops", TAPDrops);
         } else if (message.contains("VERY RARE DROP!  (") && message.contains(" Endersnake Rune I)")) {
-            endermanEndersnakes++;
-            endermanEndersnakesSession++;
-            ConfigHandler.writeIntConfig("enderman", "endersnakes", endermanEndersnakes);
+            endersnakes++;
+            endersnakesSession++;
+            ConfigHandler.writeIntConfig("enderman", "endersnakes", endersnakes);
         } else if (message.contains("VERY RARE DROP!  (Summoning Eye)")) {
-            endermanSummoningEyes++;
-            endermanSummoningEyesSession++;
-            ConfigHandler.writeIntConfig("enderman", "summoningEyes", endermanSummoningEyes);
+            summoningEyes++;
+            summoningEyesSession++;
+            ConfigHandler.writeIntConfig("enderman", "summoningEyes", summoningEyes);
         } else if (message.contains("VERY RARE DROP!  (Mana Steal I)")) {
-            endermanManaBooks++;
-            endermanManaBooksSession++;
-            ConfigHandler.writeIntConfig("enderman", "manaBooks", endermanManaBooks);
+            manaBooks++;
+            manaBooksSession++;
+            ConfigHandler.writeIntConfig("enderman", "manaBooks", manaBooks);
         } else if (message.contains("VERY RARE DROP!  (Transmission Tuner)")) {
-            endermanTuners++;
-            endermanTunersSession++;
-            ConfigHandler.writeIntConfig("enderman", "tuners", endermanTuners);
+            tuners++;
+            tunersSession++;
+            ConfigHandler.writeIntConfig("enderman", "tuners", tuners);
         } else if (message.contains("VERY RARE DROP!  (Null Atom)")) {
-            endermanAtoms++;
-            endermanAtomsSession++;
-            ConfigHandler.writeIntConfig("enderman", "atoms", endermanAtoms);
+            atoms++;
+            atomsSession++;
+            ConfigHandler.writeIntConfig("enderman", "atoms", atoms);
+        } else if (message.contains("VERY RARE DROP!  (Hazmat Enderman)")) {
+            hazmats++;
+            hazmatsSession++;
+            ConfigHandler.writeIntConfig("enderman", "hazmats", hazmats);
         } else if (message.contains("CRAZY RARE DROP!  (Pocket Espresso Machine)")) {
             rng = true;
-            endermanEspressoMachines++;
-            endermanEspressoMachinesSession++;
-            ConfigHandler.writeIntConfig("enderman", "espressoMachines", endermanEspressoMachines);
+            espressoMachines++;
+            espressoMachinesSession++;
+            ConfigHandler.writeIntConfig("enderman", "espressoMachines", espressoMachines);
             if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.AQUA + "POCKET ESPRESSO MACHINE!", 3);
         } else if (message.contains("VERY RARE DROP!  (Smarty Pants I)")) {
-            endermanSmartyBooks++;
-            endermanSmartyBooksSession++;
-            ConfigHandler.writeIntConfig("enderman", "smartyBooks", endermanSmartyBooks);
+            smartyBooks++;
+            smartyBooksSession++;
+            ConfigHandler.writeIntConfig("enderman", "smartyBooks", smartyBooks);
         } else if (message.contains("VERY RARE DROP!  (") && message.contains(" End Rune I)")) {
-            endermanEndRunes++;
-            endermanEndRunesSession++;
-            ConfigHandler.writeIntConfig("enderman", "endRunes", endermanEndRunes);
+            endRunes++;
+            endRunesSession++;
+            ConfigHandler.writeIntConfig("enderman", "endRunes", endRunes);
         } else if (message.contains("CRAZY RARE DROP!  (Handy Blood Chalice)")) {
             rng = true;
-            endermanChalices++;
-            endermanChalicesSession++;
-            ConfigHandler.writeIntConfig("enderman", "chalices", endermanChalices);
+            chalices++;
+            chalicesSession++;
+            ConfigHandler.writeIntConfig("enderman", "chalices", chalices);
             if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.RED + "HANDY BLOOD CHALICE!", 3);
         } else if (message.contains("VERY RARE DROP!  (Sinful Dice)")) {
-            endermanDice++;
-            endermanDiceSession++;
-            ConfigHandler.writeIntConfig("enderman", "dice", endermanDice);
+            dice++;
+            diceSession++;
+            ConfigHandler.writeIntConfig("enderman", "dice", dice);
         } else if (message.contains("CRAZY RARE DROP!  (Exceedingly Rare Ender Artifact Upgrader)")) {
             rng = true;
-            endermanArtifacts++;
-            endermanArtifactsSession++;
-            ConfigHandler.writeIntConfig("enderman", "artifacts", endermanArtifacts);
+            artifacts++;
+            artifactsSession++;
+            ConfigHandler.writeIntConfig("enderman", "artifacts", artifacts);
             if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_PURPLE + "ENDER ARTIFACT UPGRADER!", 3);
         } else if (message.contains("CRAZY RARE DROP!  (Void Conqueror Enderman Skin)")) {
             rng = true;
-            endermanSkins++;
-            endermanSkinsSession++;
-            ConfigHandler.writeIntConfig("enderman", "skins", endermanSkins);
+            skins++;
+            skinsSession++;
+            ConfigHandler.writeIntConfig("enderman", "skins", skins);
             if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_PURPLE + "ENDERMAN SKIN!", 3);
         } else if (message.contains("VERY RARE DROP!  (Etherwarp Merger)")) {
-            endermanMergers++;
-            endermanMergersSession++;
-            ConfigHandler.writeIntConfig("enderman", "mergers", endermanMergers);
+            mergers++;
+            mergersSession++;
+            ConfigHandler.writeIntConfig("enderman", "mergers", mergers);
         } else if (message.contains("CRAZY RARE DROP!  (Judgement Core)")) {
             rng = true;
-            endermanCores++;
-            endermanCoresSession++;
-            ConfigHandler.writeIntConfig("enderman", "cores", endermanCores);
+            cores++;
+            coresSession++;
+            ConfigHandler.writeIntConfig("enderman", "cores", cores);
             if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.GOLD + "JUDGEMENT CORE!", 5);
         } else if (message.contains("CRAZY RARE DROP!  (") && message.contains(" Enchant Rune I)")) {
             rng = true;
-            endermanEnchantRunes++;
-            endermanEnchantRunesSession++;
-            ConfigHandler.writeIntConfig("enderman", "enchantRunes", endermanEnchantRunes);
+            enchantRunes++;
+            enchantRunesSession++;
+            ConfigHandler.writeIntConfig("enderman", "enchantRunes", enchantRunes);
             if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.GRAY + "ENCHANT RUNE!", 3);
         } else if (message.contains("INSANE DROP!  (Ender Slayer VII)") || message.contains("CRAZY RARE DROP!  (Ender Slayer VII)")) {
             rng = true;
-            endermanEnderBooks++;
-            endermanEnderBooksSession++;
-            ConfigHandler.writeIntConfig("enderman", "enderBooks", endermanEnderBooks);
+            enderBooks++;
+            enderBooksSession++;
+            ConfigHandler.writeIntConfig("enderman", "enderBooks", enderBooks);
             if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.RED + "ENDER SLAYER VII!", 3);
         }
 
         if (rng) {
-            endermanTime = System.currentTimeMillis() / 1000;
-            endermanBosses = 0;
-            endermanTimeSession = System.currentTimeMillis() / 1000;
-            endermanBossesSession = 0;
-            ConfigHandler.writeDoubleConfig("enderman", "timeRNG", endermanTime);
+            time = System.currentTimeMillis() / 1000;
+            bosses = 0;
+            timeSession = System.currentTimeMillis() / 1000;
+            bossesSession = 0;
+            ConfigHandler.writeDoubleConfig("enderman", "timeRNG", time);
             ConfigHandler.writeIntConfig("enderman", "bossRNG", 0);
         }
     }
diff --git a/src/main/java/me/Danker/features/loot/FishingTracker.java b/src/main/java/me/Danker/features/loot/FishingTracker.java
index 95a9040..f8adfa2 100644
--- a/src/main/java/me/Danker/features/loot/FishingTracker.java
+++ b/src/main/java/me/Danker/features/loot/FishingTracker.java
@@ -55,6 +55,7 @@ public class FishingTracker {
     public static int lavaPigmen;
     public static int zombieMiners;
     // Lava fishing
+    public static int plhlegblasts;
     public static int magmaSlugs;
     public static int moogmas;
     public static int lavaLeeches;
@@ -114,6 +115,7 @@ public class FishingTracker {
     public static int lavaPigmenSession = 0;
     public static int zombieMinersSession = 0;
     // Lava fishing
+    public static int plhlegblastsSession = 0;
     public static int magmaSlugsSession = 0;
     public static int moogmasSession = 0;
     public static int lavaLeechesSession = 0;
@@ -320,7 +322,12 @@ public class FishingTracker {
             zombieMinersSession++;
             ConfigHandler.writeIntConfig("fishing", "zombieMiner", zombieMiners);
             increaseSeaCreatures();
-        } else if (message.contains("From Beneath the lava appears a Magma Slug")) {
+        } else if (message.contains("WOAH! A Plhlegblast appeared")) {
+            plhlegblasts++;
+            plhlegblastsSession++;
+            ConfigHandler.writeIntConfig("fishing", "plhlegblast", plhlegblasts);
+            increaseSeaCreatures();
+        } else if (message.contains("From beneath the lava appears a Magma Slug")) {
             magmaSlugs++;
             magmaSlugsSession++;
             ConfigHandler.writeIntConfig("fishing", "magmaSlug", magmaSlugs);
diff --git a/src/main/java/me/Danker/features/loot/LootDisplay.java b/src/main/java/me/Danker/features/loot/LootDisplay.java
index e1ddcb0..7832362 100644
--- a/src/main/java/me/Danker/features/loot/LootDisplay.java
+++ b/src/main/java/me/Danker/features/loot/LootDisplay.java
@@ -37,20 +37,20 @@ public class LootDisplay {
 
             switch (display) {
                 case "wolf":
-                    if (WolfTracker.wolfTime == -1) {
+                    if (WolfTracker.time == -1) {
                         timeBetween = "Never";
                     } else {
-                        timeBetween = Utils.getTimeBetween(WolfTracker.wolfTime, timeNow);
+                        timeBetween = Utils.getTimeBetween(WolfTracker.time, timeNow);
                     }
-                    if (WolfTracker.wolfBosses == -1) {
+                    if (WolfTracker.bosses == -1) {
                         bossesBetween = "Never";
                     } else {
-                        bossesBetween = nf.format(WolfTracker.wolfBosses);
+                        bossesBetween = nf.format(WolfTracker.bosses);
                     }
                     if (ToggleCommand.slayerCountTotal) {
-                        drop20 = nf.format(WolfTracker.wolfWheels);
+                        drop20 = nf.format(WolfTracker.wheels);
                     } else {
-                        drop20 = nf.format(WolfTracker.wolfWheelsDrops) + " times";
+                        drop20 = nf.format(WolfTracker.wheelsDrops) + " times";
                     }
 
                     dropsText = EnumChatFormatting.GOLD + "Svens Killed:\n" +
@@ -58,39 +58,41 @@ public class LootDisplay {
                             EnumChatFormatting.BLUE + "Hamster Wheels:\n" +
                             EnumChatFormatting.AQUA + "Spirit Runes:\n" +
                             EnumChatFormatting.WHITE + "Critical VI Books:\n" +
+                            EnumChatFormatting.DARK_AQUA + "Furballs:\n" +
                             EnumChatFormatting.DARK_RED + "Red Claw Eggs:\n" +
                             EnumChatFormatting.GOLD + "Couture Runes:\n" +
                             EnumChatFormatting.AQUA + "Grizzly Baits:\n" +
                             EnumChatFormatting.DARK_PURPLE + "Overfluxes:\n" +
                             EnumChatFormatting.AQUA + "Time Since RNG:\n" +
                             EnumChatFormatting.AQUA + "Bosses Since RNG:";
-                    countText = EnumChatFormatting.GOLD + nf.format(WolfTracker.wolfSvens) + "\n" +
-                            EnumChatFormatting.GREEN + nf.format(WolfTracker.wolfTeeth) + "\n" +
+                    countText = EnumChatFormatting.GOLD + nf.format(WolfTracker.svens) + "\n" +
+                            EnumChatFormatting.GREEN + nf.format(WolfTracker.teeth) + "\n" +
                             EnumChatFormatting.BLUE + drop20 + "\n" +
-                            EnumChatFormatting.AQUA + WolfTracker.wolfSpirits + "\n" +
-                            EnumChatFormatting.WHITE + WolfTracker.wolfBooks + "\n" +
-                            EnumChatFormatting.DARK_RED + WolfTracker.wolfEggs + "\n" +
-                            EnumChatFormatting.GOLD + WolfTracker.wolfCoutures + "\n" +
-                            EnumChatFormatting.AQUA + WolfTracker.wolfBaits + "\n" +
-                            EnumChatFormatting.DARK_PURPLE + WolfTracker.wolfFluxes + "\n" +
+                            EnumChatFormatting.AQUA + WolfTracker.spirits + "\n" +
+                            EnumChatFormatting.WHITE + WolfTracker.books + "\n" +
+                            EnumChatFormatting.DARK_AQUA + WolfTracker.furballs + "\n" +
+                            EnumChatFormatting.DARK_RED + WolfTracker.eggs + "\n" +
+                            EnumChatFormatting.GOLD + WolfTracker.coutures + "\n" +
+                            EnumChatFormatting.AQUA + WolfTracker.baits + "\n" +
+                            EnumChatFormatting.DARK_PURPLE + WolfTracker.fluxes + "\n" +
                             EnumChatFormatting.AQUA + timeBetween + "\n" +
                             EnumChatFormatting.AQUA + bossesBetween;
                     break;
                 case "wolf_session":
-                    if (WolfTracker.wolfTimeSession == -1) {
+                    if (WolfTracker.timeSession == -1) {
                         timeBetween = "Never";
                     } else {
-                        timeBetween = Utils.getTimeBetween(WolfTracker.wolfTimeSession, timeNow);
+                        timeBetween = Utils.getTimeBetween(WolfTracker.timeSession, timeNow);
                     }
-                    if (WolfTracker.wolfBossesSession == -1) {
+                    if (WolfTracker.bossesSession == -1) {
                         bossesBetween = "Never";
                     } else {
-                        bossesBetween = nf.format(WolfTracker.wolfBossesSession);
+                        bossesBetween = nf.format(WolfTracker.bossesSession);
                     }
                     if (ToggleCommand.slayerCountTotal) {
-                        drop20 = nf.format(WolfTracker.wolfWheelsSession);
+                        drop20 = nf.format(WolfTracker.wheelsSession);
                     } else {
-                        drop20 = nf.format(WolfTracker.wolfWheelsDropsSession) + " times";
+                        drop20 = nf.format(WolfTracker.wheelsDropsSession) + " times";
                     }
 
                     dropsText = EnumChatFormatting.GOLD + "Svens Killed:\n" +
@@ -98,39 +100,41 @@ public class LootDisplay {
                             EnumChatFormatting.BLUE + "Hamster Wheels:\n" +
                             EnumChatFormatting.AQUA + "Spirit Runes:\n" +
                             EnumChatFormatting.WHITE + "Critical VI Books:\n" +
+                            EnumChatFormatting.DARK_AQUA + "Furballs:\n" +
                             EnumChatFormatting.DARK_RED + "Red Claw Eggs:\n" +
                             EnumChatFormatting.GOLD + "Couture Runes:\n" +
                             EnumChatFormatting.AQUA + "Grizzly Baits:\n" +
                             EnumChatFormatting.DARK_PURPLE + "Overfluxes:\n" +
                             EnumChatFormatting.AQUA + "Time Since RNG:\n" +
                             EnumChatFormatting.AQUA + "Bosses Since RNG:";
-                    countText = EnumChatFormatting.GOLD + nf.format(WolfTracker.wolfSvensSession) + "\n" +
-                            EnumChatFormatting.GREEN + nf.format(WolfTracker.wolfTeethSession) + "\n" +
+                    countText = EnumChatFormatting.GOLD + nf.format(WolfTracker.svensSession) + "\n" +
+                            EnumChatFormatting.GREEN + nf.format(WolfTracker.teethSession) + "\n" +
                             EnumChatFormatting.BLUE + drop20 + "\n" +
-                            EnumChatFormatting.AQUA + WolfTracker.wolfSpiritsSession + "\n" +
-                            EnumChatFormatting.WHITE + WolfTracker.wolfBooksSession + "\n" +
-                            EnumChatFormatting.DARK_RED + WolfTracker.wolfEggsSession + "\n" +
-                            EnumChatFormatting.GOLD + WolfTracker.wolfCouturesSession + "\n" +
-                            EnumChatFormatting.AQUA + WolfTracker.wolfBaitsSession + "\n" +
-                            EnumChatFormatting.DARK_PURPLE + WolfTracker.wolfFluxesSession + "\n" +
+                            EnumChatFormatting.AQUA + WolfTracker.spiritsSession + "\n" +
+                            EnumChatFormatting.WHITE + WolfTracker.booksSession + "\n" +
+                            EnumChatFormatting.DARK_AQUA + WolfTracker.furballsSession + "\n" +
+                            EnumChatFormatting.DARK_RED + WolfTracker.eggsSession + "\n" +
+                            EnumChatFormatting.GOLD + WolfTracker.couturesSession + "\n" +
+                            EnumChatFormatting.AQUA + WolfTracker.baitsSession + "\n" +
+                            EnumChatFormatting.DARK_PURPLE + WolfTracker.fluxesSession + "\n" +
                             EnumChatFormatting.AQUA + timeBetween + "\n" +
                             EnumChatFormatting.AQUA + bossesBetween;
                     break;
                 case "spider":
-                    if (SpiderTracker.spiderTime == -1) {
+                    if (SpiderTracker.time == -1) {
                         timeBetween = "Never";
                     } else {
-                        timeBetween = Utils.getTimeBetween(SpiderTracker.spiderTime, timeNow);
+                        timeBetween = Utils.getTimeBetween(SpiderTracker.time, timeNow);
                     }
-                    if (SpiderTracker.spiderBosses == -1) {
+                    if (SpiderTracker.bosses == -1) {
                         bossesBetween = "Never";
                     } else {
-                        bossesBetween = nf.format(SpiderTracker.spiderBosses);
+                        bossesBetween = nf.format(SpiderTracker.bosses);
                     }
                     if (ToggleCommand.slayerCountTotal) {
-                        drop20 = nf.format(SpiderTracker.spiderTAP);
+                        drop20 = nf.format(SpiderTracker.TAP);
                     } else {
-                        drop20 = nf.format(SpiderTracker.spiderTAPDrops) + " times";
+                        drop20 = nf.format(SpiderTracker.TAPDrops) + " times";
                     }
 
                     dropsText = EnumChatFormatting.GOLD + "Tarantulas Killed:\n" +
@@ -144,33 +148,33 @@ public class LootDisplay {
                             EnumChatFormatting.GOLD + "Digested Mosquitos:\n" +
                             EnumChatFormatting.AQUA + "Time Since RNG:\n" +
                             EnumChatFormatting.AQUA + "Bosses Since RNG:";
-                    countText = EnumChatFormatting.GOLD + nf.format(SpiderTracker.spiderTarantulas) + "\n" +
-                            EnumChatFormatting.GREEN + nf.format(SpiderTracker.spiderWebs) + "\n" +
+                    countText = EnumChatFormatting.GOLD + nf.format(SpiderTracker.tarantulas) + "\n" +
+                            EnumChatFormatting.GREEN + nf.format(SpiderTracker.webs) + "\n" +
                             EnumChatFormatting.DARK_GREEN + drop20 + "\n" +
-                            EnumChatFormatting.DARK_GRAY + SpiderTracker.spiderBites + "\n" +
-                            EnumChatFormatting.WHITE + SpiderTracker.spiderBooks + "\n" +
-                            EnumChatFormatting.AQUA + SpiderTracker.spiderCatalysts + "\n" +
-                            EnumChatFormatting.DARK_PURPLE + SpiderTracker.spiderTalismans + "\n" +
-                            EnumChatFormatting.LIGHT_PURPLE + SpiderTracker.spiderSwatters + "\n" +
-                            EnumChatFormatting.GOLD + SpiderTracker.spiderMosquitos + "\n" +
+                            EnumChatFormatting.DARK_GRAY + SpiderTracker.bites + "\n" +
+                            EnumChatFormatting.WHITE + SpiderTracker.books + "\n" +
+                            EnumChatFormatting.AQUA + SpiderTracker.catalysts + "\n" +
+                            EnumChatFormatting.DARK_PURPLE + SpiderTracker.talismans + "\n" +
+                            EnumChatFormatting.LIGHT_PURPLE + SpiderTracker.swatters + "\n" +
+                            EnumChatFormatting.GOLD + SpiderTracker.mosquitos + "\n" +
                             EnumChatFormatting.AQUA + timeBetween + "\n" +
                             EnumChatFormatting.AQUA + bossesBetween;
                     break;
                 case "spider_session":
-                    if (SpiderTracker.spiderTimeSession == -1) {
+                    if (SpiderTracker.timeSession == -1) {
                         timeBetween = "Never";
                     } else {
-                        timeBetween = Utils.getTimeBetween(SpiderTracker.spiderTimeSession, timeNow);
+                        timeBetween = Utils.getTimeBetween(SpiderTracker.timeSession, timeNow);
                     }
-                    if (SpiderTracker.spiderBossesSession == -1) {
+                    if (SpiderTracker.bossesSession == -1) {
                         bossesBetween = "Never";
                     } else {
-                        bossesBetween = nf.format(SpiderTracker.spiderBossesSession);
+                        bossesBetween = nf.format(SpiderTracker.bossesSession);
                     }
                     if (ToggleCommand.slayerCountTotal) {
-                        drop20 = nf.format(SpiderTracker.spiderTAPSession);
+                        drop20 = nf.format(SpiderTracker.TAPSession);
                     } else {
-                        drop20 = nf.format(SpiderTracker.spiderTAPDropsSession) + " times";
+                        drop20 = nf.format(SpiderTracker.TAPDropsSession) + " times";
                     }
 
                     dropsText = EnumChatFormatting.GOLD + "Tarantulas Killed:\n" +
@@ -184,33 +188,33 @@ public class LootDisplay {
                             EnumChatFormatting.GOLD + "Digested Mosquitos:\n" +
                             EnumChatFormatting.AQUA + "Time Since RNG:\n" +
                             EnumChatFormatting.AQUA + "Bosses Since RNG:";
-                    countText = EnumChatFormatting.GOLD + nf.format(SpiderTracker.spiderTarantulasSession) + "\n" +
-                            EnumChatFormatting.GREEN + nf.format(SpiderTracker.spiderWebsSession) + "\n" +
+                    countText = EnumChatFormatting.GOLD + nf.format(SpiderTracker.tarantulasSession) + "\n" +
+                            EnumChatFormatting.GREEN + nf.format(SpiderTracker.websSession) + "\n" +
                             EnumChatFormatting.DARK_GREEN + drop20 + "\n" +
-                            EnumChatFormatting.DARK_GRAY + SpiderTracker.spiderBitesSession + "\n" +
-                            EnumChatFormatting.WHITE + SpiderTracker.spiderBooksSession + "\n" +
-                            EnumChatFormatting.AQUA + SpiderTracker.spiderCatalystsSession + "\n" +
-                            EnumChatFormatting.DARK_PURPLE + SpiderTracker.spiderTalismansSession + "\n" +
-                            EnumChatFormatting.LIGHT_PURPLE + SpiderTracker.spiderSwattersSession + "\n" +
-                            EnumChatFormatting.GOLD + SpiderTracker.spiderMosquitosSession + "\n" +
+                            EnumChatFormatting.DARK_GRAY + SpiderTracker.bitesSession + "\n" +
+                            EnumChatFormatting.WHITE + SpiderTracker.booksSession + "\n" +
+                            EnumChatFormatting.AQUA + SpiderTracker.catalystsSession + "\n" +
+                            EnumChatFormatting.DARK_PURPLE + SpiderTracker.talismansSession + "\n" +
+                            EnumChatFormatting.LIGHT_PURPLE + SpiderTracker.swattersSession + "\n" +
+                            EnumChatFormatting.GOLD + SpiderTracker.mosquitosSession + "\n" +
                             EnumChatFormatting.AQUA + timeBetween + "\n" +
                             EnumChatFormatting.AQUA + bossesBetween;
                     break;
                 case "zombie":
-                    if (ZombieTracker.zombieTime == -1) {
+                    if (ZombieTracker.time == -1) {
                         timeBetween = "Never";
                     } else {
-                        timeBetween = Utils.getTimeBetween(ZombieTracker.zombieTime, timeNow);
+                        timeBetween = Utils.getTimeBetween(ZombieTracker.time, timeNow);
                     }
-                    if (ZombieTracker.zombieBosses == -1) {
+                    if (ZombieTracker.bosses == -1) {
                         bossesBetween = "Never";
                     } else {
-                        bossesBetween = nf.format(ZombieTracker.zombieBosses);
+                        bossesBetween = nf.format(ZombieTracker.bosses);
                     }
                     if (ToggleCommand.slayerCountTotal) {
-                        drop20 = nf.format(ZombieTracker.zombieFoulFlesh);
+                        drop20 = nf.format(ZombieTracker.foulFlesh);
                     } else {
-                        drop20 = nf.format(ZombieTracker.zombieFoulFleshDrops) + " times";
+                        drop20 = nf.format(ZombieTracker.foulFleshDrops) + " times";
                     }
 
                     dropsText = EnumChatFormatting.GOLD + "Revs Killed:\n" +
@@ -229,38 +233,38 @@ public class LootDisplay {
                             EnumChatFormatting.RED + "Warden Hearts:\n" +
                             EnumChatFormatting.AQUA + "Time Since RNG:\n" +
                             EnumChatFormatting.AQUA + "Bosses Since RNG:";
-                    countText = EnumChatFormatting.GOLD + nf.format(ZombieTracker.zombieRevs) + "\n" +
-                            EnumChatFormatting.GREEN + nf.format(ZombieTracker.zombieRevFlesh) + "\n" +
-                            EnumChatFormatting.GREEN + nf.format(ZombieTracker.zombieRevViscera) + "\n" +
+                    countText = EnumChatFormatting.GOLD + nf.format(ZombieTracker.revs) + "\n" +
+                            EnumChatFormatting.GREEN + nf.format(ZombieTracker.revFlesh) + "\n" +
+                            EnumChatFormatting.GREEN + nf.format(ZombieTracker.revViscera) + "\n" +
                             EnumChatFormatting.BLUE + drop20 + "\n" +
-                            EnumChatFormatting.DARK_GREEN + ZombieTracker.zombiePestilences + "\n" +
-                            EnumChatFormatting.WHITE + ZombieTracker.zombieBooks + "\n" +
-                            EnumChatFormatting.WHITE + ZombieTracker.zombieBooksT7 + "\n" +
-                            EnumChatFormatting.AQUA + ZombieTracker.zombieUndeadCatas + "\n" +
-                            EnumChatFormatting.DARK_PURPLE + ZombieTracker.zombieBeheadeds + "\n" +
-                            EnumChatFormatting.RED + ZombieTracker.zombieRevCatas + "\n" +
-                            EnumChatFormatting.DARK_GREEN + ZombieTracker.zombieSnakes + "\n" +