From 6dbbb53d9fb1578da92bd9af111cff74769ad67e Mon Sep 17 00:00:00 2001
From: GaLi <zhangjl@longersec.com>
Date: Fri, 5 Dec 2025 13:55:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4provider&interface=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ae2/client/gui/InterfaceScreenMixin.java  |  2 +-
 .../client/gui/GuiExPatternProviderMixin.java | 44 -------------------
 2 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/client/gui/InterfaceScreenMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/client/gui/InterfaceScreenMixin.java
index 0f68ef4..106a481 100644
--- a/src/main/java/com/extendedae_plus/mixin/ae2/client/gui/InterfaceScreenMixin.java
+++ b/src/main/java/com/extendedae_plus/mixin/ae2/client/gui/InterfaceScreenMixin.java
@@ -230,7 +230,7 @@ public abstract class InterfaceScreenMixin<T extends AEBaseMenu> {
             int topPos = ((AbstractContainerScreenAccessor<?>) (Object) this).eap$getTopPos();
             int imageWidth = ((AbstractContainerScreenAccessor<?>) (Object) this).eap$getImageWidth();
             int bx = leftPos - this.eap$divideBy2Button.getWidth() - 1;
-            int by = topPos + 30;
+            int by = topPos + 50;
             int spacing = 22;
             if (this.eap$divideBy2Button != null) {
                 this.eap$divideBy2Button.setX(bx);
diff --git a/src/main/java/com/extendedae_plus/mixin/extendedae/client/gui/GuiExPatternProviderMixin.java b/src/main/java/com/extendedae_plus/mixin/extendedae/client/gui/GuiExPatternProviderMixin.java
index decbf58..b694a6b 100644
--- a/src/main/java/com/extendedae_plus/mixin/extendedae/client/gui/GuiExPatternProviderMixin.java
+++ b/src/main/java/com/extendedae_plus/mixin/extendedae/client/gui/GuiExPatternProviderMixin.java
@@ -54,8 +54,6 @@ public abstract class GuiExPatternProviderMixin extends PatternProviderScreen<Co
     private ActionEPPButton divideBy2Button;
     private ActionEPPButton x5Button;
     private ActionEPPButton divideBy5Button;
-    private ActionEPPButton x10Button;
-    private ActionEPPButton divideBy10Button;
     public GuiExPatternProviderMixin(ContainerExPatternProvider menu, Inventory playerInventory, Component title, ScreenStyle style) {
         super(menu, playerInventory, title, style);
     }
@@ -210,18 +208,6 @@ public abstract class GuiExPatternProviderMixin extends PatternProviderScreen<Co
         }, NewIcon.DIVIDE2);
         this.divideBy2Button.setVisibility(true);
 
-        this.x10Button = new ActionEPPButton((b) -> {
-            var conn = Minecraft.getInstance().getConnection();
-            if (conn != null) conn.send(new ScalePatternsC2SPacket(ScalePatternsC2SPacket.Operation.MUL10));
-        }, NewIcon.MULTIPLY10);
-        this.x10Button.setVisibility(true);
-
-        this.divideBy10Button = new ActionEPPButton((b) -> {
-            var conn = Minecraft.getInstance().getConnection();
-            if (conn != null) conn.send(new ScalePatternsC2SPacket(ScalePatternsC2SPacket.Operation.DIV10));
-        }, NewIcon.DIVIDE10);
-        this.divideBy10Button.setVisibility(true);
-
         this.divideBy5Button = new ActionEPPButton((b) -> {
             var conn = Minecraft.getInstance().getConnection();
             if (conn != null) conn.send(new ScalePatternsC2SPacket(ScalePatternsC2SPacket.Operation.DIV5));
@@ -239,8 +225,6 @@ public abstract class GuiExPatternProviderMixin extends PatternProviderScreen<Co
         this.addRenderableWidget(this.x2Button);
         this.addRenderableWidget(this.divideBy5Button);
         this.addRenderableWidget(this.x5Button);
-        this.addRenderableWidget(this.divideBy10Button);
-        this.addRenderableWidget(this.x10Button);
     }
 
     @Override
@@ -265,12 +249,6 @@ public abstract class GuiExPatternProviderMixin extends PatternProviderScreen<Co
         if (this.divideBy2Button != null) {
             this.divideBy2Button.setVisibility(true);
         }
-        if (this.x10Button != null) {
-            this.x10Button.setVisibility(true);
-        }
-        if (this.divideBy10Button != null) {
-            this.divideBy10Button.setVisibility(true);
-        }
         if (this.divideBy5Button != null) {
             this.divideBy5Button.setVisibility(true);
         }
@@ -293,12 +271,6 @@ public abstract class GuiExPatternProviderMixin extends PatternProviderScreen<Co
             if (this.x5Button != null && !this.renderables.contains(this.x5Button)) {
                 this.addRenderableWidget(this.x5Button);
             }
-            if (this.divideBy10Button != null && !this.renderables.contains(this.divideBy10Button)) {
-                this.addRenderableWidget(this.divideBy10Button);
-            }
-            if (this.x10Button != null && !this.renderables.contains(this.x10Button)) {
-                this.addRenderableWidget(this.x10Button);
-            }
         } catch (Throwable ignored) {}
 
         // 如果屏幕尺寸发生变化（窗口/GUI缩放），重新注册右侧外列的自定义按钮，翻页按钮由左侧工具栏托管
@@ -322,14 +294,6 @@ public abstract class GuiExPatternProviderMixin extends PatternProviderScreen<Co
                     this.removeWidget(this.x5Button);
                     this.addRenderableWidget(this.x5Button);
                 }
-                if (this.divideBy10Button != null) {
-                    this.removeWidget(this.divideBy10Button);
-                    this.addRenderableWidget(this.divideBy10Button);
-                }
-                if (this.x10Button != null) {
-                    this.removeWidget(this.x10Button);
-                    this.addRenderableWidget(this.x10Button);
-                }
             } catch (Throwable ignored) {}
         }
 
@@ -354,14 +318,6 @@ public abstract class GuiExPatternProviderMixin extends PatternProviderScreen<Co
             this.x5Button.setX(bx);
             this.x5Button.setY(by + spacing * 3);
         }
-        if (this.divideBy10Button != null) {
-            this.divideBy10Button.setX(bx);
-            this.divideBy10Button.setY(by + spacing * 4);
-        }
-        if (this.x10Button != null) {
-            this.x10Button.setX(bx);
-            this.x10Button.setY(by + spacing * 5);
-        }
 
         // 每帧确保当前页槽位处于启用状态，非当前页禁用
         this.eap$updatePageSlotActivity();