Update room debug info so it gets passed via Neo data attachment sync

robotgryphon · robotgryphon · commit 935354251aa5 · 2026-02-13T19:15:08.000-05:00
Should fix the F3 crashes now.
diff --git a/core-api/src/main/java/dev/compactmods/machines/api/CompactMachines.java b/core-api/src/main/java/dev/compactmods/machines/api/CompactMachines.java
@@ -136,7 +136,7 @@ public static IPlayerHistoryApi playerHistoryApi() {
 		return PLAYER_HISTORY_API;
 	}
 
-	@Deprecated
+	@Deprecated(forRemoval = true)
 	public static Optional<RoomInstance> room(String roomCode) {
 		return roomRegistrar(ServerLifecycleHooks.getCurrentServer()).get(roomCode);
 	}
diff --git a/core-api/src/main/java/dev/compactmods/machines/api/attachment/CMDataAttachments.java b/core-api/src/main/java/dev/compactmods/machines/api/attachment/CMDataAttachments.java
@@ -4,6 +4,7 @@
 import com.mojang.serialization.Codec;
 import dev.compactmods.machines.api.CompactMachines;
 import dev.compactmods.machines.api.machine.MachineColor;
+import dev.compactmods.machines.api.room.RoomDebugInformation;
 import dev.compactmods.machines.api.room.history.RoomEntryPoint;
 import dev.compactmods.machines.api.room.upgrade.inventory.RoomUpgradeInventory;
 import net.minecraft.Util;
@@ -41,6 +42,12 @@ public interface CMDataAttachments {
             .serialize(Codec.STRING)
             .build());
 
+    Supplier<AttachmentType<RoomDebugInformation>> CURRENT_ROOM_DEBUG_INFO = ATTACHMENT_TYPES.register("current_room_debug_info", () -> AttachmentType
+            .builder(() -> new RoomDebugInformation("", Util.NIL_UUID))
+            .serialize(RoomDebugInformation.CODEC)
+            .sync(RoomDebugInformation.STREAM_CODEC)
+            .build());
+
     Supplier<AttachmentType<UUID>> ROOM_OWNER = ATTACHMENT_TYPES.register("room_owner", () -> AttachmentType
             .builder(() -> Util.NIL_UUID)
             .serialize(UUIDUtil.CODEC)
diff --git a/core-api/src/main/java/dev/compactmods/machines/api/room/RoomDebugInformation.java b/core-api/src/main/java/dev/compactmods/machines/api/room/RoomDebugInformation.java
@@ -0,0 +1,24 @@
+package dev.compactmods.machines.api.room;
+
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.core.UUIDUtil;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.codec.ByteBufCodecs;
+import net.minecraft.network.codec.StreamCodec;
+
+import java.util.UUID;
+
+public record RoomDebugInformation(String roomCode, UUID owner) {
+
+    public static final Codec<RoomDebugInformation> CODEC = RecordCodecBuilder.create(i -> i.group(
+            Codec.STRING.fieldOf("room_code").forGetter(RoomDebugInformation::roomCode),
+            UUIDUtil.CODEC.fieldOf("owner").forGetter(RoomDebugInformation::owner)
+    ).apply(i, RoomDebugInformation::new));
+
+    public static final StreamCodec<FriendlyByteBuf, RoomDebugInformation> STREAM_CODEC = StreamCodec.composite(
+            ByteBufCodecs.STRING_UTF8, RoomDebugInformation::roomCode,
+            UUIDUtil.STREAM_CODEC, RoomDebugInformation::owner,
+            RoomDebugInformation::new
+    );
+}
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/client/room/ClientRoomPacketHandler.java b/neoforge-main/src/main/java/dev/compactmods/machines/client/room/ClientRoomPacketHandler.java
@@ -2,7 +2,6 @@
 
 import dev.compactmods.gander.level.VirtualLevel;
 import dev.compactmods.gander.render.geometry.LevelBakery;
-import dev.compactmods.machines.api.attachment.CMDataAttachments;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.RandomSource;
@@ -38,11 +37,4 @@ public static void handleBlockData(StructureTemplate blocks) {
         }
     }
 
-    public static void handleRoomSync(String roomCode) {
-        final var mc = Minecraft.getInstance();
-
-        // FIXME - Current Room Owner
-        mc.player.setData(CMDataAttachments.CURRENT_ROOM_CODE, roomCode);
-        // mc.player.setData(Rooms.DataAttachments)
-    }
 }
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/command/CMGiveMachineSubcommand.java b/neoforge-main/src/main/java/dev/compactmods/machines/command/CMGiveMachineSubcommand.java
@@ -121,7 +121,7 @@ private static void createAndGiveNewMachine(CommandSourceStack src, ResourceLoca
     }
 
     private static void createAndGiveExistingRoom(String roomCode, ServerPlayer player, CommandSourceStack src) {
-        CompactMachines.room(roomCode).ifPresentOrElse(room -> {
+        CompactMachines.room(src.getServer(), roomCode).ifPresentOrElse(room -> {
             ItemStack newItem = Machines.Items.boundToRoom(room.code(), room.defaultMachineColor());
             if (!player.addItem(newItem)) {
                 src.sendFailure(CommandTranslations.CANNOT_GIVE_MACHINE.get());
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/command/CMTeleportSubcommand.java b/neoforge-main/src/main/java/dev/compactmods/machines/command/CMTeleportSubcommand.java
@@ -39,7 +39,7 @@ public static LiteralArgumentBuilder<CommandSourceStack> make() {
     }
 
     private static void teleportToRoom(CommandSourceStack src, MinecraftServer server, ServerPlayer player, String roomCode) {
-        CompactMachines.room(roomCode).ifPresentOrElse(room -> {
+        CompactMachines.room(server, roomCode).ifPresentOrElse(room -> {
             try {
                 RoomHelper.teleportPlayerIntoRoom(server, player, room, RoomEntryPoint.playerUsingCommand(player));
             } catch (MissingDimensionException e) {
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/command/rooms/CMFindRoomSubcommand.java b/neoforge-main/src/main/java/dev/compactmods/machines/command/rooms/CMFindRoomSubcommand.java
@@ -67,7 +67,9 @@ private static int fetchByChunkPos(CommandContext<CommandSourceStack> ctx) {
 
     private static int fetchByMachineBlock(CommandContext<CommandSourceStack> ctx) throws CommandSyntaxException {
         final var block = BlockPosArgument.getLoadedBlockPos(ctx, "pos");
-        final var level = ctx.getSource().getLevel();
+        final var source = ctx.getSource();
+
+        final var level = source.getLevel();
 
         if (!level.getBlockState(block).is(MachineConstants.MACHINE_BLOCK)) {
             ctx.getSource().sendFailure(MachineTranslations.NOT_A_MACHINE_BLOCK.apply(block));
@@ -76,7 +78,7 @@ private static int fetchByMachineBlock(CommandContext<CommandSourceStack> ctx) t
 
         if (level.getBlockEntity(block) instanceof BoundCompactMachineBlockEntity be) {
             final var roomCode = be.connectedRoom();
-            CompactMachines.room(roomCode).ifPresent(roomInfo -> {
+            CompactMachines.room(source.getServer(), roomCode).ifPresent(roomInfo -> {
                 ctx.getSource().sendSuccess(() -> RoomTranslations.MACHINE_ROOM_INFO.apply(block, roomInfo), false);
             });
         } else {
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/compat/jade/BoundMachineProviders.java b/neoforge-main/src/main/java/dev/compactmods/machines/compat/jade/BoundMachineProviders.java
@@ -82,8 +82,9 @@ public ResourceLocation getUid() {
     public static final IServerDataProvider<BlockAccessor> SERVER_DATA = new IServerDataProvider<>() {
         @Override
         public void appendServerData(CompoundTag tag, BlockAccessor blockAccessor) {
+            final var server = blockAccessor.getLevel().getServer();
             if (blockAccessor.getBlockEntity() instanceof BoundCompactMachineBlockEntity machine) {
-                CompactMachines.room(machine.connectedRoom()).ifPresent(inst -> {
+                CompactMachines.room(server, machine.connectedRoom()).ifPresent(inst -> {
                     tag.store("room_code", Codec.STRING, inst.code());
                     inst.getExistingData(CMDataAttachments.ROOM_OWNER).ifPresent(owner -> {
                         tag.store("owner", UUIDUtil.CODEC, owner);
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/data/ServerHolder.java b/neoforge-main/src/main/java/dev/compactmods/machines/data/ServerHolder.java
@@ -0,0 +1,8 @@
+package dev.compactmods.machines.data;
+
+import net.minecraft.server.MinecraftServer;
+
+public interface ServerHolder {
+    MinecraftServer server();
+    void setServer(MinecraftServer server);
+}
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/data/manager/CMSingletonDataFileManager.java b/neoforge-main/src/main/java/dev/compactmods/machines/data/manager/CMSingletonDataFileManager.java
@@ -5,6 +5,7 @@
 import dev.compactmods.machines.data.CMDataFile;
 import dev.compactmods.machines.data.CodecHolder;
 import dev.compactmods.machines.data.DataFileUtil;
+import dev.compactmods.machines.data.ServerHolder;
 import dev.compactmods.machines.player.PlayerEntryPointHistoryManager;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtIo;
@@ -38,6 +39,8 @@ public void load() {
 
         if (file.exists()) {
             this.instance = DataFileUtil.loadFileWithCodec(file, instance.codec());
+            if(instance instanceof ServerHolder sh)
+                sh.setServer(server);
         }
     }
 
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/dimension/VoidAirBlock.java b/neoforge-main/src/main/java/dev/compactmods/machines/dimension/VoidAirBlock.java
@@ -5,12 +5,12 @@
 import dev.compactmods.machines.util.PlayerUtil;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.server.level.ServerPlayerGameMode;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.GameRules;
 import net.minecraft.world.level.GameType;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.AirBlock;
@@ -55,15 +55,7 @@ public void entityInside(BlockState pState, Level pLevel, BlockPos pPos, Entity
             // FIXME - Achievement
             // PlayerUtil.howDidYouGetThere(player);
 
-            boolean allowedOutOfBounds = switch (player.gameMode.getGameModeForPlayer()) {
-                case GameType.ADVENTURE, GameType.SURVIVAL ->
-                        rules.getBoolean(CMGameRules.ALLOW_SURVIVAL_OUT_OF_BOUNDS);
-                case GameType.CREATIVE -> rules.getBoolean(CMGameRules.ALLOW_CREATIVE_OUT_OF_BOUNDS);
-                case GameType.SPECTATOR -> rules.getBoolean(CMGameRules.ALLOW_SPECTATORS_OUT_OF_BOUNDS);
-            };
-
-            if (!allowedOutOfBounds)
-                PlayerUtil.teleportPlayerToRespawnOrOverworld(player.server, player);
+            PlayerUtil.handlePlayerMaybeEscaped(player, rules);
         }
     }
 
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/machine/block/BoundCompactMachineBlock.java b/neoforge-main/src/main/java/dev/compactmods/machines/machine/block/BoundCompactMachineBlock.java
@@ -132,7 +132,7 @@ protected InteractionResult useWithoutItem(BlockState state, Level level, BlockP
         if (!level.isClientSide && !(player instanceof FakePlayer)) {
             level.getBlockEntity(pos, Machines.BlockEntities.MACHINE.get()).ifPresent(machine -> {
                 final var roomCode = machine.connectedRoom();
-                CompactMachines.room(roomCode).ifPresent(inst -> {
+                CompactMachines.room(player.getServer(), roomCode).ifPresent(inst -> {
                     if (player instanceof ServerPlayer sp) {
                         sp.setData(CMDataAttachments.OPEN_MACHINE_POS, machine.getLevelPosition());
 
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/machine/block/BoundCompactMachineBlockEntity.java b/neoforge-main/src/main/java/dev/compactmods/machines/machine/block/BoundCompactMachineBlockEntity.java
@@ -99,7 +99,7 @@ public void setConnectedRoom(String roomCode) {
 	  if (level != null && !level.isClientSide()) {
 		 this.roomCode = roomCode;
 
-		 CompactMachines.room(roomCode).ifPresentOrElse(inst -> {
+		 CompactMachines.room(level.getServer(), roomCode).ifPresentOrElse(inst -> {
 				this.setData(CMDataAttachments.MACHINE_COLOR, inst.defaultMachineColor());
 			 },
 			 () -> {
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/network/CMNetworks.java b/neoforge-main/src/main/java/dev/compactmods/machines/network/CMNetworks.java
@@ -8,22 +8,20 @@
 import dev.compactmods.machines.network.room.PlayerRequestedTeleportPacket;
 import dev.compactmods.machines.network.room.PlayerRequestedUpgradeUIPacket;
 import dev.compactmods.machines.network.room.PlayerStartedRoomTrackingPacket;
-import dev.compactmods.machines.network.room.SyncRoomMetadataPacket;
 import net.minecraft.network.codec.StreamCodec;
 import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
 import net.neoforged.neoforge.network.registration.PayloadRegistrar;
 
 public class CMNetworks {
 
     public static void onPacketRegistration(final RegisterPayloadHandlersEvent payloads) {
-        final PayloadRegistrar main = payloads.registrar("7.1.0");
+        final PayloadRegistrar main = payloads.registrar("7.2.0");
 
         // Machines
         main.playToClient(MachineColorSyncPacket.TYPE, MachineColorSyncPacket.STREAM_CODEC, MachineColorSyncPacket.HANDLER);
         main.playToClient(OpenMachinePreviewScreenPacket.TYPE, OpenMachinePreviewScreenPacket.STREAM_CODEC, OpenMachinePreviewScreenPacket.HANDLER);
 
         // Rooms
-        main.playToClient(SyncRoomMetadataPacket.TYPE, SyncRoomMetadataPacket.STREAM_CODEC, SyncRoomMetadataPacket.HANDLER);
         main.playToClient(InitialRoomBlockDataPacket.TYPE, InitialRoomBlockDataPacket.STREAM_CODEC, InitialRoomBlockDataPacket.HANDLER);
 
         main.playToServer(PlayerStartedRoomTrackingPacket.TYPE, PlayerStartedRoomTrackingPacket.STREAM_CODEC, PlayerStartedRoomTrackingPacket.HANDLER);
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/network/room/PlayerRequestedRoomUIPacket.java b/neoforge-main/src/main/java/dev/compactmods/machines/network/room/PlayerRequestedRoomUIPacket.java
@@ -16,9 +16,7 @@ public record PlayerRequestedRoomUIPacket(String roomCode) implements CustomPack
     );
 
     public static final IPayloadHandler<PlayerRequestedRoomUIPacket> HANDLER = (pkt, ctx) -> {
-        CompactMachines.room(pkt.roomCode).ifPresent(inst -> {
 
-        });
     };
 
     @Override
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/network/room/PlayerRequestedUpgradeUIPacket.java b/neoforge-main/src/main/java/dev/compactmods/machines/network/room/PlayerRequestedUpgradeUIPacket.java
@@ -16,7 +16,7 @@ public record PlayerRequestedUpgradeUIPacket(String roomCode, boolean isIsolated
 
    public static final IPayloadHandler<PlayerRequestedUpgradeUIPacket> HANDLER = (pkt, ctx) -> {
 	  final var player = ctx.player();
-	  CompactMachines.room(pkt.roomCode()).ifPresent(inst -> {
+	  CompactMachines.room(player.getServer(), pkt.roomCode()).ifPresent(inst -> {
 		 player.openMenu(RoomUpgradeMenu.provider(inst), buf -> {
 			buf.writeBoolean(pkt.isIsolated);
 			buf.writeUtf(pkt.roomCode());
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/network/room/PlayerStartedRoomTrackingPacket.java b/neoforge-main/src/main/java/dev/compactmods/machines/network/room/PlayerStartedRoomTrackingPacket.java
@@ -29,7 +29,7 @@ public record PlayerStartedRoomTrackingPacket(String roomCode) implements Custom
         var sender = ctx.player();
         var server = ctx.player().getServer();
 
-        CompactMachines.room(pkt.roomCode).ifPresent(instance -> {
+        CompactMachines.room(server, pkt.roomCode).ifPresent(instance -> {
             final StructureTemplate blocks;
             try {
                 blocks = RoomBlocks.getInternalBlocks(server, instance).get(5, TimeUnit.SECONDS);
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/network/room/SyncRoomMetadataPacket.java b/neoforge-main/src/main/java/dev/compactmods/machines/network/room/SyncRoomMetadataPacket.java
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/player/PlayerEventHandler.java b/neoforge-main/src/main/java/dev/compactmods/machines/player/PlayerEventHandler.java
@@ -1,15 +1,18 @@
 package dev.compactmods.machines.player;
 
+import dev.compactmods.machines.LoggingUtil;
+import dev.compactmods.machines.api.CompactMachines;
 import dev.compactmods.machines.api.attachment.CMDataAttachments;
-import dev.compactmods.machines.network.room.SyncRoomMetadataPacket;
-import dev.compactmods.machines.room.Rooms;
-import net.minecraft.Util;
+import dev.compactmods.machines.api.dimension.CompactDimension;
+import dev.compactmods.machines.api.room.RoomDebugInformation;
+import dev.compactmods.machines.util.PlayerUtil;
 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;
+import org.apache.logging.log4j.Logger;
 
 public class PlayerEventHandler {
+    private static final Logger MOD_LOG = LoggingUtil.modLog();
 
     public static void registerEvents() {
         NeoForge.EVENT_BUS.addListener(PlayerEventHandler::onPlayerJoinedServer);
@@ -18,9 +21,41 @@ public static void registerEvents() {
     public static void onPlayerJoinedServer(PlayerEvent.PlayerLoggedInEvent event) {
         final var player = event.getEntity();
 
-        if(player instanceof ServerPlayer serverPlayer) {
-            final var currentRoom = serverPlayer.getExistingData(CMDataAttachments.CURRENT_ROOM_CODE);
-            currentRoom.ifPresent(roomCode -> PacketDistributor.sendToPlayer(serverPlayer, new SyncRoomMetadataPacket(roomCode, Util.NIL_UUID)));
+        if(player instanceof ServerPlayer serverPlayer && CompactDimension.isInServerDimension(serverPlayer)) {
+            String currentRoom = CompactMachines.chunkManager()
+                    .findRoomByChunk(serverPlayer.chunkPosition())
+                    .orElse(null);
+
+            MOD_LOG.debug("Player joined server ({}); they are supposedly in the compact dimension. Room Code: {}",
+                    serverPlayer.getUUID(), currentRoom);
+
+            if(currentRoom == null) {
+                // Kick player out of space
+                MOD_LOG.warn("Room not found. Either data got corrupted or the player escaped a room. Checking...");
+
+                PlayerUtil.handlePlayerMaybeEscaped(serverPlayer, serverPlayer.server.getGameRules());
+                return;
+            }
+
+            final var room = CompactMachines.room(serverPlayer.server, currentRoom)
+                            .orElseThrow();
+
+            final var owner = room.getData(CMDataAttachments.ROOM_OWNER);
+
+            final var isInRoomBounds = room.boundaries()
+                    .innerBounds()
+                    .intersects(player.getBoundingBox());
+
+            if(!isInRoomBounds) {
+                // Kick player out of space
+                MOD_LOG.warn("Room found. But it looks like the player escaped the room boundaries. Checking...");
+
+                PlayerUtil.handlePlayerMaybeEscaped(serverPlayer, serverPlayer.server.getGameRules());
+                return;
+            }
+
+            serverPlayer.setData(CMDataAttachments.CURRENT_ROOM_CODE, room.code());
+            serverPlayer.setData(CMDataAttachments.CURRENT_ROOM_DEBUG_INFO, new RoomDebugInformation(room.code(), owner));
         }
     }
 }
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/room/RoomEventHandler.java b/neoforge-main/src/main/java/dev/compactmods/machines/room/RoomEventHandler.java
@@ -3,9 +3,9 @@
 import dev.compactmods.machines.LoggingUtil;
 import dev.compactmods.machines.api.CompactMachines;
 import dev.compactmods.machines.api.attachment.CMDataAttachments;
+import dev.compactmods.machines.api.room.RoomDebugInformation;
 import dev.compactmods.machines.i18n.Translations;
 import dev.compactmods.machines.api.dimension.CompactDimension;
-import dev.compactmods.machines.network.room.SyncRoomMetadataPacket;
 import dev.compactmods.machines.util.PlayerUtil;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.Entity;
@@ -51,7 +51,9 @@ public static void entityJoined(final EntityJoinLevelEvent evt) {
                     .findRoomByChunk(serverPlayer.chunkPosition())
                     .flatMap((String roomCode) -> CompactMachines.room(serverPlayer.server, roomCode))
                     .ifPresent(room -> {
-                        PacketDistributor.sendToPlayer(serverPlayer, new SyncRoomMetadataPacket(room.code(), room.getData(CMDataAttachments.ROOM_OWNER)));
+                        serverPlayer.setData(CMDataAttachments.CURRENT_ROOM_CODE, room.code());
+                        serverPlayer.setData(CMDataAttachments.CURRENT_ROOM_DEBUG_INFO,
+                                new RoomDebugInformation(room.code(), room.getData(CMDataAttachments.ROOM_OWNER)));
                     });
         } else {
             if (!positionInsideRoom(ent, ent.position())) {
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/room/RoomHelper.java b/neoforge-main/src/main/java/dev/compactmods/machines/room/RoomHelper.java
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/room/capability/BasicRoomCapabilities.java b/neoforge-main/src/main/java/dev/compactmods/machines/room/capability/BasicRoomCapabilities.java
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/room/spawn/RoomSpawnManagers.java b/neoforge-main/src/main/java/dev/compactmods/machines/room/spawn/RoomSpawnManagers.java
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/room/spawn/SpawnManager.java b/neoforge-main/src/main/java/dev/compactmods/machines/room/spawn/SpawnManager.java
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/room/ui/overlay/RoomMetadataDebugOverlay.java b/neoforge-main/src/main/java/dev/compactmods/machines/room/ui/overlay/RoomMetadataDebugOverlay.java
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/util/PlayerUtil.java b/neoforge-main/src/main/java/dev/compactmods/machines/util/PlayerUtil.java

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ public static IPlayerHistoryApi playerHistoryApi() {`
`136`	`136`	`return PLAYER_HISTORY_API;`
`137`	`137`	`}`
`138`	`138`
`139`		`- @Deprecated`
	`139`	`+ @Deprecated(forRemoval = true)`
`140`	`140`	`public static Optional<RoomInstance> room(String roomCode) {`
`141`	`141`	`return roomRegistrar(ServerLifecycleHooks.getCurrentServer()).get(roomCode);`
`142`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`import dev.compactmods.gander.level.VirtualLevel;`
`4`	`4`	`import dev.compactmods.gander.render.geometry.LevelBakery;`
`5`		`-import dev.compactmods.machines.api.attachment.CMDataAttachments;`
`6`	`5`	`import net.minecraft.client.Minecraft;`
`7`	`6`	`import net.minecraft.core.BlockPos;`
`8`	`7`	`import net.minecraft.util.RandomSource;`
`@@ -38,11 +37,4 @@ public static void handleBlockData(StructureTemplate blocks) {`
`38`	`37`	`}`
`39`	`38`	`}`
`40`	`39`
`41`		`- public static void handleRoomSync(String roomCode) {`
`42`		`- final var mc = Minecraft.getInstance();`
`43`		`-`
`44`		`- // FIXME - Current Room Owner`
`45`		`- mc.player.setData(CMDataAttachments.CURRENT_ROOM_CODE, roomCode);`
`46`		`- // mc.player.setData(Rooms.DataAttachments)`
`47`		`- }`
`48`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ private static void createAndGiveNewMachine(CommandSourceStack src, ResourceLoca`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`private static void createAndGiveExistingRoom(String roomCode, ServerPlayer player, CommandSourceStack src) {`
`124`		`- CompactMachines.room(roomCode).ifPresentOrElse(room -> {`
	`124`	`+ CompactMachines.room(src.getServer(), roomCode).ifPresentOrElse(room -> {`
`125`	`125`	`ItemStack newItem = Machines.Items.boundToRoom(room.code(), room.defaultMachineColor());`
`126`	`126`	`if (!player.addItem(newItem)) {`
`127`	`127`	`src.sendFailure(CommandTranslations.CANNOT_GIVE_MACHINE.get());`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public static LiteralArgumentBuilder<CommandSourceStack> make() {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`private static void teleportToRoom(CommandSourceStack src, MinecraftServer server, ServerPlayer player, String roomCode) {`
`42`		`- CompactMachines.room(roomCode).ifPresentOrElse(room -> {`
	`42`	`+ CompactMachines.room(server, roomCode).ifPresentOrElse(room -> {`
`43`	`43`	`try {`
`44`	`44`	`RoomHelper.teleportPlayerIntoRoom(server, player, room, RoomEntryPoint.playerUsingCommand(player));`
`45`	`45`	`} catch (MissingDimensionException e) {`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`import dev.compactmods.machines.data.CMDataFile;`
`6`	`6`	`import dev.compactmods.machines.data.CodecHolder;`
`7`	`7`	`import dev.compactmods.machines.data.DataFileUtil;`
	`8`	`+import dev.compactmods.machines.data.ServerHolder;`
`8`	`9`	`import dev.compactmods.machines.player.PlayerEntryPointHistoryManager;`
`9`	`10`	`import net.minecraft.nbt.CompoundTag;`
`10`	`11`	`import net.minecraft.nbt.NbtIo;`
`@@ -38,6 +39,8 @@ public void load() {`
`38`	`39`
`39`	`40`	`if (file.exists()) {`
`40`	`41`	`this.instance = DataFileUtil.loadFileWithCodec(file, instance.codec());`
	`42`	`+ if(instance instanceof ServerHolder sh)`
	`43`	`+ sh.setServer(server);`
`41`	`44`	`}`
`42`	`45`	`}`
`43`	`46`