From a48e184ddbfdb35da09b452eea17044e6e9e125a Mon Sep 17 00:00:00 2001 From: Andrew Hill Date: Thu, 21 Feb 2013 01:04:11 +1000 Subject: [PATCH] correction to the previous commit please --squash this or the previous ones. (and i'll try not to write up commits using the web interface, even for simple things in the future) --- .../buildcraft/core/{triggers => utils}/CraftingHelper.java | 2 +- common/buildcraft/factory/TileAutoWorkbench.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename common/buildcraft/core/{triggers => utils}/CraftingHelper.java (98%) diff --git a/common/buildcraft/core/triggers/CraftingHelper.java b/common/buildcraft/core/utils/CraftingHelper.java similarity index 98% rename from common/buildcraft/core/triggers/CraftingHelper.java rename to common/buildcraft/core/utils/CraftingHelper.java index c281cd3f..2a4bfe12 100644 --- a/common/buildcraft/core/triggers/CraftingHelper.java +++ b/common/buildcraft/core/utils/CraftingHelper.java @@ -1,4 +1,4 @@ -package buildcraft.transport.utils; +package buildcraft.core.utils; import java.util.ArrayList; import java.util.List; diff --git a/common/buildcraft/factory/TileAutoWorkbench.java b/common/buildcraft/factory/TileAutoWorkbench.java index 53cf39e8..db9cef05 100644 --- a/common/buildcraft/factory/TileAutoWorkbench.java +++ b/common/buildcraft/factory/TileAutoWorkbench.java @@ -187,12 +187,12 @@ public class TileAutoWorkbench extends TileEntity implements ISpecialInventory { } if(this.currentRecipe == null || !this.currentRecipe.matches(craftMatrix, worldObj)) - currentRecipe = CraftingHelper.findMatchingRecipe(craftMatrix, worldObj); + currentRecipe = buildcraft.core.utils.CraftingHelper.findMatchingRecipe(craftMatrix, worldObj); ItemStack resultStack = null; if(currentRecipe != null) { - resultStack = currentRecipe.getCraftingResult(internalInventoryCrafting); + resultStack = currentRecipe.getCraftingResult(craftMatrix); } if (resultStack == null || !doRemove) {