diff --git a/src/main/java/forestry/factory/recipes/FabricatorRecipeManager.java b/src/main/java/forestry/factory/recipes/FabricatorRecipeManager.java index 7e914ed4b..ee3ce218b 100644 --- a/src/main/java/forestry/factory/recipes/FabricatorRecipeManager.java +++ b/src/main/java/forestry/factory/recipes/FabricatorRecipeManager.java @@ -30,6 +30,7 @@ import net.minecraftforge.fluids.FluidStack; public class FabricatorRecipeManager implements IFabricatorManager { + public static final Pair EMPTY_RECIPE = Pair.of(null, null); private static final Set recipes = new HashSet<>(); @Override @@ -55,7 +56,7 @@ public class FabricatorRecipeManager implements IFabricatorManager { } } - return Pair.of(null, null); + return EMPTY_RECIPE; } public static boolean isPlan(ItemStack plan) { diff --git a/src/main/java/forestry/factory/tiles/TileFabricator.java b/src/main/java/forestry/factory/tiles/TileFabricator.java index cb28123a8..a12a8402c 100644 --- a/src/main/java/forestry/factory/tiles/TileFabricator.java +++ b/src/main/java/forestry/factory/tiles/TileFabricator.java @@ -178,9 +178,8 @@ public class TileFabricator extends TilePowered implements ISlotPickupWatcher, I return recipePair; } - public ItemStack getResult() { - IFabricatorRecipe myRecipe = getRecipe().getLeft(); - + public ItemStack getResult(Pair myRecipePair) { + IFabricatorRecipe myRecipe = myRecipePair.getLeft(); if (myRecipe == null) { return ItemStack.EMPTY; } @@ -198,7 +197,7 @@ public class TileFabricator extends TilePowered implements ISlotPickupWatcher, I private void craftResult() { Pair myRecipePair = getRecipe(); - ItemStack craftResult = getResult(); + ItemStack craftResult = getResult(myRecipePair); IFabricatorRecipe myRecipe = myRecipePair.getLeft(); if (myRecipe != null && !craftResult.isEmpty() && getStackInSlot(InventoryFabricator.SLOT_RESULT).isEmpty()) { FluidStack liquid = myRecipe.getLiquid();