aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2022-06-17 18:43:56 +0800
committershedaniel <daniel@shedaniel.me>2022-06-17 18:43:56 +0800
commitb29fd5abdd06b815b499b39c2e42d3672aa588f6 (patch)
tree4cfbdf63f57396bf24b621862431b55cc1f27241
parent78f93b975c66b9345906e563e0f95c63ef285ac8 (diff)
parent85ecd54de2309184b1cbc0153236b67426c17cb7 (diff)
downloadRoughlyEnoughItems-b29fd5abdd06b815b499b39c2e42d3672aa588f6.tar.gz
RoughlyEnoughItems-b29fd5abdd06b815b499b39c2e42d3672aa588f6.tar.bz2
RoughlyEnoughItems-b29fd5abdd06b815b499b39c2e42d3672aa588f6.zip
Merge remote-tracking branch 'origin/8.x-1.18.2' into feature/rei_8.3
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/AbstractDisplayViewingScreen.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/AbstractDisplayViewingScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/AbstractDisplayViewingScreen.java
index ff1fd37c2..88963bca5 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/AbstractDisplayViewingScreen.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/AbstractDisplayViewingScreen.java
@@ -236,6 +236,12 @@ public abstract class AbstractDisplayViewingScreen extends Screen implements Dis
@Override
public Tooltip apply(Tooltip tooltip) {
if (widget.getEntries().size() > 1) {
+ for (Tooltip.Entry entry : tooltip.entries()) {
+ if (entry.isTooltipComponent() && entry.getAsTooltipComponent() instanceof TooltipProcessor) {
+ return tooltip;
+ }
+ }
+
tooltip.add((ClientTooltipComponent) this);
}
return tooltip;