diff options
| author | Yasin <a.piri@hotmail.de> | 2024-05-08 18:14:58 +0200 |
|---|---|---|
| committer | Yasin <a.piri@hotmail.de> | 2024-05-08 18:14:58 +0200 |
| commit | b8ee477e01d92d633d4c4a8db836e004e716d28e (patch) | |
| tree | adc1a7d019c9660419da90c29fd523891de268ac /src/main/java/de/hysky | |
| parent | 9b27b4cbd8899ada89fd0a47f33ef4b717db5637 (diff) | |
| download | Skyblocker-b8ee477e01d92d633d4c4a8db836e004e716d28e.tar.gz Skyblocker-b8ee477e01d92d633d4c4a8db836e004e716d28e.tar.bz2 Skyblocker-b8ee477e01d92d633d4c4a8db836e004e716d28e.zip | |
language file thing
option->config
categorie->config
and corrected prefix
Diffstat (limited to 'src/main/java/de/hysky')
23 files changed, 906 insertions, 887 deletions
diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java index f01f463c..9f463a4d 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java @@ -57,7 +57,7 @@ public class SkyblockerConfigManager { Screens.getButtons(screen).add(ButtonWidget .builder(Text.literal("\uD83D\uDD27"), buttonWidget -> client.setScreen(createGUI(screen))) .dimensions(((HandledScreenAccessor) genericContainerScreen).getX() + ((HandledScreenAccessor) genericContainerScreen).getBackgroundWidth() - 16, ((HandledScreenAccessor) genericContainerScreen).getY() + 4, 12, 12) - .tooltip(Tooltip.of(Text.translatable("skyblocker.title"))) + .tooltip(Tooltip.of(Text.translatable("skyblocker.config.title"))) .build()); } }); @@ -69,7 +69,7 @@ public class SkyblockerConfigManager { public static Screen createGUI(Screen parent) { return YetAnotherConfigLib.create(HANDLER, (defaults, config, builder) -> builder - .title(Text.translatable("skyblocker.title")) + .title(Text.translatable("skyblocker.config.title")) .category(GeneralCategory.create(defaults, config)) .category(UIAndVisualsCategory.create(defaults, config)) .category(HelperCategory.create(defaults, config)) diff --git a/src/main/java/de/hysky/skyblocker/config/categories/CrimsonIsleCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/CrimsonIsleCategory.java index dd9cb693..fed8fa96 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/CrimsonIsleCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/CrimsonIsleCategory.java @@ -14,66 +14,67 @@ public class CrimsonIsleCategory { public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) { return ConfigCategory.createBuilder() - .name(Text.translatable("skyblocker.category.crimsonIsle")) + .name(Text.translatable("skyblocker.config.crimsonIsle")) //Kuudra .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra")) + .name(Text.translatable("skyblocker.config.crimsonIsle.kuudra")) .collapsed(false) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.supplyWaypoints")) + .name(Text.translatable("skyblocker.config.crimsonIsle.kuudra.supplyWaypoints")) .binding(defaults.crimsonIsle.kuudra.supplyWaypoints, () -> config.crimsonIsle.kuudra.supplyWaypoints, newValue -> config.crimsonIsle.kuudra.supplyWaypoints = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.fuelWaypoints")) + .name(Text.translatable("skyblocker.config.crimsonIsle.kuudra.fuelWaypoints")) .binding(defaults.crimsonIsle.kuudra.fuelWaypoints, () -> config.crimsonIsle.kuudra.fuelWaypoints, newValue -> config.crimsonIsle.kuudra.fuelWaypoints = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Waypoint.Type>createBuilder() - .name(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.suppliesAndFuelWaypointType")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.waypoints.waypointType.@Tooltip"))) + .name(Text.translatable("skyblocker.config.crimsonIsle.kuudra.suppliesAndFuelWaypointType")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.secretWaypoints.waypointType.@Tooltip"), + Text.translatable("skyblocker.config.dungeons.secretWaypoints.waypointType.generalNote"))) .binding(defaults.crimsonIsle.kuudra.suppliesAndFuelWaypointType, () -> config.crimsonIsle.kuudra.suppliesAndFuelWaypointType, newValue -> config.crimsonIsle.kuudra.suppliesAndFuelWaypointType = newValue) .controller(ConfigUtils::createEnumCyclingListController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.ballistaBuildWaypoints")) + .name(Text.translatable("skyblocker.config.crimsonIsle.kuudra.ballistaBuildWaypoints")) .binding(defaults.crimsonIsle.kuudra.ballistaBuildWaypoints, () -> config.crimsonIsle.kuudra.ballistaBuildWaypoints, newValue -> config.crimsonIsle.kuudra.ballistaBuildWaypoints = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.safeSpotWaypoints")) + .name(Text.translatable("skyblocker.config.crimsonIsle.kuudra.safeSpotWaypoints")) .binding(defaults.crimsonIsle.kuudra.safeSpotWaypoints, () -> config.crimsonIsle.kuudra.safeSpotWaypoints, newValue -> config.crimsonIsle.kuudra.safeSpotWaypoints = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.pearlWaypoints")) + .name(Text.translatable("skyblocker.config.crimsonIsle.kuudra.pearlWaypoints")) .binding(defaults.crimsonIsle.kuudra.pearlWaypoints, () -> config.crimsonIsle.kuudra.pearlWaypoints, newValue -> config.crimsonIsle.kuudra.pearlWaypoints = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.noArrowPoisonWarning")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.noArrowPoisonWarning.@Tooltip"))) + .name(Text.translatable("skyblocker.config.crimsonIsle.kuudra.noArrowPoisonWarning")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.crimsonIsle.kuudra.noArrowPoisonWarning.@Tooltip"))) .binding(defaults.crimsonIsle.kuudra.noArrowPoisonWarning, () -> config.crimsonIsle.kuudra.noArrowPoisonWarning, newValue -> config.crimsonIsle.kuudra.noArrowPoisonWarning = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Integer>createBuilder() - .name(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.arrowPoisonThreshold")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.arrowPoisonThreshold.@Tooltip"))) + .name(Text.translatable("skyblocker.config.crimsonIsle.kuudra.arrowPoisonThreshold")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.crimsonIsle.kuudra.arrowPoisonThreshold.@Tooltip"))) .binding(defaults.crimsonIsle.kuudra.arrowPoisonThreshold, () -> config.crimsonIsle.kuudra.arrowPoisonThreshold, newValue -> config.crimsonIsle.kuudra.arrowPoisonThreshold = newValue) 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 94cb01b7..dddb19a0 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java @@ -17,58 +17,58 @@ public class DungeonsCategory { public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) { return ConfigCategory.createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons")) + .name(Text.translatable("skyblocker.config.dungeons")) //Ungrouped Options .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.fancyPartyFinder")) + .name(Text.translatable("skyblocker.config.dungeons.fancyPartyFinder")) .binding(defaults.dungeons.fancyPartyFinder, () -> config.dungeons.fancyPartyFinder, newValue -> config.dungeons.fancyPartyFinder = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.croesusHelper")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.croesusHelper.@Tooltip"))) + .name(Text.translatable("skyblocker.config.dungeons.croesusHelper")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.croesusHelper.@Tooltip"))) .binding(defaults.dungeons.croesusHelper, () -> config.dungeons.croesusHelper, newValue -> config.dungeons.croesusHelper = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.playerSecretsTracker")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.playerSecretsTracker.@Tooltip"))) + .name(Text.translatable("skyblocker.config.dungeons.playerSecretsTracker")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.playerSecretsTracker.@Tooltip"))) .binding(defaults.dungeons.playerSecretsTracker, () -> config.dungeons.playerSecretsTracker, newValue -> config.dungeons.playerSecretsTracker = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.starredMobGlow")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.starredMobGlow.@Tooltip"))) + .name(Text.translatable("skyblocker.config.dungeons.starredMobGlow")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.starredMobGlow.@Tooltip"))) .binding(defaults.dungeons.starredMobGlow, () -> config.dungeons.starredMobGlow, newValue -> config.dungeons.starredMobGlow = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.starredMobBoundingBoxes")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.starredMobBoundingBoxes.@Tooltip"))) + .name(Text.translatable("skyblocker.config.dungeons.starredMobBoundingBoxes")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.starredMobBoundingBoxes.@Tooltip"))) .binding(defaults.dungeons.starredMobBoundingBoxes, () -> config.dungeons.starredMobBoundingBoxes, newValue -> config.dungeons.starredMobBoundingBoxes = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.allowDroppingProtectedItems")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.allowDroppingProtectedItems.@Tooltip"))) + .name(Text.translatable("skyblocker.config.dungeons.allowDroppingProtectedItems")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.allowDroppingProtectedItems.@Tooltip"))) .binding(defaults.dungeons.allowDroppingProtectedItems, () -> config.dungeons.allowDroppingProtectedItems, newValue -> config.dungeons.allowDroppingProtectedItems = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.acceptReparty")) + .name(Text.translatable("skyblocker.config.dungeons.acceptReparty")) .binding(defaults.dungeons.acceptReparty, () -> config.dungeons.acceptReparty, newValue -> config.dungeons.acceptReparty = newValue) @@ -77,23 +77,24 @@ public class DungeonsCategory { // Map .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.map")) + .name(Text.translatable("skyblocker.config.dungeons.map")) + .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.enableMap")) + .name(Text.translatable("skyblocker.config.dungeons.map.enableMap")) .binding(defaults.dungeons.dungeonMap.enableMap, () -> config.dungeons.dungeonMap.enableMap, newValue -> config.dungeons.dungeonMap.enableMap = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Float>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.mapScaling")) + .name(Text.translatable("skyblocker.config.dungeons.map.mapScaling")) .binding(defaults.dungeons.dungeonMap.mapScaling, () -> config.dungeons.dungeonMap.mapScaling, newValue -> config.dungeons.dungeonMap.mapScaling = newValue) .controller(FloatFieldControllerBuilder::create) .build()) .option(ButtonOption.createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.mapScreen")) + .name(Text.translatable("skyblocker.config.dungeons.map.mapScreen")) .text(Text.translatable("text.skyblocker.open")) .action((screen, opt) -> MinecraftClient.getInstance().setScreen(new DungeonMapConfigScreen(screen))) .build()) @@ -101,70 +102,71 @@ public class DungeonsCategory { // Puzzle Solver .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.puzzle")) + .name(Text.translatable("skyblocker.config.dungeons.puzzle")) + .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.solveTicTacToe")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.solveTicTacToe.@Tooltip"))) + .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) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.solveThreeWeirdos")) + .name(Text.translatable("skyblocker.config.dungeons.puzzle.solveThreeWeirdos")) .binding(defaults.dungeons.puzzleSolver.solveThreeWeirdos, () -> config.dungeons.puzzleSolver.solveThreeWeirdos, newValue -> config.dungeons.puzzleSolver.solveThreeWeirdos = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.creeperSolver")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.creeperSolver.@Tooltip"))) + .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) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.solveWaterboard")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.solveWaterboard.@Tooltip"))) + .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) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.blazeSolver")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.blazeSolver.@Tooltip"))) + .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) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.solveBoulder")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.solveBoulder.@Tooltip"))) + .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) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.solveIceFill")) + .name(Text.translatable("skyblocker.config.dungeons.puzzle.solveIceFill")) .binding(defaults.dungeons.puzzleSolver.solveIceFill, () -> config.dungeons.puzzleSolver.solveIceFill, newValue -> config.dungeons.puzzleSolver.solveIceFill = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.solveSilverfish")) + .name(Text.translatable("skyblocker.config.dungeons.puzzle.solveSilverfish")) .binding(defaults.dungeons.puzzleSolver.solveSilverfish, () -> config.dungeons.puzzleSolver.solveSilverfish, newValue -> config.dungeons.puzzleSolver.solveSilverfish = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.solveTrivia")) + .name(Text.translatable("skyblocker.config.dungeons.puzzle.solveTrivia")) .binding(defaults.dungeons.puzzleSolver.solveTrivia, () -> config.dungeons.puzzleSolver.solveTrivia, newValue -> config.dungeons.puzzleSolver.solveTrivia = newValue) @@ -174,18 +176,19 @@ public class DungeonsCategory { // The Professor (F3/M3) .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.professor")) + .name(Text.translatable("skyblocker.config.dungeons.professor")) + .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.fireFreezeStaffTimer")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.fireFreezeStaffTimer.@Tooltip"))) + .name(Text.translatable("skyblocker.config.dungeons.professor.fireFreezeStaffTimer")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.professor.fireFreezeStaffTimer.@Tooltip"))) .binding(defaults.dungeons.theProfessor.fireFreezeStaffTimer, () -> config.dungeons.theProfessor.fireFreezeStaffTimer, newValue -> config.dungeons.theProfessor.fireFreezeStaffTimer = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.floor3GuardianHealthDisplay")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.floor3GuardianHealthDisplay.@Tooltip"))) + .name(Text.translatable("skyblocker.config.dungeons.professor.floor3GuardianHealthDisplay")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.professor.floor3GuardianHealthDisplay.@Tooltip"))) .binding(defaults.dungeons.theProfessor.floor3GuardianHealthDisplay, () -> config.dungeons.theProfessor.floor3GuardianHealthDisplay, newValue -> config.dungeons.theProfessor.floor3GuardianHealthDisplay = newValue) @@ -195,35 +198,35 @@ public class DungeonsCategory { // Livid (F5/M5) .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.livid")) + .name(Text.translatable("skyblocker.config.dungeons.livid")) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.lividColor.enableLividColorGlow")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.lividColor.enableLividColorGlow.@Tooltip"))) + .name(Text.translatable("skyblocker.config.dungeons.livid.enableLividColorGlow")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.livid.enableLividColorGlow.@Tooltip"))) .binding(defaults.dungeons.livid.enableLividColorGlow, () -> config.dungeons.livid.enableLividColorGlow, newValue -> config.dungeons.livid.enableLividColorGlow = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.lividColor.enableLividColorText")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.lividColor.enableLividColorText.@Tooltip"))) + .name(Text.translatable("skyblocker.config.dungeons.livid.enableLividColorText")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.livid.enableLividColorText.@Tooltip"))) .binding(defaults.dungeons.livid.enableLividColorText, () -> config.dungeons.livid.enableLividColorText, newValue -> config.dungeons.livid.enableLividColorText = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.lividColor.enableLividColorTitle")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.lividColor.enableLividColorTitle.@Tooltip"))) + .name(Text.translatable("skyblocker.config.dungeons.livid.enableLividColorTitle")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.livid.enableLividColorTitle.@Tooltip"))) .binding(defaults.dungeons.livid.enableLividColorTitle, () -> config.dungeons.livid.enableLividColorTitle, newValue -> config.dungeons.livid.enableLividColorTitle = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.lividColor.lividColorText")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.lividColor.lividColorText.@Tooltip"))) + .name(Text.translatable("skyblocker.config.dungeons.livid.lividColorText")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.livid.lividColorText.@Tooltip"))) .binding(defaults.dungeons.livid.lividColorText, () -> config.dungeons.livid.lividColorText, newValue -> config.dungeons.livid.lividColorText = newValue) @@ -233,24 +236,24 @@ public class DungeonsCategory { // Terminal (F7/M7) .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.terminals")) + .name(Text.translatable("skyblocker.config.dungeons.terminals")) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.terminals.solveColor")) + .name(Text.translatable("skyblocker.config.dungeons.terminals.solveColor")) .binding(defaults.dungeons.terminals.solveColor, () -> config.dungeons.terminals.solveColor, newValue -> config.dungeons.terminals.solveColor = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.terminals.solveOrder")) + .name(Text.translatable("skyblocker.config.dungeons.terminals.solveOrder")) .binding(defaults.dungeons.terminals.solveOrder, () -> config.dungeons.terminals.solveOrder, newValue -> config.dungeons.terminals.solveOrder = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.terminals.solveStartsWith")) + .name(Text.translatable("skyblocker.config.dungeons.terminals.solveStartsWith")) .binding(defaults.dungeons.terminals.solveStartsWith, () -> config.dungeons.terminals.solveStartsWith, newValue -> config.dungeons.terminals.solveStartsWith = newValue) @@ -260,11 +263,11 @@ public class DungeonsCategory { // Dungeon Secret Waypoints .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints")) + .name(Text.translatable("skyblocker.config.dungeons.secretWaypoints")) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.enableRoomMatching")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.enableRoomMatching.@Tooltip"))) + .name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enableRoomMatching")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enableRoomMatching.@Tooltip"))) .binding(defaults.dungeons.secretWaypoints.enableRoomMatching, () -> config.dungeons.secretWaypoints.enableRoomMatching, newValue -> config.dungeons.secretWaypoints.enableRoomMatching = newValue) @@ -272,108 +275,109 @@ public class DungeonsCategory { .flag(OptionFlag.GAME_RESTART) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.enableSecretWaypoints")) + .name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enableSecretWaypoints")) .binding(defaults.dungeons.secretWaypoints.enableSecretWaypoints, () -> config.dungeons.secretWaypoints.enableSecretWaypoints, newValue -> config.dungeons.secretWaypoints.enableSecretWaypoints = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Type>createBuilder() - .name(Text.translatable("skyblocker.option.general.waypoints.waypointType")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.waypoints.waypointType.@Tooltip"))) + .name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.waypointType")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.secretWaypoints.waypointType.@Tooltip"), + Text.translatable("skyblocker.config.dungeons.secretWaypoints.waypointType.generalNote"))) .binding(defaults.dungeons.secretWaypoints.waypointType, () -> config.dungeons.secretWaypoints.waypointType, newValue -> config.dungeons.secretWaypoints.waypointType = newValue) .controller(ConfigUtils::createEnumCyclingListController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.showSecretText")) + .name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.showSecretText")) .binding(defaults.dungeons.secretWaypoints.showSecretText, () -> config.dungeons.secretWaypoints.showSecretText, newValue -> config.dungeons.secretWaypoints.showSecretText = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.enableEntranceWaypoints")) + .name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enableEntranceWaypoints")) .binding(defaults.dungeons.secretWaypoints.enableEntranceWaypoints, () -> config.dungeons.secretWaypoints.enableEntranceWaypoints, newValue -> config.dungeons.secretWaypoints.enableEntranceWaypoints = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.enableSuperboomWaypoints")) + .name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enableSuperboomWaypoints")) .binding(defaults.dungeons.secretWaypoints.enableSuperboomWaypoints, () -> config.dungeons.secretWaypoints.enableSuperboomWaypoints, newValue -> config.dungeons.secretWaypoints.enableSuperboomWaypoints = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.enableChestWaypoints")) + .name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enableChestWaypoints")) .binding(defaults.dungeons.secretWaypoints.enableChestWaypoints, () -> config.dungeons.secretWaypoints.enableChestWaypoints, newValue -> config.dungeons.secretWaypoints.enableChestWaypoints = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.enableItemWaypoints")) + .name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enableItemWaypoints")) .binding(defaults.dungeons.secretWaypoints.enableItemWaypoints, () -> config.dungeons.secretWaypoints.enableItemWaypoints, newValue -> config.dungeons.secretWaypoints.enableItemWaypoints = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.enableBatWaypoints")) + .name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enableBatWaypoints")) .binding(defaults.dungeons.secretWaypoints.enableBatWaypoints, () -> config.dungeons.secretWaypoints.enableBatWaypoints, newValue -> config.dungeons.secretWaypoints.enableBatWaypoints = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.enableWitherWaypoints")) + .name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enableWitherWaypoints")) .binding(defaults.dungeons.secretWaypoints.enableWitherWaypoints, () -> config.dungeons.secretWaypoints.enableWitherWaypoints, newValue -> config.dungeons.secretWaypoints.enableWitherWaypoints = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.enableLeverWaypoints")) + .name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enableLeverWaypoints")) .binding(defaults.dungeons.secretWaypoints.enableLeverWaypoints, () -> config.dungeons.secretWaypoints.enableLeverWaypoints, newValue -> config.dungeons.secretWaypoints.enableLeverWaypoints = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.enableFairySoulWaypoints")) + .name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enableFairySoulWaypoints")) .binding(defaults.dungeons.secretWaypoints.enableFairySoulWaypoints, () -> config.dungeons.secretWaypoints.enableFairySoulWaypoints, newValue -> config.dungeons.secretWaypoints.enableFairySoulWaypoints = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.enableStonkWaypoints")) + .name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enableStonkWaypoints")) .binding(defaults.dungeons.secretWaypoints.enableStonkWaypoints, () -> config.dungeons.secretWaypoints.enableStonkWaypoints, newValue -> config.dungeons.secretWaypoints.enableStonkWaypoints = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.enableAotvWaypoints")) + .name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enableAotvWaypoints")) .binding(defaults.dungeons.secretWaypoints.enableAotvWaypoints, () -> config.dungeons.secretWaypoints.enableAotvWaypoints, newValue -> config.dungeons.secretWaypoints.enableAotvWaypoints = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.enablePearlWaypoints")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.enablePearlWaypoints.@Tooltip"))) + .name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enablePearlWaypoints")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enablePearlWaypoints.@Tooltip"))) .binding(defaults.dungeons.secretWaypoints.enablePearlWaypoints, () -> config.dungeons.secretWaypoints.enablePearlWaypoints, newValue -> config.dungeons.secretWaypoints.enablePearlWaypoints = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.enableDefaultWaypoints")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.enableDefaultWaypoints.@Tooltip"))) + .name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enableDefaultWaypoints")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enableDefaultWaypoints.@Tooltip"))) .binding(defaults.dungeons.secretWaypoints.enableDefaultWaypoints, () -> config.dungeons.secretWaypoints.enableDefaultWaypoints, newValue -> config.dungeons.secretWaypoints.enableDefaultWaypoints = newValue) @@ -383,19 +387,19 @@ public class DungeonsCategory { // Mimic Message .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.mimicMessage")) + .name(Text.translatable("skyblocker.config.dungeons.mimicMessage")) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.mimicMessage.sendMimicMessage")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.mimicMessage.sendMimicMessage.@Tooltip"))) + .name(Text.translatable("skyblocker.config.dungeons.mimicMessage.sendMimicMessage")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.mimicMessage.sendMimicMessage.@Tooltip"))) .binding(defaults.dungeons.mimicMessage.sendMimicMessage, () -> config.dungeons.mimicMessage.sendMimicMessage, newValue -> config.dungeons.mimicMessage.sendMimicMessage = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.mimicMessage.mimicMessage")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.mimicMessage.mimicMessage.@Tooltip"))) + .name(Text.translatable("skyblocker.config.dungeons.mimicMessage.mimicMessage")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.mimicMessage.mimicMessage.@Tooltip"))) .binding(defaults.dungeons.mimicMessage.mimicMessage, () -> config.dungeons.mimicMessage.mimicMessage, newValue -> config.dungeons.mimicMessage.mimicMessage = newValue) @@ -405,18 +409,20 @@ public class DungeonsCategory { // Door Highlight .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.doorHighlight")) + .name(Text.translatable("skyblocker.config.dungeons.doorHighlight")) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.doorHighlight.enableDoorHighlight")) + .name(Text.translatable("skyblocker.config.dungeons.doorHighlight.enableDoorHighlight")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.doorHighlight.enableDoorHighlight.@Tooltip"))) .binding(defaults.dungeons.doorHighlight.enableDoorHighlight, () -> config.dungeons.doorHighlight.enableDoorHighlight, newValue -> config.dungeons.doorHighlight.enableDoorHighlight = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<DungeonsConfig.DoorHighlight.Type>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.doorHighlight.doorHighlightType")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.doorHighlight.doorHighlightType.@Tooltip"), Text.translatable("skyblocker.option.locations.dungeons.doorHighlight.doorHighlightType.secretWaypointsNote"))) + .name(Text.translatable("skyblocker.config.dungeons.doorHighlight.doorHighlightType")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.doorHighlight.doorHighlightType.@Tooltip"), + Text.translatable("skyblocker.config.dungeons.doorHighlight.doorHighlightType.secretWaypointsNote"))) .binding(defaults.dungeons.doorHighlight.doorHighlightType, () -> config.dungeons.doorHighlight.doorHighlightType, newValue -> config.dungeons.doorHighlight.doorHighlightType = newValue) @@ -426,106 +432,107 @@ public class DungeonsCategory { // Dungeon Score .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.dungeonScore")) + .name(Text.translatable("skyblocker.config.dungeons.dungeonScore")) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.dungeonScore.enableDungeonScoreMessage", 270)) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.dungeonScore.enableDungeonScoreMessage.@Tooltip", 270))) + .name(Text.translatable("skyblocker.config.dungeons.dungeonScore.enableDungeonScoreMessage", 270)) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.dungeonScore.enableDungeonScoreMessage.@Tooltip", 270))) .binding(defaults.dungeons.dungeonScore.enableDungeonScore270Message, () -> config.dungeons.dungeonScore.enableDungeonScore270Message, newValue -> config.dungeons.dungeonScore.enableDungeonScore270Message = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.dungeonScore.enableDungeonScoreTitle", 270)) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.dungeonScore.enableDungeonScoreTitle.@Tooltip", 270))) + .name(Text.translatable("skyblocker.config.dungeons.dungeonScore.enableDungeonScoreTitle", 270)) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.dungeonScore.enableDungeonScoreTitle.@Tooltip", 270))) .binding(defaults.dungeons.dungeonScore.enableDungeonScore270Title, () -> config.dungeons.dungeonScore.enableDungeonScore270Title, newValue -> config.dungeons.dungeonScore.enableDungeonScore270Title = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.dungeonScore.enableDungeonScoreSound", 270)) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.dungeonScore.enableDungeonScoreSound.@Tooltip", 270))) + .name(Text.translatable("skyblocker.config.dungeons.dungeonScore.enableDungeonScoreSound", 270)) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.dungeonScore.enableDungeonScoreSound.@Tooltip", 270))) .binding(defaults.dungeons.dungeonScore.enableDungeonScore270Sound, () -> config.dungeons.dungeonScore.enableDungeonScore270Sound, newValue -> config.dungeons.dungeonScore.enableDungeonScore270Sound = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.dungeonScore.dungeonScoreMessage", 270)) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.dungeonScore.dungeonScoreMessage.@Tooltip", 270, 270))) + .name(Text.translatable("skyblocker.config.dungeons.dungeonScore.dungeonScoreMessage", 270)) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.dungeonScore.dungeonScoreMessage.@Tooltip", 270, 270))) .binding(defaults.dungeons.dungeonScore.dungeonScore270Message, () -> config.dungeons.dungeonScore.dungeonScore270Message, newValue -> config.dungeons.dungeonScore.dungeonScore270Message = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.dungeonScore.enableDungeonScoreMessage", 300)) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.dungeonScore.enableDungeonScoreMessage.@Tooltip", 300))) + .name(Text.translatable("skyblocker.config.dungeons.dungeonScore.enableDungeonScoreMessage", 300)) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.dungeonScore.enableDungeonScoreMessage.@Tooltip", 300))) .binding(defaults.dungeons.dungeonScore.enableDungeonScore300Message, () -> config.dungeons.dungeonScore.enableDungeonScore300Message, newValue -> config.dungeons.dungeonScore.enableDungeonScore300Message = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.dungeonScore.enableDungeonScoreTitle", 300)) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.dungeonScore.enableDungeonScoreTitle.@Tooltip", 300))) + .name(Text.translatable("skyblocker.config.dungeons.dungeonScore.enableDungeonScoreTitle", 300)) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.dungeonScore.enableDungeonScoreTitle.@Tooltip", 300))) .binding(defaults.dungeons.dungeonScore.enableDungeonScore300Title, () -> config.dungeons.dungeonScore.enableDungeonScore300Title, newValue -> config.dungeons.dungeonScore.enableDungeonScore300Title = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.dungeonScore.enableDungeonScoreSound", 300)) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.dungeonScore.enableDungeonScoreSound.@Tooltip", 300))) + .name(Text.translatable("skyblocker.config.dungeons.dungeonScore.enableDungeonScoreSound", 300)) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.dungeonScore.enableDungeonScoreSound.@Tooltip", 300))) .binding(defaults.dungeons.dungeonScore.enableDungeonScore300Sound, () -> config.dungeons.dungeonScore.enableDungeonScore300Sound, newValue -> config.dungeons.dungeonScore.enableDungeonScore300Sound = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.dungeonScore.dungeonScoreMessage", 300)) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.dungeonScore.dungeonScoreMessage.@Tooltip", 300, 300))) + .name(Text.translatable("skyblocker.config.dungeons.dungeonScore.dungeonScoreMessage", 300)) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.dungeonScore.dungeonScoreMessage.@Tooltip", 300, 300))) .binding(defaults.dungeons.dungeonScore.dungeonScore300Message, () -> config.dungeons.dungeonScore.dungeonScore300Message, newValue -> config.dungeons.dungeonScore.dungeonScore300Message = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.dungeonScore.enableDungeonCryptsMessage")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.dungeonScore.enableDungeonCryptsMessage.@Tooltip"))) + .name(Text.translatable("skyblocker.config.dungeons.dungeonScore.enableDungeonCryptsMessage")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.dungeonScore.enableDungeonCryptsMessage.@Tooltip"))) .binding(defaults.dungeons.dungeonScore.enableDungeonCryptsMessage, () -> config.dungeons.dungeonScore.enableDungeonCryptsMessage, newValue -> config.dungeons.dungeonScore.enableDungeonCryptsMessage = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Integer>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.dungeonScore.dungeonCryptsMessageThreshold")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.dungeonScore.dungeonCryptsMessageThreshold.@Tooltip"))) + .name(Text.translatable("skyblocker.config.dungeons.dungeonScore.dungeonCryptsMessageThreshold")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.dungeonScore.dungeonCryptsMessageThreshold.@Tooltip"))) .binding(defaults.dungeons.dungeonScore.dungeonCryptsMessageThreshold, () -> config.dungeons.dungeonScore.dungeonCryptsMessageThreshold, newValue -> config.dungeons.dungeonScore.dungeonCryptsMessageThreshold = newValue) .controller(IntegerFieldControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.dungeonScore.dungeonCryptsMessage")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.dungeonScore.dungeonCryptsMessage.@Tooltip"))) + .name(Text.translatable("skyblocker.config.dungeons.dungeonScore.dungeonCryptsMessage")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.dungeonScore.dungeonCryptsMessage.@Tooltip"))) .binding(defaults.dungeons.dungeonScore.dungeonCryptsMessage, () -> config.dungeons.dungeonScore.dungeonCryptsMessage, newValue -> config.dungeons.dungeonScore.dungeonCryptsMessage = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.dungeonScore.enableScoreHUD")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.dungeonScore.enableScoreHUD.@Tooltip"), Text.translatable("skyblocker.option.locations.dungeons.dungeonScore.enableScoreHUD.deathMessagesNote"))) + .name(Text.translatable("skyblocker.config.dungeons.dungeonScore.enableScoreHUD")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.dungeonScore.enableScoreHUD.@Tooltip"), + Text.translatable("skyblocker.config.dungeons.dungeonScore.enableScoreHUD.deathMessagesNote"))) .binding(defaults.dungeons.dungeonScore.enableScoreHUD, () -> config.dungeons.dungeonScore.enableScoreHUD, newValue -> config.dungeons.dungeonScore.enableScoreHUD = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Float>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.dungeonScore.scoreScaling")) + .name(Text.translatable("skyblocker.config.dungeons.dungeonScore.scoreScaling")) .binding(defaults.dungeons.dungeonScore.scoreScaling, () -> config.dungeons.dungeonScore.scoreScaling, newValue -> { @@ -539,35 +546,35 @@ public class DungeonsCategory { // Dungeon Chest Profit Calculator .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.dungeonChestProfit")) + .name(Text.translatable("skyblocker.config.dungeons.dungeonChestProfit")) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.dungeonChestProfit.enableProfitCalculator")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.dungeonChestProfit.enableProfitCalculator.@Tooltip"))) + .name(Text.translatable("skyblocker.config.dungeons.dungeonChestProfit.enableProfitCalculator")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.dungeonChestProfit.enableProfitCalculator.@Tooltip"))) .binding(defaults.dungeons.dungeonChestProfit.enableProfitCalculator, () -> config.dungeons.dungeonChestProfit.enableProfitCalculator, newValue -> config.dungeons.dungeonChestProfit.enableProfitCalculator = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.dungeonChestProfit.croesusProfit")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.dungeonChestProfit.croesusProfit.@Tooltip"))) + .name(Text.translatable("skyblocker.config.dungeons.dungeonChestProfit.croesusProfit")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.dungeonChestProfit.croesusProfit.@Tooltip"))) .binding(defaults.dungeons.dungeonChestProfit.croesusProfit, () -> config.dungeons.dungeonChestProfit.croesusProfit, newValue -> config.dungeons.dungeonChestProfit.croesusProfit = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.dungeonChestProfit.includeKismet")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.dungeonChestProfit.includeKismet.@Tooltip"))) + .name(Text.translatable("skyblocker.config.dungeons.dungeonChestProfit.includeKismet")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.dungeonChestProfit.includeKismet.@Tooltip"))) .binding(defaults.dungeons.dungeonChestProfit.includeKismet, () -> config.dungeons.dungeonChestProfit.includeKismet, newValue -> config.dungeons.dungeonChestProfit.includeKismet = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.dungeonChestProfit.includeEssence")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.dungeonChestProfit.includeEssence.@Tooltip"))) + .name(Text.translatable("skyblocker.config.dungeons.dungeonChestProfit.includeEssence")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.dungeonChestProfit.includeEssence.@Tooltip"))) .binding(defaults.dungeons.dungeonChestProfit.includeEssence, () -> config.dungeons.dungeonChestProfit.includeEssence, newValue -> config.dungeons.dungeonChestProfit.includeEssence = newValue) @@ -575,37 +582,37 @@ public class DungeonsCategory { .build()) //FIXME maybe use color controller .option(Option.<Integer>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.dungeonChestProfit.neutralThreshold")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.dungeonChestProfit.neutralThreshold.@Tooltip"))) + .name(Text.translatable("skyblocker.config.dungeons.dungeonChestProfit.neutralThreshold")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.dungeonChestProfit.neutralThreshold.@Tooltip"))) .binding(defaults.dungeons.dungeonChestProfit.neutralThreshold, () -> config.dungeons.dungeonChestProfit.neutralThreshold, newValue -> config.dungeons.dungeonChestProfit.neutralThreshold = newValue) .controller(IntegerFieldControllerBuilder::create) .build()) .option(Option.<Formatting>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.dungeonChestProfit.neutralColor")) + .name(Text.translatable("skyblocker.config.dungeons.dungeonChestProfit.neutralColor")) .binding(defaults.dungeons.dungeonChestProfit.neutralColor, () -> config.dungeons.dungeonChestProfit.neutralColor, newValue -> config.dungeons.dungeonChestProfit.neutralColor = newValue) .controller(ConfigUtils.getEnumDropdownControllerFactory(ConfigUtils.FORMATTING_FORMATTER)) .build()) .option(Option.<Formatting>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.dungeonChestProfit.profitColor")) + .name(Text.translatable("skyblocker.config.dungeons.dungeonChestProfit.profitColor")) .binding(defaults.dungeons.dungeonChestProfit.profitColor, () -> config.dungeons.dungeonChestProfit.profitColor, newValue -> config.dungeons.dungeonChestProfit.profitColor = newValue) .controller(ConfigUtils.getEnumDropdownControllerFactory(ConfigUtils.FORMATTING_FORMATTER)) .build()) .option(Option.<Formatting>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dungeons.dungeonChestProfit.lossColor")) + .name(Text.translatable("skyblocker.config.dungeons.dungeonChestProfit.lossColor")) .binding(defaults.dungeons.dungeonChestProfit.lossColor, () -> config.dungeons.dungeonChestProfit.lossColor, newValue -> config.dungeons.dungeonChestProfit.lossColor = newValue) .controller(ConfigUtils.getEnumDropdownControllerFactory(ConfigUtils.FORMATTING_FORMATTER)) .build()) .option(Option.<Formatting>createBuilder() - .name(Text.translatable("skyblocker.option.general.chestValue.incompleteColor")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.chestValue.incompleteColor.@Tooltip"))) + .name(Text.translatable("skyblocker.config.dungeons.dungeonChestProfit.incompleteColor")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.dungeonChestProfit.incompleteColor.@Tooltip"))) .binding(defaults.dungeons.dungeonChestProfit.incompleteColor, () -> config.dungeons.dungeonChestProfit.incompleteColor, newValue -> config.dungeons.dungeonChestProfit.incompleteColor = newValue) diff --git a/src/main/java/de/hysky/skyblocker/config/categories/FarmingCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/FarmingCategory.java index 2c3572c5..90b36c72 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/FarmingCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/FarmingCategory.java @@ -14,47 +14,47 @@ public class FarmingCategory { public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) { return ConfigCategory.createBuilder() - .name(Text.translatable("skyblocker.category.farming")) + .name(Text.translatable("skyblocker.config.farming")) //Garden .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.locations.garden")) + .name(Text.translatable("skyblocker.config.farming.garden")) .collapsed(false) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.garden.farmingHud.enableHud")) + .name(Text.translatable("skyblocker.config.farming.garden.enableHud")) .binding(defaults.farming.garden.farmingHud.enableHud, () -> config.farming.garden.farmingHud.enableHud, newValue -> config.farming.garden.farmingHud.enableHud = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(ButtonOption.createBuilder() - .name(Text.translatable("skyblocker.option.locations.garden.farmingHud.config")) + .name(Text.translatable("skyblocker.config.farming.garden.farmingHud")) .text(Text.translatable("text.skyblocker.open")) .action((screen, opt) -> MinecraftClient.getInstance().setScreen(new FarmingHudConfigScreen(screen))) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.garden.dicerTitlePrevent")) + .name(Text.translatable("skyblocker.config.farming.garden.dicerTitlePrevent")) .binding(defaults.farming.garden.dicerTitlePrevent, () -> config.farming.garden.dicerTitlePrevent, newValue -> config.farming.garden.dicerTitlePrevent = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.garden.visitorHelper")) + .name(Text.translatable("skyblocker.config.farming.garden.visitorHelper")) .binding(defaults.farming.garden.visitorHelper, () -> config.farming.garden.visitorHelper, newValue -> config.farming.garden.visitorHelper = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.garden.lockMouseTool")) + .name(Text.translatable("skyblocker.config.farming.garden.lockMouseTool")) .binding(defaults.farming.garden.lockMouseTool, () -> config.farming.garden.lockMouseTool, newValue -> config.farming.garden.lockMouseTool = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.garden.lockMouseGround")) + .name(Text.translatable("skyblocker.config.farming.garden.lockMouseGround")) .binding(defaults.farming.garden.lockMouseGroundOnly, () -> config.farming.garden.lockMouseGroundOnly, newValue -> config.farming.garden.lockMouseGroundOnly = newValue) 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 161d1d39..d75f1623 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java @@ -12,299 +12,307 @@ import net.minecraft.util.Formatting; public class GeneralCategory { - public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) { - return ConfigCategory.createBuilder() - .name(Text.translatable("skyblocker.category.general")) + public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) { + return ConfigCategory.createBuilder() + .name(Text.translatable("skyblocker.config.general")) - //Ungrouped Options - .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.enableTips")) - .binding(defaults.general.enableTips, - () -> config.general.enableTips, - newValue -> config.general.enableTips = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) - .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.hideEmptyTooltips")) - .binding(defaults.general.hideEmptyTooltips, - () -> config.general.hideEmptyTooltips, - newValue -> config.general.hideEmptyTooltips = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) + //Ungrouped Options + .option(Option.<Boolean>createBuilder() + .name(Text.translatable("skyblocker.config.general.enableTips")) + .binding(defaults.general.enableTips, + () -> config.general.enableTips, + newValue -> config.general.enableTips = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .option(Option.<Boolean>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() - .name(Text.translatable("skyblocker.option.general.shortcuts")) - .collapsed(true) - .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.shortcuts.enableShortcuts")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.shortcuts.enableShortcuts.@Tooltip"))) - .binding(defaults.general.shortcuts.enableShortcuts, - () -> config.general.shortcuts.enableShortcuts, - newValue -> config.general.shortcuts.enableShortcuts = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) - .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.shortcuts.enableCommandShortcuts")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.shortcuts.enableCommandShortcuts.@Tooltip"))) - .binding(defaults.general.shortcuts.enableCommandShortcuts, - () -> config.general.shortcuts.enableCommandShortcuts, - newValue -> config.general.shortcuts.enableCommandShortcuts = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) - .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.shortcuts.enableCommandArgShortcuts")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.shortcuts.enableCommandArgShortcuts.@Tooltip"))) - .binding(defaults.general.shortcuts.enableCommandArgShortcuts, - () -> config.general.shortcuts.enableCommandArgShortcuts, - newValue -> config.general.shortcuts.enableCommandArgShortcuts = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) - .option(ButtonOption.createBuilder() - .name(Text.translatable("skyblocker.option.general.shortcuts.config")) - .text(Text.translatable("text.skyblocker.open")) - .action((screen, opt) -> MinecraftClient.getInstance().setScreen(new ShortcutsConfigScreen(screen))) - .build()) - .build()) + //Shortcuts + .group(OptionGroup.createBuilder() + .name(Text.translatable("skyblocker.config.general.shortcuts")) + .collapsed(true) + .option(Option.<Boolean>createBuilder() + .name(Text.translatable("skyblocker.config.general.shortcuts.enableShortcuts")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.general.shortcuts.enableShortcuts.@Tooltip"))) + .binding(defaults.general.shortcuts.enableShortcuts, + () -> config.general.shortcuts.enableShortcuts, + newValue -> config.general.shortcuts.enableShortcuts = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .option(Option.<Boolean>createBuilder() + .name(Text.translatable("skyblocker.config.general.shortcuts.enableCommandShortcuts")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.general.shortcuts.enableCommandShortcuts.@Tooltip"))) + .binding(defaults.general.shortcuts.enableCommandShortcuts, + () -> config.general.shortcuts.enableCommandShortcuts, + newValue -> config.general.shortcuts.enableCommandShortcuts = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .option(Option.<Boolean>createBuilder() + .name(Text.translatable("skyblocker.config.general.shortcuts.enableCommandArgShortcuts")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.general.shortcuts.enableCommandArgShortcuts.@Tooltip"))) + .binding(defaults.general.shortcuts.enableCommandArgShortcuts, + () -> config.general.shortcuts.enableCommandArgShortcuts, + newValue -> config.general.shortcuts.enableCommandArgShortcuts = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .option(ButtonOption.createBuilder() + .name(Text.translatable("skyblocker.config.general.shortcuts.config")) + .text(Text.translatable("text.skyblocker.open")) + .action((screen, opt) -> MinecraftClient.getInstance().setScreen(new ShortcutsConfigScreen(screen))) + .build()) + .build()) - //Quiver Warning - .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.general.quiverWarning")) - .collapsed(true) - .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.quiverWarning.enableQuiverWarning")) - .binding(defaults.general.quiverWarning.enableQuiverWarning, - () -> config.general.quiverWarning.enableQuiverWarning, - newValue -> config.general.quiverWarning.enableQuiverWarning = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) - .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.quiverWarning.enableQuiverWarningInDungeons")) - .binding(defaults.general.quiverWarning.enableQuiverWarningInDungeons, - () -> config.general.quiverWarning.enableQuiverWarningInDungeons, - newValue -> config.general.quiverWarning.enableQuiverWarningInDungeons = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) - .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.quiverWarning.enableQuiverWarningAfterDungeon")) - .binding(defaults.general.quiverWarning.enableQuiverWarningAfterDungeon, - () -> config.general.quiverWarning.enableQuiverWarningAfterDungeon, - newValue -> config.general.quiverWarning.enableQuiverWarningAfterDungeon = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) - .build()) + //Quiver Warning + .group(OptionGroup.createBuilder() + .name(Text.translatable("skyblocker.config.general.quiverWarning")) + .collapsed(true) + .option(Option.<Boolean>createBuilder() + .name(Text.translatable("skyblocker.config.general.quiverWarning.enableQuiverWarning")) + .binding(defaults.general.quiverWarning.enableQuiverWarning, + () -> config.general.quiverWarning.enableQuiverWarning, + newValue -> config.general.quiverWarning.enableQuiverWarning = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .option(Option.<Boolean>createBuilder() + .name(Text.translatable("skyblocker.config.general.quiverWarning.enableQuiverWarningInDungeons")) + .binding(defaults.general.quiverWarning.enableQuiverWarningInDungeons, + () -> config.general.quiverWarning.enableQuiverWarningInDungeons, + newValue -> config.general.quiverWarning.enableQuiverWarningInDungeons = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .option(Option.<Boolean>createBuilder() + .name(Text.translatable("skyblocker.config.general.quiverWarning.enableQuiverWarningAfterDungeon")) + .binding(defaults.general.quiverWarning.enableQuiverWarningAfterDungeon, + () -> config.general.quiverWarning.enableQuiverWarningAfterDungeon, + newValue -> config.general.quiverWarning.enableQuiverWarningAfterDungeon = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .build()) - //Item List - .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.general.itemList")) - .collapsed(true) - .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.itemList.enableItemList")) - .binding(defaults.general.itemList.enableItemList, - () -> config.general.itemList.enableItemList, - newValue -> config.general.itemList.enableItemList = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) - .build()) + //Item List + .group(OptionGroup.createBuilder() + .name(Text.translatable("skyblocker.config.general.itemList")) + .collapsed(true) + .option(Option.<Boolean>createBuilder() + .name(Text.translatable("skyblocker.config.general.itemList.enableItemList")) + .binding(defaults.general.itemList.enableItemList, + () -> config.general.itemList.enableItemList, + newValue -> config.general.itemList.enableItemList = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .build()) - //Item Tooltip - .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.general.itemTooltip")) - .collapsed(true) - .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.itemTooltip.enableNPCPrice")) - .binding(defaults.general.itemTooltip.enableNPCPrice, - () -> config.general.itemTooltip.enableNPCPrice, - newValue -> config.general.itemTooltip.enableNPCPrice = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) - .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.itemTooltip.enableMotesPrice")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.itemTooltip.enableMotesPrice.@Tooltip"))) - .binding(defaults.general.itemTooltip.enableMotesPrice, - () -> config.general.itemTooltip.enableMotesPrice, - newValue -> config.general.itemTooltip.enableMotesPrice = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) - .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.itemTooltip.enableAvgBIN")) - .binding(defaults.general.itemTooltip.enableAvgBIN, - () -> config.general.itemTooltip.enableAvgBIN, - newValue -> config.general.itemTooltip.enableAvgBIN = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) - .option(Option.<GeneralConfig.Average>createBuilder() - .name(Text.translatable("skyblocker.option.general.itemTooltip.avg")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.itemTooltip.avg.@Tooltip"))) - .binding(defaults.general.itemTooltip.avg, - () -> config.general.itemTooltip.avg, - newValue -> config.general.itemTooltip.avg = newValue) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.itemTooltip.enableLowestBIN")) - .binding(defaults.general.itemTooltip.enableLowestBIN, - () -> config.general.itemTooltip.enableLowestBIN, - newValue -> config.general.itemTooltip.enableLowestBIN = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) - .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.itemTooltip.enableBazaarPrice")) - .binding(defaults.general.itemTooltip.enableBazaarPrice, - () -> config.general.itemTooltip.enableBazaarPrice, - newValue -> config.general.itemTooltip.enableBazaarPrice = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) - .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.itemTooltip.enableObtainedDate")) - .binding(defaults.general.itemTooltip.enableObtainedDate, - () -> config.general.itemTooltip.enableObtainedDate, - newValue -> config.general.itemTooltip.enableObtainedDate = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) - .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.itemTooltip.enableMuseumInfo")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.itemTooltip.enableMuseumInfo.@Tooltip"))) - .binding(defaults.general.itemTooltip.enableMuseumInfo, - () -> config.general.itemTooltip.enableMuseumInfo, - newValue -> config.general.itemTooltip.enableMuseumInfo = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) - .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.itemTooltip.enableExoticTooltip")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.itemTooltip.enableExoticTooltip.@Tooltip"))) - .binding(defaults.general.itemTooltip.enableExoticTooltip, - () -> config.general.itemTooltip.enableExoticTooltip, - newValue -> config.general.itemTooltip.enableExoticTooltip = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) - .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.itemTooltip.enableAccessoriesHelper")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.itemTooltip.enableAccessoriesHelper.@Tooltip[0]"), Text.literal("\n\n✔ Collected").formatted(Formatting.GREEN), Text.translatable("skyblocker.option.general.itemTooltip.enableAccessoriesHelper.@Tooltip[1]"), - Text.literal("\n✦ Upgrade").withColor(0x218bff), Text.translatable("skyblocker.option.general.itemTooltip.enableAccessoriesHelper.@Tooltip[2]"), Text.literal("\n↑ Upgradable").withColor(0xf8d048), Text.translatable("skyblocker.option.general.itemTooltip.enableAccessoriesHelper.@Tooltip[3]"), - Text.literal("\n↓ Downgrade").formatted(Formatting.GRAY), Text.translatable("skyblocker.option.general.itemTooltip.enableAccessoriesHelper.@Tooltip[4]"), Text.literal("\n✖ Missing").formatted(Formatting.RED), Text.translatable("skyblocker.option.general.itemTooltip.enableAccessoriesHelper.@Tooltip[5]"))) - .binding(defaults.general.itemTooltip.enableAccessoriesHelper, - () -> config.general.itemTooltip.enableAccessoriesHelper, - newValue -> config.general.itemTooltip.enableAccessoriesHelper = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) - .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.itemTooltip.dungeonQuality")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.itemTooltip.dungeonQuality.@Tooltip"))) - .binding(defaults.general.itemTooltip.dungeonQuality, - () -> config.general.itemTooltip.dungeonQuality, - newValue -> config.general.itemTooltip.dungeonQuality = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) - .build()) + //Item Tooltip + .group(OptionGroup.createBuilder() + .name(Text.translatable("skyblocker.config.general.itemTooltip")) + .collapsed(true) + .option(Option.<Boolean>createBuilder() + .name(Text.translatable("skyblocker.config.general.itemTooltip.enableNPCPrice")) + .binding(defaults.general.itemTooltip.enableNPCPrice, + () -> config.general.itemTooltip.enableNPCPrice, + newValue -> config.general.itemTooltip.enableNPCPrice = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .option(Option.<Boolean>createBuilder() + .name(Text.translatable("skyblocker.config.general.itemTooltip.enableMotesPrice")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.general.itemTooltip.enableMotesPrice.@Tooltip"))) + .binding(defaults.general.itemTooltip.enableMotesPrice, + () -> config.general.itemTooltip.enableMotesPrice, + newValue -> config.general.itemTooltip.enableMotesPrice = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .option(Option.<Boolean>createBuilder() + .name(Text.translatable("skyblocker.config.general.itemTooltip.enableAvgBIN")) + .binding(defaults.general.itemTooltip.enableAvgBIN, + () -> config.general.itemTooltip.enableAvgBIN, + newValue -> config.general.itemTooltip.enableAvgBIN = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .option(Option.<GeneralConfig.Average>createBuilder() + .name(Text.translatable("skyblocker.config.general.itemTooltip.avg")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.general.itemTooltip.avg.@Tooltip"))) + .binding(defaults.general.itemTooltip.avg, + () -> config.general.itemTooltip.avg, + newValue -> config.general.itemTooltip.avg = newValue) + .controller(ConfigUtils::createEnumCyclingListController) + .build()) + .option(Option.<Boolean>createBuilder() + .name(Text.translatable("skyblocker.config.general.itemTooltip.enableLowestBIN")) + .binding(defaults.general.itemTooltip.enableLowestBIN, + () -> config.general.itemTooltip.enableLowestBIN, + newValue -> config.general.itemTooltip.enableLowestBIN = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .option(Option.<Boolean>createBuilder() + .name(Text.translatable("skyblocker.config.general.itemTooltip.enableBazaarPrice")) + .binding(defaults.general.itemTooltip.enableBazaarPrice, + () -> config.general.itemTooltip.enableBazaarPrice, + newValue -> config.general.itemTooltip.enableBazaarPrice = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .option(Option.<Boolean>createBuilder() + .name(Text.translatable("skyblocker.config.general.itemTooltip.enableObtainedDate")) + .binding(defaults.general.itemTooltip.enableObtainedDate, + () -> config.general.itemTooltip.enableObtainedDate, + newValue -> config.general.itemTooltip.enableObtainedDate = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .option(Option.<Boolean>createBuilder() + .name(Text.translatable("skyblocker.config.general.itemTooltip.enableMuseumInfo")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.general.itemTooltip.enableMuseumInfo.@Tooltip"))) + .binding(defaults.general.itemTooltip.enableMuseumInfo, + () -> config.general.itemTooltip.enableMuseumInfo, + newValue -> config.general.itemTooltip.enableMuseumInfo = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .option(Option.<Boolean>createBuilder() + .name(Text.translatable("skyblocker.config.general.itemTooltip.enableExoticTooltip")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.general.itemTooltip.enableExoticTooltip.@Tooltip"))) + .binding(defaults.general.itemTooltip.enableExoticTooltip, + () -> config.general.itemTooltip.enableExoticTooltip, + newValue -> config.general.itemTooltip.enableExoticTooltip = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .option(Option.<Boolean>createBuilder() + .name(Text.translatable("skyblocker.config.general.itemTooltip.enableAccessoriesHelper")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.general.itemTooltip.enableAccessoriesHelper.@Tooltip[0]"), + Text.literal("\n\n✔ Collected").formatted(Formatting.GREEN), + Text.translatable("skyblocker.config.general.itemTooltip.enableAccessoriesHelper.@Tooltip[1]"), + Text.literal("\n✦ Upgrade").withColor(0x218bff), + Text.translatable("skyblocker.config.general.itemTooltip.enableAccessoriesHelper.@Tooltip[2]"), + Text.literal("\n↑ Upgradable").withColor(0xf8d048), + Text.translatable("skyblocker.config.general.itemTooltip.enableAccessoriesHelper.@Tooltip[3]"), + Text.literal("\n↓ Downgrade").formatted(Formatting.GRAY), + Text.translatable("skyblocker.config.general.itemTooltip.enableAccessoriesHelper.@Tooltip[4]"), + Text.literal("\n✖ Missing").formatted(Formatting.RED), + Text.translatable("skyblocker.config.general.itemTooltip.enableAccessoriesHelper.@Tooltip[5]"))) + .binding(defaults.general.itemTooltip.enableAccessoriesHelper, + () -> config.general.itemTooltip.enableAccessoriesHelper, + newValue -> config.general.itemTooltip.enableAccessoriesHelper = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .option(Option.<Boolean>createBuilder() + .name(Text.translatable("skyblocker.config.general.itemTooltip.dungeonQuality")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.general.itemTooltip.dungeonQuality.@Tooltip"))) + .binding(defaults.general.itemTooltip.dungeonQuality, + () -> config.general.itemTooltip.dungeonQuality, + newValue -> config.general.itemTooltip.dungeonQuality = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .build()) - //Item Info Display - .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.general.itemInfoDisplay")) - .collapsed(true) - .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.itemInfoDisplay.attributeShardInfo")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.itemInfoDisplay.attributeShardInfo.@Tooltip"))) - .binding(defaults.general.itemInfoDisplay.attributeShardInfo, - () -> config.general.itemInfoDisplay.attributeShardInfo, - newValue -> config.general.itemInfoDisplay.attributeShardInfo = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) - .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.itemInfoDisplay.itemRarityBackgrounds")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.itemInfoDisplay.itemRarityBackgrounds.@Tooltip"))) - .binding(defaults.general.itemInfoDisplay.itemRarityBackgrounds, - () -> config.general.itemInfoDisplay.itemRarityBackgrounds, - newValue -> config.general.itemInfoDisplay.itemRarityBackgrounds = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) - .option(Option.<GeneralConfig.RarityBackgroundStyle>createBuilder() - .name(Text.translatable("skyblocker.option.general.itemInfoDisplay.itemRarityBackgroundStyle")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.itemInfoDisplay.itemRarityBackgroundStyle.@Tooltip"))) - .binding(defaults.general.itemInfoDisplay.itemRarityBackgroundStyle, - () -> config.general.itemInfoDisplay.itemRarityBackgroundStyle, - newValue -> config.general.itemInfoDisplay.itemRarityBackgroundStyle = newValue) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.<Float>createBuilder() - .name(Text.translatable("skyblocker.option.general.itemInfoDisplay.itemRarityBackgroundsOpacity")) - .binding(defaults.general.itemInfoDisplay.itemRarityBackgroundsOpacity, - () -> config.general.itemInfoDisplay.itemRarityBackgroundsOpacity, - newValue -> config.general.itemInfoDisplay.itemRarityBackgroundsOpacity = newValue) - .controller(opt -> FloatSliderControllerBuilder.create(opt).range(0f, 1f).step(0.05f).formatValue(ConfigUtils.FLOAT_TWO_FORMATTER)) - .build()) - .build()) + //Item Info Display + .group(OptionGroup.createBuilder() + .name(Text.translatable("skyblocker.config.general.itemInfoDisplay")) + .collapsed(true) + .option(Option.<Boolean>createBuilder() + .name(Text.translatable("skyblocker.config.general.itemInfoDisplay.attributeShardInfo")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.general.itemInfoDisplay.attributeShardInfo.@Tooltip"))) + .binding(defaults.general.itemInfoDisplay.attributeShardInfo, + () -> config.general.itemInfoDisplay.attributeShardInfo, + newValue -> config.general.itemInfoDisplay.attributeShardInfo = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .option(Option.<Boolean>createBuilder() + .name(Text.translatable("skyblocker.config.general.itemInfoDisplay.itemRarityBackgrounds")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.general.itemInfoDisplay.itemRarityBackgrounds.@Tooltip"))) + .binding(defaults.general.itemInfoDisplay.itemRarityBackgrounds, + () -> config.general.itemInfoDisplay.itemRarityBackgrounds, + newValue -> config.general.itemInfoDisplay.itemRarityBackgrounds = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .option(Option.<GeneralConfig.RarityBackgroundStyle>createBuilder() + .name(Text.translatable("skyblocker.config.general.itemInfoDisplay.itemRarityBackgroundStyle")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.general.itemInfoDisplay.itemRarityBackgroundStyle.@Tooltip"))) + .binding(defaults.general.itemInfoDisplay.itemRarityBackgroundStyle, + () -> config.general.itemInfoDisplay.itemRarityBackgroundStyle, + newValue -> config.general.itemInfoDisplay.itemRarityBackgroundStyle = newValue) + .controller(ConfigUtils::createEnumCyclingListController) + .build()) + .option(Option.<Float>createBuilder() + .name(Text.translatable("skyblocker.config.general.itemInfoDisplay.itemRarityBackgroundsOpacity")) + .binding(defaults.general.itemInfoDisplay.itemRarityBackgroundsOpacity, + () -> config.general.itemInfoDisplay.itemRarityBackgroundsOpacity, + newValue -> config.general.itemInfoDisplay.itemRarityBackgroundsOpacity = newValue) + .controller(opt -> FloatSliderControllerBuilder.create(opt).range(0f, 1f).step(0.05f).formatValue(ConfigUtils.FLOAT_TWO_FORMATTER)) + .build()) + .build()) - //Item Protection - .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.general.itemProtection")) - .collapsed(true) - .option(Option.<GeneralConfig.SlotLockStyle>createBuilder() - .name(Text.translatable("skyblocker.option.general.itemProtection.slotLockStyle")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.itemProtection.slotLockStyle.@Tooltip"))) - .binding(defaults.general.itemProtection.slotLockStyle, - () -> config.general.itemProtection.slotLockStyle, - newValue -> config.general.itemProtection.slotLockStyle = newValue) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .build()) + //Item Protection + .group(OptionGroup.createBuilder() + .name(Text.translatable("skyblocker.config.general.itemProtection")) + .collapsed(true) + .option(Option.<GeneralConfig.SlotLockStyle>createBuilder() + .name(Text.translatable("skyblocker.config.general.itemProtection.slotLockStyle")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.general.itemProtection.slotLockStyle.@Tooltip"))) + .binding(defaults.general.itemProtection.slotLockStyle, + () -> config.general.itemProtection.slotLockStyle, + newValue -> config.general.itemProtection.slotLockStyle = newValue) + .controller(ConfigUtils::createEnumCyclingListController) + .build()) + .build()) - //Wiki Lookup - .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.general.wikiLookup")) - .collapsed(true) - .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.wikiLookup.enableWikiLookup")) - .description(OptionDescription.of(Text.translatable("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.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.wikiLookup.officialWiki")) - .description(OptionDescription.of(Text.translatable("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()) + //Wiki Lookup + .group(OptionGroup.createBuilder() + .name(Text.translatable("skyblocker.config.general.wikiLookup")) + .collapsed(true) + .option(Option.<Boolean>createBuilder() + .name(Text.translatable("skyblocker.config.general.wikiLookup.enableWikiLookup")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.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.<Boolean>createBuilder() + .name(Text.translatable("skyblocker.config.general.wikiLookup.officialWiki")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.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("skyblocker.option.general.specialEffects")) - .collapsed(true) - .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.specialEffects.rareDungeonDropEffects")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.specialEffects.rareDungeonDropEffects.@Tooltip"))) - .binding(defaults.general.specialEffects.rareDungeonDropEffects, - () -> config.general.specialEffects.rareDungeonDropEffects, - newValue -> config.general.specialEffects.rareDungeonDropEffects = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) - .build()) + //Special Effects + .group(OptionGroup.createBuilder() + .name(Text.translatable("skyblocker.config.general.specialEffects")) + .collapsed(true) + .option(Option.<Boolean>createBuilder() + .name(Text.translatable("skyblocker.config.general.specialEffects.rareDungeonDropEffects")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.general.specialEffects.rareDungeonDropEffects.@Tooltip"))) + .binding(defaults.general.specialEffects.rareDungeonDropEffects, + () -> config.general.specialEffects.rareDungeonDropEffects, + newValue -> config.general.specialEffects.rareDungeonDropEffects = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .build()) - //Hitboxes - .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.general.hitbox")) - .collapsed(true) - .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.hitbox.oldFarmlandHitbox")) - .binding(defaults.general.hitbox.oldFarmlandHitbox, - () -> config.general.hitbox.oldFarmlandHitbox, - newValue -> config.general.hitbox.oldFarmlandHitbox = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) - .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.hitbox.oldLeverHitbox")) - .binding(defaults.general.hitbox.oldLeverHitbox, - () -> config.general.hitbox.oldLeverHitbox, - newValue -> config.general.hitbox.oldLeverHitbox = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) - .build()) + //Hitboxes + .group(OptionGroup.createBuilder() + .name(Text.translatable("skyblocker.config.general.hitbox")) + .collapsed(true) + .option(Option.<Boolean>createBuilder() + .name(Text.translatable("skyblocker.config.general.hitbox.oldFarmlandHitbox")) + .binding(defaults.general.hitbox.oldFarmlandHitbox, + () -> config.general.hitbox.oldFarmlandHitbox, + newValue -> config.general.hitbox.oldFarmlandHitbox = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .option(Option.<Boolean>createBuilder() + .name(Text.translatable("skyblocker.config.general.hitbox.oldLeverHitbox")) + .binding(defaults.general.hitbox.oldLeverHitbox, + () -> config.general.hitbox.oldLeverHitbox, + newValue -> config.general.hitbox.oldLeverHitbox = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .build()) - .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 011fb7de..29444e48 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/HelperCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/HelperCategory.java @@ -12,12 +12,12 @@ import net.minecraft.text.Text; public class HelperCategory { public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) { return ConfigCategory.createBuilder() - .name(Text.translatable("skyblocker.category.helper")) + .name(Text.translatable("skyblocker.config.helper")) //Ungrouped Options .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.enableNewYearCakesHelper")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.enableNewYearCakesHelper.@Tooltip"))) + .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) @@ -26,10 +26,10 @@ public class HelperCategory { //Mythological Ritual .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.general.mythologicalRitual")) + .name(Text.translatable("skyblocker.config.helper.mythologicalRitual")) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.mythologicalRitual.enableMythologicalRitualHelper")) + .name(Text.translatable("skyblocker.config.helper.mythologicalRitual.enableMythologicalRitualHelper")) .binding(defaults.helper.mythologicalRitual.enableMythologicalRitualHelper, () -> config.helper.mythologicalRitual.enableMythologicalRitualHelper, newValue -> config.helper.mythologicalRitual.enableMythologicalRitualHelper = newValue) @@ -39,24 +39,24 @@ public class HelperCategory { //Experiments Solver .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.general.experiments")) + .name(Text.translatable("skyblocker.config.helper.experiments")) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.experiments.enableChronomatronSolver")) + .name(Text.translatable("skyblocker.config.helper.experiments.enableChronomatronSolver")) .binding(defaults.helper.experiments.enableChronomatronSolver, () -> config.helper.experiments.enableChronomatronSolver, newValue -> config.helper.experiments.enableChronomatronSolver = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.experiments.enableSuperpairsSolver")) + .name(Text.translatable("skyblocker.config.helper.experiments.enableSuperpairsSolver")) .binding(defaults.helper.experiments.enableSuperpairsSolver, () -> config.helper.experiments.enableSuperpairsSolver, newValue -> config.helper.experiments.enableSuperpairsSolver = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.experiments.enableUltrasequencerSolver")) + .name(Text.translatable("skyblocker.config.helper.experiments.enableUltrasequencerSolver")) .binding(defaults.helper.experiments.enableUltrasequencerSolver, () -> config.helper.experiments.enableUltrasequencerSolver, newValue -> config.helper.experiments.enableUltrasequencerSolver = newValue) @@ -66,42 +66,42 @@ public class HelperCategory { //Fishing Helper .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.general.fishing")) + .name(Text.translatable("skyblocker.config.helper.fishing")) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.fishing.enableFishingHelper")) + .name(Text.translatable("skyblocker.config.helper.fishing.enableFishingHelper")) .binding(defaults.helper.fishing.enableFishingHelper, () -> config.helper.fishing.enableFishingHelper, newValue -> config.helper.fishing.enableFishingHelper = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.fishing.enableFishingTimer")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.fishing.enableFishingTimer.@Tooltip"))) + .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) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.fishing.changeTimerColor")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.fishing.changeTimerColor.@Tooltip"))) + .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) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Float>createBuilder() - .name(Text.translatable("skyblocker.option.general.fishing.fishingTimerScale")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.fishing.fishingTimerScale.@Tooltip"))) + .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) .controller(FloatFieldControllerBuilder::create) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.fishing.hideOtherPlayers")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.fishing.hideOtherPlayers.@Tooltip"))) + .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) @@ -111,25 +111,25 @@ public class HelperCategory { //Fairy Souls Helper .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.general.fairySouls")) + .name(Text.translatable("skyblocker.config.helper.fairySouls")) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.fairySouls.enableFairySoulsHelper")) + .name(Text.translatable("skyblocker.config.helper.fairySouls.enableFairySoulsHelper")) .binding(defaults.helper.fairySouls.enableFairySoulsHelper, () -> config.helper.fairySouls.enableFairySoulsHelper, newValue -> config.helper.fairySouls.enableFairySoulsHelper = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.fairySouls.highlightFoundSouls")) + .name(Text.translatable("skyblocker.config.helper.fairySouls.highlightFoundSouls")) .binding(defaults.helper.fairySouls.highlightFoundSouls, () -> config.helper.fairySouls.highlightFoundSouls, newValue -> config.helper.fairySouls.highlightFoundSouls = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.fairySouls.highlightOnlyNearbySouls")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.fairySouls.highlightOnlyNearbySouls.@Tooltip"))) + .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) diff --git a/src/main/java/de/hysky/skyblocker/config/categories/MessageFilterCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/MessageFilterCategory.java index a5b1e3ed..0e2716e7 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/MessageFilterCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/MessageFilterCategory.java @@ -13,141 +13,145 @@ public class MessageFilterCategory { public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) { return ConfigCategory.createBuilder() - .name(Text.translatable("skyblocker.category.messages")) + .name(Text.translatable("skyblocker.config.messages")) //Uncategorized Options - .option(Option.<ChatFilterResult>createBuilder() - .name(Text.translatable("skyblocker.option.messages.hideAbility")) - .binding(defaults.messages.hideAbility, - () -> config.messages.hideAbility, - newValue -> config.messages.hideAbility = newValue) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.<ChatFilterResult>createBuilder() - .name(Text.translatable("skyblocker.option.messages.hideHeal")) - .binding(defaults.messages.hideHeal, - () -> config.messages.hideHeal, - newValue -> config.messages.hideHeal = newValue) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.<ChatFilterResult>createBuilder() - .name(Text.translatable("skyblocker.option.messages.hideAOTE")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.messages.hideAOTE.@Tooltip"))) - .binding(defaults.messages.hideAOTE, - () -> config.messages.hideAOTE, - newValue -> config.messages.hideAOTE = newValue) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.<ChatFilterResult>createBuilder() - .name(Text.translatable("skyblocker.option.messages.hideImplosion")) - .binding(defaults.messages.hideImplosion, - () -> config.messages.hideImplosion, - newValue -> config.messages.hideImplosion = newValue) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.<ChatFilterResult>createBuilder() - .name(Text.translatable("skyblocker.option.messages.hideMoltenWave")) - .binding(defaults.messages.hideMoltenWave, - () -> config.messages.hideMoltenWave, - newValue -> config.messages.hideMoltenWave = newValue) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.<ChatFilterResult>createBuilder() - .name(Text.translatable("skyblocker.option.messages.hideAds")) - .binding(defaults.messages.hideAds, - () -> config.messages.hideAds, - newValue -> config.messages.hideAds = newValue) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.<ChatFilterResult>createBuilder() - .name(Text.translatable("skyblocker.option.messages.hideTeleportPad")) - .binding(defaults.messages.hideTeleportPad, - () -> config.messages.hideTeleportPad, - newValue -> config.messages.hideTeleportPad = newValue) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.<ChatFilterResult>createBuilder() - .name(Text.translatable("skyblocker.option.messages.hideCombo")) - .binding(defaults.messages.hideCombo, - () -> config.messages.hideCombo, - newValue -> config.messages.hideCombo = newValue) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.<ChatFilterResult>createBuilder() - .name(Text.translatable("skyblocker.option.messages.hideAutopet")) - .binding(defaults.messages.hideAutopet, - () -> config.messages.hideAutopet, - newValue -> config.messages.hideAutopet = newValue) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.<ChatFilterResult>createBuilder() - .name(Text.translatable("skyblocker.option.messages.hideShowOff")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.messages.hideShowOff.@Tooltip"))) - .binding(defaults.messages.hideShowOff, - () -> config.messages.hideShowOff, - newValue -> config.messages.hideShowOff = newValue) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.<ChatFilterResult>createBuilder() - .name(Text.translatable("skyblocker.option.messages.hideToggleSkyMall")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.messages.hideToggleSkyMall.@Tooltip"))) - .binding(defaults.messages.hideToggleSkyMall, - () -> config.messages.hideToggleSkyMall, - newValue -> config.messages.hideToggleSkyMall = newValue) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.messages.hideMana")) - .binding(defaults.messages.hideMana, - () -> config.messages.hideMana, - newValue -> config.messages.hideMana = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) - .option(Option.<ChatFilterResult>createBuilder() - .name(Text.translatable("skyblocker.option.messages.hideMimicKill")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.messages.hideMimicKill.@Tooltip"))) - .binding(defaults.messages.hideMimicKill, - () -> config.messages.hideMimicKill, - newValue -> config.messages.hideMimicKill = newValue) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.<ChatFilterResult>createBuilder() - .name(Text.translatable("skyblocker.option.messages.hideDeath")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.messages.hideDeath.@Tooltip"))) - .binding(defaults.messages.hideDeath, - () -> config.messages.hideDeath, - newValue -> config.messages.hideDeath = newValue) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.<ChatFilterResult>createBuilder() - .name(Text.translatable("skyblocker.option.messages.hideDicer")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.messages.hideDicer.@Tooltip"))) - .binding(defaults.messages.hideDicer, - () -> config.messages.hideDicer, - newValue -> config.messages.hideDicer = newValue) - .controller(ConfigUtils::createEnumCyclingListController) + .group(OptionGroup.createBuilder() + .name(Text.translatable("skyblocker.config.messages.filter")) + .option(Option.<ChatFilterResult>createBuilder() + .name(Text.translatable("skyblocker.config.messages.filter.hideAbility")) + .binding(defaults.messages.hideAbility, + () -> config.messages.hideAbility, + newValue -> config.messages.hideAbility = newValue) + .controller(ConfigUtils::createEnumCyclingListController) + .build()) + .option(Option.<ChatFilterResult>createBuilder() + .name(Text.translatable("skyblocker.config.messages.filter.hideHeal")) + .binding(defaults.messages.hideHeal, + () -> config.messages.hideHeal, + newValue -> config.messages.hideHeal = newValue) + .controller(ConfigUtils::createEnumCyclingListController) + .build()) + .option(Option.<ChatFilterResult>createBuilder() + .name(Text.translatable("skyblocker.config.messages.filter.hideAOTE")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.messages.filter.hideAOTE.@Tooltip"))) + .binding(defaults.messages.hideAOTE, + () -> config.messages.hideAOTE, + newValue -> config.messages.hideAOTE = newValue) + .controller(ConfigUtils::createEnumCyclingListController) + .build()) + .option(Option.<ChatFilterResult>createBuilder() + .name(Text.translatable("skyblocker.config.messages.filter.hideImplosion")) + .binding(defaults.messages.hideImplosion, + () -> config.messages.hideImplosion, + newValue -> config.messages.hideImplosion = newValue) + .controller(ConfigUtils::createEnumCyclingListController) + .build()) + .option(Option.<ChatFilterResult>createBuilder() + .name(Text.translatable("skyblocker.config.messages.filter.hideMoltenWave")) + .binding(defaults.messages.hideMoltenWave, + () -> config.messages.hideMoltenWave, + newValue -> config.messages.hideMoltenWave = newValue) + .controller(ConfigUtils::createEnumCyclingListController) + .build()) + .option(Option.<ChatFilterResult>createBuilder() + .name(Text.translatable("skyblocker.config.messages.filter.hideAds")) + .binding(defaults.messages.hideAds, + () -> config.messages.hideAds, + newValue -> config.messages.hideAds = newValue) + .controller(ConfigUtils::createEnumCyclingListController) + .build()) + .option(Option.<ChatFilterResult>createBuilder() + .name(Text.translatable("skyblocker.config.messages.filter.hideTeleportPad")) + .binding(defaults.messages.hideTeleportPad, + () -> config.messages.hideTeleportPad, + newValue -> config.messages.hideTeleportPad = newValue) + .controller(ConfigUtils::createEnumCyclingListController) + .build()) + .option(Option.<ChatFilterResult>createBuilder() + .name(Text.translatable("skyblocker.config.messages.filter.hideCombo")) + .binding(defaults.messages.hideCombo, + () -> config.messages.hideCombo, + newValue -> config.messages.hideCombo = newValue) + .controller(ConfigUtils::createEnumCyclingListController) + .build()) + .option(Option.<ChatFilterResult>createBuilder() + .name(Text.translatable("skyblocker.config.messages.filter.hideAutopet")) + .binding(defaults.messages.hideAutopet, + () -> config.messages.hideAutopet, + newValue -> config.messages.hideAutopet = newValue) + .controller(ConfigUtils::createEnumCyclingListController) + .build()) + .option(Option.<ChatFilterResult>createBuilder() + .name(Text.translatable("skyblocker.config.messages.filter.hideShowOff")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.messages.filter.hideShowOff.@Tooltip"))) + .binding(defaults.messages.hideShowOff, + () -> config.messages.hideShowOff, + newValue -> config.messages.hideShowOff = newValue) + .controller(ConfigUtils::createEnumCyclingListController) + .build()) + .option(Option.<ChatFilterResult>createBuilder() + .name(Text.translatable("skyblocker.config.messages.filter.hideToggleSkyMall")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.messages.filter.hideToggleSkyMall.@Tooltip"))) + .binding(defaults.messages.hideToggleSkyMall, + () -> config.messages.hideToggleSkyMall, + newValue -> config.messages.hideToggleSkyMall = newValue) + .controller(ConfigUtils::createEnumCyclingListController) + .build()) + .option(Option.<Boolean>createBuilder() + .name(Text.translatable("skyblocker.config.messages.filter.hideMana")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.messages.filter.hideMana.@Tooltip"))) + .binding(defaults.messages.hideMana, + () -> config.messages.hideMana, + newValue -> config.messages.hideMana = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .option(Option.<ChatFilterResult>createBuilder() + .name(Text.translatable("skyblocker.config.messages.filter.hideMimicKill")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.messages.filter.hideMimicKill.@Tooltip"))) + .binding(defaults.messages.hideMimicKill, + () -> config.messages.hideMimicKill, + newValue -> config.messages.hideMimicKill = newValue) + .controller(ConfigUtils::createEnumCyclingListController) + .build()) + .option(Option.<ChatFilterResult>createBuilder() + .name(Text.translatable("skyblocker.config.messages.filter.hideDeath")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.messages.filter.hideDeath.@Tooltip"))) + .binding(defaults.messages.hideDeath, + () -> config.messages.hideDeath, + newValue -> config.messages.hideDeath = newValue) + .controller(ConfigUtils::createEnumCyclingListController) + .build()) + .option(Option.<ChatFilterResult>createBuilder() + .name(Text.translatable("skyblocker.config.messages.filter.hideDicer")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.messages.filter.hideDicer.@Tooltip"))) + .binding(defaults.messages.hideDicer, + () -> config.messages.hideDicer, + newValue -> config.messages.hideDicer = newValue) + .controller(ConfigUtils::createEnumCyclingListController) + .build()) .build()) //chat rules options .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.messages.chatRules")) + .name(Text.translatable("skyblocker.config.messages.chatRules")) .collapsed(false) .option(ButtonOption.createBuilder() - .name(Text.translatable("skyblocker.option.messages.chatRules.screen")) + .name(Text.translatable("skyblocker.config.messages.chatRules.screen")) .text(Text.translatable("text.skyblocker.open")) .action((screen, opt) -> MinecraftClient.getInstance().setScreen(new ChatRulesConfigScreen(screen))) .build()) .option(Option.<Integer>createBuilder() - .name(Text.translatable("skyblocker.option.messages.chatRules.announcementLength")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.messages.chatRules.announcementLength.@Tooltip"))) + .name(Text.translatable("skyblocker.config.messages.chatRules.announcementLength")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.messages.chatRules.announcementLength.@Tooltip"))) .binding(defaults.messages.chatRuleConfig.announcementLength, () -> config.messages.chatRuleConfig.announcementLength, newValue -> config.messages.chatRuleConfig.announcementLength = newValue) .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(5, 200).step(1)) .build()) .option(Option.<Integer>createBuilder() - .name(Text.translatable("skyblocker.option.messages.chatRules.announcementScale")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.messages.chatRules.announcementScale.@Tooltip"))) + .name(Text.translatable("skyblocker.config.messages.chatRules.announcementScale")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.messages.chatRules.announcementScale.@Tooltip"))) .binding(defaults.messages.chatRuleConfig.announcementScale, () -> config.messages.chatRuleConfig.announcementScale, newValue -> config.messages.chatRuleConfig.announcementScale = newValue) diff --git a/src/main/java/de/hysky/skyblocker/config/categories/MiningCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/MiningCategory.java index bfa49442..8809ba44 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/MiningCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/MiningCategory.java @@ -19,11 +19,11 @@ public class MiningCategory { public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) { return ConfigCategory.createBuilder() - .name(Text.translatable("skyblocker.option.locations.dwarvenMines")) + .name(Text.translatable("skyblocker.config.mining")) //Uncategorized Options .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dwarvenMines.enableDrillFuel")) + .name(Text.translatable("skyblocker.config.mining.enableDrillFuel")) .binding(defaults.mining.enableDrillFuel, () -> config.mining.enableDrillFuel, newValue -> config.mining.enableDrillFuel = newValue) @@ -32,16 +32,16 @@ public class MiningCategory { //Dwarven Mines .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.locations.dwarvenMines.dwarvenHud")) + .name(Text.translatable("skyblocker.config.mining.dwarvenMines")) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dwarvenMines.solveFetchur")) + .name(Text.translatable("skyblocker.config.mining.dwarvenMines.solveFetchur")) .binding(defaults.mining.dwarvenMines.solveFetchur, () -> config.mining.dwarvenMines.solveFetchur, newValue -> config.mining.dwarvenMines.solveFetchur = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dwarvenMines.solvePuzzler")) + .name(Text.translatable("skyblocker.config.mining.dwarvenMines.solvePuzzler")) .binding(defaults.mining.dwarvenMines.solvePuzzler, () -> config.mining.dwarvenMines.solvePuzzler, newValue -> config.mining.dwarvenMines.solvePuzzler = newValue) @@ -51,34 +51,34 @@ public class MiningCategory { //Dwarven HUD .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.locations.dwarvenMines.dwarvenHud")) + .name(Text.translatable("skyblocker.config.mining.dwarvenHud")) .collapsed(false) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dwarvenMines.dwarvenHud.enabledCommissions")) + .name(Text.translatable("skyblocker.config.mining.dwarvenHud.enabledCommissions")) .binding(defaults.mining.dwarvenHud.enabledCommissions, () -> config.mining.dwarvenHud.enabledCommissions, newValue -> config.mining.dwarvenHud.enabledCommissions = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dwarvenMines.dwarvenHud.enabledPowder")) + .name(Text.translatable("skyblocker.config.mining.dwarvenHud.enabledPowder")) .binding(defaults.mining.dwarvenHud.enabledPowder, () -> config.mining.dwarvenHud.enabledPowder, newValue -> config.mining.dwarvenHud.enabledPowder = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<MiningConfig.DwarvenHudStyle>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dwarvenMines.dwarvenHud.style")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[0]"), - Text.translatable("skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[1]"), - Text.translatable("skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[2]"))) + .name(Text.translatable("skyblocker.config.mining.dwarvenHud.style")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.mining.dwarvenHud.style.@Tooltip[0]"), + Text.translatable("skyblocker.config.mining.dwarvenHud.style.@Tooltip[1]"), + Text.translatable("skyblocker.config.mining.dwarvenHud.style.@Tooltip[2]"))) .binding(defaults.mining.dwarvenHud.style, () -> config.mining.dwarvenHud.style, newValue -> config.mining.dwarvenHud.style = newValue) .controller(ConfigUtils::createEnumCyclingListController) .build()) .option(ButtonOption.createBuilder() - .name(Text.translatable("skyblocker.option.locations.dwarvenMines.dwarvenHud.screen")) + .name(Text.translatable("skyblocker.config.mining.dwarvenHud.screen")) .text(Text.translatable("text.skyblocker.open")) .action((screen, opt) -> MinecraftClient.getInstance().setScreen(new DwarvenHudConfigScreen(screen))) .build()) @@ -86,10 +86,10 @@ public class MiningCategory { //Crystal Hollows .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.locations.dwarvenMines.dwarvenHud")) + .name(Text.translatable("skyblocker.config.mining.crystalHollows")) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dwarvenMines.metalDetectorHelper")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dwarvenMines.metalDetectorHelper.@Tooltip"))) + .name(Text.translatable("skyblocker.config.mining.crystalHollows.metalDetectorHelper")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.mining.crystalHollows.metalDetectorHelper.@Tooltip"))) .binding(defaults.mining.crystalHollows.metalDetectorHelper, () -> config.mining.crystalHollows.metalDetectorHelper, newValue -> config.mining.crystalHollows.metalDetectorHelper = newValue) @@ -99,38 +99,38 @@ public class MiningCategory { //Crystal Hollows Map .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.locations.dwarvenMines.crystalsHud")) + .name(Text.translatable("skyblocker.config.mining.crystalsHud")) .collapsed(false) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dwarvenMines.crystalsHud.enabled")) + .name(Text.translatable("skyblocker.config.mining.crystalsHud.enabled")) .binding(defaults.mining.crystalsHud.enabled, () -> config.mining.crystalsHud.enabled, newValue -> config.mining.crystalsHud.enabled = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(ButtonOption.createBuilder() - .name(Text.translatable("skyblocker.option.locations.dwarvenMines.crystalsHud.screen")) + .name(Text.translatable("skyblocker.config.mining.crystalsHud.screen")) .text(Text.translatable("text.skyblocker.open")) .action((screen, opt) -> MinecraftClient.getInstance().setScreen(new CrystalsHudConfigScreen(screen))) .build()) .option(Option.<Float>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dwarvenMines.crystalsHud.mapScaling")) + .name(Text.translatable("skyblocker.config.mining.crystalsHud.mapScaling")) .binding(defaults.mining.crystalsHud.mapScaling, () -> config.mining.crystalsHud.mapScaling, newValue -> config.mining.crystalsHud.mapScaling = newValue) .controller(FloatFieldControllerBuilder::create) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dwarvenMines.crystalsHud.showLocations")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dwarvenMines.crystalsHud.showLocations.@Tooltip"))) + .name(Text.translatable("skyblocker.config.mining.crystalsHud.showLocations")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.mining.crystalsHud.showLocations.@Tooltip"))) .binding(defaults.mining.crystalsHud.showLocations, () -> config.mining.crystalsHud.showLocations, newValue -> config.mining.crystalsHud.showLocations = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Integer>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dwarvenMines.crystalsHud.showLocations.locationSize")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dwarvenMines.crystalsHud.showLocations.locationSize.@Tooltip"))) + .name(Text.translatable("skyblocker.config.mining.crystalsHud.showLocations.locationSize")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.mining.crystalsHud.showLocations.locationSize.@Tooltip"))) .binding(defaults.mining.crystalsHud.locationSize, () -> config.mining.crystalsHud.locationSize, newValue -> config.mining.crystalsHud.locationSize = newValue) @@ -140,19 +140,19 @@ public class MiningCategory { //Crystal Hollows waypoints .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.locations.dwarvenMines.crystalsWaypoints")) + .name(Text.translatable("skyblocker.config.mining.crystalsWaypoints")) .collapsed(false) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dwarvenMines.crystalsWaypoints.enabled")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dwarvenMines.crystalsWaypoints.enabled.@Tooltip"))) + .name(Text.translatable("skyblocker.config.mining.crystalsWaypoints.enabled")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.mining.crystalsWaypoints.enabled.@Tooltip"))) .binding(defaults.mining.crystalsWaypoints.enabled, () -> config.mining.crystalsWaypoints.enabled, newValue -> config.mining.crystalsWaypoints.enabled = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.dwarvenMines.crystalsWaypoints.findInChat")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dwarvenMines.crystalsWaypoints.findInChat.@Tooltip"))) + .name(Text.translatable("skyblocker.config.mining.crystalsWaypoints.findInChat")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.mining.crystalsWaypoints.findInChat.@Tooltip"))) .binding(defaults.mining.crystalsWaypoints.findInChat, () -> config.mining.crystalsWaypoints.findInChat, newValue -> config.mining.crystalsWaypoints.findInChat = newValue) 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 70b4ee1b..e5dba84e 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/MiscCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/MiscCategory.java @@ -14,11 +14,11 @@ public class MiscCategory { public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) { return ConfigCategory.createBuilder() - .name(Text.translatable("skyblocker.category.misc")) + .name(Text.translatable("skyblocker.config.misc")) //Uncategorized Options .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.hideStatusEffectOverlay")) + .name(Text.translatable("skyblocker.config.misc.hideStatusEffectOverlay")) .binding(defaults.misc.hideStatusEffectOverlay, () -> config.misc.hideStatusEffectOverlay, newValue -> config.misc.hideStatusEffectOverlay = newValue) @@ -27,31 +27,31 @@ public class MiscCategory { //Discord RPC .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.misc.richPresence")) + .name(Text.translatable("skyblocker.config.misc.richPresence")) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.misc.richPresence.enableRichPresence")) + .name(Text.translatable("skyblocker.config.misc.richPresence.enableRichPresence")) .binding(defaults.misc.richPresence.enableRichPresence, () -> config.misc.richPresence.enableRichPresence, newValue -> config.misc.richPresence.enableRichPresence = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<MiscConfig.Info>createBuilder() - .name(Text.translatable("skyblocker.option.misc.richPresence.info")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.misc.richPresence.info.@Tooltip"))) + .name(Text.translatable("skyblocker.config.misc.richPresence.info")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.misc.richPresence.info.@Tooltip"))) .binding(defaults.misc.richPresence.info, () -> config.misc.richPresence.info, newValue -> config.misc.richPresence.info = newValue) .controller(ConfigUtils::createEnumCyclingListController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.misc.richPresence.cycleMode")) + .name(Text.translatable("skyblocker.config.misc.richPresence.cycleMode")) .binding(defaults.misc.richPresence.cycleMode, () -> config.misc.richPresence.cycleMode, newValue -> config.misc.richPresence.cycleMode = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.misc.richPresence.customMessage")) + .name(Text.translatable("skyblocker.config.misc.richPresence.customMessage")) .binding(defaults.misc.richPresence.customMessage, () -> config.misc.richPresence.customMessage, newValue -> config.misc.richPresence.customMessage = newValue) diff --git a/src/main/java/de/hysky/skyblocker/config/categories/OtherLocationsCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/OtherLocationsCategory.java index 63afdeee..67397b9d 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/OtherLocationsCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/OtherLocationsCategory.java @@ -5,7 +5,6 @@ import de.hysky.skyblocker.config.SkyblockerConfig; import de.hysky.skyblocker.skyblock.end.EndHudConfigScreen; import de.hysky.skyblocker.skyblock.end.EndHudWidget; import de.hysky.skyblocker.skyblock.end.TheEnd; -import de.hysky.skyblocker.skyblock.garden.FarmingHudConfigScreen; import dev.isxander.yacl3.api.*; import dev.isxander.yacl3.api.controller.IntegerSliderControllerBuilder; import net.minecraft.client.MinecraftClient; @@ -15,21 +14,21 @@ public class OtherLocationsCategory { public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) { return ConfigCategory.createBuilder() - .name(Text.translatable("skyblocker.category.locations")) + .name(Text.translatable("skyblocker.config.otherLocations")) //Barn .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.locations.barn")) + .name(Text.translatable("skyblocker.config.otherLocations.barn")) .collapsed(false) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.barn.solveHungryHiker")) + .name(Text.translatable("skyblocker.config.otherLocations.barn.solveHungryHiker")) .binding(defaults.otherLocations.barn.solveHungryHiker, () -> config.otherLocations.barn.solveHungryHiker, newValue -> config.otherLocations.barn.solveHungryHiker = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.barn.solveTreasureHunter")) + .name(Text.translatable("skyblocker.config.otherLocations.barn.solveTreasureHunter")) .binding(defaults.otherLocations.barn.solveTreasureHunter, () -> config.otherLocations.barn.solveTreasureHunter, newValue -> config.otherLocations.barn.solveTreasureHunter = newValue) @@ -39,41 +38,41 @@ public class OtherLocationsCategory { //The Rift .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.locations.rift")) + .name(Text.translatable("skyblocker.config.otherLocations.rift")) .collapsed(false) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.rift.mirrorverseWaypoints")) + .name(Text.translatable("skyblocker.config.otherLocations.rift.mirrorverseWaypoints")) .binding(defaults.otherLocations.rift.mirrorverseWaypoints, () -> config.otherLocations.rift.mirrorverseWaypoints, newValue -> config.otherLocations.rift.mirrorverseWaypoints = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.rift.blobbercystGlow")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.rift.blobbercystGlow.@Tooltip"))) + .name(Text.translatable("skyblocker.config.otherLocations.rift.blobbercystGlow")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.otherLocations.rift.blobbercystGlow.@Tooltip"))) .binding(defaults.otherLocations.rift.blobbercystGlow, () -> config.otherLocations.rift.blobbercystGlow, newValue -> config.otherLocations.rift.blobbercystGlow = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.rift.enigmaSoulWaypoints")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.rift.enigmaSoulWaypoints.@Tooltip"))) + .name(Text.translatable("skyblocker.config.otherLocations.rift.enigmaSoulWaypoints")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.otherLocations.rift.enigmaSoulWaypoints.@Tooltip"))) .binding(defaults.otherLocations.rift.enigmaSoulWaypoints, () -> config.otherLocations.rift.enigmaSoulWaypoints, newValue -> config.otherLocations.rift.enigmaSoulWaypoints = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.rift.highlightFoundEnigmaSouls")) + .name(Text.translatable("skyblocker.config.otherLocations.rift.highlightFoundEnigmaSouls")) .binding(defaults.otherLocations.rift.highlightFoundEnigmaSouls, () -> config.otherLocations.rift.highlightFoundEnigmaSouls, newValue -> config.otherLocations.rift.highlightFoundEnigmaSouls = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Integer>createBuilder() - .name(Text.translatable("skyblocker.option.locations.rift.mcGrubberStacks")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.rift.mcGrubberStacks.@Tooltip"))) + .name(Text.translatable("skyblocker.config.otherLocations.rift.mcGrubberStacks")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.otherLocations.rift.mcGrubberStacks.@Tooltip"))) .binding(defaults.otherLocations.rift.mcGrubberStacks, () -> config.otherLocations.rift.mcGrubberStacks, newValue -> config.otherLocations.rift.mcGrubberStacks = newValue) @@ -83,24 +82,24 @@ public class OtherLocationsCategory { // The end .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.locations.end")) + .name(Text.translatable("skyblocker.config.otherLocations.end")) .collapsed(false) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.end.enableEnderNodeHelper")) + .name(Text.translatable("skyblocker.config.otherLocations.end.enableEnderNodeHelper")) .binding(defaults.otherLocations.end.enableEnderNodeHelper, () -> config.otherLocations.end.enableEnderNodeHelper, newValue -> config.otherLocations.end.enableEnderNodeHelper = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.end.hudEnabled")) + .name(Text.translatable("skyblocker.config.otherLocations.end.hudEnabled")) .binding(defaults.otherLocations.end.hudEnabled, () -> config.otherLocations.end.hudEnabled, newValue -> config.otherLocations.end.hudEnabled = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.end.zealotKillsEnabled")) + .name(Text.translatable("skyblocker.config.otherLocations.end.zealotKillsEnabled")) .binding(defaults.otherLocations.end.zealotKillsEnabled, () -> config.otherLocations.end.zealotKillsEnabled, newValue -> { @@ -110,7 +109,7 @@ public class OtherLocationsCategory { .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.end.protectorLocationEnable")) + .name(Text.translatable("skyblocker.config.otherLocations.end.protectorLocationEnable")) .binding(defaults.otherLocations.end.protectorLocationEnabled, () -> config.otherLocations.end.protectorLocationEnabled, newValue -> { @@ -120,43 +119,41 @@ public class OtherLocationsCategory { .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.end.waypoint")) + .name(Text.translatable("skyblocker.config.otherLocations.end.waypoint")) .binding(defaults.otherLocations.end.waypoint, () -> config.otherLocations.end.waypoint, newValue -> config.otherLocations.end.waypoint = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(ButtonOption.createBuilder() - .name(Text.translatable("skyblocker.option.locations.end.screen")) + .name(Text.translatable("skyblocker.config.otherLocations.end.screen")) .text(Text.translatable("text.skyblocker.open")) // Reusing again lol .action((screen, opt) -> MinecraftClient.getInstance().setScreen(new EndHudConfigScreen(screen))) .build()) .option(ButtonOption.createBuilder() - .name(Text.translatable("skyblocker.option.locations.end.resetName")) - .text(Text.translatable("skyblocker.option.locations.end.resetText")) + .name(Text.translatable("skyblocker.config.otherLocations.end.resetName")) + .text(Text.translatable("skyblocker.config.otherLocations.end.resetText")) .action((screen, opt) -> { TheEnd.zealotsKilled = 0; TheEnd.zealotsSinceLastEye = 0; TheEnd.eyes = 0; }) .build()) - .build() - - ) + .build()) //Spider's Den .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.locations.spidersDen")) + .name(Text.translatable("skyblocker.config.otherLocations.spidersDen")) .collapsed(false) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.spidersDen.relics.enableRelicsHelper")) + .name(Text.translatable("skyblocker.config.otherLocations.spidersDen.relics.enableRelicsHelper")) .binding(defaults.otherLocations.spidersDen.relics.enableRelicsHelper, () -> config.otherLocations.spidersDen.relics.enableRelicsHelper, newValue -> config.otherLocations.spidersDen.relics.enableRelicsHelper = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.locations.spidersDen.relics.highlightFoundRelics")) + .name(Text.translatable("skyblocker.config.otherLocations.spidersDen.relics.highlightFoundRelics")) .binding(defaults.otherLocations.spidersDen.relics.highlightFoundRelics, () -> config.otherLocations.spidersDen.relics.highlightFoundRelics, newValue -> config.otherLocations.spidersDen.relics.highlightFoundRelics = newValue) 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 15d94fed..c09a16af 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/QuickNavigationCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/QuickNavigationCategory.java @@ -14,11 +14,11 @@ public class QuickNavigationCategory { public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) { return ConfigCategory.createBuilder() - .name(Text.translatable("skyblocker.category.quickNav")) + .name(Text.translatable("skyblocker.config.quickNav")) //Toggle .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.enableQuickNav")) + .name(Text.translatable("skyblocker.config.quickNav.enableQuickNav")) .binding(defaults.quickNav.enableQuickNav, () -> config.quickNav.enableQuickNav, newValue -> config.quickNav.enableQuickNav = newValue) @@ -27,46 +27,46 @@ public class QuickNavigationCategory { //Button 1 .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button", 1)) + .name(Text.translatable("skyblocker.config.quickNav.button", 1)) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.render")) + .name(Text.translatable("skyblocker.config.quickNav.button.render")) .binding(defaults.quickNav.button1.render, () -> config.quickNav.button1.render, newValue -> config.quickNav.button1.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.itemName")) + .name(Text.translatable("skyblocker.config.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.<Integer>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.count")) + .name(Text.translatable("skyblocker.config.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.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.nbt")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.quickNav.button.item.nbt.@Tooltip"))) + .name(Text.translatable("skyblocker.config.quickNav.button.item.nbt")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.quickNav.button.item.nbt.@Tooltip"))) .binding(defaults.quickNav.button1.item.nbt, () -> config.quickNav.button1.item.nbt, newValue -> config.quickNav.button1.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.uiTitle")) + .name(Text.translatable("skyblocker.config.quickNav.button.uiTitle")) .binding(defaults.quickNav.button1.uiTitle, () -> config.quickNav.button1.uiTitle, newValue -> config.quickNav.button1.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.clickEvent")) + .name(Text.translatable("skyblocker.config.quickNav.button.clickEvent")) .binding(defaults.quickNav.button1.clickEvent, () -> config.quickNav.button1.clickEvent, newValue -> config.quickNav.button1.clickEvent = newValue) @@ -76,46 +76,46 @@ public class QuickNavigationCategory { //Button 2 .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button", 2)) + .name(Text.translatable("skyblocker.config.quickNav.button", 2)) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.render")) + .name(Text.translatable("skyblocker.config.quickNav.button.render")) .binding(defaults.quickNav.button2.render, () -> config.quickNav.button2.render, newValue -> config.quickNav.button2.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.itemName")) + .name(Text.translatable("skyblocker.config.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.<Integer>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.count")) + .name(Text.translatable("skyblocker.config.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.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.nbt")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.quickNav.button.item.nbt.@Tooltip"))) + .name(Text.translatable("skyblocker.config.quickNav.button.item.nbt")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.quickNav.button.item.nbt.@Tooltip"))) .binding(defaults.quickNav.button2.item.nbt, () -> config.quickNav.button2.item.nbt, newValue -> config.quickNav.button2.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.uiTitle")) + .name(Text.translatable("skyblocker.config.quickNav.button.uiTitle")) .binding(defaults.quickNav.button2.uiTitle, () -> config.quickNav.button2.uiTitle, newValue -> config.quickNav.button2.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.clickEvent")) + .name(Text.translatable("skyblocker.config.quickNav.button.clickEvent")) .binding(defaults.quickNav.button2.clickEvent, () -> config.quickNav.button2.clickEvent, newValue -> config.quickNav.button2.clickEvent = newValue) @@ -125,46 +125,46 @@ public class QuickNavigationCategory { //Button 3 .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button", 3)) + .name(Text.translatable("skyblocker.config.quickNav.button", 3)) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.render")) + .name(Text.translatable("skyblocker.config.quickNav.button.render")) .binding(defaults.quickNav.button3.render, () -> config.quickNav.button3.render, newValue -> config.quickNav.button3.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.itemName")) + .name(Text.translatable("skyblocker.config.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.<Integer>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.count")) + .name(Text.translatable("skyblocker.config.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.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.nbt")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.quickNav.button.item.nbt.@Tooltip"))) + .name(Text.translatable("skyblocker.config.quickNav.button.item.nbt")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.quickNav.button.item.nbt.@Tooltip"))) .binding(defaults.quickNav.button3.item.nbt, () -> config.quickNav.button3.item.nbt, newValue -> config.quickNav.button3.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.uiTitle")) + .name(Text.translatable("skyblocker.config.quickNav.button.uiTitle")) .binding(defaults.quickNav.button3.uiTitle, () -> config.quickNav.button3.uiTitle, newValue -> config.quickNav.button3.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.clickEvent")) + .name(Text.translatable("skyblocker.config.quickNav.button.clickEvent")) .binding(defaults.quickNav.button3.clickEvent, () -> config.quickNav.button3.clickEvent, newValue -> config.quickNav.button3.clickEvent = newValue) @@ -174,46 +174,46 @@ public class QuickNavigationCategory { //Button 4 .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button", 4)) + .name(Text.translatable("skyblocker.config.quickNav.button", 4)) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.render")) + .name(Text.translatable("skyblocker.config.quickNav.button.render")) .binding(defaults.quickNav.button4.render, () -> config.quickNav.button4.render, newValue -> config.quickNav.button4.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.itemName")) + .name(Text.translatable("skyblocker.config.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.<Integer>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.count")) + .name(Text.translatable("skyblocker.config.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.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.nbt")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.quickNav.button.item.nbt.@Tooltip"))) + .name(Text.translatable("skyblocker.config.quickNav.button.item.nbt")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.quickNav.button.item.nbt.@Tooltip"))) .binding(defaults.quickNav.button4.item.nbt, () -> config.quickNav.button4.item.nbt, newValue -> config.quickNav.button4.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.uiTitle")) + .name(Text.translatable("skyblocker.config.quickNav.button.uiTitle")) .binding(defaults.quickNav.button4.uiTitle, () -> config.quickNav.button4.uiTitle, newValue -> config.quickNav.button4.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.clickEvent")) + .name(Text.translatable("skyblocker.config.quickNav.button.clickEvent")) .binding(defaults.quickNav.button4.clickEvent, () -> config.quickNav.button4.clickEvent, newValue -> config.quickNav.button4.clickEvent = newValue) @@ -223,46 +223,46 @@ public class QuickNavigationCategory { //Button 5 .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button", 5)) + .name(Text.translatable("skyblocker.config.quickNav.button", 5)) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.render")) + .name(Text.translatable("skyblocker.config.quickNav.button.render")) .binding(defaults.quickNav.button5.render, () -> config.quickNav.button5.render, newValue -> config.quickNav.button5.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.itemName")) + .name(Text.translatable("skyblocker.config.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.<Integer>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.count")) + .name(Text.translatable("skyblocker.config.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.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.nbt")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.quickNav.button.item.nbt.@Tooltip"))) + .name(Text.translatable("skyblocker.config.quickNav.button.item.nbt")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.quickNav.button.item.nbt.@Tooltip"))) .binding(defaults.quickNav.button5.item.nbt, () -> config.quickNav.button5.item.nbt, newValue -> config.quickNav.button5.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.uiTitle")) + .name(Text.translatable("skyblocker.config.quickNav.button.uiTitle")) .binding(defaults.quickNav.button5.uiTitle, () -> config.quickNav.button5.uiTitle, newValue -> config.quickNav.button5.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.clickEvent")) + .name(Text.translatable("skyblocker.config.quickNav.button.clickEvent")) .binding(defaults.quickNav.button5.clickEvent, () -> config.quickNav.button5.clickEvent, newValue -> config.quickNav.button5.clickEvent = newValue) @@ -272,46 +272,46 @@ public class QuickNavigationCategory { //Button 6 .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button", 6)) + .name(Text.translatable("skyblocker.config.quickNav.button", 6)) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.render")) + .name(Text.translatable("skyblocker.config.quickNav.button.render")) .binding(defaults.quickNav.button6.render, () -> config.quickNav.button6.render, newValue -> config.quickNav.button6.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.itemName")) + .name(Text.translatable("skyblocker.config.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.<Integer>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.count")) + .name(Text.translatable("skyblocker.config.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.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.nbt")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.quickNav.button.item.nbt.@Tooltip"))) + .name(Text.translatable("skyblocker.config.quickNav.button.item.nbt")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.quickNav.button.item.nbt.@Tooltip"))) .binding(defaults.quickNav.button6.item.nbt, () -> config.quickNav.button6.item.nbt, newValue -> config.quickNav.button6.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.uiTitle")) + .name(Text.translatable("skyblocker.config.quickNav.button.uiTitle")) .binding(defaults.quickNav.button6.uiTitle, () -> config.quickNav.button6.uiTitle, newValue -> config.quickNav.button6.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.clickEvent")) + .name(Text.translatable("skyblocker.config.quickNav.button.clickEvent")) .binding(defaults.quickNav.button6.clickEvent, () -> config.quickNav.button6.clickEvent, newValue -> config.quickNav.button6.clickEvent = newValue) @@ -321,46 +321,46 @@ public class QuickNavigationCategory { //Button 7 .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button", 7)) + .name(Text.translatable("skyblocker.config.quickNav.button", 7)) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.render")) + .name(Text.translatable("skyblocker.config.quickNav.button.render")) .binding(defaults.quickNav.button7.render, () -> config.quickNav.button7.render, newValue -> config.quickNav.button7.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.itemName")) + .name(Text.translatable("skyblocker.config.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.<Integer>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.count")) + .name(Text.translatable("skyblocker.config.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.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.nbt")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.quickNav.button.item.nbt.@Tooltip"))) + .name(Text.translatable("skyblocker.config.quickNav.button.item.nbt")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.quickNav.button.item.nbt.@Tooltip"))) .binding(defaults.quickNav.button7.item.nbt, () -> config.quickNav.button7.item.nbt, newValue -> config.quickNav.button7.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.uiTitle")) + .name(Text.translatable("skyblocker.config.quickNav.button.uiTitle")) .binding(defaults.quickNav.button7.uiTitle, () -> config.quickNav.button7.uiTitle, newValue -> config.quickNav.button7.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.clickEvent")) + .name(Text.translatable("skyblocker.config.quickNav.button.clickEvent")) .binding(defaults.quickNav.button7.clickEvent, () -> config.quickNav.button7.clickEvent, newValue -> config.quickNav.button7.clickEvent = newValue) @@ -370,46 +370,46 @@ public class QuickNavigationCategory { //Button 8 .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button", 8)) + .name(Text.translatable("skyblocker.config.quickNav.button", 8)) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.render")) + .name(Text.translatable("skyblocker.config.quickNav.button.render")) .binding(defaults.quickNav.button8.render, () -> config.quickNav.button8.render, newValue -> config.quickNav.button8.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.itemName")) + .name(Text.translatable("skyblocker.config.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.<Integer>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.count")) + .name(Text.translatable("skyblocker.config.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.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.nbt")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.quickNav.button.item.nbt.@Tooltip"))) + .name(Text.translatable("skyblocker.config.quickNav.button.item.nbt")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.quickNav.button.item.nbt.@Tooltip"))) .binding(defaults.quickNav.button8.item.nbt, () -> config.quickNav.button8.item.nbt, newValue -> config.quickNav.button8.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.uiTitle")) + .name(Text.translatable("skyblocker.config.quickNav.button.uiTitle")) .binding(defaults.quickNav.button8.uiTitle, () -> config.quickNav.button8.uiTitle, newValue -> config.quickNav.button8.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.clickEvent")) + .name(Text.translatable("skyblocker.config.quickNav.button.clickEvent")) .binding(defaults.quickNav.button8.clickEvent, () -> config.quickNav.button8.clickEvent, newValue -> config.quickNav.button8.clickEvent = newValue) @@ -419,46 +419,46 @@ public class QuickNavigationCategory { //Button 9 .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button", 9)) + .name(Text.translatable("skyblocker.config.quickNav.button", 9)) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.render")) + .name(Text.translatable("skyblocker.config.quickNav.button.render")) .binding(defaults.quickNav.button9.render, () -> config.quickNav.button9.render, newValue -> config.quickNav.button9.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.itemName")) + .name(Text.translatable("skyblocker.config.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.<Integer>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.count")) + .name(Text.translatable("skyblocker.config.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.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.nbt")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.quickNav.button.item.nbt.@Tooltip"))) + .name(Text.translatable("skyblocker.config.quickNav.button.item.nbt")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.quickNav.button.item.nbt.@Tooltip"))) .binding(defaults.quickNav.button9.item.nbt, () -> config.quickNav.button9.item.nbt, newValue -> config.quickNav.button9.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.uiTitle")) + .name(Text.translatable("skyblocker.config.quickNav.button.uiTitle")) .binding(defaults.quickNav.button9.uiTitle, () -> config.quickNav.button9.uiTitle, newValue -> config.quickNav.button9.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.clickEvent")) + .name(Text.translatable("skyblocker.config.quickNav.button.clickEvent")) .binding(defaults.quickNav.button9.clickEvent, () -> config.quickNav.button9.clickEvent, newValue -> config.quickNav.button9.clickEvent = newValue) @@ -468,46 +468,46 @@ public class QuickNavigationCategory { //Button 10 .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button", 10)) + .name(Text.translatable("skyblocker.config.quickNav.button", 10)) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.render")) + .name(Text.translatable("skyblocker.config.quickNav.button.render")) .binding(defaults.quickNav.button10.render, () -> config.quickNav.button10.render, newValue -> config.quickNav.button10.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.itemName")) + .name(Text.translatable("skyblocker.config.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.<Integer>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.count")) + .name(Text.translatable("skyblocker.config.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.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.nbt")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.quickNav.button.item.nbt.@Tooltip"))) + .name(Text.translatable("skyblocker.config.quickNav.button.item.nbt")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.quickNav.button.item.nbt.@Tooltip"))) .binding(defaults.quickNav.button10.item.nbt, () -> config.quickNav.button10.item.nbt, newValue -> config.quickNav.button10.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.uiTitle")) + .name(Text.translatable("skyblocker.config.quickNav.button.uiTitle")) .binding(defaults.quickNav.button10.uiTitle, () -> config.quickNav.button10.uiTitle, newValue -> config.quickNav.button10.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.clickEvent")) + .name(Text.translatable("skyblocker.config.quickNav.button.clickEvent")) .binding(defaults.quickNav.button10.clickEvent, () -> config.quickNav.button10.clickEvent, newValue -> config.quickNav.button10.clickEvent = newValue) @@ -517,46 +517,46 @@ public class QuickNavigationCategory { //Button 11 .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button", 11)) + .name(Text.translatable("skyblocker.config.quickNav.button", 11)) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.render")) + .name(Text.translatable("skyblocker.config.quickNav.button.render")) .binding(defaults.quickNav.button11.render, () -> config.quickNav.button11.render, newValue -> config.quickNav.button11.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.itemName")) + .name(Text.translatable("skyblocker.config.quickNav.button.item.itemName")) .binding(defaults.quickNav.button11.item.itemName, () -> config.quickNav.button11.item.itemName, newValue -> config.quickNav.button11.item.itemName = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<Integer>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.count")) + .name(Text.translatable("skyblocker.config.quickNav.button.item.count")) .binding(defaults.quickNav.button11.item.count, () -> config.quickNav.button11.item.count, newValue -> config.quickNav.button11.item.count = newValue) .controller(opt -> IntegerFieldControllerBuilder.create(opt).range(1, 64)) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.nbt")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.quickNav.button.item.nbt.@Tooltip"))) + .name(Text.translatable("skyblocker.config.quickNav.button.item.nbt")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.quickNav.button.item.nbt.@Tooltip"))) .binding(defaults.quickNav.button11.item.nbt, () -> config.quickNav.button11.item.nbt, newValue -> config.quickNav.button11.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.uiTitle")) + .name(Text.translatable("skyblocker.config.quickNav.button.uiTitle")) .binding(defaults.quickNav.button11.uiTitle, () -> config.quickNav.button11.uiTitle, newValue -> config.quickNav.button11.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.clickEvent")) + .name(Text.translatable("skyblocker.config.quickNav.button.clickEvent")) .binding(defaults.quickNav.button11.clickEvent, () -> config.quickNav.button11.clickEvent, newValue -> config.quickNav.button11.clickEvent = newValue) @@ -566,46 +566,46 @@ public class QuickNavigationCategory { //Button 12 .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button", 12)) + .name(Text.translatable("skyblocker.config.quickNav.button", 12)) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.render")) + .name(Text.translatable("skyblocker.config.quickNav.button.render")) .binding(defaults.quickNav.button12.render, () -> config.quickNav.button12.render, newValue -> config.quickNav.button12.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.itemName")) + .name(Text.translatable("skyblocker.config.quickNav.button.item.itemName")) .binding(defaults.quickNav.button12.item.itemName, () -> config.quickNav.button12.item.itemName, newValue -> config.quickNav.button12.item.itemName = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<Integer>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.count")) + .name(Text.translatable("skyblocker.config.quickNav.button.item.count")) .binding(defaults.quickNav.button12.item.count, () -> config.quickNav.button12.item.count, newValue -> config.quickNav.button12.item.count = newValue) .controller(opt -> IntegerFieldControllerBuilder.create(opt).range(1, 64)) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.item.nbt")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.quickNav.button.item.nbt.@Tooltip"))) + .name(Text.translatable("skyblocker.config.quickNav.button.item.nbt")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.quickNav.button.item.nbt.@Tooltip"))) .binding(defaults.quickNav.button12.item.nbt, () -> config.quickNav.button12.item.nbt, newValue -> config.quickNav.button12.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.uiTitle")) + .name(Text.translatable("skyblocker.config.quickNav.button.uiTitle")) .binding(defaults.quickNav.button12.uiTitle, () -> config.quickNav.button12.uiTitle, newValue -> config.quickNav.button12.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("skyblocker.option.quickNav.button.clickEvent")) + .name(Text.translatable("skyblocker.config.quickNav.button.clickEvent")) .binding(defaults.quickNav.button12.clickEvent, () -> config.quickNav.button12.clickEvent, newValue -> config.quickNav.button12.clickEvent = newValue) 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 196baa85..8bb22c14 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/SlayersCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/SlayersCategory.java @@ -15,28 +15,28 @@ public class SlayersCategory { public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) { return ConfigCategory.createBuilder() - .name(Text.translatable("skyblocker.category.slayer")) + .name(Text.translatable("skyblocker.config.slayer")) //Enderman Slayer .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.slayer.endermanSlayer")) + .name(Text.translatable("skyblocker.config.slayer.endermanSlayer")) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.slayer.endermanSlayer.enableYangGlyphsNotification")) + .name(Text.translatable("skyblocker.config.slayer.endermanSlayer.enableYangGlyphsNotification")) .binding(defaults.slayer.endermanSlayer.enableYangGlyphsNotification, () -> config.slayer.endermanSlayer.enableYangGlyphsNotification, newValue -> config.slayer.endermanSlayer.enableYangGlyphsNotification = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.slayer.endermanSlayer.highlightBeacons")) + .name(Text.translatable("skyblocker.config.slayer.endermanSlayer.highlightBeacons")) .binding(defaults.slayer.endermanSlayer.highlightBeacons, () -> config.slayer.endermanSlayer.highlightBeacons, newValue -> config.slayer.endermanSlayer.highlightBeacons = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.slayer.endermanSlayer.highlightNukekubiHeads")) + .name(Text.translatable("skyblocker.config.slayer.endermanSlayer.highlightNukekubiHeads")) .binding(defaults.slayer.endermanSlayer.highlightNukekubiHeads, () -> config.slayer.endermanSlayer.highlightNukekubiHeads, newValue -> config.slayer.endermanSlayer.highlightNukekubiHeads = newValue) @@ -46,91 +46,91 @@ public class SlayersCategory { //Vampire Slayer .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.slayer.vampireSlayer")) + .name(Text.translatable("skyblocker.config.slayer.vampireSlayer")) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.slayer.vampireSlayer.enableEffigyWaypoints")) + .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.enableEffigyWaypoints")) .binding(defaults.slayer.vampireSlayer.enableEffigyWaypoints, () -> config.slayer.vampireSlayer.enableEffigyWaypoints, newValue -> config.slayer.vampireSlayer.enableEffigyWaypoints = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.slayer.vampireSlayer.compactEffigyWaypoints")) + .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.compactEffigyWaypoints")) .binding(defaults.slayer.vampireSlayer.compactEffigyWaypoints, () -> config.slayer.vampireSlayer.compactEffigyWaypoints, newValue -> config.slayer.vampireSlayer.compactEffigyWaypoints = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Integer>createBuilder() - .name(Text.translatable("skyblocker.option.slayer.vampireSlayer.effigyUpdateFrequency")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.slayer.vampireSlayer.effigyUpdateFrequency.@Tooltip"))) + .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) .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(1, 10).step(1)) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.slayer.vampireSlayer.enableHolyIceIndicator")) + .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.enableHolyIceIndicator")) .binding(defaults.slayer.vampireSlayer.enableHolyIceIndicator, () -> config.slayer.vampireSlayer.enableHolyIceIndicator, newValue -> config.slayer.vampireSlayer.enableHolyIceIndicator = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Integer>createBuilder() - .name(Text.translatable("skyblocker.option.slayer.vampireSlayer.holyIceIndicatorTickDelay")) + .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.holyIceIndicatorTickDelay")) .binding(defaults.slayer.vampireSlayer.holyIceIndicatorTickDelay, () -> config.slayer.vampireSlayer.holyIceIndicatorTickDelay, newValue -> config.slayer.vampireSlayer.holyIceIndicatorTickDelay = newValue) .controller(IntegerFieldControllerBuilder::create) .build()) .option(Option.<Integer>createBuilder() - .name(Text.translatable("skyblocker.option.slayer.vampireSlayer.holyIceUpdateFrequency")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.slayer.vampireSlayer.holyIceUpdateFrequency.@Tooltip"))) + .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) .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(1, 10).step(1)) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.slayer.vampireSlayer.enableHealingMelonIndicator")) + .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.enableHealingMelonIndicator")) .binding(defaults.slayer.vampireSlayer.enableHealingMelonIndicator, () -> config.slayer.vampireSlayer.enableHealingMelonIndicator, newValue -> config.slayer.vampireSlayer.enableHealingMelonIndicator = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Float>createBuilder() - .name(Text.translatable("skyblocker.option.slayer.vampireSlayer.healingMelonHealthThreshold")) + .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.healingMelonHealthThreshold")) .binding(defaults.slayer.vampireSlayer.healingMelonHealthThreshold, () -> config.slayer.vampireSlayer.healingMelonHealthThreshold, newValue -> config.slayer.vampireSlayer.healingMelonHealthThreshold = newValue) .controller(FloatFieldControllerBuilder::create) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.slayer.vampireSlayer.enableSteakStakeIndicator")) + .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.enableSteakStakeIndicator")) .binding(defaults.slayer.vampireSlayer.enableSteakStakeIndicator, () -> config.slayer.vampireSlayer.enableSteakStakeIndicator, newValue -> config.slayer.vampireSlayer.enableSteakStakeIndicator = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Integer>createBuilder() - .name(Text.translatable("skyblocker.option.slayer.vampireSlayer.steakStakeUpdateFrequency")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.slayer.vampireSlayer.steakStakeUpdateFrequency.@Tooltip"))) + .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) .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(1, 10).step(1)) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.slayer.vampireSlayer.enableManiaIndicator")) + .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.enableManiaIndicator")) .binding(defaults.slayer.vampireSlayer.enableManiaIndicator, () -> config.slayer.vampireSlayer.enableManiaIndicator, newValue -> config.slayer.vampireSlayer.enableManiaIndicator = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Integer>createBuilder() - .name(Text.translatable("skyblocker.option.slayer.vampireSlayer.maniaUpdateFrequency")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.slayer.vampireSlayer.maniaUpdateFrequency.@Tooltip"))) + .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) 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 f59991c7..fd638198 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java @@ -17,19 +17,19 @@ import net.minecraft.util.Formatting; public class UIAndVisualsCategory { public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) { return ConfigCategory.createBuilder() - .name(Text.translatable("skyblocker.category.useinterfaceandvisuals")) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals")) //Ungrouped Options .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.compactorDeletorPreview")) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.compactorDeletorPreview")) .binding(defaults.uiAndVisuals.compactorDeletorPreview, () -> config.uiAndVisuals.compactorDeletorPreview, newValue -> config.uiAndVisuals.compactorDeletorPreview = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.dontStripSkinAlphaValues")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.dontStripSkinAlphaValues.@Tooltip"))) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.dontStripSkinAlphaValues")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.userInterfaceAndVisuals.dontStripSkinAlphaValues.@Tooltip"))) .binding(defaults.uiAndVisuals.dontStripSkinAlphaValues, () -> config.uiAndVisuals.dontStripSkinAlphaValues, newValue -> config.uiAndVisuals.dontStripSkinAlphaValues = newValue) @@ -37,14 +37,14 @@ public class UIAndVisualsCategory { .flag(OptionFlag.ASSET_RELOAD) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.backpackPreviewWithoutShift")) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.backpackPreviewWithoutShift")) .binding(defaults.uiAndVisuals.backpackPreviewWithoutShift, () -> config.uiAndVisuals.backpackPreviewWithoutShift, newValue -> config.uiAndVisuals.backpackPreviewWithoutShift = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.fancyCraftingTable")) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.fancyCraftingTable")) .binding(defaults.uiAndVisuals.fancyCraftingTable, () -> config.uiAndVisuals.fancyCraftingTable, newValue -> config.uiAndVisuals.fancyCraftingTable = newValue) @@ -53,26 +53,26 @@ public class UIAndVisualsCategory { //Chest Value FIXME change dropdown to color controller .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.general.chestValue")) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.chestValue")) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.chestValue.enableChestValue")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.chestValue.enableChestValue.@Tooltip"))) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.chestValue.enableChestValue")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.userInterfaceAndVisuals.chestValue.enableChestValue.@Tooltip"))) .binding(defaults.uiAndVisuals.chestValue.enableChestValue, () -> config.uiAndVisuals.chestValue.enableChestValue, newValue -> config.uiAndVisuals.chestValue.enableChestValue = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Formatting>createBuilder() - .name(Text.translatable("skyblocker.option.general.chestValue.color")) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.chestValue.color")) .binding(defaults.uiAndVisuals.chestValue.color, () -> config.uiAndVisuals.chestValue.color, newValue -> config.uiAndVisuals.chestValue.color = newValue) .controller(ConfigUtils.getEnumDropdownControllerFactory(ConfigUtils.FORMATTING_FORMATTER)) .build()) .option(Option.<Formatting>createBuilder() - .name(Text.translatable("skyblocker.option.general.chestValue.incompleteColor")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.chestValue.incompleteColor.@Tooltip"))) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.chestValue.incompleteColor")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.userInterfaceAndVisuals.chestValue.incompleteColor.@Tooltip"))) .binding(defaults.uiAndVisuals.chestValue.incompleteColor, () -> config.uiAndVisuals.chestValue.incompleteColor, newValue -> config.uiAndVisuals.chestValue.incompleteColor = newValue) @@ -82,10 +82,10 @@ public class UIAndVisualsCategory { //Item Cooldown .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.general.itemCooldown")) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.itemCooldown")) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.itemCooldown.enableItemCooldowns")) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.itemCooldown.enableItemCooldowns")) .binding(defaults.uiAndVisuals.itemCooldown.enableItemCooldowns, () -> config.uiAndVisuals.itemCooldown.enableItemCooldowns, newValue -> config.uiAndVisuals.itemCooldown.enableItemCooldowns = newValue) @@ -95,18 +95,18 @@ public class UIAndVisualsCategory { //Title Container .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.general.titleContainer")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.titleContainer.@Tooltip"))) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.titleContainer")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.userInterfaceAndVisuals.titleContainer.@Tooltip"))) .collapsed(true) .option(Option.<Float>createBuilder() - .name(Text.translatable("skyblocker.option.general.titleContainer.titleContainerScale")) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.titleContainer.titleContainerScale")) .binding(defaults.uiAndVisuals.titleContainer.titleContainerScale, () -> config.uiAndVisuals.titleContainer.titleContainerScale, newValue -> config.uiAndVisuals.titleContainer.titleContainerScale = newValue) .controller(opt -> FloatFieldControllerBuilder.create(opt).range(30f, 140f)) .build()) .option(ButtonOption.createBuilder() - .name(Text.translatable("skyblocker.option.general.titleContainer.config")) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.titleContainer.config")) .text(Text.translatable("text.skyblocker.open")) .action((screen, opt) -> MinecraftClient.getInstance().setScreen(new TitleContainerConfigScreen(screen))) .build()) @@ -114,42 +114,42 @@ public class UIAndVisualsCategory { //Tab Hud .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.general.tabHud")) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.tabHud")) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.tabHud.tabHudEnabled")) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.tabHud.tabHudEnabled")) .binding(defaults.uiAndVisuals.tabHud.tabHudEnabled, () -> config.uiAndVisuals.tabHud.tabHudEnabled, newValue -> config.uiAndVisuals.tabHud.tabHudEnabled = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Integer>createBuilder() - .name(Text.translatable("skyblocker.option.general.tabHud.tabHudScale")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.tabHud.tabHudScale.@Tooltip"))) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.tabHud.tabHudScale")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.userInterfaceAndVisuals.tabHud.tabHudScale.@Tooltip"))) .binding(defaults.uiAndVisuals.tabHud.tabHudScale, () -> config.uiAndVisuals.tabHud.tabHudScale, newValue -> config.uiAndVisuals.tabHud.tabHudScale = newValue) .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(10, 200).step(1)) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.tabHud.enableHudBackground")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.tabHud.enableHudBackground.@Tooltip"))) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.tabHud.enableHudBackground")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.userInterfaceAndVisuals.tabHud.enableHudBackground.@Tooltip"))) .binding(defaults.uiAndVisuals.tabHud.enableHudBackground, () -> config.uiAndVisuals.tabHud.enableHudBackground, newValue -> config.uiAndVisuals.tabHud.enableHudBackground = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.tabHud.plainPlayerNames")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.tabHud.plainPlayerNames.@Tooltip"))) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.tabHud.plainPlayerNames")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.userInterfaceAndVisuals.tabHud.plainPlayerNames.@Tooltip"))) .binding(defaults.uiAndVisuals.tabHud.plainPlayerNames, () -> config.uiAndVisuals.tabHud.plainPlayerNames, newValue -> config.uiAndVisuals.tabHud.plainPlayerNames = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<UIAndVisualsConfig.NameSorting>createBuilder() - .name(Text.translatable("skyblocker.option.general.tabHud.nameSorting")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.tabHud.nameSorting.@Tooltip"))) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.tabHud.nameSorting")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.userInterfaceAndVisuals.tabHud.nameSorting.@Tooltip"))) .binding(defaults.uiAndVisuals.tabHud.nameSorting, () -> config.uiAndVisuals.tabHud.nameSorting, newValue -> config.uiAndVisuals.tabHud.nameSorting = newValue) @@ -159,17 +159,17 @@ public class UIAndVisualsCategory { // Fancy Auction House .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.general.fancyAuctionHouse")) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.fancyAuctionHouse")) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.fancyAuctionHouse.enabled")) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.fancyAuctionHouse.enabled")) .binding(defaults.uiAndVisuals.fancyAuctionHouse.enabled, () -> config.uiAndVisuals.fancyAuctionHouse.enabled, newValue -> config.uiAndVisuals.fancyAuctionHouse.enabled = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.fancyAuctionHouse.highlightUnderAvgPrice")) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.fancyAuctionHouse.highlightUnderAvgPrice")) .binding(defaults.uiAndVisuals.fancyAuctionHouse.highlightCheapBIN, () -> config.uiAndVisuals.fancyAuctionHouse.highlightCheapBIN, newValue -> config.uiAndVisuals.fancyAuctionHouse.highlightCheapBIN = newValue) @@ -179,17 +179,17 @@ public class UIAndVisualsCategory { //Fancy Bars .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.general.bars")) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.bars")) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.bars.enableBars")) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.bars.enableBars")) .binding(defaults.uiAndVisuals.bars.enableBars, () -> config.uiAndVisuals.bars.enableBars, newValue -> config.uiAndVisuals.bars.enableBars = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(ButtonOption.createBuilder() - .name(Text.translatable("skyblocker.bars.config.openScreen")) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.bars.openScreen")) .text(Text.translatable("text.skyblocker.open")) .action((screen, opt) -> MinecraftClient.getInstance().setScreen(new StatusBarsConfigScreen())) .build()) @@ -197,18 +197,19 @@ public class UIAndVisualsCategory { //Waypoints .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.general.waypoints")) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.waypoints")) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.waypoints.enableWaypoints")) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.waypoints.enableWaypoints")) .binding(defaults.uiAndVisuals.waypoints.enableWaypoints, () -> config.uiAndVisuals.waypoints.enableWaypoints, newValue -> config.uiAndVisuals.waypoints.enableWaypoints = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Waypoint.Type>createBuilder() - .name(Text.translatable("skyblocker.option.general.waypoints.waypointType")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.waypoints.waypointType.@Tooltip"), Text.translatable("skyblocker.option.general.waypoints.waypointType.generalNote"))) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.waypoints.waypointType")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.userInterfaceAndVisuals.waypoints.waypointType.@Tooltip"), + Text.translatable("skyblocker.config.userInterfaceAndVisuals.waypoints.waypointType"))) .binding(defaults.uiAndVisuals.waypoints.waypointType, () -> config.uiAndVisuals.waypoints.waypointType, newValue -> config.uiAndVisuals.waypoints.waypointType = newValue) @@ -218,45 +219,45 @@ public class UIAndVisualsCategory { //Teleport Overlays .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.general.teleportOverlay")) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.teleportOverlay")) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.teleportOverlay.enableTeleportOverlays")) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.teleportOverlay.enableTeleportOverlays")) .binding(defaults.uiAndVisuals.teleportOverlay.enableTeleportOverlays, () -> config.uiAndVisuals.teleportOverlay.enableTeleportOverlays, newValue -> config.uiAndVisuals.teleportOverlay.enableTeleportOverlays = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.teleportOverlay.enableWeirdTransmission")) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.teleportOverlay.enableWeirdTransmission")) .binding(defaults.uiAndVisuals.teleportOverlay.enableWeirdTransmission, () -> config.uiAndVisuals.teleportOverlay.enableWeirdTransmission, newValue -> config.uiAndVisuals.teleportOverlay.enableWeirdTransmission = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.teleportOverlay.enableInstantTransmission")) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.teleportOverlay.enableInstantTransmission")) .binding(defaults.uiAndVisuals.teleportOverlay.enableInstantTransmission, () -> config.uiAndVisuals.teleportOverlay.enableInstantTransmission, newValue -> config.uiAndVisuals.teleportOverlay.enableInstantTransmission = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.teleportOverlay.enableEtherTransmission")) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.teleportOverlay.enableEtherTransmission")) .binding(defaults.uiAndVisuals.teleportOverlay.enableEtherTransmission, () -> config.uiAndVisuals.teleportOverlay.enableEtherTransmission, newValue -> config.uiAndVisuals.teleportOverlay.enableEtherTransmission = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.teleportOverlay.enableSinrecallTransmission")) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.teleportOverlay.enableSinrecallTransmission")) .binding(defaults.uiAndVisuals.teleportOverlay.enableSinrecallTransmission, () -> config.uiAndVisuals.teleportOverlay.enableSinrecallTransmission, newValue -> config.uiAndVisuals.teleportOverlay.enableSinrecallTransmission = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.teleportOverlay.enableWitherImpact")) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.teleportOverlay.enableWitherImpact")) .binding(defaults.uiAndVisuals.teleportOverlay.enableWitherImpact, () -> config.uiAndVisuals.teleportOverlay.enableWitherImpact, newValue -> config.uiAndVisuals.teleportOverlay.enableWitherImpact = newValue) @@ -266,51 +267,51 @@ public class UIAndVisualsCategory { //Search overlay .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.general.searchOverlay")) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.searchOverlay")) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.searchOverlay.enableBazaar")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.searchOverlay.enableBazaar.@Tooltip"))) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.searchOverlay.enableBazaar")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.userInterfaceAndVisuals.searchOverlay.enableBazaar.@Tooltip"))) .binding(defaults.uiAndVisuals.searchOverlay.enableBazaar, () -> config.uiAndVisuals.searchOverlay.enableBazaar, newValue -> config.uiAndVisuals.searchOverlay.enableBazaar = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.searchOverlay.enableAuctionHouse")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.searchOverlay.enableAuctionHouse.@Tooltip"))) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.searchOverlay.enableAuctionHouse")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.userInterfaceAndVisuals.searchOverlay.enableAuctionHouse.@Tooltip"))) .binding(defaults.uiAndVisuals.searchOverlay.enableAuctionHouse, () -> config.uiAndVisuals.searchOverlay.enableAuctionHouse, newValue -> config.uiAndVisuals.searchOverlay.enableAuctionHouse = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.searchOverlay.keepPreviousSearches")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.searchOverlay.keepPreviousSearches.@Tooltip"))) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.searchOverlay.keepPreviousSearches")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.userInterfaceAndVisuals.searchOverlay.keepPreviousSearches.@Tooltip"))) .binding(defaults.uiAndVisuals.searchOverlay.keepPreviousSearches, () -> config.uiAndVisuals.searchOverlay.keepPreviousSearches, newValue -> config.uiAndVisuals.searchOverlay.keepPreviousSearches = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Integer>createBuilder() - .name(Text.translatable("skyblocker.option.general.searchOverlay.maxSuggestions")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.searchOverlay.maxSuggestions.@Tooltip"))) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.searchOverlay.maxSuggestions")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.userInterfaceAndVisuals.searchOverlay.maxSuggestions.@Tooltip"))) .binding(defaults.uiAndVisuals.searchOverlay.maxSuggestions, () -> config.uiAndVisuals.searchOverlay.maxSuggestions, newValue -> config.uiAndVisuals.searchOverlay.maxSuggestions = newValue) .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(0, 5).step(1)) .build()) .option(Option.<Integer>createBuilder() - .name(Text.translatable("skyblocker.option.general.searchOverlay.historyLength")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.searchOverlay.historyLength.@Tooltip"))) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.searchOverlay.historyLength")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.userInterfaceAndVisuals.searchOverlay.historyLength.@Tooltip"))) .binding(defaults.uiAndVisuals.searchOverlay.historyLength, () -> config.uiAndVisuals.searchOverlay.historyLength, newValue -> config.uiAndVisuals.searchOverlay.historyLength = newValue) .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(0, 5).step(1)) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.option.general.searchOverlay.enableCommands")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.searchOverlay.enableCommands.@Tooltip"))) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.searchOverlay.enableCommands")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.userInterfaceAndVisuals.searchOverlay.enableCommands.@Tooltip"))) .binding(defaults.uiAndVisuals.searchOverlay.enableCommands, () -> config.uiAndVisuals.searchOverlay.enableCommands, newValue -> config.uiAndVisuals.searchOverlay.enableCommands = newValue) @@ -320,19 +321,19 @@ public class UIAndVisualsCategory { //Flame Overlay .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.option.general.flameOverlay")) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.flameOverlay")) .collapsed(true) .option(Option.<Integer>createBuilder() - .name(Text.translatable("skyblocker.option.general.flameOverlay.flameHeight")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.flameOverlay.flameHeight.@Tooltip"))) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.flameOverlay.flameHeight")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.userInterfaceAndVisuals.flameOverlay.flameHeight.@Tooltip"))) .binding(defaults.uiAndVisuals.flameOverlay.flameHeight, () -> config.uiAndVisuals.flameOverlay.flameHeight, newValue -> config.uiAndVisuals.flameOverlay.flameHeight = newValue) .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(0, 100).step(1)) .build()) .option(Option.<Integer>createBuilder() - .name(Text.translatable("skyblocker.option.general.flameOverlay.flameOpacity")) - .description(OptionDescription.of(Text.translatable("skyblocker.option.general.flameOverlay.flameOpacity.@Tooltip"))) + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.flameOverlay.flameOpacity")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.userInterfaceAndVisuals.flameOverlay.flameOpacity.@Tooltip"))) .binding(defaults.uiAndVisuals.flameOverlay.flameOpacity, () -> config.uiAndVisuals.flameOverlay.flameOpacity, newValue -> config.uiAndVisuals.flameOverlay.flameOpacity = newValue) 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 f4e65e36..a899d6ed 100644 --- a/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java @@ -135,7 +135,7 @@ public class GeneralConfig { @Override public String toString() { - return I18n.translate("skyblocker.option.general.itemTooltip.avg." + name()); + return I18n.translate("skyblocker.config.general.itemTooltip.avg." + name()); } } 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 de321431..ed0857e0 100644 --- a/src/main/java/de/hysky/skyblocker/config/configs/MiscConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/configs/MiscConfig.java @@ -29,7 +29,7 @@ public class MiscConfig { @Override public String toString() { - return I18n.translate("skyblocker.option.richPresence.info." + name()); + return I18n.translate("skyblocker.config.misc.richPresence.info." + name()); } } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java b/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java index a10e69ce..7f8b2c71 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java @@ -57,7 +57,7 @@ public class ChestValue { ); }) .dimensions(((HandledScreenAccessor) genericContainerScreen).getX() + ((HandledScreenAccessor) genericContainerScreen).getBackgroundWidth() - 16, ((HandledScreenAccessor) genericContainerScreen).getY() + 4, 12, 12) - .tooltip(Tooltip.of(Text.translatable("skyblocker.option.general.chestValue.@Tooltip"))) + .tooltip(Tooltip.of(Text.translatable("skyblocker.config.general.chestValue.@Tooltip"))) .build() ); } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleConfigScreen.java index 634ea932..3c6cfa1b 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleConfigScreen.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleConfigScreen.java @@ -24,13 +24,13 @@ public class ChatRuleConfigScreen extends Screen { private static final int SPACER_Y = 25; private final Map<MutableText, SoundEvent> soundsLookup = Map.ofEntries( - entry(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.pling"), SoundEvents.BLOCK_NOTE_BLOCK_PLING.value()), - entry(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.cave"), SoundEvents.AMBIENT_CAVE.value()), - entry(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.zombie"), SoundEvents.ENTITY_ZOMBIE_AMBIENT), - entry(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.crit"), SoundEvents.ENTITY_PLAYER_ATTACK_CRIT), - entry(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.arrowHit"), SoundEvents.ENTITY_ARROW_HIT_PLAYER), - entry(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.amethyst"), SoundEvents.BLOCK_AMETHYST_BLOCK_HIT), - entry(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.anvil"), SoundEvents.BLOCK_ANVIL_LAND) + entry(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.sounds.pling"), SoundEvents.BLOCK_NOTE_BLOCK_PLING.value()), + entry(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.sounds.cave"), SoundEvents.AMBIENT_CAVE.value()), + entry(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.sounds.zombie"), SoundEvents.ENTITY_ZOMBIE_AMBIENT), + entry(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.sounds.crit"), SoundEvents.ENTITY_PLAYER_ATTACK_CRIT), + entry(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.sounds.arrowHit"), SoundEvents.ENTITY_ARROW_HIT_PLAYER), + entry(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.sounds.amethyst"), SoundEvents.BLOCK_AMETHYST_BLOCK_HIT), + entry(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.sounds.anvil"), SoundEvents.BLOCK_ANVIL_LAND) ); private int buttonWidth = 75; @@ -69,7 +69,7 @@ public class ChatRuleConfigScreen extends Screen { private final Screen parent; public ChatRuleConfigScreen(Screen parent, int chatRuleIndex) { - super(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen")); + super(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen")); this.chatRuleIndex = chatRuleIndex; this.chatRule = ChatRulesHandler.chatRuleList.get(chatRuleIndex); this.parent = parent; @@ -101,63 +101,63 @@ public class ChatRuleConfigScreen extends Screen { int lineXOffset; nameLabelTextPos = currentPos; - lineXOffset = client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.name")) + SPACER_X; + lineXOffset = client.textRenderer.getWidth(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.name")) + SPACER_X; nameInput = new TextFieldWidget(client.textRenderer, currentPos.leftInt() + lineXOffset, currentPos.rightInt(), 100, 20, Text.of("")); nameInput.setText(chatRule.getName()); - nameInput.setTooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.name.@Tooltip"))); + nameInput.setTooltip(Tooltip.of(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.name.@Tooltip"))); currentPos = IntIntPair.of(currentPos.leftInt(), currentPos.rightInt() + SPACER_Y); inputsLabelTextPos = currentPos; currentPos = IntIntPair.of(currentPos.leftInt() + 10, currentPos.rightInt() + SPACER_Y); filterLabelTextPos = currentPos; - lineXOffset = client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.filter")) + SPACER_X; + lineXOffset = client.textRenderer.getWidth(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.filter")) + SPACER_X; filterInput = new TextFieldWidget(client.textRenderer, currentPos.leftInt() + lineXOffset, currentPos.rightInt(), 200, 20, Text.of("")); filterInput.setMaxLength(96); filterInput.setText(chatRule.getFilter()); - filterInput.setTooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.filter.@Tooltip"))); + filterInput.setTooltip(Tooltip.of(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.filter.@Tooltip"))); currentPos = IntIntPair.of(currentPos.leftInt(),currentPos.rightInt() + SPACER_Y); lineXOffset = 0; partialMatchTextPos = IntIntPair.of(currentPos.leftInt() + lineXOffset, currentPos.rightInt()); - lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.partialMatch")) + SPACER_X; + lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.partialMatch")) + SPACER_X; partialMatchToggle = ButtonWidget.builder(enabledButtonText(chatRule.getPartialMatch()), a -> { chatRule.setPartialMatch(!chatRule.getPartialMatch()); partialMatchToggle.setMessage(enabledButtonText(chatRule.getPartialMatch())); }) .position(currentPos.leftInt() + lineXOffset, currentPos.rightInt()) .size(buttonWidth,20) - .tooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.partialMatch.@Tooltip"))) + .tooltip(Tooltip.of(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.partialMatch.@Tooltip"))) .build(); lineXOffset += buttonWidth + SPACER_X; regexTextPos = IntIntPair.of(currentPos.leftInt() + lineXOffset,currentPos.rightInt()); - lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.regex")) + SPACER_X; + lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.regex")) + SPACER_X; regexToggle = ButtonWidget.builder(enabledButtonText(chatRule.getRegex()), a -> { chatRule.setRegex(!chatRule.getRegex()); regexToggle.setMessage(enabledButtonText(chatRule.getRegex())); }) .position(currentPos.leftInt() + lineXOffset, currentPos.rightInt()) .size(buttonWidth,20) - .tooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.regex.@Tooltip"))) + .tooltip(Tooltip.of(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.regex.@Tooltip"))) .build(); lineXOffset += buttonWidth + SPACER_X; ignoreCaseTextPos = IntIntPair.of(currentPos.leftInt() + lineXOffset,currentPos.rightInt()); - lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.ignoreCase")) + SPACER_X; + lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.ignoreCase")) + SPACER_X; ignoreCaseToggle = ButtonWidget.builder(enabledButtonText(chatRule.getIgnoreCase()), a -> { chatRule.setIgnoreCase(!chatRule.getIgnoreCase()); ignoreCaseToggle.setMessage(enabledButtonText(chatRule.getIgnoreCase())); }) .position(currentPos.leftInt() + lineXOffset, currentPos.rightInt()) .size(buttonWidth,20) - .tooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.ignoreCase.@Tooltip"))) + .tooltip(Tooltip.of(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.ignoreCase.@Tooltip"))) .build(); currentPos = IntIntPair.of(currentPos.leftInt(), currentPos.rightInt() + SPACER_Y); locationLabelTextPos = currentPos; - lineXOffset = client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.locations")) + SPACER_X; + lineXOffset = client.textRenderer.getWidth(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.locations")) + SPACER_X; locationsInput = new TextFieldWidget(client.textRenderer, currentPos.leftInt() + lineXOffset, currentPos.rightInt(), 200, 20, Text.of("")); locationsInput.setText(chatRule.getValidLocations()); - MutableText locationToolTip = Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.locations.@Tooltip"); + MutableText locationToolTip = Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.locations.@Tooltip"); locationToolTip.append("\n"); ChatRulesHandler.locationsList.forEach(location -> locationToolTip.append(" " + location + ",\n")); locationsInput.setTooltip(Tooltip.of(locationToolTip)); @@ -167,42 +167,42 @@ public class ChatRuleConfigScreen extends Screen { currentPos = IntIntPair.of(currentPos.leftInt(), currentPos.rightInt() + SPACER_Y); hideMessageTextPos = currentPos; - lineXOffset = client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.hideMessage")) + SPACER_X; + lineXOffset = client.textRenderer.getWidth(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.hideMessage")) + SPACER_X; hideMessageToggle = ButtonWidget.builder(enabledButtonText(chatRule.getHideMessage()), a -> { chatRule.setHideMessage(!chatRule.getHideMessage()); hideMessageToggle.setMessage(enabledButtonText(chatRule.getHideMessage())); }) .position(currentPos.leftInt() + lineXOffset, currentPos.rightInt()) .size(buttonWidth,20) - .tooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.hideMessage.@Tooltip"))) + .tooltip(Tooltip.of(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.hideMessage.@Tooltip"))) .build(); lineXOffset += buttonWidth + SPACER_X; actionBarTextPos = IntIntPair.of(currentPos.leftInt() + lineXOffset,currentPos.rightInt()); - lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.actionBar")) + SPACER_X; + lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.actionBar")) + SPACER_X; actionBarToggle = ButtonWidget.builder(enabledButtonText(chatRule.getShowActionBar()), a -> { chatRule.setShowActionBar(!chatRule.getShowActionBar()); actionBarToggle.setMessage(enabledButtonText(chatRule.getShowActionBar())); }) .position(currentPos.leftInt() + lineXOffset, currentPos.rightInt()) .size(buttonWidth,20) - .tooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.actionBar.@Tooltip"))) + .tooltip(Tooltip.of(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.actionBar.@Tooltip"))) .build(); lineXOffset = 0; currentPos = IntIntPair.of(currentPos.leftInt(), currentPos.rightInt() + SPACER_Y); announcementTextPos = IntIntPair.of(currentPos.leftInt() + lineXOffset, currentPos.rightInt()); - lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.announcement")) + SPACER_X; + lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.announcement")) + SPACER_X; announcementToggle = ButtonWidget.builder(enabledButtonText(chatRule.getShowAnnouncement()), a -> { chatRule.setShowAnnouncement(!chatRule.getShowAnnouncement()); announcementToggle.setMessage(enabledButtonText(chatRule.getShowAnnouncement())); }) .position(currentPos.leftInt() + lineXOffset, currentPos.rightInt()) .size(buttonWidth,20) - .tooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.announcement.@Tooltip"))) + .tooltip(Tooltip.of(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.announcement.@Tooltip"))) .build(); lineXOffset += buttonWidth + SPACER_X; customSoundLabelTextPos = IntIntPair.of(currentPos.leftInt() + lineXOffset,currentPos.rightInt()); - lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds")) + SPACER_X; + lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.sounds")) + SPACER_X; soundsToggle = ButtonWidget.builder(getSoundName(), a -> { currentSoundIndex += 1; if (currentSoundIndex == soundsLookup.size()) { @@ -217,18 +217,18 @@ public class ChatRuleConfigScreen extends Screen { }}) .position(currentPos.leftInt() + lineXOffset, currentPos.rightInt()) .size(buttonWidth,20) - .tooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.@Tooltip"))) + .tooltip(Tooltip.of(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.sounds.@Tooltip"))) .build(); currentPos = IntIntPair.of(currentPos.leftInt(), currentPos.rightInt() + SPACER_Y); replaceMessageLabelTextPos = currentPos; - lineXOffset = client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.replace")) + SPACER_X; + lineXOffset = client.textRenderer.getWidth(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.replace")) + SPACER_X; replaceMessageInput = new TextFieldWidget(client.textRenderer, currentPos.leftInt() + lineXOffset, currentPos.rightInt(), 200, 20, Text.of("")); replaceMessageInput.setMaxLength(96); - replaceMessageInput.setTooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.replace.@Tooltip"))); + replaceMessageInput.setTooltip(Tooltip.of(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.replace.@Tooltip"))); replaceMessageInput.setText(chatRule.getReplaceMessage()); - ButtonWidget finishButton = ButtonWidget.builder(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.finish"), a -> close()) + ButtonWidget finishButton = ButtonWidget.builder(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.finish"), a -> close()) .position(this.width - buttonWidth - SPACER_Y, this.height - SPACER_Y) .size(buttonWidth, 20) .build(); @@ -266,9 +266,9 @@ public class ChatRuleConfigScreen extends Screen { private int getMaxUsedWidth() { if (client == null) return 0; //text - int total = client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.partialMatch")); - total += client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.regex")); - total += client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.ignoreCase")); + int total = client.textRenderer.getWidth(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.partialMatch")); + total += client.textRenderer.getWidth(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.regex")); + total += client.textRenderer.getWidth(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.ignoreCase")); //space total += SPACER_X * 6; //button width @@ -287,9 +287,9 @@ public class ChatRuleConfigScreen extends Screen { private Text enabledButtonText(boolean enabled) { if (enabled) { - return Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.true").withColor(Color.GREEN.getRGB()); + return Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.true").withColor(Color.GREEN.getRGB()); } else { - return Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.false").withColor(Color.RED.getRGB()); + return Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.false").withColor(Color.RED.getRGB()); } } @@ -300,19 +300,19 @@ public class ChatRuleConfigScreen extends Screen { //draw labels ands text int yOffset = (SPACER_Y - this.textRenderer.fontHeight) / 2; - context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.inputs"), inputsLabelTextPos.leftInt(), inputsLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); - context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.name"), nameLabelTextPos.leftInt(), nameLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); - context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.filter"), filterLabelTextPos.leftInt(), filterLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); - context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.partialMatch"), partialMatchTextPos.leftInt(), partialMatchTextPos.rightInt() + yOffset, 0xFFFFFFFF); - context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.regex"), regexTextPos.leftInt(), regexTextPos.rightInt() + yOffset, 0xFFFFFFFF); - context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.ignoreCase"), ignoreCaseTextPos.leftInt(), ignoreCaseTextPos.rightInt() + yOffset, 0xFFFFFFFF); - context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.locations"), locationLabelTextPos.leftInt(), locationLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); - context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.outputs"), outputsLabelTextPos.leftInt(), outputsLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); - context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.hideMessage"), hideMessageTextPos.leftInt(), hideMessageTextPos.rightInt() + yOffset, 0xFFFFFFFF); - context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.actionBar"), actionBarTextPos.leftInt(), actionBarTextPos.rightInt() + yOffset, 0xFFFFFFFF); - context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.announcement"), announcementTextPos.leftInt(), announcementTextPos.rightInt() + yOffset, 0xFFFFFFFF); - context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds"), customSoundLabelTextPos.leftInt(), customSoundLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); - context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.replace"), replaceMessageLabelTextPos.leftInt(), replaceMessageLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); + context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.inputs"), inputsLabelTextPos.leftInt(), inputsLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); + context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.name"), nameLabelTextPos.leftInt(), nameLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); + context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.filter"), filterLabelTextPos.leftInt(), filterLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); + context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.partialMatch"), partialMatchTextPos.leftInt(), partialMatchTextPos.rightInt() + yOffset, 0xFFFFFFFF); + context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.regex"), regexTextPos.leftInt(), regexTextPos.rightInt() + yOffset, 0xFFFFFFFF); + context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.ignoreCase"), ignoreCaseTextPos.leftInt(), ignoreCaseTextPos.rightInt() + yOffset, 0xFFFFFFFF); + context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.locations"), locationLabelTextPos.leftInt(), locationLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); + context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.outputs"), outputsLabelTextPos.leftInt(), outputsLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); + context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.hideMessage"), hideMessageTextPos.leftInt(), hideMessageTextPos.rightInt() + yOffset, 0xFFFFFFFF); + context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.actionBar"), actionBarTextPos.leftInt(), actionBarTextPos.rightInt() + yOffset, 0xFFFFFFFF); + context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.announcement"), announcementTextPos.leftInt(), announcementTextPos.rightInt() + yOffset, 0xFFFFFFFF); + context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.sounds"), customSoundLabelTextPos.leftInt(), customSoundLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); + context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.replace"), replaceMessageLabelTextPos.leftInt(), replaceMessageLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF); } /** @@ -337,7 +337,7 @@ public class ChatRuleConfigScreen extends Screen { private MutableText getSoundName() { if (currentSoundIndex == -1) { - return Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.none"); + return Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.sounds.none"); } return soundsLookup.keySet().stream().toList().get(currentSoundIndex); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java index f7a5ba84..1bc73ec2 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java @@ -82,9 +82,9 @@ public class ChatRulesConfigListWidget extends ElementListWidget<ChatRulesConfig @Override public void render(DrawContext context, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) { - context.drawCenteredTextWithShadow(client.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleName"), width / 2 - 125, y + 5, 0xFFFFFFFF); - context.drawCenteredTextWithShadow(client.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleEnabled"), width / 2, y + 5, 0xFFFFFFFF); - context.drawCenteredTextWithShadow(client.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.modify"), width / 2 + 100, y + 5, 0xFFFFFFFF); + context.drawCenteredTextWithShadow(client.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleName"), width / 2 - 125, y + 5, 0xFFFFFFFF); + context.drawCenteredTextWithShadow(client.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.ruleEnabled"), width / 2, y + 5, 0xFFFFFFFF); + context.drawCenteredTextWithShadow(client.textRenderer, Text.translatable("skyblocker.config.messages.chatRules.screen.modify"), width / 2 + 100, y + 5, 0xFFFFFFFF); } } @@ -115,17 +115,17 @@ public class ChatRulesConfigListWidget extends ElementListWidget<ChatRulesConfig .position(width / 2 - 25, 5) .build(); - openConfigButton = ButtonWidget.builder(Text.translatable("skyblocker.option.messages.chatRules.screen.editRule"), a -> { + openConfigButton = ButtonWidget.builder(Text.translatable("skyblocker.config.messages.chatRules.screen.editRule"), a -> { client.setScreen(new ChatRuleConfigScreen(screen, chatRuleIndex)); }) .size(50, 20) .position(width / 2 + 45, 5) - .tooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.editRule.@Tooltip"))) + .tooltip(Tooltip.of(Text.translatable("skyblocker.config.messages.chatRules.screen.editRule.@Tooltip"))) .build(); deleteButton = ButtonWidget.builder(Text.translatable("selectServer.delete"), a -> { oldScrollAmount = getScrollAmount(); - client.setScreen(new ConfirmScreen(this::deleteEntry, Text.translatable("skyblocker.option.messages.chatRules.screen.deleteQuestion"), Text.translatable("skyblocker.option.messages.chatRules.screen.deleteWarning", chatRule.getName()), Text.translatable("selectServer.deleteButton"), ScreenTexts.CANCEL)); + client.setScreen(new ConfirmScreen(this::deleteEntry, Text.translatable("skyblocker.config.messages.chatRules.screen.deleteQuestion"), Text.translatable("skyblocker.config.messages.chatRules.screen.deleteWarning", chatRule.getName()), Text.translatable("selectServer.deleteButton"), ScreenTexts.CANCEL)); }) .size(50, 20) .position(width / 2 + 105, 5) @@ -136,9 +136,9 @@ public class ChatRulesConfigListWidget extends ElementListWidget<ChatRulesConfig private Text enabledButtonText() { if (chatRule.getEnabled()) { - return Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.true").withColor(Color.GREEN.getRGB()); + return Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.true").withColor(Color.GREEN.getRGB()); } else { - return Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.false").withColor(Color.RED.getRGB()); + return Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen.false").withColor(Color.RED.getRGB()); } } private void toggleEnabled() { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigScreen.java index 7ca17676..303d8176 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigScreen.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigScreen.java @@ -15,7 +15,7 @@ public class ChatRulesConfigScreen extends Screen { private final Screen parent; public ChatRulesConfigScreen(Screen parent) { - super(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen")); + super(Text.translatable("skyblocker.config.messages.chatRules.screen.ruleScreen")); this.parent = parent; } @@ -37,7 +37,7 @@ public class ChatRulesConfigScreen extends Screen { close(); } }).build()); - ButtonWidget buttonNew1 = ButtonWidget.builder(Text.translatable("skyblocker.option.messages.chatRules.screen.new"), buttonNew -> chatRulesConfigListWidget.addRuleAfterSelected()).build(); + ButtonWidget buttonNew1 = ButtonWidget.builder(Text.translatable("skyblocker.config.messages.chatRules.screen.new"), buttonNew -> chatRulesConfigListWidget.addRuleAfterSelected()).build(); adder.add(buttonNew1); ButtonWidget buttonDone = ButtonWidget.builder(ScreenTexts.DONE, button -> { chatRulesConfigListWidget.saveRules(); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java index dd13af42..6f4c86a7 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java @@ -177,7 +177,7 @@ public class CrystalsLocationsManager { if (CLIENT.player == null || CLIENT.getNetworkHandler() == null) { return 0; } - CLIENT.player.sendMessage(Constants.PREFIX.get().append(Text.translatable("skyblocker.option.locations.dwarvenMines.crystalsWaypoints.shareFail").formatted(Formatting.RED)), false); + CLIENT.player.sendMessage(Constants.PREFIX.get().append(Text.translatable("skyblocker.config.mining.crystalsWaypoints.shareFail").formatted(Formatting.RED)), false); } return Command.SINGLE_SUCCESS; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/searchoverlay/OverlayScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/searchoverlay/OverlayScreen.java index 66d817e4..a03f3549 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/searchoverlay/OverlayScreen.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/searchoverlay/OverlayScreen.java @@ -106,7 +106,7 @@ public class OverlayScreen extends Screen { int renderOffset = (rowHeight - 16) / 2; context.drawGuiTexture(SEARCH_ICON_TEXTURE, finishedButton.getX() + renderOffset, finishedButton.getY() + renderOffset, 16, 16); if (historyButtons.length > 0 && historyButtons[0] != null) { - context.drawText(textRenderer, Text.translatable("skyblocker.option.general.searchOverlay.historyLabel"), historyButtons[0].getX() + renderOffset, historyButtons[0].getY() - rowHeight / 2, 0xFFFFFFFF, true); + context.drawText(textRenderer, Text.translatable("skyblocker.config.general.searchOverlay.historyLabel"), historyButtons[0].getX() + renderOffset, historyButtons[0].getY() - rowHeight / 2, 0xFFFFFFFF, true); } //draw item stacks and tooltip to buttons diff --git a/src/main/java/de/hysky/skyblocker/utils/chat/ChatFilterResult.java b/src/main/java/de/hysky/skyblocker/utils/chat/ChatFilterResult.java index 48ba9dad..8040a4d4 100644 --- a/src/main/java/de/hysky/skyblocker/utils/chat/ChatFilterResult.java +++ b/src/main/java/de/hysky/skyblocker/utils/chat/ChatFilterResult.java @@ -1,6 +1,7 @@ package de.hysky.skyblocker.utils.chat; import net.minecraft.client.resource.language.I18n; + public enum ChatFilterResult { // Skip this one / no action PASS, @@ -13,6 +14,6 @@ public enum ChatFilterResult { @Override public String toString() { - return I18n.translate("skyblocker.option.messages.chatFilterResult." + name()); + return I18n.translate("skyblocker.config.messages.filter.chatFilterResult." + name()); } } diff --git a/src/main/java/de/hysky/skyblocker/utils/render/title/TitleContainerConfigScreen.java b/src/main/java/de/hysky/skyblocker/utils/render/title/TitleContainerConfigScreen.java index e5cf6f80..3fee25e8 100644 --- a/src/main/java/de/hysky/skyblocker/utils/render/title/TitleContainerConfigScreen.java +++ b/src/main/java/de/hysky/skyblocker/utils/render/title/TitleContainerConfigScreen.java @@ -176,8 +176,8 @@ public class TitleContainerConfigScreen extends Screen { //TODO Come up with a better, less hacky solution for this in the future (: if (parent instanceof YACLScreen yaclScreen) { - ConfigCategory category = yaclScreen.config.categories().stream().filter(cat -> cat.name().getString().equals(I18n.translate("skyblocker.category.general"))).findFirst().orElseThrow(); - OptionGroup group = category.groups().stream().filter(grp -> grp.name().getString().equals(I18n.translate("skyblocker.option.general.titleContainer"))).findFirst().orElseThrow(); + ConfigCategory category = yaclScreen.config.categories().stream().filter(cat -> cat.name().getString().equals(I18n.translate("skyblocker.config.userInterfaceAndVisuals"))).findFirst().orElseThrow(); + OptionGroup group = category.groups().stream().filter(grp -> grp.name().getString().equals(I18n.translate("skyblocker.config.userInterfaceAndVisuals.titleContainer"))).findFirst().orElseThrow(); Option<?> scaleOpt = group.options().getFirst(); |