roll back to use StringArgumentType

QuickBackupMultiMod-Dev · Oct 8, 2024 · cd7a61a · cd7a61a
1 parent dff8c83
commit cd7a61a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/src/main/java/io/github/skydynamic/quickbackupmulti/command/MakeCommand.java b/src/main/java/io/github/skydynamic/quickbackupmulti/command/MakeCommand.java
@@ -1,5 +1,6 @@
 package io.github.skydynamic.quickbackupmulti.command;
 
+import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import io.github.skydynamic.quickbackupmulti.command.permission.PermissionManager;
 import io.github.skydynamic.quickbackupmulti.command.permission.PermissionType;
@@ -40,13 +41,13 @@ public void run() {
     public static LiteralArgumentBuilder<ServerCommandSource> makeCommand = literal("make")
         .requires(it -> PermissionManager.hasPermission(it, 4, PermissionType.HELPER))
         .executes(it -> makeSaveBackup(it.getSource(), dateFormat.format(System.currentTimeMillis()), ""))
-        .then(CommandManager.argument("name", MessageArgumentType.message())
-            .executes(it -> makeSaveBackup(it.getSource(), MessageArgumentType.getMessage(it, "name").getString(), ""))
-            .then(CommandManager.argument("desc", MessageArgumentType.message())
+        .then(CommandManager.argument("name", StringArgumentType.string())
+            .executes(it -> makeSaveBackup(it.getSource(), StringArgumentType.getString(it, "name"), ""))
+            .then(CommandManager.argument("desc", StringArgumentType.string())
                 .executes(it -> makeSaveBackup(
                     it.getSource(),
-                    MessageArgumentType.getMessage(it, "name").getString(),
-                    MessageArgumentType.getMessage(it, "desc").getString()
+                    StringArgumentType.getString(it, "name"),
+                    StringArgumentType.getString(it, "desc")
                 )))
         );
 //        .then(CommandManager.argument("desc", StringArgumentType.string())

diff --git a/src/main/java/io/github/skydynamic/quickbackupmulti/command/QuickBackupMultiCommand.java b/src/main/java/io/github/skydynamic/quickbackupmulti/command/QuickBackupMultiCommand.java
@@ -14,7 +14,6 @@
 import io.github.skydynamic.quickbackupmulti.config.Config;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.command.argument.MessageArgumentType;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.command.CommandManager;
 import net.minecraft.server.command.ServerCommandSource;
@@ -54,14 +53,14 @@ public static void RegisterCommand(CommandDispatcher<ServerCommandSource> dispat
                     .executes(it -> listSaveBackups(it.getSource(), IntegerArgumentType.getInteger(it, "page")))))
 
             .then(literal("search")
-                .then(CommandManager.argument("name", MessageArgumentType.message())
-                    .executes(it -> searchSaveBackups(it.getSource(), MessageArgumentType.getMessage(it, "name").getString()))))
+                .then(CommandManager.argument("name", StringArgumentType.string())
+                    .executes(it -> searchSaveBackups(it.getSource(), StringArgumentType.getString(it, "name")))))
 
             .then(MakeCommand.makeCommand)
 
             .then(literal("back").requires(it -> PermissionManager.hasPermission(it, 4, PermissionType.ADMIN))
-                    .then(CommandManager.argument("name", MessageArgumentType.message())
-                            .executes(it -> restoreSaveBackup(it.getSource(), MessageArgumentType.getMessage(it, "name").getString()))))
+                    .then(CommandManager.argument("name", StringArgumentType.string())
+                            .executes(it -> restoreSaveBackup(it.getSource(), StringArgumentType.getString(it, "name")))))
 
             .then(literal("confirm").requires(it -> PermissionManager.hasPermission(it, 4, PermissionType.ADMIN))
                     .executes(it -> {
@@ -77,14 +76,14 @@ public static void RegisterCommand(CommandDispatcher<ServerCommandSource> dispat
                     .executes(it -> cancelRestore(it.getSource())))
 
             .then(literal("delete").requires(it -> PermissionManager.hasPermission(it, 2, PermissionType.HELPER))
-                    .then(CommandManager.argument("name", MessageArgumentType.message())
-                        .executes(it -> deleteSaveBackup(it.getSource(), MessageArgumentType.getMessage(it, "name").getString()))))
+                    .then(CommandManager.argument("name", StringArgumentType.string())
+                        .executes(it -> deleteSaveBackup(it.getSource(), StringArgumentType.getString(it, "name")))))
 
             .then(settingCommand)
 
             .then(literal("show")
-                .then(CommandManager.argument("name", MessageArgumentType.message())
-                    .executes(it -> showBackupDetail(it.getSource(), MessageArgumentType.getMessage(it, "name").getString()))))
+                .then(CommandManager.argument("name", StringArgumentType.string())
+                    .executes(it -> showBackupDetail(it.getSource(), StringArgumentType.getString(it, "name")))))
 
             .then(permissionCommand)
         );