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

2
1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/BoundArmour.java
View file

@ -677,7 +677,7 @@ public class BoundArmour extends ItemArmor implements IAlchemyGoggles, ISpecialA
public int getItemEnchantability()
{
return 0;
return Integer.MIN_VALUE;
}
public boolean getIsInvisible(ItemStack armourStack)

28
1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/DemonPlacer.java
View file

@ -68,7 +68,8 @@ public class DemonPlacer extends Item
d0 = 0.5D;
}
Entity entity = spawnCreature(par3World, par1ItemStack.getItemDamage(), (double) par4 + 0.5D, (double) par5 + d0, (double) par6 + 0.5D, par1ItemStack);
String demonName = DemonPlacer.getDemonString(par1ItemStack);
Entity entity = spawnCreature(par3World, demonName, (double) par4 + 0.5D, (double) par5 + d0, (double) par6 + 0.5D, par1ItemStack);
if (entity != null)
{
@ -122,7 +123,8 @@ public class DemonPlacer extends Item
if (par2World.getBlock(i, j, k).getMaterial() == Material.water)
{
Entity entity = spawnCreature(par2World, par1ItemStack.getItemDamage(), (double) i, (double) j, (double) k, par1ItemStack);
String demonName = DemonPlacer.getDemonString(par1ItemStack);
Entity entity = spawnCreature(par2World, demonName, (double) i, (double) j, (double) k, par1ItemStack);
if (entity != null)
{
@ -148,7 +150,7 @@ public class DemonPlacer extends Item
* Spawns the creature specified by the egg's type in the location specified by the last three parameters.
* Parameters: world, entityID, x, y, z.
*/
public static Entity spawnCreature(World par0World, int par1, double par2, double par4, double par6, ItemStack itemStack)
public static Entity spawnCreature(World par0World, String par1, double par2, double par4, double par6, ItemStack itemStack)
{
Entity entity = null;
@ -198,6 +200,26 @@ public class DemonPlacer extends Item
return par1ItemStack.stackTagCompound.getString("ownerName");
}
public static void setDemonString(ItemStack itemStack, String demonName)
{
if (itemStack.stackTagCompound == null)
{
itemStack.setTagCompound(new NBTTagCompound());
}
itemStack.stackTagCompound.setString("demonName", demonName);
}
public static String getDemonString(ItemStack itemStack)
{
if (itemStack.stackTagCompound == null)
{
itemStack.setTagCompound(new NBTTagCompound());
}
return itemStack.stackTagCompound.getString("demonName");
}
@Override
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4)