From 28dfdaac78e27057a5fe8981ffdc7349dbc98138 Mon Sep 17 00:00:00 2001
From: C-H716 <1536152356@qq.com>
Date: Thu, 25 Sep 2025 23:33:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E8=AF=B7=E6=B1=82=E9=87=8F=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=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  | 11 ++---------
 .../ae2/autopattern/CraftingTreeProcessMixin.java     |  1 +
 2 files changed, 3 insertions(+), 9 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..aa4f062 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
@@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
-@Mixin(value = CraftingTreeNode.class,remap = false)
+@Mixin(value = CraftingTreeNode.class, remap = false)
 public class CraftingTreeNodeMixin {
     @Inject(method = "request(Lappeng/crafting/inv/CraftingSimulationState;JLappeng/api/stacks/KeyCounter;)V",
             at = @At(value = "INVOKE",
@@ -18,13 +18,6 @@ public class CraftingTreeNodeMixin {
             locals = LocalCapture.CAPTURE_FAILHARD)
     private void captureRequestedAmount(CraftingSimulationState inv, long requestedAmount, KeyCounter containerItems, CallbackInfo ci) {
         // 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();
+        RequestedAmountHolder.push(requestedAmount);
     }
 }
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 8f96a90..b8359ab 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
@@ -56,6 +56,7 @@ public abstract class CraftingTreeProcessMixin {
             CraftingTreeNodeAccessor parentAcc = (CraftingTreeNodeAccessor) craftingTreeNode;
             AEKey parentTarget = parentAcc.eap$getWhat();
             long requested = RequestedAmountHolder.get();
+            RequestedAmountHolder.pop();
 
             // 根据配置决定是否在 provider 间轮询分配请求量（默认开启）
             long perProvider = 1L;

From 848cf86624e2ecddd50dacd84ac6bfb111eca935 Mon Sep 17 00:00:00 2001
From: C-H716 <1536152356@qq.com>
Date: Fri, 26 Sep 2025 21:50:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=AE=9E=E4=BD=93=E5=8A=A0=E9=80=9F?=
 =?UTF-8?q?=E5=99=A8=E8=83=BD=E9=87=8F=E4=B8=8D=E8=B6=B3=E7=9A=84=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ae/menu/EntitySpeedTickerMenu.java        | 20 +++++++++---
 .../ae/parts/EntitySpeedTickerPart.java       | 31 ++++++++++---------
 .../ae/screen/EntitySpeedTickerScreen.java    |  5 +--
 3 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/extendedae_plus/ae/menu/EntitySpeedTickerMenu.java b/src/main/java/com/extendedae_plus/ae/menu/EntitySpeedTickerMenu.java
index 8c09948..d74f897 100644
--- a/src/main/java/com/extendedae_plus/ae/menu/EntitySpeedTickerMenu.java
+++ b/src/main/java/com/extendedae_plus/ae/menu/EntitySpeedTickerMenu.java
@@ -30,8 +30,8 @@ public class EntitySpeedTickerMenu extends UpgradeableMenu<EntitySpeedTickerPart
     @GuiSync(719) public int effectiveSpeed = 1;
     @GuiSync(720) public double multiplier = 1.0;
     @GuiSync(721) public boolean targetBlacklisted = false;
-    // 来自部件的网络能量不足提示（服务端设置，客户端用于显示警告）
-    @GuiSync(722) public boolean networkEnergyInsufficient = false;
+    // 来自部件的网络能量充足提示（服务端设置，客户端用于显示警告）
+    @GuiSync(722) public boolean networkEnergySufficient = true;
 
     public boolean getAccelerateEnabled() {
         return this.accelerateEnabled;
@@ -41,6 +41,16 @@ public class EntitySpeedTickerMenu extends UpgradeableMenu<EntitySpeedTickerPart
         this.accelerateEnabled = enabled;
     }
 
+    /**
+     * 从 Part 更新 networkEnergySufficient 的封装方法（由服务器调用）
+     * 该方法会更新 @GuiSync 字段并广播变化到客户端
+     */
+    public void setNetworkEnergySufficient(boolean sufficient) {
+        this.networkEnergySufficient = sufficient;
+        // 触发一次数据广播，使客户端立即接收到最新状态
+        this.broadcastChanges();
+    }
+
 
     // 构造方法，初始化菜单并与部件绑定
     public EntitySpeedTickerMenu(int id, Inventory ip, EntitySpeedTickerPart host) {
@@ -99,11 +109,11 @@ public class EntitySpeedTickerMenu extends UpgradeableMenu<EntitySpeedTickerPart
             this.effectiveSpeed = (int) PowerUtils.computeProductWithCapFromMenu(this, 8);
         }
 
-        // 从部件同步网络能量不足状态（防御性编程，避免 NPE）
+        // 从部件同步网络能量充足状态：仅在服务器端从部件读取，客户端应使用由 @GuiSync 同步过来的值
         try {
             EntitySpeedTickerPart host = getHost();
-            if (host != null) {
-                this.networkEnergyInsufficient = host.isNetworkEnergyInsufficient();
+            if (host != null && !isClientSide()) {
+                this.networkEnergySufficient = host.isNetworkEnergySufficient();
             }
         } catch (Exception ignored) {}
 
diff --git a/src/main/java/com/extendedae_plus/ae/parts/EntitySpeedTickerPart.java b/src/main/java/com/extendedae_plus/ae/parts/EntitySpeedTickerPart.java
index bf87c21..654d050 100644
--- a/src/main/java/com/extendedae_plus/ae/parts/EntitySpeedTickerPart.java
+++ b/src/main/java/com/extendedae_plus/ae/parts/EntitySpeedTickerPart.java
@@ -62,13 +62,13 @@ public class EntitySpeedTickerPart extends UpgradeablePart implements IGridTicka
     public static final PartModel MODELS_ON;
     @PartModels
     public static final PartModel MODELS_HAS_CHANNEL;
-    
+
     static {
         MODELS_OFF = new PartModel(MODEL_BASE, new ResourceLocation(ExtendedAEPlus.MODID, "part/entity_speed_ticker_off"));
         MODELS_ON = new PartModel(MODEL_BASE, new ResourceLocation(ExtendedAEPlus.MODID, "part/entity_speed_ticker_on"));
         MODELS_HAS_CHANNEL = new PartModel(MODEL_BASE, new ResourceLocation(ExtendedAEPlus.MODID, "part/entity_speed_ticker_has_channel"));
     }
-    
+
     /**
      * 构造函数，初始化部件并设置网络节点属性
      * @param partItem 部件物品
@@ -84,16 +84,15 @@ public class EntitySpeedTickerPart extends UpgradeablePart implements IGridTicka
 
     // 控制是否启用加速（默认启用）
     private boolean accelerateEnabled = true;
-    // 标记网络中是否能量不足（用于 GUI 提示）
-    private boolean networkEnergyInsufficient = true;
-
+    // 标记网络中能量是否充足（用于 GUI 提示，默认充足）
+    private boolean networkEnergySufficient = true;
 
     public boolean getAccelerateEnabled() {
         return this.accelerateEnabled;
     }
 
-    public boolean isNetworkEnergyInsufficient() {
-        return this.networkEnergyInsufficient;
+    public boolean isNetworkEnergySufficient() {
+        return this.networkEnergySufficient;
     }
 
     public void setAccelerateEnabled(boolean accelerateEnabled) {
@@ -101,15 +100,16 @@ public class EntitySpeedTickerPart extends UpgradeablePart implements IGridTicka
     }
 
     /**
-     * 更新网络能量不足标记并在菜单存在且状态变化时触发同步
-     * @param insufficient 是否能量不足
+     * 更新网络能量充足标记并在菜单存在且状态变化时触发同步
+     * @param sufficient 是否能量充足
      */
-    private void updateNetworkEnergyInsufficient(boolean insufficient) {
-        if (this.networkEnergyInsufficient == insufficient) return;
-        this.networkEnergyInsufficient = insufficient;
+    private void updateNetworkEnergySufficient(boolean sufficient) {
+        // 保持部件内部状态一致（部件为权威来源）
+        this.networkEnergySufficient = sufficient;
         if (this.menu != null) {
             try {
-                this.menu.broadcastChanges();
+                // 使用菜单的封装方法更新并广播，以保持封装性
+                this.menu.setNetworkEnergySufficient(sufficient);
             } catch (Exception ignored) {}
         }
     }
@@ -260,16 +260,17 @@ public class EntitySpeedTickerPart extends UpgradeablePart implements IGridTicka
         double simulated = getMainNode().getGrid().getEnergyService()
                 .extractAEPower(requiredPower, Actionable.SIMULATE, PowerMultiplier.CONFIG);
         if (simulated < requiredPower) {
-            updateNetworkEnergyInsufficient(false);
+            updateNetworkEnergySufficient(false); // 能量不足
             return;
         }
 
         double extractedPower = getMainNode().getGrid().getEnergyService()
                 .extractAEPower(requiredPower, Actionable.MODULATE, PowerMultiplier.CONFIG);
         if (extractedPower < requiredPower) {
-            updateNetworkEnergyInsufficient(false);
+            updateNetworkEnergySufficient(false); // 能量不足
             return;
         }
+        updateNetworkEnergySufficient(true); // 能量充足
 
         // 计算加速倍数：基于 2 的次方，并把 8 张映射到最大 1024x（2^10）
         // 已由 product 计算得到 speed；上面已在没有卡时提前返回
diff --git a/src/main/java/com/extendedae_plus/ae/screen/EntitySpeedTickerScreen.java b/src/main/java/com/extendedae_plus/ae/screen/EntitySpeedTickerScreen.java
index 24651ed..04fc9b1 100644
--- a/src/main/java/com/extendedae_plus/ae/screen/EntitySpeedTickerScreen.java
+++ b/src/main/java/com/extendedae_plus/ae/screen/EntitySpeedTickerScreen.java
@@ -126,9 +126,10 @@ public class EntitySpeedTickerScreen<C extends EntitySpeedTickerMenu> extends Up
         double finalPower = PowerUtils.computeFinalPowerForProduct(effectiveSpeed, energyCardCount);
         double remainingRatio = PowerUtils.getRemainingRatio(energyCardCount);
 
-        // 如果网络能量不足，优先显示警告信息并在能量值处显示 0
-        if (getMenu().networkEnergyInsufficient) {
+        if (!getMenu().networkEnergySufficient) {
             setTextContent("enable", Component.translatable("screen.extendedae_plus.entity_speed_ticker.warning_network_energy_insufficient"));
+        }else {
+            setTextContent("enable", null);
         }
         setTextContent("speed", Component.translatable("screen.extendedae_plus.entity_speed_ticker.speed", effectiveSpeed));
         setTextContent("energy", Component.translatable("screen.extendedae_plus.entity_speed_ticker.energy", Platform.formatPower(finalPower, false)));