Add new slayer drops

Add furball to wolf tracker and hazmat enderman to enderman tracket
Also make variable names less redudant

6 files changed, 493 insertions, 473 deletions

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/LootDisplay.java b/src/main/java/me/Danker/features/loot/LootDisplay.java
index e1ddcb0..f2f86b0 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" +
-                            EnumChatFormatting.GOLD + ZombieTracker.zombieScythes + "\n" +
-                            EnumChatFormatting.RED + ZombieTracker.zombieShards + "\n" +
-                            EnumChatFormatting.RED + ZombieTracker.zombieWardenHearts + "\n" +
+                            EnumChatFormatting.DARK_GREEN + ZombieTracker.pestilences + "\n" +
+                            EnumChatFormatting.WHITE + ZombieTracker.books + "\n" +
+                            EnumChatFormatting.WHITE + ZombieTracker.booksT7 + "\n" +
+                            EnumChatFormatting.AQUA + ZombieTracker.undeadCatas + "\n" +
+                            EnumChatFormatting.DARK_PURPLE + ZombieTracker.beheadeds + "\n" +
+                            EnumChatFormatting.RED + ZombieTracker.revCatas + "\n" +
+                            EnumChatFormatting.DARK_GREEN + ZombieTracker.snakes + "\n" +
+                            EnumChatFormatting.GOLD + ZombieTracker.scythes + "\n" +
+                            EnumChatFormatting.RED + ZombieTracker.shards + "\n" +
+                            EnumChatFormatting.RED + ZombieTracker.wardenHearts + "\n" +
                             EnumChatFormatting.AQUA + timeBetween + "\n" +
                             EnumChatFormatting.AQUA + bossesBetween;
                     break;
                 case "zombie_session":
-                    if (ZombieTracker.zombieTimeSession == -1) {
+                    if (ZombieTracker.timeSession == -1) {
                         timeBetween = "Never";
                     } else {
-                        timeBetween = Utils.getTimeBetween(ZombieTracker.zombieTimeSession, timeNow);
+                        timeBetween = Utils.getTimeBetween(ZombieTracker.timeSession, timeNow);
                     }
-                    if (ZombieTracker.zombieBossesSession == -1) {
+                    if (ZombieTracker.bossesSession == -1) {
                         bossesBetween = "Never";
                     } else {
-                        bossesBetween = nf.format(ZombieTracker.zombieBossesSession);
+                        bossesBetween = nf.format(ZombieTracker.bossesSession);
                     }
                     if (ToggleCommand.slayerCountTotal) {
-                        drop20 = nf.format(ZombieTracker.zombieFoulFleshSession);
+                        drop20 = nf.format(ZombieTracker.foulFleshSession);
                     } else {
-                        drop20 = nf.format(ZombieTracker.zombieFoulFleshDropsSession) + " times";
+                        drop20 = nf.format(ZombieTracker.foulFleshDropsSession) + " times";
                     }
 
                     dropsText = EnumChatFormatting.GOLD + "Revs Killed:\n" +
@@ -279,38 +283,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.zombieRevsSession) + "\n" +
-                            EnumChatFormatting.GREEN + nf.format(ZombieTracker.zombieRevFleshSession) + "\n" +
-                            EnumChatFormatting.GREEN + nf.format(ZombieTracker.zombieRevVisceraSession) + "\n" +
+                    countText = EnumChatFormatting.GOLD + nf.format(ZombieTracker.revsSession) + "\n" +
+                            EnumChatFormatting.GREEN + nf.format(ZombieTracker.revFleshSession) + "\n" +
+                            EnumChatFormatting.GREEN + nf.format(ZombieTracker.revVisceraSession) + "\n" +
                             EnumChatFormatting.BLUE + drop20 + "\n" +
-                            EnumChatFormatting.DARK_GREEN + ZombieTracker.zombiePestilencesSession + "\n" +
-                            EnumChatFormatting.WHITE + ZombieTracker.zombieBooksSession + "\n" +
-                            EnumChatFormatting.WHITE + ZombieTracker.zombieBooksT7Session + "\n" +
-                            EnumChatFormatting.AQUA + ZombieTracker.zombieUndeadCatasSession + "\n" +
-                            EnumChatFormatting.DARK_PURPLE + ZombieTracker.zombieBeheadedsSession + "\n" +
-                            EnumChatFormatting.RED + ZombieTracker.zombieRevCatasSession + "\n" +
-                            EnumChatFormatting.DARK_GREEN + ZombieTracker.zombieSnakesSession + "\n" +
-                            EnumChatFormatting.GOLD + ZombieTracker.zombieScythes + "\n" +
-                            EnumChatFormatting.RED + ZombieTracker.zombieShardsSession + "\n" +
-                            EnumChatFormatting.RED + ZombieTracker.zombieWardenHeartsSession + "\n" +
+                            EnumChatFormatting.DARK_GREEN + ZombieTracker.pestilencesSession + "\n" +
+                            EnumChatFormatting.WHITE + ZombieTracker.booksSession + "\n" +
+                            EnumChatFormatting.WHITE + ZombieTracker.booksT7Session + "\n" +
+                            EnumChatFormatting.AQUA + ZombieTracker.undeadCatasSession + "\n" +
+                            EnumChatFormatting.DARK_PURPLE + ZombieTracker.beheadedsSession + "\n" +
+                            EnumChatFormatting.RED + ZombieTracker.revCatasSession + "\n" +
+                            EnumChatFormatting.DARK_GREEN + ZombieTracker.snakesSession + "\n" +
+                            EnumChatFormatting.GOLD + ZombieTracker.scythes + "\n" +
+                            EnumChatFormatting.RED + ZombieTracker.shardsSession + "\n" +
+                            EnumChatFormatting.RED + ZombieTracker.wardenHeartsSession + "\n" +
                             EnumChatFormatting.AQUA + timeBetween + "\n" +
                             EnumChatFormatting.AQUA + bossesBetween;
                     break;
                 case "enderman":
-                    if (EndermanTracker.endermanTime == -1) {
+                    if (EndermanTracker.time == -1) {
                         timeBetween = "Never";
                     } else {
-                        timeBetween = Utils.getTimeBetween(EndermanTracker.endermanTime, timeNow);
+                        timeBetween = Utils.getTimeBetween(EndermanTracker.time, timeNow);
                     }
-                    if (EndermanTracker.endermanBosses == -1) {
+                    if (EndermanTracker.bosses == -1) {
                         bossesBetween = "Never";
                     } else {
-                        bossesBetween = nf.format(EndermanTracker.endermanBosses);
+                        bossesBetween = nf.format(EndermanTracker.bosses);
                     }
                     if (ToggleCommand.slayerCountTotal) {
-                        drop20 = nf.format(EndermanTracker.endermanTAP);
+                        drop20 = nf.format(EndermanTracker.TAP);
                     } else {
-                        drop20 = nf.format(EndermanTracker.endermanTAPDrops) + " times";
+                        drop20 = nf.format(EndermanTracker.TAPDrops) + " times";
                     }
                     
                     dropsText = EnumChatFormatting.GOLD + "Voidglooms Killed:\n" +
@@ -321,6 +325,7 @@ public class LootDisplay {
                             EnumChatFormatting.AQUA + "Mana Steal Books:\n" +
                             EnumChatFormatting.BLUE + "Transmission Tuners:\n" +
                             EnumChatFormatting.YELLOW + "Null Atoms:\n" +
+                            EnumChatFormatting.YELLOW + "Hazmat Endermen:\n" +
                             EnumChatFormatting.AQUA + "Espresso Machines:\n" +
                             EnumChatFormatting.WHITE + "Smarty Pants Books:\n" +
                             EnumChatFormatting.LIGHT_PURPLE + "End Runes:\n" +
@@ -334,43 +339,44 @@ public class LootDisplay {
                             EnumChatFormatting.RED + "Ender Slayer Books:\n" +
                             EnumChatFormatting.AQUA + "Time Since RNG:\n" +
                             EnumChatFormatting.AQUA + "Bosses Since RNG:";
-                    countText = EnumChatFormatting.GOLD + nf.format(EndermanTracker.endermanVoidglooms) + "\n" +
-                            EnumChatFormatting.DARK_GRAY + nf.format(EndermanTracker.endermanNullSpheres) + "\n" +
+                    countText = EnumChatFormatting.GOLD + nf.format(EndermanTracker.voidglooms) + "\n" +
+                            EnumChatFormatting.DARK_GRAY + nf.format(EndermanTracker.nullSpheres) + "\n" +
                             EnumChatFormatting.DARK_PURPLE + drop20 + "\n" +
-                            EnumChatFormatting.LIGHT_PURPLE + EndermanTracker.endermanEndersnakes + "\n" +
-                            EnumChatFormatting.DARK_GREEN + EndermanTracker.endermanSummoningEyes + "\n" +
-                            EnumChatFormatting.AQUA + EndermanTracker.endermanManaBooks + "\n" +
-                            EnumChatFormatting.BLUE + EndermanTracker.endermanTuners + "\n" +
-                            EnumChatFormatting.YELLOW + EndermanTracker.endermanAtoms + "\n" +
-                            EnumChatFormatting.AQUA + EndermanTracker.endermanEspressoMachines + "\n" +
-                            EnumChatFormatting.WHITE + EndermanTracker.endermanSmartyBooks + "\n" +
-                            EnumChatFormatting.LIGHT_PURPLE + EndermanTracker.endermanEndRunes + "\n" +
-                            EnumChatFormatting.RED + EndermanTracker.endermanChalices + "\n" +
-                            EnumChatFormatting.RED + EndermanTracker.endermanDice + "\n" +
-                            EnumChatFormatting.DARK_PURPLE + EndermanTracker.endermanArtifacts + "\n" +
-                            EnumChatFormatting.DARK_PURPLE + EndermanTracker.endermanSkins + "\n" +
-                            EnumChatFormatting.GRAY + EndermanTracker.endermanEnchantRunes + "\n" +
-                            EnumChatFormatting.GOLD + EndermanTracker.endermanMergers + "\n" +
-                            EnumChatFormatting.GOLD + EndermanTracker.endermanCores + "\n" +
-                            EnumChatFormatting.RED + EndermanTracker.endermanEnderBooks + "\n" +
+                            EnumChatFormatting.LIGHT_PURPLE + EndermanTracker.endersnakes + "\n" +
+                            EnumChatFormatting.DARK_GREEN + EndermanTracker.summoningEyes + "\n" +
+                            EnumChatFormatting.AQUA + EndermanTracker.manaBooks + "\n" +
+                            EnumChatFormatting.BLUE + EndermanTracker.tuners + "\n" +
+                            EnumChatFormatting.YELLOW + EndermanTracker.atoms + "\n" +
+                            EnumChatFormatting.YELLOW + EndermanTracker.hazmats + "\n" +
+                            EnumChatFormatting.AQUA + EndermanTracker.espressoMachines + "\n" +
+                            EnumChatFormatting.WHITE + EndermanTracker.smartyBooks + "\n" +
+                            EnumChatFormatting.LIGHT_PURPLE + EndermanTracker.endRunes + "\n" +
+                            EnumChatFormatting.RED + EndermanTracker.chalices + "\n" +
+                            EnumChatFormatting.RED + EndermanTracker.dice + "\n" +
+                            EnumChatFormatting.DARK_PURPLE + EndermanTracker.artifacts + "\n" +
+                            EnumChatFormatting.DARK_PURPLE + EndermanTracker.skins + "\n" +
+                            EnumChatFormatting.GRAY + EndermanTracker.enchantRunes + "\n" +
+                            EnumChatFormatting.GOLD + EndermanTracker.mergers + "\n" +
+                            EnumChatFormatting.GOLD + EndermanTracker.cores + "\n" +
+                            EnumChatFormatting.RED + EndermanTracker.enderBooks + "\n" +
                             EnumChatFormatting.AQUA + timeBetween + "\n" +
                             EnumChatFormatting.AQUA + bossesBetween;
                     break;
                 case "enderman_session":
-                    if (EndermanTracker.endermanTimeSession == -1) {
+                    if (EndermanTracker.timeSession == -1) {
                         timeBetween = "Never";
                     } else {
-                        timeBetween = Utils.getTimeBetween(EndermanTracker.endermanTimeSession, timeNow);
+                        timeBetween = Utils.getTimeBetween(EndermanTracker.timeSession, timeNow);
                     }
-                    if (EndermanTracker.endermanBossesSession == -1) {
+                    if (EndermanTracker.bossesSession == -1) {
                         bossesBetween = "Never";
                     } else {
-                        bossesBetween = nf.format(EndermanTracker.endermanBossesSession);
+                        bossesBetween = nf.format(EndermanTracker.bossesSession);
                     }
                     if (ToggleCommand.slayerCountTotal) {
-                        drop20 = nf.format(EndermanTracker.endermanTAPSession);
+                        drop20 = nf.format(EndermanTracker.TAPSession);
                     } else {
-                        drop20 = nf.format(EndermanTracker.endermanTAPDropsSession) + " times";
+                        drop20 = nf.format(EndermanTracker.TAPDropsSession) + " times";
                     }
 
                     dropsText = EnumChatFormatting.GOLD + "Voidglooms Killed:\n" +
@@ -381,6 +387,7 @@ public class LootDisplay {
                             EnumChatFormatting.AQUA + "Mana Steal Books:\n" +
                             EnumChatFormatting.BLUE + "Transmission Tuners:\n" +
                             EnumChatFormatting.YELLOW + "Null Atoms:\n" +
+                            EnumChatFormatting.YELLOW + "Hazmat Endermen:\n" +
                             EnumChatFormatting.AQUA + "Espresso Machines:\n" +
                             EnumChatFormatting.WHITE + "Smarty Pants Books:\n" +
                             EnumChatFormatting.LIGHT_PURPLE + "End Runes:\n" +
@@ -394,25 +401,26 @@ public class LootDisplay {
                             EnumChatFormatting.RED + "Ender Slayer Books:\n" +
                             EnumChatFormatting.AQUA + "Time Since RNG:\n" +
                             EnumChatFormatting.AQUA + "Bosses Since RNG:";
-                    countText = EnumChatFormatting.GOLD + nf.format(EndermanTracker.endermanVoidgloomsSession) + "\n" +
-                            EnumChatFormatting.DARK_GRAY + nf.format(EndermanTracker.endermanNullSpheresSession) + "\n" +
+                    countText = EnumChatFormatting.GOLD + nf.format(EndermanTracker.voidgloomsSession) + "\n" +
+                            EnumChatFormatting.DARK_GRAY + nf.format(EndermanTracker.nullSpheresSession) + "\n" +
                             EnumChatFormatting.DARK_PURPLE + drop20 + "\n" +
-                            EnumChatFormatting.LIGHT_PURPLE + EndermanTracker.endermanEndersnakesSession + "\n" +
-                            EnumChatFormatting.DARK_GREEN + EndermanTracker.endermanSummoningEyesSession + "\n" +
-                            EnumChatFormatting.AQUA + EndermanTracker.endermanManaBooksSession + "\n" +
-                            EnumChatFormatting.BLUE + EndermanTracker.endermanTunersSession + "\n" +
-                            EnumChatFormatting.YELLOW + EndermanTracker.endermanAtomsSession + "\n" +
-                            EnumChatFormatting.AQUA + EndermanTracker.endermanEspressoMachinesSession + "\n" +
-                            EnumChatFormatting.WHITE + EndermanTracker.endermanSmartyBooksSession + "\n" +
-                            EnumChatFormatting.LIGHT_PURPLE + EndermanTracker.endermanEndRunesSession + "\n" +
-                            EnumChatFormatting.RED + EndermanTracker.endermanChalicesSession + "\n" +
-                            EnumChatFormatting.RED + EndermanTracker.endermanDiceSession + "\n" +
-                            EnumChatFormatting.DARK_PURPLE + EndermanTracker.endermanArtifactsSession + "\n" +
-                            EnumChatFormatting.DARK_PURPLE + EndermanTracker.endermanSkinsSession + "\n" +
-                            EnumChatFormatting.GRAY + EndermanTracker.endermanEnchantRunesSession + "\n" +
-                            EnumChatFormatting.GOLD + EndermanTracker.endermanMergersSession + "\n" +
-                            EnumChatFormatting.GOLD + EndermanTracker.endermanCoresSession + "\n" +
-                            EnumChatFormatting.RED + EndermanTracker.endermanEnderBooksSession + "\n" +
+                            EnumChatFormatting.LIGHT_PURPLE + EndermanTracker.endersnakesSession + "\n" +
+                            EnumChatFormatting.DARK_GREEN + EndermanTracker.summoningEyesSession + "\n" +
+                            EnumChatFormatting.AQUA + EndermanTracker.manaBooksSession + "\n" +
+                            EnumChatFormatting.BLUE + EndermanTracker.tunersSession + "\n" +
+                            EnumChatFormatting.YELLOW + EndermanTracker.atomsSession + "\n" +
+                            EnumChatFormatting.YELLOW + EndermanTracker.hazmatsSession + "\n" +
+                            EnumChatFormatting.AQUA + EndermanTracker.espressoMachinesSession + "\n" +
+                            EnumChatFormatting.WHITE + EndermanTracker.smartyBooksSession + "\n" +
+                            EnumChatFormatting.LIGHT_PURPLE + EndermanTracker.endRunesSession + "\n" +
+                            EnumChatFormatting.RED + EndermanTracker.chalicesSession + "\n" +
+                            EnumChatFormatting.RED + EndermanTracker.diceSession + "\n" +
+                            EnumChatFormatting.DARK_PURPLE + EndermanTracker.artifactsSession + "\n" +
+                            EnumChatFormatting.DARK_PURPLE + EndermanTracker.skinsSession + "\n" +
+                            EnumChatFormatting.GRAY + EndermanTracker.enchantRunesSession + "\n" +
+                            EnumChatFormatting.GOLD + EndermanTracker.mergersSession + "\n" +
+                            EnumChatFormatting.GOLD + EndermanTracker.coresSession + "\n" +
+                            EnumChatFormatting.RED + EndermanTracker.enderBooksSession + "\n" +
                             EnumChatFormatting.AQUA + timeBetween + "\n" +
                             EnumChatFormatting.AQUA + bossesBetween;
                     break;
diff --git a/src/main/java/me/Danker/features/loot/LootTracker.java b/src/main/java/me/Danker/features/loot/LootTracker.java
index d654109..7fa223d 100644
--- a/src/main/java/me/Danker/features/loot/LootTracker.java
+++ b/src/main/java/me/Danker/features/loot/LootTracker.java
@@ -39,21 +39,21 @@ public class LootTracker {
                     // If no items, are detected, allow check again. Should fix items not being found
                     if (itemTeeth + itemWebs + itemRev + itemNullSphere + itemDerelictAshe > 0) {
                         itemsChecked = System.currentTimeMillis() / 1000;
-                        WolfTracker.wolfTeeth += itemTeeth;
-                        SpiderTracker.spiderWebs += itemWebs;
-                        ZombieTracker.zombieRevFlesh += itemRev;
-                        EndermanTracker.endermanNullSpheres += itemNullSphere;
+                        WolfTracker.teeth += itemTeeth;
+                        SpiderTracker.webs += itemWebs;
+                        ZombieTracker.revFlesh += itemRev;
+                        EndermanTracker.nullSpheres += itemNullSphere;
                         BlazeTracker.derelictAshes += itemDerelictAshe;
-                        WolfTracker.wolfTeethSession += itemTeeth;
-                        SpiderTracker.spiderWebsSession += itemWebs;
-                        ZombieTracker.zombieRevFleshSession += itemRev;
-                        EndermanTracker.endermanNullSpheresSession += itemNullSphere;
+                        WolfTracker.teethSession += itemTeeth;
+                        SpiderTracker.websSession += itemWebs;
+                        ZombieTracker.revFleshSession += itemRev;
+                        EndermanTracker.nullSpheresSession += itemNullSphere;
                         BlazeTracker.derelictAshesSession += itemDerelictAshe;
 
-                        ConfigHandler.writeIntConfig("wolf", "teeth", WolfTracker.wolfTeeth);
-                        ConfigHandler.writeIntConfig("spider", "web", SpiderTracker.spiderWebs);
-                        ConfigHandler.writeIntConfig("zombie", "revFlesh", ZombieTracker.zombieRevFlesh);
-                        ConfigHandler.writeIntConfig("enderman", "nullSpheres", EndermanTracker.endermanNullSpheres);
+                        ConfigHandler.writeIntConfig("wolf", "teeth", WolfTracker.teeth);
+                        ConfigHandler.writeIntConfig("spider", "web", SpiderTracker.webs);
+                        ConfigHandler.writeIntConfig("zombie", "revFlesh", ZombieTracker.revFlesh);
+                        ConfigHandler.writeIntConfig("enderman", "nullSpheres", EndermanTracker.nullSpheres);
                         ConfigHandler.writeIntConfig("blaze", "derelictAshe", BlazeTracker.derelictAshes);
                     }
                 }
diff --git a/src/main/java/me/Danker/features/loot/SpiderTracker.java b/src/main/java/me/Danker/features/loot/SpiderTracker.java
index 34ee695..05a8e75 100644
--- a/src/main/java/me/Danker/features/loot/SpiderTracker.java
+++ b/src/main/java/me/Danker/features/loot/SpiderTracker.java
@@ -10,31 +10,31 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
 public class SpiderTracker {
 
-    public static int spiderTarantulas;
-    public static int spiderWebs;
-    public static int spiderTAP;
-    public static int spiderTAPDrops;
-    public static int spiderBites;
-    public static int spiderCatalysts;
-    public static int spiderBooks;
-    public static int spiderSwatters;
-    public static int spiderTalismans;
-    public static int spiderMosquitos;
-    public static double spiderTime;
-    public static int spiderBosses;
+    public static int tarantulas;
+    public static int webs;
+    public static int TAP;
+    public static int TAPDrops;
+    public static int bites;
+    public static int catalysts;
+    public static int books;
+    public static int swatters;
+    public static int talismans;
+    public static int mosquitos;
+    public static double time;
+    public static int bosses;
 
-    public static int spiderTarantulasSession = 0;
-    public static int spiderWebsSession = 0;
-    public static int spiderTAPSession = 0;
-    public static int spiderTAPDropsSession = 0;
-    public static int spiderBitesSession = 0;
-    public static int spiderCatalystsSession = 0;
-    public static int spiderBooksSession = 0;
-    public static int spiderSwattersSession = 0;
-    public static int spiderTalismansSession = 0;
-    public static int spiderMosquitosSession = 0;
-    public static double spiderTimeSession = -1;
-    public static int spiderBossesSession = -1;
+    public static int tarantulasSession = 0;
+    public static int websSession = 0;
+    public static int TAPSession = 0;
+    public static int TAPDropsSession = 0;
+    public static int bitesSession = 0;
+    public static int catalystsSession = 0;
+    public static int booksSession = 0;
+    public static int swattersSession = 0;
+    public static int talismansSession = 0;
+    public static int mosquitosSession = 0;
+    public static double timeSession = -1;
+    public static int bossesSession = -1;
 
     @SubscribeEvent
     public void onChat(ClientChatReceivedEvent event) {
@@ -47,62 +47,62 @@ public class SpiderTracker {
         boolean rng = false;
 
         if (message.contains("   Spider Slayer LVL ")) { // Spider
-            spiderTarantulas++;
-            spiderTarantulasSession++;
-            if (spiderBosses != -1) {
-                spiderBosses++;
+            tarantulas++;
+            tarantulasSession++;
+            if (bosses != -1) {
+                bosses++;
             }
-            if (spiderBossesSession != -1) {
-                spiderBossesSession++;
+            if (bossesSession != -1) {
+                bossesSession++;
             }
-            ConfigHandler.writeIntConfig("spider", "tarantulas", spiderTarantulas);
-            ConfigHandler.writeIntConfig("spider", "bossRNG", spiderBosses);
+            ConfigHandler.writeIntConfig("spider", "tarantulas", tarantulas);
+            ConfigHandler.writeIntConfig("spider", "bossRNG", bosses);
         } else if (message.contains("RARE DROP! (") && message.contains("Toxic Arrow Poison)")) {
             int amount = LootTracker.getAmountfromMessage(message);
-            spiderTAP += amount;
-            spiderTAPSession += amount;
-            spiderTAPDrops++;
-            spiderTAPDropsSession++;
-            ConfigHandler.writeIntConfig("spider", "tap", spiderTAP);
-            ConfigHandler.writeIntConfig("spider", "tapDrops", spiderTAPDrops);
+            TAP += amount;
+            TAPSession += amount;
+            TAPDrops++;
+            TAPDropsSession++;
+            ConfigHandler.writeIntConfig("spider", "tap", TAP);
+            ConfigHandler.writeIntConfig("spider", "tapDrops", TAPDrops);
         } else if (message.contains("VERY RARE DROP!  (") && message.contains(" Bite Rune I)")) {
-            spiderBites++;
-            spiderBitesSession++;
-            ConfigHandler.writeIntConfig("spider", "bite", spiderBites);
+            bites++;
+            bitesSession++;
+            ConfigHandler.writeIntConfig("spider", "bite", bites);
         } else if (message.contains("VERY RARE DROP!  (Bane of Arthropods VI)")) {
-            spiderBooks++;
-            spiderBooksSession++;
-            ConfigHandler.writeIntConfig("spider", "book", spiderBooks);
+            books++;
+            booksSession++;
+            ConfigHandler.writeIntConfig("spider", "book", books);
         } else if (message.contains("VERY RARE DROP!  (Spider Catalyst)")) {
-            spiderCatalysts++;
-            spiderCatalystsSession++;
-            ConfigHandler.writeIntConfig("spider", "catalyst", spiderCatalysts);
+            catalysts++;
+            catalystsSession++;
+            ConfigHandler.writeIntConfig("spider", "catalyst", catalysts);
         } else if (message.contains("CRAZY RARE DROP!  (Fly Swatter)")) {
             rng = true;
-            spiderSwatters++;
-            spiderSwattersSession++;
-            ConfigHandler.writeIntConfig("spider", "swatter", spiderSwatters);
+            swatters++;
+            swattersSession++;
+            ConfigHandler.writeIntConfig("spider", "swatter", swatters);
             if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.LIGHT_PURPLE + "FLY SWATTER!", 3);
         } else if (message.contains("CRAZY RARE DROP!  (Tarantula Talisman")) {
             rng = true;
-            spiderTalismans++;
-            spiderTalismansSession++;
-            ConfigHandler.writeIntConfig("spider", "talisman", spiderTalismans);
+            talismans++;
+            talismansSession++;
+            ConfigHandler.writeIntConfig("spider", "talisman", talismans);
             if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_PURPLE + "TARANTULA TALISMAN!", 3);
         } else if (message.contains("CRAZY RARE DROP!  (Digested Mosquito)")) {
             rng = true;
-            spiderMosquitos++;
-            spiderMosquitosSession++;
-            ConfigHandler.writeIntConfig("spider", "mosquito", spiderMosquitos);
+            mosquitos++;
+            mosquitosSession++;
+            ConfigHandler.writeIntConfig("spider", "mosquito", mosquitos);
             if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.GOLD + "DIGESTED MOSQUITO!", 5);
         }
 
         if (rng) {
-            spiderTime = System.currentTimeMillis() / 1000;
-            spiderBosses = 0;
-            spiderTimeSession = System.currentTimeMillis() / 1000;
-            spiderBossesSession = 0;
-            ConfigHandler.writeDoubleConfig("spider", "timeRNG", spiderTime);
+            time = System.currentTimeMillis() / 1000;
+            bosses = 0;
+            timeSession = System.currentTimeMillis() / 1000;
+            bossesSession = 0;
+            ConfigHandler.writeDoubleConfig("spider", "timeRNG", time);
             ConfigHandler.writeIntConfig("spider", "bossRNG", 0);
         }
     }
diff --git a/src/main/java/me/Danker/features/loot/WolfTracker.java b/src/main/java/me/Danker/features/loot/WolfTracker.java
index 449a3b4..906f507 100644
--- a/src/main/java/me/Danker/features/loot/WolfTracker.java
+++ b/src/main/java/me/Danker/features/loot/WolfTracker.java
@@ -10,31 +10,33 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
 public class WolfTracker {
 
-    public static int wolfSvens;
-    public static int wolfTeeth;
-    public static int wolfWheels;
-    public static int wolfWheelsDrops;
-    public static int wolfSpirits;
-    public static int wolfBooks;
-    public static int wolfEggs;
-    public static int wolfCoutures;
-    public static int wolfBaits;
-    public static int wolfFluxes;
-    public static double wolfTime;
-    public static int wolfBosses;
+    public static int svens;
+    public static int teeth;
+    public static int wheels;
+    public static int wheelsDrops;
+    public static int spirits;
+    public static int books;
+    public static int furballs;
+    public static int eggs;
+    public static int coutures;
+    public static int baits;
+    public static int fluxes;
+    public static double time;
+    public static int bosses;
 
-    public static int wolfSvensSession = 0;
-    public static int wolfTeethSession = 0;
-    public static int wolfWheelsSession = 0;
-    public static int wolfWheelsDropsSession = 0;
-    public static int wolfSpiritsSession = 0;
-    public static int wolfBooksSession = 0;
-    public static int wolfEggsSession = 0;
-    public static int wolfCouturesSession = 0;
-    public static int wolfBaitsSession = 0;
-    public static int wolfFluxesSession = 0;
-    public static double wolfTimeSession = -1;
-    public static int wolfBossesSession = -1;
+    public static int svensSession = 0;
+    public static int teethSession = 0;
+    public static int wheelsSession = 0;
+    public static int wheelsDropsSession = 0;
+    public static int spiritsSession = 0;
+    public static int booksSession = 0;
+    public static int furballsSession = 0;
+    public static int eggsSession = 0;
+    public static int couturesSession = 0;
+    public static int baitsSession = 0;
+    public static int fluxesSession = 0;
+    public static double timeSession = -1;
+    public static int bossesSession = -1;
 
     @SubscribeEvent
     public void onChat(ClientChatReceivedEvent event) {
@@ -47,64 +49,68 @@ public class WolfTracker {
         boolean rng = false;
 
         if (message.contains("   Wolf Slayer LVL ")) {
-            wolfSvens++;
-            wolfSvensSession++;
-            if (wolfBosses != -1) {
-                wolfBosses++;
+            svens++;
+            svensSession++;
+            if (bosses != -1) {
+                bosses++;
             }
-            if (wolfBossesSession != -1) {
-                wolfBossesSession++;
+            if (bossesSession != -1) {
+                bossesSession++;
             }
-            ConfigHandler.writeIntConfig("wolf", "svens", wolfSvens);
-            ConfigHandler.writeIntConfig("wolf", "bossRNG", wolfBosses);
+            ConfigHandler.writeIntConfig("wolf", "svens", svens);
+            ConfigHandler.writeIntConfig("wolf", "bossRNG", bosses);
         } else if (message.contains("RARE DROP! (") && message.contains("Hamster Wheel)")) {
             int amount = LootTracker.getAmountfromMessage(message);
-            wolfWheels += amount;
-            wolfWheelsSession += amount;
-            wolfWheelsDrops++;
-            wolfWheelsDropsSession++;
-            ConfigHandler.writeIntConfig("wolf", "wheel", wolfWheels);
-            ConfigHandler.writeIntConfig("wolf", "wheelDrops", wolfWheelsDrops);
+            wheels += amount;
+            wheelsSession += amount;
+            wheelsDrops++;
+            wheelsDropsSession++;
+            ConfigHandler.writeIntConfig("wolf", "wheel", wheels);
+            ConfigHandler.writeIntConfig("wolf", "wheelDrops", wheelsDrops);
         } else if (message.contains("VERY RARE DROP!  (") && message.contains(" Spirit Rune I)")) { // Removing the unicode here *should* fix rune drops not counting
-            wolfSpirits++;
-            wolfSpiritsSession++;
-            ConfigHandler.writeIntConfig("wolf", "spirit", wolfSpirits);
+            spirits++;
+            spiritsSession++;
+            ConfigHandler.writeIntConfig("wolf", "spirit", spirits);
         } else if (message.contains("VERY RARE DROP!  (Critical VI)")) {
-            wolfBooks++;
-            wolfBooksSession++;
-            ConfigHandler.writeIntConfig("wolf", "book", wolfBooks);
+            books++;
+            booksSession++;
+            ConfigHandler.writeIntConfig("wolf", "book", books);
+        } else if (message.contains("VERY RARE DROP!  (Furball)")) {
+            furballs++;
+            furballsSession++;
+            ConfigHandler.writeIntConfig("wolf", "furball", furballs);
         } else if (message.contains("CRAZY RARE DROP!  (Red Claw Egg)")) {
             rng = true;
-            wolfEggs++;
-            wolfEggsSession++;
-            ConfigHandler.writeIntConfig("wolf", "egg", wolfEggs);
+            eggs++;
+            eggsSession++;
+            ConfigHandler.writeIntConfig("wolf", "egg", eggs);
             if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_RED + "RED CLAW EGG!", 3);
         } else if (message.contains("CRAZY RARE DROP!  (") && message.contains(" Couture Rune I)")) {
             rng = true;
-            wolfCoutures++;
-            wolfCouturesSession++;
-            ConfigHandler.writeIntConfig("wolf", "couture", wolfCoutures);
+            coutures++;
+            couturesSession++;
+            ConfigHandler.writeIntConfig("wolf", "couture", coutures);
             if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.GOLD + "COUTURE RUNE!", 3);
         } else if (message.contains("CRAZY RARE DROP!  (Grizzly Bait)") || message.contains("CRAZY RARE DROP! (Rename Me)")) { // How did Skyblock devs even manage to make this item Rename Me
             rng = true;
-            wolfBaits++;
-            wolfBaitsSession++;
-            ConfigHandler.writeIntConfig("wolf", "bait", wolfBaits);
+            baits++;
+            baitsSession++;
+            ConfigHandler.writeIntConfig("wolf", "bait", baits);
             if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.AQUA + "GRIZZLY BAIT!", 3);
         } else if (message.contains("CRAZY RARE DROP!  (Overflux Capacitor)")) {
             rng = true;
-            wolfFluxes++;
-            wolfFluxesSession++;
-            ConfigHandler.writeIntConfig("wolf", "flux", wolfFluxes);
+            fluxes++;
+            fluxesSession++;
+            ConfigHandler.writeIntConfig("wolf", "flux", fluxes);
             if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_PURPLE + "OVERFLUX CAPACITOR!", 5);
         }
 
         if (rng) {
-            wolfTime = System.currentTimeMillis() / 1000;
-            wolfBosses = 0;
-            wolfTimeSession = System.currentTimeMillis() / 1000;
-            wolfBossesSession = 0;
-            ConfigHandler.writeDoubleConfig("wolf", "timeRNG", wolfTime);
+            time = System.currentTimeMillis() / 1000;
+            bosses = 0;
+            timeSession = System.currentTimeMillis() / 1000;
+            bossesSession = 0;
+            ConfigHandler.writeDoubleConfig("wolf", "timeRNG", time);
             ConfigHandler.writeIntConfig("wolf", "bossRNG", 0);
         }
     }
diff --git a/src/main/java/me/Danker/features/loot/ZombieTracker.java b/src/main/java/me/Danker/features/loot/ZombieTracker.java
index 1d71222..922e1f4 100644
--- a/src/main/java/me/Danker/features/loot/ZombieTracker.java
+++ b/src/main/java/me/Danker/features/loot/ZombieTracker.java
@@ -10,41 +10,41 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
 public class ZombieTracker {
 
-    public static int zombieRevs;
-    public static int zombieRevFlesh;
-    public static int zombieRevViscera;
-    public static int zombieFoulFlesh;
-    public static int zombieFoulFleshDrops;
-    public static int zombiePestilences;
-    public static int zombieUndeadCatas;
-    public static int zombieBooks;
-    public static int zombieBooksT7;
-    public static int zombieBeheadeds;
-    public static int zombieRevCatas;
-    public static int zombieSnakes;
-    public static int zombieScythes;
-    public static int zombieShards;
-    public static int zombieWardenHearts;
-    public static double zombieTime;
-    public static int zombieBosses;
+    public static int revs;
+    public static int revFlesh;
+    public static int revViscera;
+    public static int foulFlesh;
+    public static int foulFleshDrops;
+    public static int pestilences;
+    public static int undeadCatas;
+    public static int books;
+    public static int booksT7;
+    public static int beheadeds;
+    public static int revCatas;
+    public static int snakes;
+    public static int scythes;
+    public static int shards;
+    public static int wardenHearts;
+    public static double time;
+    public static int bosses;
 
-    public static int zombieRevsSession = 0;
-    public static int zombieRevFleshSession = 0;
-    public static int zombieRevVisceraSession = 0;
-    public static int zombieFoulFleshSession = 0;
-    public static int zombieFoulFleshDropsSession = 0;
-    public static int zombiePestilencesSession = 0;
-    public static int zombieUndeadCatasSession = 0;
-    public static int zombieBooksSession = 0;
-    public static int zombieBooksT7Session = 0;
-    public static int zombieBeheadedsSession = 0;
-    public static int zombieRevCatasSession = 0;
-    public static int zombieSnakesSession = 0;
-    public static int zombieScythesSession = 0;
-    public static int zombieShardsSession = 0;
-    public static int zombieWardenHeartsSession = 0;
-    public static double zombieTimeSession = -1;
-    public static int zombieBossesSession = -1;
+    public static int revsSession = 0;
+    public static int revFleshSession = 0;
+    public static int revVisceraSession = 0;
+    public static int foulFleshSession = 0;
+    public static int foulFleshDropsSession = 0;
+    public static int pestilencesSession = 0;
+    public static int undeadCatasSession = 0;
+    public static int booksSession = 0;
+    public static int booksT7Session = 0;
+    public static int beheadedsSession = 0;
+    public static int revCatasSession = 0;
+    public static int snakesSession = 0;
+    public static int scythesSession = 0;
+    public static int shardsSession = 0;
+    public static int wardenHeartsSession = 0;
+    public static double timeSession = -1;
+    public static int bossesSession = -1;
 
     @SubscribeEvent
     public void onChat(ClientChatReceivedEvent event) {
@@ -57,87 +57,87 @@ public class ZombieTracker {
         boolean rng = false;
 
         if (message.contains("   Zombie Slayer LVL ")) { // Zombie
-            zombieRevs++;
-            zombieRevsSession++;
-            if (zombieBosses != -1) {
-                zombieBosses++;
+            revs++;
+            revsSession++;
+            if (bosses != -1) {
+                bosses++;
             }
-            if (zombieBossesSession != 1) {
-                zombieBossesSession++;
+            if (bossesSession != 1) {
+                bossesSession++;
             }
-            ConfigHandler.writeIntConfig("zombie", "revs", zombieRevs);
-            ConfigHandler.writeIntConfig("zombie", "bossRNG", zombieBosses);
+            ConfigHandler.writeIntConfig("zombie", "revs", revs);
+            ConfigHandler.writeIntConfig("zombie", "bossRNG", bosses);
         } else if (message.contains("RARE DROP! (") && message.contains("Revenant Viscera)")) {
             int amount = LootTracker.getAmountfromMessage(message);
-            zombieRevViscera += amount;
-            zombieRevVisceraSession += amount;
-            ConfigHandler.writeIntConfig("zombie", "revViscera", zombieRevViscera);
+            revViscera += amount;
+            revVisceraSession += amount;
+            ConfigHandler.writeIntConfig("zombie", "revViscera", revViscera);
         } else if (message.contains("RARE DROP! (") && message.contains("Foul Flesh)")) {
             int amount = LootTracker.getAmountfromMessage(message);
-            zombieFoulFlesh += amount;
-            zombieFoulFleshSession += amount;
-            zombieFoulFleshDrops++;
-            zombieFoulFleshDropsSession++;
-            ConfigHandler.writeIntConfig("zombie", "foulFlesh", zombieFoulFlesh);
-            ConfigHandler.writeIntConfig("zombie", "foulFleshDrops", zombieFoulFleshDrops);
+            foulFlesh += amount;
+            foulFleshSession += amount;
+            foulFleshDrops++;
+            foulFleshDropsSession++;
+            ConfigHandler.writeIntConfig("zombie", "foulFlesh", foulFlesh);
+            ConfigHandler.writeIntConfig("zombie", "foulFleshDrops", foulFleshDrops);
         } else if (message.contains("VERY RARE DROP!  (Revenant Catalyst)")) {
-            zombieRevCatas++;
-            zombieRevCatasSession++;
-            ConfigHandler.writeIntConfig("zombie", "revCatalyst", zombieRevCatas);
+            revCatas++;
+            revCatasSession++;
+            ConfigHandler.writeIntConfig("zombie", "revCatalyst", revCatas);
         } else if (message.contains("VERY RARE DROP!  (") && message.contains(" Pestilence Rune I)")) {
-            zombiePestilences++;
-            zombiePestilencesSession++;
-            ConfigHandler.writeIntConfig("zombie", "pestilence", zombiePestilences);
+            pestilences++;
+            pestilencesSession++;
+            ConfigHandler.writeIntConfig("zombie", "pestilence", pestilences);
         } else if (message.contains("VERY RARE DROP!  (Smite VI)")) {
-            zombieBooks++;
-            zombieBooksSession++;
-            ConfigHandler.writeIntConfig("zombie", "book", zombieBooks);
+            books++;
+            booksSession++;
+            ConfigHandler.writeIntConfig("zombie", "book", books);
         } else if (message.contains("VERY RARE DROP!  (Smite VII)")) {
-            zombieBooksT7++;
-            zombieBooksT7Session++;
-            ConfigHandler.writeIntConfig("zombie", "bookT7", zombieBooksT7);
+            booksT7++;
+            booksT7Session++;
+            ConfigHandler.writeIntConfig("zombie", "bookT7", booksT7);
         } else if (message.contains("VERY RARE DROP!  (Undead Catalyst)")) {
-            zombieUndeadCatas++;
-            zombieUndeadCatasSession++;
-            ConfigHandler.writeIntConfig("zombie", "undeadCatalyst", zombieUndeadCatas);
+            undeadCatas++;
+            undeadCatasSession++;
+            ConfigHandler.writeIntConfig("zombie", "undeadCatalyst", undeadCatas);
         } else if (message.contains("CRAZY RARE DROP!  (Beheaded Horror)")) {
             rng = true;
-            zombieBeheadeds++;
-            zombieBeheadedsSession++;
-            ConfigHandler.writeIntConfig("zombie", "beheaded", zombieBeheadeds);
+            beheadeds++;
+            beheadedsSession++;
+            ConfigHandler.writeIntConfig("zombie", "beheaded", beheadeds);
             if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_PURPLE + "BEHEADED HORROR!", 3);
         } else if (message.contains("CRAZY RARE DROP!  (") && message.contains(" Snake Rune I)")) {
             rng = true;
-            zombieSnakes++;
-            zombieSnakesSession++;
-            ConfigHandler.writeIntConfig("zombie", "snake", zombieSnakes);
+            snakes++;
+            snakesSession++;
+            ConfigHandler.writeIntConfig("zombie", "snake", snakes);
             if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_GREEN + "SNAKE RUNE!", 3);
         } else if (message.contains("CRAZY RARE DROP!  (Scythe Blade)")) {
             rng = true;
-            zombieScythes++;
-            zombieScythesSession++;
-            ConfigHandler.writeIntConfig("zombie", "scythe", zombieScythes);
+            scythes++;
+            scythesSession++;
+            ConfigHandler.writeIntConfig("zombie", "scythe", scythes);
             if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.GOLD + "SCYTHE BLADE!", 5);
         } else if (message.contains("CRAZY RARE DROP!  (Shard of the Shredded)")) {
             rng = true;
-            zombieShards++;
-            zombieShardsSession++;
-            ConfigHandler.writeIntConfig("zombie", "shard", zombieShards);
+            shards++;
+            shardsSession++;
+            ConfigHandler.writeIntConfig("zombie", "shard", shards);
             if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.RED + "SHARD OF THE SHREDDED!", 5);
         } else if (message.contains("INSANE DROP!  (Warden Heart)") || message.contains("CRAZY RARE DROP!  (Warden Heart)")) {
             rng = true;
-            zombieWardenHearts++;
-            zombieWardenHeartsSession++;
-            ConfigHandler.writeIntConfig("zombie", "heart", zombieWardenHearts);
+            wardenHearts++;
+            wardenHeartsSession++;
+            ConfigHandler.writeIntConfig("zombie", "heart", wardenHearts);
             if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.RED + "WARDEN HEART!", 5);
         }
 
         if (rng) {
-            zombieTime = System.currentTimeMillis() / 1000;
-            zombieBosses = 0;
-            zombieTimeSession = System.currentTimeMillis() / 1000;
-            zombieBossesSession = 0;
-            ConfigHandler.writeDoubleConfig("zombie", "timeRNG", zombieTime);
+            time = System.currentTimeMillis() / 1000;
+            bosses = 0;
+            timeSession = System.currentTimeMillis() / 1000;
+            bossesSession = 0;
+            ConfigHandler.writeDoubleConfig("zombie", "timeRNG", time);
             ConfigHandler.writeIntConfig("zombie", "bossRNG", 0);
         }
     }