Skip to content

Use slot-by-slot insertion to resolve Fluid Tank transfer issue with Item Pipes #706

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

Open
epiccoleman wants to merge 1 commit into
base: 1.21
Choose a base branch
from
Open

Use slot-by-slot insertion to resolve Fluid Tank transfer issue with Item Pipes #706

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 30 additions & 0 deletions fabric/src/main/java/rearth/oritech/fabric/FabricItemApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,36 @@ public boolean supportsInsertion() {
@Override
public int insert(ItemStack inserted, boolean simulate) {
if (inserted.isEmpty()) return 0;

// Use slot-by-slot insertion to respect item max stack size,
// which Fabric's bulk insert may not check for component-based MAX_STACK_SIZE
if (storage instanceof SlottedStorage<ItemVariant> slottedStorage) {
var variant = ItemVariant.of(inserted);
var maxStackSize = inserted.getMaxStackSize();
var remaining = inserted.getCount();

try (var transaction = Transaction.openOuter()) {
for (int i = 0; i < slottedStorage.getSlotCount() && remaining > 0; i++) {
var slot = slottedStorage.getSlot(i);
var currentAmount = (int) slot.getAmount();

// Skip slots that are full according to the item's max stack size
if (!slot.isResourceBlank() && currentAmount >= maxStackSize) continue;

var canInsert = Math.min(remaining, maxStackSize - (slot.isResourceBlank() ? 0 : currentAmount));
if (canInsert <= 0) continue;

var insertedCount = (int) slot.insert(variant, canInsert, transaction);
remaining -= insertedCount;
}

if (!simulate)
transaction.commit();
return inserted.getCount() - remaining;
}
}

// Fallback for non-slotted storage
try (var transaction = Transaction.openOuter()) {
var insertCount = storage.insert(ItemVariant.of(inserted), inserted.getCount(), transaction);
if (!simulate)
Expand Down