smooth interpolate

Author: Aspw-w

src/main/java/net/aspw/viaforgeplus/api/AnimationUtils.kt

@@ -2,6 +2,8 @@ package net.aspw.viaforgeplus.api
 
 object AnimationUtils {
 
+    private var overflowEyeHeight = 0f
+
     @JvmStatic
     fun animate(target: Float, current: Float, speed: Float): Float {
         var current = current
@@ -27,4 +29,9 @@ object AnimationUtils {
         }
         return current
     }
+
+    @JvmStatic
+    fun setOverflowEyeHeight(eyeHeight: Float) {
+        overflowEyeHeight = eyeHeight
+    }
 }

src/main/java/net/aspw/viaforgeplus/api/McUpdatesHandler.java

@@ -55,10 +55,10 @@ public void onMotion(MotionEvent event) {
             delta = 0.085f;
 
             if (shouldAnimation()) {
-                eyeHeight = AnimationUtils.animate(END_HEIGHT, eyeHeight, 2 * delta);
+                eyeHeight = AnimationUtils.animate(END_HEIGHT, eyeHeight, 4 * delta);
                 doingEyeRot = true;
             } else if (eyeHeight < START_HEIGHT)
-                eyeHeight = AnimationUtils.animate(START_HEIGHT, eyeHeight, 2 * delta);
+                eyeHeight = AnimationUtils.animate(START_HEIGHT, eyeHeight, 4 * delta);
 
             if (eyeHeight >= START_HEIGHT && doingEyeRot)
                 doingEyeRot = false;

src/main/java/net/aspw/viaforgeplus/api/PacketManager.java

@@ -34,9 +34,9 @@ else if (ProtocolFixer.newerThanOrEqualsTo1_14())
         else delta = 0.154f;
 
         if (mc.thePlayer.isSneaking())
-            eyeHeight = AnimationUtils.animate(END_HEIGHT, eyeHeight, 2 * delta);
+            eyeHeight = AnimationUtils.animate(END_HEIGHT, eyeHeight, 4 * delta);
         else if (eyeHeight < START_HEIGHT)
-            eyeHeight = AnimationUtils.animate(START_HEIGHT, eyeHeight, 2 * delta);
+            eyeHeight = AnimationUtils.animate(START_HEIGHT, eyeHeight, 4 * delta);
     }
 
     @EventTarget

src/main/java/net/aspw/viaforgeplus/injection/forge/mixins/render/MixinEntityRenderer.java

@@ -0,0 +1,38 @@
+package net.aspw.viaforgeplus.injection.forge.mixins.render;
+
+import net.aspw.viaforgeplus.api.AnimationUtils;
+import net.aspw.viaforgeplus.network.MinecraftInstance;
+import net.minecraft.client.renderer.EntityRenderer;
+import net.minecraft.entity.Entity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(EntityRenderer.class)
+public class MixinEntityRenderer {
+
+    @Unique
+    private float height;
+    @Unique
+    private float previousHeight;
+
+    @Redirect(method = "orientCamera", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;getEyeHeight()F"))
+    public float modifyEyeHeight(Entity entity, float partialTicks) {
+        return previousHeight + (height - previousHeight) * partialTicks;
+    }
+
+    @Inject(method = "updateRenderer", at = @At("HEAD"))
+    private void interpolateHeight(CallbackInfo ci) {
+        Entity entity = MinecraftInstance.mc.getRenderViewEntity();
+        float eyeHeight = entity.getEyeHeight();
+        previousHeight = height;
+        if (eyeHeight < height)
+            height = eyeHeight;
+        else
+            height += (eyeHeight - height) * 0.5f;
+        AnimationUtils.setOverflowEyeHeight(height);
+    }
+}

src/main/resources/viaforgeplus.forge.mixins.json

@@ -21,6 +21,7 @@
     "network.MixinNetworkManager$5",
     "network.MixinServerData",
     "packets.MixinC00Handshake",
+    "render.MixinEntityRenderer",
     "render.MixinLayerArmorBase",
     "render.MixinModelBiped"
   ]