Fix for room arg serializing; fix giveMachine "dim not found", lang

Author: robotgryphon

src/datagen/java/dev/compactmods/machines/datagen/lang/EnglishLangGenerator.java

@@ -76,6 +76,8 @@ protected void addTranslations() {
         addCommand(CMCommands.CANNOT_GIVE_MACHINE, "Failed to give a new machine to player.");
         addCommand(CMCommands.MACHINE_GIVEN, "Created a new machine item and gave it to %s.");
 
+        addMessage(Messages.UNKNOWN_ROOM_CHUNK, "Unknown room at %s; please verify it exists.");
+
         add("itemGroup." + CompactMachines.MOD_ID, "Compact Machines");
 
         add("biome." + CompactMachines.MOD_ID + ".machine", "Compact Machine");

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

@@ -3,13 +3,18 @@
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import dev.compactmods.machines.CompactMachines;
+import dev.compactmods.machines.command.argument.RoomPositionArgument;
 import dev.compactmods.machines.command.data.CMDataSubcommand;
 import dev.compactmods.machines.command.subcommand.*;
 import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.synchronization.ArgumentTypes;
+import net.minecraft.commands.synchronization.EmptyArgumentSerializer;
 
 public class CMCommandRoot {
 
     public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
+        ArgumentTypes.register("room_pos", RoomPositionArgument.class, new EmptyArgumentSerializer<>(RoomPositionArgument::room));
+
         final LiteralArgumentBuilder<CommandSourceStack> root = LiteralArgumentBuilder.literal(CompactMachines.MOD_ID);
         root.then(CMEjectSubcommand.make());
         root.then(CMSummarySubcommand.make());

src/main/java/dev/compactmods/machines/command/argument/RoomPositionArgument.java

@@ -8,16 +8,12 @@
 import com.mojang.brigadier.suggestion.Suggestions;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.commands.arguments.coordinates.*;
-import net.minecraft.core.BlockPos;
+import net.minecraft.commands.arguments.coordinates.WorldCoordinate;
 import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraft.server.level.ColumnPos;
 import net.minecraft.world.level.ChunkPos;
 
 import java.util.concurrent.CompletableFuture;
 
-import static net.minecraft.commands.arguments.coordinates.WorldCoordinate.ERROR_EXPECTED_INT;
-
 public class RoomPositionArgument implements ArgumentType<RoomCoordinates> {
     public static final SimpleCommandExceptionType ERROR_NOT_COMPLETE = new SimpleCommandExceptionType(new TranslatableComponent("argument.pos2d.incomplete"));
 

src/main/java/dev/compactmods/machines/command/subcommand/CMGiveMachineSubcommand.java

@@ -5,6 +5,7 @@
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import dev.compactmods.machines.CompactMachines;
 import dev.compactmods.machines.api.core.CMCommands;
+import dev.compactmods.machines.api.core.Messages;
 import dev.compactmods.machines.command.argument.RoomPositionArgument;
 import dev.compactmods.machines.config.ServerConfig;
 import dev.compactmods.machines.core.MissingDimensionException;
@@ -40,8 +41,9 @@ private static int giveMachine(CommandContext<CommandSourceStack> ctx) throws Co
         final var roomPos = RoomPositionArgument.get(ctx, "room");
 
         if(!Rooms.exists(server, roomPos)) {
-            CompactMachines.LOGGER.error("Error giving player a new machine block: compact dimension not found.");
-            throw new CommandRuntimeException(TranslationUtil.command(CMCommands.LEVEL_NOT_FOUND));
+            CompactMachines.LOGGER.error("Error giving player a new machine block: room not found.");
+            src.sendFailure(TranslationUtil.message(Messages.UNKNOWN_ROOM_CHUNK, "%s, %s".formatted(roomPos.x, roomPos.z)));
+            return -1;
         }
 
         try {

src/main/java/dev/compactmods/machines/command/subcommand/CMRoomsSubcommand.java

@@ -15,6 +15,7 @@
 import dev.compactmods.machines.room.Rooms;
 import dev.compactmods.machines.room.data.CompactRoomData;
 import dev.compactmods.machines.room.exceptions.NonexistentRoomException;
+import net.minecraft.ChatFormatting;
 import net.minecraft.commands.CommandRuntimeException;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
@@ -80,7 +81,10 @@ private static int findByContainingPlayer(CommandContext<CommandSourceStack> ctx
             ctx.getSource().sendSuccess(m, false);
         } catch (NonexistentRoomException e) {
             CompactMachines.LOGGER.error("Player is inside an unregistered chunk ({}) in the compact world.", playerChunk, e);
-            throw new CommandRuntimeException(TranslationUtil.message(Messages.UNKNOWN_ROOM_CHUNK));
+            final var tc = new TextComponent("%s, %s".formatted(playerChunk.x, playerChunk.z))
+                    .withStyle(ChatFormatting.RED);
+
+            throw new CommandRuntimeException(TranslationUtil.message(Messages.UNKNOWN_ROOM_CHUNK, tc));
         }
 
         return 0;