From f60629aadfb75ca2f748f6fdd04e4dcd210339b7 Mon Sep 17 00:00:00 2001
From: C-H716 <1536152356@qq.com>
Date: Sat, 27 Sep 2025 20:18:13 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AF=B7=E6=B1=82=E9=87=8Fpop=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mixin/ae2/autopattern/CraftingTreeNodeMixin.java       | 7 -------
 .../mixin/ae2/autopattern/CraftingTreeProcessMixin.java    | 1 +
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingTreeNodeMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingTreeNodeMixin.java
index b2651d5..23d0102 100644
--- a/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingTreeNodeMixin.java
+++ b/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingTreeNodeMixin.java
@@ -20,11 +20,4 @@ public class CraftingTreeNodeMixin {
         // push the requestedAmount before addContainerItems is called
        RequestedAmountHolder.push(requestedAmount);
     }
-
-    @Inject(method = "request(Lappeng/crafting/inv/CraftingSimulationState;JLappeng/api/stacks/KeyCounter;)V",
-            at = @At(value = "RETURN"))
-    private void clearRequestedAmountOnReturn(CraftingSimulationState inv, long requestedAmount, KeyCounter containerItems, CallbackInfo ci) {
-        // pop the pushed requested amount on return
-        RequestedAmountHolder.pop();
-    }
 }
diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingTreeProcessMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingTreeProcessMixin.java
index 68e510e..fb0d122 100644
--- a/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingTreeProcessMixin.java
+++ b/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingTreeProcessMixin.java
@@ -55,6 +55,7 @@ public abstract class CraftingTreeProcessMixin {
             CraftingTreeNodeAccessor parentAcc = (CraftingTreeNodeAccessor) craftingTreeNode;
             AEKey parentTarget = parentAcc.eap$getWhat();
             long requested = RequestedAmountHolder.get();
+            RequestedAmountHolder.pop();
 
             // 根据配置决定是否在 provider 间轮询分配请求量（默认开启）
             long perProvider = 1L;