From de3f4dab7e18b653855cb07cc3dd0b1f18dd7222 Mon Sep 17 00:00:00 2001
From: Jonas Herzig <me@johni0702.de>
Date: Sun, 15 Aug 2021 18:55:10 +0200
Subject: [PATCH] Pause path playback while resource pack is loading (closes
 #540)

---
 .../player/RealtimeTimelinePlayer.java        | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/replaymod/pathing/player/RealtimeTimelinePlayer.java b/src/main/java/com/replaymod/pathing/player/RealtimeTimelinePlayer.java
index d26ca2f0..af53c5b8 100644
--- a/src/main/java/com/replaymod/pathing/player/RealtimeTimelinePlayer.java
+++ b/src/main/java/com/replaymod/pathing/player/RealtimeTimelinePlayer.java
@@ -3,6 +3,7 @@ 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.minecraft.client.MinecraftClient;
 
 /**
  * Timeline player using the system time.
@@ -21,6 +22,9 @@ public class RealtimeTimelinePlayer extends AbstractTimelinePlayer {
      */
     private long startTime;
 
+    private boolean loadingResources;
+    private long timeBeforeResourceLoading;
+
     public RealtimeTimelinePlayer(ReplayHandler replayHandler) {
         super(replayHandler);
     }
@@ -28,6 +32,7 @@ public class RealtimeTimelinePlayer extends AbstractTimelinePlayer {
     @Override
     public ListenableFuture<Void> start(Timeline timeline) {
         firstFrame = true;
+        loadingResources = false;
         return super.start(timeline);
     }
 
@@ -35,9 +40,25 @@ public class RealtimeTimelinePlayer extends AbstractTimelinePlayer {
     public void onTick() {
         if (secondFrame) {
             secondFrame = false;
-            startTime = System.currentTimeMillis();
+            startTime = System.currentTimeMillis() - startOffset;
         }
+
+        //#if MC>=11400
+        if (MinecraftClient.getInstance().getOverlay() != null) {
+            if (!loadingResources) {
+                timeBeforeResourceLoading = getTimePassed();
+                loadingResources = true;
+            }
+            super.onTick();
+            return;
+        } else if (loadingResources && !firstFrame) {
+            startTime = System.currentTimeMillis() - timeBeforeResourceLoading;
+            loadingResources = false;
+        }
+        //#endif
+
         super.onTick();
+
         if (firstFrame) {
             firstFrame = false;
             secondFrame = true;
@@ -46,6 +67,8 @@ public class RealtimeTimelinePlayer extends AbstractTimelinePlayer {
 
     @Override
     public long getTimePassed() {
-        return startOffset + (firstFrame ? 0 : System.currentTimeMillis() - startTime);
+        if (firstFrame) return 0;
+        if (loadingResources) return timeBeforeResourceLoading;
+        return System.currentTimeMillis() - startTime;
     }
 }