From d76023307064176a74caa20dc9f0234e48039677 Mon Sep 17 00:00:00 2001
From: GaLicn <133291877+GaLicn@users.noreply.github.com>
Date: Thu, 25 Sep 2025 16:34:02 +0800
Subject: [PATCH] =?UTF-8?q?appliedflux=E4=B8=8B=E4=BE=9B=E5=BA=94=E5=99=A8?=
 =?UTF-8?q?jade=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ae2/client/gui/PatternProviderScreenUpgradesMixin.java  | 6 ++++++
 .../mixin/ae2/menu/PatternProviderMenuUpgradesMixin.java    | 5 ++---
 2 files changed, 8 insertions(+), 3 deletions(-)

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 2150990..890223b 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
@@ -42,6 +42,12 @@ public abstract class PatternProviderScreenUpgradesMixin<C extends PatternProvid
             com.extendedae_plus.util.ExtendedAELogger.LOGGER.debug("[样板供应器][界面] 跳过添加升级面板：shouldAddUpgradePanelToScreen返回false");
             return;
         }
+
+        // 若已安装 AppliedFlux，则由 AE2/AppliedFlux 自己负责渲染升级面板，避免我们重复添加导致界面显示两个槽
+        if (!UpgradeSlotCompat.shouldEnableUpgradeSlots()) {
+            com.extendedae_plus.util.ExtendedAELogger.LOGGER.debug("[样板供应器][界面] 跳过添加升级面板：已安装 appflux，由 AE2/AppliedFlux 负责渲染");
+            return;
+        }
         
         // 使用改进的AppliedFlux兼容性检测
         @SuppressWarnings("unchecked")
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 e2c947e..17f2f60 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
@@ -37,9 +37,8 @@ public abstract class PatternProviderMenuUpgradesMixin extends AEBaseMenu implem
             ExtendedAELogger.LOGGER.debug("[样板供应器][菜单] 注入升级槽: 使用自带 compat 槽");
             this.setupUpgrades(((CompatUpgradeProvider) this.logic).eap$getCompatUpgrades());
         } else {
-            // 安装 appflux：使用 appflux 注入到 PatternProviderLogic 的升级槽
-            ExtendedAELogger.LOGGER.debug("[样板供应器][菜单] 注入升级槽: 使用 appflux 槽");
-            this.setupUpgrades(((IUpgradeableObject) this.logic).getUpgrades());
+            // 安装 appflux：AE2/AppliedFlux 已在其原始构造流程中添加升级槽，这里避免重复注入导致界面重复渲染
+            ExtendedAELogger.LOGGER.debug("[样板供应器][菜单] 跳过注入升级槽: 由 AE2/AppliedFlux 负责渲染");
         }
     }