diff options
author | ExternalTime <84183548+ExternalTime@users.noreply.github.com> | 2021-09-16 23:21:47 +0200 |
---|---|---|
committer | ExternalTime <84183548+ExternalTime@users.noreply.github.com> | 2021-09-16 23:21:47 +0200 |
commit | ee5d7d950ac836c0385003eb32da2dc6e51877d4 (patch) | |
tree | f46dda1f2e13f83a12e7f74e2364a3c27556a676 /src/main/java | |
parent | 6fc7918adabec07479ee0cb5dfb1598f4c227801 (diff) | |
download | Skyblocker-ee5d7d950ac836c0385003eb32da2dc6e51877d4.tar.gz Skyblocker-ee5d7d950ac836c0385003eb32da2dc6e51877d4.tar.bz2 Skyblocker-ee5d7d950ac836c0385003eb32da2dc6e51877d4.zip |
Fixed action bar parsing when holding zombie sword
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java index e5b13032..1efe66d6 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java @@ -15,7 +15,7 @@ import java.util.regex.Pattern; public class FancyStatusBars extends DrawableHelper { private static final MinecraftClient client = MinecraftClient.getInstance(); private static final Identifier BARS = new Identifier(SkyblockerMod.NAMESPACE,"textures/gui/bars.png"); - private static final Pattern ACTION_BAR_STATUS = Pattern.compile("^§[6c]([0-9]+)/([0-9]+)❤ +§(?:a([0-9]+)§a❈ Defense|b-[0-9]+ Mana \\(§6[a-zA-Z ]+§b\\)) +§(?:b([0-9]+)/([0-9]+)✎ Mana|[0-9,]+/[0-9,]+k? Drill Fuel)$"); + private static final Pattern ACTION_BAR_STATUS = Pattern.compile("^§[6c]([0-9]+)/([0-9]+)❤ +§(?:a([0-9]+)§a❈ Defense|b-[0-9]+ Mana \\(§6[a-zA-Z ]+§b\\)) +§(?:b([0-9]+)/([0-9]+)✎ Mana|[0-9,]+/[0-9,]+k? Drill Fuel)(?: {4}§e§lⓩ{0,5}§6§lⓄ{0,5})?$"); private final Resource health; private final Resource mana; private int defense; @@ -30,9 +30,8 @@ public class FancyStatusBars extends DrawableHelper { if(!SkyblockerConfig.get().general.bars.enableBars) return false; Matcher matcher = ACTION_BAR_STATUS.matcher(actionBar); - if(!matcher.matches()) { + if(!matcher.matches()) return false; - } health.set(matcher.group(1), matcher.group(2)); if(matcher.group(3) != null) defense = Integer.parseInt(matcher.group(3)); |