From 55f77b14e8a876fc499c7f53ea1b2ace68fac1de Mon Sep 17 00:00:00 2001 From: Yasin Date: Wed, 8 May 2024 19:51:59 +0200 Subject: MessagesFilterConfig -> ChatConfig --- .../hysky/skyblocker/config/SkyblockerConfig.java | 2 +- .../skyblocker/config/SkyblockerConfigManager.java | 2 +- .../skyblocker/config/categories/ChatCategory.java | 163 +++++++++++++++++++++ .../config/categories/MessageFilterCategory.java | 163 --------------------- .../skyblocker/config/configs/ChatConfig.java | 61 ++++++++ .../config/configs/MessagesFilterConfig.java | 61 -------- 6 files changed, 226 insertions(+), 226 deletions(-) create mode 100644 src/main/java/de/hysky/skyblocker/config/categories/ChatCategory.java delete mode 100644 src/main/java/de/hysky/skyblocker/config/categories/MessageFilterCategory.java create mode 100644 src/main/java/de/hysky/skyblocker/config/configs/ChatConfig.java delete mode 100644 src/main/java/de/hysky/skyblocker/config/configs/MessagesFilterConfig.java (limited to 'src/main/java/de/hysky/skyblocker/config') 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/ChatCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/ChatCategory.java new file mode 100644 index 00000000..2932c697 --- /dev/null +++ b/src/main/java/de/hysky/skyblocker/config/categories/ChatCategory.java @@ -0,0 +1,163 @@ +package de.hysky.skyblocker.config.categories; + +import de.hysky.skyblocker.config.ConfigUtils; +import de.hysky.skyblocker.config.SkyblockerConfig; +import de.hysky.skyblocker.skyblock.chat.ChatRulesConfigScreen; +import de.hysky.skyblocker.utils.chat.ChatFilterResult; +import dev.isxander.yacl3.api.*; +import dev.isxander.yacl3.api.controller.IntegerSliderControllerBuilder; +import net.minecraft.client.MinecraftClient; +import net.minecraft.text.Text; + +public class ChatCategory { + + public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) { + return ConfigCategory.createBuilder() + .name(Text.translatable("skyblocker.config.chat")) + + //Uncategorized Options + .group(OptionGroup.createBuilder() + .name(Text.translatable("skyblocker.config.chat.filter")) + .option(Option.createBuilder() + .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.createBuilder() + .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.createBuilder() + .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.createBuilder() + .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.createBuilder() + .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.createBuilder() + .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.createBuilder() + .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.createBuilder() + .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.createBuilder() + .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.createBuilder() + .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.createBuilder() + .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.createBuilder() + .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.createBuilder() + .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.createBuilder() + .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.createBuilder() + .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.chat.chatRules")) + .collapsed(false) + .option(ButtonOption.createBuilder() + .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.createBuilder() + .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.createBuilder() + .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()) + .build(); + } +} diff --git a/src/main/java/de/hysky/skyblocker/config/categories/MessageFilterCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/MessageFilterCategory.java deleted file mode 100644 index 0e2716e7..00000000 --- a/src/main/java/de/hysky/skyblocker/config/categories/MessageFilterCategory.java +++ /dev/null @@ -1,163 +0,0 @@ -package de.hysky.skyblocker.config.categories; - -import de.hysky.skyblocker.config.ConfigUtils; -import de.hysky.skyblocker.config.SkyblockerConfig; -import de.hysky.skyblocker.skyblock.chat.ChatRulesConfigScreen; -import de.hysky.skyblocker.utils.chat.ChatFilterResult; -import dev.isxander.yacl3.api.*; -import dev.isxander.yacl3.api.controller.IntegerSliderControllerBuilder; -import net.minecraft.client.MinecraftClient; -import net.minecraft.text.Text; - -public class MessageFilterCategory { - - public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) { - return ConfigCategory.createBuilder() - .name(Text.translatable("skyblocker.config.messages")) - - //Uncategorized Options - .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.config.messages.filter")) - .option(Option.createBuilder() - .name(Text.translatable("skyblocker.config.messages.filter.hideAbility")) - .binding(defaults.messages.hideAbility, - () -> config.messages.hideAbility, - newValue -> config.messages.hideAbility = newValue) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.createBuilder() - .name(Text.translatable("skyblocker.config.messages.filter.hideHeal")) - .binding(defaults.messages.hideHeal, - () -> config.messages.hideHeal, - newValue -> config.messages.hideHeal = newValue) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.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) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.createBuilder() - .name(Text.translatable("skyblocker.config.messages.filter.hideImplosion")) - .binding(defaults.messages.hideImplosion, - () -> config.messages.hideImplosion, - newValue -> config.messages.hideImplosion = newValue) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.createBuilder() - .name(Text.translatable("skyblocker.config.messages.filter.hideMoltenWave")) - .binding(defaults.messages.hideMoltenWave, - () -> config.messages.hideMoltenWave, - newValue -> config.messages.hideMoltenWave = newValue) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.createBuilder() - .name(Text.translatable("skyblocker.config.messages.filter.hideAds")) - .binding(defaults.messages.hideAds, - () -> config.messages.hideAds, - newValue -> config.messages.hideAds = newValue) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.createBuilder() - .name(Text.translatable("skyblocker.config.messages.filter.hideTeleportPad")) - .binding(defaults.messages.hideTeleportPad, - () -> config.messages.hideTeleportPad, - newValue -> config.messages.hideTeleportPad = newValue) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.createBuilder() - .name(Text.translatable("skyblocker.config.messages.filter.hideCombo")) - .binding(defaults.messages.hideCombo, - () -> config.messages.hideCombo, - newValue -> config.messages.hideCombo = newValue) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.createBuilder() - .name(Text.translatable("skyblocker.config.messages.filter.hideAutopet")) - .binding(defaults.messages.hideAutopet, - () -> config.messages.hideAutopet, - newValue -> config.messages.hideAutopet = newValue) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.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) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.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) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.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) - .controller(ConfigUtils::createBooleanController) - .build()) - .option(Option.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) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.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) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.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) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .build()) - - //chat rules options - .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.config.messages.chatRules")) - .collapsed(false) - .option(ButtonOption.createBuilder() - .name(Text.translatable("skyblocker.config.messages.chatRules.screen")) - .text(Text.translatable("text.skyblocker.open")) - .action((screen, opt) -> MinecraftClient.getInstance().setScreen(new ChatRulesConfigScreen(screen))) - .build()) - .option(Option.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) - .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(5, 200).step(1)) - .build()) - .option(Option.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) - .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(1, 8).step(1)) - .build()) - .build()) - .build(); - } -} diff --git a/src/main/java/de/hysky/skyblocker/config/configs/ChatConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/ChatConfig.java new file mode 100644 index 00000000..f857ad61 --- /dev/null +++ b/src/main/java/de/hysky/skyblocker/config/configs/ChatConfig.java @@ -0,0 +1,61 @@ +package de.hysky.skyblocker.config.configs; + +import de.hysky.skyblocker.utils.chat.ChatFilterResult; +import dev.isxander.yacl3.config.v2.api.SerialEntry; + +public class ChatConfig { + @SerialEntry + public ChatFilterResult hideAbility = ChatFilterResult.PASS; + + @SerialEntry + public ChatFilterResult hideHeal = ChatFilterResult.PASS; + + @SerialEntry + public ChatFilterResult hideAOTE = ChatFilterResult.PASS; + + @SerialEntry + public ChatFilterResult hideImplosion = ChatFilterResult.PASS; + + @SerialEntry + public ChatFilterResult hideMoltenWave = ChatFilterResult.PASS; + + @SerialEntry + public ChatFilterResult hideAds = ChatFilterResult.PASS; + + @SerialEntry + public ChatFilterResult hideTeleportPad = ChatFilterResult.PASS; + + @SerialEntry + public ChatFilterResult hideCombo = ChatFilterResult.PASS; + + @SerialEntry + public ChatFilterResult hideAutopet = ChatFilterResult.PASS; + + @SerialEntry + public ChatFilterResult hideShowOff = ChatFilterResult.PASS; + + @SerialEntry + public ChatFilterResult hideToggleSkyMall = ChatFilterResult.PASS; + + @SerialEntry + public ChatFilterResult hideMimicKill = ChatFilterResult.PASS; + + @SerialEntry + public ChatFilterResult hideDeath = ChatFilterResult.PASS; + + @SerialEntry + public boolean hideMana = false; + + @SerialEntry + public ChatFilterResult hideDicer = ChatFilterResult.PASS; + + @SerialEntry + public ChatRuleConfig chatRuleConfig = new ChatRuleConfig(); + + public static class ChatRuleConfig { + @SerialEntry + public int announcementLength = 60; + @SerialEntry + public int announcementScale = 3; + } +} diff --git a/src/main/java/de/hysky/skyblocker/config/configs/MessagesFilterConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/MessagesFilterConfig.java deleted file mode 100644 index 778cd829..00000000 --- a/src/main/java/de/hysky/skyblocker/config/configs/MessagesFilterConfig.java +++ /dev/null @@ -1,61 +0,0 @@ -package de.hysky.skyblocker.config.configs; - -import de.hysky.skyblocker.utils.chat.ChatFilterResult; -import dev.isxander.yacl3.config.v2.api.SerialEntry; - -public class MessagesFilterConfig { - @SerialEntry - public ChatFilterResult hideAbility = ChatFilterResult.PASS; - - @SerialEntry - public ChatFilterResult hideHeal = ChatFilterResult.PASS; - - @SerialEntry - public ChatFilterResult hideAOTE = ChatFilterResult.PASS; - - @SerialEntry - public ChatFilterResult hideImplosion = ChatFilterResult.PASS; - - @SerialEntry - public ChatFilterResult hideMoltenWave = ChatFilterResult.PASS; - - @SerialEntry - public ChatFilterResult hideAds = ChatFilterResult.PASS; - - @SerialEntry - public ChatFilterResult hideTeleportPad = ChatFilterResult.PASS; - - @SerialEntry - public ChatFilterResult hideCombo = ChatFilterResult.PASS; - - @SerialEntry - public ChatFilterResult hideAutopet = ChatFilterResult.PASS; - - @SerialEntry - public ChatFilterResult hideShowOff = ChatFilterResult.PASS; - - @SerialEntry - public ChatFilterResult hideToggleSkyMall = ChatFilterResult.PASS; - - @SerialEntry - public ChatFilterResult hideMimicKill = ChatFilterResult.PASS; - - @SerialEntry - public ChatFilterResult hideDeath = ChatFilterResult.PASS; - - @SerialEntry - public boolean hideMana = false; - - @SerialEntry - public ChatFilterResult hideDicer = ChatFilterResult.PASS; - - @SerialEntry - public ChatRuleConfig chatRuleConfig = new ChatRuleConfig(); - - public static class ChatRuleConfig { - @SerialEntry - public int announcementLength = 60; - @SerialEntry - public int announcementScale = 3; - } -} -- cgit