Fix slayer book tracking and add smite 7

4 files changed, 22 insertions, 24 deletions

diff --git a/src/main/java/me/Danker/features/loot/LootDisplay.java b/src/main/java/me/Danker/features/loot/LootDisplay.java
index 9f7f0e3..b1c584d 100644
--- a/src/main/java/me/Danker/features/loot/LootDisplay.java
+++ b/src/main/java/me/Danker/features/loot/LootDisplay.java
@@ -217,6 +217,7 @@ public class LootDisplay {
                             EnumChatFormatting.BLUE + "Foul Flesh:\n" +
                             EnumChatFormatting.DARK_GREEN + "Pestilence Runes:\n" +
                             EnumChatFormatting.WHITE + "Smite VI Books:\n" +
+                            EnumChatFormatting.WHITE + "Smite VII Books:\n" +
                             EnumChatFormatting.AQUA + "Undead Catalysts:\n" +
                             EnumChatFormatting.DARK_PURPLE + "Beheaded Horrors:\n" +
                             EnumChatFormatting.RED + "Revenant Catalysts:\n" +
@@ -232,6 +233,7 @@ public class LootDisplay {
                             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" +
@@ -265,6 +267,7 @@ public class LootDisplay {
                             EnumChatFormatting.BLUE + "Foul Flesh:\n" +
                             EnumChatFormatting.DARK_GREEN + "Pestilence Runes:\n" +
                             EnumChatFormatting.WHITE + "Smite VI Books:\n" +
+                            EnumChatFormatting.WHITE + "Smite VII Books:\n" +
                             EnumChatFormatting.AQUA + "Undead Catalysts:\n" +
                             EnumChatFormatting.DARK_PURPLE + "Beheaded Horrors:\n" +
                             EnumChatFormatting.RED + "Revenant Catalysts:\n" +
@@ -280,6 +283,7 @@ public class LootDisplay {
                             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" +
diff --git a/src/main/java/me/Danker/features/loot/SpiderTracker.java b/src/main/java/me/Danker/features/loot/SpiderTracker.java
index e6227b2..34ee695 100644
--- a/src/main/java/me/Danker/features/loot/SpiderTracker.java
+++ b/src/main/java/me/Danker/features/loot/SpiderTracker.java
@@ -46,14 +46,6 @@ public class SpiderTracker {
 
         boolean rng = false;
 
-        if (message.contains("VERY RARE DROP!  (Enchanted Book)") || message.contains("CRAZY RARE DROP!  (Enchanted Book)")) {
-            if (Utils.isInScoreboard("Tarantula Broodfather")) {
-                spiderBooks++;
-                spiderBooksSession++;
-                ConfigHandler.writeIntConfig("spider", "book", spiderBooks);
-            }
-        }
-
         if (message.contains("   Spider Slayer LVL ")) { // Spider
             spiderTarantulas++;
             spiderTarantulasSession++;
@@ -77,6 +69,10 @@ public class SpiderTracker {
             spiderBites++;
             spiderBitesSession++;
             ConfigHandler.writeIntConfig("spider", "bite", spiderBites);
+        } else if (message.contains("VERY RARE DROP!  (Bane of Arthropods VI)")) {
+            spiderBooks++;
+            spiderBooksSession++;
+            ConfigHandler.writeIntConfig("spider", "book", spiderBooks);
         } else if (message.contains("VERY RARE DROP!  (Spider Catalyst)")) {
             spiderCatalysts++;
             spiderCatalystsSession++;
diff --git a/src/main/java/me/Danker/features/loot/WolfTracker.java b/src/main/java/me/Danker/features/loot/WolfTracker.java
index f248914..449a3b4 100644
--- a/src/main/java/me/Danker/features/loot/WolfTracker.java
+++ b/src/main/java/me/Danker/features/loot/WolfTracker.java
@@ -46,14 +46,6 @@ public class WolfTracker {
 
         boolean rng = false;
 
-        if (message.contains("VERY RARE DROP!  (Enchanted Book)") || message.contains("CRAZY RARE DROP!  (Enchanted Book)")) {
-            if (Utils.isInScoreboard("Sven Packmaster")) {
-                wolfBooks++;
-                wolfBooksSession++;
-                ConfigHandler.writeIntConfig("wolf", "book", wolfBooks);
-            }
-        }
-
         if (message.contains("   Wolf Slayer LVL ")) {
             wolfSvens++;
             wolfSvensSession++;
@@ -77,6 +69,10 @@ public class WolfTracker {
             wolfSpirits++;
             wolfSpiritsSession++;
             ConfigHandler.writeIntConfig("wolf", "spirit", wolfSpirits);
+        } else if (message.contains("VERY RARE DROP!  (Critical VI)")) {
+            wolfBooks++;
+            wolfBooksSession++;
+            ConfigHandler.writeIntConfig("wolf", "book", wolfBooks);
         } else if (message.contains("CRAZY RARE DROP!  (Red Claw Egg)")) {
             rng = true;
             wolfEggs++;
diff --git a/src/main/java/me/Danker/features/loot/ZombieTracker.java b/src/main/java/me/Danker/features/loot/ZombieTracker.java
index 5914599..1d71222 100644
--- a/src/main/java/me/Danker/features/loot/ZombieTracker.java
+++ b/src/main/java/me/Danker/features/loot/ZombieTracker.java
@@ -18,6 +18,7 @@ public class ZombieTracker {
     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;
@@ -35,6 +36,7 @@ public class ZombieTracker {
     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;
@@ -54,14 +56,6 @@ public class ZombieTracker {
 
         boolean rng = false;
 
-        if (message.contains("VERY RARE DROP!  (Enchanted Book)") || message.contains("CRAZY RARE DROP!  (Enchanted Book)")) {
-            if (Utils.isInScoreboard("Revenant Horror")) {
-                zombieBooks++;
-                zombieBooksSession++;
-                ConfigHandler.writeIntConfig("zombie", "book", zombieBooks);
-            }
-        }
-
         if (message.contains("   Zombie Slayer LVL ")) { // Zombie
             zombieRevs++;
             zombieRevsSession++;
@@ -94,6 +88,14 @@ public class ZombieTracker {
             zombiePestilences++;
             zombiePestilencesSession++;
             ConfigHandler.writeIntConfig("zombie", "pestilence", zombiePestilences);
+        } else if (message.contains("VERY RARE DROP!  (Smite VI)")) {
+            zombieBooks++;
+            zombieBooksSession++;
+            ConfigHandler.writeIntConfig("zombie", "book", zombieBooks);
+        } else if (message.contains("VERY RARE DROP!  (Smite VII)")) {
+            zombieBooksT7++;
+            zombieBooksT7Session++;
+            ConfigHandler.writeIntConfig("zombie", "bookT7", zombieBooksT7);
         } else if (message.contains("VERY RARE DROP!  (Undead Catalyst)")) {
             zombieUndeadCatas++;
             zombieUndeadCatasSession++;