lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/WayofTime/BloodMagic

Browse source
This commit is contained in:
WayofTime 2015-02-01 10:41:57 -05:00
commit b57c490856
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/WayofTime/alchemicalWizardry/api/items/ShapelessBloodOrbRecipe.java
View file

@ -39,12 +39,17 @@ public class ShapelessBloodOrbRecipe implements IRecipe
output = result.copy(); output = result.copy();
for (Object in : recipe) for (Object in : recipe)
{ {
if (in instanceof ItemStack) if (in instanceof IBloodOrb)
{
input.add(((ItemStack) in).copy());
} else if (in instanceof IBloodOrb)
{ //If the item is an instanceof IBloodOrb then save the level of the orb { //If the item is an instanceof IBloodOrb then save the level of the orb
input.add((Integer) (((IBloodOrb) in).getOrbLevel())); input.add((Integer) (((IBloodOrb) in).getOrbLevel()));
}
else if (in instanceof ItemStack)
{
if (((ItemStack)in).getItem() instanceof IBloodOrb)
{
input.add((Integer) (((IBloodOrb) ((ItemStack)in).getItem()).getOrbLevel()));
}
else input.add(((ItemStack) in).copy());
} else if (in instanceof Item) } else if (in instanceof Item)
{ {
input.add(new ItemStack((Item) in)); input.add(new ItemStack((Item) in));
@ -137,6 +142,7 @@ public class ShapelessBloodOrbRecipe implements IRecipe
return false; return false;
} }
} else return false; } else return false;
match = true;
} else if (next instanceof ItemStack) } else if (next instanceof ItemStack)
{ {
match = OreDictionary.itemMatches((ItemStack) next, slot, false); match = OreDictionary.itemMatches((ItemStack) next, slot, false);