fix: when doDaylightCycle false, account for sign flip in timeOfDay

Author: hugeblank

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

@@ -1,29 +1,59 @@
 package dev.hugeblank.asahi.client;
 
+import net.fabricmc.loader.api.FabricLoader;
+import org.spongepowered.asm.mixin.Unique;
+
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 public class InterpolatedTickProperty {
-    private double factor = 0;
+    public static final byte TPS = 20;
+
+    private final EvictingList<Double> points = new EvictingList<>(10);
+    private double factor = 1;
     private double remainder = 0;
 
+    private final String prefix;
     private final Consumer<Long> setProperty;
     private final Supplier<Long> getProperty;
 
-    public InterpolatedTickProperty(Consumer<Long> setProperty, Supplier<Long> getProperty) {
+    public InterpolatedTickProperty(String prefix, Consumer<Long> setProperty, Supplier<Long> getProperty) {
+        this.prefix = prefix;
         this.setProperty = setProperty;
         this.getProperty = getProperty;
     }
 
-    public void increment() {
+    public void tick() {
         remainder += factor; // add remainder to factor
         long increment = (long) remainder; // truncate floating value
-        this.setProperty.accept(this.getProperty.get() + increment);
+        setProperty.accept(getProperty.get() + increment);
         // subtract the incremented integer, preserving the floating point remainder for later
         remainder -= increment;
     }
 
-    public void setFactor(double factor) {
-        this.factor = factor;
+    public void update(long serverValue) {
+        int localDiff = (int) (serverValue - getProperty.get());
+        float minMoveFactor = 1f / TPS; // MIN_MOVE_FACTOR
+        points.add((double) (localDiff + TPS) / TPS);
+        double avg = 0, weights = 0; // weighted average
+        int size = points.size();
+        for (int i = 0; i < size; i++) {
+            double weight = size - i + 1;
+            weight *= weight;
+            weights += weight;
+            avg += points.get(i) * weight;
+        }
+        avg /= weights;
+        double factor = avg < 0 ? Math.min(avg, -minMoveFactor) : Math.max(avg, minMoveFactor);
+
+        // If the next value would take more than 60 seconds at the current TPS to reach, just skip to the position.
+        if (Math.abs(serverValue-getProperty.get()) >= 60 * TPS) {
+            this.factor = 1;
+            setProperty.accept(serverValue);
+        } else {
+            this.factor = factor;
+            if (FabricLoader.getInstance().isDevelopmentEnvironment())
+                System.out.format("%s: %s server by %d ticks. Speed: %f\n", prefix, (localDiff < 0 ? "ahead of" : "behind"), Math.abs(localDiff), avg);
+        }
     }
 }

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

@@ -23,8 +23,6 @@
 @Mixin(World.class)
 public abstract class ClientWorldMixin implements ExtendedBlockView, IWorld, AutoCloseable, TimeSmoother {
 
-    @Unique private final EvictingList<Double> points = new EvictingList<>(10);
-    @Unique private long lastPacketTimeOfDay = 0;
     @Unique private boolean shouldTickDay = true;
 
     @Unique private InterpolatedTickProperty timeProperty;
@@ -39,16 +37,16 @@ protected ClientWorldMixin(
     @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);
+            this.timeProperty = new InterpolatedTickProperty("time", this::setTime, this::getTime);
+            this.dayTimeProperty = new InterpolatedTickProperty("timeOfDay", this::setTimeOfDay, this::getTimeOfDay);
         }
     }
 
     @Inject(at=@At("HEAD"), method = "tickTime", cancellable = true)
     public void tickTime(CallbackInfo ci) {
         if (this.isClient) {
-            timeProperty.increment();
-            if (shouldTickDay) dayTimeProperty.increment();
+            timeProperty.tick();
+            if (shouldTickDay) dayTimeProperty.tick();
             ci.cancel();
         }
     }
@@ -65,39 +63,9 @@ public void tickTime(CallbackInfo ci) {
 
     @Override
     public void asahi$updateTimes(WorldTimeUpdateS2CPacket packet) {
-        if (lastPacketTimeOfDay == packet.getTimeOfDay()) {
-            if (!shouldTickDay) {
-                this.setTimeOfDay(packet.getTimeOfDay());
-            }
-            shouldTickDay = false;
-        } else {
-            shouldTickDay = true;
-        }
-
-        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());
-        } else {
-            float minMoveFactor = 1f/ TPS; // MIN_MOVE_FACTOR
-            points.add((double) (localDiff + TPS) / TPS);
-            double avg = 0, weights = 0; // weighted average
-            int size = points.size();
-            for (int i = 0; i < size; i++) {
-                double weight = size - i + 1;
-                weight *= weight;
-                weights += weight;
-                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);
+        shouldTickDay = packet.getTimeOfDay() > 0;
 
-            if (FabricLoader.getInstance().isDevelopmentEnvironment())
-                System.out.format("%s server by %d ticks. Speed: %f\n", (localDiff < 0 ? "ahead of" : "behind"), Math.abs(localDiff), avg);
-        }
-        lastPacketTimeOfDay = packet.getTimeOfDay();
+        timeProperty.update(packet.getTime());
+        dayTimeProperty.update(shouldTickDay ? packet.getTimeOfDay() : packet.getTimeOfDay()*-1);
     }
 }