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

src/main/java/com/replaymod/pathing/player/AbstractTimelinePlayer.java

@@ -10,9 +10,9 @@ import com.replaymod.replay.ReplayHandler;
 import com.replaymod.replaystudio.pathing.path.Keyframe;
 import com.replaymod.replaystudio.pathing.path.Path;
 import com.replaymod.replaystudio.pathing.path.Timeline;
+import net.minecraft.client.Minecraft;
 import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.gameevent.TickEvent;
 
 import javax.annotation.Nullable;
 import java.util.Iterator;
@@ -21,8 +21,10 @@ import java.util.Iterator;
  * Plays a timeline.
  */
 public abstract class AbstractTimelinePlayer {
+    private final Minecraft mc = Minecraft.getMinecraft();
     private final ReplayHandler replayHandler;
     private Timeline timeline;
+    private long lastTime;
     private long lastTimestamp;
     private ListenableFuture<Void> future;
     private SettableFuture<Void> settableFuture;
@@ -58,6 +60,10 @@ public abstract class AbstractTimelinePlayer {
 
         replayHandler.getReplaySender().setSyncModeAndWait();
         FMLCommonHandler.instance().bus().register(this);
+        lastTime = 0;
+        mc.timer = new ReplayTimer(mc.timer);
+        mc.timer.timerSpeed = 1;
+        mc.timer.elapsedPartialTicks = mc.timer.elapsedTicks = 0;
         return future = settableFuture = SettableFuture.create();
     }
 
@@ -70,8 +76,9 @@ public abstract class AbstractTimelinePlayer {
     }
 
     @SubscribeEvent
-    public void onTick(TickEvent.RenderTickEvent event) {
+    public void onTick(ReplayTimer.UpdatedEvent event) {
         if (future.isDone()) {
+            mc.timer = ((ReplayTimer) mc.timer).getWrapped();
             replayHandler.getReplaySender().setAsyncMode(true);
             FMLCommonHandler.instance().bus().unregister(this);
             return;
@@ -80,8 +87,27 @@ public abstract class AbstractTimelinePlayer {
         if (time > lastTimestamp) {
             time = lastTimestamp;
         }
+
+        // Apply to timeline
         timeline.applyToGame(time, replayHandler);
-        if (time == lastTimestamp) {
+
+        // Update minecraft timer
+        long replayTime = replayHandler.getReplaySender().currentTimeStamp();
+        if (lastTime == 0) {
+            // First frame, no change yet
+            lastTime = replayTime;
+        }
+        float timeInTicks = replayTime / 50f;
+        float previousTimeInTicks = lastTime / 50f;
+        float passedTicks = timeInTicks - previousTimeInTicks;
+        mc.timer.elapsedPartialTicks += passedTicks;
+        mc.timer.elapsedTicks = (int) mc.timer.elapsedPartialTicks;
+        mc.timer.elapsedPartialTicks -= mc.timer.elapsedTicks;
+        mc.timer.renderPartialTicks =  mc.timer.elapsedPartialTicks;
+
+        lastTime = replayTime;
+
+        if (time >= lastTimestamp) {
             settableFuture.set(null);
         }
     }

src/main/java/com/replaymod/pathing/player/RealtimeTimelinePlayer.java

@@ -3,7 +3,6 @@ package com.replaymod.pathing.player;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.replaymod.replay.ReplayHandler;
 import com.replaymod.replaystudio.pathing.path.Timeline;
-import net.minecraftforge.fml.common.gameevent.TickEvent;
 
 /**
  * Timeline player using the system time.
@@ -33,7 +32,7 @@ public class RealtimeTimelinePlayer extends AbstractTimelinePlayer {
     }
 
     @Override
-    public void onTick(TickEvent.RenderTickEvent event) {
+    public void onTick(ReplayTimer.UpdatedEvent event) {
         if (secondFrame) {
             secondFrame = false;
             startTime = System.currentTimeMillis();

src/main/java/com/replaymod/pathing/player/ReplayTimer.java

@@ -0,0 +1,32 @@
+package com.replaymod.pathing.player;
+
+import com.replaymod.core.utils.WrappedTimer;
+import net.minecraft.util.Timer;
+import net.minecraftforge.fml.common.FMLCommonHandler;
+import net.minecraftforge.fml.common.eventhandler.Event;
+
+/**
+ * Wrapper around the current timer that prevents the timer from advancing by itself.
+ */
+public class ReplayTimer extends WrappedTimer {
+    private final Timer state = new Timer(0);
+
+    public ReplayTimer(Timer wrapped) {
+        super(wrapped);
+    }
+
+    @Override
+    public void updateTimer() {
+        copy(this, state); // Save our current state
+        super.updateTimer(); // Update current state
+        copy(state, this); // Restore our old state
+        FMLCommonHandler.instance().bus().post(new UpdatedEvent());
+    }
+
+    public Timer getWrapped() {
+        return wrapped;
+    }
+
+    public static class UpdatedEvent extends Event {
+    }
+}