From 4f7ad220df0438b6f3382110577b53f29da46453 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 24 May 2018 15:50:07 -0400 Subject: Update of all changes --- .../jewelrycraft/effects/EffectBlazePowder.java | 73 ++++++++++++++++++---- 1 file changed, 60 insertions(+), 13 deletions(-) mode change 100644 => 100755 src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java (limited to 'src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java') diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java b/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java old mode 100644 new mode 100755 index 678aa51..c735b2c --- a/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java +++ b/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java @@ -24,42 +24,89 @@ public class EffectBlazePowder extends ModifierEffects { public void action(ItemStack item, EntityPlayer player, Item jewelry) { if (jewelry instanceof ItemNecklace) { // Positive for necklace - if (player.isBurning() && rand.nextInt(JewelryNBT.numberOfModifiers(item)) == 0) player.extinguish(); + if (player.isBurning() && rand + .nextInt(JewelryNBT.numberOfModifiers(item)) == 0) + player.extinguish(); // Negative for necklace - if (player.isInWater()) player.attackEntityFrom(DamageSource.drown, 1f + (JewelryNBT.numberOfModifiers(item) - 1) * 0.1F); + if (player.isInWater()) + player.attackEntityFrom(DamageSource.drown, 1f + + (JewelryNBT.numberOfModifiers(item) - 1) * 0.1F); } // Negative for bracelet if (jewelry instanceof ItemBracelet && player.isInWater()) { - double slowAmount = 0.6D + (JewelryNBT.numberOfModifiers(item) - 1) * 0.05D; + double slowAmount = 0.6D + + (JewelryNBT.numberOfModifiers(item) - 1) * 0.05D; player.motionX *= slowAmount; player.motionY *= slowAmount; player.motionZ *= slowAmount; - player.motionY -= (0.02D + (JewelryNBT.numberOfModifiers(item) - 1) * 0.005D); - if (player.isCollidedHorizontally) player.motionY = 0.30000001192092896D; + player.motionY -= (0.02D + + (JewelryNBT.numberOfModifiers(item) - 1) * 0.005D); + if (player.isCollidedHorizontally) + player.motionY = 0.30000001192092896D; } // Negative for earrings if (jewelry instanceof ItemEarrings) { - if (player.getAir() >= 300) player.setAir(player.getAir() / 2); - else player.setAir(player.getAir() - JewelryNBT.numberOfModifiers(item)); + if (player.getAir() >= 300) + player.setAir(player.getAir() / 2); + else + player.setAir(player.getAir() + - JewelryNBT.numberOfModifiers(item)); } } @Override - public boolean onEntityAttackedCacellable(ItemStack item, EntityPlayer player, Entity target, Item jewelry, float amount) { + public boolean onEntityAttackedCancellable(ItemStack item, + EntityPlayer player, Entity target, Item jewelry, + float amount) { // Balanced for ring - if (jewelry instanceof ItemRing && !player.isInWater() && rand.nextInt(JewelryNBT.numberOfModifiers(item)) == 0) target.setFire(2); + if (jewelry instanceof ItemRing && !player.isInWater() + && rand.nextInt(JewelryNBT.numberOfModifiers(item)) == 0) + target.setFire(2); return false; } - public boolean onPlayerAttackedCacellable(ItemStack item, EntityPlayer player, DamageSource source, Item jewelry, float amount) { - if (jewelry instanceof ItemEarrings && rand.nextInt(4) == 0 && source == DamageSource.lava || source == DamageSource.inFire || source == DamageSource.onFire) { + @Override + public boolean onPlayerAttackedCancellable(ItemStack item, + EntityPlayer player, DamageSource source, Item jewelry, + float amount) { + if (jewelry instanceof ItemEarrings && rand.nextInt(4) == 0 + && source == DamageSource.lava + || source == DamageSource.inFire + || source == DamageSource.onFire) { // Positive for earrings int stackSize = JewelryNBT.modifierSize(item, modifier); - player.heal(stackSize * 0.05F - (JewelryNBT.numberOfModifiers(item) - 1) * 0.01F); + + player.heal(stackSize * 0.05F + - (JewelryNBT.numberOfModifiers(item) - 1) * 0.01F); + return true; } // Positive for bracelet - if (jewelry instanceof ItemBracelet) if (source == DamageSource.inFire || source == DamageSource.onFire || source == DamageSource.lava && player.worldObj.isMaterialInBB(AxisAlignedBB.getBoundingBox(player.boundingBox.minX, player.boundingBox.minY, player.boundingBox.minZ, player.boundingBox.maxX, player.boundingBox.maxY - 0.7, player.boundingBox.maxZ), Material.lava) && !player.worldObj.isMaterialInBB(AxisAlignedBB.getBoundingBox(player.boundingBox.minX, player.boundingBox.minY + 0.9, player.boundingBox.minZ, player.boundingBox.maxX, player.boundingBox.maxY, player.boundingBox.maxZ), Material.lava)) return true; + if (jewelry instanceof ItemBracelet) + if (source == DamageSource.inFire + || source == DamageSource.onFire + || source == DamageSource.lava + && player.worldObj.isMaterialInBB( + AxisAlignedBB.getBoundingBox( + player.boundingBox.minX, + player.boundingBox.minY, + player.boundingBox.minZ, + player.boundingBox.maxX, + player.boundingBox.maxY - 0.7, + player.boundingBox.maxZ), + Material.lava) + && !player.worldObj.isMaterialInBB( + AxisAlignedBB.getBoundingBox( + player.boundingBox.minX, + player.boundingBox.minY + 0.9, + player.boundingBox.minZ, + player.boundingBox.maxX, + player.boundingBox.maxY, + player.boundingBox.maxZ), + Material.lava)) { + return true; + } + return false; } } -- cgit v1.2.3