From 4e5d32ba8d743bbd5e7a1f854bd97874d681b2a4 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Sun, 23 Apr 2023 17:16:20 +0200 Subject: Hide chat messages from the visitors in garden. (Except Beth and Spaceman) --- .../hannibal2/skyhanni/config/features/Garden.java | 6 ++++++ .../garden/visitor/GardenVisitorFeatures.kt | 25 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) (limited to 'src') diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java b/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java index b6bb30838..7547d3e1b 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java @@ -166,6 +166,12 @@ public class Garden { @ConfigAccordionId(id = 1) public boolean visitorHypixelArrivedMessage = true; + @Expose + @ConfigOption(name = "Hide Chat", desc = "Hide chat messages from the visitors in garden. (Except Beth and Spaceman)") + @ConfigEditorBoolean + @ConfigAccordionId(id = 1) + public boolean visitorHideChat = true; + @Expose @ConfigOption(name = "Numbers", desc = "") @ConfigEditorAccordion(id = 5) diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt index 3f27138b8..1bababdb1 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt @@ -43,6 +43,7 @@ class GardenVisitorFeatures { private val newVisitorArrivedMessage = ".* §r§ehas arrived on your §r§bGarden§r§e!".toPattern() private val copperPattern = " §8\\+§c(.*) Copper".toPattern() private val gardenExperiencePattern = " §8\\+§2(.*) §7Garden Experience".toPattern() + private val visitorChatMessagePattern = "§e\\[NPC] (§.)?(?.*)§f: §r§f.*".toPattern() private val config get() = SkyHanniMod.feature.garden private val logger = LorenzLogger("garden/visitors") @@ -462,6 +463,30 @@ class GardenVisitorFeatures { event.blockedReason = "new_visitor_arrived" } } + + if (GardenAPI.inGarden()) { + if (config.visitorHideChat) { + if (hideVisitorMessage(event.message)) { + event.blockedReason = "garden_visitor_message" + } + } + } + } + + private fun hideVisitorMessage(message: String): Boolean { + val matcher = visitorChatMessagePattern.matcher(message) + if (!matcher.matches()) return false + + val name = matcher.group("name") + if (name == "Spaceman") return false + if (name == "Beth") return false + + if (visitors.keys.any { it.removeColor() == name }) { + println("blocked msg from '$name'") + return true + } + + return false } private fun update() { -- cgit