Convert machine colors to data attachments

core-api/src/main/java/dev/compactmods/machines/api/machine/block/IBoundCompactMachineBlockEntity.java

@@ -1,10 +1,6 @@
 package dev.compactmods.machines.api.machine.block;
 
 public interface IBoundCompactMachineBlockEntity extends ICompactMachineBlockEntity {
-
     String NBT_OWNER = "owner";
-    String NBT_COLOR = "machine_color";
     String NBT_ROOM_CODE = "room_code";
-    String NBT_ROOM_COLOR = "room_color";
-
 }

core-api/src/main/java/dev/compactmods/machines/api/machine/block/ICompactMachineBlockEntity.java

@@ -1,5 +1,3 @@
 package dev.compactmods.machines.api.machine.block;
 
-public interface ICompactMachineBlockEntity {
-    String NBT_COLOR = "machine_color";
-}
+public interface ICompactMachineBlockEntity {}

core-api/src/main/java/dev/compactmods/machines/api/machine/item/ICompactMachineItem.java

@@ -12,8 +12,6 @@
 
 public interface ICompactMachineItem {
 
-    String NBT_COLOR = "machine_color";
-
     String NBT_CUSTOM_NAME = "custom_name";
 
     default Optional<String> getMachineName(ItemStack stack) {
@@ -26,30 +24,9 @@ default Optional<String> getMachineName(ItemStack stack) {
         return Optional.of(tag.getString(NBT_CUSTOM_NAME));
     }
 
-    default ItemStack setColor(ItemStack stack, int color) {
-        var tag = stack.getOrCreateTag();
-        tag.putInt(NBT_COLOR, color);
-
-        var blockEntityData = new CompoundTag();
-        blockEntityData.putInt(ICompactMachineBlockEntity.NBT_COLOR, color);
-        addBlockEntityData(stack, blockEntityData);
-
-        return stack;
-    }
-
-    default int getMachineColor(ItemStack stack) {
-        if (!stack.hasTag()) return 0xFFFFFFFF;
-
-        final var tag = stack.getTag();
-        if (tag == null || tag.isEmpty() || !tag.contains(NBT_COLOR))
-            return 0xFFFFFFFF;
-
-        return tag.getInt(NBT_COLOR);
-    }
 
     default void addBlockEntityData(@NotNull ItemStack stack, @NotNull CompoundTag stackTag) {
         final var existingTag = stack.getOrCreateTagElement("BlockEntityTag");
         existingTag.merge(stackTag);
     }
-
 }

core/src/main/java/dev/compactmods/machines/room/spawn/SpawnManager.java

@@ -3,25 +3,21 @@
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.mojang.serialization.codecs.UnboundedMapCodec;
+import dev.compactmods.machines.api.Constants;
+import dev.compactmods.machines.api.dimension.CompactDimension;
+import dev.compactmods.machines.api.dimension.MissingDimensionException;
 import dev.compactmods.machines.api.room.spatial.IRoomBoundaries;
 import dev.compactmods.machines.api.room.spawn.IRoomSpawn;
 import dev.compactmods.machines.api.room.spawn.IRoomSpawnManager;
 import dev.compactmods.machines.api.room.spawn.IRoomSpawns;
-import dev.compactmods.machines.api.Constants;
-import dev.compactmods.machines.api.dimension.CompactDimension;
-import dev.compactmods.machines.api.dimension.MissingDimensionException;
 import dev.compactmods.machines.data.CodecBackedSavedData;
 import net.minecraft.core.UUIDUtil;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.NbtOps;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.world.level.saveddata.SavedData;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec2;
 import net.minecraft.world.phys.Vec3;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -69,6 +65,7 @@ public static SpawnManager forRoom(MinecraftServer server, String roomCode, IRoo
                 .getDataStorage()
                 .computeIfAbsent(new CodecWrappedSavedData<>(CODEC, () -> new SpawnManager(roomCode, roomBounds)).sd(), roomFilename);
 
+        manager.roomBounds = roomBounds.innerBounds();
         return manager;
     }