From 3bd212839e1d3c497a840221a0c149451967467e Mon Sep 17 00:00:00 2001
From: ThatGravyBoat <thatgravyboat@gmail.com>
Date: Tue, 13 Jul 2021 01:51:19 -0230
Subject: Added 2 new subcommands to crystal waypoints, Added medals shown in
 farmhouse, Added config option to stop auto flipping of rpg hud, Added option
 so if exp bar is still being rendered it should hide when holding drill to
 not overlay them and keep a consistent hud

---
 .../skyblockhud/handlers/SlayerHandler.java              | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'src/main/java/com/thatgravyboat/skyblockhud/handlers/SlayerHandler.java')

diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/SlayerHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/handlers/SlayerHandler.java
index 67bde54..49b2928 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/SlayerHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/handlers/SlayerHandler.java
@@ -11,8 +11,6 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
 public class SlayerHandler {
 
-    //Optional Characters are required because Hypixel dumb and cuts off text
-    private static final Pattern COMBAT_XP_REGEX = Pattern.compile("\\(([\\d,]+)/([\\dkm]+)\\) comb?a?t? x?p?");
     private static final Pattern KILLS_REGEX = Pattern.compile("(\\d+)/(\\d+) kills?");
 
     public enum slayerTypes {
@@ -91,7 +89,6 @@ public class SlayerHandler {
         if (isDoingSlayer) {
             String line = event.formattedLine.toLowerCase();
             Matcher killMatcher = KILLS_REGEX.matcher(line);
-            Matcher xpMatcher = COMBAT_XP_REGEX.matcher(line);
 
             if (killMatcher.find()) {
                 SlayerHandler.bossSlain = false;
@@ -102,15 +99,6 @@ public class SlayerHandler {
                 try {
                     maxKills = Integer.parseInt(killMatcher.group(2));
                 } catch (Exception ignored) {}
-            } else if (xpMatcher.find()) {
-                SlayerHandler.bossSlain = false;
-                SlayerHandler.isKillingBoss = false;
-                try {
-                    progress = Integer.parseInt(xpMatcher.group(1));
-                } catch (Exception ignored) {}
-                try {
-                    maxKills = Integer.parseInt(xpMatcher.group(2).replace("k", "")) * (xpMatcher.group(2).contains("k") ? 1000 : xpMatcher.group(2).contains("m") ? 1000000 : 1);
-                } catch (Exception ignored) {}
             } else if (line.contains("slay the boss")) {
                 SlayerHandler.bossSlain = false;
                 SlayerHandler.isKillingBoss = true;
@@ -122,10 +110,6 @@ public class SlayerHandler {
                 SlayerHandler.progress = 0;
                 SlayerHandler.bossSlain = true;
             }
-            if (maxKills == 0 && progress == 0) {
-                SlayerHandler.maxKills = 0;
-                SlayerHandler.progress = 0;
-            }
         }
     }
 }
-- 
cgit