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

Performance Commit --Too lazy to do the Altar recipe

Browse source
This commit is contained in:
Arcaratus 2015-07-02 11:05:07 -04:00
parent 013367cffa
commit e5b795fddc
217 changed files with 840 additions and 1244 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -63,10 +63,10 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
//My guess is that this will alter the max health
if (this.isTamed())
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxTamedHealth);
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxTamedHealth);
} else
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxUntamedHealth);
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxUntamedHealth);
}
}
@ -99,14 +99,14 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
*/
protected void updateAITick()
{
this.dataWatcher.updateObject(18, Float.valueOf(this.getHealth()));
this.dataWatcher.updateObject(18, this.getHealth());
}
protected void entityInit()
{
super.entityInit();
this.dataWatcher.addObject(18, new Float(this.getHealth()));
this.dataWatcher.addObject(19, new Byte((byte) 0));
this.dataWatcher.addObject(18, this.getHealth());
this.dataWatcher.addObject(19, 0);
}
/**
@ -263,10 +263,10 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
if (par1)
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxTamedHealth);
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxTamedHealth);
} else
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxUntamedHealth);
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxUntamedHealth);
}
}
@ -286,7 +286,7 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
{
ItemFood itemfood = (ItemFood) itemstack.getItem();
if (itemfood.isWolfsFavoriteMeat() && this.dataWatcher.getWatchableObjectFloat(18) < this.maxTamedHealth)
if (itemfood.isWolfsFavoriteMeat() && this.dataWatcher.getWatchableObjectFloat(18) < maxTamedHealth)
{
if (!par1EntityPlayer.capabilities.isCreativeMode)
{
@ -297,7 +297,7 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
if (itemstack.stackSize <= 0)
{
par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, (ItemStack) null);
par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, null);
}
return true;
@ -311,9 +311,9 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
{
this.aiSit.setSitting(!this.isSitting());
this.isJumping = false;
this.setPathToEntity((PathEntity) null);
this.setTarget((Entity) null);
this.setAttackTarget((EntityLivingBase) null);
this.setPathToEntity(null);
this.setTarget(null);
this.setAttackTarget(null);
}
this.sendSittingMessageToPlayer(par1EntityPlayer, !this.isSitting());
@ -327,7 +327,7 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
if (itemstack.stackSize <= 0)
{
par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, (ItemStack) null);
par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, null);
}
if (!this.worldObj.isRemote)
@ -335,10 +335,10 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
if (this.rand.nextInt(1) == 0)
{
this.setTamed(true);
this.setPathToEntity((PathEntity) null);
this.setAttackTarget((EntityLivingBase) null);
this.setPathToEntity(null);
this.setAttackTarget(null);
this.aiSit.setSitting(true);
this.setHealth(this.maxTamedHealth);
this.setHealth(maxTamedHealth);
this.func_152115_b(par1EntityPlayer.getUniqueID().toString());
this.playTameEffect(true);
this.worldObj.setEntityState(this, (byte) 7);
@ -382,10 +382,10 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
if (par1)
{
this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 | 2)));
this.dataWatcher.updateObject(16, b0 | 2);
} else
{
this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 & -3)));
this.dataWatcher.updateObject(16, b0 & -3);
}
}
@ -402,7 +402,7 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
*/
public void setCollarColor(int par1)
{
this.dataWatcher.updateObject(20, Byte.valueOf((byte) (par1 & 15)));
this.dataWatcher.updateObject(20, par1 & 15);
}
/**
@ -417,10 +417,10 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
{
if (par1)
{
this.dataWatcher.updateObject(19, Byte.valueOf((byte) 1));
this.dataWatcher.updateObject(19, 1);
} else
{
this.dataWatcher.updateObject(19, Byte.valueOf((byte) 0));
this.dataWatcher.updateObject(19, 0);
}
}
@ -476,9 +476,6 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
*/
public void attackEntityWithRangedAttack(EntityLivingBase par1EntityLivingBase, float par2)
{
double xCoord;
double yCoord;
double zCoord;
IceProjectile hol = new IceProjectile(worldObj, this, par1EntityLivingBase, 1.8f, 0f, 3, 600);
this.worldObj.spawnEntityInWorld(hol);
}
@ -490,7 +487,6 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
{
this.tasks.removeTask(this.aiAttackOnCollide);
this.tasks.removeTask(this.aiArrowAttack);
ItemStack itemstack = this.getHeldItem();
this.tasks.addTask(4, this.aiArrowAttack);
}
}