Add new slayer drops

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

1 files changed, 67 insertions, 61 deletions

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);
         }
     }