aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hysky/skyblocker/utils/chat
diff options
context:
space:
mode:
authorAaron <51387595+AzureAaron@users.noreply.github.com>2024-04-30 17:59:50 -0400
committerAaron <51387595+AzureAaron@users.noreply.github.com>2024-04-30 17:59:50 -0400
commit88ff7afb7e6ab60f384e571d378b76f52ed3dfbd (patch)
treec16612751b621064b434922945820cc6cea794f7 /src/main/java/de/hysky/skyblocker/utils/chat
parent4fe76a3341356390fa5a4012c83062ca00bd5635 (diff)
downloadSkyblocker-88ff7afb7e6ab60f384e571d378b76f52ed3dfbd.tar.gz
Skyblocker-88ff7afb7e6ab60f384e571d378b76f52ed3dfbd.tar.bz2
Skyblocker-88ff7afb7e6ab60f384e571d378b76f52ed3dfbd.zip
Make filters ignore formatting codes
The formatting codes caused a mess in longer regexes and are fragile if Hypixel changes them or moves fully to Text components. Hypixel also added emblems that display in dark purple and light blue which were obviously incompatible due to the hardcoded formatting codes.
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/utils/chat')
-rw-r--r--src/main/java/de/hysky/skyblocker/utils/chat/ChatMessageListener.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/de/hysky/skyblocker/utils/chat/ChatMessageListener.java b/src/main/java/de/hysky/skyblocker/utils/chat/ChatMessageListener.java
index bdff2d94..3aea459e 100644
--- a/src/main/java/de/hysky/skyblocker/utils/chat/ChatMessageListener.java
+++ b/src/main/java/de/hysky/skyblocker/utils/chat/ChatMessageListener.java
@@ -1,5 +1,7 @@
package de.hysky.skyblocker.utils.chat;
+import java.util.Objects;
+
import de.hysky.skyblocker.skyblock.barn.HungryHiker;
import de.hysky.skyblocker.skyblock.barn.TreasureHunter;
import de.hysky.skyblocker.skyblock.dungeon.Reparty;
@@ -15,6 +17,7 @@ import net.fabricmc.fabric.api.event.EventFactory;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
@FunctionalInterface
public interface ChatMessageListener {
@@ -68,7 +71,7 @@ public interface ChatMessageListener {
if (!Utils.isOnSkyblock()) {
return true;
}
- ChatFilterResult result = EVENT.invoker().onMessage(message, message.getString());
+ ChatFilterResult result = EVENT.invoker().onMessage(message, Formatting.strip(message.getString()));
switch (result) {
case ACTION_BAR -> {
if (overlay) {