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

All the items !sigils

Browse source
This commit is contained in:
Arcaratus 2015-07-30 17:24:20 -04:00
parent d88cc2d79e
commit a2c4f4b965
129 changed files with 587 additions and 1134 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilAir.java
View file

@ -13,10 +13,10 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import WayofTime.alchemicalWizardry.common.items.BindableItems;
import codechicken.lib.render.TextureUtils.IIconRegister;
public class SigilAir extends EnergyItems implements ArmourUpgrade, ISigil
public class SigilAir extends BindableItems implements ArmourUpgrade, ISigil
{
public SigilAir()
{
@ -48,7 +48,7 @@ public class SigilAir extends EnergyItems implements ArmourUpgrade, ISigil
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@ -75,7 +75,7 @@ public class SigilAir extends EnergyItems implements ArmourUpgrade, ISigil
if (!par3EntityPlayer.capabilities.isCreativeMode)
{
if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
if (!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{
if(!par2World.isRemote)
{

10
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilBloodLight.java
View file

@ -16,11 +16,11 @@ import WayofTime.alchemicalWizardry.ModBlocks;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.IHolding;
import WayofTime.alchemicalWizardry.common.entity.projectile.EntityBloodLightProjectile;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import WayofTime.alchemicalWizardry.common.items.BindableItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class SigilBloodLight extends EnergyItems implements IHolding, ArmourUpgrade, ISigil
public class SigilBloodLight extends BindableItems implements IHolding, ArmourUpgrade, ISigil
{
public SigilBloodLight()
{
@ -51,7 +51,7 @@ public class SigilBloodLight extends EnergyItems implements IHolding, ArmourUpgr
@Override
public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10)
{
if(!EnergyItems.checkAndSetItemOwner(par1ItemStack, par2EntityPlayer) || !EnergyItems.syphonBatteries(par1ItemStack, par2EntityPlayer, getEnergyUsed()))
if(!BindableItems.checkAndSetItemOwner(par1ItemStack, par2EntityPlayer) || !BindableItems.syphonBatteries(par1ItemStack, par2EntityPlayer, getEnergyUsed()))
{
return true;
}
@ -97,7 +97,7 @@ public class SigilBloodLight extends EnergyItems implements IHolding, ArmourUpgr
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@ -107,7 +107,7 @@ public class SigilBloodLight extends EnergyItems implements IHolding, ArmourUpgr
par1ItemStack.setTagCompound(new NBTTagCompound());
}
if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed() * 5))
if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed() * 5))
{
return par1ItemStack;
}

8
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilDivination.java
View file

@ -22,7 +22,7 @@ import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentRegistry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import WayofTime.alchemicalWizardry.api.items.interfaces.IReagentManipulator;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import WayofTime.alchemicalWizardry.common.items.BindableItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -57,14 +57,14 @@ public class SigilDivination extends Item implements ArmourUpgrade, IReagentMani
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.worldObj.isRemote)
if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.worldObj.isRemote)
{
return par1ItemStack;
}
if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 0))
if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 0))
{
return par1ItemStack;
}

10
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilHarvest.java
View file

@ -15,11 +15,11 @@ import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.harvest.HarvestRegistry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.IHolding;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import WayofTime.alchemicalWizardry.common.items.BindableItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class SigilHarvest extends EnergyItems implements IHolding, ArmourUpgrade, ISigil
public class SigilHarvest extends BindableItems implements IHolding, ArmourUpgrade, ISigil
{
@SideOnly(Side.CLIENT)
private IIcon activeIcon;
@ -97,7 +97,7 @@ public class SigilHarvest extends EnergyItems implements IHolding, ArmourUpgrade
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@ -117,7 +117,7 @@ public class SigilHarvest extends EnergyItems implements IHolding, ArmourUpgrade
if (!par3EntityPlayer.capabilities.isCreativeMode)
{
if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
if (!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{
tag.setBoolean("isActive", false);
}
@ -168,7 +168,7 @@ public class SigilHarvest extends EnergyItems implements IHolding, ArmourUpgrade
{
if (!par3EntityPlayer.capabilities.isCreativeMode)
{
if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{
par1ItemStack.getTagCompound().setBoolean("isActive", false);
}

12
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilLava.java
View file

@ -22,8 +22,8 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.items.EnergyBattery;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import WayofTime.alchemicalWizardry.common.items.Orb;
import WayofTime.alchemicalWizardry.common.items.BindableItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -82,7 +82,7 @@ public class SigilLava extends ItemBucket implements ArmourUpgrade, ISigil
@Override
public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ)
{
if (world.isRemote || !EnergyItems.checkAndSetItemOwner(stack, player) || player.isSneaking())
if (world.isRemote || !BindableItems.checkAndSetItemOwner(stack, player) || player.isSneaking())
{
return false;
}
@ -98,7 +98,7 @@ public class SigilLava extends ItemBucket implements ArmourUpgrade, ISigil
FluidStack fluid = new FluidStack(FluidRegistry.LAVA, 1000);
int amount = ((IFluidHandler) tile).fill(ForgeDirection.getOrientation(side), fluid, false);
if (amount > 0 && EnergyItems.syphonBatteries(stack, player, getEnergyUsed()))
if (amount > 0 && BindableItems.syphonBatteries(stack, player, getEnergyUsed()))
{
((IFluidHandler) tile).fill(ForgeDirection.getOrientation(side), fluid, true);
}
@ -146,7 +146,7 @@ public class SigilLava extends ItemBucket implements ArmourUpgrade, ISigil
return false;
}
if(this.canPlaceContainedLiquid(world, x, y, z, x, y, z) && EnergyItems.syphonBatteries(stack, player, getEnergyUsed()))
if(this.canPlaceContainedLiquid(world, x, y, z, x, y, z) && BindableItems.syphonBatteries(stack, player, getEnergyUsed()))
{
return this.tryPlaceContainedLiquid(world, x, y, z, x, y, z);
}
@ -212,7 +212,7 @@ public class SigilLava extends ItemBucket implements ArmourUpgrade, ISigil
{
continue;
}
if (stack.getItem() instanceof EnergyBattery && !usedBattery)
if (stack.getItem() instanceof Orb && !usedBattery)
{
if (stack.getItemDamage() <= stack.getMaxDamage() - damageToBeDone)
{

10
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfElementalAffinity.java
View file

@ -2,7 +2,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import WayofTime.alchemicalWizardry.common.items.BindableItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
@ -18,7 +18,7 @@ import net.minecraft.world.World;
import java.util.List;
public class SigilOfElementalAffinity extends EnergyItems implements ISigil
public class SigilOfElementalAffinity extends BindableItems implements ISigil
{
@SideOnly(Side.CLIENT)
private IIcon activeIcon;
@ -97,7 +97,7 @@ public class SigilOfElementalAffinity extends EnergyItems implements ISigil
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@ -110,7 +110,7 @@ public class SigilOfElementalAffinity extends EnergyItems implements ISigil
NBTTagCompound tag = par1ItemStack.getTagCompound();
tag.setBoolean("isActive", !(tag.getBoolean("isActive")));
if (tag.getBoolean("isActive") && EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
if (tag.getBoolean("isActive") && BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{
par1ItemStack.setItemDamage(1);
tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200);
@ -150,7 +150,7 @@ public class SigilOfElementalAffinity extends EnergyItems implements ISigil
{
if (!par3EntityPlayer.capabilities.isCreativeMode)
{
if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
if (!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{
par1ItemStack.getTagCompound().setBoolean("isActive", false);
}

10
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfEnderSeverance.java
View file

@ -3,7 +3,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.IHolding;
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import WayofTime.alchemicalWizardry.common.items.BindableItems;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -20,7 +20,7 @@ import net.minecraft.world.World;
import java.util.List;
public class SigilOfEnderSeverance extends EnergyItems implements IHolding, ISigil
public class SigilOfEnderSeverance extends BindableItems implements IHolding, ISigil
{
@SideOnly(Side.CLIENT)
private IIcon activeIcon;
@ -98,7 +98,7 @@ public class SigilOfEnderSeverance extends EnergyItems implements IHolding, ISig
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@ -118,7 +118,7 @@ public class SigilOfEnderSeverance extends EnergyItems implements IHolding, ISig
if (!par3EntityPlayer.capabilities.isCreativeMode)
{
if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
if (!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{
tag.setBoolean("isActive", false);
}
@ -161,7 +161,7 @@ public class SigilOfEnderSeverance extends EnergyItems implements IHolding, ISig
{
if (!par3EntityPlayer.capabilities.isCreativeMode)
{
if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{
par1ItemStack.getTagCompound().setBoolean("isActive", false);
}

14
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java
View file

@ -3,7 +3,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import WayofTime.alchemicalWizardry.common.items.BindableItems;
import cpw.mods.fml.common.eventhandler.Event.Result;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -24,7 +24,7 @@ import net.minecraftforge.event.entity.player.BonemealEvent;
import java.util.List;
public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil
public class SigilOfGrowth extends BindableItems implements ArmourUpgrade, ISigil
{
@SideOnly(Side.CLIENT)
private IIcon activeIcon;
@ -104,11 +104,11 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil
@Override
public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10)
{
if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par2EntityPlayer))
if (BindableItems.checkAndSetItemOwner(par1ItemStack, par2EntityPlayer))
{
if (applyBonemeal(par1ItemStack, par3World, par4, par5, par6, par2EntityPlayer))
{
EnergyItems.syphonBatteries(par1ItemStack, par2EntityPlayer, getEnergyUsed());
BindableItems.syphonBatteries(par1ItemStack, par2EntityPlayer, getEnergyUsed());
if (par3World.isRemote)
{
@ -125,7 +125,7 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@ -143,7 +143,7 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil
NBTTagCompound tag = par1ItemStack.getTagCompound();
tag.setBoolean("isActive", !(tag.getBoolean("isActive")));
if (tag.getBoolean("isActive") && EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
if (tag.getBoolean("isActive") && BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{
par1ItemStack.setItemDamage(1);
tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % tickDelay);
@ -172,7 +172,7 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil
{
if (par2World.getWorldTime() % tickDelay == par1ItemStack.getTagCompound().getInteger("worldTimeDelay"))
{
if(!EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par3Entity, getEnergyUsed()))
if(!BindableItems.syphonBatteries(par1ItemStack, (EntityPlayer) par3Entity, getEnergyUsed()))
{
par1ItemStack.getTagCompound().setBoolean("isActive", false);
}

10
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java
View file

@ -3,7 +3,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import WayofTime.alchemicalWizardry.common.items.BindableItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
@ -18,7 +18,7 @@ import net.minecraft.world.World;
import java.util.List;
public class SigilOfHaste extends EnergyItems implements ArmourUpgrade, ISigil
public class SigilOfHaste extends BindableItems implements ArmourUpgrade, ISigil
{
@SideOnly(Side.CLIENT)
private IIcon activeIcon;
@ -96,7 +96,7 @@ public class SigilOfHaste extends EnergyItems implements ArmourUpgrade, ISigil
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@ -109,7 +109,7 @@ public class SigilOfHaste extends EnergyItems implements ArmourUpgrade, ISigil
NBTTagCompound tag = par1ItemStack.getTagCompound();
tag.setBoolean("isActive", !(tag.getBoolean("isActive")));
if (tag.getBoolean("isActive") && EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
if (tag.getBoolean("isActive") && BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{
par1ItemStack.setItemDamage(1);
tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200);
@ -146,7 +146,7 @@ public class SigilOfHaste extends EnergyItems implements ArmourUpgrade, ISigil
{
if (!par3EntityPlayer.capabilities.isCreativeMode)
{
if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
if (!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{
par1ItemStack.getTagCompound().setBoolean("isActive", false);
}

10
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java
View file

@ -17,11 +17,11 @@ import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.IHolding;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import WayofTime.alchemicalWizardry.common.items.BindableItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade, IHolding, ISigil
public class SigilOfMagnetism extends BindableItems implements ArmourUpgrade, IHolding, ISigil
{
@SideOnly(Side.CLIENT)
private IIcon activeIcon;
@ -100,7 +100,7 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade, IHol
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@ -113,7 +113,7 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade, IHol
NBTTagCompound tag = par1ItemStack.getTagCompound();
tag.setBoolean("isActive", !(tag.getBoolean("isActive")));
if (tag.getBoolean("isActive") && EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
if (tag.getBoolean("isActive") && BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{
par1ItemStack.setItemDamage(1);
tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % tickDelay);
@ -144,7 +144,7 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade, IHol
{
if (par2World.getWorldTime() % tickDelay == par1ItemStack.getTagCompound().getInteger("worldTimeDelay"))
{
if(!EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par3Entity, getEnergyUsed()))
if(!BindableItems.syphonBatteries(par1ItemStack, (EntityPlayer) par3Entity, getEnergyUsed()))
{
par1ItemStack.getTagCompound().setBoolean("isActive", false);
}

10
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfSupression.java
View file

@ -3,7 +3,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import WayofTime.alchemicalWizardry.common.items.BindableItems;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
import WayofTime.alchemicalWizardry.common.tileEntity.TESpectralContainer;
import cpw.mods.fml.relauncher.Side;
@ -22,7 +22,7 @@ import net.minecraft.world.World;
import java.util.List;
public class SigilOfSupression extends EnergyItems implements ArmourUpgrade, ISigil
public class SigilOfSupression extends BindableItems implements ArmourUpgrade, ISigil
{
@SideOnly(Side.CLIENT)
private IIcon activeIcon;
@ -104,7 +104,7 @@ public class SigilOfSupression extends EnergyItems implements ArmourUpgrade, ISi
{
int tickDelay = 200;
if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || SpellHelper.isFakePlayer(par2World, par3EntityPlayer))
if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || SpellHelper.isFakePlayer(par2World, par3EntityPlayer))
{
return par1ItemStack;
}
@ -129,7 +129,7 @@ public class SigilOfSupression extends EnergyItems implements ArmourUpgrade, ISi
if (!par3EntityPlayer.capabilities.isCreativeMode)
{
if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{
tag.setBoolean("isActive", false);
}
@ -206,7 +206,7 @@ public class SigilOfSupression extends EnergyItems implements ArmourUpgrade, ISi
{
if (!par3EntityPlayer.capabilities.isCreativeMode)
{
if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{
par1ItemStack.getTagCompound().setBoolean("isActive", false);
}

6
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheAssassin.java
View file

@ -22,13 +22,13 @@ import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.living.EnderTeleportEvent;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import WayofTime.alchemicalWizardry.common.items.BindableItems;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
import WayofTime.alchemicalWizardry.common.spell.simple.SpellTeleport;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class SigilOfTheAssassin extends EnergyItems implements ArmourUpgrade, ISigil
public class SigilOfTheAssassin extends BindableItems implements ArmourUpgrade, ISigil
{
public SigilOfTheAssassin()
{
@ -79,7 +79,7 @@ public class SigilOfTheAssassin extends EnergyItems implements ArmourUpgrade, IS
*/
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}

10
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java
View file

@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.ModBlocks;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import WayofTime.alchemicalWizardry.common.items.BindableItems;
import WayofTime.alchemicalWizardry.common.tileEntity.TESpectralBlock;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -21,7 +21,7 @@ import net.minecraft.world.World;
import java.util.List;
public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade, ISigil
public class SigilOfTheBridge extends BindableItems implements ArmourUpgrade, ISigil
{
@SideOnly(Side.CLIENT)
private IIcon activeIcon;
@ -101,7 +101,7 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade, ISig
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@ -114,7 +114,7 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade, ISig
NBTTagCompound tag = par1ItemStack.getTagCompound();
tag.setBoolean("isActive", !(tag.getBoolean("isActive")));
if (tag.getBoolean("isActive") && EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
if (tag.getBoolean("isActive") && BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{
par1ItemStack.setItemDamage(1);
tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % tickDelay);
@ -145,7 +145,7 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade, ISig
{
if (par2World.getWorldTime() % tickDelay == par1ItemStack.getTagCompound().getInteger("worldTimeDelay"))
{
if(EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par3Entity, this.getLPUsed(par1ItemStack)))
if(BindableItems.syphonBatteries(par1ItemStack, (EntityPlayer) par3Entity, this.getLPUsed(par1ItemStack)))
{
this.setLPUsed(par1ItemStack, 0);
}else

10
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java
View file

@ -3,7 +3,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import WayofTime.alchemicalWizardry.common.items.BindableItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
@ -19,7 +19,7 @@ import net.minecraft.world.World;
import java.util.List;
public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade, ISigil
public class SigilOfTheFastMiner extends BindableItems implements ArmourUpgrade, ISigil
{
@SideOnly(Side.CLIENT)
private IIcon activeIcon;
@ -97,7 +97,7 @@ public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade, I
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@ -110,7 +110,7 @@ public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade, I
NBTTagCompound tag = par1ItemStack.getTagCompound();
tag.setBoolean("isActive", !(tag.getBoolean("isActive")));
if (tag.getBoolean("isActive") && EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
if (tag.getBoolean("isActive") && BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{
par1ItemStack.setItemDamage(1);
tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200);
@ -147,7 +147,7 @@ public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade, I
{
if (!par3EntityPlayer.capabilities.isCreativeMode)
{
if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
if (!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{
par1ItemStack.getTagCompound().setBoolean("isActive", false);
}

8
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java
View file

@ -12,7 +12,7 @@ import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import WayofTime.alchemicalWizardry.common.items.BindableItems;
public class SigilOfWind extends SigilToggleable implements ArmourUpgrade, ISigil
{
@ -46,7 +46,7 @@ public class SigilOfWind extends SigilToggleable implements ArmourUpgrade, ISigi
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@ -59,7 +59,7 @@ public class SigilOfWind extends SigilToggleable implements ArmourUpgrade, ISigi
NBTTagCompound tag = par1ItemStack.getTagCompound();
this.setActivated(par1ItemStack, !(this.getActivated(par1ItemStack)));
if (this.getActivated(par1ItemStack) && EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
if (this.getActivated(par1ItemStack) && BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{
par1ItemStack.setItemDamage(1);
tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200);
@ -96,7 +96,7 @@ public class SigilOfWind extends SigilToggleable implements ArmourUpgrade, ISigi
{
if (!par3EntityPlayer.capabilities.isCreativeMode)
{
if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
if (!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{
this.setActivated(par1ItemStack, false);
}

10
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilPackRat.java
View file

@ -16,11 +16,11 @@ import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.compress.CompressionRegistry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.IHolding;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import WayofTime.alchemicalWizardry.common.items.BindableItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class SigilPackRat extends EnergyItems implements IHolding, ArmourUpgrade, ISigil
public class SigilPackRat extends BindableItems implements IHolding, ArmourUpgrade, ISigil
{
@SideOnly(Side.CLIENT)
private IIcon activeIcon;
@ -98,7 +98,7 @@ public class SigilPackRat extends EnergyItems implements IHolding, ArmourUpgrade
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@ -118,7 +118,7 @@ public class SigilPackRat extends EnergyItems implements IHolding, ArmourUpgrade
if (!par3EntityPlayer.capabilities.isCreativeMode)
{
if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
if (!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{
tag.setBoolean("isActive", false);
}
@ -159,7 +159,7 @@ public class SigilPackRat extends EnergyItems implements IHolding, ArmourUpgrade
{
if (!par3EntityPlayer.capabilities.isCreativeMode)
{
if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{
par1ItemStack.getTagCompound().setBoolean("isActive", false);
}

4
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilSeer.java
View file

@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.IHolding;
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import WayofTime.alchemicalWizardry.common.items.BindableItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
@ -47,7 +47,7 @@ public class SigilSeer extends Item implements IHolding, ArmourUpgrade, ISigil
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.worldObj.isRemote)
if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.worldObj.isRemote)
{
return par1ItemStack;
}

4
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilToggleable.java
View file

@ -1,9 +1,9 @@
package WayofTime.alchemicalWizardry.common.items.sigil;
import net.minecraft.item.ItemStack;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import WayofTime.alchemicalWizardry.common.items.BindableItems;
public class SigilToggleable extends EnergyItems
public class SigilToggleable extends BindableItems
{
public void setActivated(ItemStack stack, boolean newActivated)
{

8
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilVoid.java
View file

@ -15,7 +15,7 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import WayofTime.alchemicalWizardry.common.items.BindableItems;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -79,7 +79,7 @@ public class SigilVoid extends ItemBucket implements ArmourUpgrade, ISigil
@Override
public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ)
{
if (world.isRemote || !EnergyItems.checkAndSetItemOwner(stack, player) || player.isSneaking())
if (world.isRemote || !BindableItems.checkAndSetItemOwner(stack, player) || player.isSneaking())
{
return false;
}
@ -96,7 +96,7 @@ public class SigilVoid extends ItemBucket implements ArmourUpgrade, ISigil
{
FluidStack amount = ((IFluidHandler) tile).drain(ForgeDirection.getOrientation(side), 1000, false);
if (amount != null && amount.amount > 0 && EnergyItems.syphonBatteries(stack, player, getEnergyUsed()))
if (amount != null && amount.amount > 0 && BindableItems.syphonBatteries(stack, player, getEnergyUsed()))
{
((IFluidHandler) tile).drain(ForgeDirection.getOrientation(side), 1000, true);
return true;
@ -140,7 +140,7 @@ public class SigilVoid extends ItemBucket implements ArmourUpgrade, ISigil
return false;
}
if (SpellHelper.isBlockFluid(world.getBlock(x, y, z)) && EnergyItems.syphonBatteries(stack, player, getEnergyUsed()))
if (SpellHelper.isBlockFluid(world.getBlock(x, y, z)) && BindableItems.syphonBatteries(stack, player, getEnergyUsed()))
{
world.setBlockToAir(x, y, z);
return true;

8
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilWater.java
View file

@ -22,7 +22,7 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import WayofTime.alchemicalWizardry.common.items.BindableItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -83,7 +83,7 @@ public class SigilWater extends ItemBucket implements ArmourUpgrade, ISigil
@Override
public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ)
{
if (world.isRemote || !EnergyItems.checkAndSetItemOwner(stack, player) || player.isSneaking())
if (world.isRemote || !BindableItems.checkAndSetItemOwner(stack, player) || player.isSneaking())
{
return false;
}
@ -99,7 +99,7 @@ public class SigilWater extends ItemBucket implements ArmourUpgrade, ISigil
FluidStack fluid = new FluidStack(FluidRegistry.WATER, 1000);
int amount = ((IFluidHandler) tile).fill(ForgeDirection.getOrientation(side), fluid, false);
if (amount > 0 && EnergyItems.syphonBatteries(stack, player, getEnergyUsed()))
if (amount > 0 && BindableItems.syphonBatteries(stack, player, getEnergyUsed()))
{
((IFluidHandler) tile).fill(ForgeDirection.getOrientation(side), fluid, true);
}
@ -147,7 +147,7 @@ public class SigilWater extends ItemBucket implements ArmourUpgrade, ISigil
return false;
}
if(this.canPlaceContainedLiquid(world, x, y, z, x, y, z) && EnergyItems.syphonBatteries(stack, player, getEnergyUsed()))
if(this.canPlaceContainedLiquid(world, x, y, z, x, y, z) && BindableItems.syphonBatteries(stack, player, getEnergyUsed()))
{
return this.tryPlaceContainedLiquid(world, x, y, z, x, y, z);
}

4
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/SigilOfHolding.java
View file

@ -13,9 +13,9 @@ import net.minecraft.util.MathHelper;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import WayofTime.alchemicalWizardry.common.items.BindableItems;
public class SigilOfHolding extends EnergyItems
public class SigilOfHolding extends BindableItems
{
private static int invSize = 4;