Move tooltip injection point

4 files changed, 29 insertions, 39 deletions

diff --git a/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java b/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java
index e4dc09fb..35b91639 100644
--- a/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java
@@ -1,7 +1,6 @@
 package de.hysky.skyblocker.mixins;
 
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import com.llamalad7.mixinextras.sugar.Local;
 import com.mojang.blaze3d.systems.RenderSystem;
 import de.hysky.skyblocker.SkyblockerMod;
@@ -24,11 +23,9 @@ import de.hysky.skyblocker.skyblock.quicknav.QuickNavButton;
 import de.hysky.skyblocker.utils.ItemUtils;
 import de.hysky.skyblocker.utils.Utils;
 import de.hysky.skyblocker.utils.render.gui.ContainerSolver;
-import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
-import net.minecraft.client.item.TooltipData;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.inventory.SimpleInventory;
 import net.minecraft.item.Item;
@@ -41,10 +38,7 @@ import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.*;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
@@ -53,7 +47,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.regex.Matcher;
 
@@ -101,6 +94,9 @@ public abstract class HandledScreenMixin<T extends ScreenHandler> extends Screen
 	@Final
 	protected T handler;
 
+	@Shadow
+	protected abstract List<Text> getTooltipFromItem(ItemStack stack);
+
 	@Unique
 	private List<QuickNavButton> quickNavButtons;
 
@@ -182,7 +178,7 @@ public abstract class HandledScreenMixin<T extends ScreenHandler> extends Screen
 		// Compactor Preview
 		if (SkyblockerConfigManager.get().uiAndVisuals.compactorDeletorPreview) {
 			Matcher matcher = CompactorDeletorPreview.NAME.matcher(ItemUtils.getItemId(stack));
-			if (matcher.matches() && CompactorDeletorPreview.drawPreview(context, stack, matcher.group("type"), matcher.group("size"), x, y)) {
+			if (matcher.matches() && CompactorDeletorPreview.drawPreview(context, stack, getTooltipFromItem(stack), matcher.group("type"), matcher.group("size"), x, y)) {
 				ci.cancel();
 			}
 		}
@@ -194,9 +190,9 @@ public abstract class HandledScreenMixin<T extends ScreenHandler> extends Screen
 	}
 
 	@SuppressWarnings("deprecation")
-	@WrapOperation(method = "drawMouseoverTooltip", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawTooltip(Lnet/minecraft/client/font/TextRenderer;Ljava/util/List;Ljava/util/Optional;II)V"))
-	private void skyblocker$tooltips$drawMouseoverTooltip(DrawContext context, TextRenderer textRenderer, List<Text> text, Optional<TooltipData> data, int x, int y, Operation<Void> original) {
-		original.call(context, textRenderer, TooltipManager.addToTooltip(text, focusedSlot), data, x, y);
+	@ModifyReturnValue(method = "getTooltipFromItem", at = @At("RETURN"))
+	private List<Text> skyblocker$tooltips$addToTooltip(List<Text> tooltip) {
+		return TooltipManager.addToTooltip(tooltip, focusedSlot);
 	}
 
 	@ModifyVariable(method = "drawSlot", at = @At(value = "LOAD", ordinal = 3), ordinal = 0)
diff --git a/src/main/java/de/hysky/skyblocker/mixins/accessors/HandledScreenAccessor.java b/src/main/java/de/hysky/skyblocker/mixins/accessors/HandledScreenAccessor.java
index 9a2a8311..41323a5e 100644
--- a/src/main/java/de/hysky/skyblocker/mixins/accessors/HandledScreenAccessor.java
+++ b/src/main/java/de/hysky/skyblocker/mixins/accessors/HandledScreenAccessor.java
@@ -1,11 +1,16 @@
 package de.hysky.skyblocker.mixins.accessors;
 
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
+import net.minecraft.item.ItemStack;
 import net.minecraft.screen.ScreenHandler;
 import net.minecraft.screen.slot.Slot;
+import net.minecraft.text.Text;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
 import org.spongepowered.asm.mixin.gen.Accessor;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+import java.util.List;
 
 @Mixin(HandledScreen.class)
 public interface HandledScreenAccessor {
@@ -27,4 +32,7 @@ public interface HandledScreenAccessor {
 
     @Accessor("focusedSlot")
     Slot getFocusedSlot();
+
+    @Invoker
+    List<Text> invokeGetTooltipFromItem(ItemStack stack);
 }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/CompactorDeletorPreview.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/CompactorDeletorPreview.java
index c5279c61..b93ca77a 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/CompactorDeletorPreview.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/CompactorDeletorPreview.java
@@ -7,7 +7,6 @@ import it.unimi.dsi.fastutil.ints.IntIntPair;
 import it.unimi.dsi.fastutil.ints.IntObjectPair;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.tooltip.HoveredTooltipPositioner;
 import net.minecraft.client.gui.tooltip.TooltipComponent;
 import net.minecraft.item.ItemStack;
@@ -34,8 +33,7 @@ public class CompactorDeletorPreview {
     public static final Pattern NAME = Pattern.compile("PERSONAL_(?<type>COMPACTOR|DELETOR)_(?<size>\\d+)");
     private static final MinecraftClient client = MinecraftClient.getInstance();
 
-    public static boolean drawPreview(DrawContext context, ItemStack stack, String type, String size, int x, int y) {
-        List<Text> tooltips = Screen.getTooltipFromItem(client, stack);
+    public static boolean drawPreview(DrawContext context, ItemStack stack, List<Text> tooltips, String type, String size, int x, int y) {
         int targetIndex = getTargetIndex(tooltips);
         if (targetIndex == -1) return false;
 
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ResultButtonWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ResultButtonWidget.java
index d2d463c7..9e2ec0b3 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ResultButtonWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ResultButtonWidget.java
@@ -1,30 +1,29 @@
 package de.hysky.skyblocker.skyblock.itemlist;
 
-import java.util.List;
-import java.util.ArrayList;
-
+import de.hysky.skyblocker.mixins.accessors.HandledScreenAccessor;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder;
 import net.minecraft.client.gui.widget.ClickableWidget;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
-import net.minecraft.text.OrderedText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 
+import java.util.List;
+
 public class ResultButtonWidget extends ClickableWidget {
     private static final Identifier BACKGROUND_TEXTURE = new Identifier("recipe_book/slot_craftable");
 
     protected ItemStack itemStack = null;
 
     public ResultButtonWidget(int x, int y) {
-        super(x, y, 25, 25, Text.of(""));
+        super(x, y, 25, 25, Text.literal(""));
     }
 
     protected void setItemStack(ItemStack itemStack) {
-        this.active = !itemStack.getItem().equals(Items.AIR);
+        this.active = !itemStack.isEmpty();
         this.visible = true;
         this.itemStack = itemStack;
     }
@@ -37,29 +36,18 @@ public class ResultButtonWidget extends ClickableWidget {
     @Override
     public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
         MinecraftClient client = MinecraftClient.getInstance();
-        // this.drawTexture(matrices, this.x, this.y, 29, 206, this.width, this.height);
         context.drawGuiTexture(BACKGROUND_TEXTURE, this.getX(), this.getY(), this.getWidth(), this.getHeight());
-        // client.getItemRenderer().renderInGui(this.itemStack, this.x + 4, this.y + 4);
         context.drawItem(this.itemStack, this.getX() + 4, this.getY() + 4);
-        // client.getItemRenderer().renderGuiItemOverlay(client.textRenderer, itemStack, this.x + 4, this.y + 4);
         context.drawItemInSlot(client.textRenderer, itemStack, this.getX() + 4, this.getY() + 4);
     }
 
     public void renderTooltip(DrawContext context, int mouseX, int mouseY) {
         MinecraftClient client = MinecraftClient.getInstance();
-        List<Text> tooltip = Screen.getTooltipFromItem(client, this.itemStack);
-        List<OrderedText> orderedTooltip = new ArrayList<>();
-
-        for(int i = 0; i < tooltip.size(); i++) {
-        	orderedTooltip.add(tooltip.get(i).asOrderedText());
-        }
-
-        client.currentScreen.setTooltip(orderedTooltip);
+        if (client.currentScreen == null) return;
+        List<Text> tooltip = client.currentScreen instanceof HandledScreen<?> handledScreen ? ((HandledScreenAccessor) handledScreen).invokeGetTooltipFromItem(this.itemStack) : Screen.getTooltipFromItem(client, this.itemStack);
+        client.currentScreen.setTooltip(tooltip.stream().map(Text::asOrderedText).toList());
     }
 
-	@Override
-	protected void appendClickableNarrations(NarrationMessageBuilder builder) {
-		// TODO Auto-generated method stub
-
-	}
+    @Override
+    protected void appendClickableNarrations(NarrationMessageBuilder builder) {}
 }