From 6fd895753bfe317233f68da38ba3460422674475 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Thu, 9 Jun 2022 16:45:30 +0800 Subject: Add accepted stacks to the tooltip --- .../shedaniel/rei/impl/client/gui/fabric/ScreenOverlayImplImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'fabric/src/main/java') diff --git a/fabric/src/main/java/me/shedaniel/rei/impl/client/gui/fabric/ScreenOverlayImplImpl.java b/fabric/src/main/java/me/shedaniel/rei/impl/client/gui/fabric/ScreenOverlayImplImpl.java index caf42161f..affa0859f 100644 --- a/fabric/src/main/java/me/shedaniel/rei/impl/client/gui/fabric/ScreenOverlayImplImpl.java +++ b/fabric/src/main/java/me/shedaniel/rei/impl/client/gui/fabric/ScreenOverlayImplImpl.java @@ -26,6 +26,7 @@ package me.shedaniel.rei.impl.client.gui.fabric; import com.mojang.blaze3d.vertex.PoseStack; import me.shedaniel.rei.api.client.gui.widgets.Tooltip; import me.shedaniel.rei.impl.ClientInternals; +import me.shedaniel.rei.impl.client.gui.widget.QueuedTooltip; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; @@ -48,7 +49,7 @@ public class ScreenOverlayImplImpl { Stream sequenceStream = texts.isEmpty() ? Stream.of(component.getAsText().getVisualOrderText()) : texts.stream().map(Language.getInstance()::getVisualOrder); return sequenceStream.map(ClientTooltipComponent::create); - } else if (!component.isTooltipComponent()) { + } else if (((QueuedTooltip.TooltipEntryImpl) component).isClientComponent()) { return Stream.of(component.getAsComponent()); } else { return Stream.empty(); @@ -59,6 +60,8 @@ public class ScreenOverlayImplImpl { if (entry.isTooltipComponent()) { TooltipComponent component = entry.getAsTooltipComponent(); + if (component instanceof ClientTooltipComponent) break; + try { ClientInternals.getClientTooltipComponent(lines, component); } catch (Throwable exception) { -- cgit