diff options
| author | bculkin2442 <bjculkin@mix.wvu.edu> | 2019-08-22 20:01:40 -0400 |
|---|---|---|
| committer | bculkin2442 <bjculkin@mix.wvu.edu> | 2019-08-22 20:01:40 -0400 |
| commit | 20bef6e26d948698398bd16aeab8c9e6b89110e4 (patch) | |
| tree | 8a21e17f78b330435f4ce2d4355d72b773230aa7 /src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java | |
| parent | 26fb28edd1ebb6390f8803fed3876d222cb8fdba (diff) | |
Format/import cleanup
Diffstat (limited to 'src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java')
| -rwxr-xr-x | src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java | 80 |
1 files changed, 22 insertions, 58 deletions
diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java b/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java index ebfa48c..f65d135 100755 --- a/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java +++ b/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java @@ -21,32 +21,22 @@ public class EffectBlazePowder extends ModifierEffects { }
@Override
- public void action(ItemStack item, EntityPlayer player,
- Item jewelry) {
+ 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)
+ 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);
+ 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;
+ if (jewelry instanceof ItemBracelet && player.isInWater()) {
+ 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);
+ player.motionY -= (0.02D + (JewelryNBT.numberOfModifiers(item) - 1) * 0.005D);
if (player.isCollidedHorizontally)
player.motionY = 0.30000001192092896D;
}
@@ -55,67 +45,41 @@ public class EffectBlazePowder extends ModifierEffects { if (player.getAir() >= 300)
player.setAir(player.getAir() / 2);
else
- player.setAir(player.getAir() - JewelryNBT
- .numberOfModifiers(item));
+ player.setAir(player.getAir() - JewelryNBT.numberOfModifiers(item));
}
}
@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) {
// Balanced for ring
- if (jewelry instanceof ItemRing && !player.isInWater()
- && rand.nextInt(JewelryNBT
- .numberOfModifiers(
- item)) == 0)
+ if (jewelry instanceof ItemRing && !player.isInWater() && rand.nextInt(JewelryNBT.numberOfModifiers(item)) == 0)
target.setFire(2);
return false;
}
@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) {
+ 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);
+ 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
+ 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)) {
+ && 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;
}
|