made flame height/opacity easier to understand

4 files changed, 12 insertions, 8 deletions

diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
index effd9e07..78605c00 100644
--- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
@@ -465,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 {
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 1e2f8063..afd688d8 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
@@ -635,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/mixin/InGameOverlayRendererMixin.java b/src/main/java/de/hysky/skyblocker/mixin/InGameOverlayRendererMixin.java
index b957603a..4775ce2d 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/InGameOverlayRendererMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/InGameOverlayRendererMixin.java
@@ -11,12 +11,12 @@ public class InGameOverlayRendererMixin {
 
     @ModifyArg(method = "renderFireOverlay", index = 2, at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/BufferBuilder;vertex(Lorg/joml/Matrix4f;FFF)Lnet/minecraft/client/render/VertexConsumer;"))
     private static float configureFlameHeight(float y) {
-        return y - SkyblockerConfigManager.get().general.flameOverlay.flameHeight;
+        return y - (0.5f - ((float) SkyblockerConfigManager.get().general.flameOverlay.flameHeight / 200.0f));
     }
 
     @ModifyArg(method = "renderFireOverlay", index = 3, at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/VertexConsumer;color(FFFF)Lnet/minecraft/client/render/VertexConsumer;"))
     private static float configureFlameOpacity(float opacity) {
-        return opacity - SkyblockerConfigManager.get().general.flameOverlay.flameOpacity;
+        return opacity - (0.8f - ((float) SkyblockerConfigManager.get().general.flameOverlay.flameOpacity / 125.0f));
     }
 
 }
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index 60631ef1..dc3d6911 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -132,7 +132,9 @@
   "text.autoconfig.skyblocker.option.general.teleportOverlay.enableWitherImpact": "Enable Wither Impact Overlay",
   "text.autoconfig.skyblocker.option.general.flameOverlay": "Flame Overlay",
   "text.autoconfig.skyblocker.option.general.flameOverlay.flameHeight": "Flame Height",
+  "text.autoconfig.skyblocker.option.general.flameOverlay.flameHeight.@Tooltip": "100%  default height\n0%     off",
   "text.autoconfig.skyblocker.option.general.flameOverlay.flameOpacity": "Flame Opacity",
+  "text.autoconfig.skyblocker.option.general.flameOverlay.flameOpacity.@Tooltip": "100%  default opacity\n0%     off",
   "text.autoconfig.skyblocker.option.general.searchOverlay": "Search Overlay",
   "text.autoconfig.skyblocker.option.general.searchOverlay.enableBazaar": "Enable For Bazaar",
   "text.autoconfig.skyblocker.option.general.searchOverlay.enableBazaar.@Tooltip": "Show custom search overlay when searching in bazaar.",