nmd/ForgeCraft
2
2
Fork 0
Code Issues Pull Requests Releases Wiki Activity

spears

Browse Source
This commit is contained in:
KitsuShadow
2015-08-10 23:53:08 -04:00
parent b1eb1a3bcc
commit 4783806ed0
4 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.class
View File

Binary file not shown.

21
src/main/java/com/kitsu/medievalcraft/entity/EntityITSpear.java
View File

@@ -240,7 +240,7 @@ public class EntityITSpear extends EntityArrow implements IProjectile {
if (this.ticksInGround == -1) if (this.ticksInGround == -1)
{ {
this.setDead(); //this.setDead();
} }
} }
else else
@@ -299,6 +299,7 @@ public class EntityITSpear extends EntityArrow implements IProjectile {
if (entity != null) if (entity != null)
{ {
movingobjectposition = new MovingObjectPosition(entity); movingobjectposition = new MovingObjectPosition(entity);
this.inGround=true;
} }
if (movingobjectposition != null && movingobjectposition.entityHit != null && movingobjectposition.entityHit instanceof EntityPlayer) 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 != null)
{ {
if (movingobjectposition.entityHit != null) if (movingobjectposition.entityHit != null)
{ {
f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); 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); 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) if (!this.worldObj.isRemote)
{ {
entitylivingbase.setArrowCountInEntity(entitylivingbase.getArrowCountInEntity() + 1); //entitylivingbase.setArrowCountInEntity(entitylivingbase.getArrowCountInEntity() + 1);
} }
if (this.knockbackStrength > 0) if (this.knockbackStrength > 0)
@@ -374,7 +376,7 @@ public class EntityITSpear extends EntityArrow implements IProjectile {
if (!(movingobjectposition.entityHit instanceof EntityEnderman)) if (!(movingobjectposition.entityHit instanceof EntityEnderman))
{ {
this.setDead(); this.inGround = true;
} }
} }
else else
@@ -386,6 +388,7 @@ public class EntityITSpear extends EntityArrow implements IProjectile {
this.prevRotationYaw += 180.0F; this.prevRotationYaw += 180.0F;
this.ticksInAir = 0; this.ticksInAir = 0;
} }
this.inGround=true;
} }
else else
{ {
@@ -461,6 +464,14 @@ public class EntityITSpear extends EntityArrow implements IProjectile {
this.extinguish(); this.extinguish();
} }
if (movingobjectposition != null)
{
if (movingobjectposition.entityHit != null)
{
this.inGround=true;
}
}
this.motionX *= (double)f3; this.motionX *= (double)f3;
this.motionY *= (double)f3; this.motionY *= (double)f3;
this.motionZ *= (double)f3; this.motionZ *= (double)f3;
@@ -551,7 +562,7 @@ public class EntityITSpear extends EntityArrow implements IProjectile {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public float getShadowSize() public float getShadowSize()
{ {
return 0.0F; return 1.0F;
} }
public void setDamage(double p_70239_1_) public void setDamage(double p_70239_1_)
@@ -577,6 +588,6 @@ public class EntityITSpear extends EntityArrow implements IProjectile {
*/ */
public boolean canAttackWithItem() public boolean canAttackWithItem()
{ {
return false; return true;
} }
} }

4
src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/IRITSpear.java
View File

@@ -96,8 +96,8 @@ public class IRITSpear implements IItemRenderer{
//ANGLE, X ROTATE, Y ROTATE, Z ROTATE //ANGLE, X ROTATE, Y ROTATE, Z ROTATE
GL11.glTranslatef(0.0F, 2.0F, 0.0F); GL11.glTranslatef(0.0F, 2.0F, 0.0F);
//GL11.glRotatef(45F, 1.0F, 0.0F, 0.0F); //GL11.glRotatef(45F, 1.0F, 0.0F, 0.0F);
// GL11.glRotatef(90F, 0.0F, 0.0F, 1.0F); //GL11.glRotatef(90F, 0.0F, 0.0F, 1.0F);
// GL11.glRotatef(45F, 0.0F, -1.0F, 0.0F); //GL11.glRotatef(45F, 0.0F, -1.0F, 0.0F);
//GL11.glRotated(-85, 1.0, 0.0, 0.0); //GL11.glRotated(-85, 1.0, 0.0, 0.0);
//GL11.glRotated(50, 0.0F, 0.0F, 1.0F); //GL11.glRotated(50, 0.0F, 0.0F, 1.0F);

4
src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.java
View File

@@ -15,10 +15,10 @@ public class TileIngotBase extends TileEntity implements AnvilUtil{
private String specName; private String specName;
public int hits = 0; public int hits = 0;
protected int heatBase = 300; public int heatBase = 300;
public int coolTicks = 250; public int coolTicks = 250;
public int heatTicks = 300; public int heatTicks = 300;
protected int coolBase = 250; public int coolBase = 250;
public boolean hot; public boolean hot;
public TileIngotBase(String name){ public TileIngotBase(String name){