aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hysky/skyblocker/config
diff options
context:
space:
mode:
authorKevin <92656833+kevinthegreat1@users.noreply.github.com>2024-07-26 01:27:30 +0800
committerGitHub <noreply@github.com>2024-07-26 01:27:30 +0800
commit8f475f07c91076542b996cdada8385505a1bcce6 (patch)
treecb2dea55ea098eded224b555edaa97cb293ce44c /src/main/java/de/hysky/skyblocker/config
parent55349c543a4b0fcbf9cbb86e0c1b7c0abd790b8c (diff)
parentcd9f7062e7b66f6f8fee078cbef32aee8d07df94 (diff)
downloadSkyblocker-8f475f07c91076542b996cdada8385505a1bcce6.tar.gz
Skyblocker-8f475f07c91076542b996cdada8385505a1bcce6.tar.bz2
Skyblocker-8f475f07c91076542b996cdada8385505a1bcce6.zip
Merge pull request #791 from olim88/improve-mining-waypoint
Improve mining waypoint
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/config')
-rw-r--r--src/main/java/de/hysky/skyblocker/config/categories/MiningCategory.java32
-rw-r--r--src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java10
2 files changed, 32 insertions, 10 deletions
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..796a6105 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.<Float>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.<Boolean>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.<Boolean>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.<Boolean>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.<Float>createBuilder()
.name(Text.translatable("skyblocker.config.mining.commissionWaypoints.textScale"))
.description(OptionDescription.of(Text.translatable("skyblocker.config.mining.commissionWaypoints.textScale.@Tooltip")))
@@ -210,6 +218,14 @@ public class MiningCategory {
.controller(FloatFieldControllerBuilder::create)
.build())
.option(Option.<Boolean>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.<Boolean>createBuilder()
.name(Text.translatable("skyblocker.config.mining.commissionWaypoints.showBaseCamp"))
.description(OptionDescription.of(Text.translatable("skyblocker.config.mining.commissionWaypoints.showBaseCamp.@Tooltip")))
.binding(defaults.mining.commissionWaypoints.showBaseCamp,
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..dcf70f24 100644
--- a/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java
@@ -94,7 +94,13 @@ public class MiningConfig {
public boolean enabled = true;
@SerialEntry
+ public float textScale = 1;
+
+ @SerialEntry
public boolean findInChat = true;
+
+ @SerialEntry
+ public boolean wishingCompassSolver = true;
}
public static class CommissionWaypoints {
@@ -102,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;