diff options
Diffstat (limited to 'src/main/java')
18 files changed, 71 insertions, 71 deletions
diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index 9970eec1..c591ba14 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 slayers = new SlayersConfig(); @SerialEntry - public ChatConfig chats = new ChatConfig(); + public ChatConfig chat = new ChatConfig(); @SerialEntry public QuickNavigationConfig quickNav = new QuickNavigationConfig(); diff --git a/src/main/java/de/hysky/skyblocker/config/categories/ChatCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/ChatCategory.java index 2932c697..993b07e4 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/ChatCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/ChatCategory.java @@ -20,114 +20,114 @@ public class ChatCategory { .name(Text.translatable("skyblocker.config.chat.filter")) .option(Option.<ChatFilterResult>createBuilder() .name(Text.translatable("skyblocker.config.chat.filter.hideAbility")) - .binding(defaults.chats.hideAbility, - () -> config.chats.hideAbility, - newValue -> config.chats.hideAbility = newValue) + .binding(defaults.chat.hideAbility, + () -> config.chat.hideAbility, + newValue -> config.chat.hideAbility = newValue) .controller(ConfigUtils::createEnumCyclingListController) .build()) .option(Option.<ChatFilterResult>createBuilder() .name(Text.translatable("skyblocker.config.chat.filter.hideHeal")) - .binding(defaults.chats.hideHeal, - () -> config.chats.hideHeal, - newValue -> config.chats.hideHeal = newValue) + .binding(defaults.chat.hideHeal, + () -> config.chat.hideHeal, + newValue -> config.chat.hideHeal = newValue) .controller(ConfigUtils::createEnumCyclingListController) .build()) .option(Option.<ChatFilterResult>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) + .binding(defaults.chat.hideAOTE, + () -> config.chat.hideAOTE, + newValue -> config.chat.hideAOTE = newValue) .controller(ConfigUtils::createEnumCyclingListController) .build()) .option(Option.<ChatFilterResult>createBuilder() .name(Text.translatable("skyblocker.config.chat.filter.hideImplosion")) - .binding(defaults.chats.hideImplosion, - () -> config.chats.hideImplosion, - newValue -> config.chats.hideImplosion = newValue) + .binding(defaults.chat.hideImplosion, + () -> config.chat.hideImplosion, + newValue -> config.chat.hideImplosion = newValue) .controller(ConfigUtils::createEnumCyclingListController) .build()) .option(Option.<ChatFilterResult>createBuilder() .name(Text.translatable("skyblocker.config.chat.filter.hideMoltenWave")) - .binding(defaults.chats.hideMoltenWave, - () -> config.chats.hideMoltenWave, - newValue -> config.chats.hideMoltenWave = newValue) + .binding(defaults.chat.hideMoltenWave, + () -> config.chat.hideMoltenWave, + newValue -> config.chat.hideMoltenWave = newValue) .controller(ConfigUtils::createEnumCyclingListController) .build()) .option(Option.<ChatFilterResult>createBuilder() .name(Text.translatable("skyblocker.config.chat.filter.hideAds")) - .binding(defaults.chats.hideAds, - () -> config.chats.hideAds, - newValue -> config.chats.hideAds = newValue) + .binding(defaults.chat.hideAds, + () -> config.chat.hideAds, + newValue -> config.chat.hideAds = newValue) .controller(ConfigUtils::createEnumCyclingListController) .build()) .option(Option.<ChatFilterResult>createBuilder() .name(Text.translatable("skyblocker.config.chat.filter.hideTeleportPad")) - .binding(defaults.chats.hideTeleportPad, - () -> config.chats.hideTeleportPad, - newValue -> config.chats.hideTeleportPad = newValue) + .binding(defaults.chat.hideTeleportPad, + () -> config.chat.hideTeleportPad, + newValue -> config.chat.hideTeleportPad = newValue) .controller(ConfigUtils::createEnumCyclingListController) .build()) .option(Option.<ChatFilterResult>createBuilder() .name(Text.translatable("skyblocker.config.chat.filter.hideCombo")) - .binding(defaults.chats.hideCombo, - () -> config.chats.hideCombo, - newValue -> config.chats.hideCombo = newValue) + .binding(defaults.chat.hideCombo, + () -> config.chat.hideCombo, + newValue -> config.chat.hideCombo = newValue) .controller(ConfigUtils::createEnumCyclingListController) .build()) .option(Option.<ChatFilterResult>createBuilder() .name(Text.translatable("skyblocker.config.chat.filter.hideAutopet")) - .binding(defaults.chats.hideAutopet, - () -> config.chats.hideAutopet, - newValue -> config.chats.hideAutopet = newValue) + .binding(defaults.chat.hideAutopet, + () -> config.chat.hideAutopet, + newValue -> config.chat.hideAutopet = newValue) .controller(ConfigUtils::createEnumCyclingListController) .build()) .option(Option.<ChatFilterResult>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) + .binding(defaults.chat.hideShowOff, + () -> config.chat.hideShowOff, + newValue -> config.chat.hideShowOff = newValue) .controller(ConfigUtils::createEnumCyclingListController) .build()) .option(Option.<ChatFilterResult>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) + .binding(defaults.chat.hideToggleSkyMall, + () -> config.chat.hideToggleSkyMall, + newValue -> config.chat.hideToggleSkyMall = newValue) .controller(ConfigUtils::createEnumCyclingListController) .build()) .option(Option.<Boolean>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) + .binding(defaults.chat.hideMana, + () -> config.chat.hideMana, + newValue -> config.chat.hideMana = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<ChatFilterResult>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) + .binding(defaults.chat.hideMimicKill, + () -> config.chat.hideMimicKill, + newValue -> config.chat.hideMimicKill = newValue) .controller(ConfigUtils::createEnumCyclingListController) .build()) .option(Option.<ChatFilterResult>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) + .binding(defaults.chat.hideDeath, + () -> config.chat.hideDeath, + newValue -> config.chat.hideDeath = newValue) .controller(ConfigUtils::createEnumCyclingListController) .build()) .option(Option.<ChatFilterResult>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) + .binding(defaults.chat.hideDicer, + () -> config.chat.hideDicer, + newValue -> config.chat.hideDicer = newValue) .controller(ConfigUtils::createEnumCyclingListController) .build()) .build()) @@ -144,17 +144,17 @@ public class ChatCategory { .option(Option.<Integer>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) + .binding(defaults.chat.chatRuleConfig.announcementLength, + () -> config.chat.chatRuleConfig.announcementLength, + newValue -> config.chat.chatRuleConfig.announcementLength = newValue) .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(5, 200).step(1)) .build()) .option(Option.<Integer>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) + .binding(defaults.chat.chatRuleConfig.announcementScale, + () -> config.chat.chatRuleConfig.announcementScale, + newValue -> config.chat.chatRuleConfig.announcementScale = newValue) .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(1, 8).step(1)) .build()) .build()) diff --git a/src/main/java/de/hysky/skyblocker/skyblock/StatusBarTracker.java b/src/main/java/de/hysky/skyblocker/skyblock/StatusBarTracker.java index 6f84a315..717bd8d6 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().chats.hideMana)); + return Text.of(update(text.getString(), SkyblockerConfigManager.get().chat.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 d028d431..b8d409ae 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().chats.chatRuleConfig.announcementScale; + int scale = SkyblockerConfigManager.get().chat.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().chats.chatRuleConfig.announcementLength; + timer = SkyblockerConfigManager.get().chat.chatRuleConfig.announcementLength; } } 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 f48654d8..1675dd89 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().chats.hideAbility; + return SkyblockerConfigManager.get().chat.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 7e11ec36..53f7066c 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().chats.hideAds; + return SkyblockerConfigManager.get().chat.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 f9a17293..98e252f3 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().chats.hideAOTE; + return SkyblockerConfigManager.get().chat.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 0d245254..3e535ec9 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().chats.hideAutopet == ChatFilterResult.ACTION_BAR) { + if (SkyblockerConfigManager.get().chat.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().chats.hideAutopet == ChatFilterResult.ACTION_BAR) + if (SkyblockerConfigManager.get().chat.hideAutopet == ChatFilterResult.ACTION_BAR) return ChatFilterResult.FILTER; else - return SkyblockerConfigManager.get().chats.hideAutopet; + return SkyblockerConfigManager.get().chat.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 fad2bb28..e6103720 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().chats.hideCombo; + return SkyblockerConfigManager.get().chat.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 27b9a4e5..b286c9b5 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().chats.hideDeath; + return SkyblockerConfigManager.get().chat.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 35ce360a..b2022f1f 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().chats.hideDicer; + return SkyblockerConfigManager.get().chat.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 0c0bdc52..604a0f5c 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().chats.hideHeal; + return SkyblockerConfigManager.get().chat.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 41d634f6..a120c0e5 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().chats.hideImplosion; + return SkyblockerConfigManager.get().chat.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 1e228022..1659713c 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().chats.hideMimicKill; + return SkyblockerConfigManager.get().chat.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 5653921b..d935138b 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().chats.hideMoltenWave; + return SkyblockerConfigManager.get().chat.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 9d7d13a4..94c23504 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().chats.hideShowOff; + return SkyblockerConfigManager.get().chat.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 f0c44491..5c30b039 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().chats.hideTeleportPad; + return SkyblockerConfigManager.get().chat.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 6b1fa26c..b1907391 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().chats.hideToggleSkyMall; + return SkyblockerConfigManager.get().chat.hideToggleSkyMall; } } |