Merge pull request #690 from olim88/mining-features

add waypoints for commissions in dwarven mines and glacite.

2 files changed, 84 insertions, 0 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 8809ba44..8dc587fd 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/MiningCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/MiningCategory.java
@@ -160,6 +160,56 @@ public class MiningCategory {
                                 .build())
 
                         .build())
+
+                //commission waypoints
+                .group(OptionGroup.createBuilder()
+                        .name(Text.translatable("skyblocker.config.mining.commissionWaypoints"))
+                        .collapsed(false)
+                        .option(Option.<MiningConfig.CommissionWaypointMode>createBuilder()
+                                .name(Text.translatable("skyblocker.config.mining.commissionWaypoints.mode"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.mining.commissionWaypoints.mode.@Tooltip[0]"),
+                                        Text.translatable("skyblocker.config.mining.commissionWaypoints.mode.@Tooltip[1]"),
+                                        Text.translatable("skyblocker.config.mining.commissionWaypoints.mode.@Tooltip[2]"),
+                                        Text.translatable("skyblocker.config.mining.commissionWaypoints.mode.@Tooltip[3]"),
+                                        Text.translatable("skyblocker.config.mining.commissionWaypoints.mode.@Tooltip[4]")))
+                                .binding(defaults.mining.commissionWaypoints.mode,
+                                        () -> config.mining.commissionWaypoints.mode,
+                                        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")))
+                                .binding(defaults.mining.commissionWaypoints.textScale,
+                                        () -> config.mining.commissionWaypoints.textScale,
+                                        newValue -> config.mining.commissionWaypoints.textScale = newValue)
+                                .controller(FloatFieldControllerBuilder::create)
+                                .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,
+                                        () -> config.mining.commissionWaypoints.showBaseCamp,
+                                        newValue -> config.mining.commissionWaypoints.showBaseCamp = newValue)
+                                .controller(ConfigUtils::createBooleanController)
+                                .build())
+                        .option(Option.<Boolean>createBuilder()
+                                .name(Text.translatable("skyblocker.config.mining.commissionWaypoints.showEmissary"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.mining.commissionWaypoints.showEmissary.@Tooltip")))
+                                .binding(defaults.mining.commissionWaypoints.showEmissary,
+                                        () -> config.mining.commissionWaypoints.showEmissary,
+                                        newValue -> config.mining.commissionWaypoints.showEmissary = newValue)
+                                .controller(ConfigUtils::createBooleanController)
+                                .build())
+                        .build())
                 .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 fe845e55..65fd63ca 100644
--- a/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java
@@ -21,6 +21,9 @@ public class MiningConfig {
     @SerialEntry
     public CrystalsWaypoints crystalsWaypoints = new CrystalsWaypoints();
 
+    @SerialEntry
+    public CommissionWaypoints commissionWaypoints = new CommissionWaypoints();
+
     public static class DwarvenMines {
         @SerialEntry
         public boolean solveFetchur = true;
@@ -85,6 +88,37 @@ public class MiningConfig {
         public boolean findInChat = true;
     }
 
+    public static class CommissionWaypoints {
+        @SerialEntry
+        public CommissionWaypointMode mode = CommissionWaypointMode.BOTH;
+
+        @SerialEntry
+        public boolean useColor = true;
+
+        @SerialEntry
+        public float textScale = 1;
+
+        @SerialEntry
+        public boolean showBaseCamp = false;
+
+        @SerialEntry
+        public boolean showEmissary = true;
+    }
+
+    public enum CommissionWaypointMode {
+        OFF, DWARVEN, GLACITE, BOTH;
+
+        @Override
+        public String toString() {
+            return switch (this) {
+                case OFF -> "Off";
+                case DWARVEN -> "Dwarven";
+                case GLACITE -> "Glacite";
+                case BOTH -> "Both";
+            };
+        }
+    }
+
     public enum DwarvenHudStyle {
         SIMPLE, FANCY, CLASSIC;