diff --git a/MODSRC/vazkii/botania/api/recipe/RecipeManaInfusion.java b/MODSRC/vazkii/botania/api/recipe/RecipeManaInfusion.java index 0021561b0..8bf0b4463 100644 --- a/MODSRC/vazkii/botania/api/recipe/RecipeManaInfusion.java +++ b/MODSRC/vazkii/botania/api/recipe/RecipeManaInfusion.java @@ -35,9 +35,15 @@ public class RecipeManaInfusion { if(input instanceof String) { List validStacks = OreDictionary.getOres((String) input); - for(ItemStack stack_ : validStacks) - if(stack.isItemEqual(stack_)) + + for(ItemStack ostack : validStacks) { + ItemStack cstack = ostack.copy(); + if(cstack.getItemDamage() == Short.MAX_VALUE) + cstack.setItemDamage(stack.getItemDamage()); + + if(stack.isItemEqual(cstack)) return true; + } } return false; diff --git a/MODSRC/vazkii/botania/api/recipe/RecipePetals.java b/MODSRC/vazkii/botania/api/recipe/RecipePetals.java index fda3587ff..0049bbd8c 100644 --- a/MODSRC/vazkii/botania/api/recipe/RecipePetals.java +++ b/MODSRC/vazkii/botania/api/recipe/RecipePetals.java @@ -50,9 +50,24 @@ public class RecipePetals { for(int j = 0; j < inputsMissing.size(); j++) { Object input = inputsMissing.get(j); - if(input instanceof String && input.equals(oredict)) { - oredictIndex = j; - break; + if(input instanceof String) { + List validStacks = OreDictionary.getOres((String) input); + boolean found = false; + for(ItemStack ostack : validStacks) { + ItemStack cstack = ostack.copy(); + if(cstack.getItemDamage() == Short.MAX_VALUE) + cstack.setItemDamage(stack.getItemDamage()); + + if(stack.isItemEqual(cstack)) { + oredictIndex = j; + found = true; + break; + } + } + + + if(found) + break; } else if(input instanceof ItemStack && simpleAreStacksEqual((ItemStack) input, stack)) { stackIndex = j; break;