From e316a165d8f7f812afa6d3c9f2f0f576fd1e6f93 Mon Sep 17 00:00:00 2001
From: Rime <81419447+Emirlol@users.noreply.github.com>
Date: Wed, 10 Jul 2024 17:37:05 +0300
Subject: Change tooltip manager to allow adding tooltips on non-handled
 screens

---
 .../de/hysky/skyblocker/skyblock/item/tooltip/TooltipManager.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/main/java/de/hysky/skyblocker/skyblock')

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipManager.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipManager.java
index e89a1995..ad4e181d 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipManager.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipManager.java
@@ -4,12 +4,12 @@ import de.hysky.skyblocker.mixins.accessors.HandledScreenAccessor;
 import de.hysky.skyblocker.skyblock.bazaar.ReorderHelper;
 import de.hysky.skyblocker.skyblock.chocolatefactory.ChocolateFactorySolver;
 import de.hysky.skyblocker.skyblock.item.tooltip.adders.*;
-import de.hysky.skyblocker.skyblock.item.tooltip.adders.CraftPriceTooltip;
 import de.hysky.skyblocker.utils.Utils;
 import de.hysky.skyblocker.utils.container.TooltipAdder;
 import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.item.ItemStack;
 import net.minecraft.screen.slot.Slot;
@@ -53,14 +53,12 @@ public class TooltipManager {
 			}
 		});
 		ScreenEvents.AFTER_INIT.register((client, screen, width, height) -> {
-			if (screen instanceof HandledScreen<?> handledScreen) {
-				onScreenChange(handledScreen);
-			}
+			onScreenChange(screen);
 			ScreenEvents.remove(screen).register(ignored -> currentScreenAdders.clear());
 		});
 	}
 
-	private static void onScreenChange(HandledScreen<?> screen) {
+	private static void onScreenChange(Screen screen) {
 		currentScreenAdders.clear();
 		for (TooltipAdder adder : adders) {
 			if (adder.isEnabled() && adder.test(screen)) {
-- 
cgit