1.7.10 moving forward to v1.1.0!

This commit is contained in:
WayofTime 2014-07-15 19:23:57 -04:00
parent 1778cfa737
commit a92efa364d
51 changed files with 849 additions and 175 deletions

View file

@ -138,7 +138,6 @@ public class EntityBileDemon extends EntityDemon
{
super.writeEntityToNBT(par1NBTTagCompound);
par1NBTTagCompound.setBoolean("Angry", this.isAngry());
par1NBTTagCompound.setByte("CollarColor", (byte) this.getCollarColor());
par1NBTTagCompound.setByte("attackTimer", (byte) attackTimer);
}
@ -150,11 +149,6 @@ public class EntityBileDemon extends EntityDemon
super.readEntityFromNBT(par1NBTTagCompound);
this.setAngry(par1NBTTagCompound.getBoolean("Angry"));
if (par1NBTTagCompound.hasKey("CollarColor"))
{
this.setCollarColor(par1NBTTagCompound.getByte("CollarColor"));
}
attackTimer = par1NBTTagCompound.getByte("attackTimer");
}

View file

@ -138,7 +138,6 @@ public class EntityBoulderFist extends EntityDemon
public void writeEntityToNBT(NBTTagCompound par1NBTTagCompound)
{
super.writeEntityToNBT(par1NBTTagCompound);
par1NBTTagCompound.setBoolean("Angry", this.isAngry());
par1NBTTagCompound.setByte("CollarColor", (byte) this.getCollarColor());
}
@ -150,11 +149,6 @@ public class EntityBoulderFist extends EntityDemon
super.readEntityFromNBT(par1NBTTagCompound);
this.setAngry(par1NBTTagCompound.getBoolean("Angry"));
if (par1NBTTagCompound.hasKey("CollarColor"))
{
this.setCollarColor(par1NBTTagCompound.getByte("CollarColor"));
}
this.setCombatTask();
}

View file

@ -341,7 +341,6 @@ public class EntityElemental extends EntityDemon
public void writeEntityToNBT(NBTTagCompound par1NBTTagCompound)
{
super.writeEntityToNBT(par1NBTTagCompound);
par1NBTTagCompound.setBoolean("Angry", this.isAngry());
par1NBTTagCompound.setByte("CollarColor", (byte) this.getCollarColor());
}
@ -353,11 +352,6 @@ public class EntityElemental extends EntityDemon
super.readEntityFromNBT(par1NBTTagCompound);
this.setAngry(par1NBTTagCompound.getBoolean("Angry"));
if (par1NBTTagCompound.hasKey("CollarColor"))
{
this.setCollarColor(par1NBTTagCompound.getByte("CollarColor"));
}
this.setCombatTask();
}

View file

@ -148,7 +148,6 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob
{
super.writeEntityToNBT(par1NBTTagCompound);
par1NBTTagCompound.setBoolean("Angry", this.isAngry());
par1NBTTagCompound.setByte("CollarColor", (byte) this.getCollarColor());
}
/**
@ -159,11 +158,6 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob
super.readEntityFromNBT(par1NBTTagCompound);
this.setAngry(par1NBTTagCompound.getBoolean("Angry"));
if (par1NBTTagCompound.hasKey("CollarColor"))
{
this.setCollarColor(par1NBTTagCompound.getByte("CollarColor"));
}
this.setCombatTask();
}

View file

@ -149,7 +149,6 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
{
super.writeEntityToNBT(par1NBTTagCompound);
par1NBTTagCompound.setBoolean("Angry", this.isAngry());
par1NBTTagCompound.setByte("CollarColor", (byte) this.getCollarColor());
}
/**
@ -160,11 +159,6 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
super.readEntityFromNBT(par1NBTTagCompound);
this.setAngry(par1NBTTagCompound.getBoolean("Angry"));
if (par1NBTTagCompound.hasKey("CollarColor"))
{
this.setCollarColor(par1NBTTagCompound.getByte("CollarColor"));
}
this.setCombatTask();
}

View file

@ -134,7 +134,6 @@ public class EntityLowerGuardian extends EntityDemon
{
super.writeEntityToNBT(par1NBTTagCompound);
par1NBTTagCompound.setBoolean("Angry", this.isAngry());
par1NBTTagCompound.setByte("CollarColor", (byte) this.getCollarColor());
par1NBTTagCompound.setByte("attackTimer", (byte) attackTimer);
par1NBTTagCompound.setBoolean("isAggro", this.isAggro());
}
@ -147,11 +146,6 @@ public class EntityLowerGuardian extends EntityDemon
super.readEntityFromNBT(par1NBTTagCompound);
this.setAngry(par1NBTTagCompound.getBoolean("Angry"));
if (par1NBTTagCompound.hasKey("CollarColor"))
{
this.setCollarColor(par1NBTTagCompound.getByte("CollarColor"));
}
attackTimer = par1NBTTagCompound.getByte("attackTimer");
isAggro = par1NBTTagCompound.getBoolean("isAggro");
}

View file

@ -139,7 +139,6 @@ public class EntityShade extends EntityDemon
{
super.writeEntityToNBT(par1NBTTagCompound);
par1NBTTagCompound.setBoolean("Angry", this.isAngry());
par1NBTTagCompound.setByte("CollarColor", (byte) this.getCollarColor());
}
/**
@ -150,11 +149,6 @@ public class EntityShade extends EntityDemon
super.readEntityFromNBT(par1NBTTagCompound);
this.setAngry(par1NBTTagCompound.getBoolean("Angry"));
if (par1NBTTagCompound.hasKey("CollarColor"))
{
this.setCollarColor(par1NBTTagCompound.getByte("CollarColor"));
}
this.setCombatTask();
}

View file

@ -147,7 +147,6 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM
{
super.writeEntityToNBT(par1NBTTagCompound);
par1NBTTagCompound.setBoolean("Angry", this.isAngry());
par1NBTTagCompound.setByte("CollarColor", (byte) this.getCollarColor());
}
/**
@ -158,11 +157,6 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM
super.readEntityFromNBT(par1NBTTagCompound);
this.setAngry(par1NBTTagCompound.getBoolean("Angry"));
if (par1NBTTagCompound.hasKey("CollarColor"))
{
this.setCollarColor(par1NBTTagCompound.getByte("CollarColor"));
}
this.setCombatTask();
}

View file

@ -149,7 +149,6 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM
{
super.writeEntityToNBT(par1NBTTagCompound);
par1NBTTagCompound.setBoolean("Angry", this.isAngry());
par1NBTTagCompound.setByte("CollarColor", (byte) this.getCollarColor());
}
/**
@ -160,11 +159,6 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM
super.readEntityFromNBT(par1NBTTagCompound);
this.setAngry(par1NBTTagCompound.getBoolean("Angry"));
if (par1NBTTagCompound.hasKey("CollarColor"))
{
this.setCollarColor(par1NBTTagCompound.getByte("CollarColor"));
}
this.setCombatTask();
}