fix: mitigate sodium bug in another way

For some reason this didn't get into 1.21.6+, but now here it is

Cherry-picked from bb70ca6

Author: ishland

c2me-base/src/main/java/com/ishland/c2me/base/common/theinterface/PlayerEntityExtension.java

@@ -0,0 +1,7 @@
+package com.ishland.c2me.base.common.theinterface;
+
+public interface PlayerEntityExtension {
+
+    void c2me$onForcedLoaded();
+
+}

c2me-base/src/main/java/com/ishland/c2me/base/mixin/client_movement/MixinClientPlayerEntity.java

@@ -1,22 +1,21 @@
 package com.ishland.c2me.base.mixin.client_movement;
 
-import com.ishland.c2me.base.mixin.access.IPlayerEntity;
-import com.mojang.authlib.GameProfile;
-import net.minecraft.client.network.AbstractClientPlayerEntity;
+import com.ishland.c2me.base.common.theinterface.PlayerEntityExtension;
+import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.client.world.ClientWorld;
+import net.minecraft.network.packet.c2s.play.PlayerLoadedC2SPacket;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(ClientPlayerEntity.class)
-public abstract class MixinClientPlayerEntity extends AbstractClientPlayerEntity {
+public class MixinClientPlayerEntity implements PlayerEntityExtension {
 
-    public MixinClientPlayerEntity(ClientWorld world, GameProfile profile) {
-        super(world, profile);
-    }
+    @Shadow @Final public ClientPlayNetworkHandler networkHandler;
 
     @Override
-    public boolean isLoaded() {
-        return ((IPlayerEntity) this).getLoaded();
+    public void c2me$onForcedLoaded() {
+        this.networkHandler.sendPacket(new PlayerLoadedC2SPacket());
     }
 
 }

c2me-base/src/main/java/com/ishland/c2me/base/mixin/client_movement/MixinPlayerEntity.java

@@ -0,0 +1,30 @@
+package com.ishland.c2me.base.mixin.client_movement;
+
+import com.ishland.c2me.base.common.theinterface.PlayerEntityExtension;
+import net.minecraft.entity.player.PlayerEntity;
+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(PlayerEntity.class)
+public class MixinPlayerEntity implements PlayerEntityExtension {
+
+    @Shadow private boolean loaded;
+
+    @Shadow protected int remainingLoadTicks;
+
+    @Override
+    public void c2me$onForcedLoaded() {
+        // no-op, intended to be overridden
+    }
+
+    @Inject(method = "tickLoaded", at = @At("RETURN"))
+    private void onForcedLoaded(CallbackInfo ci) {
+        if (!this.loaded && this.remainingLoadTicks == 0) {
+            this.c2me$onForcedLoaded();
+        }
+    }
+
+}

c2me-base/src/main/resources/c2me-base.mixins.json

@@ -56,6 +56,7 @@
     "access.IXoroshiro128PlusPlusRandomDeriver",
     "access.IXoroshiro128PlusPlusRandomImpl",
     "access.fapi.IArrayBackedEvent",
+    "client_movement.MixinPlayerEntity",
     "instrumentation.MixinServerChunkManager",
     "report.MixinDedicatedServerWatchdog",
     "scheduler.MixinServerChunkManager",