Merge pull request #523 from olim88/crystal-hollows-fetures

Crystal hollows fetures

2 files changed, 121 insertions, 6 deletions

diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
index a7569adb..4acb8064 100644
--- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
@@ -873,11 +873,20 @@ public class SkyblockerConfig {
 
 		@SerialEntry
 		public DwarvenHud dwarvenHud = new DwarvenHud();
+
+		@SerialEntry
+		public CrystalsHud crystalsHud = new CrystalsHud();
+
+		@SerialEntry
+		public CrystalsWaypoints crystalsWaypoints = new CrystalsWaypoints();
 	}
 
 	public static class DwarvenHud {
 		@SerialEntry
-		public boolean enabled = true;
+		public boolean enabledCommissions = true;
+
+		@SerialEntry
+		public boolean enabledPowder = true;
 
 		@SerialEntry
 		public DwarvenHudStyle style = DwarvenHudStyle.SIMPLE;
@@ -890,6 +899,40 @@ public class SkyblockerConfig {
 
 		@SerialEntry
 		public int y = 10;
+
+		@SerialEntry
+		public int powderX = 10;
+
+		@SerialEntry
+		public int powderY = 70;
+	}
+
+	public static class CrystalsHud {
+		@SerialEntry
+		public boolean enabled = true;
+
+		@SerialEntry
+		public boolean showLocations = true;
+
+		@SerialEntry
+		public int locationSize = 8;
+
+		@SerialEntry
+		public int x = 10;
+
+		@SerialEntry
+		public int y = 130;
+
+		@SerialEntry
+		public float mapScaling = 1f;
+	}
+
+	public static class CrystalsWaypoints {
+		@SerialEntry
+		public boolean enabled = true;
+
+		@SerialEntry
+		public boolean findInChat = true;
 	}
 
 	public enum DwarvenHudStyle {
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java
index 80d6485b..97b48bc4 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java
@@ -2,12 +2,15 @@ package de.hysky.skyblocker.config.categories;
 
 import de.hysky.skyblocker.config.ConfigUtils;
 import de.hysky.skyblocker.config.SkyblockerConfig;
+import de.hysky.skyblocker.skyblock.dwarven.CrystalsHudConfigScreen;
 import dev.isxander.yacl3.api.ButtonOption;
 import dev.isxander.yacl3.api.ConfigCategory;
 import dev.isxander.yacl3.api.Option;
 import dev.isxander.yacl3.api.OptionDescription;
 import dev.isxander.yacl3.api.OptionGroup;
 import de.hysky.skyblocker.skyblock.dwarven.DwarvenHudConfigScreen;
+import dev.isxander.yacl3.api.controller.FloatFieldControllerBuilder;
+import dev.isxander.yacl3.api.controller.IntegerSliderControllerBuilder;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.text.Text;
 
@@ -45,15 +48,22 @@ public class DwarvenMinesCategory {
 						.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud"))
 						.collapsed(false)
 						.option(Option.<Boolean>createBuilder()
-								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled"))
-								.binding(defaults.locations.dwarvenMines.dwarvenHud.enabled,
-										() -> config.locations.dwarvenMines.dwarvenHud.enabled,
-										newValue -> config.locations.dwarvenMines.dwarvenHud.enabled = newValue)
+								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabledCommissions"))
+								.binding(defaults.locations.dwarvenMines.dwarvenHud.enabledCommissions,
+										() -> config.locations.dwarvenMines.dwarvenHud.enabledCommissions,
+										newValue -> config.locations.dwarvenMines.dwarvenHud.enabledCommissions = newValue)
+								.controller(ConfigUtils::createBooleanController)
+								.build())
+						.option(Option.<Boolean>createBuilder()
+								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabledPowder"))
+								.binding(defaults.locations.dwarvenMines.dwarvenHud.enabledPowder,
+										() -> config.locations.dwarvenMines.dwarvenHud.enabledPowder,
+										newValue -> config.locations.dwarvenMines.dwarvenHud.enabledPowder = newValue)
 								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<SkyblockerConfig.DwarvenHudStyle>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style"))
-								.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[0]"), 
+								.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[0]"),
 										Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[1]"),
 										Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[2]")))
 								.binding(defaults.locations.dwarvenMines.dwarvenHud.style,
@@ -74,6 +84,68 @@ public class DwarvenMinesCategory {
 								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.build())
+				//crystal HUD
+				.group(OptionGroup.createBuilder()
+						.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsHud"))
+						.collapsed(false)
+						.option(Option.<Boolean>createBuilder()
+								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsHud.enabled"))
+								.binding(defaults.locations.dwarvenMines.crystalsHud.enabled,
+										() -> config.locations.dwarvenMines.crystalsHud.enabled,
+										newValue -> config.locations.dwarvenMines.crystalsHud.enabled = newValue)
+								.controller(ConfigUtils::createBooleanController)
+								.build())
+						.option(ButtonOption.createBuilder()
+								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.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("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsHud.mapScaling"))
+								.binding(defaults.locations.dwarvenMines.crystalsHud.mapScaling,
+										() -> config.locations.dwarvenMines.crystalsHud.mapScaling,
+										newValue -> config.locations.dwarvenMines.crystalsHud.mapScaling = newValue)
+								.controller(FloatFieldControllerBuilder::create)
+								.build())
+						.option(Option.<Boolean>createBuilder()
+								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsHud.showLocations"))
+								.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsHud.showLocations.@Tooltip")))
+								.binding(defaults.locations.dwarvenMines.crystalsHud.showLocations,
+										() -> config.locations.dwarvenMines.crystalsHud.showLocations,
+										newValue -> config.locations.dwarvenMines.crystalsHud.showLocations = newValue)
+								.controller(ConfigUtils::createBooleanController)
+								.build())
+						.option(Option.<Integer>createBuilder()
+								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsHud.showLocations.locationSize"))
+								.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsHud.showLocations.locationSize.@Tooltip")))
+								.binding(defaults.locations.dwarvenMines.crystalsHud.locationSize,
+										() -> config.locations.dwarvenMines.crystalsHud.locationSize,
+										newValue -> config.locations.dwarvenMines.crystalsHud.locationSize = newValue)
+								.controller(opt -> IntegerSliderControllerBuilder.create(opt).range(4, 12).step(2))
+								.build())
+						.build())
+				//crystals waypoints
+				.group(OptionGroup.createBuilder()
+						.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsWaypoints"))
+						.collapsed(false)
+						.option(Option.<Boolean>createBuilder()
+								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsWaypoints.enabled"))
+								.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsWaypoints.enabled.@Tooltip")))
+								.binding(defaults.locations.dwarvenMines.crystalsWaypoints.enabled,
+										() -> config.locations.dwarvenMines.crystalsWaypoints.enabled,
+										newValue -> config.locations.dwarvenMines.crystalsWaypoints.enabled = newValue)
+								.controller(ConfigUtils::createBooleanController)
+								.build())
+						.option(Option.<Boolean>createBuilder()
+								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsWaypoints.findInChat"))
+								.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsWaypoints.findInChat.@Tooltip")))
+								.binding(defaults.locations.dwarvenMines.crystalsWaypoints.findInChat,
+										() -> config.locations.dwarvenMines.crystalsWaypoints.findInChat,
+										newValue -> config.locations.dwarvenMines.crystalsWaypoints.findInChat = newValue)
+								.controller(ConfigUtils::createBooleanController)
+								.build())
+
+						.build())
 				.build();
 	}
 }