Added Event handler, crest modifiers, sheath

2 files changed, 237 insertions, 192 deletions

diff --git a/src/main/java/gmail/Lance5057/items/tools/ArmorCore.java b/src/main/java/gmail/Lance5057/items/tools/ArmorCore.java
new file mode 100644
index 0000000..d834a53
--- /dev/null
+++ b/src/main/java/gmail/Lance5057/items/tools/ArmorCore.java
@@ -0,0 +1,26 @@
+package gmail.Lance5057.items.tools;
+
+import tconstruct.library.tools.ToolCore;
+import cpw.mods.fml.relauncher.*;
+import mods.battlegear2.api.IEnchantable;
+import mods.battlegear2.api.ISheathed;
+import mods.battlegear2.api.shield.IArrowCatcher;
+import mods.battlegear2.api.shield.IArrowDisplay;
+import mods.battlegear2.api.shield.IShield;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.IProjectile;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.*;
+import net.minecraft.item.ItemArmor.ArmorMaterial;
+import net.minecraft.util.DamageSource;
+import net.minecraft.world.World;
+
+public abstract class ArmorCore extends ItemArmor
+{
+	public ArmorCore(ArmorMaterial par2EnumArmorMaterial, int par3, int par4) {
+		super(par2EnumArmorMaterial, par3, par4);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/gmail/Lance5057/items/tools/Shield.java b/src/main/java/gmail/Lance5057/items/tools/Shield.java
index 479c28c..af33f84 100644
--- a/src/main/java/gmail/Lance5057/items/tools/Shield.java
+++ b/src/main/java/gmail/Lance5057/items/tools/Shield.java
@@ -17,198 +17,217 @@ import net.minecraft.item.*;
 import net.minecraft.util.DamageSource;
 import net.minecraft.world.World;
 
-public class Shield extends ToolCore implements IShield, ISheathed, IArrowCatcher, IArrowDisplay
-{
-public Shield(int baseDamage)
-{
-super(baseDamage);
-}
-protected float baseSpeed ()
-{
-return 1.5f;
-}
-protected float effectiveSpeed ()
-{
-return 15f;
-}
-public float breakSpeedModifier ()
-{
-return 1.0f;
-}
-@Override
-public float getDigSpeed (ItemStack stack, Block block, int meta)
-{
-if (stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Broken"))
-return 0.1f;
-for (int i = 0; i < web.length; i++)
-{
-if (web[i] == block.getMaterial())
-{
-return effectiveSpeed();
-}
-}
-return baseSpeed();
-}
-/**
-* returns the action that specifies what animation to play when the items
-* is being used
-*/
-@Override
-public EnumAction getItemUseAction (ItemStack par1ItemStack)
-{
-return EnumAction.block;
-}
-/**
-* How long it takes to use or consume an item
-*/
-@Override
-public int getMaxItemUseDuration (ItemStack par1ItemStack)
-{
-return 72000;
-}
-/**
-* Called whenever this item is equipped and the right mouse button is
-* pressed. Args: itemStack, world, entityPlayer
-*/
-@Override
-public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer player)
-{
-player.setItemInUse(stack, this.getMaxItemUseDuration(stack));
-return stack;
-}
-@Override
-public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float clickX, float clickY, float clickZ)
-{
-return false;
-}
-/**
-* Returns if the item (tool) can harvest results from the block type.
-*/
-@Override
-public boolean canHarvestBlock (Block block, ItemStack is)
-{
-for (int i = 0; i < web.length; i++)
-{
-if (block.getMaterial() == web[i])
-return true;
-}
-return super.canHarvestBlock(block, is);
-}
-protected Material[] getEffectiveMaterials ()
-{
-return web;
-}
-@Override
-@SideOnly(Side.CLIENT)
-public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boolean par5)
-{
-	super.onUpdate(stack, world, entity, par4, par5);
-	if (entity instanceof EntityPlayerSP)
-	{
-		EntityPlayerSP player = (EntityPlayerSP) entity;
-		ItemStack usingItem = player.getItemInUse();
-		if (usingItem != null && usingItem.getItem() == this)
-		{
-			player.movementInput.moveForward *= 2.5F;
-			player.movementInput.moveStrafe *= 2.5F;
+public class Shield extends ToolCore implements IShield, ISheathed,
+		IArrowCatcher, IArrowDisplay {
+	public Shield(int baseDamage) {
+		super(baseDamage);
+	}
+
+	protected float baseSpeed() {
+		return 1.5f;
+	}
+
+	protected float effectiveSpeed() {
+		return 15f;
+	}
+
+	public float breakSpeedModifier() {
+		return 1.0f;
+	}
+
+	@Override
+	public float getDigSpeed(ItemStack stack, Block block, int meta) {
+		if (stack.getTagCompound().getCompoundTag("InfiTool")
+				.getBoolean("Broken"))
+			return 0.1f;
+		for (int i = 0; i < web.length; i++) {
+			if (web[i] == block.getMaterial()) {
+				return effectiveSpeed();
+			}
 		}
+		return baseSpeed();
+	}
+
+	/**
+	 * returns the action that specifies what animation to play when the items
+	 * is being used
+	 */
+	@Override
+	public EnumAction getItemUseAction(ItemStack par1ItemStack) {
+		return EnumAction.block;
+	}
+
+	/**
+	 * How long it takes to use or consume an item
+	 */
+	@Override
+	public int getMaxItemUseDuration(ItemStack par1ItemStack) {
+		return 72000;
+	}
+
+	/**
+	 * Called whenever this item is equipped and the right mouse button is
+	 * pressed. Args: itemStack, world, entityPlayer
+	 */
+	@Override
+	public ItemStack onItemRightClick(ItemStack stack, World world,
+			EntityPlayer player) {
+		player.setItemInUse(stack, this.getMaxItemUseDuration(stack));
+		return stack;
+	}
+
+	@Override
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world,
+			int x, int y, int z, int side, float clickX, float clickY,
+			float clickZ) {
+		return false;
+	}
+
+	/**
+	 * Returns if the item (tool) can harvest results from the block type.
+	 */
+	@Override
+	public boolean canHarvestBlock(Block block, ItemStack is) {
+		for (int i = 0; i < web.length; i++) {
+			if (block.getMaterial() == web[i])
+				return true;
+		}
+		return super.canHarvestBlock(block, is);
+	}
+
+	protected Material[] getEffectiveMaterials() {
+		return web;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void onUpdate(ItemStack stack, World world, Entity entity, int par4,
+			boolean par5) {
+		super.onUpdate(stack, world, entity, par4, par5);
+		if (entity instanceof EntityPlayerSP) {
+			EntityPlayerSP player = (EntityPlayerSP) entity;
+			ItemStack usingItem = player.getItemInUse();
+			if (usingItem != null && usingItem.getItem() == this) {
+				player.movementInput.moveForward *= 2.5F;
+				player.movementInput.moveStrafe *= 2.5F;
+			}
+		}
+	}
+
+	@Override
+	public String[] getTraits() {
+		return new String[] { "shield", "melee" };
+	}
+
+	public static Material[] web = new Material[] { Material.web,
+			Material.cloth, Material.coral, Material.cake };
+	public static Material[] none = new Material[0];
+
+	protected String getHarvestType() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public int getArrowCount(ItemStack arg0) {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public void setArrowCount(ItemStack arg0, int arg1) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public boolean catchArrow(ItemStack arg0, EntityPlayer arg1,
+			IProjectile arg2) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean sheatheOnBack(ItemStack item) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public void blockAnimation(EntityPlayer arg0, float arg1) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public boolean canBlock(ItemStack arg0, DamageSource arg1) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public int getBashTimer(ItemStack arg0) {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public float getBlockAngle(ItemStack arg0) {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public float getDamageDecayRate(ItemStack arg0, float arg1) {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public float getDamageReduction(ItemStack arg0, DamageSource arg1) {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public float getDecayRate(ItemStack arg0) {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public float getRecoveryRate(ItemStack arg0) {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public Item getAccessoryItem() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getDefaultFolder() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getEffectSuffix() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Item getHeadItem() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getIconSuffix(int arg0) {
+		// TODO Auto-generated method stub
+		return null;
 	}
-}
-@Override
-public String[] getTraits ()
-{
-return new String[] { "shield", "melee" };
-}
-public static Material[] web = new Material[] { Material.web, Material.cloth, Material.coral, Material.cake };
-public static Material[] none = new Material[0];
-
-protected String getHarvestType() {
-	// TODO Auto-generated method stub
-	return null;
-}
-@Override
-public int getArrowCount(ItemStack arg0) {
-	// TODO Auto-generated method stub
-	return 0;
-}
-@Override
-public void setArrowCount(ItemStack arg0, int arg1) {
-	// TODO Auto-generated method stub
-	
-}
-@Override
-public boolean catchArrow(ItemStack arg0, EntityPlayer arg1, IProjectile arg2) {
-	// TODO Auto-generated method stub
-	return false;
-}
-@Override
-public boolean sheatheOnBack(ItemStack item) {
-	// TODO Auto-generated method stub
-	return false;
-}
-@Override
-public void blockAnimation(EntityPlayer arg0, float arg1) {
-	// TODO Auto-generated method stub
-	
-}
-@Override
-public boolean canBlock(ItemStack arg0, DamageSource arg1) {
-	// TODO Auto-generated method stub
-	return false;
-}
-@Override
-public int getBashTimer(ItemStack arg0) {
-	// TODO Auto-generated method stub
-	return 0;
-}
-@Override
-public float getBlockAngle(ItemStack arg0) {
-	// TODO Auto-generated method stub
-	return 0;
-}
-@Override
-public float getDamageDecayRate(ItemStack arg0, float arg1) {
-	// TODO Auto-generated method stub
-	return 0;
-}
-@Override
-public float getDamageReduction(ItemStack arg0, DamageSource arg1) {
-	// TODO Auto-generated method stub
-	return 0;
-}
-@Override
-public float getDecayRate(ItemStack arg0) {
-	// TODO Auto-generated method stub
-	return 0;
-}
-@Override
-public float getRecoveryRate(ItemStack arg0) {
-	// TODO Auto-generated method stub
-	return 0;
-}
-@Override
-public Item getAccessoryItem() {
-	// TODO Auto-generated method stub
-	return null;
-}
-@Override
-public String getDefaultFolder() {
-	// TODO Auto-generated method stub
-	return null;
-}
-@Override
-public String getEffectSuffix() {
-	// TODO Auto-generated method stub
-	return null;
-}
-@Override
-public Item getHeadItem() {
-	// TODO Auto-generated method stub
-	return null;
-}
-@Override
-public String getIconSuffix(int arg0) {
-	// TODO Auto-generated method stub
-	return null;
-}
 }
\ No newline at end of file