From 7a1e35e05f8c0199cdef76fcd5db455375cb2335 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sun, 5 Mar 2017 14:55:35 +0100 Subject: [PATCH] Fix #1569 Can't See Capsule/Can Recipes --- src/main/java/forestry/core/fluids/FluidHelper.java | 5 ++++- src/main/java/forestry/factory/recipes/BottlerRecipe.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/forestry/core/fluids/FluidHelper.java b/src/main/java/forestry/core/fluids/FluidHelper.java index 5d3d5dd76..271f70887 100644 --- a/src/main/java/forestry/core/fluids/FluidHelper.java +++ b/src/main/java/forestry/core/fluids/FluidHelper.java @@ -64,7 +64,6 @@ public final class FluidHelper { } public static FillStatus fillContainers(IFluidHandler fluidHandler, IInventory inv, int inputSlot, int outputSlot, Fluid fluidToFill, ItemStack emptyStack, boolean doFill) { - ItemStack input = inv.getStackInSlot(inputSlot); if (input.isEmpty()) { return FillStatus.INVALID_INPUT; @@ -74,6 +73,10 @@ public final class FluidHelper { ItemStack filled = input.copy(); filled.setCount(1); + if(emptyStack.isEmpty()){ + emptyStack = filled; + } + IFluidHandlerItem fluidFilledHandler = FluidUtil.getFluidHandler(filled); IFluidHandlerItem fluidEmptyHandler = FluidUtil.getFluidHandler(emptyStack); if (fluidFilledHandler == null || fluidEmptyHandler == null) { diff --git a/src/main/java/forestry/factory/recipes/BottlerRecipe.java b/src/main/java/forestry/factory/recipes/BottlerRecipe.java index 62bdd6d6c..7cf6f1293 100644 --- a/src/main/java/forestry/factory/recipes/BottlerRecipe.java +++ b/src/main/java/forestry/factory/recipes/BottlerRecipe.java @@ -67,7 +67,7 @@ public class BottlerRecipe { } public boolean matchEmpty(ItemStack emptyCan, FluidStack resource) { - return emptyCan.isEmpty() && emptyCan.isItemEqual(inputStack) && resource.isFluidEqual(fluid) && fillRecipe; + return !emptyCan.isEmpty() && emptyCan.isItemEqual(inputStack) && resource.isFluidEqual(fluid) && fillRecipe; } public boolean matchFilled(ItemStack filledCan) {