From 1a5ef68be46accd6a652e0829656d71057041a5c Mon Sep 17 00:00:00 2001 From: Darkere Date: Mon, 20 Sep 2021 17:02:41 +0200 Subject: [PATCH] fix autocrafting --- .../autocrafting/task/v6/node/ProcessingNode.java | 4 ++-- .../apiimpl/network/node/CrafterNetworkNode.java | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 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 a3ddedc3b..fc51f65a6 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 @@ -104,8 +104,8 @@ public class ProcessingNode extends Node { allLocked = false; } - if ((!singleItemSetToRequire.isEmpty() && container.hasConnectedInventory()) || - (!singleFluidSetToRequire.isEmpty() && container.hasConnectedFluidInventory())) { + if ((!singleItemSetToRequire.isEmpty() && !container.hasConnectedInventory()) || + (!singleFluidSetToRequire.isEmpty() && !container.hasConnectedFluidInventory())) { if (allMissingMachine) { this.state = ProcessingState.MACHINE_NONE; } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java index daa9662ed..99d926f42 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java @@ -478,14 +478,15 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC public boolean insertItemsIntoInventory(Collection> toInsert, Action action) { IItemHandler dest = getConnectedInventory(); - if (dest == null) { - return false; - } if (toInsert.isEmpty()) { return true; } + if (dest == null) { + return false; + } + Deque> stacks = new ArrayDeque<>(toInsert); StackListEntry currentEntry = stacks.poll(); @@ -534,6 +535,10 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC public boolean insertFluidsIntoInventory(Collection> toInsert, Action action) { IFluidHandler dest = getConnectedFluidInventory(); + if (toInsert.isEmpty()) { + return true; + } + if (dest == null) { return false; }