From f3a3e8033441ab3252520fd8c6cb3f265b6159ca Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 17 Jun 2016 00:17:51 -0500 Subject: [PATCH] Revert "Revert "Fix other mods crashing because of alternate implementations of metadata"" This reverts commit fc23dedd051b9011e072171d29aae0b288c4e0e9. --- .../botania/api/lexicon/LexiconRecipeMappings.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java index 81eb5e162..156d34298 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java @@ -48,22 +48,24 @@ public final class LexiconRecipeMappings { } public static EntryData getDataForStack(ItemStack stack) { - ItemStack wildCopy = stack.copy(); - wildCopy.setItemDamage(OreDictionary.WILDCARD_VALUE); - String wildKey = stackToString(wildCopy); + String wildKey = stackToString(stack, true); if (mappings.containsKey(wildKey)) return mappings.get(wildKey); return mappings.get(stackToString(stack)); } public static String stackToString(ItemStack stack) { + return stackToString(stack, false); + } + + public static String stackToString(ItemStack stack, boolean forceIgnore) { if(stack == null || stack.getItem() == null) return "NULL"; if(stack.hasTagCompound() && stack.getItem() instanceof IRecipeKeyProvider) return ((IRecipeKeyProvider) stack.getItem()).getKey(stack); - return stack.getUnlocalizedName() + (ignoreMeta(stack) ? "" : "~" + stack.getItemDamage()); + return stack.getUnlocalizedName() + (forceIgnore || ignoreMeta(stack) ? "" : "~" + stack.getItemDamage()); } public static boolean ignoreMeta(ItemStack stack) {