lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changes to Demons

Browse source
This commit is contained in:
WayofTime 2015-07-18 10:05:23 -04:00
parent d6a57ca644
commit ebad8a2e29
2 changed files with 21 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBoulderFist.java
View file

@ -109,7 +109,6 @@ public class EntityBoulderFist extends EntityDemon
{ {
super.entityInit(); super.entityInit();
this.dataWatcher.addObject(18, this.getHealth()); this.dataWatcher.addObject(18, this.getHealth());
this.dataWatcher.addObject(19, 0);
} }
/** /**
@ -126,7 +125,7 @@ public class EntityBoulderFist extends EntityDemon
public void writeEntityToNBT(NBTTagCompound par1NBTTagCompound) public void writeEntityToNBT(NBTTagCompound par1NBTTagCompound)
{ {
super.writeEntityToNBT(par1NBTTagCompound); super.writeEntityToNBT(par1NBTTagCompound);
par1NBTTagCompound.setByte("CollarColor", (byte) this.getCollarColor());
} }
/** /**
@ -396,17 +395,6 @@ public class EntityBoulderFist extends EntityDemon
return null; return null;
} }
public void func_70918_i(boolean par1)
{
if (par1)
{
this.dataWatcher.updateObject(19, 1);
} else
{
this.dataWatcher.updateObject(19, 0);
}
}
/** /**
* Returns true if the mob is currently able to mate with the specified mob. * Returns true if the mob is currently able to mate with the specified mob.
*/ */
@ -415,11 +403,6 @@ public class EntityBoulderFist extends EntityDemon
return false; return false;
} }
public boolean func_70922_bv()
{
return this.dataWatcher.getWatchableObjectByte(19) == 1;
}
/** /**
* Determines if an entity can be despawned, used on idle far away entities * Determines if an entity can be despawned, used on idle far away entities
*/ */

28
src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityIceDemon.java
View file

@ -1,12 +1,20 @@
package WayofTime.alchemicalWizardry.common.entity.mob; package WayofTime.alchemicalWizardry.common.entity.mob;
import WayofTime.alchemicalWizardry.AlchemicalWizardry; import net.minecraft.entity.Entity;
import WayofTime.alchemicalWizardry.ModItems; import net.minecraft.entity.EntityAgeable;
import WayofTime.alchemicalWizardry.common.EntityAITargetAggro; import net.minecraft.entity.EntityLivingBase;
import WayofTime.alchemicalWizardry.common.entity.projectile.IceProjectile; import net.minecraft.entity.IRangedAttackMob;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.*; import net.minecraft.entity.ai.EntityAIArrowAttack;
import net.minecraft.entity.ai.*; import net.minecraft.entity.ai.EntityAIAttackOnCollide;
import net.minecraft.entity.ai.EntityAIFollowOwner;
import net.minecraft.entity.ai.EntityAIHurtByTarget;
import net.minecraft.entity.ai.EntityAILookIdle;
import net.minecraft.entity.ai.EntityAIOwnerHurtByTarget;
import net.minecraft.entity.ai.EntityAIOwnerHurtTarget;
import net.minecraft.entity.ai.EntityAISwimming;
import net.minecraft.entity.ai.EntityAIWander;
import net.minecraft.entity.ai.EntityAIWatchClosest;
import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.EntityCreeper;
import net.minecraft.entity.monster.EntityGhast; import net.minecraft.entity.monster.EntityGhast;
import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.entity.passive.EntityAnimal;
@ -17,10 +25,14 @@ import net.minecraft.entity.projectile.EntityArrow;
import net.minecraft.item.ItemFood; import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.pathfinding.PathEntity;
import net.minecraft.util.DamageSource; import net.minecraft.util.DamageSource;
import net.minecraft.util.Vec3; import net.minecraft.util.Vec3;
import net.minecraft.world.World; import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.ModItems;
import WayofTime.alchemicalWizardry.common.EntityAITargetAggro;
import WayofTime.alchemicalWizardry.common.entity.projectile.IceProjectile;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
public class EntityIceDemon extends EntityDemon implements IRangedAttackMob public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
{ {