Latest 1.6.4 push

This commit is contained in:
WayofTime 2014-03-08 12:52:17 -05:00
parent 5a4bb6e8e8
commit 172cd45548
41 changed files with 27 additions and 4109 deletions

View file

@ -509,7 +509,7 @@ public class BoundArmour extends ItemArmor implements ISpecialArmor, IRevealer,
continue;
}
if (item.getItem() instanceof IRevealer)
if (AlchemicalWizardry.isThaumcraftLoaded && item.getItem() instanceof IRevealer)
{
return true;
}
@ -534,7 +534,7 @@ public class BoundArmour extends ItemArmor implements ISpecialArmor, IRevealer,
continue;
}
if (item.getItem() instanceof IGoggles)
if (AlchemicalWizardry.isThaumcraftLoaded && item.getItem() instanceof IGoggles)
{
return true;
}
@ -593,13 +593,11 @@ public class BoundArmour extends ItemArmor implements ISpecialArmor, IRevealer,
return 0;
}
@Override
public boolean showNodes(ItemStack itemstack, EntityLivingBase player)
{
return this.hasIRevealer(itemstack);
}
@Override
public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player)
{
return this.hasIGoggles(itemstack);