fix item rendering interference

brachy84 · brachy84 · commit ae0b6710ea33 · 2025-05-06T23:50:26.000+02:00
diff --git a/src/main/java/com/cleanroommc/modularui/api/widget/IWidget.java b/src/main/java/com/cleanroommc/modularui/api/widget/IWidget.java
@@ -90,7 +90,7 @@ default void draw(ModularGuiContext context) {
     void drawForeground(ModularGuiContext context);
 
     default void transform(IViewportStack stack) {
-        stack.translate(getArea().rx, getArea().ry);
+        stack.translate(getArea().rx, getArea().ry, getArea().getPanelLayer() * 20);
     }
 
     default WidgetTheme getWidgetTheme(ITheme theme) {
diff --git a/src/main/java/com/cleanroommc/modularui/drawable/GuiDraw.java b/src/main/java/com/cleanroommc/modularui/drawable/GuiDraw.java
@@ -337,15 +337,15 @@ public static void drawTiledTexture(float x, float y, float w, float h, float u0
         tessellator.draw();
     }
 
-    public static void drawItem(ItemStack item, int x, int y, float width, float height) {
+    public static void drawItem(ItemStack item, int x, int y, float width, float height, int z) {
         if (item.isEmpty()) return;
         GlStateManager.pushMatrix();
         RenderHelper.enableGUIStandardItemLighting();
         GlStateManager.enableDepth();
         GlStateManager.translate(x, y, 0);
         GlStateManager.scale(width / 16f, height / 16f, 1);
         RenderItem renderItem = Minecraft.getMinecraft().getRenderItem();
-        renderItem.zLevel = 200;
+        renderItem.zLevel = z + 100;
         renderItem.renderItemAndEffectIntoGUI(Minecraft.getMinecraft().player, item, 0, 0);
         renderItem.zLevel = 0;
         GlStateManager.disableDepth();
diff --git a/src/main/java/com/cleanroommc/modularui/drawable/IngredientDrawable.java b/src/main/java/com/cleanroommc/modularui/drawable/IngredientDrawable.java
@@ -29,7 +29,7 @@ public void draw(GuiContext context, int x, int y, int width, int height, Widget
         if (this.items.length == 0) return;
         ItemStack item = this.items[(int) (Minecraft.getSystemTime() % (1000 * this.items.length)) / 1000];
         if (item != null) {
-            GuiDraw.drawItem(item, x, y, width, height);
+            GuiDraw.drawItem(item, x, y, width, height, context.getCurrentDrawingZ());
         }
     }
 
diff --git a/src/main/java/com/cleanroommc/modularui/drawable/ItemDrawable.java b/src/main/java/com/cleanroommc/modularui/drawable/ItemDrawable.java
@@ -66,7 +66,7 @@ public ItemDrawable(@NotNull Block item, int meta, int amount) {
     @SideOnly(Side.CLIENT)
     @Override
     public void draw(GuiContext context, int x, int y, int width, int height, WidgetTheme widgetTheme) {
-        GuiDraw.drawItem(this.item, x, y, width, height);
+        GuiDraw.drawItem(this.item, x, y, width, height, context.getCurrentDrawingZ());
     }
 
     @Override
diff --git a/src/main/java/com/cleanroommc/modularui/screen/ModularScreen.java b/src/main/java/com/cleanroommc/modularui/screen/ModularScreen.java
@@ -246,11 +246,13 @@ public void drawScreen(int mouseX, int mouseY, float partialTicks) {
         this.context.reset();
         this.context.pushViewport(null, this.context.getScreenArea());
         for (ModularPanel panel : this.panelManager.getReverseOpenPanels()) {
+            this.context.updateZ(panel.getArea().getPanelLayer() * 20);
             if (panel.disablePanelsBelow()) {
                 GuiDraw.drawRect(0, 0, this.context.getScreenArea().w(), this.context.getScreenArea().h(), Color.argb(16, 16, 16, (int) (125 * panel.getAlpha())));
             }
             WidgetTree.drawTree(panel, this.context);
         }
+        this.context.updateZ(0);
         this.context.popViewport(null);
 
         this.context.postRenderCallbacks.forEach(element -> element.accept(this.context));
diff --git a/src/main/java/com/cleanroommc/modularui/screen/viewport/GuiContext.java b/src/main/java/com/cleanroommc/modularui/screen/viewport/GuiContext.java
@@ -44,6 +44,7 @@ public static GuiContext getDefault() {
     /* Render states */
     private float partialTicks;
     private long tick = 0;
+    private int currentDrawingZ = 0;
 
     public boolean isAbove(IGuiElement widget) {
         return isMouseAbove(widget.getArea());
@@ -85,6 +86,10 @@ public void updateScreenArea(int w, int h) {
         this.screenArea.ry = 0;
     }
 
+    public void updateZ(int z) {
+        this.currentDrawingZ = z;
+    }
+
     @SideOnly(Side.CLIENT)
     public Minecraft getMC() {
         return Minecraft.getMinecraft();
@@ -161,6 +166,10 @@ public float getPartialTicks() {
         return this.partialTicks;
     }
 
+    public int getCurrentDrawingZ() {
+        return currentDrawingZ;
+    }
+
     public boolean isMuiContext() {
         return false;
     }
diff --git a/src/main/java/com/cleanroommc/modularui/test/TestTile2.java b/src/main/java/com/cleanroommc/modularui/test/TestTile2.java
@@ -1,12 +1,18 @@
 package com.cleanroommc.modularui.test;
 
 import com.cleanroommc.modularui.api.IGuiHolder;
+import com.cleanroommc.modularui.api.IPanelHandler;
+import com.cleanroommc.modularui.drawable.GuiTextures;
+import com.cleanroommc.modularui.drawable.ItemDrawable;
 import com.cleanroommc.modularui.factory.PosGuiData;
 import com.cleanroommc.modularui.screen.ModularPanel;
 import com.cleanroommc.modularui.screen.UISettings;
 import com.cleanroommc.modularui.value.sync.PanelSyncManager;
 import com.cleanroommc.modularui.widget.ScrollWidget;
 import com.cleanroommc.modularui.widget.scroll.VerticalScrollData;
+import com.cleanroommc.modularui.widgets.ButtonWidget;
+import com.cleanroommc.modularui.widgets.Dialog;
+import com.cleanroommc.modularui.widgets.SlotGroupWidget;
 import com.cleanroommc.modularui.widgets.slot.ItemSlot;
 import com.cleanroommc.modularui.widgets.slot.ModularSlot;
 
@@ -22,7 +28,7 @@
 
 public class TestTile2 extends TileEntity implements IGuiHolder<PosGuiData>, ITickable {
 
-    private static final int SLOT_COUNT = 9999;
+    private static final int SLOT_COUNT = 81;
 
     private final IItemHandlerModifiable itemHandler = new ItemStackHandler(SLOT_COUNT);
 
@@ -39,17 +45,38 @@ public TestTile2() {
 
     @Override
     public ModularPanel buildUI(PosGuiData data, PanelSyncManager syncManager, UISettings settings) {
-        ScrollWidget<?> sw = new ScrollWidget<>(new VerticalScrollData()).size(9 * 18).margin(7);
+        ScrollWidget<?> sw = new ScrollWidget<>(new VerticalScrollData()).size(9 * 18).margin(7).top(20);
         sw.getScrollArea().getScrollY().setScrollSize(18 * (SLOT_COUNT / 9));
         for (int i = 0; i < SLOT_COUNT; i++) {
             int x = i % 9;
             int y = i / 9;
             sw.child(new ItemSlot().pos(x * 18, y * 18)
                     .slot(new ModularSlot(this.itemHandler, i)));
         }
-        return ModularPanel.defaultPanel("test_tile_2", 176, 13 * 18 + 14 + 10)
+        ModularPanel panel = ModularPanel.defaultPanel("test_tile_2", 176, 13 * 18 + 14 + 10 + 20);
+        IPanelHandler otherPanel = syncManager.panel("2nd panel", (syncManager1, syncHandler) -> {
+            ModularPanel panel1 = new Dialog<>("Option Selection").setDisablePanelsBelow(false).setDraggable(true).size(4 * 18 + 8, 4 * 18 + 8);
+            return panel1
+                    .child(SlotGroupWidget.builder()
+                            .row("IIII")
+                            .row("IIII")
+                            .row("IIII")
+                            .row("IIII")
+                            .key('I', i -> new ItemDrawable(this.itemHandler.getStackInSlot(i + 23)).asIcon().asWidget().size(18)/*new ItemSlot().slot(new ModularSlot(this.itemHandler, i + 23))*/)
+                            .build()
+                            .pos(4, 4)
+                    );
+        }, true);
+        return panel
                 .bindPlayerInventory()
-                .child(sw);
+                .child(sw)
+                .child(new ButtonWidget<>()
+                        .top(5).size(12, 12).leftRel(0.5f)
+                        .overlay(GuiTextures.ADD)
+                        .onMouseTapped(mouseButton -> {
+                            otherPanel.openPanel();
+                            return true;
+                        }));
     }
 
     @Override
diff --git a/src/main/java/com/cleanroommc/modularui/widgets/slot/ItemSlot.java b/src/main/java/com/cleanroommc/modularui/widgets/slot/ItemSlot.java
@@ -214,8 +214,10 @@ private void drawSlot(Slot slotIn) {
             }
         }
 
-        ((GuiAccessor) guiScreen).setZLevel(100f);
-        renderItem.zLevel = 100.0F;
+        // makes sure items of different layers don't interfere with each other visually
+        float z = getContext().getCurrentDrawingZ() + 100;
+        ((GuiAccessor) guiScreen).setZLevel(z);
+        renderItem.zLevel = z;
 
         if (!flag1) {
             if (isDragPreview) {

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ default void draw(ModularGuiContext context) {`
`90`	`90`	`void drawForeground(ModularGuiContext context);`
`91`	`91`
`92`	`92`	`default void transform(IViewportStack stack) {`
`93`		`- stack.translate(getArea().rx, getArea().ry);`
	`93`	`+ stack.translate(getArea().rx, getArea().ry, getArea().getPanelLayer() * 20);`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`default WidgetTheme getWidgetTheme(ITheme theme) {`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public void draw(GuiContext context, int x, int y, int width, int height, Widget`
`29`	`29`	`if (this.items.length == 0) return;`
`30`	`30`	`ItemStack item = this.items[(int) (Minecraft.getSystemTime() % (1000 * this.items.length)) / 1000];`
`31`	`31`	`if (item != null) {`
`32`		`- GuiDraw.drawItem(item, x, y, width, height);`
	`32`	`+ GuiDraw.drawItem(item, x, y, width, height, context.getCurrentDrawingZ());`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public ItemDrawable(@NotNull Block item, int meta, int amount) {`
`66`	`66`	`@SideOnly(Side.CLIENT)`
`67`	`67`	`@Override`
`68`	`68`	`public void draw(GuiContext context, int x, int y, int width, int height, WidgetTheme widgetTheme) {`
`69`		`- GuiDraw.drawItem(this.item, x, y, width, height);`
	`69`	`+ GuiDraw.drawItem(this.item, x, y, width, height, context.getCurrentDrawingZ());`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -246,11 +246,13 @@ public void drawScreen(int mouseX, int mouseY, float partialTicks) {`
`246`	`246`	`this.context.reset();`
`247`	`247`	`this.context.pushViewport(null, this.context.getScreenArea());`
`248`	`248`	`for (ModularPanel panel : this.panelManager.getReverseOpenPanels()) {`
	`249`	`+ this.context.updateZ(panel.getArea().getPanelLayer() * 20);`
`249`	`250`	`if (panel.disablePanelsBelow()) {`
`250`	`251`	`GuiDraw.drawRect(0, 0, this.context.getScreenArea().w(), this.context.getScreenArea().h(), Color.argb(16, 16, 16, (int) (125 * panel.getAlpha())));`
`251`	`252`	`}`
`252`	`253`	`WidgetTree.drawTree(panel, this.context);`
`253`	`254`	`}`
	`255`	`+ this.context.updateZ(0);`
`254`	`256`	`this.context.popViewport(null);`
`255`	`257`
`256`	`258`	`this.context.postRenderCallbacks.forEach(element -> element.accept(this.context));`
Original file line number	Diff line number	Diff line change
`@@ -214,8 +214,10 @@ private void drawSlot(Slot slotIn) {`
`214`	`214`	`}`
`215`	`215`	`}`
`216`	`216`
`217`		`- ((GuiAccessor) guiScreen).setZLevel(100f);`
`218`		`- renderItem.zLevel = 100.0F;`
	`217`	`+ // makes sure items of different layers don't interfere with each other visually`
	`218`	`+ float z = getContext().getCurrentDrawingZ() + 100;`
	`219`	`+ ((GuiAccessor) guiScreen).setZLevel(z);`
	`220`	`+ renderItem.zLevel = z;`
`219`	`221`
`220`	`222`	`if (!flag1) {`
`221`	`223`	`if (isDragPreview) {`