aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hysky/skyblocker/config
diff options
context:
space:
mode:
authorAaron <51387595+AzureAaron@users.noreply.github.com>2024-01-26 14:55:59 -0500
committerAaron <51387595+AzureAaron@users.noreply.github.com>2024-01-26 14:55:59 -0500
commit5c9eb5f77f85b221ee5c8ebedf44dd0a48bb8292 (patch)
tree9b31ff7721d801a9671c37ed75ddc8188fe9c33d /src/main/java/de/hysky/skyblocker/config
parent1ea5f54ab6d7edf7a7c5971db05e22667d3a9c93 (diff)
downloadSkyblocker-5c9eb5f77f85b221ee5c8ebedf44dd0a48bb8292.tar.gz
Skyblocker-5c9eb5f77f85b221ee5c8ebedf44dd0a48bb8292.tar.bz2
Skyblocker-5c9eb5f77f85b221ee5c8ebedf44dd0a48bb8292.zip
Tweak waypoints
Thanks to Fluboxer for the suggestions!
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/config')
-rw-r--r--src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java10
-rw-r--r--src/main/java/de/hysky/skyblocker/config/categories/CrimsonIsleCategory.java30
2 files changed, 20 insertions, 20 deletions
diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
index 7234664d..b842ec27 100644
--- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
@@ -926,19 +926,19 @@ public class SkyblockerConfig {
public boolean supplyWaypoints = true;
@SerialEntry
- public boolean supplyPileWaypoints = true;
+ public boolean fuelWaypoints = true;
@SerialEntry
- public boolean fuelWaypoints = true;
+ public Waypoint.Type suppliesAndFuelWaypointType = Waypoint.Type.WAYPOINT;
@SerialEntry
- public boolean safeSpotWaypoints = true;
+ public boolean ballistaBuildWaypoints = true;
@SerialEntry
- public boolean pearlWaypoints = true;
+ public boolean safeSpotWaypoints = true;
@SerialEntry
- public Waypoint.Type waypointType = Waypoint.Type.WAYPOINT;
+ public boolean pearlWaypoints = true;
@SerialEntry
public boolean noArrowPoisonWarning = true;
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 bd7d4c07..3c2dc3b6 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/CrimsonIsleCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/CrimsonIsleCategory.java
@@ -28,19 +28,27 @@ public class CrimsonIsleCategory {
.controller(ConfigUtils::createBooleanController)
.build())
.option(Option.<Boolean>createBuilder()
- .name(Text.translatable("text.autoconfig.skyblocker.option.locations.crimsonIsle.kuudra.supplyPileWaypoints"))
- .binding(defaults.locations.crimsonIsle.kuudra.supplyPileWaypoints,
- () -> config.locations.crimsonIsle.kuudra.supplyPileWaypoints,
- newValue -> config.locations.crimsonIsle.kuudra.supplyPileWaypoints = newValue)
- .controller(ConfigUtils::createBooleanController)
- .build())
- .option(Option.<Boolean>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.locations.crimsonIsle.kuudra.fuelWaypoints"))
.binding(defaults.locations.crimsonIsle.kuudra.fuelWaypoints,
() -> config.locations.crimsonIsle.kuudra.fuelWaypoints,
newValue -> config.locations.crimsonIsle.kuudra.fuelWaypoints = newValue)
.controller(ConfigUtils::createBooleanController)
.build())
+ .option(Option.<Waypoint.Type>createBuilder()
+ .name(Text.translatable("text.autoconfig.skyblocker.option.locations.crimsonIsle.kuudra.suppliesAndFuelWaypointType"))
+ .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.general.waypoints.waypointType.@Tooltip")))
+ .binding(defaults.locations.crimsonIsle.kuudra.suppliesAndFuelWaypointType,
+ () -> config.locations.crimsonIsle.kuudra.suppliesAndFuelWaypointType,
+ newValue -> config.locations.crimsonIsle.kuudra.suppliesAndFuelWaypointType = newValue)
+ .controller(ConfigUtils::createEnumCyclingListController)
+ .build())
+ .option(Option.<Boolean>createBuilder()
+ .name(Text.translatable("text.autoconfig.skyblocker.option.locations.crimsonIsle.kuudra.ballistaBuildWaypoints"))
+ .binding(defaults.locations.crimsonIsle.kuudra.ballistaBuildWaypoints,
+ () -> config.locations.crimsonIsle.kuudra.ballistaBuildWaypoints,
+ newValue -> config.locations.crimsonIsle.kuudra.ballistaBuildWaypoints = newValue)
+ .controller(ConfigUtils::createBooleanController)
+ .build())
.option(Option.<Boolean>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.locations.crimsonIsle.kuudra.safeSpotWaypoints"))
.binding(defaults.locations.crimsonIsle.kuudra.safeSpotWaypoints,
@@ -55,14 +63,6 @@ public class CrimsonIsleCategory {
newValue -> config.locations.crimsonIsle.kuudra.pearlWaypoints = newValue)
.controller(ConfigUtils::createBooleanController)
.build())
- .option(Option.<Waypoint.Type>createBuilder()
- .name(Text.translatable("text.autoconfig.skyblocker.option.general.waypoints.waypointType"))
- .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.general.waypoints.waypointType.@Tooltip")))
- .binding(defaults.locations.crimsonIsle.kuudra.waypointType,
- () -> config.locations.crimsonIsle.kuudra.waypointType,
- newValue -> config.locations.crimsonIsle.kuudra.waypointType = newValue)
- .controller(ConfigUtils::createEnumCyclingListController)
- .build())
.option(Option.<Boolean>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.locations.crimsonIsle.kuudra.noArrowPoisonWarning"))
.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.crimsonIsle.kuudra.noArrowPoisonWarning.@Tooltip")))