From bbf4c43a1ed431c94c2a95e67ea8494a8007cdee Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
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
---
 .../rei/impl/client/gui/forge/ScreenOverlayImplForge.java          | 6 +++---
 neoforge/src/main/resources/META-INF/accesstransformer.cfg         | 7 ++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'neoforge/src')

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<Component> 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();
     }
 }
diff --git a/neoforge/src/main/resources/META-INF/accesstransformer.cfg b/neoforge/src/main/resources/META-INF/accesstransformer.cfg
index 387e2bce5..c4c0703e4 100644
--- a/neoforge/src/main/resources/META-INF/accesstransformer.cfg
+++ b/neoforge/src/main/resources/META-INF/accesstransformer.cfg
@@ -1,4 +1,3 @@
-public net.minecraft.client.gui.Font$StringRenderOutput
 public net.minecraft.world.item.alchemy.PotionBrewing$Mix
 public net.minecraft.client.gui.components.ImageButton sprites
 public net.minecraft.client.gui.screens.inventory.AbstractContainerScreen hoveredSlot
@@ -28,9 +27,9 @@ public-f net.minecraft.client.gui.screens.inventory.AbstractContainerScreen drag
 protected net.minecraft.client.gui.screens.Screen init(Lnet/minecraft/client/Minecraft;II)V
 public net.minecraft.client.gui.screens.Screen addRenderableWidget(Lnet/minecraft/client/gui/components/events/GuiEventListener;)Lnet/minecraft/client/gui/components/events/GuiEventListener;
 public net.minecraft.client.gui.screens.Screen addRenderableOnly(Lnet/minecraft/client/gui/components/Renderable;)Lnet/minecraft/client/gui/components/Renderable;
-public net.minecraft.client.gui.GuiGraphics renderTooltipInternal(Lnet/minecraft/client/gui/Font;Ljava/util/List;IILnet/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipPositioner;Lnet/minecraft/resources/ResourceLocation;)V # renderTooltipInternal
+public net.minecraft.client.gui.GuiGraphics setTooltipForNextFrameInternal(Lnet/minecraft/client/gui/Font;Ljava/util/List;IILnet/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipPositioner;Lnet/minecraft/resources/ResourceLocation;Z)V # setTooltipForNextFrameInternal
 public net.minecraft.client.gui.GuiGraphics tooltipStack
-public net.minecraft.client.gui.GuiGraphics innerBlit(Lnet/minecraft/resources/ResourceLocation;IIIIIFFFF)V # innerBlit
+public net.minecraft.client.gui.GuiGraphics innerBlit(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/ResourceLocation;IIIIFFFFI)V
 public net.minecraft.client.renderer.RenderType$OutlineProperty
 public net.minecraft.client.renderer.RenderType$CompositeState
 public net.minecraft.tags.TagEntry tag # tag
@@ -50,8 +49,6 @@ public net.minecraft.world.item.crafting.SingleItemRecipe result()Lnet/minecraft
 public net.minecraft.world.item.crafting.ShapedRecipe result
 public net.minecraft.world.item.crafting.ShapelessRecipe result
 public net.minecraft.client.gui.screens.inventory.AbstractRecipeBookScreen recipeBookComponent
-public net.minecraft.client.gui.GuiGraphics innerBlit(Ljava/util/function/Function;Lnet/minecraft/resources/ResourceLocation;IIIIFFFFI)V
-public net.minecraft.client.gui.GuiGraphics bufferSource
 public-f net.minecraft.client.gui.GuiGraphics scissorStack
 public net.minecraft.client.gui.GuiGraphics$ScissorStack
 public net.minecraft.client.gui.GuiGraphics$ScissorStack stack
-- 
cgit