From ffb3b05d2e052cae78bfdc784e72ad99c60a5d9f Mon Sep 17 00:00:00 2001 From: Andrei Laiff Date: Thu, 19 Oct 2023 01:11:11 +0300 Subject: [PATCH] Fix packet corruption with level emitters --- .../container/ContainerFluidCraftConfirm.java | 4 ++++ .../gui/container/ContainerLevelTerminal.java | 19 ++++++++-------- .../adapters/PartLevelEmitterAdapter.java | 22 ++++++++++++------- .../resources/assets/ae2fc/lang/en_US.lang | 2 +- 4 files changed, 29 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidCraftConfirm.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidCraftConfirm.java index e49cfaa1..878cd9f4 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidCraftConfirm.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidCraftConfirm.java @@ -9,6 +9,7 @@ import net.minecraftforge.common.util.ForgeDirection; import com.glodblock.github.common.item.ItemBaseWirelessTerminal; import com.glodblock.github.common.parts.PartFluidPatternTerminal; import com.glodblock.github.common.parts.PartFluidPatternTerminalEx; +import com.glodblock.github.common.parts.PartLevelTerminal; import com.glodblock.github.inventory.InventoryHandler; import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.inventory.item.IWirelessTerminal; @@ -35,6 +36,9 @@ public class ContainerFluidCraftConfirm extends ContainerCraftConfirm { if (ah instanceof PartFluidPatternTerminalEx) { originalGui = GuiType.FLUID_PATTERN_TERMINAL_EX; } + if (ah instanceof PartLevelTerminal) { + originalGui = GuiType.LEVEL_TERMINAL; + } if (ah instanceof IWirelessTerminal) { ItemStack terminal = ((IWirelessTerminal) ah).getItemStack(); if (terminal.getItem() instanceof ItemBaseWirelessTerminal) { diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerLevelTerminal.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerLevelTerminal.java index 652ae95c..7a69c615 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerLevelTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerLevelTerminal.java @@ -46,7 +46,7 @@ public class ContainerLevelTerminal extends FCBaseContainer { */ private int nextId = 0; - private final Map tracked = new HashMap<>(); + private final Map tracked = new HashMap<>(); private final Map trackedById = new HashMap<>(); private IGrid grid; @@ -246,21 +246,22 @@ public class ContainerLevelTerminal extends FCBaseContainer { private SPacketLevelTerminalUpdate updateList() { SPacketLevelTerminalUpdate update = null; var supported = LevelTerminalRegistry.instance().getSupportedClasses(); - Set visited = new HashSet<>(); + Set visited = new HashSet<>(); for (Class clz : supported) { boolean isAdopted = LevelTerminalRegistry.instance().isAdopted(clz); Class machineClass = isAdopted ? LevelTerminalRegistry.instance().getAdopted(clz) : clz; for (IGridNode gridNode : grid.getMachines(machineClass)) { + final IGridHost gridHost = gridNode.getMachine(); final ILevelViewable machine = isAdopted - ? LevelTerminalRegistry.instance().getAdapter(clz).adapt(gridNode.getMachine()) - : (ILevelViewable) gridNode.getMachine(); + ? LevelTerminalRegistry.instance().getAdapter(clz).adapt(gridHost) + : (ILevelViewable) gridHost; /* First check if we are already tracking this node */ - if (tracked.containsKey(machine)) { + if (tracked.containsKey(gridHost)) { /* Check for updates */ - ContainerLevelTerminal.InvTracker knownTracker = tracked.get(machine); + ContainerLevelTerminal.InvTracker knownTracker = tracked.get(gridHost); /* Name changed? */ String name = machine.getCustomName(); @@ -310,15 +311,15 @@ public class ContainerLevelTerminal extends FCBaseContainer { .setLocation(entry.x, entry.y, entry.z, entry.dim, entry.side.ordinal()) .setItems(entry.rows, entry.rowSize, entry.inventoryNbt) .setViewItemStack(machine.getSelfItemStack(), machine.getDisplayItemStack()); - tracked.put(machine, entry); + tracked.put(gridHost, entry); trackedById.put(entry.id, entry); } - visited.add(machine); + visited.add(gridHost); } } /* Now find any entries that we need to remove */ - Iterator> it = tracked.entrySet().iterator(); + Iterator> it = tracked.entrySet().iterator(); while (it.hasNext()) { var entry = it.next(); if (visited.contains(entry.getKey())) { diff --git a/src/main/java/com/glodblock/github/coremod/registries/adapters/PartLevelEmitterAdapter.java b/src/main/java/com/glodblock/github/coremod/registries/adapters/PartLevelEmitterAdapter.java index af477981..cf4cd255 100644 --- a/src/main/java/com/glodblock/github/coremod/registries/adapters/PartLevelEmitterAdapter.java +++ b/src/main/java/com/glodblock/github/coremod/registries/adapters/PartLevelEmitterAdapter.java @@ -12,12 +12,17 @@ import com.glodblock.github.api.registries.ILevelViewable; import com.glodblock.github.api.registries.ILevelViewableAdapter; import com.glodblock.github.common.tile.TileLevelMaintainer.State; import com.glodblock.github.common.tile.TileLevelMaintainer.TLMTags; +import com.glodblock.github.inventory.AeItemStackHandler; +import com.glodblock.github.inventory.AeStackInventoryImpl; import appeng.api.networking.IGridHost; import appeng.api.networking.IGridNode; +import appeng.api.storage.StorageChannel; +import appeng.api.storage.data.IAEItemStack; import appeng.api.util.AECableType; import appeng.api.util.DimensionalCoord; import appeng.parts.automation.PartLevelEmitter; +import appeng.util.item.AEItemStack; public class PartLevelEmitterAdapter implements ILevelViewable, ILevelViewableAdapter { @@ -30,20 +35,21 @@ public class PartLevelEmitterAdapter implements ILevelViewable, ILevelViewableAd public ILevelViewable adapt(IGridHost gridHost) { if (gridHost instanceof PartLevelEmitter levelEmitter) this.delegate = levelEmitter; return this; - }; + } @NotNull static public IInventory getPatchedInventory(IInventory inventory, long quantity, State state) { - ItemStack itemStack = inventory.getStackInSlot(SLOT_IN).copy(); + ItemStack itemStack = inventory.getStackInSlot(SLOT_IN); + if (itemStack == null) return inventory; NBTTagCompound data = !itemStack.hasTagCompound() ? new NBTTagCompound() : itemStack.getTagCompound(); - if (!data.hasKey(TLMTags.Quantity.tagName) || data.getLong(TLMTags.Quantity.tagName) != quantity) - data.setLong(TLMTags.Quantity.tagName, quantity); - if (!data.hasKey(TLMTags.State.tagName) || data.getInteger(TLMTags.State.tagName) != state.ordinal()) - data.setInteger(TLMTags.State.tagName, state.ordinal()); + data.setLong(TLMTags.Quantity.tagName, quantity); + data.setInteger(TLMTags.State.tagName, state.ordinal()); itemStack.setTagCompound(data); - inventory.setInventorySlotContents(SLOT_IN, itemStack); - return inventory; + AeStackInventoryImpl inv = new AeStackInventoryImpl<>(StorageChannel.ITEMS, 1); + inv.setStack(SLOT_IN, AEItemStack.create(itemStack)); + + return new AeItemStackHandler(inv); } @Override diff --git a/src/main/resources/assets/ae2fc/lang/en_US.lang b/src/main/resources/assets/ae2fc/lang/en_US.lang index 08a052e9..3e236e33 100644 --- a/src/main/resources/assets/ae2fc/lang/en_US.lang +++ b/src/main/resources/assets/ae2fc/lang/en_US.lang @@ -94,7 +94,7 @@ ae2fc.tooltip.level_maintainer.link_desc=The system is currently crafting the re ae2fc.tooltip.level_maintainer.export=§5Exporting§r ae2fc.tooltip.level_maintainer.export_desc=The Requester is trying to export the crafting results to the system. If the Requester has this status for a long time, there is no available space for the export. ae2fc.tooltip.level_maintainer.error=§4Errored§r -ae2fc.tooltip.level_maintainer.error_desc=The Requester is trying to schedule crafting job but it fails. Possible reasons no receipt found or insufficient resources to craft. +ae2fc.tooltip.level_maintainer.error_desc=The Requester is trying to schedule a crafting job but is failing. Possible reasons include a missing recipe or insufficient resources. ae2fc.tooltip.level_maintainer.batch_size=§6Crafting Batch Size§r ae2fc.tooltip.level_maintainer.batch_size.hint=When craft requests are emitted, the Requester will use the batch size for the request. Using larger batches will increase the speed of stocking up items but will require more crafting storage. ae2fc.tooltip.level_maintainer.request_size=§6Amount to Maintain§r