Make glove haste actually work.

SlimeKnights · Oct 10, 2014 · 3bb7301 · 3bb7301
1 parent e3c3fa3
commit 3bb7301
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/src/main/java/tconstruct/armor/TinkerArmor.java b/src/main/java/tconstruct/armor/TinkerArmor.java
@@ -47,11 +47,13 @@ public class TinkerArmor
     // public static Item netherPattern;
     public static Block dryingRack;
     // Wearables
+    /*
     public static Item heavyHelmet;
     public static Item heavyChestplate;
     public static Item heavyPants;
     public static Item heavyBoots;
     public static Item glove;
+    */
     public static Item knapsack;
     public static Item heartCanister;
     // Armor - basic

diff --git a/src/main/java/tconstruct/armor/TinkerArmorEvents.java b/src/main/java/tconstruct/armor/TinkerArmorEvents.java
@@ -58,10 +58,22 @@ public void onLivingDrop (LivingDropsEvent event)
     @SubscribeEvent
     public void armorMineSpeed (net.minecraftforge.event.entity.player.PlayerEvent.BreakSpeed event)
     {
-        TPlayerStats stats = TPlayerStats.get(event.entityPlayer);
-        float modifier = 1f + stats.mineSpeed / 1000f;
-        float base = stats.mineSpeed / 250f;
-        event.newSpeed = (event.newSpeed + base) * modifier;
+        if(event.entityPlayer == null)
+            return;
+
+        ItemStack glove = TPlayerStats.get(event.entityPlayer).armor.getStackInSlot(1);
+        if(event.entityPlayer.worldObj.isRemote) // todo: sync extended inventory with clients so this stuff and rendering is done properly...
+            glove = ArmorProxyClient.armorExtended.getStackInSlot(1);
+        if(glove == null || !glove.hasTagCompound())
+            return;
+
+        // ok, we got a glove. bonus mining speeeeed
+        NBTTagCompound tags = glove.getTagCompound().getCompoundTag(TinkerArmor.travelGlove.getBaseTagName());
+        float mineSpeed = tags.getInteger("MiningSpeed");
+
+        float modifier = 1f + mineSpeed / 1000f;
+        float base = mineSpeed / 250f;
+        event.newSpeed = (event.originalSpeed + base) * modifier;
     }
 
     @SubscribeEvent

diff --git a/src/main/java/tconstruct/armor/player/TPlayerStats.java b/src/main/java/tconstruct/armor/player/TPlayerStats.java
@@ -20,7 +20,6 @@ public class TPlayerStats implements IExtendedEntityProperties, IPlayerExtendedI
     public int damage;
     public int hunger;
     public int previousDimension;
-    public int mineSpeed;
 
     public boolean climbWalls;
     public boolean activeGoggles = true;