remove panel layer

Author: brachy84

src/main/java/com/cleanroommc/modularui/api/widget/IWidget.java

@@ -92,7 +92,7 @@ default void draw(ModularGuiContext context) {
     void drawForeground(ModularGuiContext context);
 
     default void transform(IViewportStack stack) {
-        stack.translate(getArea().rx, getArea().ry, getArea().getPanelLayer() * 20);
+        stack.translate(getArea().rx, getArea().ry, 0);
     }
 
     default Object getAdditionalHoverInfo(IViewportStack viewportStack, int mouseX, int mouseY) {

src/main/java/com/cleanroommc/modularui/screen/ModularScreen.java

@@ -291,7 +291,7 @@ public void drawScreen() {
         this.context.reset();
         this.context.pushViewport(null, this.context.getScreenArea());
         for (ModularPanel panel : this.panelManager.getReverseOpenPanels()) {
-            this.context.updateZ(panel.getArea().getPanelLayer() * 20);
+            this.context.updateZ(0);
             if (panel.disablePanelsBelow()) {
                 GuiDraw.drawRect(0, 0, this.context.getScreenArea().w(), this.context.getScreenArea().h(), Color.argb(16, 16, 16, (int) (125 * panel.getAlpha())));
             }
@@ -324,7 +324,7 @@ public void drawForeground() {
         this.context.reset();
         this.context.pushViewport(null, this.context.getScreenArea());
         for (ModularPanel panel : this.panelManager.getReverseOpenPanels()) {
-            this.context.updateZ(100 + panel.getArea().getPanelLayer() * 20);
+            this.context.updateZ(100);
             if (panel.isEnabled()) {
                 WidgetTree.drawTreeForeground(panel, this.context);
             }

src/main/java/com/cleanroommc/modularui/screen/PanelManager.java

@@ -97,7 +97,6 @@ private void openPanel(ModularPanel panel, boolean resize) {
         panel.setPanelGuiContext(this.screen.getContext());
         this.panels.addFirst(panel);
         this.dirty = true;
-        panel.getArea().setPanelLayer((byte) this.panels.size());
         panel.onOpen(this.screen);
         if (resize) {
             WidgetTree.resizeInternal(panel, true);

src/main/java/com/cleanroommc/modularui/widget/EmptyWidget.java

@@ -29,7 +29,6 @@ public ModularScreen getScreen() {
     @Override
     public void initialise(@NotNull IWidget parent, boolean late) {
         this.parent = parent;
-        getArea().setPanelLayer(getParent().getArea().getPanelLayer());
         getArea().z(parent.getArea().z() + 1);
     }
 

src/main/java/com/cleanroommc/modularui/widget/Widget.java

@@ -101,7 +101,6 @@ public final void initialise(@NotNull IWidget parent, boolean late) {
             this.parent = parent;
             this.panel = parent.getPanel();
             this.context = parent.getContext();
-            getArea().setPanelLayer(this.panel.getArea().getPanelLayer());
             getArea().z(parent.getArea().z() + 1);
             if (this.guiActionListeners != null) {
                 for (IGuiAction action : this.guiActionListeners) {

src/main/java/com/cleanroommc/modularui/widget/sizer/Area.java

@@ -7,6 +7,8 @@
 import com.cleanroommc.modularui.utils.Interpolations;
 import com.cleanroommc.modularui.utils.MathUtils;
 
+import org.jetbrains.annotations.ApiStatus;
+
 import java.awt.*;
 import java.awt.geom.Rectangle2D;
 import java.util.Objects;
@@ -30,10 +32,6 @@ public static boolean isInside(int x, int y, int w, int h, int px, int py) {
      * relative position (in most cases the direct parent)
      */
     public int rx, ry;
-    /**
-     * each panel has its own layer
-     */
-    private byte panelLayer = 0;
     /**
      * the widget layer within this panel
      */
@@ -55,7 +53,6 @@ public Area(Area area) {
         super(area);
         this.rx = area.rx;
         this.ry = area.ry;
-        this.panelLayer = area.panelLayer;
         this.z = area.z;
         getMargin().set(area.getMargin());
         getPadding().set(area.getPadding());
@@ -125,13 +122,15 @@ public void z(int z) {
         this.z = z;
     }
 
+    @ApiStatus.ScheduledForRemoval(inVersion = "3.2.0")
+    @Deprecated
     public byte getPanelLayer() {
-        return this.panelLayer;
+        return 0;
     }
 
-    public void setPanelLayer(byte panelLayer) {
-        this.panelLayer = panelLayer;
-    }
+    @ApiStatus.ScheduledForRemoval(inVersion = "3.2.0")
+    @Deprecated
+    public void setPanelLayer(byte panelLayer) {}
 
     /**
      * Calculate X based on anchor value
@@ -557,13 +556,13 @@ public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass()) return false;
         if (!super.equals(o)) return false;
         Area area = (Area) o;
-        return rx == area.rx && ry == area.ry && panelLayer == area.panelLayer && z == area.z && Objects.equals(getMargin(),
+        return rx == area.rx && ry == area.ry && z == area.z && Objects.equals(getMargin(),
                 area.getMargin()) && Objects.equals(
                 getPadding(), area.getPadding());
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), rx, ry, panelLayer, z, getMargin(), getPadding());
+        return Objects.hash(super.hashCode(), rx, ry, z, getMargin(), getPadding());
     }
 }

src/main/java/com/cleanroommc/modularui/widget/sizer/Flex.java

@@ -433,10 +433,8 @@ public boolean isYMarginPaddingApplied() {
     public boolean resize(IGuiElement guiElement, boolean isParentLayout) {
         IResizeable relativeTo = getRelativeTo();
         Area relativeArea = relativeTo.getArea();
-        byte panelLayer = this.parent.getArea().getPanelLayer();
 
-        if (!this.bypassLayerRestriction && (relativeArea.getPanelLayer() > panelLayer ||
-                (relativeArea.getPanelLayer() == panelLayer && relativeArea.z() >= this.parent.getArea().z()))) {
+        if (!this.bypassLayerRestriction && relativeArea.z() >= this.parent.getArea().z()) {
             Area area = guiElement.getArea();
             area.setSize(18, 18);
             area.rx = 0;