From 66b581c2a702858f1289c8a77d5ed53039a019c3 Mon Sep 17 00:00:00 2001
From: GaLicn <133291877+GaLicn@users.noreply.github.com>
Date: Tue, 23 Sep 2025 18:53:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BAme=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=8D=87=E7=BA=A7=E6=A7=BD=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E4=B8=94=E5=85=BC=E5=AE=B9applied=20flux?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                           |  2 +-
 .../com/extendedae_plus/compat/UpgradeSlotCompat.java  | 10 +++++++++-
 .../com/extendedae_plus/mixin/MixinConditions.java     |  6 ++++++
 src/main/resources/extendedae_plus.mixins.json         |  3 ++-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 25fe6a4..f22d7c4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -81,7 +81,7 @@ dependencies {
 
     annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor"
 
-    modImplementation "curse.maven:applied-flux-965012:6755986"
+   // modImplementation "curse.maven:applied-flux-965012:6755986"
     modCompileOnly "curse.maven:mega-cells-622112:${mega_cells_version}"
     modCompileOnly "curse.maven:jade-324717:${jade_version}"
 
diff --git a/src/main/java/com/extendedae_plus/compat/UpgradeSlotCompat.java b/src/main/java/com/extendedae_plus/compat/UpgradeSlotCompat.java
index cef62a5..9768050 100644
--- a/src/main/java/com/extendedae_plus/compat/UpgradeSlotCompat.java
+++ b/src/main/java/com/extendedae_plus/compat/UpgradeSlotCompat.java
@@ -27,12 +27,20 @@ import java.util.List;
 public class UpgradeSlotCompat {
     private static final String APPFLUX_MOD_ID = "appflux";
     
+    /**
+     * 检测Applied Flux模组是否存在
+     * @return true如果存在，false如果不存在
+     */
+    public static boolean isAppfluxPresent() {
+        return ModList.get().isLoaded(APPFLUX_MOD_ID);
+    }
+    
     /**
      * 检测是否应该启用我们的升级卡槽功能
      * @return true如果应该启用，false如果检测到appflux模组存在
      */
     public static boolean shouldEnableUpgradeSlots() {
-        boolean appfluxExists = ModList.get().isLoaded(APPFLUX_MOD_ID);
+        boolean appfluxExists = isAppfluxPresent();
         ExtendedAELogger.LOGGER.info("ExtendedAE-appflux模组检测: {}", appfluxExists ? "存在" : "不存在");
         
         if (appfluxExists) {
diff --git a/src/main/java/com/extendedae_plus/mixin/MixinConditions.java b/src/main/java/com/extendedae_plus/mixin/MixinConditions.java
index 30c8213..7a47b91 100644
--- a/src/main/java/com/extendedae_plus/mixin/MixinConditions.java
+++ b/src/main/java/com/extendedae_plus/mixin/MixinConditions.java
@@ -58,6 +58,12 @@ public class MixinConditions implements IMixinConfigPlugin {
             return true; // 总是加载，在Mixin内部进行运行时检查
         }
         
+        // 对于InterfaceLogicUpgradesMixin，总是加载但在运行时检查条件
+        if (mixinClassName.contains("InterfaceLogicUpgradesMixin")) {
+            System.out.println("[ExtendedAE_Plus] 总是加载Interface升级Mixin，运行时检查条件: " + mixinClassName);
+            return true; // 总是加载，在Mixin内部进行运行时检查
+        }
+        
         // 其他Mixin正常应用
         System.out.println("[ExtendedAE_Plus] 加载Mixin: " + mixinClassName);
         return true;
diff --git a/src/main/resources/extendedae_plus.mixins.json b/src/main/resources/extendedae_plus.mixins.json
index c266b12..97c7ce5 100644
--- a/src/main/resources/extendedae_plus.mixins.json
+++ b/src/main/resources/extendedae_plus.mixins.json
@@ -80,7 +80,8 @@
     "extendedae.container.ContainerExPatternTerminalMixin",
     "extendedae.container.ContainerWirelessExPatternTerminalMixin",
     "ae2.helpers.InterfaceLogicChannelCardMixin",
-    "ae2.helpers.InterfaceLogicTickerMixin"
+    "ae2.helpers.InterfaceLogicTickerMixin",
+    "ae2.InterfaceLogicUpgradesMixin"
   ],
   "injectors": {
     "defaultRequire": 1