From 4783806ed0a1f07aaa057b5dfd32c4fbe0a2071f Mon Sep 17 00:00:00 2001
From: KitsuShadow <spikespiegel19@gmail.com>
Date: Mon, 10 Aug 2015 23:53:08 -0400
Subject: [PATCH] spears

---
 .../tileents/ingots/TileIngotBase.class       | Bin 3205 -> 3205 bytes
 .../medievalcraft/entity/EntityITSpear.java   |  31 ++++++++++++------
 .../renderer/itemrenderer/IRITSpear.java      |   4 +--
 .../tileents/ingots/TileIngotBase.java        |   4 +--
 4 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/bin/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.class b/bin/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.class
index 17e7d692cc8446ebb1044567492295f50298eb5c..7dc57770b299a4da28df4593f3793545b91e560d 100644
GIT binary patch
delta 20
ccmZpbY?a)wo}H0#@&<NsM#jx2*!Qvk07H2OO8@`>

delta 20
ccmZpbY?a)wo}H0p@&<NsMwZPd*!Qvk07I_^Q2+n{

diff --git a/src/main/java/com/kitsu/medievalcraft/entity/EntityITSpear.java b/src/main/java/com/kitsu/medievalcraft/entity/EntityITSpear.java
index 4c156474..f41fa8fe 100644
--- a/src/main/java/com/kitsu/medievalcraft/entity/EntityITSpear.java
+++ b/src/main/java/com/kitsu/medievalcraft/entity/EntityITSpear.java
@@ -106,7 +106,7 @@ public class EntityITSpear extends EntityArrow implements IProjectile {
 
 		this.setSize(0.5F, 0.5F);
 		this.setLocationAndAngles(player.posX, player.posY + (double)player.getEyeHeight(), player.posZ, player.rotationYaw, player.rotationPitch);
-		
+
 		this.posX += (player.getLookVec().xCoord);
 		//this.posY -= 0.10000000149011612D;
 		this.posZ += (player.getLookVec().zCoord);
@@ -179,7 +179,7 @@ public class EntityITSpear extends EntityArrow implements IProjectile {
 	@SideOnly(Side.CLIENT)
 	public void setVelocity(double p_70016_1_, double p_70016_3_, double p_70016_5_)
 	{
-		
+
 		this.motionX = p_70016_1_ ;
 		this.motionY = p_70016_3_ ;
 		this.motionZ = p_70016_5_ ;
@@ -213,7 +213,7 @@ public class EntityITSpear extends EntityArrow implements IProjectile {
 
 		Block block = this.worldObj.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f);
 		//this.getEntityData().setInteger("blockX", this.field_145791_d);
-		
+
 		if (block.getMaterial() != Material.air)
 		{
 			block.setBlockBoundsBasedOnState(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f);
@@ -240,7 +240,7 @@ public class EntityITSpear extends EntityArrow implements IProjectile {
 
 				if (this.ticksInGround == -1)
 				{
-					this.setDead();
+					//this.setDead();
 				}
 			}
 			else
@@ -299,6 +299,7 @@ public class EntityITSpear extends EntityArrow implements IProjectile {
 			if (entity != null)
 			{
 				movingobjectposition = new MovingObjectPosition(entity);
+				this.inGround=true;
 			}
 
 			if (movingobjectposition != null && movingobjectposition.entityHit != null && movingobjectposition.entityHit instanceof EntityPlayer)
@@ -317,6 +318,7 @@ public class EntityITSpear extends EntityArrow implements IProjectile {
 			if (movingobjectposition != null)
 			{
 				if (movingobjectposition.entityHit != null)
+
 				{
 					f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ);
 					int k = MathHelper.ceiling_double_int((double)f2 * this.damage);
@@ -345,7 +347,7 @@ public class EntityITSpear extends EntityArrow implements IProjectile {
 
 							if (!this.worldObj.isRemote)
 							{
-								entitylivingbase.setArrowCountInEntity(entitylivingbase.getArrowCountInEntity() + 1);
+								//entitylivingbase.setArrowCountInEntity(entitylivingbase.getArrowCountInEntity() + 1);
 							}
 
 							if (this.knockbackStrength > 0)
@@ -374,7 +376,7 @@ public class EntityITSpear extends EntityArrow implements IProjectile {
 
 						if (!(movingobjectposition.entityHit instanceof EntityEnderman))
 						{
-							this.setDead();
+							this.inGround = true;
 						}
 					}
 					else
@@ -386,10 +388,11 @@ public class EntityITSpear extends EntityArrow implements IProjectile {
 						this.prevRotationYaw += 180.0F;
 						this.ticksInAir = 0;
 					}
+					this.inGround=true;
 				}
 				else
 				{
-					
+
 					this.field_145791_d = movingobjectposition.blockX;
 					this.field_145792_e = movingobjectposition.blockY;
 					this.field_145789_f = movingobjectposition.blockZ;
@@ -405,7 +408,7 @@ public class EntityITSpear extends EntityArrow implements IProjectile {
 					this.playSound("random.bowhit", 1.0F, 1.2F / (this.rand.nextFloat() * 0.2F + 0.9F));
 					this.inGround = true;
 					this.arrowShake = 7;
-					
+
 
 					if (this.field_145790_g.getMaterial() != Material.air)
 					{
@@ -461,6 +464,14 @@ public class EntityITSpear extends EntityArrow implements IProjectile {
 				this.extinguish();
 			}
 
+			if (movingobjectposition != null)
+			{
+				if (movingobjectposition.entityHit != null)
+				{
+					this.inGround=true;
+				}
+			}
+
 			this.motionX *= (double)f3;
 			this.motionY *= (double)f3;
 			this.motionZ *= (double)f3;
@@ -551,7 +562,7 @@ public class EntityITSpear extends EntityArrow implements IProjectile {
 	@SideOnly(Side.CLIENT)
 	public float getShadowSize()
 	{
-		return 0.0F;
+		return 1.0F;
 	}
 
 	public void setDamage(double p_70239_1_)
@@ -577,6 +588,6 @@ public class EntityITSpear extends EntityArrow implements IProjectile {
 	 */
 	public boolean canAttackWithItem()
 	{
-		return false;
+		return true;
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/IRITSpear.java b/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/IRITSpear.java
index 391448bd..ecb2015f 100644
--- a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/IRITSpear.java
+++ b/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/IRITSpear.java
@@ -96,8 +96,8 @@ public class IRITSpear implements IItemRenderer{
 			//ANGLE, X ROTATE, Y ROTATE, Z ROTATE
 			GL11.glTranslatef(0.0F, 2.0F, 0.0F);
 			//GL11.glRotatef(45F, 1.0F, 0.0F, 0.0F);
-		//	GL11.glRotatef(90F, 0.0F, 0.0F, 1.0F);
-		//	GL11.glRotatef(45F, 0.0F, -1.0F, 0.0F);
+			//GL11.glRotatef(90F, 0.0F, 0.0F, 1.0F);
+			//GL11.glRotatef(45F, 0.0F, -1.0F, 0.0F);
 
 			//GL11.glRotated(-85, 1.0, 0.0, 0.0);
 			//GL11.glRotated(50, 0.0F, 0.0F, 1.0F);
diff --git a/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.java b/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.java
index 6266ff33..b46fc80e 100644
--- a/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.java
+++ b/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.java
@@ -15,10 +15,10 @@ public class TileIngotBase extends TileEntity implements AnvilUtil{
 
 	private String specName;
 	public int hits = 0;
-	protected int heatBase = 300;
+	public int heatBase = 300;
 	public int coolTicks = 250;
 	public int heatTicks = 300;
-	protected int coolBase = 250;
+	public int coolBase = 250;
 	public boolean hot;
 
 	public TileIngotBase(String name){