From bbf4c43a1ed431c94c2a95e67ea8494a8007cdee Mon Sep 17 00:00:00 2001 From: shedaniel Date: Wed, 23 Jul 2025 20:50:25 +0200 Subject: Port to 1.21.6 (#1907) * Port to 1.21.6 * Fix tooltip Z-rendering * Fix config screen * Add workflow --- .../shedaniel/rei/impl/client/gui/forge/ScreenOverlayImplForge.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'neoforge/src/main/java') diff --git a/neoforge/src/main/java/me/shedaniel/rei/impl/client/gui/forge/ScreenOverlayImplForge.java b/neoforge/src/main/java/me/shedaniel/rei/impl/client/gui/forge/ScreenOverlayImplForge.java index 78751b442..dea238b6d 100644 --- a/neoforge/src/main/java/me/shedaniel/rei/impl/client/gui/forge/ScreenOverlayImplForge.java +++ b/neoforge/src/main/java/me/shedaniel/rei/impl/client/gui/forge/ScreenOverlayImplForge.java @@ -46,7 +46,7 @@ import java.util.Optional; public class ScreenOverlayImplForge extends ScreenOverlayImpl { @Override public void renderTooltipInner(Screen screen, GuiGraphics graphics, Tooltip tooltip, int mouseX, int mouseY) { - graphics.pose().pushPose(); + graphics.pose().pushMatrix(); EntryStack stack = tooltip.getContextStack(); ItemStack itemStack = stack.getType() == VanillaEntryTypes.ITEM ? stack.castValue() : ItemStack.EMPTY; List texts = CollectionUtils.filterAndMap(tooltip.entries(), Tooltip.Entry::isText, Tooltip.Entry::getAsText); @@ -69,8 +69,8 @@ public class ScreenOverlayImplForge extends ScreenOverlayImpl { font = ClientHooks.getTooltipFont(itemStack, font); } graphics.tooltipStack = itemStack; - graphics.renderTooltipInternal(font, components, mouseX, mouseY, DefaultTooltipPositioner.INSTANCE, tooltip.getTooltipStyle()); + graphics.setTooltipForNextFrameInternal(font, components, mouseX, mouseY, DefaultTooltipPositioner.INSTANCE, tooltip.getTooltipStyle(), false); graphics.tooltipStack = ItemStack.EMPTY; - graphics.pose().popPose(); + graphics.pose().popMatrix(); } } -- cgit