From caa82617183f2665cb4bd369eab72b996b4ef1e4 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Tue, 12 Apr 2022 12:55:54 +0800 Subject: Fix quark tooltip fighting issues --- .../impl/client/gui/fabric/ScreenOverlayImplImpl.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (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 6dc97563f..86c21c5a4 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 @@ -50,15 +50,19 @@ public class ScreenOverlayImplImpl { : texts.stream().map(Language.getInstance()::getVisualOrder); return sequenceStream.map(ClientTooltipComponent::create); } else { - return Stream.of(component.getAsComponent()); + return Stream.empty(); } }) .collect(Collectors.toList()); - for (TooltipComponent component : tooltip.components()) { - try { - ClientInternals.getClientTooltipComponent(lines, component); - } catch (Throwable exception) { - throw new IllegalArgumentException("Failed to add tooltip component! " + component + ", Class: " + (component == null ? null : component.getClass().getCanonicalName()), exception); + for (Tooltip.Entry entry : tooltip.entries()) { + if (entry.isTooltipComponent()) { + TooltipComponent component = entry.getAsTooltipComponent(); + + try { + ClientInternals.getClientTooltipComponent(lines, component); + } catch (Throwable exception) { + throw new IllegalArgumentException("Failed to add tooltip component! " + component + ", Class: " + (component == null ? null : component.getClass().getCanonicalName()), exception); + } } } renderTooltipInner(matrices, lines, tooltip.getX(), tooltip.getY()); -- cgit