Persist spawn locations with keyed data manager, fixes #616

Author: robotgryphon

neoforge-main/src/main/java/dev/compactmods/machines/room/spawn/RoomSpawnManagers.java

@@ -1,37 +1,25 @@
 package dev.compactmods.machines.room.spawn;
 
-import dev.compactmods.machines.api.CompactMachines;
 import dev.compactmods.machines.api.room.spawn.IRoomSpawnManager;
 import dev.compactmods.machines.api.room.spawn.IRoomSpawnManagers;
+import dev.compactmods.machines.data.manager.CMKeyedDataFileManager;
 import net.minecraft.server.MinecraftServer;
 
-import java.util.HashMap;
-
 public class RoomSpawnManagers implements IRoomSpawnManagers {
 
-    private final HashMap<String, IRoomSpawnManager> spawnManagers;
+    private final CMKeyedDataFileManager<String, SpawnManager> spawnManagers;
 
     public RoomSpawnManagers(MinecraftServer server) {
-        this.spawnManagers = new HashMap<>();
-
-        CompactMachines.roomRegistrar()
-                .allRooms()
-                .forEach(roomInstance -> {
-                    final var manager = new SpawnManager(roomInstance.code(), roomInstance.boundaries());
-                    spawnManagers.put(roomInstance.code(), manager);
-                });
+        this.spawnManagers = new CMKeyedDataFileManager<>(server, (serv, code) -> new SpawnManager(code));
     }
 
     @Override
     public IRoomSpawnManager get(String roomCode) {
-        return spawnManagers.computeIfAbsent(roomCode, (code) -> CompactMachines
-                .room(roomCode)
-                .map(inst -> new SpawnManager(roomCode, inst.boundaries()))
-                .orElseThrow());
+        return spawnManagers.data(roomCode);
     }
 
     @Override
     public void save() {
-        // FIXME
+        spawnManagers.save();
     }
 }

neoforge-main/src/main/java/dev/compactmods/machines/room/spawn/SpawnManager.java

@@ -3,6 +3,8 @@
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.mojang.serialization.codecs.UnboundedMapCodec;
+import dev.compactmods.machines.api.CompactMachines;
+import dev.compactmods.machines.api.room.RoomInstance;
 import dev.compactmods.machines.api.room.data.CMRoomDataLocations;
 import dev.compactmods.machines.data.CMDataFile;
 import dev.compactmods.machines.api.room.spatial.IRoomBoundaries;
@@ -17,6 +19,7 @@
 import net.minecraft.world.phys.Vec3;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.jetbrains.annotations.Nullable;
 
 import java.nio.file.Path;
 import java.util.Collections;
@@ -37,16 +40,21 @@ public class SpawnManager implements IRoomSpawnManager, CodecHolder<SpawnManager
     ).apply(inst, SpawnManager::new));
 
     private final String roomCode;
+
+    @Nullable
+    private RoomInstance roomInstance;
+
+    @Nullable
     private RoomSpawn defaultSpawn;
+
     private final Map<UUID, RoomSpawn> playerSpawns;
-    private AABB roomBounds;
 
-    public SpawnManager(String roomCode, IRoomBoundaries roomBounds) {
-        this(roomCode, Collections.emptyMap(), new RoomSpawn(roomBounds.defaultSpawn(), Vec2.ZERO));
-        this.roomBounds = roomBounds.innerBounds();
+    public SpawnManager(String roomCode) {
+        this.roomCode = roomCode;
+        this.playerSpawns = new HashMap<>();
     }
 
-    public SpawnManager(String roomCode, Map<UUID, RoomSpawn> playerSpawns, RoomSpawn defaultSpawn) {
+    private SpawnManager(String roomCode, Map<UUID, RoomSpawn> playerSpawns, RoomSpawn defaultSpawn) {
         this.roomCode = roomCode;
         this.playerSpawns = new HashMap<>(playerSpawns);
         this.defaultSpawn = defaultSpawn;
@@ -64,14 +72,20 @@ public void setDefaultSpawn(Vec3 position, Vec2 rotation) {
 
     @Override
     public IRoomSpawns spawns() {
+        if (this.defaultSpawn == null) {
+            final var i = getRoomInstance();
+            this.defaultSpawn = new RoomSpawn(i.boundaries().defaultSpawn(), Vec2.ZERO);
+        }
+
         final var ps = new HashMap<UUID, RoomSpawn>();
         playerSpawns.forEach(ps::putIfAbsent);
         return new RoomSpawns(defaultSpawn, ps);
     }
 
     @Override
     public void setPlayerSpawn(UUID player, Vec3 location, Vec2 rotation) {
-        if(!roomBounds.contains(location))
+        final var ins = getRoomInstance();
+        if (!ins.boundaries().innerBounds().contains(location))
             return;
 
         playerSpawns.put(player, new RoomSpawn(location, rotation));
@@ -84,10 +98,20 @@ public Path getDataLocation(MinecraftServer server) {
 
     @Override
     public Codec<SpawnManager> codec() {
-        return null;
+        return CODEC;
+    }
+
+    private RoomInstance getRoomInstance() {
+        if (roomInstance == null) {
+            final var instance = CompactMachines.room(this.roomCode).orElseThrow();
+            this.roomInstance = instance;
+        }
+
+        return this.roomInstance;
     }
 
-    private record RoomSpawns(RoomSpawn defaultSpawn, Map<UUID, RoomSpawn> playerSpawnsSnapshot) implements IRoomSpawns {
+    private record RoomSpawns(RoomSpawn defaultSpawn,
+                              Map<UUID, RoomSpawn> playerSpawnsSnapshot) implements IRoomSpawns {
 
         @Override
         public Optional<IRoomSpawn> forPlayer(UUID player) {