dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed OpenComputers voiding items with extract item API when there is no inventory space. Fixes #2081

Browse Source
This commit is contained in:
raoulvdberge
2018-11-17 12:12:58 +01:00
parent 90a0ddfdd7
commit 73d8cb3310
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java
View File

@@ -309,18 +309,18 @@ public class EnvironmentNetwork extends AbstractManagedEnvironment {
}
// Simulate extracting the item and get the amount of items that can be extracted
ItemStack extractedSim = node.getNetwork().extractItem(stack, count, Action.SIMULATE);
if (extractedSim == null) {
ItemStack extracted = node.getNetwork().extractItem(stack, count, Action.SIMULATE);
if (extracted == null) {
return new Object[]{null, "could not extract the specified item"};
}
int transferableAmount = extractedSim.getCount();
int transferableAmount = extracted.getCount();
// Simulate inserting the item and see how many we were able to insert
IItemHandler handler = targetEntity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, facing.getOpposite());
ItemStack insertedSim = ItemHandlerHelper.insertItemStacked(handler, extractedSim, true);
if (!insertedSim.isEmpty() && insertedSim.getCount() > 0) {
transferableAmount -= insertedSim.getCount();
ItemStack remainder = ItemHandlerHelper.insertItemStacked(handler, extracted, true);
if (!remainder.isEmpty()) {
transferableAmount -= remainder.getCount();
}
// Abort early if we can not insert items
@@ -329,9 +329,13 @@ public class EnvironmentNetwork extends AbstractManagedEnvironment {
}
// Actually do it and return how many items we've inserted
ItemStack extracted = node.getNetwork().extractItem(stack, count, Action.PERFORM);
extracted = node.getNetwork().extractItem(stack, transferableAmount, Action.PERFORM);
if (extracted != null) {
ItemHandlerHelper.insertItemStacked(handler, extracted, false);
remainder = ItemHandlerHelper.insertItemStacked(handler, extracted, false);
if (!remainder.isEmpty()) {
node.getNetwork().insertItem(remainder, remainder.getCount(), Action.PERFORM);
}
}
return new Object[]{transferableAmount};