Skip to content

Commit 897d535

Browse files
committed
Simplified sided inventory pushing, closes InnovativeOnlineIndustries/Industrial-Foregoing#1165
1 parent 2a582a2 commit 897d535

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

src/main/java/com/hrznstudio/titanium/component/inventory/SidedInventoryComponent.java

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -213,23 +213,12 @@ private boolean transfer(FacingUtil.Sideness sideness, IItemHandler from, IItemH
213213
int slot = slotCache.getOrDefault(sideness, getNextSlot(from, 0));
214214
if (slot >= from.getSlots()) slot = 0;
215215
ItemStack extracted = from.extractItem(slot, workAmount, true);
216-
int outSlot = isValidForAnySlot(to, extracted);
217-
if (!extracted.isEmpty() && outSlot != -1) {
218-
ItemStack returned = to.insertItem(outSlot, extracted, false);
216+
if (!extracted.isEmpty()) {
217+
ItemStack returned = ItemHandlerHelper.insertItem(to, extracted, false);
219218
return !from.extractItem(slot, extracted.getCount() - returned.getCount(), false).isEmpty();
220219
}
221220
slotCache.put(sideness, getNextSlot(from, slot + 1));
222221
return false;
223222
}
224223

225-
private int isValidForAnySlot(IItemHandler dest, ItemStack stack) {
226-
for (int i = 0; i < dest.getSlots(); i++) {
227-
if (!dest.isItemValid(i, stack)) continue;
228-
if (dest.getStackInSlot(i).isEmpty()) return i;
229-
if (ItemHandlerHelper.canItemStacksStack(dest.getStackInSlot(i), stack) && dest.getStackInSlot(i).getCount() < dest.getSlotLimit(i) && dest.getStackInSlot(i).getCount() < dest.getStackInSlot(i).getMaxStackSize()) {
230-
return i;
231-
}
232-
}
233-
return -1;
234-
}
235224
}

0 commit comments

Comments
 (0)