Optimize the join and remove commands to team

src/main/java/emu/grasscutter/command/commands/JoinCommand.java

-package emu.grasscutter.command.commands;
-
-import emu.grasscutter.Grasscutter;
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.server.packet.send.PacketChangeMpTeamAvatarRsp;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static emu.grasscutter.utils.Language.translate;
-
-@Command(label = "join", usage = "join [AvatarIDs] such as\"join 10000038 10000039\"",
-        description = "commands.join.description", permission = "player.join")
-public class JoinCommand implements CommandHandler {
-
-    @Override
-    public void execute(Player sender, Player targetPlayer, List<String> args) {
-        if (targetPlayer == null) {
-            CommandHandler.sendMessage(sender, translate(sender, "commands.execution.need_target"));
-            return;
-        }
-
-        List<Integer> avatarIds = new ArrayList<>();
-        for (String arg : args) {
-            try {
-                int avatarId = Integer.parseInt(arg);
-                avatarIds.add(avatarId);
-            } catch (Exception ignored) {
-                ignored.printStackTrace();
-                CommandHandler.sendMessage(sender, translate("commands.generic.invalid.avatarId"));
-                return;
-            }
-        }
-
-
-        for (int i = 0; i < args.size(); i++) {
-            Avatar avatar = targetPlayer.getAvatars().getAvatarById(avatarIds.get(i));
-            if (avatar == null) {
-                CommandHandler.sendMessage(sender, translate("commands.generic.invalid.avatarId"));
-                return;
-            }
-            if (targetPlayer.getTeamManager().getCurrentTeamInfo().contains(avatar)){
-                continue;
-            }
-            targetPlayer.getTeamManager().getCurrentTeamInfo().addAvatar(avatar);
-        }
-
-        // Packet
-        targetPlayer.getTeamManager().updateTeamEntities(new PacketChangeMpTeamAvatarRsp(targetPlayer, targetPlayer.getTeamManager().getCurrentTeamInfo()));
-    }
-}

src/main/java/emu/grasscutter/command/commands/RemoveCommand.java

-package emu.grasscutter.command.commands;
-
-import emu.grasscutter.Grasscutter;
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.server.packet.send.PacketChangeMpTeamAvatarRsp;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import static emu.grasscutter.utils.Language.translate;
-
-@Command(label = "remove", usage = "remove [indexOfYourTeams] index start from 1",
-        description = "commands.remove.description", permission = "player.remove")
-public class RemoveCommand implements CommandHandler {
-
-    @Override
-    public void execute(Player sender, Player targetPlayer, List<String> args) {
-        if (targetPlayer == null) {
-            CommandHandler.sendMessage(sender, translate(sender, "commands.execution.need_target"));
-            return;
-        }
-        
-        List<Integer> avatarIndexList = new ArrayList<>();
-        for (String arg : args) {
-            try {
-                int avatarIndex = Integer.parseInt(arg);
-                if (!avatarIndexList.contains(avatarIndex)) {
-                    avatarIndexList.add(avatarIndex);
-                }
-            } catch (Exception ignored) {
-                ignored.printStackTrace();
-                CommandHandler.sendMessage(sender, translate("commands.remove.invalid_index"));
-                return;
-            }
-        }
-
-        Collections.sort(avatarIndexList, Collections.reverseOrder());
-
-        for (int i = 0; i < avatarIndexList.size(); i++) {
-            if (avatarIndexList.get(i) > targetPlayer.getTeamManager().getCurrentTeamInfo().getAvatars().size() || avatarIndexList.get(i) <= 0) {
-                CommandHandler.sendMessage(targetPlayer, translate("commands.remove.invalid_index"));
-                return;
-            }
-            targetPlayer.getTeamManager().getCurrentTeamInfo().removeAvatar(avatarIndexList.get(i) - 1);
-        }
-
-        // Packet
-        targetPlayer.getTeamManager().updateTeamEntities(new PacketChangeMpTeamAvatarRsp(targetPlayer, targetPlayer.getTeamManager().getCurrentTeamInfo()));
-    }
-}

src/main/java/emu/grasscutter/command/commands/TeamCommand.java

+package emu.grasscutter.command.commands;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.game.avatar.Avatar;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.server.packet.send.PacketChangeMpTeamAvatarRsp;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.HashSet;
+
+import static emu.grasscutter.utils.Language.translate;
+import static emu.grasscutter.Configuration.*;
+
+@Command(label = "team", usage = "team <add|remove|set> [avatarId,...] [index|first|last|index-index,...]", permission = "player.team",
+		permissionTargeted = "player.team.others", description = "commands.team.description")
+public final class TeamCommand implements CommandHandler {
+    private static final int BASE_AVATARID = 10000000;
+
+    @Override
+    public void execute(Player sender, Player targetPlayer, List<String> args) {
+        if (targetPlayer == null) {
+            CommandHandler.sendMessage(sender, translate(sender, "commands.execution.need_target"));
+            return;
+        }
+
+        if (args.isEmpty()) {
+            CommandHandler.sendMessage(sender, translate(sender, "commands.team.usage"));
+            return;
+        }
+
+        switch (args.get(0)) {
+            case "add":
+                if (!addCommand(sender, targetPlayer, args)) return;
+                break;
+
+            case "remove":
+                if (!removeCommand(sender, targetPlayer, args)) return;
+                break;
+
+            case "set":
+                if (!setCommand(sender, targetPlayer, args)) return;
+                break;
+
+            default:
+                CommandHandler.sendMessage(sender, translate(sender, "commands.team.invalid_usage"));
+                CommandHandler.sendMessage(sender, translate(sender, "commands.team.usage"));
+                return;
+        }
+
+        targetPlayer.getTeamManager().updateTeamEntities(new PacketChangeMpTeamAvatarRsp(targetPlayer, targetPlayer.getTeamManager().getCurrentTeamInfo()));
+    }
+
+    private boolean addCommand(Player sender, Player targetPlayer, List<String> args) {
+        if (args.size() < 2) {
+            CommandHandler.sendMessage(sender, translate(sender, "commands.team.invalid_usage"));
+            CommandHandler.sendMessage(sender, translate(sender, "commands.team.add_usage"));
+            return false;
+        }
+
+        int index = -1;
+        if (args.size() > 2) {
+            try {
+                index = Integer.parseInt(args.get(2)) - 1;
+				if (index < 0) index = 0;
+            } catch (Exception e) {
+                CommandHandler.sendMessage(sender, translate(sender, "commands.team.invalid_index"));
+                return false;
+            }
+        }
+
+        var avatarIds = args.get(1).split(",");
+        var currentTeamAvatars = targetPlayer.getTeamManager().getCurrentTeamInfo().getAvatars();
+
+        if (currentTeamAvatars.size() + avatarIds.length > GAME_OPTIONS.avatarLimits.singlePlayerTeam) {
+            CommandHandler.sendMessage(sender, translate(sender, "commands.team.add_too_much", GAME_OPTIONS.avatarLimits.singlePlayerTeam));
+            return false;
+        }
+
+        for (var avatarId: avatarIds) {
+            try {
+                int id = Integer.parseInt(avatarId);
+				var ret = addAvatar(sender, targetPlayer, id, index);
+				if (index > 0) ++index;
+                if (!ret) continue;
+            } catch (Exception e) {
+                CommandHandler.sendMessage(sender, translate(sender, "commands.team.failed_to_add_avatar", avatarId));
+                continue;
+            }
+        }
+        return true;
+    }
+
+    private boolean removeCommand(Player sender, Player targetPlayer, List<String> args) {
+        if (args.size() < 2) {
+            CommandHandler.sendMessage(sender, translate(sender, "commands.team.invalid_usage"));
+            CommandHandler.sendMessage(sender, translate(sender, "commands.team.remove_usage"));
+            return false;
+        }
+
+        var currentTeamAvatars = targetPlayer.getTeamManager().getCurrentTeamInfo().getAvatars();
+        var avatarCount = currentTeamAvatars.size();
+
+        var metaIndexList = args.get(1).split(",");
+        var indexes = new HashSet<Integer>();
+        var ignoreList = new ArrayList<Integer>();
+        for (var metaIndex: metaIndexList) {
+            // step 1: parse metaIndex to indexes
+            var subIndexes = transformToIndexes(metaIndex, avatarCount);
+            if (subIndexes == null) {
+                CommandHandler.sendMessage(sender, translate(sender, "commands.team.failed_to_parse_index", metaIndex));
+                continue;
+            }
+
+            // step 2: get all of the avatar id through indexes
+            for (var avatarIndex: subIndexes) {
+                try {
+                    indexes.add(currentTeamAvatars.get(avatarIndex - 1));
+                } catch (Exception e) {
+                    ignoreList.add(avatarIndex);
+                    continue;
+                }
+            }
+        }
+
+        // step 3: check if user remove all of the avatar
+        if (indexes.size() >= avatarCount) {
+            CommandHandler.sendMessage(sender, translate(sender, "commands.team.remove_too_much"));
+            return false;
+        }
+
+        // step 4: hint user for ignore index
+        if (!ignoreList.isEmpty()) {
+            CommandHandler.sendMessage(sender, translate(sender, "commands.team.ignore_index", ignoreList));
+        }
+
+        // step 5: remove
+        currentTeamAvatars.removeAll(indexes);
+        return true;
+    }
+
+    private boolean setCommand(Player sender, Player targetPlayer, List<String> args) {
+        if (args.size() < 3) {
+            CommandHandler.sendMessage(sender, translate(sender, "commands.team.invalid_usage"));
+            CommandHandler.sendMessage(sender, translate(sender, "commands.team.set_usage"));
+            return false;
+        }
+
+        var currentTeamAvatars = targetPlayer.getTeamManager().getCurrentTeamInfo().getAvatars();
+
+        int index;
+        try {
+            index = Integer.parseInt(args.get(1)) - 1;
+            if (index < 0) index = 0;
+        } catch(Exception e) {
+            CommandHandler.sendMessage(sender, translate(sender, "commands.team.failed_to_parse_index", args.get(1)));
+            return false;
+        }
+
+        if (index + 1 > currentTeamAvatars.size()) {
+            CommandHandler.sendMessage(sender, translate(sender, "commands.team.index_out_of_range"));
+            return false;
+        }
+
+        int avatarId;
+        try {
+            avatarId = Integer.parseInt(args.get(2));
+        } catch(Exception e) {
+            CommandHandler.sendMessage(sender, translate(sender, "commands.team.failed_parse_avatar_id", args.get(2)));
+            return false;
+        }
+        if (avatarId < BASE_AVATARID) {
+            avatarId += BASE_AVATARID;
+        }
+
+		if (currentTeamAvatars.contains(avatarId)) {
+            CommandHandler.sendMessage(sender, translate(sender, "commands.team.avatar_already_in_team", avatarId));
+            return false;
+		}
+
+        if (!targetPlayer.getAvatars().hasAvatar(avatarId)) {
+            CommandHandler.sendMessage(sender, translate(sender, "commands.team.avatar_not_found", avatarId));
+            return false;
+        }
+
+        currentTeamAvatars.set(index, avatarId);
+        return true;
+    }
+
+    private boolean addAvatar(Player sender, Player targetPlayer, int avatarId, int index) {
+        if (avatarId < BASE_AVATARID) {
+            avatarId += BASE_AVATARID;
+        }
+        var currentTeamAvatars = targetPlayer.getTeamManager().getCurrentTeamInfo().getAvatars();
+		if (currentTeamAvatars.contains(avatarId)) {
+            CommandHandler.sendMessage(sender, translate(sender, "commands.team.avatar_already_in_team", avatarId));
+            return false;
+		}
+        if (!sender.getAvatars().hasAvatar(avatarId)) {
+            CommandHandler.sendMessage(sender, translate(sender, "commands.team.avatar_not_found", avatarId));
+            return false;
+        }
+        if (index < 0) {
+            currentTeamAvatars.add(avatarId);
+        } else {
+            currentTeamAvatars.add(index, avatarId);
+        }
+        return true;
+    }
+
+    private List<Integer> transformToIndexes(String metaIndexes, int listLength) {
+        // step 1: check if metaIndexes is a special constants
+        if (metaIndexes.equals("first")) {
+            return List.of(1);
+        } else if (metaIndexes.equals("last")) {
+            return List.of(listLength);
+        }
+
+        // step 2: check if metaIndexes is a range
+        if (metaIndexes.contains("-")) {
+            var range = metaIndexes.split("-");
+            if (range.length < 2) {
+                return null;
+            }
+
+            int min, max;
+            try {
+                min = switch (range[0]) {
+                    case "first" -> 1;
+                    case "last" -> listLength;
+                    default -> Integer.parseInt(range[0]);
+                };
+
+                max = switch (range[1]) {
+                    case "first" -> 1;
+                    case "last" -> listLength;
+                    default -> Integer.parseInt(range[1]);
+                };
+            } catch (Exception e) {
+                return null;
+            }
+
+            if (min > max) {
+                min ^= max;
+                max ^= min;
+                min ^= max;
+            }
+
+            var indexes = new ArrayList<Integer>();
+            for (int i = min; i <= max; ++i) {
+                indexes.add(i);
+            }
+            return indexes;
+        }
+
+        // step 3: index is a value, simply return
+        try {
+            int index = Integer.parseInt(metaIndexes);
+            return List.of(index);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+}

src/main/resources/languages/en-US.json

@@ -331,6 +331,24 @@
       "q_skill_id": "Q skill ID %s.",
       "description": "Set talent level for your current active character"
     },
+    "team": {
+      "usage": "Usage: team <add|remove|set> [avatarId,...] [index|first|last|index-index,...]",
+      "invalid_usage": "invalid usage",
+      "add_usage": "usage(add): team add <avatarId,...> [index]",
+      "invalid_index": "index is invalid",
+      "add_too_much": "server is only allow you to add %d avatar(s)",
+      "failed_to_add_avatar": "failed to add avatar by id: %s",
+      "remove_usage": "usage(remove): team remove <index|first|last|index-index,...>",
+      "failed_parse_index": "failed to parse index: %s",
+      "remove_too_much": "you can't remove so much avatars",
+      "ignore_index": "ignored index(es): %s",
+      "set_usage": "usage(set): team set <index> <avatarId>",
+      "index_out_of_range": "index your specified is out of range",
+      "failed_parse_avatar_id": "failed to parse avatar id: %s",
+      "avatar_already_in_team": "avatar is already in team",
+      "avatar_not_found": "avatar not found: %d",
+      "description": "modify your team manually"
+    },
     "teleportAll": {
       "success": "Summoned all players to your location.",
       "error": "You only can use this command in MP mode.",

src/main/resources/languages/zh-CN.json

@@ -330,6 +330,24 @@
       "q_skill_id": "元素爆发ID %s。",
       "description": "设置当前角色的天赋等级"
     },
+    "team": {
+      "usage": "用法: team <add|remove|set> [avatarId,...] [index|first|last|index-index,...]",
+      "invalid_usage": "无效用法",
+      "add_usage": "用法(add): team add <avatarId,...> [index]",
+      "invalid_index": "无效索引",
+      "add_too_much": "服务端仅支持你添加%d个角色",
+      "failed_to_add_avatar": "无法根据id %s 添加角色",
+      "remove_usage": "用法(remove): team remove <index|first|last|index-index,...>",
+      "failed_parse_index": "无法解析索引: %s",
+      "remove_too_much": "你不能删除那么多角色",
+      "ignore_index": "忽略的索引列表: %s",
+      "set_usage": "用法(set): team set <index> <avatarId>",
+      "index_out_of_range": "你指定的索引超出了范围",
+      "failed_parse_avatar_id": "无法解析的角色id: %s",
+      "avatar_already_in_team": "角色已经在你的队伍中了",
+      "avatar_not_found": "无法找到该角色: %d",
+      "description": "手动修改你的队伍"
+    },
     "teleportAll": {
       "success": "已将所有玩家传送到你的位置。",
       "error": "你只能在多人游戏状态下执行此命令。",