MessagesFilterConfig -> ChatConfig

38 files changed, 604 insertions, 604 deletions

diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
index 84c957ca..6bd32254 100644
--- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
@@ -35,7 +35,7 @@ public class SkyblockerConfig {
     public SlayersConfig slayer = new SlayersConfig();
 
     @SerialEntry
-    public MessagesFilterConfig messages = new MessagesFilterConfig();
+    public ChatConfig chats = new ChatConfig();
 
     @SerialEntry
     public QuickNavigationConfig quickNav = new QuickNavigationConfig();
diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java
index 9f463a4d..4b8e56df 100644
--- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java
+++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java
@@ -79,7 +79,7 @@ public class SkyblockerConfigManager {
                 .category(FarmingCategory.create(defaults, config))
                 .category(OtherLocationsCategory.create(defaults, config))
                 .category(SlayersCategory.create(defaults, config))
-                .category(MessageFilterCategory.create(defaults, config))
+                .category(ChatCategory.create(defaults, config))
                 .category(QuickNavigationCategory.create(defaults, config))
                 .category(MiscCategory.create(defaults, config))).generateScreen(parent);
     }
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/MessageFilterCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/ChatCategory.java
index 0e2716e7..2932c697 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/MessageFilterCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/ChatCategory.java
@@ -9,152 +9,152 @@ import dev.isxander.yacl3.api.controller.IntegerSliderControllerBuilder;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.text.Text;
 
-public class MessageFilterCategory {
+public class ChatCategory {
 
     public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) {
         return ConfigCategory.createBuilder()
-                .name(Text.translatable("skyblocker.config.messages"))
+                .name(Text.translatable("skyblocker.config.chat"))
 
                 //Uncategorized Options
                 .group(OptionGroup.createBuilder()
-                        .name(Text.translatable("skyblocker.config.messages.filter"))
+                        .name(Text.translatable("skyblocker.config.chat.filter"))
                         .option(Option.<ChatFilterResult>createBuilder()
-                                .name(Text.translatable("skyblocker.config.messages.filter.hideAbility"))
-                                .binding(defaults.messages.hideAbility,
-                                        () -> config.messages.hideAbility,
-                                        newValue -> config.messages.hideAbility = newValue)
+                                .name(Text.translatable("skyblocker.config.chat.filter.hideAbility"))
+                                .binding(defaults.chats.hideAbility,
+                                        () -> config.chats.hideAbility,
+                                        newValue -> config.chats.hideAbility = newValue)
                                 .controller(ConfigUtils::createEnumCyclingListController)
                                 .build())
                         .option(Option.<ChatFilterResult>createBuilder()
-                                .name(Text.translatable("skyblocker.config.messages.filter.hideHeal"))
-                                .binding(defaults.messages.hideHeal,
-                                        () -> config.messages.hideHeal,
-                                        newValue -> config.messages.hideHeal = newValue)
+                                .name(Text.translatable("skyblocker.config.chat.filter.hideHeal"))
+                                .binding(defaults.chats.hideHeal,
+                                        () -> config.chats.hideHeal,
+                                        newValue -> config.chats.hideHeal = newValue)
                                 .controller(ConfigUtils::createEnumCyclingListController)
                                 .build())
                         .option(Option.<ChatFilterResult>createBuilder()
-                                .name(Text.translatable("skyblocker.config.messages.filter.hideAOTE"))
-                                .description(OptionDescription.of(Text.translatable("skyblocker.config.messages.filter.hideAOTE.@Tooltip")))
-                                .binding(defaults.messages.hideAOTE,
-                                        () -> config.messages.hideAOTE,
-                                        newValue -> config.messages.hideAOTE = newValue)
+                                .name(Text.translatable("skyblocker.config.chat.filter.hideAOTE"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.chat.filter.hideAOTE.@Tooltip")))
+                                .binding(defaults.chats.hideAOTE,
+                                        () -> config.chats.hideAOTE,
+                                        newValue -> config.chats.hideAOTE = newValue)
                                 .controller(ConfigUtils::createEnumCyclingListController)
                                 .build())
                         .option(Option.<ChatFilterResult>createBuilder()
-                                .name(Text.translatable("skyblocker.config.messages.filter.hideImplosion"))
-                                .binding(defaults.messages.hideImplosion,
-                                        () -> config.messages.hideImplosion,
-                                        newValue -> config.messages.hideImplosion = newValue)
+                                .name(Text.translatable("skyblocker.config.chat.filter.hideImplosion"))
+                                .binding(defaults.chats.hideImplosion,
+                                        () -> config.chats.hideImplosion,
+                                        newValue -> config.chats.hideImplosion = newValue)
                                 .controller(ConfigUtils::createEnumCyclingListController)
                                 .build())
                         .option(Option.<ChatFilterResult>createBuilder()
-                                .name(Text.translatable("skyblocker.config.messages.filter.hideMoltenWave"))
-                                .binding(defaults.messages.hideMoltenWave,
-                                        () -> config.messages.hideMoltenWave,
-                                        newValue -> config.messages.hideMoltenWave = newValue)
+                                .name(Text.translatable("skyblocker.config.chat.filter.hideMoltenWave"))
+                                .binding(defaults.chats.hideMoltenWave,
+                                        () -> config.chats.hideMoltenWave,
+                                        newValue -> config.chats.hideMoltenWave = newValue)
                                 .controller(ConfigUtils::createEnumCyclingListController)
                                 .build())
                         .option(Option.<ChatFilterResult>createBuilder()
-                                .name(Text.translatable("skyblocker.config.messages.filter.hideAds"))
-                                .binding(defaults.messages.hideAds,
-                                        () -> config.messages.hideAds,
-                                        newValue -> config.messages.hideAds = newValue)
+                                .name(Text.translatable("skyblocker.config.chat.filter.hideAds"))
+                                .binding(defaults.chats.hideAds,
+                                        () -> config.chats.hideAds,
+                                        newValue -> config.chats.hideAds = newValue)
                                 .controller(ConfigUtils::createEnumCyclingListController)
                                 .build())
                         .option(Option.<ChatFilterResult>createBuilder()
-                                .name(Text.translatable("skyblocker.config.messages.filter.hideTeleportPad"))
-                                .binding(defaults.messages.hideTeleportPad,
-                                        () -> config.messages.hideTeleportPad,
-                                        newValue -> config.messages.hideTeleportPad = newValue)
+                                .name(Text.translatable("skyblocker.config.chat.filter.hideTeleportPad"))
+                                .binding(defaults.chats.hideTeleportPad,
+                                        () -> config.chats.hideTeleportPad,
+                                        newValue -> config.chats.hideTeleportPad = newValue)
                                 .controller(ConfigUtils::createEnumCyclingListController)
                                 .build())
                         .option(Option.<ChatFilterResult>createBuilder()
-                                .name(Text.translatable("skyblocker.config.messages.filter.hideCombo"))
-                                .binding(defaults.messages.hideCombo,
-                                        () -> config.messages.hideCombo,
-                                        newValue -> config.messages.hideCombo = newValue)
+                                .name(Text.translatable("skyblocker.config.chat.filter.hideCombo"))
+                                .binding(defaults.chats.hideCombo,
+                                        () -> config.chats.hideCombo,
+                                        newValue -> config.chats.hideCombo = newValue)
                                 .controller(ConfigUtils::createEnumCyclingListController)
                                 .build())
                         .option(Option.<ChatFilterResult>createBuilder()
-                                .name(Text.translatable("skyblocker.config.messages.filter.hideAutopet"))
-                                .binding(defaults.messages.hideAutopet,
-                                        () -> config.messages.hideAutopet,
-                                        newValue -> config.messages.hideAutopet = newValue)
+                                .name(Text.translatable("skyblocker.config.chat.filter.hideAutopet"))
+                                .binding(defaults.chats.hideAutopet,
+                                        () -> config.chats.hideAutopet,
+                                        newValue -> config.chats.hideAutopet = newValue)
                                 .controller(ConfigUtils::createEnumCyclingListController)
                                 .build())
                         .option(Option.<ChatFilterResult>createBuilder()
-                                .name(Text.translatable("skyblocker.config.messages.filter.hideShowOff"))
-                                .description(OptionDescription.of(Text.translatable("skyblocker.config.messages.filter.hideShowOff.@Tooltip")))
-                                .binding(defaults.messages.hideShowOff,
-                                        () -> config.messages.hideShowOff,
-                                        newValue -> config.messages.hideShowOff = newValue)
+                                .name(Text.translatable("skyblocker.config.chat.filter.hideShowOff"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.chat.filter.hideShowOff.@Tooltip")))
+                                .binding(defaults.chats.hideShowOff,
+                                        () -> config.chats.hideShowOff,
+                                        newValue -> config.chats.hideShowOff = newValue)
                                 .controller(ConfigUtils::createEnumCyclingListController)
                                 .build())
                         .option(Option.<ChatFilterResult>createBuilder()
-                                .name(Text.translatable("skyblocker.config.messages.filter.hideToggleSkyMall"))
-                                .description(OptionDescription.of(Text.translatable("skyblocker.config.messages.filter.hideToggleSkyMall.@Tooltip")))
-                                .binding(defaults.messages.hideToggleSkyMall,
-                                        () -> config.messages.hideToggleSkyMall,
-                                        newValue -> config.messages.hideToggleSkyMall = newValue)
+                                .name(Text.translatable("skyblocker.config.chat.filter.hideToggleSkyMall"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.chat.filter.hideToggleSkyMall.@Tooltip")))
+                                .binding(defaults.chats.hideToggleSkyMall,
+                                        () -> config.chats.hideToggleSkyMall,
+                                        newValue -> config.chats.hideToggleSkyMall = newValue)
                                 .controller(ConfigUtils::createEnumCyclingListController)
                                 .build())
                         .option(Option.<Boolean>createBuilder()
-                                .name(Text.translatable("skyblocker.config.messages.filter.hideMana"))
-                                .description(OptionDescription.of(Text.translatable("skyblocker.config.messages.filter.hideMana.@Tooltip")))
-                                .binding(defaults.messages.hideMana,
-                                        () -> config.messages.hideMana,
-                                        newValue -> config.messages.hideMana = newValue)
+                                .name(Text.translatable("skyblocker.config.chat.filter.hideMana"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.chat.filter.hideMana.@Tooltip")))
+                                .binding(defaults.chats.hideMana,
+                                        () -> config.chats.hideMana,
+                                        newValue -> config.chats.hideMana = newValue)
                                 .controller(ConfigUtils::createBooleanController)
                                 .build())
                         .option(Option.<ChatFilterResult>createBuilder()
-                                .name(Text.translatable("skyblocker.config.messages.filter.hideMimicKill"))
-                                .description(OptionDescription.of(Text.translatable("skyblocker.config.messages.filter.hideMimicKill.@Tooltip")))
-                                .binding(defaults.messages.hideMimicKill,
-                                        () -> config.messages.hideMimicKill,
-                                        newValue -> config.messages.hideMimicKill = newValue)
+                                .name(Text.translatable("skyblocker.config.chat.filter.hideMimicKill"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.chat.filter.hideMimicKill.@Tooltip")))
+                                .binding(defaults.chats.hideMimicKill,
+                                        () -> config.chats.hideMimicKill,
+                                        newValue -> config.chats.hideMimicKill = newValue)
                                 .controller(ConfigUtils::createEnumCyclingListController)
                                 .build())
                         .option(Option.<ChatFilterResult>createBuilder()
-                                .name(Text.translatable("skyblocker.config.messages.filter.hideDeath"))
-                                .description(OptionDescription.of(Text.translatable("skyblocker.config.messages.filter.hideDeath.@Tooltip")))
-                                .binding(defaults.messages.hideDeath,
-                                        () -> config.messages.hideDeath,
-                                        newValue -> config.messages.hideDeath = newValue)
+                                .name(Text.translatable("skyblocker.config.chat.filter.hideDeath"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.chat.filter.hideDeath.@Tooltip")))
+                                .binding(defaults.chats.hideDeath,
+                                        () -> config.chats.hideDeath,
+                                        newValue -> config.chats.hideDeath = newValue)
                                 .controller(ConfigUtils::createEnumCyclingListController)
                                 .build())
                         .option(Option.<ChatFilterResult>createBuilder()
-                                .name(Text.translatable("skyblocker.config.messages.filter.hideDicer"))
-                                .description(OptionDescription.of(Text.translatable("skyblocker.config.messages.filter.hideDicer.@Tooltip")))
-                                .binding(defaults.messages.hideDicer,
-                                        () -> config.messages.hideDicer,
-                                        newValue -> config.messages.hideDicer = newValue)
+                                .name(Text.translatable("skyblocker.config.chat.filter.hideDicer"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.chat.filter.hideDicer.@Tooltip")))
+                                .binding(defaults.chats.hideDicer,
+                                        () -> config.chats.hideDicer,
+                                        newValue -> config.chats.hideDicer = newValue)
                                 .controller(ConfigUtils::createEnumCyclingListController)
                                 .build())
                         .build())
 
                 //chat rules options
                 .group(OptionGroup.createBuilder()
-                        .name(Text.translatable("skyblocker.config.messages.chatRules"))
+                        .name(Text.translatable("skyblocker.config.chat.chatRules"))
                         .collapsed(false)
                         .option(ButtonOption.createBuilder()
-                                .name(Text.translatable("skyblocker.config.messages.chatRules.screen"))
+                                .name(Text.translatable("skyblocker.config.chat.chatRules.screen"))
                                 .text(Text.translatable("text.skyblocker.open"))
                                 .action((screen, opt) -> MinecraftClient.getInstance().setScreen(new ChatRulesConfigScreen(screen)))
                                 .build())
                         .option(Option.<Integer>createBuilder()
-                                .name(Text.translatable("skyblocker.config.messages.chatRules.announcementLength"))
-                                .description(OptionDescription.of(Text.translatable("skyblocker.config.messages.chatRules.announcementLength.@Tooltip")))
-                                .binding(defaults.messages.chatRuleConfig.announcementLength,
-                                        () -> config.messages.chatRuleConfig.announcementLength,
-                                        newValue -> config.messages.chatRuleConfig.announcementLength = newValue)
+                                .name(Text.translatable("skyblocker.config.chat.chatRules.announcementLength"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.chat.chatRules.announcementLength.@Tooltip")))
+                                .binding(defaults.chats.chatRuleConfig.announcementLength,
+                                        () -> config.chats.chatRuleConfig.announcementLength,
+                                        newValue -> config.chats.chatRuleConfig.announcementLength = newValue)
                                 .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(5, 200).step(1))
                                 .build())
                         .option(Option.<Integer>createBuilder()
-                                .name(Text.translatable("skyblocker.config.messages.chatRules.announcementScale"))
-                                .description(OptionDescription.of(Text.translatable("skyblocker.config.messages.chatRules.announcementScale.@Tooltip")))
-                                .binding(defaults.messages.chatRuleConfig.announcementScale,
-                                        () -> config.messages.chatRuleConfig.announcementScale,
-                                        newValue -> config.messages.chatRuleConfig.announcementScale = newValue)
+                                .name(Text.translatable("skyblocker.config.chat.chatRules.announcementScale"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.chat.chatRules.announcementScale.@Tooltip")))
+                                .binding(defaults.chats.chatRuleConfig.announcementScale,
+                                        () -> config.chats.chatRuleConfig.announcementScale,
+                                        newValue -> config.chats.chatRuleConfig.announcementScale = newValue)
                                 .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(1, 8).step(1))
                                 .build())
                         .build())
diff --git a/src/main/java/de/hysky/skyblocker/config/configs/MessagesFilterConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/ChatConfig.java
index 778cd829..f857ad61 100644
--- a/src/main/java/de/hysky/skyblocker/config/configs/MessagesFilterConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/configs/ChatConfig.java
@@ -3,7 +3,7 @@ package de.hysky.skyblocker.config.configs;
 import de.hysky.skyblocker.utils.chat.ChatFilterResult;
 import dev.isxander.yacl3.config.v2.api.SerialEntry;
 
-public class MessagesFilterConfig {
+public class ChatConfig {
     @SerialEntry
     public ChatFilterResult hideAbility = ChatFilterResult.PASS;
 
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/StatusBarTracker.java b/src/main/java/de/hysky/skyblocker/skyblock/StatusBarTracker.java
index 46ae9f3e..6f84a315 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/StatusBarTracker.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/StatusBarTracker.java
@@ -75,7 +75,7 @@ public class StatusBarTracker {
         if (!overlay || !Utils.isOnSkyblock() || !SkyblockerConfigManager.get().uiAndVisuals.bars.enableBars || Utils.isInTheRift()) {
             return text;
         }
-        return Text.of(update(text.getString(), SkyblockerConfigManager.get().messages.hideMana));
+        return Text.of(update(text.getString(), SkyblockerConfigManager.get().chats.hideMana));
     }
 
     public String update(String actionBar, boolean filterManaUse) {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleAnnouncementScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleAnnouncementScreen.java
index d61a0b59..d028d431 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleAnnouncementScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleAnnouncementScreen.java
@@ -27,7 +27,7 @@ public class ChatRuleAnnouncementScreen {
      * @param tickDelta difference from last render to remove from timer
      */
     private static void render(DrawContext context, float tickDelta) {
-        int scale = SkyblockerConfigManager.get().messages.chatRuleConfig.announcementScale;
+        int scale = SkyblockerConfigManager.get().chats.chatRuleConfig.announcementScale;
         //decrement timer
         timer -= tickDelta;
         //scale text up and center
@@ -43,6 +43,6 @@ public class ChatRuleAnnouncementScreen {
 
     protected static void setText(Text newText) {
         text = newText;
-        timer =  SkyblockerConfigManager.get().messages.chatRuleConfig.announcementLength;
+        timer =  SkyblockerConfigManager.get().chats.chatRuleConfig.announcementLength;
     }
 }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleConfigScreen.java
index 3c6cfa1b..cb6e8cc8 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleConfigScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleConfigScreen.java
@@ -24,13 +24,13 @@ public class ChatRuleConfigScreen extends Screen {
     private static final int SPACER_Y = 25;
 
     private final Map<MutableText, SoundEvent> soundsLookup = Map.ofEntries(
-            entry(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.sounds.pling"), SoundEvents.BLOCK_NOTE_BLOCK_PLING.value()),
-            entry(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.sounds.cave"), SoundEvents.AMBIENT_CAVE.value()),
-            entry(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.sounds.zombie"), SoundEvents.ENTITY_ZOMBIE_AMBIENT),
-            entry(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.sounds.crit"), SoundEvents.ENTITY_PLAYER_ATTACK_CRIT),
-            entry(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.sounds.arrowHit"), SoundEvents.ENTITY_ARROW_HIT_PLAYER),
-            entry(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.sounds.amethyst"), SoundEvents.BLOCK_AMETHYST_BLOCK_HIT),
-            entry(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.sounds.anvil"), SoundEvents.BLOCK_ANVIL_LAND)
+            entry(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.sounds.pling"), SoundEvents.BLOCK_NOTE_BLOCK_PLING.value()),
+            entry(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.sounds.cave"), SoundEvents.AMBIENT_CAVE.value()),
+            entry(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.sounds.zombie"), SoundEvents.ENTITY_ZOMBIE_AMBIENT),
+            entry(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.sounds.crit"), SoundEvents.ENTITY_PLAYER_ATTACK_CRIT),
+            entry(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.sounds.arrowHit"), SoundEvents.ENTITY_ARROW_HIT_PLAYER),
+            entry(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.sounds.amethyst"), SoundEvents.BLOCK_AMETHYST_BLOCK_HIT),
+            entry(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.sounds.anvil"), SoundEvents.BLOCK_ANVIL_LAND)
     );
 
     private int buttonWidth = 75;
@@ -69,7 +69,7 @@ public class ChatRuleConfigScreen extends Screen {
     private final Screen parent;
 
     public ChatRuleConfigScreen(Screen parent, int chatRuleIndex) {
-        super(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen"));
+        super(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen"));
         this.chatRuleIndex = chatRuleIndex;
         this.chatRule = ChatRulesHandler.chatRuleList.get(chatRuleIndex);
         this.parent = parent;
@@ -101,63 +101,63 @@ public class ChatRuleConfigScreen extends Screen {
         int lineXOffset;
 
         nameLabelTextPos = currentPos;
-        lineXOffset  = client.textRenderer.getWidth(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.name")) + SPACER_X;
+        lineXOffset  = client.textRenderer.getWidth(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.name")) + SPACER_X;
         nameInput =  new TextFieldWidget(client.textRenderer, currentPos.leftInt() + lineXOffset, currentPos.rightInt(), 100, 20, Text.of(""));
         nameInput.setText(chatRule.getName());
-        nameInput.setTooltip(Tooltip.of(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.name.@Tooltip")));
+        nameInput.setTooltip(Tooltip.of(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.name.@Tooltip")));
         currentPos = IntIntPair.of(currentPos.leftInt(), currentPos.rightInt() + SPACER_Y);
 
         inputsLabelTextPos = currentPos;
         currentPos = IntIntPair.of(currentPos.leftInt() + 10, currentPos.rightInt() + SPACER_Y);
 
         filterLabelTextPos = currentPos;
-        lineXOffset = client.textRenderer.getWidth(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.filter")) + SPACER_X;
+        lineXOffset = client.textRenderer.getWidth(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.filter")) + SPACER_X;
         filterInput = new TextFieldWidget(client.textRenderer, currentPos.leftInt() + lineXOffset, currentPos.rightInt(), 200, 20, Text.of(""));
         filterInput.setMaxLength(96);
         filterInput.setText(chatRule.getFilter());
-        filterInput.setTooltip(Tooltip.of(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.filter.@Tooltip")));
+        filterInput.setTooltip(Tooltip.of(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.filter.@Tooltip")));
         currentPos = IntIntPair.of(currentPos.leftInt(),currentPos.rightInt() + SPACER_Y);
         lineXOffset = 0;
 
         partialMatchTextPos = IntIntPair.of(currentPos.leftInt() + lineXOffset, currentPos.rightInt());
-        lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.partialMatch")) + SPACER_X;
+        lineXOffset += client.textRender