Fix empty inventories not being ignored during crafting, Closes #5

Author: rubensworks

build.properties

@@ -1,6 +1,6 @@
 mod_version=0.1.7
 minecraft_version=1.11.2
-forge_version=13.20.0.2201
+forge_version=13.20.0.2282
 mcp_mappings_version=snapshot_20161206
 cyclopscore_version=0.9.1-476
 release_type=release

src/main/java/org/cyclops/structuredcrafting/Reference.java

@@ -19,7 +19,7 @@ public final class Reference {
     // MOD ID's
     public static final String MOD_FORGE = "forge";
     public static final String MOD_FORGE_VERSION = "@FORGE_VERSION@";
-    public static final String MOD_FORGE_VERSION_MIN = "13.20.0.2201";
+    public static final String MOD_FORGE_VERSION_MIN = "13.20.0.2282";
     public static final String MOD_CYCLOPSCORE = "cyclopscore";
     public static final String MOD_CYCLOPSCORE_MINVERSION = "@CYCLOPSCORE_VERSION@";
     public static final String MOD_CYCLOPSCORE_VERSION_MIN = "0.9.1";

src/main/java/org/cyclops/structuredcrafting/craft/provider/InventoryItemStackProvider.java

@@ -48,15 +48,18 @@ public boolean isValidForResults(World world, BlockPos pos, EnumFacing side) {
     public boolean hasItemStack(World world, BlockPos pos, EnumFacing side) {
         IInventory inventory = TileHelpers.getSafeTile(world, pos, IInventory.class);
         IItemHandler itemHandler = TileHelpers.getCapability(world, pos, side, CapabilityItemHandler.ITEM_HANDLER_CAPABILITY);
-        return (itemHandler != null && getFirstItem(itemHandler, side) != null)
-                || (inventory != null && getFirstItem(inventory, side) != null);
+        return itemHandler != null || inventory != null;
     }
 
     @Override
     public ItemStack getItemStack(World world, BlockPos pos, EnumFacing side) {
         IItemHandler itemHandler = TileHelpers.getCapability(world, pos, side, CapabilityItemHandler.ITEM_HANDLER_CAPABILITY);
         IInventory inventory = TileHelpers.getSafeTile(world, pos, IInventory.class);
-        return itemHandler != null ? getFirstItem(itemHandler, side).getRight() : getFirstItem(inventory, side).getRight();
+        Pair<Integer, ItemStack> result = itemHandler != null ? getFirstItem(itemHandler, side) : getFirstItem(inventory, side);
+        if (result != null) {
+            return result.getRight();
+        }
+        return ItemStack.EMPTY;
     }
 
     @Override