From ae0a9f8357b79c8d589a4252d644ccac90cb0ce9 Mon Sep 17 00:00:00 2001
From: Roelymole <roelymole@gmail.com>
Date: Tue, 28 Jan 2025 01:34:39 +0000
Subject: [PATCH 1/2] fix: improved the tabs at the sides of the machine GUIs
 including specifying better exclusion zones for REI and fixing small mistakes
 in the texture

---
 build.gradle.kts                              |   2 +-
 .../client/api/screen/MachineScreen.java      | 126 ++++++++++--------
 .../compat/MachineLibREIClientPlugin.java     |  28 +++-
 .../machinelib/impl/Constant.java             |   2 +-
 .../textures/gui/machine_panels.png           | Bin 2551 -> 6657 bytes
 5 files changed, 98 insertions(+), 60 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index b1e738cb..3e39f97d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -200,7 +200,7 @@ dependencies {
     "testmodImplementation"(sourceSets.main.get().output)
     "modTestmodImplementation"("net.fabricmc.fabric-api:fabric-api:$fabric")
 
-//    modRuntimeOnly("me.shedaniel:RoughlyEnoughItems-fabric:$rei")
+    modRuntimeOnly("me.shedaniel:RoughlyEnoughItems-fabric:$rei")
     modRuntimeOnly("mcp.mobius.waila:wthit:fabric-$wthit")
 }
 
diff --git a/src/main/java/dev/galacticraft/machinelib/client/api/screen/MachineScreen.java b/src/main/java/dev/galacticraft/machinelib/client/api/screen/MachineScreen.java
index 560e54e2..eeb970da 100644
--- a/src/main/java/dev/galacticraft/machinelib/client/api/screen/MachineScreen.java
+++ b/src/main/java/dev/galacticraft/machinelib/client/api/screen/MachineScreen.java
@@ -100,12 +100,13 @@ public class MachineScreen<Machine extends MachineBlockEntity, Menu extends Mach
     private static final ItemStack ALUMINUM_WIRE = new ItemStack(getOptionalItem(ResourceLocation.fromNamespaceAndPath("galacticraft", "aluminum_wire"), Items.MOJANG_BANNER_PATTERN));
     private static final ItemStack IRON_CHESTPLATE = new ItemStack(Items.IRON_CHESTPLATE);
 
-    private static final int SPACING = 4;
+    public static final int SPACING = 4;
 
-    private static final int PANEL_ICON_X = 3;
+    private static final int PANEL_ICON_X_LEFT = 4;
+    private static final int PANEL_ICON_X_RIGHT = 2;
     private static final int PANEL_ICON_Y = 3;
 
-    private static final int PANEL_TITLE_X = 19;
+    private static final int PANEL_TITLE_X = 18;
     private static final int PANEL_TITLE_Y = 7;
 
     private static final int REDSTONE_IGNORE_X = 18;
@@ -117,13 +118,13 @@ public class MachineScreen<Machine extends MachineBlockEntity, Menu extends Mach
     private static final int REDSTONE_HIGH_X = 68;
     private static final int REDSTONE_HIGH_Y = 30;
 
-    private static final int SECURITY_PUBLIC_X = 18;
+    private static final int SECURITY_PUBLIC_X = 16;
     private static final int SECURITY_PUBLIC_Y = 30;
 
-    private static final int SECURITY_TEAM_X = 43;
+    private static final int SECURITY_TEAM_X = 41;
     private static final int SECURITY_TEAM_Y = 30;
 
-    private static final int SECURITY_PRIVATE_X = 68;
+    private static final int SECURITY_PRIVATE_X = 66;
     private static final int SECURITY_PRIVATE_Y = 30;
 
     private static final int TOP_FACE_X = 33;
@@ -144,17 +145,20 @@ public class MachineScreen<Machine extends MachineBlockEntity, Menu extends Mach
     private static final int BOTTOM_FACE_X = 33;
     private static final int BOTTOM_FACE_Y = 64;
 
-    private static final int OWNER_FACE_X = 6;
-    private static final int OWNER_FACE_Y = 20;
+    private static final int OWNER_FACE_X = 33;
+    private static final int OWNER_FACE_Y = 36;
 
     private static final int REDSTONE_STATE_TEXT_X = 11;
-    private static final int REDSTONE_STATE_TEXT_Y = 53;
+    private static final int REDSTONE_STATE_TEXT_Y = 54;
 
     private static final int REDSTONE_STATUS_TEXT_X = 11;
-    private static final int REDSTONE_STATUS_TEXT_Y = 57; //add font height
+    private static final int REDSTONE_STATUS_TEXT_Y = 59; //add font height
 
-    private static final int SECURITY_STATE_TEXT_X = 11;
-    private static final int SECURITY_STATE_TEXT_Y = 53;
+    private static final int SECURITY_STATE_TEXT_X = 9;
+    private static final int SECURITY_STATE_TEXT_Y = 54;
+
+    private static final int STATS_TEXT_X = 9;
+    private static final int STATS_TEXT_Y = 55;
 
     private static final int MACHINE_FACE_SIZE = 16;
     private static final int BUTTON_SIZE = 16;
@@ -268,17 +272,31 @@ public void appendEnergyTooltip(List<Component> lines) {
      */
     protected void drawConfigurationPanels(@NotNull GuiGraphics graphics, int mouseX, int mouseY) {
         assert this.minecraft != null;
-        boolean secondary = false;
         PoseStack poseStack = graphics.pose();
 
+        int leftX = this.leftPos;
+        int rightX = this.leftPos + this.imageWidth;
+        int leftY = this.topPos + SPACING;
+        int rightY = this.topPos + SPACING;
+        int width;
+        int height;
         for (Tab tab : Tab.values()) { // 0, 1, 2, 3
             poseStack.pushPose();
-            if (secondary) poseStack.translate(0, SPACING, 0);
-            graphics.blit(Constant.ScreenTexture.MACHINE_CONFIG_PANELS, this.leftPos + (tab.isLeft() ? tab.isOpen() ? -PANEL_WIDTH : -22 : this.imageWidth), this.topPos + (secondary ? Tab.values()[tab.ordinal() - 1].isOpen() ? PANEL_HEIGHT : TAB_HEIGHT : 0) + SPACING, tab.getU(), tab.getV(), tab.isOpen() ? PANEL_WIDTH : TAB_WIDTH, tab.isOpen() ? PANEL_HEIGHT : TAB_HEIGHT);
-            if (!tab.isOpen()) {
-                graphics.renderFakeItem(tab.getItem(), this.leftPos + (tab.isLeft() ? -22 : this.imageWidth) + (tab.isLeft() ? 4 : 2), this.topPos + (secondary ? Tab.values()[tab.ordinal() - 1].isOpen() ? PANEL_HEIGHT : TAB_HEIGHT : 0) + SPACING + 3);
+            width = tab.isOpen() ? PANEL_WIDTH : TAB_WIDTH;
+            height = tab.isOpen() ? PANEL_HEIGHT : TAB_HEIGHT;
+            if (tab.isLeft()) {
+                graphics.blit(Constant.ScreenTexture.MACHINE_CONFIG_PANELS, leftX - width, leftY, tab.getU(), tab.getV(), width, height);
+                if (!tab.isOpen()) {
+                    graphics.renderFakeItem(tab.getItem(), leftX - TAB_WIDTH + 4, leftY + 3);
+                }
+                leftY += height + SPACING;
+            } else {
+                graphics.blit(Constant.ScreenTexture.MACHINE_CONFIG_PANELS, rightX, rightY, tab.getU(), tab.getV(), width, height);
+                if (!tab.isOpen()) {
+                    graphics.renderFakeItem(tab.getItem(), rightX + 2, rightY + 3);
+                }
+                rightY += height + SPACING;
             }
-            secondary = !secondary;
             poseStack.popPose();
         }
         poseStack.pushPose();
@@ -290,13 +308,13 @@ protected void drawConfigurationPanels(@NotNull GuiGraphics graphics, int mouseX
             this.drawButton(graphics, REDSTONE_IGNORE_X, REDSTONE_IGNORE_Y, mouseX + PANEL_WIDTH - this.leftPos, mouseY - SPACING - this.topPos, menu.redstoneMode == RedstoneMode.IGNORE);
             this.drawButton(graphics, REDSTONE_LOW_X, REDSTONE_LOW_Y, mouseX + PANEL_WIDTH - this.leftPos, mouseY - SPACING - this.topPos, menu.redstoneMode == RedstoneMode.LOW);
             this.drawButton(graphics, REDSTONE_HIGH_X, REDSTONE_HIGH_Y, mouseX + PANEL_WIDTH - this.leftPos, mouseY - SPACING - this.topPos, menu.redstoneMode == RedstoneMode.HIGH);
-            graphics.renderFakeItem(REDSTONE, PANEL_ICON_X, PANEL_ICON_Y);
+            graphics.renderFakeItem(REDSTONE, (Tab.REDSTONE.isLeft() ? PANEL_ICON_X_LEFT : PANEL_ICON_X_RIGHT), PANEL_ICON_Y);
             graphics.renderFakeItem(GUNPOWDER, REDSTONE_IGNORE_X, REDSTONE_IGNORE_Y);
             graphics.renderFakeItem(UNLIT_TORCH, REDSTONE_LOW_X, REDSTONE_LOW_Y - 2);
             graphics.renderFakeItem(REDSTONE_TORCH, REDSTONE_HIGH_X, REDSTONE_HIGH_Y - 2);
 
-            graphics.drawString(this.font, Component.translatable(Constant.TranslationKey.REDSTONE_MODE)
-                    .setStyle(Constant.Text.GRAY_STYLE), PANEL_TITLE_X, PANEL_TITLE_Y, 0xFFFFFFFF);
+            graphics.drawString(this.font, Component.translatable(Constant.TranslationKey.REDSTONE_MODE).setStyle(Constant.Text.GRAY_STYLE),
+                    (Tab.REDSTONE.isLeft() ? PANEL_ICON_X_LEFT : PANEL_ICON_X_RIGHT) + PANEL_TITLE_X - 1, PANEL_TITLE_Y, 0xFFFFFFFF);
             graphics.drawString(this.font, Component.translatable(Constant.TranslationKey.REDSTONE_STATE,
                     menu.redstoneMode.getName()).setStyle(Constant.Text.GRAY_STYLE), REDSTONE_STATE_TEXT_X, REDSTONE_STATE_TEXT_Y, 0xFFFFFFFF);
             graphics.drawString(this.font, Component.translatable(Constant.TranslationKey.REDSTONE_STATUS,
@@ -307,12 +325,13 @@ protected void drawConfigurationPanels(@NotNull GuiGraphics graphics, int mouseX
 
             poseStack.popPose();
         }
+
         if (Tab.CONFIGURATION.isOpen()) {
             poseStack.pushPose();
-            poseStack.translate(-PANEL_WIDTH, TAB_HEIGHT + SPACING + SPACING, 0);
-            graphics.renderFakeItem(WRENCH, PANEL_ICON_X, PANEL_ICON_Y);
-            graphics.drawString(this.font, Component.translatable(Constant.TranslationKey.CONFIGURATION)
-                    .setStyle(Constant.Text.GRAY_STYLE), PANEL_TITLE_X, PANEL_TITLE_Y, 0xFFFFFFFF);
+            poseStack.translate(-PANEL_WIDTH, TAB_HEIGHT + SPACING * 2, 0);
+            graphics.renderFakeItem(WRENCH, (Tab.CONFIGURATION.isLeft() ? PANEL_ICON_X_LEFT : PANEL_ICON_X_RIGHT), PANEL_ICON_Y);
+            graphics.drawString(this.font, Component.translatable(Constant.TranslationKey.CONFIGURATION).setStyle(Constant.Text.GRAY_STYLE),
+                    (Tab.CONFIGURATION.isLeft() ? PANEL_ICON_X_LEFT : PANEL_ICON_X_RIGHT) + PANEL_TITLE_X, PANEL_TITLE_Y, 0xFFFFFFFF);
 
             RenderSystem.setShaderTexture(0, InventoryMenu.BLOCK_ATLAS);
             this.drawMachineFace(graphics, TOP_FACE_X, TOP_FACE_Y, this.menu.configuration, BlockFace.TOP);
@@ -323,36 +342,37 @@ protected void drawConfigurationPanels(@NotNull GuiGraphics graphics, int mouseX
             this.drawMachineFace(graphics, BOTTOM_FACE_X, BOTTOM_FACE_Y, this.menu.configuration, BlockFace.BOTTOM);
             poseStack.popPose();
         }
+
         if (Tab.STATS.isOpen()) {
             poseStack.pushPose();
             poseStack.translate(this.imageWidth, SPACING, 0);
-            graphics.renderFakeItem(ALUMINUM_WIRE, PANEL_ICON_X, PANEL_ICON_Y);
+            graphics.renderFakeItem(ALUMINUM_WIRE, (Tab.STATS.isLeft() ? PANEL_ICON_X_LEFT : PANEL_ICON_X_RIGHT), PANEL_ICON_Y);
             PlayerFaceRenderer.draw(graphics, this.ownerSkin.getNow(DefaultPlayerSkin.get(this.menu.security.getOwner() == null ? this.menu.player.getUUID() : this.menu.security.getOwner())), OWNER_FACE_X, OWNER_FACE_Y, OWNER_FACE_SIZE);
-            graphics.drawString(this.font, Component.translatable(Constant.TranslationKey.STATISTICS)
-                    .setStyle(Constant.Text.GREEN_STYLE), PANEL_TITLE_X, PANEL_TITLE_Y, 0xFFFFFFFF);
-            List<FormattedCharSequence> text = this.font.split(this.menu.be.getBlockState().getBlock().getName(), 64);
-            int offsetY = 0;
-            for (FormattedCharSequence orderedText : text) {
-                graphics.drawString(this.font, orderedText, 40, 22 + offsetY, 0xFFFFFFFF, false);
-                offsetY += this.font.lineHeight + 2;
-            }
+            graphics.drawString(this.font, Component.translatable(Constant.TranslationKey.STATISTICS).setStyle(Constant.Text.GRAY_STYLE),
+                    (Tab.STATS.isLeft() ? PANEL_ICON_X_LEFT : PANEL_ICON_X_RIGHT) + PANEL_TITLE_X, PANEL_TITLE_Y, 0xFFFFFFFF);
+            // List<FormattedCharSequence> text = this.font.split(this.menu.be.getBlockState().getBlock().getName(), 64);
+            // int offsetY = 0;
+            // for (FormattedCharSequence orderedText : text) {
+            //     graphics.drawString(this.font, orderedText, STATS_TEXT_X, STATS_TEXT_Y + offsetY, 0xFFFFFFFF, false);
+            //     offsetY += this.font.lineHeight + 2;
+            // }
             poseStack.popPose();
         }
 
         if (Tab.SECURITY.isOpen()) {
             poseStack.pushPose();
-            poseStack.translate(this.imageWidth, TAB_HEIGHT + SPACING + SPACING, 0);
-            graphics.blit(Constant.ScreenTexture.MACHINE_CONFIG_PANELS, PANEL_ICON_X, PANEL_ICON_Y, ICON_LOCK_PRIVATE_U, ICON_LOCK_PRIVATE_V, ICON_WIDTH, ICON_HEIGHT);
+            poseStack.translate(this.imageWidth, TAB_HEIGHT + SPACING * 2, 0);
+            graphics.renderFakeItem(IRON_CHESTPLATE, (Tab.SECURITY.isLeft() ? PANEL_ICON_X_LEFT : PANEL_ICON_X_RIGHT), PANEL_ICON_Y);
 
-            this.drawButton(graphics, SECURITY_PUBLIC_X, SECURITY_PUBLIC_Y, mouseX - this.imageWidth - this.leftPos, mouseY - (TAB_HEIGHT + SPACING + SPACING) - this.topPos, this.menu.security.getAccessLevel() == AccessLevel.PUBLIC || !this.menu.security.isOwner(this.menu.player));
-            this.drawButton(graphics, SECURITY_TEAM_X, SECURITY_TEAM_Y, mouseX - this.imageWidth - this.leftPos, mouseY - (TAB_HEIGHT + SPACING + SPACING) - this.topPos, this.menu.security.getAccessLevel() == AccessLevel.TEAM || !this.menu.security.isOwner(this.menu.player));
-            this.drawButton(graphics, SECURITY_PRIVATE_X, SECURITY_PRIVATE_Y, mouseX - this.imageWidth - this.leftPos, mouseY - (TAB_HEIGHT + SPACING + SPACING) - this.topPos, this.menu.security.getAccessLevel() == AccessLevel.PRIVATE || !this.menu.security.isOwner(this.menu.player));
+            this.drawButton(graphics, SECURITY_PUBLIC_X, SECURITY_PUBLIC_Y, mouseX - this.imageWidth - this.leftPos, mouseY - (TAB_HEIGHT + SPACING * 2) - this.topPos, this.menu.security.getAccessLevel() == AccessLevel.PUBLIC || !this.menu.security.isOwner(this.menu.player));
+            this.drawButton(graphics, SECURITY_TEAM_X, SECURITY_TEAM_Y, mouseX - this.imageWidth - this.leftPos, mouseY - (TAB_HEIGHT + SPACING * 2) - this.topPos, this.menu.security.getAccessLevel() == AccessLevel.TEAM || !this.menu.security.isOwner(this.menu.player));
+            this.drawButton(graphics, SECURITY_PRIVATE_X, SECURITY_PRIVATE_Y, mouseX - this.imageWidth - this.leftPos, mouseY - (TAB_HEIGHT + SPACING * 2) - this.topPos, this.menu.security.getAccessLevel() == AccessLevel.PRIVATE || !this.menu.security.isOwner(this.menu.player));
             graphics.blit(Constant.ScreenTexture.MACHINE_CONFIG_PANELS, SECURITY_PUBLIC_X, SECURITY_PUBLIC_Y, ICON_LOCK_PRIVATE_U, ICON_LOCK_PRIVATE_V, ICON_WIDTH, ICON_HEIGHT);
             graphics.blit(Constant.ScreenTexture.MACHINE_CONFIG_PANELS, SECURITY_TEAM_X, SECURITY_TEAM_Y, ICON_LOCK_PARTY_U, ICON_LOCK_PARTY_V, ICON_WIDTH, ICON_HEIGHT);
             graphics.blit(Constant.ScreenTexture.MACHINE_CONFIG_PANELS, SECURITY_PRIVATE_X, SECURITY_PRIVATE_Y, ICON_LOCK_PUBLIC_U, ICON_LOCK_PUBLIC_V, ICON_WIDTH, ICON_HEIGHT);
 
-            graphics.drawString(this.font, Component.translatable(Constant.TranslationKey.SECURITY)
-                    .setStyle(Constant.Text.GRAY_STYLE), PANEL_TITLE_X, PANEL_TITLE_Y, 0xFFFFFFFF);
+            graphics.drawString(this.font, Component.translatable(Constant.TranslationKey.SECURITY).setStyle(Constant.Text.GRAY_STYLE),
+                    (Tab.SECURITY.isLeft() ? PANEL_ICON_X_LEFT : PANEL_ICON_X_RIGHT) + PANEL_TITLE_X, PANEL_TITLE_Y, 0xFFFFFFFF);
             graphics.drawString(this.font, Component.translatable(Constant.TranslationKey.ACCESS_LEVEL,
                     this.menu.security.getAccessLevel().getName()).setStyle(Constant.Text.GRAY_STYLE), SECURITY_STATE_TEXT_X, SECURITY_STATE_TEXT_Y, 0xFFFFFFFF);
 
@@ -462,7 +482,7 @@ public boolean checkConfigurationPanelClick(double mouseX, double mouseY, int bu
         mouseY = mY - this.topPos;
         if (Tab.CONFIGURATION.isOpen()) {
             mouseX += PANEL_WIDTH;
-            mouseY -= TAB_HEIGHT + SPACING + SPACING;
+            mouseY -= TAB_HEIGHT + SPACING * 2;
             if (mouseIn(mouseX, mouseY, 0, 0, PANEL_WIDTH, PANEL_UPPER_HEIGHT)) {
                 Tab.CONFIGURATION.toggle();
                 return true;
@@ -491,9 +511,9 @@ public boolean checkConfigurationPanelClick(double mouseX, double mouseY, int bu
         } else {
             mouseX += TAB_WIDTH;
             if (Tab.REDSTONE.isOpen()) {
-                mouseY -= PANEL_HEIGHT + SPACING + SPACING;
+                mouseY -= PANEL_HEIGHT + SPACING * 2;
             } else {
-                mouseY -= TAB_HEIGHT + SPACING + SPACING;
+                mouseY -= TAB_HEIGHT + SPACING * 2;
             }
             if (mouseIn(mouseX, mouseY, 0, 0, TAB_WIDTH, TAB_HEIGHT)) {
                 Tab.CONFIGURATION.toggle();
@@ -519,7 +539,7 @@ public boolean checkConfigurationPanelClick(double mouseX, double mouseY, int bu
         mouseY = mY - this.topPos;
         mouseX -= this.imageWidth;
         if (Tab.SECURITY.isOpen()) {
-            mouseY -= TAB_HEIGHT + SPACING + SPACING;
+            mouseY -= TAB_HEIGHT + SPACING * 2;
             if (mouseIn(mouseX, mouseY, 0, 0, PANEL_WIDTH, PANEL_UPPER_HEIGHT)) {
                 Tab.SECURITY.toggle();
                 return true;
@@ -544,9 +564,9 @@ public boolean checkConfigurationPanelClick(double mouseX, double mouseY, int bu
             }
         } else {
             if (Tab.STATS.isOpen()) {
-                mouseY -= PANEL_HEIGHT + SPACING + SPACING;
+                mouseY -= PANEL_HEIGHT + SPACING * 2;
             } else {
-                mouseY -= TAB_HEIGHT + SPACING + SPACING;
+                mouseY -= TAB_HEIGHT + SPACING * 2;
             }
             if (mouseIn(mouseX, mouseY, 0, 0, TAB_WIDTH, TAB_HEIGHT)) {
                 Tab.SECURITY.toggle();
@@ -609,7 +629,7 @@ protected void drawConfigurationPanelTooltips(GuiGraphics graphics, int mouseX,
         mouseY = mY - this.topPos;
         if (Tab.CONFIGURATION.isOpen()) {
             mouseX += PANEL_WIDTH;
-            mouseY -= TAB_HEIGHT + SPACING + SPACING;
+            mouseY -= TAB_HEIGHT + SPACING * 2;
             if (mouseIn(mouseX, mouseY, TOP_FACE_X, TOP_FACE_Y, MACHINE_FACE_SIZE, MACHINE_FACE_SIZE)) {
                 this.renderFaceTooltip(graphics, BlockFace.TOP, mX, mY);
             }
@@ -660,7 +680,7 @@ protected void drawConfigurationPanelTooltips(GuiGraphics graphics, int mouseX,
         mouseY = mY - this.topPos;
         if (Tab.SECURITY.isOpen()) {
             mouseX -= this.imageWidth;
-            mouseY -= TAB_HEIGHT + SPACING + SPACING;
+            mouseY -= TAB_HEIGHT + SPACING * 2;
 
             if (this.menu.security.isOwner(this.menu.player)) {
                 if (mouseIn(mouseX, mouseY, REDSTONE_IGNORE_X, REDSTONE_IGNORE_Y, BUTTON_WIDTH, BUTTON_HEIGHT)) {
@@ -682,12 +702,12 @@ protected void drawConfigurationPanelTooltips(GuiGraphics graphics, int mouseX,
         } else {
             mouseX -= this.imageWidth;
             if (Tab.STATS.isOpen()) {
-                mouseY -= PANEL_HEIGHT + SPACING + SPACING;
+                mouseY -= PANEL_HEIGHT + SPACING * 2;
             } else {
-                mouseY -= TAB_HEIGHT + SPACING + SPACING;
+                mouseY -= TAB_HEIGHT + SPACING * 2;
             }
             if (mouseIn(mouseX, mouseY, 0, 0, TAB_WIDTH, TAB_HEIGHT)) {
-                graphics.renderTooltip(this.font, Component.translatable(Constant.TranslationKey.SECURITY).setStyle(Constant.Text.BLUE_STYLE), mX, mY);
+                graphics.renderTooltip(this.font, Component.translatable(Constant.TranslationKey.SECURITY).setStyle(Constant.Text.GREEN_STYLE), mX, mY);
             }
         }
     }
@@ -826,7 +846,7 @@ protected void drawTanks(GuiGraphics graphics, int mouseX, int mouseY) {
     private void handleSlotHighlight(GuiGraphics graphics, int mouseX, int mouseY) {
         if (Tab.CONFIGURATION.isOpen()) {
             mouseX -= (this.leftPos - PANEL_WIDTH);
-            mouseY -= (this.topPos + (TAB_HEIGHT + SPACING + SPACING));
+            mouseY -= (this.topPos + (TAB_HEIGHT + SPACING * 2));
             IOFace config = null;
             if (mouseIn(mouseX, mouseY, TOP_FACE_X, TOP_FACE_Y, MACHINE_FACE_SIZE, MACHINE_FACE_SIZE)) {
                 config = this.menu.configuration.get(BlockFace.TOP);
diff --git a/src/main/java/dev/galacticraft/machinelib/client/impl/compat/MachineLibREIClientPlugin.java b/src/main/java/dev/galacticraft/machinelib/client/impl/compat/MachineLibREIClientPlugin.java
index da67395d..325b67fa 100644
--- a/src/main/java/dev/galacticraft/machinelib/client/impl/compat/MachineLibREIClientPlugin.java
+++ b/src/main/java/dev/galacticraft/machinelib/client/impl/compat/MachineLibREIClientPlugin.java
@@ -25,6 +25,7 @@
 import dev.architectury.event.CompoundEventResult;
 import dev.galacticraft.machinelib.client.api.screen.MachineScreen;
 import dev.galacticraft.machinelib.impl.Constant;
+import dev.galacticraft.machinelib.impl.Constant.TextureCoordinate;
 import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.client.plugins.REIClientPlugin;
 import me.shedaniel.rei.api.client.registry.screen.ExclusionZones;
@@ -49,13 +50,30 @@ public void registerScreens(ScreenRegistry registry) {
 
     @Override
     public void registerExclusionZones(ExclusionZones zones) {
-        zones.register(MachineScreen.class, screen -> {
+        zones.register(MachineScreen.class, provider -> {
             List<Rectangle> areas = new ArrayList<>();
-            if (MachineScreen.Tab.STATS.isOpen() || MachineScreen.Tab.SECURITY.isOpen()) {
-                areas.add(new Rectangle(screen.getX() + screen.getImageWidth(), screen.getY() + (MachineScreen.Tab.STATS.isOpen() ? 0 : Constant.TextureCoordinate.TAB_HEIGHT), Constant.TextureCoordinate.PANEL_WIDTH, Constant.TextureCoordinate.PANEL_HEIGHT));
-                areas.add(new Rectangle(screen.getX() + screen.getImageWidth(), screen.getY() + Constant.TextureCoordinate.TAB_HEIGHT, Constant.TextureCoordinate.TAB_WIDTH, Constant.TextureCoordinate.PANEL_HEIGHT));
+            int leftX = provider.getX();
+            int rightX = provider.getX() + provider.getImageWidth();
+            int leftY = provider.getY() + MachineScreen.SPACING;
+            int rightY = provider.getY() + MachineScreen.SPACING;
+            int width;
+            int height;
+            for (MachineScreen.Tab tab : MachineScreen.Tab.values()) {
+                if (tab.isOpen()) {
+                    width = TextureCoordinate.PANEL_WIDTH;
+                    height = TextureCoordinate.PANEL_HEIGHT;
+                } else {
+                    width = TextureCoordinate.TAB_WIDTH;
+                    height = TextureCoordinate.TAB_HEIGHT;
+                }
+                if (tab.isLeft()) {
+                    areas.add(new Rectangle(leftX - width, leftY, width, height));
+                    leftY += height + MachineScreen.SPACING;
+                } else {
+                    areas.add(new Rectangle(rightX, rightY, width, height));
+                    rightY += height + MachineScreen.SPACING;
+                }
             }
-            areas.add(new Rectangle(screen.getX() + screen.getImageWidth(), screen.getY(), Constant.TextureCoordinate.TAB_WIDTH, Constant.TextureCoordinate.TAB_HEIGHT * 2));
             return areas;
         });
     }
diff --git a/src/main/java/dev/galacticraft/machinelib/impl/Constant.java b/src/main/java/dev/galacticraft/machinelib/impl/Constant.java
index 7ee6c738..f27dc68f 100644
--- a/src/main/java/dev/galacticraft/machinelib/impl/Constant.java
+++ b/src/main/java/dev/galacticraft/machinelib/impl/Constant.java
@@ -102,7 +102,7 @@ interface TextureCoordinate {
         /**
          * The height of a configuration panel.
          */
-        int PANEL_HEIGHT = 93;
+        int PANEL_HEIGHT = 92;
         /**
          * The width of a configuration tab.
          */
diff --git a/src/main/resources/assets/machinelib/textures/gui/machine_panels.png b/src/main/resources/assets/machinelib/textures/gui/machine_panels.png
index 92d23a2d5669ced8c13a969d4bea795ecba61d43..b18b9f1ab854dda5a30db1efb26c16fc715aecd6 100644
GIT binary patch
literal 6657
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
UT_3OCAel<4!zxO_GXKB+6DAldJ^%m!

delta 2363
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
Leja7+wA6nC2INwY


From dba9d15d2de485aed93c7d95ab6e9652e7f574d3 Mon Sep 17 00:00:00 2001
From: Roelymole <roelymole@gmail.com>
Date: Mon, 3 Feb 2025 21:22:33 +0000
Subject: [PATCH 2/2] chore: replaced machine_panels.png texture with
 machine_config.png from TeamGalacticraft/Galacticraft with a slight tweak

---
 .../textures/gui/machine_panels.png           | Bin 6657 -> 6683 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/assets/machinelib/textures/gui/machine_panels.png b/src/main/resources/assets/machinelib/textures/gui/machine_panels.png
index b18b9f1ab854dda5a30db1efb26c16fc715aecd6..b28d8602032d41d3032e2e50f598e11021e62f15 100644
GIT binary patch
delta 3259
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
MD<{j66O=#x2X;QtHvj+t

delta 3269
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