Skip to content

Fix Crafting Station Connected Inventory Desync #2789

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ghzdude merged 2 commits into from
May 17, 2025
Merged

Fix Crafting Station Connected Inventory Desync #2789

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
447751b
sync connected inventory on initial load
ghzdude May 14, 2025
160962e
spotless pls
ghzdude May 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 23 additions & 9 deletions src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityWorkbench.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ public void writeInitialSyncData(@NotNull PacketBuffer buf) {
NetworkUtils.writeItemStack(buf, craftingGrid.getStackInSlot(i));
}
this.recipeMemory.writeInitialSyncData(buf);
buf.writeVarInt(computeConnectedInventory().getSlots());
}

@Override
Expand All @@ -134,6 +135,8 @@ public void receiveInitialSyncData(@NotNull PacketBuffer buf) {
craftingGrid.setStackInSlot(i, NetworkUtils.readItemStack(buf));
}
this.recipeMemory.receiveInitialSyncData(buf);
this.connectedInventory = new ItemHandlerList(
Collections.singletonList(new GTItemStackHandler(this, buf.readVarInt())));
}

@Override
Expand All @@ -158,28 +161,39 @@ public void readFromNBT(NBTTagCompound data) {
}

public IItemHandlerModifiable getAvailableHandlers() {
var handlers = new ArrayList<IItemHandler>();
ArrayList<IItemHandler> handlers = new ArrayList<>();
handlers.add(this.internalInventory);
handlers.add(this.toolInventory);
if (getWorld().isRemote) {
// this might be called on client, so just return the existing inventory instead
handlers.add(this.connectedInventory);
} else {
handlers.add(computeConnectedInventory());
}
return this.combinedInventory = new ItemHandlerList(handlers);
}

// this should only be called server-side
private ItemHandlerList computeConnectedInventory() {
ArrayList<IItemHandler> handlers = new ArrayList<>();
for (var facing : EnumFacing.VALUES) {
var neighbor = getNeighbor(facing);
if (neighbor == null) continue;
var handler = neighbor.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, facing.getOpposite());
if (handler != null) handlers.add(handler);
}
this.connectedInventory = new ItemHandlerList(handlers);
handlers.clear();

handlers.add(this.internalInventory);
handlers.add(this.toolInventory);
handlers.add(this.connectedInventory);
return this.combinedInventory = new ItemHandlerList(handlers);
return this.connectedInventory = new ItemHandlerList(handlers);
}

@Override
public void onNeighborChanged() {
getCraftingRecipeLogic().updateInventory(getAvailableHandlers());
writeCustomData(GregtechDataCodes.UPDATE_CLIENT_HANDLER, this::sendHandlerToClient);
if (!getWorld().isRemote) {
writeCustomData(GregtechDataCodes.UPDATE_CLIENT_HANDLER, this::sendHandlerToClient);
}
}

// this is called on client and server
public @NotNull CraftingRecipeLogic getCraftingRecipeLogic() {
Preconditions.checkState(getWorld() != null, "getRecipeResolver called too early");
if (this.recipeLogic == null) {
Expand Down
Loading