Add death message filter and improve death regex

6 files changed, 46 insertions, 3 deletions

diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
index e47b008d..4e7f9802 100644
--- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
@@ -996,6 +996,9 @@ public class SkyblockerConfig {
 		public ChatFilterResult hideMimicKill = ChatFilterResult.PASS;
 
 		@SerialEntry
+		public ChatFilterResult hideDeath = ChatFilterResult.PASS;
+
+		@SerialEntry
 		public boolean hideMana = false;
 	}
 
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/MessageFilterCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/MessageFilterCategory.java
index 3fe285de..ce349049 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/MessageFilterCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/MessageFilterCategory.java
@@ -110,6 +110,14 @@ public class MessageFilterCategory {
 								newValue -> config.messages.hideMimicKill = newValue)
 						.controller(ConfigUtils::createEnumCyclingListController)
 						.build())
+				.option(Option.<ChatFilterResult>createBuilder()
+						.name(Text.translatable("text.autoconfig.skyblocker.option.messages.hideDeath"))
+						.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.messages.hideDeath.@Tooltip")))
+						.binding(defaults.messages.hideDeath,
+								() -> config.messages.hideDeath,
+								newValue -> config.messages.hideDeath = newValue)
+						.controller(ConfigUtils::createEnumCyclingListController)
+						.build())
 				.build();
 	}
 }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScore.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScore.java
index c6dbf8dc..a59d5615 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScore.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScore.java
@@ -47,7 +47,7 @@ public class DungeonScore {
 	private static final Pattern CRYPTS_PATTERN = Pattern.compile("Crypts: (?<crypts>\\d+)");
 	private static final Pattern COMPLETED_ROOMS_PATTERN = Pattern.compile(" *Completed Rooms: (?<rooms>\\d+)");
 	//Chat patterns
-	private static final Pattern DEATHS_PATTERN = Pattern.compile(".*?\u2620 (?<whodied>\\S+) .*");
+	private static final Pattern DEATHS_PATTERN = Pattern.compile(" \\u2620 (?<whodied>\\S+) .*");
 	//Other patterns
 	private static final Pattern MIMIC_FLOORS_PATTERN = Pattern.compile("[FM][67]");
 
@@ -82,6 +82,10 @@ public class DungeonScore {
 				checkMessageForWatcher(str);
 			}
 		});
+		ClientReceiveMessageEvents.GAME_CANCELED.register((message, overlay) -> {
+			if (overlay || !Utils.isInDungeons() || !dungeonStarted) return;
+			checkMessageForDeaths(message.getString());
+		});
 	}
 
 	public static void tick() {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/DeathFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/filters/DeathFilter.java
new file mode 100644
index 00000000..f2b9e7c5
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/filters/DeathFilter.java
@@ -0,0 +1,25 @@
+package de.hysky.skyblocker.skyblock.filters;
+
+import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.utils.chat.ChatFilterResult;
+import de.hysky.skyblocker.utils.chat.ChatPatternListener;
+import net.minecraft.text.Text;
+
+import java.util.regex.Matcher;
+
+public class DeathFilter extends ChatPatternListener {
+
+	public DeathFilter() {
+		super(" \\u2620 .*");
+	}
+
+	@Override
+	protected ChatFilterResult state() {
+		return SkyblockerConfigManager.get().messages.hideDeath;
+	}
+
+	@Override
+	protected boolean onMatch(Text message, Matcher matcher) {
+		return true;
+	}
+}
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 97398625..ee43bc4c 100644
--- a/src/main/java/de/hysky/skyblocker/utils/chat/ChatMessageListener.java
+++ b/src/main/java/de/hysky/skyblocker/utils/chat/ChatMessageListener.java
@@ -55,7 +55,8 @@ public interface ChatMessageListener {
                 new AutopetFilter(),
                 new ShowOffFilter(),
                 new ToggleSkyMallFilter(),
-                new MimicFilter()
+                new MimicFilter(),
+                new DeathFilter()
         };
         // Register all listeners to EVENT
         for (ChatMessageListener listener : listeners) {
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index 3381e67a..91354ae7 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -202,7 +202,7 @@
   "text.autoconfig.skyblocker.option.locations.dungeons.dungeonScore.dungeonScoreMessage.@Tooltip": "Message which will be sent in the chat when reaching %d score in dungeons. The string \"[score]\" will be replaced with the dungeon score (%d).",
   "text.autoconfig.skyblocker.option.locations.dungeons.dungeonScore.enableScoreHUD": "Enable Score HUD",
   "text.autoconfig.skyblocker.option.locations.dungeons.dungeonScore.enableScoreHUD.@Tooltip": "Displays the dungeon score in the HUD.",
-  "text.autoconfig.skyblocker.option.locations.dungeons.dungeonScore.enableScoreHUD.deathMessagesNote": "\n\n\nNote: This only works correctly if death messages are enabled in your skyblock settings.",
+  "text.autoconfig.skyblocker.option.locations.dungeons.dungeonScore.enableScoreHUD.deathMessagesNote": "\n\n\nNote: This only works correctly if death messages are enabled in your skyblock settings. If you want to hide death messages, use this mod's Hide Player Death Messages setting instead to allow further processing of death messages.",
   "text.autoconfig.skyblocker.option.locations.dungeons.dungeonScore.scoreScaling": "Score Scaling",
   "text.autoconfig.skyblocker.option.locations.dungeons.dungeonChestProfit": "Dungeon Chest Profit Calculator",
   "text.autoconfig.skyblocker.option.locations.dungeons.dungeonChestProfit.enableProfitCalculator": "Enable Profit Calculator",
@@ -305,6 +305,8 @@
   "text.autoconfig.skyblocker.option.messages.hideToggleSkyMall.@Tooltip": "Hides those pesky messages telling you to disable the Sky Mall HOTM perk when you want it enabled!",
   "text.autoconfig.skyblocker.option.messages.hideMimicKill": "Hide Mimic Kill Messages",
   "text.autoconfig.skyblocker.option.messages.hideMimicKill.@Tooltip": "Filters the \"Mimic dead!\" and \"Mimic killed!\" messages from chat.",
+  "text.autoconfig.skyblocker.option.messages.hideDeath": "Hide Player Death Messages",
+  "text.autoconfig.skyblocker.option.messages.hideDeath.@Tooltip": "Filters the player death messages from chat.",
   "text.autoconfig.skyblocker.category.slayer": "Slayers",
   "text.autoconfig.skyblocker.option.slayer.vampireSlayer": "Vampire Slayer",
   "text.autoconfig.skyblocker.option.slayer.vampireSlayer.enableEffigyWaypoints": "Enable Effigy Waypoints",