From e549aafcd11f373edc8a9415e7652dc4ef795302 Mon Sep 17 00:00:00 2001 From: Tom Elfring Date: Sat, 12 Aug 2017 16:13:26 +0200 Subject: [PATCH] Fix findMatchinRecipe in Mekanismutils. Fixes issue #4621 (Formulaic Assemblicator) and OreDictmanager Also sneaked in an update of the build.properties to make HWYLA work in 1.12.1 dev environment --- build.properties | 2 +- .../java/mekanism/common/util/MekanismUtils.java | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/build.properties b/build.properties index d0bd56f28..b5be0efe5 100644 --- a/build.properties +++ b/build.properties @@ -7,7 +7,7 @@ mod_version=9.4.0 tesla_version=1.0.59 invtweak_version=1.63+beta.107 opencomputers_version=1.7.0.24 -hwyla_version=1.8.18-B32_1.12 +hwyla_version=1.8.20-B35_1.12 redstoneflux_version=2.0.0.1 buildcraft_version=7.99.6 ctm_version=0.2.1.5 diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index db2c37429..e92e40ebf 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -67,6 +67,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing.Axis; @@ -1380,17 +1382,8 @@ public final class MekanismUtils return new ItemStack(dmgItems.get(0).getItem(), 1, solve); } -// List list = new ArrayList<>(CraftingManager.getInstance().getRecipeList()); -// -// for(IRecipe recipe : list) -// { -// if(recipe.matches(inv, world)) -// { -// return recipe.getCraftingResult(inv); -// } -// } - - return ItemStack.EMPTY; + IRecipe potentialResult = CraftingManager.findMatchingRecipe(inv, world); + return potentialResult != null ? potentialResult.getRecipeOutput() : ItemStack.EMPTY; } /**