feat: 1.20.4

Author: hugeblank

gradle.properties

@@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://modmuss50.me/fabric.html
-	minecraft_version=1.20.1
-	yarn_mappings=23w32a+build.6
-	loader_version=0.14.21
+	minecraft_version=1.20.4
+	yarn_mappings=1.20.4+build.3
+	loader_version=0.15.6
 
 # Mod Properties
 	mod_version = 1.0.3

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

@@ -3,5 +3,5 @@
 import net.minecraft.network.packet.s2c.play.WorldTimeUpdateS2CPacket;
 
 public interface TimeSmoother {
-    void updateTimes(WorldTimeUpdateS2CPacket packet);
+    void asahi$updateTimes(WorldTimeUpdateS2CPacket packet);
 }

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

@@ -1,30 +1,33 @@
 package dev.hugeblank.asahi.client.mixin;
 
 import dev.hugeblank.asahi.client.TimeSmoother;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.network.ClientCommonNetworkHandler;
+import net.minecraft.client.network.ClientConnectionState;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
-import net.minecraft.client.util.telemetry.WorldSession;
 import net.minecraft.client.world.ClientWorld;
+import net.minecraft.network.ClientConnection;
 import net.minecraft.network.packet.s2c.play.WorldTimeUpdateS2CPacket;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ClientPlayNetworkHandler.class)
-public class ClientPlayNetworkHandlerMixin {
-    @Shadow
-    private ClientWorld world;
+public abstract class ClientPlayNetworkHandlerMixin extends ClientCommonNetworkHandler {
 
-    @Final
-    @Shadow
-    private WorldSession field_34963;
+
+    @Shadow public abstract ClientWorld getWorld();
+
+    protected ClientPlayNetworkHandlerMixin(MinecraftClient client, ClientConnection connection, ClientConnectionState connectionState) {
+        super(client, connection, connectionState);
+    }
 
     @Inject(at=@At(value="INVOKE", target = "Lnet/minecraft/client/world/ClientWorld;setTime(J)V"), method="onWorldTimeUpdate(Lnet/minecraft/network/packet/s2c/play/WorldTimeUpdateS2CPacket;)V", cancellable = true)
     private void clearTickable(WorldTimeUpdateS2CPacket packet, CallbackInfo ci) {
-        ((TimeSmoother) world).updateTimes(packet);
-        field_34963.setTick(packet.getTime());
+        ((TimeSmoother) getWorld()).asahi$updateTimes(packet);
+        worldSession.setTick(packet.getTime());
         ci.cancel();
     }
 }

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

@@ -44,17 +44,6 @@ protected ClientWorldMixin(
         super(properties, registryRef, registryManager, dimensionEntry, profiler, isClient, debugWorld, biomeAccess, maxChainedNeighborUpdates);
     }
 
-    @Unique
-    private void setTime(long time) {
-        this.clientWorldProperties.setTime(time);
-    }
-
-    @Unique
-    private void setTimeOfDay(long timeOfDay) {
-        this.clientWorldProperties.setTimeOfDay(timeOfDay);
-    }
-
-
     /**
      * @author hugeblank
      * @reason Smooth out daylight cycle & remove client de-sync jitter.
@@ -63,22 +52,22 @@ private void setTimeOfDay(long timeOfDay) {
     private void tickTime() {
         remainder += factor;
         long increment = (long) remainder;
-        setTime(properties.getTime() + increment);
+        clientWorldProperties.setTime(properties.getTime() + increment);
         if (properties.getGameRules().getBoolean(GameRules.DO_DAYLIGHT_CYCLE)) {
-            setTimeOfDay(properties.getTimeOfDay() + increment);
+            clientWorldProperties.setTimeOfDay(properties.getTimeOfDay() + increment);
         }
         remainder = remainder - increment;
     }
 
     @Override
-    public void updateTimes(WorldTimeUpdateS2CPacket packet) {
+    public void asahi$updateTimes(WorldTimeUpdateS2CPacket packet) {
         long currentPacketTime = packet.getTimeOfDay();
         long localDiff = currentPacketTime - properties.getTimeOfDay();
         // System.out.println("packetDiff: " + packetDiff);
         // System.out.println("localDiff: " + localDiff); // TODO: Debug logging that doesn't show up in prod
         if (Math.abs(localDiff) >= Constants.SKIP_DURATION) {
-            setTime(packet.getTime());
-            setTimeOfDay(packet.getTimeOfDay());
+            clientWorldProperties.setTime(packet.getTime());
+            clientWorldProperties.setTimeOfDay(packet.getTimeOfDay());
             factor = 1;
         } else {
             long packetDiff = currentPacketTime - lastPacketTime;