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

Big commitment~

Browse source
This commit is contained in:
WayofTime 2014-07-31 19:45:40 -04:00
parent a92efa364d
commit 4f9fad22c5
24 changed files with 1122 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

37
1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/BoundArmour.java
View file

@ -117,12 +117,19 @@ public class BoundArmour extends ItemArmor implements ISpecialArmor,IBindable ,I
return new ArmorProperties(-1, 0, 0);
}
if (helmet.getItem().equals(ModItems.boundHelmet) || plate.getItem().equals(ModItems.boundPlate) || leggings.getItem().equals(ModItems.boundLeggings) || boots.getItem().equals(ModItems.boundBoots))
if (helmet.getItem().equals(ModItems.boundHelmet) && plate.getItem().equals(ModItems.boundPlate) && leggings.getItem().equals(ModItems.boundLeggings) && boots.getItem().equals(ModItems.boundBoots))
{
if (source.isUnblockable())
{
return new ArmorProperties(-1, 3, 4);
}
if(player.isPotionActive(AlchemicalWizardry.customPotionSoulFray))
{
int i = player.getActivePotionEffect(AlchemicalWizardry.customPotionSoulFray).getAmplifier() + 1;
return new ArmorProperties(-1, 3, (int)(25*(1.0f - 0.15f*i)));
}
return new ArmorProperties(-1, 3, 100000);
}
@ -209,7 +216,7 @@ public class BoundArmour extends ItemArmor implements ISpecialArmor,IBindable ,I
//TODO Make the armour invisible when the player has Invisibility on.
if (entity instanceof EntityLivingBase)
{
if (((EntityLivingBase) entity).isPotionActive(Potion.invisibility.id))
if (this.getIsInvisible(stack))
{
if (this== ModItems.boundHelmet || this == ModItems.boundPlate || this == ModItems.boundBoots)
{
@ -265,6 +272,8 @@ public class BoundArmour extends ItemArmor implements ISpecialArmor,IBindable ,I
{
tickInternalInventory(itemStack, world, player, 0, false);
}
this.setIsInvisible(itemStack, player.isPotionActive(Potion.invisibility.id));
if (itemStack.getItemDamage() > 0)
{
@ -577,6 +586,30 @@ public class BoundArmour extends ItemArmor implements ISpecialArmor,IBindable ,I
{
return 0;
}
public boolean getIsInvisible(ItemStack armourStack)
{
NBTTagCompound tag = armourStack.getTagCompound();
if(tag != null)
{
return tag.getBoolean("invisible");
}
return false;
}
public void setIsInvisible(ItemStack armourStack, boolean invisible)
{
NBTTagCompound tag = armourStack.getTagCompound();
if(tag == null)
{
armourStack.setTagCompound(new NBTTagCompound());
tag = armourStack.getTagCompound();
}
tag.setBoolean("invisible", invisible);
}
@Override
@Optional.Method(modid = "Thaumcraft")