aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com/thatgravyboat/skyblockhud/handlers/SlayerHandler.java
diff options
context:
space:
mode:
authorThatGravyBoat <thatgravyboat@gmail.com>2021-07-13 01:51:19 -0230
committerThatGravyBoat <thatgravyboat@gmail.com>2021-07-13 01:51:19 -0230
commit3bd212839e1d3c497a840221a0c149451967467e (patch)
tree9a306491b76808a17a26c6bef6f74c08cbc99964 /src/main/java/com/thatgravyboat/skyblockhud/handlers/SlayerHandler.java
parent087d97fb0663edc5e343187c0fa4ec1bc6b081bc (diff)
downloadskyblockhud-3bd212839e1d3c497a840221a0c149451967467e.tar.gz
skyblockhud-3bd212839e1d3c497a840221a0c149451967467e.tar.bz2
skyblockhud-3bd212839e1d3c497a840221a0c149451967467e.zip
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
Diffstat (limited to 'src/main/java/com/thatgravyboat/skyblockhud/handlers/SlayerHandler.java')
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/handlers/SlayerHandler.java16
1 files changed, 0 insertions, 16 deletions
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;
- }
}
}
}