Fix freecam causing a stuck loading screen when changing dimensions

Author: IceTank

src/main/java/com/lambda/mixin/network/ClientPlayNetworkHandlerMixin.java

@@ -20,20 +20,27 @@
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.ChatEvent;
 import com.lambda.event.events.InventoryEvent;
+import com.lambda.event.events.PlayerEvent;
 import com.lambda.event.events.WorldEvent;
 import com.lambda.interaction.managers.inventory.InventoryManager;
 import com.lambda.module.modules.movement.Velocity;
 import com.lambda.module.modules.render.NoRender;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.client.network.PlayerListEntry;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityPosition;
 import net.minecraft.network.packet.s2c.play.*;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.Set;
 
 @Mixin(ClientPlayNetworkHandler.class)
 public class ClientPlayNetworkHandlerMixin {
@@ -125,4 +132,25 @@ void onSendMessage(String content, Operation<Void> original) {
         if (!EventFlow.post(event).isCanceled())
             original.call(event.getMessage());
     }
+
+    @Inject(method = "onPlayerRespawn", at = @At("TAIL"))
+    void onPlayerRespawn(PlayerRespawnS2CPacket packet, CallbackInfo ci) {
+        EventFlow.post(new PlayerEvent.World.Respawn(packet));
+    }
+
+    @Inject(method = "onPlayerPositionLook", at = @At("TAIL"))
+    void onPlayerPositionLook(PlayerPositionLookS2CPacket packet, CallbackInfo ci) {
+        EventFlow.post(new PlayerEvent.World.PositionLook(packet));
+    }
+
+    @Inject(method = "setPosition", at = @At("TAIL"))
+    private static void onSetPosition(EntityPosition pos, Set<PositionFlag> flags, Entity entity, boolean bl,
+                                      CallbackInfoReturnable<Boolean> cir) {
+        if (cir.getReturnValue() == false) {
+            var player = MinecraftClient.getInstance().player;
+            assert player != null;
+            var event = new PlayerEvent.World.SetPosition(player.getEntityPos(), player.getVelocity(), player.getYaw(), player.getPitch());
+            EventFlow.post(event);
+        }
+    }
 }

src/main/kotlin/com/lambda/event/events/PlayerEvent.kt

@@ -20,13 +20,16 @@ package com.lambda.event.events
 import com.lambda.event.Event
 import com.lambda.event.callback.Cancellable
 import com.lambda.event.callback.ICancellable
+import net.minecraft.network.packet.s2c.play.PlayerPositionLookS2CPacket
+import net.minecraft.network.packet.s2c.play.PlayerRespawnS2CPacket
 import net.minecraft.screen.ScreenHandler
 import net.minecraft.screen.slot.SlotActionType
 import net.minecraft.util.Hand
 import net.minecraft.util.hit.BlockHitResult
 import net.minecraft.util.hit.EntityHitResult
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Direction
+import net.minecraft.util.math.Vec3d
 
 /**
  * Represents various events that can be triggered by the player during gameplay.
@@ -138,4 +141,21 @@ sealed class PlayerEvent {
         val action: SlotActionType,
         val screenHandler: ScreenHandler,
     ) : ICancellable by Cancellable()
+
+    sealed class World {
+        data class Respawn(
+            val packet: PlayerRespawnS2CPacket
+        ) : Event
+
+        data class PositionLook(
+            val packet: PlayerPositionLookS2CPacket
+        ) : Event
+
+        data class SetPosition(
+            val position: Vec3d,
+            val velocity: Vec3d,
+            val yaw: Float,
+            val pitch: Float
+        ) : Event
+    }
 }

src/main/kotlin/com/lambda/module/modules/player/Freecam.kt

@@ -31,6 +31,7 @@ import com.lambda.interaction.managers.rotating.visibilty.lookAt
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
 import com.lambda.threading.runSafeAutomated
+import com.lambda.util.Communication.info
 import com.lambda.util.Describable
 import com.lambda.util.NamedEnum
 import com.lambda.util.extension.rotation
@@ -83,6 +84,7 @@ object Freecam : Module(
 
     private var rotation: Rotation = Rotation.ZERO
     private var velocity: Vec3d = Vec3d.ZERO
+    private var loading = false
 
     @JvmStatic
     fun updateCam() {
@@ -123,6 +125,21 @@ object Freecam : Module(
             }
         }
 
+        listen<PlayerEvent.World.Respawn> {
+            loading = true
+            info("Respawned, waiting for position look packet to update freecam position...")
+        }
+
+        listen<PlayerEvent.World.SetPosition> {
+            info("Received position look packet, updating freecam position")
+            info("New position: ${it.position}")
+            if (loading) {
+                loading = false
+                position = player.eyePos
+                rotation = player.rotation
+            }
+        }
+
         listen<PlayerEvent.ChangeLookDirection> {
             rotation = rotation.withDelta(
                 it.deltaYaw * SENSITIVITY_FACTOR,