From bc565c0e0bfbc5e87af8191519980a440da5bfa4 Mon Sep 17 00:00:00 2001
From: ExternalTime <84183548+ExternalTime@users.noreply.github.com>
Date: Sat, 18 Sep 2021 19:58:41 +0200
Subject: Created an interface for listening to chat messages

---
 .../skyblocker/mixin/ChatHudListenerMixin.java         | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'src/main/java/me/xmrvizzy/skyblocker/mixin')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/ChatHudListenerMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/ChatHudListenerMixin.java
index c22364d6..6cc6cb0e 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/ChatHudListenerMixin.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/ChatHudListenerMixin.java
@@ -1,33 +1,28 @@
 package me.xmrvizzy.skyblocker.mixin;
 
-import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
-import me.xmrvizzy.skyblocker.skyblock.ChatFilter;
-import me.xmrvizzy.skyblocker.skyblock.dungeon.DungeonPuzzles;
-import me.xmrvizzy.skyblocker.skyblock.dwarven.Fetchur;
-import me.xmrvizzy.skyblocker.skyblock.dwarven.Puzzler;
+import me.xmrvizzy.skyblocker.chat.ChatParser;
 import me.xmrvizzy.skyblocker.utils.Utils;
-import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.hud.ChatHudListener;
 import net.minecraft.network.MessageType;
 import net.minecraft.text.Text;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 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.List;
 import java.util.UUID;
 
 @Mixin(ChatHudListener.class)
 public class ChatHudListenerMixin {
 
-    @Shadow @Final private MinecraftClient client;
-    private final ChatFilter filter = new ChatFilter();
+    private final ChatParser parser = new ChatParser();
 
     @Inject(method = "onChatMessage", at = @At("HEAD"), cancellable = true)
     public void onMessage(MessageType messageType, Text message, UUID senderUuid, CallbackInfo ci) {
+        if (Utils.isSkyblock && parser.shouldFilter(message.getString()))
+            ci.cancel();
+
+        /*
         String msg = message.getString();
 
         if (Utils.isDungeons) {
@@ -61,6 +56,7 @@ public class ChatHudListenerMixin {
             if(filter.shouldFilter(msg))
                 ci.cancel();
         }
+        */
     }
 
 }
-- 
cgit