Fix #1639 Thermionic Fabricator & Glass Pane

This commit is contained in:
Nedelosk committed 2017-03-26 14:21:31 +02:00
1 parent 4a31215ce1
commit 2c9a30db73
2 files changed
+5 -5

No files matched your search

@@ -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<IFabricatorRecipe> 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) {
@@ -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<IFabricatorRecipe, String[][]> 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<IFabricatorRecipe, String[][]> 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();