If this doesn't fix manasteel with IC2 I don't know what will.

This commit is contained in:
Vasco Lavos committed 2014-04-29 18:32:39 +01:00
1 parent bef11befe9
commit 1668bf7bdc
2 files changed
+10 -3

No files matched your search

@@ -11,6 +11,8 @@
*/
package vazkii.botania.api.recipe;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
@@ -30,8 +32,14 @@ public class RecipeManaInfusion {
if(input instanceof ItemStack)
return stack.isItemEqual((ItemStack) input);
String oredict = OreDictionary.getOreName(OreDictionary.getOreID(stack));
return oredict.equals(input);
if(input instanceof String) {
List<ItemStack> validStacks = OreDictionary.getOres((String) input);
for(ItemStack stack_ : validStacks)
if(stack.isItemEqual(stack_))
return true;
}
return false;
}
public Object getInput() {
@@ -40,7 +40,6 @@ public final class ModManaInfusionRecipes {
for(int i = 0; i < 16; i++)
manaPetalRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPetal, 1, i), LibOreDict.PETAL[i], 1000));
BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 0), Items.iron_ingot, 3000); // Add a non oredict recipe because IC2 breaks things
manasteelRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 0), "ingotIron", 3000);
manaPearlRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 1), new ItemStack(Items.ender_pearl), 6000);
manaDiamondRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 2), "gemDiamond", 10000);