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

Fix to Full Stomach ritual, adding new system for summoning registry

Browse source
This commit is contained in:
WayofTime 2014-10-19 19:34:51 -04:00
parent 3360a4d85c
commit dc1357739b
15 changed files with 270 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

10
1.7.10/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityDemon.java
View file

@ -14,9 +14,9 @@ import net.minecraft.world.World;
public class EntityDemon extends EntityTameable implements IDemon
{
private boolean isAggro;
private int demonID;
private String demonID;
public EntityDemon(World par1World, int demonID)
public EntityDemon(World par1World, String demonID)
{
super(par1World);
this.demonID = demonID;
@ -49,7 +49,9 @@ public class EntityDemon extends EntityTameable implements IDemon
protected void dropFewItems(boolean par1, int par2)
{
ItemStack drop = new ItemStack(ModItems.demonPlacer, 1, this.getDemonID());
ItemStack drop = new ItemStack(ModItems.demonPlacer);
DemonPlacer.setDemonString(drop, this.getDemonID());
if ((this.getOwner() instanceof EntityPlayer))
{
@ -92,7 +94,7 @@ public class EntityDemon extends EntityTameable implements IDemon
}
}
public int getDemonID()
public String getDemonID()
{
return this.demonID;
}

4
1.7.10/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityElemental.java
View file

@ -32,9 +32,9 @@ public class EntityElemental extends EntityDemon
private static float maxTamedHealth = 100.0F;
private static float maxUntamedHealth = 100.0F;
public EntityElemental(World par1World, int demonID)
public EntityElemental(World par1World, String entityAirElementalID)
{
super(par1World, demonID);
super(par1World, entityAirElementalID);
this.setSize(0.5F, 1.0F);
this.setAggro(false);
this.setTamed(false);