diff options
Diffstat (limited to 'src/main/java/at')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java | 12 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt | 44 |
2 files changed, 56 insertions, 0 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java index 8898ab68a..b2fb03d76 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java @@ -117,6 +117,18 @@ public class FilterTypesConfig { @FeatureToggle public boolean hideAlphaAchievements = false; + @Expose + @ConfigOption(name = "Hide Parkour", desc = "Hide parkour messages (starting, stopping, reaching a milestone).") + @ConfigEditorBoolean + @FeatureToggle + public boolean hideParkour = false; + + @Expose + @ConfigOption(name = "Hide Teleport Pads", desc = "Hide annoying messages when using teleport pads.") + @ConfigEditorBoolean + @FeatureToggle + public boolean hideTeleportPads = false; + //TODO remove @Expose @ConfigOption(name = "Others", desc = "Hide other annoying messages.") diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt index ada41bab4..0e23fbb79 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt @@ -406,6 +406,42 @@ object ChatFilter { "§e§k.§a>> {3}§aAchievement Unlocked: .* {3}<<§e§k.".toPattern(), ) + /** + * REGEX-TEST: §aStarted parkour cocoa! + * REGEX-TEST: §aFinished parkour cocoa in 12:34.567 + * REGEX-TEST: §aReached checkpoint #4 for parkour cocoa! + * REGEX-TEST: §4Wrong checkpoint for parkour cocoa! + * REGEX-TEST: §4You haven't reached all checkpoints for parkour cocoa! + */ + private val parkourPatterns = listOf( + "§aStarted parkour (.*)!".toPattern(), + "§aFinished parkour (.*) in (.*)!".toPattern(), + "§aReached checkpoint #(.*) for parkour (.*)!".toPattern(), + "§4Wrong checkpoint for parkour (.*)!".toPattern(), + "§4You haven't reached all checkpoints for parkour (.*)!".toPattern(), + ) + + /** + * REGEX-TEST: §4Cancelled parkour! You cannot fly. + * REGEX-TEST: §4Cancelled parkour! You cannot use item abilities. + * REGEX-TEST: §4Cancelled parkour! + */ + private val parkourCancelMessages = listOf( + "§4Cancelled parkour! You cannot fly.", + "§4Cancelled parkour! You cannot use item abilities.", + "§4Cancelled parkour!", + ) + + // §r§aWarped from the tppadone §r§ato the tppadtwo§r§a! + private val teleportPadPatterns = listOf( + "§aWarped from the (.*) §r§ato the (.*)§r§a!".toPattern(), + ) + + // §r§4This Teleport Pad does not have a destination set! + private val teleportPadMessages = listOf( + "§4This Teleport Pad does not have a destination set!" + ) + private val patternsMap: Map<String, List<Pattern>> = mapOf( "lobby" to lobbyPatterns, "warping" to warpingPatterns, @@ -428,6 +464,8 @@ object ChatFilter { "solo_stats" to soloStatsPatterns, "fairy" to fairyPatterns, "achievement_get" to achievementGetPatterns, + "parkour" to parkourPatterns, + "teleport_pads" to teleportPadPatterns, ) private val messagesMap: Map<String, List<String>> = mapOf( @@ -447,10 +485,14 @@ object ChatFilter { "fire_sale" to fireSaleMessages, "event" to eventMessage, "skymall" to skymallMessages, + "parkour" to parkourCancelMessages, + "teleport_pads" to teleportPadMessages, ) + private val messagesContainsMap: Map<String, List<String>> = mapOf( "lobby" to lobbyMessagesContains, ) + private val messagesStartsWithMap: Map<String, List<String>> = mapOf( "slayer" to slayerMessageStartWith, "profile_join" to profileJoinMessageStartsWith, @@ -478,6 +520,8 @@ object ChatFilter { config.guildExp && message.isPresent("guild_exp") -> "guild_exp" config.killCombo && message.isPresent("kill_combo") -> "kill_combo" config.profileJoin && message.isPresent("profile_join") -> "profile_join" + config.hideParkour && message.isPresent("parkour") -> "parkour" + config.hideTeleportPads && message.isPresent("teleport_pads") -> "teleport_pads" config.hideAlphaAchievements && HypixelData.hypixelAlpha && message.isPresent("achievement_get") -> "achievement_get" |