From 75306f1a3f62a4958b364423955685525336a52e Mon Sep 17 00:00:00 2001 From: Lorenz Date: Sat, 9 Jul 2022 02:43:02 +0200 Subject: moved mining messages out of dungeon chat --- src/main/java/at/lorenz/mod/chat/ChatFilter.kt | 6 ++++++ src/main/java/at/lorenz/mod/dungeon/DungeonChatFilter.kt | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/main/java/at/lorenz/mod/chat/ChatFilter.kt b/src/main/java/at/lorenz/mod/chat/ChatFilter.kt index 9b8d981bf..f31297100 100644 --- a/src/main/java/at/lorenz/mod/chat/ChatFilter.kt +++ b/src/main/java/at/lorenz/mod/chat/ChatFilter.kt @@ -39,6 +39,8 @@ class ChatFilter { friendJoin(message) && LorenzMod.feature.chat.others -> "friend_join" + + else -> "" } @@ -56,6 +58,10 @@ class ChatFilter { return when { message == "§eYour previous §r§6Plasmaflux Power Orb §r§ewas removed!" -> true + message == "§aYou used your §r§6Mining Speed Boost §r§aPickaxe Ability!" -> true + message == "§cYour Mining Speed Boost has expired!" -> true + message == "§a§r§6Mining Speed Boost §r§ais now available!" -> true + else -> false } } diff --git a/src/main/java/at/lorenz/mod/dungeon/DungeonChatFilter.kt b/src/main/java/at/lorenz/mod/dungeon/DungeonChatFilter.kt index 4c71d0c3b..929c2f9ed 100644 --- a/src/main/java/at/lorenz/mod/dungeon/DungeonChatFilter.kt +++ b/src/main/java/at/lorenz/mod/dungeon/DungeonChatFilter.kt @@ -99,9 +99,6 @@ class DungeonChatFilter { message.matchRegex("§c(.*) §r§epicked up your (.*) Orb!") -> true message.matchRegex("§cThis ability is on cooldown for (.*)s.") -> true message.matchRegex("§a§l(.*) healed you for (.*) health!") -> true - message == "§aYou used your §r§6Mining Speed Boost §r§aPickaxe Ability!" -> true - message == "§cYour Mining Speed Boost has expired!" -> true - message == "§a§r§6Mining Speed Boost §r§ais now available!" -> true message.matchRegex("§eYour bone plating reduced the damage you took by §r§c(.*)§r§e!") -> true message.matchRegex("(.*) §r§eformed a tether with you!") -> true message.matchRegex("§eYour tether with (.*) §r§ehealed you for §r§a(.*) §r§ehealth.") -> true -- cgit