split off the chat filter settings

1 files changed, 42 insertions, 13 deletions

diff --git a/src/main/java/at/lorenz/mod/config/Features.java b/src/main/java/at/lorenz/mod/config/Features.java
index 0bbac1e4a..43843df40 100644
--- a/src/main/java/at/lorenz/mod/config/Features.java
+++ b/src/main/java/at/lorenz/mod/config/Features.java
@@ -6,10 +6,7 @@ import com.thatgravyboat.skyblockhud_2.config.SBHConfigEditor;
 import com.thatgravyboat.skyblockhud_2.core.GuiElement;
 import com.thatgravyboat.skyblockhud_2.core.GuiScreenElementWrapper;
 import com.thatgravyboat.skyblockhud_2.core.config.Position;
-import com.thatgravyboat.skyblockhud_2.core.config.annotations.Category;
-import com.thatgravyboat.skyblockhud_2.core.config.annotations.ConfigEditorBoolean;
-import com.thatgravyboat.skyblockhud_2.core.config.annotations.ConfigEditorButton;
-import com.thatgravyboat.skyblockhud_2.core.config.annotations.ConfigOption;
+import com.thatgravyboat.skyblockhud_2.core.config.annotations.*;
 import com.thatgravyboat.skyblockhud_2.core.config.gui.GuiPositionEditor;
 import net.minecraft.client.Minecraft;
 
@@ -67,22 +64,54 @@ public class Features {
     public static class Chat {
 
         @Expose
-        @ConfigOption(name = "Main Chat Filter", desc = "Hides all the annoying chat messages.")
+        @ConfigOption(name = "Chat Filter Types", desc = "")
+        @ConfigEditorAccordion(id = 1)
+        public boolean filterTypes = false;
+
+
+        @Expose
+        @ConfigOption(name = "HyPixel Hub", desc = "Block messages outside SkyBlock in the HyPixel lobby: player joins, loot boxes, prototype lobby messages, radiating generosity and HyPixel tournaments.")
+        @ConfigEditorBoolean
+        @ConfigAccordionId(id = 1)
+        public boolean hypixelHub = false;
+
+        @Expose
+        @ConfigOption(name = "Empty", desc = "Hide all the empty messages from the chat.")
         @ConfigEditorBoolean
-        public boolean mainFilter = true;
+        @ConfigAccordionId(id = 1)
+        public boolean empty = false;
+
+        @Expose
+        @ConfigOption(name = "Warping", desc = "Block 'sending request to join ..' and 'warping ..' messages.")
+        @ConfigEditorBoolean
+        @ConfigAccordionId(id = 1)
+        public boolean warping = false;
+
+        @Expose
+        @ConfigOption(name = "Welcome", desc = "Hide the 'welcome to skyblock' message.")
+        @ConfigEditorBoolean
+        @ConfigAccordionId(id = 1)
+        public boolean welcome = false;
+
+        //TODO remove
+        @Expose
+        @ConfigOption(name = "Others", desc = "Hide other annoying messages.")
+        @ConfigEditorBoolean
+        @ConfigAccordionId(id = 1)
+        public boolean others = false;
 
         @Expose
         @ConfigOption(name = "Player Messages", desc = "Add a fancy new chat format for player messages.")
         @ConfigEditorBoolean
         public boolean playerMessages = false;
-    }
-
-    public static class Dungeon {
 
         @Expose
-        @ConfigOption(name = "Hide Messages", desc = "Hide annoying dungeon messages.")
+        @ConfigOption(name = "Dungeon Filter", desc = "Hide annoying messages inside dungeon.")
         @ConfigEditorBoolean
-        public boolean hideAnnoyingMessages = false;
+        public boolean dungeonMessages = false;
+    }
+
+    public static class Dungeon {
 
         @Expose
         @ConfigOption(name = "Clicked Blocks", desc = "Highlight the following blocks when clicked in dungeon: Lever, Chest, Wither Essence")
@@ -136,7 +165,7 @@ public class Features {
     public static class Bazaar {
 
         @Expose
-        @ConfigOption(name = "Order Helper", desc = "Show visual hints when items are ready to pickup or outbid.")
+        @ConfigOption(name = "Order Helper", desc = "Show visual hints inside the Bazaar Manage Order view when items are ready to pickup or outbid.")
         @ConfigEditorBoolean
         public boolean orderHelper = false;
     }
@@ -154,7 +183,7 @@ public class Features {
         public Position petDisplayPos = new Position(10, 10, false, true);
 
         @Expose
-        @ConfigOption(name = "Exp Bottles", desc = "Hides all the experience bottles laying on the ground.")
+        @ConfigOption(name = "Exp Bottles", desc = "Hides all the experience bottles lying on the ground.")
         @ConfigEditorBoolean
         public boolean hideExpBottles = false;
     }