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

More demon village tweaks, adding more event functionality

Browse source
This commit is contained in:
WayofTime 2014-11-30 17:56:10 -05:00
parent 1115eaf9a7
commit d439ac92fc
14 changed files with 83 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java
View file

@ -5,6 +5,7 @@ import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb;
import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -75,7 +76,7 @@ public class EnergyBattery extends Item implements ArmourUpgrade, IBindable, IBl
return par1ItemStack;
}
EnergyItems.addEssenceToMaximum(itemTag.getString("ownerName"), 200, this.getMaxEssence());
SoulNetworkHandler.addCurrentEssenceToMaximum(itemTag.getString("ownerName"), 200, this.getMaxEssence());
EnergyItems.hurtPlayer(par3EntityPlayer, 200);
return par1ItemStack;
}

1
src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java
View file

@ -83,6 +83,7 @@ public class EnergyItems extends Item implements IBindable
return true;
}
@Deprecated
public static boolean syphonWhileInContainer(ItemStack ist, int damageToBeDone)
{
if (ist.getTagCompound() != null && !(ist.getTagCompound().getString("ownerName").equals("")))

5
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/DivinationSigil.java
View file

@ -62,6 +62,11 @@ public class DivinationSigil extends Item implements ArmourUpgrade, IReagentMani
{
return par1ItemStack;
}
if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 0))
{
return par1ItemStack;
}
NBTTagCompound itemTag = par1ItemStack.stackTagCompound;