From 2128cae72bf49b7b926d039d788f713507cb2a90 Mon Sep 17 00:00:00 2001 From: Darkere Date: Sat, 12 Jun 2021 17:05:46 +0200 Subject: [PATCH] also break loop if we do not yet have enough ingredients (#3001) * also break loop if we do not yet have enough ingredients * clean up if statements --- .../task/v6/node/ProcessingNode.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/node/ProcessingNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/node/ProcessingNode.java index c56f5fc3b..6c718d520 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/node/ProcessingNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/node/ProcessingNode.java @@ -132,9 +132,11 @@ public class ProcessingNode extends Node { if (canInsertFullAmount) { canInsertFullAmount = IoUtil.insertIntoInventory(container.getConnectedFluidInventory(), extractedFluids.getStacks(), Action.SIMULATE); } + } else { + break; } - if (hasAllRequirements && !canInsertFullAmount) { + if (!canInsertFullAmount) { if (allRejected) { this.state = ProcessingState.MACHINE_DOES_NOT_ACCEPT; } @@ -144,21 +146,19 @@ public class ProcessingNode extends Node { allRejected = false; } - if (hasAllRequirements && canInsertFullAmount) { - this.state = ProcessingState.READY; + this.state = ProcessingState.READY; - extractedItems = IoUtil.extractFromInternalItemStorage(requirements.getSingleItemRequirementSet(false), internalStorage, Action.PERFORM); - extractedFluids = IoUtil.extractFromInternalFluidStorage(requirements.getSingleFluidRequirementSet(false), internalFluidStorage, Action.PERFORM); + extractedItems = IoUtil.extractFromInternalItemStorage(requirements.getSingleItemRequirementSet(false), internalStorage, Action.PERFORM); + extractedFluids = IoUtil.extractFromInternalFluidStorage(requirements.getSingleFluidRequirementSet(false), internalFluidStorage, Action.PERFORM); - IoUtil.insertIntoInventory(container.getConnectedInventory(), extractedItems.getStacks(), Action.PERFORM); - IoUtil.insertIntoInventory(container.getConnectedFluidInventory(), extractedFluids.getStacks(), Action.PERFORM); + IoUtil.insertIntoInventory(container.getConnectedInventory(), extractedItems.getStacks(), Action.PERFORM); + IoUtil.insertIntoInventory(container.getConnectedFluidInventory(), extractedFluids.getStacks(), Action.PERFORM); - next(); + next(); - listener.onSingleDone(this); + listener.onSingleDone(this); - container.onUsedForProcessing(); - } + container.onUsedForProcessing(); } } }