修复bug，bug，和bug

Author: Circulate233

src/main/java/com/glodblock/github/client/GuiGeneralLevelMaintainer.java

@@ -1,14 +1,10 @@
 package com.glodblock.github.client;
 
-import appeng.api.storage.data.IAEItemStack;
 import appeng.client.gui.AEBaseGui;
 import appeng.client.gui.widgets.GuiNumberBox;
 import appeng.container.interfaces.IJEIGhostIngredients;
 import appeng.container.slot.SlotFake;
 import appeng.core.localization.GuiText;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.PacketInventoryAction;
-import appeng.helpers.InventoryAction;
 import appeng.util.item.AEItemStack;
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.client.container.ContainerGeneralLevelMaintainer;
@@ -22,19 +18,13 @@
 import com.glodblock.github.util.UtilClient;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import mekanism.api.gas.GasStack;
 import mezz.jei.api.gui.IGhostIngredientHandler;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fml.common.Optional;
 import net.minecraftforge.items.IItemHandler;
-import org.lwjgl.input.Mouse;
 
-import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
@@ -200,17 +190,13 @@ public void drawBG(int offsetX, int offsetY, int mouseX, int mouseY) {
     public List<IGhostIngredientHandler.Target<?>> getPhantomTargets(Object ingredient) {
         this.mapTargetSlot.clear();
         List<IGhostIngredientHandler.Target<?>> list = new ObjectArrayList<>();
-        if (ModAndClassUtil.GAS && mek$getPhantomTargets(ingredient, list)) return list;
-
-        if (ingredient instanceof ItemStack || ingredient instanceof FluidStack) {
-            if (!this.inventorySlots.inventorySlots.isEmpty()) {
-                for (Slot slots : this.inventorySlots.inventorySlots) {
-                    if (slots instanceof SlotFake slot) {
-                        final IGhostIngredientHandler.Target<Object> targetItem;
-                        targetItem = new ItemAndFluidPacketTarget(getGuiLeft(), getGuiTop(), slot);
-                        list.add(targetItem);
-                        this.mapTargetSlot.putIfAbsent(targetItem, slot);
-                    }
+        if (!this.inventorySlots.inventorySlots.isEmpty()) {
+            for (Slot slots : this.inventorySlots.inventorySlots) {
+                if (slots instanceof SlotFake slot) {
+                    final IGhostIngredientHandler.Target<Object> targetItem
+                        = new FluidPacketTarget(getGuiLeft(), getGuiTop(), slot);
+                    list.add(targetItem);
+                    this.mapTargetSlot.put(targetItem, slot);
                 }
             }
         }
@@ -222,57 +208,4 @@ public Map<IGhostIngredientHandler.Target<?>, Object> getFakeSlotTargetMap() {
         return mapTargetSlot;
     }
 
-    @Optional.Method(modid = "mekeng")
-    public boolean mek$getPhantomTargets(Object ingredient, List<IGhostIngredientHandler.Target<?>> list) {
-        if (ingredient instanceof GasStack) {
-            if (!this.inventorySlots.inventorySlots.isEmpty()) {
-                for (Slot slots : this.inventorySlots.inventorySlots) {
-                    if (slots instanceof SlotFake slot) {
-                        IGhostIngredientHandler.Target<Object> targetItem = new FluidPacketTarget(getGuiLeft(), getGuiTop(), slot);
-                        list.add(targetItem);
-                        this.mapTargetSlot.putIfAbsent(targetItem, slot);
-                    }
-                }
-            }
-        }
-        return list.isEmpty();
-    }
-
-    private static class ItemAndFluidPacketTarget extends FluidPacketTarget {
-
-        public ItemAndFluidPacketTarget(int guiLeft, int guiTop, Slot slot) {
-            super(guiLeft, guiTop, slot);
-        }
-
-        @Override
-        public void accept(@Nonnull Object ingredient) {
-            if (ingredient instanceof ItemStack s) {
-                if (Mouse.getEventButton() == 0) {
-                    FluidStack fluid = covertFluid(ingredient);
-                    Object gas = covertGas(ingredient);
-                    if (fluid != null) {
-                        super.accept(fluid);
-                        return;
-                    }
-                    if (gas != null) {
-                        super.accept(gas);
-                        return;
-                    }
-                }
-                IAEItemStack stack = AEItemStack.fromItemStack(s);
-                if (stack == null) {
-                    return;
-                }
-                final PacketInventoryAction p;
-                try {
-                    p = new PacketInventoryAction(InventoryAction.PLACE_JEI_GHOST_ITEM, (SlotFake) slot, stack);
-                    NetworkHandler.instance().sendToServer(p);
-                } catch (IOException ignored) {
-
-                }
-                return;
-            }
-            super.accept(ingredient);
-        }
-    }
 }

src/main/java/com/glodblock/github/client/GuiUltimateEncoder.java

@@ -16,7 +16,6 @@
 import com.glodblock.github.client.container.ContainerUltimateEncoder;
 import com.glodblock.github.common.tile.TileUltimateEncoder;
 import com.glodblock.github.integration.jei.FluidPacketTarget;
-import com.glodblock.github.integration.jei.ItemTarget;
 import com.glodblock.github.network.CPacketFluidPatternTermBtns;
 import com.glodblock.github.network.CPacketInventoryAction;
 import com.glodblock.github.util.ModAndClassUtil;
@@ -29,13 +28,10 @@
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.ClickType;
 import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 
 import javax.annotation.Nonnull;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -215,28 +211,15 @@ public void drawBG(int offsetX, int offsetY, int mouseX, int mouseY) {
 
     @Override
     public List<IGhostIngredientHandler.Target<?>> getPhantomTargets(Object ingredient) {
-        if (FluidPacketTarget.covertFluid(ingredient) != null || FluidPacketTarget.covertGas(ingredient) != null) {
-            List<IGhostIngredientHandler.Target<?>> targets = new ObjectArrayList<>();
-            for (Slot slot : this.container.inventorySlots) {
-                if (slot instanceof SlotFake) {
-                    IGhostIngredientHandler.Target<?> target = new FluidPacketTarget(getGuiLeft(), getGuiTop(), slot);
-                    targets.add(target);
-                    this.mapTargetSlot.putIfAbsent(target, slot);
-                }
-            }
-            return targets;
-        } else if (ingredient instanceof ItemStack) {
-            List<IGhostIngredientHandler.Target<?>> targets = new ArrayList<>();
-            for (Slot slot : this.container.inventorySlots) {
-                if (slot instanceof SlotFake) {
-                    IGhostIngredientHandler.Target<?> target = new ItemTarget(getGuiLeft(), getGuiTop(), slot);
-                    targets.add(target);
-                    this.mapTargetSlot.putIfAbsent(target, slot);
-                }
+        List<IGhostIngredientHandler.Target<?>> targets = new ObjectArrayList<>();
+        for (Slot slot : this.container.inventorySlots) {
+            if (slot instanceof SlotFake) {
+                IGhostIngredientHandler.Target<?> target = new FluidPacketTarget(getGuiLeft(), getGuiTop(), slot);
+                targets.add(target);
+                this.mapTargetSlot.putIfAbsent(target, slot);
             }
-            return targets;
         }
-        return Collections.emptyList();
+        return targets;
     }
 
     @Override

src/main/java/com/glodblock/github/client/client/gui/GuiExtendedFluidPatternTerminal.java

@@ -20,13 +20,13 @@
 import com.glodblock.github.util.Ae2ReflectClient;
 import com.glodblock.github.util.ModAndClassUtil;
 import com.glodblock.github.util.UtilClient;
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import mezz.jei.api.gui.IGhostIngredientHandler.Target;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.ClickType;
 import net.minecraft.inventory.Slot;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class GuiExtendedFluidPatternTerminal extends GuiExpandedProcessingPatternTerm {
@@ -127,19 +127,15 @@ protected void handleMouseClick(Slot slot, int slotIdx, int mouseButton, ClickTy
 
     @Override
     public List<Target<?>> getPhantomTargets(Object ingredient) {
-        if (FluidPacketTarget.covertFluid(ingredient) != null || FluidPacketTarget.covertGas(ingredient) != null) {
-            List<Target<?>> targets = new ArrayList<>();
-            for (Slot slot : this.inventorySlots.inventorySlots) {
-                if (slot instanceof SlotFake) {
-                    Target<?> target = new FluidPacketTarget(getGuiLeft(), getGuiTop(), slot);
-                    targets.add(target);
-                    mapTargetSlot.putIfAbsent(target, slot);
-                }
+        List<Target<?>> targets = new ObjectArrayList<>();
+        for (Slot slot : this.inventorySlots.inventorySlots) {
+            if (slot instanceof SlotFake) {
+                Target<?> target = new FluidPacketTarget(getGuiLeft(), getGuiTop(), slot);
+                targets.add(target);
+                mapTargetSlot.putIfAbsent(target, slot);
             }
-            return targets;
-        } else {
-            return super.getPhantomTargets(ingredient);
         }
+        return targets;
     }
 
     @Override

src/main/java/com/glodblock/github/client/client/gui/GuiFluidPatternTerminal.java

@@ -20,13 +20,13 @@
 import com.glodblock.github.util.Ae2ReflectClient;
 import com.glodblock.github.util.ModAndClassUtil;
 import com.glodblock.github.util.UtilClient;
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import mezz.jei.api.gui.IGhostIngredientHandler.Target;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.ClickType;
 import net.minecraft.inventory.Slot;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class GuiFluidPatternTerminal extends GuiPatternTerm {
@@ -141,19 +141,15 @@ protected void handleMouseClick(Slot slot, int slotIdx, int mouseButton, ClickTy
 
     @Override
     public List<Target<?>> getPhantomTargets(Object ingredient) {
-        if (!this.container.isCraftingMode() && (FluidPacketTarget.covertFluid(ingredient) != null || FluidPacketTarget.covertGas(ingredient) != null)) {
-            List<Target<?>> targets = new ArrayList<>();
-            for (Slot slot : this.inventorySlots.inventorySlots) {
-                if (slot instanceof SlotFake) {
-                    Target<?> target = new FluidPacketTarget(getGuiLeft(), getGuiTop(), slot);
-                    targets.add(target);
-                    mapTargetSlot.putIfAbsent(target, slot);
-                }
+        List<Target<?>> targets = new ObjectArrayList<>();
+        for (Slot slot : this.inventorySlots.inventorySlots) {
+            if (slot instanceof SlotFake) {
+                Target<?> target = new FluidPacketTarget(getGuiLeft(), getGuiTop(), slot);
+                targets.add(target);
+                mapTargetSlot.putIfAbsent(target, slot);
             }
-            return targets;
-        } else {
-            return super.getPhantomTargets(ingredient);
         }
+        return targets;
     }
 
     @Override

src/main/java/com/glodblock/github/client/client/gui/GuiWirelessFluidPatternTerminal.java

@@ -146,19 +146,15 @@ protected void handleMouseClick(Slot slot, int slotIdx, int mouseButton, ClickTy
 
     @Override
     public List<IGhostIngredientHandler.Target<?>> getPhantomTargets(Object ingredient) {
-        if (!this.container.isCraftingMode() && (FluidPacketTarget.covertFluid(ingredient) != null || FluidPacketTarget.covertGas(ingredient) != null)) {
-            List<IGhostIngredientHandler.Target<?>> targets = new ArrayList<>();
-            for (Slot slot : this.inventorySlots.inventorySlots) {
-                if (slot instanceof SlotFake) {
-                    IGhostIngredientHandler.Target<?> target = new FluidPacketTarget(getGuiLeft(), getGuiTop(), slot);
-                    targets.add(target);
-                    mapTargetSlot.putIfAbsent(target, slot);
-                }
+        List<IGhostIngredientHandler.Target<?>> targets = new ArrayList<>();
+        for (Slot slot : this.inventorySlots.inventorySlots) {
+            if (slot instanceof SlotFake) {
+                IGhostIngredientHandler.Target<?> target = new FluidPacketTarget(getGuiLeft(), getGuiTop(), slot);
+                targets.add(target);
+                mapTargetSlot.putIfAbsent(target, slot);
             }
-            return targets;
-        } else {
-            return super.getPhantomTargets(ingredient);
         }
+        return targets;
     }
 
     @Override

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

@@ -1,14 +1,18 @@
 package com.glodblock.github.coremod.mixin.ae2;
 
 import appeng.api.networking.IGrid;
+import appeng.api.networking.security.IActionSource;
 import appeng.api.storage.IStorageChannel;
+import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IAEStack;
 import appeng.me.cache.GridStorageCache;
 import appeng.me.cache.NetworkMonitor;
 import appeng.me.storage.NetworkInventoryHandler;
 import com.glodblock.github.interfaces.FCNetworkInventoryHandler;
 import com.glodblock.github.interfaces.FCNetworkMonitor;
+import com.glodblock.github.util.ModAndClassUtil;
 import com.glodblock.github.util.Util;
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -36,4 +40,16 @@ public void onBuild(IStorageChannel<?> chan, CallbackInfoReturnable<NetworkInven
         var m = ((FCNetworkMonitor) this.storageMonitors.get(Util.getItemChannel()));
         ((FCNetworkInventoryHandler) cir.getReturnValue()).init(m);
     }
+
+    @Inject(method = "postAlterationOfStoredItems", at = @At("TAIL"))
+    public void postAlterationOfStoredItems(IStorageChannel<?> chan, Iterable<? extends IAEStack<?>> input, IActionSource src, CallbackInfo ci) {
+        if (chan == Util.getFluidChannel() || (ModAndClassUtil.GAS && chan == Util.getGasChannel())) {
+            var list = new ObjectArrayList<IAEItemStack>();
+            for (IAEStack<?> i : input) {
+                var drop = Util.packAEStackToDrop(i);
+                if (drop != null) list.add(drop);
+            }
+            ((FCNetworkMonitor) this.storageMonitors.get(Util.getItemChannel())).fc$postChange(true, list, src);
+        }
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.glodblock.github.coremod.mixin.ae2;
 
 import appeng.api.config.FuzzyMode;
+import appeng.api.networking.security.IActionSource;
 import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IAEItemStack;
@@ -28,7 +29,7 @@
 import javax.annotation.Nonnull;
 
 @Mixin(value = NetworkMonitor.class, remap = false)
-public class MixinNetworkMonitor<T extends IAEStack<T>> implements FCNetworkMonitor {
+public abstract class MixinNetworkMonitor<T extends IAEStack<T>> implements FCNetworkMonitor<T> {
 
     @Shadow
     @Final
@@ -40,6 +41,9 @@ public class MixinNetworkMonitor<T extends IAEStack<T>> implements FCNetworkMoni
     @Nonnull
     private GridStorageCache myGridCache;
 
+    @Shadow
+    protected abstract void postChange(boolean add, Iterable<T> changes, IActionSource src);
+
     @Unique
     private FakeMonitor<IAEFluidStack> fluidMonitor;
 
@@ -104,6 +108,11 @@ public FakeMonitor<?> getGasMonitor() {
         return gasMonitor;
     }
 
+    @Override
+    public void fc$postChange(boolean add, Iterable<T> changes, IActionSource src) {
+        this.postChange(add, changes, src);
+    }
+
     @Inject(method = "getAvailableItems", at = @At("TAIL"))
     public void getAvailableItems(IItemList<T> out, CallbackInfoReturnable<IItemList<T>> cir) {
         if (this.myChannel == Util.getItemChannel()) {