From 4ac68ae960e9377c898e2af70089b5fbc27fd5e3 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Tue, 17 Oct 2023 19:07:57 -0400 Subject: Remove most antiquated hud config options --- .../config/categories/DungeonsCategory.java | 14 ----------- .../config/categories/DwarvenMinesCategory.java | 15 ----------- .../config/categories/GeneralCategory.java | 29 ---------------------- 3 files changed, 58 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/config') 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 a9c0c26b..1fb30afe 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java @@ -210,20 +210,6 @@ public class DungeonsCategory { newValue -> config.locations.dungeons.mapScaling = newValue) .controller(FloatFieldControllerBuilder::create) .build()) - .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.mapX")) - .binding(defaults.locations.dungeons.mapX, - () -> config.locations.dungeons.mapX, - newValue -> config.locations.dungeons.mapX = newValue) - .controller(IntegerFieldControllerBuilder::create) - .build()) - .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.mapY")) - .binding(defaults.locations.dungeons.mapY, - () -> config.locations.dungeons.mapY, - newValue -> config.locations.dungeons.mapY = newValue) - .controller(IntegerFieldControllerBuilder::create) - .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.starredMobGlow")) .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.starredMobGlow.@Tooltip"))) diff --git a/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java index 35c91d64..719cbd79 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java @@ -7,7 +7,6 @@ import dev.isxander.yacl3.api.ConfigCategory; import dev.isxander.yacl3.api.Option; import dev.isxander.yacl3.api.OptionDescription; import dev.isxander.yacl3.api.OptionGroup; -import dev.isxander.yacl3.api.controller.IntegerFieldControllerBuilder; import de.hysky.skyblocker.skyblock.dwarven.DwarvenHudConfigScreen; import net.minecraft.client.MinecraftClient; import net.minecraft.text.Text; @@ -74,20 +73,6 @@ public class DwarvenMinesCategory { newValue -> config.locations.dwarvenMines.dwarvenHud.enableBackground = newValue) .controller(ConfigUtils::createBooleanController) .build()) - .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.x")) - .binding(defaults.locations.dwarvenMines.dwarvenHud.x, - () -> config.locations.dwarvenMines.dwarvenHud.x, - newValue -> config.locations.dwarvenMines.dwarvenHud.x = newValue) - .controller(IntegerFieldControllerBuilder::create) - .build()) - .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.y")) - .binding(defaults.locations.dwarvenMines.dwarvenHud.y, - () -> config.locations.dwarvenMines.dwarvenHud.y, - newValue -> config.locations.dwarvenMines.dwarvenHud.y = newValue) - .controller(IntegerFieldControllerBuilder::create) - .build()) .build()) .build(); } 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 6a393868..b4f61c36 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java @@ -5,7 +5,6 @@ import de.hysky.skyblocker.config.SkyblockerConfig; import dev.isxander.yacl3.api.*; import dev.isxander.yacl3.api.controller.FloatFieldControllerBuilder; import dev.isxander.yacl3.api.controller.FloatSliderControllerBuilder; -import dev.isxander.yacl3.api.controller.IntegerFieldControllerBuilder; import dev.isxander.yacl3.api.controller.IntegerSliderControllerBuilder; import de.hysky.skyblocker.skyblock.shortcut.ShortcutsConfigScreen; import de.hysky.skyblocker.utils.render.title.TitleContainerConfigScreen; @@ -421,34 +420,6 @@ public class GeneralCategory { newValue -> config.general.titleContainer.titleContainerScale = newValue) .controller(opt -> FloatFieldControllerBuilder.create(opt).range(30f, 140f)) .build()) - .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.general.titleContainer.x")) - .binding(defaults.general.titleContainer.x, - () -> config.general.titleContainer.x, - newValue -> config.general.titleContainer.x = newValue) - .controller(IntegerFieldControllerBuilder::create) - .build()) - .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.general.titleContainer.y")) - .binding(defaults.general.titleContainer.y, - () -> config.general.titleContainer.y, - newValue -> config.general.titleContainer.y = newValue) - .controller(IntegerFieldControllerBuilder::create) - .build()) - .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.general.titleContainer.direction")) - .binding(defaults.general.titleContainer.direction, - () -> config.general.titleContainer.direction, - newValue -> config.general.titleContainer.direction = newValue) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.general.titleContainer.alignment")) - .binding(defaults.general.titleContainer.alignment, - () -> config.general.titleContainer.alignment, - newValue -> config.general.titleContainer.alignment = newValue) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) .option(ButtonOption.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.general.titleContainer.config")) .text(Text.translatable("text.skyblocker.open")) -- cgit From 00340f5d7df495f7351159e9da86e74b1b5fd2a9 Mon Sep 17 00:00:00 2001 From: Kevin <92656833+kevinthegreat1@users.noreply.github.com> Date: Tue, 17 Oct 2023 19:53:55 -0400 Subject: Refactor NEU Repo (#364) Add RepoParser Fix Golden Dragon stats leveling Add wiki option Fix recipe output count --- .../hysky/skyblocker/config/SkyblockerConfig.java | 231 +++++++++++---------- .../config/categories/GeneralCategory.java | 22 ++ 2 files changed, 143 insertions(+), 110 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/config') diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index 189c6af7..107fe26e 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -16,7 +16,7 @@ import java.util.List; public class SkyblockerConfig { @SerialEntry public int version = 1; - + @SerialEntry public General general = new General(); @@ -117,7 +117,7 @@ public class SkyblockerConfig { @SerialEntry public String uiTitle; - + @SerialEntry public String clickEvent; } @@ -137,10 +137,10 @@ public class SkyblockerConfig { @SerialEntry public String itemName; - + @SerialEntry public int count; - + @SerialEntry public String nbt; } @@ -148,16 +148,16 @@ public class SkyblockerConfig { public static class General { @SerialEntry public boolean acceptReparty = true; - + @SerialEntry public boolean backpackPreviewWithoutShift = false; - + @SerialEntry public boolean compactorDeletorPreview = true; - + @SerialEntry public boolean hideEmptyTooltips = true; - + @SerialEntry public boolean hideStatusEffectOverlay = false; @@ -181,7 +181,7 @@ public class SkyblockerConfig { @SerialEntry public Shortcuts shortcuts = new Shortcuts(); - + @SerialEntry public QuiverWarning quiverWarning = new QuiverWarning(); @@ -193,7 +193,10 @@ public class SkyblockerConfig { @SerialEntry public ItemInfoDisplay itemInfoDisplay = new ItemInfoDisplay(); - + + @SerialEntry + public WikiLookup wikiLookup = new WikiLookup(); + @SerialEntry public SpecialEffects specialEffects = new SpecialEffects(); @@ -208,7 +211,7 @@ public class SkyblockerConfig { @SerialEntry public List lockedSlots = new ArrayList<>(); - + @SerialEntry public ObjectOpenHashSet protectedItems = new ObjectOpenHashSet<>(); @@ -228,10 +231,10 @@ public class SkyblockerConfig { @SerialEntry public int tabHudScale = 100; - + @SerialEntry public boolean plainPlayerNames = false; - + @SerialEntry public NameSorting nameSorting = NameSorting.DEFAULT; } @@ -259,13 +262,13 @@ public class SkyblockerConfig { public static class BarPositions { @SerialEntry public BarPosition healthBarPosition = BarPosition.LAYER1; - + @SerialEntry public BarPosition manaBarPosition = BarPosition.LAYER1; - + @SerialEntry public BarPosition defenceBarPosition = BarPosition.LAYER1; - + @SerialEntry public BarPosition experienceBarPosition = BarPosition.LAYER1; @@ -292,10 +295,10 @@ public class SkyblockerConfig { public static class Experiments { @SerialEntry public boolean enableChronomatronSolver = true; - + @SerialEntry public boolean enableSuperpairsSolver = true; - + @SerialEntry public boolean enableUltrasequencerSolver = true; } @@ -308,10 +311,10 @@ public class SkyblockerConfig { public static class FairySouls { @SerialEntry public boolean enableFairySoulsHelper = false; - + @SerialEntry public boolean highlightFoundSouls = true; - + @SerialEntry public boolean highlightOnlyNearbySouls = false; } @@ -324,14 +327,14 @@ public class SkyblockerConfig { public static class Shortcuts { @SerialEntry public boolean enableShortcuts = true; - + @SerialEntry public boolean enableCommandShortcuts = true; - + @SerialEntry public boolean enableCommandArgShortcuts = true; } - + public static class QuiverWarning { @SerialEntry public boolean enableQuiverWarning = true; @@ -346,7 +349,7 @@ public class SkyblockerConfig { public static class Hitbox { @SerialEntry public boolean oldFarmlandHitbox = true; - + @SerialEntry public boolean oldLeverHitbox = false; } @@ -354,16 +357,16 @@ public class SkyblockerConfig { public static class TitleContainer { @SerialEntry public float titleContainerScale = 100; - + @SerialEntry public int x = 540; - + @SerialEntry public int y = 10; - + @SerialEntry public Direction direction = Direction.HORIZONTAL; - + @SerialEntry public Alignment alignment = Alignment.MIDDLE; } @@ -371,19 +374,19 @@ public class SkyblockerConfig { public static class TeleportOverlay { @SerialEntry public boolean enableTeleportOverlays = true; - + @SerialEntry public boolean enableWeirdTransmission = true; - + @SerialEntry public boolean enableInstantTransmission = true; - + @SerialEntry public boolean enableEtherTransmission = true; - + @SerialEntry public boolean enableSinrecallTransmission = true; - + @SerialEntry public boolean enableWitherImpact = true; } @@ -419,10 +422,10 @@ public class SkyblockerConfig { @SerialEntry public Info info = Info.LOCATION; - + @SerialEntry public boolean cycleMode = false; - + @SerialEntry public String customMessage = "Playing Skyblock"; } @@ -444,22 +447,22 @@ public class SkyblockerConfig { public static class ItemTooltip { @SerialEntry public boolean enableNPCPrice = true; - + @SerialEntry public boolean enableMotesPrice = true; - + @SerialEntry public boolean enableAvgBIN = true; - + @SerialEntry public Average avg = Average.THREE_DAY; - + @SerialEntry public boolean enableLowestBIN = true; - + @SerialEntry public boolean enableBazaarPrice = true; - + @SerialEntry public boolean enableMuseumDate = true; } @@ -467,14 +470,22 @@ public class SkyblockerConfig { public static class ItemInfoDisplay { @SerialEntry public boolean attributeShardInfo = true; - + @SerialEntry public boolean itemRarityBackgrounds = false; @SerialEntry public float itemRarityBackgroundsOpacity = 1f; } - + + public static class WikiLookup { + @SerialEntry + public boolean enableWikiLookup = true; + + @SerialEntry + public boolean officialWiki = false; + } + public static class SpecialEffects { @SerialEntry public boolean rareDungeonDropEffects = true; @@ -492,7 +503,7 @@ public class SkyblockerConfig { @SerialEntry public Rift rift = new Rift(); - + @SerialEntry public SpidersDen spidersDen = new SpidersDen(); } @@ -500,46 +511,46 @@ public class SkyblockerConfig { public static class Dungeons { @SerialEntry public SecretWaypoints secretWaypoints = new SecretWaypoints(); - + @SerialEntry public DungeonChestProfit dungeonChestProfit = new DungeonChestProfit(); - + @SerialEntry public boolean croesusHelper = true; - + @SerialEntry public boolean enableMap = true; - + @SerialEntry public float mapScaling = 1f; - + @SerialEntry public int mapX = 2; - + @SerialEntry public int mapY = 2; - + @SerialEntry public boolean starredMobGlow = true; - + @SerialEntry public boolean solveThreeWeirdos = true; - + @SerialEntry public boolean blazeSolver = true; @SerialEntry public boolean creeperSolver = true; - + @SerialEntry public boolean solveTrivia = true; - + @SerialEntry public boolean solveTicTacToe = true; - + @SerialEntry public LividColor lividColor = new LividColor(); - + @SerialEntry public Terminals terminals = new Terminals(); } @@ -547,72 +558,72 @@ public class SkyblockerConfig { public static class SecretWaypoints { @SerialEntry public boolean enableSecretWaypoints = true; - + @SerialEntry public boolean noInitSecretWaypoints = false; - + @SerialEntry public boolean enableEntranceWaypoints = true; - + @SerialEntry public boolean enableSuperboomWaypoints = true; - + @SerialEntry public boolean enableChestWaypoints = true; - + @SerialEntry public boolean enableItemWaypoints = true; - + @SerialEntry public boolean enableBatWaypoints = true; - + @SerialEntry public boolean enableWitherWaypoints = true; - + @SerialEntry public boolean enableLeverWaypoints = true; - + @SerialEntry public boolean enableFairySoulWaypoints = true; - + @SerialEntry public boolean enableStonkWaypoints = true; - + @SerialEntry public boolean enableDefaultWaypoints = true; } - + public static class DungeonChestProfit { @SerialEntry public boolean enableProfitCalculator = true; - + @SerialEntry public boolean includeKismet = false; - + @SerialEntry public boolean includeEssence = true; - + @SerialEntry public int neutralThreshold = 1000; - + @SerialEntry public Formatting neutralColor = Formatting.DARK_GRAY; - + @SerialEntry public Formatting profitColor = Formatting.DARK_GREEN; - + @SerialEntry public Formatting lossColor = Formatting.RED; - + @SerialEntry public Formatting incompleteColor = Formatting.BLUE; - + } public static class LividColor { @SerialEntry public boolean enableLividColor = true; - + @SerialEntry public String lividColorText = "The livid color is [color]"; } @@ -620,10 +631,10 @@ public class SkyblockerConfig { public static class Terminals { @SerialEntry public boolean solveColor = true; - + @SerialEntry public boolean solveOrder = true; - + @SerialEntry public boolean solveStartsWith = true; } @@ -631,13 +642,13 @@ public class SkyblockerConfig { public static class DwarvenMines { @SerialEntry public boolean enableDrillFuel = true; - + @SerialEntry public boolean solveFetchur = true; - + @SerialEntry public boolean solvePuzzler = true; - + @SerialEntry public DwarvenHud dwarvenHud = new DwarvenHud(); } @@ -645,16 +656,16 @@ public class SkyblockerConfig { public static class DwarvenHud { @SerialEntry public boolean enabled = true; - + @SerialEntry public DwarvenHudStyle style = DwarvenHudStyle.SIMPLE; - + @SerialEntry public boolean enableBackground = true; - + @SerialEntry public int x = 10; - + @SerialEntry public int y = 10; } @@ -675,7 +686,7 @@ public class SkyblockerConfig { public static class Barn { @SerialEntry public boolean solveHungryHiker = true; - + @SerialEntry public boolean solveTreasureHunter = true; } @@ -683,20 +694,20 @@ public class SkyblockerConfig { public static class Rift { @SerialEntry public boolean mirrorverseWaypoints = true; - + @SerialEntry public int mcGrubberStacks = 0; } - + public static class SpidersDen { @SerialEntry public Relics relics = new Relics(); } - + public static class Relics { @SerialEntry public boolean enableRelicsHelper = false; - + @SerialEntry public boolean highlightFoundRelics = true; } @@ -709,34 +720,34 @@ public class SkyblockerConfig { public static class VampireSlayer { @SerialEntry public boolean enableEffigyWaypoints = true; - + @SerialEntry public boolean compactEffigyWaypoints; - + @SerialEntry public int effigyUpdateFrequency = 5; - + @SerialEntry public boolean enableHolyIceIndicator = true; - + @SerialEntry public int holyIceIndicatorTickDelay = 10; @SerialEntry public int holyIceUpdateFrequency = 5; - + @SerialEntry public boolean enableHealingMelonIndicator = true; - + @SerialEntry public float healingMelonHealthThreshold = 4f; - + @SerialEntry public boolean enableSteakStakeIndicator = true; @SerialEntry public int steakStakeUpdateFrequency = 5; - + @SerialEntry public boolean enableManiaIndicator = true; @@ -747,34 +758,34 @@ public class SkyblockerConfig { public static class Messages { @SerialEntry public ChatFilterResult hideAbility = ChatFilterResult.PASS; - + @SerialEntry public ChatFilterResult hideHeal = ChatFilterResult.PASS; - + @SerialEntry public ChatFilterResult hideAOTE = ChatFilterResult.PASS; - + @SerialEntry public ChatFilterResult hideImplosion = ChatFilterResult.PASS; - + @SerialEntry public ChatFilterResult hideMoltenWave = ChatFilterResult.PASS; - + @SerialEntry public ChatFilterResult hideAds = ChatFilterResult.PASS; - + @SerialEntry public ChatFilterResult hideTeleportPad = ChatFilterResult.PASS; - + @SerialEntry public ChatFilterResult hideCombo = ChatFilterResult.PASS; - + @SerialEntry public ChatFilterResult hideAutopet = ChatFilterResult.PASS; - + @SerialEntry public ChatFilterResult hideShowOff = ChatFilterResult.PASS; - + @SerialEntry public boolean hideMana = false; } 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 6a393868..80792ab9 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java @@ -375,6 +375,28 @@ public class GeneralCategory { .build()) .build()) + //Wiki Lookup + .group(OptionGroup.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.general.wikiLookup")) + .collapsed(true) + .option(Option.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.general.wikiLookup.enableWikiLookup")) + .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.general.wikiLookup.enableWikiLookup.@Tooltip"))) + .binding(defaults.general.wikiLookup.enableWikiLookup, + () -> config.general.wikiLookup.enableWikiLookup, + newValue -> config.general.wikiLookup.enableWikiLookup = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .option(Option.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.general.wikiLookup.officialWiki")) + .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.general.wikiLookup.officialWiki.@Tooltip"))) + .binding(defaults.general.wikiLookup.officialWiki, + () -> config.general.wikiLookup.officialWiki, + newValue -> config.general.wikiLookup.officialWiki = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .build()) + //Special Effects .group(OptionGroup.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.general.specialEffects")) -- cgit From 38f3ec2348c0d02d3b2ef682bfbb62aa0a327cec Mon Sep 17 00:00:00 2001 From: Yasin Date: Wed, 18 Oct 2023 02:04:12 +0200 Subject: Change flame height (#370) --- .../de/hysky/skyblocker/config/SkyblockerConfig.java | 11 +++++++++++ .../config/categories/GeneralCategory.java | 20 ++++++++++++++++++++ 2 files changed, 31 insertions(+) (limited to 'src/main/java/de/hysky/skyblocker/config') diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index 107fe26e..4efcc1df 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -209,6 +209,9 @@ public class SkyblockerConfig { @SerialEntry public TeleportOverlay teleportOverlay = new TeleportOverlay(); + @SerialEntry + public FlameOverlay flameOverlay = new FlameOverlay(); + @SerialEntry public List lockedSlots = new ArrayList<>(); @@ -391,6 +394,14 @@ public class SkyblockerConfig { public boolean enableWitherImpact = true; } + public static class FlameOverlay { + @SerialEntry + public float flameHeight = 0f; + + @SerialEntry + public float flameOpacity = 0f; + } + public enum Direction { HORIZONTAL, VERTICAL; 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 80792ab9..635d192f 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java @@ -525,6 +525,26 @@ public class GeneralCategory { .controller(ConfigUtils::createBooleanController) .build()) .build()) + + //Flame Overlay + .group(OptionGroup.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.general.flameOverlay")) + .collapsed(true) + .option(Option.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.general.flameOverlay.flameHeight")) + .binding(defaults.general.flameOverlay.flameHeight, + () -> config.general.flameOverlay.flameHeight, + newValue -> config.general.flameOverlay.flameHeight = newValue) + .controller(opt -> FloatSliderControllerBuilder.create(opt).range(0.0f, 0.5f).step(0.01f)) + .build()) + .option(Option.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.general.flameOverlay.flameOpacity")) + .binding(defaults.general.flameOverlay.flameOpacity, + () -> config.general.flameOverlay.flameOpacity, + newValue -> config.general.flameOverlay.flameOpacity = newValue) + .controller(opt -> FloatSliderControllerBuilder.create(opt).range(0.0f, 0.8f).step(0.1f)) + .build()) + .build()) .build(); } } -- cgit From 132c33af264df143bc3e02087c76be20d94aebf5 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Wed, 18 Oct 2023 00:45:58 -0400 Subject: Secret Waypoint Rendering Customization --- .../de/hysky/skyblocker/config/SkyblockerConfig.java | 18 ++++++++++++++++++ .../skyblocker/config/categories/DungeonsCategory.java | 9 +++++++++ 2 files changed, 27 insertions(+) (limited to 'src/main/java/de/hysky/skyblocker/config') diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index 4efcc1df..6622fa83 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -572,6 +572,9 @@ public class SkyblockerConfig { @SerialEntry public boolean noInitSecretWaypoints = false; + + @SerialEntry + public WaypointType waypointType = WaypointType.WAYPOINT; @SerialEntry public boolean enableEntranceWaypoints = true; @@ -603,6 +606,21 @@ public class SkyblockerConfig { @SerialEntry public boolean enableDefaultWaypoints = true; } + + public enum WaypointType { + WAYPOINT, + OUTLINE, + OUTLINED_WAYPOINT; + + @Override + public String toString() { + return switch (this) { + case WAYPOINT -> "Waypoint"; + case OUTLINE -> "Outline"; + case OUTLINED_WAYPOINT -> "Outlined Waypoint"; + }; + } + } public static class DungeonChestProfit { @SerialEntry 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 a9c0c26b..89ac6f8e 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java @@ -2,6 +2,7 @@ package de.hysky.skyblocker.config.categories; import de.hysky.skyblocker.config.ConfigUtils; import de.hysky.skyblocker.config.SkyblockerConfig; +import de.hysky.skyblocker.config.SkyblockerConfig.WaypointType; import dev.isxander.yacl3.api.ButtonOption; import dev.isxander.yacl3.api.ConfigCategory; import dev.isxander.yacl3.api.Option; @@ -43,6 +44,14 @@ public class DungeonsCategory { .controller(ConfigUtils::createBooleanController) .flag(OptionFlag.GAME_RESTART) .build()) + .option(Option.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.waypointType")) + .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.waypointType.@Tooltip"))) + .binding(defaults.locations.dungeons.secretWaypoints.waypointType, + () -> config.locations.dungeons.secretWaypoints.waypointType, + newValue -> config.locations.dungeons.secretWaypoints.waypointType = newValue) + .controller(ConfigUtils::createEnumCyclingListController) + .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableEntranceWaypoints")) .binding(defaults.locations.dungeons.secretWaypoints.enableEntranceWaypoints, -- cgit From 7773e425d3e2da1e4d4c0368be3067052f35139e Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Wed, 18 Oct 2023 22:11:32 -0400 Subject: More Waypoint Customization --- .../java/de/hysky/skyblocker/config/SkyblockerConfig.java | 13 ++++++++++--- .../skyblocker/config/categories/DungeonsCategory.java | 7 +++++++ 2 files changed, 17 insertions(+), 3 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/config') diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index 6622fa83..d7279bc8 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -575,6 +575,9 @@ public class SkyblockerConfig { @SerialEntry public WaypointType waypointType = WaypointType.WAYPOINT; + + @SerialEntry + public boolean showSecretText = true; @SerialEntry public boolean enableEntranceWaypoints = true; @@ -609,15 +612,19 @@ public class SkyblockerConfig { public enum WaypointType { WAYPOINT, - OUTLINE, - OUTLINED_WAYPOINT; + OUTLINED_WAYPOINT, + HIGHLIGHT, + OUTLINED_HIGHLIGHT, + OUTLINE; @Override public String toString() { return switch (this) { case WAYPOINT -> "Waypoint"; - case OUTLINE -> "Outline"; case OUTLINED_WAYPOINT -> "Outlined Waypoint"; + case HIGHLIGHT -> "Highlight"; + case OUTLINED_HIGHLIGHT -> "Outlined Highlight"; + case OUTLINE -> "Outline"; }; } } 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 89ac6f8e..7b32cb78 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java @@ -52,6 +52,13 @@ public class DungeonsCategory { newValue -> config.locations.dungeons.secretWaypoints.waypointType = newValue) .controller(ConfigUtils::createEnumCyclingListController) .build()) + .option(Option.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.showSecretText")) + .binding(defaults.locations.dungeons.secretWaypoints.showSecretText, + () -> config.locations.dungeons.secretWaypoints.showSecretText, + newValue -> config.locations.dungeons.secretWaypoints.showSecretText = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableEntranceWaypoints")) .binding(defaults.locations.dungeons.secretWaypoints.enableEntranceWaypoints, -- cgit From 6a0117ce7f58ee3e1b1b510ad5c53f08388a4128 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Fri, 20 Oct 2023 01:00:51 -0400 Subject: Simplify QuickNav translation strings --- .../config/categories/QuickNavigationCategory.java | 168 ++++++++++----------- 1 file changed, 84 insertions(+), 84 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/config') diff --git a/src/main/java/de/hysky/skyblocker/config/categories/QuickNavigationCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/QuickNavigationCategory.java index b17fed23..775a0ae1 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/QuickNavigationCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/QuickNavigationCategory.java @@ -26,45 +26,45 @@ public class QuickNavigationCategory { //Button 1 .group(OptionGroup.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 1)) .collapsed(true) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.render")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.render")) .binding(defaults.quickNav.button1.render, () -> config.quickNav.button1.render, newValue -> config.quickNav.button1.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.itemName")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.itemName")) .binding(defaults.quickNav.button1.item.itemName, () -> config.quickNav.button1.item.itemName, newValue -> config.quickNav.button1.item.itemName = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.count")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.count")) .binding(defaults.quickNav.button1.item.count, () -> config.quickNav.button1.item.count, newValue -> config.quickNav.button1.item.count = newValue) .controller(opt -> IntegerFieldControllerBuilder.create(opt).range(1, 64)) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.nbt")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt")) .binding(defaults.quickNav.button1.item.nbt, () -> config.quickNav.button1.item.nbt, newValue -> config.quickNav.button1.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.uiTitle")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) .binding(defaults.quickNav.button1.uiTitle, () -> config.quickNav.button1.uiTitle, newValue -> config.quickNav.button1.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.clickEvent")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.clickEvent")) .binding(defaults.quickNav.button1.clickEvent, () -> config.quickNav.button1.clickEvent, newValue -> config.quickNav.button1.clickEvent = newValue) @@ -74,45 +74,45 @@ public class QuickNavigationCategory { //Button 2 .group(OptionGroup.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button2")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 2)) .collapsed(true) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.render")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.render")) .binding(defaults.quickNav.button2.render, () -> config.quickNav.button2.render, newValue -> config.quickNav.button2.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.itemName")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.itemName")) .binding(defaults.quickNav.button2.item.itemName, () -> config.quickNav.button2.item.itemName, newValue -> config.quickNav.button2.item.itemName = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.count")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.count")) .binding(defaults.quickNav.button2.item.count, () -> config.quickNav.button2.item.count, newValue -> config.quickNav.button2.item.count = newValue) .controller(opt -> IntegerFieldControllerBuilder.create(opt).range(1, 64)) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.nbt")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt")) .binding(defaults.quickNav.button2.item.nbt, () -> config.quickNav.button2.item.nbt, newValue -> config.quickNav.button2.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.uiTitle")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) .binding(defaults.quickNav.button2.uiTitle, () -> config.quickNav.button2.uiTitle, newValue -> config.quickNav.button2.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.clickEvent")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.clickEvent")) .binding(defaults.quickNav.button2.clickEvent, () -> config.quickNav.button2.clickEvent, newValue -> config.quickNav.button2.clickEvent = newValue) @@ -122,45 +122,45 @@ public class QuickNavigationCategory { //Button 3 .group(OptionGroup.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button3")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 3)) .collapsed(true) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.render")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.render")) .binding(defaults.quickNav.button3.render, () -> config.quickNav.button3.render, newValue -> config.quickNav.button3.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.itemName")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.itemName")) .binding(defaults.quickNav.button3.item.itemName, () -> config.quickNav.button3.item.itemName, newValue -> config.quickNav.button3.item.itemName = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.count")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.count")) .binding(defaults.quickNav.button3.item.count, () -> config.quickNav.button3.item.count, newValue -> config.quickNav.button3.item.count = newValue) .controller(opt -> IntegerFieldControllerBuilder.create(opt).range(1, 64)) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.nbt")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt")) .binding(defaults.quickNav.button3.item.nbt, () -> config.quickNav.button3.item.nbt, newValue -> config.quickNav.button3.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.uiTitle")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) .binding(defaults.quickNav.button3.uiTitle, () -> config.quickNav.button3.uiTitle, newValue -> config.quickNav.button3.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.clickEvent")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.clickEvent")) .binding(defaults.quickNav.button3.clickEvent, () -> config.quickNav.button3.clickEvent, newValue -> config.quickNav.button3.clickEvent = newValue) @@ -170,45 +170,45 @@ public class QuickNavigationCategory { //Button 4 .group(OptionGroup.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button4")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 4)) .collapsed(true) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.render")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.render")) .binding(defaults.quickNav.button4.render, () -> config.quickNav.button4.render, newValue -> config.quickNav.button4.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.itemName")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.itemName")) .binding(defaults.quickNav.button4.item.itemName, () -> config.quickNav.button4.item.itemName, newValue -> config.quickNav.button4.item.itemName = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.count")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.count")) .binding(defaults.quickNav.button4.item.count, () -> config.quickNav.button4.item.count, newValue -> config.quickNav.button4.item.count = newValue) .controller(opt -> IntegerFieldControllerBuilder.create(opt).range(1, 64)) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.nbt")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt")) .binding(defaults.quickNav.button4.item.nbt, () -> config.quickNav.button4.item.nbt, newValue -> config.quickNav.button4.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.uiTitle")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) .binding(defaults.quickNav.button4.uiTitle, () -> config.quickNav.button4.uiTitle, newValue -> config.quickNav.button4.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.clickEvent")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.clickEvent")) .binding(defaults.quickNav.button4.clickEvent, () -> config.quickNav.button4.clickEvent, newValue -> config.quickNav.button4.clickEvent = newValue) @@ -218,45 +218,45 @@ public class QuickNavigationCategory { //Button 5 .group(OptionGroup.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button5")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 5)) .collapsed(true) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.render")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.render")) .binding(defaults.quickNav.button5.render, () -> config.quickNav.button5.render, newValue -> config.quickNav.button5.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.itemName")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.itemName")) .binding(defaults.quickNav.button5.item.itemName, () -> config.quickNav.button5.item.itemName, newValue -> config.quickNav.button5.item.itemName = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.count")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.count")) .binding(defaults.quickNav.button5.item.count, () -> config.quickNav.button5.item.count, newValue -> config.quickNav.button5.item.count = newValue) .controller(opt -> IntegerFieldControllerBuilder.create(opt).range(1, 64)) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.nbt")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt")) .binding(defaults.quickNav.button5.item.nbt, () -> config.quickNav.button5.item.nbt, newValue -> config.quickNav.button5.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.uiTitle")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) .binding(defaults.quickNav.button5.uiTitle, () -> config.quickNav.button5.uiTitle, newValue -> config.quickNav.button5.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.clickEvent")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.clickEvent")) .binding(defaults.quickNav.button5.clickEvent, () -> config.quickNav.button5.clickEvent, newValue -> config.quickNav.button5.clickEvent = newValue) @@ -266,45 +266,45 @@ public class QuickNavigationCategory { //Button 6 .group(OptionGroup.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button6")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 6)) .collapsed(true) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.render")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.render")) .binding(defaults.quickNav.button6.render, () -> config.quickNav.button6.render, newValue -> config.quickNav.button6.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.itemName")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.itemName")) .binding(defaults.quickNav.button6.item.itemName, () -> config.quickNav.button6.item.itemName, newValue -> config.quickNav.button6.item.itemName = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.count")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.count")) .binding(defaults.quickNav.button6.item.count, () -> config.quickNav.button6.item.count, newValue -> config.quickNav.button6.item.count = newValue) .controller(opt -> IntegerFieldControllerBuilder.create(opt).range(1, 64)) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.nbt")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt")) .binding(defaults.quickNav.button6.item.nbt, () -> config.quickNav.button6.item.nbt, newValue -> config.quickNav.button6.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.uiTitle")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) .binding(defaults.quickNav.button6.uiTitle, () -> config.quickNav.button6.uiTitle, newValue -> config.quickNav.button6.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.clickEvent")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.clickEvent")) .binding(defaults.quickNav.button6.clickEvent, () -> config.quickNav.button6.clickEvent, newValue -> config.quickNav.button6.clickEvent = newValue) @@ -314,45 +314,45 @@ public class QuickNavigationCategory { //Button 7 .group(OptionGroup.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button7")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 7)) .collapsed(true) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.render")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.render")) .binding(defaults.quickNav.button7.render, () -> config.quickNav.button7.render, newValue -> config.quickNav.button7.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.itemName")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.itemName")) .binding(defaults.quickNav.button7.item.itemName, () -> config.quickNav.button7.item.itemName, newValue -> config.quickNav.button7.item.itemName = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.count")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.count")) .binding(defaults.quickNav.button7.item.count, () -> config.quickNav.button7.item.count, newValue -> config.quickNav.button7.item.count = newValue) .controller(opt -> IntegerFieldControllerBuilder.create(opt).range(1, 64)) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.nbt")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt")) .binding(defaults.quickNav.button7.item.nbt, () -> config.quickNav.button7.item.nbt, newValue -> config.quickNav.button7.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.uiTitle")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) .binding(defaults.quickNav.button7.uiTitle, () -> config.quickNav.button7.uiTitle, newValue -> config.quickNav.button7.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.clickEvent")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.clickEvent")) .binding(defaults.quickNav.button7.clickEvent, () -> config.quickNav.button7.clickEvent, newValue -> config.quickNav.button7.clickEvent = newValue) @@ -362,45 +362,45 @@ public class QuickNavigationCategory { //Button 8 .group(OptionGroup.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button8")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 8)) .collapsed(true) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.render")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.render")) .binding(defaults.quickNav.button8.render, () -> config.quickNav.button8.render, newValue -> config.quickNav.button8.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.itemName")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.itemName")) .binding(defaults.quickNav.button8.item.itemName, () -> config.quickNav.button8.item.itemName, newValue -> config.quickNav.button8.item.itemName = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.count")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.count")) .binding(defaults.quickNav.button8.item.count, () -> config.quickNav.button8.item.count, newValue -> config.quickNav.button8.item.count = newValue) .controller(opt -> IntegerFieldControllerBuilder.create(opt).range(1, 64)) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.nbt")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt")) .binding(defaults.quickNav.button8.item.nbt, () -> config.quickNav.button8.item.nbt, newValue -> config.quickNav.button8.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.uiTitle")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) .binding(defaults.quickNav.button8.uiTitle, () -> config.quickNav.button8.uiTitle, newValue -> config.quickNav.button8.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.clickEvent")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.clickEvent")) .binding(defaults.quickNav.button8.clickEvent, () -> config.quickNav.button8.clickEvent, newValue -> config.quickNav.button8.clickEvent = newValue) @@ -410,45 +410,45 @@ public class QuickNavigationCategory { //Button 9 .group(OptionGroup.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button9")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 9)) .collapsed(true) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.render")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.render")) .binding(defaults.quickNav.button9.render, () -> config.quickNav.button9.render, newValue -> config.quickNav.button9.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.itemName")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.itemName")) .binding(defaults.quickNav.button9.item.itemName, () -> config.quickNav.button9.item.itemName, newValue -> config.quickNav.button9.item.itemName = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.count")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.count")) .binding(defaults.quickNav.button9.item.count, () -> config.quickNav.button9.item.count, newValue -> config.quickNav.button9.item.count = newValue) .controller(opt -> IntegerFieldControllerBuilder.create(opt).range(1, 64)) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.nbt")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt")) .binding(defaults.quickNav.button9.item.nbt, () -> config.quickNav.button9.item.nbt, newValue -> config.quickNav.button9.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.uiTitle")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) .binding(defaults.quickNav.button9.uiTitle, () -> config.quickNav.button9.uiTitle, newValue -> config.quickNav.button9.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.clickEvent")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.clickEvent")) .binding(defaults.quickNav.button9.clickEvent, () -> config.quickNav.button9.clickEvent, newValue -> config.quickNav.button9.clickEvent = newValue) @@ -458,45 +458,45 @@ public class QuickNavigationCategory { //Button 10 .group(OptionGroup.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button10")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 10)) .collapsed(true) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.render")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.render")) .binding(defaults.quickNav.button10.render, () -> config.quickNav.button10.render, newValue -> config.quickNav.button10.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.itemName")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.itemName")) .binding(defaults.quickNav.button10.item.itemName, () -> config.quickNav.button10.item.itemName, newValue -> config.quickNav.button10.item.itemName = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.count")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.count")) .binding(defaults.quickNav.button10.item.count, () -> config.quickNav.button10.item.count, newValue -> config.quickNav.button10.item.count = newValue) .controller(opt -> IntegerFieldControllerBuilder.create(opt).range(1, 64)) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.nbt")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt")) .binding(defaults.quickNav.button10.item.nbt, () -> config.quickNav.button10.item.nbt, newValue -> config.quickNav.button10.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.uiTitle")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) .binding(defaults.quickNav.button10.uiTitle, () -> config.quickNav.button10.uiTitle, newValue -> config.quickNav.button10.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.clickEvent")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.clickEvent")) .binding(defaults.quickNav.button10.clickEvent, () -> config.quickNav.button10.clickEvent, newValue -> config.quickNav.button10.clickEvent = newValue) @@ -506,45 +506,45 @@ public class QuickNavigationCategory { //Button 11 .group(OptionGroup.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button11")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 11)) .collapsed(true) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.render")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.render")) .binding(defaults.quickNav.button11.render, () ->