From 1c552532ad4dc376b684452eb9fc77d6a84111ec Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Fri, 1 Dec 2017 12:59:07 +0100 Subject: [PATCH] Byproducts is always nonnull and nonempty --- .../apiimpl/autocrafting/task/CraftingStepCraft.java | 4 +--- .../apiimpl/autocrafting/task/CraftingTask.java | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStepCraft.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStepCraft.java index d42631ec0..1ea613ec2 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStepCraft.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStepCraft.java @@ -100,9 +100,7 @@ public class CraftingStepCraft extends CraftingStep { } for (ItemStack byproduct : (pattern.isOredict() ? pattern.getByproducts(took) : pattern.getByproducts())) { - if (byproduct != null && !byproduct.isEmpty()) { - toInsertItems.add(byproduct.copy()); - } + toInsertItems.add(byproduct.copy()); } } else { // Couldn't extract items diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java index 69e35a120..4f7c43456 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java @@ -129,7 +129,7 @@ public class CraftingTask implements ICraftingTask { List previousSteps = new LinkedList<>(); IStackList byproductList = API.instance().createItemStackList(); - pattern.getByproducts().stream().filter(s -> !s.isEmpty()).forEach(byproductList::add); + pattern.getByproducts().forEach(byproductList::add); for (List inputs : pattern.getOreInputs()) { if (inputs == null || inputs.isEmpty()) { @@ -303,9 +303,7 @@ public class CraftingTask implements ICraftingTask { } for (ItemStack byproduct : (!pattern.isProcessing() && pattern.isOredict() && missing.isEmpty()) ? pattern.getByproducts(took) : pattern.getByproducts()) { - if (byproduct != null && !byproduct.isEmpty()) { - toInsert.add(byproduct); - } + toInsert.add(byproduct); } usedPatterns.remove(pattern);