aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2024-12-13 19:31:20 +0800
committershedaniel <daniel@shedaniel.me>2024-12-13 19:32:10 +0800
commit2eaaf02a116102cbc53e5707d5443d0c137055ff (patch)
treea5f463d5c63660520593a5c000ec9a14c5d8a238
parent7d9ab3e4a44c5d6859abb7eb40308ae4dad9c831 (diff)
downloadRoughlyEnoughItems-2eaaf02a116102cbc53e5707d5443d0c137055ff.tar.gz
RoughlyEnoughItems-2eaaf02a116102cbc53e5707d5443d0c137055ff.tar.bz2
RoughlyEnoughItems-2eaaf02a116102cbc53e5707d5443d0c137055ff.zip
Fix sub-menus not showing
-rw-r--r--fabric/src/main/resources/roughlyenoughitems.accessWidener5
-rw-r--r--neoforge/src/main/resources/META-INF/accesstransformer.cfg4
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/gui/modules/entries/SubMenuEntry.java3
3 files changed, 12 insertions, 0 deletions
diff --git a/fabric/src/main/resources/roughlyenoughitems.accessWidener b/fabric/src/main/resources/roughlyenoughitems.accessWidener
index 3d7dc66d6..dfb2dfa25 100644
--- a/fabric/src/main/resources/roughlyenoughitems.accessWidener
+++ b/fabric/src/main/resources/roughlyenoughitems.accessWidener
@@ -43,3 +43,8 @@ accessible field net/minecraft/world/item/crafting/ShapelessRecipe result Lnet/m
accessible field net/minecraft/client/gui/screens/inventory/AbstractRecipeBookScreen recipeBookComponent Lnet/minecraft/client/gui/screens/recipebook/RecipeBookComponent;
accessible method net/minecraft/client/gui/GuiGraphics innerBlit (Ljava/util/function/Function;Lnet/minecraft/resources/ResourceLocation;IIIIFFFFI)V
accessible field net/minecraft/client/gui/GuiGraphics bufferSource Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;
+accessible field net/minecraft/client/gui/GuiGraphics scissorStack Lnet/minecraft/client/gui/GuiGraphics$ScissorStack;
+mutable field net/minecraft/client/gui/GuiGraphics scissorStack Lnet/minecraft/client/gui/GuiGraphics$ScissorStack;
+accessible class net/minecraft/client/gui/GuiGraphics$ScissorStack
+accessible field net/minecraft/client/gui/GuiGraphics$ScissorStack stack Ljava/util/Deque;
+accessible method net/minecraft/client/gui/GuiGraphics$ScissorStack <init> ()V
diff --git a/neoforge/src/main/resources/META-INF/accesstransformer.cfg b/neoforge/src/main/resources/META-INF/accesstransformer.cfg
index 070e182a8..8e2a5e547 100644
--- a/neoforge/src/main/resources/META-INF/accesstransformer.cfg
+++ b/neoforge/src/main/resources/META-INF/accesstransformer.cfg
@@ -53,3 +53,7 @@ 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
+public net.minecraft.client.gui.GuiGraphics$ScissorStack <init>()V
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/modules/entries/SubMenuEntry.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/modules/entries/SubMenuEntry.java
index cb150b7c1..845e0e1fd 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/modules/entries/SubMenuEntry.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/modules/entries/SubMenuEntry.java
@@ -120,7 +120,10 @@ public class SubMenuEntry extends AbstractMenuEntry {
}
RenderSystem.disableScissor();
+ GuiGraphics.ScissorStack tmp = graphics.scissorStack;
+ graphics.scissorStack = new GuiGraphics.ScissorStack();
menu.render(graphics, mouseX, mouseY, delta);
+ graphics.scissorStack = tmp;
graphics.enableScissor(0, 0, 0, 0);
graphics.disableScissor();
}