From d57f8b64a80f30b56172d548ec62718757417e05 Mon Sep 17 00:00:00 2001
From: Bernhard Bonigl <bernhard.bonigl@gmail.com>
Date: Fri, 21 Nov 2014 18:27:33 +0100
Subject: [PATCH] Throwing knives windup is shorter and they nearly don't slow
 you down while doing so. Also minimal javelin buff.

---
 .../tconstruct/weaponry/weapons/Javelin.java  |  2 +-
 .../weaponry/weapons/ThrowingKnife.java       | 21 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/main/java/tconstruct/weaponry/weapons/Javelin.java b/src/main/java/tconstruct/weaponry/weapons/Javelin.java
index 92e8de56f33..936c8b44bba 100644
--- a/src/main/java/tconstruct/weaponry/weapons/Javelin.java
+++ b/src/main/java/tconstruct/weaponry/weapons/Javelin.java
@@ -108,7 +108,7 @@ public float maxAccuracy(ItemStack itemStack) {
 
     @Override
     public int getWindupTime(ItemStack itemStack) {
-        return 20;
+        return 17;
     }
 
     @Override
diff --git a/src/main/java/tconstruct/weaponry/weapons/ThrowingKnife.java b/src/main/java/tconstruct/weaponry/weapons/ThrowingKnife.java
index c109255631d..f1d0205cb1e 100644
--- a/src/main/java/tconstruct/weaponry/weapons/ThrowingKnife.java
+++ b/src/main/java/tconstruct/weaponry/weapons/ThrowingKnife.java
@@ -1,5 +1,6 @@
 package tconstruct.weaponry.weapons;
 
+import net.minecraft.client.entity.EntityPlayerSP;
 import tconstruct.weaponry.client.CrosshairType;
 import tconstruct.weaponry.entity.ThrowingKnifeEntity;
 import tconstruct.library.weaponry.AmmoWeapon;
@@ -58,7 +59,7 @@ public Item getAccessoryItem() {
     }
 
     @Override
-    public int getWindupTime(ItemStack itemStack) { return 30; } // 1 1/2 seconds
+    public int getWindupTime(ItemStack itemStack) { return 15; } // 1 1/2 seconds
 
     @Override
     public float getMinWindupProgress(ItemStack itemStack) {
@@ -90,4 +91,22 @@ public float getProjectileSpeed() {
     public CrosshairType getCrosshairType() {
         return CrosshairType.SPIKE;
     }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boolean par5)
+    {
+        // aiming with throwing knives slows down much less than with a bow
+        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 *= 3.0F;
+                player.movementInput.moveStrafe *= 3.0F;
+            }
+        }
+    }
 }