Merge branch 'SkyblockerMod:master' into Croesus-chest-highlight

3 files changed, 18 insertions, 16 deletions

diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
index 713a9fbd..b4e520e2 100644
--- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
@@ -178,9 +178,6 @@ public class SkyblockerConfig {
 		public boolean dungeonQuality = true;
 
 		@SerialEntry
-		public boolean visitorHelper = true;
-
-		@SerialEntry
 		public TabHudConf tabHud = new TabHudConf();
 
 		@SerialEntry
@@ -468,10 +465,10 @@ public class SkyblockerConfig {
 
 	public static class FlameOverlay {
 		@SerialEntry
-		public float flameHeight = 0f;
+		public int flameHeight = 100;
 
 		@SerialEntry
-		public float flameOpacity = 0f;
+		public int flameOpacity = 100;
 	}
 
 	public static class SearchOverlay {
@@ -1094,6 +1091,9 @@ public class SkyblockerConfig {
 	public static class Garden {
 		@SerialEntry
 		public boolean dicerTitlePrevent = true;
+
+		@SerialEntry
+		public boolean visitorHelper = true;
 	}
 
 	public static class Slayer {
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
index 8a7d832c..afd688d8 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
@@ -86,13 +86,6 @@ public class GeneralCategory {
 								newValue -> config.general.dungeonQuality = newValue)
 						.controller(ConfigUtils::createBooleanController)
 						.build())
-				.option(Option.<Boolean>createBuilder()
-						.name(Text.translatable("text.autoconfig.skyblocker.option.general.visitorHelper"))
-						.binding(defaults.general.visitorHelper,
-								() -> config.general.visitorHelper,
-								newValue -> config.general.visitorHelper = newValue)
-						.controller(ConfigUtils::createBooleanController)
-						.build())
 
 				//Tab Hud
 				.group(OptionGroup.createBuilder()
@@ -642,19 +635,21 @@ public class GeneralCategory {
 				.group(OptionGroup.createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.general.flameOverlay"))
 						.collapsed(true)
-						.option(Option.<Float>createBuilder()
+						.option(Option.<Integer>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.general.flameOverlay.flameHeight"))
+								.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.general.flameOverlay.flameHeight.@Tooltip")))
 								.binding(defaults.general.flameOverlay.flameHeight,
 										() -> config.general.flameOverlay.flameHeight,
 										newValue -> config.general.flameOverlay.flameHeight = newValue)
-								.controller(opt -> FloatSliderControllerBuilder.create(opt).range(0.0f, 0.5f).step(0.01f))
+								.controller(opt -> IntegerSliderControllerBuilder.create(opt).range(0, 100).step(1))
 								.build())
-						.option(Option.<Float>createBuilder()
+						.option(Option.<Integer>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.general.flameOverlay.flameOpacity"))
+								.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.general.flameOverlay.flameOpacity.@Tooltip")))
 								.binding(defaults.general.flameOverlay.flameOpacity,
 										() -> config.general.flameOverlay.flameOpacity,
 										newValue -> config.general.flameOverlay.flameOpacity = newValue)
-								.controller(opt -> FloatSliderControllerBuilder.create(opt).range(0.0f, 0.8f).step(0.1f))
+								.controller(opt -> IntegerSliderControllerBuilder.create(opt).range(0, 100).step(1))
 								.build())
 						.build())
 
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/LocationsCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/LocationsCategory.java
index 75c83a9b..d97513f8 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/LocationsCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/LocationsCategory.java
@@ -153,6 +153,13 @@ public class LocationsCategory {
 										newValue -> config.locations.garden.dicerTitlePrevent = newValue)
 								.controller(ConfigUtils::createBooleanController)
 								.build())
+						.option(Option.<Boolean>createBuilder()
+								.name(Text.translatable("text.autoconfig.skyblocker.option.general.visitorHelper"))
+								.binding(defaults.locations.garden.visitorHelper,
+										() -> config.locations.garden.visitorHelper,
+										newValue -> config.locations.garden.visitorHelper = newValue)
+								.controller(ConfigUtils::createBooleanController)
+								.build())
 						.build())
 				.build();
 	}