fix: Add interpolated tick properties for both time and timeOfDay

Author: hugeblank

src/main/java/dev/hugeblank/asahi/client/InterpolatedTickProperty.java

@@ -0,0 +1,29 @@
+package dev.hugeblank.asahi.client;
+
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+
+public class InterpolatedTickProperty {
+    private double factor = 0;
+    private double remainder = 0;
+
+    private final Consumer<Long> setProperty;
+    private final Supplier<Long> getProperty;
+
+    public InterpolatedTickProperty(Consumer<Long> setProperty, Supplier<Long> getProperty) {
+        this.setProperty = setProperty;
+        this.getProperty = getProperty;
+    }
+
+    public void increment() {
+        remainder += factor; // add remainder to factor
+        long increment = (long) remainder; // truncate floating value
+        this.setProperty.accept(this.getProperty.get() + increment);
+        // subtract the incremented integer, preserving the floating point remainder for later
+        remainder -= increment;
+    }
+
+    public void setFactor(double factor) {
+        this.factor = factor;
+    }
+}

src/main/java/dev/hugeblank/asahi/client/mixin/ClientWorldMixin.java

@@ -2,6 +2,7 @@
 
 import dev.hugeblank.asahi.client.EvictingList;
 import dev.hugeblank.asahi.client.TimeSmoother;
+import dev.hugeblank.asahi.client.InterpolatedTickProperty;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.network.packet.WorldTimeUpdateS2CPacket;
 import net.minecraft.util.profiler.Profiler;
@@ -23,26 +24,31 @@
 public abstract class ClientWorldMixin implements ExtendedBlockView, IWorld, AutoCloseable, TimeSmoother {
 
     @Unique private final EvictingList<Double> points = new EvictingList<>(10);
-    @Unique private double factor = 0D;
-    @Unique private double remainder = 0D;
     @Unique private long lastPacketTimeOfDay = 0;
     @Unique private boolean shouldTickDay = true;
 
+    @Unique private InterpolatedTickProperty timeProperty;
+    @Unique private InterpolatedTickProperty dayTimeProperty;
+
     protected ClientWorldMixin(
             LevelProperties levelProperties, DimensionType dimensionType, BiFunction<World, Dimension, ChunkManager> biFunction, Profiler profiler, boolean bl
     ) {
         super();
     }
 
+    @Inject(at=@At("TAIL"), method = "<init>")
+    private void init(LevelProperties levelProperties, DimensionType dimensionType, BiFunction biFunction, Profiler profiler, boolean bl, CallbackInfo ci) {
+        if (this.isClient) {
+            this.timeProperty = new InterpolatedTickProperty(this::setTime, this::getTime);
+            this.dayTimeProperty = new InterpolatedTickProperty(this::setTimeOfDay, this::getTimeOfDay);
+        }
+    }
+
     @Inject(at=@At("HEAD"), method = "tickTime", cancellable = true)
     public void tickTime(CallbackInfo ci) {
         if (this.isClient) {
-            remainder += factor; // add remainder to factor
-            long increment = (long) remainder; // truncate floating value
-            this.setTime(this.getTime() + increment);
-            if (shouldTickDay) this.setTimeOfDay(this.getTimeOfDay() + increment);
-            // subtract the incremented integer, preserving the floating point remainder for later
-            remainder -= increment;
+            timeProperty.increment();
+            if (shouldTickDay) dayTimeProperty.increment();
             ci.cancel();
         }
     }
@@ -59,8 +65,6 @@ public void tickTime(CallbackInfo ci) {
 
     @Override
     public void asahi$updateTimes(WorldTimeUpdateS2CPacket packet) {
-        final int TPS = 20;
-        long currentPacketTime = packet.getTime();
         if (lastPacketTimeOfDay == packet.getTimeOfDay()) {
             if (!shouldTickDay) {
                 this.setTimeOfDay(packet.getTimeOfDay());
@@ -69,7 +73,9 @@ public void tickTime(CallbackInfo ci) {
         } else {
             shouldTickDay = true;
         }
-        int localDiff = (int) (currentPacketTime - this.getTime());
+
+        final int TPS = 20;
+        int localDiff = (int) (packet.getTime() - this.getTime());
         if (Math.abs(localDiff) >= 60 * TPS) { // SKIP_DURATION
             this.setTime(packet.getTime());
             if (shouldTickDay) this.setTimeOfDay(packet.getTimeOfDay());
@@ -85,10 +91,13 @@ public void tickTime(CallbackInfo ci) {
                 avg += points.get(i)*weight;
             }
             avg /= weights;
+            double factor = avg < 0 ? Math.min(avg, -minMoveFactor) : Math.max(avg, minMoveFactor);
+            timeProperty.setFactor(factor);
+            dayTimeProperty.setFactor(factor);
+
             if (FabricLoader.getInstance().isDevelopmentEnvironment())
-                System.out.println((localDiff < 0 ? "ahead of" : "behind") + " server by " + Math.abs(localDiff) + " ticks. Speed: " + avg);
-            factor = avg < 0 ? Math.min(avg, -minMoveFactor) : Math.max(avg, minMoveFactor);
-            lastPacketTimeOfDay = packet.getTimeOfDay();
+                System.out.format("%s server by %d ticks. Speed: %f\n", (localDiff < 0 ? "ahead of" : "behind"), Math.abs(localDiff), avg);
         }
+        lastPacketTimeOfDay = packet.getTimeOfDay();
     }
 }