fix #9

Author: Circulate233

src/main/java/com/glodblock/github/coremod/mixin/ae2/MixinMEPassThrough.java

@@ -0,0 +1,25 @@
+package com.glodblock.github.coremod.mixin.ae2;
+
+import appeng.api.config.Actionable;
+import appeng.api.networking.security.IActionSource;
+import appeng.api.storage.IMEInventory;
+import appeng.api.storage.data.IAEStack;
+import appeng.me.storage.MEPassThrough;
+import com.glodblock.github.util.FakeMonitor;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(value = MEPassThrough.class, remap = false)
+public class MixinMEPassThrough {
+
+    @WrapOperation(method = "injectItems", at = @At(value = "INVOKE", target = "Lappeng/api/storage/IMEInventory;injectItems(Lappeng/api/storage/data/IAEStack;Lappeng/api/config/Actionable;Lappeng/api/networking/security/IActionSource;)Lappeng/api/storage/data/IAEStack;"))
+    public IAEStack<?> injectItems(IMEInventory<?> instance, IAEStack<?> t, Actionable actionable, IActionSource iActionSource, Operation<IAEStack<?>> original) {
+        if (iActionSource instanceof FakeMonitor.FakeMonitorSource m) {
+            return original.call(instance, t, actionable, m.getSource());
+        }
+        return original.call(instance, t, actionable, iActionSource);
+    }
+
+}

src/main/java/com/glodblock/github/coremod/mixin/ae2/MixinNetworkInventoryHandler.java

@@ -60,26 +60,15 @@ public abstract class MixinNetworkInventoryHandler<T extends IAEStack<T>> implem
     @Shadow
     protected abstract Deque<?> getDepth(Actionable type);
 
-    @Shadow @Final private SecurityCache security;
-
     @Inject(method = "<init>", at = @At("TAIL"))
     public void onInit(final IStorageChannel<?> chan, final SecurityCache security, final CallbackInfo ci) {
         monitor = security.getGrid().<IStorageGrid>getCache(IStorageGrid.class).getInventory(Util.getItemChannel());
     }
 
     @Inject(method = "injectItems", at = @At(value = "INVOKE", target = "Ljava/util/NavigableMap;values()Ljava/util/Collection;", ordinal = 1), cancellable = true)
-    private void notItemInject(final T input, final Actionable mode, final IActionSource src, final CallbackInfoReturnable<T> cir) {
+    private void notItemInject(final T input, final Actionable mode, IActionSource src, final CallbackInfoReturnable<T> cir) {
         if (input == null || input instanceof IAEItemStack) return;
-        if (mode == Actionable.SIMULATE) return;
-        if (src instanceof FakeMonitor.FakeMonitorSource m) {
-            var o = m.machine();
-            if (o.isPresent()) {
-                var machine = o.get();
-                if (machine.getActionableNode().getGrid() == this.security.getGrid()) {
-                    return;
-                }
-            }
-        }
+        if (mode == Actionable.SIMULATE || src instanceof FakeMonitor.FakeMonitorSource) return;
         final var drop = Util.packAEStackToDrop(input);
         if (drop != null) {
             if (!this.getDepth(mode).isEmpty()) this.surface(null, mode);

src/main/java/com/glodblock/github/util/FakeMonitor.java

@@ -54,8 +54,9 @@ public IAEItemStack injectItems(final IAEItemStack stack, final Actionable actio
     public IAEItemStack extractItems(final IAEItemStack stack, final Actionable actionable, final IActionSource source) {
         final T i = FakeItemRegister.getAEStack(stack);
         if (i == null) return null;
+        final T s;
         final FakeMonitorSource fakeSource = FakeMonitorSource.release(source);
-        final T s = monitor.extractItems(i, actionable, fakeSource);
+        s = monitor.extractItems(i, actionable, fakeSource);
         fakeSource.recycle();
         if (s == null) {
             return null;
@@ -117,51 +118,55 @@ public boolean validForPass(final int i) {
         return i == 2;
     }
 
-    public static final class FakeMonitorSource implements IActionSource {
+    public GridStorageCache getStorage() {
+        return storage;
+    }
+
+    public static class FakeMonitorSource implements IActionSource {
 
         private static final Deque<FakeMonitorSource> POOL = new ArrayDeque<>(100);
         private IActionSource source;
 
-        private FakeMonitorSource(final IActionSource source) {
-            this.source = source;
-        }
-
         public static FakeMonitorSource release(final IActionSource source) {
             synchronized (POOL) {
                 if (!POOL.isEmpty()) {
-                    return POOL.peek().setSource(source);
+                    var s = POOL.peek();
+                    s.source = source;
+                    return s;
                 }
             }
             return new FakeMonitorSource(source);
         }
 
-        public FakeMonitorSource setSource(final IActionSource source) {
+        private FakeMonitorSource(final IActionSource source) {
             this.source = source;
-            return this;
+        }
+
+        public IActionSource getSource() {
+            return source;
         }
 
         public void recycle() {
             synchronized (POOL) {
                 if (POOL.size() < 100) POOL.add(this);
             }
-            this.setSource(null);
         }
 
         @Nonnull
         @Override
-        public Optional<EntityPlayer> player() {
+        public final Optional<EntityPlayer> player() {
             return source.player();
         }
 
         @Nonnull
         @Override
-        public Optional<IActionHost> machine() {
+        public final Optional<IActionHost> machine() {
             return source.machine();
         }
 
         @Nonnull
         @Override
-        public <T> Optional<T> context(@Nonnull final Class<T> aClass) {
+        public final <T> Optional<T> context(@Nonnull final Class<T> aClass) {
             return source.context(aClass);
         }
     }

src/main/resources/mixins.ae2fc.json

@@ -11,6 +11,7 @@
     "ae2.MixinDualityInterface",
     "ae2.MixinGridStorageCache",
     "ae2.MixinGuiBridge",
+    "ae2.MixinMEPassThrough",
     "ae2.MixinNetworkInventoryHandler",
     "ae2.MixinNetworkMonitor",
     "ae2.container.MixinContainerCellWorkbench",