From 11482b826523e927baa83874f6e6cf2ad5a05372 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Thu, 31 May 2018 19:06:07 +0200 Subject: [PATCH] Fixed crafting steps inserting items when it has missing items. --- .../apiimpl/autocrafting/task/CraftingExtractor.java | 4 ++-- .../apiimpl/network/grid/handler/ItemGridHandler.java | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingExtractor.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingExtractor.java index 76fb06873..279c2463d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingExtractor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingExtractor.java @@ -45,11 +45,11 @@ public class CraftingExtractor { } public boolean isAllAvailable() { - return status.stream().allMatch(s -> s == CraftingExtractorItemStatus.AVAILABLE || s == CraftingExtractorItemStatus.EXTRACTED); + return !items.isEmpty() && status.stream().allMatch(s -> s == CraftingExtractorItemStatus.AVAILABLE || s == CraftingExtractorItemStatus.EXTRACTED); } public boolean isAllExtracted() { - return status.stream().allMatch(s -> s == CraftingExtractorItemStatus.EXTRACTED); + return !items.isEmpty() && status.stream().allMatch(s -> s == CraftingExtractorItemStatus.EXTRACTED); } public void extractOne() { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java index 84c98ae7e..2bcf0b951 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java @@ -170,7 +170,6 @@ public class ItemGridHandler implements IItemGridHandler { return; } - // TODO why? IStackList cache = API.instance().createItemStackList(); for (ICraftingPattern pattern : network.getCraftingManager().getPatterns()) {