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

also break loop if we do not yet have enough ingredients (#3001)

Browse Source 
* also break loop if we do not yet have enough ingredients

* clean up if statements
This commit is contained in:
Darkere
2021-06-12 17:05:46 +02:00
committed by GitHub
parent f596531798
commit 2128cae72b
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/node/ProcessingNode.java
View File

@@ -132,9 +132,11 @@ public class ProcessingNode extends Node {
if (canInsertFullAmount) { if (canInsertFullAmount) {
canInsertFullAmount = IoUtil.insertIntoInventory(container.getConnectedFluidInventory(), extractedFluids.getStacks(), Action.SIMULATE); canInsertFullAmount = IoUtil.insertIntoInventory(container.getConnectedFluidInventory(), extractedFluids.getStacks(), Action.SIMULATE);
} }
} else {
break;
} }
if (hasAllRequirements && !canInsertFullAmount) { if (!canInsertFullAmount) {
if (allRejected) { if (allRejected) {
this.state = ProcessingState.MACHINE_DOES_NOT_ACCEPT; this.state = ProcessingState.MACHINE_DOES_NOT_ACCEPT;
} }
@@ -144,21 +146,19 @@ public class ProcessingNode extends Node {
allRejected = false; allRejected = false;
} }
if (hasAllRequirements && canInsertFullAmount) { this.state = ProcessingState.READY;
this.state = ProcessingState.READY;
extractedItems = IoUtil.extractFromInternalItemStorage(requirements.getSingleItemRequirementSet(false), internalStorage, Action.PERFORM); extractedItems = IoUtil.extractFromInternalItemStorage(requirements.getSingleItemRequirementSet(false), internalStorage, Action.PERFORM);
extractedFluids = IoUtil.extractFromInternalFluidStorage(requirements.getSingleFluidRequirementSet(false), internalFluidStorage, Action.PERFORM); extractedFluids = IoUtil.extractFromInternalFluidStorage(requirements.getSingleFluidRequirementSet(false), internalFluidStorage, Action.PERFORM);
IoUtil.insertIntoInventory(container.getConnectedInventory(), extractedItems.getStacks(), Action.PERFORM); IoUtil.insertIntoInventory(container.getConnectedInventory(), extractedItems.getStacks(), Action.PERFORM);
IoUtil.insertIntoInventory(container.getConnectedFluidInventory(), extractedFluids.getStacks(), Action.PERFORM); IoUtil.insertIntoInventory(container.getConnectedFluidInventory(), extractedFluids.getStacks(), Action.PERFORM);
next(); next();
listener.onSingleDone(this); listener.onSingleDone(this);
container.onUsedForProcessing(); container.onUsedForProcessing();
}
} }
} }
} }