From 1bff63807581a3b3c76c9ae92ac7d01739cf8cbe Mon Sep 17 00:00:00 2001 From: yrsegal Date: Wed, 1 Jun 2016 18:39:36 -0400 Subject: [PATCH] Make the lexicon recipe mappings accept the wildcard value --- .../botania/api/lexicon/LexiconRecipeMappings.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java index b955cbab6..81eb5e162 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java @@ -11,6 +11,7 @@ package vazkii.botania.api.lexicon; import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.mana.IManaItem; import java.util.HashMap; @@ -47,13 +48,18 @@ public final class LexiconRecipeMappings { } public static EntryData getDataForStack(ItemStack stack) { + ItemStack wildCopy = stack.copy(); + wildCopy.setItemDamage(OreDictionary.WILDCARD_VALUE); + String wildKey = stackToString(wildCopy); + if (mappings.containsKey(wildKey)) + return mappings.get(wildKey); return mappings.get(stackToString(stack)); } public static String stackToString(ItemStack stack) { if(stack == null || stack.getItem() == null) return "NULL"; - + if(stack.hasTagCompound() && stack.getItem() instanceof IRecipeKeyProvider) return ((IRecipeKeyProvider) stack.getItem()).getKey(stack); @@ -61,7 +67,7 @@ public final class LexiconRecipeMappings { } public static boolean ignoreMeta(ItemStack stack) { - return stack.isItemStackDamageable() || stack.getItem() instanceof IManaItem; + return stack.isItemStackDamageable() || stack.getItem() instanceof IManaItem || stack.getItemDamage() == OreDictionary.WILDCARD_VALUE; } public static class EntryData {