From 88ff7afb7e6ab60f384e571d378b76f52ed3dfbd Mon Sep 17 00:00:00 2001
From: Aaron <51387595+AzureAaron@users.noreply.github.com>
Date: Tue, 30 Apr 2024 17:59:50 -0400
Subject: 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.
---
 .../java/de/hysky/skyblocker/utils/chat/ChatMessageListener.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/main/java/de/hysky/skyblocker/utils/chat')

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) {
-- 
cgit 


From 792a6c5c4ae1e9ee945fae13c04d416083a886bd Mon Sep 17 00:00:00 2001
From: Aaron <51387595+AzureAaron@users.noreply.github.com>
Date: Thu, 2 May 2024 20:21:05 -0400
Subject: Fix Quiz Solver Crash

---
 src/main/java/de/hysky/skyblocker/utils/chat/ChatMessageListener.java | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/main/java/de/hysky/skyblocker/utils/chat')

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 3aea459e..1f0caff5 100644
--- a/src/main/java/de/hysky/skyblocker/utils/chat/ChatMessageListener.java
+++ b/src/main/java/de/hysky/skyblocker/utils/chat/ChatMessageListener.java
@@ -1,7 +1,5 @@
 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;
-- 
cgit