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

Move getOwnerName/UUID to IBindable

Browse source 
Where it should have been to begin with... hehe...

Deprecated methods will be removed after beta
This commit is contained in:
Nick 2016-02-04 00:25:37 -08:00
parent 8c1eaddb97
commit fd16a58b6b
8 changed files with 72 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/WayofTime/bloodmagic/item/ItemBindable.java
View file

@ -178,4 +178,16 @@ public class ItemBindable extends Item implements IBindable
{
return true;
}
@Override
public String getOwnerName(ItemStack stack)
{
return stack != null ? NBTHelper.checkNBT(stack).getTagCompound().getString(Constants.NBT.OWNER_NAME) : null;
}
@Override
public String getOwnerUUID(ItemStack stack)
{
return stack != null ? NBTHelper.checkNBT(stack).getTagCompound().getString(Constants.NBT.OWNER_UUID) : null;
}
}

12
src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java
View file

@ -80,4 +80,16 @@ public class ItemBoundSword extends ItemSword implements IBindable
{
return true;
}
@Override
public String getOwnerName(ItemStack stack)
{
return stack != null ? NBTHelper.checkNBT(stack).getTagCompound().getString(Constants.NBT.OWNER_NAME) : null;
}
@Override
public String getOwnerUUID(ItemStack stack)
{
return stack != null ? NBTHelper.checkNBT(stack).getTagCompound().getString(Constants.NBT.OWNER_UUID) : null;
}
}

2
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java
View file

@ -31,7 +31,7 @@ public class ItemSigilDivination extends ItemSigilBase implements IAltarReader
if (!world.isRemote)
{
MovingObjectPosition position = getMovingObjectPositionFromPlayer(world, player, false);
int currentEssence = NetworkHelper.getSoulNetwork(BindableHelper.getOwnerUUID(stack)).getCurrentEssence();
int currentEssence = NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).getCurrentEssence();
if (position == null)
{

2
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java
View file

@ -32,7 +32,7 @@ public class ItemSigilSeer extends ItemSigilBase implements IAltarReader
if (!world.isRemote)
{
MovingObjectPosition position = getMovingObjectPositionFromPlayer(world, player, false);
int currentEssence = NetworkHelper.getSoulNetwork(BindableHelper.getOwnerUUID(stack)).getCurrentEssence();
int currentEssence = NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).getCurrentEssence();
if (position == null)
{