Improve data persistence and history tracking logic

Closes #602 and #604

Author: robotgryphon

neoforge-main/src/main/java/dev/compactmods/machines/CompactMachinesCommon.java

@@ -9,6 +9,7 @@
 import dev.compactmods.machines.dimension.WorldBorderFixer;
 import dev.compactmods.machines.machine.Machines;
 import dev.compactmods.machines.network.CMNetworks;
+import dev.compactmods.machines.player.PlayerEventHandler;
 import dev.compactmods.machines.room.Rooms;
 import dev.compactmods.machines.room.block.ProtectedBlockEventHandler;
 import dev.compactmods.machines.room.upgrade.RoomUpgrades;
@@ -54,6 +55,7 @@ private static void registerEvents(IEventBus modBus) {
         Rooms.registerEvents(modBus);
         RoomUpgrades.registerEvents(modBus);
         WorldBorderFixer.registerEvents();
+        PlayerEventHandler.registerEvents();
 
         modBus.addListener(CompactMachinesCommon::commonSetup);
         modBus.addListener(CMFeaturePacks::addFeaturePacks);

neoforge-main/src/main/java/dev/compactmods/machines/data/manager/CMSingletonDataFileManager.java

@@ -1,9 +1,11 @@
 package dev.compactmods.machines.data.manager;
 
 import dev.compactmods.machines.LoggingUtil;
+import dev.compactmods.machines.api.room.data.CMRoomDataLocations;
 import dev.compactmods.machines.data.CMDataFile;
 import dev.compactmods.machines.data.CodecHolder;
 import dev.compactmods.machines.data.DataFileUtil;
+import dev.compactmods.machines.player.PlayerEntryPointHistoryManager;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtIo;
 import net.minecraft.nbt.NbtOps;
@@ -14,47 +16,58 @@
 
 /**
  * A codec-backed file that stores a single data instance.
+ *
  * @param <T>
  */
 public class CMSingletonDataFileManager<T extends CMDataFile & CodecHolder<T>> implements IDataFileManager<T> {
 
-   protected final MinecraftServer server;
-   private final String dataKey;
-   private final T instance;
-
-   public CMSingletonDataFileManager(MinecraftServer server, String dataKey, T instance) {
-	  this.server = server;
-	  this.dataKey = dataKey;
-	  this.instance = instance;
-   }
-
-   public T data() {
-	  return this.instance;
-   }
-
-   private void ensureFileReady() {
-	  var dir = instance.getDataLocation(server);
-	  DataFileUtil.ensureDirExists(dir);
-   }
-
-   public void save() {
-	  if (instance != null) {
-		 ensureFileReady();
-
-		 var fullData = new CompoundTag();
-		 fullData.putString("version", instance.getDataVersion());
-
-		 var fileData = instance.codec()
-			 .encodeStart(NbtOps.INSTANCE, instance)
-			 .getOrThrow();
-
-		 fullData.put("data", fileData);
-
-		 try {
-			 IOUtilities.writeNbtCompressed(fullData, instance.getDataLocation(server).resolve(dataKey + ".dat"));
-		 } catch (IOException e) {
-			LoggingUtil.modLog().error("Failed to write data: " + e.getMessage(), e);
-		 }
-	  }
-   }
+    protected final MinecraftServer server;
+    private final String dataKey;
+    private T instance;
+
+    public CMSingletonDataFileManager(MinecraftServer server, String dataKey, T instance) {
+        this.server = server;
+        this.dataKey = dataKey;
+        this.instance = instance;
+    }
+
+    public void load() {
+        final var file = instance.getDataLocation(server)
+                .resolve(dataKey + ".dat")
+                .toFile();
+
+        if (file.exists()) {
+            this.instance = DataFileUtil.loadFileWithCodec(file, instance.codec());
+        }
+    }
+
+    public T data() {
+        return this.instance;
+    }
+
+    private void ensureFileReady() {
+        var dir = instance.getDataLocation(server);
+        DataFileUtil.ensureDirExists(dir);
+    }
+
+    public void save() {
+        if (instance != null) {
+            ensureFileReady();
+
+            var fullData = new CompoundTag();
+            fullData.putString("version", instance.getDataVersion());
+
+            var fileData = instance.codec()
+                    .encodeStart(NbtOps.INSTANCE, instance)
+                    .getOrThrow();
+
+            fullData.put("data", fileData);
+
+            try {
+                IOUtilities.writeNbtCompressed(fullData, instance.getDataLocation(server).resolve(dataKey + ".dat"));
+            } catch (IOException e) {
+                LoggingUtil.modLog().error("Failed to write data: " + e.getMessage(), e);
+            }
+        }
+    }
 }

neoforge-main/src/main/java/dev/compactmods/machines/player/PlayerEntryPointHistoryManager.java

@@ -7,7 +7,6 @@
 import dev.compactmods.feather.node.Node;
 import dev.compactmods.feather.traversal.GraphNodeTransformationFunction;
 import dev.compactmods.machines.api.CompactMachines;
-import dev.compactmods.machines.api.dimension.CompactDimension;
 import dev.compactmods.machines.api.room.data.CMRoomDataLocations;
 import dev.compactmods.machines.api.room.history.IPlayerEntryPointHistoryManager;
 import dev.compactmods.machines.api.room.history.PlayerRoomHistoryEntry;
@@ -82,7 +81,7 @@ private PlayerEntryPointHistoryManager(int maxDepth, Map<UUID, List<PlayerRoomHi
             entry.getValue()
                     .stream()
                     .sorted(Comparator.comparing(PlayerRoomHistoryEntry::instant))
-                    .forEach(hist -> enterRoom(entry.getKey(), hist));
+                    .forEach(hist -> addRoomEntryUnsafe(entry.getKey(), hist));
         }
     }
 
@@ -141,6 +140,10 @@ public RoomEntryResult enterRoom(UUID player, PlayerRoomHistoryEntry history) {
         if (!CompactMachines.isValidRoomCode(history.roomCode()))
             return RoomEntryResult.FAILED_ROOM_INVALID;
 
+        return addRoomEntryUnsafe(player, history);
+    }
+
+    private @NotNull RoomEntryResult addRoomEntryUnsafe(UUID player, PlayerRoomHistoryEntry history) {
         PlayerReferenceNode playerNode = getOrCreatePlayer(player);
 
         long depth = graph.outboundEdges(playerNode, PlayerEntryPointNode.class).count();

neoforge-main/src/main/java/dev/compactmods/machines/player/PlayerEventHandler.java

@@ -0,0 +1,25 @@
+package dev.compactmods.machines.player;
+
+import dev.compactmods.machines.network.room.SyncRoomMetadataPacket;
+import dev.compactmods.machines.room.Rooms;
+import net.minecraft.Util;
+import net.minecraft.server.level.ServerPlayer;
+import net.neoforged.neoforge.common.NeoForge;
+import net.neoforged.neoforge.event.entity.player.PlayerEvent;
+import net.neoforged.neoforge.network.PacketDistributor;
+
+public class PlayerEventHandler {
+
+    public static void registerEvents() {
+        NeoForge.EVENT_BUS.addListener(PlayerEventHandler::onPlayerJoinedServer);
+    }
+
+    public static void onPlayerJoinedServer(PlayerEvent.PlayerLoggedInEvent event) {
+        final var player = event.getEntity();
+
+        if(player instanceof ServerPlayer serverPlayer) {
+            final var currentRoom = serverPlayer.getExistingData(Rooms.DataAttachments.CURRENT_ROOM_CODE);
+            currentRoom.ifPresent(roomCode -> PacketDistributor.sendToPlayer(serverPlayer, new SyncRoomMetadataPacket(roomCode, Util.NIL_UUID)));
+        }
+    }
+}

neoforge-main/src/main/java/dev/compactmods/machines/room/RoomRegistrar.java

@@ -124,12 +124,6 @@ public Path getDataLocation(MinecraftServer server) {
         return CMRoomDataLocations.DATA_ROOT.apply(server);
     }
 
-    public static File getFile(MinecraftServer server) {
-        return CMRoomDataLocations.DATA_ROOT.apply(server)
-            .resolve("room_registrations.dat")
-            .toFile();
-    }
-
     @Override
     public Codec<RoomRegistrar> codec() {
         return CODEC;