调整实现

Author: Circulate233

src/main/java/com/circulation/random_complement/common/interfaces/AEIgnoredInputMachine.java

@@ -0,0 +1,8 @@
+package com.circulation.random_complement.common.interfaces;
+
+public interface AEIgnoredInputMachine {
+
+    boolean r$isIgnored();
+
+    void r$setIgnored(boolean b);
+}

src/main/java/com/circulation/random_complement/common/interfaces/RCCraftingJob.java

@@ -10,5 +10,5 @@ public interface RCCraftingJob {
 
     void setSpecialDeficiency(boolean b);
 
-    boolean isPlayer();
+    boolean canIgnoredInput();
 }

src/main/java/com/circulation/random_complement/mixin/ae2/miss_craft/MixinContainerCraftConfirm.java

@@ -19,17 +19,17 @@
 public abstract class MixinContainerCraftConfirm implements RCAEBaseContainer {
 
     @Unique
-    private boolean r$isPlayer = false;
+    private boolean r$canIgnoredInput = false;
 
     @WrapOperation(method = "detectAndSendChanges", at = @At(value = "INVOKE", target = "Lappeng/api/networking/crafting/ICraftingJob;isSimulation()Z", ordinal = 1, remap = false))
     public boolean isSimulation1(ICraftingJob instance, Operation<Boolean> original) {
-        if (!r$isPlayer) return original.call(instance);
+        if (!r$canIgnoredInput) return original.call(instance);
         return true;
     }
 
     @WrapOperation(method = "detectAndSendChanges", at = @At(value = "INVOKE", target = "Lappeng/api/networking/crafting/ICraftingJob;isSimulation()Z", ordinal = 2, remap = false))
     public boolean isSimulation2(ICraftingJob instance, Operation<Boolean> original) {
-        if (!r$isPlayer) return original.call(instance);
+        if (!r$canIgnoredInput) return original.call(instance);
         return true;
     }
 
@@ -38,7 +38,7 @@ public void setJob(Future<ICraftingJob> job, CallbackInfo ci) {
         if (job == null) return;
         try {
             if (job.get() instanceof RCCraftingJob j) {
-                this.r$isPlayer = j.isPlayer();
+                this.r$canIgnoredInput = j.canIgnoredInput();
             }
         } catch (InterruptedException | ExecutionException ignored) {
         }

src/main/java/com/circulation/random_complement/mixin/ae2/miss_craft/MixinCraftingCPUCluster.java

@@ -62,7 +62,7 @@ public void onStop(IAEItemStack input, Actionable type, IActionSource src, Callb
     @Inject(method = "submitJob", at = @At(value = "INVOKE", target = "Lappeng/crafting/CraftingTreeNode;setJob(Lappeng/crafting/MECraftingInventory;Lappeng/me/cluster/implementations/CraftingCPUCluster;Lappeng/api/networking/security/IActionSource;)V"))
     public void submitJob(IGrid g, ICraftingJob job, IActionSource src, ICraftingRequester requestingMachine, CallbackInfoReturnable<ICraftingLink> cir) {
         var j = (RCCraftingJob) job;
-        if (!j.isPlayer()) return;
+        if (!j.canIgnoredInput()) return;
         var s = j.getWaitingItem();
         if (s != null && s.getStackSize() > 0) {
             r$waitInput = s.copy();

src/main/java/com/circulation/random_complement/mixin/ae2/miss_craft/MixinCraftingJob.java

@@ -6,6 +6,7 @@
 import appeng.crafting.CraftingJob;
 import appeng.crafting.CraftingTreeNode;
 import appeng.crafting.MECraftingInventory;
+import com.circulation.random_complement.common.interfaces.AEIgnoredInputMachine;
 import com.circulation.random_complement.common.interfaces.RCCraftingJob;
 import com.circulation.random_complement.mixin.ae2.AccessorCraftingTreeNode;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
@@ -50,7 +51,7 @@ public abstract class MixinCraftingJob implements RCCraftingJob {
 
     @WrapOperation(method = "run", at = @At(value = "INVOKE", target = "Lappeng/crafting/MECraftingInventory;ignore(Lappeng/api/storage/data/IAEItemStack;)V", ordinal = 0))
     public void record(MECraftingInventory instance, IAEItemStack what, Operation<Void> original, @Share("rcOutput") LocalLongRef stackLocalRef) {
-        if (!isPlayer()) return;
+        if (!canIgnoredInput()) return;
         var stack = instance.getItemList().findPrecise(what);
         if (stack != null) {
             var size = stack.getStackSize();
@@ -65,13 +66,16 @@ public IAEItemStack getWaitingItem() {
     }
 
     @Intrinsic
-    public boolean isPlayer() {
-        return this.actionSrc.player().isPresent();
+    public boolean canIgnoredInput() {
+        if (this.actionSrc.player().isPresent()) return true;
+        if (this.actionSrc.machine().orElse(null) instanceof AEIgnoredInputMachine a)
+            return a.r$isIgnored();
+        return false;
     }
 
     @Inject(method = "run", at = @At(value = "INVOKE", target = "Lappeng/crafting/CraftingTreeNode;request(Lappeng/crafting/MECraftingInventory;JLappeng/api/networking/security/IActionSource;)Lappeng/api/storage/data/IAEItemStack;", shift = At.Shift.AFTER, ordinal = 0))
     public void supplementaryOutput(CallbackInfo ci, @Share("rcOutput") LocalLongRef stackLocalRef) {
-        if (!isPlayer()) return;
+        if (!canIgnoredInput()) return;
         var tree = (AccessorCraftingTreeNode) this.tree;
         if (tree.isCanEmit()) return;
         final long out = stackLocalRef.get();

src/main/java/com/circulation/random_complement/mixin/ae2/miss_craft/MixinCraftingTreeNode.java

@@ -117,6 +117,6 @@ public void notRecursive(ICraftingPatternDetails details, CallbackInfoReturnable
 
     @Intrinsic
     private boolean isPlayer() {
-        return ((RCCraftingJob) job).isPlayer();
+        return ((RCCraftingJob) job).canIgnoredInput();
     }
 }

src/main/java/com/circulation/random_complement/mixin/threng/MixinTileLevelMaintainer.java

@@ -18,6 +18,7 @@
 import appeng.me.GridAccessException;
 import appeng.util.Platform;
 import appeng.util.item.AEItemStack;
+import com.circulation.random_complement.common.interfaces.AEIgnoredInputMachine;
 import com.glodblock.github.common.item.fake.FakeFluids;
 import com.glodblock.github.common.item.fake.FakeItemRegister;
 import com.glodblock.github.integration.mek.FakeGases;
@@ -46,7 +47,7 @@
 import java.util.Objects;
 
 @Mixin(value = TileLevelMaintainer.class, remap = false)
-public abstract class MixinTileLevelMaintainer extends TileNetworkDevice implements IStackWatcherHost, ICraftingRequester {
+public abstract class MixinTileLevelMaintainer extends TileNetworkDevice implements IStackWatcherHost, ICraftingRequester, AEIgnoredInputMachine {
 
     @Shadow
     @AutoSerialize
@@ -68,6 +69,9 @@ public abstract class MixinTileLevelMaintainer extends TileNetworkDevice impleme
     @Shadow
     private int sleepIncrement;
 
+    @Unique
+    private boolean r$isIgnored = false;
+
     /**
      * @author circulation
      * @reason 删除多余的检测
@@ -244,4 +248,13 @@ public void injectCraftedItems(ICraftingLink link, IAEItemStack stack, Actionabl
         return !t.getRequestStacks()[index].isEmpty() && t.getRequestQtys()[index] - existing > 0L ? t.getRequestBatches()[index] : 0L;
     }
 
+    @Override
+    public boolean r$isIgnored() {
+        return r$isIgnored;
+    }
+
+    @Override
+    public void r$setIgnored(boolean b) {
+        r$isIgnored = b;
+    }
 }