Toggle Sky Mall Filter (#475)

SkyblockerMod · Jan 4, 2024 · 4dc26a1 · 4dc26a1
1 parent fa28367
commit 4dc26a1
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 1 deletion.
diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
@@ -939,6 +939,9 @@ public static class Messages {
 		@SerialEntry
 		public ChatFilterResult hideShowOff = ChatFilterResult.PASS;
 
+		@SerialEntry
+		public ChatFilterResult hideToggleSkyMall = 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
@@ -87,6 +87,14 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig
 								newValue -> config.messages.hideShowOff = newValue)
 						.controller(ConfigUtils::createEnumCyclingListController)
 						.build())
+				.option(Option.<ChatFilterResult>createBuilder()
+						.name(Text.translatable("text.autoconfig.skyblocker.option.messages.hideToggleSkyMall"))
+						.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.messages.hideToggleSkyMall.@Tooltip")))
+						.binding(defaults.messages.hideToggleSkyMall,
+								() -> config.messages.hideToggleSkyMall,
+								newValue -> config.messages.hideToggleSkyMall = newValue)
+						.controller(ConfigUtils::createEnumCyclingListController)
+						.build())
 				.option(Option.<Boolean>createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.messages.hideMana"))
 						.binding(defaults.messages.hideMana,

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/ToggleSkyMallFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/filters/ToggleSkyMallFilter.java
@@ -0,0 +1,16 @@
+package de.hysky.skyblocker.skyblock.filters;
+
+import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.utils.chat.ChatFilterResult;
+
+public class ToggleSkyMallFilter extends SimpleChatFilter {
+
+	public ToggleSkyMallFilter() {
+		super("^§8§oYou can disable this messaging by toggling Sky Mall in your /hotm!$");
+	}
+
+	@Override
+	protected ChatFilterResult state() {
+		return SkyblockerConfigManager.get().messages.hideToggleSkyMall;
+	}
+}
diff --git a/src/main/java/de/hysky/skyblocker/utils/chat/ChatMessageListener.java b/src/main/java/de/hysky/skyblocker/utils/chat/ChatMessageListener.java
@@ -53,7 +53,8 @@ static void init() {
                 new MoltenWaveFilter(),
                 new TeleportPadFilter(),
                 new AutopetFilter(),
-                new ShowOffFilter()
+                new ShowOffFilter(),
+                new ToggleSkyMallFilter()
         };
         // 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
@@ -279,6 +279,8 @@
   "text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "Gives a better experience with FancyBar",
   "text.autoconfig.skyblocker.option.messages.hideShowOff": "Hide Show Off Messages",
   "text.autoconfig.skyblocker.option.messages.hideShowOff.@Tooltip": "Filters messages from the /show command",
+  "text.autoconfig.skyblocker.option.messages.hideToggleSkyMall": "Hide Toggle Sky Mall Messages",
+  "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.category.slayer": "Slayers",
   "text.autoconfig.skyblocker.option.slayer.vampireSlayer": "Vampire Slayer",
   "text.autoconfig.skyblocker.option.slayer.vampireSlayer.enableEffigyWaypoints": "Enable Effigy Waypoints",