防止向EF上传重复的样板

Circulate233 · Circulate233 · commit bbac34876684 · 2025-11-07T13:27:12.000+08:00
diff --git a/src/main/java/github/kasuminova/novaeng/common/network/PktPatternTermUploadPattern.java b/src/main/java/github/kasuminova/novaeng/common/network/PktPatternTermUploadPattern.java
@@ -1,20 +1,26 @@
 package github.kasuminova.novaeng.common.network;
 
+import appeng.api.AEApi;
 import appeng.api.implementations.guiobjects.IGuiItemObject;
 import appeng.api.networking.IGridNode;
 import appeng.api.networking.IMachineSet;
 import appeng.api.networking.security.IActionHost;
+import appeng.api.storage.data.IAEItemStack;
 import appeng.container.implementations.ContainerPatternEncoder;
 import appeng.container.slot.SlotRestrictedInput;
+import appeng.items.misc.ItemEncodedPattern;
 import appeng.me.GridAccessException;
 import appeng.parts.reporting.AbstractPartEncoder;
+import com.glodblock.github.util.EmptyMachineSet;
+import com.glodblock.github.util.FluidPatternDetails;
 import github.kasuminova.novaeng.common.tile.ecotech.efabricator.EFabricatorMEChannel;
 import github.kasuminova.novaeng.mixin.ae2.AccessorContainerPatternEncoder;
 import hellfirepvp.modularmachinery.ModularMachinery;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.inventory.Container;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
 import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
@@ -31,46 +37,70 @@ public void toBytes(final ByteBuf buf) {
 
     @Override
     public IMessage onMessage(final PktPatternTermUploadPattern message, final MessageContext ctx) {
-        EntityPlayerMP player = ctx.getServerHandler().player;
+        final EntityPlayerMP player = ctx.getServerHandler().player;
         ModularMachinery.EXECUTE_MANAGER.addSyncTask(() -> {
-            Container container = player.openContainer;
+            final Container container = player.openContainer;
             if (!(container instanceof ContainerPatternEncoder encoder)) {
                 return;
             }
 
-            SlotRestrictedInput patternSlotOUT = ((AccessorContainerPatternEncoder) encoder).getPatternSlotOUT();
-            ItemStack patternStack = patternSlotOUT.getStack();
+            final SlotRestrictedInput patternSlotOUT = ((AccessorContainerPatternEncoder) encoder).getPatternSlotOUT();
+            final ItemStack patternStack = patternSlotOUT.getStack();
             if (patternStack.isEmpty()) {
                 return;
             }
 
-            try {
-                AbstractPartEncoder part = encoder.getPart();
-                IGuiItemObject itemObject = ((AccessorContainerPatternEncoder) encoder).getIGuiItemObject();
-                IMachineSet channelNodes;
+            AbstractPartEncoder part = encoder.getPart();
+            IGuiItemObject itemObject = ((AccessorContainerPatternEncoder) encoder).getIGuiItemObject();
+            IMachineSet channelNodes;
                 if (part != null) {
-                    channelNodes = part.getProxy().getGrid().getMachines(EFabricatorMEChannel.class);
+                    try {
+                        channelNodes = part.getProxy().getGrid().getMachines(EFabricatorMEChannel.class);
+                    } catch (GridAccessException ignored) {
+                        channelNodes = EmptyMachineSet.create(EFabricatorMEChannel.class);
+                    }
                 } else if (itemObject instanceof IActionHost wirelessTerm) {
                     channelNodes = wirelessTerm.getActionableNode().getGrid().getMachines(EFabricatorMEChannel.class);
                 } else {
                     return;
                 }
-                for (final IGridNode channelNode : channelNodes) {
+
+            final IAEItemStack out;
+            if (patternStack.getItem() instanceof ItemEncodedPattern item) {
+                var pattern = item.getPatternForItem(patternStack, player.world);
+                if (pattern.isCraftable() || pattern instanceof FluidPatternDetails) {
+                    out = pattern.getCondensedOutputs()[0];
+                } else return;
+            } else return;
+
+            for (final IGridNode channelNode : channelNodes) {
+                EFabricatorMEChannel channel = (EFabricatorMEChannel) channelNode.getMachine();
+                for (var patternBus : channel.getController().getPatternBuses()) {
+                    if (patternBus.getAePatterns().contains(out)) {
+                        player.sendMessage(
+                                new TextComponentTranslation(
+                                        "novaeng.efabricator_parallel_proc.tooltip.0"
+                                )
+                        );
+                        player.inventory.placeItemBackInInventory(
+                                player.world,
+                                AEApi.instance().definitions().materials().blankPattern().maybeStack(patternSlotOUT.getStack().getCount()).orElse(ItemStack.EMPTY)
+                        );
+                        patternSlotOUT.putStack(ItemStack.EMPTY);
+                        return;
+                    }
+                }
+            }
+
+            for (final IGridNode channelNode : channelNodes) {
                     EFabricatorMEChannel channel = (EFabricatorMEChannel) channelNode.getMachine();
                     if (channel.insertPattern(patternStack)) {
-                        patternStack.shrink(1);
-                        if (patternStack.isEmpty()) {
-                            patternSlotOUT.putStack(ItemStack.EMPTY);
-                        } else {
-                            patternSlotOUT.putStack(patternStack);
-                        }
+                        patternSlotOUT.putStack(ItemStack.EMPTY);
                         break;
                     }
                 }
-            } catch (GridAccessException ignored) {
-            }
+
         });
         return null;
     }
-
-}
+}
diff --git a/src/main/java/github/kasuminova/novaeng/common/tile/ecotech/efabricator/EFabricatorController.kt b/src/main/java/github/kasuminova/novaeng/common/tile/ecotech/efabricator/EFabricatorController.kt
@@ -28,11 +28,6 @@ import hellfirepvp.modularmachinery.common.machine.MachineRegistry
 import hellfirepvp.modularmachinery.common.util.ItemUtils
 import it.unimi.dsi.fastutil.objects.Object2ObjectAVLTreeMap
 import it.unimi.dsi.fastutil.objects.ObjectArrayList
-import java.util.function.Consumer
-import java.util.function.IntFunction
-import java.util.stream.Collectors
-import java.util.stream.IntStream
-import java.util.stream.Stream
 import net.minecraft.block.Block
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NBTTagCompound
@@ -43,6 +38,11 @@ import net.minecraftforge.common.util.Constants
 import net.minecraftforge.fluids.FluidStack
 import net.minecraftforge.fluids.capability.IFluidHandler
 import net.minecraftforge.fml.common.FMLCommonHandler
+import java.util.function.Consumer
+import java.util.function.IntFunction
+import java.util.stream.Collectors
+import java.util.stream.IntStream
+import java.util.stream.Stream
 import kotlin.concurrent.Volatile
 import kotlin.math.max
 import kotlin.math.min
diff --git a/src/main/java/github/kasuminova/novaeng/common/tile/ecotech/efabricator/EFabricatorPatternBus.kt b/src/main/java/github/kasuminova/novaeng/common/tile/ecotech/efabricator/EFabricatorPatternBus.kt
@@ -3,23 +3,22 @@ package github.kasuminova.novaeng.common.tile.ecotech.efabricator
 import appeng.api.implementations.ICraftingPatternItem
 import appeng.api.networking.crafting.ICraftingPatternDetails
 import appeng.api.networking.events.MENetworkCraftingPatternChange
+import appeng.api.storage.data.IAEItemStack
+import appeng.items.misc.ItemEncodedPattern
 import appeng.me.GridAccessException
 import appeng.tile.inventory.AppEngInternalInventory
 import appeng.util.inv.IAEAppEngInventory
 import appeng.util.inv.InvOperation
 import com.glodblock.github.util.FluidCraftingPatternDetails
+import com.glodblock.github.util.FluidPatternDetails
 import github.kasuminova.mmce.common.util.PatternItemFilter
 import github.kasuminova.novaeng.NovaEngineeringCore
 import github.kasuminova.novaeng.common.container.ContainerEFabricatorPatternSearch
 import github.kasuminova.novaeng.common.container.data.EFabricatorPatternData
 import github.kasuminova.novaeng.common.network.PktEFabricatorPatternSearchGUIUpdate
 import hellfirepvp.modularmachinery.ModularMachinery
 import it.unimi.dsi.fastutil.objects.ObjectArrayList
-import java.util.Objects
-import java.util.function.Consumer
-import java.util.function.IntFunction
-import java.util.stream.Collectors
-import java.util.stream.IntStream
+import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.entity.player.EntityPlayerMP
 import net.minecraft.item.ItemStack
@@ -29,6 +28,11 @@ import net.minecraftforge.common.capabilities.Capability
 import net.minecraftforge.fml.common.FMLCommonHandler
 import net.minecraftforge.items.CapabilityItemHandler
 import net.minecraftforge.items.IItemHandler
+import java.util.Objects
+import java.util.function.Consumer
+import java.util.function.IntFunction
+import java.util.stream.Collectors
+import java.util.stream.IntStream
 import javax.annotation.Nonnull
 
 open class EFabricatorPatternBus : EFabricatorPart(), IAEAppEngInventory {
@@ -37,6 +41,7 @@ open class EFabricatorPatternBus : EFabricatorPart(), IAEAppEngInventory {
         val PATTERN_SLOTS = 12 * 6
     }
 
+    val aePatterns = ObjectOpenHashSet<IAEItemStack>()
     val patterns = AppEngInternalInventory(this, PATTERN_SLOTS, 1, PatternItemFilter.INSTANCE)
     protected val details = ObjectArrayList<ICraftingPatternDetails?>(PATTERN_SLOTS)
 
@@ -83,15 +88,43 @@ open class EFabricatorPatternBus : EFabricatorPart(), IAEAppEngInventory {
     }
 
     override fun onChangeInventory(
-        inv: IItemHandler?,
+        inv: IItemHandler,
         slot: Int,
-        mc: InvOperation?,
-        removedStack: ItemStack?,
-        newStack: ItemStack?
+        mc: InvOperation,
+        removedStack: ItemStack,
+        newStack: ItemStack
     ) {
         refreshPattern(slot)
         notifyPatternChanged()
         sendPatternSearchGUIUpdateToClient(slot)
+        when (mc) {
+            InvOperation.EXTRACT -> removePattern(removedStack)
+            InvOperation.INSERT -> addPattern(newStack)
+            InvOperation.SET -> {
+                removePattern(removedStack)
+                addPattern(newStack)
+            }
+        }
+    }
+
+    private fun addPattern(stack: ItemStack) {
+        val item = stack.item
+        if (item is ItemEncodedPattern) {
+            val pattern = item.getPatternForItem(stack, this.world)
+            if (pattern.isCraftable || pattern is FluidPatternDetails) {
+                aePatterns.add(pattern.condensedOutputs[0])
+            }
+        }
+    }
+
+    private fun removePattern(stack: ItemStack) {
+        val item = stack.item
+        if (item is ItemEncodedPattern) {
+            val pattern = item.getPatternForItem(stack, this.world)
+            if (pattern.isCraftable || pattern is FluidPatternDetails) {
+                aePatterns.remove(pattern.condensedOutputs[0])
+            }
+        }
     }
 
     private fun notifyPatternChanged() {
@@ -165,6 +198,9 @@ open class EFabricatorPatternBus : EFabricatorPart(), IAEAppEngInventory {
     override fun readCustomNBT(compound: NBTTagCompound) {
         super.readCustomNBT(compound)
         patterns.readFromNBT(compound.getCompoundTag("patterns"))
+        for (stack in patterns) {
+            addPattern(stack)
+        }
     }
 
     override fun writeCustomNBT(compound: NBTTagCompound?) {
diff --git a/src/main/resources/assets/novaeng_core/lang/en_US.lang b/src/main/resources/assets/novaeng_core/lang/en_US.lang
@@ -128,6 +128,7 @@ novaeng.extendable_calculate_subsystem.info.6=  分配完成后，如果系统
 novaeng.extendable_calculate_subsystem.info.7=  只要系统中已分配的 §bvCPU§7 数不超过§e最大线程数§7，则可以一直分配新的 §bvCPU§7，直到上限。
 novaeng.extendable_calculate_subsystem.info.8=  §bvCPU§7 会在合成任务完成后，并且§e物品全部返还§7时§a立刻销毁§7。
 
+novaeng.efabricator_parallel_proc.tooltip.0=网络已有类似的合成样板,已跳过上传并返还空白样板！
 novaeng.efabricator_parallel_proc.info.0=§5并行核心§7为合成子系统提供§5并行数§7。
 novaeng.efabricator_parallel_proc.info.1=§5并行数§7可提高§b工作核心§7每次处理合成任务的§a处理数量§7（最大不超过队列深度）。
 novaeng.efabricator_parallel_proc.modifiers=§5并行数§7修正:
diff --git a/src/main/resources/assets/novaeng_core/lang/zh_CN.lang b/src/main/resources/assets/novaeng_core/lang/zh_CN.lang
@@ -128,6 +128,7 @@ novaeng.extendable_calculate_subsystem.info.6=  分配完成后，如果系统
 novaeng.extendable_calculate_subsystem.info.7=  只要系统中已分配的 §bvCPU§7 数不超过§e最大线程数§7，则可以一直分配新的 §bvCPU§7，直到上限。
 novaeng.extendable_calculate_subsystem.info.8=  §bvCPU§7 会在合成任务完成后，并且§e物品全部返还§7时§a立刻销毁§7。
 
+novaeng.efabricator_parallel_proc.tooltip.0=网络已有类似的合成样板,已跳过上传并返还空白样板！
 novaeng.efabricator_parallel_proc.info.0=§5并行核心§7为合成子系统提供§5并行数§7。
 novaeng.efabricator_parallel_proc.info.1=§5并行数§7可提高§b工作核心§7每次处理合成任务的§a处理数量§7（最大不超过队列深度）。
 novaeng.efabricator_parallel_proc.modifiers=§5并行数§7修正:
