From 47fd7799ff930544eaec4373c143511b8b0af09b Mon Sep 17 00:00:00 2001 From: Aidan Brady Date: Mon, 2 Dec 2013 22:42:54 -0500 Subject: [PATCH] Fix up recipe system to accept wildcard blocks --- common/mekanism/common/MekanismRecipe.java | 6 +++--- common/mekanism/generators/common/MekanismGenerators.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/mekanism/common/MekanismRecipe.java b/common/mekanism/common/MekanismRecipe.java index 309e7b529..02180db26 100644 --- a/common/mekanism/common/MekanismRecipe.java +++ b/common/mekanism/common/MekanismRecipe.java @@ -104,7 +104,7 @@ public class MekanismRecipe implements IRecipe } else if(in instanceof Block) { - itemMap.put(chr, new ItemStack((Block)in)); + itemMap.put(chr, new ItemStack((Block)in, 1, OreDictionary.WILDCARD_VALUE)); } else if(in instanceof String) { @@ -289,7 +289,7 @@ public class MekanismRecipe implements IRecipe if(!(target.getItem() instanceof IEnergizedItem) && !(input.getItem() instanceof IEnergizedItem)) { - if(target.getItemDamage() != input.getItemDamage()) + if(target.getItemDamage() != input.getItemDamage() && target.getItemDamage() != OreDictionary.WILDCARD_VALUE) { return false; } @@ -297,7 +297,7 @@ public class MekanismRecipe implements IRecipe else { if(((IEnergizedItem)target.getItem()).isMetadataSpecific() && ((IEnergizedItem)input.getItem()).isMetadataSpecific()) { - if(target.getItemDamage() != input.getItemDamage()) + if(target.getItemDamage() != input.getItemDamage() && target.getItemDamage() != OreDictionary.WILDCARD_VALUE) { return false; } diff --git a/common/mekanism/generators/common/MekanismGenerators.java b/common/mekanism/generators/common/MekanismGenerators.java index 7e88ed62f..1dea02316 100644 --- a/common/mekanism/generators/common/MekanismGenerators.java +++ b/common/mekanism/generators/common/MekanismGenerators.java @@ -114,7 +114,7 @@ public class MekanismGenerators implements IModule public void addRecipes() { CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Generator, 1, 0), new Object[] { - "III", "COC", "IFI", Character.valueOf('I'), "ingotIron", Character.valueOf('C'), "ingotCopper", Character.valueOf('O'), "ingotOsmium", Character.valueOf('F'), Block.furnaceIdle + "III", "WOW", "CFC", Character.valueOf('I'), "ingotIron", Character.valueOf('C'), "ingotCopper", Character.valueOf('O'), "ingotOsmium", Character.valueOf('F'), Block.furnaceIdle, Character.valueOf('W'), Block.planks })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Generator, 1, 1), new Object[] { "SSS", "AIA", "PEP", Character.valueOf('S'), SolarPanel, Character.valueOf('A'), Mekanism.EnrichedAlloy, Character.valueOf('I'), Item.ingotIron, Character.valueOf('P'), "dustOsmium", Character.valueOf('E'), Mekanism.EnergyTablet.getUnchargedItem()