From 20bef6e26d948698398bd16aeab8c9e6b89110e4 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 22 Aug 2019 20:01:40 -0400 Subject: Format/import cleanup --- .../jewelrycraft/curses/CurseInfamy.java | 58 ++++++---------------- 1 file changed, 16 insertions(+), 42 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java') diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java b/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java index 720ea6f..a24c92c 100755 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java @@ -32,64 +32,40 @@ public class CurseInfamy extends Curse { } @Override - public void attackedByPlayerAction(LivingAttackEvent event, - World world, EntityPlayer player, Entity target) { - if (rand.nextInt(5) == 0 && !world.isRemote - && !(target instanceof EntityMob) - && target instanceof EntityLiving - && !(target instanceof EntityHeart) - && !(target instanceof EntityHalfHeart) + public void attackedByPlayerAction(LivingAttackEvent event, World world, EntityPlayer player, Entity target) { + if (rand.nextInt(5) == 0 && !world.isRemote && !(target instanceof EntityMob) && target instanceof EntityLiving + && !(target instanceof EntityHeart) && !(target instanceof EntityHalfHeart) && target.canAttackWithItem()) { - NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(player, - Variables.MODID); + NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID); - playerInfo.setFloat("BlackHeart", - playerInfo.getFloat("BlackHeart") - + 1.0F); + playerInfo.setFloat("BlackHeart", playerInfo.getFloat("BlackHeart") + 1.0F); if (player.getMaxHealth() >= 3F) { - player.getEntityAttribute( - SharedMonsterAttributes.maxHealth) - .setBaseValue(player - .getMaxHealth() - - 1.0F); - - player.setHealth( - player.getHealth() - 1.0F); + player.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(player.getMaxHealth() - 1.0F); + + player.setHealth(player.getHealth() - 1.0F); } JewelrycraftUtil.addCursePoints(player, 10); - JewelrycraftMod.netWrapper.sendToAll( - new PacketSendServerPlayersInfo()); + JewelrycraftMod.netWrapper.sendToAll(new PacketSendServerPlayersInfo()); - JewelrycraftMod.netWrapper.sendTo( - new PacketSendClientPlayerInfo( - playerInfo), - (EntityPlayerMP) player); + JewelrycraftMod.netWrapper.sendTo(new PacketSendClientPlayerInfo(playerInfo), (EntityPlayerMP) player); } } @Override - public void playerRender(EntityPlayer player, - RenderPlayerEvent.Specials.Post event) { + public void playerRender(EntityPlayer player, RenderPlayerEvent.Specials.Post event) { MaskRender mask = new MaskRender(); float yaw = player.prevRotationYawHead - + (player.rotationYawHead - - player.prevRotationYawHead) - * event.partialRenderTick; + + (player.rotationYawHead - player.prevRotationYawHead) * event.partialRenderTick; float yawOffset = player.prevRenderYawOffset - + (player.renderYawOffset - - player.prevRenderYawOffset) - * event.partialRenderTick; + + (player.renderYawOffset - player.prevRenderYawOffset) * event.partialRenderTick; float pitch = player.prevRotationPitch - + (player.rotationPitch - - player.prevRotationPitch) - * event.partialRenderTick; + + (player.rotationPitch - player.prevRotationPitch) * event.partialRenderTick; GL11.glPushMatrix(); GL11.glColor4f(1, 1, 1, 1); GL11.glRotatef(yawOffset, 0, -1, 0); @@ -105,14 +81,12 @@ public class CurseInfamy extends Curse { @Override public String getDescription() { - return StatCollector.translateToLocal("curse." - + Variables.MODID + ".infamy.description"); + return StatCollector.translateToLocal("curse." + Variables.MODID + ".infamy.description"); } @Override public String getDisplayName() { - return StatCollector.translateToLocal( - "curse." + Variables.MODID + ".infamy"); + return StatCollector.translateToLocal("curse." + Variables.MODID + ".infamy"); } @Override -- cgit v1.2.3