Added Daze Modifier, Texture not working

3 files changed, 334 insertions, 322 deletions

diff --git a/src/main/java/gmail/Lance5057/items/TinkerArmor.java b/src/main/java/gmail/Lance5057/items/TinkerArmor.java
index 0f1aa18..b4be050 100644
--- a/src/main/java/gmail/Lance5057/items/TinkerArmor.java
+++ b/src/main/java/gmail/Lance5057/items/TinkerArmor.java
@@ -10,67 +10,65 @@ import net.minecraft.item.ItemArmor;
 import net.minecraft.item.ItemStack;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-public class TinkerArmor extends ItemArmor
-{ 
-	public TinkerArmor(ArmorMaterial par2EnumArmorMaterial, int par3, int par4)
-	{ 
+
+public class TinkerArmor extends ItemArmor {
+	public TinkerArmor(ArmorMaterial par2EnumArmorMaterial, int par3, int par4) {
 		super(par2EnumArmorMaterial, par3, par4);
 	}
-	
-	@Override 
-	@SideOnly(Side.CLIENT) public void registerIcons(IIconRegister par1IconRegister) 
-	{ 
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerIcons(IIconRegister par1IconRegister) {
 		String itemName = "tinkersdefense:textures/armor/TinkerArmor";
-		this.itemIcon = par1IconRegister.registerIcon(itemName); 
+		this.itemIcon = par1IconRegister.registerIcon(itemName);
 	}
-	
-	@Override 
-	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
-	{
+
+	@Override
+	public String getArmorTexture(ItemStack stack, Entity entity, int slot,
+			String type) {
 		return "tinkersdefense:textures/armor/TinkerArmor.png";
-	} 
-	
+	}
+
 	@Override
-	@SideOnly(Side.CLIENT) public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot)
-	{ 
+	@SideOnly(Side.CLIENT)
+	public ModelBiped getArmorModel(EntityLivingBase entityLiving,
+			ItemStack itemStack, int armorSlot) {
 		ModelBiped armorModel = null;
-		if(itemStack != null)
-		{
-			if(itemStack.getItem() instanceof TinkerArmor)
-			{
-				int type = ((ItemArmor)itemStack.getItem()).armorType;
-				if(type == 1 || type == 3)
-				{ 
+		if (itemStack != null) {
+			if (itemStack.getItem() instanceof TinkerArmor) {
+				int type = ((ItemArmor) itemStack.getItem()).armorType;
+				if (type == 1 || type == 3) {
 					armorModel = TinkersDefense.proxy.getArmorModel(0);
+				} else {
+					armorModel = TinkersDefense.proxy.getArmorModel(1);
 				}
-				else
-				{ 
-					armorModel = TinkersDefense.proxy.getArmorModel(1); 
-					}
-				
-			} 
-			if(armorModel != null)
-			{ 
+
+			}
+			if (armorModel != null) {
 				armorModel.bipedHead.showModel = armorSlot == 0;
 				armorModel.bipedHeadwear.showModel = armorSlot == 0;
-				armorModel.bipedBody.showModel = armorSlot == 1 || armorSlot == 2; armorModel.bipedRightArm.showModel = armorSlot == 1;
+				armorModel.bipedBody.showModel = armorSlot == 1
+						|| armorSlot == 2;
+				armorModel.bipedRightArm.showModel = armorSlot == 1;
 				armorModel.bipedLeftArm.showModel = armorSlot == 1;
-				armorModel.bipedRightLeg.showModel = armorSlot == 2 || armorSlot == 3;
-				armorModel.bipedLeftLeg.showModel = armorSlot == 2 || armorSlot == 3;
+				armorModel.bipedRightLeg.showModel = armorSlot == 2
+						|| armorSlot == 3;
+				armorModel.bipedLeftLeg.showModel = armorSlot == 2
+						|| armorSlot == 3;
 				armorModel.isSneak = entityLiving.isSneaking();
 				armorModel.isRiding = entityLiving.isRiding();
 				armorModel.isChild = entityLiving.isChild();
-				armorModel.heldItemRight = entityLiving.getHeldItem() != null ? 1 :0;
-				
-				if(entityLiving instanceof EntityPlayer)
-				{
-					armorModel.aimedBow =((EntityPlayer)entityLiving).getItemInUseDuration() > 2;
-				} 
+				armorModel.heldItemRight = entityLiving.getHeldItem() != null ? 1
+						: 0;
+
+				if (entityLiving instanceof EntityPlayer) {
+					armorModel.aimedBow = ((EntityPlayer) entityLiving)
+							.getItemInUseDuration() > 2;
+				}
 				return armorModel;
 			}
 		}
-		return armorModel; 
+		return armorModel;
 	}
-	
-	
+
 }
\ No newline at end of file
diff --git a/src/main/java/gmail/Lance5057/items/tools/HeaterShield.java b/src/main/java/gmail/Lance5057/items/tools/HeaterShield.java
index 9d6395e..8455bc2 100644
--- a/src/main/java/gmail/Lance5057/items/tools/HeaterShield.java
+++ b/src/main/java/gmail/Lance5057/items/tools/HeaterShield.java
@@ -24,226 +24,235 @@ import tconstruct.tools.TinkerTools;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-
-public class HeaterShield extends Shield 
-{
+public class HeaterShield extends Shield {
 	int induceDamage = 0;
-public HeaterShield()
-{
-super(0);
-this.setUnlocalizedName("heatershield");
-}
-@Override
-public Item getHeadItem ()
-{
-return TinkerTools.largePlate;
-}
-@Override
-public Item getHandleItem ()
-{
-return TinkerTools.toughRod;
-}
-@Override
-public Item getAccessoryItem ()
-{
-return TinkerTools.largePlate;
-}
-@Override
-public Item getExtraItem ()
-{
-	return TinkerTools.toughBinding;
-}
-@Override
-public int durabilityTypeAccessory ()
-{
-return 2;
-}
-@Override
-public float getRepairCost ()
-{
-return 4.0f;
-}
-@Override
-public float getDurabilityModifier ()
-{
-return 2.5f;
-}
-@Override
-public float breakSpeedModifier ()
-{
-return 0.4f;
-}
-@Override
-public float getDamageModifier ()
-{
-return 1.4f;
-}
-@SideOnly(Side.CLIENT)
-@Override
-public int getPartAmount ()
-{
-return 4;
-}
-@Override
-public String getIconSuffix (int partType)
-{
-switch (partType)
-{
-case 0:
-return "_shield_face";
-case 1:
-return "_shield_face_broken";
-case 2:
-return "_shield_edge";
-case 3:
-return "_shield_face_other";
-case 4:
-return "_shield_binding";
-default:
-return "";
-}
-}
-@Override
-public String getEffectSuffix ()
-{
-return "_shield_effect";
-}
-@Override
-public String getDefaultFolder ()
-{
-return "heatershield";
-}
-/* tool_TinkerShield specific */
-@Override
-public boolean onLeftClickEntity (ItemStack stack, EntityPlayer player, Entity entity)
-{
-if (AbilityHelper.onLeftClickEntity(stack, player, entity, this))
-{
-entity.hurtResistantTime += 7;
-/*
-* if (entity instanceof EntityLiving) { EntityLiving living =
-* (EntityLiving) entity; if (living.getHealth() <= 0) {
-*
-* } }
-*/
-// if (entity.getHealth() <= 0)
-}
-return true;
-}
-@Override
-public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boolean par5)
-{
-super.onUpdate(stack, world, entity, par4, par5);
-
-}
-
-@Override
-public int getArrowCount(ItemStack stack)
-{
-	if(stack.hasTagCompound() && stack.getTagCompound().hasKey("arrows"))
-	{
-		return stack.getTagCompound().getShort("arrows");
-	}
-	else
-		return 0;
-}
-@Override
-public void setArrowCount(ItemStack stack, int count)
-{
-	if(!stack.hasTagCompound()){
-	stack.setTagCompound(new NBTTagCompound());
-	}
-	//Should never happen, you would need A LOT of arrows for this to happen
-	if(count > Short.MAX_VALUE){
-	count = Short.MAX_VALUE;
-	}
-	stack.getTagCompound().setShort("arrows", (short)count);
-}
-@Override
-public boolean catchArrow(ItemStack shield, EntityPlayer player, IProjectile arrow)
-{
-	if(arrow instanceof EntityArrow)
-	{
-		setArrowCount(shield, getArrowCount(shield)+1);
-		player.setArrowCountInEntity(player.getArrowCountInEntity() - 1);
-		((EntityArrow)arrow).setDead();
+
+	public HeaterShield() {
+		super(0);
+		this.setUnlocalizedName("heatershield");
+	}
+
+	@Override
+	public Item getHeadItem() {
+		return TinkerTools.largePlate;
+	}
+
+	@Override
+	public Item getHandleItem() {
+		return TinkerTools.toughRod;
+	}
+
+	@Override
+	public Item getAccessoryItem() {
+		return TinkerTools.largePlate;
+	}
+
+	@Override
+	public Item getExtraItem() {
+		return TinkerTools.toughBinding;
+	}
+
+	@Override
+	public int durabilityTypeAccessory() {
+		return 2;
+	}
+
+	@Override
+	public float getRepairCost() {
+		return 4.0f;
+	}
+
+	@Override
+	public float getDurabilityModifier() {
+		return 2.5f;
+	}
+
+	@Override
+	public float breakSpeedModifier() {
+		return 0.4f;
+	}
+
+	@Override
+	public float getDamageModifier() {
+		return 1.4f;
+	}
+
+	@SideOnly(Side.CLIENT)
+	@Override
+	public int getPartAmount() {
+		return 4;
+	}
+
+	@Override
+	public String getIconSuffix(int partType) {
+		switch (partType) {
+		case 0:
+			return "_shield_face";
+		case 1:
+			return "_shield_face_broken";
+		case 2:
+			return "_shield_edge";
+		case 3:
+			return "_shield_face_other";
+		case 4:
+			return "_shield_binding";
+		default:
+			return "";
+		}
+	}
+
+	@Override
+	public String getEffectSuffix() {
+		return "_shield_effect";
+	}
+
+	@Override
+	public String getDefaultFolder() {
+		return "heatershield";
+	}
+
+	/* tool_TinkerShield specific */
+	@Override
+	public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player,
+			Entity entity) {
+		if (AbilityHelper.onLeftClickEntity(stack, player, entity, this)) {
+			entity.hurtResistantTime += 7;
+			/*
+			 * if (entity instanceof EntityLiving) { EntityLiving living =
+			 * (EntityLiving) entity; if (living.getHealth() <= 0) {
+			 * 
+			 * } }
+			 */
+			// if (entity.getHealth() <= 0)
+		}
 		return true;
 	}
-	return false;
-}
-@Override
-public boolean sheatheOnBack(ItemStack arg0) {
-	return true;
-}
-@Override
-public void blockAnimation(EntityPlayer player, float dmg)
-{
-	player.worldObj.playSoundAtEntity(player, "battlegear2:shield", 1, 1);
-}
-@Override
-public boolean canBlock(ItemStack shield, DamageSource source) {
-	return !source.isUnblockable();
-}
-@Override
-public int getBashTimer(ItemStack arg0) {
-	// TODO Auto-generated method stub
-	return 10;
-}
-@Override
-public float getBlockAngle(ItemStack arg0) {
-	// TODO Auto-generated method stub
-	return 60;
-}
-@Override
-public float getDamageDecayRate(ItemStack shield, float amount) 
-{
-	return 0;
-}
-@Override
-public float getDamageReduction(ItemStack arg0, DamageSource arg1) {
-	return 1f;
-}
-@Override
-public float getDecayRate(ItemStack stack) 
-{
-	NBTTagCompound tags = stack.getTagCompound();
-	float recovery = tags.getCompoundTag("InfiTool").getInteger("MiningSpeed") / 1.5f;
-	return 10f / recovery;
-}
-@Override
-public float getRecoveryRate(ItemStack stack) 
-{
-	NBTTagCompound tags = stack.getTagCompound();
-	float recovery = tags.getCompoundTag("InfiTool").getInteger("MiningSpeed") / 1.5f;
-	return 10f / recovery;
-}
-
-@Override
-@SideOnly(Side.CLIENT)
-public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) 
-{
-	NBTTagCompound tags = par1ItemStack.getTagCompound();
-	super.addInformation(par1ItemStack, par2EntityPlayer, par3List, par4);
-	par3List.add("");
-	par3List.add(EnumChatFormatting.DARK_GREEN+
-	ItemStack.field_111284_a.format( 1F / (10f / (tags.getCompoundTag("InfiTool").getInteger("MiningSpeed")/1.5f)) / 20F)+
-	StatCollector.translateToLocal("attribute.shield.block.time"));
-	int arrowCount = getArrowCount(par1ItemStack);
-	if(arrowCount > 0)
-	{
-		par3List.add(String.format("%s%s %s", EnumChatFormatting.GOLD, arrowCount, StatCollector.translateToLocal("attribute.shield.arrow.count")));
-	}
-}
-@Override
-protected Material[] getEffectiveMaterials ()
-{
-	return materials;
-}
-	static Material[] materials = new Material[] { Material.rock, Material.iron, Material.ice, Material.glass, Material.piston, Material.anvil, Material.circuits };
-
-@Override
-protected String getHarvestType() {
-	// TODO Auto-generated method stub
-	return "pickaxe";
-}
+
+	@Override
+	public void onUpdate(ItemStack stack, World world, Entity entity, int par4,
+			boolean par5) {
+		super.onUpdate(stack, world, entity, par4, par5);
+
+	}
+
+	@Override
+	public int getArrowCount(ItemStack stack) {
+		if (stack.hasTagCompound() && stack.getTagCompound().hasKey("arrows")) {
+			return stack.getTagCompound().getShort("arrows");
+		} else
+			return 0;
+	}
+
+	@Override
+	public void setArrowCount(ItemStack stack, int count) {
+		if (!stack.hasTagCompound()) {
+			stack.setTagCompound(new NBTTagCompound());
+		}
+		// Should never happen, you would need A LOT of arrows for this to
+		// happen
+		if (count > Short.MAX_VALUE) {
+			count = Short.MAX_VALUE;
+		}
+		stack.getTagCompound().setShort("arrows", (short) count);
+	}
+
+	@Override
+	public boolean catchArrow(ItemStack shield, EntityPlayer player,
+			IProjectile arrow) {
+		if (arrow instanceof EntityArrow) {
+			setArrowCount(shield, getArrowCount(shield) + 1);
+			player.setArrowCountInEntity(player.getArrowCountInEntity() - 1);
+			((EntityArrow) arrow).setDead();
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public boolean sheatheOnBack(ItemStack arg0) {
+		return true;
+	}
+
+	@Override
+	public void blockAnimation(EntityPlayer player, float dmg) {
+		player.worldObj.playSoundAtEntity(player, "battlegear2:shield", 1, 1);
+	}
+
+	@Override
+	public boolean canBlock(ItemStack shield, DamageSource source) {
+		return !source.isUnblockable();
+	}
+
+	@Override
+	public int getBashTimer(ItemStack arg0) {
+		// TODO Auto-generated method stub
+		return 10;
+	}
+
+	@Override
+	public float getBlockAngle(ItemStack arg0) {
+		// TODO Auto-generated method stub
+		return 60;
+	}
+
+	@Override
+	public float getDamageDecayRate(ItemStack shield, float amount) {
+		return 0;
+	}
+
+	@Override
+	public float getDamageReduction(ItemStack arg0, DamageSource arg1) {
+		return 1f;
+	}
+
+	@Override
+	public float getDecayRate(ItemStack stack) {
+		NBTTagCompound tags = stack.getTagCompound();
+		float recovery = tags.getCompoundTag("InfiTool").getInteger(
+				"MiningSpeed") / 1.5f;
+		return 10f / recovery;
+	}
+
+	@Override
+	public float getRecoveryRate(ItemStack stack) {
+		NBTTagCompound tags = stack.getTagCompound();
+		float recovery = tags.getCompoundTag("InfiTool").getInteger(
+				"MiningSpeed") / 1.5f;
+		return 10f / recovery;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void addInformation(ItemStack par1ItemStack,
+			EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
+		NBTTagCompound tags = par1ItemStack.getTagCompound();
+		super.addInformation(par1ItemStack, par2EntityPlayer, par3List, par4);
+		par3List.add("");
+		par3List.add(EnumChatFormatting.DARK_GREEN
+				+ ItemStack.field_111284_a
+						.format(1F / (10f / (tags.getCompoundTag("InfiTool")
+								.getInteger("MiningSpeed") / 1.5f)) / 20F)
+				+ StatCollector.translateToLocal("attribute.shield.block.time"));
+		int arrowCount = getArrowCount(par1ItemStack);
+		if (arrowCount > 0) {
+			par3List.add(String.format("%s%s %s", EnumChatFormatting.GOLD,
+					arrowCount, StatCollector
+							.translateToLocal("attribute.shield.arrow.count")));
+		}
+	}
+
+	@Override
+	protected Material[] getEffectiveMaterials() {
+		return materials;
+	}
+
+	static Material[] materials = new Material[] { Material.rock,
+			Material.iron, Material.ice, Material.glass, Material.piston,
+			Material.anvil, Material.circuits };
+
+	@Override
+	protected String getHarvestType() {
+		// TODO Auto-generated method stub
+		return "pickaxe";
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/gmail/Lance5057/items/tools/TinkerWrench.java b/src/main/java/gmail/Lance5057/items/tools/TinkerWrench.java
index bf541a5..7ac7799 100644
--- a/src/main/java/gmail/Lance5057/items/tools/TinkerWrench.java
+++ b/src/main/java/gmail/Lance5057/items/tools/TinkerWrench.java
@@ -26,93 +26,98 @@ import tconstruct.tools.TinkerTools;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-
-public class TinkerWrench extends Weapon implements IToolWrench
-{
+public class TinkerWrench extends Weapon implements IToolWrench {
 	int induceDamage = 0;
-	
-	public TinkerWrench()
-	{
-	super(0);
-	this.setUnlocalizedName("tinkerwrench");
+
+	public TinkerWrench() {
+		super(0);
+		this.setUnlocalizedName("tinkerwrench");
 	}
+
 	@Override
-	public Item getHeadItem ()
-	{
-	return TinkerTools.handGuard;
+	public Item getHeadItem() {
+		return TinkerTools.handGuard;
 	}
+
 	@Override
-	public Item getHandleItem ()
-	{
-	return TinkerTools.toolRod;
+	public Item getHandleItem() {
+		return TinkerTools.toolRod;
 	}
+
 	@Override
-	public Item getAccessoryItem ()
-	{
-	return TinkerTools.binding;
+	public Item getAccessoryItem() {
+		return TinkerTools.binding;
 	}
+
 	@Override
-	public int durabilityTypeAccessory ()
-	{
-	return 2;
+	public int durabilityTypeAccessory() {
+		return 2;
 	}
+
 	@Override
-	public float getRepairCost ()
-	{
-	return 1.0f;
+	public float getRepairCost() {
+		return 1.0f;
 	}
+
 	@Override
-	public float getDurabilityModifier ()
-	{
-	return 2.5f;
+	public float getDurabilityModifier() {
+		return 0.1f;
 	}
+
 	@Override
-	public float getDamageModifier ()
-	{
-	return 0.4f;
+	public float getDamageModifier() {
+		return 0.4f;
 	}
+
 	@SideOnly(Side.CLIENT)
 	@Override
-	public int getPartAmount ()
-	{
-	return 3;
+	public int getPartAmount() {
+		return 3;
 	}
+
 	@Override
-	public String getIconSuffix (int partType)
-	{
-	switch (partType)
-	{
-	case 0:
-	return "_wrench_head";
-	case 1:
-	return "_wrench_head_broken";
-	case 2:
-	return "_wrench_handle";
-	case 3:
-	return "_wrench_binding";
-	default:
-	return "";
-	}
+	public String getIconSuffix(int partType) {
+		switch (partType) {
+		case 0:
+			return "_wrench_head";
+		case 1:
+			return "_wrench_head_broken";
+		case 2:
+			return "_wrench_handle";
+		case 3:
+			return "_wrench_binding";
+		default:
+			return "";
+		}
 	}
+
 	@Override
-	public String getEffectSuffix ()
-	{
-	return "_wrench_effect";
+	public String getEffectSuffix() {
+		return "_wrench_effect";
 	}
+
 	@Override
-	public String getDefaultFolder ()
-	{
-	return "wrench";
+	public String getDefaultFolder() {
+		return "wrench";
 	}
+
 	@Override
-	public boolean canWrench(EntityPlayer player, int x, int y, int z) 
-	{
-		return true;
+	public boolean canWrench(EntityPlayer player, int x, int y, int z) {
+		NBTTagCompound tags = player.inventory.getCurrentItem()
+				.getTagCompound().getCompoundTag("InfiTool");
+
+		if (!tags.getBoolean("Broken")) {
+			return true;
+		}
+		return false;
 	}
+
 	@Override
-	public void wrenchUsed(EntityPlayer player, int x, int y, int z) 
-	{
+	public void wrenchUsed(EntityPlayer player, int x, int y, int z) {
+
 		player.swingItem();
-		AbilityHelper.damageTool(player.getCurrentEquippedItem(), 1, player, false);
+		AbilityHelper.damageTool(player.inventory.getCurrentItem(), 1, player,
+				false);
+
 	}
 }
\ No newline at end of file