From c22843b1d2b34afe240df12d6129c980a0f6680c Mon Sep 17 00:00:00 2001 From: olim Date: Thu, 20 Jun 2024 00:42:52 +0100 Subject: add options to config and translations add option for wishing compass to config and translations for text in it. add separate scale for crystal waypoints and commissions --- .../config/categories/MiningCategory.java | 32 ++++++++++++++++------ .../skyblocker/config/configs/MiningConfig.java | 6 ++++ 2 files changed, 30 insertions(+), 8 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/config') 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 4e11d869..9828474b 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/MiningCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/MiningCategory.java @@ -166,6 +166,14 @@ public class MiningCategory { newValue -> config.mining.crystalsWaypoints.enabled = newValue) .controller(ConfigUtils::createBooleanController) .build()) + .option(Option.createBuilder() + .name(Text.translatable("skyblocker.config.mining.crystalsWaypoints.textScale")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.mining.crystalsWaypoints.textScale.@Tooltip"))) + .binding(defaults.mining.crystalsWaypoints.textScale, + () -> config.mining.crystalsWaypoints.textScale, + newValue -> config.mining.crystalsWaypoints.textScale = newValue) + .controller(FloatFieldControllerBuilder::create) + .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.mining.crystalsWaypoints.findInChat")) .description(OptionDescription.of(Text.translatable("skyblocker.config.mining.crystalsWaypoints.findInChat.@Tooltip"))) @@ -174,6 +182,14 @@ public class MiningCategory { newValue -> config.mining.crystalsWaypoints.findInChat = newValue) .controller(ConfigUtils::createBooleanController) .build()) + .option(Option.createBuilder() + .name(Text.translatable("skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.@Tooltip"))) + .binding(defaults.mining.crystalsWaypoints.WishingCompassSolver, + () -> config.mining.crystalsWaypoints.WishingCompassSolver, + newValue -> config.mining.crystalsWaypoints.WishingCompassSolver = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) .build()) @@ -193,14 +209,6 @@ public class MiningCategory { newValue -> config.mining.commissionWaypoints.mode = newValue) .controller(ConfigUtils::createEnumCyclingListController) .build()) - .option(Option.createBuilder() - .name(Text.translatable("skyblocker.config.mining.commissionWaypoints.useColor")) - .description(OptionDescription.of(Text.translatable("skyblocker.config.mining.commissionWaypoints.useColor.@Tooltip"))) - .binding(defaults.mining.commissionWaypoints.useColor, - () -> config.mining.commissionWaypoints.useColor, - newValue -> config.mining.commissionWaypoints.useColor = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.mining.commissionWaypoints.textScale")) .description(OptionDescription.of(Text.translatable("skyblocker.config.mining.commissionWaypoints.textScale.@Tooltip"))) @@ -209,6 +217,14 @@ public class MiningCategory { newValue -> config.mining.commissionWaypoints.textScale = newValue) .controller(FloatFieldControllerBuilder::create) .build()) + .option(Option.createBuilder() + .name(Text.translatable("skyblocker.config.mining.commissionWaypoints.useColor")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.mining.commissionWaypoints.useColor.@Tooltip"))) + .binding(defaults.mining.commissionWaypoints.useColor, + () -> config.mining.commissionWaypoints.useColor, + newValue -> config.mining.commissionWaypoints.useColor = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.mining.commissionWaypoints.showBaseCamp")) .description(OptionDescription.of(Text.translatable("skyblocker.config.mining.commissionWaypoints.showBaseCamp.@Tooltip"))) diff --git a/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java index d71f57b6..7c74af80 100644 --- a/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java @@ -93,8 +93,14 @@ public class MiningConfig { @SerialEntry public boolean enabled = true; + @SerialEntry + public float textScale = 1; + @SerialEntry public boolean findInChat = true; + + @SerialEntry + public boolean WishingCompassSolver = true; } public static class CommissionWaypoints { -- cgit From 5c20347f8a2a0bbad3f0c04264e52cb02b3057a7 Mon Sep 17 00:00:00 2001 From: olim Date: Wed, 10 Jul 2024 12:30:59 +0100 Subject: implement requested changes fix formatting of code in place to be correct --- .../java/de/hysky/skyblocker/config/categories/MiningCategory.java | 6 +++--- src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/config') 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 9828474b..796a6105 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/MiningCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/MiningCategory.java @@ -185,9 +185,9 @@ public class MiningCategory { .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver")) .description(OptionDescription.of(Text.translatable("skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.@Tooltip"))) - .binding(defaults.mining.crystalsWaypoints.WishingCompassSolver, - () -> config.mining.crystalsWaypoints.WishingCompassSolver, - newValue -> config.mining.crystalsWaypoints.WishingCompassSolver = newValue) + .binding(defaults.mining.crystalsWaypoints.wishingCompassSolver, + () -> config.mining.crystalsWaypoints.wishingCompassSolver, + newValue -> config.mining.crystalsWaypoints.wishingCompassSolver = newValue) .controller(ConfigUtils::createBooleanController) .build()) diff --git a/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java index 7c74af80..1347f158 100644 --- a/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java @@ -100,7 +100,7 @@ public class MiningConfig { public boolean findInChat = true; @SerialEntry - public boolean WishingCompassSolver = true; + public boolean wishingCompassSolver = true; } public static class CommissionWaypoints { -- cgit From d19a509eedcc87b249288cbc196f6d6422200fff Mon Sep 17 00:00:00 2001 From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> Date: Mon, 22 Jul 2024 23:27:03 +0800 Subject: Apply code review --- src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/config') diff --git a/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java index 1347f158..dcf70f24 100644 --- a/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java @@ -108,10 +108,10 @@ public class MiningConfig { public CommissionWaypointMode mode = CommissionWaypointMode.BOTH; @SerialEntry - public boolean useColor = true; + public float textScale = 1; @SerialEntry - public float textScale = 1; + public boolean useColor = true; @SerialEntry public boolean showBaseCamp = false; -- cgit