change: fix EntityProjection interpolation from 000 at spawn

Author: zbx1425

src/main/java/cn/zbx1425/projectme/ProjectMe.java

@@ -16,6 +16,7 @@
 import net.minecraft.util.Util;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
+import net.minecraft.world.phys.Vec3;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.ModList;
@@ -35,7 +36,9 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Random;
 import java.util.UUID;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.Supplier;
 
 @Mod(ProjectMe.MOD_ID)
@@ -117,7 +120,7 @@ public static void onServerTick(ServerTickEvent.Pre event) {
             if (synchronizer == null) return;
             if (event.getServer().getTickCount() % CONFIG.syncInterval.value == 0) {
                 synchronizer.notifyPlayerPresence(event.getServer().getPlayerList().getPlayers());
-                // synchronizer.mockPlayerPresence(new Vec3(random.nextDouble(-5, 5), -60, random.nextDouble(-5, 5)));
+//                synchronizer.mockPlayerPresence();
             }
         }
 

src/main/java/cn/zbx1425/projectme/sync/RedisMessage.java

@@ -11,8 +11,7 @@
 import net.minecraft.world.phys.Vec3;
 
 import java.io.IOException;
-import java.util.Random;
-import java.util.UUID;
+import java.util.*;
 
 public class RedisMessage {
 
@@ -62,17 +61,36 @@ public RedisMessage andWithPlayer(ServerPlayer player, boolean isVisible) {
         return this;
     }
 
-    private static final UUID MOCK_PLAYER_UUID = UUID.fromString("8f50bdf3-cb09-4e29-ab76-dc1cf9db86a1");
-    public static RedisMessage mockPlayerPresence(Vec3 position) {
-        RedisMessage result = beginPlayerPresence(1);
-        result.content.writeUUID(MOCK_PLAYER_UUID);
-        result.content.writeBoolean(true);
-        result.content.writeUtf("MalayP");
-        result.content.writeResourceKey(Level.OVERWORLD);
-        Vec3.STREAM_CODEC.encode(result.content, position);
-        result.content.writeFloat(0);
-        result.content.writeFloat(0);
-        result.content.writeFloat(0);
+    private static final ArrayDeque<UUID> mockPlayers = new ArrayDeque<>();
+    private static final Random random = new Random();
+
+    public static List<RedisMessage> mockPlayerPresence() {
+        List<RedisMessage> result = new ArrayList<>();
+        if (random.nextInt(100) < 1) {
+            if (random.nextBoolean() || mockPlayers.size() >= 20) {
+                if (!mockPlayers.isEmpty()) {
+                    UUID playerLeft = mockPlayers.pop();
+                    RedisMessage absencePacket = playerAbsence(playerLeft);
+                    absencePacket.resetInitiator(0);
+                    result.add(absencePacket);
+                }
+            } else {
+                mockPlayers.add(UUID.randomUUID());
+            }
+        }
+        RedisMessage presencePacket = beginPlayerPresence(mockPlayers.size());
+        for (UUID player : mockPlayers) {
+            presencePacket.content.writeUUID(player);
+            presencePacket.content.writeBoolean(true);
+            presencePacket.content.writeUtf(player.toString().substring(0, 8));
+            presencePacket.content.writeResourceKey(Level.OVERWORLD);
+            Vec3.STREAM_CODEC.encode(presencePacket.content, new Vec3(random.nextDouble(-10, 10), -60, random.nextDouble(-10, 10)));
+            presencePacket.content.writeFloat(0);
+            presencePacket.content.writeFloat(0);
+            presencePacket.content.writeFloat(0);
+        }
+        presencePacket.resetInitiator(0);
+        result.add(presencePacket);
         return result;
     }
 
@@ -121,6 +139,14 @@ public boolean isFromSelf() {
         return initiator == INSTANCE_ID;
     }
 
+    public void resetInitiator(long initiator) {
+        this.initiator = initiator;
+        int writerIndex = this.content.writerIndex();
+        this.content.writerIndex(1);
+        this.content.writeLong(initiator);
+        this.content.writerIndex(writerIndex);
+    }
+
     public enum Action {
         PLAYER_PRESENCE, PLAYER_ABSENCE
     }

src/main/java/cn/zbx1425/projectme/sync/Synchronizer.java

@@ -66,8 +66,10 @@ public void notifyPlayerPresence(List<ServerPlayer> players) {
         });
     }
 
-    public void mockPlayerPresence(Vec3 position) {
-        RedisMessage.mockPlayerPresence(position).publishAsync(redisConn);
+    public void mockPlayerPresence() {
+        for (RedisMessage message : RedisMessage.mockPlayerPresence()) {
+            message.publishAsync(redisConn);
+        }
     }
 
     protected void handlePlayerPresence(UUID player, String playerName, ResourceKey<Level> level, Vec3 position,
@@ -82,8 +84,12 @@ protected void handlePlayerPresence(UUID player, String playerName, ResourceKey<
                 return;
             }
             if (currentEntity == null || currentEntity.isRemoved()
+                    || currentEntity.level().getEntity(currentEntity.getId()) == null
                     || !currentEntity.level().dimension().equals(level)) {
                 if (currentEntity != null) {
+                    if (currentEntity.level().getEntity(currentEntity.getId()) == null && !currentEntity.isRemoved()) {
+                        ProjectMe.LOGGER.debug("EntityProjection not in level while not removed, for {}", player);
+                    }
                     currentEntity.discard();
                     currentProjections.remove(player);
                 }
@@ -93,18 +99,24 @@ protected void handlePlayerPresence(UUID player, String playerName, ResourceKey<
                 CompoundTag entityInitData = new CompoundTag();
                 entityInitData.putString("id", ProjectMe.id("projection").toString());
                 entityInitData.store("projectingPlayer", UUIDUtil.CODEC, player);
+                entityInitData.putLong("addedAt", System.currentTimeMillis());
                 entityInitData.putBoolean("NoGravity", true);
                 entityInitData.putString("CustomName", playerName);
-                EntityProjection entity = (EntityProjection) EntityType.loadEntityRecursive(entityInitData, targetLevel, EntitySpawnReason.COMMAND, newEntity -> {
-                    newEntity.moveOrInterpolateTo(position, yRotBody, xRot);
+                EntityProjection entity = (EntityProjection) EntityType.loadEntityRecursive(entityInitData, targetLevel, EntitySpawnReason.DIMENSION_TRAVEL, newEntity -> {
+                    newEntity.setPos(position);
+                    newEntity.setYRot(yRotHead);
+                    newEntity.setXRot(xRot);
+                    newEntity.setYHeadRot(yRotHead);
+                    newEntity.setYBodyRot(yRotBody);
                     return newEntity;
                 });
                 if (entity == null) return;
                 if (!targetLevel.tryAddFreshEntityWithPassengers(entity)) return;
                 currentProjections.put(player, entity);
             } else {
-                currentEntity.moveOrInterpolateTo(position, yRotBody, xRot);
+                currentEntity.moveOrInterpolateTo(position, yRotHead, xRot);
                 currentEntity.setYHeadRot(yRotHead);
+                currentEntity.setYBodyRot(yRotBody);
             }
         });
     }