✅ 客户端也使用服务端的翻译逻辑

Author: 1024-byteeeee

src/main/java/top/byteeeee/quickcommand/commands/quickcommandcommand/QuickCommandCommand.java

@@ -85,6 +85,15 @@ public static void register(CommandDispatcher<FabricClientCommandSource> dispatc
             // help
             .then(ClientCommandManager.literal("help")
             .executes(context -> QuickCommandCommandHelper.help(context.getSource().getPlayer())))
+
+            // language
+            .then(ClientCommandManager.literal("language")
+            .then(ClientCommandManager.argument("language", StringArgumentType.string())
+            .suggests(QuickCommandCommandHelper.CLIENT_LANGUAGE_SUGGESTION)
+            .executes(context -> QuickCommandCommandHelper.setLanguage(
+                context.getSource().getPlayer(),
+                StringArgumentType.getString(context, "language")
+            ))))
         );
     }
 }

src/main/java/top/byteeeee/quickcommand/commands/quickcommandcommand/ServerQuickCommandCommand.java

@@ -24,9 +24,7 @@
 import com.mojang.brigadier.arguments.BoolArgumentType;
 import com.mojang.brigadier.arguments.IntegerArgumentType;
 import com.mojang.brigadier.arguments.StringArgumentType;
-import com.mojang.brigadier.suggestion.SuggestionProvider;
 
-import net.minecraft.command.CommandSource;
 import net.minecraft.server.command.ServerCommandSource;
 
 import top.byteeeee.quickcommand.helpers.QuickCommandCommandHelper;
@@ -35,8 +33,6 @@
 import static net.minecraft.server.command.CommandManager.literal;
 
 public class ServerQuickCommandCommand {
-    private static final SuggestionProvider<ServerCommandSource> LANGUAGE_SUGGESTION = (context, builder) -> CommandSource.suggestMatching(new String[]{"en_us", "zh_cn"}, builder);
-
     public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
         dispatcher.register(literal("serverQuickCommand")
             .executes(context -> QuickCommandCommandHelper.showListWithRun(context.getSource().getPlayer()))
@@ -93,7 +89,7 @@ public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
             // language
             .then(literal("language")
             .then(argument("language", StringArgumentType.string())
-            .suggests(LANGUAGE_SUGGESTION)
+            .suggests(QuickCommandCommandHelper.SERVER_LANGUAGE_SUGGESTION)
             .executes(context -> QuickCommandCommandHelper.setLanguage(
                 context.getSource().getPlayer(),
                 StringArgumentType.getString(context, "language")

src/main/java/top/byteeeee/quickcommand/helpers/QuickCommandCommandHelper.java

@@ -20,8 +20,12 @@
 
 package top.byteeeee.quickcommand.helpers;
 
+import com.mojang.brigadier.suggestion.SuggestionProvider;
+
+import net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource;
+import net.minecraft.command.CommandSource;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.text.MutableText;
 import net.minecraft.util.Formatting;
 
@@ -34,6 +38,8 @@
 
 public class QuickCommandCommandHelper {
     private static final Translator translator = new Translator("command");
+    public static final SuggestionProvider<ServerCommandSource> SERVER_LANGUAGE_SUGGESTION = (context, builder) -> CommandSource.suggestMatching(new String[]{"en_us", "zh_cn"}, builder);
+    public static final SuggestionProvider<FabricClientCommandSource> CLIENT_LANGUAGE_SUGGESTION = (context, builder) -> CommandSource.suggestMatching(new String[]{"en_us", "zh_cn"}, builder);
     public static final Map<String, String> QUICK_COMMAND_MAP = new LinkedHashMap<>();
     private static final String MSG_HEAD = EnvironmentHelper.isServer() ? "§b<ServerQuickCommand>§r " : "§b<QuickCommand>§r ";
     public static boolean awaitingConfirmation = false;
@@ -108,6 +114,7 @@ public static int showListWithRun(PlayerEntity player) {
             ).formatted(Formatting.AQUA, Formatting.BOLD),
             false
         );
+
         player.sendMessage(
             translator.tr("setLanguageTitle").formatted(Formatting.LIGHT_PURPLE)
             .append(Messenger.endl())
@@ -116,6 +123,7 @@ public static int showListWithRun(PlayerEntity player) {
             .append(QuickCommandButton.setEnglishButton())
             .append(Messenger.endl()), false
         );
+
         player.sendMessage(translator.tr("commandListTitle").formatted(Formatting.LIGHT_PURPLE), false);
         if (QUICK_COMMAND_MAP.isEmpty()) {
             player.sendMessage(Messenger.s("··· ··· ···").formatted(Formatting.AQUA), false);
@@ -139,6 +147,7 @@ public static int showListWithRun(PlayerEntity player) {
             player.sendMessage(message, false);
             counter++;
         }
+
         final String displayCommandInListMsgLine = "-----------------------------";
         player.sendMessage(
             Messenger.s(displayCommandInListMsgLine).formatted(Formatting.DARK_AQUA)
@@ -151,6 +160,7 @@ public static int showListWithRun(PlayerEntity player) {
             .append(Messenger.endl()),
             false
         );
+
         player.sendMessage(
             translator.tr("easyOperation").formatted(Formatting.LIGHT_PURPLE).append(Messenger.endl())
             .append(QuickCommandButton.addCommandButton()).append(Messenger.endl())
@@ -208,7 +218,7 @@ public static void saveToJson() {
         QuickCommandConfig.saveToJson(QUICK_COMMAND_MAP);
     }
 
-    public static int setLanguage(ServerPlayerEntity player, String language) {
+    public static int setLanguage(PlayerEntity player, String language) {
         List<String> availableLanguages = Arrays.asList("zh_cn", "en_us");
         if (!availableLanguages.contains(language)) {
             return 0;