From 7c07dd148a39eee3ae95d3e1d73e3a8cc056ad82 Mon Sep 17 00:00:00 2001
From: GaLicn <133291877+GaLicn@users.noreply.github.com>
Date: Thu, 25 Sep 2025 19:04:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B4=A9=E6=BA=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/extendedae_plus/bridge/IUpgradableMenu.java | 2 +-
 .../ae2/client/gui/PatternProviderScreenUpgradesMixin.java    | 4 ++--
 .../mixin/ae2/menu/InterfaceMenuUpgradesMixin.java            | 2 +-
 .../mixin/ae2/menu/PatternProviderMenuUpgradesMixin.java      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/extendedae_plus/bridge/IUpgradableMenu.java b/src/main/java/com/extendedae_plus/bridge/IUpgradableMenu.java
index 9599172..63d56f6 100644
--- a/src/main/java/com/extendedae_plus/bridge/IUpgradableMenu.java
+++ b/src/main/java/com/extendedae_plus/bridge/IUpgradableMenu.java
@@ -8,5 +8,5 @@ import appeng.menu.ToolboxMenu;
  * 以便在界面上显示升级卡槽（用于放置频道卡）。
  */
 public interface IUpgradableMenu {
-    ToolboxMenu getToolbox();
+    ToolboxMenu eap$getToolbox();
 }
diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/client/gui/PatternProviderScreenUpgradesMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/client/gui/PatternProviderScreenUpgradesMixin.java
index 977436a..c46560f 100644
--- a/src/main/java/com/extendedae_plus/mixin/ae2/client/gui/PatternProviderScreenUpgradesMixin.java
+++ b/src/main/java/com/extendedae_plus/mixin/ae2/client/gui/PatternProviderScreenUpgradesMixin.java
@@ -77,9 +77,9 @@ public abstract class PatternProviderScreenUpgradesMixin<C extends PatternProvid
             ((IStyleAccessor) style).getWidgets().put("toolbox", ws);
             
             // 添加工具箱面板
-            if (menu instanceof AEBaseMenu base && base instanceof com.extendedae_plus.bridge.IUpgradableMenu upg && upg.getToolbox() != null && upg.getToolbox().isPresent()) {
+            if (menu instanceof AEBaseMenu base && base instanceof com.extendedae_plus.bridge.IUpgradableMenu upg && upg.eap$getToolbox() != null && upg.eap$getToolbox().isPresent()) {
                 try {
-                    this.widgets.add("toolbox", new ToolboxPanel(style, upg.getToolbox().getName()));
+                    this.widgets.add("toolbox", new ToolboxPanel(style, upg.eap$getToolbox().getName()));
                 } catch (IllegalStateException e) {
                     com.extendedae_plus.util.ExtendedAELogger.LOGGER.warn("[样板供应器][界面] 工具箱面板已存在，跳过添加: {}", e.getMessage());
                 }
diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/menu/InterfaceMenuUpgradesMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/menu/InterfaceMenuUpgradesMixin.java
index a3667cc..fc6e80a 100644
--- a/src/main/java/com/extendedae_plus/mixin/ae2/menu/InterfaceMenuUpgradesMixin.java
+++ b/src/main/java/com/extendedae_plus/mixin/ae2/menu/InterfaceMenuUpgradesMixin.java
@@ -34,7 +34,7 @@ public abstract class InterfaceMenuUpgradesMixin extends AEBaseMenu implements I
     }
 
     @Override
-    public ToolboxMenu getToolbox() {
+    public ToolboxMenu eap$getToolbox() {
         return this.eap$toolbox;
     }
 
diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/menu/PatternProviderMenuUpgradesMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/menu/PatternProviderMenuUpgradesMixin.java
index 5022583..9fc4db7 100644
--- a/src/main/java/com/extendedae_plus/mixin/ae2/menu/PatternProviderMenuUpgradesMixin.java
+++ b/src/main/java/com/extendedae_plus/mixin/ae2/menu/PatternProviderMenuUpgradesMixin.java
@@ -42,7 +42,7 @@ public abstract class PatternProviderMenuUpgradesMixin extends AEBaseMenu implem
     }
 
     @Override
-    public ToolboxMenu getToolbox() {
+    public ToolboxMenu eap$getToolbox() {
         return this.eap$toolbox;
     }