Added a curse tab, added a config to enable/disable extra jewelry info,

plus more!

1 files changed, 108 insertions, 117 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java b/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java
index 6612c52..26f6d2e 100644
--- a/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java
+++ b/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java
@@ -22,121 +22,112 @@ import darkknight.jewelrycraft.util.Variables;
 /**

  * @author Sorin

  */

-public class EntityHeart extends EntityLiving

-{

-    public EntityHeart(World world)

-    {

-        super(world);

-        this.setSize(0.4F, 0.4F);

-    }

-    

-    protected void applyEntityAttributes()

-    {

-        super.applyEntityAttributes();

-        this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(getQuantity());

-    }

-    

-    @Override

-    public void updateEntityActionState()

-    {

-        if(ConfigHandler.HEARTS_DESPAWN) ++this.entityAge;

-    }

-    

-    public void onLivingUpdate()

-    {

-        super.onLivingUpdate();

-        if (ConfigHandler.HEARTS_DESPAWN && this.entityAge > ConfigHandler.HEART_DESPAWN_TIME) this.setDead();

-    }

-    

-    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());

-            getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(getQuantity() + ((EntityHeart)entity).getQuantity());

-            this.heal(getQuantity());

-            entity.setDead();

-        }

-    }

-    

-    @Override

-    public void onCollideWithPlayer(EntityPlayer player)

-    {

-        if (!this.worldObj.isRemote){

-            NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);

-            if (getType() == "Red" && player.getHealth() < player.getMaxHealth()){

-                float healAmount = player.getMaxHealth() - player.getHealth();

-                if (getQuantity() > healAmount){

-                    player.heal(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);

-                player.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(player.getMaxHealth() + playerInfo.getFloat("WhiteHeart"));

-                this.setDead();

-            }else if (getType() != "Red"){

-                playerInfo.setFloat(getType() + "Heart", playerInfo.getFloat(getType() + "Heart") + getQuantity());

-                JewelrycraftMod.netWrapper.sendToServer(new PacketRequestPlayerInfo());

-                this.setDead();

-            }

-        }

-    }

-    

-    @SideOnly (Side.CLIENT)

-    public boolean canRenderOnFire()

-    {

-        return false;

-    }

-    

-    protected void entityInit()

-    {

-        super.entityInit();

-        this.dataWatcher.addObject(16, "Red");

-        this.dataWatcher.addObject(17, 2f);

-    }

-    

-    public void writeEntityToNBT(NBTTagCompound nbt)

-    {

-        super.writeEntityToNBT(nbt);

-        nbt.setString("Type", getType());

-        nbt.setFloat("Quantity", getQuantity());

-    }

-    

-    /**

-     * (abstract) Protected helper method to read subclass entity data from NBT.

-     */

-    public void readEntityFromNBT(NBTTagCompound nbt)

-    {

-        super.readEntityFromNBT(nbt);

-        setType(nbt.getString("Type"));

-        setQuantity(nbt.getFloat("Quantity"));

-    }

-    

-    public String getType()

-    {

-        return this.dataWatcher.getWatchableObjectString(16);

-    }

-    

-    public void setType(String type)

-    {

-        this.dataWatcher.updateObject(16, type);

-    }

-    

-    public Float getQuantity()

-    {

-        return this.dataWatcher.getWatchableObjectFloat(17);

-    }

-    

-    public void setQuantity(Float qty)

-    {

-        this.dataWatcher.updateObject(17, qty);

-    }

-    

-    public EnumCreatureAttribute getCreatureAttribute()

-    {

-        return JewelrycraftUtil.HEART;

-    }

+public class EntityHeart extends EntityLiving {

+	public EntityHeart(World world) {

+		super(world);

+		this.setSize(0.4F, 0.4F);

+	}

+

+	protected void applyEntityAttributes() {

+		super.applyEntityAttributes();

+		this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(getQuantity());

+	}

+

+	@Override

+	public void updateEntityActionState() {

+		if (ConfigHandler.HEARTS_DESPAWN) ++this.entityAge;

+		this.setCanPickUpLoot(true);

+	}

+

+	public void onLivingUpdate() {

+		super.onLivingUpdate();

+		if (ConfigHandler.HEARTS_DESPAWN && this.entityAge > ConfigHandler.HEART_DESPAWN_TIME) this.setDead();

+	}

+

+	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());

+			getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(getQuantity() + ((EntityHeart) entity).getQuantity());

+			this.heal(getQuantity());

+			entity.setDead();

+		}

+	}

+

+	@Override

+	public void onCollideWithPlayer(EntityPlayer player) {

+		if (!this.worldObj.isRemote) {

+			NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);

+			if (playerInfo != null) {

+				if (getType() == "Red" && player.getHealth() < player.getMaxHealth()) {

+					float healAmount = player.getMaxHealth() - player.getHealth();

+					if (getQuantity() > healAmount) {

+						player.heal(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);

+					player.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(player.getMaxHealth() + playerInfo.getFloat("WhiteHeart"));

+					this.setDead();

+				} else if (getType().equals("Black") || getType().equals("Blue")) {

+					playerInfo.setFloat(getType() + "Heart", playerInfo.getFloat(getType() + "Heart") + getQuantity());

+					JewelrycraftMod.netWrapper.sendToServer(new PacketRequestPlayerInfo());

+					this.setDead();

+				}

+			}

+		}

+	}

+

+	@SideOnly(Side.CLIENT)

+	public boolean canRenderOnFire() {

+		return false;

+	}

+

+	protected void entityInit() {

+		super.entityInit();

+		this.dataWatcher.addObject(16, "Red");

+		this.dataWatcher.addObject(17, 2f);

+	}

+

+	public void writeEntityToNBT(NBTTagCompound nbt) {

+		super.writeEntityToNBT(nbt);

+		nbt.setString("Type", getType());

+		nbt.setFloat("Quantity", getQuantity());

+	}

+

+	/**

+	 * (abstract) Protected helper method to read subclass entity data from NBT.

+	 */

+	public void readEntityFromNBT(NBTTagCompound nbt) {

+		super.readEntityFromNBT(nbt);

+		setType(nbt.getString("Type"));

+		setQuantity(nbt.getFloat("Quantity"));

+	}

+

+	public String getType() {

+		return this.dataWatcher.getWatchableObjectString(16);

+	}

+

+	public void setType(String type) {

+		this.dataWatcher.updateObject(16, type);

+	}

+

+	public Float getQuantity() {

+		return this.dataWatcher.getWatchableObjectFloat(17);

+	}

+

+	public void setQuantity(Float qty) {

+		this.dataWatcher.updateObject(17, qty);

+	}

+

+	public EnumCreatureAttribute getCreatureAttribute() {

+		return JewelrycraftUtil.HEART;

+	}

+

+	public boolean isEntityInvulnerable() {

+		return false;

+	}

 }