diff options
| author | Yasin <a.piri@hotmail.de> | 2024-05-08 19:51:59 +0200 | 
|---|---|---|
| committer | Yasin <a.piri@hotmail.de> | 2024-05-08 19:51:59 +0200 | 
| commit | 55f77b14e8a876fc499c7f53ea1b2ace68fac1de (patch) | |
| tree | 393fca10a03f94aec3cae23463db4eafd9de422c /src/main/java | |
| parent | 4aaa17128a54c9c91a9a02988a81037848f2b1a2 (diff) | |
| download | Skyblocker-55f77b14e8a876fc499c7f53ea1b2ace68fac1de.tar.gz Skyblocker-55f77b14e8a876fc499c7f53ea1b2ace68fac1de.tar.bz2 Skyblocker-55f77b14e8a876fc499c7f53ea1b2ace68fac1de.zip | |
MessagesFilterConfig -> ChatConfig
Diffstat (limited to 'src/main/java')
24 files changed, 165 insertions, 165 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.textRenderer.getWidth(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.partialMatch")) + SPACER_X;          partialMatchToggle = ButtonWidget.builder(enabledButtonText(chatRule.getPartialMatch()), a -> {                      chatRule.setPartialMatch(!chatRule.getPartialMatch());                      partialMatchToggle.setMessage(enabledButtonText(chatRule.getPartialMatch()));                  })                  .position(currentPos.leftInt() + lineXOffset, currentPos.rightInt())                  .size(buttonWidth,20) -                .tooltip(Tooltip.of(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.partialMatch.@Tooltip"))) +                .tooltip(Tooltip.of(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.partialMatch.@Tooltip")))                  .build();          lineXOffset += buttonWidth + SPACER_X;          regexTextPos = IntIntPair.of(currentPos.leftInt() + lineXOffset,currentPos.rightInt()); -        lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.regex")) + SPACER_X; +        lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.regex")) + SPACER_X;          regexToggle = ButtonWidget.builder(enabledButtonText(chatRule.getRegex()), a -> {                      chatRule.setRegex(!chatRule.getRegex());                      regexToggle.setMessage(enabledButtonText(chatRule.getRegex()));                  })                  .position(currentPos.leftInt() + lineXOffset, currentPos.rightInt())                  .size(buttonWidth,20) -                .tooltip(Tooltip.of(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.regex.@Tooltip"))) +                .tooltip(Tooltip.of(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.regex.@Tooltip")))                  .build();          lineXOffset += buttonWidth + SPACER_X;          ignoreCaseTextPos = IntIntPair.of(currentPos.leftInt() + lineXOffset,currentPos.rightInt()); -        lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.ignoreCase")) + SPACER_X; +        lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.ignoreCase")) + SPACER_X;          ignoreCaseToggle = ButtonWidget.builder(enabledButtonText(chatRule.getIgnoreCase()), a -> {                      chatRule.setIgnoreCase(!chatRule.getIgnoreCase());                      ignoreCaseToggle.setMessage(enabledButtonText(chatRule.getIgnoreCase()));                  })                  .position(currentPos.leftInt() + lineXOffset, currentPos.rightInt())                  .size(buttonWidth,20) -                .tooltip(Tooltip.of(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.ignoreCase.@Tooltip"))) +                .tooltip(Tooltip.of(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.ignoreCase.@Tooltip")))                  .build();          currentPos = IntIntPair.of(currentPos.leftInt(), currentPos.rightInt() + SPACER_Y);          locationLabelTextPos = currentPos; -        lineXOffset = client.textRenderer.getWidth(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.locations")) + SPACER_X; +        lineXOffset = client.textRenderer.getWidth(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.locations")) + SPACER_X;          locationsInput = new TextFieldWidget(client.textRenderer, currentPos.leftInt() + lineXOffset, currentPos.rightInt(), 200, 20, Text.of(""));          locationsInput.setText(chatRule.getValidLocations()); -        MutableText locationToolTip = Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.locations.@Tooltip"); +        MutableText locationToolTip = Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.locations.@Tooltip");          locationToolTip.append("\n");          ChatRulesHandler.locationsList.forEach(location -> locationToolTip.append(" " + location + ",\n"));          locationsInput.setTooltip(Tooltip.of(locationToolTip)); @@ -167,42 +167,42 @@ public class ChatRuleConfigScreen extends Screen {          currentPos = IntIntPair.of(currentPos.leftInt(), currentPos.rightInt() + SPACER_Y);          hideMessageTextPos = currentPos; -        lineXOffset = client.textRenderer.getWidth(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.hideMessage")) + SPACER_X; +        lineXOffset = client.textRenderer.getWidth(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.hideMessage")) + SPACER_X;          hideMessageToggle = ButtonWidget.builder(enabledButtonText(chatRule.getHideMessage()), a -> {                      chatRule.setHideMessage(!chatRule.getHideMessage());                      hideMessageToggle.setMessage(enabledButtonText(chatRule.getHideMessage()));                  })                  .position(currentPos.leftInt() + lineXOffset, currentPos.rightInt())                  .size(buttonWidth,20) -                .tooltip(Tooltip.of(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.hideMessage.@Tooltip"))) +                .tooltip(Tooltip.of(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.hideMessage.@Tooltip")))                  .build();          lineXOffset += buttonWidth + SPACER_X;          actionBarTextPos = IntIntPair.of(currentPos.leftInt() + lineXOffset,currentPos.rightInt()); -        lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.actionBar")) + SPACER_X; +        lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.actionBar")) + SPACER_X;          actionBarToggle = ButtonWidget.builder(enabledButtonText(chatRule.getShowActionBar()), a -> {                      chatRule.setShowActionBar(!chatRule.getShowActionBar());                      actionBarToggle.setMessage(enabledButtonText(chatRule.getShowActionBar()));                  })                  .position(currentPos.leftInt() + lineXOffset, currentPos.rightInt())                  .size(buttonWidth,20) -                .tooltip(Tooltip.of(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.actionBar.@Tooltip"))) +                .tooltip(Tooltip.of(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.actionBar.@Tooltip")))                  .build();          lineXOffset = 0;          currentPos = IntIntPair.of(currentPos.leftInt(), currentPos.rightInt() + SPACER_Y);          announcementTextPos = IntIntPair.of(currentPos.leftInt() + lineXOffset, currentPos.rightInt()); -        lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.announcement")) + SPACER_X; +        lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.announcement")) + SPACER_X;          announcementToggle = ButtonWidget.builder(enabledButtonText(chatRule.getShowAnnouncement()), a -> {                      chatRule.setShowAnnouncement(!chatRule.getShowAnnouncement());                      announcementToggle.setMessage(enabledButtonText(chatRule.getShowAnnouncement()));                  })                  .position(currentPos.leftInt() + lineXOffset, currentPos.rightInt())                  .size(buttonWidth,20) -                .tooltip(Tooltip.of(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.announcement.@Tooltip"))) +                .tooltip(Tooltip.of(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.announcement.@Tooltip")))                  .build();          lineXOffset += buttonWidth + SPACER_X;          customSoundLabelTextPos = IntIntPair.of(currentPos.leftInt() + lineXOffset,currentPos.rightInt()); -        lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.sounds")) + SPACER_X; +        lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.sounds")) + SPACER_X;          soundsToggle = ButtonWidget.builder(getSoundName(), a -> {                  currentSoundIndex += 1;                  if (currentSoundIndex == soundsLookup.size()) { @@ -217,18 +217,18 @@ public class ChatRuleConfigScreen extends Screen {                  }})                  .position(currentPos.leftInt() + lineXOffset, currentPos.rightInt())                  .size(buttonWidth,20) -                .tooltip(Tooltip.of(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.sounds.@Tooltip"))) +                .tooltip(Tooltip.of(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.sounds.@Tooltip")))                  .build();          currentPos = IntIntPair.of(currentPos.leftInt(), currentPos.rightInt() + SPACER_Y);          replaceMessageLabelTextPos = currentPos; -        lineXOffset = client.textRenderer.getWidth(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.replace")) + SPACER_X; +        lineXOffset = client.textRenderer.getWidth(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.replace")) + SPACER_X;          replaceMessageInput = new TextFieldWidget(client.textRenderer, currentPos.leftInt() + lineXOffset, currentPos.rightInt(), 200, 20, Text.of(""));          replaceMessageInput.setMaxLength(96); -        replaceMessageInput.setTooltip(Tooltip.of(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.replace.@Tooltip"))); +        replaceMessageInput.setTooltip(Tooltip.of(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.replace.@Tooltip")));          replaceMessageInput.setText(chatRule.getReplaceMessage()); -        ButtonWidget finishButton = ButtonWidget.builder(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.finish"), a -> close()) +        ButtonWidget finishButton = ButtonWidget.builder(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.finish"), a -> close())                  .position(this.width - buttonWidth - SPACER_Y, this.height - SPACER_Y)                  .size(buttonWidth, 20)                  .build(); @@ -266,9 +266,9 @@ public class ChatRuleConfigScreen extends Screen {      private int getMaxUsedWidth() {          if (client == null) return 0;          //text -        int total = client.textRenderer.getWidth(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.partialMatch")); -        total += client.textRenderer.getWidth(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.regex")); -        total += client.textRenderer.getWidth(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.ignoreCase")); +        int total = client.textRenderer.getWidth(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.partialMatch")); +        total += client.textRenderer.getWidth(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.regex")); +        total += client.textRenderer.getWidth(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.ignoreCase"));          //space          total += SPACER_X * 6;          //button width @@ -287,9 +287,9 @@ public class ChatRuleConfigScreen extends Screen {      private Text enabledButtonText(boolean enabled) {          if (enabled) { -            return Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.true").withColor(Color.GREEN.getRGB()); +            return Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.true").withColor(Color.GREEN.getRGB());          } else { -            return Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.false").withColor(Color.RED.getRGB()); +            return Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.false").withColor(Color.RED.getRGB());          }      } @@ -300,19 +300,19 @@ public class ChatRuleConfigScreen extends Screen {          //draw labels ands text          int yOffset = (SPACER_Y - this.textRenderer.fontHeight) / 2; -        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.inputs"), inputsLabelTextPos.leftInt(), inputsLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); -        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.name"), nameLabelTextPos.leftInt(), nameLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); -        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.filter"), filterLabelTextPos.leftInt(), filterLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); -        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.partialMatch"), partialMatchTextPos.leftInt(), partialMatchTextPos.rightInt() + yOffset, 0xFFFFFFFF); -        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.regex"), regexTextPos.leftInt(), regexTextPos.rightInt() + yOffset, 0xFFFFFFFF); -        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.ignoreCase"), ignoreCaseTextPos.leftInt(), ignoreCaseTextPos.rightInt() + yOffset, 0xFFFFFFFF); -        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.locations"), locationLabelTextPos.leftInt(), locationLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); -        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.outputs"), outputsLabelTextPos.leftInt(), outputsLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); -        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.hideMessage"), hideMessageTextPos.leftInt(), hideMessageTextPos.rightInt() + yOffset, 0xFFFFFFFF); -        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.actionBar"), actionBarTextPos.leftInt(), actionBarTextPos.rightInt() + yOffset, 0xFFFFFFFF); -        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.announcement"), announcementTextPos.leftInt(), announcementTextPos.rightInt() + yOffset, 0xFFFFFFFF); -        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.sounds"), customSoundLabelTextPos.leftInt(), customSoundLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); -        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.replace"), replaceMessageLabelTextPos.leftInt(), replaceMessageLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); +        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.inputs"), inputsLabelTextPos.leftInt(), inputsLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); +        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.name"), nameLabelTextPos.leftInt(), nameLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); +        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.filter"), filterLabelTextPos.leftInt(), filterLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); +        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.partialMatch"), partialMatchTextPos.leftInt(), partialMatchTextPos.rightInt() + yOffset, 0xFFFFFFFF); +        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.regex"), regexTextPos.leftInt(), regexTextPos.rightInt() + yOffset, 0xFFFFFFFF); +        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.ignoreCase"), ignoreCaseTextPos.leftInt(), ignoreCaseTextPos.rightInt() + yOffset, 0xFFFFFFFF); +        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.locations"), locationLabelTextPos.leftInt(), locationLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); +        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.outputs"), outputsLabelTextPos.leftInt(), outputsLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); +        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.hideMessage"), hideMessageTextPos.leftInt(), hideMessageTextPos.rightInt() + yOffset, 0xFFFFFFFF); +        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.actionBar"), actionBarTextPos.leftInt(), actionBarTextPos.rightInt() + yOffset, 0xFFFFFFFF); +        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.announcement"), announcementTextPos.leftInt(), announcementTextPos.rightInt() + yOffset, 0xFFFFFFFF); +        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.sounds"), customSoundLabelTextPos.leftInt(), customSoundLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); +        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.replace"), replaceMessageLabelTextPos.leftInt(), replaceMessageLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF);      }      /** @@ -337,7 +337,7 @@ public class ChatRuleConfigScreen extends Screen {      private MutableText getSoundName() {          if (currentSoundIndex == -1) { -            return Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.sounds.none"); +            return Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.sounds.none");          }          return soundsLookup.keySet().stream().toList().get(currentSoundIndex); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java index 1bc73ec2..29c052b8 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java @@ -82,9 +82,9 @@ public class ChatRulesConfigListWidget extends ElementListWidget<ChatRulesConfig          @Override          public void render(DrawContext context, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) { -            context.drawCenteredTextWithShadow(client.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleName"), width / 2 - 125, y + 5, 0xFFFFFFFF); -            context.drawCenteredTextWithShadow(client.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleEnabled"), width / 2, y + 5, 0xFFFFFFFF); -            context.drawCenteredTextWithShadow(client.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.modify"), width / 2 + 100, y + 5, 0xFFFFFFFF); +            context.drawCenteredTextWithShadow(client.textRenderer, Text.translatable("skyblocker.config.chat.chatRules.screen.ruleName"), width / 2 - 125, y + 5, 0xFFFFFFFF); +            context.drawCenteredTextWithShadow(client.textRenderer, Text.translatable("skyblocker.config.chat.chatRules.screen.ruleEnabled"), width / 2, y + 5, 0xFFFFFFFF); +            context.drawCenteredTextWithShadow(client.textRenderer, Text.translatable("skyblocker.config.chat.chatRules.screen.modify"), width / 2 + 100, y + 5, 0xFFFFFFFF);          }      } @@ -115,17 +115,17 @@ public class ChatRulesConfigListWidget extends ElementListWidget<ChatRulesConfig                      .position(width / 2 - 25, 5)                      .build(); -            openConfigButton = ButtonWidget.builder(Text.translatable("skyblocker.config.messages.chatRules.screen.editRule"), a -> { +            openConfigButton = ButtonWidget.builder(Text.translatable("skyblocker.config.chat.chatRules.screen.editRule"), a -> {                          client.setScreen(new ChatRuleConfigScreen(screen, chatRuleIndex));                      })                      .size(50, 20)                      .position(width / 2 + 45, 5) -                    .tooltip(Tooltip.of(Text.translatable("skyblocker.config.messages.chatRules.screen.editRule.@Tooltip"))) +                    .tooltip(Tooltip.of(Text.translatable("skyblocker.config.chat.chatRules.screen.editRule.@Tooltip")))                      .build();              deleteButton = ButtonWidget.builder(Text.translatable("selectServer.delete"), a -> {                          oldScrollAmount = getScrollAmount(); -                        client.setScreen(new ConfirmScreen(this::deleteEntry, Text.translatable("skyblocker.config.messages.chatRules.screen.deleteQuestion"), Text.translatable("skyblocker.config.messages.chatRules.screen.deleteWarning", chatRule.getName()), Text.translatable("selectServer.deleteButton"), ScreenTexts.CANCEL)); +                        client.setScreen(new ConfirmScreen(this::deleteEntry, Text.translatable("skyblocker.config.chat.chatRules.screen.deleteQuestion"), Text.translatable("skyblocker.config.chat.chatRules.screen.deleteWarning", chatRule.getName()), Text.translatable("selectServer.deleteButton"), ScreenTexts.CANCEL));                      })                      .size(50, 20)                      .position(width / 2 + 105, 5) @@ -136,9 +136,9 @@ public class ChatRulesConfigListWidget extends ElementListWidget<ChatRulesConfig          private Text enabledButtonText() {              if (chatRule.getEnabled()) { -                return Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.true").withColor(Color.GREEN.getRGB()); +                return Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.true").withColor(Color.GREEN.getRGB());              } else { -                return Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.false").withColor(Color.RED.getRGB()); +                return Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.false").withColor(Color.RED.getRGB());              }          }          private void toggleEnabled() { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigScreen.java index 303d8176..d986f9c7 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigScreen.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigScreen.java @@ -15,7 +15,7 @@ public class ChatRulesConfigScreen extends Screen {      private final Screen parent;      public ChatRulesConfigScreen(Screen parent) { -        super(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen")); +        super(Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen"));          this.parent = parent;      } @@ -37,7 +37,7 @@ public class ChatRulesConfigScreen extends Screen {                  close();              }          }).build()); -        ButtonWidget buttonNew1 = ButtonWidget.builder(Text.translatable("skyblocker.config.messages.chatRules.screen.new"), buttonNew -> chatRulesConfigListWidget.addRuleAfterSelected()).build(); +        ButtonWidget buttonNew1 = ButtonWidget.builder(Text.translatable("skyblocker.config.chat.chatRules.screen.new"), buttonNew -> chatRulesConfigListWidget.addRuleAfterSelected()).build();          adder.add(buttonNew1);          ButtonWidget buttonDone = ButtonWidget.builder(ScreenTexts.DONE, button -> {              chatRulesConfigListWidget.saveRules(); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/AbilityFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/filters/AbilityFilter.java index 17842891..f48654d8 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/filters/AbilityFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/filters/AbilityFilter.java @@ -10,6 +10,6 @@ public class AbilityFilter extends SimpleChatFilter {      @Override      protected ChatFilterResult state() { -        return SkyblockerConfigManager.get().messages.hideAbility; +        return SkyblockerConfigManager.get().chats.hideAbility;      }  } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/AdFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/filters/AdFilter.java index 5c9cd4a5..7e11ec36 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/filters/AdFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/filters/AdFilter.java @@ -34,6 +34,6 @@ public class AdFilter extends ChatPatternListener {  	@Override  	protected ChatFilterResult state() { -		return SkyblockerConfigManager.get().messages.hideAds; +		return SkyblockerConfigManager.get().chats.hideAds;  	}  }
\ No newline at end of file diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/AoteFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/filters/AoteFilter.java index 5d660037..f9a17293 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/filters/AoteFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/filters/AoteFilter.java @@ -10,6 +10,6 @@ public class AoteFilter extends SimpleChatFilter {      @Override      public ChatFilterResult state() { -        return SkyblockerConfigManager.get().messages.hideAOTE; +        return SkyblockerConfigManager.get().chats.hideAOTE;      }  } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/AutopetFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/filters/AutopetFilter.java index 958be11e..0d245254 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/filters/AutopetFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/filters/AutopetFilter.java @@ -16,7 +16,7 @@ public class AutopetFilter extends ChatPatternListener {      @Override      public boolean onMatch(Text _message, Matcher matcher) { -        if (SkyblockerConfigManager.get().messages.hideAutopet == ChatFilterResult.ACTION_BAR) { +        if (SkyblockerConfigManager.get().chats.hideAutopet == ChatFilterResult.ACTION_BAR) {              Objects.requireNonNull(MinecraftClient.getInstance().player).sendMessage(                      Text.literal(                              _message.getString().replace("VIEW RULE", "") @@ -27,9 +27,9 @@ public class AutopetFilter extends ChatPatternListener {      @Override      public ChatFilterResult state() { -        if (SkyblockerConfigManager.get().messages.hideAutopet == ChatFilterResult.ACTION_BAR) +        if (SkyblockerConfigManager.get().chats.hideAutopet == ChatFilterResult.ACTION_BAR)              return ChatFilterResult.FILTER;          else -            return SkyblockerConfigManager.get().messages.hideAutopet; +            return SkyblockerConfigManager.get().chats.hideAutopet;      }  }
\ No newline at end of file diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/ComboFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/filters/ComboFilter.java index d6a40d2d..fad2bb28 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/filters/ComboFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/filters/ComboFilter.java @@ -11,6 +11,6 @@ public class ComboFilter extends SimpleChatFilter {      @Override      public ChatFilterResult state() { -        return SkyblockerConfigManager.get().messages.hideCombo; +        return SkyblockerConfigManager.get().chats.hideCombo;      }  } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/DeathFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/filters/DeathFilter.java index f2b9e7c5..27b9a4e5 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/filters/DeathFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/filters/DeathFilter.java @@ -15,7 +15,7 @@ public class DeathFilter extends ChatPatternListener {  	@Override  	protected ChatFilterResult state() { -		return SkyblockerConfigManager.get().messages.hideDeath; +		return SkyblockerConfigManager.get().chats.hideDeath;  	}  	@Override diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/DicerFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/filters/DicerFilter.java index a3f78684..35ce360a 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/filters/DicerFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/filters/DicerFilter.java @@ -10,6 +10,6 @@ public class DicerFilter extends SimpleChatFilter {      @Override      public ChatFilterResult state() { -        return SkyblockerConfigManager.get().messages.hideDicer; +        return SkyblockerConfigManager.get().chats.hideDicer;      }  } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/HealFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/filters/HealFilter.java index 8b46efb5..0c0bdc52 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/filters/HealFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/filters/HealFilter.java @@ -10,6 +10,6 @@ public class HealFilter extends SimpleChatFilter {      @Override      public ChatFilterResult state() { -        return SkyblockerConfigManager.get().messages.hideHeal; +        return SkyblockerConfigManager.get().chats.hideHeal;      }  } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/ImplosionFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/filters/ImplosionFilter.java index 730f6d5d..41d634f6 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/filters/ImplosionFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/filters/ImplosionFilter.java @@ -10,6 +10,6 @@ public class ImplosionFilter extends SimpleChatFilter {      @Override      public ChatFilterResult state() { -        return SkyblockerConfigManager.get().messages.hideImplosion; +        return SkyblockerConfigManager.get().chats.hideImplosion;      }  } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/MimicFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/filters/MimicFilter.java index f284624d..1e228022 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/filters/MimicFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/filters/MimicFilter.java @@ -16,7 +16,7 @@ public class MimicFilter extends ChatPatternListener {      @Override      public ChatFilterResult state() { -        return SkyblockerConfigManager.get().messages.hideMimicKill; +        return SkyblockerConfigManager.get().chats.hideMimicKill;      }      @Override diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/MoltenWaveFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/filters/MoltenWaveFilter.java index aa3bb64d..5653921b 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/filters/MoltenWaveFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/filters/MoltenWaveFilter.java @@ -10,6 +10,6 @@ public class MoltenWaveFilter extends SimpleChatFilter {      @Override      public ChatFilterResult state() { -        return SkyblockerConfigManager.get().messages.hideMoltenWave; +        return SkyblockerConfigManager.get().chats.hideMoltenWave;      }  } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/ShowOffFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/filters/ShowOffFilter.java index 84d32007..9d7d13a4 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/filters/ShowOffFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/filters/ShowOffFilter.java @@ -14,6 +14,6 @@ public class ShowOffFilter extends SimpleChatFilter {  	@Override  	protected ChatFilterResult state() { -		return SkyblockerConfigManager.get().messages.hideShowOff; +		return SkyblockerConfigManager.get().chats.hideShowOff;  	}  } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/TeleportPadFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/filters/TeleportPadFilter.java index 57fac590..f0c44491 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/filters/TeleportPadFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/filters/TeleportPadFilter.java @@ -11,6 +11,6 @@ public class TeleportPadFilter extends SimpleChatFilter {      @Override      public ChatFilterResult state() { -        return SkyblockerConfigManager.get().messages.hideTeleportPad; +        return SkyblockerConfigManager.get().chats.hideTeleportPad;      }  }
\ No newline at end of file diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/ToggleSkyMallFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/filters/ToggleSkyMallFilter.java index 6ee13aff..6b1fa26c 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/filters/ToggleSkyMallFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/filters/ToggleSkyMallFilter.java @@ -11,6 +11,6 @@ public class ToggleSkyMallFilter extends SimpleChatFilter {  	@Override  	protected ChatFilterResult state() { -		return SkyblockerConfigManager.get().messages.hideToggleSkyMall; +		return SkyblockerConfigManager.get().chats.hideToggleSkyMall;  	}  } diff --git a/src/main/java/de/hysky/skyblocker/utils/chat/ChatFilterResult.java b/src/main/java/de/hysky/skyblocker/utils/chat/ChatFilterResult.java index 8040a4d4..5c2bfe53 100644 --- a/src/main/java/de/hysky/skyblocker/utils/chat/ChatFilterResult.java +++ b/src/main/java/de/hysky/skyblocker/utils/chat/ChatFilterResult.java @@ -14,6 +14,6 @@ public enum ChatFilterResult {      @Override      public String toString() { -        return I18n.translate("skyblocker.config.messages.filter.chatFilterResult." + name()); +        return I18n.translate("skyblocker.config.chat.filter.chatFilterResult." + name());      }  } | 
