From 7520d93aaac321a7a149cbc11bc588e14baf1c4b Mon Sep 17 00:00:00 2001
From: GaLicn <133291877+GaLicn@users.noreply.github.com>
Date: Sat, 6 Sep 2025 22:47:11 +0800
Subject: [PATCH] mixin

---
 build.gradle                                             | 9 ++-------
 .../ContainerUWirelessExPatternTerminalMixin.java        | 4 ++--
 src/main/resources/extendedae_plus.mixins.json           | 5 +++++
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1788c87..2395d73 100644
--- a/build.gradle
+++ b/build.gradle
@@ -134,13 +134,8 @@ sourceSets.main.java {
     include 'com/extendedae_plus/**'
     // 允许 accessor
     include 'com/extendedae_plus/mixin/**/accessor/**'
-    // 排除具体的非 accessor mixin 目录
-    // AE2 相关非 accessor（已启用，需要参与编译与运行）
-    // 其他模块的非 accessor mixin
-    exclude 'com/extendedae_plus/mixin/ae2WTlib/**'
-    // 允许 JEI/REI 捕获混入参与编译（用于记录 lastProcessingName）
-    // 排除顶层 mixin 文件
-    exclude 'com/extendedae_plus/mixin/PickFromWirelessMixin.java'
+    // 放开此前被排除的 mixin 源码，便于完整移植功能；是否实际注入由 mixins.json 决定
+    // 注意：可选联动（如 ae2WTlib）未在 mixins.json 注册时不会注入，避免运行期崩溃
 }
 
 configurations {
diff --git a/src/main/java/com/extendedae_plus/mixin/ae2WTlib/ContainerUWirelessExPatternTerminalMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2WTlib/ContainerUWirelessExPatternTerminalMixin.java
index 83cddd9..19defb5 100644
--- a/src/main/java/com/extendedae_plus/mixin/ae2WTlib/ContainerUWirelessExPatternTerminalMixin.java
+++ b/src/main/java/com/extendedae_plus/mixin/ae2WTlib/ContainerUWirelessExPatternTerminalMixin.java
@@ -15,8 +15,8 @@ public abstract class ContainerUWirelessExPatternTerminalMixin {
 
     // 1.21 环境下，Glodium IActionHolder 已被移除，改为 no-op 保留占位，以便未来扩展。
     // 明确目标构造签名：<init>(int, Inventory, HostUWirelessExPAT)
-    @Inject(method = "<init>(ILnet/minecraft/world/entity/player/Inventory;Lcom/glodblock/github/extendedae/xmod/wt/HostUWirelessExPAT;)V", at = @At("TAIL"), remap = false)
-    private void init(int id, net.minecraft.world.entity.player.Inventory playerInventory, com.glodblock.github.extendedae.xmod.wt.HostUWirelessExPAT host, CallbackInfo ci) {
+    @Inject(method = "<init>(ILnet/minecraft/world/entity/player/Inventory;Ljava/lang/Object;)V", at = @At("TAIL"), remap = false)
+    private void init(int id, net.minecraft.world.entity.player.Inventory playerInventory, Object host, CallbackInfo ci) {
         // no-op
     }
 }
diff --git a/src/main/resources/extendedae_plus.mixins.json b/src/main/resources/extendedae_plus.mixins.json
index 1255c8c..ba05944 100644
--- a/src/main/resources/extendedae_plus.mixins.json
+++ b/src/main/resources/extendedae_plus.mixins.json
@@ -13,6 +13,9 @@
     "ae2.AEProcessingPatternMixin",
     "ae2.autopattern.CraftingTreeNodeAccessor",
     "ae2.autopattern.CraftingTreeProcessMixin",
+    "ae2.autopattern.CraftingTreeNodeMixin",
+    "ae2.autopattern.CraftingServiceGetProvidersMixin",
+    "ae2.autopattern.PatternProviderLogicContainsRedirectMixin",
     "ae2.accessor.PatternProviderLogicPatternInputsAccessor",
     "extendedae.common.PartExPatternProviderMixin",
     "extendedae.common.TileExPatternProviderMixin",
@@ -20,6 +23,8 @@
     "extendedae.container.ContainerExPatternTerminalMixin",
     "extendedae.container.ContainerWirelessExPatternTerminalMixin",
     "ae2.menu.PatternEncodingTermMenuMixin",
+    "ae2.menu.ContainerPatternEncodingTermMenuMixin",
+    "ae2.menu.MEStorageMenuMixin",
     "ae2.accessor.MEStorageMenuAccessor",
     "ae2.accessor.PatternEncodingTermMenuAccessor"
   ],