From fc23dedd051b9011e072171d29aae0b288c4e0e9 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 17 Jun 2016 00:03:04 -0500 Subject: [PATCH] Revert "Fix other mods crashing because of alternate implementations of metadata" This reverts commit 25cd5746626fddbcda4adff69aae17de2ec99c65. --- .../botania/api/lexicon/LexiconRecipeMappings.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java index 156d34298..81eb5e162 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java @@ -48,24 +48,22 @@ public final class LexiconRecipeMappings { } public static EntryData getDataForStack(ItemStack stack) { - String wildKey = stackToString(stack, true); + 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) { - 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() + (forceIgnore || ignoreMeta(stack) ? "" : "~" + stack.getItemDamage()); + return stack.getUnlocalizedName() + (ignoreMeta(stack) ? "" : "~" + stack.getItemDamage()); } public static boolean ignoreMeta(ItemStack stack) {