From 83fd00cad561890ad22a263af156663cfb82a9cf Mon Sep 17 00:00:00 2001 From: marcin212 Date: Fri, 7 Jul 2017 13:41:45 +0200 Subject: [PATCH] Fixed brewery recipes --- .../extratrees/machines/brewery/BreweryCrafting.java | 8 ++++++++ .../binnie/extratrees/machines/brewery/BreweryRecipe.java | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryCrafting.java b/src/main/java/binnie/extratrees/machines/brewery/BreweryCrafting.java index 2665750a..2ca1b6d4 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BreweryCrafting.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BreweryCrafting.java @@ -35,6 +35,14 @@ public class BreweryCrafting implements INbtWritable { ItemStack yeast = new ItemStack(nbt.getCompoundTag("yeast")); return new BreweryCrafting(inputFluid, ingredient, inputGrains, yeast); } + + public boolean hasInputGrainsEmpty(){ + return inputGrains == null || (isEmptyStack(inputGrains[0]) && isEmptyStack(inputGrains[1]) && isEmptyStack(inputGrains[2])); + } + + private boolean isEmptyStack(ItemStack stack){ + return stack == null || stack.isEmpty(); + } @Override public NBTTagCompound writeToNBT(final NBTTagCompound nbt) { diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipe.java b/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipe.java index e6836be1..a4a495bd 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipe.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipe.java @@ -31,7 +31,7 @@ public class BreweryRecipe implements IBreweryRecipe { if (!this.yeast.isItemEqual(crafting.yeast)) { return null; } - if(crafting.inputGrains != null && crafting.inputGrains.length > 0){ + if(!crafting.hasInputGrainsEmpty()){ return null; } if(!crafting.ingredient.isEmpty()){