From b99ba98ffeaff540a15dd7b188a9793539fd2bb7 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Thu, 9 Jun 2022 16:45:30 +0800
Subject: Add accepted stacks to the tooltip

---
 forge/build.gradle                                             |  5 ++---
 .../rei/impl/client/gui/forge/ScreenOverlayImplImpl.java       | 10 +++++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'forge')

diff --git a/forge/build.gradle b/forge/build.gradle
index 97fdc24e4..0f1dd4ebf 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -221,7 +221,7 @@ curseforge {
             releaseType = "beta"
             changelogType = "html"
             changelog = rootProject.releaseChangelog
-            addGameVersion "1.18.2"
+            addGameVersion "1.19"
             addGameVersion "Java 17"
             addGameVersion "Forge"
             relations {
@@ -238,8 +238,7 @@ curseforge {
             releaseType = "release"
             changelogType = "html"
             changelog = rootProject.releaseChangelog
-            addGameVersion "1.18"
-            addGameVersion "1.18.1"
+            addGameVersion "1.19"
             addGameVersion "Java 17"
             addGameVersion "Forge"
             relations {
diff --git a/forge/src/main/java/me/shedaniel/rei/impl/client/gui/forge/ScreenOverlayImplImpl.java b/forge/src/main/java/me/shedaniel/rei/impl/client/gui/forge/ScreenOverlayImplImpl.java
index a7b5a3091..259633e2d 100644
--- a/forge/src/main/java/me/shedaniel/rei/impl/client/gui/forge/ScreenOverlayImplImpl.java
+++ b/forge/src/main/java/me/shedaniel/rei/impl/client/gui/forge/ScreenOverlayImplImpl.java
@@ -31,6 +31,7 @@ import me.shedaniel.rei.api.common.util.CollectionUtils;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
 import net.minecraft.network.chat.Component;
+import net.minecraft.world.inventory.tooltip.TooltipComponent;
 import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.client.ForgeHooksClient;
 
@@ -47,7 +48,14 @@ public class ScreenOverlayImplImpl {
         components = new ArrayList<>(components);
         for (Tooltip.Entry entry : tooltip.entries()) {
             if (!entry.isText()) {
-                components.add(1, ClientTooltipComponent.create(entry.getAsTooltipComponent()));
+                TooltipComponent component = entry.getAsTooltipComponent();
+                
+                if (component instanceof ClientTooltipComponent client) {
+                    components.add(client);
+                    continue;
+                }
+                
+                components.add(1, ClientTooltipComponent.create(component));
             }
         }
         screen.tooltipStack = itemStack;
-- 
cgit