diff --git a/src/main/java/com/github/vfyjxf/nee/network/packet/PacketNEIPatternRecipe.java b/src/main/java/com/github/vfyjxf/nee/network/packet/PacketNEIPatternRecipe.java index 005b8b5..65616f8 100644 --- a/src/main/java/com/github/vfyjxf/nee/network/packet/PacketNEIPatternRecipe.java +++ b/src/main/java/com/github/vfyjxf/nee/network/packet/PacketNEIPatternRecipe.java @@ -135,7 +135,7 @@ public class PacketNEIPatternRecipe implements IMessage { list.put(i, aes); } - container.receiveSlotStacks(StorageName.CRAFTING_INPUT, list); + updateVirtualSlots(container, StorageName.CRAFTING_INPUT, list); } } @@ -193,8 +193,15 @@ public class PacketNEIPatternRecipe implements IMessage { } container.clear(); - container.receiveSlotStacks(StorageName.CRAFTING_INPUT, input); - container.receiveSlotStacks(StorageName.CRAFTING_OUTPUT, output); + updateVirtualSlots(container, StorageName.CRAFTING_INPUT, input); + updateVirtualSlots(container, StorageName.CRAFTING_OUTPUT, output); + } + } + + private void updateVirtualSlots(ContainerPatternTerm container, StorageName storageName, + Int2ObjectOpenHashMap> stacks) { + for (var entry : stacks.int2ObjectEntrySet()) { + container.updateVirtualSlot(storageName, entry.getIntKey(), entry.getValue()); } } diff --git a/src/main/java/com/github/vfyjxf/nee/network/packet/PacketSlotStackChange.java b/src/main/java/com/github/vfyjxf/nee/network/packet/PacketSlotStackChange.java index d867789..302c872 100644 --- a/src/main/java/com/github/vfyjxf/nee/network/packet/PacketSlotStackChange.java +++ b/src/main/java/com/github/vfyjxf/nee/network/packet/PacketSlotStackChange.java @@ -8,7 +8,6 @@ import com.github.vfyjxf.nee.NotEnoughEnergistics; import appeng.api.storage.StorageName; import appeng.api.storage.data.IAEItemStack; -import appeng.api.storage.data.IAEStack; import appeng.container.implementations.ContainerPatternTerm; import appeng.util.item.AEItemStack; import cpw.mods.fml.common.network.simpleimpl.IMessage; @@ -73,11 +72,9 @@ public class PacketSlotStackChange implements IMessage { @Override public IMessage onMessage(PacketSlotStackChange message, MessageContext ctx) { if (ctx.getServerHandler().playerEntity.openContainer instanceof ContainerPatternTerm cpt) { - final Int2ObjectMap> temp = new Int2ObjectOpenHashMap<>(); for (Int2ObjectMap.Entry entry : message.getSlotStacks().int2ObjectEntrySet()) { - temp.put(entry.getIntKey(), entry.getValue()); + cpt.updateVirtualSlot(StorageName.CRAFTING_INPUT, entry.getIntKey(), entry.getValue()); } - cpt.receiveSlotStacks(StorageName.CRAFTING_INPUT, temp); } return null; } diff --git a/src/main/java/com/github/vfyjxf/nee/network/packet/PacketStackCountChange.java b/src/main/java/com/github/vfyjxf/nee/network/packet/PacketStackCountChange.java index 4255689..7cb2d60 100644 --- a/src/main/java/com/github/vfyjxf/nee/network/packet/PacketStackCountChange.java +++ b/src/main/java/com/github/vfyjxf/nee/network/packet/PacketStackCountChange.java @@ -10,8 +10,6 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; /** * @author vfyjxf @@ -73,10 +71,8 @@ public class PacketStackCountChange implements IMessage { .getAEStackInSlot(message.getSlotIndex()); if (aes != null) { final IAEStack newAes = aes.copy(); - final Int2ObjectMap> temp = new Int2ObjectOpenHashMap<>(); newAes.setStackSize(Math.max(1, aes.getStackSize() + message.getChangeCount())); - temp.put(message.getSlotIndex(), newAes); - cpt.receiveSlotStacks(message.getStorageName(), temp); + cpt.updateVirtualSlot(message.getStorageName(), message.getSlotIndex(), newAes); } } }