Configurable commands, clean up some lang files

Author: robotgryphon

src/api/java/dev/compactmods/machines/api/core/CMCommands.java

@@ -7,7 +7,6 @@
 public class CMCommands {
     public static final ResourceLocation LEVEL_REGISTERED = new ResourceLocation(MOD_ID, "level_registered");
     public static final ResourceLocation LEVEL_NOT_FOUND = new ResourceLocation(MOD_ID, "level_not_found");
-    public static final ResourceLocation ROOM_DATA_NOT_FOUND = new ResourceLocation(MOD_ID, "room_data_not_found");
 
     /**
      * Used for displaying the number of registered machines via summary commands.
@@ -21,12 +20,7 @@ public class CMCommands {
     public static final ResourceLocation ROOM_REG_COUNT = new ResourceLocation(MOD_ID, "room_reg_count");
     public static final ResourceLocation NOT_A_MACHINE_BLOCK = new ResourceLocation(MOD_ID, "not_a_machine_block");
     public static final ResourceLocation MACHINE_NOT_BOUND = new ResourceLocation(MOD_ID, "machine_not_bound");
-    public static final ResourceLocation REBIND_HAS_TUNNEL_CONNECTED = new ResourceLocation(MOD_ID, "rebind_tunnel_connected");
 
-    public static final ResourceLocation CMD_ROOM_NOT_REGISTERED = new ResourceLocation(MOD_ID, "room_not_registered");
-    public static final ResourceLocation CMD_MACHINE_NOT_REGISTERED = new ResourceLocation(MOD_ID, "machine_not_registered");
-    public static final ResourceLocation CMD_BAD_STATE = new ResourceLocation(MOD_ID, "incorrect_machine_state");
-    public static final ResourceLocation NO_PLAYER_HISTORY = new ResourceLocation(MOD_ID, "no_player_history");
     public static final ResourceLocation WRONG_DIMENSION = new ResourceLocation(MOD_ID, "not_in_compact_dimension");
     public static final ResourceLocation NOT_IN_COMPACT_DIMENSION = new ResourceLocation(MOD_ID, "not_in_compact_dim");
     public static final ResourceLocation FAILED_CMD_FILE_ERROR = new ResourceLocation(MOD_ID, "failed_command_file_error");

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

@@ -36,11 +36,10 @@ protected void addTranslations() {
         addCommand(CMCommands.FAILED_CMD_FILE_ERROR, "Failed to execute command; there was a file error. Check logs.");
         addCommand(CMCommands.MACHINE_NOT_BOUND, "Machine at %s does not have an associated ID.");
         addCommand(CMCommands.ROOM_REG_COUNT, "Number of registered rooms: %s");
-        addCommand(CMCommands.MACHINE_REG_DIM, "Number of registered machines: %s");
+        addCommand(CMCommands.MACHINE_REG_DIM, "[%s]: %s");
+        addCommand(CMCommands.MACHINE_REG_TOTAL, "Total: %s");
         addCommand(CMCommands.LEVEL_REGISTERED, "Compact Machine dimension found.");
         addCommand(CMCommands.LEVEL_NOT_FOUND, "Compact Machine dimension could not be found.");
-        addCommand(CMCommands.CMD_ROOM_NOT_REGISTERED, "");
-        addCommand(CMCommands.ROOM_DATA_NOT_FOUND, "");
 
         addAdvancementTranslations();
 

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

@@ -15,7 +15,6 @@
 public class CMEjectSubcommand {
     public static ArgumentBuilder<CommandSourceStack, ?> make() {
         return Commands.literal("eject")
-                .requires(cs -> cs.hasPermission(Commands.LEVEL_GAMEMASTERS))
                 .executes(CMEjectSubcommand::execExecutingPlayer)
                     .then(Commands.argument("player", EntityArgument.player())
                     .executes(CMEjectSubcommand::execSpecificPlayer));

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

@@ -6,6 +6,7 @@
 import dev.compactmods.machines.CompactMachines;
 import dev.compactmods.machines.api.core.CMCommands;
 import dev.compactmods.machines.command.argument.RoomPositionArgument;
+import dev.compactmods.machines.config.ServerConfig;
 import dev.compactmods.machines.core.MissingDimensionException;
 import dev.compactmods.machines.i18n.TranslationUtil;
 import dev.compactmods.machines.machine.CompactMachineItem;
@@ -22,7 +23,7 @@ public class CMGiveMachineSubcommand {
 
     public static LiteralArgumentBuilder<CommandSourceStack> make() {
         final var subRoot = Commands.literal("give")
-                .requires(cs -> cs.hasPermission(Commands.LEVEL_GAMEMASTERS));
+                .requires(cs -> cs.hasPermission(ServerConfig.giveMachineLevel()));
 
         subRoot.then(Commands.argument("player", EntityArgument.player())
                 .then(Commands.argument("room", RoomPositionArgument.room())

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

@@ -6,6 +6,7 @@
 import dev.compactmods.machines.CompactMachines;
 import dev.compactmods.machines.api.core.CMCommands;
 import dev.compactmods.machines.command.argument.RoomPositionArgument;
+import dev.compactmods.machines.config.ServerConfig;
 import dev.compactmods.machines.core.Registration;
 import dev.compactmods.machines.machine.graph.DimensionMachineGraph;
 import dev.compactmods.machines.i18n.TranslationUtil;
@@ -20,7 +21,7 @@ public class CMRebindSubcommand {
 
     public static LiteralArgumentBuilder<CommandSourceStack> make() {
         final var subRoot = Commands.literal("rebind")
-                .requires(cs -> cs.hasPermission(Commands.LEVEL_GAMEMASTERS));
+                .requires(cs -> cs.hasPermission(ServerConfig.rebindLevel()));
 
         subRoot.then(Commands.argument("pos", BlockPosArgument.blockPos())
                 .then(Commands.argument("bindTo", RoomPositionArgument.room())

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

@@ -19,11 +19,10 @@
 public class CMSummarySubcommand {
     public static ArgumentBuilder<CommandSourceStack, ?> make() {
         return Commands.literal("summary")
-                // .requires(cs -> cs.hasPermission(Commands.LEVEL_ALL))
                 .executes(CMSummarySubcommand::exec);
     }
 
-    private static int exec(CommandContext<CommandSourceStack> ctx) throws CommandSyntaxException {
+    private static int exec(CommandContext<CommandSourceStack> ctx) {
         var src = ctx.getSource();
         var serv = src.getServer();
 

src/main/java/dev/compactmods/machines/config/ServerConfig.java

@@ -1,7 +1,9 @@
 package dev.compactmods.machines.config;
 
 import com.electronwill.nightconfig.core.EnumGetMethod;
+import dev.compactmods.machines.client.level.EmptyLevelEntityGetter;
 import dev.compactmods.machines.core.EnumMachinePlayersBreakHandling;
+import net.minecraft.commands.Commands;
 import net.minecraftforge.common.ForgeConfigSpec;
 
 import java.util.Arrays;
@@ -15,6 +17,9 @@ public class ServerConfig {
 
     public static ForgeConfigSpec.IntValue MACHINE_FLOOR_Y;
 
+    private static ForgeConfigSpec.IntValue REBIND_LEVEL;
+    private static ForgeConfigSpec.IntValue GIVE_MACHINE;
+
     static {
         generateConfig();
     }
@@ -46,6 +51,26 @@ private static void generateConfig() {
 
         builder.pop();
 
+        builder
+                .push("commands")
+                .push("permLevels")
+                .comment("Specifies requirements for running administrative commands. Requires a server restart to take effect.")
+                .comment("0 = ALL, 1 = ADMIN, 2 = OP, 4 = OWNER");
+
+
+        REBIND_LEVEL = builder.defineInRange("rebind", Commands.LEVEL_ALL, Commands.LEVEL_ALL, Commands.LEVEL_OWNERS);
+        GIVE_MACHINE = builder.defineInRange("give", Commands.LEVEL_ALL, Commands.LEVEL_ALL, Commands.LEVEL_OWNERS);
+
+        builder.pop(2);
+
         CONFIG = builder.build();
     }
+
+    public static int rebindLevel() {
+        return REBIND_LEVEL.get();
+    }
+
+    public static int giveMachineLevel() {
+        return GIVE_MACHINE.get();
+    }
 }