修正流体存储总线更新流体时无法正确的更新液滴数量的问题

Author: Circulate233

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

@@ -5,6 +5,7 @@
 import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IAEStack;
+import appeng.api.storage.data.IItemList;
 import appeng.me.cache.GridStorageCache;
 import appeng.me.cache.NetworkMonitor;
 import appeng.me.storage.NetworkInventoryHandler;
@@ -46,10 +47,26 @@ public void postAlterationOfStoredItems(final IStorageChannel<?> chan, final Ite
         if (chan == Util.getFluidChannel() || (ModAndClassUtil.GAS && chan == Util.getGasChannel())) {
             final var list = new ObjectArrayList<IAEItemStack>();
             for (final IAEStack<?> i : input) {
-                final var drop = Util.packAEStackToDrop(i);
-                if (drop != null) list.add(drop);
+                final var size = i.getStackSize();
+                final var drop = Util.packAEStackToDrop(size > 0 ? i : i.setStackSize(-size));
+                if (drop != null) list.add(drop.setStackSize(size));
+                i.setStackSize(size);
             }
             ((FCNetworkMonitor) this.storageMonitors.get(Util.getItemChannel())).fc$postChange(true, list, src);
         }
     }
+
+    @Inject(method = "postChangesToNetwork", at = @At("TAIL"))
+    private <T extends IAEStack<T>, C extends IStorageChannel<T>> void postChangesToNetwork(final C chan, final int upOrDown, final IItemList<T> availableItems, final IActionSource src, final CallbackInfo ci) {
+        if (chan == Util.getFluidChannel() || (ModAndClassUtil.GAS && chan == Util.getGasChannel())) {
+            final var list = new ObjectArrayList<IAEItemStack>();
+            for (final IAEStack<?> i : availableItems) {
+                final var size = i.getStackSize();
+                final var drop = Util.packAEStackToDrop(size > 0 ? i : i.setStackSize(-size));
+                if (drop != null) list.add(drop.setStackSize(size));
+                i.setStackSize(size);
+            }
+            ((FCNetworkMonitor) this.storageMonitors.get(Util.getItemChannel())).fc$postChange(upOrDown > 0, list, src);
+        }
+    }
 }

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

@@ -14,7 +14,6 @@
 import appeng.me.cache.NetworkMonitor;
 import com.glodblock.github.common.item.fake.FakeItemRegister;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-import it.unimi.dsi.fastutil.objects.ObjectLists;
 import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap;
 import net.minecraft.entity.player.EntityPlayer;
 
@@ -44,17 +43,6 @@ public IAEItemStack injectItems(final IAEItemStack stack, final Actionable actio
         final FakeMonitorSource fakeSource = FakeMonitorSource.release(source);
         final T s = monitor.injectItems(i, actionable, fakeSource);
         fakeSource.recycle();
-        if (actionable == Actionable.MODULATE) {
-            storage.postAlterationOfStoredItems(
-                channel,
-                ObjectLists.singleton(
-                    stack.copy().setStackSize(
-                        stack.getStackSize() - (s == null ? 0 : s.getStackSize())
-                    )
-                ),
-                source
-            );
-        }
         if (s == null) {
             return null;
         } else {
@@ -72,19 +60,7 @@ public IAEItemStack extractItems(final IAEItemStack stack, final Actionable acti
         if (s == null) {
             return null;
         } else {
-            final var o = FakeItemRegister.packAEStackLong(s, stack.getItem());
-            if (actionable == Actionable.MODULATE && o != null) {
-                storage.postAlterationOfStoredItems(
-                    channel,
-                    ObjectLists.singleton(
-                        stack.copy().setStackSize(
-                            -o.getStackSize()
-                        )
-                    ),
-                    source
-                );
-            }
-            return o;
+            return FakeItemRegister.packAEStackLong(s, stack.getItem());
         }
     }