Moved steping to server side, and fixed high step effect after removi…

…ng the boots
SlimeKnights · Jul 26, 2014 · 498e0d8 · 498e0d8
1 parent b4c649c
commit 498e0d8
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 3 deletions.
diff --git a/src/main/java/tconstruct/armor/ArmorAbilities.java b/src/main/java/tconstruct/armor/ArmorAbilities.java
@@ -3,6 +3,7 @@
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import tconstruct.armor.items.TravelGear;
 import tconstruct.armor.player.TPlayerStats;
 import tconstruct.library.modifier.IModifyable;
 import cpw.mods.fml.common.Loader;
@@ -15,11 +16,16 @@ public class ArmorAbilities
     boolean morphed;
     boolean morphLoaded = Loader.isModLoaded("Morph");
 
+    ItemStack prevFeet;
+    double prevMotionY;
+
     @SubscribeEvent
     public void playerTick (TickEvent.PlayerTickEvent event)
     {
         EntityPlayer player = event.player;
         TPlayerStats stats = TPlayerStats.get(player);
+
+        // Wall climb
         if (stats.climbWalls)
         {
             double motionX = player.posX - player.lastTickPosX;
@@ -30,6 +36,31 @@ public void playerTick (TickEvent.PlayerTickEvent event)
                 player.fallDistance = 0.0F;
             }
         }
+
+        //Feet changes
+        ItemStack feet = player.getCurrentArmor(0);
+        if (feet != null)
+        {
+            if (feet.getItem() instanceof IModifyable && !player.isSneaking())
+            {
+                NBTTagCompound tag = feet.getTagCompound().getCompoundTag(((IModifyable) feet.getItem()).getBaseTagName());
+                int sole = tag.getInteger("Slimy Soles");
+                if (sole > 0)
+                {
+                    if (!player.isSneaking() && player.onGround && prevMotionY < -0.4)
+                        player.motionY = -prevMotionY * (Math.min(0.99, sole * 0.2));
+                }
+            }
+            prevMotionY = player.motionY;
+        }
+        if (feet != prevFeet)
+        {
+            if (prevFeet != null && prevFeet.getItem() instanceof TravelGear)
+                player.stepHeight -= 0.6f;
+            if (feet != null && feet.getItem() instanceof TravelGear)
+                player.stepHeight += 0.6f;
+            prevFeet = feet;
+        }
         //TODO: Proper minimap support
         /*ItemStack stack = player.inventory.getStackInSlot(8);
         if (stack != null && stack.getItem() instanceof ItemMap)

diff --git a/src/main/java/tconstruct/armor/ArmorAbilitiesClient.java b/src/main/java/tconstruct/armor/ArmorAbilitiesClient.java
@@ -43,8 +43,8 @@ public void playerTick (TickEvent.PlayerTickEvent event)
             player.fallDistance = 0.0f;
         }
 
-        //Feet changes
-        ItemStack feet = player.getCurrentArmor(0);
+        //Feet changes - moved to server side
+        /*ItemStack feet = player.getCurrentArmor(0);
         if (feet != null)
         {
             if (feet.getItem() instanceof TravelGear && player.stepHeight < 1.0f)
@@ -70,7 +70,7 @@ public void playerTick (TickEvent.PlayerTickEvent event)
             if (feet != null && feet.getItem() instanceof TravelGear)
                 player.stepHeight += 0.6f;
             prevFeet = feet;
-        }
+        }*/
 
         //Legs or wing changes
         /*ItemStack legs = player.getCurrentArmor(1);