upstream/Applied-Energistics-2-Unofficial
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Applied-Energistics-2-Unofficial.git synced 2026-11-14 01:14:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

use decrStackSize to pull from unknown IInventory (#1474)

Browse Source 
Co-authored-by: Martin Robertz <[email protected]>
This commit is contained in:
__felix__andMartin Robertz authored and GitHub committed 2026-08-08 01:47:35 +07:00
1 parent 952e08760f
commit 26ceda1b16
2 files changed
+11 -57
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/appeng/me/storage/MEIInventoryWrapper.java
+1 -14
View File
@@ -133,20 +133,7 @@ public class MEIInventoryWrapper implements IMEInventory<IAEItemStack> {
reqNum = Req.stackSize;
}
ItemStack retrieved = null;
if (sub.stackSize < Req.stackSize) {
retrieved = Platform.cloneItemStack(sub);
sub.stackSize = 0;
} else {
retrieved = sub.splitStack(Req.stackSize);
}
if (sub.stackSize <= 0) {
this.target.setInventorySlotContents(x, null);
} else {
this.target.setInventorySlotContents(x, sub);
}
ItemStack retrieved = this.target.decrStackSize(x, reqNum);
if (retrieved != null) {
Gathered.stackSize += retrieved.stackSize;
src/main/java/appeng/util/inv/AdaptorIInventory.java
+10 -43
View File
@@ -56,25 +56,13 @@ public class AdaptorIInventory extends InventoryAdaptor {
}
if (boundAmounts > 0) {
if (rv == null) {
rv = is.copy();
filter = rv;
rv.stackSize = boundAmounts;
amount -= boundAmounts;
} else {
rv.stackSize += boundAmounts;
amount -= boundAmounts;
}
if (is.stackSize == boundAmounts) {
this.i.setInventorySlotContents(x, null);
this.i.markDirty();
} else {
final ItemStack po = is.copy();
po.stackSize -= boundAmounts;
this.i.setInventorySlotContents(x, po);
this.i.markDirty();
filter = this.i.decrStackSize(x, boundAmounts);
if (filter != null) {
amount -= filter.stackSize;
if (rv == null) rv = filter;
else rv.stackSize += filter.stackSize;
}
this.i.markDirty();
}
}
}
@@ -126,34 +114,13 @@ public class AdaptorIInventory extends InventoryAdaptor {
final ItemStack is = this.i.getStackInSlot(x);
if (is != null && this.canRemoveStackFromSlot(x, is)
&& (filter == null || Platform.isSameItemFuzzy(is, filter, fuzzyMode))) {
int newAmount = amount;
if (newAmount > is.stackSize) {
newAmount = is.stackSize;
}
if (destination != null && !destination.canInsert(is)) {
newAmount = 0;
}
ItemStack rv = null;
if (newAmount > 0) {
rv = is.copy();
rv.stackSize = newAmount;
if (destination != null && !destination.canInsert(is)) continue;
if (is.stackSize == rv.stackSize) {
this.i.setInventorySlotContents(x, null);
this.i.markDirty();
} else {
final ItemStack po = is.copy();
po.stackSize -= rv.stackSize;
this.i.setInventorySlotContents(x, po);
this.i.markDirty();
}
}
ItemStack rv = this.i.decrStackSize(x, amount);
this.i.markDirty();
if (rv != null && rv.stackSize > 0) return rv;
if (rv != null) {
// i.markDirty();
return rv;
}
}
}
return null;