From 3bb73019a5513c5d5d9ce4f8fa0558f3ee3934e9 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Fri, 10 Oct 2014 12:39:14 +0200 Subject: [PATCH] Make glove haste actually work. --- .../java/tconstruct/armor/TinkerArmor.java | 2 ++ .../tconstruct/armor/TinkerArmorEvents.java | 20 +++++++++++++++---- .../tconstruct/armor/player/TPlayerStats.java | 1 - 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/main/java/tconstruct/armor/TinkerArmor.java b/src/main/java/tconstruct/armor/TinkerArmor.java index ec389155..747ef6a5 100644 --- 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 index 690ddb4b..90367e0a 100644 --- a/src/main/java/tconstruct/armor/TinkerArmorEvents.java +++ b/src/main/java/tconstruct/armor/TinkerArmorEvents.java @@ -58,10 +58,22 @@ public class TinkerArmorEvents @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 index d8633976..444e282b 100644 --- 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;