Merge pull request #561 from LifeIsAParadox/small-fixes

4 small changes

7 files changed, 57 insertions, 21 deletions

diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
index 78458291..78605c00 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 {
@@ -1091,6 +1088,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();
 	}
diff --git a/src/main/java/de/hysky/skyblocker/mixin/HandledScreenMixin.java b/src/main/java/de/hysky/skyblocker/mixin/HandledScreenMixin.java
index 8a1af570..77141688 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/HandledScreenMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/HandledScreenMixin.java
@@ -42,6 +42,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.Map;
+import java.util.Set;
 import java.util.regex.Matcher;
 
 @Mixin(HandledScreen.class)
@@ -75,13 +76,13 @@ public abstract class HandledScreenMixin<T extends ScreenHandler> extends Screen
     public void skyblocker$renderScreen(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
         if (!Utils.isOnSkyblock()) return;
 
-        if (SkyblockerConfigManager.get().general.visitorHelper && (Utils.getLocationRaw().equals("garden") && !getTitle().getString().contains("Logbook") || getTitle().getString().startsWith("Bazaar")))
+        if (SkyblockerConfigManager.get().locations.garden.visitorHelper && (Utils.getLocationRaw().equals("garden") && !getTitle().getString().contains("Logbook") || getTitle().getString().startsWith("Bazaar")))
             VisitorHelper.renderScreen(this.getTitle().getString(), context, textRenderer, handler, mouseX, mouseY);
     }
 
     @Inject(at = @At("HEAD"), method = "mouseClicked")
     public void skyblocker$mouseClicked(double mouseX, double mouseY, int button, CallbackInfoReturnable<Boolean> cir) {
-        if (SkyblockerConfigManager.get().general.visitorHelper && (Utils.getLocationRaw().equals("garden") && !getTitle().getString().contains("Logbook") || getTitle().getString().startsWith("Bazaar")))
+        if (SkyblockerConfigManager.get().locations.garden.visitorHelper && (Utils.getLocationRaw().equals("garden") && !getTitle().getString().contains("Logbook") || getTitle().getString().startsWith("Bazaar")))
             VisitorHelper.onMouseClicked(mouseX, mouseY, button, this.textRenderer);
     }
 
@@ -167,6 +168,37 @@ public abstract class HandledScreenMixin<T extends ScreenHandler> extends Screen
             }
 
             if (slot != null) {
+                // Prevent some menu items from dragging and dropping
+                String itemName = slot.getStack().getName().getString();
+                if (SkyblockerConfigManager.get().general.hideEmptyTooltips) {
+                    Set<String> blockedItemPatterns = Set.of(
+                            " ", // Empty menu item
+                            "Locked Page",
+                            "Quick Crafting Slot",
+                            "Locked Backpack Slot 2", //Regular expressions won't be utilized here since the search by contains is based on plain text rather than regex syntax
+                            "Locked Backpack Slot 3",
+                            "Locked Backpack Slot 4",
+                            "Locked Backpack Slot 5",
+                            "Locked Backpack Slot 6",
+                            "Locked Backpack Slot 7",
+                            "Locked Backpack Slot 8",
+                            "Locked Backpack Slot 9",
+                            "Locked Backpack Slot 10",
+                            "Locked Backpack Slot 11",
+                            "Locked Backpack Slot 12",
+                            "Locked Backpack Slot 13",
+                            "Locked Backpack Slot 14",
+                            "Locked Backpack Slot 15",
+                            "Locked Backpack Slot 16",
+                            "Locked Backpack Slot 17",
+                            "Locked Backpack Slot 18",
+                            "Preparing"
+                    );
+                    if (blockedItemPatterns.contains(itemName)) {
+                        ci.cancel();
+                    }
+                }
+
                 // When you click your drop key while hovering over an item
                 if (actionType == SlotActionType.THROW) {
                     ItemStack stack = slot.getStack();
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/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
index d5be7eee..fbef1bcb 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
@@ -51,7 +51,7 @@ public class ItemTooltip {
         boolean bazaarOpened = lines.stream().anyMatch(each -> each.getString().contains("Buy price:") || each.getString().contains("Sell price:"));
 
         if (TooltipInfoType.NPC.isTooltipEnabledAndHasOrNullWarning(internalID)) {
-            lines.add(Text.literal(String.format("%-21s", "NPC Price:"))
+            lines.add(Text.literal(String.format("%-21s", "NPC Sell Price:"))
                     .formatted(Formatting.YELLOW)
                     .append(getCoinsMessage(TooltipInfoType.NPC.getData().get(internalID).getAsDouble(), count)));
         }
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.",