diff options
Diffstat (limited to 'src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java')
| -rwxr-xr-x | src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java | 107 |
1 files changed, 28 insertions, 79 deletions
diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java b/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java index 3b79390..95f52b5 100755 --- a/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java +++ b/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java @@ -25,68 +25,39 @@ public class EffectObsidian extends ModifierEffects { }
@Override
- public void action(ItemStack item, EntityPlayer player,
- Item jewelry) {
- NBTTagCompound playerInfo = PlayerUtils
- .getModPlayerPersistTag(player,
- Variables.MODID);
+ public void action(ItemStack item, EntityPlayer player, Item jewelry) {
+ NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
if (jewelry instanceof ItemNecklace) {
// Positive necklace
- player.addPotionEffect(new PotionEffect(
- Potion.resistance.id, 60, 2,
- true));
+ player.addPotionEffect(new PotionEffect(Potion.resistance.id, 60, 2, true));
// Negative necklace
- if (player.isInWater()
- && !player.capabilities.isCreativeMode) {
- double slowAmount = 0.2D + (JewelryNBT
- .numberOfModifiers(item)
- - 1) * 0.05D;
+ if (player.isInWater() && !player.capabilities.isCreativeMode) {
+ double slowAmount = 0.2D + (JewelryNBT.numberOfModifiers(item) - 1) * 0.05D;
player.motionX *= slowAmount;
player.motionY *= slowAmount;
player.motionZ *= slowAmount;
player.motionY = -0.5D;
if (rand.nextInt(50) == 0)
- player.attackEntityFrom(
- DamageSourceList.weak,
- 2F);
+ player.attackEntityFrom(DamageSourceList.weak, 2F);
}
}
// Negative bracelet
- if (jewelry instanceof ItemBracelet
- && playerInfo.hasKey("falls")
- && playerInfo.getInteger("falls") >= 300)
- player.addPotionEffect(new PotionEffect(
- Potion.moveSlowdown.id, 60, 1,
- true));
+ if (jewelry instanceof ItemBracelet && playerInfo.hasKey("falls") && playerInfo.getInteger("falls") >= 300)
+ player.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 60, 1, true));
// Negative ring
- if (jewelry instanceof ItemRing
- && playerInfo.hasKey("strikes")
- && playerInfo.getInteger(
- "strikes") >= 200) {
- player.addPotionEffect(new PotionEffect(
- Potion.weakness.id, 60, 0, true));
- player.addPotionEffect(new PotionEffect(
- Potion.digSlowdown.id, 60, 1,
- true));
+ if (jewelry instanceof ItemRing && playerInfo.hasKey("strikes") && playerInfo.getInteger("strikes") >= 200) {
+ player.addPotionEffect(new PotionEffect(Potion.weakness.id, 60, 0, true));
+ player.addPotionEffect(new PotionEffect(Potion.digSlowdown.id, 60, 1, true));
}
}
@Override
- public boolean onPlayerAttackedCancellable(ItemStack item,
- EntityPlayer player, DamageSource source,
- Item jewelry, float amount) {
- NBTTagCompound playerInfo = PlayerUtils
- .getModPlayerPersistTag(player,
- Variables.MODID);
- if (jewelry instanceof ItemEarrings
- && (source == DamageSource.anvil
- || source.damageType
- .equals("arrow"))) {
+ public boolean onPlayerAttackedCancellable(ItemStack item, EntityPlayer player, DamageSource source, Item jewelry,
+ float amount) {
+ NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
+ if (jewelry instanceof ItemEarrings && (source == DamageSource.anvil || source.damageType.equals("arrow"))) {
if (playerInfo.hasKey("protected")) {
- playerInfo.setInteger("protected",
- playerInfo.getInteger(
- "protected")
- + 1);
+ playerInfo.setInteger("protected", playerInfo.getInteger("protected") + 1);
} else {
playerInfo.setInteger("protected", 1);
}
@@ -94,16 +65,11 @@ public class EffectObsidian extends ModifierEffects { if (playerInfo.getInteger("protected") < 2000) {
return true;
}
- player.attackEntityFrom(DamageSourceList.weak,
- player.getHealth() * 3F);
+ player.attackEntityFrom(DamageSourceList.weak, player.getHealth() * 3F);
}
- if (jewelry instanceof ItemBracelet
- && source == DamageSource.fall) {
+ if (jewelry instanceof ItemBracelet && source == DamageSource.fall) {
if (playerInfo.hasKey("falls")) {
- playerInfo.setInteger("falls",
- playerInfo.getInteger(
- "falls")
- + 1);
+ playerInfo.setInteger("falls", playerInfo.getInteger("falls") + 1);
} else {
playerInfo.setInteger("falls", 1);
}
@@ -115,45 +81,28 @@ public class EffectObsidian extends ModifierEffects { }
@Override
- public void onPlayerDead(ItemStack item, EntityPlayer player,
- DamageSource source, Item jewelry) {
- NBTTagCompound playerInfo = PlayerUtils
- .getModPlayerPersistTag(player,
- Variables.MODID);
+ public void onPlayerDead(ItemStack item, EntityPlayer player, DamageSource source, Item jewelry) {
+ NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
playerInfo.setInteger("falls", 0);
playerInfo.setInteger("strikes", 0);
playerInfo.setInteger("protected", 0);
}
@Override
- public boolean onEntityAttackedCancellable(ItemStack item,
- EntityPlayer player, Entity target, Item jewelry,
+ public boolean onEntityAttackedCancellable(ItemStack item, EntityPlayer player, Entity target, Item jewelry,
float amount) {
- NBTTagCompound playerInfo = PlayerUtils
- .getModPlayerPersistTag(player,
- Variables.MODID);
+ NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
NBTTagCompound enemyData = target.getEntityData();
// Positive ring
- if (jewelry instanceof ItemRing
- && playerInfo.getInteger("strikes") < 2000
- && !player.worldObj.isRemote) {
+ if (jewelry instanceof ItemRing && playerInfo.getInteger("strikes") < 2000 && !player.worldObj.isRemote) {
if (enemyData.getInteger("reAttacked") == 0) {
if (playerInfo.hasKey("strikes"))
- playerInfo.setInteger("strikes",
- playerInfo.getInteger(
- "strikes")
- + 1);
+ playerInfo.setInteger("strikes", playerInfo.getInteger("strikes") + 1);
else
- playerInfo.setInteger("strikes",
- 1);
+ playerInfo.setInteger("strikes", 1);
// Negative ring
- enemyData.setInteger("reAttacked",
- enemyData.getInteger(
- "reAttacked")
- + 1);
- target.attackEntityFrom(DamageSource
- .causePlayerDamage(player),
- amount * 1.5F);
+ enemyData.setInteger("reAttacked", enemyData.getInteger("reAttacked") + 1);
+ target.attackEntityFrom(DamageSource.causePlayerDamage(player), amount * 1.5F);
return true;
}
if (enemyData.getInteger("reAttacked") == 1)
|