From cfe51ebb00dea1ab11f81dbbf9c441de738565ba Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Mon, 27 Jun 2022 23:48:34 +0800
Subject: Implement fallback renderer for entries that can't be converted to
 EntryStacks

---
 .../rei/impl/client/entry/type/types/RenderingEntryDefinition.java   | 2 +-
 .../java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java    | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'runtime/src/main/java')

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/entry/type/types/RenderingEntryDefinition.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/entry/type/types/RenderingEntryDefinition.java
index 7965bd2e9..bf38add70 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/entry/type/types/RenderingEntryDefinition.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/entry/type/types/RenderingEntryDefinition.java
@@ -83,7 +83,7 @@ public class RenderingEntryDefinition {
         @Override
         @Nullable
         public Tooltip getTooltip(EntryStack<Renderer> entry, TooltipContext context) {
-            return entry.getValue().getTooltip(context.getPoint());
+            return entry.getValue().getTooltip(context);
         }
     }
 }
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java
index e8b272c65..a3999f993 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java
@@ -43,6 +43,7 @@ import me.shedaniel.rei.api.client.gui.drag.DraggingContext;
 import me.shedaniel.rei.api.client.gui.screen.DisplayScreen;
 import me.shedaniel.rei.api.client.gui.widgets.Slot;
 import me.shedaniel.rei.api.client.gui.widgets.Tooltip;
+import me.shedaniel.rei.api.client.gui.widgets.TooltipContext;
 import me.shedaniel.rei.api.client.overlay.ScreenOverlay;
 import me.shedaniel.rei.api.client.registry.display.DisplayRegistry;
 import me.shedaniel.rei.api.client.registry.transfer.TransferHandler;
@@ -405,7 +406,7 @@ public class EntryWidget extends Slot implements DraggableStackProviderWidget {
     }
     
     protected void queueTooltip(PoseStack matrices, int mouseX, int mouseY, float delta) {
-        Tooltip tooltip = getCurrentTooltip(new Point(mouseX, mouseY));
+        Tooltip tooltip = getCurrentTooltip(TooltipContext.ofMouse().getPoint());
         if (tooltip != null) {
             tooltip.queue();
         }
@@ -416,7 +417,7 @@ public class EntryWidget extends Slot implements DraggableStackProviderWidget {
     @Override
     @Nullable
     public Tooltip getCurrentTooltip(Point point) {
-        Tooltip tooltip = getCurrentEntry().getTooltip(point);
+        Tooltip tooltip = getCurrentEntry().getTooltip(TooltipContext.of(point));
         
         if (tooltip != null && !(Minecraft.getInstance().screen instanceof DisplayScreen)) {
             boolean exists = getTransferHandler(false) != null;
-- 
cgit