Port to 1.21.6 (#1907)

* Port to 1.21.6

* Fix tooltip Z-rendering

* Fix config screen

* Add workflow

Author: shedaniel

.github/workflows/curseforge.yml

@@ -23,6 +23,7 @@ on:
       - 17.x-1.21.2
       - 18.x-1.21.4
       - 19.x-1.21.5
+      - 20.x-1.21.6
 
 jobs:
   build:

api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java

@@ -115,14 +115,6 @@ static ConfigObject getInstance() {
      */
     boolean isGrabbingItems();
 
-    /**
-     * Returns whether favorites motions are animated.
-     *
-     * @return whether favorites motions are animated
-     */
-    @Deprecated(forRemoval = true)
-    boolean isFavoritesAnimated();
-    
     /**
      * Returns whether motions are reduced.
      *
@@ -281,8 +273,6 @@ default boolean isLeftHandSidePanel() {
     @ApiStatus.Experimental
     boolean doDisplayIMEHints();
 
-    boolean doesFastEntryRendering();
-    
     boolean doesCacheEntryRendering();
 
     @ApiStatus.Experimental

api/src/main/java/me/shedaniel/rei/api/client/entry/renderer/BatchedEntryRenderer.java

@@ -90,13 +90,13 @@ public CompoundFavoriteRenderer(boolean showcase, int count, IntFunction<Rendere
     public void render(GuiGraphics graphics, Rectangle bounds, int mouseX, int mouseY, float delta) {
         updateAnimator(delta);
         graphics.enableScissor(bounds.x, bounds.y, bounds.getMaxX(), bounds.getMaxY());
-        graphics.pose().pushPose();
-        graphics.pose().translate(0, this.offset.floatValue() * -bounds.getHeight(), 0);
+        graphics.pose().pushMatrix();
+        graphics.pose().translate(0, this.offset.floatValue() * -bounds.getHeight());
         for (int i = 0; i < count; i++) {
             renderers.apply(i).render(graphics, bounds, mouseX, mouseY, delta);
-            graphics.pose().translate(0, bounds.height, 0);
+            graphics.pose().translate(0, bounds.height);
         }
-        graphics.pose().popPose();
+        graphics.pose().popMatrix();
         graphics.disableScissor();
     }
 

api/src/main/java/me/shedaniel/rei/api/client/favorites/CompoundFavoriteRenderer.java

@@ -36,7 +36,7 @@
 import me.shedaniel.rei.api.common.util.EntryStacks;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
 import org.jetbrains.annotations.ApiStatus;
@@ -120,8 +120,6 @@ public void render(GuiGraphics graphics, Rectangle bounds, int mouseX, int mouse
         int xx = bounds.x + 4, yy = bounds.y + 2;
         int j = 0;
         int itemsPerLine = getItemsPerLine();
-        graphics.pose().pushPose();
-        graphics.pose().translate(0, 0, 50);
         for (Slot entryWidget : inputWidgets) {
             entryWidget.getBounds().setLocation(xx, yy);
             entryWidget.render(graphics, mouseX, mouseY, delta);
@@ -133,20 +131,16 @@ public void render(GuiGraphics graphics, Rectangle bounds, int mouseX, int mouse
                 j = 0;
             }
         }
-        graphics.pose().popPose();
         xx = bounds.x + 4 + 18 * (getItemsPerLine() - 2);
         yy = bounds.y + getHeight() / 2 - 8;
-        graphics.blit(RenderType::guiTextured, CHEST_GUI_TEXTURE, xx, yy, 0, 28, 18, 18, 256, 256);
+        graphics.blit(RenderPipelines.GUI_TEXTURED, CHEST_GUI_TEXTURE, xx, yy, 0, 28, 18, 18, 256, 256);
         xx += 18;
         yy += outputWidgets.size() * -9 + 9;
-        graphics.pose().pushPose();
-        graphics.pose().translate(0, 0, 50);
         for (Slot outputWidget : outputWidgets) {
             outputWidget.getBounds().setLocation(xx, yy);
             outputWidget.render(graphics, mouseX, mouseY, delta);
             yy += 18;
         }
-        graphics.pose().popPose();
     }
 
     @Nullable

api/src/main/java/me/shedaniel/rei/api/client/gui/SimpleDisplayRenderer.java

@@ -23,7 +23,6 @@
 
 package me.shedaniel.rei.api.client.gui.widgets;
 
-import com.mojang.blaze3d.vertex.PoseStack;
 import me.shedaniel.math.Point;
 import me.shedaniel.math.Rectangle;
 import me.shedaniel.math.impl.PointHelper;
@@ -36,8 +35,8 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.Renderable;
 import org.jetbrains.annotations.ApiStatus;
-import org.joml.Matrix4f;
-import org.joml.Vector4f;
+import org.joml.Matrix3x2f;
+import org.joml.Vector3f;
 
 import java.util.Stack;
 
@@ -71,17 +70,13 @@ public static Point popMouse() {
         return mouseStack.pop();
     }
 
-    public static Point translateMouse(PoseStack poses) {
-        return translateMouse(poses.last().pose());
+    public static Point translateMouse(double x, double y) {
+        return translateMouse(new Matrix3x2f().translate((float) x, (float) y));
     }
 
-    public static Point translateMouse(double x, double y, double z) {
-        return translateMouse(new Matrix4f().translate((float) x, (float) y, (float) z));
-    }
-    
-    public static Point translateMouse(Matrix4f pose) {
+    public static Point translateMouse(Matrix3x2f pose) {
         Point mouse = mouse();
-        Vector4f mouseVec = new Vector4f(mouse.x, mouse.y, 0, 1);
+        Vector3f mouseVec = new Vector3f(mouse.x, mouse.y, 1);
         pose.transform(mouseVec);
         return pushMouse(new Point(mouseVec.x(), mouseVec.y()));
     }

api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Widget.java

@@ -44,7 +44,7 @@
 import net.minecraft.world.item.Item;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
-import org.joml.Matrix4f;
+import org.joml.Matrix3x2f;
 
 import java.util.*;
 import java.util.function.Consumer;
@@ -110,19 +110,19 @@ public static Widget wrapVanillaWidget(GuiEventListener element) {
         return ClientInternals.getWidgetsProvider().wrapVanillaWidget(element);
     }
 
-    public static WidgetWithBounds withTranslate(Widget widget, double x, double y, double z) {
-        return withTranslate(widget, new Matrix4f().translate((float) x, (float) y, (float) z));
+    public static WidgetWithBounds withTranslate(Widget widget, double x, double y) {
+        return withTranslate(widget, new Matrix3x2f().translate((float) x, (float) y));
     }
 
-    public static WidgetWithBounds withTranslate(Widget widget, Matrix4f translate) {
+    public static WidgetWithBounds withTranslate(Widget widget, Matrix3x2f translate) {
         return withTranslate(widget, () -> translate);
     }
 
-    public static <T extends Widget> WidgetWithBounds withTranslate(T widget, Function<T, Matrix4f> translate) {
+    public static <T extends Widget> WidgetWithBounds withTranslate(T widget, Function<T, Matrix3x2f> translate) {
         return withTranslate(widget, () -> translate.apply(widget));
     }
 
-    public static WidgetWithBounds withTranslate(Widget widget, Supplier<Matrix4f> translate) {
+    public static WidgetWithBounds withTranslate(Widget widget, Supplier<Matrix3x2f> translate) {
         WidgetWithBounds widgetWithBounds = wrapWidgetWithBounds(widget);
         return ClientInternals.getWidgetsProvider().withTranslate(widgetWithBounds, translate);
     }

api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Widgets.java

@@ -174,11 +174,8 @@ default void renderMissingInput(Context context, List<InputIngredient<ItemStack>
         for (Widget widget : widgets) {
             if (widget instanceof Slot && ((Slot) widget).getNoticeMark() == Slot.INPUT) {
                 if (missingIndices.contains(i++)) {
-                    graphics.pose().pushPose();
-                    graphics.pose().translate(0, 0, 50);
                     Rectangle innerBounds = ((Slot) widget).getInnerBounds();
                     graphics.fill(innerBounds.x, innerBounds.y, innerBounds.getMaxX(), innerBounds.getMaxY(), 0x40ff0000);
-                    graphics.pose().popPose();
                 }
             }
         }

api/src/main/java/me/shedaniel/rei/api/client/registry/transfer/simple/SimpleTransferHandler.java

@@ -23,26 +23,53 @@
 
 package me.shedaniel.rei.api.client.util;
 
-import com.mojang.math.Transformation;
 import me.shedaniel.math.Point;
 import me.shedaniel.math.Rectangle;
 import org.jetbrains.annotations.ApiStatus;
-import org.joml.Matrix4f;
-import org.joml.Vector4f;
+import org.joml.Matrix3x2f;
+import org.joml.Vector3f;
 
 @ApiStatus.Experimental
 public class MatrixUtils {
-    public static Matrix4f inverse(Matrix4f matrix) {
-        Transformation transformation = new Transformation(matrix);
-        Transformation inverse = transformation.inverse();
-        if (inverse != null) inverse.getScale(); // This has a side effect
-        return inverse == null ? Transformation.identity().getMatrixCopy() : inverse.getMatrixCopy();
+    public static Matrix3x2f inverse(Matrix3x2f matrix) {
+        float m00 = matrix.m00;
+        float m01 = matrix.m01;
+        float m10 = matrix.m10;
+        float m11 = matrix.m11;
+        float m20 = matrix.m20; // Translation X
+        float m21 = matrix.m21; // Translation Y
+        
+        // Calculate determinant of the 2x2 rotation/scale part
+        float det = m00 * m11 - m10 * m01;
+        
+        if (Math.abs(det) < 0.00001f) { // Check for singularity (e.g., zero scale)
+            System.err.println("Warning: Matrix is singular (determinant near zero), cannot be accurately inverted.");
+            return null;
+        }
+        
+        float invDet = 1.0f / det;
+        float invM00 = m11 * invDet;
+        float invM01 = -m01 * invDet;
+        float invM10 = -m10 * invDet;
+        float invM11 = m00 * invDet;
+        
+        // Apply inverse 2x2 part to translation
+        // T_inv = -M_inv * T
+        float invM20 = -(invM00 * m20 + invM10 * m21);
+        float invM21 = -(invM01 * m20 + invM11 * m21);
+        
+        // Create the inverse matrix
+        return new Matrix3x2f(
+                invM00, invM01, // First column (x-axis transformation)
+                invM10, invM11, // Second column (y-axis transformation)
+                invM20, invM21  // Third column (translation)
+        );
     }
 
-    public static Rectangle transform(Matrix4f matrix, Rectangle rectangle) {
-        Vector4f vec1 = new Vector4f((float) rectangle.x, (float) rectangle.y, 0, 1);
+    public static Rectangle transform(Matrix3x2f matrix, Rectangle rectangle) {
+        Vector3f vec1 = new Vector3f((float) rectangle.x, (float) rectangle.y, 1);
         matrix.transform(vec1);
-        Vector4f vec2 = new Vector4f((float) rectangle.getMaxX(), (float) rectangle.getMaxY(), 0, 1);
+        Vector3f vec2 = new Vector3f((float) rectangle.getMaxX(), (float) rectangle.getMaxY(), 1);
         matrix.transform(vec2);
         int x1 = Math.round(vec1.x());
         int x2 = Math.round(vec2.x());
@@ -51,8 +78,8 @@ public static Rectangle transform(Matrix4f matrix, Rectangle rectangle) {
         return new Rectangle(Math.min(x1, x2), Math.min(y1, y2), Math.abs(x2 - x1), Math.abs(y2 - y1));
     }
 
-    public static Point transform(Matrix4f matrix, Point point) {
-        Vector4f mouse = new Vector4f((float) point.x, (float) point.y, 0, 1);
+    public static Point transform(Matrix3x2f matrix, Point point) {
+        Vector3f mouse = new Vector3f((float) point.x, (float) point.y, 1);
         matrix.transform(mouse);
         return new Point(mouse.x(), mouse.y());
     }