From 73f861eca0423d5709ada36254dff659b1d15602 Mon Sep 17 00:00:00 2001 From: Trương Hoàng Long Date: Mon, 14 Mar 2022 22:26:20 +0100 Subject: add: filter for mana consumption message from action bar --- .../java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 1 + src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java | 9 +++++++++ 2 files changed, 10 insertions(+) (limited to 'src/main/java/me') diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index eea430ab..669746c4 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -152,6 +152,7 @@ public class SkyblockerConfig implements ConfigData { public ChatFilterResult hideCombo = ChatFilterResult.PASS; @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON) public ChatFilterResult hideAutopet = ChatFilterResult.PASS; + public boolean hideMana = false; } public enum Info { diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java index 19e0d79e..0549d235 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java +++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java @@ -24,10 +24,14 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + @Environment(EnvType.CLIENT) @Mixin(InGameHud.class) public abstract class InGameHudMixin extends DrawableHelper { private static final Identifier SLOT_LOCK = new Identifier(SkyblockerMod.NAMESPACE, "textures/gui/slot_lock.png"); + private static final Pattern ACTION_BAR_MANA = Pattern.compile("^§b-\\d+ Mana \\(.*\\)(| +)$"); private final FancyStatusBars statusBars = new FancyStatusBars(); private MatrixStack hotbarMatrices; @@ -46,6 +50,11 @@ public abstract class InGameHudMixin extends DrawableHelper { if(!Utils.isOnSkyblock) return; String msg = message.getString(); + if (SkyblockerConfig.get().messages.hideMana) { + Matcher matcher = ACTION_BAR_MANA.matcher(msg); + if (matcher.matches()) + ci.cancel(); + } if(statusBars.update(msg)) ci.cancel(); } -- cgit