Copy some files from Grasscutter-Quests

NOT completely finished, nor is it completely done. Protocol issues remain! (including lack of packet IDs)

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

@@ -3,7 +3,7 @@ package emu.grasscutter.command.commands;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.excels.AchievementData;
+import emu.grasscutter.data.excels.achievement.AchievementData;
 import emu.grasscutter.game.achievement.AchievementControlReturns;
 import emu.grasscutter.game.achievement.Achievements;
 import emu.grasscutter.game.player.Player;
@@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger;
         permissionTargeted = "player.achievement.others",
         targetRequirement = Command.TargetRequirement.PLAYER,
         threading = true)
-public class AchievementCommand implements CommandHandler {
+public final class AchievementCommand implements CommandHandler {
     private static void sendSuccessMessage(Player sender, String cmd, Object... args) {
         CommandHandler.sendTranslatedMessage(
                 sender, AchievementControlReturns.Return.SUCCESS.getKey() + cmd, args);

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

@@ -1,137 +1,139 @@
-package emu.grasscutter.command.commands;
-
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.entity.*;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.ElementType;
-import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.server.event.entity.EntityDamageEvent;
-import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
-import lombok.Setter;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.function.BiConsumer;
-import java.util.regex.Pattern;
-
-import static emu.grasscutter.command.CommandHelpers.*;
-import static emu.grasscutter.utils.Language.translate;
-
-@Command(
-    label = "entity",
-    usage = {
-        "<configId gadget> [state<state>] [maxhp<maxhp>] [hp<hp>(0 for infinite)] [atk<atk>] [def<def>]",
-        "<configId monster> [ai<aiId>] [maxhp<maxhp>] [hp<hp>(0 for infinite)] [atk<atk>] [def<def>]"},
-    permission = "server.entity")
-public final class EntityCommand implements CommandHandler {
-    private static final Map<Pattern, BiConsumer<EntityParameters, Integer>> intCommandHandlers = Map.ofEntries(
-        Map.entry(stateRegex, EntityParameters::setState),
-        Map.entry(maxHPRegex, EntityParameters::setMaxHP),
-        Map.entry(hpRegex, EntityParameters::setHp),
-        Map.entry(defRegex, EntityParameters::setDef),
-        Map.entry(atkRegex, EntityParameters::setAtk),
-        Map.entry(aiRegex, EntityParameters::setAi)
-    );
-
-    @Override
-    public void execute(Player sender, Player targetPlayer, List<String> args) {
-        EntityParameters param = new EntityParameters();
-
-        parseIntParameters(args, param, intCommandHandlers);
-
-        // At this point, first remaining argument MUST be the id and the rest the pos
-        if (args.size() != 1) {
-            sendUsageMessage(sender);  // Reachable if someone does `/give lv90` or similar
-            throw new IllegalArgumentException();
-        }
-
-        try {
-            param.configId = Integer.parseInt(args.get(0));
-        } catch (NumberFormatException ignored) {
-            CommandHandler.sendMessage(sender, translate(sender, "commands.generic.invalid.cfgId"));
-        }
-
-        param.scene = targetPlayer.getScene();
-        var entity = param.scene.getEntityByConfigId(param.configId);
-
-        if(entity == null){
-            CommandHandler.sendMessage(sender, translate(sender, "commands.entity.not_found_error"));
-            return;
-        }
-        applyFightProps(entity, param);
-        applyGadgetParams(entity, param);
-        applyMonsterParams(entity, param);
-
-        CommandHandler.sendMessage(sender, translate(sender, "commands.status.success"));
-    }
-
-
-
-    private void applyGadgetParams(GameEntity entity, EntityParameters param) {
-        if(!(entity instanceof EntityGadget)){
-            return;
-        }
-        if(param.state != -1 ){
-            ((EntityGadget) entity).updateState(param.state);
-        }
-
-    }
-    private void applyMonsterParams(GameEntity entity, EntityParameters param) {
-        if(!(entity instanceof EntityMonster)){
-            return;
-        }
-
-        if(param.ai != -1 ){
-            ((EntityMonster) entity).setAiId(param.ai);
-            //TODO notify
-        }
-    }
-
-    private void applyFightProps(GameEntity entity, EntityParameters param) {
-        var changedFields = new ArrayList<FightProperty>();
-        if (param.maxHP != -1) {
-            setFightProperty(entity, FightProperty.FIGHT_PROP_MAX_HP, param.maxHP, changedFields);
-        }
-        if (param.hp != -1) {
-            float targetHp = param.hp == 0 ? Float.MAX_VALUE : param.hp;
-            float oldHp = entity.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP);
-            setFightProperty(entity, FightProperty.FIGHT_PROP_CUR_HP, targetHp, changedFields);
-            EntityDamageEvent event = new EntityDamageEvent(entity, oldHp-targetHp, ElementType.None, null);
-            callHPEvents(entity, event);
-        }
-        if (param.atk != -1) {
-            setFightProperty(entity, FightProperty.FIGHT_PROP_ATTACK, param.atk, changedFields);
-            setFightProperty(entity, FightProperty.FIGHT_PROP_CUR_ATTACK, param.atk, changedFields);
-        }
-        if (param.def != -1) {
-            setFightProperty(entity, FightProperty.FIGHT_PROP_DEFENSE, param.def, changedFields);
-            setFightProperty(entity, FightProperty.FIGHT_PROP_CUR_DEFENSE, param.def, changedFields);
-        }
-        if(!changedFields.isEmpty()) {
-            entity.getScene().broadcastPacket(new PacketEntityFightPropUpdateNotify(entity, changedFields));
-        }
-    }
-
-    private void callHPEvents(GameEntity entity, EntityDamageEvent event){
-        entity.callLuaHPEvent(event);
-    }
-
-    private void setFightProperty(GameEntity entity, FightProperty property, float value, List<FightProperty> modifiedProps){
-        entity.setFightProperty(property, value);
-        modifiedProps.add(property);
-    }
-
-    private static class EntityParameters {
-        @Setter public int configId = -1;
-        @Setter public int state = -1;
-        @Setter public int hp = -1;
-        @Setter public int maxHP = -1;
-        @Setter public int atk = -1;
-        @Setter public int def = -1;
-        @Setter public int ai = -1;
-        public Scene scene = null;
-    }
-}
+package emu.grasscutter.command.commands;
+
+import static emu.grasscutter.command.CommandHelpers.*;
+import static emu.grasscutter.utils.Language.translate;
+
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.game.entity.*;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.ElementType;
+import emu.grasscutter.game.props.FightProperty;
+import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.server.event.entity.EntityDamageEvent;
+import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiConsumer;
+import java.util.regex.Pattern;
+import lombok.Setter;
+
+@Command(
+        label = "entity",
+        usage = {
+            "<configId gadget> [state<state>] [maxhp<maxhp>] [hp<hp>(0 for infinite)] [atk<atk>] [def<def>]",
+            "<configId monster> [ai<aiId>] [maxhp<maxhp>] [hp<hp>(0 for infinite)] [atk<atk>] [def<def>]"
+        },
+        permission = "server.entity")
+public final class EntityCommand implements CommandHandler {
+    private static final Map<Pattern, BiConsumer<EntityParameters, Integer>> intCommandHandlers =
+            Map.ofEntries(
+                    Map.entry(stateRegex, EntityParameters::setState),
+                    Map.entry(maxHPRegex, EntityParameters::setMaxHP),
+                    Map.entry(hpRegex, EntityParameters::setHp),
+                    Map.entry(defRegex, EntityParameters::setDef),
+                    Map.entry(atkRegex, EntityParameters::setAtk),
+                    Map.entry(aiRegex, EntityParameters::setAi));
+
+    @Override
+    public void execute(Player sender, Player targetPlayer, List<String> args) {
+        EntityParameters param = new EntityParameters();
+
+        parseIntParameters(args, param, intCommandHandlers);
+
+        // At this point, first remaining argument MUST be the id and the rest the pos
+        if (args.size() != 1) {
+            sendUsageMessage(sender); // Reachable if someone does `/give lv90` or similar
+            throw new IllegalArgumentException();
+        }
+
+        try {
+            param.configId = Integer.parseInt(args.get(0));
+        } catch (NumberFormatException ignored) {
+            CommandHandler.sendMessage(sender, translate(sender, "commands.generic.invalid.cfgId"));
+        }
+
+        param.scene = targetPlayer.getScene();
+        var entity = param.scene.getEntityByConfigId(param.configId);
+
+        if (entity == null) {
+            CommandHandler.sendMessage(sender, translate(sender, "commands.entity.not_found_error"));
+            return;
+        }
+        applyFightProps(entity, param);
+        applyGadgetParams(entity, param);
+        applyMonsterParams(entity, param);
+
+        CommandHandler.sendMessage(sender, translate(sender, "commands.status.success"));
+    }
+
+    private void applyGadgetParams(GameEntity entity, EntityParameters param) {
+        if (!(entity instanceof EntityGadget)) {
+            return;
+        }
+        if (param.state != -1) {
+            ((EntityGadget) entity).updateState(param.state);
+        }
+    }
+
+    private void applyMonsterParams(GameEntity entity, EntityParameters param) {
+        if (!(entity instanceof EntityMonster)) {
+            return;
+        }
+
+        if (param.ai != -1) {
+            ((EntityMonster) entity).setAiId(param.ai);
+            // TODO notify
+        }
+    }
+
+    private void applyFightProps(GameEntity entity, EntityParameters param) {
+        var changedFields = new ArrayList<FightProperty>();
+        if (param.maxHP != -1) {
+            setFightProperty(entity, FightProperty.FIGHT_PROP_MAX_HP, param.maxHP, changedFields);
+        }
+        if (param.hp != -1) {
+            float targetHp = param.hp == 0 ? Float.MAX_VALUE : param.hp;
+            float oldHp = entity.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP);
+            setFightProperty(entity, FightProperty.FIGHT_PROP_CUR_HP, targetHp, changedFields);
+            EntityDamageEvent event =
+                    new EntityDamageEvent(entity, oldHp - targetHp, ElementType.None, null);
+            callHPEvents(entity, event);
+        }
+        if (param.atk != -1) {
+            setFightProperty(entity, FightProperty.FIGHT_PROP_ATTACK, param.atk, changedFields);
+            setFightProperty(entity, FightProperty.FIGHT_PROP_CUR_ATTACK, param.atk, changedFields);
+        }
+        if (param.def != -1) {
+            setFightProperty(entity, FightProperty.FIGHT_PROP_DEFENSE, param.def, changedFields);
+            setFightProperty(entity, FightProperty.FIGHT_PROP_CUR_DEFENSE, param.def, changedFields);
+        }
+        if (!changedFields.isEmpty()) {
+            entity
+                    .getScene()
+                    .broadcastPacket(new PacketEntityFightPropUpdateNotify(entity, changedFields));
+        }
+    }
+
+    private void callHPEvents(GameEntity entity, EntityDamageEvent event) {
+        entity.callLuaHPEvent(event);
+    }
+
+    private void setFightProperty(
+            GameEntity entity, FightProperty property, float value, List<FightProperty> modifiedProps) {
+        entity.setFightProperty(property, value);
+        modifiedProps.add(property);
+    }
+
+    private static class EntityParameters {
+        @Setter public int configId = -1;
+        @Setter public int state = -1;
+        @Setter public int hp = -1;
+        @Setter public int maxHP = -1;
+        @Setter public int atk = -1;
+        @Setter public int def = -1;
+        @Setter public int ai = -1;
+        public Scene scene = null;
+    }
+}

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

@@ -4,10 +4,10 @@ import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.GameDepot;
-import emu.grasscutter.data.excels.AvatarData;
+import emu.grasscutter.data.excels.avatar.AvatarData;
 import emu.grasscutter.data.excels.ItemData;
-import emu.grasscutter.data.excels.ReliquaryAffixData;
-import emu.grasscutter.data.excels.ReliquaryMainPropData;
+import emu.grasscutter.data.excels.reliquary.ReliquaryAffixData;
+import emu.grasscutter.data.excels.reliquary.ReliquaryMainPropData;
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.inventory.ItemType;

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

@@ -1,72 +1,72 @@
-package emu.grasscutter.command.commands;
-
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.world.SceneGroupInstance;
-
-import java.util.List;
-
-import static emu.grasscutter.utils.Language.translate;
-
-@Command(label = "group",
-         aliases = {"g"},
-         usage = {"(refresh) [<groupId>] [<suiteId>]"},
-         permission = "player.group",
-         permissionTargeted = "player.group.others")
-public final class GroupCommand implements CommandHandler {
-
-    @Override
-    public void execute(Player sender, Player targetPlayer, List<String> args) {
-        if (args.isEmpty()) {
-            return;
-        }
-        String cmd = args.remove(0).toLowerCase();
-
-        int groupId = 0;
-        int suiteId = 0;
-        switch (args.size()){
-            case 2:
-                try {
-                    suiteId = Integer.parseInt(args.get(1));
-                }
-                catch (Exception e) {
-                    CommandHandler.sendMessage(sender, translate(sender, "commands.group.invalid_suiteid"));
-                    return;
-                }  // Fallthrough
-            case 1:
-                try {
-                    groupId = Integer.parseInt(args.get(0));
-                }
-                catch (Exception e) {
-                    CommandHandler.sendMessage(sender, translate(sender, "commands.group.invalid_groupid"));
-                    return;
-                }
-                break;
-            default:
-                sendUsageMessage(sender);
-                return;
-        }
-
-        switch (cmd) {
-            case "refresh" -> {
-                SceneGroupInstance groupInstance = targetPlayer.getScene().getScriptManager().getGroupInstanceById(groupId);
-                if(groupInstance == null) {
-                    CommandHandler.sendMessage(sender, translate(sender, "commands.group.group_not_found", groupId));
-                    return;
-                }
-
-                if(args.size() >= 2) {
-                    targetPlayer.getScene().getScriptManager().refreshGroup(groupInstance, suiteId, false);
-                } else {
-                    targetPlayer.getScene().getScriptManager().refreshGroup(groupInstance);
-                }
-
-                CommandHandler.sendMessage(sender, translate(sender, "commands.group.refreshed", groupId));
-            }
-            default -> {
-                sendUsageMessage(sender);
-            }
-        }
-    }
-}
+package emu.grasscutter.command.commands;
+
+import static emu.grasscutter.utils.Language.translate;
+
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.world.SceneGroupInstance;
+import java.util.List;
+
+@Command(
+        label = "group",
+        aliases = {"g"},
+        usage = {"(refresh) [<groupId>] [<suiteId>]"},
+        permission = "player.group",
+        permissionTargeted = "player.group.others")
+public final class GroupCommand implements CommandHandler {
+
+    @Override
+    public void execute(Player sender, Player targetPlayer, List<String> args) {
+        if (args.isEmpty()) {
+            return;
+        }
+        String cmd = args.remove(0).toLowerCase();
+
+        int groupId = 0;
+        int suiteId = 0;
+        switch (args.size()) {
+            case 2:
+                try {
+                    suiteId = Integer.parseInt(args.get(1));
+                } catch (Exception e) {
+                    CommandHandler.sendMessage(sender, translate(sender, "commands.group.invalid_suiteid"));
+                    return;
+                } // Fallthrough
+            case 1:
+                try {
+                    groupId = Integer.parseInt(args.get(0));
+                } catch (Exception e) {
+                    CommandHandler.sendMessage(sender, translate(sender, "commands.group.invalid_groupid"));
+                    return;
+                }
+                break;
+            default:
+                sendUsageMessage(sender);
+                return;
+        }
+
+        switch (cmd) {
+            case "refresh" -> {
+                SceneGroupInstance groupInstance =
+                        targetPlayer.getScene().getScriptManager().getGroupInstanceById(groupId);
+                if (groupInstance == null) {
+                    CommandHandler.sendMessage(
+                            sender, translate(sender, "commands.group.group_not_found", groupId));
+                    return;
+                }
+
+                if (args.size() >= 2) {
+                    targetPlayer.getScene().getScriptManager().refreshGroup(groupInstance, suiteId, false);
+                } else {
+                    targetPlayer.getScene().getScriptManager().refreshGroup(groupInstance);
+                }
+
+                CommandHandler.sendMessage(sender, translate(sender, "commands.group.refreshed", groupId));
+            }
+            default -> {
+                sendUsageMessage(sender);
+            }
+        }
+    }
+}

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

@@ -9,7 +9,7 @@ import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.excels.GadgetData;
 import emu.grasscutter.data.excels.ItemData;
-import emu.grasscutter.data.excels.MonsterData;
+import emu.grasscutter.data.excels.monster.MonsterData;
 import emu.grasscutter.game.entity.*;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.EntityType;

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

@@ -3,7 +3,7 @@ package emu.grasscutter.command.commands;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.excels.AvatarSkillDepotData;
+import emu.grasscutter.data.excels.avatar.AvatarSkillDepotData;
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.utils.Language;

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

@@ -1,125 +1,156 @@
-package emu.grasscutter.command.commands;
-
-import emu.grasscutter.Grasscutter;
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.activity.PlayerActivityData;
-import emu.grasscutter.game.activity.trialavatar.TrialAvatarActivityHandler;
-import emu.grasscutter.game.activity.trialavatar.TrialAvatarPlayerData;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.ActivityType;
-import emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo;
-import emu.grasscutter.server.packet.send.PacketActivityInfoNotify;
-import emu.grasscutter.utils.JsonUtils;
-
-import java.util.List;
-import lombok.val;
-
-import static emu.grasscutter.utils.Language.translate;
-
-@Command(
-    label = "trialAvatarActivity",
-    aliases = {"taa"},
-    usage = {"change <scheduleId>", "toggleDungeon <index(start from 1)|all>", "toggleReward <index(start from 1)|all>"},
-    permission = "player.trialavataractivity",
-    permissionTargeted = "player.trialavataractivity.others")
-public final class TrialAvatarActivityCommand implements CommandHandler {
-    @Override
-    public void execute(Player sender, Player targetPlayer, List<String> args) {
-        if (args.size() < 2) {
-            sendUsageMessage(sender);
-            return;
-        }
-
-        String action = args.get(0).toLowerCase();
-        String param = args.get(1);
-
-        val playerDataOption = targetPlayer.getActivityManager()
-            .getPlayerActivityDataByActivityType(ActivityType.NEW_ACTIVITY_TRIAL_AVATAR);
-        if (playerDataOption == null) {
-            CommandHandler.sendMessage(sender, translate(sender, "commands.trialAvatarActivity.not_found"));
-            return;
-        }
-        val playerData = playerDataOption.get();
-        if (playerData == null) {
-            CommandHandler.sendMessage(sender, translate(sender, "commands.trialAvatarActivity.not_found"));
-            return;
-        }
-        var handler = (TrialAvatarActivityHandler) playerData.getActivityHandler();
-        if (handler == null) {
-            CommandHandler.sendMessage(sender, translate(sender, "commands.trialAvatarActivity.not_found"));
-            return;
-        }
-        TrialAvatarPlayerData trialAvatarPlayerData = JsonUtils.decode(playerData.getDetail(), TrialAvatarPlayerData.class);
-        if (trialAvatarPlayerData == null) {
-            CommandHandler.sendMessage(sender, translate(sender, "commands.trialAvatarActivity.not_found"));
-            return;
-        }
-
-        switch (action) {
-            default -> {
-                sendUsageMessage(sender);
-            }
-            case "change" -> {
-                if (!param.chars().allMatch(Character::isDigit)) { // if its not number
-                    CommandHandler.sendMessage(sender, translate(sender, "commands.trialAvatarActivity.invalid_param"));
-                    return;
-                }
-                if (TrialAvatarPlayerData.getAvatarIdList(Integer.parseInt(param)).isEmpty()) {
-                    CommandHandler.sendMessage(sender, translate(sender, "commands.trialAvatarActivity.schedule_not_found", Integer.parseInt(param)));
-                    return;
-                }
-                playerData.setDetail(TrialAvatarPlayerData.create(Integer.parseInt(param)));
-                playerData.save();
-                CommandHandler.sendMessage(sender, translate(sender, "commands.trialAvatarActivity.success_schedule", Integer.parseInt(param)));
-            }
-            case "toggledungeon" -> {
-                if (param.chars().allMatch(Character::isDigit)) { // if its number
-                    if (Integer.parseInt(param)-1 >= trialAvatarPlayerData.getRewardInfoList().size()
-                        || Integer.parseInt(param)-1 <= 0) {
-                        CommandHandler.sendMessage(sender, translate(sender, "commands.trialAvatarActivity.invalid_param"));
-                        return;
-                    }
-                    TrialAvatarPlayerData.RewardInfoItem rewardInfo = trialAvatarPlayerData.getRewardInfoList().get(Integer.parseInt(param)-1);
-                    rewardInfo.setPassedDungeon(!rewardInfo.isPassedDungeon());
-                    playerData.setDetail(trialAvatarPlayerData);
-                    playerData.save();
-                    CommandHandler.sendMessage(sender, translate(sender, "commands.trialAvatarActivity.success_dungeon", Integer.parseInt(param)));
-                } else {
-                    if (!param.equals("all")) {
-                        CommandHandler.sendMessage(sender, translate(sender, "commands.trialAvatarActivity.invalid_param"));
-                        return;
-                    }
-                    trialAvatarPlayerData.getRewardInfoList().forEach(r -> r.setPassedDungeon(!r.isPassedDungeon()));
-                    playerData.setDetail(trialAvatarPlayerData);
-                    playerData.save();
-                    CommandHandler.sendMessage(sender, translate(sender, "commands.trialAvatarActivity.success_dungeon_all"));
-                }
-            }
-            case "togglereward" -> {
-                if (param.chars().allMatch(Character::isDigit)) { // if its number
-                    if (Integer.parseInt(param)-1 >= trialAvatarPlayerData.getRewardInfoList().size()
-                        || Integer.parseInt(param)-1 <= 0) {
-                        CommandHandler.sendMessage(sender, translate(sender, "commands.trialAvatarActivity.invalid_param"));
-                        return;
-                    }
-                    TrialAvatarPlayerData.RewardInfoItem rewardInfo = trialAvatarPlayerData.getRewardInfoList().get(Integer.parseInt(param)-1);
-                    rewardInfo.setReceivedReward(!rewardInfo.isReceivedReward());
-                    playerData.setDetail(trialAvatarPlayerData);
-                    playerData.save();
-                    CommandHandler.sendMessage(sender, translate(sender, "commands.trialAvatarActivity.success_reward", Integer.parseInt(param)));
-                } else {
-                    if (!param.toLowerCase().equals("all")) {
-                        CommandHandler.sendMessage(sender, translate(sender, "commands.trialAvatarActivity.invalid_param"));
-                        return;
-                    }
-                    trialAvatarPlayerData.getRewardInfoList().forEach(r -> r.setReceivedReward(!r.isReceivedReward()));
-                    playerData.setDetail(trialAvatarPlayerData);
-                    playerData.save();
-                    CommandHandler.sendMessage(sender, translate(sender, "commands.trialAvatarActivity.success_reward_all"));
-                }
-            }
-        }
-        targetPlayer.sendPacket(new PacketActivityInfoNotify(handler.toProto(playerData, targetPlayer.getActivityManager().getConditionExecutor())));
-    }
-}
+package emu.grasscutter.command.commands;
+
+import static emu.grasscutter.utils.Language.translate;
+
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.game.activity.trialavatar.TrialAvatarActivityHandler;
+import emu.grasscutter.game.activity.trialavatar.TrialAvatarPlayerData;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.ActivityType;
+import emu.grasscutter.server.packet.send.PacketActivityInfoNotify;
+import emu.grasscutter.utils.JsonUtils;
+import java.util.List;
+
+@Command(
+        label = "trialAvatarActivity",
+        aliases = {"taa"},
+        usage = {
+            "change <scheduleId>",
+            "toggleDungeon <index(start from 1)|all>",
+            "toggleReward <index(start from 1)|all>"
+        },
+        permission = "player.trialavataractivity",
+        permissionTargeted = "player.trialavataractivity.others")
+public final class TrialAvatarActivityCommand implements CommandHandler {
+    @Override
+    public void execute(Player sender, Player targetPlayer, List<String> args) {
+        if (args.size() < 2) {
+            sendUsageMessage(sender);
+            return;
+        }
+
+        var action = args.get(0).toLowerCase();
+        var param = args.get(1);
+
+        var playerDataOption =
+                targetPlayer
+                        .getActivityManager()
+                        .getPlayerActivityDataByActivityType(ActivityType.NEW_ACTIVITY_TRIAL_AVATAR);
+        if (playerDataOption.isEmpty()) {
+            CommandHandler.sendMessage(
+                    sender, translate(sender, "commands.trialAvatarActivity.not_found"));
+            return;
+        }
+
+        var playerData = playerDataOption.get();
+        var handler = (TrialAvatarActivityHandler) playerData.getActivityHandler();
+        if (handler == null) {
+            CommandHandler.sendMessage(
+                    sender, translate(sender, "commands.trialAvatarActivity.not_found"));
+            return;
+        }
+
+        var trialAvatarPlayerData =
+                JsonUtils.decode(playerData.getDetail(), TrialAvatarPlayerData.class);
+        if (trialAvatarPlayerData == null) {
+            CommandHandler.sendMessage(
+                    sender, translate(sender, "commands.trialAvatarActivity.not_found"));
+            return;
+        }
+
+        switch (action) {
+            default -> this.sendUsageMessage(sender);
+            case "change" -> {
+                if (!param.chars().allMatch(Character::isDigit)) { // if its not number
+                    CommandHandler.sendMessage(
+                            sender, translate(sender, "commands.trialAvatarActivity.invalid_param"));
+                    return;
+                }
+                if (TrialAvatarPlayerData.getAvatarIdList(Integer.parseInt(param)).isEmpty()) {
+                    CommandHandler.sendMessage(
+                            sender,
+                            translate(
+                                    sender,
+                                    "commands.trialAvatarActivity.schedule_not_found",
+                                    Integer.parseInt(param)));
+                    return;
+                }
+                playerData.setDetail(TrialAvatarPlayerData.create(Integer.parseInt(param)));
+                playerData.save();
+                CommandHandler.sendMessage(
+                        sender,
+                        translate(
+                                sender, "commands.trialAvatarActivity.success_schedule", Integer.parseInt(param)));
+            }
+            case "toggledungeon" -> {
+                if (param.chars().allMatch(Character::isDigit)) { // if its number
+                    if (Integer.parseInt(param) - 1 >= trialAvatarPlayerData.getRewardInfoList().size()
+                            || Integer.parseInt(param) - 1 <= 0) {
+                        CommandHandler.sendMessage(
+                                sender, translate(sender, "commands.trialAvatarActivity.invalid_param"));
+                        return;
+                    }
+                    TrialAvatarPlayerData.RewardInfoItem rewardInfo =
+                            trialAvatarPlayerData.getRewardInfoList().get(Integer.parseInt(param) - 1);
+                    rewardInfo.setPassedDungeon(!rewardInfo.isPassedDungeon());
+                    playerData.setDetail(trialAvatarPlayerData);
+                    playerData.save();
+                    CommandHandler.sendMessage(
+                            sender,
+                            translate(
+                                    sender, "commands.trialAvatarActivity.success_dungeon", Integer.parseInt(param)));
+                } else {
+                    if (!param.equals("all")) {
+                        CommandHandler.sendMessage(
+                                sender, translate(sender, "commands.trialAvatarActivity.invalid_param"));
+                        return;
+                    }
+                    trialAvatarPlayerData
+                            .getRewardInfoList()
+                            .forEach(r -> r.setPassedDungeon(!r.isPassedDungeon()));
+                    playerData.setDetail(trialAvatarPlayerData);
+                    playerData.save();
+                    CommandHandler.sendMessage(
+                            sender, translate(sender, "commands.trialAvatarActivity.success_dungeon_all"));
+                }
+            }
+            case "togglereward" -> {
+                if (param.chars().allMatch(Character::isDigit)) { // if its number
+                    if (Integer.parseInt(param) - 1 >= trialAvatarPlayerData.getRewardInfoList().size()
+                            || Integer.parseInt(param) - 1 <= 0) {
+                        CommandHandler.sendMessage(
+                                sender, translate(sender, "commands.trialAvatarActivity.invalid_param"));
+                        return;
+                    }
+                    TrialAvatarPlayerData.RewardInfoItem rewardInfo =
+                            trialAvatarPlayerData.getRewardInfoList().get(Integer.parseInt(param) - 1);
+                    rewardInfo.setReceivedReward(!rewardInfo.isReceivedReward());
+                    playerData.setDetail(trialAvatarPlayerData);
+                    playerData.save();
+                    CommandHandler.sendMessage(
+                            sender,
+                            translate(
+                                    sender, "commands.trialAvatarActivity.success_reward", Integer.parseInt(param)));
+                } else {
+                    if (!param.toLowerCase().equals("all")) {
+                        CommandHandler.sendMessage(
+                                sender, translate(sender, "commands.trialAvatarActivity.invalid_param"));
+                        return;
+                    }
+                    trialAvatarPlayerData
+                            .getRewardInfoList()
+                            .forEach(r -> r.setReceivedReward(!r.isReceivedReward()));
+                    playerData.setDetail(trialAvatarPlayerData);
+                    playerData.save();
+                    CommandHandler.sendMessage(
+                            sender, translate(sender, "commands.trialAvatarActivity.success_reward_all"));
+                }
+            }
+        }
+
+        targetPlayer.sendPacket(
+                new PacketActivityInfoNotify(
+                        handler.toProto(playerData, targetPlayer.getActivityManager().getConditionExecutor())));
+    }
+}