Fix sub-menus not showing

shedaniel · Dec 13, 2024 · 2eaaf02 · 2eaaf02
1 parent 7d9ab3e
commit 2eaaf02
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git 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
@@ -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
@@ -120,7 +120,10 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
                 }
 
                 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();
             }