WIP commands and positional changes

Author: robotgryphon

src/api/java/dev/compactmods/machines/api/location/IDimensionalBlockPosition.java

@@ -0,0 +1,8 @@
+package dev.compactmods.machines.api.location;
+
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.level.block.state.BlockState;
+
+public interface IDimensionalBlockPosition extends IDimensionalPosition {
+    BlockState state(MinecraftServer server);
+}

src/api/java/dev/compactmods/machines/api/location/IDimensionalPosition.java

@@ -1,20 +1,27 @@
 package dev.compactmods.machines.api.location;
 
 import java.util.Optional;
+
+import com.mojang.serialization.Codec;
 import net.minecraft.core.Direction;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.Vec3;
 
 public interface IDimensionalPosition {
+
     IDimensionalPosition relative(Direction direction, float amount);
 
     BlockPos getBlockPosition();
+    Vec3 getExactPosition();
 
-    Optional<ServerLevel> level(MinecraftServer server);
-
-    Optional<BlockState> state(MinecraftServer server);
+    ResourceKey<Level> dimensionKey();
+    ServerLevel level(MinecraftServer server);
 
     IDimensionalPosition relative(Direction direction);
+
+    Optional<Vec3> getRotation();
 }

src/api/java/dev/compactmods/machines/api/room/IRoomHistory.java

@@ -0,0 +1,15 @@
+package dev.compactmods.machines.api.room;
+
+import dev.compactmods.machines.api.room.history.IRoomHistoryItem;
+import net.minecraft.nbt.ListTag;
+import net.minecraftforge.common.util.INBTSerializable;
+
+public interface IRoomHistory<T extends IRoomHistoryItem> extends INBTSerializable<ListTag> {
+
+    void clear();
+    boolean hasHistory();
+    T peek();
+    T pop();
+
+    void addHistory(T item);
+}

src/api/java/dev/compactmods/machines/api/room/IMachineRoom.java renamed to src/api/java/dev/compactmods/machines/api/room/IRoomInformation.java

@@ -5,11 +5,11 @@
 
 import javax.annotation.Nonnull;
 
-public interface IMachineRoom {
+public interface IRoomInformation {
 
     @Nonnull
-    ChunkPos getChunk();
+    ChunkPos chunk();
 
     @Nonnull
-    ServerLevel getLevel();
+    ServerLevel level();
 }

src/api/java/dev/compactmods/machines/api/room/MachineRoomConnections.java

@@ -17,6 +17,7 @@ public interface MachineRoomConnections {
     void registerRoom(ChunkPos roomChunk);
 
     void connectMachineToRoom(int machine, ChunkPos room);
+    void changeMachineLink(int machine, ChunkPos newRoom);
 
     void disconnect(int machine);
 

src/api/java/dev/compactmods/machines/api/room/history/IRoomHistoryItem.java

@@ -0,0 +1,10 @@
+package dev.compactmods.machines.api.room.history;
+
+import dev.compactmods.machines.api.location.IDimensionalPosition;
+
+public interface IRoomHistoryItem {
+
+    IDimensionalPosition getEntryLocation();
+
+    int getMachine();
+}

src/main/java/dev/compactmods/machines/command/CMCommandRoot.java

@@ -3,15 +3,18 @@
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import dev.compactmods.machines.CompactMachines;
+import dev.compactmods.machines.command.subcommand.*;
 import net.minecraft.commands.CommandSourceStack;
 
 public class CMCommandRoot {
 
     public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
         final LiteralArgumentBuilder<CommandSourceStack> root = LiteralArgumentBuilder.literal(CompactMachines.MOD_ID);
-        root.then(CMEjectSubcommand.register());
-        root.then(CMSummarySubcommand.register());
-        root.then(ReaddDimensionCommand.register());
+        root.then(CMEjectSubcommand.make());
+        root.then(CMSummarySubcommand.make());
+        root.then(CMRebindSubcommand.make());
+        root.then(CMReaddDimensionSubcommand.make());
+        root.then(CMRoomsSubcommand.make());
         dispatcher.register(root);
     }
 }

src/main/java/dev/compactmods/machines/command/CMDataCommand.java renamed to src/main/java/dev/compactmods/machines/command/data/CMDataCommand.java

@@ -1,4 +1,4 @@
-package dev.compactmods.machines.command;
+package dev.compactmods.machines.command.data;
 
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;

src/main/java/dev/compactmods/machines/command/CMMachineDataExportCommand.java renamed to src/main/java/dev/compactmods/machines/command/data/CMMachineDataExportCommand.java

@@ -1,9 +1,9 @@
-package dev.compactmods.machines.command;
+package dev.compactmods.machines.command.data;
 
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
 import dev.compactmods.machines.CompactMachines;
-import dev.compactmods.machines.api.core.Messages;
+import dev.compactmods.machines.api.core.CMCommands;
 import dev.compactmods.machines.api.room.MachineRoomConnections;
 import dev.compactmods.machines.core.MissingDimensionException;
 import dev.compactmods.machines.i18n.TranslationUtil;
@@ -31,10 +31,11 @@ private static int execAll(CommandContext<CommandSourceStack> ctx) {
         var src = ctx.getSource();
         var serv = src.getServer();
 
-        final var connections = MachineToRoomConnections.get(serv);
         final CompactMachineData machines;
+        final MachineRoomConnections connections;
         try {
             machines = CompactMachineData.get(serv);
+            connections = MachineToRoomConnections.get(serv);
         } catch (MissingDimensionException e) {
             CompactMachines.LOGGER.fatal(e);
             return -1;
@@ -56,7 +57,7 @@ private static int execAll(CommandContext<CommandSourceStack> ctx) {
             writer.close();
         } catch (IOException e) {
             CompactMachines.LOGGER.error(e);
-            src.sendFailure(TranslationUtil.message(Messages.FAILED_CMD_FILE_ERROR));
+            src.sendFailure(TranslationUtil.command(CMCommands.FAILED_CMD_FILE_ERROR));
             return -1;
         }
 

src/main/java/dev/compactmods/machines/command/CMRoomDataExportCommand.java renamed to src/main/java/dev/compactmods/machines/command/data/CMRoomDataExportCommand.java

@@ -1,9 +1,9 @@
-package dev.compactmods.machines.command;
+package dev.compactmods.machines.command.data;
 
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
 import dev.compactmods.machines.CompactMachines;
-import dev.compactmods.machines.api.core.Messages;
+import dev.compactmods.machines.api.core.CMCommands;
 import dev.compactmods.machines.core.MissingDimensionException;
 import dev.compactmods.machines.core.Registration;
 import dev.compactmods.machines.i18n.TranslationUtil;
@@ -57,7 +57,7 @@ private static int execAll(CommandContext<CommandSourceStack> ctx) {
             writer.close();
         } catch (IOException e) {
             CompactMachines.LOGGER.error(e);
-            src.sendFailure(TranslationUtil.message(Messages.FAILED_CMD_FILE_ERROR));
+            src.sendFailure(TranslationUtil.command(CMCommands.FAILED_CMD_FILE_ERROR));
             return -1;
         }