From d09c32601ffb16a294adcd15265e9cf93a5b4ea4 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Fri, 30 Sep 2022 18:29:53 +0200
Subject: wrong blaze dagger chat

---
 CHANGELOG.md                                               |  1 +
 FEATURES.md                                                |  1 +
 .../java/at/hannibal2/skyhanni/config/features/Slayer.java |  6 ++++++
 .../features/slayer/blaze/BlazeSlayerDaggerHelper.kt       | 14 ++++++++++++++
 src/main/java/at/hannibal2/skyhanni/test/LorenzTest.kt     |  8 +-------
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c35f80764..d3c389001 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Changes
 + Removed more blaze slayer item drop message spam.
 + Hide particles and fireballs near blaze slayer bosses and demons.
++ Option to remove the wrong dagger messages from chat.
 
 ## Version 0.11
 
diff --git a/FEATURES.md b/FEATURES.md
index 76cc8941e..1d156902d 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -114,6 +114,7 @@
 + Mark the right dagger to use for blaze slayer in the dagger overlay.
 + Warning when the fire pit phase starts for the Blaze Slayer tier 3
 + Hide particles and fireballs near blaze slayer bosses and demons.
++ Option to remove the wrong dagger messages from chat.
 + Warning when wrong slayer quest is selected, or killing mobs for the wrong slayer.
 
 ## Marked Players
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Slayer.java b/src/main/java/at/hannibal2/skyhanni/config/features/Slayer.java
index 544493750..def86bc74 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Slayer.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Slayer.java
@@ -58,6 +58,12 @@ public class Slayer {
     @ConfigAccordionId(id = 2)
     public int blazeFirstDagger = 0;
 
+    @Expose
+    @ConfigOption(name = "Hide Chat", desc = "Remove the wrong dagger messages from chat.")
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 2)
+    public boolean blazeHideDaggerWarning = false;
+
     @Expose
     @ConfigOption(name = "Fire Pillars", desc = "")
     @ConfigEditorAccordion(id = 3)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt
index be8871bd5..551fe6177 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt
@@ -3,11 +3,13 @@ package at.hannibal2.skyhanni.features.slayer.blaze
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.core.util.render.TextRenderUtils
 import at.hannibal2.skyhanni.events.ItemClickInHandEvent
+import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.PacketEvent
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.LocationUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils.matchRegex
 import at.hannibal2.skyhanni.utils.NumberUtil.roundToPrecision
 import at.hannibal2.skyhanni.utils.getLorenzVec
 import net.minecraft.client.Minecraft
@@ -32,6 +34,18 @@ class BlazeSlayerDaggerHelper {
     private var lastNearestCheck = 0L
     private var lastNearest: HellionShield? = null
 
+    @SubscribeEvent
+    fun onChatMessage(event: LorenzChatEvent) {
+        if (!LorenzUtils.inSkyblock) return
+        if (!SkyHanniMod.feature.slayer.blazeHideDaggerWarning) return
+
+        val message = event.message
+        if (message.matchRegex("§cStrike using the §r(.+) §r§cattunement on your dagger!") ||
+            message == "§cYour hit was reduced by Hellion Shield!") {
+            event.blockedReason = "blaze_slayer_dagger"
+        }
+    }
+
     @SubscribeEvent
     fun onTick(event: TickEvent.ClientTickEvent) {
         if (!isEnabled()) return
diff --git a/src/main/java/at/hannibal2/skyhanni/test/LorenzTest.kt b/src/main/java/at/hannibal2/skyhanni/test/LorenzTest.kt
index 87473af62..feefb60d7 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/LorenzTest.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/LorenzTest.kt
@@ -110,13 +110,7 @@ class LorenzTest {
 
     @SubscribeEvent
     fun onChatMessage(event: LorenzChatEvent) {
-//        val message = event.message
-//        if (message.matchRegex("§cStrike using the §r(.+) §r§cattunement on your dagger!")) {
-//            event.blockedReason = "lorenz_test"
-//        }
-//        if (message == "§cYour hit was reduced by Hellion Shield!") {
-//            event.blockedReason = "lorenz_test"
-//        }
+
     }
 
     @SubscribeEvent
-- 
cgit