From 9a4d1e95ea7784f0f98ea2913701a3a3c28aefaa Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 24 May 2018 16:03:42 -0400 Subject: Formatting pass --- .../jewelrycraft/effects/EffectObsidian.java | 82 ++++++++++++++-------- 1 file changed, 53 insertions(+), 29 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java') diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java b/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java index be1d233..3b79390 100755 --- a/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java +++ b/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java @@ -25,53 +25,68 @@ public class EffectObsidian extends ModifierEffects { } @Override - public void action(ItemStack item, EntityPlayer player, Item jewelry) { + public void action(ItemStack item, EntityPlayer player, + Item jewelry) { NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(player, Variables.MODID); + .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; + 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") + if (jewelry instanceof ItemBracelet + && playerInfo.hasKey("falls") && playerInfo.getInteger("falls") >= 300) - player.addPotionEffect( - new PotionEffect(Potion.moveSlowdown.id, 60, 1, true)); + 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) { + EntityPlayer player, DamageSource source, + Item jewelry, float amount) { NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(player, Variables.MODID); + .getModPlayerPersistTag(player, + Variables.MODID); if (jewelry instanceof ItemEarrings && (source == DamageSource.anvil - || source.damageType.equals("arrow"))) { + || source.damageType + .equals("arrow"))) { if (playerInfo.hasKey("protected")) { playerInfo.setInteger("protected", - playerInfo.getInteger("protected") + 1); + playerInfo.getInteger( + "protected") + + 1); } else { playerInfo.setInteger("protected", 1); } @@ -86,7 +101,9 @@ public class EffectObsidian extends ModifierEffects { && source == DamageSource.fall) { if (playerInfo.hasKey("falls")) { playerInfo.setInteger("falls", - playerInfo.getInteger("falls") + 1); + playerInfo.getInteger( + "falls") + + 1); } else { playerInfo.setInteger("falls", 1); } @@ -101,7 +118,8 @@ public class EffectObsidian extends ModifierEffects { public void onPlayerDead(ItemStack item, EntityPlayer player, DamageSource source, Item jewelry) { NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(player, Variables.MODID); + .getModPlayerPersistTag(player, + Variables.MODID); playerInfo.setInteger("falls", 0); playerInfo.setInteger("strikes", 0); playerInfo.setInteger("protected", 0); @@ -112,7 +130,8 @@ public class EffectObsidian extends ModifierEffects { EntityPlayer player, Entity target, Item jewelry, float amount) { NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(player, Variables.MODID); + .getModPlayerPersistTag(player, + Variables.MODID); NBTTagCompound enemyData = target.getEntityData(); // Positive ring if (jewelry instanceof ItemRing @@ -121,14 +140,19 @@ public class EffectObsidian extends ModifierEffects { if (enemyData.getInteger("reAttacked") == 0) { if (playerInfo.hasKey("strikes")) playerInfo.setInteger("strikes", - playerInfo.getInteger("strikes") + 1); + 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), + enemyData.getInteger( + "reAttacked") + + 1); + target.attackEntityFrom(DamageSource + .causePlayerDamage(player), amount * 1.5F); return true; } -- cgit v1.2.3