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. --- .../skyblocker/mixins/AbstractInventoryScreenMixin.java | 2 +- .../hysky/skyblocker/mixins/ClientPlayerEntityMixin.java | 6 +++--- .../de/hysky/skyblocker/mixins/HandledScreenMixin.java | 8 ++++---- .../skyblocker/mixins/HandledScreenProviderMixin.java | 14 +++++++------- .../java/de/hysky/skyblocker/mixins/InGameHudMixin.java | 8 ++++---- .../skyblocker/mixins/InGameOverlayRendererMixin.java | 4 ++-- .../java/de/hysky/skyblocker/mixins/ItemStackMixin.java | 2 +- .../de/hysky/skyblocker/mixins/PlayerListHudMixin.java | 4 ++-- .../de/hysky/skyblocker/mixins/PlayerSkinTextureMixin.java | 2 +- .../java/de/hysky/skyblocker/mixins/RenderFishMixin.java | 2 +- 10 files changed, 26 insertions(+), 26 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/mixins') diff --git a/src/main/java/de/hysky/skyblocker/mixins/AbstractInventoryScreenMixin.java b/src/main/java/de/hysky/skyblocker/mixins/AbstractInventoryScreenMixin.java index 53151826..b0e26575 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/AbstractInventoryScreenMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/AbstractInventoryScreenMixin.java @@ -14,6 +14,6 @@ public class AbstractInventoryScreenMixin { @Inject(method = "drawStatusEffects", at = @At("HEAD"), cancellable = true) private void skyblocker$dontDrawStatusEffects(CallbackInfo ci) { - if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().general.hideStatusEffectOverlay) ci.cancel(); + if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().misc.hideStatusEffectOverlay) ci.cancel(); } } diff --git a/src/main/java/de/hysky/skyblocker/mixins/ClientPlayerEntityMixin.java b/src/main/java/de/hysky/skyblocker/mixins/ClientPlayerEntityMixin.java index d4c930d2..0da6abfb 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/ClientPlayerEntityMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/ClientPlayerEntityMixin.java @@ -38,7 +38,7 @@ public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity @Inject(method = "dropSelectedItem", at = @At("HEAD"), cancellable = true) public void skyblocker$dropSelectedItem(CallbackInfoReturnable cir) { if (Utils.isOnSkyblock() && (ItemProtection.isItemProtected(this.getInventory().getMainHandStack()) || HotbarSlotLock.isLocked(this.getInventory().selectedSlot)) - && (!SkyblockerConfigManager.get().locations.dungeons.allowDroppingProtectedItems || !Utils.isInDungeons())) { + && (!SkyblockerConfigManager.get().dungeons.allowDroppingProtectedItems || !Utils.isInDungeons())) { cir.setReturnValue(false); } } @@ -64,13 +64,13 @@ public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity // Search Overlay if (client.currentScreen != null) { - if (SkyblockerConfigManager.get().general.searchOverlay.enableAuctionHouse && client.currentScreen.getTitle().getString().toLowerCase().contains("auction")) { + if (SkyblockerConfigManager.get().uiAndVisuals.searchOverlay.enableAuctionHouse && client.currentScreen.getTitle().getString().toLowerCase().contains("auction")) { if (sign.getText(front).getMessage(3, false).getString().equalsIgnoreCase("enter query")) { SearchOverManager.updateSign(sign, front, true); client.setScreen(new OverlayScreen(Text.of(""))); callbackInfo.cancel(); } - } else if (SkyblockerConfigManager.get().general.searchOverlay.enableBazaar && client.currentScreen.getTitle().getString().toLowerCase().contains("bazaar")) { + } else if (SkyblockerConfigManager.get().uiAndVisuals.searchOverlay.enableBazaar && client.currentScreen.getTitle().getString().toLowerCase().contains("bazaar")) { if (sign.getText(front).getMessage(3, false).getString().equalsIgnoreCase("enter query")) { SearchOverManager.updateSign(sign, front, false); client.setScreen(new OverlayScreen(Text.of(""))); diff --git a/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java b/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java index 9ae25d85..46207669 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java @@ -109,7 +109,7 @@ public abstract class HandledScreenMixin extends Screen @Inject(at = @At("HEAD"), method = "mouseClicked") public void skyblocker$mouseClicked(double mouseX, double mouseY, int button, CallbackInfoReturnable cir) { - if (SkyblockerConfigManager.get().locations.garden.visitorHelper && (Utils.getLocationRaw().equals("garden") && !getTitle().getString().contains("Logbook") || getTitle().getString().startsWith("Bazaar"))) + if (SkyblockerConfigManager.get().farming.garden.visitorHelper && (Utils.getLocationRaw().equals("garden") && !getTitle().getString().contains("Logbook") || getTitle().getString().startsWith("Bazaar"))) VisitorHelper.onMouseClicked(mouseX, mouseY, button, this.textRenderer); } @@ -125,13 +125,13 @@ public abstract class HandledScreenMixin extends Screen } // Backpack Preview - boolean shiftDown = SkyblockerConfigManager.get().general.backpackPreviewWithoutShift ^ Screen.hasShiftDown(); + boolean shiftDown = SkyblockerConfigManager.get().uiAndVisuals.backpackPreviewWithoutShift ^ Screen.hasShiftDown(); if (shiftDown && getTitle().getString().equals("Storage") && focusedSlot.inventory != client.player.getInventory() && BackpackPreview.renderPreview(context, this, focusedSlot.getIndex(), x, y)) { ci.cancel(); } // Compactor Preview - if (SkyblockerConfigManager.get().general.compactorDeletorPreview) { + if (SkyblockerConfigManager.get().uiAndVisuals.compactorDeletorPreview) { Matcher matcher = CompactorDeletorPreview.NAME.matcher(ItemUtils.getItemId(stack)); if (matcher.matches() && CompactorDeletorPreview.drawPreview(context, stack, matcher.group("type"), matcher.group("size"), x, y)) { ci.cancel(); @@ -187,7 +187,7 @@ public abstract class HandledScreenMixin extends Screen // Prevent clicks on filler items if (SkyblockerConfigManager.get().general.hideEmptyTooltips && FILLER_ITEMS.contains(stack.getName().getString()) && // Allow clicks in Ultrasequencer and Superpairs - (!UltrasequencerSolver.INSTANCE.getName().matcher(title).matches() || SkyblockerConfigManager.get().general.experiments.enableUltrasequencerSolver)) { + (!UltrasequencerSolver.INSTANCE.getName().matcher(title).matches() || SkyblockerConfigManager.get().helper.experiments.enableUltrasequencerSolver)) { ci.cancel(); return; } diff --git a/src/main/java/de/hysky/skyblocker/mixins/HandledScreenProviderMixin.java b/src/main/java/de/hysky/skyblocker/mixins/HandledScreenProviderMixin.java index da87c2a3..fde54425 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/HandledScreenProviderMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/HandledScreenProviderMixin.java @@ -34,10 +34,10 @@ public interface HandledScreenProviderMixin { switch (screenHandler) { // Better party finder - case GenericContainerScreenHandler ignored when SkyblockerConfigManager.get().general.betterPartyFinder && nameLowercase.contains("select tier") -> PartyFinderScreen.isInKuudraPartyFinder = true; - case GenericContainerScreenHandler ignored when SkyblockerConfigManager.get().general.betterPartyFinder && nameLowercase.contains("catacombs") -> PartyFinderScreen.isInKuudraPartyFinder = false; + case GenericContainerScreenHandler ignored when SkyblockerConfigManager.get().dungeons.fancyPartyFinder && nameLowercase.contains("select tier") -> PartyFinderScreen.isInKuudraPartyFinder = true; + case GenericContainerScreenHandler ignored when SkyblockerConfigManager.get().dungeons.fancyPartyFinder && nameLowercase.contains("catacombs") -> PartyFinderScreen.isInKuudraPartyFinder = false; - case GenericContainerScreenHandler containerScreenHandler when SkyblockerConfigManager.get().general.betterPartyFinder && PartyFinderScreen.possibleInventoryNames.contains(nameLowercase) -> { + case GenericContainerScreenHandler containerScreenHandler when SkyblockerConfigManager.get().dungeons.fancyPartyFinder && PartyFinderScreen.possibleInventoryNames.contains(nameLowercase) -> { if (client.currentScreen != null) { String lowerCase = client.currentScreen.getTitle().getString().toLowerCase(); if (lowerCase.contains("group builder")) return; @@ -55,7 +55,7 @@ public interface HandledScreenProviderMixin { } // Fancy AH - case GenericContainerScreenHandler containerScreenHandler when SkyblockerConfigManager.get().general.fancyAuctionHouse.enabled && (nameLowercase.contains("auctions browser") || nameLowercase.contains("auctions: ")) -> { + case GenericContainerScreenHandler containerScreenHandler when SkyblockerConfigManager.get().uiAndVisuals.fancyAuctionHouse.enabled && (nameLowercase.contains("auctions browser") || nameLowercase.contains("auctions: ")) -> { AuctionHouseScreenHandler auctionHouseScreenHandler = AuctionHouseScreenHandler.of(containerScreenHandler, false); client.player.currentScreenHandler = auctionHouseScreenHandler; @@ -67,7 +67,7 @@ public interface HandledScreenProviderMixin { ci.cancel(); } - case GenericContainerScreenHandler containerScreenHandler when SkyblockerConfigManager.get().general.fancyAuctionHouse.enabled && nameLowercase.contains("auction view") -> { + case GenericContainerScreenHandler containerScreenHandler when SkyblockerConfigManager.get().uiAndVisuals.fancyAuctionHouse.enabled && nameLowercase.contains("auction view") -> { AuctionHouseScreenHandler auctionHouseScreenHandler = AuctionHouseScreenHandler.of(containerScreenHandler, true); client.player.currentScreenHandler = auctionHouseScreenHandler; @@ -79,14 +79,14 @@ public interface HandledScreenProviderMixin { ci.cancel(); } - case GenericContainerScreenHandler containerScreenHandler when SkyblockerConfigManager.get().general.fancyAuctionHouse.enabled && (nameLowercase.contains("confirm purchase") || nameLowercase.contains("confirm bid")) && client.currentScreen instanceof AuctionViewScreen auctionViewScreen -> { + case GenericContainerScreenHandler containerScreenHandler when SkyblockerConfigManager.get().uiAndVisuals.fancyAuctionHouse.enabled && (nameLowercase.contains("confirm purchase") || nameLowercase.contains("confirm bid")) && client.currentScreen instanceof AuctionViewScreen auctionViewScreen -> { client.setScreen(auctionViewScreen.getConfirmPurchasePopup(name)); client.player.currentScreenHandler = containerScreenHandler; ci.cancel(); } // Fancy crafting table - case GenericContainerScreenHandler containerScreenHandler when SkyblockerConfigManager.get().general.fancyCraftingTable && name.getString().toLowerCase().contains("craft item") -> { + case GenericContainerScreenHandler containerScreenHandler when SkyblockerConfigManager.get().uiAndVisuals.fancyCraftingTable && name.getString().toLowerCase().contains("craft item") -> { SkyblockCraftingTableScreenHandler skyblockCraftingTableScreenHandler = new SkyblockCraftingTableScreenHandler(containerScreenHandler, player.getInventory()); client.player.currentScreenHandler = skyblockCraftingTableScreenHandler; client.setScreen(new SkyblockCraftingTableScreen(skyblockCraftingTableScreenHandler, player.getInventory(), Text.literal("Craft Item"))); diff --git a/src/main/java/de/hysky/skyblocker/mixins/InGameHudMixin.java b/src/main/java/de/hysky/skyblocker/mixins/InGameHudMixin.java index 897b98b3..30f1626f 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/InGameHudMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/InGameHudMixin.java @@ -79,7 +79,7 @@ public abstract class InGameHudMixin { @Inject(method = { "renderExperienceBar", "renderExperienceLevel" }, at = @At("HEAD"), cancellable = true) private void skyblocker$renderExperienceBar(CallbackInfo ci) { - if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().general.bars.enableBars && !Utils.isInTheRift()) + if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().uiAndVisuals.bars.enableBars && !Utils.isInTheRift()) ci.cancel(); } @@ -93,13 +93,13 @@ public abstract class InGameHudMixin { @Inject(method = "renderMountHealth", at = @At("HEAD"), cancellable = true) private void skyblocker$renderMountHealth(CallbackInfo ci) { - if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().general.bars.enableBars && !Utils.isInTheRift()) + if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().uiAndVisuals.bars.enableBars && !Utils.isInTheRift()) ci.cancel(); } @Inject(method = "renderStatusEffectOverlay", at = @At("HEAD"), cancellable = true) private void skyblocker$dontRenderStatusEffects(CallbackInfo ci) { - if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().general.hideStatusEffectOverlay) ci.cancel(); + if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().misc.hideStatusEffectOverlay) ci.cancel(); } @ModifyExpressionValue(method = "renderCrosshair", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;getAttackCooldownProgress(F)F")) @@ -116,7 +116,7 @@ public abstract class InGameHudMixin { @Inject(method = "setTitle", at = @At("HEAD"), cancellable = true) private void skyblocker$dicerTitlePrevent(Text title, CallbackInfo ci) { - if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().locations.garden.dicerTitlePrevent && title != null && DICER_TITLE_BLACKLIST.matcher(title.getString()).matches()) { + if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().farming.garden.dicerTitlePrevent && title != null && DICER_TITLE_BLACKLIST.matcher(title.getString()).matches()) { ci.cancel(); } } diff --git a/src/main/java/de/hysky/skyblocker/mixins/InGameOverlayRendererMixin.java b/src/main/java/de/hysky/skyblocker/mixins/InGameOverlayRendererMixin.java index c7704558..d3b79efe 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/InGameOverlayRendererMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/InGameOverlayRendererMixin.java @@ -11,12 +11,12 @@ public class InGameOverlayRendererMixin { @ModifyArg(method = "renderFireOverlay", index = 2, at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/BufferBuilder;vertex(Lorg/joml/Matrix4f;FFF)Lnet/minecraft/client/render/VertexConsumer;")) private static float configureFlameHeight(float y) { - return y - (0.5f - ((float) SkyblockerConfigManager.get().general.flameOverlay.flameHeight / 200.0f)); + return y - (0.5f - ((float) SkyblockerConfigManager.get().uiAndVisuals.flameOverlay.flameHeight / 200.0f)); } @ModifyArg(method = "renderFireOverlay", index = 3, at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/VertexConsumer;color(FFFF)Lnet/minecraft/client/render/VertexConsumer;")) private static float configureFlameOpacity(float opacity) { - return opacity - (0.8f - ((float) SkyblockerConfigManager.get().general.flameOverlay.flameOpacity / 125.0f)); + return opacity - (0.8f - ((float) SkyblockerConfigManager.get().uiAndVisuals.flameOverlay.flameOpacity / 125.0f)); } } diff --git a/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java b/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java index 3ebfc439..878a93ac 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java @@ -87,7 +87,7 @@ public abstract class ItemStackMixin { @Unique private boolean skyblocker$shouldProcess() { - return Utils.isOnSkyblock() && SkyblockerConfigManager.get().locations.dwarvenMines.enableDrillFuel && ItemUtils.hasCustomDurability((ItemStack) (Object) this); + return Utils.isOnSkyblock() && SkyblockerConfigManager.get().mining.enableDrillFuel && ItemUtils.hasCustomDurability((ItemStack) (Object) this); } @Unique diff --git a/src/main/java/de/hysky/skyblocker/mixins/PlayerListHudMixin.java b/src/main/java/de/hysky/skyblocker/mixins/PlayerListHudMixin.java index a1a9116c..a96a7727 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/PlayerListHudMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/PlayerListHudMixin.java @@ -28,7 +28,7 @@ public class PlayerListHudMixin { @Inject(at = @At("HEAD"), method = "render", cancellable = true) public void skyblocker$renderTabHud(CallbackInfo info, @Local(argsOnly = true) DrawContext context, @Local(argsOnly = true) int w) { - if (!Utils.isInDungeons() || !SkyblockerConfigManager.get().general.tabHud.tabHudEnabled || TabHud.defaultTgl.isPressed()) { + if (!Utils.isInDungeons() || !SkyblockerConfigManager.get().uiAndVisuals.tabHud.tabHudEnabled || TabHud.defaultTgl.isPressed()) { return; } @@ -38,7 +38,7 @@ public class PlayerListHudMixin { } int h = MinecraftClient.getInstance().getWindow().getScaledHeight(); - float scale = SkyblockerConfigManager.get().general.tabHud.tabHudScale / 100f; + float scale = SkyblockerConfigManager.get().uiAndVisuals.tabHud.tabHudScale / 100f; w = (int) (w / scale); h = (int) (h / scale); diff --git a/src/main/java/de/hysky/skyblocker/mixins/PlayerSkinTextureMixin.java b/src/main/java/de/hysky/skyblocker/mixins/PlayerSkinTextureMixin.java index f9e2c8cd..828d32e3 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/PlayerSkinTextureMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/PlayerSkinTextureMixin.java @@ -35,6 +35,6 @@ public class PlayerSkinTextureMixin { @WrapWithCondition(method = "remapTexture", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/texture/PlayerSkinTexture;stripAlpha(Lnet/minecraft/client/texture/NativeImage;IIII)V")) private boolean skyblocker$dontStripAlphaValues(NativeImage image, int x1, int y1, int x2, int y2) { - return !(SkyblockerConfigManager.get().general.dontStripSkinAlphaValues && this.isSkyblockSkinTexture); + return !(SkyblockerConfigManager.get().uiAndVisuals.dontStripSkinAlphaValues && this.isSkyblockSkinTexture); } } diff --git a/src/main/java/de/hysky/skyblocker/mixins/RenderFishMixin.java b/src/main/java/de/hysky/skyblocker/mixins/RenderFishMixin.java index 71e7f56f..66449b24 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/RenderFishMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/RenderFishMixin.java @@ -19,7 +19,7 @@ public abstract class RenderFishMixin { @Inject(method = "render", at = @At("HEAD"), cancellable = true) private void skyblocker$render(FishingBobberEntity fishingBobberEntity, float f, float g, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, CallbackInfo ci) { //if rendered bobber is not the players and option to hide others is enabled do not render the bobber - if (Utils.isOnSkyblock() && fishingBobberEntity.getPlayerOwner() != MinecraftClient.getInstance().player && SkyblockerConfigManager.get().general.fishing.hideOtherPlayersRods) { + if (Utils.isOnSkyblock() && fishingBobberEntity.getPlayerOwner() != MinecraftClient.getInstance().player && SkyblockerConfigManager.get().helper.fishing.hideOtherPlayersRods) { ci.cancel(); } } -- cgit From b2510546a8322b4fac83048f7c154c9b85e72f46 Mon Sep 17 00:00:00 2001 From: Yasin Date: Wed, 8 May 2024 19:58:29 +0200 Subject: hideEmptyTooltips -> ui tab --- .../de/hysky/skyblocker/config/categories/GeneralCategory.java | 7 ------- .../hysky/skyblocker/config/categories/UIAndVisualsCategory.java | 7 +++++++ .../java/de/hysky/skyblocker/config/configs/GeneralConfig.java | 3 --- .../de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java | 3 +++ src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java | 4 ++-- src/main/resources/assets/skyblocker/lang/de_de.json | 2 +- src/main/resources/assets/skyblocker/lang/en_us.json | 2 +- src/main/resources/assets/skyblocker/lang/fr_fr.json | 2 +- src/main/resources/assets/skyblocker/lang/pt_br.json | 2 +- src/main/resources/assets/skyblocker/lang/ru_ru.json | 2 +- src/main/resources/assets/skyblocker/lang/tr_tr.json | 2 +- src/main/resources/assets/skyblocker/lang/zh_cn.json | 2 +- src/main/resources/assets/skyblocker/lang/zh_tw.json | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/mixins') diff --git a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java index 69182506..1477d669 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java @@ -31,13 +31,6 @@ public class GeneralCategory { newValue -> config.general.acceptReparty = newValue) .controller(ConfigUtils::createBooleanController) .build()) - .option(Option.createBuilder() - .name(Text.translatable("skyblocker.config.general.hideEmptyTooltips")) - .binding(defaults.general.hideEmptyTooltips, - () -> config.general.hideEmptyTooltips, - newValue -> config.general.hideEmptyTooltips = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) //Shortcuts .group(OptionGroup.createBuilder() diff --git a/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java index fd638198..460a250d 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java @@ -43,6 +43,13 @@ public class UIAndVisualsCategory { newValue -> config.uiAndVisuals.backpackPreviewWithoutShift = newValue) .controller(ConfigUtils::createBooleanController) .build()) + .option(Option.createBuilder() + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.hideEmptyTooltips")) + .binding(defaults.uiAndVisuals.hideEmptyTooltips, + () -> config.uiAndVisuals.hideEmptyTooltips, + newValue -> config.uiAndVisuals.hideEmptyTooltips = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.fancyCraftingTable")) .binding(defaults.uiAndVisuals.fancyCraftingTable, diff --git a/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java index 2a8e31df..56e110b6 100644 --- a/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java @@ -21,9 +21,6 @@ public class GeneralConfig { @SerialEntry public boolean acceptReparty = true; - @SerialEntry - public boolean hideEmptyTooltips = true; - @SerialEntry public Shortcuts shortcuts = new Shortcuts(); diff --git a/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java index 9facd21d..8c96ec57 100644 --- a/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java @@ -17,6 +17,9 @@ public class UIAndVisualsConfig { @SerialEntry public boolean backpackPreviewWithoutShift = false; + @SerialEntry + public boolean hideEmptyTooltips = true; + @SerialEntry public boolean fancyCraftingTable = true; diff --git a/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java b/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java index 46207669..631a1ed8 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java @@ -120,7 +120,7 @@ public abstract class HandledScreenMixin extends Screen if (!Utils.isOnSkyblock()) return; // Hide Empty Tooltips - if (SkyblockerConfigManager.get().general.hideEmptyTooltips && stack.getName().getString().equals(" ")) { + if (SkyblockerConfigManager.get().uiAndVisuals.hideEmptyTooltips && stack.getName().getString().equals(" ")) { ci.cancel(); } @@ -185,7 +185,7 @@ public abstract class HandledScreenMixin extends Screen ContainerSolver currentSolver = SkyblockerMod.getInstance().containerSolverManager.getCurrentSolver(); // Prevent clicks on filler items - if (SkyblockerConfigManager.get().general.hideEmptyTooltips && FILLER_ITEMS.contains(stack.getName().getString()) && + if (SkyblockerConfigManager.get().uiAndVisuals.hideEmptyTooltips && FILLER_ITEMS.contains(stack.getName().getString()) && // Allow clicks in Ultrasequencer and Superpairs (!UltrasequencerSolver.INSTANCE.getName().matcher(title).matches() || SkyblockerConfigManager.get().helper.experiments.enableUltrasequencerSolver)) { ci.cancel(); diff --git a/src/main/resources/assets/skyblocker/lang/de_de.json b/src/main/resources/assets/skyblocker/lang/de_de.json index 7204d810..9177c9e0 100644 --- a/src/main/resources/assets/skyblocker/lang/de_de.json +++ b/src/main/resources/assets/skyblocker/lang/de_de.json @@ -9,7 +9,7 @@ "skyblocker.config.userInterfaceAndVisuals.tabHud.tabHudScale": "Skalierungsfaktor für schöners Tab-HUD", "skyblocker.config.userInterfaceAndVisuals.tabHud.tabHudScale.@Tooltip": "Wert in %, relativ zur Skalierung des Vanilla-GUIs", "skyblocker.config.userInterfaceAndVisuals.bars.enableBars": "Balken aktivieren", - "skyblocker.config.general.hideEmptyTooltips": "Leere Item-Tooltips in Menüs verstecken", + "skyblocker.config.userInterfaceAndVisuals.hideEmptyTooltips": "Leere Item-Tooltips in Menüs verstecken", "skyblocker.config.otherLocations": "Standorte", "skyblocker.config.dungeons": "Dungeons", "skyblocker.config.dungeons.map.enableMap": "Karte aktivieren", diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 6f411778..48af15a5 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -190,7 +190,7 @@ "skyblocker.config.general.acceptReparty": "Auto accept Reparty", - "skyblocker.config.general.hideEmptyTooltips": "Hide empty item tooltips in menus", + "skyblocker.config.userInterfaceAndVisuals.hideEmptyTooltips": "Hide empty item tooltips in menus", "skyblocker.config.general.hitbox": "Hitboxes", "skyblocker.config.general.hitbox.oldFarmlandHitbox": "Enable 1.8 farmland hitbox", diff --git a/src/main/resources/assets/skyblocker/lang/fr_fr.json b/src/main/resources/assets/skyblocker/lang/fr_fr.json index d937513d..e1b967b8 100644 --- a/src/main/resources/assets/skyblocker/lang/fr_fr.json +++ b/src/main/resources/assets/skyblocker/lang/fr_fr.json @@ -74,7 +74,7 @@ "skyblocker.config.otherLocations.barn.solveTreasureHunter": "Résoudre Chasseur de trésor", "skyblocker.config.otherLocations.barn.solveHungryHiker": "Résoudre Randonneur affamé", "skyblocker.config.chat.filter.chatFilterResult.PASS": "Désactivé", - "skyblocker.config.general.hideEmptyTooltips": "Cacher les tooltips des items vides dans les menus", + "skyblocker.config.userInterfaceAndVisuals.hideEmptyTooltips": "Cacher les tooltips des items vides dans les menus", "skyblocker.config.userInterfaceAndVisuals.tabHud.tabHudScale.@Tooltip": "Valeur en %, relative à la taille de l'interface vanilla", "key.skyblocker.defaultTgl": "Passer le HUD Tab à la vue par défaut", "skyblocker.config.userInterfaceAndVisuals.tabHud": "HUD Tab joli (temporairement désactivé en dehors des donjons)", diff --git a/src/main/resources/assets/skyblocker/lang/pt_br.json b/src/main/resources/assets/skyblocker/lang/pt_br.json index 48b8ad7d..c1c1f4cc 100644 --- a/src/main/resources/assets/skyblocker/lang/pt_br.json +++ b/src/main/resources/assets/skyblocker/lang/pt_br.json @@ -104,7 +104,7 @@ "skyblocker.config.slayer.vampireSlayer.holyIceUpdateFrequency.@Tooltip": "Quanto menor o valor, maior será a frequência de atualizações, o que irá talvez causa lag.", "skyblocker.config.slayer.vampireSlayer.steakStakeUpdateFrequency.@Tooltip": "Quanto menor o valor, maior será a frequência de atualizações, o que irá talvez causa lag.", "skyblocker.config.slayer.vampireSlayer.maniaUpdateFrequency.@Tooltip": "Quanto menor o valor, maior será a frequência de atualizações, o que irá talvez causa lag.", - "skyblocker.config.general.hideEmptyTooltips": "Esconder tooltips vazio de itens nos menus", + "skyblocker.config.userInterfaceAndVisuals.hideEmptyTooltips": "Esconder tooltips vazio de itens nos menus", "skyblocker.config.general.shortcuts.enableCommandArgShortcuts": "Ativar Atalhos de Argumentos de Comando", "skyblocker.config.general.quiverWarning.enableQuiverWarningInDungeons": "Ativar Aviso de Aljava em Dungeons", "skyblocker.config.general.quiverWarning.enableQuiverWarningAfterDungeon": "Ativar Aviso de Aljava Após uma Dungeon", diff --git a/src/main/resources/assets/skyblocker/lang/ru_ru.json b/src/main/resources/assets/skyblocker/lang/ru_ru.json index f61e8e18..af1843e8 100644 --- a/src/main/resources/assets/skyblocker/lang/ru_ru.json +++ b/src/main/resources/assets/skyblocker/lang/ru_ru.json @@ -52,7 +52,7 @@ "skyblocker.fishing.reelNow": "Тяни!", "skyblocker.config.chat.filter.hideAutopet": "Скрывать сообщения Autopet", "skyblocker.config.chat.filter.hideMana": "Скрывать сообщения о расходе маны из Action Bar", - "skyblocker.config.general.hideEmptyTooltips": "Скрывать описания предметов в меню", + "skyblocker.config.userInterfaceAndVisuals.hideEmptyTooltips": "Скрывать описания предметов в меню", "skyblocker.config.helper.fishing": "Помощь в рыбалке", "skyblocker.config.helper.fishing.enableFishingHelper": "Включить помощь в рыбалке", "skyblocker.config.general.itemTooltip.avg.BOTH": "Обе", diff --git a/src/main/resources/assets/skyblocker/lang/tr_tr.json b/src/main/resources/assets/skyblocker/lang/tr_tr.json index b7af138e..76afc019 100644 --- a/src/main/resources/assets/skyblocker/lang/tr_tr.json +++ b/src/main/resources/assets/skyblocker/lang/tr_tr.json @@ -37,7 +37,7 @@ "skyblocker.config.chat.filter.hideAutopet": "Autopet mesajlarını filtrele", "skyblocker.config.chat.filter.hideMana": "Aksiyon barındaki mana tüketimlerini gizle", "skyblocker.config.chat.filter.hideMana.@Tooltip": "FancyBar ile daha iyi bir deneyim sunar", - "skyblocker.config.general.hideEmptyTooltips": "Menülerdeki boş eşya açıklamalarını gizle", + "skyblocker.config.userInterfaceAndVisuals.hideEmptyTooltips": "Menülerdeki boş eşya açıklamalarını gizle", "skyblocker.config.general.itemTooltip.avg.@Tooltip": "Kaç günlük ortalamanın gösterileceğini seçebilirsiniz", "skyblocker.config.general.itemTooltip.enableLowestBIN": "En düşük BIN fiyatını göster", "skyblocker.config.misc.richPresence.enableRichPresence": "Aktif", diff --git a/src/main/resources/assets/skyblocker/lang/zh_cn.json b/src/main/resources/assets/skyblocker/lang/zh_cn.json index f0beec66..0abaacf3 100644 --- a/src/main/resources/assets/skyblocker/lang/zh_cn.json +++ b/src/main/resources/assets/skyblocker/lang/zh_cn.json @@ -71,7 +71,7 @@ "skyblocker.config.chat.filter.hideAutopet": "隐藏自动宠物消息", "skyblocker.config.chat.filter.hideMana": "在动作栏中隐藏法力消耗信息", "skyblocker.config.chat.filter.hideMana.@Tooltip": "已被更好的属性条代替", - "skyblocker.config.general.hideEmptyTooltips": "隐藏菜单中分隔符的物品信息", + "skyblocker.config.userInterfaceAndVisuals.hideEmptyTooltips": "隐藏菜单中分隔符的物品信息", "skyblocker.config.dungeons.map.mapScaling": "地图界面大小", "skyblocker.updateRepository.error": "§c更新本地数据存储库失败，请手动删除文件并重启游戏。", "skyblocker.config.helper.fishing": "钓鱼助手", diff --git a/src/main/resources/assets/skyblocker/lang/zh_tw.json b/src/main/resources/assets/skyblocker/lang/zh_tw.json index b49338ae..0e4285ce 100644 --- a/src/main/resources/assets/skyblocker/lang/zh_tw.json +++ b/src/main/resources/assets/skyblocker/lang/zh_tw.json @@ -9,7 +9,7 @@ "skyblocker.config.chat.filter.hideTeleportPad": "隱藏傳送點訊息", "skyblocker.config.chat.filter.hideCombo": "隱藏連殺訊息", "skyblocker.config.chat.filter.hideAutopet": "隱藏自動寵物訊息", - "skyblocker.config.general.hideEmptyTooltips": "隱藏選單玻璃物品資訊", + "skyblocker.config.userInterfaceAndVisuals.hideEmptyTooltips": "隱藏選單玻璃物品資訊", "skyblocker.config.chat.filter.hideAbility": "隱藏技能冷卻", "skyblocker.config.chat.filter.hideHeal": "隱藏治療訊息", "skyblocker.config.chat.filter.hideMana": "在動作欄中隱藏魔力消耗的提示訊息", -- cgit From b73adb121637fd3dcc3768d1ce69558ab0fa5de8 Mon Sep 17 00:00:00 2001 From: Yasin Date: Wed, 8 May 2024 20:13:08 +0200 Subject: pluralize slayer, helper and pulzzlesolver --- .../hysky/skyblocker/config/SkyblockerConfig.java | 4 +- .../config/categories/DungeonsCategory.java | 54 ++++++------- .../config/categories/HelperCategory.java | 78 +++++++++---------- .../config/categories/SlayersCategory.java | 90 +++++++++++----------- .../skyblocker/config/configs/DungeonsConfig.java | 4 +- .../hysky/skyblocker/mixins/DataTrackerMixin.java | 2 +- .../skyblocker/mixins/HandledScreenMixin.java | 2 +- .../hysky/skyblocker/mixins/RenderFishMixin.java | 2 +- .../hysky/skyblocker/skyblock/FishingHelper.java | 8 +- .../newyearcakes/NewYearCakeBagHelper.java | 2 +- .../newyearcakes/NewYearCakesHelper.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 +- .../skyblocker/skyblock/end/BeaconHighlighter.java | 2 +- .../hysky/skyblocker/skyblock/entity/MobGlow.java | 2 +- .../skyblock/experiment/ExperimentSolver.java | 3 +- .../skyblocker/skyblock/rift/EffigyWaypoints.java | 6 +- .../skyblock/rift/HealingMelonIndicator.java | 4 +- .../skyblocker/skyblock/rift/ManiaIndicator.java | 2 +- .../skyblocker/skyblock/rift/StakeIndicator.java | 2 +- .../de/hysky/skyblocker/skyblock/rift/TheRift.java | 8 +- .../skyblock/rift/TwinClawsIndicator.java | 4 +- .../skyblocker/skyblock/waypoint/FairySouls.java | 3 +- .../skyblock/waypoint/MythologicalRitual.java | 2 +- 31 files changed, 156 insertions(+), 158 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/mixins') diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index 6bd32254..9970eec1 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -14,7 +14,7 @@ public class SkyblockerConfig { public UIAndVisualsConfig uiAndVisuals = new UIAndVisualsConfig(); @SerialEntry - public HelperConfig helper = new HelperConfig(); + public HelperConfig helpers = new HelperConfig(); @SerialEntry public DungeonsConfig dungeons = new DungeonsConfig(); @@ -32,7 +32,7 @@ public class SkyblockerConfig { public OtherLocationsConfig otherLocations = new OtherLocationsConfig(); @SerialEntry - public SlayersConfig slayer = new SlayersConfig(); + public SlayersConfig slayers = new SlayersConfig(); @SerialEntry public ChatConfig chats = new ChatConfig(); diff --git a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java index b1754bbd..d44ab490 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java @@ -100,69 +100,69 @@ public class DungeonsCategory { .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.dungeons.puzzle.solveTicTacToe")) .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.puzzle.solveTicTacToe.@Tooltip"))) - .binding(defaults.dungeons.puzzleSolver.solveTicTacToe, - () -> config.dungeons.puzzleSolver.solveTicTacToe, - newValue -> config.dungeons.puzzleSolver.solveTicTacToe = newValue) + .binding(defaults.dungeons.puzzleSolvers.solveTicTacToe, + () -> config.dungeons.puzzleSolvers.solveTicTacToe, + newValue -> config.dungeons.puzzleSolvers.solveTicTacToe = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.dungeons.puzzle.solveThreeWeirdos")) - .binding(defaults.dungeons.puzzleSolver.solveThreeWeirdos, - () -> config.dungeons.puzzleSolver.solveThreeWeirdos, - newValue -> config.dungeons.puzzleSolver.solveThreeWeirdos = newValue) + .binding(defaults.dungeons.puzzleSolvers.solveThreeWeirdos, + () -> config.dungeons.puzzleSolvers.solveThreeWeirdos, + newValue -> config.dungeons.puzzleSolvers.solveThreeWeirdos = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.dungeons.puzzle.creeperSolver")) .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.puzzle.creeperSolver.@Tooltip"))) - .binding(defaults.dungeons.puzzleSolver.creeperSolver, - () -> config.dungeons.puzzleSolver.creeperSolver, - newValue -> config.dungeons.puzzleSolver.creeperSolver = newValue) + .binding(defaults.dungeons.puzzleSolvers.creeperSolver, + () -> config.dungeons.puzzleSolvers.creeperSolver, + newValue -> config.dungeons.puzzleSolvers.creeperSolver = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.dungeons.puzzle.solveWaterboard")) .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.puzzle.solveWaterboard.@Tooltip"))) - .binding(defaults.dungeons.puzzleSolver.solveWaterboard, - () -> config.dungeons.puzzleSolver.solveWaterboard, - newValue -> config.dungeons.puzzleSolver.solveWaterboard = newValue) + .binding(defaults.dungeons.puzzleSolvers.solveWaterboard, + () -> config.dungeons.puzzleSolvers.solveWaterboard, + newValue -> config.dungeons.puzzleSolvers.solveWaterboard = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.dungeons.puzzle.blazeSolver")) .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.puzzle.blazeSolver.@Tooltip"))) - .binding(defaults.dungeons.puzzleSolver.blazeSolver, - () -> config.dungeons.puzzleSolver.blazeSolver, - newValue -> config.dungeons.puzzleSolver.blazeSolver = newValue) + .binding(defaults.dungeons.puzzleSolvers.blazeSolver, + () -> config.dungeons.puzzleSolvers.blazeSolver, + newValue -> config.dungeons.puzzleSolvers.blazeSolver = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.dungeons.puzzle.solveBoulder")) .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.puzzle.solveBoulder.@Tooltip"))) - .binding(defaults.dungeons.puzzleSolver.solveBoulder, - () -> config.dungeons.puzzleSolver.solveBoulder, - newValue -> config.dungeons.puzzleSolver.solveBoulder = newValue) + .binding(defaults.dungeons.puzzleSolvers.solveBoulder, + () -> config.dungeons.puzzleSolvers.solveBoulder, + newValue -> config.dungeons.puzzleSolvers.solveBoulder = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.dungeons.puzzle.solveIceFill")) - .binding(defaults.dungeons.puzzleSolver.solveIceFill, - () -> config.dungeons.puzzleSolver.solveIceFill, - newValue -> config.dungeons.puzzleSolver.solveIceFill = newValue) + .binding(defaults.dungeons.puzzleSolvers.solveIceFill, + () -> config.dungeons.puzzleSolvers.solveIceFill, + newValue -> config.dungeons.puzzleSolvers.solveIceFill = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.dungeons.puzzle.solveSilverfish")) - .binding(defaults.dungeons.puzzleSolver.solveSilverfish, - () -> config.dungeons.puzzleSolver.solveSilverfish, - newValue -> config.dungeons.puzzleSolver.solveSilverfish = newValue) + .binding(defaults.dungeons.puzzleSolvers.solveSilverfish, + () -> config.dungeons.puzzleSolvers.solveSilverfish, + newValue -> config.dungeons.puzzleSolvers.solveSilverfish = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.dungeons.puzzle.solveTrivia")) - .binding(defaults.dungeons.puzzleSolver.solveTrivia, - () -> config.dungeons.puzzleSolver.solveTrivia, - newValue -> config.dungeons.puzzleSolver.solveTrivia = newValue) + .binding(defaults.dungeons.puzzleSolvers.solveTrivia, + () -> config.dungeons.puzzleSolvers.solveTrivia, + newValue -> config.dungeons.puzzleSolvers.solveTrivia = newValue) .controller(ConfigUtils::createBooleanController) .build()) .build()) diff --git a/src/main/java/de/hysky/skyblocker/config/categories/HelperCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/HelperCategory.java index 29444e48..4d0202aa 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/HelperCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/HelperCategory.java @@ -18,9 +18,9 @@ public class HelperCategory { .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.helper.enableNewYearCakesHelper")) .description(OptionDescription.of(Text.translatable("skyblocker.config.helper.enableNewYearCakesHelper.@Tooltip"))) - .binding(defaults.helper.enableNewYearCakesHelper, - () -> config.helper.enableNewYearCakesHelper, - newValue -> config.helper.enableNewYearCakesHelper = newValue) + .binding(defaults.helpers.enableNewYearCakesHelper, + () -> config.helpers.enableNewYearCakesHelper, + newValue -> config.helpers.enableNewYearCakesHelper = newValue) .controller(ConfigUtils::createBooleanController) .build()) @@ -30,9 +30,9 @@ public class HelperCategory { .collapsed(true) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.helper.mythologicalRitual.enableMythologicalRitualHelper")) - .binding(defaults.helper.mythologicalRitual.enableMythologicalRitualHelper, - () -> config.helper.mythologicalRitual.enableMythologicalRitualHelper, - newValue -> config.helper.mythologicalRitual.enableMythologicalRitualHelper = newValue) + .binding(defaults.helpers.mythologicalRitual.enableMythologicalRitualHelper, + () -> config.helpers.mythologicalRitual.enableMythologicalRitualHelper, + newValue -> config.helpers.mythologicalRitual.enableMythologicalRitualHelper = newValue) .controller(ConfigUtils::createBooleanController) .build()) .build()) @@ -43,23 +43,23 @@ public class HelperCategory { .collapsed(true) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.helper.experiments.enableChronomatronSolver")) - .binding(defaults.helper.experiments.enableChronomatronSolver, - () -> config.helper.experiments.enableChronomatronSolver, - newValue -> config.helper.experiments.enableChronomatronSolver = newValue) + .binding(defaults.helpers.experiments.enableChronomatronSolver, + () -> config.helpers.experiments.enableChronomatronSolver, + newValue -> config.helpers.experiments.enableChronomatronSolver = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.helper.experiments.enableSuperpairsSolver")) - .binding(defaults.helper.experiments.enableSuperpairsSolver, - () -> config.helper.experiments.enableSuperpairsSolver, - newValue -> config.helper.experiments.enableSuperpairsSolver = newValue) + .binding(defaults.helpers.experiments.enableSuperpairsSolver, + () -> config.helpers.experiments.enableSuperpairsSolver, + newValue -> config.helpers.experiments.enableSuperpairsSolver = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.helper.experiments.enableUltrasequencerSolver")) - .binding(defaults.helper.experiments.enableUltrasequencerSolver, - () -> config.helper.experiments.enableUltrasequencerSolver, - newValue -> config.helper.experiments.enableUltrasequencerSolver = newValue) + .binding(defaults.helpers.experiments.enableUltrasequencerSolver, + () -> config.helpers.experiments.enableUltrasequencerSolver, + newValue -> config.helpers.experiments.enableUltrasequencerSolver = newValue) .controller(ConfigUtils::createBooleanController) .build()) .build()) @@ -70,41 +70,41 @@ public class HelperCategory { .collapsed(true) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.helper.fishing.enableFishingHelper")) - .binding(defaults.helper.fishing.enableFishingHelper, - () -> config.helper.fishing.enableFishingHelper, - newValue -> config.helper.fishing.enableFishingHelper = newValue) + .binding(defaults.helpers.fishing.enableFishingHelper, + () -> config.helpers.fishing.enableFishingHelper, + newValue -> config.helpers.fishing.enableFishingHelper = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.helper.fishing.enableFishingTimer")) .description(OptionDescription.of(Text.translatable("skyblocker.config.helper.fishing.enableFishingTimer.@Tooltip"))) - .binding(defaults.helper.fishing.enableFishingTimer, - () -> config.helper.fishing.enableFishingTimer, - newValue -> config.helper.fishing.enableFishingTimer = newValue) + .binding(defaults.helpers.fishing.enableFishingTimer, + () -> config.helpers.fishing.enableFishingTimer, + newValue -> config.helpers.fishing.enableFishingTimer = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.helper.fishing.changeTimerColor")) .description(OptionDescription.of(Text.translatable("skyblocker.config.helper.fishing.changeTimerColor.@Tooltip"))) - .binding(defaults.helper.fishing.changeTimerColor, - () -> config.helper.fishing.changeTimerColor, - newValue -> config.helper.fishing.changeTimerColor = newValue) + .binding(defaults.helpers.fishing.changeTimerColor, + () -> config.helpers.fishing.changeTimerColor, + newValue -> config.helpers.fishing.changeTimerColor = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.helper.fishing.fishingTimerScale")) .description(OptionDescription.of(Text.translatable("skyblocker.config.helper.fishing.fishingTimerScale.@Tooltip"))) - .binding(defaults.helper.fishing.fishingTimerScale, - () -> config.helper.fishing.fishingTimerScale, - newValue -> config.helper.fishing.fishingTimerScale = newValue) + .binding(defaults.helpers.fishing.fishingTimerScale, + () -> config.helpers.fishing.fishingTimerScale, + newValue -> config.helpers.fishing.fishingTimerScale = newValue) .controller(FloatFieldControllerBuilder::create) .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.helper.fishing.hideOtherPlayers")) .description(OptionDescription.of(Text.translatable("skyblocker.config.helper.fishing.hideOtherPlayers.@Tooltip"))) - .binding(defaults.helper.fishing.hideOtherPlayersRods, - () -> config.helper.fishing.hideOtherPlayersRods, - newValue -> config.helper.fishing.hideOtherPlayersRods = newValue) + .binding(defaults.helpers.fishing.hideOtherPlayersRods, + () -> config.helpers.fishing.hideOtherPlayersRods, + newValue -> config.helpers.fishing.hideOtherPlayersRods = newValue) .controller(ConfigUtils::createBooleanController) .build()) .build()) @@ -115,24 +115,24 @@ public class HelperCategory { .collapsed(true) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.helper.fairySouls.enableFairySoulsHelper")) - .binding(defaults.helper.fairySouls.enableFairySoulsHelper, - () -> config.helper.fairySouls.enableFairySoulsHelper, - newValue -> config.helper.fairySouls.enableFairySoulsHelper = newValue) + .binding(defaults.helpers.fairySouls.enableFairySoulsHelper, + () -> config.helpers.fairySouls.enableFairySoulsHelper, + newValue -> config.helpers.fairySouls.enableFairySoulsHelper = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.helper.fairySouls.highlightFoundSouls")) - .binding(defaults.helper.fairySouls.highlightFoundSouls, - () -> config.helper.fairySouls.highlightFoundSouls, - newValue -> config.helper.fairySouls.highlightFoundSouls = newValue) + .binding(defaults.helpers.fairySouls.highlightFoundSouls, + () -> config.helpers.fairySouls.highlightFoundSouls, + newValue -> config.helpers.fairySouls.highlightFoundSouls = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.helper.fairySouls.highlightOnlyNearbySouls")) .description(OptionDescription.of(Text.translatable("skyblocker.config.helper.fairySouls.highlightOnlyNearbySouls.@Tooltip"))) - .binding(defaults.helper.fairySouls.highlightOnlyNearbySouls, - () -> config.helper.fairySouls.highlightOnlyNearbySouls, - newValue -> config.helper.fairySouls.highlightOnlyNearbySouls = newValue) + .binding(defaults.helpers.fairySouls.highlightOnlyNearbySouls, + () -> config.helpers.fairySouls.highlightOnlyNearbySouls, + newValue -> config.helpers.fairySouls.highlightOnlyNearbySouls = newValue) .controller(ConfigUtils::createBooleanController) .build()) .build()) diff --git a/src/main/java/de/hysky/skyblocker/config/categories/SlayersCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/SlayersCategory.java index 8bb22c14..0a65aa3b 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/SlayersCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/SlayersCategory.java @@ -23,23 +23,23 @@ public class SlayersCategory { .collapsed(true) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.slayer.endermanSlayer.enableYangGlyphsNotification")) - .binding(defaults.slayer.endermanSlayer.enableYangGlyphsNotification, - () -> config.slayer.endermanSlayer.enableYangGlyphsNotification, - newValue -> config.slayer.endermanSlayer.enableYangGlyphsNotification = newValue) + .binding(defaults.slayers.endermanSlayer.enableYangGlyphsNotification, + () -> config.slayers.endermanSlayer.enableYangGlyphsNotification, + newValue -> config.slayers.endermanSlayer.enableYangGlyphsNotification = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.slayer.endermanSlayer.highlightBeacons")) - .binding(defaults.slayer.endermanSlayer.highlightBeacons, - () -> config.slayer.endermanSlayer.highlightBeacons, - newValue -> config.slayer.endermanSlayer.highlightBeacons = newValue) + .binding(defaults.slayers.endermanSlayer.highlightBeacons, + () -> config.slayers.endermanSlayer.highlightBeacons, + newValue -> config.slayers.endermanSlayer.highlightBeacons = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.slayer.endermanSlayer.highlightNukekubiHeads")) - .binding(defaults.slayer.endermanSlayer.highlightNukekubiHeads, - () -> config.slayer.endermanSlayer.highlightNukekubiHeads, - newValue -> config.slayer.endermanSlayer.highlightNukekubiHeads = newValue) + .binding(defaults.slayers.endermanSlayer.highlightNukekubiHeads, + () -> config.slayers.endermanSlayer.highlightNukekubiHeads, + newValue -> config.slayers.endermanSlayer.highlightNukekubiHeads = newValue) .controller(ConfigUtils::createBooleanController) .build()) .build()) @@ -50,90 +50,90 @@ public class SlayersCategory { .collapsed(true) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.enableEffigyWaypoints")) - .binding(defaults.slayer.vampireSlayer.enableEffigyWaypoints, - () -> config.slayer.vampireSlayer.enableEffigyWaypoints, - newValue -> config.slayer.vampireSlayer.enableEffigyWaypoints = newValue) + .binding(defaults.slayers.vampireSlayer.enableEffigyWaypoints, + () -> config.slayers.vampireSlayer.enableEffigyWaypoints, + newValue -> config.slayers.vampireSlayer.enableEffigyWaypoints = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.compactEffigyWaypoints")) - .binding(defaults.slayer.vampireSlayer.compactEffigyWaypoints, - () -> config.slayer.vampireSlayer.compactEffigyWaypoints, - newValue -> config.slayer.vampireSlayer.compactEffigyWaypoints = newValue) + .binding(defaults.slayers.vampireSlayer.compactEffigyWaypoints, + () -> config.slayers.vampireSlayer.compactEffigyWaypoints, + newValue -> config.slayers.vampireSlayer.compactEffigyWaypoints = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.effigyUpdateFrequency")) .description(OptionDescription.of(Text.translatable("skyblocker.config.slayer.vampireSlayer.effigyUpdateFrequency.@Tooltip"))) - .binding(defaults.slayer.vampireSlayer.effigyUpdateFrequency, - () -> config.slayer.vampireSlayer.effigyUpdateFrequency, - newValue -> config.slayer.vampireSlayer.effigyUpdateFrequency = newValue) + .binding(defaults.slayers.vampireSlayer.effigyUpdateFrequency, + () -> config.slayers.vampireSlayer.effigyUpdateFrequency, + newValue -> config.slayers.vampireSlayer.effigyUpdateFrequency = newValue) .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(1, 10).step(1)) .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.enableHolyIceIndicator")) - .binding(defaults.slayer.vampireSlayer.enableHolyIceIndicator, - () -> config.slayer.vampireSlayer.enableHolyIceIndicator, - newValue -> config.slayer.vampireSlayer.enableHolyIceIndicator = newValue) + .binding(defaults.slayers.vampireSlayer.enableHolyIceIndicator, + () -> config.slayers.vampireSlayer.enableHolyIceIndicator, + newValue -> config.slayers.vampireSlayer.enableHolyIceIndicator = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.holyIceIndicatorTickDelay")) - .binding(defaults.slayer.vampireSlayer.holyIceIndicatorTickDelay, - () -> config.slayer.vampireSlayer.holyIceIndicatorTickDelay, - newValue -> config.slayer.vampireSlayer.holyIceIndicatorTickDelay = newValue) + .binding(defaults.slayers.vampireSlayer.holyIceIndicatorTickDelay, + () -> config.slayers.vampireSlayer.holyIceIndicatorTickDelay, + newValue -> config.slayers.vampireSlayer.holyIceIndicatorTickDelay = newValue) .controller(IntegerFieldControllerBuilder::create) .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.holyIceUpdateFrequency")) .description(OptionDescription.of(Text.translatable("skyblocker.config.slayer.vampireSlayer.holyIceUpdateFrequency.@Tooltip"))) - .binding(defaults.slayer.vampireSlayer.holyIceUpdateFrequency, - () -> config.slayer.vampireSlayer.holyIceUpdateFrequency, - newValue -> config.slayer.vampireSlayer.holyIceUpdateFrequency = newValue) + .binding(defaults.slayers.vampireSlayer.holyIceUpdateFrequency, + () -> config.slayers.vampireSlayer.holyIceUpdateFrequency, + newValue -> config.slayers.vampireSlayer.holyIceUpdateFrequency = newValue) .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(1, 10).step(1)) .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.enableHealingMelonIndicator")) - .binding(defaults.slayer.vampireSlayer.enableHealingMelonIndicator, - () -> config.slayer.vampireSlayer.enableHealingMelonIndicator, - newValue -> config.slayer.vampireSlayer.enableHealingMelonIndicator = newValue) + .binding(defaults.slayers.vampireSlayer.enableHealingMelonIndicator, + () -> config.slayers.vampireSlayer.enableHealingMelonIndicator, + newValue -> config.slayers.vampireSlayer.enableHealingMelonIndicator = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.healingMelonHealthThreshold")) - .binding(defaults.slayer.vampireSlayer.healingMelonHealthThreshold, - () -> config.slayer.vampireSlayer.healingMelonHealthThreshold, - newValue -> config.slayer.vampireSlayer.healingMelonHealthThreshold = newValue) + .binding(defaults.slayers.vampireSlayer.healingMelonHealthThreshold, + () -> config.slayers.vampireSlayer.healingMelonHealthThreshold, + newValue -> config.slayers.vampireSlayer.healingMelonHealthThreshold = newValue) .controller(FloatFieldControllerBuilder::create) .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.enableSteakStakeIndicator")) - .binding(defaults.slayer.vampireSlayer.enableSteakStakeIndicator, - () -> config.slayer.vampireSlayer.enableSteakStakeIndicator, - newValue -> config.slayer.vampireSlayer.enableSteakStakeIndicator = newValue) + .binding(defaults.slayers.vampireSlayer.enableSteakStakeIndicator, + () -> config.slayers.vampireSlayer.enableSteakStakeIndicator, + newValue -> config.slayers.vampireSlayer.enableSteakStakeIndicator = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.steakStakeUpdateFrequency")) .description(OptionDescription.of(Text.translatable("skyblocker.config.slayer.vampireSlayer.steakStakeUpdateFrequency.@Tooltip"))) - .binding(defaults.slayer.vampireSlayer.steakStakeUpdateFrequency, - () -> config.slayer.vampireSlayer.steakStakeUpdateFrequency, - newValue -> config.slayer.vampireSlayer.steakStakeUpdateFrequency = newValue) + .binding(defaults.slayers.vampireSlayer.steakStakeUpdateFrequency, + () -> config.slayers.vampireSlayer.steakStakeUpdateFrequency, + newValue -> config.slayers.vampireSlayer.steakStakeUpdateFrequency = newValue) .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(1, 10).step(1)) .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.enableManiaIndicator")) - .binding(defaults.slayer.vampireSlayer.enableManiaIndicator, - () -> config.slayer.vampireSlayer.enableManiaIndicator, - newValue -> config.slayer.vampireSlayer.enableManiaIndicator = newValue) + .binding(defaults.slayers.vampireSlayer.enableManiaIndicator, + () -> config.slayers.vampireSlayer.enableManiaIndicator, + newValue -> config.slayers.vampireSlayer.enableManiaIndicator = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.maniaUpdateFrequency")) .description(OptionDescription.of(Text.translatable("skyblocker.config.slayer.vampireSlayer.maniaUpdateFrequency.@Tooltip"))) - .binding(defaults.slayer.vampireSlayer.maniaUpdateFrequency, - () -> config.slayer.vampireSlayer.maniaUpdateFrequency, - newValue -> config.slayer.vampireSlayer.maniaUpdateFrequency = newValue) + .binding(defaults.slayers.vampireSlayer.maniaUpdateFrequency, + () -> config.slayers.vampireSlayer.maniaUpdateFrequency, + newValue -> config.slayers.vampireSlayer.maniaUpdateFrequency = newValue) .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(1, 10).step(1)) .build()) .build()) diff --git a/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java index d458cd63..2c99dc56 100644 --- a/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java @@ -27,7 +27,7 @@ public class DungeonsConfig { public DungeonMap dungeonMap = new DungeonMap(); @SerialEntry - public PuzzleSolver puzzleSolver = new PuzzleSolver(); + public PuzzleSolvers puzzleSolvers = new PuzzleSolvers(); @SerialEntry public TheProfessor theProfessor = new TheProfessor(); @@ -67,7 +67,7 @@ public class DungeonsConfig { public int mapY = 2; } - public static class PuzzleSolver { + public static class PuzzleSolvers { @SerialEntry public boolean solveTicTacToe = true; diff --git a/src/main/java/de/hysky/skyblocker/mixins/DataTrackerMixin.java b/src/main/java/de/hysky/skyblocker/mixins/DataTrackerMixin.java index 77bb09bb..a192f448 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/DataTrackerMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/DataTrackerMixin.java @@ -32,7 +32,7 @@ public abstract class DataTrackerMixin { @SuppressWarnings("ConstantValue") @Inject(method = "writeUpdatedEntries", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/data/DataTracker;copyToFrom(Lnet/minecraft/entity/data/DataTracker$Entry;Lnet/minecraft/entity/data/DataTracker$SerializedEntry;)V")) private void skyblocker$onWriteUpdatedEntries(CallbackInfo ci, @Local DataTracker.Entry entry, @Local DataTracker.SerializedEntry serializedEntry) { - if (Utils.isInTheEnd() && SkyblockerConfigManager.get().slayer.endermanSlayer.enableYangGlyphsNotification && entry.getData() == EndermanEntityAccessor.getCARRIED_BLOCK() && entry.get() instanceof Optional value && value.isPresent() && value.get() instanceof BlockState state && state.isOf(Blocks.BEACON) && ((Optional) serializedEntry.value()).isEmpty()) { + if (Utils.isInTheEnd() && SkyblockerConfigManager.get().slayers.endermanSlayer.enableYangGlyphsNotification && entry.getData() == EndermanEntityAccessor.getCARRIED_BLOCK() && entry.get() instanceof Optional value && value.isPresent() && value.get() instanceof BlockState state && state.isOf(Blocks.BEACON) && ((Optional) serializedEntry.value()).isEmpty()) { MinecraftClient client = MinecraftClient.getInstance(); if (trackedEntity instanceof Entity entity && MobGlow.getArmorStands(entity).stream().anyMatch(armorStand -> armorStand.getName().getString().contains(client.getSession().getUsername()))) { client.inGameHud.setTitleTicks(5, 20, 10); diff --git a/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java b/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java index 631a1ed8..04e6749c 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java @@ -187,7 +187,7 @@ public abstract class HandledScreenMixin extends Screen // Prevent clicks on filler items if (SkyblockerConfigManager.get().uiAndVisuals.hideEmptyTooltips && FILLER_ITEMS.contains(stack.getName().getString()) && // Allow clicks in Ultrasequencer and Superpairs - (!UltrasequencerSolver.INSTANCE.getName().matcher(title).matches() || SkyblockerConfigManager.get().helper.experiments.enableUltrasequencerSolver)) { + (!UltrasequencerSolver.INSTANCE.getName().matcher(title).matches() || SkyblockerConfigManager.get().helpers.experiments.enableUltrasequencerSolver)) { ci.cancel(); return; } diff --git a/src/main/java/de/hysky/skyblocker/mixins/RenderFishMixin.java b/src/main/java/de/hysky/skyblocker/mixins/RenderFishMixin.java index 66449b24..3b7bc8be 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/RenderFishMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/RenderFishMixin.java @@ -19,7 +19,7 @@ public abstract class RenderFishMixin { @Inject(method = "render", at = @At("HEAD"), cancellable = true) private void skyblocker$render(FishingBobberEntity fishingBobberEntity, float f, float g, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, CallbackInfo ci) { //if rendered bobber is not the players and option to hide others is enabled do not render the bobber - if (Utils.isOnSkyblock() && fishingBobberEntity.getPlayerOwner() != MinecraftClient.getInstance().player && SkyblockerConfigManager.get().helper.fishing.hideOtherPlayersRods) { + if (Utils.isOnSkyblock() && fishingBobberEntity.getPlayerOwner() != MinecraftClient.getInstance().player && SkyblockerConfigManager.get().helpers.fishing.hideOtherPlayersRods) { ci.cancel(); } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/FishingHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/FishingHelper.java index 3f4c8269..79239825 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().helper.fishing.enableFishingHelper && startTimeFish != 0 && System.currentTimeMillis() >= startTimeFish + 2000 && ("entity.generic.splash".equals(path) || "entity.player.splash".equals(path))) { + if (SkyblockerConfigManager.get().helpers.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().helper.fishing.enableFishingTimer && startTime != 0) { + if (SkyblockerConfigManager.get().helpers.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().helper.fishing.fishingTimerScale; + float scale = SkyblockerConfigManager.get().helpers.fishing.fishingTimerScale; Vec3d pos = player.fishHook.getPos().add(0, 0.4 + scale / 10, 0); Text text; - if (time >= 20 && SkyblockerConfigManager.get().helper.fishing.changeTimerColor) { + if (time >= 20 && SkyblockerConfigManager.get().helpers.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/accessories/newyearcakes/NewYearCakeBagHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakeBagHelper.java index 8023ae05..747ce9b4 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().helper.enableNewYearCakesHelper; + return SkyblockerConfigManager.get().helpers.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 1860dbc9..c403a81b 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().helper.enableNewYearCakesHelper; + return SkyblockerConfigManager.get().helpers.enableNewYearCakesHelper; } public boolean addCake(int year) { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/CreeperBeams.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/CreeperBeams.java index 3fd24f8e..3d9e05ae 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/CreeperBeams.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/CreeperBeams.java @@ -177,7 +177,7 @@ public class CreeperBeams extends DungeonPuzzle { public void render(WorldRenderContext wrc) { // don't render if solved or disabled - if (!shouldSolve() || !SkyblockerConfigManager.get().dungeons.puzzleSolver.creeperSolver) { + if (!shouldSolve() || !SkyblockerConfigManager.get().dungeons.puzzleSolvers.creeperSolver) { return; } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/DungeonBlaze.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/DungeonBlaze.java index cd3508c1..8ac79f39 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/DungeonBlaze.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/DungeonBlaze.java @@ -111,7 +111,7 @@ public class DungeonBlaze extends DungeonPuzzle { @Override public void render(WorldRenderContext wrc) { try { - if (highestBlaze != null && lowestBlaze != null && highestBlaze.isAlive() && lowestBlaze.isAlive() && SkyblockerConfigManager.get().dungeons.puzzleSolver.blazeSolver) { + if (highestBlaze != null && lowestBlaze != null && highestBlaze.isAlive() && lowestBlaze.isAlive() && SkyblockerConfigManager.get().dungeons.puzzleSolvers.blazeSolver) { if (highestBlaze.getY() < 69) { renderBlazeOutline(highestBlaze, nextHighestBlaze, wrc); } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/IceFill.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/IceFill.java index 6c2d56b3..8bc14b52 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/IceFill.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/IceFill.java @@ -80,7 +80,7 @@ public class IceFill extends DungeonPuzzle { @Override public void tick(MinecraftClient client) { - if (!SkyblockerConfigManager.get().dungeons.puzzleSolver.solveIceFill || client.world == null || !DungeonManager.isCurrentRoomMatched() || solve != null && !solve.isDone()) { + if (!SkyblockerConfigManager.get().dungeons.puzzleSolvers.solveIceFill || client.world == null || !DungeonManager.isCurrentRoomMatched() || solve != null && !solve.isDone()) { return; } Room room = DungeonManager.getCurrentRoom(); @@ -150,7 +150,7 @@ public class IceFill extends DungeonPuzzle { @Override public void render(WorldRenderContext context) { - if (!SkyblockerConfigManager.get().dungeons.puzzleSolver.solveIceFill || !DungeonManager.isCurrentRoomMatched()) { + if (!SkyblockerConfigManager.get().dungeons.puzzleSolvers.solveIceFill || !DungeonManager.isCurrentRoomMatched()) { return; } Room room = DungeonManager.getCurrentRoom(); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Silverfish.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Silverfish.java index eed291c2..3b0ee65c 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Silverfish.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Silverfish.java @@ -65,7 +65,7 @@ public class Silverfish extends DungeonPuzzle { @Override public void tick(MinecraftClient client) { - if (!SkyblockerConfigManager.get().dungeons.puzzleSolver.solveSilverfish || client.world == null || !DungeonManager.isCurrentRoomMatched()) { + if (!SkyblockerConfigManager.get().dungeons.puzzleSolvers.solveSilverfish || client.world == null || !DungeonManager.isCurrentRoomMatched()) { return; } Room room = DungeonManager.getCurrentRoom(); @@ -158,7 +158,7 @@ public class Silverfish extends DungeonPuzzle { @Override public void render(WorldRenderContext context) { - if (!SkyblockerConfigManager.get().dungeons.puzzleSolver.solveSilverfish || !DungeonManager.isCurrentRoomMatched() || silverfishPath.isEmpty()) { + if (!SkyblockerConfigManager.get().dungeons.puzzleSolvers.solveSilverfish || !DungeonManager.isCurrentRoomMatched() || silverfishPath.isEmpty()) { return; } Room room = DungeonManager.getCurrentRoom(); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdos.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdos.java index ae72d3cc..30119204 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdos.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdos.java @@ -17,7 +17,7 @@ public class ThreeWeirdos extends ChatPatternListener { @Override public ChatFilterResult state() { - return SkyblockerConfigManager.get().dungeons.puzzleSolver.solveThreeWeirdos ? null : ChatFilterResult.PASS; + return SkyblockerConfigManager.get().dungeons.puzzleSolvers.solveThreeWeirdos ? null : ChatFilterResult.PASS; } @Override diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/TicTacToe.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/TicTacToe.java index 088a6e6b..3c0b0dc9 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/TicTacToe.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/TicTacToe.java @@ -111,7 +111,7 @@ public class TicTacToe extends DungeonPuzzle { @Override public void render(WorldRenderContext context) { try { - if (SkyblockerConfigManager.get().dungeons.puzzleSolver.solveTicTacToe && nextBestMoveToMake != null) { + if (SkyblockerConfigManager.get().dungeons.puzzleSolvers.solveTicTacToe && nextBestMoveToMake != null) { RenderHelper.renderOutline(context, nextBestMoveToMake, RED_COLOR_COMPONENTS, 5, false); } } catch (Exception e) { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Trivia.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Trivia.java index 4dc72cff..874907c3 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Trivia.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Trivia.java @@ -29,7 +29,7 @@ public class Trivia extends ChatPatternListener { @Override public ChatFilterResult state() { - return SkyblockerConfigManager.get().dungeons.puzzleSolver.solveTrivia ? ChatFilterResult.FILTER : ChatFilterResult.PASS; + return SkyblockerConfigManager.get().dungeons.puzzleSolvers.solveTrivia ? ChatFilterResult.FILTER : ChatFilterResult.PASS; } @Override diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/boulder/Boulder.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/boulder/Boulder.java index 24d1331a..68671896 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/boulder/Boulder.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/boulder/Boulder.java @@ -43,7 +43,7 @@ public class Boulder extends DungeonPuzzle { @Override public void tick(MinecraftClient client) { - if (!shouldSolve() || !SkyblockerConfigManager.get().dungeons.puzzleSolver.solveBoulder || client.world == null || !DungeonManager.isCurrentRoomMatched()) { + if (!shouldSolve() || !SkyblockerConfigManager.get().dungeons.puzzleSolvers.solveBoulder || client.world == null || !DungeonManager.isCurrentRoomMatched()) { return; } @@ -195,7 +195,7 @@ public class Boulder extends DungeonPuzzle { @Override public void render(WorldRenderContext context) { - if (!shouldSolve() || !SkyblockerConfigManager.get().dungeons.puzzleSolver.solveBoulder || !DungeonManager.isCurrentRoomMatched()) + if (!shouldSolve() || !SkyblockerConfigManager.get().dungeons.puzzleSolvers.solveBoulder || !DungeonManager.isCurrentRoomMatched()) return; float alpha = 1.0f; float lineWidth = 5.0f; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/waterboard/Waterboard.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/waterboard/Waterboard.java index 852873ea..4e8122c3 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/waterboard/Waterboard.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/waterboard/Waterboard.java @@ -133,7 +133,7 @@ public class Waterboard extends DungeonPuzzle { @Override public void tick(MinecraftClient client) { - if (!SkyblockerConfigManager.get().dungeons.puzzleSolver.solveWaterboard || client.world == null || !DungeonManager.isCurrentRoomMatched() || solve != null && !solve.isDone()) { + if (!SkyblockerConfigManager.get().dungeons.puzzleSolvers.solveWaterboard || client.world == null || !DungeonManager.isCurrentRoomMatched() || solve != null && !solve.isDone()) { return; } Room room = DungeonManager.getCurrentRoom(); @@ -337,7 +337,7 @@ public class Waterboard extends DungeonPuzzle { @Override public void render(WorldRenderContext context) { - if (!SkyblockerConfigManager.get().dungeons.puzzleSolver.solveWaterboard || !DungeonManager.isCurrentRoomMatched()) return; + if (!SkyblockerConfigManager.get().dungeons.puzzleSolvers.solveWaterboard || !DungeonManager.isCurrentRoomMatched()) return; Room room = DungeonManager.getCurrentRoom(); // Render the best combination. @@ -377,7 +377,7 @@ public class Waterboard extends DungeonPuzzle { private ActionResult onUseBlock(PlayerEntity player, World world, Hand hand, BlockHitResult blockHitResult) { BlockState state = world.getBlockState(blockHitResult.getBlockPos()); - if (SkyblockerConfigManager.get().dungeons.puzzleSolver.solveWaterboard && blockHitResult.getType() == HitResult.Type.BLOCK && waypoints[6] != null && DungeonManager.isCurrentRoomMatched() && blockHitResult.getBlockPos().equals(DungeonManager.getCurrentRoom().relativeToActual(WATER_LEVER)) && state.contains(LeverBlock.POWERED)) { + if (SkyblockerConfigManager.get().dungeons.puzzleSolvers.solveWaterboard && blockHitResult.getType() == HitResult.Type.BLOCK && waypoints[6] != null && DungeonManager.isCurrentRoomMatched() && blockHitResult.getBlockPos().equals(DungeonManager.getCurrentRoom().relativeToActual(WATER_LEVER)) && state.contains(LeverBlock.POWERED)) { if (!state.get(LeverBlock.POWERED)) { bestCombinationsUpdated = false; Scheduler.INSTANCE.schedule(() -> waypoints[6].setMissing(), 50); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/end/BeaconHighlighter.java b/src/main/java/de/hysky/skyblocker/skyblock/end/BeaconHighlighter.java index a2298ecf..8f7ef286 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/end/BeaconHighlighter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/end/BeaconHighlighter.java @@ -46,7 +46,7 @@ public class BeaconHighlighter { * @param context An instance of WorldRenderContext for the RenderHelper to use */ private static void render(WorldRenderContext context) { - if (Utils.isInTheEnd() && SkyblockerConfigManager.get().slayer.endermanSlayer.highlightBeacons) { + if (Utils.isInTheEnd() && SkyblockerConfigManager.get().slayers.endermanSlayer.highlightBeacons) { for (BlockPos pos : beaconPositions) { RenderHelper.renderFilled(context, pos, RED_COLOR_COMPONENTS, 0.5f, true); } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/entity/MobGlow.java b/src/main/java/de/hysky/skyblocker/skyblock/entity/MobGlow.java index 5dc3b768..d6f9410b 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/entity/MobGlow.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/entity/MobGlow.java @@ -52,7 +52,7 @@ public class MobGlow { // Enderman Slayer // Highlights Nukekubi Heads - case ArmorStandEntity armorStand when Utils.isInTheEnd() && SlayerUtils.isInSlayer() && isNukekubiHead(armorStand) -> SkyblockerConfigManager.get().slayer.endermanSlayer.highlightNukekubiHeads; + case ArmorStandEntity armorStand when Utils.isInTheEnd() && SlayerUtils.isInSlayer() && isNukekubiHead(armorStand) -> SkyblockerConfigManager.get().slayers.endermanSlayer.highlightNukekubiHeads; // Special Zelot case EndermanEntity enderman when Utils.isInTheEnd() && !entity.isInvisible() -> TheEnd.isSpecialZealot(enderman); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/experiment/ExperimentSolver.java b/src/main/java/de/hysky/skyblocker/skyblock/experiment/ExperimentSolver.java index 4e28e3c1..f91055c7 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/experiment/ExperimentSolver.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/experiment/ExperimentSolver.java @@ -1,6 +1,5 @@ package de.hysky.skyblocker.skyblock.experiment; -import de.hysky.skyblocker.config.SkyblockerConfig; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.config.configs.HelperConfig; import de.hysky.skyblocker.utils.render.gui.ContainerSolver; @@ -38,7 +37,7 @@ public abstract class ExperimentSolver extends ContainerSolver { @Override protected final boolean isEnabled() { - return isEnabled(SkyblockerConfigManager.get().helper.experiments); + return isEnabled(SkyblockerConfigManager.get().helpers.experiments); } protected abstract boolean isEnabled(HelperConfig.Experiments experimentsConfig); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/rift/EffigyWaypoints.java b/src/main/java/de/hysky/skyblocker/skyblock/rift/EffigyWaypoints.java index ea0c5176..11963857 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/rift/EffigyWaypoints.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/rift/EffigyWaypoints.java @@ -28,7 +28,7 @@ public class EffigyWaypoints { private static final List UNBROKEN_EFFIGIES = new ArrayList<>(); protected static void updateEffigies() { - if (!SkyblockerConfigManager.get().slayer.vampireSlayer.enableEffigyWaypoints || !Utils.isOnSkyblock() || !Utils.isInTheRift() || !Utils.getIslandArea().contains("Stillgore Château")) return; + if (!SkyblockerConfigManager.get().slayers.vampireSlayer.enableEffigyWaypoints || !Utils.isOnSkyblock() || !Utils.isInTheRift() || !Utils.getIslandArea().contains("Stillgore Château")) return; UNBROKEN_EFFIGIES.clear(); @@ -55,10 +55,10 @@ public class EffigyWaypoints { } protected static void render(WorldRenderContext context) { - if (SkyblockerConfigManager.get().slayer.vampireSlayer.enableEffigyWaypoints && Utils.getIslandArea().contains("Stillgore Château")) { + if (SkyblockerConfigManager.get().slayers.vampireSlayer.enableEffigyWaypoints && Utils.getIslandArea().contains("Stillgore Château")) { for (BlockPos effigy : UNBROKEN_EFFIGIES) { float[] colorComponents = DyeColor.RED.getColorComponents(); - if (SkyblockerConfigManager.get().slayer.vampireSlayer.compactEffigyWaypoints) { + if (SkyblockerConfigManager.get().slayers.vampireSlayer.compactEffigyWaypoints) { RenderHelper.renderFilledWithBeaconBeam(context, effigy.down(6), colorComponents, 0.5F, true); } else { RenderHelper.renderFilledWithBeaconBeam(context, effigy, colorComponents, 0.5F, true); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/rift/HealingMelonIndicator.java b/src/main/java/de/hysky/skyblocker/skyblock/rift/HealingMelonIndicator.java index b94ebac1..c5b22576 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/rift/HealingMelonIndicator.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/rift/HealingMelonIndicator.java @@ -13,12 +13,12 @@ public class HealingMelonIndicator { private static final Title title = new Title("skyblocker.rift.healNow", Formatting.DARK_RED); public static void updateHealth() { - if (!SkyblockerConfigManager.get().slayer.vampireSlayer.enableHealingMelonIndicator || !Utils.isOnSkyblock() || !Utils.isInTheRift() || !Utils.getIslandArea().contains("Stillgore Château")) { + if (!SkyblockerConfigManager.get().slayers.vampireSlayer.enableHealingMelonIndicator || !Utils.isOnSkyblock() || !Utils.isInTheRift() || !Utils.getIslandArea().contains("Stillgore Château")) { TitleContainer.removeTitle(title); return; } ClientPlayerEntity player = MinecraftClient.getInstance().player; - if (player != null && player.getHealth() <= SkyblockerConfigManager.get().slayer.vampireSlayer.healingMelonHealthThreshold * 2F) { + if (player != null && player.getHealth() <= SkyblockerConfigManager.get().slayers.vampireSlayer.healingMelonHealthThreshold * 2F) { RenderHelper.displayInTitleContainerAndPlaySound(title); } else { TitleContainer.removeTitle(title); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/rift/ManiaIndicator.java b/src/main/java/de/hysky/skyblocker/skyblock/rift/ManiaIndicator.java index d38151ff..54ea9093 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/rift/ManiaIndicator.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/rift/ManiaIndicator.java @@ -17,7 +17,7 @@ public class ManiaIndicator { private static final Title title = new Title("skyblocker.rift.mania", Formatting.RED); protected static void updateMania() { - if (!SkyblockerConfigManager.get().slayer.vampireSlayer.enableManiaIndicator || !Utils.isOnSkyblock() || !Utils.isInTheRift() || !(Utils.getIslandArea().contains("Stillgore Château")) || !SlayerUtils.isInSlayer()) { + if (!SkyblockerConfigManager.get().slayers.vampireSlayer.enableManiaIndicator || !Utils.isOnSkyblock() || !Utils.isInTheRift() || !(Utils.getIslandArea().contains("Stillgore Château")) || !SlayerUtils.isInSlayer()) { TitleContainer.removeTitle(title); return; } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/rift/StakeIndicator.java b/src/main/java/de/hysky/skyblocker/skyblock/rift/StakeIndicator.java index db24efa2..54bee5ec 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/rift/StakeIndicator.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/rift/StakeIndicator.java @@ -13,7 +13,7 @@ public class StakeIndicator { private static final Title title = new Title("skyblocker.rift.stakeNow", Formatting.RED); protected static void updateStake() { - if (!SkyblockerConfigManager.get().slayer.vampireSlayer.enableSteakStakeIndicator || !Utils.isOnSkyblock() || !Utils.isInTheRift() || !Utils.getIslandArea().contains("Stillgore Château") || !SlayerUtils.isInSlayer()) { + if (!SkyblockerConfigManager.get().slayers.vampireSlayer.enableSteakStakeIndicator || !Utils.isOnSkyblock() || !Utils.isInTheRift() || !Utils.getIslandArea().contains("Stillgore Château") || !SlayerUtils.isInSlayer()) { TitleContainer.removeTitle(title); return; } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/rift/TheRift.java b/src/main/java/de/hysky/skyblocker/skyblock/rift/TheRift.java index 7413e06f..568a5829 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/rift/TheRift.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/rift/TheRift.java @@ -17,9 +17,9 @@ public class TheRift { ClientLifecycleEvents.CLIENT_STOPPING.register(EnigmaSouls::save); ClientReceiveMessageEvents.GAME.register(EnigmaSouls::onMessage); ClientCommandRegistrationCallback.EVENT.register(EnigmaSouls::registerCommands); - Scheduler.INSTANCE.scheduleCyclic(EffigyWaypoints::updateEffigies, SkyblockerConfigManager.get().slayer.vampireSlayer.effigyUpdateFrequency); - Scheduler.INSTANCE.scheduleCyclic(TwinClawsIndicator::updateIce, SkyblockerConfigManager.get().slayer.vampireSlayer.holyIceUpdateFrequency); - Scheduler.INSTANCE.scheduleCyclic(ManiaIndicator::updateMania, SkyblockerConfigManager.get().slayer.vampireSlayer.maniaUpdateFrequency); - Scheduler.INSTANCE.scheduleCyclic(StakeIndicator::updateStake, SkyblockerConfigManager.get().slayer.vampireSlayer.steakStakeUpdateFrequency); + Scheduler.INSTANCE.scheduleCyclic(EffigyWaypoints::updateEffigies, SkyblockerConfigManager.get().slayers.vampireSlayer.effigyUpdateFrequency); + Scheduler.INSTANCE.scheduleCyclic(TwinClawsIndicator::updateIce, SkyblockerConfigManager.get().slayers.vampireSlayer.holyIceUpdateFrequency); + Scheduler.INSTANCE.scheduleCyclic(ManiaIndicator::updateMania, SkyblockerConfigManager.get().slayers.vampireSlayer.maniaUpdateFrequency); + Scheduler.INSTANCE.scheduleCyclic(StakeIndicator::updateStake, SkyblockerConfigManager.get().slayers.vampireSlayer.steakStakeUpdateFrequency); } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/rift/TwinClawsIndicator.java b/src/main/java/de/hysky/skyblocker/skyblock/rift/TwinClawsIndicator.java index 48bb72ea..f6952ab4 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/rift/TwinClawsIndicator.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/rift/TwinClawsIndicator.java @@ -15,7 +15,7 @@ public class TwinClawsIndicator { private static boolean scheduled = false; protected static void updateIce() { - if (!SkyblockerConfigManager.get().slayer.vampireSlayer.enableHolyIceIndicator || !Utils.isOnSkyblock() || !Utils.isInTheRift() || !(Utils.getIslandArea().contains("Stillgore Château")) || !SlayerUtils.isInSlayer()) { + if (!SkyblockerConfigManager.get().slayers.vampireSlayer.enableHolyIceIndicator || !Utils.isOnSkyblock() || !Utils.isInTheRift() || !(Utils.getIslandArea().contains("Stillgore Château")) || !SlayerUtils.isInSlayer()) { TitleContainer.removeTitle(title); return; } @@ -32,7 +32,7 @@ public class TwinClawsIndicator { Scheduler.INSTANCE.schedule(() -> { RenderHelper.displayInTitleContainerAndPlaySound(title); scheduled = false; - }, SkyblockerConfigManager.get().slayer.vampireSlayer.holyIceIndicatorTickDelay); + }, SkyblockerConfigManager.get().slayers.vampireSlayer.holyIceIndicatorTickDelay); } } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/waypoint/FairySouls.java b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/FairySouls.java index f27a5fab..25741b22 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/waypoint/FairySouls.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/FairySouls.java @@ -6,7 +6,6 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.mojang.brigadier.CommandDispatcher; import de.hysky.skyblocker.SkyblockerMod; -import de.hysky.skyblocker.config.SkyblockerConfig; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.config.configs.HelperConfig; import de.hysky.skyblocker.utils.Constants; @@ -143,7 +142,7 @@ public class FairySouls { } private static void render(WorldRenderContext context) { - HelperConfig.FairySouls fairySoulsConfig = SkyblockerConfigManager.get().helper.fairySouls; + HelperConfig.FairySouls fairySoulsConfig = SkyblockerConfigManager.get().helpers.fairySouls; if (fairySoulsConfig.enableFairySoulsHelper && fairySoulsLoaded.isDone() && fairySouls.containsKey(Utils.getLocationRaw())) { for (Waypoint fairySoul : fairySouls.get(Utils.getLocationRaw()).values()) { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/waypoint/MythologicalRitual.java b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/MythologicalRitual.java index a82d32ae..254077ad 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/waypoint/MythologicalRitual.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/MythologicalRitual.java @@ -189,7 +189,7 @@ public class MythologicalRitual { } private static boolean isActive() { - return SkyblockerConfigManager.get().helper.mythologicalRitual.enableMythologicalRitualHelper && Utils.getLocationRaw().equals("hub"); + return SkyblockerConfigManager.get().helpers.mythologicalRitual.enableMythologicalRitualHelper && Utils.getLocationRaw().equals("hub"); } private static void reset() { -- cgit From 0730b5f54e673131b4ae935fbaf7c5f8e38c2da3 Mon Sep 17 00:00:00 2001 From: Yasin Date: Thu, 9 May 2024 16:29:04 +0200 Subject: hideStatusEffectOverlay -> ui tab --- .../java/de/hysky/skyblocker/config/categories/MiscCategory.java | 7 ------- .../hysky/skyblocker/config/categories/UIAndVisualsCategory.java | 7 +++++++ src/main/java/de/hysky/skyblocker/config/configs/MiscConfig.java | 2 -- .../de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java | 3 +++ .../de/hysky/skyblocker/mixins/AbstractInventoryScreenMixin.java | 2 +- src/main/java/de/hysky/skyblocker/mixins/InGameHudMixin.java | 2 +- src/main/resources/assets/skyblocker/lang/en_us.json | 4 ++-- src/main/resources/assets/skyblocker/lang/pt_br.json | 2 +- src/main/resources/assets/skyblocker/lang/ru_ru.json | 2 +- src/main/resources/assets/skyblocker/lang/zh_cn.json | 2 +- src/main/resources/assets/skyblocker/lang/zh_tw.json | 2 +- 11 files changed, 18 insertions(+), 17 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/mixins') diff --git a/src/main/java/de/hysky/skyblocker/config/categories/MiscCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/MiscCategory.java index e5dba84e..b2127e6b 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/MiscCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/MiscCategory.java @@ -17,13 +17,6 @@ public class MiscCategory { .name(Text.translatable("skyblocker.config.misc")) //Uncategorized Options - .option(Option.createBuilder() - .name(Text.translatable("skyblocker.config.misc.hideStatusEffectOverlay")) - .binding(defaults.misc.hideStatusEffectOverlay, - () -> config.misc.hideStatusEffectOverlay, - newValue -> config.misc.hideStatusEffectOverlay = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) //Discord RPC .group(OptionGroup.createBuilder() diff --git a/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java index 12edd0d1..c6936335 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java @@ -57,6 +57,13 @@ public class UIAndVisualsCategory { newValue -> config.uiAndVisuals.fancyCraftingTable = newValue) .controller(ConfigUtils::createBooleanController) .build()) + .option(Option.createBuilder() + .name(Text.translatable("skyblocker.config.uiAndVisuals.hideStatusEffectOverlay")) + .binding(defaults.uiAndVisuals.hideStatusEffectOverlay, + () -> config.uiAndVisuals.hideStatusEffectOverlay, + newValue -> config.uiAndVisuals.hideStatusEffectOverlay = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) //Chest Value FIXME change dropdown to color controller .group(OptionGroup.createBuilder() diff --git a/src/main/java/de/hysky/skyblocker/config/configs/MiscConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/MiscConfig.java index ed0857e0..919a26d8 100644 --- a/src/main/java/de/hysky/skyblocker/config/configs/MiscConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/configs/MiscConfig.java @@ -4,8 +4,6 @@ import dev.isxander.yacl3.config.v2.api.SerialEntry; import net.minecraft.client.resource.language.I18n; public class MiscConfig { - @SerialEntry - public boolean hideStatusEffectOverlay = false; @SerialEntry public RichPresence richPresence = new RichPresence(); diff --git a/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java index 8c96ec57..267dde14 100644 --- a/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java @@ -23,6 +23,9 @@ public class UIAndVisualsConfig { @SerialEntry public boolean fancyCraftingTable = true; + @SerialEntry + public boolean hideStatusEffectOverlay = false; + @SerialEntry public ChestValue chestValue = new ChestValue(); diff --git a/src/main/java/de/hysky/skyblocker/mixins/AbstractInventoryScreenMixin.java b/src/main/java/de/hysky/skyblocker/mixins/AbstractInventoryScreenMixin.java index b0e26575..69f33aa0 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/AbstractInventoryScreenMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/AbstractInventoryScreenMixin.java @@ -14,6 +14,6 @@ public class AbstractInventoryScreenMixin { @Inject(method = "drawStatusEffects", at = @At("HEAD"), cancellable = true) private void skyblocker$dontDrawStatusEffects(CallbackInfo ci) { - if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().misc.hideStatusEffectOverlay) ci.cancel(); + if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().uiAndVisuals.hideStatusEffectOverlay) ci.cancel(); } } diff --git a/src/main/java/de/hysky/skyblocker/mixins/InGameHudMixin.java b/src/main/java/de/hysky/skyblocker/mixins/InGameHudMixin.java index 30f1626f..b939b401 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/InGameHudMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/InGameHudMixin.java @@ -99,7 +99,7 @@ public abstract class InGameHudMixin { @Inject(method = "renderStatusEffectOverlay", at = @At("HEAD"), cancellable = true) private void skyblocker$dontRenderStatusEffects(CallbackInfo ci) { - if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().misc.hideStatusEffectOverlay) ci.cancel(); + if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().uiAndVisuals.hideStatusEffectOverlay) ci.cancel(); } @ModifyExpressionValue(method = "renderCrosshair", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;getAttackCooldownProgress(F)F")) diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 35cd92fd..0ff25125 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -414,8 +414,6 @@ "skyblocker.config.misc": "Misc", - "skyblocker.config.misc.hideStatusEffectOverlay": "Hide Status Effect Overlay", - "skyblocker.config.misc.richPresence": "Discord RPC", "skyblocker.config.misc.richPresence.customMessage": "Custom Message", "skyblocker.config.misc.richPresence.cycleMode": "Cycle Skyblock Info", @@ -494,6 +492,8 @@ "skyblocker.config.uiAndVisuals.backpackPreviewWithoutShift": "View backpack preview without holding Shift", + "skyblocker.config.uiAndVisuals.hideStatusEffectOverlay": "Hide Status Effect Overlay", + "skyblocker.config.uiAndVisuals.bars": "Health, Mana, Defence & XP Bars", "skyblocker.config.uiAndVisuals.bars.enableBars": "Enable Bars", diff --git a/src/main/resources/assets/skyblocker/lang/pt_br.json b/src/main/resources/assets/skyblocker/lang/pt_br.json index 5636494d..3683e87e 100644 --- a/src/main/resources/assets/skyblocker/lang/pt_br.json +++ b/src/main/resources/assets/skyblocker/lang/pt_br.json @@ -141,7 +141,7 @@ "skyblocker.config.general.itemInfoDisplay.attributeShardInfo.@Tooltip": "Mostra o nível do atributo como uma contagem de stack e os iniciais do nome do atributo.", "skyblocker.config.slayer": "Slayers", "skyblocker.updateRepository.error": "§cAtualização do repositório local falhou. Remova os arquivos manualmente e reinicie o jogo.", - "skyblocker.config.misc.hideStatusEffectOverlay": "Esconder Overlay de Status de Efeitos", + "skyblocker.config.uiAndVisuals.hideStatusEffectOverlay": "Esconder Overlay de Status de Efeitos", "skyblocker.config.general.itemList.enableItemList": "Ativar Lista de Itens", "skyblocker.config.general.itemList": "Lista de Itens", "text.skyblocker.open": "Abrir", diff --git a/src/main/resources/assets/skyblocker/lang/ru_ru.json b/src/main/resources/assets/skyblocker/lang/ru_ru.json index cbfa5cde..441e175a 100644 --- a/src/main/resources/assets/skyblocker/lang/ru_ru.json +++ b/src/main/resources/assets/skyblocker/lang/ru_ru.json @@ -274,7 +274,7 @@ "skyblocker.config.general.itemInfoDisplay.attributeShardInfo": "Информация об Attribute Shard", "skyblocker.config.general.itemInfoDisplay": "Отображение информации о предмете", "skyblocker.dungeons.secrets.markSecretMissing": "§b[§6Skyblocker§b] §rПометил секрет #%d как пропущенный.", - "skyblocker.config.misc.hideStatusEffectOverlay": "Скрыть отображение статуса эффектов", + "skyblocker.config.uiAndVisuals.hideStatusEffectOverlay": "Скрыть отображение статуса эффектов", "skyblocker.dungeons.secrets.markSecretFound": "§b[§6Skyblocker§b] §гПометил секрет #%d как найденный.", "skyblocker.dungeons.secrets.markSecretMissingUnable": "§b[§6Skyblocker§b] §cНевозможно отметить секрет #%d как пропущенный.", "skyblocker.dungeons.secrets.markSecretFoundUnable": "§b[§6Skyblocker§b] §cНевозможно отметить секрет #%d как найденный.", diff --git a/src/main/resources/assets/skyblocker/lang/zh_cn.json b/src/main/resources/assets/skyblocker/lang/zh_cn.json index 1ae39a89..211e618a 100644 --- a/src/main/resources/assets/skyblocker/lang/zh_cn.json +++ b/src/main/resources/assets/skyblocker/lang/zh_cn.json @@ -450,7 +450,7 @@ "skyblocker.config.dungeons.professor.fireFreezeStaffTimer": "开火冻结计时器（F3/M3）", "skyblocker.config.dungeons.dungeonChestProfit.neutralThreshold": "中性的临界点", "skyblocker.config.dungeons.dungeonChestProfit.neutralThreshold.@Tooltip": "低于这个数值的利润将被视为中性。", - "skyblocker.config.misc.hideStatusEffectOverlay": "隐藏状态效果动画", + "skyblocker.config.uiAndVisuals.hideStatusEffectOverlay": "隐藏状态效果动画", "skyblocker.tips.fancyTabExtraInfo": "你知道吗？在拿着N或M时可以在精致菜单中看到额外的信息。", "skyblocker.config.dungeons.map.mapScreen": "地牢地图和分数的位置设置...", "skyblocker.config.quickNav.button": "按钮 %d", diff --git a/src/main/resources/assets/skyblocker/lang/zh_tw.json b/src/main/resources/assets/skyblocker/lang/zh_tw.json index b5584c68..6f125699 100644 --- a/src/main/resources/assets/skyblocker/lang/zh_tw.json +++ b/src/main/resources/assets/skyblocker/lang/zh_tw.json @@ -415,7 +415,7 @@ "skyblocker.rift.enigmaSouls.markAllMissing": "§r將所有Enigma之魂標記為已忽略！", "skyblocker.shortcuts.deleteQuestion": "你確定要移除這個快捷指令嗎？", "skyblocker.config.slayer.vampireSlayer.maniaUpdateFrequency.@Tooltip": "值越低，更新越頻繁，可能會導致卡頓。", - "skyblocker.config.misc.hideStatusEffectOverlay": "隱藏狀態效果動畫", + "skyblocker.config.uiAndVisuals.hideStatusEffectOverlay": "隱藏狀態效果動畫", "key.itemProtection": "保護物品", "skyblocker.config.uiAndVisuals.teleportOverlay.enableWeirdTransmission": "啟用Weird Transmission目標位置顯示", "skyblocker.config.uiAndVisuals.teleportOverlay.enableInstantTransmission": "啟用Instant Transmission技能目標位置顯示", -- cgit