Format code

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

@@ -1,139 +1,139 @@
-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.runLuaCallbacks(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.runLuaCallbacks(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/SetPropCommand.java

@@ -1,279 +1,279 @@
-package emu.grasscutter.command.commands;
-
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.PlayerProperty;
-import emu.grasscutter.game.tower.TowerLevelRecord;
-import emu.grasscutter.server.packet.send.PacketOpenStateChangeNotify;
-import emu.grasscutter.server.packet.send.PacketSceneAreaUnlockNotify;
-import emu.grasscutter.server.packet.send.PacketScenePointUnlockNotify;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Command(
-        label = "setProp",
-        aliases = {"prop"},
-        usage = {"<prop> <value>"},
-        permission = "player.setprop",
-        permissionTargeted = "player.setprop.others")
-public final class SetPropCommand implements CommandHandler {
-    // List of map areas. Unfortunately, there is no readily available source for them in excels or
-    // bins.
-    private static final List<Integer> sceneAreas =
-            List.of(
-                    1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
-                    28, 29, 32, 100, 101, 102, 103, 200, 210, 300, 400, 401, 402, 403);
-    Map<String, Prop> props;
-
-    public SetPropCommand() {
-        this.props = new HashMap<>();
-        // Full PlayerProperty enum that won't be advertised but can be used by devs
-        for (PlayerProperty prop : PlayerProperty.values()) {
-            String name = prop.toString().substring(5); // PROP_EXP -> EXP
-            String key = name.toLowerCase(); // EXP -> exp
-            this.props.put(key, new Prop(name, prop));
-        }
-        // Add special props
-        Prop worldlevel =
-                new Prop("World Level", PlayerProperty.PROP_PLAYER_WORLD_LEVEL, PseudoProp.WORLD_LEVEL);
-        this.props.put("worldlevel", worldlevel);
-        this.props.put("wl", worldlevel);
-
-        Prop abyss = new Prop("Tower Level", PseudoProp.TOWER_LEVEL);
-        this.props.put("abyss", abyss);
-        this.props.put("abyssfloor", abyss);
-        this.props.put("ut", abyss);
-        this.props.put("tower", abyss);
-        this.props.put("towerlevel", abyss);
-        this.props.put("unlocktower", abyss);
-
-        Prop bplevel = new Prop("BP Level", PseudoProp.BP_LEVEL);
-        this.props.put("bplevel", bplevel);
-        this.props.put("bp", bplevel);
-        this.props.put("battlepass", bplevel);
-
-        Prop godmode = new Prop("GodMode", PseudoProp.GOD_MODE);
-        this.props.put("godmode", godmode);
-        this.props.put("god", godmode);
-
-        Prop nostamina = new Prop("UnlimitedStamina", PseudoProp.UNLIMITED_STAMINA);
-        this.props.put("unlimitedstamina", nostamina);
-        this.props.put("us", nostamina);
-        this.props.put("nostamina", nostamina);
-        this.props.put("nostam", nostamina);
-        this.props.put("ns", nostamina);
-
-        Prop unlimitedenergy = new Prop("UnlimitedEnergy", PseudoProp.UNLIMITED_ENERGY);
-        this.props.put("unlimitedenergy", unlimitedenergy);
-        this.props.put("ue", unlimitedenergy);
-
-        Prop setopenstate = new Prop("SetOpenstate", PseudoProp.SET_OPENSTATE);
-        this.props.put("setopenstate", setopenstate);
-        this.props.put("so", setopenstate);
-
-        Prop unsetopenstate = new Prop("UnsetOpenstate", PseudoProp.UNSET_OPENSTATE);
-        this.props.put("unsetopenstate", unsetopenstate);
-        this.props.put("uo", unsetopenstate);
-
-        Prop unlockmap = new Prop("UnlockMap", PseudoProp.UNLOCK_MAP);
-        this.props.put("unlockmap", unlockmap);
-        this.props.put("um", unlockmap);
-    }
-
-    @Override
-    public void execute(Player sender, Player targetPlayer, List<String> args) {
-        if (args.size() != 2) {
-            sendUsageMessage(sender);
-            return;
-        }
-        String propStr = args.get(0).toLowerCase();
-        String valueStr = args.get(1).toLowerCase();
-        int value;
-
-        if (!props.containsKey(propStr)) {
-            sendUsageMessage(sender);
-            return;
-        }
-        try {
-            value =
-                    switch (valueStr.toLowerCase()) {
-                        case "on", "true" -> 1;
-                        case "off", "false" -> 0;
-                        case "toggle" -> -1;
-                        default -> Integer.parseInt(valueStr);
-                    };
-        } catch (NumberFormatException ignored) {
-            CommandHandler.sendTranslatedMessage(sender, "commands.execution.argument_error");
-            return;
-        }
-
-        boolean success = false;
-        Prop prop = props.get(propStr);
-
-        success =
-                switch (prop.pseudoProp) {
-                    case WORLD_LEVEL -> targetPlayer.setWorldLevel(value);
-                    case BP_LEVEL -> targetPlayer.getBattlePassManager().setLevel(value);
-                    case TOWER_LEVEL -> this.setTowerLevel(sender, targetPlayer, value);
-                    case GOD_MODE, UNLIMITED_STAMINA, UNLIMITED_ENERGY -> this.setBool(
-                            sender, targetPlayer, prop.pseudoProp, value);
-                    case SET_OPENSTATE -> this.setOpenState(targetPlayer, value, 1);
-                    case UNSET_OPENSTATE -> this.setOpenState(targetPlayer, value, 0);
-                    case UNLOCK_MAP -> unlockMap(targetPlayer);
-                    default -> targetPlayer.setProperty(prop.prop, value);
-                };
-
-        if (success) {
-            if (targetPlayer == sender) {
-                CommandHandler.sendTranslatedMessage(
-                        sender, "commands.generic.set_to", prop.name, valueStr);
-            } else {
-                String uidStr = targetPlayer.getAccount().getId();
-                CommandHandler.sendTranslatedMessage(
-                        sender, "commands.generic.set_for_to", prop.name, uidStr, valueStr);
-            }
-        } else {
-            if (prop.prop
-                    != PlayerProperty.PROP_NONE) { // PseudoProps need to do their own error messages
-                int min = targetPlayer.getPropertyMin(prop.prop);
-                int max = targetPlayer.getPropertyMax(prop.prop);
-                CommandHandler.sendTranslatedMessage(
-                        sender, "commands.generic.invalid.value_between", prop.name, min, max);
-            }
-        }
-    }
-
-    private boolean setTowerLevel(Player sender, Player targetPlayer, int topFloor) {
-        List<Integer> floorIds = targetPlayer.getServer().getTowerSystem().getAllFloors();
-        if (topFloor < 0 || topFloor > floorIds.size()) {
-            CommandHandler.sendTranslatedMessage(
-                    sender, "commands.generic.invalid.value_between", "Tower Level", 0, floorIds.size());
-            return false;
-        }
-
-        Map<Integer, TowerLevelRecord> recordMap = targetPlayer.getTowerManager().getRecordMap();
-        // Add records for each unlocked floor
-        for (int floor : floorIds.subList(0, topFloor)) {
-            if (!recordMap.containsKey(floor)) {
-                recordMap.put(floor, new TowerLevelRecord(floor));
-            }
-        }
-        // Remove records for each floor past our target
-        for (int floor : floorIds.subList(topFloor, floorIds.size())) {
-            recordMap.remove(floor);
-        }
-        // Six stars required on Floor 8 to unlock Floor 9+
-        if (topFloor > 8) {
-            recordMap
-                    .get(floorIds.get(7))
-                    .setLevelStars(
-                            0,
-                            6); // levelIds seem to start at 1 for Floor 1 Chamber 1, so this doesn't get shown at
-            // all
-        }
-        return true;
-    }
-
-    private boolean setBool(Player sender, Player targetPlayer, PseudoProp pseudoProp, int value) {
-        boolean enabled =
-                switch (pseudoProp) {
-                    case GOD_MODE -> targetPlayer.isInGodMode();
-                    case UNLIMITED_STAMINA -> targetPlayer.isUnlimitedStamina();
-                    case UNLIMITED_ENERGY -> !targetPlayer.getEnergyManager().isEnergyUsage();
-                    default -> false;
-                };
-        enabled =
-                switch (value) {
-                    case -1 -> !enabled;
-                    case 0 -> false;
-                    default -> true;
-                };
-
-        switch (pseudoProp) {
-            case GOD_MODE:
-                targetPlayer.setInGodMode(enabled);
-                break;
-            case UNLIMITED_STAMINA:
-                targetPlayer.setUnlimitedStamina(enabled);
-                break;
-            case UNLIMITED_ENERGY:
-                targetPlayer.getEnergyManager().setEnergyUsage(!enabled);
-                break;
-            default:
-                return false;
-        }
-        return true;
-    }
-
-    private boolean setOpenState(Player targetPlayer, int state, int value) {
-        targetPlayer.sendPacket(new PacketOpenStateChangeNotify(state, value));
-        return true;
-    }
-
-    private boolean unlockMap(Player targetPlayer) {
-        // Unlock.
-        GameData.getScenePointsPerScene()
-                .forEach(
-                        (sceneId, scenePoints) -> {
-                            // Unlock trans points.
-                            targetPlayer.getUnlockedScenePoints(sceneId).addAll(scenePoints);
-
-                            // Unlock map areas.
-                            targetPlayer.getUnlockedSceneAreas(sceneId).addAll(sceneAreas);
-                        });
-
-        // Send notify.
-        int playerScene = targetPlayer.getSceneId();
-        targetPlayer.sendPacket(
-                new PacketScenePointUnlockNotify(
-                        playerScene, targetPlayer.getUnlockedScenePoints(playerScene)));
-        targetPlayer.sendPacket(
-                new PacketSceneAreaUnlockNotify(
-                        playerScene, targetPlayer.getUnlockedSceneAreas(playerScene)));
-        return true;
-    }
-
-    enum PseudoProp {
-        NONE,
-        WORLD_LEVEL,
-        TOWER_LEVEL,
-        BP_LEVEL,
-        GOD_MODE,
-        UNLIMITED_STAMINA,
-        UNLIMITED_ENERGY,
-        SET_OPENSTATE,
-        UNSET_OPENSTATE,
-        UNLOCK_MAP
-    }
-
-    static class Prop {
-        String name;
-        PlayerProperty prop;
-        PseudoProp pseudoProp;
-
-        public Prop(PlayerProperty prop) {
-            this(prop.toString(), prop, PseudoProp.NONE);
-        }
-
-        public Prop(String name) {
-            this(name, PlayerProperty.PROP_NONE, PseudoProp.NONE);
-        }
-
-        public Prop(String name, PseudoProp pseudoProp) {
-            this(name, PlayerProperty.PROP_NONE, pseudoProp);
-        }
-
-        public Prop(String name, PlayerProperty prop) {
-            this(name, prop, PseudoProp.NONE);
-        }
-
-        public Prop(String name, PlayerProperty prop, PseudoProp pseudoProp) {
-            this.name = name;
-            this.prop = prop;
-            this.pseudoProp = pseudoProp;
-        }
-    }
-}
+package emu.grasscutter.command.commands;
+
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.PlayerProperty;
+import emu.grasscutter.game.tower.TowerLevelRecord;
+import emu.grasscutter.server.packet.send.PacketOpenStateChangeNotify;
+import emu.grasscutter.server.packet.send.PacketSceneAreaUnlockNotify;
+import emu.grasscutter.server.packet.send.PacketScenePointUnlockNotify;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Command(
+        label = "setProp",
+        aliases = {"prop"},
+        usage = {"<prop> <value>"},
+        permission = "player.setprop",
+        permissionTargeted = "player.setprop.others")
+public final class SetPropCommand implements CommandHandler {
+    // List of map areas. Unfortunately, there is no readily available source for them in excels or
+    // bins.
+    private static final List<Integer> sceneAreas =
+            List.of(
+                    1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+                    28, 29, 32, 100, 101, 102, 103, 200, 210, 300, 400, 401, 402, 403);
+    Map<String, Prop> props;
+
+    public SetPropCommand() {
+        this.props = new HashMap<>();
+        // Full PlayerProperty enum that won't be advertised but can be used by devs
+        for (PlayerProperty prop : PlayerProperty.values()) {
+            String name = prop.toString().substring(5); // PROP_EXP -> EXP
+            String key = name.toLowerCase(); // EXP -> exp
+            this.props.put(key, new Prop(name, prop));
+        }
+        // Add special props
+        Prop worldlevel =
+                new Prop("World Level", PlayerProperty.PROP_PLAYER_WORLD_LEVEL, PseudoProp.WORLD_LEVEL);
+        this.props.put("worldlevel", worldlevel);
+        this.props.put("wl", worldlevel);
+
+        Prop abyss = new Prop("Tower Level", PseudoProp.TOWER_LEVEL);
+        this.props.put("abyss", abyss);
+        this.props.put("abyssfloor", abyss);
+        this.props.put("ut", abyss);
+        this.props.put("tower", abyss);
+        this.props.put("towerlevel", abyss);
+        this.props.put("unlocktower", abyss);
+
+        Prop bplevel = new Prop("BP Level", PseudoProp.BP_LEVEL);
+        this.props.put("bplevel", bplevel);
+        this.props.put("bp", bplevel);
+        this.props.put("battlepass", bplevel);
+
+        Prop godmode = new Prop("GodMode", PseudoProp.GOD_MODE);
+        this.props.put("godmode", godmode);
+        this.props.put("god", godmode);
+
+        Prop nostamina = new Prop("UnlimitedStamina", PseudoProp.UNLIMITED_STAMINA);
+        this.props.put("unlimitedstamina", nostamina);
+        this.props.put("us", nostamina);
+        this.props.put("nostamina", nostamina);
+        this.props.put("nostam", nostamina);
+        this.props.put("ns", nostamina);
+
+        Prop unlimitedenergy = new Prop("UnlimitedEnergy", PseudoProp.UNLIMITED_ENERGY);
+        this.props.put("unlimitedenergy", unlimitedenergy);
+        this.props.put("ue", unlimitedenergy);
+
+        Prop setopenstate = new Prop("SetOpenstate", PseudoProp.SET_OPENSTATE);
+        this.props.put("setopenstate", setopenstate);
+        this.props.put("so", setopenstate);
+
+        Prop unsetopenstate = new Prop("UnsetOpenstate", PseudoProp.UNSET_OPENSTATE);
+        this.props.put("unsetopenstate", unsetopenstate);
+        this.props.put("uo", unsetopenstate);
+
+        Prop unlockmap = new Prop("UnlockMap", PseudoProp.UNLOCK_MAP);
+        this.props.put("unlockmap", unlockmap);
+        this.props.put("um", unlockmap);
+    }
+
+    @Override
+    public void execute(Player sender, Player targetPlayer, List<String> args) {
+        if (args.size() != 2) {
+            sendUsageMessage(sender);
+            return;
+        }
+        String propStr = args.get(0).toLowerCase();
+        String valueStr = args.get(1).toLowerCase();
+        int value;
+
+        if (!props.containsKey(propStr)) {
+            sendUsageMessage(sender);
+            return;
+        }
+        try {
+            value =
+                    switch (valueStr.toLowerCase()) {
+                        case "on", "true" -> 1;
+                        case "off", "false" -> 0;
+                        case "toggle" -> -1;
+                        default -> Integer.parseInt(valueStr);
+                    };
+        } catch (NumberFormatException ignored) {
+            CommandHandler.sendTranslatedMessage(sender, "commands.execution.argument_error");
+            return;
+        }
+
+        boolean success = false;
+        Prop prop = props.get(propStr);
+
+        success =
+                switch (prop.pseudoProp) {
+                    case WORLD_LEVEL -> targetPlayer.setWorldLevel(value);
+                    case BP_LEVEL -> targetPlayer.getBattlePassManager().setLevel(value);
+                    case TOWER_LEVEL -> this.setTowerLevel(sender, targetPlayer, value);
+                    case GOD_MODE, UNLIMITED_STAMINA, UNLIMITED_ENERGY -> this.setBool(
+                            sender, targetPlayer, prop.pseudoProp, value);
+                    case SET_OPENSTATE -> this.setOpenState(targetPlayer, value, 1);
+                    case UNSET_OPENSTATE -> this.setOpenState(targetPlayer, value, 0);
+                    case UNLOCK_MAP -> unlockMap(targetPlayer);
+                    default -> targetPlayer.setProperty(prop.prop, value);
+                };
+
+        if (success) {
+            if (targetPlayer == sender) {
+                CommandHandler.sendTranslatedMessage(
+                        sender, "commands.generic.set_to", prop.name, valueStr);
+            } else {
+                String uidStr = targetPlayer.getAccount().getId();
+                CommandHandler.sendTranslatedMessage(
+                        sender, "commands.generic.set_for_to", prop.name, uidStr, valueStr);
+            }
+        } else {
+            if (prop.prop
+                    != PlayerProperty.PROP_NONE) { // PseudoProps need to do their own error messages
+                int min = targetPlayer.getPropertyMin(prop.prop);
+                int max = targetPlayer.getPropertyMax(prop.prop);
+                CommandHandler.sendTranslatedMessage(
+                        sender, "commands.generic.invalid.value_between", prop.name, min, max);
+            }
+        }
+    }
+
+    private boolean setTowerLevel(Player sender, Player targetPlayer, int topFloor) {
+        List<Integer> floorIds = targetPlayer.getServer().getTowerSystem().getAllFloors();
+        if (topFloor < 0 || topFloor > floorIds.size()) {
+            CommandHandler.sendTranslatedMessage(
+                    sender, "commands.generic.invalid.value_between", "Tower Level", 0, floorIds.size());
+            return false;
+        }
+
+        Map<Integer, TowerLevelRecord> recordMap = targetPlayer.getTowerManager().getRecordMap();
+        // Add records for each unlocked floor
+        for (int floor : floorIds.subList(0, topFloor)) {
+            if (!recordMap.containsKey(floor)) {
+                recordMap.put(floor, new TowerLevelRecord(floor));
+            }
+        }
+        // Remove records for each floor past our target
+        for (int floor : floorIds.subList(topFloor, floorIds.size())) {
+            recordMap.remove(floor);
+        }
+        // Six stars required on Floor 8 to unlock Floor 9+
+        if (topFloor > 8) {
+            recordMap
+                    .get(floorIds.get(7))
+                    .setLevelStars(
+                            0,
+                            6); // levelIds seem to start at 1 for Floor 1 Chamber 1, so this doesn't get shown at
+            // all
+        }
+        return true;
+    }
+
+    private boolean setBool(Player sender, Player targetPlayer, PseudoProp pseudoProp, int value) {
+        boolean enabled =
+                switch (pseudoProp) {
+                    case GOD_MODE -> targetPlayer.isInGodMode();
+                    case UNLIMITED_STAMINA -> targetPlayer.isUnlimitedStamina();
+                    case UNLIMITED_ENERGY -> !targetPlayer.getEnergyManager().isEnergyUsage();
+                    default -> false;
+                };
+        enabled =
+                switch (value) {
+                    case -1 -> !enabled;
+                    case 0 -> false;
+                    default -> true;
+                };
+
+        switch (pseudoProp) {
+            case GOD_MODE:
+                targetPlayer.setInGodMode(enabled);
+                break;
+            case UNLIMITED_STAMINA:
+                targetPlayer.setUnlimitedStamina(enabled);
+                break;
+            case UNLIMITED_ENERGY:
+                targetPlayer.getEnergyManager().setEnergyUsage(!enabled);
+                break;
+            default:
+                return false;
+        }
+        return true;
+    }
+
+    private boolean setOpenState(Player targetPlayer, int state, int value) {
+        targetPlayer.sendPacket(new PacketOpenStateChangeNotify(state, value));
+        return true;
+    }
+
+    private boolean unlockMap(Player targetPlayer) {
+        // Unlock.
+        GameData.getScenePointsPerScene()
+                .forEach(
+                        (sceneId, scenePoints) -> {
+                            // Unlock trans points.
+                            targetPlayer.getUnlockedScenePoints(sceneId).addAll(scenePoints);
+
+                            // Unlock map areas.
+                            targetPlayer.getUnlockedSceneAreas(sceneId).addAll(sceneAreas);
+                        });
+
+        // Send notify.
+        int playerScene = targetPlayer.getSceneId();
+        targetPlayer.sendPacket(
+                new PacketScenePointUnlockNotify(
+                        playerScene, targetPlayer.getUnlockedScenePoints(playerScene)));
+        targetPlayer.sendPacket(
+                new PacketSceneAreaUnlockNotify(
+                        playerScene, targetPlayer.getUnlockedSceneAreas(playerScene)));
+        return true;
+    }
+
+    enum PseudoProp {
+        NONE,
+        WORLD_LEVEL,
+        TOWER_LEVEL,
+        BP_LEVEL,
+        GOD_MODE,
+        UNLIMITED_STAMINA,
+        UNLIMITED_ENERGY,
+        SET_OPENSTATE,
+        UNSET_OPENSTATE,
+        UNLOCK_MAP
+    }
+
+    static class Prop {
+        String name;
+        PlayerProperty prop;
+        PseudoProp pseudoProp;
+
+        public Prop(PlayerProperty prop) {
+            this(prop.toString(), prop, PseudoProp.NONE);
+        }
+
+        public Prop(String name) {
+            this(name, PlayerProperty.PROP_NONE, PseudoProp.NONE);
+        }
+
+        public Prop(String name, PseudoProp pseudoProp) {
+            this(name, PlayerProperty.PROP_NONE, pseudoProp);
+        }
+
+        public Prop(String name, PlayerProperty prop) {
+            this(name, prop, PseudoProp.NONE);
+        }
+
+        public Prop(String name, PlayerProperty prop, PseudoProp pseudoProp) {
+            this.name = name;
+            this.prop = prop;
+            this.pseudoProp = pseudoProp;
+        }
+    }
+}

src/main/java/emu/grasscutter/data/common/PointData.java

@@ -1,58 +1,70 @@
-package emu.grasscutter.data.common;
-
-import com.google.gson.annotations.SerializedName;
-
-import emu.grasscutter.Grasscutter;
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.excels.dungeon.DailyDungeonData;
-import emu.grasscutter.utils.Position;
-import it.unimi.dsi.fastutil.ints.IntArrayList;
-import it.unimi.dsi.fastutil.ints.IntList;
-import lombok.Getter;
-import lombok.Setter;
-
-public final class PointData {
-    @Getter @Setter private int id;
-    private String $type;
-    @Getter private Position tranPos;
-    @Getter private Position pos;
-    @Getter private Position rot;
-    @Getter private Position size;
-
-    @SerializedName(value="dungeonIds", alternate={"JHHFPGJNMIN"})
-    @Getter private int[] dungeonIds;
-
-    @SerializedName(value="dungeonRandomList", alternate={"OIBKFJNBLHO"})
-    @Getter private int[] dungeonRandomList;
-
-    @SerializedName(value="groupIDs", alternate={"HFOBOOHKBGF"})
-    @Getter private int[] groupIDs;
-
-    @SerializedName(value="tranSceneId", alternate={"JHBICGBAPIH"})
-    @Getter @Setter private int tranSceneId;
-
-    public String getType() {
-        return $type;
-    }
-
-    public void updateDailyDungeon() {
-        if (this.dungeonRandomList == null || this.dungeonRandomList.length == 0) {
-            return;
-        }
-
-        IntList newDungeons = new IntArrayList();
-        int day = Grasscutter.getCurrentDayOfWeek();
-
-        for (int randomId : this.dungeonRandomList) {
-            DailyDungeonData data = GameData.getDailyDungeonDataMap().get(randomId);
-
-            if (data != null) {
-                for (int d : data.getDungeonsByDay(day)) {
-                    newDungeons.add(d);
-                }
-            }
-        }
-
-        this.dungeonIds = newDungeons.toIntArray();
-    }
-}
+package emu.grasscutter.data.common;
+
+import com.google.gson.annotations.SerializedName;
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.excels.dungeon.DailyDungeonData;
+import emu.grasscutter.utils.Position;
+import it.unimi.dsi.fastutil.ints.IntArrayList;
+import it.unimi.dsi.fastutil.ints.IntList;
+import lombok.Getter;
+import lombok.Setter;
+
+public final class PointData {
+    @Getter @Setter private int id;
+    private String $type;
+    @Getter private Position tranPos;
+    @Getter private Position pos;
+    @Getter private Position rot;
+    @Getter private Position size;
+
+    @SerializedName(
+            value = "dungeonIds",
+            alternate = {"JHHFPGJNMIN"})
+    @Getter
+    private int[] dungeonIds;
+
+    @SerializedName(
+            value = "dungeonRandomList",
+            alternate = {"OIBKFJNBLHO"})
+    @Getter
+    private int[] dungeonRandomList;
+
+    @SerializedName(
+            value = "groupIDs",
+            alternate = {"HFOBOOHKBGF"})
+    @Getter
+    private int[] groupIDs;
+
+    @SerializedName(
+            value = "tranSceneId",
+            alternate = {"JHBICGBAPIH"})
+    @Getter
+    @Setter
+    private int tranSceneId;
+
+    public String getType() {
+        return $type;
+    }
+
+    public void updateDailyDungeon() {
+        if (this.dungeonRandomList == null || this.dungeonRandomList.length == 0) {
+            return;
+        }
+
+        IntList newDungeons = new IntArrayList();
+        int day = Grasscutter.getCurrentDayOfWeek();
+
+        for (int randomId : this.dungeonRandomList) {
+            DailyDungeonData data = GameData.getDailyDungeonDataMap().get(randomId);
+
+            if (data != null) {
+                for (int d : data.getDungeonsByDay(day)) {
+                    newDungeons.add(d);
+                }
+            }
+        }
+
+        this.dungeonIds = newDungeons.toIntArray();
+    }
+}

src/main/java/emu/grasscutter/data/excels/GadgetData.java

@@ -1,22 +1,22 @@
-package emu.grasscutter.data.excels;
-
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import emu.grasscutter.game.props.EntityType;
-import lombok.Getter;
-
-@ResourceType(name = "GadgetExcelConfigData.json")
-@Getter
-public final class GadgetData extends GameResource {
-    @Getter(onMethod_ = @Override)
-    private int id;
-
-    private EntityType type;
-    private String jsonName;
-    private boolean isInteractive;
-    private String[] tags;
-    private String itemJsonName;
-    private long nameTextMapHash;
-    private int campId;
-    private String visionLevel;
-}
+package emu.grasscutter.data.excels;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.game.props.EntityType;
+import lombok.Getter;
+
+@ResourceType(name = "GadgetExcelConfigData.json")
+@Getter
+public final class GadgetData extends GameResource {
+    @Getter(onMethod_ = @Override)
+    private int id;
+
+    private EntityType type;
+    private String jsonName;
+    private boolean isInteractive;
+    private String[] tags;
+    private String itemJsonName;
+    private long nameTextMapHash;
+    private int campId;
+    private String visionLevel;
+}

src/main/java/emu/grasscutter/data/excels/monster/MonsterData.java

@@ -1,120 +1,133 @@
-package emu.grasscutter.data.excels.monster;
-
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import com.google.gson.annotations.SerializedName;
-
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import emu.grasscutter.data.ResourceType.LoadPriority;
-import emu.grasscutter.data.common.PropGrowCurve;
-import emu.grasscutter.data.excels.GadgetData;
-import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.game.props.MonsterType;
-import lombok.Getter;
-
-@ResourceType(name = "MonsterExcelConfigData.json", loadPriority = LoadPriority.LOW)
-@Getter
-public class MonsterData extends GameResource {
-    static public Set<FightProperty> definedFightProperties = Set.of(FightProperty.FIGHT_PROP_BASE_HP, FightProperty.FIGHT_PROP_BASE_ATTACK, FightProperty.FIGHT_PROP_BASE_DEFENSE, FightProperty.FIGHT_PROP_PHYSICAL_SUB_HURT, FightProperty.FIGHT_PROP_FIRE_SUB_HURT, FightProperty.FIGHT_PROP_ELEC_SUB_HURT, FightProperty.FIGHT_PROP_WATER_SUB_HURT, FightProperty.FIGHT_PROP_GRASS_SUB_HURT, FightProperty.FIGHT_PROP_WIND_SUB_HURT, FightProperty.FIGHT_PROP_ROCK_SUB_HURT, FightProperty.FIGHT_PROP_ICE_SUB_HURT);
-
-    @Getter(onMethod_ = @Override)
-    private int id;
-
-    private String monsterName;
-    private MonsterType type;
-    private String serverScript;
-    private List<Integer> affix;
-    private String ai;
-    private int[] equips;
-    private List<HpDrops> hpDrops;
-    private int killDropId;
-    private String excludeWeathers;
-    private int featureTagGroupID;
-    private int mpPropID;
-    private String skin;
-    private int describeId;
-    private int combatBGMLevel;
-    private int entityBudgetLevel;
-
-    @SerializedName("hpBase")
-    private float baseHp;
-    @SerializedName("attackBase")
-    private float baseAttack;
-    @SerializedName("defenseBase")
-    private float baseDefense;
-
-    private float fireSubHurt;
-    private float elecSubHurt;
-    private float grassSubHurt;
-    private float waterSubHurt;
-    private float windSubHurt;
-    private float rockSubHurt;
-    private float iceSubHurt;
-    private float physicalSubHurt;
-    private List<PropGrowCurve> propGrowCurves;
-    private long nameTextMapHash;
-    private int campID;
-
-    // Transient
-    private int weaponId;
-    private MonsterDescribeData describeData;
-
-    private int specialNameId; // will only be set if describe data is available
-
-    @Override
-    public void onLoad() {
-        for (int id : this.equips) {
-            if (id == 0) {
-                continue;
-            }
-
-            GadgetData gadget = GameData.getGadgetDataMap().get(id);
-            if (gadget == null) {
-                continue;
-            }
-
-            if (gadget.getItemJsonName().equals("Default_MonsterWeapon")) {
-                this.weaponId = id;
-            }
-        }
-
-        this.describeData = GameData.getMonsterDescribeDataMap().get(this.getDescribeId());
-
-        if (this.describeData == null){
-            return;
-        }
-        for(Entry<Integer, MonsterSpecialNameData> entry: GameData.getMonsterSpecialNameDataMap().entrySet()) {
-            if (entry.getValue().getSpecialNameLabId() == this.getDescribeData().getSpecialNameLabId()){
-                this.specialNameId = entry.getKey();
-                break;
-            }
-        }
-    }
-
-    public float getFightProperty(FightProperty prop) {
-        return switch (prop) {
-            case FIGHT_PROP_BASE_HP -> this.baseHp;
-            case FIGHT_PROP_BASE_ATTACK -> this.baseAttack;
-            case FIGHT_PROP_BASE_DEFENSE -> this.baseDefense;
-            case FIGHT_PROP_PHYSICAL_SUB_HURT -> this.physicalSubHurt;
-            case FIGHT_PROP_FIRE_SUB_HURT -> this.fireSubHurt;
-            case FIGHT_PROP_ELEC_SUB_HURT -> this.elecSubHurt;
-            case FIGHT_PROP_WATER_SUB_HURT -> this.waterSubHurt;
-            case FIGHT_PROP_GRASS_SUB_HURT -> this.grassSubHurt;
-            case FIGHT_PROP_WIND_SUB_HURT -> this.windSubHurt;
-            case FIGHT_PROP_ROCK_SUB_HURT -> this.rockSubHurt;
-            case FIGHT_PROP_ICE_SUB_HURT -> this.iceSubHurt;
-            default -> 0f;
-        };
-    }
-
-    @Getter
-    public class HpDrops {
-        private int DropId;
-        private int HpPercent;
-    }
-}
+package emu.grasscutter.data.excels.monster;
+
+import com.google.gson.annotations.SerializedName;
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.ResourceType.LoadPriority;
+import emu.grasscutter.data.common.PropGrowCurve;
+import emu.grasscutter.data.excels.GadgetData;
+import emu.grasscutter.game.props.FightProperty;
+import emu.grasscutter.game.props.MonsterType;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Set;
+import lombok.Getter;
+
+@ResourceType(name = "MonsterExcelConfigData.json", loadPriority = LoadPriority.LOW)
+@Getter
+public class MonsterData extends GameResource {
+    public static Set<FightProperty> definedFightProperties =
+            Set.of(
+                    FightProperty.FIGHT_PROP_BASE_HP,
+                    FightProperty.FIGHT_PROP_BASE_ATTACK,
+                    FightProperty.FIGHT_PROP_BASE_DEFENSE,
+                    FightProperty.FIGHT_PROP_PHYSICAL_SUB_HURT,
+                    FightProperty.FIGHT_PROP_FIRE_SUB_HURT,
+                    FightProperty.FIGHT_PROP_ELEC_SUB_HURT,
+                    FightProperty.FIGHT_PROP_WATER_SUB_HURT,
+                    FightProperty.FIGHT_PROP_GRASS_SUB_HURT,
+                    FightProperty.FIGHT_PROP_WIND_SUB_HURT,
+                    FightProperty.FIGHT_PROP_ROCK_SUB_HURT,
+                    FightProperty.FIGHT_PROP_ICE_SUB_HURT);
+
+    @Getter(onMethod_ = @Override)
+    private int id;
+
+    private String monsterName;
+    private MonsterType type;
+    private String serverScript;
+    private List<Integer> affix;
+    private String ai;
+    private int[] equips;
+    private List<HpDrops> hpDrops;
+    private int killDropId;
+    private String excludeWeathers;
+    private int featureTagGroupID;
+    private int mpPropID;
+    private String skin;
+    private int describeId;
+    private int combatBGMLevel;
+    private int entityBudgetLevel;
+
+    @SerializedName("hpBase")
+    private float baseHp;
+
+    @SerializedName("attackBase")
+    private float baseAttack;
+
+    @SerializedName("defenseBase")
+    private float baseDefense;
+
+    private float fireSubHurt;
+    private float elecSubHurt;
+    private float grassSubHurt;
+    private float waterSubHurt;
+    private float windSubHurt;
+    private float rockSubHurt;
+    private float iceSubHurt;
+    private float physicalSubHurt;
+    private List<PropGrowCurve> propGrowCurves;
+    private long nameTextMapHash;
+    private int campID;
+
+    // Transient
+    private int weaponId;
+    private MonsterDescribeData describeData;
+
+    private int specialNameId; // will only be set if describe data is available
+
+    @Override
+    public void onLoad() {
+        for (int id : this.equips) {
+            if (id == 0) {
+                continue;
+            }
+
+            GadgetData gadget = GameData.getGadgetDataMap().get(id);
+            if (gadget == null) {
+                continue;
+            }
+
+            if (gadget.getItemJsonName().equals("Default_MonsterWeapon")) {
+                this.weaponId = id;
+            }
+        }
+
+        this.describeData = GameData.getMonsterDescribeDataMap().get(this.getDescribeId());
+
+        if (this.describeData == null) {
+            return;
+        }
+        for (Entry<Integer, MonsterSpecialNameData> entry :
+                GameData.getMonsterSpecialNameDataMap().entrySet()) {
+            if (entry.getValue().getSpecialNameLabId() == this.getDescribeData().getSpecialNameLabId()) {
+                this.specialNameId = entry.getKey();
+                break;
+            }
+        }
+    }
+
+    public float getFightProperty(FightProperty prop) {
+        return switch (prop) {
+            case FIGHT_PROP_BASE_HP -> this.baseHp;
+            case FIGHT_PROP_BASE_ATTACK -> this.baseAttack;
+            case FIGHT_PROP_BASE_DEFENSE -> this.baseDefense;
+            case FIGHT_PROP_PHYSICAL_SUB_HURT -> this.physicalSubHurt;
+            case FIGHT_PROP_FIRE_SUB_HURT -> this.fireSubHurt;
+            case FIGHT_PROP_ELEC_SUB_HURT -> this.elecSubHurt;
+            case FIGHT_PROP_WATER_SUB_HURT -> this.waterSubHurt;
+            case FIGHT_PROP_GRASS_SUB_HURT -> this.grassSubHurt;
+            case FIGHT_PROP_WIND_SUB_HURT -> this.windSubHurt;
+            case FIGHT_PROP_ROCK_SUB_HURT -> this.rockSubHurt;
+            case FIGHT_PROP_ICE_SUB_HURT -> this.iceSubHurt;
+            default -> 0f;
+        };
+    }
+
+    @Getter
+    public class HpDrops {
+        private int DropId;
+        private int HpPercent;
+    }
+}

src/main/java/emu/grasscutter/data/excels/monster/MonsterDescribeData.java

@@ -1,21 +1,28 @@
-package emu.grasscutter.data.excels.monster;
-
-import com.google.gson.annotations.SerializedName;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import emu.grasscutter.data.ResourceType.LoadPriority;
-import lombok.Getter;
-
-@ResourceType(name = "MonsterDescribeExcelConfigData.json", loadPriority = LoadPriority.HIGH)
-@Getter
-public class MonsterDescribeData extends GameResource {
-    @Getter(onMethod_ = @Override)
-    private int id;
-
-    private long nameTextMapHash;
-    @SerializedName(value = "titleId", alternate={"titleID"})
-    private int titleId;
-    @SerializedName(value = "specialNameLabId", alternate={"specialNameLabID"})
-    private int specialNameLabId;
-    private MonsterSpecialNameData specialNameData;
-}
+package emu.grasscutter.data.excels.monster;
+
+import com.google.gson.annotations.SerializedName;
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.ResourceType.LoadPriority;
+import lombok.Getter;
+
+@ResourceType(name = "MonsterDescribeExcelConfigData.json", loadPriority = LoadPriority.HIGH)
+@Getter
+public class MonsterDescribeData extends GameResource {
+    @Getter(onMethod_ = @Override)
+    private int id;
+
+    private long nameTextMapHash;
+
+    @SerializedName(
+            value = "titleId",
+            alternate = {"titleID"})
+    private int titleId;
+
+    @SerializedName(
+            value = "specialNameLabId",
+            alternate = {"specialNameLabID"})
+    private int specialNameLabId;
+
+    private MonsterSpecialNameData specialNameData;
+}

src/main/java/emu/grasscutter/database/DatabaseHelper.java

@@ -1,464 +1,464 @@
-package emu.grasscutter.database;
-
-import static com.mongodb.client.model.Filters.eq;
-
-import com.mongodb.client.result.DeleteResult;
-import dev.morphia.query.FindOptions;
-import dev.morphia.query.Sort;
-import dev.morphia.query.experimental.filters.Filters;
-import emu.grasscutter.GameConstants;
-import emu.grasscutter.Grasscutter;
-import emu.grasscutter.game.Account;
-import emu.grasscutter.game.achievement.Achievements;
-import emu.grasscutter.game.activity.PlayerActivityData;
-import emu.grasscutter.game.activity.musicgame.MusicGameBeatmap;
-import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.game.battlepass.BattlePassManager;
-import emu.grasscutter.game.friends.Friendship;
-import emu.grasscutter.game.gacha.GachaRecord;
-import emu.grasscutter.game.home.GameHome;
-import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.game.mail.Mail;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.quest.GameMainQuest;
-import emu.grasscutter.game.world.SceneGroupInstance;
-
-import java.util.List;
-import java.util.stream.Stream;
-
-public final class DatabaseHelper {
-    public static Account createAccount(String username) {
-        return createAccountWithUid(username, 0);
-    }
-
-    public static Account createAccountWithUid(String username, int reservedUid) {
-        // Unique names only
-        if (DatabaseHelper.checkIfAccountExists(username)) {
-            return null;
-        }
-
-        // Make sure there are no id collisions
-        if (reservedUid > 0) {
-            // Cannot make account with the same uid as the server console
-            if (reservedUid == GameConstants.SERVER_CONSOLE_UID) {
-                return null;
-            }
-
-            if (DatabaseHelper.checkIfAccountExists(reservedUid)) {
-                return null;
-            }
-
-            // Make sure no existing player already has this id.
-            if (DatabaseHelper.checkIfPlayerExists(reservedUid)) {
-                return null;
-            }
-        }
-
-        // Account
-        Account account = new Account();
-        account.setUsername(username);
-        account.setId(Integer.toString(DatabaseManager.getNextId(account)));
-
-        if (reservedUid > 0) {
-            account.setReservedPlayerUid(reservedUid);
-        }
-
-        DatabaseHelper.saveAccount(account);
-        return account;
-    }
-
-    @Deprecated
-    public static Account createAccountWithPassword(String username, String password) {
-        // Unique names only
-        Account exists = DatabaseHelper.getAccountByName(username);
-        if (exists != null) {
-            return null;
-        }
-
-        // Account
-        Account account = new Account();
-        account.setId(Integer.toString(DatabaseManager.getNextId(account)));
-        account.setUsername(username);
-        account.setPassword(password);
-        DatabaseHelper.saveAccount(account);
-        return account;
-    }
-
-    public static void saveAccount(Account account) {
-        DatabaseManager.getAccountDatastore().save(account);
-    }
-
-    public static Account getAccountByName(String username) {
-        return DatabaseManager.getAccountDatastore()
-                .find(Account.class)
-                .filter(Filters.eq("username", username))
-                .first();
-    }
-
-    public static Account getAccountByToken(String token) {
-        if (token == null) return null;
-        return DatabaseManager.getAccountDatastore()
-                .find(Account.class)
-                .filter(Filters.eq("token", token))
-                .first();
-    }
-
-    public static Account getAccountBySessionKey(String sessionKey) {
-        if (sessionKey == null) return null;
-        return DatabaseManager.getAccountDatastore()
-                .find(Account.class)
-                .filter(Filters.eq("sessionKey", sessionKey))
-                .first();
-    }
-
-    public static Account getAccountById(String uid) {
-        return DatabaseManager.getAccountDatastore()
-                .find(Account.class)
-                .filter(Filters.eq("_id", uid))
-                .first();
-    }
-
-    public static Account getAccountByPlayerId(int playerId) {
-        return DatabaseManager.getAccountDatastore()
-                .find(Account.class)
-                .filter(Filters.eq("reservedPlayerId", playerId))
-                .first();
-    }
-
-    public static boolean checkIfAccountExists(String name) {
-        return DatabaseManager.getAccountDatastore()
-                        .find(Account.class)
-                        .filter(Filters.eq("username", name))
-                        .count()
-                > 0;
-    }
-
-    public static boolean checkIfAccountExists(int reservedUid) {
-        return DatabaseManager.getAccountDatastore()
-                        .find(Account.class)
-                        .filter(Filters.eq("reservedPlayerId", reservedUid))
-                        .count()
-                > 0;
-    }
-
-    public static synchronized void deleteAccount(Account target) {
-        // To delete an account, we need to also delete all the other documents in the database that
-        // reference the account.
-        // This should optimally be wrapped inside a transaction, to make sure an error thrown mid-way
-        // does not leave the
-        // database in an inconsistent state, but unfortunately Mongo only supports that when we have a
-        // replica set ...
-
-        Player player = Grasscutter.getGameServer().getPlayerByAccountId(target.getId());
-
-        // Close session first
-        if (player != null) {
-            player.getSession().close();
-        } else {
-            player = getPlayerByAccount(target);
-            if (player == null) return;
-        }
-        int uid = player.getUid();
-        // Delete data from collections
-        DatabaseManager.getGameDatabase().getCollection("achievements").deleteMany(eq("uid", uid));
-        DatabaseManager.getGameDatabase().getCollection("activities").deleteMany(eq("uid", uid));
-        DatabaseManager.getGameDatabase().getCollection("homes").deleteMany(eq("ownerUid", uid));
-        DatabaseManager.getGameDatabase().getCollection("mail").deleteMany(eq("ownerUid", uid));
-        DatabaseManager.getGameDatabase().getCollection("avatars").deleteMany(eq("ownerId", uid));
-        DatabaseManager.getGameDatabase().getCollection("gachas").deleteMany(eq("ownerId", uid));
-        DatabaseManager.getGameDatabase().getCollection("items").deleteMany(eq("ownerId", uid));
-        DatabaseManager.getGameDatabase().getCollection("quests").deleteMany(eq("ownerUid", uid));
-        DatabaseManager.getGameDatabase().getCollection("battlepass").deleteMany(eq("ownerUid", uid));
-
-        // Delete friendships.
-        // Here, we need to make sure to not only delete the deleted account's friendships,
-        // but also all friendship entries for that account's friends.
-        DatabaseManager.getGameDatabase().getCollection("friendships").deleteMany(eq("ownerId", uid));
-        DatabaseManager.getGameDatabase().getCollection("friendships").deleteMany(eq("friendId", uid));
-
-        // Delete the player last.
-        DatabaseManager.getGameDatastore().find(Player.class).filter(Filters.eq("id", uid)).delete();
-
-        // Finally, delete the account itself.
-        DatabaseManager.getAccountDatastore()
-                .find(Account.class)
-                .filter(Filters.eq("id", target.getId()))
-                .delete();
-    }
-
-    public static <T> Stream<T> getByGameClass(Class<T> classType) {
-        return DatabaseManager.getGameDatastore().find(classType).stream();
-    }
-
-    @Deprecated(forRemoval = true)
-    public static List<Player> getAllPlayers() {
-        return DatabaseManager.getGameDatastore().find(Player.class).stream().toList();
-    }
-
-    public static Player getPlayerByUid(int id) {
-        return DatabaseManager.getGameDatastore()
-                .find(Player.class)
-                .filter(Filters.eq("_id", id))
-                .first();
-    }
-
-    @Deprecated
-    public static Player getPlayerByAccount(Account account) {
-        return DatabaseManager.getGameDatastore()
-                .find(Player.class)
-                .filter(Filters.eq("accountId", account.getId()))
-                .first();
-    }
-
-    public static Player getPlayerByAccount(Account account, Class<? extends Player> playerClass) {
-        return DatabaseManager.getGameDatastore()
-                .find(playerClass)
-                .filter(Filters.eq("accountId", account.getId()))
-                .first();
-    }
-
-    public static boolean checkIfPlayerExists(int uid) {
-        return DatabaseManager.getGameDatastore()
-                        .find(Player.class)
-                        .filter(Filters.eq("_id", uid))
-                        .count()
-                > 0;
-    }
-
-    public static synchronized Player generatePlayerUid(Player character, int reservedId) {
-        // Check if reserved id
-        int id;
-        if (reservedId > 0 && !checkIfPlayerExists(reservedId)) {
-            id = reservedId;
-            character.setUid(id);
-        } else {
-            do {
-                id = DatabaseManager.getNextId(character);
-            } while (checkIfPlayerExists(id));
-            character.setUid(id);
-        }
-        // Save to database
-        DatabaseManager.getGameDatastore().save(character);
-        return character;
-    }
-
-    public static synchronized int getNextPlayerId(int reservedId) {
-        // Check if reserved id
-        int id;
-        if (reservedId > 0 && !checkIfPlayerExists(reservedId)) {
-            id = reservedId;
-        } else {
-            do {
-                id = DatabaseManager.getNextId(Player.class);
-            } while (checkIfPlayerExists(id));
-        }
-        return id;
-    }
-
-    public static void savePlayer(Player character) {
-        DatabaseManager.getGameDatastore().save(character);
-    }
-
-    public static void saveAvatar(Avatar avatar) {
-        DatabaseManager.getGameDatastore().save(avatar);
-    }
-
-    public static List<Avatar> getAvatars(Player player) {
-        return DatabaseManager.getGameDatastore()
-                .find(Avatar.class)
-                .filter(Filters.eq("ownerId", player.getUid()))
-                .stream()
-                .toList();
-    }
-
-    public static void saveItem(GameItem item) {
-        DatabaseManager.getGameDatastore().save(item);
-    }
-
-    public static boolean deleteItem(GameItem item) {
-        DeleteResult result = DatabaseManager.getGameDatastore().delete(item);
-        return result.wasAcknowledged();
-    }
-
-    public static List<GameItem> getInventoryItems(Player player) {
-        return DatabaseManager.getGameDatastore()
-                .find(GameItem.class)
-                .filter(Filters.eq("ownerId", player.getUid()))
-                .stream()
-                .toList();
-    }
-
-    public static List<Friendship> getFriends(Player player) {
-        return DatabaseManager.getGameDatastore()
-                .find(Friendship.class)
-                .filter(Filters.eq("ownerId", player.getUid()))
-                .stream()
-                .toList();
-    }
-
-    public static List<Friendship> getReverseFriends(Player player) {
-        return DatabaseManager.getGameDatastore()
-                .find(Friendship.class)
-                .filter(Filters.eq("friendId", player.getUid()))
-                .stream()
-                .toList();
-    }
-
-    public static void saveFriendship(Friendship friendship) {
-        DatabaseManager.getGameDatastore().save(friendship);
-    }
-
-    public static void deleteFriendship(Friendship friendship) {
-        DatabaseManager.getGameDatastore().delete(friendship);
-    }
-
-    public static Friendship getReverseFriendship(Friendship friendship) {
-        return DatabaseManager.getGameDatastore()
-                .find(Friendship.class)
-                .filter(
-                        Filters.and(
-                                Filters.eq("ownerId", friendship.getFriendId()),
-                                Filters.eq("friendId", friendship.getOwnerId())))
-                .first();
-    }
-
-    public static List<GachaRecord> getGachaRecords(int ownerId, int page, int gachaType) {
-        return getGachaRecords(ownerId, page, gachaType, 10);
-    }
-
-    public static List<GachaRecord> getGachaRecords(
-            int ownerId, int page, int gachaType, int pageSize) {
-        return DatabaseManager.getGameDatastore()
-                .find(GachaRecord.class)
-                .filter(Filters.eq("ownerId", ownerId), Filters.eq("gachaType", gachaType))
-                .iterator(
-                        new FindOptions()
-                                .sort(Sort.descending("transactionDate"))
-                                .skip(pageSize * page)
-                                .limit(pageSize))
-                .toList();
-    }
-
-    public static long getGachaRecordsMaxPage(int ownerId, int page, int gachaType) {
-        return getGachaRecordsMaxPage(ownerId, page, gachaType, 10);
-    }
-
-    public static long getGachaRecordsMaxPage(int ownerId, int page, int gachaType, int pageSize) {
-        long count =
-                DatabaseManager.getGameDatastore()
-                        .find(GachaRecord.class)
-                        .filter(Filters.eq("ownerId", ownerId), Filters.eq("gachaType", gachaType))
-                        .count();
-        return count / 10 + (count % 10 > 0 ? 1 : 0);
-    }
-
-    public static void saveGachaRecord(GachaRecord gachaRecord) {
-        DatabaseManager.getGameDatastore().save(gachaRecord);
-    }
-
-    public static List<Mail> getAllMail(Player player) {
-        return DatabaseManager.getGameDatastore()
-                .find(Mail.class)
-                .filter(Filters.eq("ownerUid", player.getUid()))
-                .stream()
-                .toList();
-    }
-
-    public static void saveMail(Mail mail) {
-        DatabaseManager.getGameDatastore().save(mail);
-    }
-
-    public static boolean deleteMail(Mail mail) {
-        DeleteResult result = DatabaseManager.getGameDatastore().delete(mail);
-        return result.wasAcknowledged();
-    }
-
-    public static List<GameMainQuest> getAllQuests(Player player) {
-        return DatabaseManager.getGameDatastore()
-                .find(GameMainQuest.class)
-                .filter(Filters.eq("ownerUid", player.getUid()))
-                .stream()
-                .toList();
-    }
-
-    public static void saveQuest(GameMainQuest quest) {
-        DatabaseManager.getGameDatastore().save(quest);
-    }
-
-    public static boolean deleteQuest(GameMainQuest quest) {
-        return DatabaseManager.getGameDatastore().delete(quest).wasAcknowledged();
-    }
-
-    public static GameHome getHomeByUid(int id) {
-        return DatabaseManager.getGameDatastore()
-                .find(GameHome.class)
-                .filter(Filters.eq("ownerUid", id))
-                .first();
-    }
-
-    public static void saveHome(GameHome gameHome) {
-        DatabaseManager.getGameDatastore().save(gameHome);
-    }
-
-    public static BattlePassManager loadBattlePass(Player player) {
-        BattlePassManager manager =
-                DatabaseManager.getGameDatastore()
-                        .find(BattlePassManager.class)
-                        .filter(Filters.eq("ownerUid", player.getUid()))
-                        .first();
-        if (manager == null) {
-            manager = new BattlePassManager(player);
-            manager.save();
-        } else {
-            manager.setPlayer(player);
-        }
-        return manager;
-    }
-
-    public static void saveBattlePass(BattlePassManager manager) {
-        DatabaseManager.getGameDatastore().save(manager);
-    }
-
-    public static PlayerActivityData getPlayerActivityData(int uid, int activityId) {
-        return DatabaseManager.getGameDatastore()
-                .find(PlayerActivityData.class)
-                .filter(Filters.and(Filters.eq("uid", uid), Filters.eq("activityId", activityId)))
-                .first();
-    }
-
-    public static void savePlayerActivityData(PlayerActivityData playerActivityData) {
-        DatabaseManager.getGameDatastore().save(playerActivityData);
-    }
-
-    public static MusicGameBeatmap getMusicGameBeatmap(long musicShareId) {
-        return DatabaseManager.getGameDatastore()
-                .find(MusicGameBeatmap.class)
-                .filter(Filters.eq("musicShareId", musicShareId))
-                .first();
-    }
-
-    public static void saveMusicGameBeatmap(MusicGameBeatmap musicGameBeatmap) {
-        DatabaseManager.getGameDatastore().save(musicGameBeatmap);
-    }
-
-    public static Achievements getAchievementData(int uid) {
-        return DatabaseManager.getGameDatastore()
-                .find(Achievements.class)
-                .filter(Filters.and(Filters.eq("uid", uid)))
-                .first();
-    }
-
-    public static void saveAchievementData(Achievements achievements) {
-        DatabaseManager.getGameDatastore().save(achievements);
-    }
-
-    public static void saveGroupInstance(SceneGroupInstance instance) {
-        DatabaseManager.getGameDatastore().save(instance);
-    }
-
-    public static SceneGroupInstance loadGroupInstance(int groupId, Player owner) {
-        return DatabaseManager.getGameDatastore().find(SceneGroupInstance.class)
-            .filter(Filters.and(Filters.eq("ownerUid", owner.getUid()),
-                Filters.eq("groupId", groupId))).first();
-    }
-}
+package emu.grasscutter.database;
+
+import static com.mongodb.client.model.Filters.eq;
+
+import com.mongodb.client.result.DeleteResult;
+import dev.morphia.query.FindOptions;
+import dev.morphia.query.Sort;
+import dev.morphia.query.experimental.filters.Filters;
+import emu.grasscutter.GameConstants;
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.game.Account;
+import emu.grasscutter.game.achievement.Achievements;
+import emu.grasscutter.game.activity.PlayerActivityData;
+import emu.grasscutter.game.activity.musicgame.MusicGameBeatmap;
+import emu.grasscutter.game.avatar.Avatar;
+import emu.grasscutter.game.battlepass.BattlePassManager;
+import emu.grasscutter.game.friends.Friendship;
+import emu.grasscutter.game.gacha.GachaRecord;
+import emu.grasscutter.game.home.GameHome;
+import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.game.mail.Mail;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.quest.GameMainQuest;
+import emu.grasscutter.game.world.SceneGroupInstance;
+import java.util.List;
+import java.util.stream.Stream;
+
+public final class DatabaseHelper {
+    public static Account createAccount(String username) {
+        return createAccountWithUid(username, 0);
+    }
+
+    public static Account createAccountWithUid(String username, int reservedUid) {
+        // Unique names only
+        if (DatabaseHelper.checkIfAccountExists(username)) {
+            return null;
+        }
+
+        // Make sure there are no id collisions
+        if (reservedUid > 0) {
+            // Cannot make account with the same uid as the server console
+            if (reservedUid == GameConstants.SERVER_CONSOLE_UID) {
+                return null;
+            }
+
+            if (DatabaseHelper.checkIfAccountExists(reservedUid)) {
+                return null;
+            }
+
+            // Make sure no existing player already has this id.
+            if (DatabaseHelper.checkIfPlayerExists(reservedUid)) {
+                return null;
+            }
+        }
+
+        // Account
+        Account account = new Account();
+        account.setUsername(username);
+        account.setId(Integer.toString(DatabaseManager.getNextId(account)));
+
+        if (reservedUid > 0) {
+            account.setReservedPlayerUid(reservedUid);
+        }
+
+        DatabaseHelper.saveAccount(account);
+        return account;
+    }
+
+    @Deprecated
+    public static Account createAccountWithPassword(String username, String password) {
+        // Unique names only
+        Account exists = DatabaseHelper.getAccountByName(username);
+        if (exists != null) {
+            return null;
+        }
+
+        // Account
+        Account account = new Account();
+        account.setId(Integer.toString(DatabaseManager.getNextId(account)));
+        account.setUsername(username);
+        account.setPassword(password);
+        DatabaseHelper.saveAccount(account);
+        return account;
+    }
+
+    public static void saveAccount(Account account) {
+        DatabaseManager.getAccountDatastore().save(account);
+    }
+
+    public static Account getAccountByName(String username) {
+        return DatabaseManager.getAccountDatastore()
+                .find(Account.class)
+                .filter(Filters.eq("username", username))
+                .first();
+    }
+
+    public static Account getAccountByToken(String token) {
+        if (token == null) return null;
+        return DatabaseManager.getAccountDatastore()
+                .find(Account.class)
+                .filter(Filters.eq("token", token))
+                .first();
+    }
+
+    public static Account getAccountBySessionKey(String sessionKey) {
+        if (sessionKey == null) return null;
+        return DatabaseManager.getAccountDatastore()
+                .find(Account.class)
+                .filter(Filters.eq("sessionKey", sessionKey))
+                .first();
+    }
+
+    public static Account getAccountById(String uid) {
+        return DatabaseManager.getAccountDatastore()
+                .find(Account.class)
+                .filter(Filters.eq("_id", uid))
+                .first();
+    }
+
+    public static Account getAccountByPlayerId(int playerId) {
+        return DatabaseManager.getAccountDatastore()
+                .find(Account.class)
+                .filter(Filters.eq("reservedPlayerId", playerId))
+                .first();
+    }
+
+    public static boolean checkIfAccountExists(String name) {
+        return DatabaseManager.getAccountDatastore()
+                        .find(Account.class)
+                        .filter(Filters.eq("username", name))
+                        .count()
+                > 0;
+    }
+
+    public static boolean checkIfAccountExists(int reservedUid) {
+        return DatabaseManager.getAccountDatastore()
+                        .find(Account.class)
+                        .filter(Filters.eq("reservedPlayerId", reservedUid))
+                        .count()
+                > 0;
+    }
+
+    public static synchronized void deleteAccount(Account target) {
+        // To delete an account, we need to also delete all the other documents in the database that
+        // reference the account.
+        // This should optimally be wrapped inside a transaction, to make sure an error thrown mid-way
+        // does not leave the
+        // database in an inconsistent state, but unfortunately Mongo only supports that when we have a
+        // replica set ...
+
+        Player player = Grasscutter.getGameServer().getPlayerByAccountId(target.getId());
+
+        // Close session first
+        if (player != null) {
+            player.getSession().close();
+        } else {
+            player = getPlayerByAccount(target);
+            if (player == null) return;
+        }
+        int uid = player.getUid();
+        // Delete data from collections
+        DatabaseManager.getGameDatabase().getCollection("achievements").deleteMany(eq("uid", uid));
+        DatabaseManager.getGameDatabase().getCollection("activities").deleteMany(eq("uid", uid));
+        DatabaseManager.getGameDatabase().getCollection("homes").deleteMany(eq("ownerUid", uid));
+        DatabaseManager.getGameDatabase().getCollection("mail").deleteMany(eq("ownerUid", uid));
+        DatabaseManager.getGameDatabase().getCollection("avatars").deleteMany(eq("ownerId", uid));
+        DatabaseManager.getGameDatabase().getCollection("gachas").deleteMany(eq("ownerId", uid));
+        DatabaseManager.getGameDatabase().getCollection("items").deleteMany(eq("ownerId", uid));
+        DatabaseManager.getGameDatabase().getCollection("quests").deleteMany(eq("ownerUid", uid));
+        DatabaseManager.getGameDatabase().getCollection("battlepass").deleteMany(eq("ownerUid", uid));
+
+        // Delete friendships.
+        // Here, we need to make sure to not only delete the deleted account's friendships,
+        // but also all friendship entries for that account's friends.
+        DatabaseManager.getGameDatabase().getCollection("friendships").deleteMany(eq("ownerId", uid));
+        DatabaseManager.getGameDatabase().getCollection("friendships").deleteMany(eq("friendId", uid));
+
+        // Delete the player last.
+        DatabaseManager.getGameDatastore().find(Player.class).filter(Filters.eq("id", uid)).delete();
+
+        // Finally, delete the account itself.
+        DatabaseManager.getAccountDatastore()
+                .find(Account.class)
+                .filter(Filters.eq("id", target.getId()))
+                .delete();
+    }
+
+    public static <T> Stream<T> getByGameClass(Class<T> classType) {
+        return DatabaseManager.getGameDatastore().find(classType).stream();
+    }
+
+    @Deprecated(forRemoval = true)
+    public static List<Player> getAllPlayers() {
+        return DatabaseManager.getGameDatastore().find(Player.class).stream().toList();
+    }
+
+    public static Player getPlayerByUid(int id) {
+        return DatabaseManager.getGameDatastore()
+                .find(Player.class)
+                .filter(Filters.eq("_id", id))
+                .first();
+    }
+
+    @Deprecated
+    public static Player getPlayerByAccount(Account account) {
+        return DatabaseManager.getGameDatastore()
+                .find(Player.class)
+                .filter(Filters.eq("accountId", account.getId()))
+                .first();
+    }
+
+    public static Player getPlayerByAccount(Account account, Class<? extends Player> playerClass) {
+        return DatabaseManager.getGameDatastore()
+                .find(playerClass)
+                .filter(Filters.eq("accountId", account.getId()))
+                .first();
+    }
+
+    public static boolean checkIfPlayerExists(int uid) {
+        return DatabaseManager.getGameDatastore()
+                        .find(Player.class)
+                        .filter(Filters.eq("_id", uid))
+                        .count()
+                > 0;
+    }
+
+    public static synchronized Player generatePlayerUid(Player character, int reservedId) {
+        // Check if reserved id
+        int id;
+        if (reservedId > 0 && !checkIfPlayerExists(reservedId)) {
+            id = reservedId;
+            character.setUid(id);
+        } else {
+            do {
+                id = DatabaseManager.getNextId(character);
+            } while (checkIfPlayerExists(id));
+            character.setUid(id);
+        }
+        // Save to database
+        DatabaseManager.getGameDatastore().save(character);
+        return character;
+    }
+
+    public static synchronized int getNextPlayerId(int reservedId) {
+        // Check if reserved id
+        int id;
+        if (reservedId > 0 && !checkIfPlayerExists(reservedId)) {
+            id = reservedId;
+        } else {
+            do {
+                id = DatabaseManager.getNextId(Player.class);
+            } while (checkIfPlayerExists(id));
+        }
+        return id;
+    }
+
+    public static void savePlayer(Player character) {
+        DatabaseManager.getGameDatastore().save(character);
+    }
+
+    public static void saveAvatar(Avatar avatar) {
+        DatabaseManager.getGameDatastore().save(avatar);
+    }
+
+    public static List<Avatar> getAvatars(Player player) {
+        return DatabaseManager.getGameDatastore()
+                .find(Avatar.class)
+                .filter(Filters.eq("ownerId", player.getUid()))
+                .stream()
+                .toList();
+    }
+
+    public static void saveItem(GameItem item) {
+        DatabaseManager.getGameDatastore().save(item);
+    }
+
+    public static boolean deleteItem(GameItem item) {
+        DeleteResult result = DatabaseManager.getGameDatastore().delete(item);
+        return result.wasAcknowledged();
+    }
+
+    public static List<GameItem> getInventoryItems(Player player) {
+        return DatabaseManager.getGameDatastore()
+                .find(GameItem.class)
+                .filter(Filters.eq("ownerId", player.getUid()))
+                .stream()
+                .toList();
+    }
+
+    public static List<Friendship> getFriends(Player player) {
+        return DatabaseManager.getGameDatastore()
+                .find(Friendship.class)
+                .filter(Filters.eq("ownerId", player.getUid()))
+                .stream()
+                .toList();
+    }
+
+    public static List<Friendship> getReverseFriends(Player player) {
+        return DatabaseManager.getGameDatastore()
+                .find(Friendship.class)
+                .filter(Filters.eq("friendId", player.getUid()))
+                .stream()
+                .toList();
+    }
+
+    public static void saveFriendship(Friendship friendship) {
+        DatabaseManager.getGameDatastore().save(friendship);
+    }
+
+    public static void deleteFriendship(Friendship friendship) {
+        DatabaseManager.getGameDatastore().delete(friendship);
+    }
+
+    public static Friendship getReverseFriendship(Friendship friendship) {
+        return DatabaseManager.getGameDatastore()
+                .find(Friendship.class)
+                .filter(
+                        Filters.and(
+                                Filters.eq("ownerId", friendship.getFriendId()),
+                                Filters.eq("friendId", friendship.getOwnerId())))
+                .first();
+    }
+
+    public static List<GachaRecord> getGachaRecords(int ownerId, int page, int gachaType) {
+        return getGachaRecords(ownerId, page, gachaType, 10);
+    }
+
+    public static List<GachaRecord> getGachaRecords(
+            int ownerId, int page, int gachaType, int pageSize) {
+        return DatabaseManager.getGameDatastore()
+                .find(GachaRecord.class)
+                .filter(Filters.eq("ownerId", ownerId), Filters.eq("gachaType", gachaType))
+                .iterator(
+                        new FindOptions()
+                                .sort(Sort.descending("transactionDate"))
+                                .skip(pageSize * page)
+                                .limit(pageSize))
+                .toList();
+    }
+
+    public static long getGachaRecordsMaxPage(int ownerId, int page, int gachaType) {
+        return getGachaRecordsMaxPage(ownerId, page, gachaType, 10);
+    }
+
+    public static long getGachaRecordsMaxPage(int ownerId, int page, int gachaType, int pageSize) {
+        long count =
+                DatabaseManager.getGameDatastore()
+                        .find(GachaRecord.class)
+                        .filter(Filters.eq("ownerId", ownerId), Filters.eq("gachaType", gachaType))
+                        .count();
+        return count / 10 + (count % 10 > 0 ? 1 : 0);
+    }
+
+    public static void saveGachaRecord(GachaRecord gachaRecord) {
+        DatabaseManager.getGameDatastore().save(gachaRecord);
+    }
+
+    public static List<Mail> getAllMail(Player player) {
+        return DatabaseManager.getGameDatastore()
+                .find(Mail.class)
+                .filter(Filters.eq("ownerUid", player.getUid()))
+                .stream()
+                .toList();
+    }
+
+    public static void saveMail(Mail mail) {
+        DatabaseManager.getGameDatastore().save(mail);
+    }
+
+    public static boolean deleteMail(Mail mail) {
+        DeleteResult result = DatabaseManager.getGameDatastore().delete(mail);
+        return result.wasAcknowledged();
+    }
+
+    public static List<GameMainQuest> getAllQuests(Player player) {
+        return DatabaseManager.getGameDatastore()
+                .find(GameMainQuest.class)
+                .filter(Filters.eq("ownerUid", player.getUid()))
+                .stream()
+                .toList();
+    }
+
+    public static void saveQuest(GameMainQuest quest) {
+        DatabaseManager.getGameDatastore().save(quest);
+    }
+
+    public static boolean deleteQuest(GameMainQuest quest) {
+        return DatabaseManager.getGameDatastore().delete(quest).wasAcknowledged();
+    }
+
+    public static GameHome getHomeByUid(int id) {
+        return DatabaseManager.getGameDatastore()
+                .find(GameHome.class)
+                .filter(Filters.eq("ownerUid", id))
+                .first();
+    }
+
+    public static void saveHome(GameHome gameHome) {
+        DatabaseManager.getGameDatastore().save(gameHome);
+    }
+
+    public static BattlePassManager loadBattlePass(Player player) {
+        BattlePassManager manager =
+                DatabaseManager.getGameDatastore()
+                        .find(BattlePassManager.class)
+                        .filter(Filters.eq("ownerUid", player.getUid()))
+                        .first();
+        if (manager == null) {
+            manager = new BattlePassManager(player);
+            manager.save();
+        } else {
+            manager.setPlayer(player);
+        }
+        return manager;
+    }
+
+    public static void saveBattlePass(BattlePassManager manager) {
+        DatabaseManager.getGameDatastore().save(manager);
+    }
+
+    public static PlayerActivityData getPlayerActivityData(int uid, int activityId) {
+        return DatabaseManager.getGameDatastore()
+                .find(PlayerActivityData.class)
+                .filter(Filters.and(Filters.eq("uid", uid), Filters.eq("activityId", activityId)))
+                .first();
+    }
+
+    public static void savePlayerActivityData(PlayerActivityData playerActivityData) {
+        DatabaseManager.getGameDatastore().save(playerActivityData);
+    }
+
+    public static MusicGameBeatmap getMusicGameBeatmap(long musicShareId) {
+        return DatabaseManager.getGameDatastore()
+                .find(MusicGameBeatmap.class)
+                .filter(Filters.eq("musicShareId", musicShareId))
+                .first();
+    }
+
+    public static void saveMusicGameBeatmap(MusicGameBeatmap musicGameBeatmap) {
+        DatabaseManager.getGameDatastore().save(musicGameBeatmap);
+    }
+
+    public static Achievements getAchievementData(int uid) {
+        return DatabaseManager.getGameDatastore()
+                .find(Achievements.class)
+                .filter(Filters.and(Filters.eq("uid", uid)))
+                .first();
+    }
+
+    public static void saveAchievementData(Achievements achievements) {
+        DatabaseManager.getGameDatastore().save(achievements);
+    }
+
+    public static void saveGroupInstance(SceneGroupInstance instance) {
+        DatabaseManager.getGameDatastore().save(instance);
+    }
+
+    public static SceneGroupInstance loadGroupInstance(int groupId, Player owner) {
+        return DatabaseManager.getGameDatastore()
+                .find(SceneGroupInstance.class)
+                .filter(Filters.and(Filters.eq("ownerUid", owner.getUid()), Filters.eq("groupId", groupId)))
+                .first();
+    }
+}

src/main/java/emu/grasscutter/game/activity/PlayerActivityData.java

@@ -1,134 +1,134 @@
-package emu.grasscutter.game.activity;
-
-import dev.morphia.annotations.Entity;
-import dev.morphia.annotations.Id;
-import dev.morphia.annotations.Transient;
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.common.ItemParamData;
-import emu.grasscutter.data.excels.activity.ActivityWatcherData;
-import emu.grasscutter.database.DatabaseHelper;
-import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.ActionReason;
-import emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass;
-import emu.grasscutter.server.packet.send.PacketActivityUpdateWatcherNotify;
-import emu.grasscutter.utils.JsonUtils;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import lombok.AccessLevel;
-import lombok.Builder;
-import lombok.Data;
-import lombok.experimental.FieldDefaults;
-
-@Entity("activities")
-@Data
-@FieldDefaults(level = AccessLevel.PRIVATE)
-@Builder(builderMethodName = "of")
-public class PlayerActivityData {
-    @Id String id;
-    int uid;
-    int activityId;
-    Map<Integer, WatcherInfo> watcherInfoMap;
-    /** the detail data of each type of activity (Json format) */
-    String detail;
-
-    @Transient Player player;
-    @Transient ActivityHandler activityHandler;
-
-    public static PlayerActivityData getByPlayer(Player player, int activityId) {
-        return DatabaseHelper.getPlayerActivityData(player.getUid(), activityId);
-    }
-
-    public void save() {
-        DatabaseHelper.savePlayerActivityData(this);
-    }
-
-    public synchronized void addWatcherProgress(int watcherId) {
-        var watcherInfo = watcherInfoMap.get(watcherId);
-        if (watcherInfo == null) {
-            return;
-        }
-
-        if (watcherInfo.curProgress >= watcherInfo.totalProgress) {
-            return;
-        }
-
-        watcherInfo.curProgress++;
-        getPlayer().sendPacket(new PacketActivityUpdateWatcherNotify(activityId, watcherInfo));
-    }
-
-    public List<ActivityWatcherInfoOuterClass.ActivityWatcherInfo> getAllWatcherInfoList() {
-        return watcherInfoMap.values().stream().map(WatcherInfo::toProto).toList();
-    }
-
-    public void setDetail(Object detail) {
-        this.detail = JsonUtils.encode(detail);
-    }
-
-    public void takeWatcherReward(int watcherId) {
-        var watcher = watcherInfoMap.get(watcherId);
-        if (watcher == null || watcher.isTakenReward()) {
-            return;
-        }
-
-        var reward =
-                Optional.of(watcher)
-                        .map(WatcherInfo::getMetadata)
-                        .map(ActivityWatcherData::getRewardID)
-                        .map(id -> GameData.getRewardDataMap().get(id.intValue()));
-
-        if (reward.isEmpty()) {
-            return;
-        }
-
-        List<GameItem> rewards = new ArrayList<>();
-        for (ItemParamData param : reward.get().getRewardItemList()) {
-            rewards.add(new GameItem(param.getId(), Math.max(param.getCount(), 1)));
-        }
-
-        player.getInventory().addItems(rewards, ActionReason.ActivityWatcher);
-        watcher.setTakenReward(true);
-        save();
-    }
-
-    @Entity
-    @Data
-    @FieldDefaults(level = AccessLevel.PRIVATE)
-    @Builder(builderMethodName = "of")
-    public static class WatcherInfo {
-        int watcherId;
-        int totalProgress;
-        int curProgress;
-        boolean isTakenReward;
-
-        /**
-         * @return True when the progress of this watcher has reached the total progress.
-         */
-        public boolean isFinished(){
-            return this.curProgress >= this.totalProgress;
-        }
-
-        public static WatcherInfo init(ActivityWatcher watcher) {
-            return WatcherInfo.of()
-                    .watcherId(watcher.getWatcherId())
-                    .totalProgress(watcher.getActivityWatcherData().getProgress())
-                    .isTakenReward(false)
-                    .build();
-        }
-
-        public ActivityWatcherData getMetadata() {
-            return GameData.getActivityWatcherDataMap().get(watcherId);
-        }
-
-        public ActivityWatcherInfoOuterClass.ActivityWatcherInfo toProto() {
-            return ActivityWatcherInfoOuterClass.ActivityWatcherInfo.newBuilder()
-                    .setWatcherId(watcherId)
-                    .setCurProgress(curProgress)
-                    .setTotalProgress(totalProgress)
-                    .setIsTakenReward(isTakenReward)
-                    .build();
-        }
-    }
-}
+package emu.grasscutter.game.activity;
+
+import dev.morphia.annotations.Entity;
+import dev.morphia.annotations.Id;
+import dev.morphia.annotations.Transient;
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.common.ItemParamData;
+import emu.grasscutter.data.excels.activity.ActivityWatcherData;
+import emu.grasscutter.database.DatabaseHelper;
+import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.ActionReason;
+import emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass;
+import emu.grasscutter.server.packet.send.PacketActivityUpdateWatcherNotify;
+import emu.grasscutter.utils.JsonUtils;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+
+@Entity("activities")
+@Data
+@FieldDefaults(level = AccessLevel.PRIVATE)
+@Builder(builderMethodName = "of")
+public class PlayerActivityData {
+    @Id String id;
+    int uid;
+    int activityId;
+    Map<Integer, WatcherInfo> watcherInfoMap;
+    /** the detail data of each type of activity (Json format) */
+    String detail;
+
+    @Transient Player player;
+    @Transient ActivityHandler activityHandler;
+
+    public static PlayerActivityData getByPlayer(Player player, int activityId) {
+        return DatabaseHelper.getPlayerActivityData(player.getUid(), activityId);
+    }
+
+    public void save() {
+        DatabaseHelper.savePlayerActivityData(this);
+    }
+
+    public synchronized void addWatcherProgress(int watcherId) {
+        var watcherInfo = watcherInfoMap.get(watcherId);
+        if (watcherInfo == null) {
+            return;
+        }
+
+        if (watcherInfo.curProgress >= watcherInfo.totalProgress) {
+            return;
+        }
+
+        watcherInfo.curProgress++;
+        getPlayer().sendPacket(new PacketActivityUpdateWatcherNotify(activityId, watcherInfo));
+    }
+
+    public List<ActivityWatcherInfoOuterClass.ActivityWatcherInfo> getAllWatcherInfoList() {
+        return watcherInfoMap.values().stream().map(WatcherInfo::toProto).toList();
+    }
+
+    public void setDetail(Object detail) {
+        this.detail = JsonUtils.encode(detail);
+    }
+
+    public void takeWatcherReward(int watcherId) {
+        var watcher = watcherInfoMap.get(watcherId);
+        if (watcher == null || watcher.isTakenReward()) {
+            return;
+        }
+
+        var reward =
+                Optional.of(watcher)
+                        .map(WatcherInfo::getMetadata)
+                        .map(ActivityWatcherData::getRewardID)
+                        .map(id -> GameData.getRewardDataMap().get(id.intValue()));
+
+        if (reward.isEmpty()) {
+            return;
+        }
+
+        List<GameItem> rewards = new ArrayList<>();
+        for (ItemParamData param : reward.get().getRewardItemList()) {
+            rewards.add(new GameItem(param.getId(), Math.max(param.getCount(), 1)));
+        }
+
+        player.getInventory().addItems(rewards, ActionReason.ActivityWatcher);
+        watcher.setTakenReward(true);
+        save();
+    }
+
+    @Entity
+    @Data
+    @FieldDefaults(level = AccessLevel.PRIVATE)
+    @Builder(builderMethodName = "of")
+    public static class WatcherInfo {
+        int watcherId;
+        int totalProgress;
+        int curProgress;
+        boolean isTakenReward;
+
+        /**
+         * @return True when the progress of this watcher has reached the total progress.
+         */
+        public boolean isFinished() {
+            return this.curProgress >= this.totalProgress;
+        }
+
+        public static WatcherInfo init(ActivityWatcher watcher) {
+            return WatcherInfo.of()
+                    .watcherId(watcher.getWatcherId())
+                    .totalProgress(watcher.getActivityWatcherData().getProgress())
+                    .isTakenReward(false)
+                    .build();
+        }
+
+        public ActivityWatcherData getMetadata() {
+            return GameData.getActivityWatcherDataMap().get(watcherId);
+        }
+
+        public ActivityWatcherInfoOuterClass.ActivityWatcherInfo toProto() {
+            return ActivityWatcherInfoOuterClass.ActivityWatcherInfo.newBuilder()
+                    .setWatcherId(watcherId)
+                    .setCurProgress(curProgress)
+                    .setTotalProgress(totalProgress)
+                    .setIsTakenReward(isTakenReward)
+                    .build();
+        }
+    }
+}

src/main/java/emu/grasscutter/game/dungeons/BasicDungeonSettleListener.java

@@ -1,18 +1,19 @@
-package emu.grasscutter.game.dungeons;
-
-import emu.grasscutter.game.dungeons.dungeon_results.BaseDungeonResult;
-import emu.grasscutter.server.packet.send.PacketDungeonSettleNotify;
-
-public class BasicDungeonSettleListener implements DungeonSettleListener {
-
-    @Override
-    public void onDungeonSettle(DungeonManager dungeonManager, BaseDungeonResult.DungeonEndReason endReason) {
-        var scene = dungeonManager.getScene();
-        var dungeonData = dungeonManager.getDungeonData();
-        var time = scene.getSceneTimeSeconds() - dungeonManager.getStartSceneTime() ;
-        // TODO time taken and chests handling
-        DungeonEndStats stats = new DungeonEndStats(scene.getKilledMonsterCount(), time, 0, endReason);
-
-        scene.broadcastPacket(new PacketDungeonSettleNotify(new BaseDungeonResult(dungeonData, stats)));
-    }
-}
+package emu.grasscutter.game.dungeons;
+
+import emu.grasscutter.game.dungeons.dungeon_results.BaseDungeonResult;
+import emu.grasscutter.server.packet.send.PacketDungeonSettleNotify;
+
+public class BasicDungeonSettleListener implements DungeonSettleListener {
+
+    @Override
+    public void onDungeonSettle(
+            DungeonManager dungeonManager, BaseDungeonResult.DungeonEndReason endReason) {
+        var scene = dungeonManager.getScene();
+        var dungeonData = dungeonManager.getDungeonData();
+        var time = scene.getSceneTimeSeconds() - dungeonManager.getStartSceneTime();
+        // TODO time taken and chests handling
+        DungeonEndStats stats = new DungeonEndStats(scene.getKilledMonsterCount(), time, 0, endReason);
+
+        scene.broadcastPacket(new PacketDungeonSettleNotify(new BaseDungeonResult(dungeonData, stats)));
+    }
+}

src/main/java/emu/grasscutter/game/dungeons/DungeonManager.java

@@ -1,314 +1,331 @@
-package emu.grasscutter.game.dungeons;
-
-import emu.grasscutter.Grasscutter;
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.common.ItemParamData;
-import emu.grasscutter.data.excels.dungeon.DungeonData;
-import emu.grasscutter.data.excels.dungeon.DungeonPassConfigData;
-import emu.grasscutter.game.activity.trialavatar.TrialAvatarActivityHandler;
-import emu.grasscutter.game.dungeons.dungeon_results.BaseDungeonResult;
-import emu.grasscutter.game.dungeons.enums.DungeonPassConditionType;
-import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.ActionReason;
-import emu.grasscutter.game.props.ActivityType;
-import emu.grasscutter.game.props.WatcherTriggerType;
-import emu.grasscutter.game.quest.enums.LogicType;
-import emu.grasscutter.game.quest.enums.QuestContent;
-import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.scripts.constants.EventType;
-import emu.grasscutter.scripts.data.ScriptArgs;
-import emu.grasscutter.server.packet.send.PacketDungeonWayPointNotify;
-import emu.grasscutter.server.packet.send.PacketGadgetAutoPickDropInfoNotify;
-import emu.grasscutter.utils.Position;
-import emu.grasscutter.utils.Utils;
-import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
-import it.unimi.dsi.fastutil.ints.IntSet;
-import lombok.Getter;
-import lombok.NonNull;
-import lombok.val;
-
-import javax.annotation.Nullable;
-import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-/**
- * TODO handle time limits
- * TODO handle respawn points
- * TODO handle team wipes and respawns
- * TODO check monster level and levelConfigMap
- */
-public final class DungeonManager {
-    @Getter private final Scene scene;
-    @Getter private final DungeonData dungeonData;
-    @Getter private final DungeonPassConfigData passConfigData;
-
-    @Getter private final int[] finishedConditions;
-    private final IntSet rewardedPlayers = new IntOpenHashSet();
-    private final Set<Integer> activeDungeonWayPoints = new HashSet<>();
-    private boolean ended = false;
-    private int newestWayPoint = 0;
-    @Getter private int startSceneTime = 0;
-
-    DungeonTrialTeam trialTeam = null;
-
-    public DungeonManager(@NonNull Scene scene, @NonNull DungeonData dungeonData) {
-        this.scene = scene;
-        this.dungeonData = dungeonData;
-        this.passConfigData = GameData.getDungeonPassConfigDataMap().get(dungeonData.getPassCond());
-        this.finishedConditions = new int[passConfigData.getConds().size()];
-        this.scene.setDungeonManager(this);
-    }
-
-    public void triggerEvent(DungeonPassConditionType conditionType, int... params) {
-        if (ended) {
-            return;
-        }
-        for (int i = 0; i < passConfigData.getConds().size(); i++) {
-            var cond = passConfigData.getConds().get(i);
-            if (conditionType == cond.getCondType()) {
-                if (getScene().getWorld().getServer().getDungeonSystem().triggerCondition(cond, params)) {
-                    finishedConditions[i] = 1;
-                }
-
-            }
-        }
-
-        if (isFinishedSuccessfully()) {
-            finishDungeon();
-        }
-
-    }
-
-    public boolean isFinishedSuccessfully() {
-        return LogicType.calculate(passConfigData.getLogicType(), finishedConditions);
-    }
-
-    public int getLevelForMonster(int id) {
-        //TODO should use levelConfigMap? and how?
-        return dungeonData.getShowLevel();
-    }
-
-    public boolean activateRespawnPoint(int pointId) {
-        val respawnPoint = GameData.getScenePointEntryById(scene.getId(), pointId);
-
-        if (respawnPoint == null) {
-            Grasscutter.getLogger().warn("trying to activate unknown respawn point {}", pointId);
-            return false;
-        }
-
-        scene.broadcastPacket(new PacketDungeonWayPointNotify(activeDungeonWayPoints.add(pointId), activeDungeonWayPoints));
-        newestWayPoint = pointId;
-
-        Grasscutter.getLogger().debug("[unimplemented respawn] activated respawn point {}", pointId);
-        return true;
-    }
-
-    @Nullable
-    public Position getRespawnLocation() {
-        if (newestWayPoint == 0) { // validity is checked before setting it, so if != 0 its always valid
-            return null;
-        }
-        var pointData = GameData.getScenePointEntryById(scene.getId(), newestWayPoint).getPointData();
-        return pointData.getTranPos() != null ? pointData.getTranPos() : pointData.getPos();
-    }
-
-    public Position getRespawnRotation() {
-        if (newestWayPoint == 0) { // validity is checked before setting it, so if != 0 its always valid
-            return null;
-        }
-        val pointData = GameData.getScenePointEntryById(scene.getId(), newestWayPoint).getPointData();
-        return pointData.getRot() != null ? pointData.getRot() : null;
-    }
-
-    public boolean getStatueDrops(Player player, boolean useCondensed, int groupId) {
-        if (!isFinishedSuccessfully() || dungeonData.getRewardPreviewData() == null || dungeonData.getRewardPreviewData().getPreviewItems().length == 0) {
-            return false;
-        }
-
-        // Already rewarded
-        if (rewardedPlayers.contains(player.getUid())) {
-            return false;
-        }
-
-
-        if (!handleCost(player, useCondensed)) {
-            return false;
-        }
-
-        // Get and roll rewards.
-        List<GameItem> rewards = new ArrayList<>(this.rollRewards(useCondensed));
-        // Add rewards to player and send notification.
-        player.getInventory().addItems(rewards, ActionReason.DungeonStatueDrop);
-        player.sendPacket(new PacketGadgetAutoPickDropInfoNotify(rewards));
-
-        rewardedPlayers.add(player.getUid());
-
-        scene.getScriptManager().callEvent(new ScriptArgs(groupId, EventType.EVENT_DUNGEON_REWARD_GET));
-        return true;
-    }
-
-    public boolean handleCost(Player player, boolean useCondensed) {
-        int resinCost = dungeonData.getStatueCostCount() != 0 ? dungeonData.getStatueCostCount() : 20;
-        if (resinCost == 0) {
-            return true;
-        }
-        if (useCondensed) {
-            // Check if condensed resin is usable here.
-            // For this, we use the following logic for now:
-            // The normal resin cost of the dungeon has to be 20.
-            if (resinCost != 20) {
-                return false;
-            }
-
-            // Spend the condensed resin and only proceed if the transaction succeeds.
-            return player.getResinManager().useCondensedResin(1);
-        } else if (dungeonData.getStatueCostID() == 106) {
-            // Spend the resin and only proceed if the transaction succeeds.
-            return player.getResinManager().useResin(resinCost);
-        }
-        return true;
-    }
-
-    private List<GameItem> rollRewards(boolean useCondensed) {
-        List<GameItem> rewards = new ArrayList<>();
-        int dungeonId = this.dungeonData.getId();
-        // If we have specific drop data for this dungeon, we use it.
-        if (GameData.getDungeonDropDataMap().containsKey(dungeonId)) {
-            List<DungeonDropEntry> dropEntries = GameData.getDungeonDropDataMap().get(dungeonId);
-
-            // Roll for each drop group.
-            for (var entry : dropEntries) {
-                // Determine the number of drops we get for this entry.
-                int start = entry.getCounts().get(0);
-                int end = entry.getCounts().get(entry.getCounts().size() - 1);
-                var candidateAmounts = IntStream.range(start, end + 1).boxed().collect(Collectors.toList());
-
-                int amount = Utils.drawRandomListElement(candidateAmounts, entry.getProbabilities());
-
-                if (useCondensed) {
-                    amount += Utils.drawRandomListElement(candidateAmounts, entry.getProbabilities());
-                }
-
-                // Double rewards in multiplay mode, if specified.
-                if (entry.isMpDouble() && this.getScene().getPlayerCount() > 1) {
-                    amount *= 2;
-                }
-
-                // Roll items for this group.
-                // Here, we have to handle stacking, or the client will not display results correctly.
-                // For now, we use the following logic: If the possible drop item are a list of multiple items,
-                // we roll them separately. If not, we stack them. This should work out in practice, at least
-                // for the currently existing set of dungeons.
-                if (entry.getItems().size() == 1) {
-                    rewards.add(new GameItem(entry.getItems().get(0), amount));
-                } else {
-                    for (int i = 0; i < amount; i++) {
-                        // int itemIndex = ThreadLocalRandom.current().nextInt(0, entry.getItems().size());
-                        // int itemId = entry.getItems().get(itemIndex);
-                        int itemId = Utils.drawRandomListElement(entry.getItems(), entry.getItemProbabilities());
-                        rewards.add(new GameItem(itemId, 1));
-                    }
-                }
-            }
-        }
-        // Otherwise, we fall back to the preview data.
-        else {
-            Grasscutter.getLogger().info("No drop data found or dungeon {}, falling back to preview data ...", dungeonId);
-            for (ItemParamData param : dungeonData.getRewardPreviewData().getPreviewItems()) {
-                rewards.add(new GameItem(param.getId(), Math.max(param.getCount(), 1)));
-            }
-        }
-
-        return rewards;
-    }
-
-    public void applyTrialTeam(Player player) {
-        if (getDungeonData() == null) return;
-
-        switch (getDungeonData().getType()) {
-            // case DUNGEON_PLOT is handled by quest execs
-            case DUNGEON_ACTIVITY -> {
-                switch (getDungeonData().getPlayType()) {
-                    case DUNGEON_PLAY_TYPE_TRIAL_AVATAR -> {
-                        val activityHandler = player.getActivityManager()
-                            .getActivityHandlerAs(ActivityType.NEW_ACTIVITY_TRIAL_AVATAR, TrialAvatarActivityHandler.class);
-                        activityHandler.ifPresent(trialAvatarActivityHandler ->
-                            this.trialTeam = trialAvatarActivityHandler.getTrialAvatarDungeonTeam());
-                    }
-                }
-            }
-            case DUNGEON_ELEMENT_CHALLENGE -> {} // TODO
-        }
-
-        if (this.trialTeam != null) {
-            player.getTeamManager().addTrialAvatars(trialTeam.trialAvatarIds);
-        }
-    }
-
-    public void unsetTrialTeam(Player player){
-        if (this.trialTeam == null) return;
-
-        player.getTeamManager().removeTrialAvatar();
-        this.trialTeam = null;
-    }
-
-    public void startDungeon() {
-        this.startSceneTime = scene.getSceneTimeSeconds();
-        scene.getPlayers().forEach(p -> {
-            p.getQuestManager().queueEvent(QuestContent.QUEST_CONTENT_ENTER_DUNGEON, dungeonData.getId());
-            applyTrialTeam(p);
-        });
-    }
-
-    public void finishDungeon() {
-        notifyEndDungeon(true);
-        endDungeon(BaseDungeonResult.DungeonEndReason.COMPLETED);
-    }
-
-    public void notifyEndDungeon(boolean successfully) {
-        scene.getPlayers().forEach(p -> {
-            // Quest trigger
-            p.getQuestManager().queueEvent(successfully ?
-                    QuestContent.QUEST_CONTENT_FINISH_DUNGEON : QuestContent.QUEST_CONTENT_FAIL_DUNGEON,
-                dungeonData.getId());
-
-            // Battle pass trigger
-            if (dungeonData.getType().isCountsToBattlepass() && successfully) {
-                p.getBattlePassManager().triggerMission(WatcherTriggerType.TRIGGER_FINISH_DUNGEON);
-            }
-        });
-        scene.getScriptManager().callEvent(new ScriptArgs(0, EventType.EVENT_DUNGEON_SETTLE, successfully ? 1 : 0));
-    }
-
-    public void quitDungeon() {
-        notifyEndDungeon(false);
-        endDungeon(BaseDungeonResult.DungeonEndReason.QUIT);
-    }
-
-    public void failDungeon() {
-        notifyEndDungeon(false);
-        endDungeon(BaseDungeonResult.DungeonEndReason.FAILED);
-    }
-
-    public void endDungeon(BaseDungeonResult.DungeonEndReason endReason) {
-        if (scene.getDungeonSettleListeners() != null) {
-            scene.getDungeonSettleListeners().forEach(o -> o.onDungeonSettle(this, endReason));
-        }
-        ended = true;
-    }
-
-    public void restartDungeon() {
-        this.scene.setKilledMonsterCount(0);
-        this.rewardedPlayers.clear();
-        Arrays.fill(finishedConditions, 0);
-        this.ended = false;
-        this.activeDungeonWayPoints.clear();
-    }
-
-    public void cleanUpScene() {
-        this.scene.setDungeonManager(null);
-        this.scene.setKilledMonsterCount(0);
-    }
-}
+package emu.grasscutter.game.dungeons;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.common.ItemParamData;
+import emu.grasscutter.data.excels.dungeon.DungeonData;
+import emu.grasscutter.data.excels.dungeon.DungeonPassConfigData;
+import emu.grasscutter.game.activity.trialavatar.TrialAvatarActivityHandler;
+import emu.grasscutter.game.dungeons.dungeon_results.BaseDungeonResult;
+import emu.grasscutter.game.dungeons.enums.DungeonPassConditionType;
+import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.ActionReason;
+import emu.grasscutter.game.props.ActivityType;
+import emu.grasscutter.game.props.WatcherTriggerType;
+import emu.grasscutter.game.quest.enums.LogicType;
+import emu.grasscutter.game.quest.enums.QuestContent;
+import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.scripts.constants.EventType;
+import emu.grasscutter.scripts.data.ScriptArgs;
+import emu.grasscutter.server.packet.send.PacketDungeonWayPointNotify;
+import emu.grasscutter.server.packet.send.PacketGadgetAutoPickDropInfoNotify;
+import emu.grasscutter.utils.Position;
+import emu.grasscutter.utils.Utils;
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import it.unimi.dsi.fastutil.ints.IntSet;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import javax.annotation.Nullable;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.val;
+
+/**
+ * TODO handle time limits TODO handle respawn points TODO handle team wipes and respawns TODO check
+ * monster level and levelConfigMap
+ */
+public final class DungeonManager {
+    @Getter private final Scene scene;
+    @Getter private final DungeonData dungeonData;
+    @Getter private final DungeonPassConfigData passConfigData;
+
+    @Getter private final int[] finishedConditions;
+    private final IntSet rewardedPlayers = new IntOpenHashSet();
+    private final Set<Integer> activeDungeonWayPoints = new HashSet<>();
+    private boolean ended = false;
+    private int newestWayPoint = 0;
+    @Getter private int startSceneTime = 0;
+
+    DungeonTrialTeam trialTeam = null;
+
+    public DungeonManager(@NonNull Scene scene, @NonNull DungeonData dungeonData) {
+        this.scene = scene;
+        this.dungeonData = dungeonData;
+        this.passConfigData = GameData.getDungeonPassConfigDataMap().get(dungeonData.getPassCond());
+        this.finishedConditions = new int[passConfigData.getConds().size()];
+        this.scene.setDungeonManager(this);
+    }
+
+    public void triggerEvent(DungeonPassConditionType conditionType, int... params) {
+        if (ended) {
+            return;
+        }
+        for (int i = 0; i < passConfigData.getConds().size(); i++) {
+            var cond = passConfigData.getConds().get(i);
+            if (conditionType == cond.getCondType()) {
+                if (getScene().getWorld().getServer().getDungeonSystem().triggerCondition(cond, params)) {
+                    finishedConditions[i] = 1;
+                }
+            }
+        }
+
+        if (isFinishedSuccessfully()) {
+            finishDungeon();
+        }
+    }
+
+    public boolean isFinishedSuccessfully() {
+        return LogicType.calculate(passConfigData.getLogicType(), finishedConditions);
+    }
+
+    public int getLevelForMonster(int id) {
+        // TODO should use levelConfigMap? and how?
+        return dungeonData.getShowLevel();
+    }
+
+    public boolean activateRespawnPoint(int pointId) {
+        val respawnPoint = GameData.getScenePointEntryById(scene.getId(), pointId);
+
+        if (respawnPoint == null) {
+            Grasscutter.getLogger().warn("trying to activate unknown respawn point {}", pointId);
+            return false;
+        }
+
+        scene.broadcastPacket(
+                new PacketDungeonWayPointNotify(
+                        activeDungeonWayPoints.add(pointId), activeDungeonWayPoints));
+        newestWayPoint = pointId;
+
+        Grasscutter.getLogger().debug("[unimplemented respawn] activated respawn point {}", pointId);
+        return true;
+    }
+
+    @Nullable public Position getRespawnLocation() {
+        if (newestWayPoint == 0) { // validity is checked before setting it, so if != 0 its always valid
+            return null;
+        }
+        var pointData = GameData.getScenePointEntryById(scene.getId(), newestWayPoint).getPointData();
+        return pointData.getTranPos() != null ? pointData.getTranPos() : pointData.getPos();
+    }
+
+    public Position getRespawnRotation() {
+        if (newestWayPoint == 0) { // validity is checked before setting it, so if != 0 its always valid
+            return null;
+        }
+        val pointData = GameData.getScenePointEntryById(scene.getId(), newestWayPoint).getPointData();
+        return pointData.getRot() != null ? pointData.getRot() : null;
+    }
+
+    public boolean getStatueDrops(Player player, boolean useCondensed, int groupId) {
+        if (!isFinishedSuccessfully()
+                || dungeonData.getRewardPreviewData() == null
+                || dungeonData.getRewardPreviewData().getPreviewItems().length == 0) {
+            return false;
+        }
+
+        // Already rewarded
+        if (rewardedPlayers.contains(player.getUid())) {
+            return false;
+        }
+
+        if (!handleCost(player, useCondensed)) {
+            return false;
+        }
+
+        // Get and roll rewards.
+        List<GameItem> rewards = new ArrayList<>(this.rollRewards(useCondensed));
+        // Add rewards to player and send notification.
+        player.getInventory().addItems(rewards, ActionReason.DungeonStatueDrop);
+        player.sendPacket(new PacketGadgetAutoPickDropInfoNotify(rewards));
+
+        rewardedPlayers.add(player.getUid());
+
+        scene.getScriptManager().callEvent(new ScriptArgs(groupId, EventType.EVENT_DUNGEON_REWARD_GET));
+        return true;
+    }
+
+    public boolean handleCost(Player player, boolean useCondensed) {
+        int resinCost = dungeonData.getStatueCostCount() != 0 ? dungeonData.getStatueCostCount() : 20;
+        if (resinCost == 0) {
+            return true;
+        }
+        if (useCondensed) {
+            // Check if condensed resin is usable here.
+            // For this, we use the following logic for now:
+            // The normal resin cost of the dungeon has to be 20.
+            if (resinCost != 20) {
+                return false;
+            }
+
+            // Spend the condensed resin and only proceed if the transaction succeeds.
+            return player.getResinManager().useCondensedResin(1);
+        } else if (dungeonData.getStatueCostID() == 106) {
+            // Spend the resin and only proceed if the transaction succeeds.
+            return player.getResinManager().useResin(resinCost);
+        }
+        return true;
+    }
+
+    private List<GameItem> rollRewards(boolean useCondensed) {
+        List<GameItem> rewards = new ArrayList<>();
+        int dungeonId = this.dungeonData.getId();
+        // If we have specific drop data for this dungeon, we use it.
+        if (GameData.getDungeonDropDataMap().containsKey(dungeonId)) {
+            List<DungeonDropEntry> dropEntries = GameData.getDungeonDropDataMap().get(dungeonId);
+
+            // Roll for each drop group.
+            for (var entry : dropEntries) {
+                // Determine the number of drops we get for this entry.
+                int start = entry.getCounts().get(0);
+                int end = entry.getCounts().get(entry.getCounts().size() - 1);
+                var candidateAmounts = IntStream.range(start, end + 1).boxed().collect(Collectors.toList());
+
+                int amount = Utils.drawRandomListElement(candidateAmounts, entry.getProbabilities());
+
+                if (useCondensed) {
+                    amount += Utils.drawRandomListElement(candidateAmounts, entry.getProbabilities());
+                }
+
+                // Double rewards in multiplay mode, if specified.
+                if (entry.isMpDouble() && this.getScene().getPlayerCount() > 1) {
+                    amount *= 2;
+                }
+
+                // Roll items for this group.
+                // Here, we have to handle stacking, or the client will not display results correctly.
+                // For now, we use the following logic: If the possible drop item are a list of multiple
+                // items,
+                // we roll them separately. If not, we stack them. This should work out in practice, at
+                // least
+                // for the currently existing set of dungeons.
+                if (entry.getItems().size() == 1) {
+                    rewards.add(new GameItem(entry.getItems().get(0), amount));
+                } else {
+                    for (int i = 0; i < amount; i++) {
+                        // int itemIndex = ThreadLocalRandom.current().nextInt(0, entry.getItems().size());
+                        // int itemId = entry.getItems().get(itemIndex);
+                        int itemId =
+                                Utils.drawRandomListElement(entry.getItems(), entry.getItemProbabilities());
+                        rewards.add(new GameItem(itemId, 1));
+                    }
+                }
+            }
+        }
+        // Otherwise, we fall back to the preview data.
+        else {
+            Grasscutter.getLogger()
+                    .info("No drop data found or dungeon {}, falling back to preview data ...", dungeonId);
+            for (ItemParamData param : dungeonData.getRewardPreviewData().getPreviewItems()) {
+                rewards.add(new GameItem(param.getId(), Math.max(param.getCount(), 1)));
+            }
+        }
+
+        return rewards;
+    }
+
+    public void applyTrialTeam(Player player) {
+        if (getDungeonData() == null) return;
+
+        switch (getDungeonData().getType()) {
+                // case DUNGEON_PLOT is handled by quest execs
+            case DUNGEON_ACTIVITY -> {
+                switch (getDungeonData().getPlayType()) {
+                    case DUNGEON_PLAY_TYPE_TRIAL_AVATAR -> {
+                        val activityHandler =
+                                player
+                                        .getActivityManager()
+                                        .getActivityHandlerAs(
+                                                ActivityType.NEW_ACTIVITY_TRIAL_AVATAR, TrialAvatarActivityHandler.class);
+                        activityHandler.ifPresent(
+                                trialAvatarActivityHandler ->
+                                        this.trialTeam = trialAvatarActivityHandler.getTrialAvatarDungeonTeam());
+                    }
+                }
+            }
+            case DUNGEON_ELEMENT_CHALLENGE -> {} // TODO
+        }
+
+        if (this.trialTeam != null) {
+            player.getTeamManager().addTrialAvatars(trialTeam.trialAvatarIds);
+        }
+    }
+
+    public void unsetTrialTeam(Player player) {
+        if (this.trialTeam == null) return;
+
+        player.getTeamManager().removeTrialAvatar();
+        this.trialTeam = null;
+    }
+
+    public void startDungeon() {
+        this.startSceneTime = scene.getSceneTimeSeconds();
+        scene
+                .getPlayers()
+                .forEach(
+                        p -> {
+                            p.getQuestManager()
+                                    .queueEvent(QuestContent.QUEST_CONTENT_ENTER_DUNGEON, dungeonData.getId());
+                            applyTrialTeam(p);
+                        });
+    }
+
+    public void finishDungeon() {
+        notifyEndDungeon(true);
+        endDungeon(BaseDungeonResult.DungeonEndReason.COMPLETED);
+    }
+
+    public void notifyEndDungeon(boolean successfully) {
+        scene
+                .getPlayers()
+                .forEach(
+                        p -> {
+                            // Quest trigger
+                            p.getQuestManager()
+                                    .queueEvent(
+                                            successfully
+                                                    ? QuestContent.QUEST_CONTENT_FINISH_DUNGEON
+                                                    : QuestContent.QUEST_CONTENT_FAIL_DUNGEON,
+                                            dungeonData.getId());
+
+                            // Battle pass trigger
+                            if (dungeonData.getType().isCountsToBattlepass() && successfully) {
+                                p.getBattlePassManager().triggerMission(WatcherTriggerType.TRIGGER_FINISH_DUNGEON);
+                            }
+                        });
+        scene
+                .getScriptManager()
+                .callEvent(new ScriptArgs(0, EventType.EVENT_DUNGEON_SETTLE, successfully ? 1 : 0));
+    }
+
+    public void quitDungeon() {
+        notifyEndDungeon(false);
+        endDungeon(BaseDungeonResult.DungeonEndReason.QUIT);
+    }
+
+    public void failDungeon() {
+        notifyEndDungeon(false);
+        endDungeon(BaseDungeonResult.DungeonEndReason.FAILED);
+    }
+
+    public void endDungeon(BaseDungeonResult.DungeonEndReason endReason) {
+        if (scene.getDungeonSettleListeners() != null) {
+            scene.getDungeonSettleListeners().forEach(o -> o.onDungeonSettle(this, endReason));
+        }
+        ended = true;
+    }
+
+    public void restartDungeon() {
+        this.scene.setKilledMonsterCount(0);
+        this.rewardedPlayers.clear();
+        Arrays.fill(finishedConditions, 0);
+        this.ended = false;
+        this.activeDungeonWayPoints.clear();
+    }
+
+    public void cleanUpScene() {
+        this.scene.setDungeonManager(null);
+        this.scene.setKilledMonsterCount(0);
+    }
+}

src/main/java/emu/grasscutter/game/dungeons/DungeonSettleListener.java

@@ -1,7 +1,7 @@
-package emu.grasscutter.game.dungeons;
-
-import emu.grasscutter.game.dungeons.dungeon_results.BaseDungeonResult;
-
-public interface DungeonSettleListener {
-    void onDungeonSettle(DungeonManager dungeonManager, BaseDungeonResult.DungeonEndReason endReason);
-}
+package emu.grasscutter.game.dungeons;
+
+import emu.grasscutter.game.dungeons.dungeon_results.BaseDungeonResult;
+
+public interface DungeonSettleListener {
+    void onDungeonSettle(DungeonManager dungeonManager, BaseDungeonResult.DungeonEndReason endReason);
+}

src/main/java/emu/grasscutter/game/dungeons/DungeonSystem.java

@@ -1,157 +1,170 @@
-package emu.grasscutter.game.dungeons;
-
-import emu.grasscutter.GameConstants;
-import emu.grasscutter.Grasscutter;
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.binout.ScenePointEntry;
-import emu.grasscutter.data.excels.dungeon.DungeonData;
-import emu.grasscutter.data.excels.dungeon.DungeonPassConfigData;
-import emu.grasscutter.game.dungeons.handlers.DungeonBaseHandler;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.SceneType;
-import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.server.game.BaseGameSystem;
-import emu.grasscutter.server.game.GameServer;
-import emu.grasscutter.server.packet.send.PacketDungeonEntryInfoRsp;
-import emu.grasscutter.utils.Position;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import lombok.val;
-import org.reflections.Reflections;
-
-import java.util.List;
-
-public class DungeonSystem extends BaseGameSystem {
-    private static final BasicDungeonSettleListener basicDungeonSettleObserver = new BasicDungeonSettleListener();
-    private final Int2ObjectMap<DungeonBaseHandler> passCondHandlers;
-
-    public DungeonSystem(GameServer server) {
-        super(server);
-        this.passCondHandlers = new Int2ObjectOpenHashMap<>();
-        registerHandlers();
-    }
-
-    public void registerHandlers() {
-        this.registerHandlers(this.passCondHandlers, "emu.grasscutter.game.dungeons.pass_condition", DungeonBaseHandler.class);
-    }
-
-    public <T> void registerHandlers(Int2ObjectMap<T> map, String packageName, Class<T> clazz) {
-        Reflections reflections = new Reflections(packageName);
-        var handlerClasses = reflections.getSubTypesOf(clazz);
-
-        for (var obj : handlerClasses) {
-            this.registerPacketHandler(map, obj);
-        }
-    }
-
-    public <T> void registerPacketHandler(Int2ObjectMap<T> map, Class<? extends T> handlerClass) {
-        try {
-            DungeonValue opcode = handlerClass.getAnnotation(DungeonValue.class);
-
-            if (opcode == null || opcode.value() == null) {
-                return;
-            }
-
-            map.put(opcode.value().ordinal(), handlerClass.getDeclaredConstructor().newInstance());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    public void getEntryInfo(Player player, int pointId) {
-        ScenePointEntry entry = GameData.getScenePointEntryById(player.getScene().getId(), pointId);
-
-        if (entry == null) {
-            // Error
-            player.sendPacket(new PacketDungeonEntryInfoRsp());
-            return;
-        }
-
-        player.sendPacket(new PacketDungeonEntryInfoRsp(player, entry.getPointData()));
-    }
-
-    public boolean triggerCondition(DungeonPassConfigData.DungeonPassCondition condition, int... params) {
-        var handler = passCondHandlers.get(condition.getCondType().ordinal());
-
-        if (handler == null) {
-            Grasscutter.getLogger().debug("Could not trigger condition {} at {}", condition.getCondType(), params);
-            return false;
-        }
-
-        return handler.execute(condition, params);
-    }
-
-    public boolean enterDungeon(Player player, int pointId, int dungeonId) {
-        DungeonData data = GameData.getDungeonDataMap().get(dungeonId);
-
-        if (data == null) {
-            return false;
-        }
-        Grasscutter.getLogger().info("{}({}) is trying to enter dungeon {}" ,player.getNickname(),player.getUid(),dungeonId);
-
-        int sceneId = data.getSceneId();
-        var scene = player.getScene();
-        scene.setPrevScene(sceneId);
-
-        if (player.getWorld().transferPlayerToScene(player, sceneId, data)) {
-            scene = player.getScene();
-            scene.addDungeonSettleObserver(basicDungeonSettleObserver);
-        }
-
-        scene.setPrevScenePoint(pointId);
-        return true;
-    }
-
-    /**
-     * used in tower dungeons handoff
-     */
-    public boolean handoffDungeon(Player player, int dungeonId, List<DungeonSettleListener> dungeonSettleListeners) {
-        DungeonData data = GameData.getDungeonDataMap().get(dungeonId);
-
-        if (data == null) {
-            return false;
-        }
-        Grasscutter.getLogger().info("{}({}) is trying to enter tower dungeon {}" ,player.getNickname(),player.getUid(),dungeonId);
-
-        if (player.getWorld().transferPlayerToScene(player, data.getSceneId(), data)) {
-            dungeonSettleListeners.forEach(player.getScene()::addDungeonSettleObserver);
-        }
-        return true;
-    }
-
-    public void exitDungeon(Player player) {
-        Scene scene = player.getScene();
-
-        if (scene==null || scene.getSceneType() != SceneType.SCENE_DUNGEON) {
-            return;
-        }
-
-        // Get previous scene
-        int prevScene = scene.getPrevScene() > 0 ? scene.getPrevScene() : 3;
-
-        // Get previous position
-        val dungeonManager = scene.getDungeonManager();
-        DungeonData dungeonData =  dungeonManager != null ? dungeonManager.getDungeonData() : null;
-        Position prevPos = new Position(GameConstants.START_POSITION);
-
-        if (dungeonData != null) {
-            ScenePointEntry entry = GameData.getScenePointEntryById(prevScene, scene.getPrevScenePoint());
-
-            if (entry != null) {
-                prevPos.set(entry.getPointData().getTranPos());
-            }
-            if(!dungeonManager.isFinishedSuccessfully()){
-                dungeonManager.quitDungeon();
-            }
-
-            dungeonManager.unsetTrialTeam(player);
-        }
-        // clean temp team if it has
-        player.getTeamManager().cleanTemporaryTeam();
-        player.getTowerManager().clearEntry();
-
-
-        // Transfer player back to world
-        player.getWorld().transferPlayerToScene(player, prevScene, prevPos);
-    }
-}
+package emu.grasscutter.game.dungeons;
+
+import emu.grasscutter.GameConstants;
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.binout.ScenePointEntry;
+import emu.grasscutter.data.excels.dungeon.DungeonData;
+import emu.grasscutter.data.excels.dungeon.DungeonPassConfigData;
+import emu.grasscutter.game.dungeons.handlers.DungeonBaseHandler;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.SceneType;
+import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.server.game.BaseGameSystem;
+import emu.grasscutter.server.game.GameServer;
+import emu.grasscutter.server.packet.send.PacketDungeonEntryInfoRsp;
+import emu.grasscutter.utils.Position;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import java.util.List;
+import lombok.val;
+import org.reflections.Reflections;
+
+public class DungeonSystem extends BaseGameSystem {
+    private static final BasicDungeonSettleListener basicDungeonSettleObserver =
+            new BasicDungeonSettleListener();
+    private final Int2ObjectMap<DungeonBaseHandler> passCondHandlers;
+
+    public DungeonSystem(GameServer server) {
+        super(server);
+        this.passCondHandlers = new Int2ObjectOpenHashMap<>();
+        registerHandlers();
+    }
+
+    public void registerHandlers() {
+        this.registerHandlers(
+                this.passCondHandlers,
+                "emu.grasscutter.game.dungeons.pass_condition",
+                DungeonBaseHandler.class);
+    }
+
+    public <T> void registerHandlers(Int2ObjectMap<T> map, String packageName, Class<T> clazz) {
+        Reflections reflections = new Reflections(packageName);
+        var handlerClasses = reflections.getSubTypesOf(clazz);
+
+        for (var obj : handlerClasses) {
+            this.registerPacketHandler(map, obj);
+        }
+    }
+
+    public <T> void registerPacketHandler(Int2ObjectMap<T> map, Class<? extends T> handlerClass) {
+        try {
+            DungeonValue opcode = handlerClass.getAnnotation(DungeonValue.class);
+
+            if (opcode == null || opcode.value() == null) {
+                return;
+            }
+
+            map.put(opcode.value().ordinal(), handlerClass.getDeclaredConstructor().newInstance());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void getEntryInfo(Player player, int pointId) {
+        ScenePointEntry entry = GameData.getScenePointEntryById(player.getScene().getId(), pointId);
+
+        if (entry == null) {
+            // Error
+            player.sendPacket(new PacketDungeonEntryInfoRsp());
+            return;
+        }
+
+        player.sendPacket(new PacketDungeonEntryInfoRsp(player, entry.getPointData()));
+    }
+
+    public boolean triggerCondition(
+            DungeonPassConfigData.DungeonPassCondition condition, int... params) {
+        var handler = passCondHandlers.get(condition.getCondType().ordinal());
+
+        if (handler == null) {
+            Grasscutter.getLogger()
+                    .debug("Could not trigger condition {} at {}", condition.getCondType(), params);
+            return false;
+        }
+
+        return handler.execute(condition, params);
+    }
+
+    public boolean enterDungeon(Player player, int pointId, int dungeonId) {
+        DungeonData data = GameData.getDungeonDataMap().get(dungeonId);
+
+        if (data == null) {
+            return false;
+        }
+        Grasscutter.getLogger()
+                .info(
+                        "{}({}) is trying to enter dungeon {}",
+                        player.getNickname(),
+                        player.getUid(),
+                        dungeonId);
+
+        int sceneId = data.getSceneId();
+        var scene = player.getScene();
+        scene.setPrevScene(sceneId);
+
+        if (player.getWorld().transferPlayerToScene(player, sceneId, data)) {
+            scene = player.getScene();
+            scene.addDungeonSettleObserver(basicDungeonSettleObserver);
+        }
+
+        scene.setPrevScenePoint(pointId);
+        return true;
+    }
+
+    /** used in tower dungeons handoff */
+    public boolean handoffDungeon(
+            Player player, int dungeonId, List<DungeonSettleListener> dungeonSettleListeners) {
+        DungeonData data = GameData.getDungeonDataMap().get(dungeonId);
+
+        if (data == null) {
+            return false;
+        }
+        Grasscutter.getLogger()
+                .info(
+                        "{}({}) is trying to enter tower dungeon {}",
+                        player.getNickname(),
+                        player.getUid(),
+                        dungeonId);
+
+        if (player.getWorld().transferPlayerToScene(player, data.getSceneId(), data)) {
+            dungeonSettleListeners.forEach(player.getScene()::addDungeonSettleObserver);
+        }
+        return true;
+    }
+
+    public void exitDungeon(Player player) {
+        Scene scene = player.getScene();
+
+        if (scene == null || scene.getSceneType() != SceneType.SCENE_DUNGEON) {
+            return;
+        }
+
+        // Get previous scene
+        int prevScene = scene.getPrevScene() > 0 ? scene.getPrevScene() : 3;
+
+        // Get previous position
+        val dungeonManager = scene.getDungeonManager();
+        DungeonData dungeonData = dungeonManager != null ? dungeonManager.getDungeonData() : null;
+        Position prevPos = new Position(GameConstants.START_POSITION);
+
+        if (dungeonData != null) {
+            ScenePointEntry entry = GameData.getScenePointEntryById(prevScene, scene.getPrevScenePoint());
+
+            if (entry != null) {
+                prevPos.set(entry.getPointData().getTranPos());
+            }
+            if (!dungeonManager.isFinishedSuccessfully()) {
+                dungeonManager.quitDungeon();
+            }
+
+            dungeonManager.unsetTrialTeam(player);
+        }
+        // clean temp team if it has
+        player.getTeamManager().cleanTemporaryTeam();
+        player.getTowerManager().clearEntry();
+
+        // Transfer player back to world
+        player.getWorld().transferPlayerToScene(player, prevScene, prevPos);
+    }
+}

src/main/java/emu/grasscutter/game/dungeons/TowerDungeonSettleListener.java

@@ -1,38 +1,40 @@
-package emu.grasscutter.game.dungeons;
-
-import emu.grasscutter.game.dungeons.dungeon_results.BaseDungeonResult.DungeonEndReason;
-import emu.grasscutter.game.world.SceneGroupInstance;
-import emu.grasscutter.game.dungeons.dungeon_results.TowerResult;
-import emu.grasscutter.server.packet.send.PacketDungeonSettleNotify;
-import emu.grasscutter.server.packet.send.PacketTowerFloorRecordChangeNotify;
-
-public class TowerDungeonSettleListener implements DungeonSettleListener {
-
-    @Override
-    public void onDungeonSettle(DungeonManager dungeonManager, DungeonEndReason endReason) {
-        var scene = dungeonManager.getScene();
-        var dungeonData = dungeonManager.getDungeonData();
-        if (scene.getLoadedGroups().stream().anyMatch(g -> {
-            var variables = scene.getScriptManager().getVariables(g.id);
-            return variables != null && variables.containsKey("stage") && variables.get("stage") == 1;
-        })) {
-            return;
-        }
-
-        var towerManager = scene.getPlayers().get(0).getTowerManager();
-
-        towerManager.notifyCurLevelRecordChangeWhenDone(3);
-        scene.broadcastPacket(new PacketTowerFloorRecordChangeNotify(
-            towerManager.getCurrentFloorId(),
-            3,
-            towerManager.canEnterScheduleFloor()
-        ));
-
-        var challenge = scene.getChallenge();
-        var dungeonStats = new DungeonEndStats(scene.getKilledMonsterCount(), challenge.getFinishedTime(), 0, endReason);
-        var result = new TowerResult(dungeonData, dungeonStats, towerManager, challenge);
-
-        scene.broadcastPacket(new PacketDungeonSettleNotify(result));
-
-    }
-}
+package emu.grasscutter.game.dungeons;
+
+import emu.grasscutter.game.dungeons.dungeon_results.BaseDungeonResult.DungeonEndReason;
+import emu.grasscutter.game.dungeons.dungeon_results.TowerResult;
+import emu.grasscutter.server.packet.send.PacketDungeonSettleNotify;
+import emu.grasscutter.server.packet.send.PacketTowerFloorRecordChangeNotify;
+
+public class TowerDungeonSettleListener implements DungeonSettleListener {
+
+    @Override
+    public void onDungeonSettle(DungeonManager dungeonManager, DungeonEndReason endReason) {
+        var scene = dungeonManager.getScene();
+        var dungeonData = dungeonManager.getDungeonData();
+        if (scene.getLoadedGroups().stream()
+                .anyMatch(
+                        g -> {
+                            var variables = scene.getScriptManager().getVariables(g.id);
+                            return variables != null
+                                    && variables.containsKey("stage")
+                                    && variables.get("stage") == 1;
+                        })) {
+            return;
+        }
+
+        var towerManager = scene.getPlayers().get(0).getTowerManager();
+
+        towerManager.notifyCurLevelRecordChangeWhenDone(3);
+        scene.broadcastPacket(
+                new PacketTowerFloorRecordChangeNotify(
+                        towerManager.getCurrentFloorId(), 3, towerManager.canEnterScheduleFloor()));
+
+        var challenge = scene.getChallenge();
+        var dungeonStats =
+                new DungeonEndStats(
+                        scene.getKilledMonsterCount(), challenge.getFinishedTime(), 0, endReason);
+        var result = new TowerResult(dungeonData, dungeonStats, towerManager, challenge);
+
+        scene.broadcastPacket(new PacketDungeonSettleNotify(result));
+    }
+}

src/main/java/emu/grasscutter/game/dungeons/challenge/WorldChallenge.java

@@ -1,167 +1,178 @@
-package emu.grasscutter.game.dungeons.challenge;
-
-import emu.grasscutter.Grasscutter;
-import emu.grasscutter.game.dungeons.challenge.trigger.ChallengeTrigger;
-import emu.grasscutter.game.dungeons.enums.DungeonPassConditionType;
-import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.game.entity.EntityMonster;
-import emu.grasscutter.game.props.WatcherTriggerType;
-import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.scripts.constants.EventType;
-import emu.grasscutter.scripts.data.SceneGroup;
-import emu.grasscutter.scripts.data.SceneTrigger;
-import emu.grasscutter.scripts.data.ScriptArgs;
-import emu.grasscutter.server.packet.send.PacketDungeonChallengeBeginNotify;
-import emu.grasscutter.server.packet.send.PacketDungeonChallengeFinishNotify;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.val;
-
-@Getter
-@Setter
-public class WorldChallenge {
-    private final Scene scene;
-    private final SceneGroup group;
-    private final int challengeId;
-    private final int challengeIndex;
-    private final List<Integer> paramList;
-    private final int timeLimit;
-    private final List<ChallengeTrigger> challengeTriggers;
-    private final int goal;
-    private final AtomicInteger score;
-    private boolean progress;
-    private boolean success;
-    private long startedAt;
-    private int finishedTime;
-
-    public WorldChallenge(
-            Scene scene,
-            SceneGroup group,
-            int challengeId,
-            int challengeIndex,
-            List<Integer> paramList,
-            int timeLimit,
-            int goal,
-            List<ChallengeTrigger> challengeTriggers) {
-        this.scene = scene;
-        this.group = group;
-        this.challengeId = challengeId;
-        this.challengeIndex = challengeIndex;
-        this.paramList = paramList;
-        this.timeLimit = timeLimit;
-        this.challengeTriggers = challengeTriggers;
-        this.goal = goal;
-        this.score = new AtomicInteger(0);
-    }
-
-    public boolean inProgress() {
-        return this.progress;
-    }
-
-    public void onCheckTimeOut() {
-        if (!inProgress()) {
-            return;
-        }
-        if (timeLimit <= 0) {
-            return;
-        }
-        challengeTriggers.forEach(t -> t.onCheckTimeout(this));
-    }
-
-    public void start() {
-        if (inProgress()) {
-            Grasscutter.getLogger().info("Could not start a in progress challenge.");
-            return;
-        }
-        this.progress = true;
-        this.startedAt = System.currentTimeMillis();
-        getScene().broadcastPacket(new PacketDungeonChallengeBeginNotify(this));
-        challengeTriggers.forEach(t -> t.onBegin(this));
-    }
-
-    public void done() {
-        if (!this.inProgress()) return;
-        this.finish(true);
-
-        var scene = this.getScene();
-        var dungeonManager = scene.getDungeonManager();
-        if (dungeonManager != null && dungeonManager.getDungeonData() != null) {
-            scene.getPlayers().forEach(p -> p.getActivityManager().triggerWatcher(
-                WatcherTriggerType.TRIGGER_FINISH_CHALLENGE,
-                String.valueOf(dungeonManager.getDungeonData().getId()),
-                String.valueOf(this.getGroup().id),
-                String.valueOf(this.getChallengeId())
-            ));
-        }
-
-        scene.getScriptManager().callEvent(
-            // TODO record the time in PARAM2 and used in action
-            new ScriptArgs(this.getGroup().id, EventType.EVENT_CHALLENGE_SUCCESS).setParam2(finishedTime));
-        this.getScene().triggerDungeonEvent(DungeonPassConditionType.DUNGEON_COND_FINISH_CHALLENGE, getChallengeId(), getChallengeIndex());
-
-        this.challengeTriggers.forEach(t -> t.onFinish(this));
-    }
-
-    public void fail(){
-        if (!this.inProgress()) return;
-        this.finish(true);
-
-        this.getScene().getScriptManager().callEvent(new ScriptArgs(this.getGroup().id, EventType.EVENT_CHALLENGE_FAIL));
-        challengeTriggers.forEach(t -> t.onFinish(this));
-    }
-
-    private void finish(boolean success) {
-        this.progress = false;
-        this.success = success;
-        this.finishedTime = (int) ((System.currentTimeMillis() - this.startedAt) / 1000L);
-        getScene().broadcastPacket(new PacketDungeonChallengeFinishNotify(this));
-    }
-
-    public int increaseScore() {
-        return score.incrementAndGet();
-    }
-
-    public void onMonsterDeath(EntityMonster monster) {
-        if (!inProgress()) {
-            return;
-        }
-        if (monster.getGroupId() != getGroup().id) {
-            return;
-        }
-        this.challengeTriggers.forEach(t -> t.onMonsterDeath(this, monster));
-    }
-
-    public void onGadgetDeath(EntityGadget gadget) {
-        if (!inProgress()) {
-            return;
-        }
-        if (gadget.getGroupId() != getGroup().id) {
-            return;
-        }
-        this.challengeTriggers.forEach(t -> t.onGadgetDeath(this, gadget));
-    }
-
-    public void onGroupTriggerDeath(SceneTrigger trigger) {
-        if(!this.inProgress()) return;
-
-        var triggerGroup = trigger.getCurrentGroup();
-        if (triggerGroup == null ||
-            triggerGroup.id != getGroup().id) {
-            return;
-        }
-
-        this.challengeTriggers.forEach(t -> t.onGroupTrigger(this, trigger));
-    }
-
-    public void onGadgetDamage(EntityGadget gadget) {
-        if (!inProgress()) {
-            return;
-        }
-        if (gadget.getGroupId() != getGroup().id) {
-            return;
-        }
-        this.challengeTriggers.forEach(t -> t.onGadgetDamage(this, gadget));
-    }
-}
+package emu.grasscutter.game.dungeons.challenge;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.game.dungeons.challenge.trigger.ChallengeTrigger;
+import emu.grasscutter.game.dungeons.enums.DungeonPassConditionType;
+import emu.grasscutter.game.entity.EntityGadget;
+import emu.grasscutter.game.entity.EntityMonster;
+import emu.grasscutter.game.props.WatcherTriggerType;
+import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.scripts.constants.EventType;
+import emu.grasscutter.scripts.data.SceneGroup;
+import emu.grasscutter.scripts.data.SceneTrigger;
+import emu.grasscutter.scripts.data.ScriptArgs;
+import emu.grasscutter.server.packet.send.PacketDungeonChallengeBeginNotify;
+import emu.grasscutter.server.packet.send.PacketDungeonChallengeFinishNotify;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class WorldChallenge {
+    private final Scene scene;
+    private final SceneGroup group;
+    private final int challengeId;
+    private final int challengeIndex;
+    private final List<Integer> paramList;
+    private final int timeLimit;
+    private final List<ChallengeTrigger> challengeTriggers;
+    private final int goal;
+    private final AtomicInteger score;
+    private boolean progress;
+    private boolean success;
+    private long startedAt;
+    private int finishedTime;
+
+    public WorldChallenge(
+            Scene scene,
+            SceneGroup group,
+            int challengeId,
+            int challengeIndex,
+            List<Integer> paramList,
+            int timeLimit,
+            int goal,
+            List<ChallengeTrigger> challengeTriggers) {
+        this.scene = scene;
+        this.group = group;
+        this.challengeId = challengeId;
+        this.challengeIndex = challengeIndex;
+        this.paramList = paramList;
+        this.timeLimit = timeLimit;
+        this.challengeTriggers = challengeTriggers;
+        this.goal = goal;
+        this.score = new AtomicInteger(0);
+    }
+
+    public boolean inProgress() {
+        return this.progress;
+    }
+
+    public void onCheckTimeOut() {
+        if (!inProgress()) {
+            return;
+        }
+        if (timeLimit <= 0) {
+            return;
+        }
+        challengeTriggers.forEach(t -> t.onCheckTimeout(this));
+    }
+
+    public void start() {
+        if (inProgress()) {
+            Grasscutter.getLogger().info("Could not start a in progress challenge.");
+            return;
+        }
+        this.progress = true;
+        this.startedAt = System.currentTimeMillis();
+        getScene().broadcastPacket(new PacketDungeonChallengeBeginNotify(this));
+        challengeTriggers.forEach(t -> t.onBegin(this));
+    }
+
+    public void done() {
+        if (!this.inProgress()) return;
+        this.finish(true);
+
+        var scene = this.getScene();
+        var dungeonManager = scene.getDungeonManager();
+        if (dungeonManager != null && dungeonManager.getDungeonData() != null) {
+            scene
+                    .getPlayers()
+                    .forEach(
+                            p ->
+                                    p.getActivityManager()
+                                            .triggerWatcher(
+                                                    WatcherTriggerType.TRIGGER_FINISH_CHALLENGE,
+                                                    String.valueOf(dungeonManager.getDungeonData().getId()),
+                                                    String.valueOf(this.getGroup().id),
+                                                    String.valueOf(this.getChallengeId())));
+        }
+
+        scene
+                .getScriptManager()
+                .callEvent(
+                        // TODO record the time in PARAM2 and used in action
+                        new ScriptArgs(this.getGroup().id, EventType.EVENT_CHALLENGE_SUCCESS)
+                                .setParam2(finishedTime));
+        this.getScene()
+                .triggerDungeonEvent(
+                        DungeonPassConditionType.DUNGEON_COND_FINISH_CHALLENGE,
+                        getChallengeId(),
+                        getChallengeIndex());
+
+        this.challengeTriggers.forEach(t -> t.onFinish(this));
+    }
+
+    public void fail() {
+        if (!this.inProgress()) return;
+        this.finish(true);
+
+        this.getScene()
+                .getScriptManager()
+                .callEvent(new ScriptArgs(this.getGroup().id, EventType.EVENT_CHALLENGE_FAIL));
+        challengeTriggers.forEach(t -> t.onFinish(this));
+    }
+
+    private void finish(boolean success) {
+        this.progress = false;
+        this.success = success;
+        this.finishedTime = (int) ((System.currentTimeMillis() - this.startedAt) / 1000L);
+        getScene().broadcastPacket(new PacketDungeonChallengeFinishNotify(this));
+    }
+
+    public int increaseScore() {
+        return score.incrementAndGet();
+    }
+
+    public void onMonsterDeath(EntityMonster monster) {
+        if (!inProgress()) {
+            return;
+        }
+        if (monster.getGroupId() != getGroup().id) {
+            return;
+        }
+        this.challengeTriggers.forEach(t -> t.onMonsterDeath(this, monster));
+    }
+
+    public void onGadgetDeath(EntityGadget gadget) {
+        if (!inProgress()) {
+            return;
+        }
+        if (gadget.getGroupId() != getGroup().id) {
+            return;
+        }
+        this.challengeTriggers.forEach(t -> t.onGadgetDeath(this, gadget));
+    }
+
+    public void onGroupTriggerDeath(SceneTrigger trigger) {
+        if (!this.inProgress()) return;
+
+        var triggerGroup = trigger.getCurrentGroup();
+        if (triggerGroup == null || triggerGroup.id != getGroup().id) {
+            return;
+        }
+
+        this.challengeTriggers.forEach(t -> t.onGroupTrigger(this, trigger));
+    }
+
+    public void onGadgetDamage(EntityGadget gadget) {
+        if (!inProgress()) {
+            return;
+        }
+        if (gadget.getGroupId() != getGroup().id) {
+            return;
+        }
+        this.challengeTriggers.forEach(t -> t.onGadgetDamage(this, gadget));
+    }
+}

src/main/java/emu/grasscutter/game/dungeons/challenge/factory/ChallengeFactory.java

@@ -1,36 +1,44 @@
-package emu.grasscutter.game.dungeons.challenge.factory;
-
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
-import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.scripts.data.SceneGroup;
-import lombok.val;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public abstract class ChallengeFactory {
-    private static final List<ChallengeFactoryHandler> challengeFactoryHandlers = new ArrayList<>();
-
-    static {
-        challengeFactoryHandlers.add(new KillAndGuardChallengeFactoryHandler());
-        challengeFactoryHandlers.add(new KillMonsterCountChallengeFactoryHandler());
-        challengeFactoryHandlers.add(new KillMonsterInTimeChallengeFactoryHandler());
-        challengeFactoryHandlers.add(new KillMonsterTimeChallengeFactoryHandler());
-        challengeFactoryHandlers.add(new SurviveChallengeFactoryHandler());
-        challengeFactoryHandlers.add(new TriggerInTimeChallengeFactoryHandler());
-    }
-
-    public static WorldChallenge getChallenge(int localChallengeId, int challengeDataId, int param3, int param4, int param5, int param6, Scene scene, SceneGroup group){
-        val challengeData = GameData.getDungeonChallengeConfigDataMap().get(challengeDataId);
-        val challengeType = challengeData.getChallengeType();
-
-        for(var handler : challengeFactoryHandlers){
-            if(!handler.isThisType(challengeType)){
-                continue;
-            }
-            return handler.build(localChallengeId, challengeDataId, param3, param4, param5, param6, scene, group);
-        }
-        return null;
-    }
-}
+package emu.grasscutter.game.dungeons.challenge.factory;
+
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
+import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.scripts.data.SceneGroup;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.val;
+
+public abstract class ChallengeFactory {
+    private static final List<ChallengeFactoryHandler> challengeFactoryHandlers = new ArrayList<>();
+
+    static {
+        challengeFactoryHandlers.add(new KillAndGuardChallengeFactoryHandler());
+        challengeFactoryHandlers.add(new KillMonsterCountChallengeFactoryHandler());
+        challengeFactoryHandlers.add(new KillMonsterInTimeChallengeFactoryHandler());
+        challengeFactoryHandlers.add(new KillMonsterTimeChallengeFactoryHandler());
+        challengeFactoryHandlers.add(new SurviveChallengeFactoryHandler());
+        challengeFactoryHandlers.add(new TriggerInTimeChallengeFactoryHandler());
+    }
+
+    public static WorldChallenge getChallenge(
+            int localChallengeId,
+            int challengeDataId,
+            int param3,
+            int param4,
+            int param5,
+            int param6,
+            Scene scene,
+            SceneGroup group) {
+        val challengeData = GameData.getDungeonChallengeConfigDataMap().get(challengeDataId);
+        val challengeType = challengeData.getChallengeType();
+
+        for (var handler : challengeFactoryHandlers) {
+            if (!handler.isThisType(challengeType)) {
+                continue;
+            }
+            return handler.build(
+                    localChallengeId, challengeDataId, param3, param4, param5, param6, scene, group);
+        }
+        return null;
+    }
+}

src/main/java/emu/grasscutter/game/dungeons/challenge/factory/ChallengeFactoryHandler.java

@@ -7,5 +7,14 @@ import emu.grasscutter.scripts.data.SceneGroup;
 
 public interface ChallengeFactoryHandler {
     boolean isThisType(ChallengeType challengeType);
-    WorldChallenge build(int challengeIndex, int challengeId, int param3, int param4, int param5, int param6, Scene scene, SceneGroup group);
+
+    WorldChallenge build(
+            int challengeIndex,
+            int challengeId,
+            int param3,
+            int param4,
+            int param5,
+            int param6,
+            Scene scene,
+            SceneGroup group);
 }

src/main/java/emu/grasscutter/game/dungeons/challenge/factory/KillAndGuardChallengeFactoryHandler.java

@@ -1,18 +1,17 @@
 package emu.grasscutter.game.dungeons.challenge.factory;
 
+import static emu.grasscutter.game.dungeons.challenge.enums.ChallengeType.CHALLENGE_KILL_COUNT_GUARD_HP;
+
 import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
 import emu.grasscutter.game.dungeons.challenge.enums.ChallengeType;
 import emu.grasscutter.game.dungeons.challenge.trigger.GuardTrigger;
 import emu.grasscutter.game.dungeons.challenge.trigger.KillMonsterCountTrigger;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.scripts.data.SceneGroup;
+import java.util.List;
 import lombok.val;
 
-import java.util.List;
-
-import static emu.grasscutter.game.dungeons.challenge.enums.ChallengeType.CHALLENGE_KILL_COUNT_GUARD_HP;
-
-public class KillAndGuardChallengeFactoryHandler implements ChallengeFactoryHandler{
+public class KillAndGuardChallengeFactoryHandler implements ChallengeFactoryHandler {
     @Override
     public boolean isThisType(ChallengeType challengeType) {
         // ActiveChallenge with 1,188,234101003,12,3030,0
@@ -20,15 +19,24 @@ public class KillAndGuardChallengeFactoryHandler implements ChallengeFactoryHand
     }
 
     @Override /*TODO check param4 == monstesToKill*/
-    public WorldChallenge build(int challengeIndex, int challengeId, int groupId, int monstersToKill, int gadgetCFGId, int unused, Scene scene, SceneGroup group) {
+    public WorldChallenge build(
+            int challengeIndex,
+            int challengeId,
+            int groupId,
+            int monstersToKill,
+            int gadgetCFGId,
+            int unused,
+            Scene scene,
+            SceneGroup group) {
         val realGroup = scene.getScriptManager().getGroupById(groupId);
         return new WorldChallenge(
-                scene, realGroup,
+                scene,
+                realGroup,
                 challengeId, // Id
                 challengeIndex, // Index
                 List.of(monstersToKill, 0),
                 0, // Limit
-            monstersToKill,  // Goal
+                monstersToKill, // Goal
                 List.of(new KillMonsterCountTrigger(), new GuardTrigger(gadgetCFGId)));
     }
 }

src/main/java/emu/grasscutter/game/dungeons/challenge/factory/KillMonsterCountChallengeFactoryHandler.java

@@ -5,11 +5,10 @@ import emu.grasscutter.game.dungeons.challenge.enums.ChallengeType;
 import emu.grasscutter.game.dungeons.challenge.trigger.KillMonsterCountTrigger;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.scripts.data.SceneGroup;
+import java.util.List;
 import lombok.val;
 
-import java.util.List;
-
-public class KillMonsterCountChallengeFactoryHandler implements ChallengeFactoryHandler{
+public class KillMonsterCountChallengeFactoryHandler implements ChallengeFactoryHandler {
     @Override
     public boolean isThisType(ChallengeType challengeType) {
         // ActiveChallenge with 1, 1, 241033003, 15, 0, 0
@@ -17,16 +16,24 @@ public class KillMonsterCountChallengeFactoryHandler implements ChallengeFactory
     }
 
     @Override
-    public WorldChallenge build(int challengeIndex, int challengeId, int groupId, int goal, int param5, int param6, Scene scene, SceneGroup group) {
+    public WorldChallenge build(
+            int challengeIndex,
+            int challengeId,
+            int groupId,
+            int goal,
+            int param5,
+            int param6,
+            Scene scene,
+            SceneGroup group) {
         val realGroup = scene.getScriptManager().getGroupById(groupId);
         return new WorldChallenge(
-                scene, realGroup,
+                scene,
+                realGroup,
                 challengeId, // Id
                 challengeIndex, // Index
                 List.of(goal, groupId),
                 0, // Limit
-                goal,  // Goal
-                List.of(new KillMonsterCountTrigger())
-                );
+                goal, // Goal
+                List.of(new KillMonsterCountTrigger()));
     }
 }

src/main/java/emu/grasscutter/game/dungeons/challenge/factory/KillMonsterInTimeChallengeFactoryHandler.java

@@ -1,33 +1,40 @@
-package emu.grasscutter.game.dungeons.challenge.factory;
-
-import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
-import emu.grasscutter.game.dungeons.challenge.enums.ChallengeType;
-import emu.grasscutter.game.dungeons.challenge.trigger.InTimeTrigger;
-import emu.grasscutter.game.dungeons.challenge.trigger.KillMonsterTrigger;
-import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.scripts.data.SceneGroup;
-import lombok.val;
-
-import java.util.List;
-
-public class KillMonsterInTimeChallengeFactoryHandler implements ChallengeFactoryHandler{
-    @Override
-    public boolean isThisType(ChallengeType challengeType) {
-        // ActiveChallenge with 180, 72, 240, 133220161, 133220161, 0
-        return challengeType == ChallengeType.CHALLENGE_KILL_MONSTER_IN_TIME;
-    }
-
-    @Override
-    public WorldChallenge build(int challengeIndex, int challengeId, int timeLimit, int groupId, int targetCfgId, int param6, Scene scene, SceneGroup group) {
-        val realGroup = scene.getScriptManager().getGroupById(groupId);
-        return new WorldChallenge(
-            scene, realGroup,
-            challengeId, // Id
-            challengeIndex, // Index
-            List.of(timeLimit),
-            timeLimit, // Limit
-            0,  // Goal
-            List.of(new KillMonsterTrigger(targetCfgId), new InTimeTrigger())
-        );
-    }
-}
+package emu.grasscutter.game.dungeons.challenge.factory;
+
+import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
+import emu.grasscutter.game.dungeons.challenge.enums.ChallengeType;
+import emu.grasscutter.game.dungeons.challenge.trigger.InTimeTrigger;
+import emu.grasscutter.game.dungeons.challenge.trigger.KillMonsterTrigger;
+import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.scripts.data.SceneGroup;
+import java.util.List;
+import lombok.val;
+
+public class KillMonsterInTimeChallengeFactoryHandler implements ChallengeFactoryHandler {
+    @Override
+    public boolean isThisType(ChallengeType challengeType) {
+        // ActiveChallenge with 180, 72, 240, 133220161, 133220161, 0
+        return challengeType == ChallengeType.CHALLENGE_KILL_MONSTER_IN_TIME;
+    }
+
+    @Override
+    public WorldChallenge build(
+            int challengeIndex,
+            int challengeId,
+            int timeLimit,
+            int groupId,
+            int targetCfgId,
+            int param6,
+            Scene scene,
+            SceneGroup group) {
+        val realGroup = scene.getScriptManager().getGroupById(groupId);
+        return new WorldChallenge(
+                scene,
+                realGroup,
+                challengeId, // Id
+                challengeIndex, // Index
+                List.of(timeLimit),
+                timeLimit, // Limit
+                0, // Goal
+                List.of(new KillMonsterTrigger(targetCfgId), new InTimeTrigger()));
+    }
+}

src/main/java/emu/grasscutter/game/dungeons/challenge/factory/KillMonsterTimeChallengeFactoryHandler.java

@@ -6,30 +6,37 @@ import emu.grasscutter.game.dungeons.challenge.trigger.InTimeTrigger;
 import emu.grasscutter.game.dungeons.challenge.trigger.KillMonsterCountTrigger;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.scripts.data.SceneGroup;
+import java.util.List;
 import lombok.val;
 
-import java.util.List;
-
-public class KillMonsterTimeChallengeFactoryHandler implements ChallengeFactoryHandler{
+public class KillMonsterTimeChallengeFactoryHandler implements ChallengeFactoryHandler {
     @Override
     public boolean isThisType(ChallengeType challengeType) {
         // ActiveChallenge with 180,180,45,133108061,1,0
         // ActiveChallenge Fast with 1001, 5, 15, 240004005, 10, 0
-        return challengeType == ChallengeType.CHALLENGE_KILL_COUNT_IN_TIME ||
-            challengeType == ChallengeType.CHALLENGE_KILL_COUNT_FAST;
+        return challengeType == ChallengeType.CHALLENGE_KILL_COUNT_IN_TIME
+                || challengeType == ChallengeType.CHALLENGE_KILL_COUNT_FAST;
     }
 
     @Override
-    public WorldChallenge build(int challengeIndex, int challengeId, int timeLimit, int groupId, int targetCount, int param6, Scene scene, SceneGroup group) {
+    public WorldChallenge build(
+            int challengeIndex,
+            int challengeId,
+            int timeLimit,
+            int groupId,
+            int targetCount,
+            int param6,
+            Scene scene,
+            SceneGroup group) {
         val realGroup = scene.getScriptManager().getGroupById(groupId);
         return new WorldChallenge(
-                scene, realGroup,
+                scene,
+                realGroup,
                 challengeId, // Id
                 challengeIndex, // Index
                 List.of(targetCount, timeLimit),
                 timeLimit, // Limit
-                targetCount,  // Goal
-                List.of(new KillMonsterCountTrigger(), new InTimeTrigger())
-                );
+                targetCount, // Goal
+                List.of(new KillMonsterCountTrigger(), new InTimeTrigger()));
     }
 }

src/main/java/emu/grasscutter/game/dungeons/challenge/factory/SurviveChallengeFactoryHandler.java

@@ -1,15 +1,14 @@
 package emu.grasscutter.game.dungeons.challenge.factory;
 
+import static emu.grasscutter.game.dungeons.challenge.enums.ChallengeType.CHALLENGE_SURVIVE;
+
 import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
 import emu.grasscutter.game.dungeons.challenge.enums.ChallengeType;
 import emu.grasscutter.game.dungeons.challenge.trigger.ForTimeTrigger;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.scripts.data.SceneGroup;
-
 import java.util.List;
 
-import static emu.grasscutter.game.dungeons.challenge.enums.ChallengeType.CHALLENGE_SURVIVE;
-
 public class SurviveChallengeFactoryHandler implements ChallengeFactoryHandler {
     @Override
     public boolean isThisType(ChallengeType challengeType) {
@@ -19,15 +18,23 @@ public class SurviveChallengeFactoryHandler implements ChallengeFactoryHandler {
     }
 
     @Override
-    public WorldChallenge build(int challengeIndex, int challengeId, int timeToSurvive, int unused4, int unused5, int unused6, Scene scene, SceneGroup group) {
+    public WorldChallenge build(
+            int challengeIndex,
+            int challengeId,
+            int timeToSurvive,
+            int unused4,
+            int unused5,
+            int unused6,
+            Scene scene,
+            SceneGroup group) {
         return new WorldChallenge(
-            scene, group,
-            challengeId, // Id
-            challengeIndex, // Index
-            List.of(timeToSurvive),
-            timeToSurvive, // Limit
-            0,  // Goal
-            List.of(new ForTimeTrigger())
-        );
+                scene,
+                group,
+                challengeId, // Id
+                challengeIndex, // Index
+                List.of(timeToSurvive),
+                timeToSurvive, // Limit
+                0, // Goal
+                List.of(new ForTimeTrigger()));
     }
 }

src/main/java/emu/grasscutter/game/dungeons/challenge/factory/TriggerInTimeChallengeFactoryHandler.java

@@ -1,16 +1,15 @@
 package emu.grasscutter.game.dungeons.challenge.factory;
 
+import static emu.grasscutter.game.dungeons.challenge.enums.ChallengeType.CHALLENGE_TRIGGER_IN_TIME;
+
 import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
 import emu.grasscutter.game.dungeons.challenge.enums.ChallengeType;
 import emu.grasscutter.game.dungeons.challenge.trigger.InTimeTrigger;
 import emu.grasscutter.game.dungeons.challenge.trigger.TriggerGroupTriggerTrigger;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.scripts.data.SceneGroup;
-
 import java.util.List;
 
-import static emu.grasscutter.game.dungeons.challenge.enums.ChallengeType.CHALLENGE_TRIGGER_IN_TIME;
-
 public class TriggerInTimeChallengeFactoryHandler implements ChallengeFactoryHandler {
     @Override
     public boolean isThisType(ChallengeType challengeType) {
@@ -22,15 +21,23 @@ public class TriggerInTimeChallengeFactoryHandler implements ChallengeFactoryHan
     }
 
     @Override
-    public WorldChallenge build(int challengeIndex, int challengeId, int timeLimit, int param4, int triggerTag, int triggerCount, Scene scene, SceneGroup group) {
+    public WorldChallenge build(
+            int challengeIndex,
+            int challengeId,
+            int timeLimit,
+            int param4,
+            int triggerTag,
+            int triggerCount,
+            Scene scene,
+            SceneGroup group) {
         return new WorldChallenge(
-                scene, group,
+                scene,
+                group,
                 challengeId, // Id
                 challengeIndex, // Index
                 List.of(timeLimit, triggerCount),
                 timeLimit, // Limit
-                triggerCount,  // Goal
-                List.of(new InTimeTrigger(), new TriggerGroupTriggerTrigger(Integer.toString(triggerTag)))
-                );
+                triggerCount, // Goal
+                List.of(new InTimeTrigger(), new TriggerGroupTriggerTrigger(Integer.toString(triggerTag))));
     }
 }

src/main/java/emu/grasscutter/game/dungeons/challenge/trigger/ChallengeTrigger.java

@@ -1,16 +1,22 @@
-package emu.grasscutter.game.dungeons.challenge.trigger;
-
-import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
-import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.game.entity.EntityMonster;
-import emu.grasscutter.scripts.data.SceneTrigger;
-
-public abstract class ChallengeTrigger {
-    public void onBegin(WorldChallenge challenge) { }
-    public void onFinish(WorldChallenge challenge) { }
-    public void onMonsterDeath(WorldChallenge challenge, EntityMonster monster) { }
-    public void onGadgetDeath(WorldChallenge challenge, EntityGadget gadget) { }
-    public void onCheckTimeout(WorldChallenge challenge) { }
-    public void onGadgetDamage(WorldChallenge challenge, EntityGadget gadget) { }
-    public void onGroupTrigger(WorldChallenge challenge, SceneTrigger trigger) { }
-}
+package emu.grasscutter.game.dungeons.challenge.trigger;
+
+import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
+import emu.grasscutter.game.entity.EntityGadget;
+import emu.grasscutter.game.entity.EntityMonster;
+import emu.grasscutter.scripts.data.SceneTrigger;
+
+public abstract class ChallengeTrigger {
+    public void onBegin(WorldChallenge challenge) {}
+
+    public void onFinish(WorldChallenge challenge) {}
+
+    public void onMonsterDeath(WorldChallenge challenge, EntityMonster monster) {}
+
+    public void onGadgetDeath(WorldChallenge challenge, EntityGadget gadget) {}
+
+    public void onCheckTimeout(WorldChallenge challenge) {}
+
+    public void onGadgetDamage(WorldChallenge challenge, EntityGadget gadget) {}
+
+    public void onGroupTrigger(WorldChallenge challenge, SceneTrigger trigger) {}
+}

src/main/java/emu/grasscutter/game/dungeons/challenge/trigger/GuardTrigger.java

@@ -1,38 +1,38 @@
-package emu.grasscutter.game.dungeons.challenge.trigger;
-
-import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
-import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.game.entity.EntityMonster;
-import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.server.packet.send.PacketChallengeDataNotify;
-
-public class GuardTrigger extends ChallengeTrigger {
-    private final int entityToProtectCFGId;
-    private int lastSendPercent = 100;
-    public GuardTrigger(int entityToProtectCFGId){
-        this.entityToProtectCFGId = entityToProtectCFGId;
-    }
-
-    public void onBegin(WorldChallenge challenge) {
-        challenge.getScene().broadcastPacket(new PacketChallengeDataNotify(challenge, 2, 100));
-    }
-
-    @Override
-    public void onGadgetDamage(WorldChallenge challenge, EntityGadget gadget) {
-        if(gadget.getConfigId() != entityToProtectCFGId){
-            return;
-        }
-        var curHp = gadget.getFightProperties().get(FightProperty.FIGHT_PROP_CUR_HP.getId());
-        var maxHp = gadget.getFightProperties().get(FightProperty.FIGHT_PROP_BASE_HP.getId());
-        int percent = (int) (curHp / maxHp);
-
-        if(percent!=lastSendPercent) {
-            challenge.getScene().broadcastPacket(new PacketChallengeDataNotify(challenge, 2, percent));
-            lastSendPercent = percent;
-        }
-
-        if(percent <= 0){
-            challenge.fail();
-        }
-    }
-}
+package emu.grasscutter.game.dungeons.challenge.trigger;
+
+import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
+import emu.grasscutter.game.entity.EntityGadget;
+import emu.grasscutter.game.props.FightProperty;
+import emu.grasscutter.server.packet.send.PacketChallengeDataNotify;
+
+public class GuardTrigger extends ChallengeTrigger {
+    private final int entityToProtectCFGId;
+    private int lastSendPercent = 100;
+
+    public GuardTrigger(int entityToProtectCFGId) {
+        this.entityToProtectCFGId = entityToProtectCFGId;
+    }
+
+    public void onBegin(WorldChallenge challenge) {
+        challenge.getScene().broadcastPacket(new PacketChallengeDataNotify(challenge, 2, 100));
+    }
+
+    @Override
+    public void onGadgetDamage(WorldChallenge challenge, EntityGadget gadget) {
+        if (gadget.getConfigId() != entityToProtectCFGId) {
+            return;
+        }
+        var curHp = gadget.getFightProperties().get(FightProperty.FIGHT_PROP_CUR_HP.getId());
+        var maxHp = gadget.getFightProperties().get(FightProperty.FIGHT_PROP_BASE_HP.getId());
+        int percent = (int) (curHp / maxHp);
+
+        if (percent != lastSendPercent) {
+            challenge.getScene().broadcastPacket(new PacketChallengeDataNotify(challenge, 2, percent));
+            lastSendPercent = percent;
+        }
+
+        if (percent <= 0) {
+            challenge.fail();
+        }
+    }
+}

src/main/java/emu/grasscutter/game/dungeons/challenge/trigger/KillMonsterTrigger.java

@@ -1,22 +1,25 @@
-package emu.grasscutter.game.dungeons.challenge.trigger;
-
-import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
-import emu.grasscutter.game.entity.EntityMonster;
-import emu.grasscutter.server.packet.send.PacketChallengeDataNotify;
-import lombok.AllArgsConstructor;
-
-@AllArgsConstructor
-public class KillMonsterTrigger extends ChallengeTrigger{
-    private int monsterCfgId;
-    @Override
-    public void onBegin(WorldChallenge challenge) {
-        challenge.getScene().broadcastPacket(new PacketChallengeDataNotify(challenge, 1, challenge.getScore().get()));
-    }
-
-    @Override
-    public void onMonsterDeath(WorldChallenge challenge, EntityMonster monster) {
-        if(monster.getConfigId() == monsterCfgId){
-            challenge.done();
-        }
-    }
-}
+package emu.grasscutter.game.dungeons.challenge.trigger;
+
+import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
+import emu.grasscutter.game.entity.EntityMonster;
+import emu.grasscutter.server.packet.send.PacketChallengeDataNotify;
+import lombok.AllArgsConstructor;
+
+@AllArgsConstructor
+public class KillMonsterTrigger extends ChallengeTrigger {
+    private int monsterCfgId;
+
+    @Override
+    public void onBegin(WorldChallenge challenge) {
+        challenge
+                .getScene()
+                .broadcastPacket(new PacketChallengeDataNotify(challenge, 1, challenge.getScore().get()));
+    }
+
+    @Override
+    public void onMonsterDeath(WorldChallenge challenge, EntityMonster monster) {
+        if (monster.getConfigId() == monsterCfgId) {
+            challenge.done();
+        }
+    }
+}

src/main/java/emu/grasscutter/game/entity/EntityAvatar.java

@@ -1,370 +1,370 @@
-package emu.grasscutter.game.entity;
-
-import emu.grasscutter.GameConstants;
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.excels.avatar.AvatarData;
-import emu.grasscutter.data.excels.avatar.AvatarSkillDepotData;
-import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.game.inventory.EquipType;
-import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.EntityIdType;
-import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.game.props.PlayerProperty;
-import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock;
-import emu.grasscutter.net.proto.AbilityEmbryoOuterClass.AbilityEmbryo;
-import emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo;
-import emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair;
-import emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason;
-import emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason;
-import emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo;
-import emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData;
-import emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo;
-import emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType;
-import emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason;
-import emu.grasscutter.net.proto.PropPairOuterClass.PropPair;
-import emu.grasscutter.net.proto.ProtEntityTypeOuterClass.ProtEntityType;
-import emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo;
-import emu.grasscutter.net.proto.SceneEntityAiInfoOuterClass.SceneEntityAiInfo;
-import emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
-import emu.grasscutter.net.proto.VectorOuterClass.Vector;
-import emu.grasscutter.server.event.player.PlayerMoveEvent;
-import emu.grasscutter.server.packet.send.PacketAvatarFightPropUpdateNotify;
-import emu.grasscutter.server.packet.send.PacketEntityFightPropChangeReasonNotify;
-import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
-import emu.grasscutter.utils.Position;
-import emu.grasscutter.utils.ProtoHelper;
-import emu.grasscutter.utils.Utils;
-import it.unimi.dsi.fastutil.ints.Int2FloatMap;
-import lombok.Getter;
-import lombok.val;
-
-public class EntityAvatar extends GameEntity {
-    @Getter private final Avatar avatar;
-
-    @Getter private PlayerDieType killedType;
-    @Getter private int killedBy;
-
-    public EntityAvatar(Avatar avatar) {
-        this(null, avatar);
-    }
-
-    public EntityAvatar(Scene scene, Avatar avatar) {
-        super(scene);
-
-        this.avatar = avatar;
-        this.avatar.setCurrentEnergy();
-
-        if (getScene() != null) {
-            this.id = getScene().getWorld().getNextEntityId(EntityIdType.AVATAR);
-
-            var weapon = getAvatar().getWeapon();
-            if (weapon != null) {
-                weapon.setWeaponEntityId(getScene().getWorld().getNextEntityId(EntityIdType.WEAPON));
-            }
-        }
-    }
-
-    @Override
-    public int getEntityTypeId() {
-        return this.getAvatar().getAvatarId();
-    }
-
-    public Player getPlayer() {
-        return this.avatar.getPlayer();
-    }
-
-    @Override
-    public Position getPosition() {
-        return getPlayer().getPosition();
-    }
-
-    @Override
-    public Position getRotation() {
-        return getPlayer().getRotation();
-    }
-
-    @Override
-    public boolean isAlive() {
-        return this.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP) > 0f;
-    }
-
-    @Override
-    public Int2FloatMap getFightProperties() {
-        return getAvatar().getFightProperties();
-    }
-
-    public int getWeaponEntityId() {
-        if (getAvatar().getWeapon() != null) {
-            return getAvatar().getWeapon().getWeaponEntityId();
-        }
-        return 0;
-    }
-
-    @Override
-    public void onDeath(int killerId) {
-        super.onDeath(killerId); // Invoke super class's onDeath() method.
-
-        this.killedType = PlayerDieType.PLAYER_DIE_TYPE_KILL_BY_MONSTER;
-        this.killedBy = killerId;
-        clearEnergy(ChangeEnergyReason.CHANGE_ENERGY_REASON_NONE);
-    }
-
-    public void onDeath(PlayerDieType dieType, int killerId) {
-        super.onDeath(killerId); // Invoke super class's onDeath() method.
-
-        this.killedType = dieType;
-        this.killedBy = killerId;
-        clearEnergy(ChangeEnergyReason.CHANGE_ENERGY_REASON_NONE);
-    }
-
-    @Override
-    public float heal(float amount) {
-        // Do not heal character if they are dead
-        if (!this.isAlive()) {
-            return 0f;
-        }
-
-        float healed = super.heal(amount);
-
-        if (healed > 0f) {
-            getScene()
-                    .broadcastPacket(
-                            new PacketEntityFightPropChangeReasonNotify(
-                                    this,
-                                    FightProperty.FIGHT_PROP_CUR_HP,
-                                    healed,
-                                    PropChangeReason.PROP_CHANGE_REASON_ABILITY,
-                                    ChangeHpReason.CHANGE_HP_REASON_ADD_ABILITY));
-        }
-
-        return healed;
-    }
-
-    public void clearEnergy(ChangeEnergyReason reason) {
-        // Fight props.
-        val curEnergyProp = this.getAvatar().getSkillDepot().getElementType().getCurEnergyProp();
-        float curEnergy = this.getFightProperty(curEnergyProp);
-
-        // Set energy to zero.
-        this.avatar.setCurrentEnergy(curEnergyProp, 0);
-
-        // Send packets.
-        this.getScene().broadcastPacket(new PacketEntityFightPropUpdateNotify(this, curEnergyProp));
-
-        if (reason == ChangeEnergyReason.CHANGE_ENERGY_REASON_SKILL_START) {
-            this.getScene()
-                    .broadcastPacket(
-                            new PacketEntityFightPropChangeReasonNotify(this, curEnergyProp, -curEnergy, reason));
-        }
-    }
-
-    /**
-     * Adds a fixed amount of energy to the current avatar.
-     *
-     * @param amount The amount of energy to add.
-     * @return True if the energy was added, false if the energy was not added.
-     */
-    public boolean addEnergy(float amount) {
-        var curEnergyProp = this.getAvatar().getSkillDepot().getElementType().getCurEnergyProp();
-        var curEnergy = this.getFightProperty(curEnergyProp);
-        if (curEnergy == amount) return false;
-
-        this.getAvatar().setCurrentEnergy(curEnergyProp, amount);
-        this.getScene().broadcastPacket(new PacketEntityFightPropUpdateNotify(this, curEnergyProp));
-        return true;
-    }
-
-    public void addEnergy(float amount, PropChangeReason reason) {
-        this.addEnergy(amount, reason, false);
-    }
-
-    public void addEnergy(float amount, PropChangeReason reason, boolean isFlat) {
-        // Get current and maximum energy for this avatar.
-        val elementType = this.getAvatar().getSkillDepot().getElementType();
-        val curEnergyProp = elementType.getCurEnergyProp();
-        val maxEnergyProp = elementType.getMaxEnergyProp();
-
-        float curEnergy = this.getFightProperty(curEnergyProp);
-        float maxEnergy = this.getFightProperty(maxEnergyProp);
-
-        // Scale amount by energy recharge, if the amount is not flat.
-        if (!isFlat) {
-            amount *= this.getFightProperty(FightProperty.FIGHT_PROP_CHARGE_EFFICIENCY);
-        }
-
-        // Determine the new energy value.
-        float newEnergy = Math.min(curEnergy + amount, maxEnergy);
-
-        // Set energy and notify.
-        if (newEnergy != curEnergy) {
-            this.avatar.setCurrentEnergy(curEnergyProp, newEnergy);
-
-            this.getScene()
-                    .broadcastPacket(new PacketAvatarFightPropUpdateNotify(this.getAvatar(), curEnergyProp));
-            this.getScene()
-                    .broadcastPacket(
-                            new PacketEntityFightPropChangeReasonNotify(this, curEnergyProp, newEnergy, reason));
-        }
-    }
-
-    public SceneAvatarInfo getSceneAvatarInfo() {
-        val avatar = this.getAvatar();
-        val player = this.getPlayer();
-        SceneAvatarInfo.Builder avatarInfo =
-                SceneAvatarInfo.newBuilder()
-                        .setUid(player.getUid())
-                        .setAvatarId(avatar.getAvatarId())
-                        .setGuid(avatar.getGuid())
-                        .setPeerId(player.getPeerId())
-                        .addAllTalentIdList(avatar.getTalentIdList())
-                        .setCoreProudSkillLevel(avatar.getCoreProudSkillLevel())
-                        .putAllSkillLevelMap(avatar.getSkillLevelMap())
-                        .setSkillDepotId(avatar.getSkillDepotId())
-                        .addAllInherentProudSkillList(avatar.getProudSkillList())
-                        .putAllProudSkillExtraLevelMap(avatar.getProudSkillBonusMap())
-                        .addAllTeamResonanceList(player.getTeamManager().getTeamResonances())
-                        .setWearingFlycloakId(avatar.getFlyCloak())
-                        .setCostumeId(avatar.getCostume())
-                        .setBornTime(avatar.getBornTime());
-
-        for (GameItem item : avatar.getEquips().values()) {
-            if (item.getItemData().getEquipType() == EquipType.EQUIP_WEAPON) {
-                avatarInfo.setWeapon(item.createSceneWeaponInfo());
-            } else {
-                avatarInfo.addReliquaryList(item.createSceneReliquaryInfo());
-            }
-            avatarInfo.addEquipIdList(item.getItemId());
-        }
-
-        return avatarInfo.build();
-    }
-
-    @Override
-    public SceneEntityInfo toProto() {
-        EntityAuthorityInfo authority =
-                EntityAuthorityInfo.newBuilder()
-                        .setAbilityInfo(AbilitySyncStateInfo.newBuilder())
-                        .setRendererChangedInfo(EntityRendererChangedInfo.newBuilder())
-                        .setAiInfo(
-                                SceneEntityAiInfo.newBuilder().setIsAiOpen(true).setBornPos(Vector.newBuilder()))
-                        .setBornPos(Vector.newBuilder())
-                        .build();
-
-        SceneEntityInfo.Builder entityInfo =
-                SceneEntityInfo.newBuilder()
-                        .setEntityId(getId())
-                        .setEntityType(ProtEntityType.PROT_ENTITY_TYPE_AVATAR)
-                        .addAnimatorParaList(AnimatorParameterValueInfoPair.newBuilder())
-                        .setEntityClientData(EntityClientData.newBuilder())
-                        .setEntityAuthorityInfo(authority)
-                        .setLastMoveSceneTimeMs(this.getLastMoveSceneTimeMs())
-                        .setLastMoveReliableSeq(this.getLastMoveReliableSeq())
-                        .setLifeState(this.getLifeState().getValue());
-
-        if (this.getScene() != null) {
-            entityInfo.setMotionInfo(this.getMotionInfo());
-        }
-
-        this.addAllFightPropsToEntityInfo(entityInfo);
-
-        PropPair pair =
-                PropPair.newBuilder()
-                        .setType(PlayerProperty.PROP_LEVEL.getId())
-                        .setPropValue(
-                                ProtoHelper.newPropValue(PlayerProperty.PROP_LEVEL, getAvatar().getLevel()))
-                        .build();
-        entityInfo.addPropList(pair);
-
-        entityInfo.setAvatar(this.getSceneAvatarInfo());
-
-        return entityInfo.build();
-    }
-
-    public AbilityControlBlock getAbilityControlBlock() {
-        AvatarData data = this.getAvatar().getAvatarData();
-        AbilityControlBlock.Builder abilityControlBlock = AbilityControlBlock.newBuilder();
-        int embryoId = 0;
-
-        // Add avatar abilities
-        if (data.getAbilities() != null) {
-            for (int id : data.getAbilities()) {
-                AbilityEmbryo emb =
-                        AbilityEmbryo.newBuilder()
-                                .setAbilityId(++embryoId)
-                                .setAbilityNameHash(id)
-                                .setAbilityOverrideNameHash(GameConstants.DEFAULT_ABILITY_NAME)
-                                .build();
-                abilityControlBlock.addAbilityEmbryoList(emb);
-            }
-        }
-        // Add default abilities
-        for (int id : GameConstants.DEFAULT_ABILITY_HASHES) {
-            AbilityEmbryo emb =
-                    AbilityEmbryo.newBuilder()
-                            .setAbilityId(++embryoId)
-                            .setAbilityNameHash(id)
-                            .setAbilityOverrideNameHash(GameConstants.DEFAULT_ABILITY_NAME)
-                            .build();
-            abilityControlBlock.addAbilityEmbryoList(emb);
-        }
-        // Add team resonances
-        for (int id : this.getPlayer().getTeamManager().getTeamResonancesConfig()) {
-            AbilityEmbryo emb =
-                    AbilityEmbryo.newBuilder()
-                            .setAbilityId(++embryoId)
-                            .setAbilityNameHash(id)
-                            .setAbilityOverrideNameHash(GameConstants.DEFAULT_ABILITY_NAME)
-                            .build();
-            abilityControlBlock.addAbilityEmbryoList(emb);
-        }
-        // Add skill depot abilities
-        AvatarSkillDepotData skillDepot =
-                GameData.getAvatarSkillDepotDataMap().get(this.getAvatar().getSkillDepotId());
-        if (skillDepot != null && skillDepot.getAbilities() != null) {
-            for (int id : skillDepot.getAbilities()) {
-                AbilityEmbryo emb =
-                        AbilityEmbryo.newBuilder()
-                                .setAbilityId(++embryoId)
-                                .setAbilityNameHash(id)
-                                .setAbilityOverrideNameHash(GameConstants.DEFAULT_ABILITY_NAME)
-                                .build();
-                abilityControlBlock.addAbilityEmbryoList(emb);
-            }
-        }
-        // Add equip abilities
-        if (this.getAvatar().getExtraAbilityEmbryos().size() > 0) {
-            for (String skill : this.getAvatar().getExtraAbilityEmbryos()) {
-                AbilityEmbryo emb =
-                        AbilityEmbryo.newBuilder()
-                                .setAbilityId(++embryoId)
-                                .setAbilityNameHash(Utils.abilityHash(skill))
-                                .setAbilityOverrideNameHash(GameConstants.DEFAULT_ABILITY_NAME)
-                                .build();
-                abilityControlBlock.addAbilityEmbryoList(emb);
-            }
-        }
-
-        //
-        return abilityControlBlock.build();
-    }
-
-    /**
-     * Move this entity to a new position. Additionally invoke player move event.
-     *
-     * @param newPosition The new position.
-     * @param rotation The new rotation.
-     */
-    @Override
-    public void move(Position newPosition, Position rotation) {
-        // Invoke player move event.
-        PlayerMoveEvent event =
-                new PlayerMoveEvent(
-                        this.getPlayer(), PlayerMoveEvent.MoveType.PLAYER, this.getPosition(), newPosition);
-        event.call();
-
-        // Set position and rotation.
-        super.move(event.getDestination(), rotation);
-    }
-}
+package emu.grasscutter.game.entity;
+
+import emu.grasscutter.GameConstants;
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.excels.avatar.AvatarData;
+import emu.grasscutter.data.excels.avatar.AvatarSkillDepotData;
+import emu.grasscutter.game.avatar.Avatar;
+import emu.grasscutter.game.inventory.EquipType;
+import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.EntityIdType;
+import emu.grasscutter.game.props.FightProperty;
+import emu.grasscutter.game.props.PlayerProperty;
+import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock;
+import emu.grasscutter.net.proto.AbilityEmbryoOuterClass.AbilityEmbryo;
+import emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo;
+import emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair;
+import emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason;
+import emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason;
+import emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo;
+import emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData;
+import emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo;
+import emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType;
+import emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason;
+import emu.grasscutter.net.proto.PropPairOuterClass.PropPair;
+import emu.grasscutter.net.proto.ProtEntityTypeOuterClass.ProtEntityType;
+import emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo;
+import emu.grasscutter.net.proto.SceneEntityAiInfoOuterClass.SceneEntityAiInfo;
+import emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
+import emu.grasscutter.net.proto.VectorOuterClass.Vector;
+import emu.grasscutter.server.event.player.PlayerMoveEvent;
+import emu.grasscutter.server.packet.send.PacketAvatarFightPropUpdateNotify;
+import emu.grasscutter.server.packet.send.PacketEntityFightPropChangeReasonNotify;
+import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
+import emu.grasscutter.utils.Position;
+import emu.grasscutter.utils.ProtoHelper;
+import emu.grasscutter.utils.Utils;
+import it.unimi.dsi.fastutil.ints.Int2FloatMap;
+import lombok.Getter;
+import lombok.val;
+
+public class EntityAvatar extends GameEntity {
+    @Getter private final Avatar avatar;
+
+    @Getter private PlayerDieType killedType;
+    @Getter private int killedBy;
+
+    public EntityAvatar(Avatar avatar) {
+        this(null, avatar);
+    }
+
+    public EntityAvatar(Scene scene, Avatar avatar) {
+        super(scene);
+
+        this.avatar = avatar;
+        this.avatar.setCurrentEnergy();
+
+        if (getScene() != null) {
+            this.id = getScene().getWorld().getNextEntityId(EntityIdType.AVATAR);
+
+            var weapon = getAvatar().getWeapon();
+            if (weapon != null) {
+                weapon.setWeaponEntityId(getScene().getWorld().getNextEntityId(EntityIdType.WEAPON));
+            }
+        }
+    }
+
+    @Override
+    public int getEntityTypeId() {
+        return this.getAvatar().getAvatarId();
+    }
+
+    public Player getPlayer() {
+        return this.avatar.getPlayer();
+    }
+
+    @Override
+    public Position getPosition() {
+        return getPlayer().getPosition();
+    }
+
+    @Override
+    public Position getRotation() {
+        return getPlayer().getRotation();
+    }
+
+    @Override
+    public boolean isAlive() {
+        return this.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP) > 0f;
+    }
+
+    @Override
+    public Int2FloatMap getFightProperties() {
+        return getAvatar().getFightProperties();
+    }
+
+    public int getWeaponEntityId() {
+        if (getAvatar().getWeapon() != null) {
+            return getAvatar().getWeapon().getWeaponEntityId();
+        }
+        return 0;
+    }
+
+    @Override
+    public void onDeath(int killerId) {
+        super.onDeath(killerId); // Invoke super class's onDeath() method.
+
+        this.killedType = PlayerDieType.PLAYER_DIE_TYPE_KILL_BY_MONSTER;
+        this.killedBy = killerId;
+        clearEnergy(ChangeEnergyReason.CHANGE_ENERGY_REASON_NONE);
+    }
+
+    public void onDeath(PlayerDieType dieType, int killerId) {
+        super.onDeath(killerId); // Invoke super class's onDeath() method.
+
+        this.killedType = dieType;
+        this.killedBy = killerId;
+        clearEnergy(ChangeEnergyReason.CHANGE_ENERGY_REASON_NONE);
+    }
+
+    @Override
+    public float heal(float amount) {
+        // Do not heal character if they are dead
+        if (!this.isAlive()) {
+            return 0f;
+        }
+
+        float healed = super.heal(amount);
+
+        if (healed > 0f) {
+            getScene()
+                    .broadcastPacket(
+                            new PacketEntityFightPropChangeReasonNotify(
+                                    this,
+                                    FightProperty.FIGHT_PROP_CUR_HP,
+                                    healed,
+                                    PropChangeReason.PROP_CHANGE_REASON_ABILITY,
+                                    ChangeHpReason.CHANGE_HP_REASON_ADD_ABILITY));
+        }
+
+        return healed;
+    }
+
+    public void clearEnergy(ChangeEnergyReason reason) {
+        // Fight props.
+        val curEnergyProp = this.getAvatar().getSkillDepot().getElementType().getCurEnergyProp();
+        float curEnergy = this.getFightProperty(curEnergyProp);
+
+        // Set energy to zero.
+        this.avatar.setCurrentEnergy(curEnergyProp, 0);
+
+        // Send packets.
+        this.getScene().broadcastPacket(new PacketEntityFightPropUpdateNotify(this, curEnergyProp));
+
+        if (reason == ChangeEnergyReason.CHANGE_ENERGY_REASON_SKILL_START) {
+            this.getScene()
+                    .broadcastPacket(
+                            new PacketEntityFightPropChangeReasonNotify(this, curEnergyProp, -curEnergy, reason));
+        }
+    }
+
+    /**
+     * Adds a fixed amount of energy to the current avatar.
+     *
+     * @param amount The amount of energy to add.
+     * @return True if the energy was added, false if the energy was not added.
+     */
+    public boolean addEnergy(float amount) {
+        var curEnergyProp = this.getAvatar().getSkillDepot().getElementType().getCurEnergyProp();
+        var curEnergy = this.getFightProperty(curEnergyProp);
+        if (curEnergy == amount) return false;
+
+        this.getAvatar().setCurrentEnergy(curEnergyProp, amount);
+        this.getScene().broadcastPacket(new PacketEntityFightPropUpdateNotify(this, curEnergyProp));
+        return true;
+    }
+
+    public void addEnergy(float amount, PropChangeReason reason) {
+        this.addEnergy(amount, reason, false);
+    }
+
+    public void addEnergy(float amount, PropChangeReason reason, boolean isFlat) {
+        // Get current and maximum energy for this avatar.
+        val elementType = this.getAvatar().getSkillDepot().getElementType();
+        val curEnergyProp = elementType.getCurEnergyProp();
+        val maxEnergyProp = elementType.getMaxEnergyProp();
+
+        float curEnergy = this.getFightProperty(curEnergyProp);
+        float maxEnergy = this.getFightProperty(maxEnergyProp);
+
+        // Scale amount by energy recharge, if the amount is not flat.
+        if (!isFlat) {
+            amount *= this.getFightProperty(FightProperty.FIGHT_PROP_CHARGE_EFFICIENCY);
+        }
+
+        // Determine the new energy value.
+        float newEnergy = Math.min(curEnergy + amount, maxEnergy);
+
+        // Set energy and notify.
+        if (newEnergy != curEnergy) {
+            this.avatar.setCurrentEnergy(curEnergyProp, newEnergy);
+
+            this.getScene()
+                    .broadcastPacket(new PacketAvatarFightPropUpdateNotify(this.getAvatar(), curEnergyProp));
+            this.getScene()
+                    .broadcastPacket(
+                            new PacketEntityFightPropChangeReasonNotify(this, curEnergyProp, newEnergy, reason));
+        }
+    }
+
+    public SceneAvatarInfo getSceneAvatarInfo() {
+        val avatar = this.getAvatar();
+        val player = this.getPlayer();
+        SceneAvatarInfo.Builder avatarInfo =
+                SceneAvatarInfo.newBuilder()
+                        .setUid(player.getUid())
+                        .setAvatarId(avatar.getAvatarId())
+                        .setGuid(avatar.getGuid())
+                        .setPeerId(player.getPeerId())
+                        .addAllTalentIdList(avatar.getTalentIdList())
+                        .setCoreProudSkillLevel(avatar.getCoreProudSkillLevel())
+                        .putAllSkillLevelMap(avatar.getSkillLevelMap())
+                        .setSkillDepotId(avatar.getSkillDepotId())
+                        .addAllInherentProudSkillList(avatar.getProudSkillList())
+                        .putAllProudSkillExtraLevelMap(avatar.getProudSkillBonusMap())
+                        .addAllTeamResonanceList(player.getTeamManager().getTeamResonances())
+                        .setWearingFlycloakId(avatar.getFlyCloak())
+                        .setCostumeId(avatar.getCostume())
+                        .setBornTime(avatar.getBornTime());
+
+        for (GameItem item : avatar.getEquips().values()) {
+            if (item.getItemData().getEquipType() == EquipType.EQUIP_WEAPON) {
+                avatarInfo.setWeapon(item.createSceneWeaponInfo());
+            } else {
+                avatarInfo.addReliquaryList(item.createSceneReliquaryInfo());
+            }
+            avatarInfo.addEquipIdList(item.getItemId());
+        }
+
+        return avatarInfo.build();
+    }
+
+    @Override
+    public SceneEntityInfo toProto() {
+        EntityAuthorityInfo authority =
+                EntityAuthorityInfo.newBuilder()
+                        .setAbilityInfo(AbilitySyncStateInfo.newBuilder())
+                        .setRendererChangedInfo(EntityRendererChangedInfo.newBuilder())
+                        .setAiInfo(
+                                SceneEntityAiInfo.newBuilder().setIsAiOpen(true).setBornPos(Vector.newBuilder()))
+                        .setBornPos(Vector.newBuilder())
+                        .build();
+
+        SceneEntityInfo.Builder entityInfo =
+                SceneEntityInfo.newBuilder()
+                        .setEntityId(getId())
+                        .setEntityType(ProtEntityType.PROT_ENTITY_TYPE_AVATAR)
+                        .addAnimatorParaList(AnimatorParameterValueInfoPair.newBuilder())
+                        .setEntityClientData(EntityClientData.newBuilder())
+                        .setEntityAuthorityInfo(authority)
+                        .setLastMoveSceneTimeMs(this.getLastMoveSceneTimeMs())
+                        .setLastMoveReliableSeq(this.getLastMoveReliableSeq())
+                        .setLifeState(this.getLifeState().getValue());
+
+        if (this.getScene() != null) {
+            entityInfo.setMotionInfo(this.getMotionInfo());
+        }
+
+        this.addAllFightPropsToEntityInfo(entityInfo);
+
+        PropPair pair =
+                PropPair.newBuilder()
+                        .setType(PlayerProperty.PROP_LEVEL.getId())
+                        .setPropValue(
+                                ProtoHelper.newPropValue(PlayerProperty.PROP_LEVEL, getAvatar().getLevel()))
+                        .build();
+        entityInfo.addPropList(pair);
+
+        entityInfo.setAvatar(this.getSceneAvatarInfo());
+
+        return entityInfo.build();
+    }
+
+    public AbilityControlBlock getAbilityControlBlock() {
+        AvatarData data = this.getAvatar().getAvatarData();
+        AbilityControlBlock.Builder abilityControlBlock = AbilityControlBlock.newBuilder();
+        int embryoId = 0;
+
+        // Add avatar abilities
+        if (data.getAbilities() != null) {
+            for (int id : data.getAbilities()) {
+                AbilityEmbryo emb =
+                        AbilityEmbryo.newBuilder()
+                                .setAbilityId(++embryoId)
+                                .setAbilityNameHash(id)
+                                .setAbilityOverrideNameHash(GameConstants.DEFAULT_ABILITY_NAME)
+                                .build();
+                abilityControlBlock.addAbilityEmbryoList(emb);
+            }
+        }
+        // Add default abilities
+        for (int id : GameConstants.DEFAULT_ABILITY_HASHES) {
+            AbilityEmbryo emb =
+                    AbilityEmbryo.newBuilder()
+                            .setAbilityId(++embryoId)
+                            .setAbilityNameHash(id)
+                            .setAbilityOverrideNameHash(GameConstants.DEFAULT_ABILITY_NAME)
+                            .build();
+            abilityControlBlock.addAbilityEmbryoList(emb);
+        }
+        // Add team resonances
+        for (int id : this.getPlayer().getTeamManager().getTeamResonancesConfig()) {
+            AbilityEmbryo emb =
+                    AbilityEmbryo.newBuilder()
+                            .setAbilityId(++embryoId)
+                            .setAbilityNameHash(id)
+                            .setAbilityOverrideNameHash(GameConstants.DEFAULT_ABILITY_NAME)
+                            .build();
+            abilityControlBlock.addAbilityEmbryoList(emb);
+        }
+        // Add skill depot abilities
+        AvatarSkillDepotData skillDepot =
+                GameData.getAvatarSkillDepotDataMap().get(this.getAvatar().getSkillDepotId());
+        if (skillDepot != null && skillDepot.getAbilities() != null) {
+            for (int id : skillDepot.getAbilities()) {
+                AbilityEmbryo emb =
+                        AbilityEmbryo.newBuilder()
+                                .setAbilityId(++embryoId)
+                                .setAbilityNameHash(id)
+                                .setAbilityOverrideNameHash(GameConstants.DEFAULT_ABILITY_NAME)
+                                .build();
+                abilityControlBlock.addAbilityEmbryoList(emb);
+            }
+        }
+        // Add equip abilities
+        if (this.getAvatar().getExtraAbilityEmbryos().size() > 0) {
+            for (String skill : this.getAvatar().getExtraAbilityEmbryos()) {
+                AbilityEmbryo emb =
+                        AbilityEmbryo.newBuilder()
+                                .setAbilityId(++embryoId)
+                                .setAbilityNameHash(Utils.abilityHash(skill))
+                                .setAbilityOverrideNameHash(GameConstants.DEFAULT_ABILITY_NAME)
+                                .build();
+                abilityControlBlock.addAbilityEmbryoList(emb);
+            }
+        }
+
+        //
+        return abilityControlBlock.build();
+    }
+
+    /**
+     * Move this entity to a new position. Additionally invoke player move event.
+     *
+     * @param newPosition The new position.
+     * @param rotation The new rotation.
+     */
+    @Override
+    public void move(Position newPosition, Position rotation) {
+        // Invoke player move event.
+        PlayerMoveEvent event =
+                new PlayerMoveEvent(
+                        this.getPlayer(), PlayerMoveEvent.MoveType.PLAYER, this.getPosition(), newPosition);
+        event.call();
+
+        // Set position and rotation.
+        super.move(event.getDestination(), rotation);
+    }
+}

src/main/java/emu/grasscutter/game/entity/EntityBaseGadget.java

@@ -1,63 +1,63 @@
-package emu.grasscutter.game.entity;
-
-import emu.grasscutter.data.binout.config.ConfigEntityGadget;
-import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.utils.Position;
-import lombok.Getter;
-
-public abstract class EntityBaseGadget extends GameEntity {
-    @Getter(onMethod_ = @Override)
-    protected final Position position;
-
-    @Getter(onMethod_ = @Override)
-    protected final Position rotation;
-
-    public EntityBaseGadget(Scene scene) {
-        this(scene, null, null);
-    }
-
-    public EntityBaseGadget(Scene scene, Position position, Position rotation) {
-        super(scene);
-        this.position = position != null ? position.clone() : new Position();
-        this.rotation = rotation != null ? rotation.clone() : new Position();
-    }
-
-    public abstract int getGadgetId();
-
-    @Override
-    public int getEntityTypeId() {
-        return this.getGadgetId();
-    }
-
-    @Override
-    public void onDeath(int killerId) {
-        super.onDeath(killerId); // Invoke super class's onDeath() method.
-    }
-
-    protected void fillFightProps(ConfigEntityGadget configGadget) {
-        if (configGadget == null || configGadget.getCombat() == null) {
-            return;
-        }
-        var combatData = configGadget.getCombat();
-        var combatProperties = combatData.getProperty();
-
-        var targetHp = combatProperties.getHP();
-        setFightProperty(FightProperty.FIGHT_PROP_MAX_HP, targetHp);
-        setFightProperty(FightProperty.FIGHT_PROP_BASE_HP, targetHp);
-        if (combatProperties.isInvincible()) {
-            targetHp = Float.POSITIVE_INFINITY;
-        }
-        setFightProperty(FightProperty.FIGHT_PROP_CUR_HP, targetHp);
-
-        var atk = combatProperties.getAttack();
-        setFightProperty(FightProperty.FIGHT_PROP_BASE_ATTACK, atk);
-        setFightProperty(FightProperty.FIGHT_PROP_CUR_ATTACK, atk);
-
-        var def = combatProperties.getDefence();
-        setFightProperty(FightProperty.FIGHT_PROP_BASE_DEFENSE, def);
-        setFightProperty(FightProperty.FIGHT_PROP_CUR_DEFENSE, def);
-
-        setLockHP(combatProperties.isLockHP());
-    }
-}
+package emu.grasscutter.game.entity;
+
+import emu.grasscutter.data.binout.config.ConfigEntityGadget;
+import emu.grasscutter.game.props.FightProperty;
+import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.utils.Position;
+import lombok.Getter;
+
+public abstract class EntityBaseGadget extends GameEntity {
+    @Getter(onMethod_ = @Override)
+    protected final Position position;
+
+    @Getter(onMethod_ = @Override)
+    protected final Position rotation;
+
+    public EntityBaseGadget(Scene scene) {
+        this(scene, null, null);
+    }
+
+    public EntityBaseGadget(Scene scene, Position position, Position rotation) {
+        super(scene);
+        this.position = position != null ? position.clone() : new Position();
+        this.rotation = rotation != null ? rotation.clone() : new Position();
+    }
+
+    public abstract int getGadgetId();
+
+    @Override
+    public int getEntityTypeId() {
+        return this.getGadgetId();
+    }
+
+    @Override
+    public void onDeath(int killerId) {
+        super.onDeath(killerId); // Invoke super class's onDeath() method.
+    }
+
+    protected void fillFightProps(ConfigEntityGadget configGadget) {
+        if (configGadget == null || configGadget.getCombat() == null) {
+            return;
+        }
+        var combatData = configGadget.getCombat();
+        var combatProperties = combatData.getProperty();
+
+        var targetHp = combatProperties.getHP();
+        setFightProperty(FightProperty.FIGHT_PROP_MAX_HP, targetHp);
+        setFightProperty(FightProperty.FIGHT_PROP_BASE_HP, targetHp);
+        if (combatProperties.isInvincible()) {
+            targetHp = Float.POSITIVE_INFINITY;
+        }
+        setFightProperty(FightProperty.FIGHT_PROP_CUR_HP, targetHp);
+
+        var atk = combatProperties.getAttack();
+        setFightProperty(FightProperty.FIGHT_PROP_BASE_ATTACK, atk);
+        setFightProperty(FightProperty.FIGHT_PROP_CUR_ATTACK, atk);
+
+        var def = combatProperties.getDefence();
+        setFightProperty(FightProperty.FIGHT_PROP_BASE_DEFENSE, def);
+        setFightProperty(FightProperty.FIGHT_PROP_CUR_DEFENSE, def);
+
+        setLockHP(combatProperties.isLockHP());
+    }
+}

src/main/java/emu/grasscutter/game/entity/EntityGadget.java

@@ -1,281 +1,308 @@
-package emu.grasscutter.game.entity;
-
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.binout.config.ConfigEntityGadget;
-import emu.grasscutter.data.excels.GadgetData;
-import emu.grasscutter.game.entity.gadget.*;
-import emu.grasscutter.game.entity.gadget.platform.BaseRoute;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.EntityIdType;
-import emu.grasscutter.game.props.PlayerProperty;
-import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.game.world.SceneGroupInstance;
-import emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo;
-import emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair;
-import emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo;
-import emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData;
-import emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo;
-import emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq;
-import emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo;
-import emu.grasscutter.net.proto.PlatformInfoOuterClass;
-import emu.grasscutter.net.proto.PropPairOuterClass.PropPair;
-import emu.grasscutter.net.proto.ProtEntityTypeOuterClass.ProtEntityType;
-import emu.grasscutter.net.proto.SceneEntityAiInfoOuterClass.SceneEntityAiInfo;
-import emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
-import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo;
-import emu.grasscutter.net.proto.VectorOuterClass.Vector;
-import emu.grasscutter.net.proto.VisionTypeOuterClass;
-import emu.grasscutter.scripts.EntityControllerScriptManager;
-import emu.grasscutter.scripts.constants.EventType;
-import emu.grasscutter.scripts.data.SceneGadget;
-import emu.grasscutter.scripts.data.ScriptArgs;
-import emu.grasscutter.server.packet.send.PacketGadgetStateNotify;
-import emu.grasscutter.server.packet.send.PacketPlatformStartRouteNotify;
-import emu.grasscutter.server.packet.send.PacketPlatformStopRouteNotify;
-import emu.grasscutter.server.packet.send.PacketSceneTimeNotify;
-import emu.grasscutter.utils.Position;
-import emu.grasscutter.utils.ProtoHelper;
-import it.unimi.dsi.fastutil.ints.Int2FloatMap;
-import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.List;
-
-@ToString(callSuper = true)
-public class EntityGadget extends EntityBaseGadget {
-    @Getter private final GadgetData gadgetData;
-    @Getter(onMethod = @__(@Override)) @Setter
-    private int gadgetId;
-    @Getter private final Position bornPos;
-    @Getter private final Position bornRot;
-    @Getter @Setter private GameEntity owner = null;
-    @Getter @Setter private List<GameEntity> children = new ArrayList<>();
-
-    @Getter private int state;
-    @Getter @Setter private int pointType;
-    @Getter private GadgetContent content;
-    @Getter(onMethod = @__(@Override), lazy = true)
-    private final Int2FloatMap fightProperties = new Int2FloatOpenHashMap();
-    @Getter @Setter private SceneGadget metaGadget;
-    @Nullable @Getter
-    private ConfigEntityGadget configGadget;
-    @Getter @Setter private BaseRoute routeConfig;
-
-    @Getter @Setter private int stopValue = 0; //Controller related, inited to zero
-    @Getter @Setter private int startValue = 0; //Controller related, inited to zero
-    @Getter @Setter private int ticksSinceChange;
-
-
-    public EntityGadget(Scene scene, int gadgetId, Position pos) {
-        this(scene, gadgetId, pos, null, null);
-    }
-
-    public EntityGadget(Scene scene, int gadgetId, Position pos, Position rot) {
-        this(scene, gadgetId, pos, rot, null);
-    }
-
-    public EntityGadget(Scene scene, int gadgetId, Position pos, Position rot, GadgetContent content) {
-        super(scene, pos, rot);
-
-        this.gadgetData = GameData.getGadgetDataMap().get(gadgetId);
-        if (gadgetData != null && gadgetData.getJsonName() != null) {
-            this.configGadget = GameData.getGadgetConfigData().get(gadgetData.getJsonName());
-        }
-
-        this.id = this.getScene().getWorld().getNextEntityId(EntityIdType.GADGET);
-        this.gadgetId = gadgetId;
-        this.content = content;
-        this.bornPos = this.getPosition().clone();
-        this.bornRot = this.getRotation().clone();
-        this.fillFightProps(configGadget);
-
-        if(GameData.getGadgetMappingMap().containsKey(gadgetId)) {
-            String controllerName = GameData.getGadgetMappingMap().get(gadgetId).getServerController();
-            this.setEntityController(EntityControllerScriptManager.getGadgetController(controllerName));
-        }
-    }
-
-    public void setState(int state) {
-        this.state = state;
-        //Cache the gadget state
-        if(metaGadget != null && metaGadget.group != null) {
-            var instance = getScene().getScriptManager().getCachedGroupInstanceById(metaGadget.group.id);
-            if(instance != null) instance.cacheGadgetState(metaGadget, state);
-        }
-    }
-
-    public void updateState(int state) {
-        if(state == this.getState()) return; //Don't triggers events
-
-        this.setState(state);
-        ticksSinceChange = getScene().getSceneTimeSeconds();
-        this.getScene().broadcastPacket(new PacketGadgetStateNotify(this, state));
-        getScene().getScriptManager().callEvent(new ScriptArgs(this.getGroupId(), EventType.EVENT_GADGET_STATE_CHANGE, state, this.getConfigId()));
-    }
-
-    @Deprecated(forRemoval = true) // Dont use!
-    public void setContent(GadgetContent content) {
-        this.content = this.content == null ? content : this.content;
-    }
-
-    // TODO refactor
-    public void buildContent() {
-        if (this.getContent() != null || this.getGadgetData() == null || this.getGadgetData().getType() == null) {
-            return;
-        }
-
-        this.content = switch (this.getGadgetData().getType()) {
-            case GatherPoint -> new GadgetGatherPoint(this);
-            case GatherObject -> new GadgetGatherObject(this);
-            case Worktop, SealGadget -> new GadgetWorktop(this);
-            case RewardStatue -> new GadgetRewardStatue(this);
-            case Chest -> new GadgetChest(this);
-            case Gadget -> new GadgetObject(this);
-            default -> null;
-        };
-    }
-
-    @Override
-    public void onInteract(Player player, GadgetInteractReq interactReq) {
-        if (this.getContent() == null) {
-            return;
-        }
-
-        boolean shouldDelete = this.getContent().onInteract(player, interactReq);
-
-        if (shouldDelete) {
-            this.getScene().killEntity(this);
-        }
-    }
-
-    @Override
-    public void onCreate() {
-        // Lua event
-        getScene().getScriptManager().callEvent(new ScriptArgs(this.getGroupId(), EventType.EVENT_GADGET_CREATE, this.getConfigId()));
-    }
-
-    @Override
-    public void onRemoved() {
-        super.onRemoved();
-        if(!children.isEmpty()) {
-            getScene().removeEntities(children, VisionTypeOuterClass.VisionType.VISION_TYPE_REMOVE);
-            children.clear();
-        }
-    }
-
-    @Override
-    public void onDeath(int killerId) {
-        super.onDeath(killerId); // Invoke super class's onDeath() method.
-
-        if (this.getSpawnEntry() != null) {
-            this.getScene().getDeadSpawnedEntities().add(getSpawnEntry());
-        }
-        if (getScene().getChallenge() != null) {
-            getScene().getChallenge().onGadgetDeath(this);
-        }
-        getScene().getScriptManager().callEvent(new ScriptArgs(this.getGroupId(), EventType.EVENT_ANY_GADGET_DIE, this.getConfigId()));
-
-        SceneGroupInstance groupInstance = getScene().getScriptManager().getCachedGroupInstanceById(this.getGroupId());
-        if(groupInstance != null && metaGadget != null)
-            groupInstance.getDeadEntities().add(metaGadget.config_id);
-    }
-
-    public boolean startPlatform(){
-        if(routeConfig == null){
-            return false;
-        }
-
-        if(routeConfig.isStarted()){
-            return true;
-        }
-        getScene().broadcastPacket(new PacketSceneTimeNotify(getScene()));
-        routeConfig.startRoute(getScene());
-        getScene().broadcastPacket(new PacketPlatformStartRouteNotify(this));
-
-        return true;
-    }
-
-    public boolean stopPlatform(){
-        if(routeConfig == null){
-            return false;
-        }
-
-        if(!routeConfig.isStarted()){
-            return true;
-        }
-        routeConfig.stopRoute(getScene());
-        getScene().broadcastPacket(new PacketPlatformStopRouteNotify(this));
-
-        return true;
-    }
-
-    @Override
-    public SceneEntityInfo toProto() {
-        EntityAuthorityInfo authority = EntityAuthorityInfo.newBuilder()
-            .setAbilityInfo(AbilitySyncStateInfo.newBuilder())
-            .setRendererChangedInfo(EntityRendererChangedInfo.newBuilder())
-            .setAiInfo(SceneEntityAiInfo.newBuilder().setIsAiOpen(true).setBornPos(bornPos.toProto()))
-            .setBornPos(bornPos.toProto())
-            .build();
-
-        SceneEntityInfo.Builder entityInfo = SceneEntityInfo.newBuilder()
-            .setEntityId(getId())
-            .setEntityType(ProtEntityType.PROT_ENTITY_TYPE_GADGET)
-            .setMotionInfo(MotionInfo.newBuilder().setPos(getPosition().toProto()).setRot(getRotation().toProto()).setSpeed(Vector.newBuilder()))
-            .addAnimatorParaList(AnimatorParameterValueInfoPair.newBuilder())
-            .setEntityClientData(EntityClientData.newBuilder())
-            .setEntityAuthorityInfo(authority)
-            .setLifeState(1);
-
-        PropPair pair = PropPair.newBuilder()
-            .setType(PlayerProperty.PROP_LEVEL.getId())
-            .setPropValue(ProtoHelper.newPropValue(PlayerProperty.PROP_LEVEL, 1))
-            .build();
-        entityInfo.addPropList(pair);
-
-        // We do not use the getter to null check because the getter will create a fight prop map if it is null
-        if (this.fightProperties != null) {
-            addAllFightPropsToEntityInfo(entityInfo);
-        }
-
-        SceneGadgetInfo.Builder gadgetInfo = SceneGadgetInfo.newBuilder()
-            .setGadgetId(this.getGadgetId())
-            .setGroupId(this.getGroupId())
-            .setConfigId(this.getConfigId())
-            .setGadgetState(this.getState())
-            .setIsEnableInteract(true)
-            .setAuthorityPeerId(this.getScene().getWorld().getHostPeerId());
-
-        if (this.metaGadget != null) {
-            gadgetInfo.setDraftId(this.metaGadget.draft_id);
-        }
-
-        if(owner != null){
-            gadgetInfo.setOwnerEntityId(owner.getId());
-        }
-
-        if (this.getContent() != null) {
-            this.getContent().onBuildProto(gadgetInfo);
-        }
-
-        if(routeConfig!=null){
-            gadgetInfo.setPlatform(getPlatformInfo());
-        }
-
-        entityInfo.setGadget(gadgetInfo);
-
-        return entityInfo.build();
-    }
-
-    public PlatformInfoOuterClass.PlatformInfo.Builder getPlatformInfo(){
-        if(routeConfig != null){
-            return routeConfig.toProto();
-        }
-
-        return PlatformInfoOuterClass.PlatformInfo.newBuilder();
-    }
-}
+package emu.grasscutter.game.entity;
+
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.binout.config.ConfigEntityGadget;
+import emu.grasscutter.data.excels.GadgetData;
+import emu.grasscutter.game.entity.gadget.*;
+import emu.grasscutter.game.entity.gadget.platform.BaseRoute;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.EntityIdType;
+import emu.grasscutter.game.props.PlayerProperty;
+import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.game.world.SceneGroupInstance;
+import emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo;
+import emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair;
+import emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo;
+import emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData;
+import emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo;
+import emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq;
+import emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo;
+import emu.grasscutter.net.proto.PlatformInfoOuterClass;
+import emu.grasscutter.net.proto.PropPairOuterClass.PropPair;
+import emu.grasscutter.net.proto.ProtEntityTypeOuterClass.ProtEntityType;
+import emu.grasscutter.net.proto.SceneEntityAiInfoOuterClass.SceneEntityAiInfo;
+import emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
+import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo;
+import emu.grasscutter.net.proto.VectorOuterClass.Vector;
+import emu.grasscutter.net.proto.VisionTypeOuterClass;
+import emu.grasscutter.scripts.EntityControllerScriptManager;
+import emu.grasscutter.scripts.constants.EventType;
+import emu.grasscutter.scripts.data.SceneGadget;
+import emu.grasscutter.scripts.data.ScriptArgs;
+import emu.grasscutter.server.packet.send.PacketGadgetStateNotify;
+import emu.grasscutter.server.packet.send.PacketPlatformStartRouteNotify;
+import emu.grasscutter.server.packet.send.PacketPlatformStopRouteNotify;
+import emu.grasscutter.server.packet.send.PacketSceneTimeNotify;
+import emu.grasscutter.utils.Position;
+import emu.grasscutter.utils.ProtoHelper;
+import it.unimi.dsi.fastutil.ints.Int2FloatMap;
+import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
+import java.util.ArrayList;
+import java.util.List;
+import javax.annotation.Nullable;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@ToString(callSuper = true)
+public class EntityGadget extends EntityBaseGadget {
+    @Getter private final GadgetData gadgetData;
+
+    @Getter(onMethod = @__(@Override))
+    @Setter
+    private int gadgetId;
+
+    @Getter private final Position bornPos;
+    @Getter private final Position bornRot;
+    @Getter @Setter private GameEntity owner = null;
+    @Getter @Setter private List<GameEntity> children = new ArrayList<>();
+
+    @Getter private int state;
+    @Getter @Setter private int pointType;
+    @Getter private GadgetContent content;
+
+    @Getter(onMethod = @__(@Override), lazy = true)
+    private final Int2FloatMap fightProperties = new Int2FloatOpenHashMap();
+
+    @Getter @Setter private SceneGadget metaGadget;
+    @Nullable @Getter private ConfigEntityGadget configGadget;
+    @Getter @Setter private BaseRoute routeConfig;
+
+    @Getter @Setter private int stopValue = 0; // Controller related, inited to zero
+    @Getter @Setter private int startValue = 0; // Controller related, inited to zero
+    @Getter @Setter private int ticksSinceChange;
+
+    public EntityGadget(Scene scene, int gadgetId, Position pos) {
+        this(scene, gadgetId, pos, null, null);
+    }
+
+    public EntityGadget(Scene scene, int gadgetId, Position pos, Position rot) {
+        this(scene, gadgetId, pos, rot, null);
+    }
+
+    public EntityGadget(
+            Scene scene, int gadgetId, Position pos, Position rot, GadgetContent content) {
+        super(scene, pos, rot);
+
+        this.gadgetData = GameData.getGadgetDataMap().get(gadgetId);
+        if (gadgetData != null && gadgetData.getJsonName() != null) {
+            this.configGadget = GameData.getGadgetConfigData().get(gadgetData.getJsonName());
+        }
+
+        this.id = this.getScene().getWorld().getNextEntityId(EntityIdType.GADGET);
+        this.gadgetId = gadgetId;
+        this.content = content;
+        this.bornPos = this.getPosition().clone();
+        this.bornRot = this.getRotation().clone();
+        this.fillFightProps(configGadget);
+
+        if (GameData.getGadgetMappingMap().containsKey(gadgetId)) {
+            String controllerName = GameData.getGadgetMappingMap().get(gadgetId).getServerController();
+            this.setEntityController(EntityControllerScriptManager.getGadgetController(controllerName));
+        }
+    }
+
+    public void setState(int state) {
+        this.state = state;
+        // Cache the gadget state
+        if (metaGadget != null && metaGadget.group != null) {
+            var instance = getScene().getScriptManager().getCachedGroupInstanceById(metaGadget.group.id);
+            if (instance != null) instance.cacheGadgetState(metaGadget, state);
+        }
+    }
+
+    public void updateState(int state) {
+        if (state == this.getState()) return; // Don't triggers events
+
+        this.setState(state);
+        ticksSinceChange = getScene().getSceneTimeSeconds();
+        this.getScene().broadcastPacket(new PacketGadgetStateNotify(this, state));
+        getScene()
+                .getScriptManager()
+                .callEvent(
+                        new ScriptArgs(
+                                this.getGroupId(), EventType.EVENT_GADGET_STATE_CHANGE, state, this.getConfigId()));
+    }
+
+    @Deprecated(forRemoval = true) // Dont use!
+    public void setContent(GadgetContent content) {
+        this.content = this.content == null ? content : this.content;
+    }
+
+    // TODO refactor
+    public void buildContent() {
+        if (this.getContent() != null
+                || this.getGadgetData() == null
+                || this.getGadgetData().getType() == null) {
+            return;
+        }
+
+        this.content =
+                switch (this.getGadgetData().getType()) {
+                    case GatherPoint -> new GadgetGatherPoint(this);
+                    case GatherObject -> new GadgetGatherObject(this);
+                    case Worktop, SealGadget -> new GadgetWorktop(this);
+                    case RewardStatue -> new GadgetRewardStatue(this);
+                    case Chest -> new GadgetChest(this);
+                    case Gadget -> new GadgetObject(this);
+                    default -> null;
+                };
+    }
+
+    @Override
+    public void onInteract(Player player, GadgetInteractReq interactReq) {
+        if (this.getContent() == null) {
+            return;
+        }
+
+        boolean shouldDelete = this.getContent().onInteract(player, interactReq);
+
+        if (shouldDelete) {
+            this.getScene().killEntity(this);
+        }
+    }
+
+    @Override
+    public void onCreate() {
+        // Lua event
+        getScene()
+                .getScriptManager()
+                .callEvent(
+                        new ScriptArgs(this.getGroupId(), EventType.EVENT_GADGET_CREATE, this.getConfigId()));
+    }
+
+    @Override
+    public void onRemoved() {
+        super.onRemoved();
+        if (!children.isEmpty()) {
+            getScene().removeEntities(children, VisionTypeOuterClass.VisionType.VISION_TYPE_REMOVE);
+            children.clear();
+        }
+    }
+
+    @Override
+    public void onDeath(int killerId) {
+        super.onDeath(killerId); // Invoke super class's onDeath() method.
+
+        if (this.getSpawnEntry() != null) {
+            this.getScene().getDeadSpawnedEntities().add(getSpawnEntry());
+        }
+        if (getScene().getChallenge() != null) {
+            getScene().getChallenge().onGadgetDeath(this);
+        }
+        getScene()
+                .getScriptManager()
+                .callEvent(
+                        new ScriptArgs(this.getGroupId(), EventType.EVENT_ANY_GADGET_DIE, this.getConfigId()));
+
+        SceneGroupInstance groupInstance =
+                getScene().getScriptManager().getCachedGroupInstanceById(this.getGroupId());
+        if (groupInstance != null && metaGadget != null)
+            groupInstance.getDeadEntities().add(metaGadget.config_id);
+    }
+
+    public boolean startPlatform() {
+        if (routeConfig == null) {
+            return false;
+        }
+
+        if (routeConfig.isStarted()) {
+            return true;
+        }
+        getScene().broadcastPacket(new PacketSceneTimeNotify(getScene()));
+        routeConfig.startRoute(getScene());
+        getScene().broadcastPacket(new PacketPlatformStartRouteNotify(this));
+
+        return true;
+    }
+
+    public boolean stopPlatform() {
+        if (routeConfig == null) {
+            return false;
+        }
+
+        if (!routeConfig.isStarted()) {
+            return true;
+        }
+        routeConfig.stopRoute(getScene());
+        getScene().broadcastPacket(new PacketPlatformStopRouteNotify(this));
+
+        return true;
+    }
+
+    @Override
+    public SceneEntityInfo toProto() {
+        EntityAuthorityInfo authority =
+                EntityAuthorityInfo.newBuilder()
+                        .setAbilityInfo(AbilitySyncStateInfo.newBuilder())
+                        .setRendererChangedInfo(EntityRendererChangedInfo.newBuilder())
+                        .setAiInfo(
+                                SceneEntityAiInfo.newBuilder().setIsAiOpen(true).setBornPos(bornPos.toProto()))
+                        .setBornPos(bornPos.toProto())
+                        .build();
+
+        SceneEntityInfo.Builder entityInfo =
+                SceneEntityInfo.newBuilder()
+                        .setEntityId(getId())
+                        .setEntityType(ProtEntityType.PROT_ENTITY_TYPE_GADGET)
+                        .setMotionInfo(
+                                MotionInfo.newBuilder()
+                                        .setPos(getPosition().toProto())
+                                        .setRot(getRotation().toProto())
+                                        .setSpeed(Vector.newBuilder()))
+                        .addAnimatorParaList(AnimatorParameterValueInfoPair.newBuilder())
+                        .setEntityClientData(EntityClientData.newBuilder())
+                        .setEntityAuthorityInfo(authority)
+                        .setLifeState(1);
+
+        PropPair pair =
+                PropPair.newBuilder()
+                        .setType(PlayerProperty.PROP_LEVEL.getId())
+                        .setPropValue(ProtoHelper.newPropValue(PlayerProperty.PROP_LEVEL, 1))
+                        .build();
+        entityInfo.addPropList(pair);
+
+        // We do not use the getter to null check because the getter will create a fight prop map if it
+        // is null
+        if (this.fightProperties != null) {
+            addAllFightPropsToEntityInfo(entityInfo);
+        }
+
+        SceneGadgetInfo.Builder gadgetInfo =
+                SceneGadgetInfo.newBuilder()
+                        .setGadgetId(this.getGadgetId())
+                        .setGroupId(this.getGroupId())
+                        .setConfigId(this.getConfigId())
+                        .setGadgetState(this.getState())
+                        .setIsEnableInteract(true)
+                        .setAuthorityPeerId(this.getScene().getWorld().getHostPeerId());
+
+        if (this.metaGadget != null) {
+            gadgetInfo.setDraftId(this.metaGadget.draft_id);
+        }
+
+        if (owner != null) {
+            gadgetInfo.setOwnerEntityId(owner.getId());
+        }
+
+        if (this.getContent() != null) {
+            this.getContent().onBuildProto(gadgetInfo);
+        }
+
+        if (routeConfig != null) {
+            gadgetInfo.setPlatform(getPlatformInfo());
+        }
+
+        entityInfo.setGadget(gadgetInfo);
+
+        return entityInfo.build();
+    }
+
+    public PlatformInfoOuterClass.PlatformInfo.Builder getPlatformInfo() {
+        if (routeConfig != null) {
+            return routeConfig.toProto();
+        }
+
+        return PlatformInfoOuterClass.PlatformInfo.newBuilder();
+    }
+}

src/main/java/emu/grasscutter/game/entity/EntityNPC.java

@@ -1,82 +1,82 @@
-package emu.grasscutter.game.entity;
-
-import emu.grasscutter.game.props.EntityIdType;
-import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.net.proto.*;
-import emu.grasscutter.scripts.data.SceneNPC;
-import emu.grasscutter.utils.Position;
-import it.unimi.dsi.fastutil.ints.Int2FloatMap;
-import lombok.Getter;
-
-public class EntityNPC extends GameEntity {
-    @Getter(onMethod_ = @Override)
-    private final Position position;
-
-    @Getter(onMethod_ = @Override)
-    private final Position rotation;
-
-    private final SceneNPC metaNpc;
-    @Getter private final int suiteId;
-
-    public EntityNPC(Scene scene, SceneNPC metaNPC, int blockId, int suiteId) {
-        super(scene);
-        this.id = getScene().getWorld().getNextEntityId(EntityIdType.NPC);
-        setConfigId(metaNPC.config_id);
-        setGroupId(metaNPC.group.id);
-        setBlockId(blockId);
-        this.suiteId = suiteId;
-        this.position = metaNPC.pos.clone();
-        this.rotation = metaNPC.rot.clone();
-        this.metaNpc = metaNPC;
-    }
-
-    @Override
-    public int getEntityTypeId() {
-        return this.metaNpc.npc_id;
-    }
-
-    @Override
-    public Int2FloatMap getFightProperties() {
-        return null;
-    }
-
-    @Override
-    public SceneEntityInfoOuterClass.SceneEntityInfo toProto() {
-
-        EntityAuthorityInfoOuterClass.EntityAuthorityInfo authority =
-                EntityAuthorityInfoOuterClass.EntityAuthorityInfo.newBuilder()
-                        .setAbilityInfo(AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.newBuilder())
-                        .setRendererChangedInfo(
-                                EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo.newBuilder())
-                        .setAiInfo(
-                                SceneEntityAiInfoOuterClass.SceneEntityAiInfo.newBuilder()
-                                        .setIsAiOpen(true)
-                                        .setBornPos(getPosition().toProto()))
-                        .setBornPos(getPosition().toProto())
-                        .build();
-
-        SceneEntityInfoOuterClass.SceneEntityInfo.Builder entityInfo =
-                SceneEntityInfoOuterClass.SceneEntityInfo.newBuilder()
-                        .setEntityId(getId())
-                        .setEntityType(ProtEntityTypeOuterClass.ProtEntityType.PROT_ENTITY_TYPE_NPC)
-                        .setMotionInfo(
-                                MotionInfoOuterClass.MotionInfo.newBuilder()
-                                        .setPos(getPosition().toProto())
-                                        .setRot(getRotation().toProto())
-                                        .setSpeed(VectorOuterClass.Vector.newBuilder()))
-                        .addAnimatorParaList(
-                                AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair
-                                        .newBuilder())
-                        .setEntityClientData(EntityClientDataOuterClass.EntityClientData.newBuilder())
-                        .setEntityAuthorityInfo(authority)
-                        .setLifeState(1);
-
-        entityInfo.setNpc(
-                SceneNpcInfoOuterClass.SceneNpcInfo.newBuilder()
-                        .setNpcId(metaNpc.npc_id)
-                        .setBlockId(getBlockId())
-                        .build());
-
-        return entityInfo.build();
-    }
-}
+package emu.grasscutter.game.entity;
+
+import emu.grasscutter.game.props.EntityIdType;
+import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.net.proto.*;
+import emu.grasscutter.scripts.data.SceneNPC;
+import emu.grasscutter.utils.Position;
+import it.unimi.dsi.fastutil.ints.Int2FloatMap;
+import lombok.Getter;
+
+public class EntityNPC extends GameEntity {
+    @Getter(onMethod_ = @Override)
+    private final Position position;
+
+    @Getter(onMethod_ = @Override)
+    private final Position rotation;
+
+    private final SceneNPC metaNpc;
+    @Getter private final int suiteId;
+
+    public EntityNPC(Scene scene, SceneNPC metaNPC, int blockId, int suiteId) {
+        super(scene);
+        this.id = getScene().getWorld().getNextEntityId(EntityIdType.NPC);
+        setConfigId(metaNPC.config_id);
+        setGroupId(metaNPC.group.id);
+        setBlockId(blockId);
+        this.suiteId = suiteId;
+        this.position = metaNPC.pos.clone();
+        this.rotation = metaNPC.rot.clone();
+        this.metaNpc = metaNPC;
+    }
+
+    @Override
+    public int getEntityTypeId() {
+        return this.metaNpc.npc_id;
+    }
+
+    @Override
+    public Int2FloatMap getFightProperties() {
+        return null;
+    }
+
+    @Override
+    public SceneEntityInfoOuterClass.SceneEntityInfo toProto() {
+
+        EntityAuthorityInfoOuterClass.EntityAuthorityInfo authority =
+                EntityAuthorityInfoOuterClass.EntityAuthorityInfo.newBuilder()
+                        .setAbilityInfo(AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.newBuilder())
+                        .setRendererChangedInfo(
+                                EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo.newBuilder())
+                        .setAiInfo(
+                                SceneEntityAiInfoOuterClass.SceneEntityAiInfo.newBuilder()
+                                        .setIsAiOpen(true)
+                                        .setBornPos(getPosition().toProto()))
+                        .setBornPos(getPosition().toProto())
+                        .build();
+
+        SceneEntityInfoOuterClass.SceneEntityInfo.Builder entityInfo =
+                SceneEntityInfoOuterClass.SceneEntityInfo.newBuilder()
+                        .setEntityId(getId())
+                        .setEntityType(ProtEntityTypeOuterClass.ProtEntityType.PROT_ENTITY_TYPE_NPC)
+                        .setMotionInfo(
+                                MotionInfoOuterClass.MotionInfo.newBuilder()
+                                        .setPos(getPosition().toProto())
+                                        .setRot(getRotation().toProto())
+                                        .setSpeed(VectorOuterClass.Vector.newBuilder()))
+                        .addAnimatorParaList(
+                                AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair
+                                        .newBuilder())
+                        .setEntityClientData(EntityClientDataOuterClass.EntityClientData.newBuilder())
+                        .setEntityAuthorityInfo(authority)
+                        .setLifeState(1);
+
+        entityInfo.setNpc(
+                SceneNpcInfoOuterClass.SceneNpcInfo.newBuilder()
+                        .setNpcId(metaNpc.npc_id)
+                        .setBlockId(getBlockId())
+                        .build());
+
+        return entityInfo.build();
+    }
+}

src/main/java/emu/grasscutter/game/entity/EntityRegion.java

@@ -1,96 +1,96 @@
-package emu.grasscutter.game.entity;
-
-import emu.grasscutter.game.props.EntityIdType;
-import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.net.proto.SceneEntityInfoOuterClass;
-import emu.grasscutter.scripts.data.SceneRegion;
-import emu.grasscutter.utils.Position;
-import it.unimi.dsi.fastutil.ints.Int2FloatMap;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import lombok.Getter;
-
-@Getter
-public class EntityRegion extends GameEntity {
-    private final Position position;
-    private final Set<Integer> entities; // Ids of entities inside this region
-    private final SceneRegion metaRegion;
-    private boolean hasNewEntities;
-    private boolean entityLeave;
-
-    public EntityRegion(Scene scene, SceneRegion region) {
-        super(scene);
-
-        this.id = getScene().getWorld().getNextEntityId(EntityIdType.REGION);
-        this.setGroupId(region.group.id);
-        this.setBlockId(region.group.block_id);
-        this.setConfigId(region.config_id);
-        this.position = region.pos.clone();
-        this.entities = ConcurrentHashMap.newKeySet();
-        this.metaRegion = region;
-    }
-
-    @Override
-    public int getEntityTypeId() {
-        return this.metaRegion.config_id;
-    }
-
-    public void addEntity(GameEntity entity) {
-        if (this.getEntities().contains(entity.getId())) {
-            return;
-        }
-        this.getEntities().add(entity.getId());
-        this.hasNewEntities = true;
-    }
-
-    public boolean hasNewEntities() {
-        return hasNewEntities;
-    }
-
-    public void resetNewEntities() {
-        hasNewEntities = false;
-    }
-
-    public void removeEntity(int entityId) {
-        this.getEntities().remove(entityId);
-        this.entityLeave = true;
-    }
-
-    public void removeEntity(GameEntity entity) {
-        this.getEntities().remove(entity.getId());
-        this.entityLeave = true;
-    }
-
-    public boolean entityLeave() {
-        return this.entityLeave;
-    }
-
-    public void resetEntityLeave() {
-        this.entityLeave = false;
-    }
-
-    @Override
-    public Int2FloatMap getFightProperties() {
-        return null;
-    }
-
-    @Override
-    public Position getPosition() {
-        return position;
-    }
-
-    @Override
-    public Position getRotation() {
-        return null;
-    }
-
-    @Override
-    public SceneEntityInfoOuterClass.SceneEntityInfo toProto() {
-        /** The Region Entity would not be sent to client. */
-        return null;
-    }
-
-    public int getFirstEntityId() {
-        return entities.stream().findFirst().orElse(0);
-    }
-}
+package emu.grasscutter.game.entity;
+
+import emu.grasscutter.game.props.EntityIdType;
+import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.net.proto.SceneEntityInfoOuterClass;
+import emu.grasscutter.scripts.data.SceneRegion;
+import emu.grasscutter.utils.Position;
+import it.unimi.dsi.fastutil.ints.Int2FloatMap;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import lombok.Getter;
+
+@Getter
+public class EntityRegion extends GameEntity {
+    private final Position position;
+    private final Set<Integer> entities; // Ids of entities inside this region
+    private final SceneRegion metaRegion;
+    private boolean hasNewEntities;
+    private boolean entityLeave;
+
+    public EntityRegion(Scene scene, SceneRegion region) {
+        super(scene);
+
+        this.id = getScene().getWorld().getNextEntityId(EntityIdType.REGION);
+        this.setGroupId(region.group.id);
+        this.setBlockId(region.group.block_id);
+        this.setConfigId(region.config_id);
+        this.position = region.pos.clone();
+        this.entities = ConcurrentHashMap.newKeySet();
+        this.metaRegion = region;
+    }
+
+    @Override
+    public int getEntityTypeId() {
+        return this.metaRegion.config_id;
+    }
+
+    public void addEntity(GameEntity entity) {
+        if (this.getEntities().contains(entity.getId())) {
+            return;
+        }
+        this.getEntities().add(entity.getId());
+        this.hasNewEntities = true;
+    }
+
+    public boolean hasNewEntities() {
+        return hasNewEntities;
+    }
+
+    public void resetNewEntities() {
+        hasNewEntities = false;
+    }
+
+    public void removeEntity(int entityId) {
+        this.getEntities().remove(entityId);
+        this.entityLeave = true;
+    }
+
+    public void removeEntity(GameEntity entity) {
+        this.getEntities().remove(entity.getId());
+        this.entityLeave = true;
+    }
+
+    public boolean entityLeave() {
+        return this.entityLeave;
+    }
+
+    public void resetEntityLeave() {
+        this.entityLeave = false;
+    }
+
+    @Override
+    public Int2FloatMap getFightProperties() {
+        return null;
+    }
+
+    @Override
+    public Position getPosition() {
+        return position;
+    }
+
+    @Override
+    public Position getRotation() {
+        return null;
+    }
+
+    @Override
+    public SceneEntityInfoOuterClass.SceneEntityInfo toProto() {
+        /** The Region Entity would not be sent to client. */
+        return null;
+    }
+
+    public int getFirstEntityId() {
+        return entities.stream().findFirst().orElse(0);
+    }
+}

src/main/java/emu/grasscutter/game/entity/EntitySolarIsotomaClientGadget.java

@@ -1,30 +1,33 @@
-package emu.grasscutter.game.entity;
-
-import emu.grasscutter.game.entity.platform.EntitySolarIsotomaElevatorPlatform;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.net.proto.EvtCreateGadgetNotifyOuterClass;
-import lombok.Getter;
-
-public class EntitySolarIsotomaClientGadget extends EntityClientGadget {
-    public static final int GADGET_ID = 41038001;
-    public static final int ELEVATOR_GADGET_ID = 41038002;
-    @Getter private EntityGadget platformGadget;
-
-    public EntitySolarIsotomaClientGadget(Scene scene, Player player, EvtCreateGadgetNotifyOuterClass.EvtCreateGadgetNotify notify) {
-        super(scene, player, notify);
-    }
-
-    @Override
-    public void onCreate() {
-        //Create solar isotoma elevator and send to all.
-        this.platformGadget = new EntitySolarIsotomaElevatorPlatform(this, getScene(), ELEVATOR_GADGET_ID, getPosition(), getRotation());
-        getScene().addEntity(this.platformGadget);
-    }
-
-    @Override
-    public void onRemoved() {
-        //Remove solar isotoma elevator entity.
-        getScene().removeEntity(this.platformGadget);
-    }
-}
+package emu.grasscutter.game.entity;
+
+import emu.grasscutter.game.entity.platform.EntitySolarIsotomaElevatorPlatform;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.net.proto.EvtCreateGadgetNotifyOuterClass;
+import lombok.Getter;
+
+public class EntitySolarIsotomaClientGadget extends EntityClientGadget {
+    public static final int GADGET_ID = 41038001;
+    public static final int ELEVATOR_GADGET_ID = 41038002;
+    @Getter private EntityGadget platformGadget;
+
+    public EntitySolarIsotomaClientGadget(
+            Scene scene, Player player, EvtCreateGadgetNotifyOuterClass.EvtCreateGadgetNotify notify) {
+        super(scene, player, notify);
+    }
+
+    @Override
+    public void onCreate() {
+        // Create solar isotoma elevator and send to all.
+        this.platformGadget =
+                new EntitySolarIsotomaElevatorPlatform(
+                        this, getScene(), ELEVATOR_GADGET_ID, getPosition(), getRotation());
+        getScene().addEntity(this.platformGadget);
+    }
+
+    @Override
+    public void onRemoved() {
+        // Remove solar isotoma elevator entity.
+        getScene().removeEntity(this.platformGadget);
+    }
+}

src/main/java/emu/grasscutter/game/entity/EntityVehicle.java

@@ -1,112 +1,125 @@
-package emu.grasscutter.game.entity;
-
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.binout.config.ConfigEntityGadget;
-import emu.grasscutter.data.excels.GadgetData;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.EntityIdType;
-import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.game.props.PlayerProperty;
-import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo;
-import emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair;
-import emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo;
-import emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo;
-import emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo;
-import emu.grasscutter.net.proto.PropPairOuterClass.PropPair;
-import emu.grasscutter.net.proto.ProtEntityTypeOuterClass.ProtEntityType;
-import emu.grasscutter.net.proto.SceneEntityAiInfoOuterClass.SceneEntityAiInfo;
-import emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
-import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo;
-import emu.grasscutter.net.proto.VectorOuterClass.Vector;
-import emu.grasscutter.net.proto.VehicleInfoOuterClass.VehicleInfo;
-import emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember;
-import emu.grasscutter.utils.Position;
-import emu.grasscutter.utils.ProtoHelper;
-import it.unimi.dsi.fastutil.ints.Int2FloatMap;
-import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.List;
-
-public class EntityVehicle extends EntityBaseGadget {
-
-    @Getter private final Player owner;
-    @Getter(onMethod = @__(@Override))
-    private final Int2FloatMap fightProperties;
-
-    @Getter private final int pointId;
-    @Getter private final int gadgetId;
-
-    @Getter @Setter private float curStamina;
-    @Getter private final List<VehicleMember> vehicleMembers;
-    @Nullable @Getter private ConfigEntityGadget configGadget;
-
-    public EntityVehicle(Scene scene, Player player, int gadgetId, int pointId, Position pos, Position rot) {
-        super(scene, pos, rot);
-        this.owner = player;
-        this.id = getScene().getWorld().getNextEntityId(EntityIdType.GADGET);
-        this.fightProperties = new Int2FloatOpenHashMap();
-        this.gadgetId = gadgetId;
-        this.pointId = pointId;
-        this.curStamina = 240; // might be in configGadget.GCALKECLLLP.JBAKBEFIMBN.ANBMPHPOALP
-        this.vehicleMembers = new ArrayList<>();
-        GadgetData data = GameData.getGadgetDataMap().get(gadgetId);
-        if (data != null && data.getJsonName() != null) {
-            this.configGadget = GameData.getGadgetConfigData().get(data.getJsonName());
-        }
-
-        fillFightProps(configGadget);
-    }
-
-    @Override
-    protected void fillFightProps(ConfigEntityGadget configGadget) {
-        super.fillFightProps(configGadget);
-        this.addFightProperty(FightProperty.FIGHT_PROP_CUR_SPEED, 0);
-        this.addFightProperty(FightProperty.FIGHT_PROP_CHARGE_EFFICIENCY, 0);
-    }
-
-    @Override
-    public SceneEntityInfo toProto() {
-
-        VehicleInfo vehicle = VehicleInfo.newBuilder()
-            .setOwnerUid(this.owner.getUid())
-            .setCurStamina(getCurStamina())
-            .build();
-
-        EntityAuthorityInfo authority = EntityAuthorityInfo.newBuilder()
-            .setAbilityInfo(AbilitySyncStateInfo.newBuilder())
-            .setRendererChangedInfo(EntityRendererChangedInfo.newBuilder())
-            .setAiInfo(SceneEntityAiInfo.newBuilder().setIsAiOpen(true).setBornPos(getPosition().toProto()))
-            .setBornPos(getPosition().toProto())
-            .build();
-
-        SceneGadgetInfo.Builder gadgetInfo = SceneGadgetInfo.newBuilder()
-            .setGadgetId(this.getGadgetId())
-            .setAuthorityPeerId(this.getOwner().getPeerId())
-            .setIsEnableInteract(true)
-            .setVehicleInfo(vehicle);
-
-        SceneEntityInfo.Builder entityInfo = SceneEntityInfo.newBuilder()
-            .setEntityId(getId())
-            .setEntityType(ProtEntityType.PROT_ENTITY_TYPE_GADGET)
-            .setMotionInfo(MotionInfo.newBuilder().setPos(getPosition().toProto()).setRot(getRotation().toProto()).setSpeed(Vector.newBuilder()))
-            .addAnimatorParaList(AnimatorParameterValueInfoPair.newBuilder())
-            .setGadget(gadgetInfo)
-            .setEntityAuthorityInfo(authority)
-            .setLifeState(1);
-
-        PropPair pair = PropPair.newBuilder()
-            .setType(PlayerProperty.PROP_LEVEL.getId())
-            .setPropValue(ProtoHelper.newPropValue(PlayerProperty.PROP_LEVEL, 47))
-            .build();
-
-        this.addAllFightPropsToEntityInfo(entityInfo);
-        entityInfo.addPropList(pair);
-
-        return entityInfo.build();
-    }
-}
+package emu.grasscutter.game.entity;
+
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.binout.config.ConfigEntityGadget;
+import emu.grasscutter.data.excels.GadgetData;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.EntityIdType;
+import emu.grasscutter.game.props.FightProperty;
+import emu.grasscutter.game.props.PlayerProperty;
+import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo;
+import emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair;
+import emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo;
+import emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo;
+import emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo;
+import emu.grasscutter.net.proto.PropPairOuterClass.PropPair;
+import emu.grasscutter.net.proto.ProtEntityTypeOuterClass.ProtEntityType;
+import emu.grasscutter.net.proto.SceneEntityAiInfoOuterClass.SceneEntityAiInfo;
+import emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
+import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo;
+import emu.grasscutter.net.proto.VectorOuterClass.Vector;
+import emu.grasscutter.net.proto.VehicleInfoOuterClass.VehicleInfo;
+import emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember;
+import emu.grasscutter.utils.Position;
+import emu.grasscutter.utils.ProtoHelper;
+import it.unimi.dsi.fastutil.ints.Int2FloatMap;
+import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
+import java.util.ArrayList;
+import java.util.List;
+import javax.annotation.Nullable;
+import lombok.Getter;
+import lombok.Setter;
+
+public class EntityVehicle extends EntityBaseGadget {
+
+    @Getter private final Player owner;
+
+    @Getter(onMethod = @__(@Override))
+    private final Int2FloatMap fightProperties;
+
+    @Getter private final int pointId;
+    @Getter private final int gadgetId;
+
+    @Getter @Setter private float curStamina;
+    @Getter private final List<VehicleMember> vehicleMembers;
+    @Nullable @Getter private ConfigEntityGadget configGadget;
+
+    public EntityVehicle(
+            Scene scene, Player player, int gadgetId, int pointId, Position pos, Position rot) {
+        super(scene, pos, rot);
+        this.owner = player;
+        this.id = getScene().getWorld().getNextEntityId(EntityIdType.GADGET);
+        this.fightProperties = new Int2FloatOpenHashMap();
+        this.gadgetId = gadgetId;
+        this.pointId = pointId;
+        this.curStamina = 240; // might be in configGadget.GCALKECLLLP.JBAKBEFIMBN.ANBMPHPOALP
+        this.vehicleMembers = new ArrayList<>();
+        GadgetData data = GameData.getGadgetDataMap().get(gadgetId);
+        if (data != null && data.getJsonName() != null) {
+            this.configGadget = GameData.getGadgetConfigData().get(data.getJsonName());
+        }
+
+        fillFightProps(configGadget);
+    }
+
+    @Override
+    protected void fillFightProps(ConfigEntityGadget configGadget) {
+        super.fillFightProps(configGadget);
+        this.addFightProperty(FightProperty.FIGHT_PROP_CUR_SPEED, 0);
+        this.addFightProperty(FightProperty.FIGHT_PROP_CHARGE_EFFICIENCY, 0);
+    }
+
+    @Override
+    public SceneEntityInfo toProto() {
+
+        VehicleInfo vehicle =
+                VehicleInfo.newBuilder()
+                        .setOwnerUid(this.owner.getUid())
+                        .setCurStamina(getCurStamina())
+                        .build();
+
+        EntityAuthorityInfo authority =
+                EntityAuthorityInfo.newBuilder()
+                        .setAbilityInfo(AbilitySyncStateInfo.newBuilder())
+                        .setRendererChangedInfo(EntityRendererChangedInfo.newBuilder())
+                        .setAiInfo(
+                                SceneEntityAiInfo.newBuilder()
+                                        .setIsAiOpen(true)
+                                        .setBornPos(getPosition().toProto()))
+                        .setBornPos(getPosition().toProto())
+                        .build();
+
+        SceneGadgetInfo.Builder gadgetInfo =
+                SceneGadgetInfo.newBuilder()
+                        .setGadgetId(this.getGadgetId())
+                        .setAuthorityPeerId(this.getOwner().getPeerId())
+                        .setIsEnableInteract(true)
+                        .setVehicleInfo(vehicle);
+
+        SceneEntityInfo.Builder entityInfo =
+                SceneEntityInfo.newBuilder()
+                        .setEntityId(getId())
+                        .setEntityType(ProtEntityType.PROT_ENTITY_TYPE_GADGET)
+                        .setMotionInfo(
+                                MotionInfo.newBuilder()
+                                        .setPos(getPosition().toProto())
+                                        .setRot(getRotation().toProto())
+                                        .setSpeed(Vector.newBuilder()))
+                        .addAnimatorParaList(AnimatorParameterValueInfoPair.newBuilder())
+                        .setGadget(gadgetInfo)
+                        .setEntityAuthorityInfo(authority)
+                        .setLifeState(1);
+
+        PropPair pair =
+                PropPair.newBuilder()
+                        .setType(PlayerProperty.PROP_LEVEL.getId())
+                        .setPropValue(ProtoHelper.newPropValue(PlayerProperty.PROP_LEVEL, 47))
+                        .build();
+
+        this.addAllFightPropsToEntityInfo(entityInfo);
+        entityInfo.addPropList(pair);
+
+        return entityInfo.build();
+    }
+}

src/main/java/emu/grasscutter/game/entity/GameEntity.java

@@ -1,264 +1,264 @@
-package 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.props.LifeState;
-import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.game.world.SpawnDataEntry;
-import emu.grasscutter.game.world.World;
-import emu.grasscutter.net.proto.FightPropPairOuterClass.FightPropPair;
-import emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq;
-import emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo;
-import emu.grasscutter.net.proto.MotionStateOuterClass.MotionState;
-import emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
-import emu.grasscutter.net.proto.VectorOuterClass.Vector;
-import emu.grasscutter.scripts.data.controller.EntityController;
-import emu.grasscutter.server.event.entity.EntityDamageEvent;
-import emu.grasscutter.server.event.entity.EntityDeathEvent;
-import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
-import emu.grasscutter.utils.Position;
-import it.unimi.dsi.fastutil.ints.Int2FloatMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import it.unimi.dsi.fastutil.objects.Object2FloatMap;
-import it.unimi.dsi.fastutil.objects.Object2FloatOpenHashMap;
-import lombok.Getter;
-import lombok.Setter;
-
-public abstract class GameEntity {
-    @Getter private final Scene scene;
-    @Getter protected int id;
-    @Getter @Setter private SpawnDataEntry spawnEntry;
-
-    @Getter @Setter private int blockId;
-    @Getter @Setter private int configId;
-    @Getter @Setter private int groupId;
-
-    @Getter @Setter private MotionState motionState;
-    @Getter @Setter private int lastMoveSceneTimeMs;
-    @Getter @Setter private int lastMoveReliableSeq;
-
-    @Getter @Setter private boolean lockHP;
-
-    // Lua controller for specific actions
-    @Getter @Setter private EntityController entityController;
-    @Getter private ElementType lastAttackType = ElementType.None;
-
-    // Abilities
-    private Object2FloatMap<String> metaOverrideMap;
-    private Int2ObjectMap<String> metaModifiers;
-
-    public GameEntity(Scene scene) {
-        this.scene = scene;
-        this.motionState = MotionState.MOTION_STATE_NONE;
-    }
-
-    public int getEntityType() {
-        return this.getId() >> 24;
-    }
-
-    public abstract int getEntityTypeId();
-
-    public World getWorld() {
-        return this.getScene().getWorld();
-    }
-
-    public boolean isAlive() {
-        return true;
-    }
-
-    public LifeState getLifeState() {
-        return this.isAlive() ? LifeState.LIFE_ALIVE : LifeState.LIFE_DEAD;
-    }
-
-    public Object2FloatMap<String> getMetaOverrideMap() {
-        if (this.metaOverrideMap == null) {
-            this.metaOverrideMap = new Object2FloatOpenHashMap<>();
-        }
-        return this.metaOverrideMap;
-    }
-
-    public Int2ObjectMap<String> getMetaModifiers() {
-        if (this.metaModifiers == null) {
-            this.metaModifiers = new Int2ObjectOpenHashMap<>();
-        }
-        return this.metaModifiers;
-    }
-
-    public abstract Int2FloatMap getFightProperties();
-
-    public abstract Position getPosition();
-
-    public abstract Position getRotation();
-
-    public void setFightProperty(FightProperty prop, float value) {
-        this.getFightProperties().put(prop.getId(), value);
-    }
-
-    public void setFightProperty(int id, float value) {
-        this.getFightProperties().put(id, value);
-    }
-
-    public void addFightProperty(FightProperty prop, float value) {
-        this.getFightProperties().put(prop.getId(), this.getFightProperty(prop) + value);
-    }
-
-    public float getFightProperty(FightProperty prop) {
-        return this.getFightProperties().getOrDefault(prop.getId(), 0f);
-    }
-
-    public boolean hasFightProperty(FightProperty prop) {
-        return this.getFightProperties().containsKey(prop.getId());
-    }
-
-    public void addAllFightPropsToEntityInfo(SceneEntityInfo.Builder entityInfo) {
-        this.getFightProperties()
-                .forEach(
-                        (key, value) -> {
-                            if (key == 0) return;
-                            entityInfo.addFightPropList(
-                                    FightPropPair.newBuilder().setPropType(key).setPropValue(value).build());
-                        });
-    }
-
-    protected MotionInfo getMotionInfo() {
-        return MotionInfo.newBuilder()
-                .setPos(this.getPosition().toProto())
-                .setRot(this.getRotation().toProto())
-                .setSpeed(Vector.newBuilder())
-                .setState(this.getMotionState())
-                .build();
-    }
-
-    public float heal(float amount) {
-        if (this.getFightProperties() == null) {
-            return 0f;
-        }
-
-        float curHp = this.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP);
-        float maxHp = this.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP);
-
-        if (curHp >= maxHp) {
-            return 0f;
-        }
-
-        float healed = Math.min(maxHp - curHp, amount);
-        this.addFightProperty(FightProperty.FIGHT_PROP_CUR_HP, healed);
-
-        this.getScene()
-                .broadcastPacket(
-                        new PacketEntityFightPropUpdateNotify(this, FightProperty.FIGHT_PROP_CUR_HP));
-
-        return healed;
-    }
-
-    public void damage(float amount) {
-        this.damage(amount, 0, ElementType.None);
-    }
-
-    public void damage(float amount, int killerId, ElementType attackType) {
-        // Check if the entity has properties.
-        if (this.getFightProperties() == null || !hasFightProperty(FightProperty.FIGHT_PROP_CUR_HP)) {
-            return;
-        }
-
-        // Invoke entity damage event.
-        EntityDamageEvent event =
-                new EntityDamageEvent(this, amount, attackType, this.getScene().getEntityById(killerId));
-        event.call();
-        if (event.isCanceled()) {
-            return; // If the event is canceled, do not damage the entity.
-        }
-
-        float curHp = getFightProperty(FightProperty.FIGHT_PROP_CUR_HP);
-        if (curHp != Float.POSITIVE_INFINITY && !lockHP || lockHP && curHp <= event.getDamage()) {
-            // Add negative HP to the current HP property.
-            this.addFightProperty(FightProperty.FIGHT_PROP_CUR_HP, -(event.getDamage()));
-        }
-
-        // Check if dead
-        boolean isDead = false;
-        if (this.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP) <= 0f) {
-            this.setFightProperty(FightProperty.FIGHT_PROP_CUR_HP, 0f);
-            isDead = true;
-        }
-
-        // Packets
-        this.getScene()
-                .broadcastPacket(
-                        new PacketEntityFightPropUpdateNotify(this, FightProperty.FIGHT_PROP_CUR_HP));
-
-        // Check if dead.
-        if (isDead) {
-            this.getScene().killEntity(this, killerId);
-        }
-    }
-
-    /**
-     * Runs the Lua callbacks for {@link EntityDamageEvent}.
-     *
-     * @param event The damage event.
-     */
-    public void runLuaCallbacks(EntityDamageEvent event) {
-        if (entityController != null) {
-            entityController.onBeHurt(this, event.getAttackElementType(), true);//todo is host handling
-        }
-    }
-
-    /**
-     * Move this entity to a new position.
-     *
-     * @param position The new position.
-     * @param rotation The new rotation.
-     */
-    public void move(Position position, Position rotation) {
-        // Set the position and rotation.
-        this.getPosition().set(position);
-        this.getRotation().set(rotation);
-    }
-
-    /**
-     * Called when a player interacts with this entity
-     *
-     * @param player Player that is interacting with this entity
-     * @param interactReq Interact request protobuf data
-     */
-    public void onInteract(Player player, GadgetInteractReq interactReq) {}
-
-    /** Called when this entity is added to the world */
-    public void onCreate() {}
-
-    public void onRemoved() {}
-
-    public void onTick(int sceneTime) {
-        if (entityController != null) {
-            entityController.onTimer(this, sceneTime);
-        }
-    }
-
-    public int onClientExecuteRequest(int param1, int param2, int param3) {
-        if (entityController != null) {
-            return entityController.onClientExecuteRequest(this, param1, param2, param3);
-        }
-        return 0;
-    }
-
-    /**
-     * Called when this entity dies
-     *
-     * @param killerId Entity id of the entity that killed this entity
-     */
-    public void onDeath(int killerId) {
-        // Invoke entity death event.
-        EntityDeathEvent event = new EntityDeathEvent(this, killerId);
-        event.call();
-
-        // Run Lua callbacks.
-        if (entityController != null) {
-            entityController.onDie(this, getLastAttackType());
-        }
-    }
-
-    public abstract SceneEntityInfo toProto();
-}
+package 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.props.LifeState;
+import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.game.world.SpawnDataEntry;
+import emu.grasscutter.game.world.World;
+import emu.grasscutter.net.proto.FightPropPairOuterClass.FightPropPair;
+import emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq;
+import emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo;
+import emu.grasscutter.net.proto.MotionStateOuterClass.MotionState;
+import emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
+import emu.grasscutter.net.proto.VectorOuterClass.Vector;
+import emu.grasscutter.scripts.data.controller.EntityController;
+import emu.grasscutter.server.event.entity.EntityDamageEvent;
+import emu.grasscutter.server.event.entity.EntityDeathEvent;
+import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
+import emu.grasscutter.utils.Position;
+import it.unimi.dsi.fastutil.ints.Int2FloatMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.objects.Object2FloatMap;
+import it.unimi.dsi.fastutil.objects.Object2FloatOpenHashMap;
+import lombok.Getter;
+import lombok.Setter;
+
+public abstract class GameEntity {
+    @Getter private final Scene scene;
+    @Getter protected int id;
+    @Getter @Setter private SpawnDataEntry spawnEntry;
+
+    @Getter @Setter private int blockId;
+    @Getter @Setter private int configId;
+    @Getter @Setter private int groupId;
+
+    @Getter @Setter private MotionState motionState;
+    @Getter @Setter private int lastMoveSceneTimeMs;
+    @Getter @Setter private int lastMoveReliableSeq;
+
+    @Getter @Setter private boolean lockHP;
+
+    // Lua controller for specific actions
+    @Getter @Setter private EntityController entityController;
+    @Getter private ElementType lastAttackType = ElementType.None;
+
+    // Abilities
+    private Object2FloatMap<String> metaOverrideMap;
+    private Int2ObjectMap<String> metaModifiers;
+
+    public GameEntity(Scene scene) {
+        this.scene = scene;
+        this.motionState = MotionState.MOTION_STATE_NONE;
+    }
+
+    public int getEntityType() {
+        return this.getId() >> 24;
+    }
+
+    public abstract int getEntityTypeId();
+
+    public World getWorld() {
+        return this.getScene().getWorld();
+    }
+
+    public boolean isAlive() {
+        return true;
+    }
+
+    public LifeState getLifeState() {
+        return this.isAlive() ? LifeState.LIFE_ALIVE : LifeState.LIFE_DEAD;
+    }
+
+    public Object2FloatMap<String> getMetaOverrideMap() {
+        if (this.metaOverrideMap == null) {
+            this.metaOverrideMap = new Object2FloatOpenHashMap<>();
+        }
+        return this.metaOverrideMap;
+    }
+
+    public Int2ObjectMap<String> getMetaModifiers() {
+        if (this.metaModifiers == null) {
+            this.metaModifiers = new Int2ObjectOpenHashMap<>();
+        }
+        return this.metaModifiers;
+    }
+
+    public abstract Int2FloatMap getFightProperties();
+
+    public abstract Position getPosition();
+
+    public abstract Position getRotation();
+
+    public void setFightProperty(FightProperty prop, float value) {
+        this.getFightProperties().put(prop.getId(), value);
+    }
+
+    public void setFightProperty(int id, float value) {
+        this.getFightProperties().put(id, value);
+    }
+
+    public void addFightProperty(FightProperty prop, float value) {
+        this.getFightProperties().put(prop.getId(), this.getFightProperty(prop) + value);
+    }
+
+    public float getFightProperty(FightProperty prop) {
+        return this.getFightProperties().getOrDefault(prop.getId(), 0f);
+    }
+
+    public boolean hasFightProperty(FightProperty prop) {
+        return this.getFightProperties().containsKey(prop.getId());
+    }
+
+    public void addAllFightPropsToEntityInfo(SceneEntityInfo.Builder entityInfo) {
+        this.getFightProperties()
+                .forEach(
+                        (key, value) -> {
+                            if (key == 0) return;
+                            entityInfo.addFightPropList(
+                                    FightPropPair.newBuilder().setPropType(key).setPropValue(value).build());
+                        });
+    }
+
+    protected MotionInfo getMotionInfo() {
+        return MotionInfo.newBuilder()
+                .setPos(this.getPosition().toProto())
+                .setRot(this.getRotation().toProto())
+                .setSpeed(Vector.newBuilder())
+                .setState(this.getMotionState())
+                .build();
+    }
+
+    public float heal(float amount) {
+        if (this.getFightProperties() == null) {
+            return 0f;
+        }
+
+        float curHp = this.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP);
+        float maxHp = this.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP);
+
+        if (curHp >= maxHp) {
+            return 0f;
+        }
+
+        float healed = Math.min(maxHp - curHp, amount);
+        this.addFightProperty(FightProperty.FIGHT_PROP_CUR_HP, healed);
+
+        this.getScene()
+                .broadcastPacket(
+                        new PacketEntityFightPropUpdateNotify(this, FightProperty.FIGHT_PROP_CUR_HP));
+
+        return healed;
+    }
+
+    public void damage(float amount) {
+        this.damage(amount, 0, ElementType.None);
+    }
+
+    public void damage(float amount, int killerId, ElementType attackType) {
+        // Check if the entity has properties.
+        if (this.getFightProperties() == null || !hasFightProperty(FightProperty.FIGHT_PROP_CUR_HP)) {
+            return;
+        }
+
+        // Invoke entity damage event.
+        EntityDamageEvent event =
+                new EntityDamageEvent(this, amount, attackType, this.getScene().getEntityById(killerId));
+        event.call();
+        if (event.isCanceled()) {
+            return; // If the event is canceled, do not damage the entity.
+        }
+
+        float curHp = getFightProperty(FightProperty.FIGHT_PROP_CUR_HP);
+        if (curHp != Float.POSITIVE_INFINITY && !lockHP || lockHP && curHp <= event.getDamage()) {
+            // Add negative HP to the current HP property.
+            this.addFightProperty(FightProperty.FIGHT_PROP_CUR_HP, -(event.getDamage()));
+        }
+
+        // Check if dead
+        boolean isDead = false;
+        if (this.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP) <= 0f) {
+            this.setFightProperty(FightProperty.FIGHT_PROP_CUR_HP, 0f);
+            isDead = true;
+        }
+
+        // Packets
+        this.getScene()
+                .broadcastPacket(
+                        new PacketEntityFightPropUpdateNotify(this, FightProperty.FIGHT_PROP_CUR_HP));
+
+        // Check if dead.
+        if (isDead) {
+            this.getScene().killEntity(this, killerId);
+        }
+    }
+
+    /**
+     * Runs the Lua callbacks for {@link EntityDamageEvent}.
+     *
+     * @param event The damage event.
+     */
+    public void runLuaCallbacks(EntityDamageEvent event) {
+        if (entityController != null) {
+            entityController.onBeHurt(this, event.getAttackElementType(), true); // todo is host handling
+        }
+    }
+
+    /**
+     * Move this entity to a new position.
+     *
+     * @param position The new position.
+     * @param rotation The new rotation.
+     */
+    public void move(Position position, Position rotation) {
+        // Set the position and rotation.
+        this.getPosition().set(position);
+        this.getRotation().set(rotation);
+    }
+
+    /**
+     * Called when a player interacts with this entity
+     *
+     * @param player Player that is interacting with this entity
+     * @param interactReq Interact request protobuf data
+     */
+    public void onInteract(Player player, GadgetInteractReq interactReq) {}
+
+    /** Called when this entity is added to the world */
+    public void onCreate() {}
+
+    public void onRemoved() {}
+
+    public void onTick(int sceneTime) {
+        if (entityController != null) {
+            entityController.onTimer(this, sceneTime);
+        }
+    }
+
+    public int onClientExecuteRequest(int param1, int param2, int param3) {
+        if (entityController != null) {
+            return entityController.onClientExecuteRequest(this, param1, param2, param3);
+        }
+        return 0;
+    }
+
+    /**
+     * Called when this entity dies
+     *
+     * @param killerId Entity id of the entity that killed this entity
+     */
+    public void onDeath(int killerId) {
+        // Invoke entity death event.
+        EntityDeathEvent event = new EntityDeathEvent(this, killerId);
+        event.call();
+
+        // Run Lua callbacks.
+        if (entityController != null) {
+            entityController.onDie(this, getLastAttackType());
+        }
+    }
+
+    public abstract SceneEntityInfo toProto();
+}

src/main/java/emu/grasscutter/game/entity/gadget/GadgetRewardStatue.java

@@ -1,33 +1,34 @@
-package emu.grasscutter.game.entity.gadget;
-
-import emu.grasscutter.game.dungeons.challenge.DungeonChallenge;
-import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq;
-import emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType;
-import emu.grasscutter.net.proto.ResinCostTypeOuterClass;
-import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo;
-import emu.grasscutter.server.packet.send.PacketGadgetInteractRsp;
-
-public final class GadgetRewardStatue extends GadgetContent {
-
-    public GadgetRewardStatue(EntityGadget gadget) {
-        super(gadget);
-    }
-
-    public boolean onInteract(Player player, GadgetInteractReq req) {
-        var dungeonManager = player.getScene().getDungeonManager();
-
-        if (player.getScene().getChallenge() instanceof DungeonChallenge) {
-            var useCondensed = req.getResinCostType() == ResinCostTypeOuterClass.ResinCostType.RESIN_COST_TYPE_CONDENSE;
-            dungeonManager.getStatueDrops(player, useCondensed, getGadget().getGroupId());
-        }
-
-        player.sendPacket(
-                new PacketGadgetInteractRsp(getGadget(), InteractType.INTERACT_TYPE_OPEN_STATUE));
-
-        return false;
-    }
-
-    public void onBuildProto(SceneGadgetInfo.Builder gadgetInfo) {}
-}
+package emu.grasscutter.game.entity.gadget;
+
+import emu.grasscutter.game.dungeons.challenge.DungeonChallenge;
+import emu.grasscutter.game.entity.EntityGadget;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq;
+import emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType;
+import emu.grasscutter.net.proto.ResinCostTypeOuterClass;
+import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo;
+import emu.grasscutter.server.packet.send.PacketGadgetInteractRsp;
+
+public final class GadgetRewardStatue extends GadgetContent {
+
+    public GadgetRewardStatue(EntityGadget gadget) {
+        super(gadget);
+    }
+
+    public boolean onInteract(Player player, GadgetInteractReq req) {
+        var dungeonManager = player.getScene().getDungeonManager();
+
+        if (player.getScene().getChallenge() instanceof DungeonChallenge) {
+            var useCondensed =
+                    req.getResinCostType() == ResinCostTypeOuterClass.ResinCostType.RESIN_COST_TYPE_CONDENSE;
+            dungeonManager.getStatueDrops(player, useCondensed, getGadget().getGroupId());
+        }
+
+        player.sendPacket(
+                new PacketGadgetInteractRsp(getGadget(), InteractType.INTERACT_TYPE_OPEN_STATUE));
+
+        return false;
+    }
+
+    public void onBuildProto(SceneGadgetInfo.Builder gadgetInfo) {}
+}

src/main/java/emu/grasscutter/game/entity/platform/EntitySolarIsotomaElevatorPlatform.java

@@ -1,40 +1,45 @@
-package emu.grasscutter.game.entity.platform;
-
-import emu.grasscutter.Grasscutter;
-import emu.grasscutter.data.binout.config.ConfigEntityGadget;
-import emu.grasscutter.game.entity.*;
-import emu.grasscutter.game.entity.gadget.GadgetAbility;
-import emu.grasscutter.game.entity.gadget.platform.AbilityRoute;
-import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.utils.Position;
-
-public class EntitySolarIsotomaElevatorPlatform extends EntityGadget {
-    public EntitySolarIsotomaElevatorPlatform(EntitySolarIsotomaClientGadget isotoma, Scene scene, int gadgetId, Position pos, Position rot) {
-        super(scene, gadgetId, pos, rot);
-        setOwner(isotoma);
-        this.setRouteConfig(new AbilityRoute(rot, false, false, pos));
-        this.setContent(new GadgetAbility(this, isotoma));
-    }
-
-    @Override
-    protected void fillFightProps(ConfigEntityGadget configGadget) {
-        if (configGadget == null || configGadget.getCombat() == null) {
-            return;
-        }
-        var combatData = configGadget.getCombat();
-        var combatProperties = combatData.getProperty();
-
-        if (combatProperties.isUseCreatorProperty()) {
-            //If useCreatorProperty == true, use owner's property;
-            GameEntity ownerEntity = getOwner();
-            if (ownerEntity != null) {
-                getFightProperties().putAll(ownerEntity.getFightProperties());
-                return;
-            } else {
-                Grasscutter.getLogger().warn("Why gadget owner is null?");
-            }
-        }
-
-        super.fillFightProps(configGadget);
-    }
-}
+package emu.grasscutter.game.entity.platform;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.binout.config.ConfigEntityGadget;
+import emu.grasscutter.game.entity.*;
+import emu.grasscutter.game.entity.gadget.GadgetAbility;
+import emu.grasscutter.game.entity.gadget.platform.AbilityRoute;
+import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.utils.Position;
+
+public class EntitySolarIsotomaElevatorPlatform extends EntityGadget {
+    public EntitySolarIsotomaElevatorPlatform(
+            EntitySolarIsotomaClientGadget isotoma,
+            Scene scene,
+            int gadgetId,
+            Position pos,
+            Position rot) {
+        super(scene, gadgetId, pos, rot);
+        setOwner(isotoma);
+        this.setRouteConfig(new AbilityRoute(rot, false, false, pos));
+        this.setContent(new GadgetAbility(this, isotoma));
+    }
+
+    @Override
+    protected void fillFightProps(ConfigEntityGadget configGadget) {
+        if (configGadget == null || configGadget.getCombat() == null) {
+            return;
+        }
+        var combatData = configGadget.getCombat();
+        var combatProperties = combatData.getProperty();
+
+        if (combatProperties.isUseCreatorProperty()) {
+            // If useCreatorProperty == true, use owner's property;
+            GameEntity ownerEntity = getOwner();
+            if (ownerEntity != null) {
+                getFightProperties().putAll(ownerEntity.getFightProperties());
+                return;
+            } else {
+                Grasscutter.getLogger().warn("Why gadget owner is null?");
+            }
+        }
+
+        super.fillFightProps(configGadget);
+    }
+}

src/main/java/emu/grasscutter/game/mail/Mail.java

@@ -1,163 +1,173 @@
-package emu.grasscutter.game.mail;
-
-import dev.morphia.annotations.Entity;
-import dev.morphia.annotations.Id;
-import dev.morphia.annotations.Indexed;
-import dev.morphia.annotations.Transient;
-import emu.grasscutter.database.DatabaseHelper;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.proto.*;
-import emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam;
-import emu.grasscutter.net.proto.MailCollectStateOuterClass.MailCollectState;
-import emu.grasscutter.net.proto.MailTextContentOuterClass.MailTextContent;
-import org.bson.types.ObjectId;
-
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.List;
-
-import static emu.grasscutter.net.proto.MailItemOuterClass.MailItem.*;
-
-@Entity(value = "mail", useDiscriminator = false)
-public final class Mail {
-	@Id private ObjectId id;
-	@Indexed private int ownerUid;
-    public MailContent mailContent;
-    public List<MailItem> itemList;
-    public long sendTime;
-    public long expireTime;
-    public int importance;
-    public boolean isRead;
-    public boolean isAttachmentGot;
-    public int stateValue;
-    @Transient private boolean shouldDelete;
-
-    public Mail() {
-        this(new MailContent(), new ArrayList<MailItem>(), (int) Instant.now().getEpochSecond() + 604800); // TODO: add expire time to send mail command
-    }
-
-    public Mail(MailContent mailContent, List<MailItem> itemList, long expireTime) {
-        this(mailContent, itemList, expireTime, 0);
-    }
-
-    public Mail(MailContent mailContent, List<MailItem> itemList, long expireTime, int importance) {
-        this(mailContent, itemList, expireTime, importance, 1);
-    }
-
-    public Mail(MailContent mailContent, List<MailItem> itemList, long expireTime, int importance, int state) {
-        this.mailContent = mailContent;
-        this.itemList = itemList;
-        this.sendTime = (int) Instant.now().getEpochSecond();
-        this.expireTime = expireTime;
-        this.importance = importance; // Starred mail, 0 = No star, 1 = Star.
-        this.isRead = false;
-        this.isAttachmentGot = false;
-        this.stateValue = state; // Different mailboxes, 1 = Default, 3 = Gift-box.
-    }
-
-    public ObjectId getId() {
-        return id;
-    }
-
-    public int getOwnerUid() {
-        return ownerUid;
-    }
-
-    public void setOwnerUid(int ownerUid) {
-        this.ownerUid = ownerUid;
-    }
-
-    public MailDataOuterClass.MailData toProto(Player player) {
-        return MailDataOuterClass.MailData.newBuilder()
-            .setMailId(player.getMailId(this))
-            .setMailTextContent(this.mailContent.toProto())
-            .addAllItemList(this.itemList.stream().map(MailItem::toProto).toList())
-            .setSendTime((int) this.sendTime)
-            .setExpireTime((int) this.expireTime)
-            .setImportance(this.importance)
-            .setIsRead(this.isRead)
-            .setIsAttachmentGot(this.isAttachmentGot)
-            .setCollectState(MailCollectState.MAIL_COLLECT_STATE_NOT_COLLECTIBLE)
-            .build();
-    }
-
-    @Entity
-    public static class MailContent {
-        public String title;
-        public String content;
-        public String sender;
-
-        public MailContent() {
-            this.title = "";
-            this.content = "loading...";
-            this.sender = "loading";
-        }
-
-        public MailContent(String title, String content) {
-            this(title, content, "Server");
-        }
-
-        public MailContent(String title, String content, Player sender) {
-            this(title, content, sender.getNickname());
-        }
-
-        public MailContent(String title, String content, String sender) {
-            this.title = title;
-            this.content = content;
-            this.sender = sender;
-        }
-
-        public MailTextContent toProto() {
-            return MailTextContent.newBuilder()
-                .setTitle(this.title)
-                .setContent(this.content)
-                .setSender(this.sender)
-                .build();
-        }
-    }
-
-    @Entity
-    public static class MailItem {
-        public int itemId;
-        public int itemCount;
-        public int itemLevel;
-
-        public MailItem() {
-            this.itemId = 11101;
-            this.itemCount = 1;
-            this.itemLevel = 1;
-        }
-
-        public MailItem(int itemId) {
-            this(itemId, 1);
-        }
-
-        public MailItem(int itemId, int itemCount) {
-            this(itemId, itemCount, 1);
-        }
-
-        public MailItem(int itemId, int itemCount, int itemLevel) {
-            this.itemId = itemId;
-            this.itemCount = itemCount;
-            this.itemLevel = itemLevel;
-        }
-
-        public MailItemOuterClass.MailItem toProto() {
-            return newBuilder().setEquipParam(EquipParam.newBuilder()
-                    .setItemId(this.itemId)
-                    .setItemNum(this.itemCount)
-                    .setItemLevel(this.itemLevel)
-                    .setPromoteLevel(0)//mock
-                    .build())
-                .build();
-        }
-    }
-
-	public void save() {
-		if (this.expireTime * 1000 < System.currentTimeMillis()) {
-			DatabaseHelper.deleteMail(this);
-		} else {
-			DatabaseHelper.saveMail(this);
-		}
-	}
-}
+package emu.grasscutter.game.mail;
+
+import static emu.grasscutter.net.proto.MailItemOuterClass.MailItem.*;
+
+import dev.morphia.annotations.Entity;
+import dev.morphia.annotations.Id;
+import dev.morphia.annotations.Indexed;
+import dev.morphia.annotations.Transient;
+import emu.grasscutter.database.DatabaseHelper;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.net.proto.*;
+import emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam;
+import emu.grasscutter.net.proto.MailCollectStateOuterClass.MailCollectState;
+import emu.grasscutter.net.proto.MailTextContentOuterClass.MailTextContent;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
+import org.bson.types.ObjectId;
+
+@Entity(value = "mail", useDiscriminator = false)
+public final class Mail {
+    @Id private ObjectId id;
+    @Indexed private int ownerUid;
+    public MailContent mailContent;
+    public List<MailItem> itemList;
+    public long sendTime;
+    public long expireTime;
+    public int importance;
+    public boolean isRead;
+    public boolean isAttachmentGot;
+    public int stateValue;
+    @Transient private boolean shouldDelete;
+
+    public Mail() {
+        this(
+                new MailContent(),
+                new ArrayList<MailItem>(),
+                (int) Instant.now().getEpochSecond()
+                        + 604800); // TODO: add expire time to send mail command
+    }
+
+    public Mail(MailContent mailContent, List<MailItem> itemList, long expireTime) {
+        this(mailContent, itemList, expireTime, 0);
+    }
+
+    public Mail(MailContent mailContent, List<MailItem> itemList, long expireTime, int importance) {
+        this(mailContent, itemList, expireTime, importance, 1);
+    }
+
+    public Mail(
+            MailContent mailContent,
+            List<MailItem> itemList,
+            long expireTime,
+            int importance,
+            int state) {
+        this.mailContent = mailContent;
+        this.itemList = itemList;
+        this.sendTime = (int) Instant.now().getEpochSecond();
+        this.expireTime = expireTime;
+        this.importance = importance; // Starred mail, 0 = No star, 1 = Star.
+        this.isRead = false;
+        this.isAttachmentGot = false;
+        this.stateValue = state; // Different mailboxes, 1 = Default, 3 = Gift-box.
+    }
+
+    public ObjectId getId() {
+        return id;
+    }
+
+    public int getOwnerUid() {
+        return ownerUid;
+    }
+
+    public void setOwnerUid(int ownerUid) {
+        this.ownerUid = ownerUid;
+    }
+
+    public MailDataOuterClass.MailData toProto(Player player) {
+        return MailDataOuterClass.MailData.newBuilder()
+                .setMailId(player.getMailId(this))
+                .setMailTextContent(this.mailContent.toProto())
+                .addAllItemList(this.itemList.stream().map(MailItem::toProto).toList())
+                .setSendTime((int) this.sendTime)
+                .setExpireTime((int) this.expireTime)
+                .setImportance(this.importance)
+                .setIsRead(this.isRead)
+                .setIsAttachmentGot(this.isAttachmentGot)
+                .setCollectState(MailCollectState.MAIL_COLLECT_STATE_NOT_COLLECTIBLE)
+                .build();
+    }
+
+    @Entity
+    public static class MailContent {
+        public String title;
+        public String content;
+        public String sender;
+
+        public MailContent() {
+            this.title = "";
+            this.content = "loading...";
+            this.sender = "loading";
+        }
+
+        public MailContent(String title, String content) {
+            this(title, content, "Server");
+        }
+
+        public MailContent(String title, String content, Player sender) {
+            this(title, content, sender.getNickname());
+        }
+
+        public MailContent(String title, String content, String sender) {
+            this.title = title;
+            this.content = content;
+            this.sender = sender;
+        }
+
+        public MailTextContent toProto() {
+            return MailTextContent.newBuilder()
+                    .setTitle(this.title)
+                    .setContent(this.content)
+                    .setSender(this.sender)
+                    .build();
+        }
+    }
+
+    @Entity
+    public static class MailItem {
+        public int itemId;
+        public int itemCount;
+        public int itemLevel;
+
+        public MailItem() {
+            this.itemId = 11101;
+            this.itemCount = 1;
+            this.itemLevel = 1;
+        }
+
+        public MailItem(int itemId) {
+            this(itemId, 1);
+        }
+
+        public MailItem(int itemId, int itemCount) {
+            this(itemId, itemCount, 1);
+        }
+
+        public MailItem(int itemId, int itemCount, int itemLevel) {
+            this.itemId = itemId;
+            this.itemCount = itemCount;
+            this.itemLevel = itemLevel;
+        }
+
+        public MailItemOuterClass.MailItem toProto() {
+            return newBuilder()
+                    .setEquipParam(
+                            EquipParam.newBuilder()
+                                    .setItemId(this.itemId)
+                                    .setItemNum(this.itemCount)
+                                    .setItemLevel(this.itemLevel)
+                                    .setPromoteLevel(0) // mock
+                                    .build())
+                    .build();
+        }
+    }
+
+    public void save() {
+        if (this.expireTime * 1000 < System.currentTimeMillis()) {
+            DatabaseHelper.deleteMail(this);
+        } else {
+            DatabaseHelper.saveMail(this);
+        }
+    }
+}

src/main/java/emu/grasscutter/game/managers/blossom/BlossomActivity.java

@@ -1,133 +1,146 @@
-package emu.grasscutter.game.managers.blossom;
-
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
-import emu.grasscutter.game.dungeons.challenge.trigger.ChallengeTrigger;
-import emu.grasscutter.game.dungeons.challenge.trigger.KillMonsterCountTrigger;
-import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.game.entity.EntityMonster;
-import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.scripts.data.SceneBossChest;
-import emu.grasscutter.scripts.data.SceneGadget;
-import emu.grasscutter.scripts.data.SceneGroup;
-import emu.grasscutter.utils.Position;
-import emu.grasscutter.utils.Utils;
-
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Queue;
-
-public final class BlossomActivity {
-
-    private final SceneGroup tempSceneGroup;
-    private final WorldChallenge challenge;
-    private final EntityGadget gadget;
-    private EntityGadget chest;
-    private int step;
-    private final int goal;
-    private int generatedCount;
-    private final int worldLevel;
-    private boolean pass=false;
-    private final List<EntityMonster> activeMonsters = new ArrayList<>();
-    private final Queue<Integer> candidateMonsters = new ArrayDeque<>();
-    private static final int BLOOMING_GADGET_ID = 70210109;
-    public BlossomActivity(EntityGadget entityGadget, List<Integer> monsters, int timeout, int worldLevel) {
-        this.tempSceneGroup = new SceneGroup();
-        this.tempSceneGroup.id = entityGadget.getId();
-        this.gadget=entityGadget;
-        this.step=0;
-        this.goal = monsters.size();
-        this.candidateMonsters.addAll(monsters);
-        this.worldLevel = worldLevel;
-        ArrayList<ChallengeTrigger> challengeTriggers = new ArrayList<>();
-        this.challenge = new WorldChallenge(entityGadget.getScene(),
-            tempSceneGroup,
-            1,
-            1,
-            List.of(goal, timeout),
-            timeout,
-            goal, challengeTriggers);
-        challengeTriggers.add(new KillMonsterCountTrigger());
-        //this.challengeTriggers.add(new InTimeTrigger());
-    }
-    public WorldChallenge getChallenge() {
-        return this.challenge;
-    }
-    public void setMonsters(List<EntityMonster> monsters) {
-        this.activeMonsters.clear();
-        this.activeMonsters.addAll(monsters);
-        for (EntityMonster monster : monsters) {
-            monster.setGroupId(this.tempSceneGroup.id);
-        }
-    }
-    public int getAliveMonstersCount() {
-        int count=0;
-        for (EntityMonster monster: activeMonsters) {
-            if (monster.isAlive()) {
-                count++;
-            }
-        }
-        return count;
-    }
-    public boolean getPass() {
-        return pass;
-    }
-    public void start() {
-        challenge.start();
-    }
-    public void onTick() {
-        Scene scene = gadget.getScene();
-        Position pos = gadget.getPosition();
-        if (getAliveMonstersCount() <= 2) {
-            if (generatedCount<goal) {
-                step++;
-
-                var worldLevelData = GameData.getWorldLevelDataMap().get(worldLevel);
-                int worldLevelOverride = 0;
-                if (worldLevelData != null) {
-                    worldLevelOverride = worldLevelData.getMonsterLevel();
-                }
-
-                List<EntityMonster> newMonsters = new ArrayList<>();
-                int willSpawn = Utils.randomRange(3,5);
-                if (generatedCount+willSpawn>goal) {
-                    willSpawn = goal - generatedCount;
-                }
-                generatedCount+=willSpawn;
-                for (int i = 0; i < willSpawn; i++) {
-                    var monsterData = GameData.getMonsterDataMap().get(candidateMonsters.poll());
-                    int level = scene.getEntityLevel(1, worldLevelOverride);
-                    EntityMonster entity = new EntityMonster(scene, monsterData, pos.nearby2d(4f), level);
-                    scene.addEntity(entity);
-                    newMonsters.add(entity);
-                }
-                setMonsters(newMonsters);
-            }else {
-                if (getAliveMonstersCount() == 0) {
-                    this.pass = true;
-                    this.challenge.done();
-                }
-            }
-        }
-    }
-    public EntityGadget getGadget() {
-        return gadget;
-    }
-    public EntityGadget getChest() {
-        if (chest==null) {
-            EntityGadget rewardGadget = new EntityGadget(gadget.getScene(), BLOOMING_GADGET_ID, gadget.getPosition());
-            SceneGadget metaGadget = new SceneGadget();
-            metaGadget.boss_chest = new SceneBossChest();
-            metaGadget.boss_chest.resin = 20;
-            rewardGadget.setFightProperty(FightProperty.FIGHT_PROP_BASE_HP, Float.POSITIVE_INFINITY);
-            rewardGadget.setFightProperty(FightProperty.FIGHT_PROP_CUR_HP, Float.POSITIVE_INFINITY);
-            rewardGadget.setFightProperty(FightProperty.FIGHT_PROP_MAX_HP, Float.POSITIVE_INFINITY);
-            rewardGadget.setMetaGadget(metaGadget);
-            rewardGadget.buildContent();
-            chest = rewardGadget;
-        }
-        return chest;
-    }
-}
+package emu.grasscutter.game.managers.blossom;
+
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
+import emu.grasscutter.game.dungeons.challenge.trigger.ChallengeTrigger;
+import emu.grasscutter.game.dungeons.challenge.trigger.KillMonsterCountTrigger;
+import emu.grasscutter.game.entity.EntityGadget;
+import emu.grasscutter.game.entity.EntityMonster;
+import emu.grasscutter.game.props.FightProperty;
+import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.scripts.data.SceneBossChest;
+import emu.grasscutter.scripts.data.SceneGadget;
+import emu.grasscutter.scripts.data.SceneGroup;
+import emu.grasscutter.utils.Position;
+import emu.grasscutter.utils.Utils;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Queue;
+
+public final class BlossomActivity {
+
+    private final SceneGroup tempSceneGroup;
+    private final WorldChallenge challenge;
+    private final EntityGadget gadget;
+    private EntityGadget chest;
+    private int step;
+    private final int goal;
+    private int generatedCount;
+    private final int worldLevel;
+    private boolean pass = false;
+    private final List<EntityMonster> activeMonsters = new ArrayList<>();
+    private final Queue<Integer> candidateMonsters = new ArrayDeque<>();
+    private static final int BLOOMING_GADGET_ID = 70210109;
+
+    public BlossomActivity(
+            EntityGadget entityGadget, List<Integer> monsters, int timeout, int worldLevel) {
+        this.tempSceneGroup = new SceneGroup();
+        this.tempSceneGroup.id = entityGadget.getId();
+        this.gadget = entityGadget;
+        this.step = 0;
+        this.goal = monsters.size();
+        this.candidateMonsters.addAll(monsters);
+        this.worldLevel = worldLevel;
+        ArrayList<ChallengeTrigger> challengeTriggers = new ArrayList<>();
+        this.challenge =
+                new WorldChallenge(
+                        entityGadget.getScene(),
+                        tempSceneGroup,
+                        1,
+                        1,
+                        List.of(goal, timeout),
+                        timeout,
+                        goal,
+                        challengeTriggers);
+        challengeTriggers.add(new KillMonsterCountTrigger());
+        // this.challengeTriggers.add(new InTimeTrigger());
+    }
+
+    public WorldChallenge getChallenge() {
+        return this.challenge;
+    }
+
+    public void setMonsters(List<EntityMonster> monsters) {
+        this.activeMonsters.clear();
+        this.activeMonsters.addAll(monsters);
+        for (EntityMonster monster : monsters) {
+            monster.setGroupId(this.tempSceneGroup.id);
+        }
+    }
+
+    public int getAliveMonstersCount() {
+        int count = 0;
+        for (EntityMonster monster : activeMonsters) {
+            if (monster.isAlive()) {
+                count++;
+            }
+        }
+        return count;
+    }
+
+    public boolean getPass() {
+        return pass;
+    }
+
+    public void start() {
+        challenge.start();
+    }
+
+    public void onTick() {
+        Scene scene = gadget.getScene();
+        Position pos = gadget.getPosition();
+        if (getAliveMonstersCount() <= 2) {
+            if (generatedCount < goal) {
+                step++;
+
+                var worldLevelData = GameData.getWorldLevelDataMap().get(worldLevel);
+                int worldLevelOverride = 0;
+                if (worldLevelData != null) {
+                    worldLevelOverride = worldLevelData.getMonsterLevel();
+                }
+
+                List<EntityMonster> newMonsters = new ArrayList<>();
+                int willSpawn = Utils.randomRange(3, 5);
+                if (generatedCount + willSpawn > goal) {
+                    willSpawn = goal - generatedCount;
+                }
+                generatedCount += willSpawn;
+                for (int i = 0; i < willSpawn; i++) {
+                    var monsterData = GameData.getMonsterDataMap().get(candidateMonsters.poll());
+                    int level = scene.getEntityLevel(1, worldLevelOverride);
+                    EntityMonster entity = new EntityMonster(scene, monsterData, pos.nearby2d(4f), level);
+                    scene.addEntity(entity);
+                    newMonsters.add(entity);
+                }
+                setMonsters(newMonsters);
+            } else {
+                if (getAliveMonstersCount() == 0) {
+                    this.pass = true;
+                    this.challenge.done();
+                }
+            }
+        }
+    }
+
+    public EntityGadget getGadget() {
+        return gadget;
+    }
+
+    public EntityGadget getChest() {
+        if (chest == null) {
+            EntityGadget rewardGadget =
+                    new EntityGadget(gadget.getScene(), BLOOMING_GADGET_ID, gadget.getPosition());
+            SceneGadget metaGadget = new SceneGadget();
+            metaGadget.boss_chest = new SceneBossChest();
+            metaGadget.boss_chest.resin = 20;
+            rewardGadget.setFightProperty(FightProperty.FIGHT_PROP_BASE_HP, Float.POSITIVE_INFINITY);
+            rewardGadget.setFightProperty(FightProperty.FIGHT_PROP_CUR_HP, Float.POSITIVE_INFINITY);
+            rewardGadget.setFightProperty(FightProperty.FIGHT_PROP_MAX_HP, Float.POSITIVE_INFINITY);
+            rewardGadget.setMetaGadget(metaGadget);
+            rewardGadget.buildContent();
+            chest = rewardGadget;
+        }
+        return chest;
+    }
+}

src/main/java/emu/grasscutter/game/managers/energy/EnergyManager.java

@@ -1,418 +1,420 @@
-package emu.grasscutter.game.managers.energy;
-
-import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
-
-import com.google.protobuf.InvalidProtocolBufferException;
-import emu.grasscutter.Grasscutter;
-import emu.grasscutter.data.DataLoader;
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.excels.ItemData;
-import emu.grasscutter.data.excels.avatar.AvatarSkillDepotData;
-import emu.grasscutter.data.excels.monster.MonsterData.HpDrops;
-import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.game.entity.*;
-import emu.grasscutter.game.player.BasePlayerManager;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.ElementType;
-import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.game.props.MonsterType;
-import emu.grasscutter.game.props.WeaponType;
-import emu.grasscutter.net.proto.AbilityActionGenerateElemBallOuterClass.AbilityActionGenerateElemBall;
-import emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier;
-import emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry;
-import emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult;
-import emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason;
-import emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo;
-import emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason;
-import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.utils.Position;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import it.unimi.dsi.fastutil.objects.Object2IntMap;
-import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
-import lombok.Getter;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.ThreadLocalRandom;
-
-public class EnergyManager extends BasePlayerManager {
-    private static final Int2ObjectMap<List<EnergyDropInfo>> energyDropData =
-            new Int2ObjectOpenHashMap<>();
-    private static final Int2ObjectMap<List<SkillParticleGenerationInfo>>
-            skillParticleGenerationData = new Int2ObjectOpenHashMap<>();
-    private final Object2IntMap<EntityAvatar> avatarNormalProbabilities;
-    @Getter private boolean energyUsage; // Should energy usage be enabled for this player?
-
-    public EnergyManager(Player player) {
-        super(player);
-        this.avatarNormalProbabilities = new Object2IntOpenHashMap<>();
-        this.energyUsage = GAME_OPTIONS.energyUsage;
-    }
-
-    public static void initialize() {
-        // Read the data we need for monster energy drops.
-        try {
-            DataLoader.loadList("EnergyDrop.json", EnergyDropEntry.class)
-                    .forEach(
-                            entry -> {
-                                energyDropData.put(entry.getDropId(), entry.getDropList());
-                            });
-
-            Grasscutter.getLogger().debug("Energy drop data successfully loaded.");
-        } catch (Exception ex) {
-            Grasscutter.getLogger().error("Unable to load energy drop data.", ex);
-        }
-
-        // Read the data for particle generation from skills
-        try {
-            DataLoader.loadList("SkillParticleGeneration.json", SkillParticleGenerationEntry.class)
-                    .forEach(
-                            entry -> {
-                                skillParticleGenerationData.put(entry.getAvatarId(), entry.getAmountList());
-                            });
-
-            Grasscutter.getLogger().debug("Skill particle generation data successfully loaded.");
-        } catch (Exception ex) {
-            Grasscutter.getLogger().error("Unable to load skill particle generation data data.", ex);
-        }
-    }
-
-    /** Particle creation for elemental skills. */
-    private int getBallCountForAvatar(int avatarId) {
-        // We default to two particles.
-        int count = 2;
-
-        // If we don't have any data for this avatar, stop.
-        if (!skillParticleGenerationData.containsKey(avatarId)) {
-            Grasscutter.getLogger().warn("No particle generation data for avatarId {} found.", avatarId);
-        }
-        // If we do have data, roll for how many particles we should generate.
-        else {
-            int roll = ThreadLocalRandom.current().nextInt(0, 100);
-            int percentageStack = 0;
-            for (SkillParticleGenerationInfo info : skillParticleGenerationData.get(avatarId)) {
-                int chance = info.getChance();
-                percentageStack += chance;
-                if (roll < percentageStack) {
-                    count = info.getValue();
-                    break;
-                }
-            }
-        }
-
-        // Done.
-        return count;
-    }
-
-    private int getBallIdForElement(ElementType element) {
-        // If we have no element, we default to an element-less particle.
-        if (element == null) {
-            return 2024;
-        }
-
-        // Otherwise, we determine the particle's ID based on the element.
-        return switch (element) {
-            case Fire -> 2017;
-            case Water -> 2018;
-            case Grass -> 2019;
-            case Electric -> 2020;
-            case Wind -> 2021;
-            case Ice -> 2022;
-            case Rock -> 2023;
-            default -> 2024;
-        };
-    }
-
-    public void handleGenerateElemBall(AbilityInvokeEntry invoke)
-            throws InvalidProtocolBufferException {
-        // ToDo:
-        // This is also called when a weapon like Favonius Warbow etc. creates energy through its
-        // passive.
-        // We are not handling this correctly at the moment.
-
-        // Get action info.
-        AbilityActionGenerateElemBall action =
-                AbilityActionGenerateElemBall.parseFrom(invoke.getAbilityData());
-        if (action == null) {
-            return;
-        }
-
-        // Default to an elementless particle.
-        int itemId = 2024;
-
-        // Generate 2 particles by default.
-        int amount = 2;
-
-        // Try to get the casting avatar from the player's party.
-        Optional<EntityAvatar> avatarEntity =
-                this.getCastingAvatarEntityForEnergy(invoke.getEntityId());
-
-        // Bug: invokes twice sometimes, Ayato, Keqing
-        // ToDo: deal with press, hold difference. deal with charge(Beidou, Yunjin)
-        if (avatarEntity.isPresent()) {
-            Avatar avatar = avatarEntity.get().getAvatar();
-
-            if (avatar != null) {
-                int avatarId = avatar.getAvatarId();
-                AvatarSkillDepotData skillDepotData = avatar.getSkillDepot();
-
-                // Determine how many particles we need to create for this avatar.
-                amount = this.getBallCountForAvatar(avatarId);
-
-                // Determine the avatar's element, and based on that the ID of the
-                // particles we have to generate.
-                if (skillDepotData != null) {
-                    ElementType element = skillDepotData.getElementType();
-                    itemId = this.getBallIdForElement(element);
-                }
-            }
-        }
-
-        // Generate the particles.
-        var pos = new Position(action.getPos());
-        for (int i = 0; i < amount; i++) {
-            this.generateElemBall(itemId, pos, 1);
-        }
-    }
-
-    /**
-     * Energy generation for NAs/CAs.
-     *
-     * @param avatar The avatar.
-     */
-    private void generateEnergyForNormalAndCharged(EntityAvatar avatar) {
-        // This logic is based on the descriptions given in
-        //     https://genshin-impact.fandom.com/wiki/Energy#Energy_Generated_by_Normal_Attacks
-        //     https://library.keqingmains.com/combat-mechanics/energy#auto-attacking
-        // Those descriptions are lacking in some information, so this implementation most likely
-        // does not fully replicate the behavior of the official server. Open questions:
-        //    - Does the probability for a character reset after some time?
-        //    - Does the probability for a character reset when switching them out?
-        //    - Does this really count every individual hit separately?
-
-        // Get the avatar's weapon type.
-        WeaponType weaponType = avatar.getAvatar().getAvatarData().getWeaponType();
-
-        // Check if we already have probability data for this avatar. If not, insert it.
-        if (!this.avatarNormalProbabilities.containsKey(avatar)) {
-            this.avatarNormalProbabilities.put(avatar, weaponType.getEnergyGainInitialProbability());
-        }
-
-        // Roll for energy.
-        int currentProbability = this.avatarNormalProbabilities.getInt(avatar);
-        int roll = ThreadLocalRandom.current().nextInt(0, 100);
-
-        // If the player wins the roll, we increase the avatar's energy and reset the probability.
-        if (roll < currentProbability) {
-            avatar.addEnergy(1.0f, PropChangeReason.PROP_CHANGE_REASON_ABILITY, true);
-            this.avatarNormalProbabilities.put(avatar, weaponType.getEnergyGainInitialProbability());
-        }
-        // Otherwise, we increase the probability for the next hit.
-        else {
-            this.avatarNormalProbabilities.put(
-                    avatar, currentProbability + weaponType.getEnergyGainIncreaseProbability());
-        }
-    }
-
-    public void handleAttackHit(EvtBeingHitInfo hitInfo) {
-        // Get the attack result.
-        AttackResult attackRes = hitInfo.getAttackResult();
-
-        // Make sure the attack was performed by the currently active avatar. If not, we ignore the hit.
-        Optional<EntityAvatar> attackerEntity =
-                this.getCastingAvatarEntityForEnergy(attackRes.getAttackerId());
-        if (attackerEntity.isEmpty()
-                || this.player.getTeamManager().getCurrentAvatarEntity().getId()
-                        != attackerEntity.get().getId()) {
-            return;
-        }
-
-        // Make sure the target is an actual enemy.
-        GameEntity targetEntity = this.player.getScene().getEntityById(attackRes.getDefenseId());
-        if (!(targetEntity instanceof EntityMonster targetMonster)) {
-            return;
-        }
-
-        MonsterType targetType = targetMonster.getMonsterData().getType();
-        if (targetType != MonsterType.MONSTER_ORDINARY && targetType != MonsterType.MONSTER_BOSS) {
-            return;
-        }
-
-        // Get the ability that caused this hit.
-        AbilityIdentifier ability = attackRes.getAbilityIdentifier();
-
-        // Make sure there is no actual "ability" associated with the hit. For now, this is how we
-        // identify normal and charged attacks. Note that this is not completely accurate:
-        //    - Many character's charged attacks have an ability associated with them. This means that,
-        //      for now, we don't identify charged attacks reliably.
-        //    - There might also be some cases where we incorrectly identify something as a normal or
-        //      charged attack that is not (Diluc's E?).
-        //    - Catalyst normal attacks have an ability, so we don't handle those for now.
-        // ToDo: Fix all of that.
-        if (ability != AbilityIdentifier.getDefaultInstance()) {
-            return;
-        }
-
-        // Handle the energy generation.
-        this.generateEnergyForNormalAndCharged(attackerEntity.get());
-    }
-
-    /*
-     * Energy logic related to using skills.
-     */
-
-    private void handleBurstCast(Avatar avatar, int skillId) {
-        // Don't do anything if energy usage is disabled.
-        if (!GAME_OPTIONS.energyUsage || !this.energyUsage) {
-            return;
-        }
-
-        // If the cast skill was a burst, consume energy.
-        if (avatar.getSkillDepot() != null && skillId == avatar.getSkillDepot().getEnergySkill()) {
-            avatar.getAsEntity().clearEnergy(ChangeEnergyReason.CHANGE_ENERGY_REASON_SKILL_START);
-        }
-    }
-
-    public void handleEvtDoSkillSuccNotify(GameSession session, int skillId, int casterId) {
-        // Determine the entity that has cast the skill. Cancel if we can't find that avatar.
-        Optional<EntityAvatar> caster =
-                this.player.getTeamManager().getActiveTeam().stream()
-                        .filter(character -> character.getId() == casterId)
-                        .findFirst();
-
-        if (caster.isEmpty()) {
-            return;
-        }
-
-        Avatar avatar = caster.get().getAvatar();
-
-        // Handle elemental burst.
-        this.handleBurstCast(avatar, skillId);
-    }
-
-    /*
-     * Monster energy drops.
-     */
-
-    private void generateElemBallDrops(EntityMonster monster, int dropId) {
-        // Generate all drops specified for the given drop id.
-        if (!energyDropData.containsKey(dropId)) {
-            Grasscutter.getLogger().warn("No drop data for dropId {} found.", dropId);
-            return;
-        }
-
-        for (EnergyDropInfo info : energyDropData.get(dropId)) {
-            this.generateElemBall(info.getBallId(), monster.getPosition(), info.getCount());
-        }
-    }
-
-    public void handleMonsterEnergyDrop(
-            EntityMonster monster, float hpBeforeDamage, float hpAfterDamage) {
-        // Make sure this is actually a monster.
-        // Note that some wildlife also has that type, like boars or birds.
-        MonsterType type = monster.getMonsterData().getType();
-        if (type != MonsterType.MONSTER_ORDINARY && type != MonsterType.MONSTER_BOSS) {
-            return;
-        }
-
-        // Calculate the HP thresholds for before and after the damage was taken.
-        float maxHp = monster.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP);
-        float thresholdBefore = hpBeforeDamage / maxHp;
-        float thresholdAfter = hpAfterDamage / maxHp;
-
-        // Determine the thresholds the monster has passed, and generate drops based on that.
-        for (HpDrops drop : monster.getMonsterData().getHpDrops()) {
-            if (drop.getDropId() == 0) {
-                continue;
-            }
-
-            float threshold = drop.getHpPercent() / 100.0f;
-            if (threshold < thresholdBefore && threshold >= thresholdAfter) {
-                this.generateElemBallDrops(monster, drop.getDropId());
-            }
-        }
-
-        // Handle kill drops.
-        if (hpAfterDamage <= 0 && monster.getMonsterData().getKillDropId() != 0) {
-            this.generateElemBallDrops(monster, monster.getMonsterData().getKillDropId());
-        }
-    }
-
-    /*
-     * Utilities.
-     */
-
-    private void generateElemBall(int ballId, Position position, int count) {
-        // Generate a particle/orb with the specified parameters.
-        ItemData itemData = GameData.getItemDataMap().get(ballId);
-        if (itemData == null) {
-            return;
-        }
-
-        EntityItem energyBall =
-                new EntityItem(this.getPlayer().getScene(), this.getPlayer(), itemData, position, count);
-        this.getPlayer().getScene().addEntity(energyBall);
-    }
-
-    private Optional<EntityAvatar> getCastingAvatarEntityForEnergy(int invokeEntityId) {
-        // To determine the avatar that has cast the skill that caused the energy particle to be
-        // generated,
-        // we have to look at the entity that has invoked the ability. This can either be that avatar
-        // directly,
-        // or it can be an `EntityClientGadget`, owned (some way up the owner hierarchy) by the avatar
-        // that cast the skill.
-
-        // Try to get the invoking entity from the scene.
-        GameEntity entity = this.player.getScene().getEntityById(invokeEntityId);
-
-        // Determine the ID of the entity that originally cast this skill. If the scene entity is null,
-        // or not an `EntityClientGadget`, we assume that we are directly looking at the casting avatar
-        // (the null case will happen if the avatar was switched out between casting the skill and the
-        // particle being generated). If the scene entity is an `EntityClientGadget`, we need to find
-        // the
-        // ID of the original owner of that gadget.
-        int avatarEntityId =
-                (!(entity instanceof EntityClientGadget))
-                        ? invokeEntityId
-                        : ((EntityClientGadget) entity).getOriginalOwnerEntityId();
-
-        // Finally, find the avatar entity in the player's team.
-        return this.player.getTeamManager().getActiveTeam().stream()
-                .filter(character -> character.getId() == avatarEntityId)
-                .findFirst();
-    }
-
-    /**
-     * Refills the energy of the active avatar.
-     *
-     * @return True if the energy was refilled, false otherwise.
-     */
-    public boolean refillActiveEnergy() {
-        var activeEntity = this.player.getTeamManager().getCurrentAvatarEntity();
-        return activeEntity.addEnergy(activeEntity.getAvatar().getSkillDepot().getEnergySkillData().getCostElemVal());
-    }
-
-    /**
-     * Refills the energy of the entire team.
-     *
-     * @param changeReason The reason for the energy change.
-     * @param isFlat Whether the energy should be added as a flat value.
-     */
-    public void refillTeamEnergy(PropChangeReason changeReason, boolean isFlat) {
-        for (var entityAvatar : this.player.getTeamManager().getActiveTeam()) {
-            // giving the exact amount read off the AvatarSkillData.json
-            entityAvatar.addEnergy(entityAvatar.getAvatar().getSkillDepot()
-                .getEnergySkillData().getCostElemVal(), changeReason, isFlat);
-        }
-    }
-
-    public void setEnergyUsage(boolean energyUsage) {
-        this.energyUsage = energyUsage;
-        if (!energyUsage) { // Refill team energy if usage is disabled
-            for (EntityAvatar entityAvatar : this.player.getTeamManager().getActiveTeam()) {
-                entityAvatar.addEnergy(1000, PropChangeReason.PROP_CHANGE_REASON_GM, true);
-            }
-        }
-    }
-}
+package emu.grasscutter.game.managers.energy;
+
+import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
+
+import com.google.protobuf.InvalidProtocolBufferException;
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.DataLoader;
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.excels.ItemData;
+import emu.grasscutter.data.excels.avatar.AvatarSkillDepotData;
+import emu.grasscutter.data.excels.monster.MonsterData.HpDrops;
+import emu.grasscutter.game.avatar.Avatar;
+import emu.grasscutter.game.entity.*;
+import emu.grasscutter.game.player.BasePlayerManager;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.ElementType;
+import emu.grasscutter.game.props.FightProperty;
+import emu.grasscutter.game.props.MonsterType;
+import emu.grasscutter.game.props.WeaponType;
+import emu.grasscutter.net.proto.AbilityActionGenerateElemBallOuterClass.AbilityActionGenerateElemBall;
+import emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier;
+import emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry;
+import emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult;
+import emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason;
+import emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo;
+import emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.utils.Position;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.objects.Object2IntMap;
+import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.ThreadLocalRandom;
+import lombok.Getter;
+
+public class EnergyManager extends BasePlayerManager {
+    private static final Int2ObjectMap<List<EnergyDropInfo>> energyDropData =
+            new Int2ObjectOpenHashMap<>();
+    private static final Int2ObjectMap<List<SkillParticleGenerationInfo>>
+            skillParticleGenerationData = new Int2ObjectOpenHashMap<>();
+    private final Object2IntMap<EntityAvatar> avatarNormalProbabilities;
+    @Getter private boolean energyUsage; // Should energy usage be enabled for this player?
+
+    public EnergyManager(Player player) {
+        super(player);
+        this.avatarNormalProbabilities = new Object2IntOpenHashMap<>();
+        this.energyUsage = GAME_OPTIONS.energyUsage;
+    }
+
+    public static void initialize() {
+        // Read the data we need for monster energy drops.
+        try {
+            DataLoader.loadList("EnergyDrop.json", EnergyDropEntry.class)
+                    .forEach(
+                            entry -> {
+                                energyDropData.put(entry.getDropId(), entry.getDropList());
+                            });
+
+            Grasscutter.getLogger().debug("Energy drop data successfully loaded.");
+        } catch (Exception ex) {
+            Grasscutter.getLogger().error("Unable to load energy drop data.", ex);
+        }
+
+        // Read the data for particle generation from skills
+        try {
+            DataLoader.loadList("SkillParticleGeneration.json", SkillParticleGenerationEntry.class)
+                    .forEach(
+                            entry -> {
+                                skillParticleGenerationData.put(entry.getAvatarId(), entry.getAmountList());
+                            });
+
+            Grasscutter.getLogger().debug("Skill particle generation data successfully loaded.");
+        } catch (Exception ex) {
+            Grasscutter.getLogger().error("Unable to load skill particle generation data data.", ex);
+        }
+    }
+
+    /** Particle creation for elemental skills. */
+    private int getBallCountForAvatar(int avatarId) {
+        // We default to two particles.
+        int count = 2;
+
+        // If we don't have any data for this avatar, stop.
+        if (!skillParticleGenerationData.containsKey(avatarId)) {
+            Grasscutter.getLogger().warn("No particle generation data for avatarId {} found.", avatarId);
+        }
+        // If we do have data, roll for how many particles we should generate.
+        else {
+            int roll = ThreadLocalRandom.current().nextInt(0, 100);
+            int percentageStack = 0;
+            for (SkillParticleGenerationInfo info : skillParticleGenerationData.get(avatarId)) {
+                int chance = info.getChance();
+                percentageStack += chance;
+                if (roll < percentageStack) {
+                    count = info.getValue();
+                    break;
+                }
+            }
+        }
+
+        // Done.
+        return count;
+    }
+
+    private int getBallIdForElement(ElementType element) {
+        // If we have no element, we default to an element-less particle.
+        if (element == null) {
+            return 2024;
+        }
+
+        // Otherwise, we determine the particle's ID based on the element.
+        return switch (element) {
+            case Fire -> 2017;
+            case Water -> 2018;
+            case Grass -> 2019;
+            case Electric -> 2020;
+            case Wind -> 2021;
+            case Ice -> 2022;
+            case Rock -> 2023;
+            default -> 2024;
+        };
+    }
+
+    public void handleGenerateElemBall(AbilityInvokeEntry invoke)
+            throws InvalidProtocolBufferException {
+        // ToDo:
+        // This is also called when a weapon like Favonius Warbow etc. creates energy through its
+        // passive.
+        // We are not handling this correctly at the moment.
+
+        // Get action info.
+        AbilityActionGenerateElemBall action =
+                AbilityActionGenerateElemBall.parseFrom(invoke.getAbilityData());
+        if (action == null) {
+            return;
+        }
+
+        // Default to an elementless particle.
+        int itemId = 2024;
+
+        // Generate 2 particles by default.
+        int amount = 2;
+
+        // Try to get the casting avatar from the player's party.
+        Optional<EntityAvatar> avatarEntity =
+                this.getCastingAvatarEntityForEnergy(invoke.getEntityId());
+
+        // Bug: invokes twice sometimes, Ayato, Keqing
+        // ToDo: deal with press, hold difference. deal with charge(Beidou, Yunjin)
+        if (avatarEntity.isPresent()) {
+            Avatar avatar = avatarEntity.get().getAvatar();
+
+            if (avatar != null) {
+                int avatarId = avatar.getAvatarId();
+                AvatarSkillDepotData skillDepotData = avatar.getSkillDepot();
+
+                // Determine how many particles we need to create for this avatar.
+                amount = this.getBallCountForAvatar(avatarId);
+
+                // Determine the avatar's element, and based on that the ID of the
+                // particles we have to generate.
+                if (skillDepotData != null) {
+                    ElementType element = skillDepotData.getElementType();
+                    itemId = this.getBallIdForElement(element);
+                }
+            }
+        }
+
+        // Generate the particles.
+        var pos = new Position(action.getPos());
+        for (int i = 0; i < amount; i++) {
+            this.generateElemBall(itemId, pos, 1);
+        }
+    }
+
+    /**
+     * Energy generation for NAs/CAs.
+     *
+     * @param avatar The avatar.
+     */
+    private void generateEnergyForNormalAndCharged(EntityAvatar avatar) {
+        // This logic is based on the descriptions given in
+        //     https://genshin-impact.fandom.com/wiki/Energy#Energy_Generated_by_Normal_Attacks
+        //     https://library.keqingmains.com/combat-mechanics/energy#auto-attacking
+        // Those descriptions are lacking in some information, so this implementation most likely
+        // does not fully replicate the behavior of the official server. Open questions:
+        //    - Does the probability for a character reset after some time?
+        //    - Does the probability for a character reset when switching them out?
+        //    - Does this really count every individual hit separately?
+
+        // Get the avatar's weapon type.
+        WeaponType weaponType = avatar.getAvatar().getAvatarData().getWeaponType();
+
+        // Check if we already have probability data for this avatar. If not, insert it.
+        if (!this.avatarNormalProbabilities.containsKey(avatar)) {
+            this.avatarNormalProbabilities.put(avatar, weaponType.getEnergyGainInitialProbability());
+        }
+
+        // Roll for energy.
+        int currentProbability = this.avatarNormalProbabilities.getInt(avatar);
+        int roll = ThreadLocalRandom.current().nextInt(0, 100);
+
+        // If the player wins the roll, we increase the avatar's energy and reset the probability.
+        if (roll < currentProbability) {
+            avatar.addEnergy(1.0f, PropChangeReason.PROP_CHANGE_REASON_ABILITY, true);
+            this.avatarNormalProbabilities.put(avatar, weaponType.getEnergyGainInitialProbability());
+        }
+        // Otherwise, we increase the probability for the next hit.
+        else {
+            this.avatarNormalProbabilities.put(
+                    avatar, currentProbability + weaponType.getEnergyGainIncreaseProbability());
+        }
+    }
+
+    public void handleAttackHit(EvtBeingHitInfo hitInfo) {
+        // Get the attack result.
+        AttackResult attackRes = hitInfo.getAttackResult();
+
+        // Make sure the attack was performed by the currently active avatar. If not, we ignore the hit.
+        Optional<EntityAvatar> attackerEntity =
+                this.getCastingAvatarEntityForEnergy(attackRes.getAttackerId());
+        if (attackerEntity.isEmpty()
+                || this.player.getTeamManager().getCurrentAvatarEntity().getId()
+                        != attackerEntity.get().getId()) {
+            return;
+        }
+
+        // Make sure the target is an actual enemy.
+        GameEntity targetEntity = this.player.getScene().getEntityById(attackRes.getDefenseId());
+        if (!(targetEntity instanceof EntityMonster targetMonster)) {
+            return;
+        }
+
+        MonsterType targetType = targetMonster.getMonsterData().getType();
+        if (targetType != MonsterType.MONSTER_ORDINARY && targetType != MonsterType.MONSTER_BOSS) {
+            return;
+        }
+
+        // Get the ability that caused this hit.
+        AbilityIdentifier ability = attackRes.getAbilityIdentifier();
+
+        // Make sure there is no actual "ability" associated with the hit. For now, this is how we
+        // identify normal and charged attacks. Note that this is not completely accurate:
+        //    - Many character's charged attacks have an ability associated with them. This means that,
+        //      for now, we don't identify charged attacks reliably.
+        //    - There might also be some cases where we incorrectly identify something as a normal or
+        //      charged attack that is not (Diluc's E?).
+        //    - Catalyst normal attacks have an ability, so we don't handle those for now.
+        // ToDo: Fix all of that.
+        if (ability != AbilityIdentifier.getDefaultInstance()) {
+            return;
+        }
+
+        // Handle the energy generation.
+        this.generateEnergyForNormalAndCharged(attackerEntity.get());
+    }
+
+    /*
+     * Energy logic related to using skills.
+     */
+
+    private void handleBurstCast(Avatar avatar, int skillId) {
+        // Don't do anything if energy usage is disabled.
+        if (!GAME_OPTIONS.energyUsage || !this.energyUsage) {
+            return;
+        }
+
+        // If the cast skill was a burst, consume energy.
+        if (avatar.getSkillDepot() != null && skillId == avatar.getSkillDepot().getEnergySkill()) {
+            avatar.getAsEntity().clearEnergy(ChangeEnergyReason.CHANGE_ENERGY_REASON_SKILL_START);
+        }
+    }
+
+    public void handleEvtDoSkillSuccNotify(GameSession session, int skillId, int casterId) {
+        // Determine the entity that has cast the skill. Cancel if we can't find that avatar.
+        Optional<EntityAvatar> caster =
+                this.player.getTeamManager().getActiveTeam().stream()
+                        .filter(character -> character.getId() == casterId)
+                        .findFirst();
+
+        if (caster.isEmpty()) {
+            return;
+        }
+
+        Avatar avatar = caster.get().getAvatar();
+
+        // Handle elemental burst.
+        this.handleBurstCast(avatar, skillId);
+    }
+
+    /*
+     * Monster energy drops.
+     */
+
+    private void generateElemBallDrops(EntityMonster monster, int dropId) {
+        // Generate all drops specified for the given drop id.
+        if (!energyDropData.containsKey(dropId)) {
+            Grasscutter.getLogger().warn("No drop data for dropId {} found.", dropId);
+            return;
+        }
+
+        for (EnergyDropInfo info : energyDropData.get(dropId)) {
+            this.generateElemBall(info.getBallId(), monster.getPosition(), info.getCount());
+        }
+    }
+
+    public void handleMonsterEnergyDrop(
+            EntityMonster monster, float hpBeforeDamage, float hpAfterDamage) {
+        // Make sure this is actually a monster.
+        // Note that some wildlife also has that type, like boars or birds.
+        MonsterType type = monster.getMonsterData().getType();
+        if (type != MonsterType.MONSTER_ORDINARY && type != MonsterType.MONSTER_BOSS) {
+            return;
+        }
+
+        // Calculate the HP thresholds for before and after the damage was taken.
+        float maxHp = monster.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP);
+        float thresholdBefore = hpBeforeDamage / maxHp;
+        float thresholdAfter = hpAfterDamage / maxHp;
+
+        // Determine the thresholds the monster has passed, and generate drops based on that.
+        for (HpDrops drop : monster.getMonsterData().getHpDrops()) {
+            if (drop.getDropId() == 0) {
+                continue;
+            }
+
+            float threshold = drop.getHpPercent() / 100.0f;
+            if (threshold < thresholdBefore && threshold >= thresholdAfter) {
+                this.generateElemBallDrops(monster, drop.getDropId());
+            }
+        }
+
+        // Handle kill drops.
+        if (hpAfterDamage <= 0 && monster.getMonsterData().getKillDropId() != 0) {
+            this.generateElemBallDrops(monster, monster.getMonsterData().getKillDropId());
+        }
+    }
+
+    /*
+     * Utilities.
+     */
+
+    private void generateElemBall(int ballId, Position position, int count) {
+        // Generate a particle/orb with the specified parameters.
+        ItemData itemData = GameData.getItemDataMap().get(ballId);
+        if (itemData == null) {
+            return;
+        }
+
+        EntityItem energyBall =
+                new EntityItem(this.getPlayer().getScene(), this.getPlayer(), itemData, position, count);
+        this.getPlayer().getScene().addEntity(energyBall);
+    }
+
+    private Optional<EntityAvatar> getCastingAvatarEntityForEnergy(int invokeEntityId) {
+        // To determine the avatar that has cast the skill that caused the energy particle to be
+        // generated,
+        // we have to look at the entity that has invoked the ability. This can either be that avatar
+        // directly,
+        // or it can be an `EntityClientGadget`, owned (some way up the owner hierarchy) by the avatar
+        // that cast the skill.
+
+        // Try to get the invoking entity from the scene.
+        GameEntity entity = this.player.getScene().getEntityById(invokeEntityId);
+
+        // Determine the ID of the entity that originally cast this skill. If the scene entity is null,
+        // or not an `EntityClientGadget`, we assume that we are directly looking at the casting avatar
+        // (the null case will happen if the avatar was switched out between casting the skill and the
+        // particle being generated). If the scene entity is an `EntityClientGadget`, we need to find
+        // the
+        // ID of the original owner of that gadget.
+        int avatarEntityId =
+                (!(entity instanceof EntityClientGadget))
+                        ? invokeEntityId
+                        : ((EntityClientGadget) entity).getOriginalOwnerEntityId();
+
+        // Finally, find the avatar entity in the player's team.
+        return this.player.getTeamManager().getActiveTeam().stream()
+                .filter(character -> character.getId() == avatarEntityId)
+                .findFirst();
+    }
+
+    /**
+     * Refills the energy of the active avatar.
+     *
+     * @return True if the energy was refilled, false otherwise.
+     */
+    public boolean refillActiveEnergy() {
+        var activeEntity = this.player.getTeamManager().getCurrentAvatarEntity();
+        return activeEntity.addEnergy(
+                activeEntity.getAvatar().getSkillDepot().getEnergySkillData().getCostElemVal());
+    }
+
+    /**
+     * Refills the energy of the entire team.
+     *
+     * @param changeReason The reason for the energy change.
+     * @param isFlat Whether the energy should be added as a flat value.
+     */
+    public void refillTeamEnergy(PropChangeReason changeReason, boolean isFlat) {
+        for (var entityAvatar : this.player.getTeamManager().getActiveTeam()) {
+            // giving the exact amount read off the AvatarSkillData.json
+            entityAvatar.addEnergy(
+                    entityAvatar.getAvatar().getSkillDepot().getEnergySkillData().getCostElemVal(),
+                    changeReason,
+                    isFlat);
+        }
+    }
+
+    public void setEnergyUsage(boolean energyUsage) {
+        this.energyUsage = energyUsage;
+        if (!energyUsage) { // Refill team energy if usage is disabled
+            for (EntityAvatar entityAvatar : this.player.getTeamManager().getActiveTeam()) {
+                entityAvatar.addEnergy(1000, PropChangeReason.PROP_CHANGE_REASON_GM, true);
+            }
+        }
+    }
+}

src/main/java/emu/grasscutter/game/player/PlayerProgressManager.java

@@ -1,280 +1,276 @@
-package emu.grasscutter.game.player;
-
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.binout.ScenePointEntry;
-import emu.grasscutter.data.excels.OpenStateData;
-import emu.grasscutter.data.excels.OpenStateData.OpenStateCondType;
-import emu.grasscutter.game.props.ActionReason;
-import emu.grasscutter.game.quest.enums.QuestCond;
-import emu.grasscutter.game.quest.enums.QuestContent;
-import emu.grasscutter.game.quest.enums.QuestState;
-import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
-import emu.grasscutter.server.packet.send.*;
-import lombok.val;
-
-import java.util.Set;
-import java.util.stream.Collectors;
-
-// @Entity
-public final class PlayerProgressManager extends BasePlayerDataManager {
-    /******************************************************************************************************************
-     ******************************************************************************************************************
-     * OPEN STATES
-     ******************************************************************************************************************
-     *****************************************************************************************************************/
-
-    // Set of open states that are never unlocked, whether they fulfill the conditions or not.
-    public static final Set<Integer> BLACKLIST_OPEN_STATES =
-            Set.of(
-                    48 // blacklist OPEN_STATE_LIMIT_REGION_GLOBAL to make Meledy happy. =D Remove this as
-                    // soon as quest unlocks are fully implemented.
-                    );
-    // Set of open states that are set per default for all accounts. Can be overwritten by an entry in
-    // `map`.
-    public static final Set<Integer> DEFAULT_OPEN_STATES =
-            GameData.getOpenStateList().stream()
-                    .filter(
-                            s ->
-                                    s.isDefaultState() // Actual default-opened states.
-                                            // All states whose unlock we don't handle correctly yet.
-                                            || (s.getCond().stream()
-                                                            .filter(
-                                                                    c ->
-                                                                            c.getCondType()
-                                                                                    == OpenStateCondType.OPEN_STATE_COND_PLAYER_LEVEL)
-                                                            .count()
-                                                    == 0)
-                                            // Always unlock OPEN_STATE_PAIMON, otherwise the player will not have a
-                                            // working chat.
-                                            || s.getId() == 1)
-                    .filter(
-                            s ->
-                                    !BLACKLIST_OPEN_STATES.contains(s.getId())) // Filter out states in the blacklist.
-                    .map(s -> s.getId())
-                    .collect(Collectors.toSet());
-
-    public PlayerProgressManager(Player player) {
-        super(player);
-    }
-
-    /**********
-     * Handler for player login.
-     **********/
-    public void onPlayerLogin() {
-        // Try unlocking open states on player login. This handles accounts where unlock conditions were
-        // already met before certain open state unlocks were implemented.
-        this.tryUnlockOpenStates(false);
-
-        // Send notify to the client.
-        player.getSession().send(new PacketOpenStateUpdateNotify(this.player));
-
-        // Add statue quests if necessary.
-        this.addStatueQuestsOnLogin();
-
-        // Auto-unlock the first statue and map area, until we figure out how to make
-        // that particular statue interactable.
-        this.player.getUnlockedScenePoints(3).add(7);
-        this.player.getUnlockedSceneAreas(3).add(1);
-    }
-
-    /**********
-     * Direct getters and setters for open states.
-     **********/
-    public int getOpenState(int openState) {
-        return this.player.getOpenStates().getOrDefault(openState, 0);
-    }
-
-    private void setOpenState(int openState, int value, boolean sendNotify) {
-        int previousValue = this.player.getOpenStates().getOrDefault(openState, 0);
-
-        if (value != previousValue) {
-            this.player.getOpenStates().put(openState, value);
-
-            if (sendNotify) {
-                player.getSession().send(new PacketOpenStateChangeNotify(openState, value));
-            }
-        }
-    }
-
-    private void setOpenState(int openState, int value) {
-        this.setOpenState(openState, value, true);
-    }
-
-    /**********
-     * Condition checking for setting open states.
-     **********/
-    private boolean areConditionsMet(OpenStateData openState) {
-        // Check all conditions and test if at least one of them is violated.
-        for (var condition : openState.getCond()) {
-            // For level conditions, check if the player has reached the necessary level.
-            if (condition.getCondType() == OpenStateCondType.OPEN_STATE_COND_PLAYER_LEVEL) {
-                if (this.player.getLevel() < condition.getParam()) {
-                    return false;
-                }
-            } else if (condition.getCondType() == OpenStateCondType.OPEN_STATE_COND_QUEST) {
-                // ToDo: Implement.
-            } else if (condition.getCondType() == OpenStateCondType.OPEN_STATE_COND_PARENT_QUEST) {
-                // ToDo: Implement.
-            } else if (condition.getCondType() == OpenStateCondType.OPEN_STATE_OFFERING_LEVEL) {
-                // ToDo: Implement.
-            } else if (condition.getCondType() == OpenStateCondType.OPEN_STATE_CITY_REPUTATION_LEVEL) {
-                // ToDo: Implement.
-            }
-        }
-
-        // Done. If we didn't find any violations, all conditions are met.
-        return true;
-    }
-
-    /**********
-     * Setting open states from the client (via `SetOpenStateReq`).
-     **********/
-    public void setOpenStateFromClient(int openState, int value) {
-        // Get the data for this open state.
-        OpenStateData data = GameData.getOpenStateDataMap().get(openState);
-        if (data == null) {
-            this.player.sendPacket(new PacketSetOpenStateRsp(Retcode.RET_FAIL));
-            return;
-        }
-
-        // Make sure that this is an open state that the client is allowed to set,
-        // and that it doesn't have any further conditions attached.
-        if (!data.isAllowClientOpen() || !this.areConditionsMet(data)) {
-            this.player.sendPacket(new PacketSetOpenStateRsp(Retcode.RET_FAIL));
-            return;
-        }
-
-        // Set.
-        this.setOpenState(openState, value);
-        this.player.sendPacket(new PacketSetOpenStateRsp(openState, value));
-    }
-
-    /**
-     * This force sets an open state, ignoring all conditions and permissions
-     */
-    public void forceSetOpenState(int openState, int value) {
-        this.setOpenState(openState, value);
-    }
-
-    /**********
-     * Triggered unlocking of open states (unlock states whose conditions have been met.)
-     **********/
-    public void tryUnlockOpenStates(boolean sendNotify) {
-        // Get list of open states that are not yet unlocked.
-        var lockedStates =
-                GameData.getOpenStateList().stream()
-                        .filter(s -> this.player.getOpenStates().getOrDefault(s, 0) == 0)
-                        .toList();
-
-        // Try unlocking all of them.
-        for (var state : lockedStates) {
-            // To auto-unlock a state, it has to meet three conditions:
-            // * it can not be a state that is unlocked by the client,
-            // * it has to meet all its unlock conditions, and
-            // * it can not be in the blacklist.
-            if (!state.isAllowClientOpen()
-                    && this.areConditionsMet(state)
-                    && !BLACKLIST_OPEN_STATES.contains(state.getId())) {
-                this.setOpenState(state.getId(), 1, sendNotify);
-            }
-        }
-    }
-
-    public void tryUnlockOpenStates() {
-        this.tryUnlockOpenStates(true);
-    }
-
-    /******************************************************************************************************************
-     ******************************************************************************************************************
-     * MAP AREAS AND POINTS
-     ******************************************************************************************************************
-     *****************************************************************************************************************/
-    private void addStatueQuestsOnLogin() {
-        // Get all currently existing subquests for the "unlock all statues" main quest.
-        var statueMainQuest = GameData.getMainQuestDataMap().get(303);
-        var statueSubQuests = statueMainQuest.getSubQuests();
-
-        // Add the main statue quest if it isn't active yet.
-        var statueGameMainQuest = this.player.getQuestManager().getMainQuestById(303);
-        if (statueGameMainQuest == null) {
-            this.player.getQuestManager().addQuest(30302);
-            statueGameMainQuest = this.player.getQuestManager().getMainQuestById(303);
-        }
-
-        // Set all subquests to active if they aren't already finished.
-        for (var subData : statueSubQuests) {
-            var subGameQuest = statueGameMainQuest.getChildQuestById(subData.getSubId());
-            if (subGameQuest != null && subGameQuest.getState() == QuestState.QUEST_STATE_UNSTARTED) {
-                this.player.getQuestManager().addQuest(subData.getSubId());
-            }
-        }
-    }
-
-    public boolean unlockTransPoint(int sceneId, int pointId, boolean isStatue) {
-        // Check whether the unlocked point exists and whether it is still locked.
-        ScenePointEntry scenePointEntry = GameData.getScenePointEntryById(sceneId, pointId);
-
-        if (scenePointEntry == null || this.player.getUnlockedScenePoints(sceneId).contains(pointId)) {
-            return false;
-        }
-
-        // Add the point to the list of unlocked points for its scene.
-        this.player.getUnlockedScenePoints(sceneId).add(pointId);
-
-        // Give primogems  and Adventure EXP for unlocking.
-        this.player.getInventory().addItem(201, 5, ActionReason.UnlockPointReward);
-        this.player.getInventory().addItem(102, isStatue ? 50 : 10, ActionReason.UnlockPointReward);
-
-        // this.player.sendPacket(new
-        // PacketPlayerPropChangeReasonNotify(this.player.getProperty(PlayerProperty.PROP_PLAYER_EXP),
-        // PlayerProperty.PROP_PLAYER_EXP, PropChangeReason.PROP_CHANGE_REASON_PLAYER_ADD_EXP));
-
-        // Fire quest trigger for trans point unlock.
-        this.player
-                .getQuestManager()
-                .queueEvent(QuestContent.QUEST_CONTENT_UNLOCK_TRANS_POINT, sceneId, pointId);
-
-        // Send packet.
-        this.player.sendPacket(new PacketScenePointUnlockNotify(sceneId, pointId));
-        return true;
-    }
-
-    public void unlockSceneArea(int sceneId, int areaId) {
-        // Add the area to the list of unlocked areas in its scene.
-        this.player.getUnlockedSceneAreas(sceneId).add(areaId);
-
-        // Send packet.
-        this.player.sendPacket(new PacketSceneAreaUnlockNotify(sceneId, areaId));
-    }
-
-    /**
-     * Give replace costume to player (Amber, Jean, Mona, Rosaria)
-     */
-    public void addReplaceCostumes(){
-        var currentPlayerCostumes = player.getCostumeList();
-        GameData.getAvatarReplaceCostumeDataMap().keySet().forEach(costumeId -> {
-            if (GameData.getAvatarCostumeDataMap().get(costumeId) == null || currentPlayerCostumes.contains(costumeId)){
-                return;
-            }
-            this.player.addCostume(costumeId);
-        });
-    }
-
-    /**
-     * Quest progress
-     */
-    public void addQuestProgress(int id, int count){
-        var newCount = player.getPlayerProgress().addToCurrentProgress(id, count);
-        player.save();
-        player.getQuestManager().queueEvent(QuestContent.QUEST_CONTENT_ADD_QUEST_PROGRESS, id, newCount);
-    }
-
-    /**
-     * Item history
-     */
-    public void addItemObtainedHistory(int id, int count){
-        var newCount = player.getPlayerProgress().addToItemHistory(id, count);
-        player.save();
-        player.getQuestManager().queueEvent(QuestCond.QUEST_COND_HISTORY_GOT_ANY_ITEM, id, newCount);
-    }
-}
+package emu.grasscutter.game.player;
+
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.binout.ScenePointEntry;
+import emu.grasscutter.data.excels.OpenStateData;
+import emu.grasscutter.data.excels.OpenStateData.OpenStateCondType;
+import emu.grasscutter.game.props.ActionReason;
+import emu.grasscutter.game.quest.enums.QuestCond;
+import emu.grasscutter.game.quest.enums.QuestContent;
+import emu.grasscutter.game.quest.enums.QuestState;
+import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
+import emu.grasscutter.server.packet.send.*;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+// @Entity
+public final class PlayerProgressManager extends BasePlayerDataManager {
+    /******************************************************************************************************************
+     ******************************************************************************************************************
+     * OPEN STATES
+     ******************************************************************************************************************
+     *****************************************************************************************************************/
+
+    // Set of open states that are never unlocked, whether they fulfill the conditions or not.
+    public static final Set<Integer> BLACKLIST_OPEN_STATES =
+            Set.of(
+                    48 // blacklist OPEN_STATE_LIMIT_REGION_GLOBAL to make Meledy happy. =D Remove this as
+                    // soon as quest unlocks are fully implemented.
+                    );
+    // Set of open states that are set per default for all accounts. Can be overwritten by an entry in
+    // `map`.
+    public static final Set<Integer> DEFAULT_OPEN_STATES =
+            GameData.getOpenStateList().stream()
+                    .filter(
+                            s ->
+                                    s.isDefaultState() // Actual default-opened states.
+                                            // All states whose unlock we don't handle correctly yet.
+                                            || (s.getCond().stream()
+                                                            .filter(
+                                                                    c ->
+                                                                            c.getCondType()
+                                                                                    == OpenStateCondType.OPEN_STATE_COND_PLAYER_LEVEL)
+                                                            .count()
+                                                    == 0)
+                                            // Always unlock OPEN_STATE_PAIMON, otherwise the player will not have a
+                                            // working chat.
+                                            || s.getId() == 1)
+                    .filter(
+                            s ->
+                                    !BLACKLIST_OPEN_STATES.contains(s.getId())) // Filter out states in the blacklist.
+                    .map(s -> s.getId())
+                    .collect(Collectors.toSet());
+
+    public PlayerProgressManager(Player player) {
+        super(player);
+    }
+
+    /**********
+     * Handler for player login.
+     **********/
+    public void onPlayerLogin() {
+        // Try unlocking open states on player login. This handles accounts where unlock conditions were
+        // already met before certain open state unlocks were implemented.
+        this.tryUnlockOpenStates(false);
+
+        // Send notify to the client.
+        player.getSession().send(new PacketOpenStateUpdateNotify(this.player));
+
+        // Add statue quests if necessary.
+        this.addStatueQuestsOnLogin();
+
+        // Auto-unlock the first statue and map area, until we figure out how to make
+        // that particular statue interactable.
+        this.player.getUnlockedScenePoints(3).add(7);
+        this.player.getUnlockedSceneAreas(3).add(1);
+    }
+
+    /**********
+     * Direct getters and setters for open states.
+     **********/
+    public int getOpenState(int openState) {
+        return this.player.getOpenStates().getOrDefault(openState, 0);
+    }
+
+    private void setOpenState(int openState, int value, boolean sendNotify) {
+        int previousValue = this.player.getOpenStates().getOrDefault(openState, 0);
+
+        if (value != previousValue) {
+            this.player.getOpenStates().put(openState, value);
+
+            if (sendNotify) {
+                player.getSession().send(new PacketOpenStateChangeNotify(openState, value));
+            }
+        }
+    }
+
+    private void setOpenState(int openState, int value) {
+        this.setOpenState(openState, value, true);
+    }
+
+    /**********
+     * Condition checking for setting open states.
+     **********/
+    private boolean areConditionsMet(OpenStateData openState) {
+        // Check all conditions and test if at least one of them is violated.
+        for (var condition : openState.getCond()) {
+            // For level conditions, check if the player has reached the necessary level.
+            if (condition.getCondType() == OpenStateCondType.OPEN_STATE_COND_PLAYER_LEVEL) {
+                if (this.player.getLevel() < condition.getParam()) {
+                    return false;
+                }
+            } else if (condition.getCondType() == OpenStateCondType.OPEN_STATE_COND_QUEST) {
+                // ToDo: Implement.
+            } else if (condition.getCondType() == OpenStateCondType.OPEN_STATE_COND_PARENT_QUEST) {
+                // ToDo: Implement.
+            } else if (condition.getCondType() == OpenStateCondType.OPEN_STATE_OFFERING_LEVEL) {
+                // ToDo: Implement.
+            } else if (condition.getCondType() == OpenStateCondType.OPEN_STATE_CITY_REPUTATION_LEVEL) {
+                // ToDo: Implement.
+            }
+        }
+
+        // Done. If we didn't find any violations, all conditions are met.
+        return true;
+    }
+
+    /**********
+     * Setting open states from the client (via `SetOpenStateReq`).
+     **********/
+    public void setOpenStateFromClient(int openState, int value) {
+        // Get the data for this open state.
+        OpenStateData data = GameData.getOpenStateDataMap().get(openState);
+        if (data == null) {
+            this.player.sendPacket(new PacketSetOpenStateRsp(Retcode.RET_FAIL));
+            return;
+        }
+
+        // Make sure that this is an open state that the client is allowed to set,
+        // and that it doesn't have any further conditions attached.
+        if (!data.isAllowClientOpen() || !this.areConditionsMet(data)) {
+            this.player.sendPacket(new PacketSetOpenStateRsp(Retcode.RET_FAIL));
+            return;
+        }
+
+        // Set.
+        this.setOpenState(openState, value);
+        this.player.sendPacket(new PacketSetOpenStateRsp(openState, value));
+    }
+
+    /** This force sets an open state, ignoring all conditions and permissions */
+    public void forceSetOpenState(int openState, int value) {
+        this.setOpenState(openState, value);
+    }
+
+    /**********
+     * Triggered unlocking of open states (unlock states whose conditions have been met.)
+     **********/
+    public void tryUnlockOpenStates(boolean sendNotify) {
+        // Get list of open states that are not yet unlocked.
+        var lockedStates =
+                GameData.getOpenStateList().stream()
+                        .filter(s -> this.player.getOpenStates().getOrDefault(s, 0) == 0)
+                        .toList();
+
+        // Try unlocking all of them.
+        for (var state : lockedStates) {
+            // To auto-unlock a state, it has to meet three conditions:
+            // * it can not be a state that is unlocked by the client,
+            // * it has to meet all its unlock conditions, and
+            // * it can not be in the blacklist.
+            if (!state.isAllowClientOpen()
+                    && this.areConditionsMet(state)
+                    && !BLACKLIST_OPEN_STATES.contains(state.getId())) {
+                this.setOpenState(state.getId(), 1, sendNotify);
+            }
+        }
+    }
+
+    public void tryUnlockOpenStates() {
+        this.tryUnlockOpenStates(true);
+    }
+
+    /******************************************************************************************************************
+     ******************************************************************************************************************
+     * MAP AREAS AND POINTS
+     ******************************************************************************************************************
+     *****************************************************************************************************************/
+    private void addStatueQuestsOnLogin() {
+        // Get all currently existing subquests for the "unlock all statues" main quest.
+        var statueMainQuest = GameData.getMainQuestDataMap().get(303);
+        var statueSubQuests = statueMainQuest.getSubQuests();
+
+        // Add the main statue quest if it isn't active yet.
+        var statueGameMainQuest = this.player.getQuestManager().getMainQuestById(303);
+        if (statueGameMainQuest == null) {
+            this.player.getQuestManager().addQuest(30302);
+            statueGameMainQuest = this.player.getQuestManager().getMainQuestById(303);
+        }
+
+        // Set all subquests to active if they aren't already finished.
+        for (var subData : statueSubQuests) {
+            var subGameQuest = statueGameMainQuest.getChildQuestById(subData.getSubId());
+            if (subGameQuest != null && subGameQuest.getState() == QuestState.QUEST_STATE_UNSTARTED) {
+                this.player.getQuestManager().addQuest(subData.getSubId());
+            }
+        }
+    }
+
+    public boolean unlockTransPoint(int sceneId, int pointId, boolean isStatue) {
+        // Check whether the unlocked point exists and whether it is still locked.
+        ScenePointEntry scenePointEntry = GameData.getScenePointEntryById(sceneId, pointId);
+
+        if (scenePointEntry == null || this.player.getUnlockedScenePoints(sceneId).contains(pointId)) {
+            return false;
+        }
+
+        // Add the point to the list of unlocked points for its scene.
+        this.player.getUnlockedScenePoints(sceneId).add(pointId);
+
+        // Give primogems  and Adventure EXP for unlocking.
+        this.player.getInventory().addItem(201, 5, ActionReason.UnlockPointReward);
+        this.player.getInventory().addItem(102, isStatue ? 50 : 10, ActionReason.UnlockPointReward);
+
+        // this.player.sendPacket(new
+        // PacketPlayerPropChangeReasonNotify(this.player.getProperty(PlayerProperty.PROP_PLAYER_EXP),
+        // PlayerProperty.PROP_PLAYER_EXP, PropChangeReason.PROP_CHANGE_REASON_PLAYER_ADD_EXP));
+
+        // Fire quest trigger for trans point unlock.
+        this.player
+                .getQuestManager()
+                .queueEvent(QuestContent.QUEST_CONTENT_UNLOCK_TRANS_POINT, sceneId, pointId);
+
+        // Send packet.
+        this.player.sendPacket(new PacketScenePointUnlockNotify(sceneId, pointId));
+        return true;
+    }
+
+    public void unlockSceneArea(int sceneId, int areaId) {
+        // Add the area to the list of unlocked areas in its scene.
+        this.player.getUnlockedSceneAreas(sceneId).add(areaId);
+
+        // Send packet.
+        this.player.sendPacket(new PacketSceneAreaUnlockNotify(sceneId, areaId));
+    }
+
+    /** Give replace costume to player (Amber, Jean, Mona, Rosaria) */
+    public void addReplaceCostumes() {
+        var currentPlayerCostumes = player.getCostumeList();
+        GameData.getAvatarReplaceCostumeDataMap()
+                .keySet()
+                .forEach(
+                        costumeId -> {
+                            if (GameData.getAvatarCostumeDataMap().get(costumeId) == null
+                                    || currentPlayerCostumes.contains(costumeId)) {
+                                return;
+                            }
+                            this.player.addCostume(costumeId);
+                        });
+    }
+
+    /** Quest progress */
+    public void addQuestProgress(int id, int count) {
+        var newCount = player.getPlayerProgress().addToCurrentProgress(id, count);
+        player.save();
+        player
+                .getQuestManager()
+                .queueEvent(QuestContent.QUEST_CONTENT_ADD_QUEST_PROGRESS, id, newCount);
+    }
+
+    /** Item history */
+    public void addItemObtainedHistory(int id, int count) {
+        var newCount = player.getPlayerProgress().addToItemHistory(id, count);
+        player.save();
+        player.getQuestManager().queueEvent(QuestCond.QUEST_COND_HISTORY_GOT_ANY_ITEM, id, newCount);
+    }
+}

src/main/java/emu/grasscutter/game/props/ElementType.java

@@ -1,72 +1,131 @@
-package emu.grasscutter.game.props;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.Stream;
-
-import emu.grasscutter.scripts.constants.IntValueEnum;
-import emu.grasscutter.utils.Utils;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import lombok.Getter;
-
-public enum ElementType implements IntValueEnum {
-    None		(0, FightProperty.FIGHT_PROP_CUR_FIRE_ENERGY, FightProperty.FIGHT_PROP_MAX_FIRE_ENERGY),
-    Fire		(1, FightProperty.FIGHT_PROP_CUR_FIRE_ENERGY, FightProperty.FIGHT_PROP_MAX_FIRE_ENERGY, 10101, "TeamResonance_Fire_Lv2", 1),
-    Water		(2, FightProperty.FIGHT_PROP_CUR_WATER_ENERGY, FightProperty.FIGHT_PROP_MAX_WATER_ENERGY, 10201, "TeamResonance_Water_Lv2", 2),
-    Grass		(3, FightProperty.FIGHT_PROP_CUR_GRASS_ENERGY, FightProperty.FIGHT_PROP_MAX_GRASS_ENERGY, 10501, "TeamResonance_Grass_Lv2", 7),
-    Electric	(4, FightProperty.FIGHT_PROP_CUR_ELEC_ENERGY, FightProperty.FIGHT_PROP_MAX_ELEC_ENERGY, 10401, "TeamResonance_Electric_Lv2", 6),
-    Ice			(5, FightProperty.FIGHT_PROP_CUR_ICE_ENERGY, FightProperty.FIGHT_PROP_MAX_ICE_ENERGY, 10601, "TeamResonance_Ice_Lv2", 4),
-    Frozen		(6, FightProperty.FIGHT_PROP_CUR_ICE_ENERGY, FightProperty.FIGHT_PROP_MAX_ICE_ENERGY),
-    Wind		(7, FightProperty.FIGHT_PROP_CUR_WIND_ENERGY, FightProperty.FIGHT_PROP_MAX_WIND_ENERGY, 10301, "TeamResonance_Wind_Lv2", 3),
-    Rock		(8, FightProperty.FIGHT_PROP_CUR_ROCK_ENERGY, FightProperty.FIGHT_PROP_MAX_ROCK_ENERGY, 10701, "TeamResonance_Rock_Lv2", 5),
-    AntiFire	(9, FightProperty.FIGHT_PROP_CUR_FIRE_ENERGY, FightProperty.FIGHT_PROP_MAX_FIRE_ENERGY),
-    Default		(255, FightProperty.FIGHT_PROP_CUR_FIRE_ENERGY, FightProperty.FIGHT_PROP_MAX_FIRE_ENERGY, 10801, "TeamResonance_AllDifferent");
-
-    private static final Int2ObjectMap<ElementType> map = new Int2ObjectOpenHashMap<>();
-    private static final Map<String, ElementType> stringMap = new HashMap<>();
-
-    static {
-        // Create bindings for each value.
-        Stream.of(ElementType.values()).forEach(entry -> {
-            map.put(entry.getValue(), entry);
-            stringMap.put(entry.name(), entry);
-        });
-    }
-
-    @Getter private final int value;
-    @Getter private final int teamResonanceId;
-    @Getter private final FightProperty curEnergyProp;
-    @Getter private final FightProperty maxEnergyProp;
-    @Getter private final int depotIndex;
-    @Getter private final int configHash;
-
-    ElementType(int value, FightProperty curEnergyProp, FightProperty maxEnergyProp) {
-        this(value, curEnergyProp, maxEnergyProp, 0, null, 1);
-    }
-
-    ElementType(int value, FightProperty curEnergyProp, FightProperty maxEnergyProp, int teamResonanceId, String configName) {
-        this(value, curEnergyProp, maxEnergyProp, teamResonanceId, configName, 1);
-    }
-
-    ElementType(int value, FightProperty curEnergyProp, FightProperty maxEnergyProp, int teamResonanceId, String configName, int depotIndex) {
-        this.value = value;
-        this.curEnergyProp = curEnergyProp;
-        this.maxEnergyProp = maxEnergyProp;
-        this.teamResonanceId = teamResonanceId;
-        this.depotIndex = depotIndex;
-        if (configName != null) {
-            this.configHash = Utils.abilityHash(configName);
-        } else {
-            this.configHash = 0;
-        }
-    }
-
-    public static ElementType getTypeByValue(int value) {
-        return map.getOrDefault(value, None);
-    }
-
-    public static ElementType getTypeByName(String name) {
-        return stringMap.getOrDefault(name, None);
-    }
-}
+package emu.grasscutter.game.props;
+
+import emu.grasscutter.scripts.constants.IntValueEnum;
+import emu.grasscutter.utils.Utils;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Stream;
+import lombok.Getter;
+
+public enum ElementType implements IntValueEnum {
+    None(0, FightProperty.FIGHT_PROP_CUR_FIRE_ENERGY, FightProperty.FIGHT_PROP_MAX_FIRE_ENERGY),
+    Fire(
+            1,
+            FightProperty.FIGHT_PROP_CUR_FIRE_ENERGY,
+            FightProperty.FIGHT_PROP_MAX_FIRE_ENERGY,
+            10101,
+            "TeamResonance_Fire_Lv2",
+            1),
+    Water(
+            2,
+            FightProperty.FIGHT_PROP_CUR_WATER_ENERGY,
+            FightProperty.FIGHT_PROP_MAX_WATER_ENERGY,
+            10201,
+            "TeamResonance_Water_Lv2",
+            2),
+    Grass(
+            3,
+            FightProperty.FIGHT_PROP_CUR_GRASS_ENERGY,
+            FightProperty.FIGHT_PROP_MAX_GRASS_ENERGY,
+            10501,
+            "TeamResonance_Grass_Lv2",
+            7),
+    Electric(
+            4,
+            FightProperty.FIGHT_PROP_CUR_ELEC_ENERGY,
+            FightProperty.FIGHT_PROP_MAX_ELEC_ENERGY,
+            10401,
+            "TeamResonance_Electric_Lv2",
+            6),
+    Ice(
+            5,
+            FightProperty.FIGHT_PROP_CUR_ICE_ENERGY,
+            FightProperty.FIGHT_PROP_MAX_ICE_ENERGY,
+            10601,
+            "TeamResonance_Ice_Lv2",
+            4),
+    Frozen(6, FightProperty.FIGHT_PROP_CUR_ICE_ENERGY, FightProperty.FIGHT_PROP_MAX_ICE_ENERGY),
+    Wind(
+            7,
+            FightProperty.FIGHT_PROP_CUR_WIND_ENERGY,
+            FightProperty.FIGHT_PROP_MAX_WIND_ENERGY,
+            10301,
+            "TeamResonance_Wind_Lv2",
+            3),
+    Rock(
+            8,
+            FightProperty.FIGHT_PROP_CUR_ROCK_ENERGY,
+            FightProperty.FIGHT_PROP_MAX_ROCK_ENERGY,
+            10701,
+            "TeamResonance_Rock_Lv2",
+            5),
+    AntiFire(9, FightProperty.FIGHT_PROP_CUR_FIRE_ENERGY, FightProperty.FIGHT_PROP_MAX_FIRE_ENERGY),
+    Default(
+            255,
+            FightProperty.FIGHT_PROP_CUR_FIRE_ENERGY,
+            FightProperty.FIGHT_PROP_MAX_FIRE_ENERGY,
+            10801,
+            "TeamResonance_AllDifferent");
+
+    private static final Int2ObjectMap<ElementType> map = new Int2ObjectOpenHashMap<>();
+    private static final Map<String, ElementType> stringMap = new HashMap<>();
+
+    static {
+        // Create bindings for each value.
+        Stream.of(ElementType.values())
+                .forEach(
+                        entry -> {
+                            map.put(entry.getValue(), entry);
+                            stringMap.put(entry.name(), entry);
+                        });
+    }
+
+    @Getter private final int value;
+    @Getter private final int teamResonanceId;
+    @Getter private final FightProperty curEnergyProp;
+    @Getter private final FightProperty maxEnergyProp;
+    @Getter private final int depotIndex;
+    @Getter private final int configHash;
+
+    ElementType(int value, FightProperty curEnergyProp, FightProperty maxEnergyProp) {
+        this(value, curEnergyProp, maxEnergyProp, 0, null, 1);
+    }
+
+    ElementType(
+            int value,
+            FightProperty curEnergyProp,
+            FightProperty maxEnergyProp,
+            int teamResonanceId,
+            String configName) {
+        this(value, curEnergyProp, maxEnergyProp, teamResonanceId, configName, 1);
+    }
+
+    ElementType(
+            int value,
+            FightProperty curEnergyProp,
+            FightProperty maxEnergyProp,
+            int teamResonanceId,
+            String configName,
+            int depotIndex) {
+        this.value = value;
+        this.curEnergyProp = curEnergyProp;
+        this.maxEnergyProp = maxEnergyProp;
+        this.teamResonanceId = teamResonanceId;
+        this.depotIndex = depotIndex;
+        if (configName != null) {
+            this.configHash = Utils.abilityHash(configName);
+        } else {
+            this.configHash = 0;
+        }
+    }
+
+    public static ElementType getTypeByValue(int value) {
+        return map.getOrDefault(value, None);
+    }
+
+    public static ElementType getTypeByName(String name) {
+        return stringMap.getOrDefault(name, None);
+    }
+}

src/main/java/emu/grasscutter/game/quest/conditions/ConditionPersonalLineUnlock.java

@@ -1,23 +1,21 @@
-package emu.grasscutter.game.quest.conditions;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.quest.QuestValueCond;
-import emu.grasscutter.game.quest.enums.QuestCond;
-import lombok.val;
-
-@QuestValueCond(QuestCond.QUEST_COND_PERSONAL_LINE_UNLOCK)
-public class ConditionPersonalLineUnlock extends BaseCondition {
-
-    @Override
-    public boolean execute(
-            Player owner,
-            QuestData questData,
-            QuestData.QuestAcceptCondition condition,
-            String paramStr,
-            int... params
-    ) {
-        var personalLineId = condition.getParam()[0];
-        return owner.getPersonalLineList().contains(personalLineId);
-    }
-}
+package emu.grasscutter.game.quest.conditions;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.quest.QuestValueCond;
+import emu.grasscutter.game.quest.enums.QuestCond;
+
+@QuestValueCond(QuestCond.QUEST_COND_PERSONAL_LINE_UNLOCK)
+public class ConditionPersonalLineUnlock extends BaseCondition {
+
+    @Override
+    public boolean execute(
+            Player owner,
+            QuestData questData,
+            QuestData.QuestAcceptCondition condition,
+            String paramStr,
+            int... params) {
+        var personalLineId = condition.getParam()[0];
+        return owner.getPersonalLineList().contains(personalLineId);
+    }
+}

src/main/java/emu/grasscutter/game/quest/exec/ExecAddCurAvatarEnergy.java

@@ -1,17 +1,17 @@
-package emu.grasscutter.game.quest.exec;
-
-import emu.grasscutter.Grasscutter;
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
-import emu.grasscutter.game.quest.enums.QuestExec;
-import emu.grasscutter.game.quest.handlers.QuestExecHandler;
-
-@QuestValueExec(QuestExec.QUEST_EXEC_ADD_CUR_AVATAR_ENERGY)
-public class ExecAddCurAvatarEnergy extends QuestExecHandler {
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
-        Grasscutter.getLogger().info("Energy refilled");
-        return quest.getOwner().getEnergyManager().refillActiveEnergy();
-    }
-}
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.enums.QuestExec;
+import emu.grasscutter.game.quest.handlers.QuestExecHandler;
+
+@QuestValueExec(QuestExec.QUEST_EXEC_ADD_CUR_AVATAR_ENERGY)
+public class ExecAddCurAvatarEnergy extends QuestExecHandler {
+    @Override
+    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
+        Grasscutter.getLogger().info("Energy refilled");
+        return quest.getOwner().getEnergyManager().refillActiveEnergy();
+    }
+}

src/main/java/emu/grasscutter/game/quest/exec/ExecAddQuestProgress.java

@@ -1,21 +1,21 @@
-package emu.grasscutter.game.quest.exec;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
-import emu.grasscutter.game.quest.enums.QuestExec;
-import emu.grasscutter.game.quest.handlers.QuestExecHandler;
-import java.util.Arrays;
-
-@QuestValueExec(QuestExec.QUEST_EXEC_ADD_QUEST_PROGRESS)
-public final class ExecAddQuestProgress extends QuestExecHandler {
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
-        var param =
-                Arrays.stream(paramStr).filter(i -> !i.isBlank()).mapToInt(Integer::parseInt).toArray();
-
-        quest.getOwner().getProgressManager().addQuestProgress(param[0], param[1]);
-
-        return true;
-    }
-}
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.enums.QuestExec;
+import emu.grasscutter.game.quest.handlers.QuestExecHandler;
+import java.util.Arrays;
+
+@QuestValueExec(QuestExec.QUEST_EXEC_ADD_QUEST_PROGRESS)
+public final class ExecAddQuestProgress extends QuestExecHandler {
+    @Override
+    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
+        var param =
+                Arrays.stream(paramStr).filter(i -> !i.isBlank()).mapToInt(Integer::parseInt).toArray();
+
+        quest.getOwner().getProgressManager().addQuestProgress(param[0], param[1]);
+
+        return true;
+    }
+}

src/main/java/emu/grasscutter/game/quest/exec/ExecSetOpenState.java

@@ -1,20 +1,20 @@
-package emu.grasscutter.game.quest.exec;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
-import emu.grasscutter.game.quest.enums.QuestExec;
-import emu.grasscutter.game.quest.handlers.QuestExecHandler;
-import java.util.Arrays;
-
-@QuestValueExec(QuestExec.QUEST_EXEC_SET_OPEN_STATE)
-public class ExecSetOpenState extends QuestExecHandler {
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
-        var param =
-                Arrays.stream(paramStr).filter(i -> !i.isBlank()).mapToInt(Integer::parseInt).toArray();
-
-        quest.getOwner().getProgressManager().forceSetOpenState(param[0], param[1]);
-        return true;
-    }
-}
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.enums.QuestExec;
+import emu.grasscutter.game.quest.handlers.QuestExecHandler;
+import java.util.Arrays;
+
+@QuestValueExec(QuestExec.QUEST_EXEC_SET_OPEN_STATE)
+public class ExecSetOpenState extends QuestExecHandler {
+    @Override
+    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
+        var param =
+                Arrays.stream(paramStr).filter(i -> !i.isBlank()).mapToInt(Integer::parseInt).toArray();
+
+        quest.getOwner().getProgressManager().forceSetOpenState(param[0], param[1]);
+        return true;
+    }
+}

src/main/java/emu/grasscutter/game/world/SceneGroupInstance.java

@@ -1,86 +1,85 @@
-package emu.grasscutter.game.world;
-
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.bson.types.ObjectId;
-
-import dev.morphia.annotations.Entity;
-import dev.morphia.annotations.Id;
-import dev.morphia.annotations.Indexed;
-import emu.grasscutter.database.DatabaseHelper;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.scripts.data.SceneGadget;
-import emu.grasscutter.scripts.data.SceneGroup;
-import lombok.Getter;
-import lombok.Setter;
-
-@Entity(value = "group_instances", useDiscriminator = false)
-public final class SceneGroupInstance {
-    @Id private ObjectId id;
-
-    @Indexed private int ownerUid; //This group is owned by the host player
-    @Getter private int groupId;
-
-    @Getter private transient SceneGroup luaGroup;
-    @Getter @Setter private int targetSuiteId;
-    @Getter @Setter private int activeSuiteId;
-    @Getter private Set<Integer> deadEntities; //Config_ids
-    private boolean isCached;
-
-    @Getter private Map<Integer, Integer> cachedGadgetStates;
-    @Getter private Map<String, Integer> cachedVariables;
-
-    @Getter @Setter private int lastTimeRefreshed;
-
-    public SceneGroupInstance(SceneGroup group, Player owner) {
-        this.luaGroup = group;
-        this.groupId = group.id;
-        this.targetSuiteId = 0;
-        this.activeSuiteId = 0;
-        this.lastTimeRefreshed = 0;
-        this.ownerUid = owner.getUid();
-        this.deadEntities = new HashSet<>();
-        this.cachedGadgetStates = new ConcurrentHashMap<>();
-        this.cachedVariables = new ConcurrentHashMap<>();
-
-        this.isCached = false; //This is true when the group is not loaded on scene but caches suite data
-    }
-
-    @Deprecated  // Morphia only!
-    SceneGroupInstance(){
-        this.cachedVariables = new ConcurrentHashMap<>();
-        this.deadEntities = new HashSet<>();
-        this.cachedGadgetStates = new ConcurrentHashMap<>();
-    }
-
-    public void setLuaGroup(SceneGroup group) {
-        this.luaGroup = group;
-        this.groupId = group.id;
-    }
-
-    public boolean isCached() {
-        return this.isCached;
-    }
-
-    public void setCached(boolean value) {
-        this.isCached = value;
-        save(); //Save each time a group is registered or unregistered
-    }
-
-    public void cacheGadgetState(SceneGadget g, int state) {
-        if(g.persistent) //Only cache when is persistent
-            cachedGadgetStates.put(g.config_id, state);
-    }
-
-    public int getCachedGadgetState(SceneGadget g) {
-        Integer state = cachedGadgetStates.getOrDefault(g.config_id, null);
-        return (state == null) ? g.state : state;
-    }
-
-    public void save() {
-        DatabaseHelper.saveGroupInstance(this);
-    }
-}
+package emu.grasscutter.game.world;
+
+import dev.morphia.annotations.Entity;
+import dev.morphia.annotations.Id;
+import dev.morphia.annotations.Indexed;
+import emu.grasscutter.database.DatabaseHelper;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.scripts.data.SceneGadget;
+import emu.grasscutter.scripts.data.SceneGroup;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import lombok.Getter;
+import lombok.Setter;
+import org.bson.types.ObjectId;
+
+@Entity(value = "group_instances", useDiscriminator = false)
+public final class SceneGroupInstance {
+    @Id private ObjectId id;
+
+    @Indexed private int ownerUid; // This group is owned by the host player
+    @Getter private int groupId;
+
+    @Getter private transient SceneGroup luaGroup;
+    @Getter @Setter private int targetSuiteId;
+    @Getter @Setter private int activeSuiteId;
+    @Getter private Set<Integer> deadEntities; // Config_ids
+    private boolean isCached;
+
+    @Getter private Map<Integer, Integer> cachedGadgetStates;
+    @Getter private Map<String, Integer> cachedVariables;
+
+    @Getter @Setter private int lastTimeRefreshed;
+
+    public SceneGroupInstance(SceneGroup group, Player owner) {
+        this.luaGroup = group;
+        this.groupId = group.id;
+        this.targetSuiteId = 0;
+        this.activeSuiteId = 0;
+        this.lastTimeRefreshed = 0;
+        this.ownerUid = owner.getUid();
+        this.deadEntities = new HashSet<>();
+        this.cachedGadgetStates = new ConcurrentHashMap<>();
+        this.cachedVariables = new ConcurrentHashMap<>();
+
+        this.isCached =
+                false; // This is true when the group is not loaded on scene but caches suite data
+    }
+
+    @Deprecated // Morphia only!
+    SceneGroupInstance() {
+        this.cachedVariables = new ConcurrentHashMap<>();
+        this.deadEntities = new HashSet<>();
+        this.cachedGadgetStates = new ConcurrentHashMap<>();
+    }
+
+    public void setLuaGroup(SceneGroup group) {
+        this.luaGroup = group;
+        this.groupId = group.id;
+    }
+
+    public boolean isCached() {
+        return this.isCached;
+    }
+
+    public void setCached(boolean value) {
+        this.isCached = value;
+        save(); // Save each time a group is registered or unregistered
+    }
+
+    public void cacheGadgetState(SceneGadget g, int state) {
+        if (g.persistent) // Only cache when is persistent
+        cachedGadgetStates.put(g.config_id, state);
+    }
+
+    public int getCachedGadgetState(SceneGadget g) {
+        Integer state = cachedGadgetStates.getOrDefault(g.config_id, null);
+        return (state == null) ? g.state : state;
+    }
+
+    public void save() {
+        DatabaseHelper.saveGroupInstance(this);
+    }
+}

src/main/java/emu/grasscutter/scripts/ScriptUtils.java

@@ -1,66 +1,64 @@
-package emu.grasscutter.scripts;
-
-import emu.grasscutter.Grasscutter;
-import java.util.HashMap;
-
-import emu.grasscutter.utils.Position;
-import lombok.val;
-import org.luaj.vm2.LuaTable;
-import org.luaj.vm2.LuaValue;
-
-public interface ScriptUtils {
-    static HashMap<Object, Object> toMap(LuaTable table) {
-        HashMap<Object, Object> map = new HashMap<>();
-        LuaValue[] rootKeys = table.keys();
-        for (LuaValue k : rootKeys) {
-            if (table.get(k).istable()) {
-                map.put(k, toMap(table.get(k).checktable()));
-            } else {
-                map.put(k, table.get(k));
-            }
-        }
-        return map;
-    }
-
-    static void print(LuaTable table) {
-        Grasscutter.getLogger().info(toMap(table).toString());
-    }
-
-    /**
-     * Converts a position object into a Lua table.
-     *
-     * @param position The position object to convert.
-     * @return The Lua table.
-     */
-    static LuaTable posToLua(Position position) {
-        var result = new LuaTable();
-        if (position != null) {
-            result.set("x", position.getX());
-            result.set("y", position.getY());
-            result.set("z", position.getZ());
-        } else {
-            result.set("x", 0);
-            result.set("y", 0);
-            result.set("z", 0);
-        }
-
-        return result;
-    }
-
-    /**
-     * Converts a Lua table into a position object.
-     *
-     * @param position The Lua table to convert.
-     * @return The position object.
-     */
-    static Position luaToPos(LuaValue position) {
-        var result = new Position();
-        if (position != null && !position.isnil()) {
-            result.setX(position.get("x").optint(0));
-            result.setY(position.get("y").optint(0));
-            result.setZ(position.get("z").optint(0));
-        }
-
-        return result;
-    }
-}
+package emu.grasscutter.scripts;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.utils.Position;
+import java.util.HashMap;
+import org.luaj.vm2.LuaTable;
+import org.luaj.vm2.LuaValue;
+
+public interface ScriptUtils {
+    static HashMap<Object, Object> toMap(LuaTable table) {
+        HashMap<Object, Object> map = new HashMap<>();
+        LuaValue[] rootKeys = table.keys();
+        for (LuaValue k : rootKeys) {
+            if (table.get(k).istable()) {
+                map.put(k, toMap(table.get(k).checktable()));
+            } else {
+                map.put(k, table.get(k));
+            }
+        }
+        return map;
+    }
+
+    static void print(LuaTable table) {
+        Grasscutter.getLogger().info(toMap(table).toString());
+    }
+
+    /**
+     * Converts a position object into a Lua table.
+     *
+     * @param position The position object to convert.
+     * @return The Lua table.
+     */
+    static LuaTable posToLua(Position position) {
+        var result = new LuaTable();
+        if (position != null) {
+            result.set("x", position.getX());
+            result.set("y", position.getY());
+            result.set("z", position.getZ());
+        } else {
+            result.set("x", 0);
+            result.set("y", 0);
+            result.set("z", 0);
+        }
+
+        return result;
+    }
+
+    /**
+     * Converts a Lua table into a position object.
+     *
+     * @param position The Lua table to convert.
+     * @return The position object.
+     */
+    static Position luaToPos(LuaValue position) {
+        var result = new Position();
+        if (position != null && !position.isnil()) {
+            result.setX(position.get("x").optint(0));
+            result.setY(position.get("y").optint(0));
+            result.setZ(position.get("z").optint(0));
+        }
+
+        return result;
+    }
+}

src/main/java/emu/grasscutter/scripts/data/SceneConfig.java

@@ -1,16 +1,16 @@
-package emu.grasscutter.scripts.data;
-
-import emu.grasscutter.utils.Position;
-import lombok.Setter;
-import lombok.ToString;
-
-@ToString
-@Setter
-public class SceneConfig {
-    public Position vision_anchor;
-    public Position born_pos;
-    public Position born_rot;
-    public Position begin_pos;
-    public Position size;
-    public float die_y;
-}
+package emu.grasscutter.scripts.data;
+
+import emu.grasscutter.utils.Position;
+import lombok.Setter;
+import lombok.ToString;
+
+@ToString
+@Setter
+public class SceneConfig {
+    public Position vision_anchor;
+    public Position born_pos;
+    public Position born_rot;
+    public Position begin_pos;
+    public Position size;
+    public float die_y;
+}

src/main/java/emu/grasscutter/scripts/data/SceneGroup.java

@@ -1,183 +1,206 @@
-package emu.grasscutter.scripts.data;
-
-import emu.grasscutter.Grasscutter;
-import emu.grasscutter.scripts.ScriptLoader;
-import emu.grasscutter.utils.Position;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-import org.luaj.vm2.LuaValue;
-
-import javax.script.Bindings;
-import javax.script.CompiledScript;
-import javax.script.ScriptException;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Random;
-import java.util.stream.Collectors;
-
-@ToString
-@Setter
-public final class SceneGroup {
-    public transient int block_id; // Not an actual variable in the scripts but we will keep it here for reference
-
-    public int id;
-    public int refresh_id;
-    public Position pos;
-
-    public Map<Integer, SceneMonster> monsters; // <ConfigId, Monster>
-    public Map<Integer, SceneNPC> npcs; // <ConfigId, Npc>
-    public Map<Integer, SceneGadget> gadgets; // <ConfigId, Gadgets>
-    public Map<String, SceneTrigger> triggers;
-    public Map<Integer, SceneRegion> regions;
-    public List<SceneSuite> suites;
-    public List<SceneVar> variables;
-
-    public SceneBusiness business;
-    public SceneGarbage garbages;
-    public SceneInitConfig init_config;
-    @Getter public boolean dynamic_load = false;
-
-    public SceneReplaceable is_replaceable;
-
-    private transient boolean loaded; // Not an actual variable in the scripts either
-    private transient CompiledScript script;
-    private transient Bindings bindings;
-    public static SceneGroup of(int groupId) {
-        var group = new SceneGroup();
-        group.id = groupId;
-        return group;
-    }
-
-    public boolean isLoaded() {
-        return this.loaded;
-    }
-
-    public void setLoaded(boolean loaded) {
-        this.loaded = loaded;
-    }
-
-    public int getBusinessType() {
-        return this.business == null ? 0 : this.business.type;
-    }
-
-    public List<SceneGadget> getGarbageGadgets() {
-        return this.garbages == null ? null : this.garbages.gadgets;
-    }
-
-    public CompiledScript getScript() {
-        return this.script;
-    }
-
-    public SceneSuite getSuiteByIndex(int index) {
-        if(index < 1 || index > suites.size()) {
-            return null;
-        }
-        return this.suites.get(index - 1);
-    }
-
-    public Bindings getBindings() {
-        return this.bindings;
-    }
-
-    public synchronized SceneGroup load(int sceneId) {
-        if (this.loaded) {
-            return this;
-        }
-        // Set flag here so if there is no script, we don't call this function over and over again.
-        this.setLoaded(true);
-
-        this.bindings = ScriptLoader.getEngine().createBindings();
-
-        CompiledScript cs = ScriptLoader.getScript("Scene/" + sceneId + "/scene" + sceneId + "_group" + this.id + ".lua");
-
-        if (cs == null) {
-            return this;
-        }
-
-        this.script = cs;
-
-        // Eval script
-        try {
-            cs.eval(this.bindings);
-
-            // Set
-            this.monsters = ScriptLoader.getSerializer().toList(SceneMonster.class, this.bindings.get("monsters")).stream()
-                .collect(Collectors.toMap(x -> x.config_id, y -> y, (a, b) -> a));
-            this.monsters.values().forEach(m -> m.group = this);
-
-            this.npcs = ScriptLoader.getSerializer().toList(SceneNPC.class, this.bindings.get("npcs")).stream()
-                .collect(Collectors.toMap(x -> x.config_id, y -> y, (a, b) -> a));
-            this.npcs.values().forEach(m -> m.group = this);
-
-            this.gadgets = ScriptLoader.getSerializer().toList(SceneGadget.class, this.bindings.get("gadgets")).stream()
-                .collect(Collectors.toMap(x -> x.config_id, y -> y, (a, b) -> a));
-            this.gadgets.values().forEach(m -> m.group = this);
-
-            this.triggers = ScriptLoader.getSerializer().toList(SceneTrigger.class, this.bindings.get("triggers")).stream()
-                .collect(Collectors.toMap(SceneTrigger::getName, y -> y, (a, b) -> a));
-            this.triggers.values().forEach(t -> t.currentGroup = this);
-
-            this.suites = ScriptLoader.getSerializer().toList(SceneSuite.class, this.bindings.get("suites"));
-            this.regions = ScriptLoader.getSerializer().toList(SceneRegion.class, this.bindings.get("regions")).stream()
-                .collect(Collectors.toMap(x -> x.config_id, y -> y, (a, b) -> a));
-            this.regions.values().forEach(m -> m.group = this);
-
-            this.init_config = ScriptLoader.getSerializer().toObject(SceneInitConfig.class, this.bindings.get("init_config"));
-
-            // Garbages // TODO: fix properly later
-            Object garbagesValue = this.bindings.get("garbages");
-            if (garbagesValue instanceof LuaValue garbagesTable) {
-                this.garbages = new SceneGarbage();
-                if (garbagesTable.checktable().get("gadgets") != LuaValue.NIL) {
-                    this.garbages.gadgets = ScriptLoader.getSerializer().toList(SceneGadget.class, garbagesTable.checktable().get("gadgets").checktable());
-                    this.garbages.gadgets.forEach(m -> m.group = this);
-                }
-            }
-
-            // Add variables to suite
-            this.variables = ScriptLoader.getSerializer().toList(SceneVar.class, this.bindings.get("variables"));
-
-            // Add monsters and gadgets to suite
-            this.suites.forEach(i -> i.init(this));
-
-        } catch (ScriptException e) {
-            Grasscutter.getLogger().error("An error occurred while loading group " + this.id + " in scene " + sceneId + ".", e);
-        }
-
-        Grasscutter.getLogger().debug("Successfully loaded group {} in scene {}.", this.id, sceneId);
-        return this;
-    }
-
-    public int findInitSuiteIndex(int exclude_index) { //TODO: Investigate end index
-        if (init_config == null) return 1;
-        if (init_config.io_type == 1) return init_config.suite; //IO TYPE FLOW
-        if (init_config.rand_suite) {
-            if (suites.size() == 1) {
-                return init_config.suite;
-            } else {
-                List<Integer> randSuiteList = new ArrayList<>();
-                for (int i = 0; i < suites.size(); i++) {
-                    if (i == exclude_index) continue;
-
-                    var suite = suites.get(i);
-                    for(int j = 0; j < suite.rand_weight; j++) randSuiteList.add(i);
-                }
-
-                return randSuiteList.get(new Random().nextInt(randSuiteList.size()));
-            }
-        }
-        return init_config.suite;
-    }
-
-    public Optional<SceneBossChest> searchBossChestInGroup() {
-        return this.gadgets.values().stream()
-            .filter(g -> g.boss_chest != null && g.boss_chest.monster_config_id > 0)
-            .map(g -> g.boss_chest)
-            .findFirst();
-    }
-
-}
+package emu.grasscutter.scripts.data;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.scripts.ScriptLoader;
+import emu.grasscutter.utils.Position;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Random;
+import java.util.stream.Collectors;
+import javax.script.Bindings;
+import javax.script.CompiledScript;
+import javax.script.ScriptException;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.luaj.vm2.LuaValue;
+
+@ToString
+@Setter
+public final class SceneGroup {
+    public transient int
+            block_id; // Not an actual variable in the scripts but we will keep it here for reference
+
+    public int id;
+    public int refresh_id;
+    public Position pos;
+
+    public Map<Integer, SceneMonster> monsters; // <ConfigId, Monster>
+    public Map<Integer, SceneNPC> npcs; // <ConfigId, Npc>
+    public Map<Integer, SceneGadget> gadgets; // <ConfigId, Gadgets>
+    public Map<String, SceneTrigger> triggers;
+    public Map<Integer, SceneRegion> regions;
+    public List<SceneSuite> suites;
+    public List<SceneVar> variables;
+
+    public SceneBusiness business;
+    public SceneGarbage garbages;
+    public SceneInitConfig init_config;
+    @Getter public boolean dynamic_load = false;
+
+    public SceneReplaceable is_replaceable;
+
+    private transient boolean loaded; // Not an actual variable in the scripts either
+    private transient CompiledScript script;
+    private transient Bindings bindings;
+
+    public static SceneGroup of(int groupId) {
+        var group = new SceneGroup();
+        group.id = groupId;
+        return group;
+    }
+
+    public boolean isLoaded() {
+        return this.loaded;
+    }
+
+    public void setLoaded(boolean loaded) {
+        this.loaded = loaded;
+    }
+
+    public int getBusinessType() {
+        return this.business == null ? 0 : this.business.type;
+    }
+
+    public List<SceneGadget> getGarbageGadgets() {
+        return this.garbages == null ? null : this.garbages.gadgets;
+    }
+
+    public CompiledScript getScript() {
+        return this.script;
+    }
+
+    public SceneSuite getSuiteByIndex(int index) {
+        if (index < 1 || index > suites.size()) {
+            return null;
+        }
+        return this.suites.get(index - 1);
+    }
+
+    public Bindings getBindings() {
+        return this.bindings;
+    }
+
+    public synchronized SceneGroup load(int sceneId) {
+        if (this.loaded) {
+            return this;
+        }
+        // Set flag here so if there is no script, we don't call this function over and over again.
+        this.setLoaded(true);
+
+        this.bindings = ScriptLoader.getEngine().createBindings();
+
+        CompiledScript cs =
+                ScriptLoader.getScript(
+                        "Scene/" + sceneId + "/scene" + sceneId + "_group" + this.id + ".lua");
+
+        if (cs == null) {
+            return this;
+        }
+
+        this.script = cs;
+
+        // Eval script
+        try {
+            cs.eval(this.bindings);
+
+            // Set
+            this.monsters =
+                    ScriptLoader.getSerializer()
+                            .toList(SceneMonster.class, this.bindings.get("monsters"))
+                            .stream()
+                            .collect(Collectors.toMap(x -> x.config_id, y -> y, (a, b) -> a));
+            this.monsters.values().forEach(m -> m.group = this);
+
+            this.npcs =
+                    ScriptLoader.getSerializer().toList(SceneNPC.class, this.bindings.get("npcs")).stream()
+                            .collect(Collectors.toMap(x -> x.config_id, y -> y, (a, b) -> a));
+            this.npcs.values().forEach(m -> m.group = this);
+
+            this.gadgets =
+                    ScriptLoader.getSerializer()
+                            .toList(SceneGadget.class, this.bindings.get("gadgets"))
+                            .stream()
+                            .collect(Collectors.toMap(x -> x.config_id, y -> y, (a, b) -> a));
+            this.gadgets.values().forEach(m -> m.group = this);
+
+            this.triggers =
+                    ScriptLoader.getSerializer()
+                            .toList(SceneTrigger.class, this.bindings.get("triggers"))
+                            .stream()
+                            .collect(Collectors.toMap(SceneTrigger::getName, y -> y, (a, b) -> a));
+            this.triggers.values().forEach(t -> t.currentGroup = this);
+
+            this.suites =
+                    ScriptLoader.getSerializer().toList(SceneSuite.class, this.bindings.get("suites"));
+            this.regions =
+                    ScriptLoader.getSerializer()
+                            .toList(SceneRegion.class, this.bindings.get("regions"))
+                            .stream()
+                            .collect(Collectors.toMap(x -> x.config_id, y -> y, (a, b) -> a));
+            this.regions.values().forEach(m -> m.group = this);
+
+            this.init_config =
+                    ScriptLoader.getSerializer()
+                            .toObject(SceneInitConfig.class, this.bindings.get("init_config"));
+
+            // Garbages // TODO: fix properly later
+            Object garbagesValue = this.bindings.get("garbages");
+            if (garbagesValue instanceof LuaValue garbagesTable) {
+                this.garbages = new SceneGarbage();
+                if (garbagesTable.checktable().get("gadgets") != LuaValue.NIL) {
+                    this.garbages.gadgets =
+                            ScriptLoader.getSerializer()
+                                    .toList(
+                                            SceneGadget.class, garbagesTable.checktable().get("gadgets").checktable());
+                    this.garbages.gadgets.forEach(m -> m.group = this);
+                }
+            }
+
+            // Add variables to suite
+            this.variables =
+                    ScriptLoader.getSerializer().toList(SceneVar.class, this.bindings.get("variables"));
+
+            // Add monsters and gadgets to suite
+            this.suites.forEach(i -> i.init(this));
+
+        } catch (ScriptException e) {
+            Grasscutter.getLogger()
+                    .error(
+                            "An error occurred while loading group " + this.id + " in scene " + sceneId + ".", e);
+        }
+
+        Grasscutter.getLogger().debug("Successfully loaded group {} in scene {}.", this.id, sceneId);
+        return this;
+    }
+
+    public int findInitSuiteIndex(int exclude_index) { // TODO: Investigate end index
+        if (init_config == null) return 1;
+        if (init_config.io_type == 1) return init_config.suite; // IO TYPE FLOW
+        if (init_config.rand_suite) {
+            if (suites.size() == 1) {
+                return init_config.suite;
+            } else {
+                List<Integer> randSuiteList = new ArrayList<>();
+                for (int i = 0; i < suites.size(); i++) {
+                    if (i == exclude_index) continue;
+
+                    var suite = suites.get(i);
+                    for (int j = 0; j < suite.rand_weight; j++) randSuiteList.add(i);
+                }
+
+                return randSuiteList.get(new Random().nextInt(randSuiteList.size()));
+            }
+        }
+        return init_config.suite;
+    }
+
+    public Optional<SceneBossChest> searchBossChestInGroup() {
+        return this.gadgets.values().stream()
+                .filter(g -> g.boss_chest != null && g.boss_chest.monster_config_id > 0)
+                .map(g -> g.boss_chest)
+                .findFirst();
+    }
+}

src/main/java/emu/grasscutter/scripts/data/SceneInitConfig.java

@@ -1,13 +1,13 @@
-package emu.grasscutter.scripts.data;
-
-import lombok.Setter;
-import lombok.ToString;
-
-@ToString
-@Setter
-public final class SceneInitConfig {
-    public int suite;
-    public int end_suite;
-    public int io_type;
-    public boolean rand_suite;
-}
+package emu.grasscutter.scripts.data;
+
+import lombok.Setter;
+import lombok.ToString;
+
+@ToString
+@Setter
+public final class SceneInitConfig {
+    public int suite;
+    public int end_suite;
+    public int io_type;
+    public boolean rand_suite;
+}

src/main/java/emu/grasscutter/scripts/data/SceneMonster.java

@@ -1,15 +1,15 @@
-package emu.grasscutter.scripts.data;
-
-import lombok.Setter;
-import lombok.ToString;
-
-@ToString
-@Setter
-public class SceneMonster extends SceneObject{
-    public int monster_id;
-    public int pose_id;
-    public int drop_id;
-    public boolean disableWander;
-    public int title_id;
-    public int special_name_id;
-}
+package emu.grasscutter.scripts.data;
+
+import lombok.Setter;
+import lombok.ToString;
+
+@ToString
+@Setter
+public class SceneMonster extends SceneObject {
+    public int monster_id;
+    public int pose_id;
+    public int drop_id;
+    public boolean disableWander;
+    public int title_id;
+    public int special_name_id;
+}

src/main/java/emu/grasscutter/scripts/data/SceneObject.java

@@ -1,19 +1,19 @@
-package emu.grasscutter.scripts.data;
-
-import emu.grasscutter.utils.Position;
-import lombok.Setter;
-import lombok.ToString;
-
-@ToString
-@Setter
-public abstract class SceneObject {
-    public int level;
-    public int config_id;
-    public int area_id;
-    public int vision_level = 0;
-
-    public Position pos;
-    public Position rot;
-    /** not set by lua */
-    public transient SceneGroup group;
-}
+package emu.grasscutter.scripts.data;
+
+import emu.grasscutter.utils.Position;
+import lombok.Setter;
+import lombok.ToString;
+
+@ToString
+@Setter
+public abstract class SceneObject {
+    public int level;
+    public int config_id;
+    public int area_id;
+    public int vision_level = 0;
+
+    public Position pos;
+    public Position rot;
+    /** not set by lua */
+    public transient SceneGroup group;
+}

src/main/java/emu/grasscutter/scripts/data/SceneSuite.java

@@ -1,63 +1,61 @@
-package emu.grasscutter.scripts.data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import lombok.Setter;
-import lombok.ToString;
-
-@ToString
-@Setter
-public class SceneSuite {
-    // make it refer the default empty list to avoid NPE caused by some group
-    public List<Integer> monsters = List.of();
-    public List<Integer> gadgets = List.of();
-    public List<String> triggers = List.of();
-    public List<Integer> regions = List.of();
-    public int rand_weight;
-
-    public boolean ban_refresh = false;
-
-    public transient List<SceneMonster> sceneMonsters = List.of();
-    public transient List<SceneGadget> sceneGadgets = List.of();
-    public transient List<SceneTrigger> sceneTriggers = List.of();
-    public transient List<SceneRegion> sceneRegions = List.of();
-
-    public void init(SceneGroup sceneGroup) {
-        if(sceneGroup.monsters != null){
-            this.sceneMonsters = new ArrayList<>(
-                this.monsters.stream()
-                    .filter(sceneGroup.monsters::containsKey)
-                    .map(sceneGroup.monsters::get)
-                    .toList()
-            );
-        }
-
-        if(sceneGroup.gadgets != null){
-            this.sceneGadgets = new ArrayList<>(
-                this.gadgets.stream()
-                    .filter(sceneGroup.gadgets::containsKey)
-                    .map(sceneGroup.gadgets::get)
-                    .toList()
-            );
-        }
-
-        if(sceneGroup.triggers != null) {
-            this.sceneTriggers = new ArrayList<>(
-                this.triggers.stream()
-                    .filter(sceneGroup.triggers::containsKey)
-                    .map(sceneGroup.triggers::get)
-                    .toList()
-            );
-        }
-        if(sceneGroup.regions != null) {
-            this.sceneRegions = new ArrayList<>(
-                this.regions.stream()
-                    .filter(sceneGroup.regions::containsKey)
-                    .map(sceneGroup.regions::get)
-                    .toList()
-            );
-        }
-
-    }
-}
+package emu.grasscutter.scripts.data;
+
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Setter;
+import lombok.ToString;
+
+@ToString
+@Setter
+public class SceneSuite {
+    // make it refer the default empty list to avoid NPE caused by some group
+    public List<Integer> monsters = List.of();
+    public List<Integer> gadgets = List.of();
+    public List<String> triggers = List.of();
+    public List<Integer> regions = List.of();
+    public int rand_weight;
+
+    public boolean ban_refresh = false;
+
+    public transient List<SceneMonster> sceneMonsters = List.of();
+    public transient List<SceneGadget> sceneGadgets = List.of();
+    public transient List<SceneTrigger> sceneTriggers = List.of();
+    public transient List<SceneRegion> sceneRegions = List.of();
+
+    public void init(SceneGroup sceneGroup) {
+        if (sceneGroup.monsters != null) {
+            this.sceneMonsters =
+                    new ArrayList<>(
+                            this.monsters.stream()
+                                    .filter(sceneGroup.monsters::containsKey)
+                                    .map(sceneGroup.monsters::get)
+                                    .toList());
+        }
+
+        if (sceneGroup.gadgets != null) {
+            this.sceneGadgets =
+                    new ArrayList<>(
+                            this.gadgets.stream()
+                                    .filter(sceneGroup.gadgets::containsKey)
+                                    .map(sceneGroup.gadgets::get)
+                                    .toList());
+        }
+
+        if (sceneGroup.triggers != null) {
+            this.sceneTriggers =
+                    new ArrayList<>(
+                            this.triggers.stream()
+                                    .filter(sceneGroup.triggers::containsKey)
+                                    .map(sceneGroup.triggers::get)
+                                    .toList());
+        }
+        if (sceneGroup.regions != null) {
+            this.sceneRegions =
+                    new ArrayList<>(
+                            this.regions.stream()
+                                    .filter(sceneGroup.regions::containsKey)
+                                    .map(sceneGroup.regions::get)
+                                    .toList());
+        }
+    }
+}

src/main/java/emu/grasscutter/scripts/data/SceneTrigger.java

@@ -1,45 +1,57 @@
-package emu.grasscutter.scripts.data;
-
-import lombok.*;
-
-@Setter
-@Getter
-@NoArgsConstructor
-// todo find way to deserialize from lua with final fields, maybe with the help of Builder?
-public final class SceneTrigger {
-    private String name;
-    private int config_id;
-    private int event;
-    private int trigger_count = 1;
-    private String source;
-    private String condition;
-    private String action;
-    private String tag;
-
-    public transient SceneGroup currentGroup;
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof SceneTrigger sceneTrigger){
-            return this.name.equals(sceneTrigger.name);
-        } else return super.equals(obj);
-    }
-
-    @Override
-    public int hashCode() {
-        return name.hashCode();
-    }
-
-    @Override
-    public String toString() {
-        return "SceneTrigger{" +
-            "name='" + name + '\'' +
-            ", config_id=" + config_id +
-            ", event=" + event +
-            ", source='" + source + '\'' +
-            ", condition='" + condition + '\'' +
-            ", action='" + action + '\'' +
-            ", trigger_count='" + trigger_count + '\'' +
-            '}';
-    }
-}
+package emu.grasscutter.scripts.data;
+
+import lombok.*;
+
+@Setter
+@Getter
+@NoArgsConstructor
+// todo find way to deserialize from lua with final fields, maybe with the help of Builder?
+public final class SceneTrigger {
+    private String name;
+    private int config_id;
+    private int event;
+    private int trigger_count = 1;
+    private String source;
+    private String condition;
+    private String action;
+    private String tag;
+
+    public transient SceneGroup currentGroup;
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof SceneTrigger sceneTrigger) {
+            return this.name.equals(sceneTrigger.name);
+        } else return super.equals(obj);
+    }
+
+    @Override
+    public int hashCode() {
+        return name.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return "SceneTrigger{"
+                + "name='"
+                + name
+                + '\''
+                + ", config_id="
+                + config_id
+                + ", event="
+                + event
+                + ", source='"
+                + source
+                + '\''
+                + ", condition='"
+                + condition
+                + '\''
+                + ", action='"
+                + action
+                + '\''
+                + ", trigger_count='"
+                + trigger_count
+                + '\''
+                + '}';
+    }
+}

src/main/java/emu/grasscutter/scripts/data/ScriptArgs.java

@@ -1,90 +1,90 @@
-package emu.grasscutter.scripts.data;
-
-public class ScriptArgs {
-    public int param1;
-    public int param2;
-    public int param3;
-    public int source_eid; // Source entity
-    public int target_eid;
-    public int group_id;
-    public String source; // source string, used for timers
-    public int type; // lua event type, used by scripts and the ScriptManager
-
-    public ScriptArgs(int groupId, int eventType) {
-        this(groupId, eventType, 0,0);
-    }
-
-    public ScriptArgs(int groupId, int eventType, int param1) {
-        this(groupId, eventType, param1,0);
-    }
-
-    public ScriptArgs(int groupId, int eventType, int param1, int param2) {
-        this.type = eventType;
-        this.param1 = param1;
-        this.param2 = param2;
-        this.group_id = groupId;
-    }
-
-    public int getParam1() {
-        return param1;
-    }
-
-    public ScriptArgs setParam1(int param1) {
-        this.param1 = param1;
-        return this;
-    }
-
-    public int getParam2() {
-        return param2;
-    }
-
-    public ScriptArgs setParam2(int param2) {
-        this.param2 = param2;
-        return this;
-    }
-
-    public int getParam3() {
-        return param3;
-    }
-
-    public ScriptArgs setParam3(int param3) {
-        this.param3 = param3;
-        return this;
-    }
-
-    public int getSourceEntityId() {
-        return source_eid;
-    }
-
-    public ScriptArgs setSourceEntityId(int source_eid) {
-        this.source_eid = source_eid;
-        return this;
-    }
-
-    public int getTargetEntityId() {
-        return target_eid;
-    }
-
-    public ScriptArgs setTargetEntityId(int target_eid) {
-        this.target_eid = target_eid;
-        return this;
-    }
-
-    public String getEventSource() {
-        return source;
-    }
-
-    public ScriptArgs setEventSource(String source) {
-        this.source = source;
-        return this;
-    }
-
-    public int getGroupId() {
-        return group_id;
-    }
-
-    public ScriptArgs setGroupId(int group_id) {
-        this.group_id = group_id;
-        return this;
-    }
-}
+package emu.grasscutter.scripts.data;
+
+public class ScriptArgs {
+    public int param1;
+    public int param2;
+    public int param3;
+    public int source_eid; // Source entity
+    public int target_eid;
+    public int group_id;
+    public String source; // source string, used for timers
+    public int type; // lua event type, used by scripts and the ScriptManager
+
+    public ScriptArgs(int groupId, int eventType) {
+        this(groupId, eventType, 0, 0);
+    }
+
+    public ScriptArgs(int groupId, int eventType, int param1) {
+        this(groupId, eventType, param1, 0);
+    }
+
+    public ScriptArgs(int groupId, int eventType, int param1, int param2) {
+        this.type = eventType;
+        this.param1 = param1;
+        this.param2 = param2;
+        this.group_id = groupId;
+    }
+
+    public int getParam1() {
+        return param1;
+    }
+
+    public ScriptArgs setParam1(int param1) {
+        this.param1 = param1;
+        return this;
+    }
+
+    public int getParam2() {
+        return param2;
+    }
+
+    public ScriptArgs setParam2(int param2) {
+        this.param2 = param2;
+        return this;
+    }
+
+    public int getParam3() {
+        return param3;
+    }
+
+    public ScriptArgs setParam3(int param3) {
+        this.param3 = param3;
+        return this;
+    }
+
+    public int getSourceEntityId() {
+        return source_eid;
+    }
+
+    public ScriptArgs setSourceEntityId(int source_eid) {
+        this.source_eid = source_eid;
+        return this;
+    }
+
+    public int getTargetEntityId() {
+        return target_eid;
+    }
+
+    public ScriptArgs setTargetEntityId(int target_eid) {
+        this.target_eid = target_eid;
+        return this;
+    }
+
+    public String getEventSource() {
+        return source;
+    }
+
+    public ScriptArgs setEventSource(String source) {
+        this.source = source;
+        return this;
+    }
+
+    public int getGroupId() {
+        return group_id;
+    }
+
+    public ScriptArgs setGroupId(int group_id) {
+        this.group_id = group_id;
+        return this;
+    }
+}

src/main/java/emu/grasscutter/scripts/service/ScriptMonsterTideService.java

@@ -1,92 +1,102 @@
-package emu.grasscutter.scripts.service;
-
-import emu.grasscutter.game.entity.EntityMonster;
-import emu.grasscutter.scripts.SceneScriptManager;
-import emu.grasscutter.scripts.constants.EventType;
-import emu.grasscutter.scripts.data.SceneGroup;
-import emu.grasscutter.scripts.data.SceneMonster;
-import emu.grasscutter.scripts.data.ScriptArgs;
-import emu.grasscutter.scripts.listener.ScriptMonsterListener;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public final class ScriptMonsterTideService {
-    private final SceneScriptManager sceneScriptManager;
-    private final SceneGroup currentGroup;
-    private final AtomicInteger monsterAlive;
-    private final AtomicInteger monsterTideCount;
-    private final AtomicInteger monsterKillCount;
-    private final int monsterSceneLimit;
-    private final ConcurrentLinkedQueue<Integer> monsterConfigOrders;
-    private final List<Integer> monsterConfigIds;
-    private final OnMonsterCreated onMonsterCreated= new OnMonsterCreated();
-    private final OnMonsterDead onMonsterDead= new OnMonsterDead();
-
-    public ScriptMonsterTideService(SceneScriptManager sceneScriptManager,
-                                    SceneGroup group, int tideCount, int monsterSceneLimit, Integer[] ordersConfigId){
-        this.sceneScriptManager = sceneScriptManager;
-        this.currentGroup = group;
-        this.monsterSceneLimit = monsterSceneLimit;
-        this.monsterTideCount = new AtomicInteger(tideCount);
-        this.monsterKillCount = new AtomicInteger(0);
-        this.monsterAlive = new AtomicInteger(0);
-        this.monsterConfigOrders = new ConcurrentLinkedQueue<>(List.of(ordersConfigId));
-        this.monsterConfigIds = List.of(ordersConfigId);
-
-        this.sceneScriptManager.getScriptMonsterSpawnService().addMonsterCreatedListener(onMonsterCreated);
-        this.sceneScriptManager.getScriptMonsterSpawnService().addMonsterDeadListener(onMonsterDead);
-        // spawn the first turn
-        for (int i = 0; i < this.monsterSceneLimit; i++) {
-            sceneScriptManager.addEntity(this.sceneScriptManager.createMonster(group.id, group.block_id, getNextMonster()));
-        }
-    }
-
-    public class OnMonsterCreated implements ScriptMonsterListener{
-        @Override
-        public void onNotify(EntityMonster sceneMonster) {
-            if(monsterConfigIds.contains(sceneMonster.getConfigId()) && monsterSceneLimit > 0){
-                monsterAlive.incrementAndGet();
-                monsterTideCount.decrementAndGet();
-            }
-        }
-    }
-
-    public SceneMonster getNextMonster(){
-        var nextId = this.monsterConfigOrders.poll();
-        if(currentGroup.monsters.containsKey(nextId)){
-            return currentGroup.monsters.get(nextId);
-        }
-        // TODO some monster config_id do not exist in groups, so temporarily set it to the first
-        return currentGroup.monsters.values().stream().findFirst().orElse(null);
-    }
-
-    public class OnMonsterDead implements ScriptMonsterListener {
-        @Override
-        public void onNotify(EntityMonster sceneMonster) {
-            if (monsterSceneLimit <= 0) {
-                return;
-            }
-            if (monsterAlive.decrementAndGet() >= monsterSceneLimit) {
-                // maybe not happen
-                return;
-            }
-            monsterKillCount.incrementAndGet();
-            if (monsterTideCount.get() > 0) {
-                // add more
-                sceneScriptManager.addEntity(sceneScriptManager.createMonster(currentGroup.id, currentGroup.block_id, getNextMonster()));
-            }
-            // spawn the last turn of monsters
-            // fix the 5-2
-            sceneScriptManager.callEvent(new ScriptArgs(currentGroup.id, EventType.EVENT_MONSTER_TIDE_DIE, monsterKillCount.get()));
-        }
-
-    }
-
-    public void unload(){
-        this.sceneScriptManager.getScriptMonsterSpawnService().removeMonsterCreatedListener(onMonsterCreated);
-        this.sceneScriptManager.getScriptMonsterSpawnService().removeMonsterDeadListener(onMonsterDead);
-    }
-}
+package emu.grasscutter.scripts.service;
+
+import emu.grasscutter.game.entity.EntityMonster;
+import emu.grasscutter.scripts.SceneScriptManager;
+import emu.grasscutter.scripts.constants.EventType;
+import emu.grasscutter.scripts.data.SceneGroup;
+import emu.grasscutter.scripts.data.SceneMonster;
+import emu.grasscutter.scripts.data.ScriptArgs;
+import emu.grasscutter.scripts.listener.ScriptMonsterListener;
+import java.util.List;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public final class ScriptMonsterTideService {
+    private final SceneScriptManager sceneScriptManager;
+    private final SceneGroup currentGroup;
+    private final AtomicInteger monsterAlive;
+    private final AtomicInteger monsterTideCount;
+    private final AtomicInteger monsterKillCount;
+    private final int monsterSceneLimit;
+    private final ConcurrentLinkedQueue<Integer> monsterConfigOrders;
+    private final List<Integer> monsterConfigIds;
+    private final OnMonsterCreated onMonsterCreated = new OnMonsterCreated();
+    private final OnMonsterDead onMonsterDead = new OnMonsterDead();
+
+    public ScriptMonsterTideService(
+            SceneScriptManager sceneScriptManager,
+            SceneGroup group,
+            int tideCount,
+            int monsterSceneLimit,
+            Integer[] ordersConfigId) {
+        this.sceneScriptManager = sceneScriptManager;
+        this.currentGroup = group;
+        this.monsterSceneLimit = monsterSceneLimit;
+        this.monsterTideCount = new AtomicInteger(tideCount);
+        this.monsterKillCount = new AtomicInteger(0);
+        this.monsterAlive = new AtomicInteger(0);
+        this.monsterConfigOrders = new ConcurrentLinkedQueue<>(List.of(ordersConfigId));
+        this.monsterConfigIds = List.of(ordersConfigId);
+
+        this.sceneScriptManager
+                .getScriptMonsterSpawnService()
+                .addMonsterCreatedListener(onMonsterCreated);
+        this.sceneScriptManager.getScriptMonsterSpawnService().addMonsterDeadListener(onMonsterDead);
+        // spawn the first turn
+        for (int i = 0; i < this.monsterSceneLimit; i++) {
+            sceneScriptManager.addEntity(
+                    this.sceneScriptManager.createMonster(group.id, group.block_id, getNextMonster()));
+        }
+    }
+
+    public class OnMonsterCreated implements ScriptMonsterListener {
+        @Override
+        public void onNotify(EntityMonster sceneMonster) {
+            if (monsterConfigIds.contains(sceneMonster.getConfigId()) && monsterSceneLimit > 0) {
+                monsterAlive.incrementAndGet();
+                monsterTideCount.decrementAndGet();
+            }
+        }
+    }
+
+    public SceneMonster getNextMonster() {
+        var nextId = this.monsterConfigOrders.poll();
+        if (currentGroup.monsters.containsKey(nextId)) {
+            return currentGroup.monsters.get(nextId);
+        }
+        // TODO some monster config_id do not exist in groups, so temporarily set it to the first
+        return currentGroup.monsters.values().stream().findFirst().orElse(null);
+    }
+
+    public class OnMonsterDead implements ScriptMonsterListener {
+        @Override
+        public void onNotify(EntityMonster sceneMonster) {
+            if (monsterSceneLimit <= 0) {
+                return;
+            }
+            if (monsterAlive.decrementAndGet() >= monsterSceneLimit) {
+                // maybe not happen
+                return;
+            }
+            monsterKillCount.incrementAndGet();
+            if (monsterTideCount.get() > 0) {
+                // add more
+                sceneScriptManager.addEntity(
+                        sceneScriptManager.createMonster(
+                                currentGroup.id, currentGroup.block_id, getNextMonster()));
+            }
+            // spawn the last turn of monsters
+            // fix the 5-2
+            sceneScriptManager.callEvent(
+                    new ScriptArgs(
+                            currentGroup.id, EventType.EVENT_MONSTER_TIDE_DIE, monsterKillCount.get()));
+        }
+    }
+
+    public void unload() {
+        this.sceneScriptManager
+                .getScriptMonsterSpawnService()
+                .removeMonsterCreatedListener(onMonsterCreated);
+        this.sceneScriptManager.getScriptMonsterSpawnService().removeMonsterDeadListener(onMonsterDead);
+    }
+}

src/main/java/emu/grasscutter/server/event/entity/EntityDamageEvent.java

@@ -1,24 +1,27 @@
-package emu.grasscutter.server.event.entity;
-
-import emu.grasscutter.game.entity.GameEntity;
-import emu.grasscutter.game.props.ElementType;
-import emu.grasscutter.server.event.Cancellable;
-import emu.grasscutter.server.event.types.EntityEvent;
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.annotation.Nullable;
-
-public final class EntityDamageEvent extends EntityEvent implements Cancellable {
-    @Getter @Setter private float damage;
-    @Getter @Setter private ElementType attackElementType;
-    @Getter @Nullable private final GameEntity damager;
-
-    public EntityDamageEvent(GameEntity entity, float damage, ElementType attackElementType, @Nullable GameEntity damager) {
-        super(entity);
-
-        this.damage = damage;
-        this.attackElementType = attackElementType;
-        this.damager = damager;
-    }
-}
+package emu.grasscutter.server.event.entity;
+
+import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.props.ElementType;
+import emu.grasscutter.server.event.Cancellable;
+import emu.grasscutter.server.event.types.EntityEvent;
+import javax.annotation.Nullable;
+import lombok.Getter;
+import lombok.Setter;
+
+public final class EntityDamageEvent extends EntityEvent implements Cancellable {
+    @Getter @Setter private float damage;
+    @Getter @Setter private ElementType attackElementType;
+    @Getter @Nullable private final GameEntity damager;
+
+    public EntityDamageEvent(
+            GameEntity entity,
+            float damage,
+            ElementType attackElementType,
+            @Nullable GameEntity damager) {
+        super(entity);
+
+        this.damage = damage;
+        this.attackElementType = attackElementType;
+        this.damager = damager;
+    }
+}

src/main/java/emu/grasscutter/server/game/GameServer.java

@@ -1,279 +1,279 @@
-package emu.grasscutter.server.game;
-
-import static emu.grasscutter.config.Configuration.GAME_INFO;
-import static emu.grasscutter.utils.Language.translate;
-
-import emu.grasscutter.GameConstants;
-import emu.grasscutter.Grasscutter;
-import emu.grasscutter.database.DatabaseHelper;
-import emu.grasscutter.game.Account;
-import emu.grasscutter.game.battlepass.BattlePassSystem;
-import emu.grasscutter.game.chat.ChatSystem;
-import emu.grasscutter.game.chat.ChatSystemHandler;
-import emu.grasscutter.game.combine.CombineManger;
-import emu.grasscutter.game.drop.DropSystem;
-import emu.grasscutter.game.dungeons.DungeonSystem;
-import emu.grasscutter.game.expedition.ExpeditionSystem;
-import emu.grasscutter.game.gacha.GachaSystem;
-import emu.grasscutter.game.managers.cooking.CookingCompoundManager;
-import emu.grasscutter.game.managers.cooking.CookingManager;
-import emu.grasscutter.game.managers.energy.EnergyManager;
-import emu.grasscutter.game.managers.stamina.StaminaManager;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.quest.QuestSystem;
-import emu.grasscutter.game.shop.ShopSystem;
-import emu.grasscutter.game.systems.AnnouncementSystem;
-import emu.grasscutter.game.systems.InventorySystem;
-import emu.grasscutter.game.systems.MultiplayerSystem;
-import emu.grasscutter.game.tower.TowerSystem;
-import emu.grasscutter.game.world.World;
-import emu.grasscutter.game.world.WorldDataSystem;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail;
-import emu.grasscutter.server.event.game.ServerTickEvent;
-import emu.grasscutter.server.event.internal.ServerStartEvent;
-import emu.grasscutter.server.event.internal.ServerStopEvent;
-import emu.grasscutter.server.event.types.ServerEvent;
-import emu.grasscutter.server.scheduler.ServerTaskScheduler;
-import emu.grasscutter.task.TaskMap;
-import java.net.InetSocketAddress;
-import java.time.Instant;
-import java.time.OffsetDateTime;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import kcp.highway.ChannelConfig;
-import kcp.highway.KcpServer;
-import lombok.Getter;
-
-@Getter
-public final class GameServer extends KcpServer {
-    // Game server base
-    private final InetSocketAddress address;
-    private final GameServerPacketHandler packetHandler;
-    private final Map<Integer, Player> players;
-    private final Set<World> worlds;
-
-    // Server systems
-    private final InventorySystem inventorySystem;
-    private final GachaSystem gachaSystem;
-    private final ShopSystem shopSystem;
-    private final MultiplayerSystem multiplayerSystem;
-    private final DungeonSystem dungeonSystem;
-    private final ExpeditionSystem expeditionSystem;
-    private final DropSystem dropSystem;
-    private final WorldDataSystem worldDataSystem;
-    private final BattlePassSystem battlePassSystem;
-    private final CombineManger combineSystem;
-    private final TowerSystem towerSystem;
-    private final AnnouncementSystem announcementSystem;
-    private final QuestSystem questSystem;
-
-    // Extra
-    private final ServerTaskScheduler scheduler;
-    private final TaskMap taskMap;
-
-    private ChatSystemHandler chatManager;
-
-    public GameServer() {
-        this(getAdapterInetSocketAddress());
-    }
-
-    public GameServer(InetSocketAddress address) {
-        ChannelConfig channelConfig = new ChannelConfig();
-        channelConfig.nodelay(true, GAME_INFO.kcpInterval, 2, true);
-        channelConfig.setMtu(1400);
-        channelConfig.setSndwnd(256);
-        channelConfig.setRcvwnd(256);
-        channelConfig.setTimeoutMillis(30 * 1000); // 30s
-        channelConfig.setUseConvChannel(true);
-        channelConfig.setAckNoDelay(false);
-
-        this.init(GameSessionManager.getListener(), channelConfig, address);
-
-        EnergyManager.initialize();
-        StaminaManager.initialize();
-        CookingManager.initialize();
-        CookingCompoundManager.initialize();
-        CombineManger.initialize();
-
-        // Game Server base
-        this.address = address;
-        this.packetHandler = new GameServerPacketHandler(PacketHandler.class);
-        this.players = new ConcurrentHashMap<>();
-        this.worlds = Collections.synchronizedSet(new HashSet<>());
-
-        // Extra
-        this.scheduler = new ServerTaskScheduler();
-        this.taskMap = new TaskMap(true);
-
-        // Create game systems
-        this.inventorySystem = new InventorySystem(this);
-        this.gachaSystem = new GachaSystem(this);
-        this.shopSystem = new ShopSystem(this);
-        this.multiplayerSystem = new MultiplayerSystem(this);
-        this.dungeonSystem = new DungeonSystem(this);
-        this.dropSystem = new DropSystem(this);
-        this.expeditionSystem = new ExpeditionSystem(this);
-        this.combineSystem = new CombineManger(this);
-        this.towerSystem = new TowerSystem(this);
-        this.worldDataSystem = new WorldDataSystem(this);
-        this.battlePassSystem = new BattlePassSystem(this);
-        this.announcementSystem = new AnnouncementSystem(this);
-        this.questSystem = new QuestSystem(this);
-
-        // Chata manager
-        this.chatManager = new ChatSystem(this);
-
-        // Hook into shutdown event.
-        Runtime.getRuntime().addShutdownHook(new Thread(this::onServerShutdown));
-    }
-
-    private static InetSocketAddress getAdapterInetSocketAddress() {
-        InetSocketAddress inetSocketAddress;
-        if (GAME_INFO.bindAddress.equals("")) {
-            inetSocketAddress = new InetSocketAddress(GAME_INFO.bindPort);
-        } else {
-            inetSocketAddress = new InetSocketAddress(GAME_INFO.bindAddress, GAME_INFO.bindPort);
-        }
-        return inetSocketAddress;
-    }
-
-    @Deprecated
-    public ChatSystemHandler getChatManager() {
-        return chatManager;
-    }
-
-    @Deprecated
-    public void setChatManager(ChatSystemHandler chatManager) {
-        this.chatManager = chatManager;
-    }
-
-    public ChatSystemHandler getChatSystem() {
-        return chatManager;
-    }
-
-    public void setChatSystem(ChatSystemHandler chatManager) {
-        this.chatManager = chatManager;
-    }
-
-    public void registerPlayer(Player player) {
-        getPlayers().put(player.getUid(), player);
-    }
-
-    public Player getPlayerByUid(int id) {
-        return this.getPlayerByUid(id, false);
-    }
-
-    public Player getPlayerByUid(int id, boolean allowOfflinePlayers) {
-        // Console check
-        if (id == GameConstants.SERVER_CONSOLE_UID) {
-            return null;
-        }
-
-        // Get from online players
-        Player player = this.getPlayers().get(id);
-
-        if (!allowOfflinePlayers) {
-            return player;
-        }
-
-        // Check database if character isnt here
-        if (player == null) {
-            player = DatabaseHelper.getPlayerByUid(id);
-        }
-
-        return player;
-    }
-
-    public Player getPlayerByAccountId(String accountId) {
-        Optional<Player> playerOpt =
-                getPlayers().values().stream()
-                        .filter(player -> player.getAccount().getId().equals(accountId))
-                        .findFirst();
-        return playerOpt.orElse(null);
-    }
-
-    public SocialDetail.Builder getSocialDetailByUid(int id) {
-        // Get from online players
-        Player player = this.getPlayerByUid(id, true);
-
-        if (player == null) {
-            return null;
-        }
-
-        return player.getSocialDetail();
-    }
-
-    public Account getAccountByName(String username) {
-        Optional<Player> playerOpt =
-                getPlayers().values().stream()
-                        .filter(player -> player.getAccount().getUsername().equals(username))
-                        .findFirst();
-        if (playerOpt.isPresent()) {
-            return playerOpt.get().getAccount();
-        }
-        return DatabaseHelper.getAccountByName(username);
-    }
-
-    public synchronized void onTick() {
-        var tickStart = Instant.now();
-
-        // Tick worlds.
-        this.worlds.removeIf(World::onTick);
-
-        // Tick players.
-        this.players.values().forEach(Player::onTick);
-
-        // Tick scheduler.
-        this.getScheduler().runTasks();
-
-        // Call server tick event.
-        ServerTickEvent event = new ServerTickEvent(tickStart, Instant.now());
-        event.call();
-    }
-
-    public void registerWorld(World world) {
-        this.getWorlds().add(world);
-    }
-
-    public void deregisterWorld(World world) {
-        // TODO Auto-generated method stub
-
-    }
-
-    public void start() {
-        // Schedule game loop.
-        Timer gameLoop = new Timer();
-        gameLoop.scheduleAtFixedRate(
-                new TimerTask() {
-                    @Override
-                    public void run() {
-                        try {
-                            onTick();
-                        } catch (Exception e) {
-                            Grasscutter.getLogger().error(translate("messages.game.game_update_error"), e);
-                        }
-                    }
-                },
-                new Date(),
-                1000L);
-        Grasscutter.getLogger().info(translate("messages.status.free_software"));
-        Grasscutter.getLogger()
-                .info(translate("messages.game.address_bind", GAME_INFO.accessAddress, address.getPort()));
-        ServerStartEvent event = new ServerStartEvent(ServerEvent.Type.GAME, OffsetDateTime.now());
-        event.call();
-    }
-
-    public void onServerShutdown() {
-        ServerStopEvent event = new ServerStopEvent(ServerEvent.Type.GAME, OffsetDateTime.now());
-        event.call();
-
-        // Kick and save all players
-        List<Player> list = new ArrayList<>(this.getPlayers().size());
-        list.addAll(this.getPlayers().values());
-
-        for (Player player : list) {
-            player.getSession().close();
-        }
-    }
-}
+package emu.grasscutter.server.game;
+
+import static emu.grasscutter.config.Configuration.GAME_INFO;
+import static emu.grasscutter.utils.Language.translate;
+
+import emu.grasscutter.GameConstants;
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.database.DatabaseHelper;
+import emu.grasscutter.game.Account;
+import emu.grasscutter.game.battlepass.BattlePassSystem;
+import emu.grasscutter.game.chat.ChatSystem;
+import emu.grasscutter.game.chat.ChatSystemHandler;
+import emu.grasscutter.game.combine.CombineManger;
+import emu.grasscutter.game.drop.DropSystem;
+import emu.grasscutter.game.dungeons.DungeonSystem;
+import emu.grasscutter.game.expedition.ExpeditionSystem;
+import emu.grasscutter.game.gacha.GachaSystem;
+import emu.grasscutter.game.managers.cooking.CookingCompoundManager;
+import emu.grasscutter.game.managers.cooking.CookingManager;
+import emu.grasscutter.game.managers.energy.EnergyManager;
+import emu.grasscutter.game.managers.stamina.StaminaManager;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.quest.QuestSystem;
+import emu.grasscutter.game.shop.ShopSystem;
+import emu.grasscutter.game.systems.AnnouncementSystem;
+import emu.grasscutter.game.systems.InventorySystem;
+import emu.grasscutter.game.systems.MultiplayerSystem;
+import emu.grasscutter.game.tower.TowerSystem;
+import emu.grasscutter.game.world.World;
+import emu.grasscutter.game.world.WorldDataSystem;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail;
+import emu.grasscutter.server.event.game.ServerTickEvent;
+import emu.grasscutter.server.event.internal.ServerStartEvent;
+import emu.grasscutter.server.event.internal.ServerStopEvent;
+import emu.grasscutter.server.event.types.ServerEvent;
+import emu.grasscutter.server.scheduler.ServerTaskScheduler;
+import emu.grasscutter.task.TaskMap;
+import java.net.InetSocketAddress;
+import java.time.Instant;
+import java.time.OffsetDateTime;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import kcp.highway.ChannelConfig;
+import kcp.highway.KcpServer;
+import lombok.Getter;
+
+@Getter
+public final class GameServer extends KcpServer {
+    // Game server base
+    private final InetSocketAddress address;
+    private final GameServerPacketHandler packetHandler;
+    private final Map<Integer, Player> players;
+    private final Set<World> worlds;
+
+    // Server systems
+    private final InventorySystem inventorySystem;
+    private final GachaSystem gachaSystem;
+    private final ShopSystem shopSystem;
+    private final MultiplayerSystem multiplayerSystem;
+    private final DungeonSystem dungeonSystem;
+    private final ExpeditionSystem expeditionSystem;
+    private final DropSystem dropSystem;
+    private final WorldDataSystem worldDataSystem;
+    private final BattlePassSystem battlePassSystem;
+    private final CombineManger combineSystem;
+    private final TowerSystem towerSystem;
+    private final AnnouncementSystem announcementSystem;
+    private final QuestSystem questSystem;
+
+    // Extra
+    private final ServerTaskScheduler scheduler;
+    private final TaskMap taskMap;
+
+    private ChatSystemHandler chatManager;
+
+    public GameServer() {
+        this(getAdapterInetSocketAddress());
+    }
+
+    public GameServer(InetSocketAddress address) {
+        ChannelConfig channelConfig = new ChannelConfig();
+        channelConfig.nodelay(true, GAME_INFO.kcpInterval, 2, true);
+        channelConfig.setMtu(1400);
+        channelConfig.setSndwnd(256);
+        channelConfig.setRcvwnd(256);
+        channelConfig.setTimeoutMillis(30 * 1000); // 30s
+        channelConfig.setUseConvChannel(true);
+        channelConfig.setAckNoDelay(false);
+
+        this.init(GameSessionManager.getListener(), channelConfig, address);
+
+        EnergyManager.initialize();
+        StaminaManager.initialize();
+        CookingManager.initialize();
+        CookingCompoundManager.initialize();
+        CombineManger.initialize();
+
+        // Game Server base
+        this.address = address;
+        this.packetHandler = new GameServerPacketHandler(PacketHandler.class);
+        this.players = new ConcurrentHashMap<>();
+        this.worlds = Collections.synchronizedSet(new HashSet<>());
+
+        // Extra
+        this.scheduler = new ServerTaskScheduler();
+        this.taskMap = new TaskMap(true);
+
+        // Create game systems
+        this.inventorySystem = new InventorySystem(this);
+        this.gachaSystem = new GachaSystem(this);
+        this.shopSystem = new ShopSystem(this);
+        this.multiplayerSystem = new MultiplayerSystem(this);
+        this.dungeonSystem = new DungeonSystem(this);
+        this.dropSystem = new DropSystem(this);
+        this.expeditionSystem = new ExpeditionSystem(this);
+        this.combineSystem = new CombineManger(this);
+        this.towerSystem = new TowerSystem(this);
+        this.worldDataSystem = new WorldDataSystem(this);
+        this.battlePassSystem = new BattlePassSystem(this);
+        this.announcementSystem = new AnnouncementSystem(this);
+        this.questSystem = new QuestSystem(this);
+
+        // Chata manager
+        this.chatManager = new ChatSystem(this);
+
+        // Hook into shutdown event.
+        Runtime.getRuntime().addShutdownHook(new Thread(this::onServerShutdown));
+    }
+
+    private static InetSocketAddress getAdapterInetSocketAddress() {
+        InetSocketAddress inetSocketAddress;
+        if (GAME_INFO.bindAddress.equals("")) {
+            inetSocketAddress = new InetSocketAddress(GAME_INFO.bindPort);
+        } else {
+            inetSocketAddress = new InetSocketAddress(GAME_INFO.bindAddress, GAME_INFO.bindPort);
+        }
+        return inetSocketAddress;
+    }
+
+    @Deprecated
+    public ChatSystemHandler getChatManager() {
+        return chatManager;
+    }
+
+    @Deprecated
+    public void setChatManager(ChatSystemHandler chatManager) {
+        this.chatManager = chatManager;
+    }
+
+    public ChatSystemHandler getChatSystem() {
+        return chatManager;
+    }
+
+    public void setChatSystem(ChatSystemHandler chatManager) {
+        this.chatManager = chatManager;
+    }
+
+    public void registerPlayer(Player player) {
+        getPlayers().put(player.getUid(), player);
+    }
+
+    public Player getPlayerByUid(int id) {
+        return this.getPlayerByUid(id, false);
+    }
+
+    public Player getPlayerByUid(int id, boolean allowOfflinePlayers) {
+        // Console check
+        if (id == GameConstants.SERVER_CONSOLE_UID) {
+            return null;
+        }
+
+        // Get from online players
+        Player player = this.getPlayers().get(id);
+
+        if (!allowOfflinePlayers) {
+            return player;
+        }
+
+        // Check database if character isnt here
+        if (player == null) {
+            player = DatabaseHelper.getPlayerByUid(id);
+        }
+
+        return player;
+    }
+
+    public Player getPlayerByAccountId(String accountId) {
+        Optional<Player> playerOpt =
+                getPlayers().values().stream()
+                        .filter(player -> player.getAccount().getId().equals(accountId))
+                        .findFirst();
+        return playerOpt.orElse(null);
+    }
+
+    public SocialDetail.Builder getSocialDetailByUid(int id) {
+        // Get from online players
+        Player player = this.getPlayerByUid(id, true);
+
+        if (player == null) {
+            return null;
+        }
+
+        return player.getSocialDetail();
+    }
+
+    public Account getAccountByName(String username) {
+        Optional<Player> playerOpt =
+                getPlayers().values().stream()
+                        .filter(player -> player.getAccount().getUsername().equals(username))
+                        .findFirst();
+        if (playerOpt.isPresent()) {
+            return playerOpt.get().getAccount();
+        }
+        return DatabaseHelper.getAccountByName(username);
+    }
+
+    public synchronized void onTick() {
+        var tickStart = Instant.now();
+
+        // Tick worlds.
+        this.worlds.removeIf(World::onTick);
+
+        // Tick players.
+        this.players.values().forEach(Player::onTick);
+
+        // Tick scheduler.
+        this.getScheduler().runTasks();
+
+        // Call server tick event.
+        ServerTickEvent event = new ServerTickEvent(tickStart, Instant.now());
+        event.call();
+    }
+
+    public void registerWorld(World world) {
+        this.getWorlds().add(world);
+    }
+
+    public void deregisterWorld(World world) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void start() {
+        // Schedule game loop.
+        Timer gameLoop = new Timer();
+        gameLoop.scheduleAtFixedRate(
+                new TimerTask() {
+                    @Override
+                    public void run() {
+                        try {
+                            onTick();
+                        } catch (Exception e) {
+                            Grasscutter.getLogger().error(translate("messages.game.game_update_error"), e);
+                        }
+                    }
+                },
+                new Date(),
+                1000L);
+        Grasscutter.getLogger().info(translate("messages.status.free_software"));
+        Grasscutter.getLogger()
+                .info(translate("messages.game.address_bind", GAME_INFO.accessAddress, address.getPort()));
+        ServerStartEvent event = new ServerStartEvent(ServerEvent.Type.GAME, OffsetDateTime.now());
+        event.call();
+    }
+
+    public void onServerShutdown() {
+        ServerStopEvent event = new ServerStopEvent(ServerEvent.Type.GAME, OffsetDateTime.now());
+        event.call();
+
+        // Kick and save all players
+        List<Player> list = new ArrayList<>(this.getPlayers().size());
+        list.addAll(this.getPlayers().values());
+
+        for (Player player : list) {
+            player.getSession().close();
+        }
+    }
+}

src/main/java/emu/grasscutter/server/packet/recv/HandlerAddCustomTeamReq.java

@@ -1,14 +1,14 @@
-//package emu.grasscutter.server.packet.recv;
-//
-//import emu.grasscutter.net.packet.Opcodes;
-//import emu.grasscutter.net.packet.PacketHandler;
-//import emu.grasscutter.net.packet.PacketOpcodes;
-//import emu.grasscutter.server.game.GameSession;
-//
-//@Opcodes(PacketOpcodes.AddCustomTeamReq)
-//public class HandlerAddCustomTeamReq extends PacketHandler {
-//    @Override
-//    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-//        session.getPlayer().getTeamManager().addNewCustomTeam();
-//    }
-//}
+// package emu.grasscutter.server.packet.recv;
+//
+// import emu.grasscutter.net.packet.Opcodes;
+// import emu.grasscutter.net.packet.PacketHandler;
+// import emu.grasscutter.net.packet.PacketOpcodes;
+// import emu.grasscutter.server.game.GameSession;
+//
+// @Opcodes(PacketOpcodes.AddCustomTeamReq)
+// public class HandlerAddCustomTeamReq extends PacketHandler {
+//    @Override
+//    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+//        session.getPlayer().getTeamManager().addNewCustomTeam();
+//    }
+// }

src/main/java/emu/grasscutter/server/packet/recv/HandlerAddQuestContentProgressReq.java

@@ -1,26 +1,25 @@
-package emu.grasscutter.server.packet.recv;
-
-import emu.grasscutter.game.quest.enums.QuestContent;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq;
-import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketAddQuestContentProgressRsp;
-
-@Opcodes(PacketOpcodes.AddQuestContentProgressReq)
-public class HandlerAddQuestContentProgressReq extends PacketHandler {
-    @Override
-    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        var req = AddQuestContentProgressReq.parseFrom(payload);
-
-        // Find all conditions in quest that are the same as the given one
-        var type = QuestContent.getContentTriggerByValue(req.getContentType());
-        if(type != null) {
-            session.getPlayer().getQuestManager().queueEvent(type, req.getParam());
-        }
-
-        session.send(new PacketAddQuestContentProgressRsp(req.getContentType()));
-    }
-
-}
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.game.quest.enums.QuestContent;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketAddQuestContentProgressRsp;
+
+@Opcodes(PacketOpcodes.AddQuestContentProgressReq)
+public class HandlerAddQuestContentProgressReq extends PacketHandler {
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        var req = AddQuestContentProgressReq.parseFrom(payload);
+
+        // Find all conditions in quest that are the same as the given one
+        var type = QuestContent.getContentTriggerByValue(req.getContentType());
+        if (type != null) {
+            session.getPlayer().getQuestManager().queueEvent(type, req.getParam());
+        }
+
+        session.send(new PacketAddQuestContentProgressRsp(req.getContentType()));
+    }
+}

src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarChangeElementTypeReq.java

@@ -1,39 +1,38 @@
-package emu.grasscutter.server.packet.recv;
-
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.AvatarChangeElementTypeReqOuterClass.AvatarChangeElementTypeReq;
-import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
-import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketAvatarChangeElementTypeRsp;
-import lombok.val;
-
-/**
- * Changes the currently active avatars Element if possible
- */
-@Opcodes(PacketOpcodes.AvatarChangeElementTypeReq)
-public class HandlerAvatarChangeElementTypeReq extends PacketHandler {
-
-    @Override
-    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        var req = AvatarChangeElementTypeReq.parseFrom(payload);
-        var area = GameData.getWorldAreaDataMap().get(req.getAreaId());
-
-        if (area == null || area.getElementType() == null || area.getElementType().getDepotIndex() <= 0) {
-            session.send(new PacketAvatarChangeElementTypeRsp(Retcode.RET_SVR_ERROR_VALUE));
-            return;
-        }
-
-        val avatar = session.getPlayer().getTeamManager().getCurrentAvatarEntity().getAvatar();
-        if (!avatar.changeElement(area.getElementType())) {
-            session.send(new PacketAvatarChangeElementTypeRsp(Retcode.RET_SVR_ERROR_VALUE));
-            return;
-        }
-
-        // Success
-        session.send(new PacketAvatarChangeElementTypeRsp());
-    }
-
-}
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.AvatarChangeElementTypeReqOuterClass.AvatarChangeElementTypeReq;
+import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketAvatarChangeElementTypeRsp;
+import lombok.val;
+
+/** Changes the currently active avatars Element if possible */
+@Opcodes(PacketOpcodes.AvatarChangeElementTypeReq)
+public class HandlerAvatarChangeElementTypeReq extends PacketHandler {
+
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        var req = AvatarChangeElementTypeReq.parseFrom(payload);
+        var area = GameData.getWorldAreaDataMap().get(req.getAreaId());
+
+        if (area == null
+                || area.getElementType() == null
+                || area.getElementType().getDepotIndex() <= 0) {
+            session.send(new PacketAvatarChangeElementTypeRsp(Retcode.RET_SVR_ERROR_VALUE));
+            return;
+        }
+
+        val avatar = session.getPlayer().getTeamManager().getCurrentAvatarEntity().getAvatar();
+        if (!avatar.changeElement(area.getElementType())) {
+            session.send(new PacketAvatarChangeElementTypeRsp(Retcode.RET_SVR_ERROR_VALUE));
+            return;
+        }
+
+        // Success
+        session.send(new PacketAvatarChangeElementTypeRsp());
+    }
+}

src/main/java/emu/grasscutter/server/packet/recv/HandlerChangeHomeBgmReq.java

@@ -1,26 +1,26 @@
-//package emu.grasscutter.server.packet.recv;
-//
-//import emu.grasscutter.net.packet.Opcodes;
-//import emu.grasscutter.net.packet.PacketHandler;
-//import emu.grasscutter.net.packet.PacketOpcodes;
-//import emu.grasscutter.net.proto.Unk2700BEDLIGJANCJClientReq;
-//import emu.grasscutter.server.game.GameSession;
-//import emu.grasscutter.server.packet.send.PacketChangeHomeBgmNotify;
-//import emu.grasscutter.server.packet.send.PacketChangeHomeBgmRsp;
-//
-//@Opcodes(PacketOpcodes.Unk2700_BEDLIGJANCJ_ClientReq)
-//public class HandlerChangeHomeBgmReq extends PacketHandler {
-//    @Override
-//    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-//        var req = Unk2700BEDLIGJANCJClientReq.Unk2700_BEDLIGJANCJ_ClientReq.parseFrom(payload);
-//
-//        int homeBgmId = req.getUnk2700BJHAMKKECEI();
-//        var home = session.getPlayer().getHome();
-//
-//        home.getHomeSceneItem(session.getPlayer().getSceneId()).setHomeBgmId(homeBgmId);
-//        home.save();
-//
-//        session.send(new PacketChangeHomeBgmNotify(homeBgmId));
-//        session.send(new PacketChangeHomeBgmRsp());
-//    }
-//}
+// package emu.grasscutter.server.packet.recv;
+//
+// import emu.grasscutter.net.packet.Opcodes;
+// import emu.grasscutter.net.packet.PacketHandler;
+// import emu.grasscutter.net.packet.PacketOpcodes;
+// import emu.grasscutter.net.proto.Unk2700BEDLIGJANCJClientReq;
+// import emu.grasscutter.server.game.GameSession;
+// import emu.grasscutter.server.packet.send.PacketChangeHomeBgmNotify;
+// import emu.grasscutter.server.packet.send.PacketChangeHomeBgmRsp;
+//
+// @Opcodes(PacketOpcodes.Unk2700_BEDLIGJANCJ_ClientReq)
+// public class HandlerChangeHomeBgmReq extends PacketHandler {
+//    @Override
+//    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+//        var req = Unk2700BEDLIGJANCJClientReq.Unk2700_BEDLIGJANCJ_ClientReq.parseFrom(payload);
+//
+//        int homeBgmId = req.getUnk2700BJHAMKKECEI();
+//        var home = session.getPlayer().getHome();
+//
+//        home.getHomeSceneItem(session.getPlayer().getSceneId()).setHomeBgmId(homeBgmId);
+//        home.save();
+//
+//        session.send(new PacketChangeHomeBgmNotify(homeBgmId));
+//        session.send(new PacketChangeHomeBgmRsp());
+//    }
+// }

src/main/java/emu/grasscutter/server/packet/recv/HandlerCombatInvocationsNotify.java

@@ -1,191 +1,191 @@
-package emu.grasscutter.server.packet.recv;
-
-import emu.grasscutter.Grasscutter;
-import emu.grasscutter.game.entity.GameEntity;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult;
-import emu.grasscutter.net.proto.CombatInvocationsNotifyOuterClass.CombatInvocationsNotify;
-import emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry;
-import emu.grasscutter.net.proto.EntityMoveInfoOuterClass.EntityMoveInfo;
-import emu.grasscutter.net.proto.EvtAnimatorParameterInfoOuterClass.EvtAnimatorParameterInfo;
-import emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo;
-import emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo;
-import emu.grasscutter.net.proto.MotionStateOuterClass.MotionState;
-import emu.grasscutter.net.proto.PlayerDieTypeOuterClass;
-import emu.grasscutter.server.event.entity.EntityMoveEvent;
-import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
-import emu.grasscutter.utils.Position;
-
-@Opcodes(PacketOpcodes.CombatInvocationsNotify)
-public class HandlerCombatInvocationsNotify extends PacketHandler {
-
-    private float cachedLandingSpeed = 0;
-    private long cachedLandingTimeMillisecond = 0;
-    private boolean monitorLandingEvent = false;
-
-    @Override
-    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        CombatInvocationsNotify notif = CombatInvocationsNotify.parseFrom(payload);
-        for (CombatInvokeEntry entry : notif.getInvokeListList()) {
-            // Handle combat invoke
-            switch (entry.getArgumentType()) {
-                case COMBAT_TYPE_ARGUMENT_EVT_BEING_HIT -> {
-                    EvtBeingHitInfo hitInfo = EvtBeingHitInfo.parseFrom(entry.getCombatData());
-                    AttackResult attackResult = hitInfo.getAttackResult();
-                    Player player = session.getPlayer();
-
-                    // Check if the player is invulnerable.
-                    if (attackResult.getAttackerId()
-                                    != player.getTeamManager().getCurrentAvatarEntity().getId()
-                            && player.getAbilityManager().isAbilityInvulnerable()) break;
-
-                    // Handle damage
-                    player.getAttackResults().add(attackResult);
-                    player.getEnergyManager().handleAttackHit(hitInfo);
-                }
-                case COMBAT_TYPE_ARGUMENT_ENTITY_MOVE -> {
-                    // Handle movement
-                    EntityMoveInfo moveInfo = EntityMoveInfo.parseFrom(entry.getCombatData());
-                    GameEntity entity = session.getPlayer().getScene().getEntityById(moveInfo.getEntityId());
-                    if (entity != null) {
-                        // Move player
-                        MotionInfo motionInfo = moveInfo.getMotionInfo();
-                        MotionState motionState = motionInfo.getState();
-
-                        // Call entity move event.
-                        EntityMoveEvent event =
-                                new EntityMoveEvent(
-                                        entity,
-                                        new Position(motionInfo.getPos()),
-                                        new Position(motionInfo.getRot()),
-                                        motionState);
-                        event.call();
-
-                        entity.move(event.getPosition(), event.getRotation());
-                        entity.setLastMoveSceneTimeMs(moveInfo.getSceneTime());
-                        entity.setLastMoveReliableSeq(moveInfo.getReliableSeq());
-                        entity.setMotionState(motionState);
-
-                        session
-                                .getPlayer()
-                                .getStaminaManager()
-                                .handleCombatInvocationsNotify(session, moveInfo, entity);
-
-                        // TODO: handle MOTION_FIGHT landing which has a different damage factor
-                        // 		Also, for plunge attacks, LAND_SPEED is always -30 and is not useful.
-                        //  	May need the height when starting plunge attack.
-
-                        // MOTION_LAND_SPEED and MOTION_FALL_ON_GROUND arrive in different packets.
-                        // Cache land speed for later use.
-                        if (motionState == MotionState.MOTION_STATE_LAND_SPEED) {
-                            cachedLandingSpeed = motionInfo.getSpeed().getY();
-                            cachedLandingTimeMillisecond = System.currentTimeMillis();
-                            monitorLandingEvent = true;
-                        }
-                        if (monitorLandingEvent) {
-                            if (motionState == MotionState.MOTION_STATE_FALL_ON_GROUND) {
-                                monitorLandingEvent = false;
-                                handleFallOnGround(session, entity, motionState);
-                            }
-                        }
-
-                        // MOTION_STATE_NOTIFY = Dont send to other players
-                        if (motionState == MotionState.MOTION_STATE_NOTIFY) {
-                            continue;
-                        }
-                    }
-                }
-                case COMBAT_TYPE_ARGUMENT_ANIMATOR_PARAMETER_CHANGED -> {
-                    EvtAnimatorParameterInfo paramInfo =
-                            EvtAnimatorParameterInfo.parseFrom(entry.getCombatData());
-                    if (paramInfo.getIsServerCache()) {
-                        paramInfo = paramInfo.toBuilder().setIsServerCache(false).build();
-                        entry = entry.toBuilder().setCombatData(paramInfo.toByteString()).build();
-                    }
-                }
-                default -> {}
-            }
-
-            session.getPlayer().getCombatInvokeHandler().addEntry(entry.getForwardType(), entry);
-        }
-    }
-
-    private void handleFallOnGround(GameSession session, GameEntity entity, MotionState motionState) {
-        if (session.getPlayer().isInGodMode()) {
-            return;
-        }
-        // People have reported that after plunge attack (client sends a FIGHT instead of
-        // FALL_ON_GROUND) they will die
-        // 		if they talk to an NPC (this is when the client sends a FALL_ON_GROUND) without jumping
-        // again.
-        // A dirty patch: if not received immediately after MOTION_LAND_SPEED, discard this packet.
-        // 200ms seems to be a reasonable delay.
-        int maxDelay = 200;
-        long actualDelay = System.currentTimeMillis() - cachedLandingTimeMillisecond;
-        Grasscutter.getLogger()
-                .trace(
-                        "MOTION_FALL_ON_GROUND received after "
-                                + actualDelay
-                                + "/"
-                                + maxDelay
-                                + "ms."
-                                + (actualDelay > maxDelay ? " Discard" : ""));
-        if (actualDelay > maxDelay) {
-            return;
-        }
-        float currentHP = entity.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP);
-        float maxHP = entity.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP);
-        float damageFactor = 0;
-        if (cachedLandingSpeed < -23.5) {
-            damageFactor = 0.33f;
-        }
-        if (cachedLandingSpeed < -25) {
-            damageFactor = 0.5f;
-        }
-        if (cachedLandingSpeed < -26.5) {
-            damageFactor = 0.66f;
-        }
-        if (cachedLandingSpeed < -28) {
-            damageFactor = 1f;
-        }
-        float damage = maxHP * damageFactor;
-        float newHP = currentHP - damage;
-        if (newHP < 0) {
-            newHP = 0;
-        }
-        if (damageFactor > 0) {
-            Grasscutter.getLogger()
-                    .debug(
-                            currentHP
-                                    + "/"
-                                    + maxHP
-                                    + "\tLandingSpeed: "
-                                    + cachedLandingSpeed
-                                    + "\tDamageFactor: "
-                                    + damageFactor
-                                    + "\tDamage: "
-                                    + damage
-                                    + "\tNewHP: "
-                                    + newHP);
-        } else {
-            Grasscutter.getLogger().trace(currentHP + "/" + maxHP + "\tLandingSpeed: 0\tNo damage");
-        }
-        entity.setFightProperty(FightProperty.FIGHT_PROP_CUR_HP, newHP);
-        entity
-                .getWorld()
-                .broadcastPacket(
-                        new PacketEntityFightPropUpdateNotify(entity, FightProperty.FIGHT_PROP_CUR_HP));
-        if (newHP == 0) {
-            session
-                    .getPlayer()
-                    .getStaminaManager()
-                    .killAvatar(session, entity, PlayerDieTypeOuterClass.PlayerDieType.PLAYER_DIE_TYPE_FALL);
-        }
-        cachedLandingSpeed = 0;
-    }
-}
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.FightProperty;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult;
+import emu.grasscutter.net.proto.CombatInvocationsNotifyOuterClass.CombatInvocationsNotify;
+import emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry;
+import emu.grasscutter.net.proto.EntityMoveInfoOuterClass.EntityMoveInfo;
+import emu.grasscutter.net.proto.EvtAnimatorParameterInfoOuterClass.EvtAnimatorParameterInfo;
+import emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo;
+import emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo;
+import emu.grasscutter.net.proto.MotionStateOuterClass.MotionState;
+import emu.grasscutter.net.proto.PlayerDieTypeOuterClass;
+import emu.grasscutter.server.event.entity.EntityMoveEvent;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
+import emu.grasscutter.utils.Position;
+
+@Opcodes(PacketOpcodes.CombatInvocationsNotify)
+public class HandlerCombatInvocationsNotify extends PacketHandler {
+
+    private float cachedLandingSpeed = 0;
+    private long cachedLandingTimeMillisecond = 0;
+    private boolean monitorLandingEvent = false;
+
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        CombatInvocationsNotify notif = CombatInvocationsNotify.parseFrom(payload);
+        for (CombatInvokeEntry entry : notif.getInvokeListList()) {
+            // Handle combat invoke
+            switch (entry.getArgumentType()) {
+                case COMBAT_TYPE_ARGUMENT_EVT_BEING_HIT -> {
+                    EvtBeingHitInfo hitInfo = EvtBeingHitInfo.parseFrom(entry.getCombatData());
+                    AttackResult attackResult = hitInfo.getAttackResult();
+                    Player player = session.getPlayer();
+
+                    // Check if the player is invulnerable.
+                    if (attackResult.getAttackerId()
+                                    != player.getTeamManager().getCurrentAvatarEntity().getId()
+                            && player.getAbilityManager().isAbilityInvulnerable()) break;
+
+                    // Handle damage
+                    player.getAttackResults().add(attackResult);
+                    player.getEnergyManager().handleAttackHit(hitInfo);
+                }
+                case COMBAT_TYPE_ARGUMENT_ENTITY_MOVE -> {
+                    // Handle movement
+                    EntityMoveInfo moveInfo = EntityMoveInfo.parseFrom(entry.getCombatData());
+                    GameEntity entity = session.getPlayer().getScene().getEntityById(moveInfo.getEntityId());
+                    if (entity != null) {
+                        // Move player
+                        MotionInfo motionInfo = moveInfo.getMotionInfo();
+                        MotionState motionState = motionInfo.getState();
+
+                        // Call entity move event.
+                        EntityMoveEvent event =
+                                new EntityMoveEvent(
+                                        entity,
+                                        new Position(motionInfo.getPos()),
+                                        new Position(motionInfo.getRot()),
+                                        motionState);
+                        event.call();
+
+                        entity.move(event.getPosition(), event.getRotation());
+                        entity.setLastMoveSceneTimeMs(moveInfo.getSceneTime());
+                        entity.setLastMoveReliableSeq(moveInfo.getReliableSeq());
+                        entity.setMotionState(motionState);
+
+                        session
+                                .getPlayer()
+                                .getStaminaManager()
+                                .handleCombatInvocationsNotify(session, moveInfo, entity);
+
+                        // TODO: handle MOTION_FIGHT landing which has a different damage factor
+                        // 		Also, for plunge attacks, LAND_SPEED is always -30 and is not useful.
+                        //  	May need the height when starting plunge attack.
+
+                        // MOTION_LAND_SPEED and MOTION_FALL_ON_GROUND arrive in different packets.
+                        // Cache land speed for later use.
+                        if (motionState == MotionState.MOTION_STATE_LAND_SPEED) {
+                            cachedLandingSpeed = motionInfo.getSpeed().getY();
+                            cachedLandingTimeMillisecond = System.currentTimeMillis();
+                            monitorLandingEvent = true;
+                        }
+                        if (monitorLandingEvent) {
+                            if (motionState == MotionState.MOTION_STATE_FALL_ON_GROUND) {
+                                monitorLandingEvent = false;
+                                handleFallOnGround(session, entity, motionState);
+                            }
+                        }
+
+                        // MOTION_STATE_NOTIFY = Dont send to other players
+                        if (motionState == MotionState.MOTION_STATE_NOTIFY) {
+                            continue;
+                        }
+                    }
+                }
+                case COMBAT_TYPE_ARGUMENT_ANIMATOR_PARAMETER_CHANGED -> {
+                    EvtAnimatorParameterInfo paramInfo =
+                            EvtAnimatorParameterInfo.parseFrom(entry.getCombatData());
+                    if (paramInfo.getIsServerCache()) {
+                        paramInfo = paramInfo.toBuilder().setIsServerCache(false).build();
+                        entry = entry.toBuilder().setCombatData(paramInfo.toByteString()).build();
+                    }
+                }
+                default -> {}
+            }
+
+            session.getPlayer().getCombatInvokeHandler().addEntry(entry.getForwardType(), entry);
+        }
+    }
+
+    private void handleFallOnGround(GameSession session, GameEntity entity, MotionState motionState) {
+        if (session.getPlayer().isInGodMode()) {
+            return;
+        }
+        // People have reported that after plunge attack (client sends a FIGHT instead of
+        // FALL_ON_GROUND) they will die
+        // 		if they talk to an NPC (this is when the client sends a FALL_ON_GROUND) without jumping
+        // again.
+        // A dirty patch: if not received immediately after MOTION_LAND_SPEED, discard this packet.
+        // 200ms seems to be a reasonable delay.
+        int maxDelay = 200;
+        long actualDelay = System.currentTimeMillis() - cachedLandingTimeMillisecond;
+        Grasscutter.getLogger()
+                .trace(
+                        "MOTION_FALL_ON_GROUND received after "
+                                + actualDelay
+                                + "/"
+                                + maxDelay
+                                + "ms."
+                                + (actualDelay > maxDelay ? " Discard" : ""));
+        if (actualDelay > maxDelay) {
+            return;
+        }
+        float currentHP = entity.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP);
+        float maxHP = entity.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP);
+        float damageFactor = 0;
+        if (cachedLandingSpeed < -23.5) {
+            damageFactor = 0.33f;
+        }
+        if (cachedLandingSpeed < -25) {
+            damageFactor = 0.5f;
+        }
+        if (cachedLandingSpeed < -26.5) {
+            damageFactor = 0.66f;
+        }
+        if (cachedLandingSpeed < -28) {
+            damageFactor = 1f;
+        }
+        float damage = maxHP * damageFactor;
+        float newHP = currentHP - damage;
+        if (newHP < 0) {
+            newHP = 0;
+        }
+        if (damageFactor > 0) {
+            Grasscutter.getLogger()
+                    .debug(
+                            currentHP
+                                    + "/"
+                                    + maxHP
+                                    + "\tLandingSpeed: "
+                                    + cachedLandingSpeed
+                                    + "\tDamageFactor: "
+                                    + damageFactor
+                                    + "\tDamage: "
+                                    + damage
+                                    + "\tNewHP: "
+                                    + newHP);
+        } else {
+            Grasscutter.getLogger().trace(currentHP + "/" + maxHP + "\tLandingSpeed: 0\tNo damage");
+        }
+        entity.setFightProperty(FightProperty.FIGHT_PROP_CUR_HP, newHP);
+        entity
+                .getWorld()
+                .broadcastPacket(
+                        new PacketEntityFightPropUpdateNotify(entity, FightProperty.FIGHT_PROP_CUR_HP));
+        if (newHP == 0) {
+            session
+                    .getPlayer()
+                    .getStaminaManager()
+                    .killAvatar(session, entity, PlayerDieTypeOuterClass.PlayerDieType.PLAYER_DIE_TYPE_FALL);
+        }
+        cachedLandingSpeed = 0;
+    }
+}

src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtDoSkillSuccNotify.java

@@ -1,29 +1,29 @@
-package emu.grasscutter.server.packet.recv;
-
-import emu.grasscutter.game.quest.enums.QuestContent;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.EvtDoSkillSuccNotifyOuterClass.EvtDoSkillSuccNotify;
-import emu.grasscutter.server.game.GameSession;
-
-@Opcodes(PacketOpcodes.EvtDoSkillSuccNotify)
-public class HandlerEvtDoSkillSuccNotify extends PacketHandler {
-
-    @Override
-    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        EvtDoSkillSuccNotify notify = EvtDoSkillSuccNotify.parseFrom(payload);
-
-        var player = session.getPlayer();
-        int skillId = notify.getSkillId();
-        int casterId = notify.getCasterId();
-
-        // Call skill perform in the player's ability manager.
-        player.getAbilityManager().onSkillStart(session.getPlayer(), skillId, casterId);
-
-        // Handle skill notify in other managers.
-        player.getStaminaManager().handleEvtDoSkillSuccNotify(session, skillId, casterId);
-        player.getEnergyManager().handleEvtDoSkillSuccNotify(session, skillId, casterId);
-        player.getQuestManager().queueEvent(QuestContent.QUEST_CONTENT_SKILL, skillId, 0);
-    }
-}
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.game.quest.enums.QuestContent;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.EvtDoSkillSuccNotifyOuterClass.EvtDoSkillSuccNotify;
+import emu.grasscutter.server.game.GameSession;
+
+@Opcodes(PacketOpcodes.EvtDoSkillSuccNotify)
+public class HandlerEvtDoSkillSuccNotify extends PacketHandler {
+
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        EvtDoSkillSuccNotify notify = EvtDoSkillSuccNotify.parseFrom(payload);
+
+        var player = session.getPlayer();
+        int skillId = notify.getSkillId();
+        int casterId = notify.getCasterId();
+
+        // Call skill perform in the player's ability manager.
+        player.getAbilityManager().onSkillStart(session.getPlayer(), skillId, casterId);
+
+        // Handle skill notify in other managers.
+        player.getStaminaManager().handleEvtDoSkillSuccNotify(session, skillId, casterId);
+        player.getEnergyManager().handleEvtDoSkillSuccNotify(session, skillId, casterId);
+        player.getQuestManager().queueEvent(QuestContent.QUEST_CONTENT_SKILL, skillId, 0);
+    }
+}

src/main/java/emu/grasscutter/server/packet/recv/HandlerExecuteGadgetLuaReq.java

@@ -1,29 +1,29 @@
-package emu.grasscutter.server.packet.recv;
-
-import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.game.entity.GameEntity;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.ExecuteGadgetLuaReqOuterClass.ExecuteGadgetLuaReq;
-import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketExecuteGadgetLuaRsp;
-
-@Opcodes(PacketOpcodes.ExecuteGadgetLuaReq)
-public class HandlerExecuteGadgetLuaReq extends PacketHandler {
-
-    @Override
-    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        ExecuteGadgetLuaReq req = ExecuteGadgetLuaReq.parseFrom(payload);
-
-        Player player = session.getPlayer();
-        GameEntity entity = player.getScene().getEntities().get(req.getSourceEntityId());
-
-        int result = 1;
-        if (entity instanceof EntityGadget gadget)
-            result = gadget.onClientExecuteRequest(req.getParam1(), req.getParam2(), req.getParam3());
-
-        player.sendPacket(new PacketExecuteGadgetLuaRsp(result));
-    }
-}
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.game.entity.EntityGadget;
+import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.ExecuteGadgetLuaReqOuterClass.ExecuteGadgetLuaReq;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketExecuteGadgetLuaRsp;
+
+@Opcodes(PacketOpcodes.ExecuteGadgetLuaReq)
+public class HandlerExecuteGadgetLuaReq extends PacketHandler {
+
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        ExecuteGadgetLuaReq req = ExecuteGadgetLuaReq.parseFrom(payload);
+
+        Player player = session.getPlayer();
+        GameEntity entity = player.getScene().getEntities().get(req.getSourceEntityId());
+
+        int result = 1;
+        if (entity instanceof EntityGadget gadget)
+            result = gadget.onClientExecuteRequest(req.getParam1(), req.getParam2(), req.getParam3());
+
+        player.sendPacket(new PacketExecuteGadgetLuaRsp(result));
+    }
+}

src/main/java/emu/grasscutter/server/packet/recv/HandlerGadgetInteractReq.java

@@ -1,23 +1,23 @@
-package emu.grasscutter.server.packet.recv;
-
-import emu.grasscutter.game.quest.enums.QuestContent;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq;
-import emu.grasscutter.server.game.GameSession;
-
-@Opcodes(PacketOpcodes.GadgetInteractReq)
-public class HandlerGadgetInteractReq extends PacketHandler {
-
-    @Override
-    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        GadgetInteractReq req = GadgetInteractReq.parseFrom(payload);
-
-        session
-                .getPlayer()
-                .getQuestManager()
-                .queueEvent(QuestContent.QUEST_CONTENT_INTERACT_GADGET, req.getGadgetId());
-        session.getPlayer().interactWith(req.getGadgetEntityId(), req);
-    }
-}
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.game.quest.enums.QuestContent;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq;
+import emu.grasscutter.server.game.GameSession;
+
+@Opcodes(PacketOpcodes.GadgetInteractReq)
+public class HandlerGadgetInteractReq extends PacketHandler {
+
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        GadgetInteractReq req = GadgetInteractReq.parseFrom(payload);
+
+        session
+                .getPlayer()
+                .getQuestManager()
+                .queueEvent(QuestContent.QUEST_CONTENT_INTERACT_GADGET, req.getGadgetId());
+        session.getPlayer().interactWith(req.getGadgetEntityId(), req);
+    }
+}

src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAllMailNotify.java

@@ -1,17 +1,17 @@
-package emu.grasscutter.server.packet.recv;
-
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.GetAllMailNotifyOuterClass.GetAllMailNotify;
-import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketGetAllMailResultNotify;
-
-@Opcodes(PacketOpcodes.GetAllMailNotify)
-public final class HandlerGetAllMailNotify extends PacketHandler {
-    @Override
-    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        var req = GetAllMailNotify.parseFrom(payload);
-        session.send(new PacketGetAllMailResultNotify(session.getPlayer(), req.getIsCollected()));
-    }
-}
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.GetAllMailNotifyOuterClass.GetAllMailNotify;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketGetAllMailResultNotify;
+
+@Opcodes(PacketOpcodes.GetAllMailNotify)
+public final class HandlerGetAllMailNotify extends PacketHandler {
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        var req = GetAllMailNotify.parseFrom(payload);
+        session.send(new PacketGetAllMailResultNotify(session.getPlayer(), req.getIsCollected()));
+    }
+}

src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeUnknown2Req.java

@@ -1,19 +1,19 @@
-//package emu.grasscutter.server.packet.recv;
-//
-//import emu.grasscutter.net.packet.Opcodes;
-//import emu.grasscutter.net.packet.PacketHandler;
-//import emu.grasscutter.net.packet.PacketOpcodes;
-//import emu.grasscutter.server.game.GameSession;
-//import emu.grasscutter.server.packet.send.PacketHomeUnknown2Rsp;
-//
-//@Opcodes(PacketOpcodes.Unk2700_ACILPONNGGK_ClientReq)
-//public class HandlerHomeUnknown2Req extends PacketHandler {
-//
-//    @Override
-//    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-//        /*
-//         * This packet is about the edit mode
-//         */
-//        session.send(new PacketHomeUnknown2Rsp());
-//    }
-//}
+// package emu.grasscutter.server.packet.recv;
+//
+// import emu.grasscutter.net.packet.Opcodes;
+// import emu.grasscutter.net.packet.PacketHandler;
+// import emu.grasscutter.net.packet.PacketOpcodes;
+// import emu.grasscutter.server.game.GameSession;
+// import emu.grasscutter.server.packet.send.PacketHomeUnknown2Rsp;
+//
+// @Opcodes(PacketOpcodes.Unk2700_ACILPONNGGK_ClientReq)
+// public class HandlerHomeUnknown2Req extends PacketHandler {
+//
+//    @Override
+//    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+//        /*
+//         * This packet is about the edit mode
+//         */
+//        session.send(new PacketHomeUnknown2Rsp());
+//    }
+// }

src/main/java/emu/grasscutter/server/packet/recv/HandlerMusicGameSettleReq.java

@@ -1,66 +1,75 @@
-package emu.grasscutter.server.packet.recv;
-
-import emu.grasscutter.game.activity.musicgame.MusicGameActivityHandler;
-import emu.grasscutter.game.activity.musicgame.MusicGamePlayerData;
-import emu.grasscutter.game.props.ActivityType;
-import emu.grasscutter.game.props.WatcherTriggerType;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.MusicGameSettleReqOuterClass.MusicGameSettleReq;
-import emu.grasscutter.net.proto.RetcodeOuterClass;
-import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketActivityInfoNotify;
-import emu.grasscutter.server.packet.send.PacketMusicGameSettleRsp;
-import lombok.val;
-
-@Opcodes(PacketOpcodes.MusicGameSettleReq)
-public class HandlerMusicGameSettleReq extends PacketHandler {
-
-    @Override
-    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        val req = MusicGameSettleReq.parseFrom(payload);
-
-        val activityManager = session.getPlayer().getActivityManager();
-
-        val playerDataOpt = activityManager.getPlayerActivityDataByActivityType(ActivityType.NEW_ACTIVITY_MUSIC_GAME);
-        if (playerDataOpt.isEmpty()) {
-            session.send(new PacketMusicGameSettleRsp(RetcodeOuterClass.Retcode.RET_MUSIC_GAME_LEVEL_CONFIG_NOT_FOUND, req));
-            return;
-        }
-
-        val playerData = playerDataOpt.get();
-        val handler = (MusicGameActivityHandler) playerData.getActivityHandler();
-        boolean isNewRecord = false;
-
-        // check if custom beatmap
-        if (req.getUgcGuid() == 0) {
-            session.getPlayer().getActivityManager().triggerWatcher(
-                WatcherTriggerType.TRIGGER_FLEUR_FAIR_MUSIC_GAME_REACH_SCORE,
-                String.valueOf(req.getMusicBasicId()),
-                String.valueOf(req.getScore())
-            );
-
-            isNewRecord = handler.setMusicGameRecord(playerData,
-                MusicGamePlayerData.MusicGameRecord.of()
-                    .musicId(req.getMusicBasicId())
-                    .maxCombo(req.getMaxCombo())
-                    .maxScore(req.getScore())
-                    .build());
-
-            // update activity info
-            session.send(new PacketActivityInfoNotify(handler.toProto(playerData, activityManager.getConditionExecutor())));
-        } else {
-            handler.setMusicGameCustomBeatmapRecord(playerData,
-                MusicGamePlayerData.CustomBeatmapRecord.of()
-                    .musicShareId(req.getUgcGuid())
-                    .score(req.getMaxCombo())
-                    .settle(req.getIsSaveScore())
-                    .build());
-        }
-
-
-        session.send(new PacketMusicGameSettleRsp(req.getMusicBasicId(), req.getUgcGuid(), isNewRecord));
-    }
-
-}
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.game.activity.musicgame.MusicGameActivityHandler;
+import emu.grasscutter.game.activity.musicgame.MusicGamePlayerData;
+import emu.grasscutter.game.props.ActivityType;
+import emu.grasscutter.game.props.WatcherTriggerType;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.MusicGameSettleReqOuterClass.MusicGameSettleReq;
+import emu.grasscutter.net.proto.RetcodeOuterClass;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketActivityInfoNotify;
+import emu.grasscutter.server.packet.send.PacketMusicGameSettleRsp;
+import lombok.val;
+
+@Opcodes(PacketOpcodes.MusicGameSettleReq)
+public class HandlerMusicGameSettleReq extends PacketHandler {
+
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        val req = MusicGameSettleReq.parseFrom(payload);
+
+        val activityManager = session.getPlayer().getActivityManager();
+
+        val playerDataOpt =
+                activityManager.getPlayerActivityDataByActivityType(ActivityType.NEW_ACTIVITY_MUSIC_GAME);
+        if (playerDataOpt.isEmpty()) {
+            session.send(
+                    new PacketMusicGameSettleRsp(
+                            RetcodeOuterClass.Retcode.RET_MUSIC_GAME_LEVEL_CONFIG_NOT_FOUND, req));
+            return;
+        }
+
+        val playerData = playerDataOpt.get();
+        val handler = (MusicGameActivityHandler) playerData.getActivityHandler();
+        boolean isNewRecord = false;
+
+        // check if custom beatmap
+        if (req.getUgcGuid() == 0) {
+            session
+                    .getPlayer()
+                    .getActivityManager()
+                    .triggerWatcher(
+                            WatcherTriggerType.TRIGGER_FLEUR_FAIR_MUSIC_GAME_REACH_SCORE,
+                            String.valueOf(req.getMusicBasicId()),
+                            String.valueOf(req.getScore()));
+
+            isNewRecord =
+                    handler.setMusicGameRecord(
+                            playerData,
+                            MusicGamePlayerData.MusicGameRecord.of()
+                                    .musicId(req.getMusicBasicId())
+                                    .maxCombo(req.getMaxCombo())
+                                    .maxScore(req.getScore())
+                                    .build());
+
+            // update activity info
+            session.send(
+                    new PacketActivityInfoNotify(
+                            handler.toProto(playerData, activityManager.getConditionExecutor())));
+        } else {
+            handler.setMusicGameCustomBeatmapRecord(
+                    playerData,
+                    MusicGamePlayerData.CustomBeatmapRecord.of()
+                            .musicShareId(req.getUgcGuid())
+                            .score(req.getMaxCombo())
+                            .settle(req.getIsSaveScore())
+                            .build());
+        }
+
+        session.send(
+                new PacketMusicGameSettleRsp(req.getMusicBasicId(), req.getUgcGuid(), isNewRecord));
+    }
+}

src/main/java/emu/grasscutter/server/packet/recv/HandlerNpcTalkReq.java

@@ -1,67 +1,67 @@
-package emu.grasscutter.server.packet.recv;
-
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.binout.MainQuestData;
-import emu.grasscutter.data.binout.MainQuestData.TalkData;
-import emu.grasscutter.game.quest.enums.QuestContent;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.NpcTalkReqOuterClass.NpcTalkReq;
-import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketNpcTalkRsp;
-
-@Opcodes(PacketOpcodes.NpcTalkReq)
-public class HandlerNpcTalkReq extends PacketHandler {
-    @Override
-    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        NpcTalkReq req = NpcTalkReq.parseFrom(payload);
-
-        // Check if mainQuest exists
-        // remove last 2 digits to get a mainQuestId
-        int talkId = req.getTalkId();
-        int mainQuestId = talkId / 100;
-        MainQuestData mainQuestData = GameData.getMainQuestDataMap().get(mainQuestId);
-
-        if (mainQuestData != null) {
-            // This talk is associated with a quest. Handle it.
-            // If the quest has no talk data defined on it, create one.
-            TalkData talkForQuest = new TalkData(talkId, "");
-            if (mainQuestData.getTalks() != null) {
-                var talks = mainQuestData.getTalks().stream().filter(p -> p.getId() == talkId).toList();
-
-                if (talks.size() > 0) {
-                    talkForQuest = talks.get(0);
-                }
-            }
-
-            // Add to the list of done talks for this quest.
-            var mainQuest = session.getPlayer().getQuestManager().getMainQuestById(mainQuestId);
-            if (mainQuest != null) {
-                session
-                        .getPlayer()
-                        .getQuestManager()
-                        .getMainQuestById(mainQuestId)
-                        .getTalks()
-                        .put(talkId, talkForQuest);
-            }
-
-            // Fire quest triggers.
-            session
-                    .getPlayer()
-                    .getQuestManager()
-                    .queueEvent(
-                            QuestContent.QUEST_CONTENT_COMPLETE_ANY_TALK, String.valueOf(req.getTalkId()), 0, 0);
-            session
-                    .getPlayer()
-                    .getQuestManager()
-                    .queueEvent(QuestContent.QUEST_CONTENT_COMPLETE_TALK, req.getTalkId(), 0);
-            session
-                    .getPlayer()
-                    .getQuestManager()
-                    .queueEvent(QuestContent.QUEST_CONTENT_FINISH_PLOT, req.getTalkId(), 0);
-        }
-
-        session.send(new PacketNpcTalkRsp(req.getNpcEntityId(), req.getTalkId(), req.getEntityId()));
-    }
-}
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.binout.MainQuestData;
+import emu.grasscutter.data.binout.MainQuestData.TalkData;
+import emu.grasscutter.game.quest.enums.QuestContent;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.NpcTalkReqOuterClass.NpcTalkReq;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketNpcTalkRsp;
+
+@Opcodes(PacketOpcodes.NpcTalkReq)
+public class HandlerNpcTalkReq extends PacketHandler {
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        NpcTalkReq req = NpcTalkReq.parseFrom(payload);
+
+        // Check if mainQuest exists
+        // remove last 2 digits to get a mainQuestId
+        int talkId = req.getTalkId();
+        int mainQuestId = talkId / 100;
+        MainQuestData mainQuestData = GameData.getMainQuestDataMap().get(mainQuestId);
+
+        if (mainQuestData != null) {
+            // This talk is associated with a quest. Handle it.
+            // If the quest has no talk data defined on it, create one.
+            TalkData talkForQuest = new TalkData(talkId, "");
+            if (mainQuestData.getTalks() != null) {
+                var talks = mainQuestData.getTalks().stream().filter(p -> p.getId() == talkId).toList();
+
+                if (talks.size() > 0) {
+                    talkForQuest = talks.get(0);
+                }
+            }
+
+            // Add to the list of done talks for this quest.
+            var mainQuest = session.getPlayer().getQuestManager().getMainQuestById(mainQuestId);
+            if (mainQuest != null) {
+                session
+                        .getPlayer()
+                        .getQuestManager()
+                        .getMainQuestById(mainQuestId)
+                        .getTalks()
+                        .put(talkId, talkForQuest);
+            }
+
+            // Fire quest triggers.
+            session
+                    .getPlayer()
+                    .getQuestManager()
+                    .queueEvent(
+                            QuestContent.QUEST_CONTENT_COMPLETE_ANY_TALK, String.valueOf(req.getTalkId()), 0, 0);
+            session
+                    .getPlayer()
+                    .getQuestManager()
+                    .queueEvent(QuestContent.QUEST_CONTENT_COMPLETE_TALK, req.getTalkId(), 0);
+            session
+                    .getPlayer()
+                    .getQuestManager()
+                    .queueEvent(QuestContent.QUEST_CONTENT_FINISH_PLOT, req.getTalkId(), 0);
+        }
+
+        session.send(new PacketNpcTalkRsp(req.getNpcEntityId(), req.getTalkId(), req.getEntityId()));
+    }
+}

src/main/java/emu/grasscutter/server/packet/recv/HandlerPostEnterSceneReq.java

@@ -1,25 +1,25 @@
-package emu.grasscutter.server.packet.recv;
-
-import emu.grasscutter.game.props.SceneType;
-import emu.grasscutter.game.quest.enums.QuestContent;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketPostEnterSceneRsp;
-
-@Opcodes(PacketOpcodes.PostEnterSceneReq)
-public class HandlerPostEnterSceneReq extends PacketHandler {
-
-    @Override
-    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        if (session.getPlayer().getScene().getSceneType() == SceneType.SCENE_ROOM) {
-            session
-                    .getPlayer()
-                    .getQuestManager()
-                    .queueEvent(QuestContent.QUEST_CONTENT_ENTER_ROOM, session.getPlayer().getSceneId(), 0);
-        }
-
-        session.send(new PacketPostEnterSceneRsp(session.getPlayer()));
-    }
-}
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.game.props.SceneType;
+import emu.grasscutter.game.quest.enums.QuestContent;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketPostEnterSceneRsp;
+
+@Opcodes(PacketOpcodes.PostEnterSceneReq)
+public class HandlerPostEnterSceneReq extends PacketHandler {
+
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        if (session.getPlayer().getScene().getSceneType() == SceneType.SCENE_ROOM) {
+            session
+                    .getPlayer()
+                    .getQuestManager()
+                    .queueEvent(QuestContent.QUEST_CONTENT_ENTER_ROOM, session.getPlayer().getSceneId(), 0);
+        }
+
+        session.send(new PacketPostEnterSceneRsp(session.getPlayer()));
+    }
+}

src/main/java/emu/grasscutter/server/packet/recv/HandlerRemoveCustomTeamReq.java

@@ -1,16 +1,16 @@
-//package emu.grasscutter.server.packet.recv;
-//
-//import emu.grasscutter.net.packet.Opcodes;
-//import emu.grasscutter.net.packet.PacketHandler;
-//import emu.grasscutter.net.packet.PacketOpcodes;
-//import emu.grasscutter.net.proto.RemoveCustomTeamReqOuterClass.RemoveCustomTeamReq;
-//import emu.grasscutter.server.game.GameSession;
-//
-//@Opcodes(PacketOpcodes.RemoveCustomTeamReq)
-//public class HandlerRemoveCustomTeamReq extends PacketHandler {
-//    @Override
-//    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-//        RemoveCustomTeamReq req = RemoveCustomTeamReq.parseFrom(payload);
-//        session.getPlayer().getTeamManager().removeCustomTeam(req.getId());
-//    }
-//}
+// package emu.grasscutter.server.packet.recv;
+//
+// import emu.grasscutter.net.packet.Opcodes;
+// import emu.grasscutter.net.packet.PacketHandler;
+// import emu.grasscutter.net.packet.PacketOpcodes;
+// import emu.grasscutter.net.proto.RemoveCustomTeamReqOuterClass.RemoveCustomTeamReq;
+// import emu.grasscutter.server.game.GameSession;
+//
+// @Opcodes(PacketOpcodes.RemoveCustomTeamReq)
+// public class HandlerRemoveCustomTeamReq extends PacketHandler {
+//    @Override
+//    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+//        RemoveCustomTeamReq req = RemoveCustomTeamReq.parseFrom(payload);
+//        session.getPlayer().getTeamManager().removeCustomTeam(req.getId());
+//    }
+// }

src/main/java/emu/grasscutter/server/packet/recv/HandlerSaveUgcReq.java

@@ -1,97 +1,102 @@
-//package emu.grasscutter.server.packet.recv;
-//
-//import emu.grasscutter.database.DatabaseHelper;
-//import emu.grasscutter.game.activity.musicgame.MusicGameActivityHandler;
-//import emu.grasscutter.game.activity.musicgame.MusicGameBeatmap;
-//import emu.grasscutter.game.activity.musicgame.MusicGamePlayerData;
-//import emu.grasscutter.game.props.ActivityType;
-//import emu.grasscutter.net.packet.Opcodes;
-//import emu.grasscutter.net.packet.PacketHandler;
-//import emu.grasscutter.net.packet.PacketOpcodes;
-//import emu.grasscutter.net.proto.RetcodeOuterClass;
-//import emu.grasscutter.net.proto.SaveUgcReqOuterClass;
-//import emu.grasscutter.net.proto.UgcTypeOuterClass;
-//import emu.grasscutter.server.game.GameSession;
-//import emu.grasscutter.server.packet.send.PacketActivityInfoNotify;
-//import emu.grasscutter.server.packet.send.PacketMusicGameCreateBeatmapRsp;
-//import emu.grasscutter.utils.Utils;
-//import java.util.Objects;
-//import lombok.val;
-//
-//@Opcodes(PacketOpcodes.SaveUgcReq)
-//public class HandlerSaveUgcReq extends PacketHandler {
-//
-//    @Override
-//    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-//        val req = SaveUgcReqOuterClass.SaveUgcReq.parseFrom(payload);
-//
-//        // We only support music game user generated content
-//        if (req.getUgcType() != UgcTypeOuterClass.UgcType.UGC_TYPE_MUSIC_GAME) {
-//            session.send(
-//                    new PacketMusicGameCreateBeatmapRsp(
-//                            RetcodeOuterClass.Retcode.RET_UGC_DISABLED, req.getUgcType()));
-//            return;
-//        }
-//        val briefInfo = req.getMusicBriefInfo();
-//
-//        val musicGameBeatmap =
-//                MusicGameBeatmap.of()
-//                        .musicId(briefInfo.getMusicId())
-//                        .musicNoteCount(briefInfo.getNoteCount())
-//                        .savePosition(briefInfo.getSaveIdx())
-//                        .savePageType(briefInfo.getSavePageType())
-//                        .version(briefInfo.getVersion())
-//                        .afterNoteList(briefInfo.getAfterNoteListList())
-//                        .beforeNoteList(briefInfo.getBeforeNoteListList())
-//                        .timeLineEditTime(briefInfo.getTimeLineEditTime())
-//                        .publishTime(briefInfo.getPublishTime())
-//                        .realTimeEditTime(briefInfo.getRealTimeEditTime())
-//                        .maxScore(briefInfo.getMaxScore())
-//                        .authorUid(session.getPlayer().getUid())
-//                        .beatmap(MusicGameBeatmap.parse(req.getMusicRecord().getMusicTrackListList()))
-//                        .createTime(Utils.getCurrentSeconds())
-//                        .build();
-//
-//        musicGameBeatmap.save();
-//
-//        val playerData =
-//                session
-//                        .getPlayer()
-//                        .getActivityManager()
-//                        .getPlayerActivityDataByActivityType(ActivityType.NEW_ACTIVITY_MUSIC_GAME);
-//        if (playerData.isEmpty()) {
-//            session.send(
-//                    new PacketMusicGameCreateBeatmapRsp(
-//                            RetcodeOuterClass.Retcode.RET_UGC_DATA_NOT_FOUND, req.getUgcType()));
-//            return;
-//        }
-//
-//        val handler = (MusicGameActivityHandler) playerData.get().getActivityHandler();
-//        val musicGamePlayerData = handler.getMusicGamePlayerData(playerData.get());
-//
-//        val oldBeatmap =
-//                musicGamePlayerData.getPersonalCustomBeatmapRecord().values().stream()
-//                        .map(MusicGamePlayerData.CustomBeatmapRecord::getMusicShareId)
-//                        .map(DatabaseHelper::getMusicGameBeatmap)
-//                        .filter(Objects::nonNull)
-//                        .filter(item -> item.getAuthorUid() == session.getPlayer().getUid())
-//                        .filter(item -> item.getMusicId() == req.getMusicBriefInfo().getMusicId())
-//                        .filter(item -> item.getSavePosition() == req.getMusicBriefInfo().getSaveIdx())
-//                        .findFirst();
-//
-//        // delete old beatmap for player
-//        // the old beatmap is still in database so that others can still play.
-//        oldBeatmap.ifPresent(i -> handler.removePersonalBeatmap(playerData.get(), i));
-//
-//        // link this beatmap to player's personal data
-//        handler.addPersonalBeatmap(playerData.get(), musicGameBeatmap);
-//
-//        session.send(
-//                new PacketActivityInfoNotify(
-//                        handler.toProto(
-//                                playerData.get(),
-//                                session.getPlayer().getActivityManager().getConditionExecutor())));
-//        session.send(
-//                new PacketMusicGameCreateBeatmapRsp(musicGameBeatmap.getMusicShareId(), req.getUgcType()));
-//    }
-//}
+// package emu.grasscutter.server.packet.recv;
+//
+// import emu.grasscutter.database.DatabaseHelper;
+// import emu.grasscutter.game.activity.musicgame.MusicGameActivityHandler;
+// import emu.grasscutter.game.activity.musicgame.MusicGameBeatmap;
+// import emu.grasscutter.game.activity.musicgame.MusicGamePlayerData;
+// import emu.grasscutter.game.props.ActivityType;
+// import emu.grasscutter.net.packet.Opcodes;
+// import emu.grasscutter.net.packet.PacketHandler;
+// import emu.grasscutter.net.packet.PacketOpcodes;
+// import emu.grasscutter.net.proto.RetcodeOuterClass;
+// import emu.grasscutter.net.proto.SaveUgcReqOuterClass;
+// import emu.grasscutter.net.proto.UgcTypeOuterClass;
+// import emu.grasscutter.server.game.GameSession;
+// import emu.grasscutter.server.packet.send.PacketActivityInfoNotify;
+// import emu.grasscutter.server.packet.send.PacketMusicGameCreateBeatmapRsp;
+// import emu.grasscutter.utils.Utils;
+// import java.util.Objects;
+// import lombok.val;
+//
+// @Opcodes(PacketOpcodes.SaveUgcReq)
+// public class HandlerSaveUgcReq extends PacketHandler {
+//
+//    @Override
+//    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+//        val req = SaveUgcReqOuterClass.SaveUgcReq.parseFrom(payload);
+//
+//        // We only support music game user generated content
+//        if (req.getUgcType() != UgcTypeOuterClass.UgcType.UGC_TYPE_MUSIC_GAME) {
+//            session.send(
+//                    new PacketMusicGameCreateBeatmapRsp(
+//                            RetcodeOuterClass.Retcode.RET_UGC_DISABLED, req.getUgcType()));
+//            return;
+//        }
+//        val briefInfo = req.getMusicBriefInfo();
+//
+//        val musicGameBeatmap =
+//                MusicGameBeatmap.of()
+//                        .musicId(briefInfo.getMusicId())
+//                        .musicNoteCount(briefInfo.getNoteCount())
+//                        .savePosition(briefInfo.getSaveIdx())
+//                        .savePageType(briefInfo.getSavePageType())
+//                        .version(briefInfo.getVersion())
+//                        .afterNoteList(briefInfo.getAfterNoteListList())
+//                        .beforeNoteList(briefInfo.getBeforeNoteListList())
+//                        .timeLineEditTime(briefInfo.getTimeLineEditTime())
+//                        .publishTime(briefInfo.getPublishTime())
+//                        .realTimeEditTime(briefInfo.getRealTimeEditTime())
+//                        .maxScore(briefInfo.getMaxScore())
+//                        .authorUid(session.getPlayer().getUid())
+//
+// .beatmap(MusicGameBeatmap.parse(req.getMusicRecord().getMusicTrackListList()))
+//                        .createTime(Utils.getCurrentSeconds())
+//                        .build();
+//
+//        musicGameBeatmap.save();
+//
+//        val playerData =
+//                session
+//                        .getPlayer()
+//                        .getActivityManager()
+//
+// .getPlayerActivityDataByActivityType(ActivityType.NEW_ACTIVITY_MUSIC_GAME);
+//        if (playerData.isEmpty()) {
+//            session.send(
+//                    new PacketMusicGameCreateBeatmapRsp(
+//                            RetcodeOuterClass.Retcode.RET_UGC_DATA_NOT_FOUND, req.getUgcType()));
+//            return;
+//        }
+//
+//        val handler = (MusicGameActivityHandler) playerData.get().getActivityHandler();
+//        val musicGamePlayerData = handler.getMusicGamePlayerData(playerData.get());
+//
+//        val oldBeatmap =
+//                musicGamePlayerData.getPersonalCustomBeatmapRecord().values().stream()
+//                        .map(MusicGamePlayerData.CustomBeatmapRecord::getMusicShareId)
+//                        .map(DatabaseHelper::getMusicGameBeatmap)
+//                        .filter(Objects::nonNull)
+//                        .filter(item -> item.getAuthorUid() == session.getPlayer().getUid())
+//                        .filter(item -> item.getMusicId() == req.getMusicBriefInfo().getMusicId())
+//                        .filter(item -> item.getSavePosition() ==
+// req.getMusicBriefInfo().getSaveIdx())
+//                        .findFirst();
+//
+//        // delete old beatmap for player
+//        // the old beatmap is still in database so that others can still play.
+//        oldBeatmap.ifPresent(i -> handler.removePersonalBeatmap(playerData.get(), i));
+//
+//        // link this beatmap to player's personal data
+//        handler.addPersonalBeatmap(playerData.get(), musicGameBeatmap);
+//
+//        session.send(
+//                new PacketActivityInfoNotify(
+//                        handler.toProto(
+//                                playerData.get(),
+//
+// session.getPlayer().getActivityManager().getConditionExecutor())));
+//        session.send(
+//                new PacketMusicGameCreateBeatmapRsp(musicGameBeatmap.getMusicShareId(),
+// req.getUgcType()));
+//    }
+// }

src/main/java/emu/grasscutter/server/packet/recv/HandlerSelectWorktopOptionReq.java

@@ -1,39 +1,49 @@
-package emu.grasscutter.server.packet.recv;
-
-import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.game.entity.GameEntity;
-import emu.grasscutter.game.quest.enums.QuestContent;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.SelectWorktopOptionReqOuterClass.SelectWorktopOptionReq;
-import emu.grasscutter.scripts.constants.EventType;
-import emu.grasscutter.scripts.data.ScriptArgs;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketSelectWorktopOptionRsp;
-
-@Opcodes(PacketOpcodes.SelectWorktopOptionReq)
-public class HandlerSelectWorktopOptionReq extends PacketHandler {
-
-    @Override
-    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        SelectWorktopOptionReq req = SelectWorktopOptionReq.parseFrom(payload);
-
-        try {
-            GameEntity entity = session.getPlayer().getScene().getEntityById(req.getGadgetEntityId());
-
-            if (!(entity instanceof EntityGadget)) {
-                return;
-            }
-            session.getPlayer().getScene().selectWorktopOptionWith(req);
-            session.getPlayer().getScene().getScriptManager().callEvent(
-                new ScriptArgs(entity.getGroupId(), EventType.EVENT_SELECT_OPTION, entity.getConfigId(), req.getOptionId())
-            );
-            session.getPlayer().getQuestManager().queueEvent(QuestContent.QUEST_CONTENT_WORKTOP_SELECT, entity.getConfigId(), req.getOptionId());
-        } finally {
-            // Always send packet
-            session.send(new PacketSelectWorktopOptionRsp(req.getGadgetEntityId(), req.getOptionId()));
-        }
-    }
-
-}
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.game.entity.EntityGadget;
+import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.quest.enums.QuestContent;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.SelectWorktopOptionReqOuterClass.SelectWorktopOptionReq;
+import emu.grasscutter.scripts.constants.EventType;
+import emu.grasscutter.scripts.data.ScriptArgs;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketSelectWorktopOptionRsp;
+
+@Opcodes(PacketOpcodes.SelectWorktopOptionReq)
+public class HandlerSelectWorktopOptionReq extends PacketHandler {
+
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        SelectWorktopOptionReq req = SelectWorktopOptionReq.parseFrom(payload);
+
+        try {
+            GameEntity entity = session.getPlayer().getScene().getEntityById(req.getGadgetEntityId());
+
+            if (!(entity instanceof EntityGadget)) {
+                return;
+            }
+            session.getPlayer().getScene().selectWorktopOptionWith(req);
+            session
+                    .getPlayer()
+                    .getScene()
+                    .getScriptManager()
+                    .callEvent(
+                            new ScriptArgs(
+                                    entity.getGroupId(),
+                                    EventType.EVENT_SELECT_OPTION,
+                                    entity.getConfigId(),
+                                    req.getOptionId()));
+            session
+                    .getPlayer()
+                    .getQuestManager()
+                    .queueEvent(
+                            QuestContent.QUEST_CONTENT_WORKTOP_SELECT, entity.getConfigId(), req.getOptionId());
+        } finally {
+            // Always send packet
+            session.send(new PacketSelectWorktopOptionRsp(req.getGadgetEntityId(), req.getOptionId()));
+        }
+    }
+}

src/main/java/emu/grasscutter/server/packet/recv/HandlerSkipPlayerGameTimeReq.java

@@ -1,21 +1,21 @@
-package emu.grasscutter.server.packet.recv;
-
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.SkipPlayerGameTimeReqOuterClass;
-import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketPlayerGameTimeNotify;
-import emu.grasscutter.server.packet.send.PacketSkipPlayerGameTimeRsp;
-
-@Opcodes(PacketOpcodes.SkipPlayerGameTimeReq)
-public class HandlerSkipPlayerGameTimeReq extends PacketHandler {
-    @Override
-    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        var req = SkipPlayerGameTimeReqOuterClass.SkipPlayerGameTimeReq.parseFrom(payload);
-        var player = session.getPlayer();
-        player.updatePlayerGameTime(req.getGameTime());
-        player.getScene().broadcastPacket(new PacketPlayerGameTimeNotify(player));
-        player.sendPacket(new PacketSkipPlayerGameTimeRsp(req));
-    }
-}
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.SkipPlayerGameTimeReqOuterClass;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketPlayerGameTimeNotify;
+import emu.grasscutter.server.packet.send.PacketSkipPlayerGameTimeRsp;
+
+@Opcodes(PacketOpcodes.SkipPlayerGameTimeReq)
+public class HandlerSkipPlayerGameTimeReq extends PacketHandler {
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        var req = SkipPlayerGameTimeReqOuterClass.SkipPlayerGameTimeReq.parseFrom(payload);
+        var player = session.getPlayer();
+        player.updatePlayerGameTime(req.getGameTime());
+        player.getScene().broadcastPacket(new PacketPlayerGameTimeNotify(player));
+        player.sendPacket(new PacketSkipPlayerGameTimeRsp(req));
+    }
+}

src/main/java/emu/grasscutter/server/packet/recv/HandlerUpdateAbilityCreatedMovingPlatformNotify.java

@@ -1,27 +1,28 @@
-package emu.grasscutter.server.packet.recv;
-
-import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.game.entity.gadget.platform.AbilityRoute;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.UpdateAbilityCreatedMovingPlatformNotifyOuterClass.UpdateAbilityCreatedMovingPlatformNotify;
-import emu.grasscutter.server.game.GameSession;
-
-@Opcodes(PacketOpcodes.UpdateAbilityCreatedMovingPlatformNotify)
-public class HandlerUpdateAbilityCreatedMovingPlatformNotify extends PacketHandler {
-    @Override
-    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        var notify = UpdateAbilityCreatedMovingPlatformNotify.parseFrom(payload);
-        var entity = session.getPlayer().getScene().getEntityById(notify.getEntityId());
-
-        if (!(entity instanceof EntityGadget entityGadget) || !(entityGadget.getRouteConfig() instanceof AbilityRoute)) {
-            return;
-        }
-
-        switch (notify.getOpType()) {
-            case OP_TYPE_ACTIVATE -> entityGadget.startPlatform();
-            case OP_TYPE_DEACTIVATE -> entityGadget.stopPlatform();
-        }
-    }
-}
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.game.entity.EntityGadget;
+import emu.grasscutter.game.entity.gadget.platform.AbilityRoute;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.UpdateAbilityCreatedMovingPlatformNotifyOuterClass.UpdateAbilityCreatedMovingPlatformNotify;
+import emu.grasscutter.server.game.GameSession;
+
+@Opcodes(PacketOpcodes.UpdateAbilityCreatedMovingPlatformNotify)
+public class HandlerUpdateAbilityCreatedMovingPlatformNotify extends PacketHandler {
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        var notify = UpdateAbilityCreatedMovingPlatformNotify.parseFrom(payload);
+        var entity = session.getPlayer().getScene().getEntityById(notify.getEntityId());
+
+        if (!(entity instanceof EntityGadget entityGadget)
+                || !(entityGadget.getRouteConfig() instanceof AbilityRoute)) {
+            return;
+        }
+
+        switch (notify.getOpType()) {
+            case OP_TYPE_ACTIVATE -> entityGadget.startPlatform();
+            case OP_TYPE_DEACTIVATE -> entityGadget.stopPlatform();
+        }
+    }
+}

src/main/java/emu/grasscutter/server/packet/send/PacketAddCustomTeamRsp.java

@@ -1,20 +1,21 @@
-//package emu.grasscutter.server.packet.send;
-//
-//import emu.grasscutter.net.packet.BasePacket;
-//import emu.grasscutter.net.packet.PacketOpcodes;
-//import emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp;
-//import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
-//
-//public class PacketAddCustomTeamRsp extends BasePacket {
-//    public PacketAddCustomTeamRsp(Retcode retcode) {
-//        super(PacketOpcodes.AddCustomTeamRsp);
-//
-//        AddCustomTeamRsp proto = AddCustomTeamRsp.newBuilder().setRetcode(retcode.getNumber()).build();
-//
-//        this.setData(proto);
-//    }
-//
-//    public PacketAddCustomTeamRsp() {
-//        this(Retcode.RET_SUCC);
-//    }
-//}
+// package emu.grasscutter.server.packet.send;
+//
+// import emu.grasscutter.net.packet.BasePacket;
+// import emu.grasscutter.net.packet.PacketOpcodes;
+// import emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp;
+// import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
+//
+// public class PacketAddCustomTeamRsp extends BasePacket {
+//    public PacketAddCustomTeamRsp(Retcode retcode) {
+//        super(PacketOpcodes.AddCustomTeamRsp);
+//
+//        AddCustomTeamRsp proto =
+// AddCustomTeamRsp.newBuilder().setRetcode(retcode.getNumber()).build();
+//
+//        this.setData(proto);
+//    }
+//
+//    public PacketAddCustomTeamRsp() {
+//        this(Retcode.RET_SUCC);
+//    }
+// }

src/main/java/emu/grasscutter/server/packet/send/PacketBeginCameraSceneLookNotify.java

@@ -1,61 +1,61 @@
-//package emu.grasscutter.server.packet.send;
-//
-//import emu.grasscutter.net.packet.BasePacket;
-//import emu.grasscutter.net.packet.PacketOpcodes;
-//import emu.grasscutter.net.proto.BeginCameraSceneLookNotifyOuterClass.BeginCameraSceneLookNotify;
-//import emu.grasscutter.utils.Position;
-//import java.util.ArrayList;
-//import java.util.Collection;
-//import lombok.Data;
-//import lombok.NoArgsConstructor;
-//
-//public class PacketBeginCameraSceneLookNotify extends BasePacket {
-//
-//    public PacketBeginCameraSceneLookNotify(CameraSceneLookNotify parameters) {
-//        super(PacketOpcodes.BeginCameraSceneLookNotify);
-//        var builder =
-//                BeginCameraSceneLookNotify.newBuilder()
-//                        .setLookPos(parameters.lookPos.toProto())
-//                        .setFollowPos(parameters.followPos.toProto())
-//                        .setDuration(parameters.duration)
-//                        .setIsAllowInput(parameters.isAllowInput)
-//                        .setIsSetFollowPos(parameters.setFollowPos)
-//                        .setIsSetScreenXy(parameters.isScreenXY)
-//                        .setIsRecoverKeepCurrent(parameters.recoverKeepCurrent)
-//                        .setIsChangePlayMode(parameters.isChangePlayMode)
-//                        .setScreenY(parameters.screenY)
-//                        .setScreenX(parameters.screenX)
-//                        .setIsForce(parameters.isForce)
-//                        .setIsForce(parameters.isForceWalk)
-//                        .setEntityId(parameters.entityId)
-//                        .addAllOtherParams(parameters.otherParams);
-//        this.setData(builder);
-//    }
-//
-//    // TODO check default values
-//    // todo find missing field usages:
-//    //  enum Unk2700_HIAKNNCKHJB (Unk2700_LNCHDDOOECD)
-//    //  Unk3000_MNLLCJMPMNH (uint32)
-//    //  Unk2700_DHAHEKOGHBJ (float)
-//    //  Unk3000_IEFIKMHCKDH (uint32)
-//    //  Unk3000_OGCLMFFADBD (float)
-//
-//    @Data
-//    @NoArgsConstructor
-//    public static class CameraSceneLookNotify {
-//        Position lookPos = new Position();
-//        Position followPos = new Position();
-//        float duration = 0.0f;
-//        boolean isAllowInput = true;
-//        boolean setFollowPos = false;
-//        boolean isScreenXY = false;
-//        boolean recoverKeepCurrent = true;
-//        boolean isForceWalk = false;
-//        boolean isForce = false;
-//        boolean isChangePlayMode = false;
-//        float screenY = 0.0f;
-//        float screenX = 0.0f;
-//        int entityId = 0;
-//        Collection<String> otherParams = new ArrayList<>(0);
-//    }
-//}
+// package emu.grasscutter.server.packet.send;
+//
+// import emu.grasscutter.net.packet.BasePacket;
+// import emu.grasscutter.net.packet.PacketOpcodes;
+// import emu.grasscutter.net.proto.BeginCameraSceneLookNotifyOuterClass.BeginCameraSceneLookNotify;
+// import emu.grasscutter.utils.Position;
+// import java.util.ArrayList;
+// import java.util.Collection;
+// import lombok.Data;
+// import lombok.NoArgsConstructor;
+//
+// public class PacketBeginCameraSceneLookNotify extends BasePacket {
+//
+//    public PacketBeginCameraSceneLookNotify(CameraSceneLookNotify parameters) {
+//        super(PacketOpcodes.BeginCameraSceneLookNotify);
+//        var builder =
+//                BeginCameraSceneLookNotify.newBuilder()
+//                        .setLookPos(parameters.lookPos.toProto())
+//                        .setFollowPos(parameters.followPos.toProto())
+//                        .setDuration(parameters.duration)
+//                        .setIsAllowInput(parameters.isAllowInput)
+//                        .setIsSetFollowPos(parameters.setFollowPos)
+//                        .setIsSetScreenXy(parameters.isScreenXY)
+//                        .setIsRecoverKeepCurrent(parameters.recoverKeepCurrent)
+//                        .setIsChangePlayMode(parameters.isChangePlayMode)
+//                        .setScreenY(parameters.screenY)
+//                        .setScreenX(parameters.screenX)
+//                        .setIsForce(parameters.isForce)
+//                        .setIsForce(parameters.isForceWalk)
+//                        .setEntityId(parameters.entityId)
+//                        .addAllOtherParams(parameters.otherParams);
+//        this.setData(builder);
+//    }
+//
+//    // TODO check default values
+//    // todo find missing field usages:
+//    //  enum Unk2700_HIAKNNCKHJB (Unk2700_LNCHDDOOECD)
+//    //  Unk3000_MNLLCJMPMNH (uint32)
+//    //  Unk2700_DHAHEKOGHBJ (float)
+//    //  Unk3000_IEFIKMHCKDH (uint32)
+//    //  Unk3000_OGCLMFFADBD (float)
+//
+//    @Data
+//    @NoArgsConstructor
+//    public static class CameraSceneLookNotify {
+//        Position lookPos = new Position();
+//        Position followPos = new Position();
+//        float duration = 0.0f;
+//        boolean isAllowInput = true;
+//        boolean setFollowPos = false;
+//        boolean isScreenXY = false;
+//        boolean recoverKeepCurrent = true;
+//        boolean isForceWalk = false;
+//        boolean isForce = false;
+//        boolean isChangePlayMode = false;
+//        float screenY = 0.0f;
+//        float screenX = 0.0f;
+//        int entityId = 0;
+//        Collection<String> otherParams = new ArrayList<>(0);
+//    }
+// }

src/main/java/emu/grasscutter/server/packet/send/PacketChangeGameTimeRsp.java

@@ -1,18 +1,18 @@
-package emu.grasscutter.server.packet.send;
-
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp;
-
-public class PacketChangeGameTimeRsp extends BasePacket {
-
-    public PacketChangeGameTimeRsp(Player player) {
-        super(PacketOpcodes.ChangeGameTimeRsp);
-
-        ChangeGameTimeRsp proto =
-                ChangeGameTimeRsp.newBuilder().setCurGameTime(player.getWorld().getGameTime()).build();
-
-        this.setData(proto);
-    }
-}
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp;
+
+public class PacketChangeGameTimeRsp extends BasePacket {
+
+    public PacketChangeGameTimeRsp(Player player) {
+        super(PacketOpcodes.ChangeGameTimeRsp);
+
+        ChangeGameTimeRsp proto =
+                ChangeGameTimeRsp.newBuilder().setCurGameTime(player.getWorld().getGameTime()).build();
+
+        this.setData(proto);
+    }
+}

src/main/java/emu/grasscutter/server/packet/send/PacketChangeHomeBgmNotify.java

@@ -1,18 +1,18 @@
-//package emu.grasscutter.server.packet.send;
-//
-//import emu.grasscutter.net.packet.BasePacket;
-//import emu.grasscutter.net.packet.PacketOpcodes;
-//import emu.grasscutter.net.proto.Unk2700FJEHHCPCBLGServerNotify;
-//
-//public class PacketChangeHomeBgmNotify extends BasePacket {
-//    public PacketChangeHomeBgmNotify(int homeBgmId) {
-//        super(PacketOpcodes.Unk2700_FJEHHCPCBLG_ServerNotify);
-//
-//        var notify =
-//                Unk2700FJEHHCPCBLGServerNotify.Unk2700_FJEHHCPCBLG_ServerNotify.newBuilder()
-//                        .setUnk2700BJHAMKKECEI(homeBgmId)
-//                        .build();
-//
-//        this.setData(notify);
-//    }
-//}
+// package emu.grasscutter.server.packet.send;
+//
+// import emu.grasscutter.net.packet.BasePacket;
+// import emu.grasscutter.net.packet.PacketOpcodes;
+// import emu.grasscutter.net.proto.Unk2700FJEHHCPCBLGServerNotify;
+//
+// public class PacketChangeHomeBgmNotify extends BasePacket {
+//    public PacketChangeHomeBgmNotify(int homeBgmId) {
+//        super(PacketOpcodes.Unk2700_FJEHHCPCBLG_ServerNotify);
+//
+//        var notify =
+//                Unk2700FJEHHCPCBLGServerNotify.Unk2700_FJEHHCPCBLG_ServerNotify.newBuilder()
+//                        .setUnk2700BJHAMKKECEI(homeBgmId)
+//                        .build();
+//
+//        this.setData(notify);
+//    }
+// }

src/main/java/emu/grasscutter/server/packet/send/PacketChangeHomeBgmRsp.java

@@ -1,18 +1,18 @@
-//package emu.grasscutter.server.packet.send;
-//
-//import emu.grasscutter.net.packet.BasePacket;
-//import emu.grasscutter.net.packet.PacketOpcodes;
-//import emu.grasscutter.net.proto.Unk2700OGHMHELMBNNServerRsp;
-//
-//public class PacketChangeHomeBgmRsp extends BasePacket {
-//    public PacketChangeHomeBgmRsp() {
-//        super(PacketOpcodes.Unk2700_OGHMHELMBNN_ServerRsp);
-//
-//        var rsp =
-//                Unk2700OGHMHELMBNNServerRsp.Unk2700_OGHMHELMBNN_ServerRsp.newBuilder()
-//                        .setRetcode(0)
-//                        .build();
-//
-//        this.setData(rsp);
-//    }
-//}
+// package emu.grasscutter.server.packet.send;
+//
+// import emu.grasscutter.net.packet.BasePacket;
+// import emu.grasscutter.net.packet.PacketOpcodes;
+// import emu.grasscutter.net.proto.Unk2700OGHMHELMBNNServerRsp;
+//
+// public class PacketChangeHomeBgmRsp extends BasePacket {
+//    public PacketChangeHomeBgmRsp() {
+//        super(PacketOpcodes.Unk2700_OGHMHELMBNN_ServerRsp);
+//
+//        var rsp =
+//                Unk2700OGHMHELMBNNServerRsp.Unk2700_OGHMHELMBNN_ServerRsp.newBuilder()
+//                        .setRetcode(0)
+//                        .build();
+//
+//        this.setData(rsp);
+//    }
+// }

src/main/java/emu/grasscutter/server/packet/send/PacketCustomTeamListNotify.java

@@ -1,29 +1,29 @@
-//package emu.grasscutter.server.packet.send;
-//
-//import emu.grasscutter.game.player.Player;
-//import emu.grasscutter.net.packet.BasePacket;
-//import emu.grasscutter.net.packet.PacketOpcodes;
-//import emu.grasscutter.net.proto.CustomTeamListNotifyOuterClass.CustomTeamListNotify;
-//
-//public class PacketCustomTeamListNotify extends BasePacket {
-//    public PacketCustomTeamListNotify(Player player) {
-//        super(PacketOpcodes.CustomTeamListNotify);
-//
-//        CustomTeamListNotify.Builder proto = CustomTeamListNotify.newBuilder();
-//
-//        // Add the id list for custom teams.
-//        for (int id : player.getTeamManager().getTeams().keySet()) {
-//            if (id > 4) {
-//                proto.addCustomTeamIds(id);
-//            }
-//        }
-//
-//        // Add the avatar lists for all the teams the player has.
-//        player
-//                .getTeamManager()
-//                .getTeams()
-//                .forEach((id, teamInfo) -> proto.putAvatarTeamMap(id, teamInfo.toProto(player)));
-//
-//        this.setData(proto);
-//    }
-//}
+// package emu.grasscutter.server.packet.send;
+//
+// import emu.grasscutter.game.player.Player;
+// import emu.grasscutter.net.packet.BasePacket;
+// import emu.grasscutter.net.packet.PacketOpcodes;
+// import emu.grasscutter.net.proto.CustomTeamListNotifyOuterClass.CustomTeamListNotify;
+//
+// public class PacketCustomTeamListNotify extends BasePacket {
+//    public PacketCustomTeamListNotify(Player player) {
+//        super(PacketOpcodes.CustomTeamListNotify);
+//
+//        CustomTeamListNotify.Builder proto = CustomTeamListNotify.newBuilder();
+//
+//        // Add the id list for custom teams.
+//        for (int id : player.getTeamManager().getTeams().keySet()) {
+//            if (id > 4) {
+//                proto.addCustomTeamIds(id);
+//            }
+//        }
+//
+//        // Add the avatar lists for all the teams the player has.
+//        player
+//                .getTeamManager()
+//                .getTeams()
+//                .forEach((id, teamInfo) -> proto.putAvatarTeamMap(id, teamInfo.toProto(player)));
+//
+//        this.setData(proto);
+//    }
+// }

src/main/java/emu/grasscutter/server/packet/send/PacketDungeonSettleNotify.java

@@ -1,13 +1,13 @@
-package emu.grasscutter.server.packet.send;
-
-import emu.grasscutter.game.dungeons.dungeon_results.BaseDungeonResult;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-
-public class PacketDungeonSettleNotify extends BasePacket {
-    public PacketDungeonSettleNotify(BaseDungeonResult result) {
-        super(PacketOpcodes.DungeonSettleNotify);
-
-        this.setData(result.getProto());
-    }
-}
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.dungeons.dungeon_results.BaseDungeonResult;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+
+public class PacketDungeonSettleNotify extends BasePacket {
+    public PacketDungeonSettleNotify(BaseDungeonResult result) {
+        super(PacketOpcodes.DungeonSettleNotify);
+
+        this.setData(result.getProto());
+    }
+}

src/main/java/emu/grasscutter/server/packet/send/PacketEntityFightPropUpdateNotify.java

@@ -1,33 +1,31 @@
-package emu.grasscutter.server.packet.send;
-
-import emu.grasscutter.game.entity.GameEntity;
-import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.EntityFightPropUpdateNotifyOuterClass.EntityFightPropUpdateNotify;
-
-import java.util.Collection;
-
-public class PacketEntityFightPropUpdateNotify extends BasePacket {
-    public PacketEntityFightPropUpdateNotify(GameEntity entity, FightProperty prop) {
-        super(PacketOpcodes.EntityFightPropUpdateNotify);
-
-        EntityFightPropUpdateNotify proto =
-                EntityFightPropUpdateNotify.newBuilder()
-                        .setEntityId(entity.getId())
-                        .putFightPropMap(prop.getId(), entity.getFightProperty(prop))
-                        .build();
-
-        this.setData(proto);
-    }
-
-    public PacketEntityFightPropUpdateNotify(GameEntity entity, Collection<FightProperty> props) {
-        super(PacketOpcodes.EntityFightPropUpdateNotify);
-
-        var protoBuilder = EntityFightPropUpdateNotify.newBuilder()
-            .setEntityId(entity.getId());
-        props.forEach(p -> protoBuilder.putFightPropMap(p.getId(), entity.getFightProperty(p)));
-
-        this.setData(protoBuilder);
-    }
-}
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.props.FightProperty;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.EntityFightPropUpdateNotifyOuterClass.EntityFightPropUpdateNotify;
+import java.util.Collection;
+
+public class PacketEntityFightPropUpdateNotify extends BasePacket {
+    public PacketEntityFightPropUpdateNotify(GameEntity entity, FightProperty prop) {
+        super(PacketOpcodes.EntityFightPropUpdateNotify);
+
+        EntityFightPropUpdateNotify proto =
+                EntityFightPropUpdateNotify.newBuilder()
+                        .setEntityId(entity.getId())
+                        .putFightPropMap(prop.getId(), entity.getFightProperty(prop))
+                        .build();
+
+        this.setData(proto);
+    }
+
+    public PacketEntityFightPropUpdateNotify(GameEntity entity, Collection<FightProperty> props) {
+        super(PacketOpcodes.EntityFightPropUpdateNotify);
+
+        var protoBuilder = EntityFightPropUpdateNotify.newBuilder().setEntityId(entity.getId());
+        props.forEach(p -> protoBuilder.putFightPropMap(p.getId(), entity.getFightProperty(p)));
+
+        this.setData(protoBuilder);
+    }
+}

src/main/java/emu/grasscutter/server/packet/send/PacketFinishedParentQuestNotify.java

@@ -1,26 +1,26 @@
-package emu.grasscutter.server.packet.send;
-
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.quest.GameMainQuest;
-import emu.grasscutter.game.quest.enums.ParentQuestState;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.FinishedParentQuestNotifyOuterClass.FinishedParentQuestNotify;
-
-public class PacketFinishedParentQuestNotify extends BasePacket {
-
-    public PacketFinishedParentQuestNotify(Player player) {
-        super(PacketOpcodes.FinishedParentQuestNotify, true);
-
-        FinishedParentQuestNotify.Builder proto = FinishedParentQuestNotify.newBuilder();
-
-        for (GameMainQuest mainQuest : player.getQuestManager().getMainQuests().values()) {
-            //Canceled Quests do not appear in this packet
-            if (mainQuest.getState() != ParentQuestState.PARENT_QUEST_STATE_CANCELED) {
-                proto.addParentQuestList(mainQuest.toProto(false));
-            }
-        }
-
-        this.setData(proto);
-    }
-}
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.quest.GameMainQuest;
+import emu.grasscutter.game.quest.enums.ParentQuestState;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.FinishedParentQuestNotifyOuterClass.FinishedParentQuestNotify;
+
+public class PacketFinishedParentQuestNotify extends BasePacket {
+
+    public PacketFinishedParentQuestNotify(Player player) {
+        super(PacketOpcodes.FinishedParentQuestNotify, true);
+
+        FinishedParentQuestNotify.Builder proto = FinishedParentQuestNotify.newBuilder();
+
+        for (GameMainQuest mainQuest : player.getQuestManager().getMainQuests().values()) {
+            // Canceled Quests do not appear in this packet
+            if (mainQuest.getState() != ParentQuestState.PARENT_QUEST_STATE_CANCELED) {
+                proto.addParentQuestList(mainQuest.toProto(false));
+            }
+        }
+
+        this.setData(proto);
+    }
+}

src/main/java/emu/grasscutter/server/packet/send/PacketFinishedParentQuestUpdateNotify.java

@@ -1,33 +1,33 @@
-package emu.grasscutter.server.packet.send;
-
-import emu.grasscutter.game.quest.GameMainQuest;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.FinishedParentQuestUpdateNotifyOuterClass.FinishedParentQuestUpdateNotify;
-
-import java.util.List;
-
-public class PacketFinishedParentQuestUpdateNotify extends BasePacket {
-
-    public PacketFinishedParentQuestUpdateNotify(GameMainQuest quest) {
-        super(PacketOpcodes.FinishedParentQuestUpdateNotify);
-
-        FinishedParentQuestUpdateNotify proto = FinishedParentQuestUpdateNotify.newBuilder()
-            .addParentQuestList(quest.toProto(true))
-            .build();
-
-        this.setData(proto);
-    }
-
-    public PacketFinishedParentQuestUpdateNotify(List<GameMainQuest> quests) {
-        super(PacketOpcodes.FinishedParentQuestUpdateNotify);
-
-        var proto = FinishedParentQuestUpdateNotify.newBuilder();
-
-        for (GameMainQuest mainQuest : quests) {
-            proto.addParentQuestList(mainQuest.toProto(true));
-        }
-        proto.build();
-        this.setData(proto);
-    }
-}
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.quest.GameMainQuest;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.FinishedParentQuestUpdateNotifyOuterClass.FinishedParentQuestUpdateNotify;
+import java.util.List;
+
+public class PacketFinishedParentQuestUpdateNotify extends BasePacket {
+
+    public PacketFinishedParentQuestUpdateNotify(GameMainQuest quest) {
+        super(PacketOpcodes.FinishedParentQuestUpdateNotify);
+
+        FinishedParentQuestUpdateNotify proto =
+                FinishedParentQuestUpdateNotify.newBuilder()
+                        .addParentQuestList(quest.toProto(true))
+                        .build();
+
+        this.setData(proto);
+    }
+
+    public PacketFinishedParentQuestUpdateNotify(List<GameMainQuest> quests) {
+        super(PacketOpcodes.FinishedParentQuestUpdateNotify);
+
+        var proto = FinishedParentQuestUpdateNotify.newBuilder();
+
+        for (GameMainQuest mainQuest : quests) {
+            proto.addParentQuestList(mainQuest.toProto(true));
+        }
+        proto.build();
+        this.setData(proto);
+    }
+}

src/main/java/emu/grasscutter/server/packet/send/PacketGetAllMailResultNotify.java

@@ -1,40 +1,42 @@
-package emu.grasscutter.server.packet.send;
-
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.GetAllMailResultNotifyOuterClass.GetAllMailResultNotify;
-import emu.grasscutter.utils.Utils;
-
-import java.time.Instant;
-import java.util.List;
-
-public final class PacketGetAllMailResultNotify extends BasePacket {
-    /**
-     * @param player The player to fetch the mail for.
-     * @param gifts Is the mail for gifts?
-     */
-    public PacketGetAllMailResultNotify(Player player, boolean gifts) {
-        super(PacketOpcodes.GetAllMailResultNotify);
-
-        var packet = GetAllMailResultNotify.newBuilder()
-            .setTransaction(player.getUid() + "-" + Utils.getCurrentSeconds() + "-" + 0)
-            .setIsCollected(gifts)
-            .setPacketBeSentNum(1)
-            .setPacketNum(1);
-
-        var inbox = player.getAllMail();
-        if (!gifts && inbox.size() > 0) {
-            packet.addAllMailList(inbox.stream()
-                .filter(mail -> mail.stateValue == 1)
-                .filter(mail -> mail.expireTime > Instant.now().getEpochSecond())
-                .map(mail -> mail.toProto(player)).toList());
-        } else {
-            // Empty mailbox.
-            // TODO: Implement the gift mailbox.
-            packet.addAllMailList(List.of());
-        }
-
-        this.setData(packet.build());
-    }
-}
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.GetAllMailResultNotifyOuterClass.GetAllMailResultNotify;
+import emu.grasscutter.utils.Utils;
+import java.time.Instant;
+import java.util.List;
+
+public final class PacketGetAllMailResultNotify extends BasePacket {
+    /**
+     * @param player The player to fetch the mail for.
+     * @param gifts Is the mail for gifts?
+     */
+    public PacketGetAllMailResultNotify(Player player, boolean gifts) {
+        super(PacketOpcodes.GetAllMailResultNotify);
+
+        var packet =
+                GetAllMailResultNotify.newBuilder()
+                        .setTransaction(player.getUid() + "-" + Utils.getCurrentSeconds() + "-" + 0)
+                        .setIsCollected(gifts)
+                        .setPacketBeSentNum(1)
+                        .setPacketNum(1);
+
+        var inbox = player.getAllMail();
+        if (!gifts && inbox.size() > 0) {
+            packet.addAllMailList(
+                    inbox.stream()
+                            .filter(mail -> mail.stateValue == 1)
+                            .filter(mail -> mail.expireTime > Instant.now().getEpochSecond())
+                            .map(mail -> mail.toProto(player))
+                            .toList());
+        } else {
+            // Empty mailbox.
+            // TODO: Implement the gift mailbox.
+            packet.addAllMailList(List.of());
+        }
+
+        this.setData(packet.build());
+    }
+}

src/main/java/emu/grasscutter/server/packet/send/PacketHomeUnknown1Notify.java

@@ -1,18 +1,18 @@
-//package emu.grasscutter.server.packet.send;
-//
-//import emu.grasscutter.net.packet.BasePacket;
-//import emu.grasscutter.net.packet.PacketOpcodes;
-//import emu.grasscutter.net.proto.HomeUnknown1NotifyOuterClass;
-//
-//public class PacketHomeUnknown1Notify extends BasePacket {
-//
-//    public PacketHomeUnknown1Notify(boolean isEnterEditMode) {
-//        super(PacketOpcodes.Unk2700_JDMPECKFGIG_ServerNotify);
-//
-//        var proto = HomeUnknown1NotifyOuterClass.HomeUnknown1Notify.newBuilder();
-//
-//        proto.setIsEnterEditMode(isEnterEditMode);
-//
-//        this.setData(proto);
-//    }
-//}
+// package emu.grasscutter.server.packet.send;
+//
+// import emu.grasscutter.net.packet.BasePacket;
+// import emu.grasscutter.net.packet.PacketOpcodes;
+// import emu.grasscutter.net.proto.HomeUnknown1NotifyOuterClass;
+//
+// public class PacketHomeUnknown1Notify extends BasePacket {
+//
+//    public PacketHomeUnknown1Notify(boolean isEnterEditMode) {
+//        super(PacketOpcodes.Unk2700_JDMPECKFGIG_ServerNotify);
+//
+//        var proto = HomeUnknown1NotifyOuterClass.HomeUnknown1Notify.newBuilder();
+//
+//        proto.setIsEnterEditMode(isEnterEditMode);
+//
+//        this.setData(proto);
+//    }
+// }

src/main/java/emu/grasscutter/server/packet/send/PacketHomeUnknown2Rsp.java

@@ -1,11 +1,11 @@
-//package emu.grasscutter.server.packet.send;
-//
-//import emu.grasscutter.net.packet.BasePacket;
-//import emu.grasscutter.net.packet.PacketOpcodes;
-//
-//public class PacketHomeUnknown2Rsp extends BasePacket {
-//
-//    public PacketHomeUnknown2Rsp() {
-//        super(PacketOpcodes.Unk2700_KIIOGMKFNNP_ServerRsp);
-//    }
-//}
+// package emu.grasscutter.server.packet.send;
+//
+// import emu.grasscutter.net.packet.BasePacket;
+// import emu.grasscutter.net.packet.PacketOpcodes;
+//
+// public class PacketHomeUnknown2Rsp extends BasePacket {
+//
+//    public PacketHomeUnknown2Rsp() {
+//        super(PacketOpcodes.Unk2700_KIIOGMKFNNP_ServerRsp);
+//    }
+// }

src/main/java/emu/grasscutter/server/packet/send/PacketMusicGameSettleRsp.java

@@ -1,32 +1,33 @@
-package emu.grasscutter.server.packet.send;
-
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.MusicGameSettleReqOuterClass;
-import emu.grasscutter.net.proto.MusicGameSettleRspOuterClass;
-import emu.grasscutter.net.proto.RetcodeOuterClass;
-
-public class PacketMusicGameSettleRsp extends BasePacket {
-
-    public PacketMusicGameSettleRsp(int musicBasicId, long musicShareId, boolean isNewRecord) {
-        super(PacketOpcodes.MusicGameSettleRsp);
-
-        var proto = MusicGameSettleRspOuterClass.MusicGameSettleRsp.newBuilder();
-
-        proto.setMusicBasicId(musicBasicId).setUgcGuid(musicShareId).setIsNewRecord(isNewRecord);
-
-        this.setData(proto);
-    }
-
-    public PacketMusicGameSettleRsp(RetcodeOuterClass.Retcode errorCode, MusicGameSettleReqOuterClass.MusicGameSettleReq req) {
-        super(PacketOpcodes.MusicGameSettleRsp);
-
-        var proto = MusicGameSettleRspOuterClass.MusicGameSettleRsp.newBuilder()
-            .setRetcode(errorCode.getNumber())
-            .setMusicBasicId(req.getMusicBasicId())
-            .setUgcGuid(req.getUgcGuid());
-
-
-        this.setData(proto);
-    }
-}
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.MusicGameSettleReqOuterClass;
+import emu.grasscutter.net.proto.MusicGameSettleRspOuterClass;
+import emu.grasscutter.net.proto.RetcodeOuterClass;
+
+public class PacketMusicGameSettleRsp extends BasePacket {
+
+    public PacketMusicGameSettleRsp(int musicBasicId, long musicShareId, boolean isNewRecord) {
+        super(PacketOpcodes.MusicGameSettleRsp);
+
+        var proto = MusicGameSettleRspOuterClass.MusicGameSettleRsp.newBuilder();
+
+        proto.setMusicBasicId(musicBasicId).setUgcGuid(musicShareId).setIsNewRecord(isNewRecord);
+
+        this.setData(proto);
+    }
+
+    public PacketMusicGameSettleRsp(
+            RetcodeOuterClass.Retcode errorCode, MusicGameSettleReqOuterClass.MusicGameSettleReq req) {
+        super(PacketOpcodes.MusicGameSettleRsp);
+
+        var proto =
+                MusicGameSettleRspOuterClass.MusicGameSettleRsp.newBuilder()
+                        .setRetcode(errorCode.getNumber())
+                        .setMusicBasicId(req.getMusicBasicId())
+                        .setUgcGuid(req.getUgcGuid());
+
+        this.setData(proto);
+    }
+}

src/main/java/emu/grasscutter/server/packet/send/PacketPlatformStartRouteNotify.java

@@ -1,20 +1,21 @@
-package emu.grasscutter.server.packet.send;
-
-import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.PlatformStartRouteNotifyOuterClass.PlatformStartRouteNotify;
-import lombok.val;
-
-public class PacketPlatformStartRouteNotify extends BasePacket {
-    public PacketPlatformStartRouteNotify(EntityGadget gadgetEntity) {
-        super(PacketOpcodes.PlatformStartRouteNotify);
-
-        val notify = PlatformStartRouteNotify.newBuilder()
-            .setEntityId(gadgetEntity.getId())
-            .setSceneTime(gadgetEntity.getScene().getSceneTime())
-            .setPlatform(gadgetEntity.getPlatformInfo());
-
-        this.setData(notify);
-    }
-}
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.entity.EntityGadget;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.PlatformStartRouteNotifyOuterClass.PlatformStartRouteNotify;
+import lombok.val;
+
+public class PacketPlatformStartRouteNotify extends BasePacket {
+    public PacketPlatformStartRouteNotify(EntityGadget gadgetEntity) {
+        super(PacketOpcodes.PlatformStartRouteNotify);
+
+        val notify =
+                PlatformStartRouteNotify.newBuilder()
+                        .setEntityId(gadgetEntity.getId())
+                        .setSceneTime(gadgetEntity.getScene().getSceneTime())
+                        .setPlatform(gadgetEntity.getPlatformInfo());
+
+        this.setData(notify);
+    }
+}

src/main/java/emu/grasscutter/server/packet/send/PacketPlatformStopRouteNotify.java

@@ -1,20 +1,21 @@
-package emu.grasscutter.server.packet.send;
-
-import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.PlatformStopRouteNotifyOuterClass;
-
-public class PacketPlatformStopRouteNotify extends BasePacket {
-    public PacketPlatformStopRouteNotify(EntityGadget gadgetEntity) {
-        super(PacketOpcodes.PlatformStopRouteNotify);
-
-        var notify = PlatformStopRouteNotifyOuterClass.PlatformStopRouteNotify.newBuilder()
-            .setPlatform(gadgetEntity.getPlatformInfo())
-            .setSceneTime(gadgetEntity.getScene().getSceneTime())
-            .setEntityId(gadgetEntity.getId())
-            .build();
-
-        this.setData(notify);
-    }
-}
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.entity.EntityGadget;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.PlatformStopRouteNotifyOuterClass;
+
+public class PacketPlatformStopRouteNotify extends BasePacket {
+    public PacketPlatformStopRouteNotify(EntityGadget gadgetEntity) {
+        super(PacketOpcodes.PlatformStopRouteNotify);
+
+        var notify =
+                PlatformStopRouteNotifyOuterClass.PlatformStopRouteNotify.newBuilder()
+                        .setPlatform(gadgetEntity.getPlatformInfo())
+                        .setSceneTime(gadgetEntity.getScene().getSceneTime())
+                        .setEntityId(gadgetEntity.getId())
+                        .build();
+
+        this.setData(notify);
+    }
+}

src/main/java/emu/grasscutter/server/packet/send/PacketPlayerGameTimeNotify.java

@@ -1,21 +1,21 @@
-package emu.grasscutter.server.packet.send;
-
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify;
-
-public class PacketPlayerGameTimeNotify extends BasePacket {
-
-    public PacketPlayerGameTimeNotify(Player player) {
-        super(PacketOpcodes.PlayerGameTimeNotify);
-
-        PlayerGameTimeNotify proto =
-                PlayerGameTimeNotify.newBuilder()
-                        .setGameTime(player.getWorld().getGameTime())
-                        .setUid(player.getUid())
-                        .build();
-
-        this.setData(proto);
-    }
-}
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify;
+
+public class PacketPlayerGameTimeNotify extends BasePacket {
+
+    public PacketPlayerGameTimeNotify(Player player) {
+        super(PacketOpcodes.PlayerGameTimeNotify);
+
+        PlayerGameTimeNotify proto =
+                PlayerGameTimeNotify.newBuilder()
+                        .setGameTime(player.getWorld().getGameTime())
+                        .setUid(player.getUid())
+                        .build();
+
+        this.setData(proto);
+    }
+}