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/EffectFeather.java | 174 +++++++++++++-------- 1 file changed, 111 insertions(+), 63 deletions(-) mode change 100644 => 100755 src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java (limited to 'src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java') diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java b/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java old mode 100644 new mode 100755 index 2ffaa11..a7f2c8e --- a/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java +++ b/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java @@ -2,6 +2,7 @@ package darkknight.jewelrycraft.effects; import java.util.Iterator; import java.util.List; + import darkknight.jewelrycraft.api.ModifierEffects; import darkknight.jewelrycraft.damage.DamageSourceList; import darkknight.jewelrycraft.item.ItemBracelet; @@ -27,67 +28,114 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -public class EffectFeather extends ModifierEffects -{ - public EffectFeather() - { - super(new ItemStack(Items.feather)); - } - - @Override - public void action(ItemStack item, EntityPlayer player, Item jewelry) - { - // Positive earrings - if (jewelry instanceof ItemEarrings){ - AxisAlignedBB axisalignedbb = player.boundingBox.expand(1.0D, 1.0D, 1.0D); - List list = player.worldObj.getEntitiesWithinAABB(EntityArrow.class, axisalignedbb); - if (!player.worldObj.isRemote && list != null && !list.isEmpty()){ - Iterator iterator = list.iterator(); - while (iterator.hasNext()){ - EntityArrow arrow = (EntityArrow)iterator.next(); - if ((arrow.shootingEntity == null || !(arrow.shootingEntity.equals(player)) || arrow.canBePickedUp == 0) && rand.nextInt(2 + JewelryNBT.numberOfModifiers(item)) == 0) arrow.setDead(); - } - } - } - if (jewelry instanceof ItemBracelet){ - // Positive bracelet - if (player.motionY < 0) player.motionY *= (0.6D + (JewelryNBT.numberOfModifiers(item) - 1) * 0.03D); - if (rand.nextInt(JewelryNBT.numberOfModifiers(item)) == 0) player.fallDistance = 0F; - // Negative bracelet - if (!player.isPotionActive(Potion.moveSlowdown) || player.getActivePotionEffect(Potion.moveSlowdown).getDuration() < 30) player.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 80 + JewelryNBT.numberOfModifiers(item) * 10, 1 + JewelryNBT.numberOfModifiers(item) / 4)); - } - } - - @Override - public boolean onEntityAttackedCacellable(ItemStack item, EntityPlayer player, Entity target, Item jewelry, float amount) - { - NBTTagCompound enemyData = target.getEntityData(); - if (jewelry instanceof ItemRing && !player.worldObj.isRemote){ - if (enemyData.getInteger("reAttacked") == 0){ - // Negative ring - enemyData.setInteger("reAttacked", enemyData.getInteger("reAttacked") + 1); - target.attackEntityFrom(DamageSource.causePlayerDamage(player), amount / (2F + (JewelryNBT.numberOfModifiers(item) - 1) * 0.3F)); - // Positive ring - if (rand.nextInt(2) == 0 && target instanceof EntityLivingBase) ((EntityLivingBase)target).addPotionEffect(new PotionEffect(PotionList.stun.id, (51 - JewelryNBT.numberOfModifiers(item))*2, 0, false)); - return true; - } - else enemyData.setInteger("reAttacked", 0); - } - return false; - } - - @Override - public boolean onPlayerAttackedCacellable(ItemStack item, EntityPlayer player, DamageSource source, Item jewelry, float amount) - { - // Positive necklace - if (jewelry instanceof ItemNecklace && rand.nextInt(3 + JewelryNBT.numberOfModifiers(item)) == 0 && source != DamageSourceList.weak && source != DamageSource.inFire && source != DamageSource.onFire && source != DamageSource.lava){ - player.addChatComponentMessage(new ChatComponentText(EnumChatFormatting.GRAY + StatCollector.translateToLocal("chatmessage." + Variables.MODID + ".effect.feather"))); - return true; - } - // Negative necklace - if (jewelry instanceof ItemNecklace && (source == DamageSource.inFire || source == DamageSource.onFire || source == DamageSource.lava) && source != DamageSourceList.weak) player.attackEntityFrom(DamageSourceList.weak, amount * (3F + (JewelryNBT.numberOfModifiers(item) - 1) * 0.1F)); - // Negative earrings - if (jewelry instanceof ItemEarrings && source.damageType.equals("arrow")) player.attackEntityFrom(DamageSourceList.weak, amount * (2F + (JewelryNBT.numberOfModifiers(item) - 1) * 0.1F)); - return false; - } +public class EffectFeather extends ModifierEffects { + public EffectFeather() { + super(new ItemStack(Items.feather)); + } + + @Override + public void action(ItemStack item, EntityPlayer player, Item jewelry) { + // Positive earrings + if (jewelry instanceof ItemEarrings) { + AxisAlignedBB axisalignedbb = + player.boundingBox.expand(1.0D, 1.0D, 1.0D); + List list = player.worldObj.getEntitiesWithinAABB( + EntityArrow.class, axisalignedbb); + if (!player.worldObj.isRemote && list != null + && !list.isEmpty()) { + Iterator iterator = list.iterator(); + while (iterator.hasNext()) { + EntityArrow arrow = (EntityArrow) iterator.next(); + if ((arrow.shootingEntity == null + || !(arrow.shootingEntity.equals(player)) + || arrow.canBePickedUp == 0) + && rand.nextInt(2 + JewelryNBT + .numberOfModifiers(item)) == 0) + arrow.setDead(); + } + } + } + if (jewelry instanceof ItemBracelet) { + // Positive bracelet + if (player.motionY < 0) + player.motionY *= + (0.6D + (JewelryNBT.numberOfModifiers(item) - 1) + * 0.03D); + if (rand.nextInt(JewelryNBT.numberOfModifiers(item)) == 0) + player.fallDistance = 0F; + // Negative bracelet + if (!player.isPotionActive(Potion.moveSlowdown) + || player.getActivePotionEffect(Potion.moveSlowdown) + .getDuration() < 30) + player.addPotionEffect(new PotionEffect( + Potion.moveSlowdown.id, + 80 + JewelryNBT.numberOfModifiers(item) * 10, + 1 + JewelryNBT.numberOfModifiers(item) / 4)); + } + } + + @Override + public boolean onEntityAttackedCancellable(ItemStack item, + EntityPlayer player, Entity target, Item jewelry, + float amount) { + NBTTagCompound enemyData = target.getEntityData(); + if (jewelry instanceof ItemRing && !player.worldObj.isRemote) { + if (enemyData.getInteger("reAttacked") == 0) { + // Negative ring + enemyData.setInteger("reAttacked", + enemyData.getInteger("reAttacked") + 1); + target.attackEntityFrom( + DamageSource.causePlayerDamage(player), + amount / (2F + + (JewelryNBT.numberOfModifiers(item) - 1) + * 0.3F)); + // Positive ring + if (rand.nextInt(2) == 0 + && target instanceof EntityLivingBase) + ((EntityLivingBase) target).addPotionEffect( + new PotionEffect(PotionList.stun.id, + (51 - JewelryNBT + .numberOfModifiers(item)) * 2, + 0, false)); + return true; + } + enemyData.setInteger("reAttacked", 0); + } + return false; + } + + @Override + public boolean onPlayerAttackedCancellable(ItemStack item, + EntityPlayer player, DamageSource source, Item jewelry, + float amount) { + // Positive necklace + if (jewelry instanceof ItemNecklace + && rand.nextInt( + 3 + JewelryNBT.numberOfModifiers(item)) == 0 + && source != DamageSourceList.weak + && source != DamageSource.inFire + && source != DamageSource.onFire + && source != DamageSource.lava) { + player.addChatComponentMessage( + new ChatComponentText(EnumChatFormatting.GRAY + + StatCollector.translateToLocal( + "chatmessage." + Variables.MODID + + ".effect.feather"))); + return true; + } + // Negative necklace + if (jewelry instanceof ItemNecklace + && (source == DamageSource.inFire + || source == DamageSource.onFire + || source == DamageSource.lava) + && source != DamageSourceList.weak) + player.attackEntityFrom(DamageSourceList.weak, amount * (3F + + (JewelryNBT.numberOfModifiers(item) - 1) * 0.1F)); + // Negative earrings + if (jewelry instanceof ItemEarrings + && source.damageType.equals("arrow")) + player.attackEntityFrom(DamageSourceList.weak, amount * (2F + + (JewelryNBT.numberOfModifiers(item) - 1) * 0.1F)); + return false; + } } -- cgit v1.2.3