Shuffle around a lot of constants. Categorize.

README.md

@@ -12,4 +12,12 @@ like the dimension/registry keys, location-related classes, and block/item tags.
 ## Common Main (core)
 Contains core mod code such as structure generation, math, advancements, and data classes.
 
+## Room API (room-api)
+Contains classes and systems for working with machine rooms.
 
+- Player Room History Management
+- Room Owner Management
+- Room Registration Systems
+- Room Spawn Management
+
+## Room Upgrade API (room-upgrade-api)

core-api/src/main/java/dev/compactmods/machines/api/core/Constants.java → core-api/src/main/java/dev/compactmods/machines/api/Constants.java

@@ -1,4 +1,4 @@
-package dev.compactmods.machines.api.core;
+package dev.compactmods.machines.api;
 
 public interface Constants {
     String MOD_ID = "compactmachines";

core-api/src/main/java/dev/compactmods/machines/api/core/Messages.java → core-api/src/main/java/dev/compactmods/machines/api/Messages.java

@@ -1,4 +1,4 @@
-package dev.compactmods.machines.api.core;
+package dev.compactmods.machines.api;
 
 import net.minecraft.resources.ResourceLocation;
 

core-api/src/main/java/dev/compactmods/machines/api/core/Tooltips.java → core-api/src/main/java/dev/compactmods/machines/api/Tooltips.java

@@ -1,4 +1,4 @@
-package dev.compactmods.machines.api.core;
+package dev.compactmods.machines.api;
 
 import net.minecraft.resources.ResourceLocation;
 

core-api/src/main/java/dev/compactmods/machines/api/core/Advancements.java → core-api/src/main/java/dev/compactmods/machines/api/advancement/Advancements.java

@@ -1,5 +1,6 @@
-package dev.compactmods.machines.api.core;
+package dev.compactmods.machines.api.advancement;
 
+import dev.compactmods.machines.api.Constants;
 import net.minecraft.resources.ResourceLocation;
 
 /**

core/src/main/java/dev/compactmods/machines/codec/CodecExtensions.java → core-api/src/main/java/dev/compactmods/machines/api/codec/CodecExtensions.java

@@ -1,4 +1,4 @@
-package dev.compactmods.machines.codec;
+package dev.compactmods.machines.api.codec;
 
 import com.mojang.serialization.Codec;
 import net.minecraft.Util;

core/src/main/java/dev/compactmods/machines/codec/DoubleStreamExtensions.java → core-api/src/main/java/dev/compactmods/machines/api/codec/DoubleStreamExtensions.java

@@ -1,4 +1,4 @@
-package dev.compactmods.machines.codec;
+package dev.compactmods.machines.api.codec;
 
 import com.mojang.serialization.DataResult;
 import com.mojang.serialization.DynamicOps;

core/src/main/java/dev/compactmods/machines/codec/NbtListCollector.java → core-api/src/main/java/dev/compactmods/machines/api/codec/NbtListCollector.java

@@ -1,4 +1,4 @@
-package dev.compactmods.machines.codec;
+package dev.compactmods.machines.api.codec;
 
 import com.google.common.collect.ImmutableSet;
 import net.minecraft.nbt.Tag;

core-api/src/main/java/dev/compactmods/machines/api/core/CMCommands.java → core-api/src/main/java/dev/compactmods/machines/api/command/CMCommands.java

@@ -1,8 +1,8 @@
-package dev.compactmods.machines.api.core;
+package dev.compactmods.machines.api.command;
 
 import net.minecraft.resources.ResourceLocation;
 
-import static dev.compactmods.machines.api.core.Constants.MOD_ID;
+import static dev.compactmods.machines.api.Constants.MOD_ID;
 
 public interface CMCommands {
     ResourceLocation LEVEL_REGISTERED = new ResourceLocation(MOD_ID, "level_registered");

core-api/src/main/java/dev/compactmods/machines/api/dimension/CompactDimension.java

@@ -1,6 +1,5 @@
 package dev.compactmods.machines.api.dimension;
 
-import net.minecraft.core.Registry;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
@@ -13,7 +12,7 @@
 import net.minecraft.world.level.storage.LevelStorageSource;
 import org.jetbrains.annotations.NotNull;
 
-import static dev.compactmods.machines.api.core.Constants.MOD_ID;
+import static dev.compactmods.machines.api.Constants.MOD_ID;
 
 public abstract class CompactDimension {
     public static final ResourceKey<Level> LEVEL_KEY = ResourceKey
@@ -40,7 +39,6 @@ public static DimensionDataStorage getDataStorage(@NotNull LevelStorageSource.Le
         return new DimensionDataStorage(dimPath.resolve("data").toFile(), fixer);
     }
 
-    @NotNull
     public static boolean isLevelCompact(Level level) {
         return level.dimension().equals(LEVEL_KEY);
     }

core-api/src/main/java/dev/compactmods/machines/api/location/GlobalPosWithRotation.java

@@ -0,0 +1,40 @@
+package dev.compactmods.machines.api.location;
+
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import dev.compactmods.machines.api.codec.CodecExtensions;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.GlobalPos;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.Vec2;
+import net.minecraft.world.phys.Vec3;
+
+public record GlobalPosWithRotation(ResourceKey<Level> dimension, Vec3 position, Vec2 rotation) {
+
+    /*
+     * BlockPos also technically supported here, since pos matches GlobalPos.CODEC#pos - only difference
+     * here is that BlockPos uses an INT stream, while VEC3D uses a double stream.
+     */
+    public static final Codec<GlobalPosWithRotation> CODEC = RecordCodecBuilder.create(i -> i.group(
+            ResourceKey.codec(Registries.DIMENSION).fieldOf("dimension").forGetter(GlobalPosWithRotation::dimension),
+            CodecExtensions.VECTOR3D.fieldOf("pos").forGetter(GlobalPosWithRotation::position),
+            CodecExtensions.VEC2.optionalFieldOf("rot", Vec2.ZERO).forGetter(x -> x.rotation)
+    ).apply(i, GlobalPosWithRotation::new));
+
+    public static final GlobalPosWithRotation INVALID = new GlobalPosWithRotation(GlobalPos.of(Level.OVERWORLD, BlockPos.ZERO), Vec2.ZERO);
+
+    public GlobalPosWithRotation(GlobalPos pos, Vec2 rotation) {
+        this(pos.dimension(), Vec3.atBottomCenterOf(pos.pos()), rotation);
+    }
+
+    public GlobalPosWithRotation(ResourceKey<Level> dimension, BlockPos position, Vec2 rotation) {
+        this(dimension, Vec3.atBottomCenterOf(position), rotation);
+    }
+
+    public static GlobalPosWithRotation fromPlayer(Player player) {
+        return new GlobalPosWithRotation(player.level().dimension(), player.position(), new Vec2(player.xRotO, player.yRotO));
+    }
+}

core-api/src/main/java/dev/compactmods/machines/api/machine/IMachineBlockEntity.java → core-api/src/main/java/dev/compactmods/machines/api/machine/IColoredMachine.java

@@ -1,5 +1,5 @@
 package dev.compactmods.machines.api.machine;
 
-public interface IMachineBlockEntity {
+public interface IColoredMachine {
     int getColor();
 }

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

@@ -0,0 +1,36 @@
+package dev.compactmods.machines.api.machine;
+
+import dev.compactmods.machines.api.Constants;
+import dev.compactmods.machines.api.util.KeyHelper;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.Block;
+
+public interface MachineConstants {
+
+    ResourceLocation BOUND_MACHINE_BLOCK_ID = new ResourceLocation(Constants.MOD_ID, "machine");
+    ResourceLocation BOUND_MACHINE_ENTITY = new ResourceLocation(Constants.MOD_ID, "machine");
+
+    ResourceLocation UNBOUND_MACHINE_BLOCK_ID = new ResourceLocation(Constants.MOD_ID, "new_machine");
+    ResourceLocation UNBOUND_MACHINE_ITEM_ID = new ResourceLocation(Constants.MOD_ID, "new_machine");
+    ResourceLocation UNBOUND_MACHINE_ENTITY = new ResourceLocation(Constants.MOD_ID, "new_machine");
+
+    ResourceKey<Block> UNBOUND_MACHINE_BLOCK_RESKEY = KeyHelper.blockResKey("new_machine");
+    ResourceKey<Item> UNBOUND_MACHINE_ITEM_RESKEY = KeyHelper.itemResKey("new_machine");
+
+    /**
+     * Marks a block as an unbound Compact Machine; applied only to machines that are not yet bound to a room.
+     */
+    TagKey<Block> UNBOUND_MACHINE_BLOCK = KeyHelper.blockTag("new_machine");
+
+    /**
+     * Marks a block as a bound Compact Machine; applied only to machines that are bound to a room.
+     */
+    TagKey<Block> BOUND_MACHINE_BLOCK = KeyHelper.blockTag("bound_machine");
+
+    TagKey<Block> MACHINE_BLOCK = KeyHelper.blockTag("machine");
+    TagKey<Item> MACHINE_ITEM = KeyHelper.itemTagKey("machine");
+
+}

core-api/src/main/java/dev/compactmods/machines/api/room/WallConstants.java

@@ -0,0 +1,25 @@
+package dev.compactmods.machines.api.room;
+
+import dev.compactmods.machines.api.util.KeyHelper;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.Block;
+
+public interface WallConstants {
+
+    ResourceKey<Block> BREAKABLE_WALL = KeyHelper.blockResKey("wall");
+    ResourceKey<Block> SOLID_WALL = KeyHelper.blockResKey("solid_wall");
+
+    /**
+     * Applied to solid wall items.
+     */
+    TagKey<Item> TAG_SOLID_WALL_ITEMS = KeyHelper.itemTagKey("solid_walls");
+
+    /**
+     * Applied to solid walls and tunnel blocks.
+     */
+    TagKey<Block> TAG_SOLID_WALL_BLOCKS = KeyHelper.blockTag("solid_walls");
+
+
+}

core-api/src/main/java/dev/compactmods/machines/api/shrinking/PSDTags.java

@@ -1,7 +1,6 @@
 package dev.compactmods.machines.api.shrinking;
 
-import dev.compactmods.machines.api.core.Constants;
-import net.minecraft.core.Registry;
+import dev.compactmods.machines.api.Constants;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.TagKey;