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/entities/EntityHeart.java | 100 ++++++--------------- 1 file changed, 29 insertions(+), 71 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java') diff --git a/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java b/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java index 2590e55..044a841 100755 --- a/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java +++ b/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java @@ -35,8 +35,7 @@ public class EntityHeart extends EntityLiving { @Override protected void applyEntityAttributes() { super.applyEntityAttributes(); - this.getEntityAttribute(SharedMonsterAttributes.maxHealth) - .setBaseValue(getQuantity()); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(getQuantity()); } @Override @@ -49,20 +48,16 @@ public class EntityHeart extends EntityLiving { @Override public void onLivingUpdate() { super.onLivingUpdate(); - if (ConfigHandler.HEARTS_DESPAWN - && this.entityAge > ConfigHandler.HEART_DESPAWN_TIME) + if (ConfigHandler.HEARTS_DESPAWN && this.entityAge > ConfigHandler.HEART_DESPAWN_TIME) this.setDead(); } @Override protected void collideWithEntity(Entity entity) { super.collideWithEntity(entity); - if (!this.worldObj.isRemote - && entity instanceof EntityHeart - && getType().equals(((EntityHeart) entity) - .getType())) { - setQuantity(getQuantity() + ((EntityHeart) entity) - .getQuantity()); + if (!this.worldObj.isRemote && entity instanceof EntityHeart + && getType().equals(((EntityHeart) entity).getType())) { + setQuantity(getQuantity() + ((EntityHeart) entity).getQuantity()); entity.setDead(); } } @@ -70,69 +65,38 @@ public class EntityHeart extends EntityLiving { @Override public void onCollideWithPlayer(EntityPlayer player) { if (!this.worldObj.isRemote) { - NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(player, - Variables.MODID); + NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID); if (playerInfo != null) { - if (getType().equals("Red") && player - .getHealth() < player - .getMaxHealth()) { - float healAmount = player - .getMaxHealth() - - player.getHealth(); + if (getType().equals("Red") && player.getHealth() < player.getMaxHealth()) { + float healAmount = player.getMaxHealth() - player.getHealth(); if (getQuantity() > healAmount) { player.heal(healAmount); - this.setQuantity( - getQuantity() - healAmount); + this.setQuantity(getQuantity() - healAmount); } else { player.heal(getQuantity()); this.setDead(); } - } else if (getType().equals("White") - && playerInfo.getFloat( - "WhiteHeart") > 0.1F) { - playerInfo.setFloat(getType() - + "Heart", 0F); + } else if (getType().equals("White") && playerInfo.getFloat("WhiteHeart") > 0.1F) { + playerInfo.setFloat(getType() + "Heart", 0F); if (player.getMaxHealth() < 40F) { - player.getEntityAttribute( - SharedMonsterAttributes.maxHealth) - .setBaseValue(player - .getMaxHealth() - + 2f); - player.setHealth(player - .getHealth() - + 2f); + player.getEntityAttribute(SharedMonsterAttributes.maxHealth) + .setBaseValue(player.getMaxHealth() + 2f); + player.setHealth(player.getHealth() + 2f); } - JewelrycraftMod.netWrapper.sendTo( - new PacketSendClientPlayerInfo( - playerInfo), + JewelrycraftMod.netWrapper.sendTo(new PacketSendClientPlayerInfo(playerInfo), (EntityPlayerMP) player); this.setDead(); - } else if (!getType().equals("Red") - && ((getType().equals( - "Black") - && playerInfo.getFloat( - "BlackHeart") <= ConfigHandler.MAX_BLACK_HEARTS_PICKUP) - || (getType().equals( - "Blue") - && playerInfo.getFloat( - "BlueHeart") <= ConfigHandler.MAX_BLUE_HEARTS_PICKUP) - || getType().equals( - "White"))) { - if (playerInfo.hasKey(getType() - + "Heart")) - playerInfo.setFloat( - getType() + "Heart", - playerInfo.getFloat( - getType() + "Heart") - + getQuantity()); + } else if (!getType().equals("Red") && ((getType().equals("Black") + && playerInfo.getFloat("BlackHeart") <= ConfigHandler.MAX_BLACK_HEARTS_PICKUP) + || (getType().equals("Blue") + && playerInfo.getFloat("BlueHeart") <= ConfigHandler.MAX_BLUE_HEARTS_PICKUP) + || getType().equals("White"))) { + if (playerInfo.hasKey(getType() + "Heart")) + playerInfo.setFloat(getType() + "Heart", + playerInfo.getFloat(getType() + "Heart") + getQuantity()); else - playerInfo.setFloat( - getType() + "Heart", - getQuantity()); - JewelrycraftMod.netWrapper.sendTo( - new PacketSendClientPlayerInfo( - playerInfo), + playerInfo.setFloat(getType() + "Heart", getQuantity()); + JewelrycraftMod.netWrapper.sendTo(new PacketSendClientPlayerInfo(playerInfo), (EntityPlayerMP) player); this.setDead(); } @@ -143,14 +107,9 @@ public class EntityHeart extends EntityLiving { @Override public void onDeath(DamageSource source) { super.onDeath(source); - if (source.getEntity() != null && source - .getEntity() instanceof EntityPlayer) - ((EntityPlayer) source.getEntity()).addChatMessage( - new ChatComponentText(StatCollector - .translateToLocal( - "chatmessage." + Variables.MODID - + ".heartKilled." - + this.getType()))); + if (source.getEntity() != null && source.getEntity() instanceof EntityPlayer) + ((EntityPlayer) source.getEntity()).addChatMessage(new ChatComponentText(StatCollector + .translateToLocal("chatmessage." + Variables.MODID + ".heartKilled." + this.getType()))); } @Override @@ -174,8 +133,7 @@ public class EntityHeart extends EntityLiving { } /** - * (abstract) Protected helper method to read subclass entity data - * from NBT. + * (abstract) Protected helper method to read subclass entity data from NBT. */ @Override public void readEntityFromNBT(NBTTagCompound nbt) { -- cgit v1.2.3