From 15bf2503e0147aeb06ebae2922ecede237983d5c Mon Sep 17 00:00:00 2001 From: Yasin Date: Wed, 8 May 2024 00:07:04 +0200 Subject: debloat SkyblockerConfig.java + translate change removed text.autoconfig. prefix new way is skyblocker.option. --- .../de/hysky/skyblocker/skyblock/ChestValue.java | 16 ++-- .../hysky/skyblocker/skyblock/FishingHelper.java | 8 +- .../skyblocker/skyblock/StatusBarTracker.java | 2 +- .../hysky/skyblocker/skyblock/TeleportOverlay.java | 16 ++-- .../newyearcakes/NewYearCakeBagHelper.java | 2 +- .../newyearcakes/NewYearCakesHelper.java | 2 +- .../skyblock/auction/AuctionBrowserScreen.java | 4 +- .../skyblocker/skyblock/barn/HungryHiker.java | 2 +- .../skyblocker/skyblock/barn/TreasureHunter.java | 2 +- .../skyblock/chat/ChatRuleConfigScreen.java | 100 ++++++++++----------- .../skyblock/chat/ChatRulesConfigListWidget.java | 16 ++-- .../skyblock/chat/ChatRulesConfigScreen.java | 4 +- .../crimson/kuudra/ArrowPoisonWarning.java | 3 +- .../skyblock/crimson/kuudra/KuudraWaypoints.java | 24 ++--- .../skyblocker/skyblock/dungeon/CroesusHelper.java | 2 +- .../skyblocker/skyblock/dungeon/CroesusProfit.java | 2 +- .../skyblocker/skyblock/dungeon/DungeonMap.java | 8 +- .../skyblock/dungeon/DungeonMapConfigScreen.java | 26 +++--- .../skyblocker/skyblock/dungeon/DungeonScore.java | 5 +- .../skyblock/dungeon/DungeonScoreHUD.java | 8 +- .../skyblock/dungeon/FireFreezeStaffTimer.java | 4 +- .../skyblock/dungeon/GuardianHealth.java | 4 +- .../skyblocker/skyblock/dungeon/LividColor.java | 11 +-- .../hysky/skyblocker/skyblock/dungeon/Reparty.java | 2 +- .../skyblock/dungeon/puzzle/CreeperBeams.java | 2 +- .../skyblock/dungeon/puzzle/DungeonBlaze.java | 2 +- .../skyblock/dungeon/puzzle/IceFill.java | 4 +- .../skyblock/dungeon/puzzle/Silverfish.java | 4 +- .../skyblock/dungeon/puzzle/ThreeWeirdos.java | 2 +- .../skyblock/dungeon/puzzle/TicTacToe.java | 2 +- .../skyblocker/skyblock/dungeon/puzzle/Trivia.java | 2 +- .../skyblock/dungeon/puzzle/boulder/Boulder.java | 4 +- .../dungeon/puzzle/waterboard/Waterboard.java | 6 +- .../skyblock/dungeon/secrets/DungeonManager.java | 10 +-- .../skyblocker/skyblock/dungeon/secrets/Room.java | 10 +-- .../skyblock/dungeon/secrets/SecretWaypoint.java | 9 +- .../skyblock/dungeon/secrets/SecretsTracker.java | 2 +- .../skyblock/dungeon/terminal/ColorTerminal.java | 2 +- .../skyblock/dungeon/terminal/OrderTerminal.java | 2 +- .../dungeon/terminal/StartsWithTerminal.java | 2 +- .../skyblocker/skyblock/dwarven/CrystalsHud.java | 16 ++-- .../skyblock/dwarven/CrystalsHudConfigScreen.java | 6 +- .../skyblock/dwarven/CrystalsLocationsManager.java | 8 +- .../skyblock/dwarven/CrystalsWaypoint.java | 3 +- .../skyblocker/skyblock/dwarven/DwarvenHud.java | 36 ++++---- .../skyblock/dwarven/DwarvenHudConfigScreen.java | 15 ++-- .../hysky/skyblocker/skyblock/dwarven/Fetchur.java | 2 +- .../skyblocker/skyblock/dwarven/MetalDetector.java | 6 +- .../hysky/skyblocker/skyblock/dwarven/Puzzler.java | 2 +- .../skyblock/end/EndHudConfigScreen.java | 6 +- .../skyblocker/skyblock/end/EndHudWidget.java | 8 +- .../hysky/skyblocker/skyblock/end/EnderNodes.java | 4 +- .../de/hysky/skyblocker/skyblock/end/TheEnd.java | 6 +- .../skyblock/entity/MobBoundingBoxes.java | 4 +- .../hysky/skyblocker/skyblock/entity/MobGlow.java | 12 +-- .../skyblock/experiment/ChronomatronSolver.java | 3 +- .../skyblock/experiment/ExperimentSolver.java | 5 +- .../skyblock/experiment/SuperpairsSolver.java | 3 +- .../skyblock/experiment/UltrasequencerSolver.java | 3 +- .../skyblock/fancybars/FancyStatusBars.java | 7 +- .../skyblocker/skyblock/filters/MimicFilter.java | 2 +- .../skyblocker/skyblock/garden/FarmingHud.java | 4 +- .../skyblock/garden/FarmingHudConfigScreen.java | 6 +- .../skyblock/garden/FarmingHudWidget.java | 4 +- .../skyblock/garden/LowerSensitivity.java | 4 +- .../skyblocker/skyblock/garden/VisitorHelper.java | 2 +- .../skyblocker/skyblock/item/ItemCooldowns.java | 4 +- .../skyblock/item/ItemRarityBackgrounds.java | 3 +- .../skyblock/item/tooltip/ItemTooltip.java | 21 ++--- .../skyblock/item/tooltip/TooltipInfoType.java | 22 ++--- .../skyblocker/skyblock/quicknav/QuickNav.java | 15 ++-- .../skyblocker/skyblock/rift/EnigmaSouls.java | 5 +- .../skyblock/rift/MirrorverseWaypoints.java | 2 +- .../skyblock/searchoverlay/OverlayScreen.java | 10 +-- .../skyblock/searchoverlay/SearchOverManager.java | 21 +++-- .../skyblock/tabhud/util/ScreenConst.java | 2 +- .../skyblock/tabhud/widget/PlayerListWidget.java | 3 +- .../skyblocker/skyblock/tabhud/widget/Widget.java | 2 +- .../tabhud/widget/component/PlayerComponent.java | 2 +- .../skyblocker/skyblock/waypoint/FairySouls.java | 7 +- .../skyblock/waypoint/MythologicalRitual.java | 2 +- .../hysky/skyblocker/skyblock/waypoint/Relics.java | 6 +- 82 files changed, 330 insertions(+), 312 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/skyblock') diff --git a/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java b/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java index e04a30ef..2c958c0a 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java @@ -3,6 +3,8 @@ package de.hysky.skyblocker.skyblock; import com.google.gson.JsonObject; import de.hysky.skyblocker.config.SkyblockerConfig; import de.hysky.skyblocker.config.SkyblockerConfigManager; +import de.hysky.skyblocker.config.configs.DungeonsConfig; +import de.hysky.skyblocker.config.configs.UiAndVisualsConfig; import de.hysky.skyblocker.mixins.accessors.HandledScreenAccessor; import de.hysky.skyblocker.mixins.accessors.ScreenAccessor; import de.hysky.skyblocker.skyblock.item.tooltip.ItemTooltip; @@ -42,12 +44,12 @@ public class ChestValue { Text title = screen.getTitle(); String titleString = title.getString(); if (DUNGEON_CHESTS.contains(titleString)) { - if (SkyblockerConfigManager.get().locations.dungeons.dungeonChestProfit.enableProfitCalculator) { + if (SkyblockerConfigManager.get().dungeons.dungeonChestProfit.enableProfitCalculator) { ScreenEvents.afterTick(screen).register(screen_ -> ((ScreenAccessor) screen).setTitle(getDungeonChestProfit(genericContainerScreen.getScreenHandler(), title, titleString, client)) ); } - } else if (SkyblockerConfigManager.get().general.chestValue.enableChestValue && !titleString.equals("SkyBlock Menu")) { + } else if (SkyblockerConfigManager.get().uiAndVisuals.chestValue.enableChestValue && !titleString.equals("SkyBlock Menu")) { Screens.getButtons(screen).add(ButtonWidget .builder(Text.literal("$"), buttonWidget -> { Screens.getButtons(screen).remove(buttonWidget); @@ -56,7 +58,7 @@ public class ChestValue { ); }) .dimensions(((HandledScreenAccessor) genericContainerScreen).getX() + ((HandledScreenAccessor) genericContainerScreen).getBackgroundWidth() - 16, ((HandledScreenAccessor) genericContainerScreen).getY() + 4, 12, 12) - .tooltip(Tooltip.of(Text.translatable("text.autoconfig.skyblocker.option.general.chestValue.@Tooltip"))) + .tooltip(Tooltip.of(Text.translatable("skyblocker.option.general.chestValue.@Tooltip"))) .build() ); } @@ -95,7 +97,7 @@ public class ChestValue { } //Essence price - if (name.contains("Essence") && SkyblockerConfigManager.get().locations.dungeons.dungeonChestProfit.includeEssence) { + if (name.contains("Essence") && SkyblockerConfigManager.get().dungeons.dungeonChestProfit.includeEssence) { Matcher matcher = ESSENCE_PATTERN.matcher(name); if (matcher.matches()) { @@ -131,7 +133,7 @@ public class ChestValue { } } - if (SkyblockerConfigManager.get().locations.dungeons.dungeonChestProfit.includeKismet && usedKismet) { + if (SkyblockerConfigManager.get().dungeons.dungeonChestProfit.includeKismet && usedKismet) { LongBooleanPair kismetPriceData = getItemPrice("KISMET_FEATHER"); if (!kismetPriceData.rightBoolean()) hasIncompleteData = true; @@ -210,12 +212,12 @@ public class ChestValue { } static Text getProfitText(long profit, boolean hasIncompleteData) { - SkyblockerConfig.DungeonChestProfit config = SkyblockerConfigManager.get().locations.dungeons.dungeonChestProfit; + DungeonsConfig.DungeonChestProfit config = SkyblockerConfigManager.get().dungeons.dungeonChestProfit; return Text.literal((profit > 0 ? " +" : ' ') + FORMATTER.format(profit) + " Coins").formatted(hasIncompleteData ? config.incompleteColor : (Math.abs(profit) < config.neutralThreshold) ? config.neutralColor : (profit > 0) ? config.profitColor : config.lossColor); } static Text getValueText(long value, boolean hasIncompleteData) { - SkyblockerConfig.ChestValue config = SkyblockerConfigManager.get().general.chestValue; + UiAndVisualsConfig.ChestValue config = SkyblockerConfigManager.get().uiAndVisuals.chestValue; return Text.literal(' ' + FORMATTER.format(value) + " Coins").formatted(hasIncompleteData ? config.incompleteColor : config.color); } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/FishingHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/FishingHelper.java index 7676860f..3f4c8269 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/FishingHelper.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/FishingHelper.java @@ -61,7 +61,7 @@ public class FishingHelper { public static void onSound(PlaySoundS2CPacket packet) { String path = packet.getSound().value().getId().getPath(); - if (SkyblockerConfigManager.get().general.fishing.enableFishingHelper && startTimeFish != 0 && System.currentTimeMillis() >= startTimeFish + 2000 && ("entity.generic.splash".equals(path) || "entity.player.splash".equals(path))) { + if (SkyblockerConfigManager.get().helper.fishing.enableFishingHelper && startTimeFish != 0 && System.currentTimeMillis() >= startTimeFish + 2000 && ("entity.generic.splash".equals(path) || "entity.player.splash".equals(path))) { ClientPlayerEntity player = MinecraftClient.getInstance().player; if (player != null && player.fishHook != null) { Vec3d soundToFishHook = player.fishHook.getPos().subtract(packet.getX(), 0, packet.getZ()); @@ -76,15 +76,15 @@ public class FishingHelper { } public static void render(WorldRenderContext context) { - if (SkyblockerConfigManager.get().general.fishing.enableFishingTimer && startTime != 0) { + if (SkyblockerConfigManager.get().helper.fishing.enableFishingTimer && startTime != 0) { ClientPlayerEntity player = MinecraftClient.getInstance().player; if (player != null && player.fishHook != null) { float time = (int) ((System.currentTimeMillis() - startTime) / 100f) / 10f; //leave 1dp in seconds - float scale = SkyblockerConfigManager.get().general.fishing.fishingTimerScale; + float scale = SkyblockerConfigManager.get().helper.fishing.fishingTimerScale; Vec3d pos = player.fishHook.getPos().add(0, 0.4 + scale / 10, 0); Text text; - if (time >= 20 && SkyblockerConfigManager.get().general.fishing.changeTimerColor) { + if (time >= 20 && SkyblockerConfigManager.get().helper.fishing.changeTimerColor) { text = Text.literal(String.valueOf(time)).formatted(Formatting.GREEN); } else { text = Text.literal(String.valueOf(time)); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/StatusBarTracker.java b/src/main/java/de/hysky/skyblocker/skyblock/StatusBarTracker.java index c31e2107..46ae9f3e 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/StatusBarTracker.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/StatusBarTracker.java @@ -72,7 +72,7 @@ public class StatusBarTracker { } private Text onOverlayMessage(Text text, boolean overlay) { - if (!overlay || !Utils.isOnSkyblock() || !SkyblockerConfigManager.get().general.bars.enableBars || Utils.isInTheRift()) { + if (!overlay || !Utils.isOnSkyblock() || !SkyblockerConfigManager.get().uiAndVisuals.bars.enableBars || Utils.isInTheRift()) { return text; } return Text.of(update(text.getString(), SkyblockerConfigManager.get().messages.hideMana)); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/TeleportOverlay.java b/src/main/java/de/hysky/skyblocker/skyblock/TeleportOverlay.java index f7f9836c..042b126b 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/TeleportOverlay.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/TeleportOverlay.java @@ -25,7 +25,7 @@ public class TeleportOverlay { } private static void render(WorldRenderContext wrc) { - if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().general.teleportOverlay.enableTeleportOverlays && client.player != null && client.world != null) { + if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().uiAndVisuals.teleportOverlay.enableTeleportOverlays && client.player != null && client.world != null) { ItemStack heldItem = client.player.getMainHandStack(); String itemId = ItemTooltip.getInternalNameFromNBT(heldItem, true); NbtCompound customData = ItemUtils.getCustomData(heldItem); @@ -33,34 +33,34 @@ public class TeleportOverlay { if (itemId != null) { switch (itemId) { case "ASPECT_OF_THE_LEECH_1" -> { - if (SkyblockerConfigManager.get().general.teleportOverlay.enableWeirdTransmission) { + if (SkyblockerConfigManager.get().uiAndVisuals.teleportOverlay.enableWeirdTransmission) { render(wrc, 3); } } case "ASPECT_OF_THE_LEECH_2" -> { - if (SkyblockerConfigManager.get().general.teleportOverlay.enableWeirdTransmission) { + if (SkyblockerConfigManager.get().uiAndVisuals.teleportOverlay.enableWeirdTransmission) { render(wrc, 4); } } case "ASPECT_OF_THE_END", "ASPECT_OF_THE_VOID" -> { - if (SkyblockerConfigManager.get().general.teleportOverlay.enableEtherTransmission && client.options.sneakKey.isPressed() && customData != null && customData.getInt("ethermerge") == 1) { + if (SkyblockerConfigManager.get().uiAndVisuals.teleportOverlay.enableEtherTransmission && client.options.sneakKey.isPressed() && customData != null && customData.getInt("ethermerge") == 1) { render(wrc, customData, 57); - } else if (SkyblockerConfigManager.get().general.teleportOverlay.enableInstantTransmission) { + } else if (SkyblockerConfigManager.get().uiAndVisuals.teleportOverlay.enableInstantTransmission) { render(wrc, customData, 8); } } case "ETHERWARP_CONDUIT" -> { - if (SkyblockerConfigManager.get().general.teleportOverlay.enableEtherTransmission) { + if (SkyblockerConfigManager.get().uiAndVisuals.teleportOverlay.enableEtherTransmission) { render(wrc, customData, 57); } } case "SINSEEKER_SCYTHE" -> { - if (SkyblockerConfigManager.get().general.teleportOverlay.enableSinrecallTransmission) { + if (SkyblockerConfigManager.get().uiAndVisuals.teleportOverlay.enableSinrecallTransmission) { render(wrc, customData, 4); } } case "NECRON_BLADE", "ASTRAEA", "HYPERION", "SCYLLA", "VALKYRIE" -> { - if (SkyblockerConfigManager.get().general.teleportOverlay.enableWitherImpact) { + if (SkyblockerConfigManager.get().uiAndVisuals.teleportOverlay.enableWitherImpact) { render(wrc, 10); } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakeBagHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakeBagHelper.java index 9b2080a3..8023ae05 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakeBagHelper.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakeBagHelper.java @@ -17,7 +17,7 @@ public class NewYearCakeBagHelper extends ContainerSolver { @Override protected boolean isEnabled() { - return SkyblockerConfigManager.get().general.enableNewYearCakesHelper; + return SkyblockerConfigManager.get().helper.enableNewYearCakesHelper; } @Override diff --git a/src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakesHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakesHelper.java index 2fdcf3b4..1860dbc9 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakesHelper.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakesHelper.java @@ -50,7 +50,7 @@ public class NewYearCakesHelper extends ContainerSolver { @Override protected boolean isEnabled() { - return SkyblockerConfigManager.get().general.enableNewYearCakesHelper; + return SkyblockerConfigManager.get().helper.enableNewYearCakesHelper; } public boolean addCake(int year) { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionBrowserScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionBrowserScreen.java index 10823418..dc1eade5 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionBrowserScreen.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionBrowserScreen.java @@ -171,7 +171,7 @@ public class AuctionBrowserScreen extends AbstractCustomHypixelGUI 9 && slotId < (handler.getRows() - 1) * 9 && slotId % 9 > 1 && slotId % 9 < 8) { - if (!SkyblockerConfigManager.get().general.fancyAuctionHouse.highlightCheapBIN) return; + if (!SkyblockerConfigManager.get().uiAndVisuals.fancyAuctionHouse.highlightCheapBIN) return; List tooltip = ItemUtils.getLore(stack); for (int k = tooltip.size() - 1; k >= 0; k--) { Text text = tooltip.get(k); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/barn/HungryHiker.java b/src/main/java/de/hysky/skyblocker/skyblock/barn/HungryHiker.java index 4a0213c1..828b68c3 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/barn/HungryHiker.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/barn/HungryHiker.java @@ -19,7 +19,7 @@ public class HungryHiker extends ChatPatternListener { @Override public ChatFilterResult state() { - return SkyblockerConfigManager.get().locations.barn.solveHungryHiker ? ChatFilterResult.FILTER : ChatFilterResult.PASS; + return SkyblockerConfigManager.get().otherLocations.barn.solveHungryHiker ? ChatFilterResult.FILTER : ChatFilterResult.PASS; } @Override diff --git a/src/main/java/de/hysky/skyblocker/skyblock/barn/TreasureHunter.java b/src/main/java/de/hysky/skyblocker/skyblock/barn/TreasureHunter.java index 032c7df9..3b41af31 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/barn/TreasureHunter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/barn/TreasureHunter.java @@ -18,7 +18,7 @@ public class TreasureHunter extends ChatPatternListener { @Override public ChatFilterResult state() { - return SkyblockerConfigManager.get().locations.barn.solveTreasureHunter ? ChatFilterResult.FILTER : ChatFilterResult.PASS; + return SkyblockerConfigManager.get().otherLocations.barn.solveTreasureHunter ? ChatFilterResult.FILTER : ChatFilterResult.PASS; } @Override 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 c99aeed8..634ea932 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 soundsLookup = Map.ofEntries( - entry(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.pling"), SoundEvents.BLOCK_NOTE_BLOCK_PLING.value()), - entry(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.cave"), SoundEvents.AMBIENT_CAVE.value()), - entry(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.zombie"), SoundEvents.ENTITY_ZOMBIE_AMBIENT), - entry(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.crit"), SoundEvents.ENTITY_PLAYER_ATTACK_CRIT), - entry(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.arrowHit"), SoundEvents.ENTITY_ARROW_HIT_PLAYER), - entry(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.amethyst"), SoundEvents.BLOCK_AMETHYST_BLOCK_HIT), - entry(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.anvil"), SoundEvents.BLOCK_ANVIL_LAND) + entry(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.pling"), SoundEvents.BLOCK_NOTE_BLOCK_PLING.value()), + entry(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.cave"), SoundEvents.AMBIENT_CAVE.value()), + entry(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.zombie"), SoundEvents.ENTITY_ZOMBIE_AMBIENT), + entry(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.crit"), SoundEvents.ENTITY_PLAYER_ATTACK_CRIT), + entry(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.arrowHit"), SoundEvents.ENTITY_ARROW_HIT_PLAYER), + entry(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.amethyst"), SoundEvents.BLOCK_AMETHYST_BLOCK_HIT), + entry(Text.translatable("skyblocker.option.messages.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("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen")); + super(Text.translatable("skyblocker.option.messages.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("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.name")) + SPACER_X; + lineXOffset = client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.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("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.name.@Tooltip"))); + nameInput.setTooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.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("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.filter")) + SPACER_X; + lineXOffset = client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.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("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.filter.@Tooltip"))); + filterInput.setTooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.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("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.partialMatch")) + SPACER_X; + lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.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("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.partialMatch.@Tooltip"))) + .tooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.partialMatch.@Tooltip"))) .build(); lineXOffset += buttonWidth + SPACER_X; regexTextPos = IntIntPair.of(currentPos.leftInt() + lineXOffset,currentPos.rightInt()); - lineXOffset += client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.regex")) + SPACER_X; + lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.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("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.regex.@Tooltip"))) + .tooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.regex.@Tooltip"))) .build(); lineXOffset += buttonWidth + SPACER_X; ignoreCaseTextPos = IntIntPair.of(currentPos.leftInt() + lineXOffset,currentPos.rightInt()); - lineXOffset += client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.ignoreCase")) + SPACER_X; + lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.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("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.ignoreCase.@Tooltip"))) + .tooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.ignoreCase.@Tooltip"))) .build(); currentPos = IntIntPair.of(currentPos.leftInt(), currentPos.rightInt() + SPACER_Y); locationLabelTextPos = currentPos; - lineXOffset = client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.locations")) + SPACER_X; + lineXOffset = client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.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("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.locations.@Tooltip"); + MutableText locationToolTip = Text.translatable("skyblocker.option.messages.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("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.hideMessage")) + SPACER_X; + lineXOffset = client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.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("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.hideMessage.@Tooltip"))) + .tooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.hideMessage.@Tooltip"))) .build(); lineXOffset += buttonWidth + SPACER_X; actionBarTextPos = IntIntPair.of(currentPos.leftInt() + lineXOffset,currentPos.rightInt()); - lineXOffset += client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.actionBar")) + SPACER_X; + lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.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("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.actionBar.@Tooltip"))) + .tooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.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("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.announcement")) + SPACER_X; + lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.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("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.announcement.@Tooltip"))) + .tooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.announcement.@Tooltip"))) .build(); lineXOffset += buttonWidth + SPACER_X; customSoundLabelTextPos = IntIntPair.of(currentPos.leftInt() + lineXOffset,currentPos.rightInt()); - lineXOffset += client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.sounds")) + SPACER_X; + lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.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("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.@Tooltip"))) + .tooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.@Tooltip"))) .build(); currentPos = IntIntPair.of(currentPos.leftInt(), currentPos.rightInt() + SPACER_Y); replaceMessageLabelTextPos = currentPos; - lineXOffset = client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.replace")) + SPACER_X; + lineXOffset = client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.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("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.replace.@Tooltip"))); + replaceMessageInput.setTooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.replace.@Tooltip"))); replaceMessageInput.setText(chatRule.getReplaceMessage()); - ButtonWidget finishButton = ButtonWidget.builder(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.finish"), a -> close()) + ButtonWidget finishButton = ButtonWidget.builder(Text.translatable("skyblocker.option.messages.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("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.partialMatch")); - total += client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.regex")); - total += client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.ignoreCase")); + int total = client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.partialMatch")); + total += client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.regex")); + total += client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.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("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.true").withColor(Color.GREEN.getRGB()); + return Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.true").withColor(Color.GREEN.getRGB()); } else { - return Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.false").withColor(Color.RED.getRGB()); + return Text.translatable("skyblocker.option.messages.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("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.inputs"), inputsLabelTextPos.leftInt(), inputsLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); - context.drawTextWithShadow(this.textRenderer, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.name"), nameLabelTextPos.leftInt(), nameLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); - context.drawTextWithShadow(this.textRenderer, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.filter"), filterLabelTextPos.leftInt(), filterLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); - context.drawTextWithShadow(this.textRenderer, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.partialMatch"), partialMatchTextPos.leftInt(), partialMatchTextPos.rightInt() + yOffset, 0xFFFFFFFF); - context.drawTextWithShadow(this.textRenderer, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.regex"), regexTextPos.leftInt(), regexTextPos.rightInt() + yOffset, 0xFFFFFFFF); - context.drawTextWithShadow(this.textRenderer, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.ignoreCase"), ignoreCaseTextPos.leftInt(), ignoreCaseTextPos.rightInt() + yOffset, 0xFFFFFFFF); - context.drawTextWithShadow(this.textRenderer, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.locations"), locationLabelTextPos.leftInt(), locationLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); - context.drawTextWithShadow(this.textRenderer, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.outputs"), outputsLabelTextPos.leftInt(), outputsLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); - context.drawTextWithShadow(this.textRenderer, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.hideMessage"), hideMessageTextPos.leftInt(), hideMessageTextPos.rightInt() + yOffset, 0xFFFFFFFF); - context.drawTextWithShadow(this.textRenderer, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.actionBar"), actionBarTextPos.leftInt(), actionBarTextPos.rightInt() + yOffset, 0xFFFFFFFF); - context.drawTextWithShadow(this.textRenderer, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.announcement"), announcementTextPos.leftInt(), announcementTextPos.rightInt() + yOffset, 0xFFFFFFFF); - context.drawTextWithShadow(this.textRenderer, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.sounds"), customSoundLabelTextPos.leftInt(), customSoundLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); - context.drawTextWithShadow(this.textRenderer, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.replace"), replaceMessageLabelTextPos.leftInt(), replaceMessageLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); + context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.inputs"), inputsLabelTextPos.leftInt(), inputsLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); + context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.name"), nameLabelTextPos.leftInt(), nameLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); + context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.filter"), filterLabelTextPos.leftInt(), filterLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); + context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.partialMatch"), partialMatchTextPos.leftInt(), partialMatchTextPos.rightInt() + yOffset, 0xFFFFFFFF); + context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.regex"), regexTextPos.leftInt(), regexTextPos.rightInt() + yOffset, 0xFFFFFFFF); + context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.ignoreCase"), ignoreCaseTextPos.leftInt(), ignoreCaseTextPos.rightInt() + yOffset, 0xFFFFFFFF); + context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.locations"), locationLabelTextPos.leftInt(), locationLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); + context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.outputs"), outputsLabelTextPos.leftInt(), outputsLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); + context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.hideMessage"), hideMessageTextPos.leftInt(), hideMessageTextPos.rightInt() + yOffset, 0xFFFFFFFF); + context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.actionBar"), actionBarTextPos.leftInt(), actionBarTextPos.rightInt() + yOffset, 0xFFFFFFFF); + context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.announcement"), announcementTextPos.leftInt(), announcementTextPos.rightInt() + yOffset, 0xFFFFFFFF); + context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds"), customSoundLabelTextPos.leftInt(), customSoundLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); + context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.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("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.none"); + return Text.translatable("skyblocker.option.messages.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 747e826b..f7a5ba84 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 { + openConfigButton = ButtonWidget.builder(Text.translatable("skyblocker.option.messages.chatRules.screen.editRule"), a -> { client.setScreen(new ChatRuleConfigScreen(screen, chatRuleIndex)); }) .size(50, 20) .position(width / 2 + 45, 5) - .tooltip(Tooltip.of(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.editRule.@Tooltip"))) + .tooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.editRule.@Tooltip"))) .build(); deleteButton = ButtonWidget.builder(Text.translatable("selectServer.delete"), a -> { oldScrollAmount = getScrollAmount(); - client.setScreen(new ConfirmScreen(this::deleteEntry, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.deleteQuestion"), Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.deleteWarning", chatRule.getName()), Text.translatable("selectServer.deleteButton"), ScreenTexts.CANCEL)); + client.setScreen(new ConfirmScreen(this::deleteEntry, Text.translatable("skyblocker.option.messages.chatRules.screen.deleteQuestion"), Text.translatable("skyblocker.option.messages.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 chatRulesConfigListWidget.addRuleAfterSelected()).build(); + ButtonWidget buttonNew1 = ButtonWidget.builder(Text.translatable("skyblocker.option.messages.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/crimson/kuudra/ArrowPoisonWarning.java b/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/ArrowPoisonWarning.java index 7ddbeb99..7c3c634a 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/ArrowPoisonWarning.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/ArrowPoisonWarning.java @@ -4,6 +4,7 @@ import java.util.function.Supplier; import de.hysky.skyblocker.config.SkyblockerConfig; import de.hysky.skyblocker.config.SkyblockerConfigManager; +import de.hysky.skyblocker.config.configs.CrimsonIsleConfig; import de.hysky.skyblocker.skyblock.crimson.kuudra.Kuudra.KuudraPhase; import de.hysky.skyblocker.utils.ItemUtils; import de.hysky.skyblocker.utils.Utils; @@ -17,7 +18,7 @@ import net.minecraft.text.Text; import net.minecraft.util.Formatting; public class ArrowPoisonWarning { - private static final Supplier CONFIG = () -> SkyblockerConfigManager.get().locations.crimsonIsle.kuudra; + private static final Supplier CONFIG = () -> SkyblockerConfigManager.get().crimsonIsle.kuudra; private static final int THREE_SECONDS = 20 * 3; private static final Title NONE_TITLE = new Title(Text.translatable("skyblocker.crimson.kuudra.noArrowPoison").formatted(Formatting.GREEN)); private static final Title LOW_TITLE = new Title(Text.translatable("skyblocker.crimson.kuudra.lowArrowPoison").formatted(Formatting.GREEN)); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/KuudraWaypoints.java b/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/KuudraWaypoints.java index 00cd85a0..1f378dda 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/KuudraWaypoints.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/KuudraWaypoints.java @@ -2,10 +2,12 @@ package de.hysky.skyblocker.skyblock.crimson.kuudra; import java.io.BufferedReader; import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.function.Function; import java.util.function.Supplier; +import de.hysky.skyblocker.config.configs.CrimsonIsleConfig; import org.slf4j.Logger; import com.google.gson.JsonElement; @@ -36,7 +38,7 @@ public class KuudraWaypoints { private static final float[] SUPPLIES_COLOR = { 255f / 255f, 0f, 0f }; private static final float[] PEARL_COLOR = { 57f / 255f, 117f / 255f, 125f / 255f }; private static final float[] SAFE_SPOT_COLOR = { 255f / 255f, 85f / 255f, 255f / 255f }; - private static final Supplier SUPPLIES_AND_FUEL_TYPE = () -> SkyblockerConfigManager.get().locations.crimsonIsle.kuudra.suppliesAndFuelWaypointType; + private static final Supplier SUPPLIES_AND_FUEL_TYPE = () -> SkyblockerConfigManager.get().crimsonIsle.kuudra.suppliesAndFuelWaypointType; private static final ObjectArrayList SAFE_SPOT_WAYPOINTS = new ObjectArrayList<>(); private static final ObjectArrayList PEARL_WAYPOINTS = new ObjectArrayList<>(); private static final Function>> CODEC = cc -> PosUtils.ALT_BLOCK_POS_CODEC.xmap( @@ -75,14 +77,14 @@ public class KuudraWaypoints { static void tick() { MinecraftClient client = MinecraftClient.getInstance(); - SkyblockerConfig.Kuudra config = SkyblockerConfigManager.get().locations.crimsonIsle.kuudra; + CrimsonIsleConfig.Kuudra config = SkyblockerConfigManager.get().crimsonIsle.kuudra; - if (Utils.isInKuudra() && (config.supplyWaypoints || config.fuelWaypoints || config.ballistaBuildWaypoints)) { + if (Utils.isInKuudra() && (config.supplyWaypoints || config.fuelWaypoints || config.ballistaBuildWaypoints) && client.player != null) { Box searchBox = client.player.getBoundingBox().expand(500d); ObjectArrayList supplies = new ObjectArrayList<>(); ObjectArrayList fuelCells = new ObjectArrayList<>(); - if (config.supplyWaypoints || config.fuelWaypoints) { + if ((config.supplyWaypoints || config.fuelWaypoints) && client.world != null) { List giants = client.world.getEntitiesByClass(GiantEntity.class, searchBox, giant -> giant.getY() < 67); for (GiantEntity giant : giants) { @@ -94,17 +96,17 @@ public class KuudraWaypoints { Waypoint waypoint = new Waypoint(BlockPos.ofFloored(x, y, z), SUPPLIES_AND_FUEL_TYPE, SUPPLIES_COLOR, false); - switch (Kuudra.phase) { - case RETRIEVE_SUPPLIES -> supplies.add(waypoint); - case DPS -> fuelCells.add(waypoint); - default -> supplies.add(waypoint); - } + if (Objects.requireNonNull(Kuudra.phase) == Kuudra.KuudraPhase.DPS) { + fuelCells.add(waypoint); + } else { + supplies.add(waypoint); + } } } ObjectArrayList ballistaBuildSpots = new ObjectArrayList<>(); - if (config.ballistaBuildWaypoints) { + if (config.ballistaBuildWaypoints && client.world != null) { List armorStands = client.world.getEntitiesByClass(ArmorStandEntity.class, searchBox, ArmorStandEntity::hasCustomName); for (ArmorStandEntity armorStand : armorStands) { @@ -123,7 +125,7 @@ public class KuudraWaypoints { } static void render(WorldRenderContext context) { - SkyblockerConfig.Kuudra config = SkyblockerConfigManager.get().locations.crimsonIsle.kuudra; + CrimsonIsleConfig.Kuudra config = SkyblockerConfigManager.get().crimsonIsle.kuudra; if (Utils.isInKuudra() && loaded) { if (config.supplyWaypoints) { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CroesusHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CroesusHelper.java index 0bc34c57..d317a2e8 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CroesusHelper.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CroesusHelper.java @@ -19,7 +19,7 @@ public class CroesusHelper extends ContainerSolver { @Override protected boolean isEnabled() { - return SkyblockerConfigManager.get().locations.dungeons.croesusHelper; + return SkyblockerConfigManager.get().dungeons.croesusHelper; } @Override diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CroesusProfit.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CroesusProfit.java index c6cbe2ce..70e785cb 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CroesusProfit.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CroesusProfit.java @@ -28,7 +28,7 @@ public class CroesusProfit extends ContainerSolver { @Override protected boolean isEnabled() { - return SkyblockerConfigManager.get().locations.dungeons.dungeonChestProfit.croesusProfit; + return SkyblockerConfigManager.get().dungeons.dungeonChestProfit.croesusProfit; } @Override diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMap.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMap.java index 7a6cdcd0..1e896794 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMap.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMap.java @@ -46,9 +46,9 @@ public class DungeonMap { MapState state = FilledMapItem.getMapState(mapId, client.world); if (state == null) return; - int x = SkyblockerConfigManager.get().locations.dungeons.mapX; - int y = SkyblockerConfigManager.get().locations.dungeons.mapY; - float scaling = SkyblockerConfigManager.get().locations.dungeons.mapScaling; + int x = SkyblockerConfigManager.get().dungeons.dungeonMap.mapX; + int y = SkyblockerConfigManager.get().dungeons.dungeonMap.mapY; + float scaling = SkyblockerConfigManager.get().dungeons.dungeonMap.mapScaling; VertexConsumerProvider.Immediate vertices = client.getBufferBuilders().getEffectVertexConsumers(); MapRenderer mapRenderer = client.gameRenderer.getMapRenderer(); @@ -69,7 +69,7 @@ public class DungeonMap { } private static void render(DrawContext context) { - if (Utils.isInDungeons() && DungeonScore.isDungeonStarted() && !DungeonManager.isInBoss() && SkyblockerConfigManager.get().locations.dungeons.enableMap) { + if (Utils.isInDungeons() && DungeonScore.isDungeonStarted() && !DungeonManager.isInBoss() && SkyblockerConfigManager.get().dungeons.dungeonMap.enableMap) { render(context.getMatrices()); } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java index 0f42c495..068510c2 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java @@ -11,10 +11,10 @@ import java.awt.*; public class DungeonMapConfigScreen extends Screen { - private int mapX = SkyblockerConfigManager.get().locations.dungeons.mapX; - private int mapY = SkyblockerConfigManager.get().locations.dungeons.mapY; - private int scoreX = SkyblockerConfigManager.get().locations.dungeons.dungeonScore.scoreX; - private int scoreY = SkyblockerConfigManager.get().locations.dungeons.dungeonScore.scoreY; + private int mapX = SkyblockerConfigManager.get().dungeons.dungeonMap.mapX; + private int mapY = SkyblockerConfigManager.get().dungeons.dungeonMap.mapY; + private int scoreX = SkyblockerConfigManager.get().dungeons.dungeonScore.scoreX; + private int scoreY = SkyblockerConfigManager.get().dungeons.dungeonScore.scoreY; private static final Identifier MAP_BACKGROUND = new Identifier("textures/map/map_background.png"); private final Screen parent; @@ -38,8 +38,8 @@ public class DungeonMapConfigScreen extends Screen { @Override public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) { - int mapSize = (int) (128 * SkyblockerConfigManager.get().locations.dungeons.mapScaling); - float scoreScaling = SkyblockerConfigManager.get().locations.dungeons.dungeonScore.scoreScaling; + int mapSize = (int) (128 * SkyblockerConfigManager.get().dungeons.dungeonMap.mapScaling); + float scoreScaling = SkyblockerConfigManager.get().dungeons.dungeonScore.scoreScaling; int scoreWidth = (int) (textRenderer.getWidth(DungeonScoreHUD.getFormattedScoreText()) * scoreScaling); int scoreHeight = (int) (textRenderer.fontHeight * scoreScaling); if (RenderHelper.pointIsInArea(mouseX, mouseY, mapX, mapY, mapX + mapSize, mapY + mapSize) && button == 0) { @@ -57,8 +57,8 @@ public class DungeonMapConfigScreen extends Screen { if (button == 1) { mapX = 2; mapY = 2; - scoreX = Math.max((int) ((mapX + (64 * SkyblockerConfigManager.get().locations.dungeons.mapScaling)) - textRenderer.getWidth(DungeonScoreHUD.getFormattedScoreText()) * SkyblockerConfigManager.get().locations.dungeons.dungeonScore.scoreScaling / 2), 0); - scoreY = (int) (mapY + (128 * SkyblockerConfigManager.get().locations.dungeons.mapScaling) + 4); + scoreX = Math.max((int) ((mapX + (64 * SkyblockerConfigManager.get().dungeons.dungeonMap.mapScaling)) - textRenderer.getWidth(DungeonScoreHUD.getFormattedScoreText()) * SkyblockerConfigManager.get().dungeons.dungeonScore.scoreScaling / 2), 0); + scoreY = (int) (mapY + (128 * SkyblockerConfigManager.get().dungeons.dungeonMap.mapScaling) + 4); } return super.mouseClicked(mouseX, mouseY, button); @@ -66,17 +66,17 @@ public class DungeonMapConfigScreen extends Screen { @Override public void close() { - SkyblockerConfigManager.get().locations.dungeons.mapX = mapX; - SkyblockerConfigManager.get().locations.dungeons.mapY = mapY; - SkyblockerConfigManager.get().locations.dungeons.dungeonScore.scoreX = scoreX; - SkyblockerConfigManager.get().locations.dungeons.dungeonScore.scoreY = scoreY; + SkyblockerConfigManager.get().dungeons.dungeonMap.mapX = mapX; + SkyblockerConfigManager.get().dungeons.dungeonMap.mapY = mapY; + SkyblockerConfigManager.get().dungeons.dungeonScore.scoreX = scoreX; + SkyblockerConfigManager.get().dungeons.dungeonScore.scoreY = sco