Fix (character, portal, enchantment) animations during speed up / slowed down path playback and rendering

src/main/java/com/replaymod/replay/ReplaySender.java

@@ -87,6 +87,11 @@ public class ReplaySender extends ChannelInboundHandlerAdapter {
      */
     protected int lastTimeStamp;
 
+    /**
+     * @see #currentTimeStamp()
+     */
+    protected int currentTimeStamp;
+
     /**
      * The replay file.
      */
@@ -207,11 +212,18 @@ public class ReplaySender extends ChannelInboundHandlerAdapter {
     }
 
     /**
-     * Return the timestamp of the last packet sent.
+     * Return a fake {@link Minecraft#getSystemTime()} value that respects slowdown/speedup/pause and works in both,
+     * sync and async mode.
+     * Note: For sync mode this returns the last value passed to {@link #sendPacketsTill(int)}.
      * @return The timestamp in milliseconds since the start of the replay
      */
     public int currentTimeStamp() {
-        return lastTimeStamp;
+        if (asyncMode) {
+            int timePassed = (int) (System.currentTimeMillis() - lastPacketSent);
+            return lastTimeStamp + (int) (timePassed * getReplaySpeed());
+        } else {
+            return lastTimeStamp;
+        }
     }
 
     /**
@@ -746,9 +758,6 @@ public class ReplaySender extends ChannelInboundHandlerAdapter {
 
                         // Process packet
                         channelRead(ctx, pd.bytes);
-
-                        // Store last timestamp
-                        lastTimeStamp = nextTimeStamp;
                     } catch (EOFException eof) {
                         // Shit! We hit the end before finishing our job! What shall we do now?
                         // well, let's just pretend we're done...
@@ -761,6 +770,7 @@ public class ReplaySender extends ChannelInboundHandlerAdapter {
 
                 // This might be required if we change to async mode anytime soon
                 lastPacketSent = System.currentTimeMillis();
+                lastTimeStamp = timestamp;
             }
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/replaymod/replay/mixin/MixinRenderItem.java

@@ -0,0 +1,21 @@
+package com.replaymod.replay.mixin;
+
+import com.replaymod.replay.ReplayHandler;
+import com.replaymod.replay.ReplayModReplay;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.entity.RenderItem;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(RenderItem.class)
+public class MixinRenderItem {
+    @Redirect(method = "renderEffect", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;getSystemTime()J"))
+    private long getEnchantmentTime() {
+        ReplayHandler replayHandler = ReplayModReplay.instance.getReplayHandler();
+        if (replayHandler != null) {
+            return replayHandler.getReplaySender().currentTimeStamp();
+        }
+        return Minecraft.getSystemTime();
+    }
+}

src/main/java/com/replaymod/replay/mixin/MixinTileEntityEndPortalRenderer.java

@@ -0,0 +1,21 @@
+package com.replaymod.replay.mixin;
+
+import com.replaymod.replay.ReplayHandler;
+import com.replaymod.replay.ReplayModReplay;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.tileentity.TileEntityEndPortalRenderer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(TileEntityEndPortalRenderer.class)
+public class MixinTileEntityEndPortalRenderer {
+    @Redirect(method = "func_180544_a", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;getSystemTime()J"))
+    private long replayModReplay_getEnchantmentTime() {
+        ReplayHandler replayHandler = ReplayModReplay.instance.getReplayHandler();
+        if (replayHandler != null) {
+            return replayHandler.getReplaySender().currentTimeStamp();
+        }
+        return Minecraft.getSystemTime();
+    }
+}