Merge branch 'development' into more-events

# Conflicts:
#	src/main/java/emu/grasscutter/command/commands/TeleportAllCommand.java
#	src/main/java/emu/grasscutter/game/entity/EntityAvatar.java
#	src/main/java/emu/grasscutter/game/entity/GameEntity.java
#	src/main/java/emu/grasscutter/game/managers/mapmark/MapMarksManager.java

.github/workflows/lint_commit.yml

@@ -32,10 +32,10 @@ jobs:
       # - run: git merge development
       - run: git reset --hard development
       - run: git stash pop
-      - run: git add -u
-      - run: git commit -m 'Fix whitespace [skip actions]'
+      - name: Commit any whitespace changes
+        run: git add -u && git commit -m 'Fix whitespace [skip actions]' || true
       - name: Update Languages
         run: python manage_languages.py -u
-      - run: git add -u
-      - run: git commit -m 'Update languages [skip actions]'
+      - name: Commit any language changes
+        run: git add -u && git commit -m 'Update languages [skip actions]' || true
       - run: git push --set-upstream --force origin LintRatchet

build.gradle

@@ -43,8 +43,7 @@ sourceCompatibility = JavaVersion.VERSION_17
 targetCompatibility = JavaVersion.VERSION_17
 
 group = 'xyz.grasscutters'
-version = '1.2.2-dev'
-
+version = '1.2.3-dev'
 
 sourceCompatibility = 17
 targetCompatibility = 17
@@ -61,15 +60,18 @@ repositories {
 dependencies {
     implementation fileTree(dir: 'lib', include: ['*.jar'])
 
-    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.32'
-    implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.2.9'
-    implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.9'
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.36'
+    implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.2.11'
+    implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.11'
 
     implementation group: 'org.jline', name: 'jline', version: '3.21.0'
     implementation group: 'org.jline', name: 'jline-terminal-jna', version: '3.21.0'
     implementation group: 'net.java.dev.jna', name: 'jna', version: '5.10.0'
 
-    implementation group: 'io.netty', name: 'netty-all', version: '4.1.71.Final'
+    implementation group: 'io.netty', name: 'netty-common', version: '4.1.79.Final'
+    implementation group: 'io.netty', name: 'netty-handler', version: '4.1.79.Final'
+    implementation group: 'io.netty', name: 'netty-transport-native-epoll', version: '4.1.79.Final'
+    implementation group: 'io.netty', name: 'netty-transport-native-kqueue', version: '4.1.79.Final'
 
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.9.0'
     implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.18.2'
@@ -79,7 +81,7 @@ dependencies {
     implementation group: 'dev.morphia.morphia', name: 'morphia-core', version: '2.2.7'
 
     implementation group: 'org.greenrobot', name: 'eventbus-java', version: '3.3.1'
-    implementation group: 'org.danilopianini', name: 'java-quadtree', version: '0.1.9'
+    //implementation group: 'org.danilopianini', name: 'java-quadtree', version: '0.1.9'
 
     implementation group: 'org.quartz-scheduler', name: 'quartz', version: '2.3.2'
     implementation group: 'org.quartz-scheduler', name: 'quartz-jobs', version: '2.3.2'

manage_languages.py

@@ -90,6 +90,7 @@ class JsonHelpers:
 class LanguageManager:
     TRANSLATION_KEY = re.compile(r'[Tt]ranslate.*"(\w+\.[\w\.]+)"')
     POTENTIAL_KEY = re.compile(r'"(\w+\.[\w\.]+)"')
+    COMMAND_LABEL = re.compile(r'@Command\s*\([\W\w]*?label\s*=\s*"(\w+)"', re.MULTILINE)  # [\W\w] is a cheeky way to match everything including \n
 
     def __init__(self):
         self.load_jsons()
@@ -122,6 +123,8 @@ class LanguageManager:
                             used.add(k)
                         for k in self.POTENTIAL_KEY.findall(data):
                             potential.add(k)
+                        for label in self.COMMAND_LABEL.findall(data):
+                            used.add(f'commands.{label}.description')
         return used | (potential & expected_keys)
 
     def _lint_report_language(self, lang: str, keys: set, flattened: dict, primary_language_flattened: dict) -> None:

src/main/java/emu/grasscutter/GameConstants.java

@@ -6,29 +6,29 @@ import emu.grasscutter.utils.Position;
 import emu.grasscutter.utils.Utils;
 
 public final class GameConstants {
-	public static String VERSION = "2.7.0";
-	
-	public static final int MAX_TEAMS = 4;
-	public static final int MAIN_CHARACTER_MALE = 10000005;
-	public static final int MAIN_CHARACTER_FEMALE = 10000007;
-	public static final Position START_POSITION = new Position(2747, 194, -1719);
-	
-	public static final int MAX_FRIENDS = 45;
-	public static final int MAX_FRIEND_REQUESTS = 50;
-	
-	public static final int SERVER_CONSOLE_UID = 99; // The UID of the server console's "player".
-	
-	public static final int BATTLE_PASS_MAX_LEVEL = 50;
-	public static final int BATTLE_PASS_POINT_PER_LEVEL = 1000;
-	public static final int BATTLE_PASS_POINT_PER_WEEK = 10000;
-	public static final int BATTLE_PASS_LEVEL_PRICE = 150;
-	public static final int BATTLE_PASS_CURRENT_INDEX = 2;
-	
-	// Default entity ability hashes.
-	public static final String[] DEFAULT_ABILITY_STRINGS = {
-		"Avatar_DefaultAbility_VisionReplaceDieInvincible", "Avatar_DefaultAbility_AvartarInShaderChange", "Avatar_SprintBS_Invincible", 
-		"Avatar_Freeze_Duration_Reducer", "Avatar_Attack_ReviveEnergy", "Avatar_Component_Initializer", "Avatar_FallAnthem_Achievement_Listener"
-	};
-	public static final int[] DEFAULT_ABILITY_HASHES = Arrays.stream(DEFAULT_ABILITY_STRINGS).mapToInt(Utils::abilityHash).toArray();
-	public static final int DEFAULT_ABILITY_NAME = Utils.abilityHash("Default");
+    public static String VERSION = "2.8.0";
+
+    public static final int MAX_TEAMS = 4;
+    public static final int MAIN_CHARACTER_MALE = 10000005;
+    public static final int MAIN_CHARACTER_FEMALE = 10000007;
+    public static final Position START_POSITION = new Position(2747, 194, -1719);
+
+    public static final int MAX_FRIENDS = 45;
+    public static final int MAX_FRIEND_REQUESTS = 50;
+
+    public static final int SERVER_CONSOLE_UID = 99; // The UID of the server console's "player".
+
+    public static final int BATTLE_PASS_MAX_LEVEL = 50;
+    public static final int BATTLE_PASS_POINT_PER_LEVEL = 1000;
+    public static final int BATTLE_PASS_POINT_PER_WEEK = 10000;
+    public static final int BATTLE_PASS_LEVEL_PRICE = 150;
+    public static final int BATTLE_PASS_CURRENT_INDEX = 2;
+
+    // Default entity ability hashes.
+    public static final String[] DEFAULT_ABILITY_STRINGS = {
+        "Avatar_DefaultAbility_VisionReplaceDieInvincible", "Avatar_DefaultAbility_AvartarInShaderChange", "Avatar_SprintBS_Invincible",
+        "Avatar_Freeze_Duration_Reducer", "Avatar_Attack_ReviveEnergy", "Avatar_Component_Initializer", "Avatar_FallAnthem_Achievement_Listener"
+    };
+    public static final int[] DEFAULT_ABILITY_HASHES = Arrays.stream(DEFAULT_ABILITY_STRINGS).mapToInt(Utils::abilityHash).toArray();
+    public static final int DEFAULT_ABILITY_NAME = Utils.abilityHash("Default");
 }

src/main/java/emu/grasscutter/Grasscutter.java

@@ -5,14 +5,15 @@ import ch.qos.logback.classic.Logger;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
-import emu.grasscutter.Grasscutter.ServerDebugMode;
 import emu.grasscutter.auth.AuthenticationSystem;
 import emu.grasscutter.auth.DefaultAuthentication;
 import emu.grasscutter.command.CommandMap;
 import emu.grasscutter.command.DefaultPermissionHandler;
 import emu.grasscutter.command.PermissionHandler;
+import emu.grasscutter.config.ConfigContainer;
 import emu.grasscutter.data.ResourceLoader;
 import emu.grasscutter.database.DatabaseManager;
+import emu.grasscutter.net.packet.PacketOpcodesUtils;
 import emu.grasscutter.plugin.PluginManager;
 import emu.grasscutter.plugin.api.ServerHook;
 import emu.grasscutter.scripts.ScriptLoader;
@@ -26,7 +27,6 @@ import emu.grasscutter.server.http.handlers.GachaHandler;
 import emu.grasscutter.server.http.handlers.GenericHandler;
 import emu.grasscutter.server.http.handlers.LogHandler;
 import emu.grasscutter.tools.Tools;
-import emu.grasscutter.utils.ConfigContainer;
 import emu.grasscutter.utils.Crypto;
 import emu.grasscutter.utils.Language;
 import emu.grasscutter.utils.Utils;
@@ -43,8 +43,8 @@ import javax.annotation.Nullable;
 import java.io.*;
 import java.util.Calendar;
 
-import static emu.grasscutter.Configuration.DATA;
-import static emu.grasscutter.Configuration.SERVER;
+import static emu.grasscutter.config.Configuration.DATA;
+import static emu.grasscutter.config.Configuration.SERVER;
 import static emu.grasscutter.utils.Language.translate;
 
 public final class Grasscutter {
@@ -98,6 +98,10 @@ public final class Grasscutter {
                     Tools.createGmHandbook();
                     exitEarly = true;
                 }
+                case "-dumppacketids" -> {
+                    PacketOpcodesUtils.dumpPacketIds();
+                    exitEarly = true;
+                }
                 case "-gachamap" -> {
                     Tools.createGachaMapping(DATA("gacha_mappings.js"));
                     exitEarly = true;
@@ -213,7 +217,7 @@ public final class Grasscutter {
      */
     private static void onShutdown() {
         // Disable all plugins.
-        if(pluginManager != null)
+        if (pluginManager != null)
             pluginManager.disablePlugins();
     }
 

src/main/java/emu/grasscutter/auth/DefaultAuthentication.java

@@ -6,6 +6,7 @@ import emu.grasscutter.game.Account;
 import emu.grasscutter.server.http.objects.ComboTokenResJson;
 import emu.grasscutter.server.http.objects.LoginResultJson;
 
+import static emu.grasscutter.config.Configuration.ACCOUNT;
 import static emu.grasscutter.utils.Language.translate;
 
 /**
@@ -13,12 +14,20 @@ import static emu.grasscutter.utils.Language.translate;
  * Allows all users to access any account.
  */
 public final class DefaultAuthentication implements AuthenticationSystem {
-    private final Authenticator<LoginResultJson> passwordAuthenticator = new PasswordAuthenticator();
-    private final Authenticator<LoginResultJson> tokenAuthenticator = new TokenAuthenticator();
-    private final Authenticator<ComboTokenResJson> sessionKeyAuthenticator = new SessionKeyAuthenticator();
-    private final ExternalAuthenticator externalAuthenticator = new ExternalAuthentication();
-    private final OAuthAuthenticator oAuthAuthenticator = new OAuthAuthentication();
-    
+    private Authenticator<LoginResultJson> passwordAuthenticator;
+    private Authenticator<LoginResultJson> tokenAuthenticator = new TokenAuthenticator();
+    private Authenticator<ComboTokenResJson> sessionKeyAuthenticator = new SessionKeyAuthenticator();
+    private ExternalAuthenticator externalAuthenticator = new ExternalAuthentication();
+    private OAuthAuthenticator oAuthAuthenticator = new OAuthAuthentication();
+
+    public DefaultAuthentication() {
+        if (ACCOUNT.EXPERIMENTAL_RealPassword) {
+            passwordAuthenticator = new ExperimentalPasswordAuthenticator();
+        } else {
+            passwordAuthenticator = new PasswordAuthenticator();
+        }
+    }
+
     @Override
     public void createAccount(String username, String password) {
         // Unhandled. The default authenticator doesn't store passwords.

src/main/java/emu/grasscutter/auth/DefaultAuthenticators.java

@@ -1,31 +1,41 @@
 package emu.grasscutter.auth;
 
+import at.favre.lib.crypto.bcrypt.BCrypt;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.auth.AuthenticationSystem.AuthenticationRequest;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.game.Account;
 import emu.grasscutter.server.http.objects.*;
+import emu.grasscutter.utils.FileUtils;
+import emu.grasscutter.utils.Utils;
 
-import static emu.grasscutter.Configuration.*;
+import javax.crypto.Cipher;
+import java.nio.charset.StandardCharsets;
+import java.security.KeyFactory;
+import java.security.interfaces.RSAPrivateKey;
+import java.security.spec.PKCS8EncodedKeySpec;
+
+import static emu.grasscutter.config.Configuration.*;
 import static emu.grasscutter.utils.Language.translate;
 
 /**
  * A class containing default authenticators.
  */
 public final class DefaultAuthenticators {
-    
+
     /**
      * Handles the authentication request from the username and password form.
      */
     public static class PasswordAuthenticator implements Authenticator<LoginResultJson> {
-        @Override public LoginResultJson authenticate(AuthenticationRequest request) {
+        @Override
+        public LoginResultJson authenticate(AuthenticationRequest request) {
             var response = new LoginResultJson();
-            
+
             var requestData = request.getPasswordRequest();
             assert requestData != null; // This should never be null.
             int playerCount = Grasscutter.getGameServer().getPlayers().size();
 
-            boolean successfulLogin = false; 
+            boolean successfulLogin = false;
             String address = request.getRequest().ip();
             String responseMessage = translate("messages.dispatch.account.username_error");
             String loggerMessage = "";
@@ -34,12 +44,12 @@ public final class DefaultAuthenticators {
             Account account = DatabaseHelper.getAccountByName(requestData.account);
             if (ACCOUNT.maxPlayer <= -1 || playerCount < ACCOUNT.maxPlayer) {
                 // Check if account exists.
-                if(account == null && ACCOUNT.autoCreate) {
+                if (account == null && ACCOUNT.autoCreate) {
                     // This account has been created AUTOMATICALLY. There will be no permissions added.
                     account = DatabaseHelper.createAccountWithUid(requestData.account, 0);
 
                     // Check if the account was created successfully.
-                    if(account == null) {
+                    if (account == null) {
                         responseMessage = translate("messages.dispatch.account.username_create_error");
                         Grasscutter.getLogger().info(translate("messages.dispatch.account.account_login_create_error", address));
                     } else {
@@ -49,9 +59,9 @@ public final class DefaultAuthenticators {
                         // Log the creation.
                         Grasscutter.getLogger().info(translate("messages.dispatch.account.account_login_create_success", address, response.data.account.uid));
                     }
-                } else if(account != null)
+                } else if (account != null)
                     successfulLogin = true;
-                 else
+                else
                     loggerMessage = translate("messages.dispatch.account.account_login_exist_error", address);
 
             } else {
@@ -59,9 +69,113 @@ public final class DefaultAuthenticators {
                 loggerMessage = translate("messages.dispatch.account.login_max_player_limit", address);
             }
 
-            
+
             // Set response data.
-            if(successfulLogin) {
+            if (successfulLogin) {
+                response.message = "OK";
+                response.data.account.uid = account.getId();
+                response.data.account.token = account.generateSessionKey();
+                response.data.account.email = account.getEmail();
+
+                loggerMessage = translate("messages.dispatch.account.login_success", address, account.getId());
+            } else {
+                response.retcode = -201;
+                response.message = responseMessage;
+
+            }
+            Grasscutter.getLogger().info(loggerMessage);
+
+            return response;
+        }
+    }
+
+    public static class ExperimentalPasswordAuthenticator implements Authenticator<LoginResultJson> {
+        @Override
+        public LoginResultJson authenticate(AuthenticationRequest request) {
+            var response = new LoginResultJson();
+
+            var requestData = request.getPasswordRequest();
+            assert requestData != null; // This should never be null.
+            int playerCount = Grasscutter.getGameServer().getPlayers().size();
+
+            boolean successfulLogin = false;
+            String address = request.getRequest().ip();
+            String responseMessage = translate("messages.dispatch.account.username_error");
+            String loggerMessage = "";
+            String decryptedPassword = "";
+            try {
+                byte[] key = FileUtils.readResource("/keys/auth_private-key.der");
+                PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(key);
+                KeyFactory keyFactory = KeyFactory.getInstance("RSA");
+                RSAPrivateKey private_key = (RSAPrivateKey) keyFactory.generatePrivate(keySpec);
+
+                Cipher cipher = Cipher.getInstance("RSA/ECB/PKCS1Padding");
+
+                cipher.init(Cipher.DECRYPT_MODE, private_key);
+
+                decryptedPassword = new String(cipher.doFinal(Utils.base64Decode(request.getPasswordRequest().password)), StandardCharsets.UTF_8);
+            } catch (Exception ignored) {
+                decryptedPassword = request.getPasswordRequest().password;
+            }
+
+            if (decryptedPassword == null) {
+                successfulLogin = false;
+                loggerMessage = translate("messages.dispatch.account.login_password_error", address);
+                responseMessage = translate("messages.dispatch.account.password_error");
+            }
+
+            // Get account from database.
+            Account account = DatabaseHelper.getAccountByName(requestData.account);
+            if (ACCOUNT.maxPlayer <= -1 || playerCount < ACCOUNT.maxPlayer) {
+                // Check if account exists.
+                if (account == null && ACCOUNT.autoCreate) {
+                    // This account has been created AUTOMATICALLY. There will be no permissions added.
+                    if (decryptedPassword.length() >= 8) {
+                        account = DatabaseHelper.createAccountWithUid(requestData.account, 0);
+                        account.setPassword(BCrypt.withDefaults().hashToString(12, decryptedPassword.toCharArray()));
+                        account.save();
+
+                        // Check if the account was created successfully.
+                        if (account == null) {
+                            responseMessage = translate("messages.dispatch.account.username_create_error");
+                            loggerMessage = translate("messages.dispatch.account.account_login_create_error", address);
+                        } else {
+                            // Continue with login.
+                            successfulLogin = true;
+
+                            // Log the creation.
+                            Grasscutter.getLogger().info(translate("messages.dispatch.account.account_login_create_success", address, response.data.account.uid));
+                        }
+                    } else {
+                        successfulLogin = false;
+                        loggerMessage = translate("messages.dispatch.account.login_password_error", address);
+                        responseMessage = translate("messages.dispatch.account.password_length_error");
+                    }
+                } else if (account != null) {
+                    if (account.getPassword() != null && !account.getPassword().isEmpty()) {
+                        if (BCrypt.verifyer().verify(decryptedPassword.toCharArray(), account.getPassword()).verified) {
+                            successfulLogin = true;
+                        } else {
+                            successfulLogin = false;
+                            loggerMessage = translate("messages.dispatch.account.login_password_error", address);
+                            responseMessage = translate("messages.dispatch.account.password_error");
+                        }
+                    } else {
+                        successfulLogin = false;
+                        loggerMessage = translate("messages.dispatch.account.login_password_storage_error", address);
+                        responseMessage = translate("messages.dispatch.account.password_storage_error");
+                    }
+                } else {
+                    loggerMessage = translate("messages.dispatch.account.account_login_exist_error", address);
+                }
+            } else {
+                responseMessage = translate("messages.dispatch.account.server_max_player_limit");
+                loggerMessage = translate("messages.dispatch.account.login_max_player_limit", address);
+            }
+
+
+            // Set response data.
+            if (successfulLogin) {
                 response.message = "OK";
                 response.data.account.uid = account.getId();
                 response.data.account.token = account.generateSessionKey();
@@ -83,9 +197,10 @@ public final class DefaultAuthenticators {
      * Handles the authentication request from the game when using a registry token.
      */
     public static class TokenAuthenticator implements Authenticator<LoginResultJson> {
-        @Override public LoginResultJson authenticate(AuthenticationRequest request) {
+        @Override
+        public LoginResultJson authenticate(AuthenticationRequest request) {
             var response = new LoginResultJson();
-            
+
             var requestData = request.getTokenRequest();
             assert requestData != null;
 
@@ -106,7 +221,7 @@ public final class DefaultAuthenticators {
                 successfulLogin = account != null && account.getSessionKey().equals(requestData.token);
 
                 // Set response data.
-                if(successfulLogin) {
+                if (successfulLogin) {
                     response.message = "OK";
                     response.data.account.uid = account.getId();
                     response.data.account.token = account.getSessionKey();
@@ -138,13 +253,15 @@ public final class DefaultAuthenticators {
      * Handles the authentication request from the game when using a combo token/session key.
      */
     public static class SessionKeyAuthenticator implements Authenticator<ComboTokenResJson> {
-        @Override public ComboTokenResJson authenticate(AuthenticationRequest request) {
-            var response  = new ComboTokenResJson();
-            
+        @Override
+        public ComboTokenResJson authenticate(AuthenticationRequest request) {
+            var response = new ComboTokenResJson();
+
             var requestData = request.getSessionKeyRequest();
             var loginData = request.getSessionKeyData();
-            assert requestData != null; assert loginData != null;
-            
+            assert requestData != null;
+            assert loginData != null;
+
             boolean successfulLogin;
             String address = request.getRequest().ip();
             String loggerMessage;
@@ -158,7 +275,7 @@ public final class DefaultAuthenticators {
                 successfulLogin = account != null && account.getSessionKey().equals(loginData.token);
 
                 // Set response data.
-                if(successfulLogin) {
+                if (successfulLogin) {
                     response.message = "OK";
                     response.data.open_id = account.getId();
                     response.data.combo_id = "157795300";
@@ -190,17 +307,20 @@ public final class DefaultAuthenticators {
      * Handles authentication requests from external sources.
      */
     public static class ExternalAuthentication implements ExternalAuthenticator {
-        @Override public void handleLogin(AuthenticationRequest request) {
+        @Override
+        public void handleLogin(AuthenticationRequest request) {
             assert request.getResponse() != null;
             request.getResponse().send("Authentication is not available with the default authentication method.");
         }
 
-        @Override public void handleAccountCreation(AuthenticationRequest request) {
+        @Override
+        public void handleAccountCreation(AuthenticationRequest request) {
             assert request.getResponse() != null;
             request.getResponse().send("Authentication is not available with the default authentication method.");
         }
 
-        @Override public void handlePasswordReset(AuthenticationRequest request) {
+        @Override
+        public void handlePasswordReset(AuthenticationRequest request) {
             assert request.getResponse() != null;
             request.getResponse().send("Authentication is not available with the default authentication method.");
         }
@@ -210,17 +330,20 @@ public final class DefaultAuthenticators {
      * Handles authentication requests from OAuth sources.
      */
     public static class OAuthAuthentication implements OAuthAuthenticator {
-        @Override public void handleLogin(AuthenticationRequest request) {
+        @Override
+        public void handleLogin(AuthenticationRequest request) {
             assert request.getResponse() != null;
             request.getResponse().send("Authentication is not available with the default authentication method.");
         }
 
-        @Override public void handleRedirection(AuthenticationRequest request, ClientType type) {
+        @Override
+        public void handleRedirection(AuthenticationRequest request, ClientType type) {
             assert request.getResponse() != null;
             request.getResponse().send("Authentication is not available with the default authentication method.");
         }
 
-        @Override public void handleTokenProcess(AuthenticationRequest request) {
+        @Override
+        public void handleTokenProcess(AuthenticationRequest request) {
             assert request.getResponse() != null;
             request.getResponse().send("Authentication is not available with the default authentication method.");
         }

src/main/java/emu/grasscutter/command/Command.java

@@ -7,14 +7,12 @@ import java.lang.annotation.RetentionPolicy;
 public @interface Command {
     String label() default "";
 
-    String usage() default "commands.generic.no_usage_specified";
-
-    String description() default "commands.generic.no_description_specified";
-
     String[] aliases() default {};
 
+    String[] usage() default {""};
+
     String permission() default "";
-    
+
     String permissionTargeted() default "";
 
     public enum TargetRequirement {

src/main/java/emu/grasscutter/command/CommandHandler.java

@@ -2,12 +2,11 @@ package emu.grasscutter.command;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.server.event.game.CommandResponseEvent;
 import emu.grasscutter.server.event.game.ReceiveCommandFeedbackEvent;
-import emu.grasscutter.server.event.types.ServerEvent;
 import static emu.grasscutter.utils.Language.translate;
 
 import java.util.List;
+import java.util.StringJoiner;
 
 public interface CommandHandler {
 
@@ -37,6 +36,41 @@ public interface CommandHandler {
         sendMessage(player, translate(player, messageKey, args));
     }
 
+    default String getUsageString(Player player, String... args) {
+        Command annotation = this.getClass().getAnnotation(Command.class);
+        String usage_prefix = translate(player, "commands.execution.usage_prefix");
+        String command = annotation.label();
+        for (String alias : annotation.aliases()) {
+            if (alias.length() < command.length())
+                command = alias;
+        }
+        String target = switch (annotation.targetRequirement()) {
+            case NONE -> "";
+            case OFFLINE -> "@<UID> ";  // TODO: make translation keys for offline and online players
+            case ONLINE -> (player == null) ? "@<UID> " : "[@<UID>] ";  // TODO: make translation keys for offline and online players
+            case PLAYER -> (player == null) ? "@<UID> " : "[@<UID>] ";
+        };
+        String[] usages = annotation.usage();
+        StringJoiner joiner = new StringJoiner("\n\t");
+        for (String usage : usages)
+            joiner.add(usage_prefix + command + " " + target + usage);
+        return joiner.toString();
+    }
+
+    default void sendUsageMessage(Player player, String... args) {
+        sendMessage(player, getUsageString(player, args));
+    }
+
+    default String getLabel() {
+        return this.getClass().getAnnotation(Command.class).label();
+    }
+
+    default String getDescriptionString(Player player) {
+        Command annotation = this.getClass().getAnnotation(Command.class);
+        String key = "commands.%s.description".formatted(annotation.label());
+        return translate(player, key);
+    }
+
     /**
      * Called when a player/console invokes a command.
      * @param sender The player/console that invoked the command.

src/main/java/emu/grasscutter/command/CommandMap.java

@@ -8,9 +8,9 @@ import java.util.*;
 
 @SuppressWarnings({"UnusedReturnValue", "unused"})
 public final class CommandMap {
-    private final Map<String, CommandHandler> commands = new HashMap<>();
-    private final Map<String, CommandHandler> aliases = new HashMap<>();
-    private final Map<String, Command> annotations = new HashMap<>();
+    private final Map<String, CommandHandler> commands = new TreeMap<>();
+    private final Map<String, CommandHandler> aliases = new TreeMap<>();
+    private final Map<String, Command> annotations = new TreeMap<>();
     private final Map<String, Integer> targetPlayerIds = new HashMap<>();
     private static final String consoleId = "console";
 
@@ -35,6 +35,7 @@ public final class CommandMap {
      */
     public CommandMap registerCommand(String label, CommandHandler command) {
         Grasscutter.getLogger().debug("Registered command: " + label);
+        label = label.toLowerCase();
 
         // Get command data.
         Command annotation = command.getClass().getAnnotation(Command.class);
@@ -167,7 +168,7 @@ public final class CommandMap {
                 CommandHandler.sendTranslatedMessage(player, "commands.execution.clear_target");
                 return true;
         }
-        
+
         // Sets default targetPlayer to the UID provided.
         try {
             int uid = Integer.parseInt(targetUid);
@@ -203,7 +204,7 @@ public final class CommandMap {
         // Parse message.
         String[] split = rawMessage.split(" ");
         List<String> args = new LinkedList<>(Arrays.asList(split));
-        String label = args.remove(0);
+        String label = args.remove(0).toLowerCase();
         String playerId = (player == null) ? consoleId : player.getAccount().getId();
 
         // Check for special cases - currently only target command.
@@ -237,7 +238,7 @@ public final class CommandMap {
         Command annotation = this.annotations.get(label);
 
         // Resolve targetPlayer
-        try{
+        try {
             targetPlayer = getTargetPlayer(playerId, player, targetPlayer, args);
         } catch (IllegalArgumentException e) {
             return;

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

@@ -1,8 +1,10 @@
 package emu.grasscutter.command.commands;
 
+import at.favre.lib.crypto.bcrypt.BCrypt;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.config.Configuration;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.game.Account;
 import emu.grasscutter.game.player.Player;
@@ -11,18 +13,24 @@ import java.util.List;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "account", usage = "account <create|delete> <username> [uid]", description = "commands.account.description", targetRequirement = Command.TargetRequirement.NONE)
+@Command(
+    label = "account",
+    usage = {
+        "create <username> [<UID>]",  // Only with EXPERIMENTAL_RealPassword == false
+        "delete <username>",
+        "create <username> <password> [<UID>]",  // Only with EXPERIMENTAL_RealPassword == true
+        "resetpass <username> <password>"},  // Only with EXPERIMENTAL_RealPassword == true
+    targetRequirement = Command.TargetRequirement.NONE)
 public final class AccountCommand implements CommandHandler {
-
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
         if (sender != null) {
-            CommandHandler.sendMessage(sender, translate(sender, "commands.generic.console_execute_error"));
+            CommandHandler.sendTranslatedMessage(sender, "commands.generic.console_execute_error");
             return;
         }
 
         if (args.size() < 2) {
-            CommandHandler.sendMessage(null, translate(sender, "commands.account.command_usage"));
+            sendUsageMessage(sender);
             return;
         }
 
@@ -31,28 +39,55 @@ public final class AccountCommand implements CommandHandler {
 
         switch (action) {
             default:
-                CommandHandler.sendMessage(null, translate(sender, "commands.account.command_usage"));
+                sendUsageMessage(sender);
                 return;
             case "create":
                 int uid = 0;
-                if (args.size() > 2) {
-                    try {
-                        uid = Integer.parseInt(args.get(2));
-                    } catch (NumberFormatException ignored) {
-                        CommandHandler.sendMessage(null, translate(sender, "commands.account.invalid"));
+                String password = "";
+
+                if(Configuration.ACCOUNT.EXPERIMENTAL_RealPassword == true) {
+                    if(args.size() < 3) {
+                        CommandHandler.sendMessage(sender, "EXPERIMENTAL_RealPassword requires a password argument");
+                        CommandHandler.sendMessage(sender, "Usage: account create <username> <password> [uid]");
                         return;
                     }
+                    password = args.get(2);
+
+                    if (args.size() == 4) {
+                        try {
+                            uid = Integer.parseInt(args.get(3));
+                        } catch (NumberFormatException ignored) {
+                            CommandHandler.sendMessage(sender, translate(sender, "commands.account.invalid"));
+                            if(Configuration.ACCOUNT.EXPERIMENTAL_RealPassword == true) {
+                                CommandHandler.sendMessage(sender, "EXPERIMENTAL_RealPassword requires argument 2 to be a password, not a uid");
+                                CommandHandler.sendMessage(sender, "Usage: account create <username> <password> [uid]");
+                            }
+                            return;
+                        }
+                    }
+                } else {
+                    if (args.size() > 2) {
+                        try {
+                            uid = Integer.parseInt(args.get(2));
+                        } catch (NumberFormatException ignored) {
+                            CommandHandler.sendMessage(sender, translate(sender, "commands.account.invalid"));
+                            return;
+                        }
+                    }
                 }
 
                 emu.grasscutter.game.Account account = DatabaseHelper.createAccountWithUid(username, uid);
                 if (account == null) {
-                    CommandHandler.sendMessage(null, translate(sender, "commands.account.exists"));
+                    CommandHandler.sendMessage(sender, translate(sender, "commands.account.exists"));
                     return;
                 } else {
+                    if (Configuration.ACCOUNT.EXPERIMENTAL_RealPassword == true) {
+                        account.setPassword(BCrypt.withDefaults().hashToString(12, password.toCharArray()));
+                    }
                     account.addPermission("*");
                     account.save(); // Save account to database.
 
-                    CommandHandler.sendMessage(null, translate(sender, "commands.account.create", Integer.toString(account.getReservedPlayerUid())));
+                    CommandHandler.sendMessage(sender, translate(sender, "commands.account.create", Integer.toString(account.getReservedPlayerUid())));
                 }
                 return;
             case "delete":
@@ -60,20 +95,50 @@ public final class AccountCommand implements CommandHandler {
                 Account toDelete = DatabaseHelper.getAccountByName(username);
 
                 if (toDelete == null) {
-                    CommandHandler.sendMessage(null, translate(sender, "commands.account.no_account"));
+                    CommandHandler.sendMessage(sender, translate(sender, "commands.account.no_account"));
                     return;
                 }
-                
-                // Get the player for the account.
-                // If that player is currently online, we kick them before proceeding with the deletion.
-                Player player = Grasscutter.getGameServer().getPlayerByAccountId(toDelete.getId());
-                if (player != null) {
-                    player.getSession().close();
-                }
+
+                // Make sure player isn't online as we delete their account.
+                kickAccount(toDelete);
 
                 // Finally, we do the actual deletion.
                 DatabaseHelper.deleteAccount(toDelete);
-                CommandHandler.sendMessage(null, translate(sender, "commands.account.delete"));
+                CommandHandler.sendMessage(sender, translate(sender, "commands.account.delete"));
+                return;
+            case "resetpass":
+                if(Configuration.ACCOUNT.EXPERIMENTAL_RealPassword != true) {
+                    CommandHandler.sendMessage(sender, "resetpass requires EXPERIMENTAL_RealPassword to be true.");
+                    return;
+                }
+
+                if(args.size() != 3) {
+                    CommandHandler.sendMessage(sender, "Invalid Args");
+                    CommandHandler.sendMessage(sender, "Usage: account resetpass <username> <password>");
+                    return;
+                }
+
+                Account toUpdate = DatabaseHelper.getAccountByName(username);
+
+                if (toUpdate == null) {
+                    CommandHandler.sendMessage(sender, translate(sender, "commands.account.no_account"));
+                    return;
+                }
+
+                // Make sure player can't stay logged in with old password.
+                kickAccount(toUpdate);
+
+                toUpdate.setPassword(BCrypt.withDefaults().hashToString(12, args.get(2).toCharArray()));
+                toUpdate.save();
+                CommandHandler.sendMessage(sender, "Password Updated.");
+                return;
+        }
+    }
+
+    private void kickAccount(Account account) {
+        Player player = Grasscutter.getGameServer().getPlayerByAccountId(account.getId());
+        if (player != null) {
+            player.getSession().close();
         }
     }
 }

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

@@ -13,31 +13,30 @@ import java.util.Random;
 import static emu.grasscutter.utils.Language.translate;
 
 @Command(label = "announce",
-    usage = "announce|a <\"tpl\" templateId|\"refresh\"|\"revoke\" templateId|content>",
+    usage = {"<content>", "refresh", "(tpl|revoke) <templateId>"},
     permission = "server.announce",
     aliases = {"a"},
-    description = "commands.announce.description",
     targetRequirement = Command.TargetRequirement.NONE)
 public final class AnnounceCommand implements CommandHandler {
 
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
-        var manager = Grasscutter.getGameServer().getAnnouncementManager();
+        var manager = Grasscutter.getGameServer().getAnnouncementSystem();
         if (args.size() < 1) {
-            CommandHandler.sendTranslatedMessage(sender, "commands.announce.command_usage");
+            sendUsageMessage(sender);
             return;
         }
 
-        switch (args.get(0)){
+        switch (args.get(0)) {
             case "tpl":
                 if (args.size() < 2) {
-                    CommandHandler.sendTranslatedMessage(sender, "commands.announce.command_usage");
+                    sendUsageMessage(sender);
                     return;
                 }
 
                 var templateId = Integer.parseInt(args.get(1));
                 var tpl = manager.getAnnounceConfigItemMap().get(templateId);
-                if(tpl == null){
+                if (tpl == null) {
                     CommandHandler.sendMessage(sender, translate(sender, "commands.announce.not_found", templateId));
                     return;
                 }
@@ -53,7 +52,7 @@ public final class AnnounceCommand implements CommandHandler {
 
             case "revoke":
                 if (args.size() < 2) {
-                    CommandHandler.sendTranslatedMessage(sender, "commands.announce.command_usage");
+                    sendUsageMessage(sender);
                     return;
                 }
 

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

@@ -10,8 +10,7 @@ import emu.grasscutter.server.game.GameSession;
 
 @Command(
     label = "ban",
-    usage = "ban <@player> [time] [reason]",
-    description = "commands.ban.description",
+    usage = {"[<time> [<reason>]]"},
     permission = "server.ban",
     targetRequirement = Command.TargetRequirement.PLAYER
 )

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

@@ -12,10 +12,11 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
-@Command(label = "clear", usage = "clear <all|wp|art|mat> [lv<max level>] [r<max refinement>] [<max rarity>*]",
-        description = "commands.clear.description",
-        aliases = {"clear"}, permission = "player.clearinv", permissionTargeted = "player.clearinv.others")
-
+@Command(
+    label = "clear",
+    usage = {"(all|wp|art|mat) [lv<max level>] [r<max refinement>] [<max rarity>*]"},
+    permission = "player.clearinv",
+    permissionTargeted = "player.clearinv.others")
 public final class ClearCommand implements CommandHandler {
     private static Pattern lvlRegex = Pattern.compile("l(?:vl?)?(\\d+)");  // Java doesn't have raw string literals :(
     private static Pattern refineRegex = Pattern.compile("r(\\d+)");
@@ -82,7 +83,7 @@ public final class ClearCommand implements CommandHandler {
         }
 
         if (args.size() < 1) {
-            CommandHandler.sendTranslatedMessage(sender, "commands.clear.command_usage");
+            sendUsageMessage(sender);
             return;
         }
 

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

@@ -7,9 +7,7 @@ import emu.grasscutter.game.player.Player;
 
 import java.util.List;
 
-import static emu.grasscutter.utils.Language.translate;
-
-@Command(label = "coop", usage = "coop [host uid]", permission = "server.coop", permissionTargeted = "server.coop.others", description = "commands.coop.description")
+@Command(label = "coop", usage = {"[<host UID>]"}, permission = "server.coop", permissionTargeted = "server.coop.others")
 public final class CoopCommand implements CommandHandler {
 
     @Override
@@ -17,34 +15,35 @@ public final class CoopCommand implements CommandHandler {
         Player host = sender;
         switch (args.size()) {
             case 0:  // Summon target to self
-                CommandHandler.sendMessage(sender, translate(sender, "commands.coop.usage"));
-                if (sender == null) // Console doesn't have a self to summon to
+                if (sender == null) { // Console doesn't have a self to summon to
+                    sendUsageMessage(sender);
                     return;
+                }
                 break;
             case 1:  // Summon target to argument
                 try {
                     int hostId = Integer.parseInt(args.get(0));
                     host = Grasscutter.getGameServer().getPlayerByUid(hostId);
                     if (host == null) {
-                        CommandHandler.sendMessage(sender, translate(sender, "commands.execution.player_offline_error"));
+                        CommandHandler.sendTranslatedMessage(sender, "commands.execution.player_offline_error");
                         return;
                     }
                     break;
                 } catch (NumberFormatException ignored) {
-                    CommandHandler.sendMessage(sender, translate(sender, "commands.generic.invalid.uid"));
+                    CommandHandler.sendTranslatedMessage(sender, "commands.generic.invalid.uid");
                     return;
                 }
             default:
-                CommandHandler.sendMessage(sender, translate(sender, "commands.coop.usage"));
+                sendUsageMessage(sender);
                 return;
         }
-        
+
         // There's no target==host check but this just places them in multiplayer in their own world which seems fine.
         if (targetPlayer.isInMultiplayer()) {
-            targetPlayer.getServer().getMultiplayerManager().leaveCoop(targetPlayer);
+            targetPlayer.getServer().getMultiplayerSystem().leaveCoop(targetPlayer);
         }
-        host.getServer().getMultiplayerManager().applyEnterMp(targetPlayer, host.getUid());
-        targetPlayer.getServer().getMultiplayerManager().applyEnterMpReply(host, targetPlayer.getUid(), true);
-        CommandHandler.sendMessage(sender, translate(sender, "commands.coop.success", targetPlayer.getNickname(), host.getNickname()));
+        host.getServer().getMultiplayerSystem().applyEnterMp(targetPlayer, host.getUid());
+        targetPlayer.getServer().getMultiplayerSystem().applyEnterMpReply(host, targetPlayer.getUid(), true);
+        CommandHandler.sendTranslatedMessage(sender, "commands.coop.success", targetPlayer.getNickname(), host.getNickname());
     }
 }

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

@@ -8,24 +8,24 @@ import java.util.List;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "enterdungeon", usage = "enterdungeon <dungeonId>", aliases = {"dungeon"}, permission = "player.enterdungeon", permissionTargeted = "player.enterdungeon.others", description = "commands.enter_dungeon.description")
+@Command(label = "enter_dungeon", aliases = {"enterdungeon", "dungeon"}, usage = {"<dungeonId>"}, permission = "player.enterdungeon", permissionTargeted = "player.enterdungeon.others")
 public final class EnterDungeonCommand implements CommandHandler {
 
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
         if (args.size() < 1) {
-            CommandHandler.sendMessage(sender, translate(sender, "commands.enter_dungeon.usage"));
+            sendUsageMessage(sender);
             return;
         }
 
         try {
             int dungeonId = Integer.parseInt(args.get(0));
             if (dungeonId == targetPlayer.getSceneId()) {
-            	CommandHandler.sendMessage(sender, translate(sender, "commands.enter_dungeon.in_dungeon_error"));
-            	return;
+                CommandHandler.sendMessage(sender, translate(sender, "commands.enter_dungeon.in_dungeon_error"));
+                return;
             }
-            
-            boolean result = targetPlayer.getServer().getDungeonManager().enterDungeon(targetPlayer.getSession().getPlayer(), 0, dungeonId);
+
+            boolean result = targetPlayer.getServer().getDungeonSystem().enterDungeon(targetPlayer.getSession().getPlayer(), 0, dungeonId);
 
             if (!result) {
                 CommandHandler.sendMessage(sender, translate(sender, "commands.enter_dungeon.not_found_error"));
@@ -33,7 +33,7 @@ public final class EnterDungeonCommand implements CommandHandler {
                 CommandHandler.sendMessage(sender, translate(sender, "commands.enter_dungeon.changed", dungeonId));
             }
         } catch (Exception e) {
-            CommandHandler.sendMessage(sender, translate(sender, "commands.enter_dungeon.usage"));
+            sendUsageMessage(sender);
         }
     }
 }

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

@@ -23,8 +23,15 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-@Command(label = "give", usage = "give <itemId|avatarId|\"all\"|\"weapons\"|\"mats\"|\"avatars\"> [lv<level>] [r<refinement>] [x<amount>] | give <artifactId> [lv<level>] [x<amount>] [mainPropId] [<appendPropId>[,<times>]]...", aliases = {
-        "g", "item", "giveitem"}, permission = "player.give", permissionTargeted = "player.give.others", description = "commands.give.description")
+@Command(
+    label = "give",
+    aliases = {"g", "item", "giveitem"},
+    usage = {
+        "(<itemId>|<avatarId>|all|weapons|mats|avatars) [lv<level>] [r<refinement>] [x<amount>] [c<constellation>]",
+        "<artifactId> [lv<level>] [x<amount>] [<mainPropId>] [<appendPropId>[,<times>]]..."},
+    permission = "player.give",
+    permissionTargeted = "player.give.others",
+    threading = true)
 public final class GiveCommand implements CommandHandler {
     private static Pattern lvlRegex = Pattern.compile("l(?:vl?)?(\\d+)");  // Java doesn't have raw string literals :(
     private static Pattern refineRegex = Pattern.compile("r(\\d+)");
@@ -60,7 +67,7 @@ public final class GiveCommand implements CommandHandler {
         public GiveAllType giveAllType = GiveAllType.NONE;
     };
 
-    private static GiveItemParameters parseArgs(Player sender, List<String> args) throws IllegalArgumentException {
+    private GiveItemParameters parseArgs(Player sender, List<String> args) throws IllegalArgumentException {
         GiveItemParameters param = new GiveItemParameters();
 
         // Extract any tagged arguments (e.g. "lv90", "x100", "r5")
@@ -92,7 +99,7 @@ public final class GiveCommand implements CommandHandler {
 
         // At this point, first remaining argument MUST be itemId/avatarId
         if (args.size() < 1) {
-            CommandHandler.sendTranslatedMessage(sender, "commands.give.usage");  // Reachable if someone does `/give lv90` or similar
+            sendUsageMessage(sender);  // Reachable if someone does `/give lv90` or similar
             throw new IllegalArgumentException();
         }
         String id = args.remove(0);
@@ -162,7 +169,7 @@ public final class GiveCommand implements CommandHandler {
                     throw e;
                 }
             } else {
-                CommandHandler.sendTranslatedMessage(sender, "commands.give.usage");
+                sendUsageMessage(sender);
                 throw new IllegalArgumentException();
             }
         }
@@ -173,7 +180,7 @@ public final class GiveCommand implements CommandHandler {
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
         if (args.size() < 1) { // *No args*
-            CommandHandler.sendTranslatedMessage(sender, "commands.give.usage");
+            sendUsageMessage(sender);
             return;
         }
         try {
@@ -257,7 +264,7 @@ public final class GiveCommand implements CommandHandler {
         if (avatar.getAvatarId() == GameConstants.MAIN_CHARACTER_MALE) {
             avatar.setSkillDepotData(GameData.getAvatarSkillDepotDataMap().get(504));
         }
-        else if(avatar.getAvatarId() == GameConstants.MAIN_CHARACTER_FEMALE) {
+        else if (avatar.getAvatarId() == GameConstants.MAIN_CHARACTER_FEMALE) {
             avatar.setSkillDepotData(GameData.getAvatarSkillDepotDataMap().get(704));
         }
 
@@ -352,11 +359,11 @@ public final class GiveCommand implements CommandHandler {
         return affixes;
     }
 
-	private static int getAppendPropId(String substatText, ItemData itemData) throws IllegalArgumentException {
-		// If the given substat text is an integer, we just use that as the append prop ID.
-		try {
-			return Integer.parseInt(substatText);
-		} catch (NumberFormatException ignored) {
+    private static int getAppendPropId(String substatText, ItemData itemData) throws IllegalArgumentException {
+        // If the given substat text is an integer, we just use that as the append prop ID.
+        try {
+            return Integer.parseInt(substatText);
+        } catch (NumberFormatException ignored) {
             // If the argument was not an integer, we try to determine
             // the append prop ID from the given text + artifact information.
             // A substat string has the format `substat_tier`, with the
@@ -378,8 +385,8 @@ public final class GiveCommand implements CommandHandler {
             substatTier -= 1;  // 1-indexed to 0-indexed
             substatTier = Math.min(Math.max(0, substatTier), substats.size() - 1);
             return substats.get(substatTier);
-		}
-	}
+        }
+    }
 
     private static void parseRelicArgs(GiveItemParameters param, List<String> args) throws IllegalArgumentException {
         // Get the main stat from the arguments.
@@ -476,11 +483,11 @@ public final class GiveCommand implements CommandHandler {
         10000-10008, 11411, 11506-11508, 12505, 12506, 12508, 12509,
         13503, 13506, 14411, 14503, 14505, 14508, 15504-15506
         """);
-    
+
     private static final SparseSet illegalRelicIds = new SparseSet("""
         20001, 23300-23340, 23383-23385, 78310-78554, 99310-99554
         """);
-    
+
     private static final SparseSet illegalItemIds = new SparseSet("""
         100086, 100087, 100100-101000, 101106-101110, 101306, 101500-104000,
         105001, 105004, 106000-107000, 107011, 108000, 109000-110000,

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

@@ -11,7 +11,7 @@ import java.util.List;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "heal", usage = "heal|h", aliases = {"h"}, permission = "player.heal", permissionTargeted = "player.heal.others", description = "commands.heal.description")
+@Command(label = "heal", aliases = {"h"}, permission = "player.heal", permissionTargeted = "player.heal.others")
 public final class HealCommand implements CommandHandler {
 
     @Override

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

@@ -3,80 +3,81 @@ package emu.grasscutter.command.commands;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.command.CommandMap;
+import emu.grasscutter.game.Account;
 import emu.grasscutter.game.player.Player;
 
 import java.util.*;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "help", usage = "help [command]", description = "commands.help.description", targetRequirement = Command.TargetRequirement.NONE)
+@Command(label = "help", usage = {"[<command>]"}, targetRequirement = Command.TargetRequirement.NONE)
 public final class HelpCommand implements CommandHandler {
+    private final boolean SHOW_COMMANDS_WITHOUT_PERMISSIONS = false;  // TODO: Make this into a server config key
 
-    private void createCommand(StringBuilder builder, Player player, Command annotation) {
-        builder.append("\n").append(annotation.label()).append(" - ").append(translate(player, annotation.description()));
-        builder.append("\n\t").append(translate(player, "commands.help.usage"));
-        if (annotation.aliases().length >= 1) {
+    private String createCommand(Player player, CommandHandler command, List<String> args) {
+        StringBuilder builder = new StringBuilder(command.getLabel())
+            .append(" - ")
+            .append(command.getDescriptionString(player))
+            .append("\n\t")
+            .append(command.getUsageString(player, args.toArray(new String[0])));
+
+        Command annotation = command.getClass().getAnnotation(Command.class);
+        if (annotation.aliases().length > 0) {
             builder.append("\n\t").append(translate(player, "commands.help.aliases"));
             for (String alias : annotation.aliases()) {
                 builder.append(alias).append(" ");
             }
         }
+
         builder.append("\n\t").append(translate(player, "commands.help.tip_need_permission"));
-        if(annotation.permission().isEmpty() || annotation.permission().isBlank()) {
-            builder.append(translate(player, "commands.help.tip_need_no_permission"));
-        } else {
+        if (!annotation.permission().isEmpty()) {
             builder.append(annotation.permission());
+        } else {
+            builder.append(translate(player, "commands.help.tip_need_no_permission"));
         }
 
-        if(!annotation.permissionTargeted().isEmpty() && !annotation.permissionTargeted().isBlank()) {
+        if (!annotation.permissionTargeted().isEmpty()) {
             String permissionTargeted = annotation.permissionTargeted();
             builder.append(" ").append(translate(player, "commands.help.tip_permission_targeted", permissionTargeted));
         }
+        return builder.toString();
     }
 
     @Override
     public void execute(Player player, Player targetPlayer, List<String> args) {
-        if (args.size() < 1) {
-            HashMap<String, CommandHandler> handlers = CommandMap.getInstance().getHandlers();
-            List<Command> annotations = new ArrayList<>();
+        Account account = (player == null) ? null : player.getAccount();
+        Map<String, CommandHandler> handlers = CommandMap.getInstance().getHandlers();
+        List<String> commands = new ArrayList<>();
+        List<String> commands_no_permission = new ArrayList<>();
+        if (args.isEmpty()) {
             for (String key : handlers.keySet()) {
-                Command annotation = handlers.get(key).getClass().getAnnotation(Command.class);
-
-                if (!Arrays.asList(annotation.aliases()).contains(key)) {
-                    if (player != null && !Objects.equals(annotation.permission(), "") && !player.getAccount().hasPermission(annotation.permission()))
-                        continue;
-                    annotations.add(annotation);
+                CommandHandler command = handlers.get(key);
+                Command annotation = command.getClass().getAnnotation(Command.class);
+                if (player == null || account.hasPermission(annotation.permission())) {
+                    commands.add(createCommand(player, command, args));
+                } else if (SHOW_COMMANDS_WITHOUT_PERMISSIONS) {
+                    commands_no_permission.add(createCommand(player, command, args));
                 }
             }
-
-            SendAllHelpMessage(player, annotations);
+            CommandHandler.sendTranslatedMessage(player, "commands.help.available_commands");
         } else {
-            String command = args.get(0);
-            CommandHandler handler = CommandMap.getInstance().getHandler(command);
-            StringBuilder builder = new StringBuilder("");
-            if (handler == null) {
-                builder.append(translate(player, "commands.generic.command_exist_error"));
+            String command_str = args.remove(0).toLowerCase();
+            CommandHandler command = handlers.get(command_str);
+            if (command == null) {
+                CommandHandler.sendTranslatedMessage(player, "commands.generic.command_exist_error");
+                return;
             } else {
-                Command annotation = handler.getClass().getAnnotation(Command.class);
-
-                this.createCommand(builder, player, annotation);
-
-                if (player != null && !Objects.equals(annotation.permission(), "") && !player.getAccount().hasPermission(annotation.permission())) {
-                    builder.append("\n\t").append(translate(player, "commands.help.warn_player_has_no_permission"));
+                Command annotation = command.getClass().getAnnotation(Command.class);
+                if (player == null || account.hasPermission(annotation.permission())) {
+                    commands.add(createCommand(player, command, args));
+                } else {
+                    commands_no_permission.add(createCommand(player, command, args));
                 }
             }
-
-            CommandHandler.sendMessage(player, builder.toString());
         }
-    }
-
-    void SendAllHelpMessage(Player player, List<Command> annotations) {
-        StringBuilder builder = new StringBuilder(translate(player, "commands.help.available_commands"));
-        annotations.forEach(annotation -> {
-            this.createCommand(builder, player, annotation);
-            builder.append("\n");
-        });
-
-        CommandHandler.sendMessage(player, builder.toString());
+        for (String s : commands)
+            CommandHandler.sendMessage(player, s);
+        for (String s : commands_no_permission)
+            CommandHandler.sendMessage(player, s + "\n\t" + translate(player, "commands.help.warn_player_has_no_permission"));
     }
 }

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

@@ -6,19 +6,18 @@ import emu.grasscutter.game.player.Player;
 
 import java.util.List;
 
-import static emu.grasscutter.utils.Language.translate;
-
-@Command(label = "kick", usage = "kick", aliases = {"restart"}, permissionTargeted = "server.kick", description = "commands.kick.description")
+@Command(label = "kick", aliases = {"restart"}, permissionTargeted = "server.kick")
 public final class KickCommand implements CommandHandler {
 
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
         if (sender != null) {
-            CommandHandler.sendMessage(sender, translate(sender, "commands.kick.player_kick_player",
+            CommandHandler.sendTranslatedMessage(sender, "commands.kick.player_kick_player",
                 Integer.toString(sender.getUid()), sender.getAccount().getUsername(),
-                Integer.toString(targetPlayer.getUid()), targetPlayer.getAccount().getUsername()));
+                Integer.toString(targetPlayer.getUid()), targetPlayer.getAccount().getUsername());
         } else {
-            CommandHandler.sendMessage(null, translate(sender, "commands.kick.server_kick_player", Integer.toString(targetPlayer.getUid()), targetPlayer.getAccount().getUsername()));
+            CommandHandler.sendTranslatedMessage(sender, "commands.kick.server_kick_player",
+                Integer.toString(targetPlayer.getUid()), targetPlayer.getAccount().getUsername());
         }
 
         targetPlayer.getSession().close();

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

@@ -1,6 +1,5 @@
 package emu.grasscutter.command.commands;
 
-import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.game.entity.EntityMonster;
@@ -12,7 +11,7 @@ import java.util.List;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "killall", usage = "killall [sceneId]", permission = "server.killall", permissionTargeted = "server.killall.others", description = "commands.killall.description")
+@Command(label = "killall", usage = {"[<sceneId>]"}, permission = "server.killall", permissionTargeted = "server.killall.others")
 public final class KillAllCommand implements CommandHandler {
 
     @Override
@@ -26,7 +25,7 @@ public final class KillAllCommand implements CommandHandler {
                     scene = targetPlayer.getWorld().getSceneById(Integer.parseInt(args.get(0)));
                     break;
                 default:
-                    CommandHandler.sendMessage(sender, translate(sender, "commands.killall.usage"));
+                    sendUsageMessage(sender);
                     return;
             }
         } catch (NumberFormatException ignored) {

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

@@ -13,16 +13,11 @@ import java.util.List;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "killcharacter", usage = "killcharacter", aliases = {"suicide", "kill"}, permission = "player.killcharacter", permissionTargeted = "player.killcharacter.others", description = "commands.killCharacter.description")
+@Command(label = "killCharacter", aliases = {"suicide", "kill"}, permission = "player.killcharacter", permissionTargeted = "player.killcharacter.others")
 public final class KillCharacterCommand implements CommandHandler {
 
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
-        if (args.isEmpty()) {
-            CommandHandler.sendMessage(sender, translate(sender, "commands.killCharacter.usage"));
-            return;
-        }
-
         EntityAvatar entity = targetPlayer.getTeamManager().getCurrentAvatarEntity();
         entity.setFightProperty(FightProperty.FIGHT_PROP_CUR_HP, 0f);
         // Packets

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

@@ -3,8 +3,6 @@ package emu.grasscutter.command.commands;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.database.DatabaseHelper;
-import emu.grasscutter.game.Account;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.utils.Utils;
 
@@ -13,7 +11,7 @@ import java.util.Locale;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "language", usage = "language [language code]", description = "commands.language.description", aliases = {"lang"}, targetRequirement = Command.TargetRequirement.NONE)
+@Command(label = "language", usage = {"[<language code>]"}, aliases = {"lang"}, targetRequirement = Command.TargetRequirement.NONE)
 public final class LanguageCommand implements CommandHandler {
 
     @Override

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

@@ -10,7 +10,7 @@ import java.util.Map;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "list", usage = "list [uid]", aliases = {"players"}, description = "commands.list.description", targetRequirement = Command.TargetRequirement.NONE)
+@Command(label = "list", aliases = {"players"}, usage = {"[<UID>]"}, targetRequirement = Command.TargetRequirement.NONE)
 public final class ListCommand implements CommandHandler {
 
     @Override

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

@@ -11,13 +11,13 @@ import java.util.List;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "permission", usage = "permission <add|remove> <permission>", permission = "permission", description = "commands.permission.description", targetRequirement = TargetRequirement.PLAYER)
+@Command(label = "permission", usage = "(add|remove) <permission>", permission = "permission", targetRequirement = TargetRequirement.PLAYER)
 public final class PermissionCommand implements CommandHandler {
 
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
         if (args.size() != 2) {
-            CommandHandler.sendMessage(sender, translate(sender, "commands.permission.usage"));
+            sendUsageMessage(sender);
             return;
         }
 
@@ -37,7 +37,7 @@ public final class PermissionCommand implements CommandHandler {
 
         switch (action) {
             default:
-                CommandHandler.sendMessage(sender, translate(sender, "commands.permission.usage"));
+                sendUsageMessage(sender);
                 break;
             case "add":
                 if (account.addPermission(permission)) {

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

@@ -7,16 +7,14 @@ import emu.grasscutter.utils.Position;
 
 import java.util.List;
 
-import static emu.grasscutter.utils.Language.translate;
-
-@Command(label = "position", usage = "position", aliases = {"pos"}, description = "commands.position.description")
+@Command(label = "position", aliases = {"pos"})
 public final class PositionCommand implements CommandHandler {
 
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
-        Position pos = targetPlayer.getPos();
-        CommandHandler.sendMessage(sender, translate(sender, "commands.position.success",
+        Position pos = targetPlayer.getPosition();
+        CommandHandler.sendTranslatedMessage(sender, "commands.position.success",
                 Float.toString(pos.getX()), Float.toString(pos.getY()), Float.toString(pos.getZ()),
-                Integer.toString(targetPlayer.getSceneId())));
+                Integer.toString(targetPlayer.getSceneId()));
     }
 }

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

@@ -1,6 +1,5 @@
 package emu.grasscutter.command.commands;
 
-import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.game.player.Player;
@@ -10,13 +9,13 @@ import java.util.List;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "quest", usage = "quest <add|finish> [questId]", permission = "player.quest", permissionTargeted = "player.quest.others", description = "commands.quest.description")
+@Command(label = "quest", usage = {"(add|finish) [<questId>]"}, permission = "player.quest", permissionTargeted = "player.quest.others")
 public final class QuestCommand implements CommandHandler {
 
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
 		if (args.size() != 2) {
-			CommandHandler.sendMessage(sender, translate(sender, "commands.quest.usage"));
+			sendUsageMessage(sender);
             return;
 		}
 		
@@ -54,7 +53,7 @@ public final class QuestCommand implements CommandHandler {
 				CommandHandler.sendMessage(sender, translate(sender, "commands.quest.finished", questId));
 			}
 			default -> {
-				CommandHandler.sendMessage(sender, translate(sender, "commands.quest.usage"));
+				sendUsageMessage(sender);
 			}
 		}
     }

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

@@ -9,19 +9,19 @@ import java.util.List;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "reload", usage = "reload", permission = "server.reload", description = "commands.reload.description", targetRequirement = Command.TargetRequirement.NONE)
+@Command(label = "reload", permission = "server.reload", targetRequirement = Command.TargetRequirement.NONE)
 public final class ReloadCommand implements CommandHandler {
 
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
         CommandHandler.sendMessage(sender, translate(sender, "commands.reload.reload_start"));
-        
+
         Grasscutter.loadConfig();
         Grasscutter.loadLanguage();
-        Grasscutter.getGameServer().getGachaManager().load();
-        Grasscutter.getGameServer().getDropManager().load();
-        Grasscutter.getGameServer().getShopManager().load();
-        
+        Grasscutter.getGameServer().getGachaSystem().load();
+        Grasscutter.getGameServer().getDropSystem().load();
+        Grasscutter.getGameServer().getShopSystem().load();
+
         CommandHandler.sendMessage(sender, translate(sender, "commands.reload.reload_done"));
     }
 }

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

@@ -10,8 +10,12 @@ import java.util.List;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "resetconst", usage = "resetconst [all]",
-        aliases = {"resetconstellation"}, permission = "player.resetconstellation", permissionTargeted = "player.resetconstellation.others", description = "commands.resetConst.description")
+@Command(
+    label = "resetConst",
+    aliases = {"resetconstellation"},
+    usage = "[all]",
+    permission = "player.resetconstellation",
+    permissionTargeted = "player.resetconstellation.others")
 public final class ResetConstCommand implements CommandHandler {
 
     @Override

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

@@ -9,16 +9,11 @@ import java.util.List;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "resetshop", usage = "resetshop", permission = "server.resetshop", permissionTargeted = "server.resetshop.others", description = "commands.resetShopLimit.description")
+@Command(label = "resetShopLimit", aliases = {"resetshop"}, permission = "server.resetshop", permissionTargeted = "server.resetshop.others")
 public final class ResetShopLimitCommand implements CommandHandler {
 
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
-        if (args.isEmpty()) {
-            CommandHandler.sendMessage(sender, translate(sender, "commands.resetShopLimit.usage"));
-            return;
-        }
-
         targetPlayer.getShopLimit().forEach(x -> x.setNextRefreshTime(0));
         targetPlayer.save();
         CommandHandler.sendMessage(sender, translate(sender, "commands.resetShopLimit.success"));

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

@@ -13,7 +13,11 @@ import java.util.List;
 import static emu.grasscutter.utils.Language.translate;
 
 @SuppressWarnings("ConstantConditions")
-@Command(label = "sendmail", usage = "sendmail <userId|all|help> [templateId]", permission = "server.sendmail", description = "commands.sendMail.description", targetRequirement = Command.TargetRequirement.NONE)
+@Command(
+    label = "sendMail",
+    usage = {"(<userId>|all) [<templateId>]", "help"},
+    permission = "server.sendmail",
+    targetRequirement = Command.TargetRequirement.NONE)
 public final class SendMailCommand implements CommandHandler {
 
     // TODO: You should be able to do /sendmail and then just send subsequent messages until you finish
@@ -27,7 +31,7 @@ public final class SendMailCommand implements CommandHandler {
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
         int senderId;
-        if(sender != null) {
+        if (sender != null) {
             senderId = sender.getUid();
         } else {
             senderId = -1;
@@ -39,7 +43,7 @@ public final class SendMailCommand implements CommandHandler {
                     MailBuilder mailBuilder;
                     switch (args.get(0).toLowerCase()) {
                         case "help" -> {
-                            CommandHandler.sendMessage(sender, translate(sender, "commands.sendMail.usage"));
+                            sendUsageMessage(sender);
                             return;
                         }
                         case "all" -> mailBuilder = new MailBuilder(true, new Mail());
@@ -146,7 +150,7 @@ public final class SendMailCommand implements CommandHandler {
                                         }
                                         break;
                                     default: // *No args*
-                                        CommandHandler.sendMessage(sender, translate(sender, "commands.give.usage"));
+                                        CommandHandler.sendTranslatedMessage(sender, "commands.sendMail.give_usage");
                                         return;
                                 }
                                 mailBuilder.mail.itemList.add(new Mail.MailItem(item, amount, lvl));
@@ -162,7 +166,7 @@ public final class SendMailCommand implements CommandHandler {
     }
 
     private String getConstructionArgs(int stage, Player sender) {
-        return switch(stage) {
+        return switch (stage) {
             case 0 -> translate(sender, "commands.sendMail.title");
             case 1 -> translate(sender, "commands.sendMail.message");
             case 2 -> translate(sender, "commands.sendMail.sender");

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

@@ -8,16 +8,19 @@ import emu.grasscutter.game.player.Player;
 
 import java.util.List;
 
-import static emu.grasscutter.utils.Language.translate;
-
-@Command(label = "sendmessage", usage = "sendmessage <message>",
-    aliases = {"say", "sendservmsg", "sendservermessage", "b", "broadcast"}, permission = "server.sendmessage", permissionTargeted = "server.sendmessage.others", description = "commands.sendMessage.description", targetRequirement = TargetRequirement.NONE)
+@Command(
+    label = "sendMessage",
+    aliases = {"say", "sendservmsg", "sendservermessage", "b", "broadcast"},
+    usage = {"<message>"},
+    permission = "server.sendmessage",
+    permissionTargeted = "server.sendmessage.others",
+    targetRequirement = TargetRequirement.NONE)
 public final class SendMessageCommand implements CommandHandler {
 
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
         if (args.size() == 0) {
-            CommandHandler.sendMessage(sender, translate(sender, "commands.sendMessage.usage"));
+            sendUsageMessage(sender);
             return;
         }
 
@@ -30,6 +33,6 @@ public final class SendMessageCommand implements CommandHandler {
         } else {
             CommandHandler.sendMessage(targetPlayer, message);
         }
-        CommandHandler.sendMessage(sender, translate(sender, "commands.sendMessage.success"));
+        CommandHandler.sendTranslatedMessage(sender, "commands.sendMessage.success");
     }
 }

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

@@ -11,14 +11,18 @@ import emu.grasscutter.server.packet.send.PacketAvatarFetterDataNotify;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "setfetterlevel", usage = "setfetterlevel <level>",
-        aliases = {"setfetterlvl", "setfriendship"}, permission = "player.setfetterlevel", permissionTargeted = "player.setfetterlevel.others", description = "commands.setFetterLevel.description")
+@Command(
+    label = "setFetterLevel",
+    usage = {"<level>"},
+    aliases = {"setfetterlvl", "setfriendship"},
+    permission = "player.setfetterlevel",
+    permissionTargeted = "player.setfetterlevel.others")
 public final class SetFetterLevelCommand implements CommandHandler {
 
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
         if (args.size() != 1) {
-            CommandHandler.sendMessage(sender, translate(sender, "commands.setFetterLevel.usage"));
+            sendUsageMessage(sender);
             return;
         }
 

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

@@ -1,205 +1,205 @@
-package emu.grasscutter.command.commands;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.PlayerProperty;
-import emu.grasscutter.game.tower.TowerLevelRecord;
-
-@Command(label = "setprop", usage = "setprop|prop <prop> <value>", aliases = {"prop"}, permission = "player.setprop", permissionTargeted = "player.setprop.others", description = "commands.setProp.description")
-public final class SetPropCommand implements CommandHandler {
-    static enum PseudoProp {
-        NONE,
-        WORLD_LEVEL,
-        TOWER_LEVEL,
-        BP_LEVEL,
-        GOD_MODE,
-        NO_STAMINA,
-        UNLIMITED_ENERGY
-    }
-
-    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;
-        }
-    }
-    
-    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("nostamina", PseudoProp.NO_STAMINA);
-        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);
-    }
-
-    @Override
-    public void execute(Player sender, Player targetPlayer, List<String> args) {
-        if (args.size() != 2) {
-            CommandHandler.sendTranslatedMessage(sender, "commands.setProp.usage");
-            return;
-        }
-        String propStr = args.get(0).toLowerCase();
-        String valueStr = args.get(1).toLowerCase();
-        int value;
-        
-        if (!props.containsKey(propStr)) {
-            CommandHandler.sendTranslatedMessage(sender, "commands.setProp.usage");
-            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, NO_STAMINA, UNLIMITED_ENERGY -> this.setBool(sender, targetPlayer, prop.pseudoProp, value);
-            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
-                String min = Integer.toString(targetPlayer.getPropertyMin(prop.prop));
-                String max = Integer.toString(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().getTowerScheduleManager().getAllFloors();
-        if (topFloor < 0 || topFloor > floorIds.size()) {
-            String min = Integer.toString(0);
-            String max = Integer.toString(floorIds.size());
-            CommandHandler.sendTranslatedMessage(sender, "commands.generic.invalid.value_between", "Tower Level", min, max);
-            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())) {
-            if (recordMap.containsKey(floor)) {
-                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.inGodmode();
-            case NO_STAMINA -> targetPlayer.getUnlimitedStamina();
-            case UNLIMITED_ENERGY -> !targetPlayer.getEnergyManager().getEnergyUsage();
-            default -> false;
-        };
-        enabled = switch (value) {
-            case -1 -> !enabled;
-            case 0 -> false;
-            default -> true;
-        };
-
-        switch (pseudoProp) {
-            case GOD_MODE:
-                targetPlayer.setGodmode(enabled);
-                break;
-            case NO_STAMINA:
-                targetPlayer.setUnlimitedStamina(enabled);
-                break;
-            case UNLIMITED_ENERGY:
-                targetPlayer.getEnergyManager().setEnergyUsage(!enabled);
-                break;
-            default:
-                return false;
-        }
-        return true;
-    }
-}
+package emu.grasscutter.command.commands;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.PlayerProperty;
+import emu.grasscutter.game.tower.TowerLevelRecord;
+
+@Command(label = "setProp", aliases = {"prop"}, usage = {"<prop> <value>"}, permission = "player.setprop", permissionTargeted = "player.setprop.others")
+public final class SetPropCommand implements CommandHandler {
+    static enum PseudoProp {
+        NONE,
+        WORLD_LEVEL,
+        TOWER_LEVEL,
+        BP_LEVEL,
+        GOD_MODE,
+        NO_STAMINA,
+        UNLIMITED_ENERGY
+    }
+
+    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;
+        }
+    }
+
+    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("nostamina", PseudoProp.NO_STAMINA);
+        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);
+    }
+
+    @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, NO_STAMINA, UNLIMITED_ENERGY -> this.setBool(sender, targetPlayer, prop.pseudoProp, value);
+            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
+                String min = Integer.toString(targetPlayer.getPropertyMin(prop.prop));
+                String max = Integer.toString(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()) {
+            String min = Integer.toString(0);
+            String max = Integer.toString(floorIds.size());
+            CommandHandler.sendTranslatedMessage(sender, "commands.generic.invalid.value_between", "Tower Level", min, max);
+            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())) {
+            if (recordMap.containsKey(floor)) {
+                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.inGodmode();
+            case NO_STAMINA -> targetPlayer.getUnlimitedStamina();
+            case UNLIMITED_ENERGY -> !targetPlayer.getEnergyManager().getEnergyUsage();
+            default -> false;
+        };
+        enabled = switch (value) {
+            case -1 -> !enabled;
+            case 0 -> false;
+            default -> true;
+        };
+
+        switch (pseudoProp) {
+            case GOD_MODE:
+                targetPlayer.setGodmode(enabled);
+                break;
+            case NO_STAMINA:
+                targetPlayer.setUnlimitedStamina(enabled);
+                break;
+            case UNLIMITED_ENERGY:
+                targetPlayer.getEnergyManager().setEnergyUsage(!enabled);
+                break;
+            default:
+                return false;
+        }
+        return true;
+    }
+}

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

@@ -11,7 +11,7 @@ import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.FightProperty;
 import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
 
-@Command(label = "setstats", usage = "setstats|stats <stat> <value>", aliases = {"stats"}, permission = "player.setstats", permissionTargeted = "player.setstats.others", description = "commands.setStats.description")
+@Command(label = "setStats", aliases = {"stats", "stat"}, usage = {"<stat> <value>"}, permission = "player.setstats", permissionTargeted = "player.setstats.others")
 public final class SetStatsCommand implements CommandHandler {
     static class Stat {
         String name;
@@ -71,7 +71,7 @@ public final class SetStatsCommand implements CommandHandler {
             statStr = args.get(0).toLowerCase();
             valueStr = args.get(1);
         } else {
-            CommandHandler.sendTranslatedMessage(sender, "commands.setStats.usage");
+            sendUsageMessage(sender);
             return;
         }
 
@@ -105,7 +105,7 @@ public final class SetStatsCommand implements CommandHandler {
                 CommandHandler.sendTranslatedMessage(sender, "commands.generic.set_for_to", stat.name, uidStr, valueStr);
             }
         } else {
-            CommandHandler.sendTranslatedMessage(sender, "commands.setStats.usage");
+            sendUsageMessage(sender);
         }
         return;
     }

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

@@ -1,29 +1,28 @@
 package emu.grasscutter.command.commands;
 
-import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.excels.AvatarData;
 import emu.grasscutter.data.excels.GadgetData;
 import emu.grasscutter.data.excels.ItemData;
 import emu.grasscutter.data.excels.MonsterData;
-import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.entity.*;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.EntityType;
 import emu.grasscutter.game.props.FightProperty;
 import emu.grasscutter.utils.Position;
 import emu.grasscutter.game.world.Scene;
 
-import javax.swing.text.html.parser.Entity;
 import java.util.List;
-import java.util.Random;
 
-import static emu.grasscutter.Configuration.*;
+import static emu.grasscutter.config.Configuration.*;
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "spawn", usage = "spawn <entityId> [amount] [level(monster only)] [<x> <y> <z>(monster only, optional)]", aliases = {"drop"}, permission = "server.spawn", permissionTargeted = "server.spawn.others", description = "commands.spawn.description")
+@Command(
+    label = "spawn",
+    usage = {"spawn <entityId> [amount] [level(monster only)] [<x> <y> <z>(monster only)]"},
+    aliases = {"drop"},
+    permission = "server.spawn",
+    permissionTargeted = "server.spawn.others")
 public final class SpawnCommand implements CommandHandler {
 
     @Override
@@ -31,7 +30,7 @@ public final class SpawnCommand implements CommandHandler {
         int id = 0;  // This is just to shut up the linter, it's not a real default
         int amount = 1;
         int level = 1;
-		float x = 0, y = 0, z = 0;
+        float x = 0, y = 0, z = 0;
         switch (args.size()) {
             case 6:
                 try {
@@ -61,10 +60,10 @@ public final class SpawnCommand implements CommandHandler {
                 }
                 break;
             default:
-                CommandHandler.sendMessage(sender, translate(sender, "commands.spawn.usage"));
+                sendUsageMessage(sender);
                 return;
         }
-        
+
         MonsterData monsterData = GameData.getMonsterDataMap().get(id);
         GadgetData gadgetData = GameData.getGadgetDataMap().get(id);
         ItemData itemData = GameData.getItemDataMap().get(id);
@@ -72,21 +71,21 @@ public final class SpawnCommand implements CommandHandler {
             CommandHandler.sendMessage(sender, translate(sender, "commands.generic.invalid.entityId"));
             return;
         }
-       
+
         Scene scene = targetPlayer.getScene();
-        
+
         if (scene.getEntities().size() + amount > GAME_OPTIONS.sceneEntityLimit) {
-        	amount = Math.max(Math.min(GAME_OPTIONS.sceneEntityLimit - scene.getEntities().size(), amount), 0);
-        	CommandHandler.sendMessage(sender, translate(sender, "commands.spawn.limit_reached", amount));
-        	if (amount <= 0) {
-        		return;
-        	}
+            amount = Math.max(Math.min(GAME_OPTIONS.sceneEntityLimit - scene.getEntities().size(), amount), 0);
+            CommandHandler.sendMessage(sender, translate(sender, "commands.spawn.limit_reached", amount));
+            if (amount <= 0) {
+                return;
+            }
         }
 
         double maxRadius = Math.sqrt(amount * 0.2 / Math.PI);
         for (int i = 0; i < amount; i++) {
-            Position pos = GetRandomPositionInCircle(targetPlayer.getPos(), maxRadius).addY(3);
-            if(x != 0 && y != 0 && z != 0) {
+            Position pos = GetRandomPositionInCircle(targetPlayer.getPosition(), maxRadius).addY(3);
+            if (x != 0 && y != 0 && z != 0) {
                 pos = GetRandomPositionInCircle(new Position(x, y, z), maxRadius).addY(3);
             }
             GameEntity entity = null;
@@ -120,7 +119,7 @@ public final class SpawnCommand implements CommandHandler {
         CommandHandler.sendMessage(sender, translate(sender, "commands.spawn.success", Integer.toString(amount), Integer.toString(id)));
     }
 
-    private Position GetRandomPositionInCircle(Position origin, double radius){
+    private Position GetRandomPositionInCircle(Position origin, double radius) {
         Position target = origin.clone();
         double angle = Math.random() * 360;
         double r = Math.sqrt(Math.random() * radius * radius);

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

@@ -9,7 +9,7 @@ import java.util.List;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "stop", usage = "stop", permission = "server.stop", description = "commands.stop.description", targetRequirement = Command.TargetRequirement.NONE)
+@Command(label = "stop", permission = "server.stop", targetRequirement = Command.TargetRequirement.NONE)
 public final class StopCommand implements CommandHandler {
 
     @Override

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

@@ -1,6 +1,5 @@
 package emu.grasscutter.command.commands;
 
-import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.data.excels.AvatarSkillDepotData;
@@ -14,7 +13,11 @@ import java.util.List;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "talent", usage = "talent <talentId> <value>", permission = "player.settalent", permissionTargeted = "player.settalent.others", description = "commands.talent.description")
+@Command(
+    label = "talent",
+    usage = {"set <talentId> <level>", "(n|e|q) <level>", "getid"},
+    permission = "player.settalent",
+    permissionTargeted = "player.settalent.others")
 public final class TalentCommand implements CommandHandler {
     private void setTalentLevel(Player sender, Player player, Avatar avatar, int talentId, int talentLevel) {
         int oldLevel = avatar.getSkillLevelMap().get(talentId);
@@ -46,9 +49,7 @@ public final class TalentCommand implements CommandHandler {
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
         if (args.size() < 1){
-            CommandHandler.sendMessage(sender, translate(sender, "commands.talent.usage_1"));
-            CommandHandler.sendMessage(sender, translate(sender, "commands.talent.usage_2"));
-            CommandHandler.sendMessage(sender, translate(sender, "commands.talent.usage_3"));
+            sendUsageMessage(sender);
             return;
         }
 
@@ -57,15 +58,13 @@ public final class TalentCommand implements CommandHandler {
         String cmdSwitch = args.get(0);
         switch (cmdSwitch) {
             default -> {
-                CommandHandler.sendMessage(sender, translate(sender, "commands.talent.usage_1"));
-                CommandHandler.sendMessage(sender, translate(sender, "commands.talent.usage_2"));
-                CommandHandler.sendMessage(sender, translate(sender, "commands.talent.usage_3"));
+                sendUsageMessage(sender);
                 return;
             }
             case "set" -> {
                 if (args.size() < 3) {
-                    CommandHandler.sendMessage(sender, translate(sender, "commands.talent.usage_1"));
-                    CommandHandler.sendMessage(sender, translate(sender, "commands.talent.usage_3"));
+                    sendUsageMessage(sender);
+                    sendUsageMessage(sender);
                     return;
                 }
                 try {
@@ -79,7 +78,7 @@ public final class TalentCommand implements CommandHandler {
             }
             case "n", "e", "q" -> {
                 if (args.size() < 2) {
-                    CommandHandler.sendMessage(sender, translate(sender, "commands.talent.usage_2"));
+                    sendUsageMessage(sender);
                     return;
                 }
                 AvatarSkillDepotData SkillDepot = avatar.getData().getSkillDepot();

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

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

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

@@ -1,6 +1,5 @@
 package emu.grasscutter.command.commands;
 
-import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.game.player.Player;
@@ -11,7 +10,7 @@ import java.util.List;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "tpall", usage = "tpall", permission = "player.tpall", permissionTargeted = "player.tpall.others", description = "commands.teleportAll.description")
+@Command(label = "teleportAll", aliases = {"tpall"}, permission = "player.tpall", permissionTargeted = "player.tpall.others")
 public final class TeleportAllCommand implements CommandHandler {
 
     @Override
@@ -25,9 +24,9 @@ public final class TeleportAllCommand implements CommandHandler {
             if (player.equals(targetPlayer))
                 continue;
 
-            Position pos = targetPlayer.getPos();
+            Position pos = targetPlayer.getPosition();
             PlayerTeleportEvent event = new PlayerTeleportEvent(targetPlayer, PlayerTeleportEvent.TeleportType.COMMAND,
-                targetPlayer.getPos(), pos);
+                targetPlayer.getPosition(), pos);
             event.call();
 
             if(!event.isCanceled())

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

@@ -1,6 +1,5 @@
 package emu.grasscutter.command.commands;
 
-import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.game.player.Player;
@@ -11,7 +10,7 @@ import java.util.List;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "teleport", usage = "teleport <x> <y> <z> [sceneId]", aliases = {"tp"}, permission = "player.teleport", permissionTargeted = "player.teleport.others", description = "commands.teleport.description")
+@Command(label = "teleport", aliases = {"tp"}, usage = {"<x> <y> <z> [sceneId]"}, permission = "player.teleport", permissionTargeted = "player.teleport.others")
 public final class TeleportCommand implements CommandHandler {
 
     private float parseRelative(String input, Float current) {  // TODO: Maybe this will be useful elsewhere later
@@ -27,7 +26,7 @@ public final class TeleportCommand implements CommandHandler {
 
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
-        Position pos = targetPlayer.getPos();
+        Position pos = targetPlayer.getPosition();
         float x = pos.getX();
         float y = pos.getY();
         float z = pos.getZ();
@@ -50,7 +49,7 @@ public final class TeleportCommand implements CommandHandler {
                 }
                 break;
             default:
-                CommandHandler.sendMessage(sender, translate(sender, "commands.teleport.usage"));
+                sendUsageMessage(sender);
                 return;
         }
 

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

@@ -9,8 +9,6 @@ import emu.grasscutter.game.player.Player;
 
 @Command(
     label = "unban",
-    usage = "unban <@player>",
-    description = "commands.unban.description",
     permission = "server.ban",
     targetRequirement = Command.TargetRequirement.PLAYER
 )

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

@@ -0,0 +1,35 @@
+package emu.grasscutter.command.commands;
+
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.OpenState;
+import emu.grasscutter.server.packet.send.PacketOpenStateChangeNotify;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static emu.grasscutter.utils.Language.translate;
+
+@Command(label = "unlockall", usage = {""}, permission = "player.unlockall", permissionTargeted = "player.unlockall.others")
+public final class UnlockAllCommand implements CommandHandler {
+
+    @Override
+    public void execute(Player sender, Player targetPlayer, List<String> args) {
+        Map<Integer, Integer> changed = new HashMap<>();
+        
+        for (OpenState state : OpenState.values()) {
+            if (state == OpenState.OPEN_STATE_NONE || state == OpenState.OPEN_STATE_LIMIT_REGION_GLOBAL) continue;
+            
+            if (targetPlayer.getOpenStateManager().getOpenStateMap().getOrDefault(state.getValue(), 0) == 0) {
+                targetPlayer.getOpenStateManager().getOpenStateMap().put(state.getValue(), 1); 
+                changed.put(state.getValue(), 1);
+            }
+        }
+        
+        targetPlayer.sendPacket(new PacketOpenStateChangeNotify(changed));
+        
+        CommandHandler.sendMessage(sender, translate(sender, "commands.unlockall.success", targetPlayer.getNickname()));
+    }
+}

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

@@ -4,11 +4,10 @@ import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.ClimateType;
-import emu.grasscutter.game.world.Scene;
 
 import java.util.List;
 
-@Command(label = "weather", usage = "weather [weatherId] [climateType]", aliases = {"w"}, permission = "player.weather", permissionTargeted = "player.weather.others", description = "commands.weather.description")
+@Command(label = "weather", aliases = {"w"}, usage = {"weather [<weatherId>] [<climateType>]"}, permission = "player.weather", permissionTargeted = "player.weather.others")
 public final class WeatherCommand implements CommandHandler {
 
     @Override
@@ -31,7 +30,7 @@ public final class WeatherCommand implements CommandHandler {
                     weatherId = Integer.parseInt(arg);
                 } catch (NumberFormatException ignored) {
                     CommandHandler.sendTranslatedMessage(sender, "commands.generic.invalid.id");
-                    CommandHandler.sendTranslatedMessage(sender, "commands.weather.usage");
+                    sendUsageMessage(sender);
                     return;
                 }
             }

src/main/java/emu/grasscutter/config/ConfigContainer.java

@@ -1,4 +1,4 @@
-package emu.grasscutter.utils;
+package emu.grasscutter.config;
 
 import com.google.gson.JsonObject;
 import emu.grasscutter.Grasscutter;
@@ -28,7 +28,7 @@ public class ConfigContainer {
         try { // Check if the server is using a legacy config.
             JsonObject configObject = Grasscutter.getGsonFactory()
                     .fromJson(new FileReader(Grasscutter.configFile), JsonObject.class);
-            if(!configObject.has("version")) {
+            if (!configObject.has("version")) {
                 Grasscutter.getLogger().info("Updating legacy ..");
                 Grasscutter.saveConfig(null);
             }
@@ -37,7 +37,7 @@ public class ConfigContainer {
         var existing = config.version;
         var latest = version();
 
-        if(existing == latest)
+        if (existing == latest)
             return;
 
         // Create a new configuration instance.
@@ -93,9 +93,8 @@ public class ConfigContainer {
     }
 
     public static class Server {
-        public ServerDebugMode debugLevel = ServerDebugMode.NONE;
-        public Set<Integer> DebugWhitelist = Set.of();
-        public Set<Integer> DebugBlacklist = Set.of();
+        public Set<Integer> debugWhitelist = Set.of();
+        public Set<Integer> debugBlacklist = Set.of();
         public ServerRunMode runMode = ServerRunMode.HYBRID;
 
         public HTTP http = new HTTP();
@@ -112,6 +111,7 @@ public class ConfigContainer {
 
     public static class Account {
         public boolean autoCreate = false;
+        public boolean EXPERIMENTAL_RealPassword = false;
         public String[] defaultPermissions = {};
         public int maxPlayer = -1;
     }
@@ -120,10 +120,10 @@ public class ConfigContainer {
 
     public static class HTTP {
         public String bindAddress = "0.0.0.0";
+        public int bindPort = 443;
+        
         /* This is the address used in URLs. */
         public String accessAddress = "127.0.0.1";
-
-        public int bindPort = 443;
         /* This is the port used in URLs. */
         public int accessPort = 0;
 
@@ -134,16 +134,23 @@ public class ConfigContainer {
 
     public static class Game {
         public String bindAddress = "0.0.0.0";
+        public int bindPort = 22102;
+
         /* This is the address used in the default region. */
         public String accessAddress = "127.0.0.1";
-
-        public int bindPort = 22102;
         /* This is the port used in the default region. */
         public int accessPort = 0;
+
         /* Entities within a certain range will be loaded for the player */
         public int loadEntitiesForPlayerRange = 100;
         public boolean enableScriptInBigWorld = false;
         public boolean enableConsole = true;
+        
+        /* Kcp internal work interval (milliseconds) */
+        public int kcpInterval = 20;
+        /* Controls whether packets should be logged in console or not */
+        public ServerDebugMode logPackets = ServerDebugMode.NONE;
+
         public GameOptions gameOptions = new GameOptions();
         public JoinOptions joinOptions = new JoinOptions();
         public ConsoleAccount serverAccount = new ConsoleAccount();
@@ -155,6 +162,8 @@ public class ConfigContainer {
         public Region[] regions = {};
 
         public String defaultName = "Grasscutter";
+
+        public ServerDebugMode logRequests = ServerDebugMode.NONE;
     }
 
     public static class Encryption {

src/main/java/emu/grasscutter/config/Configuration.java

@@ -1,9 +1,7 @@
-package emu.grasscutter;
-
-import emu.grasscutter.utils.ConfigContainer;
-import emu.grasscutter.utils.ConfigContainer.*;
+package emu.grasscutter.config;
 
 import java.util.Locale;
+
 import java.nio.file.Paths;
 
 import static emu.grasscutter.Grasscutter.config;
@@ -11,19 +9,19 @@ import static emu.grasscutter.Grasscutter.config;
 
 /**
  * A data container for the server's configuration.
- * 
+ *
  * Use `import static emu.grasscutter.Configuration.*;`
  * to import all configuration constants.
  */
 public final class Configuration extends ConfigContainer {
-    
+
     /*
      * Constants
      */
-    
+
     // 'c' is short for 'config' and makes code look 'cleaner'.
     public static final ConfigContainer c = config;
-    
+
     public static final Locale LANGUAGE = config.language.language;
     public static final Locale FALLBACK_LANGUAGE = config.language.fallback;
     public static final String DOCUMENT_LANGUAGE = config.language.document;
@@ -32,22 +30,22 @@ public final class Configuration extends ConfigContainer {
     private static final String PLUGINS_FOLDER = config.folderStructure.plugins;
     private static final String SCRIPTS_FOLDER = config.folderStructure.scripts;
     private static final String PACKETS_FOLDER = config.folderStructure.packets;
-    
+
     public static final Server SERVER = config.server;
     public static final Database DATABASE = config.databaseInfo;
     public static final Account ACCOUNT = config.account;
-    
+
     public static final HTTP HTTP_INFO = config.server.http;
     public static final Game GAME_INFO = config.server.game;
     public static final Dispatch DISPATCH_INFO = config.server.dispatch;
-    
+
     public static final Encryption HTTP_ENCRYPTION = config.server.http.encryption;
     public static final Policies HTTP_POLICIES = config.server.http.policies;
     public static final Files HTTP_STATIC_FILES = config.server.http.files;
-    
+
     public static final GameOptions GAME_OPTIONS = config.server.game.gameOptions;
     public static final GameOptions.InventoryLimits INVENTORY_LIMITS = config.server.game.gameOptions.inventoryLimits;
-    
+
     /*
      * Utilities
      */
@@ -58,11 +56,11 @@ public final class Configuration extends ConfigContainer {
     public static String DATA(String path) {
         return Paths.get(DATA_FOLDER, path).toString();
     }
-    
+
     public static String RESOURCE(String path) {
         return Paths.get(RESOURCES_FOLDER, path).toString();
     }
-    
+
     public static String PLUGIN() {
         return PLUGINS_FOLDER;
     }

src/main/java/emu/grasscutter/data/DataLoader.java

@@ -6,14 +6,16 @@ import emu.grasscutter.tools.Tools;
 import emu.grasscutter.utils.FileUtils;
 import emu.grasscutter.utils.Utils;
 
+import static emu.grasscutter.config.Configuration.DATA;
+
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.nio.file.Path;
 import java.util.List;
 
-import static emu.grasscutter.Configuration.DATA;
-
 public class DataLoader {
 
     /**
@@ -28,6 +30,24 @@ public class DataLoader {
         return load(resourcePath, true);
     }
 
+    /**
+     * Creates an input stream reader for a data file. If the file isn't found within the /data directory then it will fallback to the default within the jar resources
+     *
+     * @param resourcePath The path to the data file to be loaded.
+     * @return InputStreamReader of the data file.
+     * @throws IOException
+     * @throws FileNotFoundException
+     * @see #load(String, boolean)
+     */
+    public static InputStreamReader loadReader(String resourcePath) throws IOException, FileNotFoundException {
+        try {
+            InputStream is = load(resourcePath, true);
+            return new InputStreamReader(is);
+        } catch (FileNotFoundException exception) {
+            throw exception;
+        }
+    }
+
     /**
      * Load a data file by its name.
      *
@@ -49,7 +69,7 @@ public class DataLoader {
         return null;
     }
 
-    public static void CheckAllFiles() {
+    public static void checkAllFiles() {
         try {
             List<Path> filenames = FileUtils.getPathsFromResource("/defaults/data/");
 
@@ -58,16 +78,16 @@ public class DataLoader {
             } else for (Path file : filenames) {
                 String relativePath = String.valueOf(file).split("defaults[\\\\\\/]data[\\\\\\/]")[1];
 
-                CheckAndCopyData(relativePath);
+                checkAndCopyData(relativePath);
             }
         } catch (Exception e) {
             Grasscutter.getLogger().error("An error occurred while trying to check the data folder.", e);
         }
 
-        GenerateGachaMappings();
+        generateGachaMappings();
     }
 
-    private static void CheckAndCopyData(String name) {
+    private static void checkAndCopyData(String name) {
         String filePath = Utils.toFilePath(DATA(name));
 
         if (!Utils.fileExists(filePath)) {
@@ -93,7 +113,7 @@ public class DataLoader {
         }
     }
 
-    private static void GenerateGachaMappings() {
+    private static void generateGachaMappings() {
         if (!Utils.fileExists(GachaHandler.gachaMappings)) {
             try {
                 Grasscutter.getLogger().info("Creating default '" + GachaHandler.gachaMappings + "' data");

src/main/java/emu/grasscutter/data/GameData.java

@@ -76,6 +76,7 @@ public class GameData {
 	private static final ArrayList<CodexReliquaryData> codexReliquaryArrayList = new ArrayList<>();
 	private static final Int2ObjectMap<FetterCharacterCardData> fetterCharacterCardDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<RewardData> rewardDataMap = new Int2ObjectOpenHashMap<>();
+	
 	private static final Int2ObjectMap<WorldAreaData> worldAreaDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<WorldLevelData> worldLevelDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<DailyDungeonData> dailyDungeonDataMap = new Int2ObjectOpenHashMap<>();
@@ -90,6 +91,7 @@ public class GameData {
 	private static final Int2ObjectMap<TowerFloorData> towerFloorDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<TowerLevelData> towerLevelDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<TowerScheduleData> towerScheduleDataMap = new Int2ObjectOpenHashMap<>();
+	private static final Int2ObjectMap<BuffData> buffDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<ForgeData> forgeDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<HomeWorldLevelData> homeWorldLevelDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<FurnitureMakeConfigData> furnitureMakeConfigDataMap = new Int2ObjectOpenHashMap<>();
@@ -448,4 +450,8 @@ public class GameData {
 	public static Int2ObjectMap<CookBonusData> getCookBonusDataMap() {
 		return cookBonusDataMap;
 	}
+
+    public static Int2ObjectMap<BuffData> getBuffDataMap() {
+        return buffDataMap;
+    }
 }

src/main/java/emu/grasscutter/data/GameDepot.java

@@ -5,80 +5,78 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.danilopianini.util.FlexibleQuadTree;
-import org.danilopianini.util.SpatialIndex;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.ResourceLoader.AvatarConfig;
-import emu.grasscutter.data.ResourceLoader.AvatarConfigAbility;
 import emu.grasscutter.data.excels.ReliquaryAffixData;
 import emu.grasscutter.data.excels.ReliquaryMainPropData;
 import emu.grasscutter.game.world.SpawnDataEntry;
-import emu.grasscutter.game.world.SpawnDataEntry.SpawnGroupEntry;
 import emu.grasscutter.utils.WeightedList;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
 public class GameDepot {
+    public static final int[] BLOCK_SIZE = new int[]{50,500};//Scales
+
     private static Int2ObjectMap<WeightedList<ReliquaryMainPropData>> relicRandomMainPropDepot = new Int2ObjectOpenHashMap<>();
     private static Int2ObjectMap<List<ReliquaryMainPropData>> relicMainPropDepot = new Int2ObjectOpenHashMap<>();
     private static Int2ObjectMap<List<ReliquaryAffixData>> relicAffixDepot = new Int2ObjectOpenHashMap<>();
-	
-	private static Map<String, AvatarConfig> playerAbilities = new HashMap<>();
-	private static Int2ObjectMap<SpatialIndex<SpawnGroupEntry>> spawnLists = new Int2ObjectOpenHashMap<>();
-	
-	public static void load() {
-		for (ReliquaryMainPropData data : GameData.getReliquaryMainPropDataMap().values()) {
-			if (data.getWeight() <= 0 || data.getPropDepotId() <= 0) {
-				continue;
-			}
+
+    private static Map<String, AvatarConfig> playerAbilities = new HashMap<>();
+    private static HashMap<SpawnDataEntry.GridBlockId, ArrayList<SpawnDataEntry>> spawnLists = new HashMap<>();
+
+    public static void load() {
+        for (ReliquaryMainPropData data : GameData.getReliquaryMainPropDataMap().values()) {
+            if (data.getWeight() <= 0 || data.getPropDepotId() <= 0) {
+                continue;
+            }
             List<ReliquaryMainPropData> list = relicMainPropDepot.computeIfAbsent(data.getPropDepotId(), k -> new ArrayList<>());
             list.add(data);
             WeightedList<ReliquaryMainPropData> weightedList = relicRandomMainPropDepot.computeIfAbsent(data.getPropDepotId(), k -> new WeightedList<>());
             weightedList.add(data.getWeight(), data);
-		}
-		for (ReliquaryAffixData data : GameData.getReliquaryAffixDataMap().values()) {
-			if (data.getWeight() <= 0 || data.getDepotId() <= 0) {
-				continue;
-			}
-			List<ReliquaryAffixData> list = relicAffixDepot.computeIfAbsent(data.getDepotId(), k -> new ArrayList<>());
-			list.add(data);
-		}
-		// Let the server owner know if theyre missing weights
-		if (relicMainPropDepot.size() == 0 || relicAffixDepot.size() == 0) {
-			Grasscutter.getLogger().error("Relic properties are missing weights! Please check your ReliquaryMainPropExcelConfigData or ReliquaryAffixExcelConfigData files in your ExcelBinOutput folder.");
-		}
-	}
-	
-	public static ReliquaryMainPropData getRandomRelicMainProp(int depot) {
+        }
+        for (ReliquaryAffixData data : GameData.getReliquaryAffixDataMap().values()) {
+            if (data.getWeight() <= 0 || data.getDepotId() <= 0) {
+                continue;
+            }
+            List<ReliquaryAffixData> list = relicAffixDepot.computeIfAbsent(data.getDepotId(), k -> new ArrayList<>());
+            list.add(data);
+        }
+        // Let the server owner know if theyre missing weights
+        if (relicMainPropDepot.size() == 0 || relicAffixDepot.size() == 0) {
+            Grasscutter.getLogger().error("Relic properties are missing weights! Please check your ReliquaryMainPropExcelConfigData or ReliquaryAffixExcelConfigData files in your ExcelBinOutput folder.");
+        }
+    }
+
+    public static ReliquaryMainPropData getRandomRelicMainProp(int depot) {
         WeightedList<ReliquaryMainPropData> depotList = relicRandomMainPropDepot.get(depot);
-		if (depotList == null) {
-			return null;
-		}
-		return depotList.next();
-	}
-	
+        if (depotList == null) {
+            return null;
+        }
+        return depotList.next();
+    }
+
     public static List<ReliquaryMainPropData> getRelicMainPropList(int depot) {
         return relicMainPropDepot.get(depot);
     }
 
     public static List<ReliquaryAffixData> getRelicAffixList(int depot) {
-		return relicAffixDepot.get(depot);
-	}
-	
-	public static Int2ObjectMap<SpatialIndex<SpawnGroupEntry>> getSpawnLists() {
-		return spawnLists;
-	}
-	
-	public static SpatialIndex<SpawnGroupEntry> getSpawnListById(int sceneId) {
-		return getSpawnLists().computeIfAbsent(sceneId, id -> new FlexibleQuadTree<>());
-	}
+        return relicAffixDepot.get(depot);
+    }
 
-	public static Map<String, AvatarConfig> getPlayerAbilities() {
-		return playerAbilities;
-	}
+    public static HashMap<SpawnDataEntry.GridBlockId, ArrayList<SpawnDataEntry>> getSpawnLists() {
+        return spawnLists;
+    }
 
-	public static void setPlayerAbilities(Map<String, AvatarConfig> playerAbilities) {
-		GameDepot.playerAbilities = playerAbilities;
-	}
+    public static void addSpawnListById(HashMap<SpawnDataEntry.GridBlockId, ArrayList<SpawnDataEntry>> data) {
+        spawnLists.putAll(data);
+    }
+
+    public static void setPlayerAbilities(Map<String, AvatarConfig> playerAbilities) {
+        GameDepot.playerAbilities = playerAbilities;
+    }
+
+    public static Map<String, AvatarConfig> getPlayerAbilities() {
+        return playerAbilities;
+    }
 }

src/main/java/emu/grasscutter/data/ResourceLoader.java

@@ -9,8 +9,8 @@ import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.google.gson.Gson;
 import emu.grasscutter.data.binout.*;
+import emu.grasscutter.game.world.SpawnDataEntry;
 import emu.grasscutter.scripts.SceneIndexManager;
 import emu.grasscutter.utils.Utils;
 import lombok.SneakyThrows;
@@ -28,464 +28,468 @@ import emu.grasscutter.data.common.PointData;
 import emu.grasscutter.data.common.ScenePointConfig;
 import emu.grasscutter.game.world.SpawnDataEntry.*;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
-import static emu.grasscutter.Configuration.*;
+import static emu.grasscutter.config.Configuration.*;
 import static emu.grasscutter.utils.Language.translate;
 
 public class ResourceLoader {
 
-	private static final List<String> loadedResources = new ArrayList<>();
+    private static final List<String> loadedResources = new ArrayList<>();
 
-	public static List<Class<?>> getResourceDefClasses() {
-		Reflections reflections = new Reflections(ResourceLoader.class.getPackage().getName());
-		Set<?> classes = reflections.getSubTypesOf(GameResource.class);
+    public static List<Class<?>> getResourceDefClasses() {
+        Reflections reflections = new Reflections(ResourceLoader.class.getPackage().getName());
+        Set<?> classes = reflections.getSubTypesOf(GameResource.class);
 
-		List<Class<?>> classList = new ArrayList<>(classes.size());
-		classes.forEach(o -> {
-			Class<?> c = (Class<?>) o;
-			if (c.getAnnotation(ResourceType.class) != null) {
-				classList.add(c);
-			}
-		});
+        List<Class<?>> classList = new ArrayList<>(classes.size());
+        classes.forEach(o -> {
+            Class<?> c = (Class<?>) o;
+            if (c.getAnnotation(ResourceType.class) != null) {
+                classList.add(c);
+            }
+        });
 
-		classList.sort((a, b) -> b.getAnnotation(ResourceType.class).loadPriority().value() - a.getAnnotation(ResourceType.class).loadPriority().value());
+        classList.sort((a, b) -> b.getAnnotation(ResourceType.class).loadPriority().value() - a.getAnnotation(ResourceType.class).loadPriority().value());
 
-		return classList;
-	}
+        return classList;
+    }
 
-	public static void loadAll() {
+    public static void loadAll() {
         Grasscutter.getLogger().info(translate("messages.status.resources.loading"));
 
-		// Load ability lists
-		loadAbilityEmbryos();
-		loadOpenConfig();
-		loadAbilityModifiers();
-		// Load resources
-		loadResources();
-		// Process into depots
-		GameDepot.load();
-		// Load spawn data and quests
-		loadSpawnData();
-		loadQuests();
-		// Load scene points - must be done AFTER resources are loaded
-		loadScenePoints();
-		// Load default home layout
-		loadHomeworldDefaultSaveData();
-		loadNpcBornData();
+        // Load ability lists
+        loadAbilityEmbryos();
+        loadOpenConfig();
+        loadAbilityModifiers();
+        // Load resources
+        loadResources();
+        // Process into depots
+        GameDepot.load();
+        // Load spawn data and quests
+        loadSpawnData();
+        loadQuests();
+        // Load scene points - must be done AFTER resources are loaded
+        loadScenePoints();
+        // Load default home layout
+        loadHomeworldDefaultSaveData();
+        loadNpcBornData();
 
         Grasscutter.getLogger().info(translate("messages.status.resources.finish"));
-	}
+    }
 
-	public static void loadResources() {
-		loadResources(false);
-	}
+    public static void loadResources() {
+        loadResources(false);
+    }
 
-	public static void loadResources(boolean doReload) {
-		for (Class<?> resourceDefinition : getResourceDefClasses()) {
-			ResourceType type = resourceDefinition.getAnnotation(ResourceType.class);
+    public static void loadResources(boolean doReload) {
+        for (Class<?> resourceDefinition : getResourceDefClasses()) {
+            ResourceType type = resourceDefinition.getAnnotation(ResourceType.class);
 
-			if (type == null) {
-				continue;
-			}
+            if (type == null) {
+                continue;
+            }
 
-			@SuppressWarnings("rawtypes")
-			Int2ObjectMap map = GameData.getMapByResourceDef(resourceDefinition);
+            @SuppressWarnings("rawtypes")
+            Int2ObjectMap map = GameData.getMapByResourceDef(resourceDefinition);
 
-			if (map == null) {
-				continue;
-			}
+            if (map == null) {
+                continue;
+            }
 
-			try {
-				loadFromResource(resourceDefinition, type, map, doReload);
-			} catch (Exception e) {
-				Grasscutter.getLogger().error("Error loading resource file: " + Arrays.toString(type.name()), e);
-			}
-		}
-	}
+            try {
+                loadFromResource(resourceDefinition, type, map, doReload);
+            } catch (Exception e) {
+                Grasscutter.getLogger().error("Error loading resource file: " + Arrays.toString(type.name()), e);
+            }
+        }
+    }
 
-	@SuppressWarnings("rawtypes")
-	protected static void loadFromResource(Class<?> c, ResourceType type, Int2ObjectMap map, boolean doReload) throws Exception {
-		if(!loadedResources.contains(c.getSimpleName()) || doReload) {
-			for (String name : type.name()) {
-				loadFromResource(c, name, map);
-			}
-			loadedResources.add(c.getSimpleName());
+    @SuppressWarnings("rawtypes")
+    protected static void loadFromResource(Class<?> c, ResourceType type, Int2ObjectMap map, boolean doReload) throws Exception {
+        if (!loadedResources.contains(c.getSimpleName()) || doReload) {
+            for (String name : type.name()) {
+                loadFromResource(c, name, map);
+            }
+            loadedResources.add(c.getSimpleName());
             Grasscutter.getLogger().debug("Loaded " + map.size() + " " + c.getSimpleName() + "s.");
-		}
-	}
-
-	@SuppressWarnings({"rawtypes", "unchecked"})
-	protected static void loadFromResource(Class<?> c, String fileName, Int2ObjectMap map) throws Exception {
-		try (FileReader fileReader = new FileReader(RESOURCE("ExcelBinOutput/" + fileName))) {
-			List list = Grasscutter.getGsonFactory().fromJson(fileReader, TypeToken.getParameterized(Collection.class, c).getType());
-
-			for (Object o : list) {
-				GameResource res = (GameResource) o;
-				res.onLoad();
-				map.put(res.getId(), res);
-			}
-		}
-	}
-
-	private static void loadScenePoints() {
-		Pattern pattern = Pattern.compile("(?<=scene)(.*?)(?=_point.json)");
-		File folder = new File(RESOURCE("BinOutput/Scene/Point"));
-
-		if (!folder.isDirectory() || !folder.exists() || folder.listFiles() == null) {
-			Grasscutter.getLogger().error("Scene point files cannot be found, you cannot use teleport waypoints!");
-			return;
-		}
-
-		List<ScenePointEntry> scenePointList = new ArrayList<>();
-		for (File file : Objects.requireNonNull(folder.listFiles())) {
-			ScenePointConfig config; Integer sceneId;
-
-			Matcher matcher = pattern.matcher(file.getName());
-			if (matcher.find()) {
-				sceneId = Integer.parseInt(matcher.group(1));
-			} else {
-				continue;
-			}
-
-			try (FileReader fileReader = new FileReader(file)) {
-				config = Grasscutter.getGsonFactory().fromJson(fileReader, ScenePointConfig.class);
-			} catch (Exception e) {
-				e.printStackTrace();
-				continue;
-			}
-
-			if (config.points == null) {
-				continue;
-			}
-
-			for (Map.Entry<String, JsonElement> entry : config.points.entrySet()) {
-				PointData pointData = Grasscutter.getGsonFactory().fromJson(entry.getValue(), PointData.class);
-				pointData.setId(Integer.parseInt(entry.getKey()));
-
-				ScenePointEntry sl = new ScenePointEntry(sceneId + "_" + entry.getKey(), pointData);
-				scenePointList.add(sl);
-				GameData.getScenePointIdList().add(pointData.getId());
-
-				pointData.updateDailyDungeon();
-			}
-
-			for (ScenePointEntry entry : scenePointList) {
-				GameData.getScenePointEntries().put(entry.getName(), entry);
-			}
-		}
-	}
-
-	private static void loadAbilityEmbryos() {
-		List<AbilityEmbryoEntry> embryoList = null;
-
-		// Read from cached file if exists
-		try (InputStream embryoCache = DataLoader.load("AbilityEmbryos.json", false)) {
-			embryoList = Grasscutter.getGsonFactory().fromJson(new InputStreamReader(embryoCache), TypeToken.getParameterized(Collection.class, AbilityEmbryoEntry.class).getType());
-		} catch (Exception ignored) {}
-
-		if(embryoList == null) {
-			// Load from BinOutput
-			Pattern pattern = Pattern.compile("(?<=ConfigAvatar_)(.*?)(?=.json)");
-
-			embryoList = new LinkedList<>();
-			File folder = new File(Utils.toFilePath(RESOURCE("BinOutput/Avatar/")));
-			File[] files = folder.listFiles();
-			if(files == null) {
-				Grasscutter.getLogger().error("Error loading ability embryos: no files found in " + folder.getAbsolutePath());
-				return;
-			}
-
-			for (File file : files) {
-				AvatarConfig config;
-				String avatarName;
-
-				Matcher matcher = pattern.matcher(file.getName());
-				if (matcher.find()) {
-					avatarName = matcher.group(0);
-				} else {
-					continue;
-				}
-
-				try (FileReader fileReader = new FileReader(file)) {
-					config = Grasscutter.getGsonFactory().fromJson(fileReader, AvatarConfig.class);
-				} catch (Exception e) {
-					e.printStackTrace();
-					continue;
-				}
-
-				if (config.abilities == null) {
-					continue;
-				}
-
-				int s = config.abilities.size();
-				AbilityEmbryoEntry al = new AbilityEmbryoEntry(avatarName, config.abilities.stream().map(Object::toString).toArray(size -> new String[s]));
-				embryoList.add(al);
-			}
-
-			File playerElementsFile = new File(Utils.toFilePath(RESOURCE("BinOutput/AbilityGroup/AbilityGroup_Other_PlayerElementAbility.json")));
-
-			if (playerElementsFile.exists()) {
-				try (FileReader fileReader = new FileReader(playerElementsFile)) {
-					GameDepot.setPlayerAbilities(Grasscutter.getGsonFactory().fromJson(fileReader, new TypeToken<Map<String, AvatarConfig>>(){}.getType()));
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-		}
-
-		if (embryoList == null || embryoList.isEmpty()) {
-			Grasscutter.getLogger().error("No embryos loaded!");
-			return;
-		}
-
-		for (AbilityEmbryoEntry entry : embryoList) {
-			GameData.getAbilityEmbryoInfo().put(entry.getName(), entry);
-		}
-	}
-
-	private static void loadAbilityModifiers() {
-		// Load from BinOutput
-		File folder = new File(Utils.toFilePath(RESOURCE("BinOutput/Ability/Temp/AvatarAbilities/")));
-		File[] files = folder.listFiles();
-		if (files == null) {
-			Grasscutter.getLogger().error("Error loading ability modifiers: no files found in " + folder.getAbsolutePath());
-			return;
-		}
-
-		for (File file : files) {
-			List<AbilityConfigData> abilityConfigList;
-
-			try (FileReader fileReader = new FileReader(file)) {
-				abilityConfigList = Grasscutter.getGsonFactory().fromJson(fileReader, TypeToken.getParameterized(Collection.class, AbilityConfigData.class).getType());
-			} catch (Exception e) {
-				e.printStackTrace();
-				continue;
-			}
-
-			for (AbilityConfigData data : abilityConfigList) {
-				if (data.Default.modifiers == null || data.Default.modifiers.size() == 0) {
-					continue;
-				}
-
-				AbilityModifierEntry modifierEntry = new AbilityModifierEntry(data.Default.abilityName);
-
-				for (Entry<String, AbilityModifier> entry : data.Default.modifiers.entrySet()) {
-					AbilityModifier modifier = entry.getValue();
-
-					// Stare.
-					if (modifier.onAdded != null) {
-						for (AbilityModifierAction action : modifier.onAdded) {
-							if (action.$type.contains("HealHP")) {
-								action.type = AbilityModifierActionType.HealHP;
-								modifierEntry.getOnAdded().add(action);
-							}
-						}
-					}
-
-					if (modifier.onThinkInterval != null) {
-						for (AbilityModifierAction action : modifier.onThinkInterval) {
-							if (action.$type.contains("HealHP")) {
-								action.type = AbilityModifierActionType.HealHP;
-								modifierEntry.getOnThinkInterval().add(action);
-							}
-						}
-					}
-
-					if (modifier.onRemoved != null) {
-						for (AbilityModifierAction action : modifier.onRemoved) {
-							if (action.$type.contains("HealHP")) {
-								action.type = AbilityModifierActionType.HealHP;
-								modifierEntry.getOnRemoved().add(action);
-							}
-						}
-					}
-				}
-
-				GameData.getAbilityModifiers().put(modifierEntry.getName(), modifierEntry);
-			}
-		}
-	}
-
-	private static void loadSpawnData() {
-		String[] spawnDataNames = {"Spawns.json", "GadgetSpawns.json"};
-		Int2ObjectMap<SpawnGroupEntry> spawnEntryMap = new Int2ObjectOpenHashMap<>();
-
-		for (String name : spawnDataNames) {
-			// Load spawn entries from file
-			try (InputStream spawnDataEntries = DataLoader.load(name)) {
-				Type type = TypeToken.getParameterized(Collection.class, SpawnGroupEntry.class).getType();
-				List<SpawnGroupEntry> list = Grasscutter.getGsonFactory().fromJson(new InputStreamReader(spawnDataEntries), type);
-				
-				// Add spawns to group if it already exists in our spawn group map
-				for (SpawnGroupEntry group : list) {
-					if (spawnEntryMap.containsKey(group.getGroupId())) {
-						spawnEntryMap.get(group.getGroupId()).getSpawns().addAll(group.getSpawns());
-					} else {
-						spawnEntryMap.put(group.getGroupId(), group);
-					}
-				}
-			} catch (Exception ignored) {}
-		}
-		
-		if (spawnEntryMap.isEmpty()) {
-			Grasscutter.getLogger().error("No spawn data loaded!");
-			return;
-		}
-
-		for (SpawnGroupEntry entry : spawnEntryMap.values()) {
-			entry.getSpawns().forEach(s -> s.setGroup(entry));
-			GameDepot.getSpawnListById(entry.getSceneId()).insert(entry, entry.getPos().getX(), entry.getPos().getZ());
-		}
-	}
-
-	private static void loadOpenConfig() {
-		// Read from cached file if exists
-		List<OpenConfigEntry> list = null;
-
-		try(InputStream openConfigCache = DataLoader.load("OpenConfig.json", false)) {
-			list = Grasscutter.getGsonFactory().fromJson(new InputStreamReader(openConfigCache), TypeToken.getParameterized(Collection.class, SpawnGroupEntry.class).getType());
-		} catch (Exception ignored) {}
-
-		if (list == null) {
-			Map<String, OpenConfigEntry> map = new TreeMap<>();
-			java.lang.reflect.Type type = new TypeToken<Map<String, OpenConfigData[]>>() {}.getType();
-			String[] folderNames = {"BinOutput/Talent/EquipTalents/", "BinOutput/Talent/AvatarTalents/"};
-
-			for (String name : folderNames) {
-				File folder = new File(Utils.toFilePath(RESOURCE(name)));
-				File[] files = folder.listFiles();
-				if(files == null) {
-					Grasscutter.getLogger().error("Error loading open config: no files found in " + folder.getAbsolutePath()); return;
-				}
-
-				for (File file : files) {
-					if (!file.getName().endsWith(".json")) {
-						continue;
-					}
-
-					Map<String, OpenConfigData[]> config;
-
-					try (FileReader fileReader = new FileReader(file)) {
-						config = Grasscutter.getGsonFactory().fromJson(fileReader, type);
-					} catch (Exception e) {
-						e.printStackTrace();
-						continue;
-					}
-
-					for (Entry<String, OpenConfigData[]> e : config.entrySet()) {
-						OpenConfigEntry entry = new OpenConfigEntry(e.getKey(), e.getValue());
-						map.put(entry.getName(), entry);
-					}
-				}
-			}
-
-			list = new ArrayList<>(map.values());
-		}
-
-		if (list == null || list.isEmpty()) {
-			Grasscutter.getLogger().error("No openconfig entries loaded!");
-			return;
-		}
-
-		for (OpenConfigEntry entry : list) {
-			GameData.getOpenConfigEntries().put(entry.getName(), entry);
-		}
-	}
-
-	private static void loadQuests() {
-		File folder = new File(RESOURCE("BinOutput/Quest/"));
-
-		if (!folder.exists()) {
-			return;
-		}
-
-		for (File file : folder.listFiles()) {
-			MainQuestData mainQuest = null;
-
-			try (FileReader fileReader = new FileReader(file)) {
-				mainQuest = Grasscutter.getGsonFactory().fromJson(fileReader, MainQuestData.class);
-			} catch (Exception e) {
-				e.printStackTrace();
-				continue;
-			}
-
-			GameData.getMainQuestDataMap().put(mainQuest.getId(), mainQuest);
-		}
-
-		Grasscutter.getLogger().debug("Loaded " + GameData.getMainQuestDataMap().size() + " MainQuestDatas.");
-	}
-
-	@SneakyThrows
-	private static void loadHomeworldDefaultSaveData(){
-		var folder = Files.list(Path.of(RESOURCE("BinOutput/HomeworldDefaultSave"))).toList();
-		var pattern = Pattern.compile("scene(.*)_home_config.json");
-
-		for(var file : folder){
-			var matcher = pattern.matcher(file.getFileName().toString());
-			if(!matcher.find()){
-				continue;
-			}
-			var sceneId = matcher.group(1);
-
-			var data = Grasscutter.getGsonFactory().fromJson(Files.readString(file), HomeworldDefaultSaveData.class);
-
-			GameData.getHomeworldDefaultSaveData().put(Integer.parseInt(sceneId), data);
-		}
-
-		Grasscutter.getLogger().debug("Loaded " + GameData.getHomeworldDefaultSaveData().size() + " HomeworldDefaultSaveDatas.");
-	}
-
-	@SneakyThrows
-	private static void loadNpcBornData(){
-		var folder = Files.list(Path.of(RESOURCE("BinOutput/Scene/SceneNpcBorn"))).toList();
-
-		for(var file : folder){
-			if(file.toFile().isDirectory()){
-				continue;
-			}
-
-			var data = Grasscutter.getGsonFactory().fromJson(Files.readString(file), SceneNpcBornData.class);
-			if(data.getBornPosList() == null || data.getBornPosList().size() == 0){
-				continue;
-			}
-
-			data.setIndex(SceneIndexManager.buildIndex(3, data.getBornPosList(), item -> item.getPos().toPoint()));
-			GameData.getSceneNpcBornData().put(data.getSceneId(), data);
-		}
-
-		Grasscutter.getLogger().debug("Loaded " + GameData.getSceneNpcBornData().size() + " SceneNpcBornDatas.");
-	}
-
-	// BinOutput configs
-
-	public static class AvatarConfig {
-		@SerializedName(value="abilities", alternate={"targetAbilities"})
-		public ArrayList<AvatarConfigAbility> abilities;
-	}
-
-	public static class AvatarConfigAbility {
-		public String abilityName;
-		public String toString() {
-			return abilityName;
-		}
-	}
-
-	private static class OpenConfig {
-		public OpenConfigData[] data;
-	}
-
-	public static class OpenConfigData {
-		public String $type;
-		public String abilityName;
+        }
+    }
+
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    protected static void loadFromResource(Class<?> c, String fileName, Int2ObjectMap map) throws Exception {
+        try (FileReader fileReader = new FileReader(RESOURCE("ExcelBinOutput/" + fileName))) {
+            List list = Grasscutter.getGsonFactory().fromJson(fileReader, TypeToken.getParameterized(Collection.class, c).getType());
+
+            for (Object o : list) {
+                GameResource res = (GameResource) o;
+                res.onLoad();
+                map.put(res.getId(), res);
+            }
+        }
+    }
+
+    private static void loadScenePoints() {
+        Pattern pattern = Pattern.compile("(?<=scene)(.*?)(?=_point.json)");
+        File folder = new File(RESOURCE("BinOutput/Scene/Point"));
+
+        if (!folder.isDirectory() || !folder.exists() || folder.listFiles() == null) {
+            Grasscutter.getLogger().error("Scene point files cannot be found, you cannot use teleport waypoints!");
+            return;
+        }
+
+        List<ScenePointEntry> scenePointList = new ArrayList<>();
+        for (File file : Objects.requireNonNull(folder.listFiles())) {
+            ScenePointConfig config; Integer sceneId;
+
+            Matcher matcher = pattern.matcher(file.getName());
+            if (matcher.find()) {
+                sceneId = Integer.parseInt(matcher.group(1));
+            } else {
+                continue;
+            }
+
+            try (FileReader fileReader = new FileReader(file)) {
+                config = Grasscutter.getGsonFactory().fromJson(fileReader, ScenePointConfig.class);
+            } catch (Exception e) {
+                e.printStackTrace();
+                continue;
+            }
+
+            if (config.points == null) {
+                continue;
+            }
+
+            for (Map.Entry<String, JsonElement> entry : config.points.entrySet()) {
+                PointData pointData = Grasscutter.getGsonFactory().fromJson(entry.getValue(), PointData.class);
+                pointData.setId(Integer.parseInt(entry.getKey()));
+
+                ScenePointEntry sl = new ScenePointEntry(sceneId + "_" + entry.getKey(), pointData);
+                scenePointList.add(sl);
+                GameData.getScenePointIdList().add(pointData.getId());
+
+                pointData.updateDailyDungeon();
+            }
+
+            for (ScenePointEntry entry : scenePointList) {
+                GameData.getScenePointEntries().put(entry.getName(), entry);
+            }
+        }
+    }
+
+    private static void loadAbilityEmbryos() {
+        List<AbilityEmbryoEntry> embryoList = null;
+
+        // Read from cached file if exists
+        try (InputStream embryoCache = DataLoader.load("AbilityEmbryos.json", false)) {
+            embryoList = Grasscutter.getGsonFactory().fromJson(new InputStreamReader(embryoCache), TypeToken.getParameterized(Collection.class, AbilityEmbryoEntry.class).getType());
+        } catch (Exception ignored) {}
+
+        if (embryoList == null) {
+            // Load from BinOutput
+            Pattern pattern = Pattern.compile("(?<=ConfigAvatar_)(.*?)(?=.json)");
+
+            embryoList = new LinkedList<>();
+            File folder = new File(Utils.toFilePath(RESOURCE("BinOutput/Avatar/")));
+            File[] files = folder.listFiles();
+            if (files == null) {
+                Grasscutter.getLogger().error("Error loading ability embryos: no files found in " + folder.getAbsolutePath());
+                return;
+            }
+
+            for (File file : files) {
+                AvatarConfig config;
+                String avatarName;
+
+                Matcher matcher = pattern.matcher(file.getName());
+                if (matcher.find()) {
+                    avatarName = matcher.group(0);
+                } else {
+                    continue;
+                }
+
+                try (FileReader fileReader = new FileReader(file)) {
+                    config = Grasscutter.getGsonFactory().fromJson(fileReader, AvatarConfig.class);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    continue;
+                }
+
+                if (config.abilities == null) {
+                    continue;
+                }
+
+                int s = config.abilities.size();
+                AbilityEmbryoEntry al = new AbilityEmbryoEntry(avatarName, config.abilities.stream().map(Object::toString).toArray(size -> new String[s]));
+                embryoList.add(al);
+            }
+
+            File playerElementsFile = new File(Utils.toFilePath(RESOURCE("BinOutput/AbilityGroup/AbilityGroup_Other_PlayerElementAbility.json")));
+
+            if (playerElementsFile.exists()) {
+                try (FileReader fileReader = new FileReader(playerElementsFile)) {
+                    GameDepot.setPlayerAbilities(Grasscutter.getGsonFactory().fromJson(fileReader, new TypeToken<Map<String, AvatarConfig>>(){}.getType()));
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        if (embryoList == null || embryoList.isEmpty()) {
+            Grasscutter.getLogger().error("No embryos loaded!");
+            return;
+        }
+
+        for (AbilityEmbryoEntry entry : embryoList) {
+            GameData.getAbilityEmbryoInfo().put(entry.getName(), entry);
+        }
+    }
+
+    private static void loadAbilityModifiers() {
+        // Load from BinOutput
+        File folder = new File(Utils.toFilePath(RESOURCE("BinOutput/Ability/Temp/AvatarAbilities/")));
+        File[] files = folder.listFiles();
+        if (files == null) {
+            Grasscutter.getLogger().error("Error loading ability modifiers: no files found in " + folder.getAbsolutePath());
+            return;
+        }
+
+        for (File file : files) {
+            List<AbilityConfigData> abilityConfigList;
+
+            try (FileReader fileReader = new FileReader(file)) {
+                abilityConfigList = Grasscutter.getGsonFactory().fromJson(fileReader, TypeToken.getParameterized(Collection.class, AbilityConfigData.class).getType());
+            } catch (Exception e) {
+                e.printStackTrace();
+                continue;
+            }
+
+            for (AbilityConfigData data : abilityConfigList) {
+                if (data.Default.modifiers == null || data.Default.modifiers.size() == 0) {
+                    continue;
+                }
+
+                AbilityModifierEntry modifierEntry = new AbilityModifierEntry(data.Default.abilityName);
+
+                for (Entry<String, AbilityModifier> entry : data.Default.modifiers.entrySet()) {
+                    AbilityModifier modifier = entry.getValue();
+
+                    // Stare.
+                    if (modifier.onAdded != null) {
+                        for (AbilityModifierAction action : modifier.onAdded) {
+                            if (action.$type.contains("HealHP")) {
+                                action.type = AbilityModifierActionType.HealHP;
+                                modifierEntry.getOnAdded().add(action);
+                            }
+                        }
+                    }
+
+                    if (modifier.onThinkInterval != null) {
+                        for (AbilityModifierAction action : modifier.onThinkInterval) {
+                            if (action.$type.contains("HealHP")) {
+                                action.type = AbilityModifierActionType.HealHP;
+                                modifierEntry.getOnThinkInterval().add(action);
+                            }
+                        }
+                    }
+
+                    if (modifier.onRemoved != null) {
+                        for (AbilityModifierAction action : modifier.onRemoved) {
+                            if (action.$type.contains("HealHP")) {
+                                action.type = AbilityModifierActionType.HealHP;
+                                modifierEntry.getOnRemoved().add(action);
+                            }
+                        }
+                    }
+                }
+
+                GameData.getAbilityModifiers().put(modifierEntry.getName(), modifierEntry);
+            }
+        }
+    }
+
+    private static void loadSpawnData() {
+        String[] spawnDataNames = {"Spawns.json", "GadgetSpawns.json"};
+        ArrayList<SpawnGroupEntry> spawnEntryMap = new ArrayList<>();
+
+        for (String name : spawnDataNames) {
+            // Load spawn entries from file
+            try (InputStreamReader reader = DataLoader.loadReader(name)) {
+                Type type = TypeToken.getParameterized(Collection.class, SpawnGroupEntry.class).getType();
+                List<SpawnGroupEntry> list = Grasscutter.getGsonFactory().fromJson(reader, type);
+
+                // Add spawns to group if it already exists in our spawn group map
+                spawnEntryMap.addAll(list);
+            } catch (Exception ignored) {}
+        }
+
+        if (spawnEntryMap.isEmpty()) {
+            Grasscutter.getLogger().error("No spawn data loaded!");
+            return;
+        }
+
+        HashMap<GridBlockId, ArrayList<SpawnDataEntry>> areaSort = new HashMap<>();
+        //key = sceneId,x,z , value = ArrayList<SpawnDataEntry>
+        for (SpawnGroupEntry entry : spawnEntryMap) {
+            entry.getSpawns().forEach(
+                s -> {
+                    s.setGroup(entry);
+                    GridBlockId point = s.getBlockId();
+                    if (!areaSort.containsKey(point)) {
+                        areaSort.put(point, new ArrayList<>());
+                    }
+                    areaSort.get(point).add(s);
+                }
+            );
+        }
+        GameDepot.addSpawnListById(areaSort);
+    }
+
+    private static void loadOpenConfig() {
+        // Read from cached file if exists
+        List<OpenConfigEntry> list = null;
+
+        try (InputStream openConfigCache = DataLoader.load("OpenConfig.json", false)) {
+            list = Grasscutter.getGsonFactory().fromJson(new InputStreamReader(openConfigCache), TypeToken.getParameterized(Collection.class, SpawnGroupEntry.class).getType());
+        } catch (Exception ignored) {}
+
+        if (list == null) {
+            Map<String, OpenConfigEntry> map = new TreeMap<>();
+            java.lang.reflect.Type type = new TypeToken<Map<String, OpenConfigData[]>>() {}.getType();
+            String[] folderNames = {"BinOutput/Talent/EquipTalents/", "BinOutput/Talent/AvatarTalents/"};
+
+            for (String name : folderNames) {
+                File folder = new File(Utils.toFilePath(RESOURCE(name)));
+                File[] files = folder.listFiles();
+                if (files == null) {
+                    Grasscutter.getLogger().error("Error loading open config: no files found in " + folder.getAbsolutePath()); return;
+                }
+
+                for (File file : files) {
+                    if (!file.getName().endsWith(".json")) {
+                        continue;
+                    }
+
+                    Map<String, OpenConfigData[]> config;
+
+                    try (FileReader fileReader = new FileReader(file)) {
+                        config = Grasscutter.getGsonFactory().fromJson(fileReader, type);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                        continue;
+                    }
+
+                    for (Entry<String, OpenConfigData[]> e : config.entrySet()) {
+                        OpenConfigEntry entry = new OpenConfigEntry(e.getKey(), e.getValue());
+                        map.put(entry.getName(), entry);
+                    }
+                }
+            }
+
+            list = new ArrayList<>(map.values());
+        }
+
+        if (list == null || list.isEmpty()) {
+            Grasscutter.getLogger().error("No openconfig entries loaded!");
+            return;
+        }
+
+        for (OpenConfigEntry entry : list) {
+            GameData.getOpenConfigEntries().put(entry.getName(), entry);
+        }
+    }
+
+    private static void loadQuests() {
+        File folder = new File(RESOURCE("BinOutput/Quest/"));
+
+        if (!folder.exists()) {
+            return;
+        }
+
+        for (File file : folder.listFiles()) {
+            MainQuestData mainQuest = null;
+
+            try (FileReader fileReader = new FileReader(file)) {
+                mainQuest = Grasscutter.getGsonFactory().fromJson(fileReader, MainQuestData.class);
+            } catch (Exception e) {
+                e.printStackTrace();
+                continue;
+            }
+
+            GameData.getMainQuestDataMap().put(mainQuest.getId(), mainQuest);
+        }
+
+        Grasscutter.getLogger().debug("Loaded " + GameData.getMainQuestDataMap().size() + " MainQuestDatas.");
+    }
+
+    @SneakyThrows
+    private static void loadHomeworldDefaultSaveData() {
+        var folder = Files.list(Path.of(RESOURCE("BinOutput/HomeworldDefaultSave"))).toList();
+        var pattern = Pattern.compile("scene(.*)_home_config.json");
+
+        for (var file : folder) {
+            var matcher = pattern.matcher(file.getFileName().toString());
+            if (!matcher.find()) {
+                continue;
+            }
+            var sceneId = matcher.group(1);
+
+            var data = Grasscutter.getGsonFactory().fromJson(Files.readString(file), HomeworldDefaultSaveData.class);
+
+            GameData.getHomeworldDefaultSaveData().put(Integer.parseInt(sceneId), data);
+        }
+
+        Grasscutter.getLogger().debug("Loaded " + GameData.getHomeworldDefaultSaveData().size() + " HomeworldDefaultSaveDatas.");
+    }
+
+    @SneakyThrows
+    private static void loadNpcBornData() {
+        var folder = Files.list(Path.of(RESOURCE("BinOutput/Scene/SceneNpcBorn"))).toList();
+
+        for (var file : folder) {
+            if (file.toFile().isDirectory()) {
+                continue;
+            }
+
+            var data = Grasscutter.getGsonFactory().fromJson(Files.readString(file), SceneNpcBornData.class);
+            if (data.getBornPosList() == null || data.getBornPosList().size() == 0) {
+                continue;
+            }
+
+            data.setIndex(SceneIndexManager.buildIndex(3, data.getBornPosList(), item -> item.getPos().toPoint()));
+            GameData.getSceneNpcBornData().put(data.getSceneId(), data);
+        }
+
+        Grasscutter.getLogger().debug("Loaded " + GameData.getSceneNpcBornData().size() + " SceneNpcBornDatas.");
+    }
+
+    // BinOutput configs
+
+    public static class AvatarConfig {
+        @SerializedName(value="abilities", alternate={"targetAbilities"})
+        public ArrayList<AvatarConfigAbility> abilities;
+    }
+
+    public static class AvatarConfigAbility {
+        public String abilityName;
+        public String toString() {
+            return abilityName;
+        }
+    }
+
+    private static class OpenConfig {
+        public OpenConfigData[] data;
+    }
+
+    public static class OpenConfigData {
+        public String $type;
+        public String abilityName;
 
-		@SerializedName(value="talentIndex", alternate={"OJOFFKLNAHN"})
-		public int talentIndex;
+        @SerializedName(value="talentIndex", alternate={"OJOFFKLNAHN"})
+        public int talentIndex;
 
-		@SerializedName(value="skillID", alternate={"overtime"})
-		public int skillID;
-
-		@SerializedName(value="pointDelta", alternate={"IGEBKIHPOIF"})
-		public int pointDelta;
-	}
+        @SerializedName(value="skillID", alternate={"overtime"})
+        public int skillID;
+
+        @SerializedName(value="pointDelta", alternate={"IGEBKIHPOIF"})
+        public int pointDelta;
+    }
 }

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

@@ -2,32 +2,34 @@ package emu.grasscutter.data.common;
 
 import com.google.gson.annotations.SerializedName;
 
+// Used in excels
 public class ItemParamData {
-	@SerializedName(value="id", alternate={"itemId"})
-	private int id;
-	
-	@SerializedName(value="count", alternate={"itemCount"})
+    @SerializedName(value="id", alternate={"itemId"})
+    private int id;
+
+    @SerializedName(value="count", alternate={"itemCount"})
     private int count;
 
     public ItemParamData() {}
-	public ItemParamData(int id, int count) {
-    	this.id = id;
-    	this.count = count;
-	}
-    
-	public int getId() {
-		return id;
-	}
-	
-	public int getItemId() {
-		return id;
-	}
-	
-	public int getCount() {
-		return count;
-	}
-	
-	public int getItemCount() {
-		return count;
-	}
+
+    public ItemParamData(int id, int count) {
+        this.id = id;
+        this.count = count;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public int getItemId() {
+        return id;
+    }
+
+    public int getCount() {
+        return count;
+    }
+
+    public int getItemCount() {
+        return count;
+    }
 }

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

@@ -1,24 +1,19 @@
 package emu.grasscutter.data.common;
 
-import java.util.List;
+import emu.grasscutter.game.props.ItemUseOp;
 
 public class ItemUseData {
-	private String useOp;
-	private List<String> useParam;
+	private ItemUseOp useOp;
+	private String[] useParam;
 
-	public String getUseOp() {
+	public ItemUseOp getUseOp() {
+	    if (useOp == null) {
+	        useOp = ItemUseOp.ITEM_USE_NONE;
+	    }
 		return useOp;
 	}
 
-	public void setUseOp(String useOp) {
-		this.useOp = useOp;
-	}
-
-	public List<String> getUseParam() {
+	public String[] getUseParam() {
 		return useParam;
 	}
-	
-	public void setUseParam(List<String> useParam) {
-		this.useParam = useParam;
-	}
 }

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

@@ -17,13 +17,8 @@ public class AvatarSkillData extends GameResource {
     private boolean isAttackCameraLock;
     private int proudSkillGroupId;
     private ElementType costElemType;
-    private List<Float> lockWeightParams;
-    
     private long nameTextMapHash;
-    
     private String abilityName;
-    private String lockShape;
-    private String globalValueKey;
 
     @Override
 	public int getId(){
@@ -58,10 +53,6 @@ public class AvatarSkillData extends GameResource {
 		return costElemType;
 	}
 
-	public List<Float> getLockWeightParams() {
-		return lockWeightParams;
-	}
-
 	public long getNameTextMapHash() {
 		return nameTextMapHash;
 	}
@@ -69,14 +60,6 @@ public class AvatarSkillData extends GameResource {
 	public String getAbilityName() {
 		return abilityName;
 	}
-
-	public String getLockShape() {
-		return lockShape;
-	}
-
-	public String getGlobalValueKey() {
-		return globalValueKey;
-	}
 	
 	@Override
 	public void onLoad() {

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

@@ -0,0 +1,25 @@
+package emu.grasscutter.data.excels;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.game.props.ServerBuffType;
+import lombok.Getter;
+
+@ResourceType(name = "BuffExcelConfigData.json")
+@Getter
+public class BuffData extends GameResource {
+    private int groupId;
+	private int serverBuffId;
+	private float time;
+	private boolean isPersistent;
+	private ServerBuffType serverBuffType;
+	
+	@Override
+	public int getId() {
+		return this.serverBuffId;
+	}
+	
+	public void onLoad() {
+	    this.serverBuffType = this.serverBuffType != null ? this.serverBuffType : ServerBuffType.SERVER_BUFF_NONE;
+	}
+}

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

@@ -1,40 +1,35 @@
-package emu.grasscutter.data.excels;
-
-import java.util.List;
-
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-
-@ResourceType(name = "EnvAnimalGatherExcelConfigData.json", loadPriority = ResourceType.LoadPriority.LOW)
-public class EnvAnimalGatherConfigData extends GameResource {
-    private int animalId;
-    private String entityType;
-    private List<GatherItem> gatherItemId;
-    private String excludeWeathers;
-    private int aliveTime;
-    private int escapeTime;
-    private int escapeRadius;
-    @Override
-    public int getId() {
-        return animalId;
-    }
-    public int getAnimalId(){
-        return animalId;
-    }
-    public String getEntityType(){
-        return entityType;
-    }
-    public GatherItem gatherItem(){
-        return gatherItemId.get(0);
-    }
-    public static class GatherItem{
-        private int id;
-        private int count;
-        public int getId(){
-            return id;
-        }
-        public int getCount(){
-            return count;
-        }
-    }
-}
+package emu.grasscutter.data.excels;
+
+import java.util.List;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.common.ItemParamData;
+
+@ResourceType(name = "EnvAnimalGatherExcelConfigData.json", loadPriority = ResourceType.LoadPriority.LOW)
+public class EnvAnimalGatherConfigData extends GameResource {
+    private int animalId;
+    private String entityType;
+    private List<ItemParamData> gatherItemId;
+    private String excludeWeathers;
+    private int aliveTime;
+    private int escapeTime;
+    private int escapeRadius;
+
+    @Override
+    public int getId() {
+        return animalId;
+    }
+
+    public int getAnimalId() {
+        return animalId;
+    }
+
+    public String getEntityType() {
+        return entityType;
+    }
+
+    public ItemParamData getGatherItem() {
+        return gatherItemId.size() > 0 ? gatherItemId.get(0) : null;
+    }
+}

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

@@ -23,9 +23,9 @@ public class ForgeData extends GameResource {
     private List<ItemParamData> materialItems;
 
     @Override
-	public int getId() {
-		return this.id;
-	}
+    public int getId() {
+        return this.id;
+    }
 
     public int getPlayerLevel() {
         return playerLevel;

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

@@ -13,10 +13,8 @@ public class GadgetData extends GameResource {
 	private boolean isInteractive;
 	private String[] tags;
 	private String itemJsonName;
-	private String inteeIconName;
 	private long nameTextMapHash;
 	private int campID;
-	private String LODPatternName;
 
 	@Override
 	public int getId() {
@@ -43,10 +41,6 @@ public class GadgetData extends GameResource {
 		return itemJsonName;
 	}
 
-	public String getInteeIconName() {
-		return inteeIconName;
-	}
-
 	public long getNameTextMapHash() {
 		return nameTextMapHash;
 	}
@@ -55,8 +49,6 @@ public class GadgetData extends GameResource {
 		return campID;
 	}
 
-	public String getLODPatternName() { return LODPatternName; }
-
 	@Override
 	public void onLoad() {
 

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

@@ -1,5 +1,6 @@
 package emu.grasscutter.data.excels;
 
+import java.util.Arrays;
 import java.util.List;
 
 import com.google.gson.annotations.SerializedName;
@@ -8,6 +9,7 @@ import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.data.common.ItemUseData;
 import emu.grasscutter.game.inventory.*;
 import emu.grasscutter.game.props.FightProperty;
+import emu.grasscutter.game.props.ItemUseTarget;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import it.unimi.dsi.fastutil.ints.IntSet;
 import lombok.Getter;
@@ -17,103 +19,75 @@ import lombok.Getter;
         "ReliquaryExcelConfigData.json",
         "HomeWorldFurnitureExcelConfigData.json"
 })
+@Getter
 public class ItemData extends GameResource {
-	
+	// Main
 	private int id;
-    @Getter private int stackLimit = 1;
-    @Getter private int maxUseCount;
-    @Getter private int rankLevel;
-    @Getter private String effectName;
-    @Getter private int[] satiationParams;
-    @Getter private int rank;
-    @Getter private int weight;
-    @Getter private int gadgetId;
+    private int stackLimit = 1;
+    private int maxUseCount;
+    private int rankLevel;
+    private String effectName;
+    private int rank;
+    private int weight;
+    private int gadgetId;
     
-    @Getter private int[] destroyReturnMaterial;
-    @Getter private int[] destroyReturnMaterialCount;
-
-    @Getter private List<ItemUseData> itemUse;
+    private int[] destroyReturnMaterial;
+    private int[] destroyReturnMaterialCount;
     
-    // Food
-    @Getter private String foodQuality;
-    @Getter private String useTarget;
-    private String[] iseParam;
-    
-    // String enums
-    private String itemType;
-    private String materialType;
-    private String equipType;
+    // Enums
+    private ItemType itemType = ItemType.ITEM_NONE;
+    private MaterialType materialType = MaterialType.MATERIAL_NONE;
+    private EquipType equipType = EquipType.EQUIP_NONE;
     private String effectType;
     private String destroyRule;
     
-    // Post load enum forms of above
-    private transient MaterialType materialEnumType;
-    private transient ItemType itemEnumType;
-    private transient EquipType equipEnumType;
+    // Food
+    private String foodQuality;
+    private int[] satiationParams;
+    
+    // Usable item
+    private ItemUseTarget useTarget;
+    private List<ItemUseData> itemUse;
     
     // Relic
-    @Getter private int mainPropDepotId;
-    @Getter private int appendPropDepotId;
-    @Getter private int appendPropNum;
-    @Getter private int setId;
+    private int mainPropDepotId;
+    private int appendPropDepotId;
+    private int appendPropNum;
+    private int setId;
     private int[] addPropLevels;
-    @Getter private int baseConvExp;
-    @Getter private int maxLevel;
+    private int baseConvExp;
+    private int maxLevel;
     
     // Weapon
-    @Getter private int weaponPromoteId;
-    @Getter private int weaponBaseExp;
-    @Getter private int storyId;
-    @Getter private int avatarPromoteId;
-    @Getter private int awakenMaterial;
-    @Getter private int[] awakenCosts;
-    @Getter private int[] skillAffix;
+    private int weaponPromoteId;
+    private int weaponBaseExp;
+    private int storyId;
+    private int avatarPromoteId;
+    private int awakenMaterial;
+    private int[] awakenCosts;
+    private int[] skillAffix;
     private WeaponProperty[] weaponProp;
     
     // Hash
-    @Getter private String icon;
-    @Getter private long nameTextMapHash;
-    
-    @Getter private IntSet addPropLevelSet;
+    private long nameTextMapHash;
 
     // Furniture
-    @Getter private int comfort;
-    @Getter private List<Integer> furnType;
-    @Getter private List<Integer> furnitureGadgetID;
+    private int comfort;
+    private List<Integer> furnType;
+    private List<Integer> furnitureGadgetID;
     @SerializedName("JFDLJGDFIGL")
-    @Getter private int roomSceneId;
+    private int roomSceneId;
+    
+    // Custom
+    private transient IntSet addPropLevelSet;
 
     @Override
 	public int getId(){
         return this.id;
     }
     
-    public String getMaterialTypeString(){
-        return this.materialType;
-    }
-    
-    public String[] getUseParam(){
-        return this.iseParam;
-    }
-    
-    public String getItemTypeString(){
-        return this.itemType;
-    }
-	
-	public WeaponProperty[] getWeaponProperties() {
-		return weaponProp;
-	}
-
-    public ItemType getItemType() {
-    	return this.itemEnumType;
-    }
-    
-    public MaterialType getMaterialType() {
-    	return this.materialEnumType;
-    }
-    
-    public EquipType getEquipType() {
-    	return this.equipEnumType;
+    public WeaponProperty[] getWeaponProperties() {
+        return this.weaponProp;
     }
     
     public boolean canAddRelicProp(int level) {
@@ -121,48 +95,37 @@ public class ItemData extends GameResource {
     }
     
 	public boolean isEquip() {
-		return this.itemEnumType == ItemType.ITEM_RELIQUARY || this.itemEnumType == ItemType.ITEM_WEAPON;
+		return this.itemType == ItemType.ITEM_RELIQUARY || this.itemType == ItemType.ITEM_WEAPON;
 	}
     
     @Override
 	public void onLoad() {
-    	this.itemEnumType = ItemType.getTypeByName(getItemTypeString());
-    	this.materialEnumType = MaterialType.getTypeByName(getMaterialTypeString());
-
-		if (this.itemEnumType == ItemType.ITEM_RELIQUARY) {
-			this.equipEnumType = EquipType.getTypeByName(this.equipType);
+		if (this.itemType == ItemType.ITEM_RELIQUARY) {
 			if (this.addPropLevels != null && this.addPropLevels.length > 0) {
 				this.addPropLevelSet = new IntOpenHashSet(this.addPropLevels);
 			}
-		} else if (this.itemEnumType == ItemType.ITEM_WEAPON) {
-			this.equipEnumType = EquipType.EQUIP_WEAPON;
+		} else if (this.itemType == ItemType.ITEM_WEAPON) {
+			this.equipType = EquipType.EQUIP_WEAPON;
 		} else {
-			this.equipEnumType = EquipType.EQUIP_NONE;
+			this.equipType = EquipType.EQUIP_NONE;
 		}
 		
-		if (this.getWeaponProperties() != null) {
-			for (WeaponProperty weaponProperty : this.getWeaponProperties()) {
-				weaponProperty.onLoad();
-			}
+		if (this.weaponProp != null) {
+		    this.weaponProp = Arrays.stream(this.weaponProp).filter(prop -> prop.getPropType() != null).toArray(WeaponProperty[]::new);
 		}
 
-        if(this.getFurnType() != null){
+        if (this.getFurnType() != null) {
             this.furnType = this.furnType.stream().filter(x -> x > 0).toList();
         }
-        if(this.getFurnitureGadgetID() != null){
+        if (this.getFurnitureGadgetID() != null) {
             this.furnitureGadgetID = this.furnitureGadgetID.stream().filter(x -> x > 0).toList();
         }
     }
     
+    @Getter
     public static class WeaponProperty {
-    	@Getter private FightProperty fightProp;
-        @Getter private String propType;
-        @Getter private float initValue;
-        @Getter private String type;
-
-		public void onLoad() {
-			this.fightProp = FightProperty.getPropByName(propType);
-		}
-        
+        private FightProperty propType;
+        private float initValue;
+        private String type;
     }
 }

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

@@ -10,7 +10,6 @@ public class MonsterDescribeData extends GameResource {
     private long nameTextMapHash;
     private int titleID;
     private int specialNameLabID;
-    private String icon;
 	
 	@Override
 	public int getId() {
@@ -29,10 +28,6 @@ public class MonsterDescribeData extends GameResource {
 		return specialNameLabID;
 	}
 
-	public String getIcon() {
-		return icon;
-	}
-
 	@Override
 	public void onLoad() {
 

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

@@ -5,63 +5,65 @@ import java.util.List;
 import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.game.props.FightProperty;
+import it.unimi.dsi.fastutil.ints.Int2FloatMap;
+import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
 @ResourceType(name = "ReliquaryLevelExcelConfigData.json")
 public class ReliquaryLevelData extends GameResource {
-	private int id;
-	private Int2ObjectMap<Float> propMap;
-	
-	private int rank;
-	private int level;
-	private int exp;
-	private List<RelicLevelProperty> addProps;
-	
-	@Override
-	public int getId() {
-		return this.id;
-	}
-	
-	public int getRank() {
-		return rank;
-	}
-	
-	public int getLevel() {
-		return level;
-	}
-	
-	public int getExp() {
-		return exp;
-	}
-	
-	public float getPropValue(FightProperty prop) {
-		return getPropValue(prop.getId());
-	}
-	
-	public float getPropValue(int id) {
-		return propMap.get(id);
-	}
-	
-	@Override
-	public void onLoad() {
-		this.id = (rank << 8) + this.getLevel();
-		this.propMap = new Int2ObjectOpenHashMap<>();
-		for (RelicLevelProperty p : addProps) {
-			this.propMap.put(FightProperty.getPropByName(p.getPropType()).getId(), (Float) p.getValue());
-		}
-	}
-	
-	public class RelicLevelProperty {
-		private String propType;
-		private float value;
-		
-		public String getPropType() {
-			return propType;
-		}
-		
-		public float getValue() {
-			return value;
-		}
-	}
+    private int id;
+    private Int2FloatMap propMap;
+
+    private int rank;
+    private int level;
+    private int exp;
+    private List<RelicLevelProperty> addProps;
+
+    @Override
+    public int getId() {
+        return this.id;
+    }
+
+    public int getRank() {
+        return rank;
+    }
+
+    public int getLevel() {
+        return level;
+    }
+
+    public int getExp() {
+        return exp;
+    }
+
+    public float getPropValue(FightProperty prop) {
+        return getPropValue(prop.getId());
+    }
+
+    public float getPropValue(int id) {
+        return propMap.getOrDefault(id, 0f);
+    }
+
+    @Override
+    public void onLoad() {
+        this.id = (rank << 8) + this.getLevel();
+        this.propMap = new Int2FloatOpenHashMap();
+        for (RelicLevelProperty p : addProps) {
+            this.propMap.put(FightProperty.getPropByName(p.getPropType()).getId(), p.getValue());
+        }
+    }
+
+    public class RelicLevelProperty {
+        private String propType;
+        private float value;
+
+        public String getPropType() {
+            return propType;
+        }
+
+        public float getValue() {
+            return value;
+        }
+    }
 }

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

@@ -1,5 +1,7 @@
 package emu.grasscutter.database;
 
+import static emu.grasscutter.config.Configuration.*;
+
 import com.mongodb.MongoCommandException;
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoClients;
@@ -26,101 +28,99 @@ import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.GameMainQuest;
 import emu.grasscutter.game.quest.GameQuest;
 
-import static emu.grasscutter.Configuration.*;
-
 public final class DatabaseManager {
-	private static Datastore gameDatastore;
-	private static Datastore dispatchDatastore;
+    private static Datastore gameDatastore;
+    private static Datastore dispatchDatastore;
 
-	private static final Class<?>[] mappedClasses = new Class<?>[] {
-		DatabaseCounter.class, Account.class, Player.class, Avatar.class, GameItem.class, Friendship.class,
-		GachaRecord.class, Mail.class, GameMainQuest.class, GameHome.class, BattlePassManager.class,
+    private static final Class<?>[] mappedClasses = new Class<?>[] {
+        DatabaseCounter.class, Account.class, Player.class, Avatar.class, GameItem.class, Friendship.class,
+        GachaRecord.class, Mail.class, GameMainQuest.class, GameHome.class, BattlePassManager.class,
         PlayerActivityData.class, MusicGameBeatmap.class
-	};
+    };
 
     public static Datastore getGameDatastore() {
-    	return gameDatastore;
+        return gameDatastore;
     }
 
     public static MongoDatabase getGameDatabase() {
-    	return getGameDatastore().getDatabase();
+        return getGameDatastore().getDatabase();
     }
 
-	// Yes. I very dislike this method. However, this will be good for now.
-	// TODO: Add dispatch routes for player account management
-	public static Datastore getAccountDatastore() {
-		if(SERVER.runMode == ServerRunMode.GAME_ONLY) {
-			return dispatchDatastore;
-		} else {
-			return gameDatastore;
-		}
-	}
-	
-	public static void initialize() {
-		// Initialize
-		MongoClient gameMongoClient = MongoClients.create(DATABASE.game.connectionUri);
-		
-		// Set mapper options.
-		MapperOptions mapperOptions = MapperOptions.builder()
-				.storeEmpties(true).storeNulls(false).build();
-		// Create data store.
-		gameDatastore = Morphia.createDatastore(gameMongoClient, DATABASE.game.collection, mapperOptions);
-		// Map classes.
-		gameDatastore.getMapper().map(mappedClasses);
-		
-		// Ensure indexes
-		try {
-			gameDatastore.ensureIndexes();
-		} catch (MongoCommandException exception) {
-			Grasscutter.getLogger().info("Mongo index error: ", exception);
-			// Duplicate index error
-			if (exception.getCode() == 85) {
-				// Drop all indexes and re add them
-				MongoIterable<String> collections = gameDatastore.getDatabase().listCollectionNames();
-				for (String name : collections) {
-					gameDatastore.getDatabase().getCollection(name).dropIndexes();
-				}
-				// Add back indexes
-				gameDatastore.ensureIndexes();
-			}
-		}
+    // Yes. I very dislike this method. However, this will be good for now.
+    // TODO: Add dispatch routes for player account management
+    public static Datastore getAccountDatastore() {
+        if (SERVER.runMode == ServerRunMode.GAME_ONLY) {
+            return dispatchDatastore;
+        } else {
+            return gameDatastore;
+        }
+    }
 
-		if(SERVER.runMode == ServerRunMode.GAME_ONLY) {
-			MongoClient dispatchMongoClient = MongoClients.create(DATABASE.server.connectionUri);
-			dispatchDatastore = Morphia.createDatastore(dispatchMongoClient, DATABASE.server.collection);
+    public static void initialize() {
+        // Initialize
+        MongoClient gameMongoClient = MongoClients.create(DATABASE.game.connectionUri);
 
-			// Ensure indexes for dispatch server
-			try {
-				dispatchDatastore.ensureIndexes();
-			} catch (MongoCommandException e) {
-				Grasscutter.getLogger().info("Mongo index error: ", e);
-				// Duplicate index error
-				if (e.getCode() == 85) {
-					// Drop all indexes and re add them
-					MongoIterable<String> collections = dispatchDatastore.getDatabase().listCollectionNames();
-					for (String name : collections) {
-						dispatchDatastore.getDatabase().getCollection(name).dropIndexes();
-					}
-					// Add back indexes
-					dispatchDatastore.ensureIndexes();
-				}
-			}
-		}
-	}
+        // Set mapper options.
+        MapperOptions mapperOptions = MapperOptions.builder()
+                .storeEmpties(true).storeNulls(false).build();
+        // Create data store.
+        gameDatastore = Morphia.createDatastore(gameMongoClient, DATABASE.game.collection, mapperOptions);
+        // Map classes.
+        gameDatastore.getMapper().map(mappedClasses);
 
-	public static synchronized int getNextId(Class<?> c) {
-		DatabaseCounter counter = getGameDatastore().find(DatabaseCounter.class).filter(Filters.eq("_id", c.getSimpleName())).first();
-		if (counter == null) {
-			counter = new DatabaseCounter(c.getSimpleName());
-		}
-		try {
-			return counter.getNextId();
-		} finally {
-			getGameDatastore().save(counter);
-		}
-	}
+        // Ensure indexes
+        try {
+            gameDatastore.ensureIndexes();
+        } catch (MongoCommandException exception) {
+            Grasscutter.getLogger().info("Mongo index error: ", exception);
+            // Duplicate index error
+            if (exception.getCode() == 85) {
+                // Drop all indexes and re add them
+                MongoIterable<String> collections = gameDatastore.getDatabase().listCollectionNames();
+                for (String name : collections) {
+                    gameDatastore.getDatabase().getCollection(name).dropIndexes();
+                }
+                // Add back indexes
+                gameDatastore.ensureIndexes();
+            }
+        }
 
-	public static synchronized int getNextId(Object o) {
-		return getNextId(o.getClass());
-	}
-}
+        if (SERVER.runMode == ServerRunMode.GAME_ONLY) {
+            MongoClient dispatchMongoClient = MongoClients.create(DATABASE.server.connectionUri);
+            dispatchDatastore = Morphia.createDatastore(dispatchMongoClient, DATABASE.server.collection);
+
+            // Ensure indexes for dispatch server
+            try {
+                dispatchDatastore.ensureIndexes();
+            } catch (MongoCommandException e) {
+                Grasscutter.getLogger().info("Mongo index error: ", e);
+                // Duplicate index error
+                if (e.getCode() == 85) {
+                    // Drop all indexes and re add them
+                    MongoIterable<String> collections = dispatchDatastore.getDatabase().listCollectionNames();
+                    for (String name : collections) {
+                        dispatchDatastore.getDatabase().getCollection(name).dropIndexes();
+                    }
+                    // Add back indexes
+                    dispatchDatastore.ensureIndexes();
+                }
+            }
+        }
+    }
+
+    public static synchronized int getNextId(Class<?> c) {
+        DatabaseCounter counter = getGameDatastore().find(DatabaseCounter.class).filter(Filters.eq("_id", c.getSimpleName())).first();
+        if (counter == null) {
+            counter = new DatabaseCounter(c.getSimpleName());
+        }
+        try {
+            return counter.getNextId();
+        } finally {
+            getGameDatastore().save(counter);
+        }
+    }
+
+    public static synchronized int getNextId(Object o) {
+        return getNextId(o.getClass());
+    }
+}

src/main/java/emu/grasscutter/game/Account.java

@@ -5,102 +5,102 @@ import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.utils.Crypto;
 import emu.grasscutter.utils.Utils;
 
+import static emu.grasscutter.config.Configuration.*;
+
 import java.util.*;
 import java.util.stream.Stream;
 
 import org.bson.Document;
 
-import static emu.grasscutter.Configuration.*;
-
 @Entity(value = "accounts", useDiscriminator = false)
 public class Account {
-	@Id private String id;
-	
-	@Indexed(options = @IndexOptions(unique = true))
-	@Collation(locale = "simple", caseLevel = true)
-	private String username;
-	private String password; // Unused for now
-	
-	private int reservedPlayerId;
-	private String email;
-	
-	private String token;
-	private String sessionKey; // Session token for dispatch server
-	private List<String> permissions;
+    @Id private String id;
+
+    @Indexed(options = @IndexOptions(unique = true))
+    @Collation(locale = "simple", caseLevel = true)
+    private String username;
+    private String password; // Unused for now
+
+    private int reservedPlayerId;
+    private String email;
+
+    private String token;
+    private String sessionKey; // Session token for dispatch server
+    private List<String> permissions;
     private Locale locale;
 
-	private String banReason;
-	private int banEndTime;
-	private int banStartTime;
-	private boolean isBanned;
-	
-	@Deprecated
-	public Account() {
-		this.permissions = new ArrayList<>();
+    private String banReason;
+    private int banEndTime;
+    private int banStartTime;
+    private boolean isBanned;
+
+    @Deprecated
+    public Account() {
+        this.permissions = new ArrayList<>();
         this.locale = LANGUAGE;
-	}
+    }
 
-	public String getId() {
-		return id;
-	}
+    public String getId() {
+        return id;
+    }
 
-	public void setId(String id) {
-		this.id = id;
-	}
+    public void setId(String id) {
+        this.id = id;
+    }
 
-	public String getUsername() {
-		return username;
-	}
+    public String getUsername() {
+        return username;
+    }
 
-	public void setUsername(String username) {
-		this.username = username;
-	}
+    public void setUsername(String username) {
+        this.username = username;
+    }
 
-	public String getPassword() {
-		return password;
-	}
+    public String getPassword() {
+        return password;
+    }
 
-	public void setPassword(String password) {
-		this.password = password;
-	}
+    public void setPassword(String password) {
+        this.password = password;
+    }
 
-	public String getToken() {
-		return token;
-	}
+    public String getToken() {
+        return token;
+    }
 
-	public void setToken(String token) {
-		this.token = token;
-	}
+    public void setToken(String token) {
+        this.token = token;
+    }
 
-	public int getReservedPlayerUid() {
-		return this.reservedPlayerId;
-	}
+    public int getReservedPlayerUid() {
+        return this.reservedPlayerId;
+    }
 
-	public void setReservedPlayerUid(int playerId) {
-		this.reservedPlayerId = playerId;
-	}
-	
-	public String getEmail() {
-		if(email != null && !email.isEmpty()) {
-			return email;
-		} else {
-			return "";
-		}
-	}
+    public void setReservedPlayerUid(int playerId) {
+        this.reservedPlayerId = playerId;
+    }
 
-	public void setEmail(String email) {
-		this.email = email;
-	}
+    public String getEmail() {
+        if (email != null && !email.isEmpty()) {
+            return email;
+        } else {
+            return "";
+        }
+    }
 
-	public String getSessionKey() {
-		return this.sessionKey;
-	}
+    public void setEmail(String email) {
+        this.email = email;
+    }
 
-	public String generateSessionKey() {
-		this.sessionKey = Utils.bytesToHex(Crypto.createSessionKey(32));
-		this.save();
-		return this.sessionKey;
-	}
+    public String getSessionKey() {
+        return this.sessionKey;
+    }
+
+    public String generateSessionKey() {
+        this.sessionKey = Utils.bytesToHex(Crypto.createSessionKey(32));
+        this.save();
+        return this.sessionKey;
+    }
 
     public Locale getLocale() {
         return locale;
@@ -110,126 +110,127 @@ public class Account {
         this.locale = locale;
     }
 
-	public String getBanReason() {
-		return banReason;
-	}
+    public String getBanReason() {
+        return banReason;
+    }
 
-	public void setBanReason(String banReason) {
-		this.banReason = banReason;
-	}
+    public void setBanReason(String banReason) {
+        this.banReason = banReason;
+    }
 
-	public int getBanEndTime() {
-		return banEndTime;
-	}
+    public int getBanEndTime() {
+        return banEndTime;
+    }
 
-	public void setBanEndTime(int banEndTime) {
-		this.banEndTime = banEndTime;
-	}
+    public void setBanEndTime(int banEndTime) {
+        this.banEndTime = banEndTime;
+    }
 
-	public int getBanStartTime() {
-		return banStartTime;
-	}
+    public int getBanStartTime() {
+        return banStartTime;
+    }
 
-	public void setBanStartTime(int banStartTime) {
-		this.banStartTime = banStartTime;
-	}
+    public void setBanStartTime(int banStartTime) {
+        this.banStartTime = banStartTime;
+    }
 
-	public boolean isBanned() {
-		if (banEndTime > 0 && banEndTime < System.currentTimeMillis() / 1000) {
-			this.isBanned = false;
-			this.banEndTime = 0;
-			this.banStartTime = 0;
-			this.banReason = null;
-			save();
-		}
+    public boolean isBanned() {
+        if (banEndTime > 0 && banEndTime < System.currentTimeMillis() / 1000) {
+            this.isBanned = false;
+            this.banEndTime = 0;
+            this.banStartTime = 0;
+            this.banReason = null;
+            save();
+        }
 
-		return isBanned;
-	}
+        return isBanned;
+    }
 
-	public void setBanned(boolean isBanned) {
-		this.isBanned = isBanned;
-	}
+    public void setBanned(boolean isBanned) {
+        this.isBanned = isBanned;
+    }
 
-	/**
-	 * The collection of a player's permissions.
-	 */
-	public List<String> getPermissions() {
-		return this.permissions;
-	}
-	
-	public boolean addPermission(String permission) {
-		if(this.permissions.contains(permission)) return false;
-		this.permissions.add(permission); return true;
-	}
+    /**
+     * The collection of a player's permissions.
+     */
+    public List<String> getPermissions() {
+        return this.permissions;
+    }
 
-	public static boolean permissionMatchesWildcard(String wildcard, String[] permissionParts) {
-		String[] wildcardParts = wildcard.split("\\.");
-		if (permissionParts.length < wildcardParts.length) {  // A longer wildcard can never match a shorter permission
-			return false;
-		}
-		for (int i=0; i<wildcardParts.length; i++) {
-			switch (wildcardParts[i]) {
-				case "**":  // Recursing match
-					return true;
-				case "*":  // Match only one layer
-					if (i >= (permissionParts.length-1)) {
-						return true;
-					}
-					break;
-				default:  // This layer isn't a wildcard, it needs to match exactly
-					if (!wildcardParts[i].equals(permissionParts[i])) {
-						return false;
-					}
-			}
-		}
-		// At this point the wildcard will have matched every layer, but if it is shorter then the permission then this is not a match at this point (no **).
-		return (wildcardParts.length == permissionParts.length);
-	}
+    public boolean addPermission(String permission) {
+        if (this.permissions.contains(permission)) return false;
+        this.permissions.add(permission); return true;
+    }
 
-	public boolean hasPermission(String permission) {
-		if(this.permissions.contains("*") && this.permissions.size() == 1) return true;
+    public static boolean permissionMatchesWildcard(String wildcard, String[] permissionParts) {
+        String[] wildcardParts = wildcard.split("\\.");
+        if (permissionParts.length < wildcardParts.length) {  // A longer wildcard can never match a shorter permission
+            return false;
+        }
+        for (int i=0; i<wildcardParts.length; i++) {
+            switch (wildcardParts[i]) {
+                case "**":  // Recursing match
+                    return true;
+                case "*":  // Match only one layer
+                    if (i >= (permissionParts.length-1)) {
+                        return true;
+                    }
+                    break;
+                default:  // This layer isn't a wildcard, it needs to match exactly
+                    if (!wildcardParts[i].equals(permissionParts[i])) {
+                        return false;
+                    }
+            }
+        }
+        // At this point the wildcard will have matched every layer, but if it is shorter then the permission then this is not a match at this point (no **).
+        return (wildcardParts.length == permissionParts.length);
+    }
 
-		// Add default permissions if it doesn't exist
-		List<String> permissions = Stream.of(this.permissions, Arrays.asList(ACCOUNT.defaultPermissions))
-				.flatMap(Collection::stream)
-				.distinct().toList();
+    public boolean hasPermission(String permission) {
+        if (permission.isEmpty()) return true;
+        if (this.permissions.contains("*") && this.permissions.size() == 1) return true;
 
-		if (permissions.contains(permission)) return true;
+        // Add default permissions if it doesn't exist
+        List<String> permissions = Stream.of(this.permissions, Arrays.asList(ACCOUNT.defaultPermissions))
+                .flatMap(Collection::stream)
+                .distinct().toList();
 
-		String[] permissionParts = permission.split("\\.");
-		for (String p : permissions) {
-			if (p.startsWith("-") && permissionMatchesWildcard(p.substring(1), permissionParts)) return false;
-			if (permissionMatchesWildcard(p, permissionParts)) return true;
-		}
+        if (permissions.contains(permission)) return true;
 
-		return permissions.contains("*");
-	}
+        String[] permissionParts = permission.split("\\.");
+        for (String p : permissions) {
+            if (p.startsWith("-") && permissionMatchesWildcard(p.substring(1), permissionParts)) return false;
+            if (permissionMatchesWildcard(p, permissionParts)) return true;
+        }
 
-	public boolean removePermission(String permission) {
-		return this.permissions.remove(permission);
-	}
+        return permissions.contains("*");
+    }
 
-	// TODO make unique
-	public String generateLoginToken() {
-		this.token = Utils.bytesToHex(Crypto.createSessionKey(32));
-		this.save();
-		return this.token;
-	}
-	
-	public void save() {
-		DatabaseHelper.saveAccount(this);
-	}
+    public boolean removePermission(String permission) {
+        return this.permissions.remove(permission);
+    }
 
-	@PreLoad
-	public void onLoad(Document document) {
-		// Grant the superuser permissions to accounts created before the permissions update
-		if (!document.containsKey("permissions")) {
-			this.addPermission("*");
-		}
+    // TODO make unique
+    public String generateLoginToken() {
+        this.token = Utils.bytesToHex(Crypto.createSessionKey(32));
+        this.save();
+        return this.token;
+    }
+
+    public void save() {
+        DatabaseHelper.saveAccount(this);
+    }
+
+    @PreLoad
+    public void onLoad(Document document) {
+        // Grant the superuser permissions to accounts created before the permissions update
+        if (!document.containsKey("permissions")) {
+            this.addPermission("*");
+        }
 
         // Set account default language as server default language
         if (!document.containsKey("locale")) {
             this.locale = LANGUAGE;
         }
-	}
+    }
 }

src/main/java/emu/grasscutter/game/ability/AbilityManager.java

@@ -1,29 +1,15 @@
 package emu.grasscutter.game.ability;
 
-import java.util.*;
-import java.util.Optional;
-import java.util.Map.Entry;
-
 import com.google.protobuf.InvalidProtocolBufferException;
 
-import emu.grasscutter.Grasscutter;
-
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.binout.AbilityModifierEntry;
 import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
-import emu.grasscutter.data.excels.AvatarSkillDepotData;
-import emu.grasscutter.data.excels.ItemData;
-import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.game.entity.EntityAvatar;
-import emu.grasscutter.game.entity.EntityClientGadget;
 import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.game.entity.EntityItem;
 import emu.grasscutter.game.entity.GameEntity;
 import emu.grasscutter.game.entity.gadget.GadgetGatherObject;
-import emu.grasscutter.game.entity.gadget.GadgetGatherPoint;
+import emu.grasscutter.game.player.BasePlayerManager;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.ElementType;
-import emu.grasscutter.net.proto.AbilityActionGenerateElemBallOuterClass.AbilityActionGenerateElemBall;
 import emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead;
 import emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry;
 import emu.grasscutter.net.proto.AbilityMetaModifierChangeOuterClass.AbilityMetaModifierChange;
@@ -31,169 +17,161 @@ import emu.grasscutter.net.proto.AbilityMetaReInitOverrideMapOuterClass.AbilityM
 import emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina;
 import emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry;
 import emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction;
-import emu.grasscutter.utils.Position;
-import emu.grasscutter.utils.Utils;
-import emu.grasscutter.game.props.FightProperty;
 
-public class AbilityManager {
-	private Player player;
+public class AbilityManager extends BasePlayerManager {
     HealAbilityManager healAbilityManager;
-	
-	public AbilityManager(Player player) {
-		this.player = player;
-        this.healAbilityManager = new HealAbilityManager(player);
-	}
-	
-	public Player getPlayer() {
-		return this.player;
-	}
 
-	public void onAbilityInvoke(AbilityInvokeEntry invoke) throws Exception {
+    public AbilityManager(Player player) {
+        super(player);
+        this.healAbilityManager = new HealAbilityManager(player);
+    }
+
+    public void onAbilityInvoke(AbilityInvokeEntry invoke) throws Exception {
         healAbilityManager.healHandler(invoke);
 
-		 //Grasscutter.getLogger().info(invoke.getArgumentType() + " (" + invoke.getArgumentTypeValue() + "): " + Utils.bytesToHex(invoke.toByteArray()));
-		switch (invoke.getArgumentType()) {
-			case ABILITY_INVOKE_ARGUMENT_META_OVERRIDE_PARAM:
-				handleOverrideParam(invoke);
-				break;
-			case ABILITY_INVOKE_ARGUMENT_META_REINIT_OVERRIDEMAP:
-				handleReinitOverrideMap(invoke);
-				break;
-			case ABILITY_INVOKE_ARGUMENT_META_MODIFIER_CHANGE:
-				handleModifierChange(invoke);
-				break;
-			case ABILITY_INVOKE_ARGUMENT_MIXIN_COST_STAMINA:
-				handleMixinCostStamina(invoke);
-				break;
-			case ABILITY_INVOKE_ARGUMENT_ACTION_GENERATE_ELEM_BALL:
-				handleGenerateElemBall(invoke);
-				break;
-			default:
-				break;
-		}
-
-	}
-
-	private void handleOverrideParam(AbilityInvokeEntry invoke) throws Exception {
-		GameEntity entity = player.getScene().getEntityById(invoke.getEntityId());
-		
-		if (entity == null) {
-			return;
-		}
-		
-		AbilityScalarValueEntry entry = AbilityScalarValueEntry.parseFrom(invoke.getAbilityData());
-		
-		entity.getMetaOverrideMap().put(entry.getKey().getStr(), entry.getFloatValue());
-	}
-
-	private void handleReinitOverrideMap(AbilityInvokeEntry invoke) throws Exception {
-		GameEntity entity = player.getScene().getEntityById(invoke.getEntityId());
-		
-		if (entity == null) {
-			return;
-		}
-		
-		AbilityMetaReInitOverrideMap map = AbilityMetaReInitOverrideMap.parseFrom(invoke.getAbilityData());
-		
-		for (AbilityScalarValueEntry entry : map.getOverrideMapList()) {
-			entity.getMetaOverrideMap().put(entry.getKey().getStr(), entry.getFloatValue());
-		}
-	}
-	
-	private void handleModifierChange(AbilityInvokeEntry invoke) throws Exception {
-		// Sanity checks
-		GameEntity target = player.getScene().getEntityById(invoke.getEntityId());
-		if (target == null) {
-			return;
-		}
-		
-		AbilityMetaModifierChange data = AbilityMetaModifierChange.parseFrom(invoke.getAbilityData());
-		if (data == null) {
-			return;
-		}
-		
-		// Destroying rocks
-		if (target instanceof EntityGadget targetGadget && targetGadget.getContent() instanceof GadgetGatherObject gatherObject) {
-			if (data.getAction() == ModifierAction.REMOVED) {
-				gatherObject.dropItems(this.getPlayer());
-				return;
-			}
+         //Grasscutter.getLogger().info(invoke.getArgumentType() + " (" + invoke.getArgumentTypeValue() + "): " + Utils.bytesToHex(invoke.toByteArray()));
+        switch (invoke.getArgumentType()) {
+            case ABILITY_INVOKE_ARGUMENT_META_OVERRIDE_PARAM:
+                handleOverrideParam(invoke);
+                break;
+            case ABILITY_INVOKE_ARGUMENT_META_REINIT_OVERRIDEMAP:
+                handleReinitOverrideMap(invoke);
+                break;
+            case ABILITY_INVOKE_ARGUMENT_META_MODIFIER_CHANGE:
+                handleModifierChange(invoke);
+                break;
+            case ABILITY_INVOKE_ARGUMENT_MIXIN_COST_STAMINA:
+                handleMixinCostStamina(invoke);
+                break;
+            case ABILITY_INVOKE_ARGUMENT_ACTION_GENERATE_ELEM_BALL:
+                handleGenerateElemBall(invoke);
+                break;
+            default:
+                break;
         }
-		
-		// Sanity checks
-		AbilityInvokeEntryHead head = invoke.getHead();
-		if (head == null) {
-			return;
-		}
-		
-		GameEntity sourceEntity = player.getScene().getEntityById(data.getApplyEntityId());
-		if (sourceEntity == null) {
-			return;
-		}
-		
-		// This is not how it works but we will keep it for now since healing abilities dont work properly anyways
-		if (data.getAction() == ModifierAction.ADDED && data.getParentAbilityName() != null) {
-			// Handle add modifier here
-			String modifierString = data.getParentAbilityName().getStr();
-			AbilityModifierEntry modifier = GameData.getAbilityModifiers().get(modifierString);
-			
-			if (modifier != null && modifier.getOnAdded().size() > 0) {
-				for (AbilityModifierAction action : modifier.getOnAdded()) {
-					invokeAction(action, target, sourceEntity);
-				}
-			}
-			
-			// Add to meta modifier list
-			target.getMetaModifiers().put(head.getInstancedModifierId(), modifierString);
-		} else if (data.getAction() == ModifierAction.REMOVED) {
-			// Handle remove modifier
-			String modifierString = target.getMetaModifiers().get(head.getInstancedModifierId());
-			
-			if (modifierString != null) {
-				// Get modifier and call on remove event
-				AbilityModifierEntry modifier = GameData.getAbilityModifiers().get(modifierString);
-				
-				if (modifier != null && modifier.getOnRemoved().size() > 0) {
-					for (AbilityModifierAction action : modifier.getOnRemoved()) {
-						invokeAction(action, target, sourceEntity);
-					}
-				}
-				
-				// Remove from meta modifiers
-				target.getMetaModifiers().remove(head.getInstancedModifierId());
-			}
-		}
-	}
-	
-	private void handleMixinCostStamina(AbilityInvokeEntry invoke) throws InvalidProtocolBufferException {
-		AbilityMixinCostStamina costStamina = AbilityMixinCostStamina.parseFrom((invoke.getAbilityData()));
-		getPlayer().getStaminaManager().handleMixinCostStamina(costStamina.getIsSwim());
-	}
 
-	private void handleGenerateElemBall(AbilityInvokeEntry invoke) throws InvalidProtocolBufferException {
-		this.player.getEnergyManager().handleGenerateElemBall(invoke);
-	}
-	
-	private void invokeAction(AbilityModifierAction action, GameEntity target, GameEntity sourceEntity) {
-		switch (action.type) {
-			case HealHP -> {
-			}
-			case LoseHP -> {
-				if (action.amountByTargetCurrentHPRatio == null) {
-					return;
-				}
-				
-				float damageAmount = 0;
-				
-				if (action.amount.isDynamic && action.amount.dynamicKey != null) {
-					damageAmount = sourceEntity.getMetaOverrideMap().getOrDefault(action.amount.dynamicKey, 0f);
-				}
-				
-				if (damageAmount > 0) {
-					target.damage(damageAmount);
-				}
-			}
-		}
-	}
+    }
+
+    private void handleOverrideParam(AbilityInvokeEntry invoke) throws Exception {
+        GameEntity entity = player.getScene().getEntityById(invoke.getEntityId());
+
+        if (entity == null) {
+            return;
+        }
+
+        AbilityScalarValueEntry entry = AbilityScalarValueEntry.parseFrom(invoke.getAbilityData());
+
+        entity.getMetaOverrideMap().put(entry.getKey().getStr(), entry.getFloatValue());
+    }
+
+    private void handleReinitOverrideMap(AbilityInvokeEntry invoke) throws Exception {
+        GameEntity entity = player.getScene().getEntityById(invoke.getEntityId());
+
+        if (entity == null) {
+            return;
+        }
+
+        AbilityMetaReInitOverrideMap map = AbilityMetaReInitOverrideMap.parseFrom(invoke.getAbilityData());
+
+        for (AbilityScalarValueEntry entry : map.getOverrideMapList()) {
+            entity.getMetaOverrideMap().put(entry.getKey().getStr(), entry.getFloatValue());
+        }
+    }
+
+    private void handleModifierChange(AbilityInvokeEntry invoke) throws Exception {
+        // Sanity checks
+        GameEntity target = player.getScene().getEntityById(invoke.getEntityId());
+        if (target == null) {
+            return;
+        }
+
+        AbilityMetaModifierChange data = AbilityMetaModifierChange.parseFrom(invoke.getAbilityData());
+        if (data == null) {
+            return;
+        }
+
+        // Destroying rocks
+        if (target instanceof EntityGadget targetGadget && targetGadget.getContent() instanceof GadgetGatherObject gatherObject) {
+            if (data.getAction() == ModifierAction.REMOVED) {
+                gatherObject.dropItems(this.getPlayer());
+                return;
+            }
+        }
+
+        // Sanity checks
+        AbilityInvokeEntryHead head = invoke.getHead();
+        if (head == null) {
+            return;
+        }
+
+        GameEntity sourceEntity = player.getScene().getEntityById(data.getApplyEntityId());
+        if (sourceEntity == null) {
+            return;
+        }
+
+        // This is not how it works but we will keep it for now since healing abilities dont work properly anyways
+        if (data.getAction() == ModifierAction.ADDED && data.getParentAbilityName() != null) {
+            // Handle add modifier here
+            String modifierString = data.getParentAbilityName().getStr();
+            AbilityModifierEntry modifier = GameData.getAbilityModifiers().get(modifierString);
+
+            if (modifier != null && modifier.getOnAdded().size() > 0) {
+                for (AbilityModifierAction action : modifier.getOnAdded()) {
+                    invokeAction(action, target, sourceEntity);
+                }
+            }
+
+            // Add to meta modifier list
+            target.getMetaModifiers().put(head.getInstancedModifierId(), modifierString);
+        } else if (data.getAction() == ModifierAction.REMOVED) {
+            // Handle remove modifier
+            String modifierString = target.getMetaModifiers().get(head.getInstancedModifierId());
+
+            if (modifierString != null) {
+                // Get modifier and call on remove event
+                AbilityModifierEntry modifier = GameData.getAbilityModifiers().get(modifierString);
+
+                if (modifier != null && modifier.getOnRemoved().size() > 0) {
+                    for (AbilityModifierAction action : modifier.getOnRemoved()) {
+                        invokeAction(action, target, sourceEntity);
+                    }
+                }
+
+                // Remove from meta modifiers
+                target.getMetaModifiers().remove(head.getInstancedModifierId());
+            }
+        }
+    }
+
+    private void handleMixinCostStamina(AbilityInvokeEntry invoke) throws InvalidProtocolBufferException {
+        AbilityMixinCostStamina costStamina = AbilityMixinCostStamina.parseFrom((invoke.getAbilityData()));
+        getPlayer().getStaminaManager().handleMixinCostStamina(costStamina.getIsSwim());
+    }
+
+    private void handleGenerateElemBall(AbilityInvokeEntry invoke) throws InvalidProtocolBufferException {
+        this.player.getEnergyManager().handleGenerateElemBall(invoke);
+    }
+
+    private void invokeAction(AbilityModifierAction action, GameEntity target, GameEntity sourceEntity) {
+        switch (action.type) {
+            case HealHP -> {
+            }
+            case LoseHP -> {
+                if (action.amountByTargetCurrentHPRatio == null) {
+                    return;
+                }
+
+                float damageAmount = 0;
+
+                if (action.amount.isDynamic && action.amount.dynamicKey != null) {
+                    damageAmount = sourceEntity.getMetaOverrideMap().getOrDefault(action.amount.dynamicKey, 0f);
+                }
+
+                if (damageAmount > 0) {
+                    target.damage(damageAmount);
+                }
+            }
+        }
+    }
 }
 

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

@@ -5,6 +5,7 @@ import com.google.gson.reflect.TypeToken;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.DataLoader;
 import emu.grasscutter.data.GameData;
+import emu.grasscutter.game.player.BasePlayerManager;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.ActivityType;
 import emu.grasscutter.game.props.WatcherTriggerType;
@@ -15,13 +16,13 @@ import org.reflections.Reflections;
 
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.Reader;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
 @Getter
-public class ActivityManager {
+public class ActivityManager extends BasePlayerManager {
     private static final Map<Integer, ActivityConfigItem> activityConfigItemMap;
-    private final Player player;
     private final Map<Integer, PlayerActivityData> playerActivityDataMap;
 
     static {
@@ -44,24 +45,24 @@ public class ActivityManager {
             activityWatcherTypeMap.put(typeName.value(), ConstructorAccess.get(item));
         });
 
-        try(InputStream is = DataLoader.load("ActivityConfig.json"); InputStreamReader isr = new InputStreamReader(is)) {
+        try (Reader reader = DataLoader.loadReader("ActivityConfig.json")) {
             List<ActivityConfigItem> activities = Grasscutter.getGsonFactory().fromJson(
-                isr,
+                reader,
                 TypeToken.getParameterized(List.class, ActivityConfigItem.class).getType());
 
 
             activities.forEach(item -> {
                 var activityData = GameData.getActivityDataMap().get(item.getActivityId());
-                if(activityData == null){
+                if (activityData == null) {
                     Grasscutter.getLogger().warn("activity {} not exist.", item.getActivityId());
                     return;
                 }
                 var activityHandlerType = activityHandlerTypeMap.get(ActivityType.getTypeByName(activityData.getActivityType()));
                 ActivityHandler activityHandler;
 
-                if(activityHandlerType != null) {
+                if (activityHandlerType != null) {
                     activityHandler = (ActivityHandler) activityHandlerType.newInstance();
-                }else{
+                }else {
                     activityHandler = new DefaultActivityHandler();
                 }
                 activityHandler.setActivityConfigItem(item);
@@ -78,14 +79,14 @@ public class ActivityManager {
 
     }
 
-    public ActivityManager(Player player){
-        this.player = player;
+    public ActivityManager(Player player) {
+        super(player);
 
         playerActivityDataMap = new ConcurrentHashMap<>();
         // load data for player
         activityConfigItemMap.values().forEach(item -> {
             var data = PlayerActivityData.getByPlayer(player, item.getActivityId());
-            if(data == null){
+            if (data == null) {
                 data = item.getActivityHandler().initPlayerActivityData(player);
                 data.save();
             }
@@ -115,34 +116,34 @@ public class ActivityManager {
             params));
     }
 
-    public ActivityInfoOuterClass.ActivityInfo getInfoProtoByActivityId(int activityId){
+    public ActivityInfoOuterClass.ActivityInfo getInfoProtoByActivityId(int activityId) {
         var activityHandler = activityConfigItemMap.get(activityId).getActivityHandler();
         var activityData = playerActivityDataMap.get(activityId);
 
         return activityHandler.toProto(activityData);
     }
 
-    public Optional<ActivityHandler> getActivityHandler(ActivityType type){
+    public Optional<ActivityHandler> getActivityHandler(ActivityType type) {
         return activityConfigItemMap.values().stream()
             .map(ActivityConfigItem::getActivityHandler)
             .filter(x -> type == x.getClass().getAnnotation(GameActivity.class).value())
             .findFirst();
     }
 
-    public <T extends ActivityHandler> Optional<T> getActivityHandlerAs(ActivityType type, Class<T> clazz){
+    public <T extends ActivityHandler> Optional<T> getActivityHandlerAs(ActivityType type, Class<T> clazz) {
         return getActivityHandler(type).map(x -> (T)x);
     }
 
-    public Optional<Integer> getActivityIdByActivityType(ActivityType type){
+    public Optional<Integer> getActivityIdByActivityType(ActivityType type) {
         return getActivityHandler(type)
             .map(ActivityHandler::getActivityConfigItem)
             .map(ActivityConfigItem::getActivityId);
     }
-    public Optional<PlayerActivityData> getPlayerActivityDataByActivityType(ActivityType type){
+    public Optional<PlayerActivityData> getPlayerActivityDataByActivityType(ActivityType type) {
         return getActivityIdByActivityType(type)
             .map(playerActivityDataMap::get);
     }
-    public Optional<ActivityInfoOuterClass.ActivityInfo> getInfoProtoByActivityType(ActivityType type){
+    public Optional<ActivityInfoOuterClass.ActivityInfo> getInfoProtoByActivityType(ActivityType type) {
        return getActivityIdByActivityType(type)
            .map(this::getInfoProtoByActivityId);
     }

src/main/java/emu/grasscutter/game/activity/musicgame/MusicGameActivityHandler.java

@@ -29,21 +29,20 @@ public class MusicGameActivityHandler extends ActivityHandler {
             .putAllMusicGameRecordMap(
                 musicGamePlayerData.getMusicGameRecord().values().stream()
                     .collect(Collectors.toMap(MusicGamePlayerData.MusicGameRecord::getMusicId, MusicGamePlayerData.MusicGameRecord::toProto)))
-
             .addAllPersonCustomBeatmap(musicGamePlayerData.getPersonalCustomBeatmapRecord().values().stream()
                 .map(MusicGamePlayerData.CustomBeatmapRecord::toPersonalBriefProto)
                 .map(MusicBriefInfoOuterClass.MusicBriefInfo.Builder::build)
                 .toList())
 
-            .addAllPersonCustomBeatmap(musicGamePlayerData.getOthersCustomBeatmapRecord().values().stream()
+            .addAllOthersCustomBeatmap(musicGamePlayerData.getOthersCustomBeatmapRecord().values().stream()
                 .map(MusicGamePlayerData.CustomBeatmapRecord::toOthersBriefProto)
                 .map(MusicBriefInfoOuterClass.MusicBriefInfo.Builder::build)
                 .toList())
             .build());
     }
 
-    public MusicGamePlayerData getMusicGamePlayerData(PlayerActivityData playerActivityData){
-        if(playerActivityData.getDetail() == null || playerActivityData.getDetail().isBlank()){
+    public MusicGamePlayerData getMusicGamePlayerData(PlayerActivityData playerActivityData) {
+        if (playerActivityData.getDetail() == null || playerActivityData.getDetail().isBlank()) {
             onInitPlayerActivityData(playerActivityData);
             playerActivityData.save();
         }
@@ -52,7 +51,7 @@ public class MusicGameActivityHandler extends ActivityHandler {
             MusicGamePlayerData.class);
     }
 
-    public boolean setMusicGameRecord(PlayerActivityData playerActivityData, MusicGamePlayerData.MusicGameRecord newRecord){
+    public boolean setMusicGameRecord(PlayerActivityData playerActivityData, MusicGamePlayerData.MusicGameRecord newRecord) {
         var musicGamePlayerData = getMusicGamePlayerData(playerActivityData);
         var saveRecord = musicGamePlayerData.getMusicGameRecord().get(newRecord.getMusicId());
 
@@ -64,7 +63,7 @@ public class MusicGameActivityHandler extends ActivityHandler {
 
         return newRecord.getMaxScore() > saveRecord.getMaxScore();
     }
-    public void setMusicGameCustomBeatmapRecord(PlayerActivityData playerActivityData, MusicGamePlayerData.CustomBeatmapRecord newRecord){
+    public void setMusicGameCustomBeatmapRecord(PlayerActivityData playerActivityData, MusicGamePlayerData.CustomBeatmapRecord newRecord) {
         var musicGamePlayerData = getMusicGamePlayerData(playerActivityData);
         musicGamePlayerData.getOthersCustomBeatmapRecord().put(newRecord.getMusicShareId(), newRecord);
 

src/main/java/emu/grasscutter/game/activity/musicgame/MusicGamePlayerData.java

@@ -21,7 +21,7 @@ public class MusicGamePlayerData {
     Map<Long, CustomBeatmapRecord> personalCustomBeatmapRecord;
     Map<Long, CustomBeatmapRecord> othersCustomBeatmapRecord;
 
-    public static MusicGamePlayerData create(){
+    public static MusicGamePlayerData create() {
         return MusicGamePlayerData.of()
             .musicGameRecord(GameData.getMusicGameBasicDataMap().values().stream()
                 .collect(Collectors.toMap(MusicGameBasicData::getId, MusicGamePlayerData.MusicGameRecord::create)))
@@ -38,13 +38,13 @@ public class MusicGamePlayerData {
         int maxCombo;
         int maxScore;
 
-        public static MusicGameRecord create(MusicGameBasicData musicGameBasicData){
+        public static MusicGameRecord create(MusicGameBasicData musicGameBasicData) {
             return MusicGameRecord.of()
                 .musicId(musicGameBasicData.getId())
                 .build();
         }
 
-        public MusicGameRecordOuterClass.MusicGameRecord toProto(){
+        public MusicGameRecordOuterClass.MusicGameRecord toProto() {
             return MusicGameRecordOuterClass.MusicGameRecord.newBuilder()
                 .setIsUnlock(true)
                 .setMaxCombo(maxCombo)
@@ -61,7 +61,7 @@ public class MusicGamePlayerData {
         int score;
         boolean settle;
 
-        public MusicBriefInfoOuterClass.MusicBriefInfo.Builder toPersonalBriefProto(){
+        public MusicBriefInfoOuterClass.MusicBriefInfo.Builder toPersonalBriefProto() {
             var musicGameBeatmap = MusicGameBeatmap.getByShareId(musicShareId);
 
             return MusicBriefInfoOuterClass.MusicBriefInfo.newBuilder()
@@ -71,11 +71,10 @@ public class MusicGamePlayerData {
                 .setMaxScore(musicGameBeatmap.getMaxScore())
                 .setPosition(musicGameBeatmap.getSavePosition())
                 .setMusicNoteCount(musicGameBeatmap.getMusicNoteCount())
-                .setMusicShareId(musicShareId)
-                ;
+                .setMusicShareId(musicShareId);
         }
 
-        public MusicBriefInfoOuterClass.MusicBriefInfo.Builder toOthersBriefProto(){
+        public MusicBriefInfoOuterClass.MusicBriefInfo.Builder toOthersBriefProto() {
             var musicGameBeatmap = MusicGameBeatmap.getByShareId(musicShareId);
 
             return musicGameBeatmap.toBriefProto()

src/main/java/emu/grasscutter/game/avatar/AvatarProfileData.java

@@ -1,26 +0,0 @@
-package emu.grasscutter.game.avatar;
-
-import dev.morphia.annotations.Entity;
-
-@Entity
-public class AvatarProfileData {
-	private int avatarId;
-	private int level;
-	
-	public AvatarProfileData(Avatar avatar) {
-		this.update(avatar);
-	}
-
-	public int getAvatarId() {
-		return avatarId;
-	}
-
-	public int getLevel() {
-		return level;
-	}
-
-	public void update(Avatar avatar) {
-		this.avatarId = avatar.getAvatarId();
-		this.level = avatar.getLevel();
-	}
-}

src/main/java/emu/grasscutter/game/avatar/AvatarStorage.java

@@ -9,6 +9,7 @@ import emu.grasscutter.data.excels.AvatarSkillDepotData;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.game.entity.EntityAvatar;
 import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.game.player.BasePlayerManager;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.server.packet.send.PacketAvatarChangeCostumeNotify;
 import emu.grasscutter.server.packet.send.PacketAvatarFlycloakChangeNotify;
@@ -17,161 +18,156 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
 import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
 
-public class AvatarStorage implements Iterable<Avatar> {
-	private final Player player;
-	private final Int2ObjectMap<Avatar> avatars;
-	private final Long2ObjectMap<Avatar> avatarsGuid;
-	
-	public AvatarStorage(Player player) {
-		this.player = player;
-		this.avatars = new Int2ObjectOpenHashMap<>();
-		this.avatarsGuid = new Long2ObjectOpenHashMap<>();
-	}
-	
-	public Player getPlayer() {
-		return player;
-	}
+public class AvatarStorage extends BasePlayerManager implements Iterable<Avatar> {
+    private final Int2ObjectMap<Avatar> avatars;
+    private final Long2ObjectMap<Avatar> avatarsGuid;
 
-	public Int2ObjectMap<Avatar> getAvatars() {
-		return avatars;
-	}
-	
-	public int getAvatarCount() {
-		return this.avatars.size();
-	}
-	
-	public Avatar getAvatarById(int id) {
-		return getAvatars().get(id);
-	}
-	
-	public Avatar getAvatarByGuid(long id) {
-		return avatarsGuid.get(id);
-	}
-	
-	public boolean hasAvatar(int id) {
-		return getAvatars().containsKey(id);
-	}
-	
-	public boolean addAvatar(Avatar avatar) {
-		if (avatar.getAvatarData() == null || this.hasAvatar(avatar.getAvatarId())) {
-			return false;
-		}
-		
-		// Set owner first
-		avatar.setOwner(getPlayer());
+    public AvatarStorage(Player player) {
+        super(player);
+        this.avatars = new Int2ObjectOpenHashMap<>();
+        this.avatarsGuid = new Long2ObjectOpenHashMap<>();
+    }
 
-		// Put into maps
-		this.avatars.put(avatar.getAvatarId(), avatar);
-		this.avatarsGuid.put(avatar.getGuid(), avatar);
+    public Int2ObjectMap<Avatar> getAvatars() {
+        return avatars;
+    }
 
-		avatar.save();
+    public int getAvatarCount() {
+        return this.avatars.size();
+    }
 
-		return true;
-	}
-	
-	public void addStartingWeapon(Avatar avatar) {
-		// Make sure avatar owner is this player
-		if (avatar.getPlayer() != this.getPlayer()) {
-			return;
-		}
-		
-		// Create weapon
-		GameItem weapon = new GameItem(avatar.getAvatarData().getInitialWeapon());
-		
-		if (weapon.getItemData() != null) {
-			this.getPlayer().getInventory().addItem(weapon);
-			
-			avatar.equipItem(weapon, true);
-		}
-	}
-	
-	public boolean wearFlycloak(long avatarGuid, int flycloakId) {
-		Avatar avatar = this.getAvatarByGuid(avatarGuid);
+    public Avatar getAvatarById(int id) {
+        return getAvatars().get(id);
+    }
 
-		if (avatar == null || !getPlayer().getFlyCloakList().contains(flycloakId)) {
-			return false;
-		}
-		
-		avatar.setFlyCloak(flycloakId);
-		avatar.save();
-		
-		// Update
-		getPlayer().sendPacket(new PacketAvatarFlycloakChangeNotify(avatar));
+    public Avatar getAvatarByGuid(long id) {
+        return avatarsGuid.get(id);
+    }
 
-		return true;
-	}
-	
-	public boolean changeCostume(long avatarGuid, int costumeId) {
-		Avatar avatar = this.getAvatarByGuid(avatarGuid);
+    public boolean hasAvatar(int id) {
+        return getAvatars().containsKey(id);
+    }
 
-		if (avatar == null) {
-			return false;
-		}
-		
-		if (costumeId != 0 && !getPlayer().getCostumeList().contains(costumeId)) {
-			return false;
-		}
-		
-		// TODO make sure avatar can wear costume
-		
-		avatar.setCostume(costumeId);
-		avatar.save();
+    public boolean addAvatar(Avatar avatar) {
+        if (avatar.getAvatarData() == null || this.hasAvatar(avatar.getAvatarId())) {
+            return false;
+        }
 
-		// Update entity
-		EntityAvatar entity = avatar.getAsEntity();
-		if (entity == null) {
-			entity = new EntityAvatar(avatar);
-			getPlayer().sendPacket(new PacketAvatarChangeCostumeNotify(entity));
-		} else {
-			getPlayer().getScene().broadcastPacket(new PacketAvatarChangeCostumeNotify(entity));
-		}
-		
-		// Done
-		return true;
-	}
-	
-	public void loadFromDatabase() {
-		List<Avatar> avatars = DatabaseHelper.getAvatars(getPlayer());
-		
-		for (Avatar avatar : avatars) {
-			// Should never happen
-			if (avatar.getObjectId() == null) {
-				continue;
-			}
-			
-			AvatarData avatarData = GameData.getAvatarDataMap().get(avatar.getAvatarId());
-			AvatarSkillDepotData skillDepot = GameData.getAvatarSkillDepotDataMap().get(avatar.getSkillDepotId());
-			if (avatarData == null || skillDepot == null) {
-				continue;
-			}
-			
-			// Set ownerships
-			avatar.setAvatarData(avatarData);
-			avatar.setSkillDepot(skillDepot);
-			avatar.setOwner(getPlayer());
-			
-			// Force recalc of const boosted skills
-			avatar.recalcConstellations();
-			
-			// Add to avatar storage
-			this.avatars.put(avatar.getAvatarId(), avatar);
-			this.avatarsGuid.put(avatar.getGuid(), avatar);
-		}
-	}
-	
-	public void postLoad() {
-		for (Avatar avatar : this) {
-			// Weapon check
-			if (avatar.getWeapon() == null) {
-				this.addStartingWeapon(avatar);
-			}
-			// Recalc stats
-			avatar.recalcStats();
-		}
-	}
+        // Set owner first
+        avatar.setOwner(getPlayer());
 
-	@Override
-	public Iterator<Avatar> iterator() {
-		return getAvatars().values().iterator();
-	}
+        // Put into maps
+        this.avatars.put(avatar.getAvatarId(), avatar);
+        this.avatarsGuid.put(avatar.getGuid(), avatar);
+
+        avatar.save();
+
+        return true;
+    }
+
+    public void addStartingWeapon(Avatar avatar) {
+        // Make sure avatar owner is this player
+        if (avatar.getPlayer() != this.getPlayer()) {
+            return;
+        }
+
+        // Create weapon
+        GameItem weapon = new GameItem(avatar.getAvatarData().getInitialWeapon());
+
+        if (weapon.getItemData() != null) {
+            this.getPlayer().getInventory().addItem(weapon);
+
+            avatar.equipItem(weapon, true);
+        }
+    }
+
+    public boolean wearFlycloak(long avatarGuid, int flycloakId) {
+        Avatar avatar = this.getAvatarByGuid(avatarGuid);
+
+        if (avatar == null || !getPlayer().getFlyCloakList().contains(flycloakId)) {
+            return false;
+        }
+
+        avatar.setFlyCloak(flycloakId);
+        avatar.save();
+
+        // Update
+        getPlayer().sendPacket(new PacketAvatarFlycloakChangeNotify(avatar));
+
+        return true;
+    }
+
+    public boolean changeCostume(long avatarGuid, int costumeId) {
+        Avatar avatar = this.getAvatarByGuid(avatarGuid);
+
+        if (avatar == null) {
+            return false;
+        }
+
+        if (costumeId != 0 && !getPlayer().getCostumeList().contains(costumeId)) {
+            return false;
+        }
+
+        // TODO make sure avatar can wear costume
+
+        avatar.setCostume(costumeId);
+        avatar.save();
+
+        // Update entity
+        EntityAvatar entity = avatar.getAsEntity();
+        if (entity == null) {
+            entity = new EntityAvatar(avatar);
+            getPlayer().sendPacket(new PacketAvatarChangeCostumeNotify(entity));
+        } else {
+            getPlayer().getScene().broadcastPacket(new PacketAvatarChangeCostumeNotify(entity));
+        }
+
+        // Done
+        return true;
+    }
+
+    public void loadFromDatabase() {
+        List<Avatar> avatars = DatabaseHelper.getAvatars(getPlayer());
+
+        for (Avatar avatar : avatars) {
+            // Should never happen
+            if (avatar.getObjectId() == null) {
+                continue;
+            }
+
+            AvatarData avatarData = GameData.getAvatarDataMap().get(avatar.getAvatarId());
+            AvatarSkillDepotData skillDepot = GameData.getAvatarSkillDepotDataMap().get(avatar.getSkillDepotId());
+            if (avatarData == null || skillDepot == null) {
+                continue;
+            }
+
+            // Set ownerships
+            avatar.setAvatarData(avatarData);
+            avatar.setSkillDepot(skillDepot);
+            avatar.setOwner(getPlayer());
+
+            // Force recalc of const boosted skills
+            avatar.recalcConstellations();
+
+            // Add to avatar storage
+            this.avatars.put(avatar.getAvatarId(), avatar);
+            this.avatarsGuid.put(avatar.getGuid(), avatar);
+        }
+    }
+
+    public void postLoad() {
+        for (Avatar avatar : this) {
+            // Weapon check
+            if (avatar.getWeapon() == null) {
+                this.addStartingWeapon(avatar);
+            }
+            // Recalc stats
+            avatar.recalcStats();
+        }
+    }
+
+    @Override
+    public Iterator<Avatar> iterator() {
+        return getAvatars().values().iterator();
+    }
 }

src/main/java/emu/grasscutter/game/battlepass/BattlePassManager.java

@@ -15,7 +15,6 @@ import org.bson.types.ObjectId;
 import dev.morphia.annotations.Entity;
 import dev.morphia.annotations.Id;
 import dev.morphia.annotations.Indexed;
-import dev.morphia.annotations.Transient;
 import emu.grasscutter.GameConstants;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.GameData;
@@ -26,9 +25,11 @@ import emu.grasscutter.data.excels.RewardData;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.inventory.MaterialType;
+import emu.grasscutter.game.player.BasePlayerDataManager;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.BattlePassMissionRefreshType;
 import emu.grasscutter.game.props.BattlePassMissionStatus;
+import emu.grasscutter.game.props.ItemUseOp;
 import emu.grasscutter.game.props.WatcherTriggerType;
 import emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle;
 import emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus;
@@ -41,324 +42,324 @@ import emu.grasscutter.server.packet.send.PacketTakeBattlePassRewardRsp;
 import lombok.Getter;
 
 @Entity(value = "battlepass", useDiscriminator = false)
-public class BattlePassManager {
-	@Id @Getter private ObjectId id;
-	@Transient @Getter private Player player;
-	
-	@Indexed private int ownerUid;
+public class BattlePassManager extends BasePlayerDataManager {
+    @Id @Getter private ObjectId id;
+
+    @Indexed private int ownerUid;
     @Getter private int point;
     @Getter private int cyclePoints; // Weekly maximum cap
     @Getter private int level;
-    
+
     @Getter private boolean viewed;
     private boolean paid;
-    
+
     private Map<Integer, BattlePassMission> missions;
     private Map<Integer, BattlePassReward> takenRewards;
-    
+
     @Deprecated // Morphia only
     public BattlePassManager() {}
 
     public BattlePassManager(Player player) {
-        this.setPlayer(player);
+        super(player);
+        this.ownerUid = player.getUid();
     }
-    
+
     public void setPlayer(Player player) {
-    	this.player = player;
-    	this.ownerUid = player.getUid();
+        this.player = player;
+        this.ownerUid = player.getUid();
     }
-    
+
     public void updateViewed() {
-		this.viewed = true;
+        this.viewed = true;
     }
 
-	public boolean setLevel(int level) {
-		if (level >= 0 && level <= GameConstants.BATTLE_PASS_MAX_LEVEL) {
-			this.level = level;
-			this.point = 0;
-			this.player.sendPacket(new PacketBattlePassCurScheduleUpdateNotify(this.player));
-			return true;
-		}
-		return false;
-	}
+    public boolean setLevel(int level) {
+        if (level >= 0 && level <= GameConstants.BATTLE_PASS_MAX_LEVEL) {
+            this.level = level;
+            this.point = 0;
+            this.player.sendPacket(new PacketBattlePassCurScheduleUpdateNotify(this.player));
+            return true;
+        }
+        return false;
+    }
 
-	public void addPoints(int points){
+    public void addPoints(int points) {
         this.addPointsDirectly(points, false);
-   
+
         this.player.sendPacket(new PacketBattlePassCurScheduleUpdateNotify(player));
         this.save();
     }
 
     public void addPointsDirectly(int points, boolean isWeekly) {
-    	int amount = points;
-    	
-    	if (isWeekly) {
-    		amount = Math.min(amount, GameConstants.BATTLE_PASS_POINT_PER_WEEK - this.cyclePoints);
-    	}
-    	
-    	if (amount <= 0) {
-    		return;
-    	}
-    	
+        int amount = points;
+
+        if (isWeekly) {
+            amount = Math.min(amount, GameConstants.BATTLE_PASS_POINT_PER_WEEK - this.cyclePoints);
+        }
+
+        if (amount <= 0) {
+            return;
+        }
+
         this.point += amount;
         this.cyclePoints += amount;
-        
+
         if (this.point >= GameConstants.BATTLE_PASS_POINT_PER_LEVEL && this.getLevel() < GameConstants.BATTLE_PASS_MAX_LEVEL) {
-        	int levelups = Math.floorDiv(this.point, GameConstants.BATTLE_PASS_POINT_PER_LEVEL);
-        	
-        	// Make sure player cant go above max BP level
-        	levelups = Math.min(levelups, GameConstants.BATTLE_PASS_MAX_LEVEL - levelups);
-        	
-        	// Set new points after level up
-        	this.point = this.point - (levelups * GameConstants.BATTLE_PASS_POINT_PER_LEVEL);
-        	this.level += levelups;
+            int levelups = Math.floorDiv(this.point, GameConstants.BATTLE_PASS_POINT_PER_LEVEL);
+
+            // Make sure player cant go above max BP level
+            levelups = Math.min(levelups, GameConstants.BATTLE_PASS_MAX_LEVEL - levelups);
+
+            // Set new points after level up
+            this.point = this.point - (levelups * GameConstants.BATTLE_PASS_POINT_PER_LEVEL);
+            this.level += levelups;
         }
     }
-    
-	public Map<Integer, BattlePassMission> getMissions() {
-		if (this.missions == null) this.missions = new HashMap<>();
-		return this.missions;
-	}
 
-	// Will return a new empty mission if the mission id is not found
-	public BattlePassMission loadMissionById(int id) {
-		return getMissions().computeIfAbsent(id, i -> new BattlePassMission(i));
-	}
-	
-	public boolean hasMission(int id) {
-		return getMissions().containsKey(id);
-	}
+    public Map<Integer, BattlePassMission> getMissions() {
+        if (this.missions == null) this.missions = new HashMap<>();
+        return this.missions;
+    }
 
-	public boolean isPaid() {
-		// ToDo: Change this when we actually support unlocking "paid" BP.
-		return true;
-	}
+    // Will return a new empty mission if the mission id is not found
+    public BattlePassMission loadMissionById(int id) {
+        return getMissions().computeIfAbsent(id, i -> new BattlePassMission(i));
+    }
 
-	public Map<Integer, BattlePassReward> getTakenRewards() {
-		if (this.takenRewards == null) this.takenRewards = new HashMap<>();
-		return this.takenRewards;
-	}
-	
-	// Mission triggers
-	public void triggerMission(WatcherTriggerType triggerType) {
-		getPlayer().getServer().getBattlePassMissionManager().triggerMission(getPlayer(), triggerType);
-	}
-	
-	public void triggerMission(WatcherTriggerType triggerType, int param, int progress) {
-		getPlayer().getServer().getBattlePassMissionManager().triggerMission(getPlayer(), triggerType, param, progress);
-	}
-	
-	// Handlers
-	public void takeMissionPoint(List<Integer> missionIdList) {
-		// Obvious exploit check
-		if (missionIdList.size() > GameData.getBattlePassMissionDataMap().size()) {
-			return;
-		}
-		
-		List<BattlePassMission> updatedMissions = new ArrayList<>(missionIdList.size());
-		
-		for (int id : missionIdList) {
-			// Skip if we dont have this mission
-			if (!this.hasMission(id)) {
-				continue;
-			}
-			
-			BattlePassMission mission = this.loadMissionById(id);
-			
-			if (mission.getData() == null) {
-				this.getMissions().remove(mission.getId());
-				continue;
-			}
-			
-			// Take reward
-			if (mission.getStatus() == BattlePassMissionStatus.MISSION_STATUS_FINISHED) {
-				this.addPointsDirectly(mission.getData().getAddPoint(), mission.getData().isCycleRefresh());
-				mission.setStatus(BattlePassMissionStatus.MISSION_STATUS_POINT_TAKEN);
-				
-				updatedMissions.add(mission);
-			}
-		}
-		
-		if (updatedMissions.size() > 0) {
-			// Save to db
-			this.save();
-			
-			// Packet
-			getPlayer().sendPacket(new PacketBattlePassMissionUpdateNotify(updatedMissions));
-			getPlayer().sendPacket(new PacketBattlePassCurScheduleUpdateNotify(getPlayer()));
-		}
-	}
+    public boolean hasMission(int id) {
+        return getMissions().containsKey(id);
+    }
 
-	private void takeRewardsFromSelectChest(ItemData rewardItemData, int index, ItemParamData entry, List<GameItem> rewardItems) {
-		// Sanity checks.
-		if (rewardItemData.getItemUse().size() < 1) {
-			return;
-		}
+    public boolean isPaid() {
+        // ToDo: Change this when we actually support unlocking "paid" BP.
+        return true;
+    }
 
-		// Get possible item choices.
-		String[] choices = rewardItemData.getItemUse().get(0).getUseParam().get(0).split(",");
-		if (choices.length < index) {
-			return;
-		}
+    public Map<Integer, BattlePassReward> getTakenRewards() {
+        if (this.takenRewards == null) this.takenRewards = new HashMap<>();
+        return this.takenRewards;
+    }
 
-		// Get data for the selected item.
-		// This depends on the type of chest.
-		int chosenId = Integer.parseInt(choices[index - 1]);
+    // Mission triggers
+    public void triggerMission(WatcherTriggerType triggerType) {
+        getPlayer().getServer().getBattlePassSystem().triggerMission(getPlayer(), triggerType);
+    }
 
-		// For ITEM_USE_ADD_SELECT_ITEM chests, we can directly add the item specified in the chest's data.
-		if (rewardItemData.getItemUse().get(0).getUseOp().equals("ITEM_USE_ADD_SELECT_ITEM")) {
-			GameItem rewardItem = new GameItem(GameData.getItemDataMap().get(chosenId), entry.getItemCount());
-			rewardItems.add(rewardItem);
-		}
-		// For ITEM_USE_GRANT_SELECT_REWARD chests, we have to again look up reward data.
-		else if (rewardItemData.getItemUse().get(0).getUseOp().equals("ITEM_USE_GRANT_SELECT_REWARD")) {
-			RewardData selectedReward = GameData.getRewardDataMap().get(chosenId);
+    public void triggerMission(WatcherTriggerType triggerType, int param, int progress) {
+        getPlayer().getServer().getBattlePassSystem().triggerMission(getPlayer(), triggerType, param, progress);
+    }
 
-			for (var r : selectedReward.getRewardItemList()) {
-				GameItem rewardItem = new GameItem(GameData.getItemDataMap().get(r.getItemId()), r.getItemCount());
-				rewardItems.add(rewardItem);
-			}
-		}
-		else {
-			Grasscutter.getLogger().error("Invalid chest type for BP reward.");
-		}
-	}
-	
-	public void takeReward(List<BattlePassRewardTakeOption> takeOptionList) {
-		List<BattlePassRewardTakeOption> rewardList = new ArrayList<>();
-		
-		for (BattlePassRewardTakeOption option : takeOptionList) {
-			// Duplicate check
-			if (option.getTag().getRewardId() == 0 || getTakenRewards().containsKey(option.getTag().getRewardId())) {
-				continue;
-			}
-			
-			// Level check
-			if (option.getTag().getLevel() > this.getLevel()) {
-				continue;
-			}
-			
-			BattlePassRewardData rewardData = GameData.getBattlePassRewardDataMap().get(GameConstants.BATTLE_PASS_CURRENT_INDEX * 100 + option.getTag().getLevel());
-			
-			// Sanity check with excel data
-			if (rewardData.getFreeRewardIdList().contains(option.getTag().getRewardId())) {
-				rewardList.add(option);
-			} else if (this.isPaid() && rewardData.getPaidRewardIdList().contains(option.getTag().getRewardId())) {
-				rewardList.add(option);
-			}
-			else {
-				Grasscutter.getLogger().info("Not in rewards list: {}", option.getTag().getRewardId());
-			}
-		}
-		
-		// Get rewards
-		List<GameItem> rewardItems = null;
-		
-		if (rewardList.size() > 0) {
+    // Handlers
+    public void takeMissionPoint(List<Integer> missionIdList) {
+        // Obvious exploit check
+        if (missionIdList.size() > GameData.getBattlePassMissionDataMap().size()) {
+            return;
+        }
 
-			rewardItems = new ArrayList<>();
-			
-			for (var option : rewardList) {
-				var tag = option.getTag();
-				int index = option.getOptionIdx();
+        List<BattlePassMission> updatedMissions = new ArrayList<>(missionIdList.size());
 
-				// Make sure we have reward data.
-				RewardData reward = GameData.getRewardDataMap().get(tag.getRewardId());
-				if (reward == null) {
-					continue;
-				}
-				
-				// Add reward items.
-				for (var entry : reward.getRewardItemList()) {
-					ItemData rewardItemData = GameData.getItemDataMap().get(entry.getItemId());
+        for (int id : missionIdList) {
+            // Skip if we dont have this mission
+            if (!this.hasMission(id)) {
+                continue;
+            }
 
-					// Some rewards are chests where the user can select the item they want.
-					if (rewardItemData.getMaterialType() == MaterialType.MATERIAL_SELECTABLE_CHEST) {
-						this.takeRewardsFromSelectChest(rewardItemData, index, entry, rewardItems);
-					}
-					// All other rewards directly give us the right item.
-					else {
-						GameItem rewardItem = new GameItem(rewardItemData, entry.getItemCount());
-						rewardItems.add(rewardItem);
-					}
-				}
+            BattlePassMission mission = this.loadMissionById(id);
 
-				// Construct the reward and set as taken.
-				BattlePassReward bpReward = new BattlePassReward(tag.getLevel(), tag.getRewardId(), tag.getUnlockStatus() == BattlePassUnlockStatus.BATTLE_PASS_UNLOCK_STATUS_PAID);
-				this.getTakenRewards().put(bpReward.getRewardId(), bpReward);
-			}
-			
-			// Save to db
-			this.save();
-			
-			// Add items and send battle pass schedule packet
-			getPlayer().getInventory().addItems(rewardItems);
-			getPlayer().sendPacket(new PacketBattlePassCurScheduleUpdateNotify(getPlayer()));
-		}
-		
-		getPlayer().sendPacket(new PacketTakeBattlePassRewardRsp(takeOptionList, rewardItems));
-	}
-	
-	public int buyLevels(int buyLevel) {
-		int boughtLevels = Math.min(buyLevel, GameConstants.BATTLE_PASS_MAX_LEVEL - buyLevel);
-		
-		if (boughtLevels > 0) {
-			int price = GameConstants.BATTLE_PASS_LEVEL_PRICE * boughtLevels;
-			
-			if (getPlayer().getPrimogems() < price) {
-				return 0;
-			}
-			
-			this.level += boughtLevels;
-			this.save();
-			
-			getPlayer().sendPacket(new PacketBattlePassCurScheduleUpdateNotify(getPlayer()));
-		}
-		
-		return boughtLevels;
-	}
-	
-	public void resetDailyMissions() {
-		var resetMissions = new ArrayList<BattlePassMission>();
+            if (mission.getData() == null) {
+                this.getMissions().remove(mission.getId());
+                continue;
+            }
 
-		for (var mission : this.missions.values()) {
-			if (mission.getData().getRefreshType() == null || mission.getData().getRefreshType() == BattlePassMissionRefreshType.BATTLE_PASS_MISSION_REFRESH_DAILY) {
-				mission.setStatus(BattlePassMissionStatus.MISSION_STATUS_UNFINISHED);
-				mission.setProgress(0);
+            // Take reward
+            if (mission.getStatus() == BattlePassMissionStatus.MISSION_STATUS_FINISHED) {
+                this.addPointsDirectly(mission.getData().getAddPoint(), mission.getData().isCycleRefresh());
+                mission.setStatus(BattlePassMissionStatus.MISSION_STATUS_POINT_TAKEN);
 
-				resetMissions.add(mission);
-			}
-		}
+                updatedMissions.add(mission);
+            }
+        }
 
-		this.getPlayer().sendPacket(new PacketBattlePassMissionUpdateNotify(resetMissions));
-		this.getPlayer().sendPacket(new PacketBattlePassCurScheduleUpdateNotify(this.getPlayer()));
-	}
-	
-	public void resetWeeklyMissions() {
-		var resetMissions = new ArrayList<BattlePassMission>();
+        if (updatedMissions.size() > 0) {
+            // Save to db
+            this.save();
 
-		for (var mission : this.missions.values()) {
-			if (mission.getData().getRefreshType() == BattlePassMissionRefreshType.BATTLE_PASS_MISSION_REFRESH_CYCLE_CROSS_SCHEDULE) {
-				mission.setStatus(BattlePassMissionStatus.MISSION_STATUS_UNFINISHED);
-				mission.setProgress(0);
+            // Packet
+            getPlayer().sendPacket(new PacketBattlePassMissionUpdateNotify(updatedMissions));
+            getPlayer().sendPacket(new PacketBattlePassCurScheduleUpdateNotify(getPlayer()));
+        }
+    }
 
-				resetMissions.add(mission);
-			}
-		}
+    private void takeRewardsFromSelectChest(ItemData rewardItemData, int index, ItemParamData entry, List<GameItem> rewardItems) {
+        // Sanity checks.
+        if (rewardItemData.getItemUse().size() < 1) {
+            return;
+        }
 
-		this.getPlayer().sendPacket(new PacketBattlePassMissionUpdateNotify(resetMissions));
-		this.getPlayer().sendPacket(new PacketBattlePassCurScheduleUpdateNotify(this.getPlayer()));
-	}
-	
-	//
-	public BattlePassSchedule getScheduleProto() {
-		var currentDate = LocalDate.now();
-		var nextSundayDate = (currentDate.getDayOfWeek() == DayOfWeek.SUNDAY) 
-			? currentDate 
-			: LocalDate.now().with(TemporalAdjusters.next(DayOfWeek.SUNDAY));
-		var nextSundayTime = LocalDateTime.of(nextSundayDate.getYear(), nextSundayDate.getMonthValue(), nextSundayDate.getDayOfMonth(), 23, 59, 59);
-		
-		BattlePassSchedule.Builder schedule = BattlePassSchedule.newBuilder()
+        // Get possible item choices.
+        String[] choices = rewardItemData.getItemUse().get(0).getUseParam()[0].split(",");
+        if (choices.length < index) {
+            return;
+        }
+
+        // Get data for the selected item.
+        // This depends on the type of chest.
+        int chosenId = Integer.parseInt(choices[index - 1]);
+
+        // For ITEM_USE_ADD_SELECT_ITEM chests, we can directly add the item specified in the chest's data.
+        if (rewardItemData.getItemUse().get(0).getUseOp() == ItemUseOp.ITEM_USE_ADD_SELECT_ITEM) {
+            GameItem rewardItem = new GameItem(GameData.getItemDataMap().get(chosenId), entry.getItemCount());
+            rewardItems.add(rewardItem);
+        }
+        // For ITEM_USE_GRANT_SELECT_REWARD chests, we have to again look up reward data.
+        else if (rewardItemData.getItemUse().get(0).getUseOp().equals("ITEM_USE_GRANT_SELECT_REWARD")) {
+            RewardData selectedReward = GameData.getRewardDataMap().get(chosenId);
+
+            for (var r : selectedReward.getRewardItemList()) {
+                GameItem rewardItem = new GameItem(GameData.getItemDataMap().get(r.getItemId()), r.getItemCount());
+                rewardItems.add(rewardItem);
+            }
+        }
+        else {
+            Grasscutter.getLogger().error("Invalid chest type for BP reward.");
+        }
+    }
+
+    public void takeReward(List<BattlePassRewardTakeOption> takeOptionList) {
+        List<BattlePassRewardTakeOption> rewardList = new ArrayList<>();
+
+        for (BattlePassRewardTakeOption option : takeOptionList) {
+            // Duplicate check
+            if (option.getTag().getRewardId() == 0 || getTakenRewards().containsKey(option.getTag().getRewardId())) {
+                continue;
+            }
+
+            // Level check
+            if (option.getTag().getLevel() > this.getLevel()) {
+                continue;
+            }
+
+            BattlePassRewardData rewardData = GameData.getBattlePassRewardDataMap().get(GameConstants.BATTLE_PASS_CURRENT_INDEX * 100 + option.getTag().getLevel());
+
+            // Sanity check with excel data
+            if (rewardData.getFreeRewardIdList().contains(option.getTag().getRewardId())) {
+                rewardList.add(option);
+            } else if (this.isPaid() && rewardData.getPaidRewardIdList().contains(option.getTag().getRewardId())) {
+                rewardList.add(option);
+            }
+            else {
+                Grasscutter.getLogger().info("Not in rewards list: {}", option.getTag().getRewardId());
+            }
+        }
+
+        // Get rewards
+        List<GameItem> rewardItems = null;
+
+        if (rewardList.size() > 0) {
+
+            rewardItems = new ArrayList<>();
+
+            for (var option : rewardList) {
+                var tag = option.getTag();
+                int index = option.getOptionIdx();
+
+                // Make sure we have reward data.
+                RewardData reward = GameData.getRewardDataMap().get(tag.getRewardId());
+                if (reward == null) {
+                    continue;
+                }
+
+                // Add reward items.
+                for (var entry : reward.getRewardItemList()) {
+                    ItemData rewardItemData = GameData.getItemDataMap().get(entry.getItemId());
+
+                    // Some rewards are chests where the user can select the item they want.
+                    if (rewardItemData.getMaterialType() == MaterialType.MATERIAL_SELECTABLE_CHEST) {
+                        this.takeRewardsFromSelectChest(rewardItemData, index, entry, rewardItems);
+                    }
+                    // All other rewards directly give us the right item.
+                    else {
+                        GameItem rewardItem = new GameItem(rewardItemData, entry.getItemCount());
+                        rewardItems.add(rewardItem);
+                    }
+                }
+
+                // Construct the reward and set as taken.
+                BattlePassReward bpReward = new BattlePassReward(tag.getLevel(), tag.getRewardId(), tag.getUnlockStatus() == BattlePassUnlockStatus.BATTLE_PASS_UNLOCK_STATUS_PAID);
+                this.getTakenRewards().put(bpReward.getRewardId(), bpReward);
+            }
+
+            // Save to db
+            this.save();
+
+            // Add items and send battle pass schedule packet
+            getPlayer().getInventory().addItems(rewardItems);
+            getPlayer().sendPacket(new PacketBattlePassCurScheduleUpdateNotify(getPlayer()));
+        }
+
+        getPlayer().sendPacket(new PacketTakeBattlePassRewardRsp(takeOptionList, rewardItems));
+    }
+
+    public int buyLevels(int buyLevel) {
+        int boughtLevels = Math.min(buyLevel, GameConstants.BATTLE_PASS_MAX_LEVEL - buyLevel);
+
+        if (boughtLevels > 0) {
+            int price = GameConstants.BATTLE_PASS_LEVEL_PRICE * boughtLevels;
+
+            if (getPlayer().getPrimogems() < price) {
+                return 0;
+            }
+
+            this.level += boughtLevels;
+            this.save();
+
+            getPlayer().sendPacket(new PacketBattlePassCurScheduleUpdateNotify(getPlayer()));
+        }
+
+        return boughtLevels;
+    }
+
+    public void resetDailyMissions() {
+        var resetMissions = new ArrayList<BattlePassMission>();
+
+        for (var mission : this.missions.values()) {
+            if (mission.getData().getRefreshType() == null || mission.getData().getRefreshType() == BattlePassMissionRefreshType.BATTLE_PASS_MISSION_REFRESH_DAILY) {
+                mission.setStatus(BattlePassMissionStatus.MISSION_STATUS_UNFINISHED);
+                mission.setProgress(0);
+
+                resetMissions.add(mission);
+            }
+        }
+
+        this.getPlayer().sendPacket(new PacketBattlePassMissionUpdateNotify(resetMissions));
+        this.getPlayer().sendPacket(new PacketBattlePassCurScheduleUpdateNotify(this.getPlayer()));
+    }
+
+    public void resetWeeklyMissions() {
+        var resetMissions = new ArrayList<BattlePassMission>();
+
+        for (var mission : this.missions.values()) {
+            if (mission.getData().getRefreshType() == BattlePassMissionRefreshType.BATTLE_PASS_MISSION_REFRESH_CYCLE_CROSS_SCHEDULE) {
+                mission.setStatus(BattlePassMissionStatus.MISSION_STATUS_UNFINISHED);
+                mission.setProgress(0);
+
+                resetMissions.add(mission);
+            }
+        }
+
+        this.getPlayer().sendPacket(new PacketBattlePassMissionUpdateNotify(resetMissions));
+        this.getPlayer().sendPacket(new PacketBattlePassCurScheduleUpdateNotify(this.getPlayer()));
+    }
+
+    //
+    public BattlePassSchedule getScheduleProto() {
+        var currentDate = LocalDate.now();
+        var nextSundayDate = (currentDate.getDayOfWeek() == DayOfWeek.SUNDAY)
+            ? currentDate
+            : LocalDate.now().with(TemporalAdjusters.next(DayOfWeek.SUNDAY));
+        var nextSundayTime = LocalDateTime.of(nextSundayDate.getYear(), nextSundayDate.getMonthValue(), nextSundayDate.getDayOfMonth(), 23, 59, 59);
+
+        BattlePassSchedule.Builder schedule = BattlePassSchedule.newBuilder()
                 .setScheduleId(2700)
                 .setLevel(this.getLevel())
                 .setPoint(this.getPoint())
@@ -367,21 +368,21 @@ public class BattlePassManager {
                 .setIsViewed(this.isViewed())
                 .setUnlockStatus(this.isPaid() ? BattlePassUnlockStatus.BATTLE_PASS_UNLOCK_STATUS_PAID : BattlePassUnlockStatus.BATTLE_PASS_UNLOCK_STATUS_FREE)
                 .setJPFMGBEBBBJ(2) // Not bought on Playstation.
-				.setCurCyclePoints(this.getCyclePoints())
+                .setCurCyclePoints(this.getCyclePoints())
                 .setCurCycle(BattlePassCycle.newBuilder()
-					.setBeginTime(0)
-					.setEndTime((int)nextSundayTime.atZone(ZoneId.systemDefault()).toEpochSecond())
-					.setCycleIdx(3)
-				);
-		
-		for (BattlePassReward reward : getTakenRewards().values()) {
-			schedule.addRewardTakenList(reward.toProto());
-		}
-		
-		return schedule.build();
-	}
-	
+                    .setBeginTime(0)
+                    .setEndTime((int)nextSundayTime.atZone(ZoneId.systemDefault()).toEpochSecond())
+                    .setCycleIdx(3)
+                );
+
+        for (BattlePassReward reward : getTakenRewards().values()) {
+            schedule.addRewardTakenList(reward.toProto());
+        }
+
+        return schedule.build();
+    }
+
     public void save() {
-    	DatabaseHelper.saveBattlePass(this);
+        DatabaseHelper.saveBattlePass(this);
     }
 }

src/main/java/emu/grasscutter/game/battlepass/BattlePassMissionManager.java

@@ -1,78 +0,0 @@
-package emu.grasscutter.game.battlepass;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.excels.BattlePassMissionData;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.BattlePassMissionRefreshType;
-import emu.grasscutter.game.props.BattlePassMissionStatus;
-import emu.grasscutter.game.props.WatcherTriggerType;
-import emu.grasscutter.server.game.GameServer;
-import emu.grasscutter.server.packet.send.PacketBattlePassMissionUpdateNotify;
-
-public class BattlePassMissionManager {
-	private final GameServer server;
-	private final Map<WatcherTriggerType, List<BattlePassMissionData>> cachedTriggers;
-	
-	// BP Mission manager for the server, contains cached triggers so we dont have to load it for each player
-	public BattlePassMissionManager(GameServer server) {
-		this.server = server;
-		this.cachedTriggers = new HashMap<>();
-		
-		for (BattlePassMissionData missionData : GameData.getBattlePassMissionDataMap().values()) {
-			if (missionData.isValidRefreshType()) {
-				List<BattlePassMissionData> triggerList = getTriggers().computeIfAbsent(missionData.getTriggerType(), e -> new ArrayList<>());
-				triggerList.add(missionData);
-			}
-		}
-	}
-
-	public GameServer getServer() {
-		return server;
-	}
-	
-	private Map<WatcherTriggerType, List<BattlePassMissionData>> getTriggers() {
-		return cachedTriggers;
-	}
-	
-	public void triggerMission(Player player, WatcherTriggerType triggerType) {
-		triggerMission(player, triggerType, 0, 1);
-	}
-
-	public void triggerMission(Player player, WatcherTriggerType triggerType, int param, int progress) {
-		List<BattlePassMissionData> triggerList = getTriggers().get(triggerType);
-		
-		if (triggerList == null || triggerList.isEmpty()) return;
-		
-		for (BattlePassMissionData data : triggerList) {
-			// Skip params check if param == 0
-			if (param != 0) {
-				if (!data.getMainParams().contains(param)) {
-					continue;
-				}
-			}
-			
-			// Get mission from player, if it doesnt exist, then we make one
-			BattlePassMission mission = player.getBattlePassManager().loadMissionById(data.getId());
-			
-			if (mission.isFinshed()) continue;
-
-			// Add progress
-			mission.addProgress(progress, data.getProgress());
-			
-			if (mission.getProgress() >= data.getProgress()) {
-				mission.setStatus(BattlePassMissionStatus.MISSION_STATUS_FINISHED);
-			}
-			
-			// Save to db
-			player.getBattlePassManager().save();
-			
-			// Packet
-			player.sendPacket(new PacketBattlePassMissionUpdateNotify(mission));
-		}
-	}
-}

src/main/java/emu/grasscutter/game/battlepass/BattlePassSystem.java

@@ -0,0 +1,79 @@
+package emu.grasscutter.game.battlepass;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.excels.BattlePassMissionData;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.BattlePassMissionRefreshType;
+import emu.grasscutter.game.props.BattlePassMissionStatus;
+import emu.grasscutter.game.props.WatcherTriggerType;
+import emu.grasscutter.server.game.BaseGameSystem;
+import emu.grasscutter.server.game.GameServer;
+import emu.grasscutter.server.packet.send.PacketBattlePassMissionUpdateNotify;
+
+public class BattlePassSystem extends BaseGameSystem {
+    private final Map<WatcherTriggerType, List<BattlePassMissionData>> cachedTriggers;
+
+    // BP Mission manager for the server, contains cached triggers so we dont have to load it for each player
+    public BattlePassSystem(GameServer server) {
+        super(server);
+
+        this.cachedTriggers = new HashMap<>();
+
+        for (BattlePassMissionData missionData : GameData.getBattlePassMissionDataMap().values()) {
+            if (missionData.isValidRefreshType()) {
+                List<BattlePassMissionData> triggerList = getTriggers().computeIfAbsent(missionData.getTriggerType(), e -> new ArrayList<>());
+                triggerList.add(missionData);
+            }
+        }
+    }
+
+    public GameServer getServer() {
+        return server;
+    }
+
+    private Map<WatcherTriggerType, List<BattlePassMissionData>> getTriggers() {
+        return cachedTriggers;
+    }
+
+    public void triggerMission(Player player, WatcherTriggerType triggerType) {
+        triggerMission(player, triggerType, 0, 1);
+    }
+
+    public void triggerMission(Player player, WatcherTriggerType triggerType, int param, int progress) {
+        List<BattlePassMissionData> triggerList = getTriggers().get(triggerType);
+
+        if (triggerList == null || triggerList.isEmpty()) return;
+
+        for (BattlePassMissionData data : triggerList) {
+            // Skip params check if param == 0
+            if (param != 0) {
+                if (!data.getMainParams().contains(param)) {
+                    continue;
+                }
+            }
+
+            // Get mission from player, if it doesnt exist, then we make one
+            BattlePassMission mission = player.getBattlePassManager().loadMissionById(data.getId());
+
+            if (mission.isFinshed()) continue;
+
+            // Add progress
+            mission.addProgress(progress, data.getProgress());
+
+            if (mission.getProgress() >= data.getProgress()) {
+                mission.setStatus(BattlePassMissionStatus.MISSION_STATUS_FINISHED);
+            }
+
+            // Save to db
+            player.getBattlePassManager().save();
+
+            // Packet
+            player.sendPacket(new PacketBattlePassMissionUpdateNotify(mission));
+        }
+    }
+}

src/main/java/emu/grasscutter/game/combine/CombineManger.java

@@ -10,8 +10,10 @@ import emu.grasscutter.game.inventory.Inventory;
 import emu.grasscutter.game.inventory.ItemType;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.ActionReason;
+import emu.grasscutter.game.props.ItemUseOp;
 import emu.grasscutter.net.proto.RetcodeOuterClass;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
+import emu.grasscutter.server.game.BaseGameSystem;
 import emu.grasscutter.server.game.GameServer;
 import emu.grasscutter.server.packet.send.PacketCombineFormulaDataNotify;
 import emu.grasscutter.server.packet.send.PacketCombineRsp;
@@ -29,65 +31,60 @@ import java.util.List;
 
 import com.google.gson.reflect.TypeToken;
 
-public class CombineManger {
-    private final GameServer gameServer;
-	private final static Int2ObjectMap<List<Integer>> reliquaryDecomposeData = new Int2ObjectOpenHashMap<>();
+public class CombineManger extends BaseGameSystem {
+    private final static Int2ObjectMap<List<Integer>> reliquaryDecomposeData = new Int2ObjectOpenHashMap<>();
 
-    public GameServer getGameServer() {
-        return gameServer;
-    }
-
-    public CombineManger(GameServer gameServer) {
-        this.gameServer = gameServer;
+    public CombineManger(GameServer server) {
+        super(server);
     }
 
     public static void initialize() {
-		// Read the data we need for strongbox.
-		try (Reader fileReader = new InputStreamReader(DataLoader.load("ReliquaryDecompose.json"))) {
-			List<ReliquaryDecomposeEntry> decomposeEntries = Grasscutter.getGsonFactory().fromJson(fileReader, TypeToken.getParameterized(Collection.class, ReliquaryDecomposeEntry.class).getType());
+        // Read the data we need for strongbox.
+        try (Reader fileReader = DataLoader.loadReader("ReliquaryDecompose.json")) {
+            List<ReliquaryDecomposeEntry> decomposeEntries = Grasscutter.getGsonFactory().fromJson(fileReader, TypeToken.getParameterized(Collection.class, ReliquaryDecomposeEntry.class).getType());
 
-			for (ReliquaryDecomposeEntry entry : decomposeEntries) {
-				reliquaryDecomposeData.put(entry.getConfigId(), entry.getItems());
-			}
+            for (ReliquaryDecomposeEntry entry : decomposeEntries) {
+                reliquaryDecomposeData.put(entry.getConfigId(), entry.getItems());
+            }
 
-			Grasscutter.getLogger().debug("Loaded {} reliquary decompose entries.", reliquaryDecomposeData.size());
-		}
-		catch (Exception ex) {
-			Grasscutter.getLogger().error("Unable to load reliquary decompose data.", ex);
-		}
-	}
+            Grasscutter.getLogger().debug("Loaded {} reliquary decompose entries.", reliquaryDecomposeData.size());
+        }
+        catch (Exception ex) {
+            Grasscutter.getLogger().error("Unable to load reliquary decompose data.", ex);
+        }
+    }
 
     public boolean unlockCombineDiagram(Player player, GameItem diagramItem) {
-		// Make sure this is actually a diagram.
-		if (!diagramItem.getItemData().getItemUse().get(0).getUseOp().equals("ITEM_USE_UNLOCK_COMBINE")) {
-			return false;
-		}
+        // Make sure this is actually a diagram.
+        if (diagramItem.getItemData().getItemUse().get(0).getUseOp() != ItemUseOp.ITEM_USE_UNLOCK_COMBINE) {
+            return false;
+        }
 
-		// Determine the combine item we should unlock.
-		int combineId = Integer.parseInt(diagramItem.getItemData().getItemUse().get(0).getUseParam().get(0));
+        // Determine the combine item we should unlock.
+        int combineId = Integer.parseInt(diagramItem.getItemData().getItemUse().get(0).getUseParam()[0]);
 
-		// Remove the diagram from the player's inventory.
-		// We need to do this here, before sending CombineFormulaDataNotify, or the the combine UI won't correctly
-		// update when unlocking the diagram.
-		player.getInventory().removeItem(diagramItem, 1);
+        // Remove the diagram from the player's inventory.
+        // We need to do this here, before sending CombineFormulaDataNotify, or the the combine UI won't correctly
+        // update when unlocking the diagram.
+        player.getInventory().removeItem(diagramItem, 1);
 
-		// Tell the client that this diagram is now unlocked and add the unlocked item to the player.
-		player.getUnlockedCombines().add(combineId);
-		player.sendPacket(new PacketCombineFormulaDataNotify(combineId));
+        // Tell the client that this diagram is now unlocked and add the unlocked item to the player.
+        player.getUnlockedCombines().add(combineId);
+        player.sendPacket(new PacketCombineFormulaDataNotify(combineId));
 
-		return true;
-	}
+        return true;
+    }
 
-    public CombineResult combineItem(Player player, int cid, int count){
+    public CombineResult combineItem(Player player, int cid, int count) {
         // check config exist
-        if(!GameData.getCombineDataMap().containsKey(cid)){
+        if (!GameData.getCombineDataMap().containsKey(cid)) {
             player.getWorld().getHost().sendPacket(new PacketCombineRsp());
             return null;
         }
 
         CombineData combineData = GameData.getCombineDataMap().get(cid);
 
-        if(combineData.getPlayerLevel() > player.getLevel()){
+        if (combineData.getPlayerLevel() > player.getLevel()) {
             return null;
         }
 
@@ -124,7 +121,7 @@ public class CombineManger {
             player.sendPacket(new PacketReliquaryDecomposeRsp(Retcode.RET_RELIQUARY_DECOMPOSE_PARAM_ERROR));
             return;
         }
-        
+
         // Check if the number of input items matches the output count.
         if (input.size() != count * 3) {
             player.sendPacket(new PacketReliquaryDecomposeRsp(Retcode.RET_RELIQUARY_DECOMPOSE_PARAM_ERROR));
@@ -148,7 +145,7 @@ public class CombineManger {
         List<Long> resultItems = new ArrayList<>();
         for (int i = 0; i < count; i++) {
             int itemId = Utils.drawRandomListElement(possibleDrops);
-			GameItem newReliquary = new GameItem(itemId, 1);
+            GameItem newReliquary = new GameItem(itemId, 1);
 
             player.getInventory().addItem(newReliquary);
             resultItems.add(newReliquary.getGuid());

src/main/java/emu/grasscutter/game/drop/DropSystem.java

@@ -12,6 +12,7 @@ import emu.grasscutter.game.inventory.ItemType;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.ActionReason;
 import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.server.game.BaseGameSystem;
 import emu.grasscutter.server.game.GameServer;
 import emu.grasscutter.utils.Position;
 import emu.grasscutter.utils.Utils;
@@ -23,30 +24,24 @@ import java.io.Reader;
 import java.util.Collection;
 import java.util.List;
 
-public class DropManager {
-    public GameServer getGameServer() {
-        return gameServer;
-    }
+public class DropSystem extends BaseGameSystem {
+    private final Int2ObjectMap<List<DropData>> dropData;
 
-    private final GameServer gameServer;
+    public DropSystem(GameServer server) {
+        super(server);
+        this.dropData = new Int2ObjectOpenHashMap<>();
+        this.load();
+    }
 
     public Int2ObjectMap<List<DropData>> getDropData() {
         return dropData;
     }
 
-    private final Int2ObjectMap<List<DropData>> dropData;
-
-    public DropManager(GameServer gameServer) {
-        this.gameServer = gameServer;
-        this.dropData = new Int2ObjectOpenHashMap<>();
-        this.load();
-    }
-
     public synchronized void load() {
-        try (Reader fileReader = new InputStreamReader(DataLoader.load("Drop.json"))) {
+        try (Reader fileReader = DataLoader.loadReader("Drop.json")) {
             getDropData().clear();
             List<DropInfo> banners = Grasscutter.getGsonFactory().fromJson(fileReader, TypeToken.getParameterized(Collection.class, DropInfo.class).getType());
-            if(banners.size() > 0) {
+            if (banners.size() > 0) {
                 for (DropInfo di : banners) {
                     getDropData().put(di.getMonsterId(), di.getDropDataList());
                 }

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

@@ -1,117 +0,0 @@
-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.DungeonData;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.SceneType;
-import emu.grasscutter.game.quest.enums.QuestTrigger;
-import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.server.game.GameServer;
-import emu.grasscutter.server.packet.send.PacketDungeonEntryInfoRsp;
-import emu.grasscutter.server.packet.send.PacketPlayerEnterDungeonRsp;
-import emu.grasscutter.utils.Position;
-
-import java.util.List;
-
-public class DungeonManager {
-	private final GameServer server;
-	private static final BasicDungeonSettleListener basicDungeonSettleObserver = new BasicDungeonSettleListener();
-	public DungeonManager(GameServer server) {
-		this.server = server;
-	}
-
-	public GameServer getServer() {
-		return server;
-	}
-
-	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 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();
-		player.getScene().setPrevScene(sceneId);
-		
-		if (player.getWorld().transferPlayerToScene(player, sceneId, data)) {
-			player.getScene().addDungeonSettleObserver(basicDungeonSettleObserver);
-			player.getQuestManager().triggerEvent(QuestTrigger.QUEST_CONTENT_ENTER_DUNGEON, data.getId());
-		}
-		
-		player.getScene().setPrevScenePoint(pointId);
-		player.sendPacket(new PacketPlayerEnterDungeonRsp(pointId, dungeonId));
-		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
-		DungeonData dungeonData = scene.getDungeonData();
-		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());
-			}
-		}
-		// clean temp team if it has
-		player.getTeamManager().cleanTemporaryTeam();
-		player.getTowerManager().clearEntry();
-
-		// Transfer player back to world
-		player.getWorld().transferPlayerToScene(player, prevScene, prevPos);
-		player.sendPacket(new BasePacket(PacketOpcodes.PlayerQuitDungeonRsp));
-	}
-	
-	public void updateDailyDungeons() {
-		for (ScenePointEntry entry : GameData.getScenePointEntries().values()) {
-			entry.getPointData().updateDailyDungeon();
-		}
-	}
-}

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

@@ -0,0 +1,114 @@
+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.DungeonData;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.SceneType;
+import emu.grasscutter.game.quest.enums.QuestTrigger;
+import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.server.game.BaseGameSystem;
+import emu.grasscutter.server.game.GameServer;
+import emu.grasscutter.server.packet.send.PacketDungeonEntryInfoRsp;
+import emu.grasscutter.server.packet.send.PacketPlayerEnterDungeonRsp;
+import emu.grasscutter.utils.Position;
+
+import java.util.List;
+
+public class DungeonSystem extends BaseGameSystem {
+    private static final BasicDungeonSettleListener basicDungeonSettleObserver = new BasicDungeonSettleListener();
+
+    public DungeonSystem(GameServer server) {
+        super(server);
+    }
+
+    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 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();
+        player.getScene().setPrevScene(sceneId);
+
+        if (player.getWorld().transferPlayerToScene(player, sceneId, data)) {
+            player.getScene().addDungeonSettleObserver(basicDungeonSettleObserver);
+            player.getQuestManager().triggerEvent(QuestTrigger.QUEST_CONTENT_ENTER_DUNGEON, data.getId());
+        }
+
+        player.getScene().setPrevScenePoint(pointId);
+        player.sendPacket(new PacketPlayerEnterDungeonRsp(pointId, dungeonId));
+        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
+        DungeonData dungeonData = scene.getDungeonData();
+        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());
+            }
+        }
+        // clean temp team if it has
+        player.getTeamManager().cleanTemporaryTeam();
+        player.getTowerManager().clearEntry();
+
+        // Transfer player back to world
+        player.getWorld().transferPlayerToScene(player, prevScene, prevPos);
+        player.sendPacket(new BasePacket(PacketOpcodes.PlayerQuitDungeonRsp));
+    }
+
+    public void updateDailyDungeons() {
+        for (ScenePointEntry entry : GameData.getScenePointEntries().values()) {
+            entry.getPointData().updateDailyDungeon();
+        }
+    }
+}

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

@@ -36,180 +36,180 @@ import com.google.gson.reflect.TypeToken;
 
 public class DungeonChallenge extends WorldChallenge {
 
-	/**
-	 * has more challenge
-	 */
-	private boolean stage;
-	private IntSet rewardedPlayers;
+    /**
+     * has more challenge
+     */
+    private boolean stage;
+    private IntSet rewardedPlayers;
 
-	private final static Int2ObjectMap<List<DungeonDropEntry>> dungeonDropData = new Int2ObjectOpenHashMap<>();
+    private final static Int2ObjectMap<List<DungeonDropEntry>> dungeonDropData = new Int2ObjectOpenHashMap<>();
 
-	public static void initialize() {
-		// Read the data we need for dungeon rewards drops.
-		try (Reader fileReader = new InputStreamReader(DataLoader.load("DungeonDrop.json"))) {
-			List<DungeonDrop> dungeonDropList = Grasscutter.getGsonFactory().fromJson(fileReader, TypeToken.getParameterized(Collection.class, DungeonDrop.class).getType());
+    public static void initialize() {
+        // Read the data we need for dungeon rewards drops.
+        try (Reader fileReader = DataLoader.loadReader("DungeonDrop.json")) {
+            List<DungeonDrop> dungeonDropList = Grasscutter.getGsonFactory().fromJson(fileReader, TypeToken.getParameterized(Collection.class, DungeonDrop.class).getType());
 
-			for (DungeonDrop entry : dungeonDropList) {
-				dungeonDropData.put(entry.getDungeonId(), entry.getDrops());
-			}
+            for (DungeonDrop entry : dungeonDropList) {
+                dungeonDropData.put(entry.getDungeonId(), entry.getDrops());
+            }
 
-			Grasscutter.getLogger().debug("Loaded {} dungeon drop data entries.", dungeonDropData.size());
-		}
-		catch (Exception ex) {
-			Grasscutter.getLogger().error("Unable to load dungeon drop data.", ex);
-		}
-	}
+            Grasscutter.getLogger().debug("Loaded {} dungeon drop data entries.", dungeonDropData.size());
+        }
+        catch (Exception ex) {
+            Grasscutter.getLogger().error("Unable to load dungeon drop data.", ex);
+        }
+    }
 
-	public DungeonChallenge(Scene scene, SceneGroup group,
-							int challengeId, int challengeIndex,
-							List<Integer> paramList,
-							int timeLimit, int goal,
-							List<ChallengeTrigger> challengeTriggers) {
-		super(scene, group, challengeId, challengeIndex, paramList, timeLimit, goal, challengeTriggers);
-		this.setRewardedPlayers(new IntOpenHashSet());
-	}
+    public DungeonChallenge(Scene scene, SceneGroup group,
+                            int challengeId, int challengeIndex,
+                            List<Integer> paramList,
+                            int timeLimit, int goal,
+                            List<ChallengeTrigger> challengeTriggers) {
+        super(scene, group, challengeId, challengeIndex, paramList, timeLimit, goal, challengeTriggers);
+        this.setRewardedPlayers(new IntOpenHashSet());
+    }
 
-	public boolean isStage() {
-		return stage;
-	}
+    public boolean isStage() {
+        return stage;
+    }
 
-	public void setStage(boolean stage) {
-		this.stage = stage;
-	}
+    public void setStage(boolean stage) {
+        this.stage = stage;
+    }
 
-	public IntSet getRewardedPlayers() {
-		return rewardedPlayers;
-	}
+    public IntSet getRewardedPlayers() {
+        return rewardedPlayers;
+    }
 
-	public void setRewardedPlayers(IntSet rewardedPlayers) {
-		this.rewardedPlayers = rewardedPlayers;
-	}
+    public void setRewardedPlayers(IntSet rewardedPlayers) {
+        this.rewardedPlayers = rewardedPlayers;
+    }
 
-	@Override
-	public void done() {
-		super.done();
-		if (this.isSuccess()) {
-			// Settle
-			settle();
-		}
-	}
+    @Override
+    public void done() {
+        super.done();
+        if (this.isSuccess()) {
+            // Settle
+            settle();
+        }
+    }
 
-	private void settle() {
-		if(!stage){
-			getScene().getDungeonSettleObservers().forEach(o -> o.onDungeonSettle(getScene()));
-			getScene().getScriptManager().callEvent(EventType.EVENT_DUNGEON_SETTLE,
-					new ScriptArgs(this.isSuccess() ? 1 : 0));
-			// Battle pass trigger
-			this.getScene().getPlayers().forEach(p -> p.getBattlePassManager().triggerMission(WatcherTriggerType.TRIGGER_FINISH_DUNGEON));
-		}
-	}
+    private void settle() {
+        if (!stage) {
+            getScene().getDungeonSettleObservers().forEach(o -> o.onDungeonSettle(getScene()));
+            getScene().getScriptManager().callEvent(EventType.EVENT_DUNGEON_SETTLE,
+                    new ScriptArgs(this.isSuccess() ? 1 : 0));
+            // Battle pass trigger
+            this.getScene().getPlayers().forEach(p -> p.getBattlePassManager().triggerMission(WatcherTriggerType.TRIGGER_FINISH_DUNGEON));
+        }
+    }
 
-	private List<GameItem> rollRewards(boolean useCondensed) {
-		List<GameItem> rewards = new ArrayList<>();
-		int dungeonId = this.getScene().getDungeonData().getId();
-		// If we have specific drop data for this dungeon, we use it.
-		if (dungeonDropData.containsKey(dungeonId)) {
-			List<DungeonDropEntry> dropEntries = dungeonDropData.get(dungeonId);
+    private List<GameItem> rollRewards(boolean useCondensed) {
+        List<GameItem> rewards = new ArrayList<>();
+        int dungeonId = this.getScene().getDungeonData().getId();
+        // If we have specific drop data for this dungeon, we use it.
+        if (dungeonDropData.containsKey(dungeonId)) {
+            List<DungeonDropEntry> dropEntries = dungeonDropData.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());
+            // 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());
+                int amount = Utils.drawRandomListElement(candidateAmounts, entry.getProbabilities());
 
-				if (useCondensed) {
-					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;
-				}
+                // 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 : getScene().getDungeonData().getRewardPreview().getPreviewItems()) {
-				rewards.add(new GameItem(param.getId(), Math.max(param.getCount(), 1)));
-			}
-		}
+                // 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 : getScene().getDungeonData().getRewardPreview().getPreviewItems()) {
+                rewards.add(new GameItem(param.getId(), Math.max(param.getCount(), 1)));
+            }
+        }
 
-		return rewards;
-	}
+        return rewards;
+    }
 
-	public void getStatueDrops(Player player, GadgetInteractReq request) {
-		DungeonData dungeonData = getScene().getDungeonData();
-		int resinCost = dungeonData.getStatueCostCount() != 0 ? dungeonData.getStatueCostCount() : 20;
+    public void getStatueDrops(Player player, GadgetInteractReq request) {
+        DungeonData dungeonData = getScene().getDungeonData();
+        int resinCost = dungeonData.getStatueCostCount() != 0 ? dungeonData.getStatueCostCount() : 20;
 
-		if (!isSuccess() || dungeonData == null || dungeonData.getRewardPreview() == null || dungeonData.getRewardPreview().getPreviewItems().length == 0) {
-			return;
-		}
+        if (!isSuccess() || dungeonData == null || dungeonData.getRewardPreview() == null || dungeonData.getRewardPreview().getPreviewItems().length == 0) {
+            return;
+        }
 
-		// Already rewarded
-		if (getRewardedPlayers().contains(player.getUid())) {
-			return;
-		}
+        // Already rewarded
+        if (getRewardedPlayers().contains(player.getUid())) {
+            return;
+        }
 
-		// Get rewards.
-		List<GameItem> rewards = new ArrayList<>();
+        // Get rewards.
+        List<GameItem> rewards = new ArrayList<>();
 
-		if (request.getIsUseCondenseResin()) {
-			// 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;
-			}
+        if (request.getIsUseCondenseResin()) {
+            // 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;
+            }
 
-			// Make sure the player has condensed resin.
-			GameItem condensedResin = player.getInventory().getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(220007);
-			if (condensedResin == null || condensedResin.getCount() <= 0) {
-				return;
-			}
+            // Make sure the player has condensed resin.
+            GameItem condensedResin = player.getInventory().getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(220007);
+            if (condensedResin == null || condensedResin.getCount() <= 0) {
+                return;
+            }
 
-			// Deduct.
-			player.getInventory().removeItem(condensedResin, 1);
+            // Deduct.
+            player.getInventory().removeItem(condensedResin, 1);
 
-			// Roll rewards.
-			rewards.addAll(this.rollRewards(true));
-		}
-		else {
-			// If the player used regular resin, try to deduct.
-			// Stop if insufficient resin.
-			boolean success = player.getResinManager().useResin(resinCost);
-			if (!success) {
-				return;
-			}
+            // Roll rewards.
+            rewards.addAll(this.rollRewards(true));
+        }
+        else {
+            // If the player used regular resin, try to deduct.
+            // Stop if insufficient resin.
+            boolean success = player.getResinManager().useResin(resinCost);
+            if (!success) {
+                return;
+            }
 
-			// Roll rewards.
-			rewards.addAll(this.rollRewards(false));
-		}
+            // Roll rewards.
+            rewards.addAll(this.rollRewards(false));
+        }
 
-		// Add rewards to player and send notification.
-		player.getInventory().addItems(rewards, ActionReason.DungeonStatueDrop);
-		player.sendPacket(new PacketGadgetAutoPickDropInfoNotify(rewards));
+        // Add rewards to player and send notification.
+        player.getInventory().addItems(rewards, ActionReason.DungeonStatueDrop);
+        player.sendPacket(new PacketGadgetAutoPickDropInfoNotify(rewards));
 
-		getRewardedPlayers().add(player.getUid());
-	}
+        getRewardedPlayers().add(player.getUid());
+    }
 }

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

@@ -30,7 +30,6 @@ 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;
@@ -64,13 +63,13 @@ public class EntityAvatar extends GameEntity {
 		this.avatar.setCurrentEnergy();
 	}
 
-	public Player getPlayer() {
-		return avatar.getPlayer();
-	}
+    public Player getPlayer() {
+        return avatar.getPlayer();
+    }
 
-	@Override
-	public Position getPosition() {
-		return getPlayer().getPos();
+    @Override
+    public Position getPosition() {
+        return getPlayer().getPosition();
 	}
 
 	@Override
@@ -107,12 +106,12 @@ public class EntityAvatar extends GameEntity {
 		return 0;
 	}
 
-	@Override
-	public void onDeath(int killerId) {
-		this.killedType = PlayerDieType.PLAYER_DIE_TYPE_KILL_BY_MONSTER;
-		this.killedBy = killerId;
-		clearEnergy(ChangeEnergyReason.CHANGE_ENERGY_REASON_NONE);
-	}
+    @Override
+    public void onDeath(int killerId) {
+        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) {
 		this.killedType = dieType;
@@ -126,7 +125,7 @@ public class EntityAvatar extends GameEntity {
 
 		if (healed > 0f) {
 			getScene().broadcastPacket(
-				new PacketEntityFightPropChangeReasonNotify(this, FightProperty.FIGHT_PROP_CUR_HP, healed, PropChangeReason.PROP_CHANGE_REASON_ABILITY, ChangeHpReason.CHANGE_HP_REASON_CHANGE_HP_ADD_ABILITY)
+                new PacketEntityFightPropChangeReasonNotify(this, FightProperty.FIGHT_PROP_CUR_HP, healed, PropChangeReason.PROP_CHANGE_REASON_ABILITY, ChangeHpReason.CHANGE_HP_REASON_ADD_ABILITY)
 			);
 		}
 
@@ -138,14 +137,14 @@ public class EntityAvatar extends GameEntity {
 		FightProperty curEnergyProp = this.getAvatar().getSkillDepot().getElementType().getCurEnergyProp();
 		FightProperty maxEnergyProp = this.getAvatar().getSkillDepot().getElementType().getMaxEnergyProp();
 
-		// Get max energy.
-		float maxEnergy = this.avatar.getFightProperty(maxEnergyProp);
+        // Get max energy.
+        float maxEnergy = this.avatar.getFightProperty(maxEnergyProp);
 
-		// Set energy to zero.
-		this.avatar.setCurrentEnergy(curEnergyProp, 0);
+        // Set energy to zero.
+        this.avatar.setCurrentEnergy(curEnergyProp, 0);
 
-		// Send packets.
-		this.getScene().broadcastPacket(new PacketEntityFightPropUpdateNotify(this, curEnergyProp));
+        // Send packets.
+        this.getScene().broadcastPacket(new PacketEntityFightPropUpdateNotify(this, curEnergyProp));
 
 		if (reason == ChangeEnergyReason.CHANGE_ENERGY_REASON_SKILL_START) {
 			this.getScene().broadcastPacket(new PacketEntityFightPropChangeReasonNotify(this, curEnergyProp, -maxEnergy, reason));
@@ -166,10 +165,10 @@ public class EntityAvatar extends GameEntity {
 		// Get energy recharge.
 		float energyRecharge = this.getFightProperty(FightProperty.FIGHT_PROP_CHARGE_EFFICIENCY);
 
-		// Scale amount by energy recharge, if the amount is not flat.
-		if (!isFlat) {
-			amount *= energyRecharge;
-		}
+        // Scale amount by energy recharge, if the amount is not flat.
+        if (!isFlat) {
+            amount *= energyRecharge;
+        }
 
 		// Determine the new energy value.
 		float newEnergy = Math.min(curEnergy + amount, maxEnergy);

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

@@ -3,6 +3,7 @@ package emu.grasscutter.game.entity;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.excels.GadgetData;
 import emu.grasscutter.game.entity.gadget.*;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.EntityIdType;
 import emu.grasscutter.game.props.EntityType;
 import emu.grasscutter.game.props.LifeState;
@@ -15,6 +16,7 @@ import emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityIn
 import emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData;
 import emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo;
 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.PropPairOuterClass.PropPair;
 import emu.grasscutter.net.proto.ProtEntityTypeOuterClass.ProtEntityType;
@@ -22,6 +24,7 @@ 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.VisionType;
 import emu.grasscutter.scripts.constants.EventType;
 import emu.grasscutter.scripts.data.SceneGadget;
 import emu.grasscutter.scripts.data.ScriptArgs;
@@ -35,186 +38,195 @@ import lombok.ToString;
 
 @ToString(callSuper = true)
 public class EntityGadget extends EntityBaseGadget {
-	private final GadgetData data;
-	private final Position pos;
-	private final Position rot;
-	private int gadgetId;
+    private final GadgetData data;
+    private final Position pos;
+    private final Position rot;
+    private int gadgetId;
 
-	private int state;
-	private int pointType;
-	private GadgetContent content;
-	private Int2FloatOpenHashMap fightProp;
-	private SceneGadget metaGadget;
+    private int state;
+    private int pointType;
+    private GadgetContent content;
+    private Int2FloatOpenHashMap fightProp;
+    private SceneGadget metaGadget;
 
-	public EntityGadget(Scene scene, int gadgetId, Position pos, Position rot) {
-		super(scene);
-		this.data = GameData.getGadgetDataMap().get(gadgetId);
-		this.id = getScene().getWorld().getNextEntityId(EntityIdType.GADGET);
-		this.gadgetId = gadgetId;
-		this.pos = pos.clone();
-		this.rot = rot != null ? rot.clone() : new Position();
-	}
+    public EntityGadget(Scene scene, int gadgetId, Position pos, Position rot) {
+        super(scene);
+        this.data = GameData.getGadgetDataMap().get(gadgetId);
+        this.id = getScene().getWorld().getNextEntityId(EntityIdType.GADGET);
+        this.gadgetId = gadgetId;
+        this.pos = pos.clone();
+        this.rot = rot != null ? rot.clone() : new Position();
+    }
 
-	public EntityGadget(Scene scene, int gadgetId, Position pos) {
-		this(scene, gadgetId, pos, new Position());
-	}
+    public EntityGadget(Scene scene, int gadgetId, Position pos) {
+        this(scene, gadgetId, pos, new Position());
+    }
 
-	public EntityGadget(Scene scene, int gadgetId, Position pos, Position rot, GadgetContent content) {
-		this(scene, gadgetId, pos, rot);
-		this.content = content;
-	}
+    public EntityGadget(Scene scene, int gadgetId, Position pos, Position rot, GadgetContent content) {
+        this(scene, gadgetId, pos, rot);
+        this.content = content;
+    }
 
-	public GadgetData getGadgetData() {
-		return data;
-	}
+    public GadgetData getGadgetData() {
+        return data;
+    }
 
-	@Override
-	public Position getPosition() {
-		return this.pos;
-	}
+    @Override
+    public Position getPosition() {
+        return this.pos;
+    }
 
-	@Override
-	public Position getRotation() {
-		return this.rot;
-	}
+    @Override
+    public Position getRotation() {
+        return this.rot;
+    }
 
-	public int getGadgetId() {
-		return gadgetId;
-	}
+    public int getGadgetId() {
+        return gadgetId;
+    }
 
-	public void setGadgetId(int gadgetId) {
-		this.gadgetId = gadgetId;
-	}
+    public void setGadgetId(int gadgetId) {
+        this.gadgetId = gadgetId;
+    }
 
-	public int getState() {
-		return state;
-	}
+    public int getState() {
+        return state;
+    }
 
-	public void setState(int state) {
-		this.state = state;
-	}
+    public void setState(int state) {
+        this.state = state;
+    }
 
-	public void updateState(int state){
-		this.setState(state);
-		this.getScene().broadcastPacket(new PacketGadgetStateNotify(this, state));
-		getScene().getScriptManager().callEvent(EventType.EVENT_GADGET_STATE_CHANGE, new ScriptArgs(state, this.getConfigId()));
-	}
+    public void updateState(int state) {
+        this.setState(state);
+        this.getScene().broadcastPacket(new PacketGadgetStateNotify(this, state));
+        getScene().getScriptManager().callEvent(EventType.EVENT_GADGET_STATE_CHANGE, new ScriptArgs(state, this.getConfigId()));
+    }
 
-	public int getPointType() {
-		return pointType;
-	}
+    public int getPointType() {
+        return pointType;
+    }
 
-	public void setPointType(int pointType) {
-		this.pointType = pointType;
-	}
+    public void setPointType(int pointType) {
+        this.pointType = pointType;
+    }
 
-	public GadgetContent getContent() {
-		return content;
-	}
+    public GadgetContent getContent() {
+        return content;
+    }
 
-	@Deprecated // Dont use!
-	public void setContent(GadgetContent content) {
-		this.content = this.content == null ? content : this.content;
-	}
+    @Deprecated // Dont use!
+    public void setContent(GadgetContent content) {
+        this.content = this.content == null ? content : this.content;
+    }
 
-	public SceneGadget getMetaGadget() {
-		return metaGadget;
-	}
+    public SceneGadget getMetaGadget() {
+        return metaGadget;
+    }
 
-	public void setMetaGadget(SceneGadget metaGadget) {
-		this.metaGadget = metaGadget;
-	}
+    public void setMetaGadget(SceneGadget metaGadget) {
+        this.metaGadget = metaGadget;
+    }
 
-	// TODO refactor
-	public void buildContent() {
-		if (getContent() != null || getGadgetData() == null || getGadgetData().getType() == null) {
-			return;
-		}
+    // TODO refactor
+    public void buildContent() {
+        if (getContent() != null || getGadgetData() == null || getGadgetData().getType() == null) {
+            return;
+        }
 
-		EntityType type = getGadgetData().getType();
-		GadgetContent content = switch (type) {
-			case GatherPoint -> new GadgetGatherPoint(this);
-			case GatherObject -> new GadgetGatherObject(this);
-			case Worktop -> new GadgetWorktop(this);
-			case RewardStatue -> new GadgetRewardStatue(this);
-			case Chest -> new GadgetChest(this);
+        EntityType type = getGadgetData().getType();
+        GadgetContent content = switch (type) {
+            case GatherPoint -> new GadgetGatherPoint(this);
+            case GatherObject -> new GadgetGatherObject(this);
+            case Worktop -> new GadgetWorktop(this);
+            case RewardStatue -> new GadgetRewardStatue(this);
+            case Chest -> new GadgetChest(this);
             case Gadget -> new GadgetObject(this);
-			default -> null;
-		};
+            default -> null;
+        };
 
-		this.content = content;
-	}
+        this.content = content;
+    }
 
-	@Override
-	public Int2FloatOpenHashMap getFightProperties() {
-		if (this.fightProp == null) this.fightProp = new Int2FloatOpenHashMap();
-		return this.fightProp;
-	}
+    @Override
+    public Int2FloatOpenHashMap getFightProperties() {
+        if (this.fightProp == null) this.fightProp = new Int2FloatOpenHashMap();
+        return this.fightProp;
+    }
 
-	@Override
-	public void onCreate() {
-		// Lua event
-		getScene().getScriptManager().callEvent(EventType.EVENT_GADGET_CREATE, new ScriptArgs(this.getConfigId()));
-	}
+    @Override
+    public void onInteract(Player player, GadgetInteractReq interactReq) {
+        if (this.getContent() == null) {
+            return;
+        }
 
-	@Override
-	public void onDeath(int killerId) {
-		if (this.getSpawnEntry() != null) {
-			this.getScene().getDeadSpawnedEntities().add(getSpawnEntry());
-		}
-		if (getScene().getChallenge() != null) {
-			getScene().getChallenge().onGadgetDeath(this);
-		}
-		getScene().getScriptManager().callEvent(EventType.EVENT_ANY_GADGET_DIE, new ScriptArgs(this.getConfigId()));
-	}
+        boolean shouldDelete = this.getContent().onInteract(player, interactReq);
 
-	@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();
+        if (shouldDelete) {
+            this.getScene().killEntity(this);
+        }
+    }
 
-		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);
+    @Override
+    public void onCreate() {
+        // Lua event
+        getScene().getScriptManager().callEvent(EventType.EVENT_GADGET_CREATE, new ScriptArgs(this.getConfigId()));
+    }
 
-		PropPair pair = PropPair.newBuilder()
-				.setType(PlayerProperty.PROP_LEVEL.getId())
-				.setPropValue(ProtoHelper.newPropValue(PlayerProperty.PROP_LEVEL, 1))
-				.build();
-		entityInfo.addPropList(pair);
+    @Override
+    public void onDeath(int killerId) {
+        if (this.getSpawnEntry() != null) {
+            this.getScene().getDeadSpawnedEntities().add(getSpawnEntry());
+        }
+        if (getScene().getChallenge() != null) {
+            getScene().getChallenge().onGadgetDeath(this);
+        }
+        getScene().getScriptManager().callEvent(EventType.EVENT_ANY_GADGET_DIE, new ScriptArgs(this.getConfigId()));
+    }
 
-		// We do not use the getter to null check because the getter will create a fight prop map if it is null
-		if (this.fightProp != null) {
-			this.addAllFightPropsToEntityInfo(entityInfo);
-		}
+    @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();
 
-		SceneGadgetInfo.Builder gadgetInfo = SceneGadgetInfo.newBuilder()
-				.setGadgetId(this.getGadgetId())
-				.setGroupId(this.getGroupId())
-				.setConfigId(this.getConfigId())
-				.setGadgetState(this.getState())
-				.setIsEnableInteract(true)
-				.setAuthorityPeerId(this.getScene().getWorld().getHostPeerId());
+        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);
 
-		if (this.getContent() != null) {
-			this.getContent().onBuildProto(gadgetInfo);
-		}
+        PropPair pair = PropPair.newBuilder()
+                .setType(PlayerProperty.PROP_LEVEL.getId())
+                .setPropValue(ProtoHelper.newPropValue(PlayerProperty.PROP_LEVEL, 1))
+                .build();
+        entityInfo.addPropList(pair);
 
-		entityInfo.setGadget(gadgetInfo);
+        // We do not use the getter to null check because the getter will create a fight prop map if it is null
+        if (this.fightProp != null) {
+            this.addAllFightPropsToEntityInfo(entityInfo);
+        }
 
-		return entityInfo.build();
-	}
-	public void die() {
-		getScene().broadcastPacket(new PacketLifeStateChangeNotify(this, LifeState.LIFE_DEAD));
-		this.onDeath(0);
-	}
+        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.getContent() != null) {
+            this.getContent().onBuildProto(gadgetInfo);
+        }
+
+        entityInfo.setGadget(gadgetInfo);
+
+        return entityInfo.build();
+    }
 }

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

@@ -3,6 +3,7 @@ package emu.grasscutter.game.entity;
 import emu.grasscutter.data.excels.ItemData;
 import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.ActionReason;
 import emu.grasscutter.game.props.EntityIdType;
 import emu.grasscutter.game.props.PlayerProperty;
 import emu.grasscutter.game.world.Scene;
@@ -12,6 +13,8 @@ import emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityIn
 import emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData;
 import emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo;
 import emu.grasscutter.net.proto.GadgetBornTypeOuterClass.GadgetBornType;
+import emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq;
+import emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType;
 import emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo;
 import emu.grasscutter.net.proto.PropPairOuterClass.PropPair;
 import emu.grasscutter.net.proto.ProtEntityTypeOuterClass.ProtEntityType;
@@ -19,120 +22,145 @@ 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.server.packet.send.PacketGadgetInteractRsp;
 import emu.grasscutter.utils.Position;
 import emu.grasscutter.utils.ProtoHelper;
 import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
 
 public class EntityItem extends EntityBaseGadget {
-	private final Position pos;
-	private final Position rot;
-	
-	private final GameItem item;
-	private final long guid;
+    private final Position pos;
+    private final Position rot;
 
-	private final boolean share;
+    private final GameItem item;
+    private final long guid;
 
-	public EntityItem(Scene scene, Player player, ItemData itemData, Position pos, int count) {
-		super(scene);
-		this.id = getScene().getWorld().getNextEntityId(EntityIdType.GADGET);
-		this.pos = new Position(pos);
-		this.rot = new Position();
-		this.guid = player == null ? scene.getWorld().getHost().getNextGameGuid() : player.getNextGameGuid();
-		this.item = new GameItem(itemData, count);
-		this.share = true;
-	}
+    private final boolean share;
 
-	// In official game, some drop items are shared to all players, and some other items are independent to all players
-	// For example, if you killed a monster in MP mode, all players could get drops but rarity and number of them are different
-	// but if you broke regional mine, when someone picked up the drop then it disappeared
-	public EntityItem(Scene scene, Player player, ItemData itemData, Position pos, int count, boolean share) {
-		super(scene);
-		this.id = getScene().getWorld().getNextEntityId(EntityIdType.GADGET);
-		this.pos = new Position(pos);
-		this.rot = new Position();
-		this.guid = player == null ? scene.getWorld().getHost().getNextGameGuid() : player.getNextGameGuid();
-		this.item = new GameItem(itemData, count);
-		this.share = share;
-	}
-	
-	@Override
-	public int getId() {
-		return this.id;
-	}
-	
-	private GameItem getItem() {
-		return this.item;
-	}
+    public EntityItem(Scene scene, Player player, ItemData itemData, Position pos, int count) {
+        super(scene);
+        this.id = getScene().getWorld().getNextEntityId(EntityIdType.GADGET);
+        this.pos = new Position(pos);
+        this.rot = new Position();
+        this.guid = player == null ? scene.getWorld().getHost().getNextGameGuid() : player.getNextGameGuid();
+        this.item = new GameItem(itemData, count);
+        this.share = true;
+    }
 
-	public ItemData getItemData() {
-		return this.getItem().getItemData();
-	}
+    // In official game, some drop items are shared to all players, and some other items are independent to all players
+    // For example, if you killed a monster in MP mode, all players could get drops but rarity and number of them are different
+    // but if you broke regional mine, when someone picked up the drop then it disappeared
+    public EntityItem(Scene scene, Player player, ItemData itemData, Position pos, int count, boolean share) {
+        super(scene);
+        this.id = getScene().getWorld().getNextEntityId(EntityIdType.GADGET);
+        this.pos = new Position(pos);
+        this.rot = new Position();
+        this.guid = player == null ? scene.getWorld().getHost().getNextGameGuid() : player.getNextGameGuid();
+        this.item = new GameItem(itemData, count);
+        this.share = share;
+    }
 
-	public long getGuid() {
-		return guid;
-	}
+    @Override
+    public int getId() {
+        return this.id;
+    }
 
-	public int getCount() {
-		return this.getItem().getCount();
-	}
-	
-	@Override
-	public int getGadgetId() {
-		return this.getItemData().getGadgetId();
-	}
+    private GameItem getItem() {
+        return this.item;
+    }
 
-	@Override
-	public Position getPosition() {
-		return this.pos;
-	}
+    public ItemData getItemData() {
+        return this.getItem().getItemData();
+    }
 
-	@Override
-	public Position getRotation() {
-		return this.rot;
-	}
-	
-	@Override
-	public Int2FloatOpenHashMap getFightProperties() {
-		return null;
-	}
+    public long getGuid() {
+        return guid;
+    }
 
-	public boolean isShare() {
-		return share;
-	}
+    public int getCount() {
+        return this.getItem().getCount();
+    }
 
-	@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_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);
-		
-		SceneGadgetInfo.Builder gadgetInfo = SceneGadgetInfo.newBuilder()
-				.setGadgetId(this.getItemData().getGadgetId())
-				.setTrifleItem(this.getItem().toProto())
-				.setBornType(GadgetBornType.GADGET_BORN_TYPE_IN_AIR)
-				.setAuthorityPeerId(this.getWorld().getHostPeerId())
-				.setIsEnableInteract(true);
+    @Override
+    public int getGadgetId() {
+        return this.getItemData().getGadgetId();
+    }
 
-		entityInfo.setGadget(gadgetInfo);
-		
-		return entityInfo.build();
-	}
+    @Override
+    public Position getPosition() {
+        return this.pos;
+    }
+
+    @Override
+    public Position getRotation() {
+        return this.rot;
+    }
+
+    @Override
+    public Int2FloatOpenHashMap getFightProperties() {
+        return null;
+    }
+
+    public boolean isShare() {
+        return share;
+    }
+
+    @Override
+    public void onInteract(Player player, GadgetInteractReq interactReq) {
+        // check drop owner to avoid someone picked up item in others' world
+        if (!this.isShare()) {
+            int dropOwner = (int) (this.getGuid() >> 32);
+            if (dropOwner != player.getUid()) {
+                return;
+            }
+        }
+
+        this.getScene().removeEntity(this);
+        GameItem item = new GameItem(this.getItemData(), this.getCount());
+
+        // Add to inventory
+        boolean success = player.getInventory().addItem(item, ActionReason.SubfieldDrop);
+        if (success) {
+            if (!this.isShare()) { // not shared drop
+                player.sendPacket(new PacketGadgetInteractRsp(this, InteractType.INTERACT_TYPE_PICK_ITEM));
+            } else {
+                this.getScene().broadcastPacket(new PacketGadgetInteractRsp(this, InteractType.INTERACT_TYPE_PICK_ITEM));
+            }
+        }
+    }
+
+    @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_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);
+
+        SceneGadgetInfo.Builder gadgetInfo = SceneGadgetInfo.newBuilder()
+                .setGadgetId(this.getItemData().getGadgetId())
+                .setTrifleItem(this.getItem().toProto())
+                .setBornType(GadgetBornType.GADGET_BORN_TYPE_IN_AIR)
+                .setAuthorityPeerId(this.getWorld().getHostPeerId())
+                .setIsEnableInteract(true);
+
+        entityInfo.setGadget(gadgetInfo);
+
+        return entityInfo.build();
+    }
 }

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

@@ -1,21 +1,29 @@
 package emu.grasscutter.game.entity;
 
+import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.common.ItemParamData;
 import emu.grasscutter.data.common.PropGrowCurve;
+import emu.grasscutter.data.excels.EnvAnimalGatherConfigData;
+import emu.grasscutter.data.excels.ItemData;
 import emu.grasscutter.data.excels.MonsterCurveData;
 import emu.grasscutter.data.excels.MonsterData;
+import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.ActionReason;
 import emu.grasscutter.game.props.EntityIdType;
 import emu.grasscutter.game.props.FightProperty;
 import emu.grasscutter.game.props.PlayerProperty;
 import emu.grasscutter.game.props.WatcherTriggerType;
 import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.net.proto.VisionTypeOuterClass;
 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.FightPropPairOuterClass.FightPropPair;
+import emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq;
 import emu.grasscutter.net.proto.MonsterBornTypeOuterClass.MonsterBornType;
 import emu.grasscutter.net.proto.PropPairOuterClass.PropPair;
 import emu.grasscutter.net.proto.ProtEntityTypeOuterClass.ProtEntityType;
@@ -31,244 +39,257 @@ import it.unimi.dsi.fastutil.ints.Int2FloatMap;
 import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
 
 public class EntityMonster extends GameEntity {
-	private final MonsterData monsterData;
-	private final Int2FloatOpenHashMap fightProp;
-	
-	private final Position pos;
-	private final Position rot;
-	private final Position bornPos;
-	private final int level;
-	private int weaponEntityId;
-	private int poseId;
-	
-	public EntityMonster(Scene scene, MonsterData monsterData, Position pos, int level) {
-		super(scene);
-		this.id = getWorld().getNextEntityId(EntityIdType.MONSTER);
-		this.monsterData = monsterData;
-		this.fightProp = new Int2FloatOpenHashMap();
-		this.pos = new Position(pos);
-		this.rot = new Position();
-		this.bornPos = getPosition().clone();
-		this.level = level;
-		
-		// Monster weapon
-		if (getMonsterWeaponId() > 0) {
-			this.weaponEntityId = getWorld().getNextEntityId(EntityIdType.WEAPON);
-		}
-		
-		this.recalcStats();
-	}
-	
-	@Override
-	public int getId() {
-		return this.id;
-	}
+    private final MonsterData monsterData;
+    private final Int2FloatOpenHashMap fightProp;
 
-	public MonsterData getMonsterData() {
-		return monsterData;
-	}
-	
-	public int getMonsterWeaponId() {
-		return getMonsterData().getWeaponId();
-	}
-	
-	private int getMonsterId() {
-		return this.getMonsterData().getId();
-	}
+    private final Position pos;
+    private final Position rot;
+    private final Position bornPos;
+    private final int level;
+    private int weaponEntityId;
+    private int poseId;
 
-	public int getLevel() {
-		return level;
-	}
+    public EntityMonster(Scene scene, MonsterData monsterData, Position pos, int level) {
+        super(scene);
+        this.id = getWorld().getNextEntityId(EntityIdType.MONSTER);
+        this.monsterData = monsterData;
+        this.fightProp = new Int2FloatOpenHashMap();
+        this.pos = new Position(pos);
+        this.rot = new Position();
+        this.bornPos = getPosition().clone();
+        this.level = level;
 
-	@Override
-	public Position getPosition() {
-		return this.pos;
-	}
+        // Monster weapon
+        if (getMonsterWeaponId() > 0) {
+            this.weaponEntityId = getWorld().getNextEntityId(EntityIdType.WEAPON);
+        }
 
-	@Override
-	public Position getRotation() {
-		return this.rot;
-	}
-	
-	public Position getBornPos() {
-		return bornPos;
-	}
+        this.recalcStats();
+    }
 
-	@Override
-	public Int2FloatOpenHashMap getFightProperties() {
-		return fightProp;
-	}
-	
-	@Override
-	public boolean isAlive() {
-		return this.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP) > 0f;
-	}
+    @Override
+    public int getId() {
+        return this.id;
+    }
 
-	public int getPoseId() {
-		return poseId;
-	}
+    public MonsterData getMonsterData() {
+        return monsterData;
+    }
 
-	public void setPoseId(int poseId) {
-		this.poseId = poseId;
-	}
-	
-	@Override
-	public void onCreate() {
-		// Lua event
-		getScene().getScriptManager().callEvent(EventType.EVENT_ANY_MONSTER_LIVE, new ScriptArgs(this.getConfigId()));
-	}
+    public int getMonsterWeaponId() {
+        return getMonsterData().getWeaponId();
+    }
 
-	@Override
-	public void damage(float amount, int killerId) {
-		// Get HP before damage.
-		float hpBeforeDamage = this.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP);
+    private int getMonsterId() {
+        return this.getMonsterData().getId();
+    }
 
-		// Apply damage.
-		super.damage(amount, killerId);
+    public int getLevel() {
+        return level;
+    }
 
-		// Get HP after damage.
-		float hpAfterDamage = this.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP);
+    @Override
+    public Position getPosition() {
+        return this.pos;
+    }
 
-		// Invoke energy drop logic.
-		for (Player player : this.getScene().getPlayers()) {
-			player.getEnergyManager().handleMonsterEnergyDrop(this, hpBeforeDamage, hpAfterDamage);
-		}
-	}
+    @Override
+    public Position getRotation() {
+        return this.rot;
+    }
 
-	@Override
-	public void onDeath(int killerId) {
-		if (this.getSpawnEntry() != null) {
-			this.getScene().getDeadSpawnedEntities().add(getSpawnEntry());
-		}
-		// first set the challenge data
-		if (getScene().getChallenge() != null) {
-			getScene().getChallenge().onMonsterDeath(this);
-		}
-		if (getScene().getScriptManager().isInit() && this.getGroupId() > 0) {
-			if(getScene().getScriptManager().getScriptMonsterSpawnService() != null){
-				getScene().getScriptManager().getScriptMonsterSpawnService().onMonsterDead(this);
-			}
-			// prevent spawn monster after success
-			if(getScene().getChallenge() != null && getScene().getChallenge().inProgress()){
-				getScene().getScriptManager().callEvent(EventType.EVENT_ANY_MONSTER_DIE, new ScriptArgs().setParam1(this.getConfigId()));
-			}else if(getScene().getChallenge() == null){
-				getScene().getScriptManager().callEvent(EventType.EVENT_ANY_MONSTER_DIE, new ScriptArgs().setParam1(this.getConfigId()));
-			}
-		}
-		// Battle Pass trigger
-		getScene().getPlayers().forEach(p -> p.getBattlePassManager().triggerMission(WatcherTriggerType.TRIGGER_MONSTER_DIE, this.getMonsterId(), 1));
-	}
-	
-	public void recalcStats() {
-		// Monster data
-		MonsterData data = this.getMonsterData();
+    public Position getBornPos() {
+        return bornPos;
+    }
 
-		// Get hp percent, set to 100% if none
-		float hpPercent = this.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP) <= 0 ? 1f : this.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP) / this.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP);
-		
-		// Clear properties
-		this.getFightProperties().clear();
-				
-		// Base stats
-		this.setFightProperty(FightProperty.FIGHT_PROP_BASE_HP, data.getBaseHp());
-		this.setFightProperty(FightProperty.FIGHT_PROP_BASE_ATTACK, data.getBaseAttack());
-		this.setFightProperty(FightProperty.FIGHT_PROP_BASE_DEFENSE, data.getBaseDefense());
-		
-		this.setFightProperty(FightProperty.FIGHT_PROP_PHYSICAL_SUB_HURT, data.getPhysicalSubHurt());
-		this.setFightProperty(FightProperty.FIGHT_PROP_FIRE_SUB_HURT, .1f);
-		this.setFightProperty(FightProperty.FIGHT_PROP_ELEC_SUB_HURT, data.getElecSubHurt());
-		this.setFightProperty(FightProperty.FIGHT_PROP_WATER_SUB_HURT, data.getWaterSubHurt());
-		this.setFightProperty(FightProperty.FIGHT_PROP_GRASS_SUB_HURT, data.getGrassSubHurt());
-		this.setFightProperty(FightProperty.FIGHT_PROP_WIND_SUB_HURT, data.getWindSubHurt());
-		this.setFightProperty(FightProperty.FIGHT_PROP_ROCK_SUB_HURT, .1f);
-		this.setFightProperty(FightProperty.FIGHT_PROP_ICE_SUB_HURT, data.getIceSubHurt());
-		
-		// Level curve
-		MonsterCurveData curve = GameData.getMonsterCurveDataMap().get(this.getLevel());
-		if (curve != null) {
-			for (PropGrowCurve growCurve : data.getPropGrowCurves()) {
-				FightProperty prop = FightProperty.getPropByName(growCurve.getType());
-				this.setFightProperty(prop, this.getFightProperty(prop) * curve.getMultByProp(growCurve.getGrowCurve()));
-			}
-		}
-		
-		// Set % stats
-		this.setFightProperty(
-			FightProperty.FIGHT_PROP_MAX_HP, 
-			(getFightProperty(FightProperty.FIGHT_PROP_BASE_HP) * (1f + getFightProperty(FightProperty.FIGHT_PROP_HP_PERCENT))) + getFightProperty(FightProperty.FIGHT_PROP_HP)
-		);
-		this.setFightProperty(
-			FightProperty.FIGHT_PROP_CUR_ATTACK, 
-			(getFightProperty(FightProperty.FIGHT_PROP_BASE_ATTACK) * (1f + getFightProperty(FightProperty.FIGHT_PROP_ATTACK_PERCENT))) + getFightProperty(FightProperty.FIGHT_PROP_ATTACK)
-		);
-		this.setFightProperty(
-			FightProperty.FIGHT_PROP_CUR_DEFENSE, 
-			(getFightProperty(FightProperty.FIGHT_PROP_BASE_DEFENSE) * (1f + getFightProperty(FightProperty.FIGHT_PROP_DEFENSE_PERCENT))) + getFightProperty(FightProperty.FIGHT_PROP_DEFENSE)
-		);
-		
-		// Set current hp
-		this.setFightProperty(FightProperty.FIGHT_PROP_CUR_HP, this.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP) * hpPercent);
-	}
+    @Override
+    public Int2FloatOpenHashMap getFightProperties() {
+        return fightProp;
+    }
 
-	@Override
-	public SceneEntityInfo toProto() {
-		EntityAuthorityInfo authority = EntityAuthorityInfo.newBuilder()
-				.setAbilityInfo(AbilitySyncStateInfo.newBuilder())
-				.setRendererChangedInfo(EntityRendererChangedInfo.newBuilder())
-				.setAiInfo(SceneEntityAiInfo.newBuilder().setIsAiOpen(true).setBornPos(this.getBornPos().toProto()))
-				.setBornPos(this.getBornPos().toProto())
-				.build();
-		
-		SceneEntityInfo.Builder entityInfo = SceneEntityInfo.newBuilder()
-				.setEntityId(getId())
-				.setEntityType(ProtEntityType.PROT_ENTITY_TYPE_MONSTER)
-				.setMotionInfo(this.getMotionInfo())
-				.addAnimatorParaList(AnimatorParameterValueInfoPair.newBuilder())
-				.setEntityClientData(EntityClientData.newBuilder())
-				.setEntityAuthorityInfo(authority)
-				.setLifeState(this.getLifeState().getValue());
-		
-		for (Int2FloatMap.Entry entry : getFightProperties().int2FloatEntrySet()) {
-			if (entry.getIntKey() == 0) {
-				continue;
-			}
-			FightPropPair fightProp = FightPropPair.newBuilder().setPropType(entry.getIntKey()).setPropValue(entry.getFloatValue()).build();
-			entityInfo.addFightPropList(fightProp);
-		}
-		
-		PropPair pair = PropPair.newBuilder()
-				.setType(PlayerProperty.PROP_LEVEL.getId())
-				.setPropValue(ProtoHelper.newPropValue(PlayerProperty.PROP_LEVEL, getLevel()))
-				.build();
-		entityInfo.addPropList(pair);
-		
-		SceneMonsterInfo.Builder monsterInfo = SceneMonsterInfo.newBuilder()
-				.setMonsterId(getMonsterId())
-				.setGroupId(this.getGroupId())
-				.setConfigId(this.getConfigId())
-				.addAllAffixList(getMonsterData().getAffix())
-				.setAuthorityPeerId(getWorld().getHostPeerId())
-				.setPoseId(this.getPoseId())
-				.setBlockId(3001)
-				.setBornType(MonsterBornType.MONSTER_BORN_TYPE_DEFAULT)
-				.setSpecialNameId(40);
-		
-		if (getMonsterData().getDescribeData() != null) {
-			monsterInfo.setTitleId(getMonsterData().getDescribeData().getTitleID());
-		}
-		
-		if (this.getMonsterWeaponId() > 0) {
-			SceneWeaponInfo weaponInfo = SceneWeaponInfo.newBuilder()
-					.setEntityId(this.weaponEntityId)
-					.setGadgetId(this.getMonsterWeaponId())
-					.setAbilityInfo(AbilitySyncStateInfo.newBuilder())
-					.build();
-			
-			monsterInfo.addWeaponList(weaponInfo);
-		}
-		
-		entityInfo.setMonster(monsterInfo);
+    @Override
+    public boolean isAlive() {
+        return this.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP) > 0f;
+    }
 
-		return entityInfo.build();
-	}
+    public int getPoseId() {
+        return poseId;
+    }
+
+    public void setPoseId(int poseId) {
+        this.poseId = poseId;
+    }
+
+    @Override
+    public void onInteract(Player player, GadgetInteractReq interactReq) {
+        EnvAnimalGatherConfigData gatherData = GameData.getEnvAnimalGatherConfigDataMap().get(this.getMonsterData().getId());
+
+        if (gatherData == null) {
+            return;
+        }
+
+        player.getInventory().addItem(gatherData.getGatherItem(), ActionReason.SubfieldDrop);
+
+        this.getScene().killEntity(this);
+    }
+
+    @Override
+    public void onCreate() {
+        // Lua event
+        getScene().getScriptManager().callEvent(EventType.EVENT_ANY_MONSTER_LIVE, new ScriptArgs(this.getConfigId()));
+    }
+
+    @Override
+    public void damage(float amount, int killerId) {
+        // Get HP before damage.
+        float hpBeforeDamage = this.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP);
+
+        // Apply damage.
+        super.damage(amount, killerId);
+
+        // Get HP after damage.
+        float hpAfterDamage = this.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP);
+
+        // Invoke energy drop logic.
+        for (Player player : this.getScene().getPlayers()) {
+            player.getEnergyManager().handleMonsterEnergyDrop(this, hpBeforeDamage, hpAfterDamage);
+        }
+    }
+
+    @Override
+    public void onDeath(int killerId) {
+        if (this.getSpawnEntry() != null) {
+            this.getScene().getDeadSpawnedEntities().add(getSpawnEntry());
+        }
+        // first set the challenge data
+        if (getScene().getChallenge() != null) {
+            getScene().getChallenge().onMonsterDeath(this);
+        }
+        if (getScene().getScriptManager().isInit() && this.getGroupId() > 0) {
+            if (getScene().getScriptManager().getScriptMonsterSpawnService() != null) {
+                getScene().getScriptManager().getScriptMonsterSpawnService().onMonsterDead(this);
+            }
+            // prevent spawn monster after success
+            if (getScene().getChallenge() != null && getScene().getChallenge().inProgress()) {
+                getScene().getScriptManager().callEvent(EventType.EVENT_ANY_MONSTER_DIE, new ScriptArgs().setParam1(this.getConfigId()));
+            }else if (getScene().getChallenge() == null) {
+                getScene().getScriptManager().callEvent(EventType.EVENT_ANY_MONSTER_DIE, new ScriptArgs().setParam1(this.getConfigId()));
+            }
+        }
+        // Battle Pass trigger
+        getScene().getPlayers().forEach(p -> p.getBattlePassManager().triggerMission(WatcherTriggerType.TRIGGER_MONSTER_DIE, this.getMonsterId(), 1));
+    }
+
+    public void recalcStats() {
+        // Monster data
+        MonsterData data = this.getMonsterData();
+
+        // Get hp percent, set to 100% if none
+        float hpPercent = this.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP) <= 0 ? 1f : this.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP) / this.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP);
+
+        // Clear properties
+        this.getFightProperties().clear();
+
+        // Base stats
+        this.setFightProperty(FightProperty.FIGHT_PROP_BASE_HP, data.getBaseHp());
+        this.setFightProperty(FightProperty.FIGHT_PROP_BASE_ATTACK, data.getBaseAttack());
+        this.setFightProperty(FightProperty.FIGHT_PROP_BASE_DEFENSE, data.getBaseDefense());
+
+        this.setFightProperty(FightProperty.FIGHT_PROP_PHYSICAL_SUB_HURT, data.getPhysicalSubHurt());
+        this.setFightProperty(FightProperty.FIGHT_PROP_FIRE_SUB_HURT, .1f);
+        this.setFightProperty(FightProperty.FIGHT_PROP_ELEC_SUB_HURT, data.getElecSubHurt());
+        this.setFightProperty(FightProperty.FIGHT_PROP_WATER_SUB_HURT, data.getWaterSubHurt());
+        this.setFightProperty(FightProperty.FIGHT_PROP_GRASS_SUB_HURT, data.getGrassSubHurt());
+        this.setFightProperty(FightProperty.FIGHT_PROP_WIND_SUB_HURT, data.getWindSubHurt());
+        this.setFightProperty(FightProperty.FIGHT_PROP_ROCK_SUB_HURT, .1f);
+        this.setFightProperty(FightProperty.FIGHT_PROP_ICE_SUB_HURT, data.getIceSubHurt());
+
+        // Level curve
+        MonsterCurveData curve = GameData.getMonsterCurveDataMap().get(this.getLevel());
+        if (curve != null) {
+            for (PropGrowCurve growCurve : data.getPropGrowCurves()) {
+                FightProperty prop = FightProperty.getPropByName(growCurve.getType());
+                this.setFightProperty(prop, this.getFightProperty(prop) * curve.getMultByProp(growCurve.getGrowCurve()));
+            }
+        }
+
+        // Set % stats
+        this.setFightProperty(
+            FightProperty.FIGHT_PROP_MAX_HP,
+            (getFightProperty(FightProperty.FIGHT_PROP_BASE_HP) * (1f + getFightProperty(FightProperty.FIGHT_PROP_HP_PERCENT))) + getFightProperty(FightProperty.FIGHT_PROP_HP)
+        );
+        this.setFightProperty(
+            FightProperty.FIGHT_PROP_CUR_ATTACK,
+            (getFightProperty(FightProperty.FIGHT_PROP_BASE_ATTACK) * (1f + getFightProperty(FightProperty.FIGHT_PROP_ATTACK_PERCENT))) + getFightProperty(FightProperty.FIGHT_PROP_ATTACK)
+        );
+        this.setFightProperty(
+            FightProperty.FIGHT_PROP_CUR_DEFENSE,
+            (getFightProperty(FightProperty.FIGHT_PROP_BASE_DEFENSE) * (1f + getFightProperty(FightProperty.FIGHT_PROP_DEFENSE_PERCENT))) + getFightProperty(FightProperty.FIGHT_PROP_DEFENSE)
+        );
+
+        // Set current hp
+        this.setFightProperty(FightProperty.FIGHT_PROP_CUR_HP, this.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP) * hpPercent);
+    }
+
+    @Override
+    public SceneEntityInfo toProto() {
+        EntityAuthorityInfo authority = EntityAuthorityInfo.newBuilder()
+                .setAbilityInfo(AbilitySyncStateInfo.newBuilder())
+                .setRendererChangedInfo(EntityRendererChangedInfo.newBuilder())
+                .setAiInfo(SceneEntityAiInfo.newBuilder().setIsAiOpen(true).setBornPos(this.getBornPos().toProto()))
+                .setBornPos(this.getBornPos().toProto())
+                .build();
+
+        SceneEntityInfo.Builder entityInfo = SceneEntityInfo.newBuilder()
+                .setEntityId(getId())
+                .setEntityType(ProtEntityType.PROT_ENTITY_TYPE_MONSTER)
+                .setMotionInfo(this.getMotionInfo())
+                .addAnimatorParaList(AnimatorParameterValueInfoPair.newBuilder())
+                .setEntityClientData(EntityClientData.newBuilder())
+                .setEntityAuthorityInfo(authority)
+                .setLifeState(this.getLifeState().getValue());
+
+        for (Int2FloatMap.Entry entry : getFightProperties().int2FloatEntrySet()) {
+            if (entry.getIntKey() == 0) {
+                continue;
+            }
+            FightPropPair fightProp = FightPropPair.newBuilder().setPropType(entry.getIntKey()).setPropValue(entry.getFloatValue()).build();
+            entityInfo.addFightPropList(fightProp);
+        }
+
+        PropPair pair = PropPair.newBuilder()
+                .setType(PlayerProperty.PROP_LEVEL.getId())
+                .setPropValue(ProtoHelper.newPropValue(PlayerProperty.PROP_LEVEL, getLevel()))
+                .build();
+        entityInfo.addPropList(pair);
+
+        SceneMonsterInfo.Builder monsterInfo = SceneMonsterInfo.newBuilder()
+                .setMonsterId(getMonsterId())
+                .setGroupId(this.getGroupId())
+                .setConfigId(this.getConfigId())
+                .addAllAffixList(getMonsterData().getAffix())
+                .setAuthorityPeerId(getWorld().getHostPeerId())
+                .setPoseId(this.getPoseId())
+                .setBlockId(3001)
+                .setBornType(MonsterBornType.MONSTER_BORN_TYPE_DEFAULT)
+                .setSpecialNameId(40);
+
+        if (getMonsterData().getDescribeData() != null) {
+            monsterInfo.setTitleId(getMonsterData().getDescribeData().getTitleID());
+        }
+
+        if (this.getMonsterWeaponId() > 0) {
+            SceneWeaponInfo weaponInfo = SceneWeaponInfo.newBuilder()
+                    .setEntityId(this.weaponEntityId)
+                    .setGadgetId(this.getMonsterWeaponId())
+                    .setAbilityInfo(AbilitySyncStateInfo.newBuilder())
+                    .build();
+
+            monsterInfo.addWeaponList(weaponInfo);
+        }
+
+        entityInfo.setMonster(monsterInfo);
+
+        return entityInfo.build();
+    }
 }

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

@@ -10,6 +10,7 @@ import emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.Animat
 import emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo;
 import emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo;
 import emu.grasscutter.net.proto.FightPropPairOuterClass.*;
+import emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq;
 import emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo;
 import emu.grasscutter.net.proto.PropPairOuterClass.PropPair;
 import emu.grasscutter.net.proto.ProtEntityTypeOuterClass.ProtEntityType;
@@ -30,104 +31,104 @@ import java.util.ArrayList;
 
 public class EntityVehicle extends EntityBaseGadget {
 
-	private final Player owner;
-	private final Int2FloatOpenHashMap fightProp;
+    private final Player owner;
+    private final Int2FloatOpenHashMap fightProp;
 
-	private final Position pos;
-	private final Position rot;
+    private final Position pos;
+    private final Position rot;
 
-	private final int pointId;
-	private final int gadgetId;
+    private final int pointId;
+    private final int gadgetId;
 
-	private float curStamina;
-	private List<VehicleMember> vehicleMembers;
+    private float curStamina;
+    private List<VehicleMember> vehicleMembers;
 
-	public EntityVehicle(Scene scene, Player player, int gadgetId, int pointId, Position pos, Position rot) {
-		super(scene);
-		this.owner = player;
-		this.id = getScene().getWorld().getNextEntityId(EntityIdType.GADGET);
-		this.fightProp = new Int2FloatOpenHashMap();
-		this.pos = new Position(pos);
-		this.rot = new Position(rot);
-		this.gadgetId = gadgetId;
-		this.pointId = pointId;
-		this.curStamina = 240;
-		this.vehicleMembers = new ArrayList<VehicleMember>();
-	}
+    public EntityVehicle(Scene scene, Player player, int gadgetId, int pointId, Position pos, Position rot) {
+        super(scene);
+        this.owner = player;
+        this.id = getScene().getWorld().getNextEntityId(EntityIdType.GADGET);
+        this.fightProp = new Int2FloatOpenHashMap();
+        this.pos = new Position(pos);
+        this.rot = new Position(rot);
+        this.gadgetId = gadgetId;
+        this.pointId = pointId;
+        this.curStamina = 240;
+        this.vehicleMembers = new ArrayList<VehicleMember>();
+    }
 
-	@Override
-	public int getGadgetId() { return gadgetId; }
+    @Override
+    public int getGadgetId() { return gadgetId; }
 
-	public Player getOwner() {
-		return owner;
-	}
+    public Player getOwner() {
+        return owner;
+    }
 
-	public float getCurStamina() { return curStamina; }
+    public float getCurStamina() { return curStamina; }
 
-	public void setCurStamina(float stamina) { this.curStamina = stamina; }
+    public void setCurStamina(float stamina) { this.curStamina = stamina; }
 
-	public int getPointId() { return pointId; }
+    public int getPointId() { return pointId; }
 
-	public List<VehicleMember> getVehicleMembers() { return vehicleMembers; }
+    public List<VehicleMember> getVehicleMembers() { return vehicleMembers; }
 
-	@Override
-	public Int2FloatOpenHashMap getFightProperties() {
-		return fightProp;
-	}
+    @Override
+    public Int2FloatOpenHashMap getFightProperties() {
+        return fightProp;
+    }
 
-	@Override
-	public Position getPosition() { return this.pos; }
+    @Override
+    public Position getPosition() { return this.pos; }
 
-	@Override
-	public Position getRotation() {
-		return this.rot;
-	}
+    @Override
+    public Position getRotation() {
+        return this.rot;
+    }
 
-	@Override
-	public SceneEntityInfo toProto() {
+    @Override
+    public SceneEntityInfo toProto() {
 
-		VehicleInfo vehicle = VehicleInfo.newBuilder()
-				.setOwnerUid(this.owner.getUid())
-				.setCurStamina(getCurStamina())
-				.build();
+        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();
+        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);
+        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);
+        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();
+        PropPair pair = PropPair.newBuilder()
+                .setType(PlayerProperty.PROP_LEVEL.getId())
+                .setPropValue(ProtoHelper.newPropValue(PlayerProperty.PROP_LEVEL, 47))
+                .build();
 
-		for (Int2FloatMap.Entry entry : getFightProperties().int2FloatEntrySet()) {
-			if (entry.getIntKey() == 0) {
-				continue;
-			}
-			FightPropPair fightProp = FightPropPair.newBuilder().setPropType(entry.getIntKey()).setPropValue(entry.getFloatValue()).build();
-			entityInfo.addFightPropList(fightProp);
-		}
+        for (Int2FloatMap.Entry entry : getFightProperties().int2FloatEntrySet()) {
+            if (entry.getIntKey() == 0) {
+                continue;
+            }
+            FightPropPair fightProp = FightPropPair.newBuilder().setPropType(entry.getIntKey()).setPropValue(entry.getFloatValue()).build();
+            entityInfo.addFightPropList(fightProp);
+        }
 
-		entityInfo.addPropList(pair);
+        entityInfo.addPropList(pair);
 
-		return entityInfo.build();
-	}
+        return entityInfo.build();
+    }
 }

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

@@ -3,12 +3,14 @@ package emu.grasscutter.game.entity;
 import java.util.HashMap;
 import java.util.Map;
 
+import emu.grasscutter.game.player.Player;
 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;
@@ -80,153 +82,153 @@ public abstract class GameEntity {
 		return this.metaModifiers;
 	}
 
-	public abstract Int2FloatOpenHashMap getFightProperties();
+    public abstract Int2FloatOpenHashMap getFightProperties();
 
-	public abstract Position getPosition();
+    public abstract Position getPosition();
 
-	public abstract Position getRotation();
+    public abstract Position getRotation();
 
-	public MotionState getMotionState() {
-		return moveState;
-	}
+    public MotionState getMotionState() {
+        return moveState;
+    }
 
-	public void setMotionState(MotionState moveState) {
-		this.moveState = moveState;
-	}
+    public void setMotionState(MotionState moveState) {
+        this.moveState = moveState;
+    }
 
-	public int getLastMoveSceneTimeMs() {
-		return lastMoveSceneTimeMs;
-	}
+    public int getLastMoveSceneTimeMs() {
+        return lastMoveSceneTimeMs;
+    }
 
-	public void setLastMoveSceneTimeMs(int lastMoveSceneTimeMs) {
-		this.lastMoveSceneTimeMs = lastMoveSceneTimeMs;
-	}
+    public void setLastMoveSceneTimeMs(int lastMoveSceneTimeMs) {
+        this.lastMoveSceneTimeMs = lastMoveSceneTimeMs;
+    }
 
-	public int getLastMoveReliableSeq() {
-		return lastMoveReliableSeq;
-	}
+    public int getLastMoveReliableSeq() {
+        return lastMoveReliableSeq;
+    }
 
-	public void setLastMoveReliableSeq(int lastMoveReliableSeq) {
-		this.lastMoveReliableSeq = lastMoveReliableSeq;
-	}
+    public void setLastMoveReliableSeq(int lastMoveReliableSeq) {
+        this.lastMoveReliableSeq = lastMoveReliableSeq;
+    }
 
-	public void setFightProperty(FightProperty prop, float value) {
-		this.getFightProperties().put(prop.getId(), value);
-	}
+    public void setFightProperty(FightProperty prop, float value) {
+        this.getFightProperties().put(prop.getId(), value);
+    }
 
-	private void setFightProperty(int id, float value) {
-		this.getFightProperties().put(id, value);
-	}
+    private void setFightProperty(int id, float value) {
+        this.getFightProperties().put(id, value);
+    }
 
-	public void addFightProperty(FightProperty prop, float value) {
-		this.getFightProperties().put(prop.getId(), getFightProperty(prop) + value);
-	}
+    public void addFightProperty(FightProperty prop, float value) {
+        this.getFightProperties().put(prop.getId(), getFightProperty(prop) + value);
+    }
 
-	public float getFightProperty(FightProperty prop) {
-		return getFightProperties().getOrDefault(prop.getId(), 0f);
-	}
+    public float getFightProperty(FightProperty prop) {
+        return getFightProperties().getOrDefault(prop.getId(), 0f);
+    }
 
-	public void addAllFightPropsToEntityInfo(SceneEntityInfo.Builder entityInfo) {
-		for (Int2FloatMap.Entry entry : getFightProperties().int2FloatEntrySet()) {
-			if (entry.getIntKey() == 0) {
-				continue;
-			}
-			FightPropPair fightProp = FightPropPair.newBuilder().setPropType(entry.getIntKey()).setPropValue(entry.getFloatValue()).build();
-			entityInfo.addFightPropList(fightProp);
-		}
-	}
+    public void addAllFightPropsToEntityInfo(SceneEntityInfo.Builder entityInfo) {
+        for (Int2FloatMap.Entry entry : getFightProperties().int2FloatEntrySet()) {
+            if (entry.getIntKey() == 0) {
+                continue;
+            }
+            FightPropPair fightProp = FightPropPair.newBuilder().setPropType(entry.getIntKey()).setPropValue(entry.getFloatValue()).build();
+            entityInfo.addFightPropList(fightProp);
+        }
+    }
 
-	public int getBlockId() {
-		return blockId;
-	}
+    public int getBlockId() {
+        return blockId;
+    }
 
-	public void setBlockId(int blockId) {
-		this.blockId = blockId;
-	}
+    public void setBlockId(int blockId) {
+        this.blockId = blockId;
+    }
 
-	public int getConfigId() {
-		return configId;
-	}
+    public int getConfigId() {
+        return configId;
+    }
 
-	public void setConfigId(int configId) {
-		this.configId = configId;
-	}
+    public void setConfigId(int configId) {
+        this.configId = configId;
+    }
 
-	public int getGroupId() {
-		return groupId;
-	}
+    public int getGroupId() {
+        return groupId;
+    }
 
-	public void setGroupId(int groupId) {
-		this.groupId = groupId;
-	}
+    public void setGroupId(int groupId) {
+        this.groupId = groupId;
+    }
 
-	protected MotionInfo getMotionInfo() {
-		MotionInfo proto = MotionInfo.newBuilder()
-				.setPos(getPosition().toProto())
-				.setRot(getRotation().toProto())
-				.setSpeed(Vector.newBuilder())
-				.setState(this.getMotionState())
-				.build();
+    protected MotionInfo getMotionInfo() {
+        MotionInfo proto = MotionInfo.newBuilder()
+                .setPos(getPosition().toProto())
+                .setRot(getRotation().toProto())
+                .setSpeed(Vector.newBuilder())
+                .setState(this.getMotionState())
+                .build();
 
-		return proto;
-	}
+        return proto;
+    }
 
-	public SpawnDataEntry getSpawnEntry() {
-		return spawnEntry;
-	}
+    public SpawnDataEntry getSpawnEntry() {
+        return spawnEntry;
+    }
 
-	public void setSpawnEntry(SpawnDataEntry spawnEntry) {
-		this.spawnEntry = spawnEntry;
-	}
+    public void setSpawnEntry(SpawnDataEntry spawnEntry) {
+        this.spawnEntry = spawnEntry;
+    }
 
-	public float heal(float amount) {
-		if (this.getFightProperties() == null) {
-			return 0f;
-		}
+    public float heal(float amount) {
+        if (this.getFightProperties() == null) {
+            return 0f;
+        }
 
-		float curHp = getFightProperty(FightProperty.FIGHT_PROP_CUR_HP);
-		float maxHp = getFightProperty(FightProperty.FIGHT_PROP_MAX_HP);
+        float curHp = getFightProperty(FightProperty.FIGHT_PROP_CUR_HP);
+        float maxHp = getFightProperty(FightProperty.FIGHT_PROP_MAX_HP);
 
-		if (curHp >= maxHp) {
-			return 0f;
-		}
+        if (curHp >= maxHp) {
+            return 0f;
+        }
 
-		float healed = Math.min(maxHp - curHp, amount);
-		this.addFightProperty(FightProperty.FIGHT_PROP_CUR_HP, healed);
+        float healed = Math.min(maxHp - curHp, amount);
+        this.addFightProperty(FightProperty.FIGHT_PROP_CUR_HP, healed);
 
-		getScene().broadcastPacket(new PacketEntityFightPropUpdateNotify(this, FightProperty.FIGHT_PROP_CUR_HP));
+        getScene().broadcastPacket(new PacketEntityFightPropUpdateNotify(this, FightProperty.FIGHT_PROP_CUR_HP));
 
-		return healed;
-	}
+        return healed;
+    }
 
-	public void damage(float amount) {
-		damage(amount, 0);
-	}
+    public void damage(float amount) {
+        damage(amount, 0);
+    }
 
-	public void damage(float amount, int killerId) {
-		// Sanity check
-		if (getFightProperties() == null) {
-			return;
-		}
+    public void damage(float amount, int killerId) {
+        // Sanity check
+        if (getFightProperties() == null) {
+            return;
+        }
 
-		// Lose hp
-		addFightProperty(FightProperty.FIGHT_PROP_CUR_HP, -amount);
+        // Lose hp
+        addFightProperty(FightProperty.FIGHT_PROP_CUR_HP, -amount);
 
-		// Check if dead
-		boolean isDead = false;
-		if (getFightProperty(FightProperty.FIGHT_PROP_CUR_HP) <= 0f) {
-			setFightProperty(FightProperty.FIGHT_PROP_CUR_HP, 0f);
-			isDead = true;
-		}
+        // Check if dead
+        boolean isDead = false;
+        if (getFightProperty(FightProperty.FIGHT_PROP_CUR_HP) <= 0f) {
+            setFightProperty(FightProperty.FIGHT_PROP_CUR_HP, 0f);
+            isDead = true;
+        }
 
-		// Packets
-		this.getScene().broadcastPacket(new PacketEntityFightPropUpdateNotify(this, FightProperty.FIGHT_PROP_CUR_HP));
+        // Packets
+        this.getScene().broadcastPacket(new PacketEntityFightPropUpdateNotify(this, FightProperty.FIGHT_PROP_CUR_HP));
 
-		// Check if dead
-		if (isDead) {
-			getScene().killEntity(this, killerId);
-		}
-	}
+        // Check if dead
+        if (isDead) {
+            getScene().killEntity(this, killerId);
+        }
+    }
 
     /**
      * Move this entity to a new position.
@@ -239,20 +241,29 @@ public abstract class GameEntity {
         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 onCreate() {
 
-	}
+    }
 
-	/**
+    /**
      * Called when this entity dies
      * @param killerId Entity id of the entity that killed this entity
      */
-	public void onDeath(int killerId) {
+    public void onDeath(int killerId) {
 
-	}
+    }
 
-	public abstract SceneEntityInfo toProto();
+    public abstract SceneEntityInfo toProto();
 }

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

@@ -3,6 +3,7 @@ package emu.grasscutter.game.entity.gadget;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.game.entity.EntityGadget;
 import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.LifeState;
 import emu.grasscutter.net.proto.BossChestInfoOuterClass.BossChestInfo;
 import emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq;
 import emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType;
@@ -11,54 +12,54 @@ import emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType;
 import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo;
 import emu.grasscutter.scripts.constants.ScriptGadgetState;
 import emu.grasscutter.server.packet.send.PacketGadgetInteractRsp;
+import emu.grasscutter.server.packet.send.PacketLifeStateChangeNotify;
 
 public class GadgetChest extends GadgetContent {
-	
-	public GadgetChest(EntityGadget gadget) {
-		super(gadget);
-	}
 
-	public boolean onInteract(Player player, GadgetInteractReq req) {
-		var chestInteractHandlerMap = getGadget().getScene().getWorld().getServer().getWorldDataManager().getChestInteractHandlerMap();
-		var handler = chestInteractHandlerMap.get(getGadget().getGadgetData().getJsonName());
-		if(handler == null){
-			Grasscutter.getLogger().warn("Could not found the handler of this type of Chests {}", getGadget().getGadgetData().getJsonName());
-			return false;
-		}
+    public GadgetChest(EntityGadget gadget) {
+        super(gadget);
+    }
 
-		if(req.getOpType() == InterOpType.INTER_OP_TYPE_START && handler.isTwoStep()){
-			player.sendPacket(new PacketGadgetInteractRsp(getGadget(), InteractType.INTERACT_TYPE_OPEN_CHEST, InterOpType.INTER_OP_TYPE_START));
-			return false;
-		}else{
-			var success = handler.onInteract(this, player);
-			if (!success){
-				return false;
-			}
+    public boolean onInteract(Player player, GadgetInteractReq req) {
+        var chestInteractHandlerMap = getGadget().getScene().getWorld().getServer().getWorldDataSystem().getChestInteractHandlerMap();
+        var handler = chestInteractHandlerMap.get(getGadget().getGadgetData().getJsonName());
+        if (handler == null) {
+            Grasscutter.getLogger().warn("Could not found the handler of this type of Chests {}", getGadget().getGadgetData().getJsonName());
+            return false;
+        }
 
-			getGadget().updateState(ScriptGadgetState.ChestOpened);
-			player.sendPacket(new PacketGadgetInteractRsp(this.getGadget(), InteractTypeOuterClass.InteractType.INTERACT_TYPE_OPEN_CHEST));
-			// let the chest disappear
-			getGadget().die();
-			return true;
-		}
-	}
+        if (req.getOpType() == InterOpType.INTER_OP_TYPE_START && handler.isTwoStep()) {
+            player.sendPacket(new PacketGadgetInteractRsp(getGadget(), InteractType.INTERACT_TYPE_OPEN_CHEST, InterOpType.INTER_OP_TYPE_START));
+            return false;
+        }else {
+            var success = handler.onInteract(this, player);
+            if (!success) {
+                return false;
+            }
 
-	public void onBuildProto(SceneGadgetInfo.Builder gadgetInfo) {
-		if(getGadget().getMetaGadget() == null){
-			return;
-		}
+            getGadget().updateState(ScriptGadgetState.ChestOpened);
+            player.sendPacket(new PacketGadgetInteractRsp(this.getGadget(), InteractTypeOuterClass.InteractType.INTERACT_TYPE_OPEN_CHEST));
 
-		var bossChest = getGadget().getMetaGadget().boss_chest;
-		if(bossChest != null){
-			var players = getGadget().getScene().getPlayers().stream().map(Player::getUid).toList();
+            return true;
+        }
+    }
 
-			gadgetInfo.setBossChest(BossChestInfo.newBuilder()
-					.setMonsterConfigId(bossChest.monster_config_id)
-					.setResin(bossChest.resin)
-					.addAllQualifyUidList(players)
-					.addAllRemainUidList(players)
-					.build());
-		}
+    public void onBuildProto(SceneGadgetInfo.Builder gadgetInfo) {
+        if (getGadget().getMetaGadget() == null) {
+            return;
+        }
 
-	}
+        var bossChest = getGadget().getMetaGadget().boss_chest;
+        if (bossChest != null) {
+            var players = getGadget().getScene().getPlayers().stream().map(Player::getUid).toList();
+
+            gadgetInfo.setBossChest(BossChestInfo.newBuilder()
+                    .setMonsterConfigId(bossChest.monster_config_id)
+                    .setResin(bossChest.resin)
+                    .addAllQualifyUidList(players)
+                    .addAllRemainUidList(players)
+                    .build());
+        }
+
+    }
 }

src/main/java/emu/grasscutter/game/entity/gadget/chest/BossChestInteractHandler.java

@@ -19,11 +19,11 @@ public class BossChestInteractHandler implements ChestInteractHandler{
 
     @Override
     public boolean onInteract(GadgetChest chest, Player player) {
-        var worldDataManager = chest.getGadget().getScene().getWorld().getServer().getWorldDataManager();
+        var worldDataManager = chest.getGadget().getScene().getWorld().getServer().getWorldDataSystem();
         var monster = chest.getGadget().getMetaGadget().group.monsters.get(chest.getGadget().getMetaGadget().boss_chest.monster_config_id);
         var reward = worldDataManager.getRewardByBossId(monster.monster_id);
 
-        if(reward == null){
+        if (reward == null) {
             Grasscutter.getLogger().warn("Could not found the reward of boss monster {}", monster.monster_id);
             return false;
         }

src/main/java/emu/grasscutter/game/expedition/ExpeditionSystem.java

@@ -3,40 +3,37 @@ package emu.grasscutter.game.expedition;
 import com.google.gson.reflect.TypeToken;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.DataLoader;
+import emu.grasscutter.server.game.BaseGameSystem;
 import emu.grasscutter.server.game.GameServer;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
+import static emu.grasscutter.config.Configuration.*;
+
 import java.io.FileReader;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.util.Collection;
 import java.util.List;
 
-import static emu.grasscutter.Configuration.*;
-
-public class ExpeditionManager {
-    public GameServer getGameServer() {
-        return gameServer;
-    }
-
-    private final GameServer gameServer;
-
-    public Int2ObjectMap<List<ExpeditionRewardDataList>> getExpeditionRewardDataList() { return expeditionRewardData; }
-
+public class ExpeditionSystem extends BaseGameSystem {
     private final Int2ObjectMap<List<ExpeditionRewardDataList>> expeditionRewardData;
 
-    public ExpeditionManager(GameServer gameServer) {
-        this.gameServer = gameServer;
+    public ExpeditionSystem(GameServer server) {
+        super(server);
         this.expeditionRewardData = new Int2ObjectOpenHashMap<>();
         this.load();
     }
 
+    public Int2ObjectMap<List<ExpeditionRewardDataList>> getExpeditionRewardDataList() {
+        return expeditionRewardData;
+    }
+
     public synchronized void load() {
-        try (Reader fileReader = new InputStreamReader(DataLoader.load("ExpeditionReward.json"))) {
+        try (Reader fileReader = DataLoader.loadReader("ExpeditionReward.json")) {
             getExpeditionRewardDataList().clear();
             List<ExpeditionRewardInfo> banners = Grasscutter.getGsonFactory().fromJson(fileReader, TypeToken.getParameterized(Collection.class, ExpeditionRewardInfo.class).getType());
-            if(banners.size() > 0) {
+            if (banners.size() > 0) {
                 for (ExpeditionRewardInfo di : banners) {
                     getExpeditionRewardDataList().put(di.getExpId(), di.getExpeditionRewardDataList());
                 }

src/main/java/emu/grasscutter/game/friends/FriendsList.java

@@ -3,6 +3,7 @@ package emu.grasscutter.game.friends;
 import java.util.List;
 
 import emu.grasscutter.database.DatabaseHelper;
+import emu.grasscutter.game.player.BasePlayerManager;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.net.proto.DealAddFriendResultTypeOuterClass.DealAddFriendResultType;
 import emu.grasscutter.server.packet.send.PacketAskAddFriendNotify;
@@ -13,250 +14,244 @@ import emu.grasscutter.server.packet.send.PacketDeleteFriendRsp;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
-public class FriendsList {
-	private final Player player;
-	
-	private final Int2ObjectMap<Friendship> friends;
-	private final Int2ObjectMap<Friendship> pendingFriends;
-	
-	private boolean loaded = false;
-	
-	public FriendsList(Player player) {
-		this.player = player;
-		this.friends = new Int2ObjectOpenHashMap<Friendship>();
-		this.pendingFriends = new Int2ObjectOpenHashMap<Friendship>();
-	}
-	
-	public Player getPlayer() {
-		return player;
-	}
-	
-	public boolean hasLoaded() {
-		return loaded;
-	}
-	
-	public synchronized Int2ObjectMap<Friendship> getFriends() {
-		return friends;
-	}
-	
-	public synchronized Int2ObjectMap<Friendship> getPendingFriends() {
-		return this.pendingFriends;
-	}
-	
-	public synchronized boolean isFriendsWith(int uid) {
-		return this.getFriends().containsKey(uid);
-	}
-	
-	private synchronized Friendship getFriendshipById(int id) {
-		Friendship friendship = this.getFriends().get(id);
-		if (friendship == null) {
-			friendship = this.getPendingFriendById(id);
-		}
-		return friendship;
-	}
-	
-	private synchronized Friendship getFriendById(int id) {
-		return this.getFriends().get(id);
-	}
-	
-	private synchronized Friendship getPendingFriendById(int id) {
-		return this.getPendingFriends().get(id);
-	}
-	
-	public void addFriend(Friendship friendship) {
-		getFriends().put(friendship.getFriendId(), friendship);
-	}
-	
-	public void addPendingFriend(Friendship friendship) {
-		getPendingFriends().put(friendship.getFriendId(), friendship);
-	}
-	
-	public synchronized void handleFriendRequest(int targetUid, DealAddFriendResultType result) {
-		// Check if player has sent friend request
-		Friendship myFriendship = this.getPendingFriendById(targetUid);
-		if (myFriendship == null) {
-			return;
-		}
-		
-		// Make sure asker cant do anything
-		if (myFriendship.getAskerId() == this.getPlayer().getUid()) {
-			return;
-		}
+public class FriendsList extends BasePlayerManager {
+    private final Int2ObjectMap<Friendship> friends;
+    private final Int2ObjectMap<Friendship> pendingFriends;
 
-		Player target = getPlayer().getSession().getServer().getPlayerByUid(targetUid, true);
-		if (target == null) {
-			return; // Should never happen
-		}
+    private boolean loaded = false;
 
-		// Get target's friendship
-		Friendship theirFriendship = null;
-		if (target.isOnline()) {
-			theirFriendship = target.getFriendsList().getPendingFriendById(this.getPlayer().getUid());
-		} else {
-			theirFriendship = DatabaseHelper.getReverseFriendship(myFriendship);
-		}
+    public FriendsList(Player player) {
+        super(player);
+        this.friends = new Int2ObjectOpenHashMap<Friendship>();
+        this.pendingFriends = new Int2ObjectOpenHashMap<Friendship>();
+    }
 
-		if (theirFriendship == null) {
-			// They dont have us on their friends list anymore, rip
-			this.getPendingFriends().remove(myFriendship.getOwnerId());
-			myFriendship.delete();
-			return;
-		}
+    public boolean hasLoaded() {
+        return loaded;
+    }
 
-		// Handle
-		if (result == DealAddFriendResultType.DEAL_ADD_FRIEND_RESULT_TYPE_ACCEPT) { // Request accepted
-			myFriendship.setIsFriend(true);
-			theirFriendship.setIsFriend(true);
-			
-			this.getPendingFriends().remove(myFriendship.getOwnerId());
-			this.addFriend(myFriendship);
-			
-			if (target.isOnline()) {
-				target.getFriendsList().getPendingFriends().remove(this.getPlayer().getUid());
-				target.getFriendsList().addFriend(theirFriendship);
-			}
-			
-			myFriendship.save();
-			theirFriendship.save();
-		} else { // Request declined
-			// Delete from my pending friends
-			this.getPendingFriends().remove(myFriendship.getOwnerId());
-			myFriendship.delete();
-			// Delete from target uid
-			if (target.isOnline()) {
-				theirFriendship = target.getFriendsList().getPendingFriendById(this.getPlayer().getUid());
-			}
-			theirFriendship.delete();
-		} 
-		
-		// Packet
-		this.getPlayer().sendPacket(new PacketDealAddFriendRsp(targetUid, result));
-	}
-	
-	public synchronized void deleteFriend(int targetUid) {
-		Friendship myFriendship = this.getFriendById(targetUid);
-		if (myFriendship == null) {
-			return;
-		}
-		
-		this.getFriends().remove(targetUid);
-		myFriendship.delete();
-		
-		Friendship theirFriendship = null;
-		Player friend = myFriendship.getFriendProfile().getPlayer();
-		if (friend != null) {
-			// Friend online
-			theirFriendship = friend.getFriendsList().getFriendById(this.getPlayer().getUid());
-			if (theirFriendship != null) {
-				friend.getFriendsList().getFriends().remove(theirFriendship.getFriendId());
-				theirFriendship.delete();
-				friend.sendPacket(new PacketDeleteFriendNotify(theirFriendship.getFriendId()));
-			}
-		} else {
-			// Friend offline
-			theirFriendship = DatabaseHelper.getReverseFriendship(myFriendship);
-			if (theirFriendship != null) {
-				theirFriendship.delete();
-			}
-		}
-		
-		// Packet
-		this.getPlayer().sendPacket(new PacketDeleteFriendRsp(targetUid));
-	}
-	
-	public synchronized void sendFriendRequest(int targetUid) {
-		Player target = getPlayer().getSession().getServer().getPlayerByUid(targetUid, true);
+    public synchronized Int2ObjectMap<Friendship> getFriends() {
+        return friends;
+    }
 
-		if (target == null || target == this.getPlayer()) {
-			return;
-		}
-		
-		// Check if friend already exists
-		if (this.getPendingFriends().containsKey(targetUid) || this.getFriends().containsKey(targetUid)) {
-			return;
-		}
-		
-		// Create friendships
-		Friendship myFriendship = new Friendship(getPlayer(), target, getPlayer());
-		Friendship theirFriendship = new Friendship(target, getPlayer(), getPlayer());
-		
-		// Add pending lists
-		this.addPendingFriend(myFriendship);
+    public synchronized Int2ObjectMap<Friendship> getPendingFriends() {
+        return this.pendingFriends;
+    }
 
-		if (target.isOnline() && target.getFriendsList().hasLoaded()) {
-			target.getFriendsList().addPendingFriend(theirFriendship);
-			target.sendPacket(new PacketAskAddFriendNotify(theirFriendship));
-		}
-		
-		// Save
-		myFriendship.save();
-		theirFriendship.save();
-		
-		// Packets
-		this.getPlayer().sendPacket(new PacketAskAddFriendRsp(targetUid));
-	}
-	
-	/** Gets total amount of potential friends
-	 * */
-	public int getFullFriendCount() {
-		return this.getPendingFriends().size() + this.getFriends().size();
-	}
+    public synchronized boolean isFriendsWith(int uid) {
+        return this.getFriends().containsKey(uid);
+    }
 
-	public synchronized void loadFromDatabase() {
-		if (this.hasLoaded()) {
-			return;
-		}
-		
-		// Get friendships from the db
-		List<Friendship> friendships = DatabaseHelper.getFriends(player);
-		friendships.forEach(this::loadFriendFromDatabase);
-		
-		// Set loaded flag
-		this.loaded = true;
-	}
-	
-	private void loadFriendFromDatabase(Friendship friendship) {
-		// Set friendship owner
-		friendship.setOwner(getPlayer());
+    private synchronized Friendship getFriendshipById(int id) {
+        Friendship friendship = this.getFriends().get(id);
+        if (friendship == null) {
+            friendship = this.getPendingFriendById(id);
+        }
+        return friendship;
+    }
 
-		// Check if friend is online
-		Player friend = getPlayer().getSession().getServer().getPlayerByUid(friendship.getFriendProfile().getUid());
-		if (friend != null) {
-			// Set friend to online mode
-			friendship.setFriendProfile(friend);
-			
-			// Update our status on friend's client if theyre online
-			if (friend.getFriendsList().hasLoaded()) {
-				Friendship theirFriendship = friend.getFriendsList().getFriendshipById(getPlayer().getUid());
-				if (theirFriendship != null) {
-					// Update friend profile
-					theirFriendship.setFriendProfile(getPlayer());
-				} else {
-					// They dont have us on their friends list anymore, rip
-					friendship.delete();
-					return;
-				}
-			}
-		}
-		
-		// Finally, load to our friends list
-		if (friendship.isFriend()) {
-			getFriends().put(friendship.getFriendId(), friendship);
-		} else {
-			getPendingFriends().put(friendship.getFriendId(), friendship);
-			// TODO - Hacky fix to force client to see a notification for a friendship
-			if (getPendingFriends().size() == 1) {
-				getPlayer().getSession().send(new PacketAskAddFriendNotify(friendship));
-			}
-		}
-	}
-	
-	public void save() {
-		// Update all our friends
-		List<Friendship> friendships = DatabaseHelper.getReverseFriends(getPlayer());
-		for (Friendship friend : friendships) {
-			friend.setFriendProfile(this.getPlayer());
-			friend.save();
-		}
-	}
+    private synchronized Friendship getFriendById(int id) {
+        return this.getFriends().get(id);
+    }
+
+    private synchronized Friendship getPendingFriendById(int id) {
+        return this.getPendingFriends().get(id);
+    }
+
+    public void addFriend(Friendship friendship) {
+        getFriends().put(friendship.getFriendId(), friendship);
+    }
+
+    public void addPendingFriend(Friendship friendship) {
+        getPendingFriends().put(friendship.getFriendId(), friendship);
+    }
+
+    public synchronized void handleFriendRequest(int targetUid, DealAddFriendResultType result) {
+        // Check if player has sent friend request
+        Friendship myFriendship = this.getPendingFriendById(targetUid);
+        if (myFriendship == null) {
+            return;
+        }
+
+        // Make sure asker cant do anything
+        if (myFriendship.getAskerId() == this.getPlayer().getUid()) {
+            return;
+        }
+
+        Player target = getPlayer().getSession().getServer().getPlayerByUid(targetUid, true);
+        if (target == null) {
+            return; // Should never happen
+        }
+
+        // Get target's friendship
+        Friendship theirFriendship = null;
+        if (target.isOnline()) {
+            theirFriendship = target.getFriendsList().getPendingFriendById(this.getPlayer().getUid());
+        } else {
+            theirFriendship = DatabaseHelper.getReverseFriendship(myFriendship);
+        }
+
+        if (theirFriendship == null) {
+            // They dont have us on their friends list anymore, rip
+            this.getPendingFriends().remove(myFriendship.getOwnerId());
+            myFriendship.delete();
+            return;
+        }
+
+        // Handle
+        if (result == DealAddFriendResultType.DEAL_ADD_FRIEND_RESULT_TYPE_ACCEPT) { // Request accepted
+            myFriendship.setIsFriend(true);
+            theirFriendship.setIsFriend(true);
+
+            this.getPendingFriends().remove(myFriendship.getOwnerId());
+            this.addFriend(myFriendship);
+
+            if (target.isOnline()) {
+                target.getFriendsList().getPendingFriends().remove(this.getPlayer().getUid());
+                target.getFriendsList().addFriend(theirFriendship);
+            }
+
+            myFriendship.save();
+            theirFriendship.save();
+        } else { // Request declined
+            // Delete from my pending friends
+            this.getPendingFriends().remove(myFriendship.getOwnerId());
+            myFriendship.delete();
+            // Delete from target uid
+            if (target.isOnline()) {
+                theirFriendship = target.getFriendsList().getPendingFriendById(this.getPlayer().getUid());
+            }
+            theirFriendship.delete();
+        }
+
+        // Packet
+        this.getPlayer().sendPacket(new PacketDealAddFriendRsp(targetUid, result));
+    }
+
+    public synchronized void deleteFriend(int targetUid) {
+        Friendship myFriendship = this.getFriendById(targetUid);
+        if (myFriendship == null) {
+            return;
+        }
+
+        this.getFriends().remove(targetUid);
+        myFriendship.delete();
+
+        Friendship theirFriendship = null;
+        Player friend = myFriendship.getFriendProfile().getPlayer();
+        if (friend != null) {
+            // Friend online
+            theirFriendship = friend.getFriendsList().getFriendById(this.getPlayer().getUid());
+            if (theirFriendship != null) {
+                friend.getFriendsList().getFriends().remove(theirFriendship.getFriendId());
+                theirFriendship.delete();
+                friend.sendPacket(new PacketDeleteFriendNotify(theirFriendship.getFriendId()));
+            }
+        } else {
+            // Friend offline
+            theirFriendship = DatabaseHelper.getReverseFriendship(myFriendship);
+            if (theirFriendship != null) {
+                theirFriendship.delete();
+            }
+        }
+
+        // Packet
+        this.getPlayer().sendPacket(new PacketDeleteFriendRsp(targetUid));
+    }
+
+    public synchronized void sendFriendRequest(int targetUid) {
+        Player target = getPlayer().getSession().getServer().getPlayerByUid(targetUid, true);
+
+        if (target == null || target == this.getPlayer()) {
+            return;
+        }
+
+        // Check if friend already exists
+        if (this.getPendingFriends().containsKey(targetUid) || this.getFriends().containsKey(targetUid)) {
+            return;
+        }
+
+        // Create friendships
+        Friendship myFriendship = new Friendship(getPlayer(), target, getPlayer());
+        Friendship theirFriendship = new Friendship(target, getPlayer(), getPlayer());
+
+        // Add pending lists
+        this.addPendingFriend(myFriendship);
+
+        if (target.isOnline() && target.getFriendsList().hasLoaded()) {
+            target.getFriendsList().addPendingFriend(theirFriendship);
+            target.sendPacket(new PacketAskAddFriendNotify(theirFriendship));
+        }
+
+        // Save
+        myFriendship.save();
+        theirFriendship.save();
+
+        // Packets
+        this.getPlayer().sendPacket(new PacketAskAddFriendRsp(targetUid));
+    }
+
+    /** Gets total amount of potential friends
+     * */
+    public int getFullFriendCount() {
+        return this.getPendingFriends().size() + this.getFriends().size();
+    }
+
+    public synchronized void loadFromDatabase() {
+        if (this.hasLoaded()) {
+            return;
+        }
+
+        // Get friendships from the db
+        List<Friendship> friendships = DatabaseHelper.getFriends(player);
+        friendships.forEach(this::loadFriendFromDatabase);
+
+        // Set loaded flag
+        this.loaded = true;
+    }
+
+    private void loadFriendFromDatabase(Friendship friendship) {
+        // Set friendship owner
+        friendship.setOwner(getPlayer());
+
+        // Check if friend is online
+        Player friend = getPlayer().getSession().getServer().getPlayerByUid(friendship.getFriendProfile().getUid());
+        if (friend != null) {
+            // Set friend to online mode
+            friendship.setFriendProfile(friend);
+
+            // Update our status on friend's client if theyre online
+            if (friend.getFriendsList().hasLoaded()) {
+                Friendship theirFriendship = friend.getFriendsList().getFriendshipById(getPlayer().getUid());
+                if (theirFriendship != null) {
+                    // Update friend profile
+                    theirFriendship.setFriendProfile(getPlayer());
+                } else {
+                    // They dont have us on their friends list anymore, rip
+                    friendship.delete();
+                    return;
+                }
+            }
+        }
+
+        // Finally, load to our friends list
+        if (friendship.isFriend()) {
+            getFriends().put(friendship.getFriendId(), friendship);
+        } else {
+            getPendingFriends().put(friendship.getFriendId(), friendship);
+            // TODO - Hacky fix to force client to see a notification for a friendship
+            if (getPendingFriends().size() == 1) {
+                getPlayer().getSession().send(new PacketAskAddFriendNotify(friendship));
+            }
+        }
+    }
+
+    public void save() {
+        // Update all our friends
+        List<Friendship> friendships = DatabaseHelper.getReverseFriends(getPlayer());
+        for (Friendship friend : friendships) {
+            friend.setFriendProfile(this.getPlayer());
+            friend.save();
+        }
+    }
 }

src/main/java/emu/grasscutter/game/gacha/GachaBanner.java

@@ -1,5 +1,7 @@
 package emu.grasscutter.game.gacha;
 
+import static emu.grasscutter.config.Configuration.*;
+
 import emu.grasscutter.data.common.ItemParamData;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo;
@@ -7,167 +9,165 @@ import emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo;
 import emu.grasscutter.utils.Utils;
 import lombok.Getter;
 
-import static emu.grasscutter.Configuration.*;
-
 public class GachaBanner {
-	@Getter private int gachaType;
-	@Getter private int scheduleId;
-	@Getter private String prefabPath;
-	@Getter private String previewPrefabPath;
-	@Getter private String titlePath;
-	private int costItemId = 0;
-	private int costItemAmount = 1;
-	private int costItemId10 = 0;
-	private int costItemAmount10 = 10;
-	@Getter private int beginTime;
-	@Getter private int endTime;
-	@Getter private int sortId;
-	@Getter private int gachaTimesLimit = Integer.MAX_VALUE;
-	private int[] rateUpItems4 = {};
-	private int[] rateUpItems5 = {};
-	@Getter private int[] fallbackItems3 = {11301, 11302, 11306, 12301, 12302, 12305, 13303, 14301, 14302, 14304, 15301, 15302, 15304};
-	@Getter private int[] fallbackItems4Pool1 = {1014, 1020, 1023, 1024, 1025, 1027, 1031, 1032, 1034, 1036, 1039, 1043, 1044, 1045, 1048, 1053, 1055, 1056, 1064};
-	@Getter private int[] fallbackItems4Pool2 = {11401, 11402, 11403, 11405, 12401, 12402, 12403, 12405, 13401, 13407, 14401, 14402, 14403, 14409, 15401, 15402, 15403, 15405};
-	@Getter private int[] fallbackItems5Pool1 = {1003, 1016, 1042, 1035, 1041};
-	@Getter private int[] fallbackItems5Pool2 = {11501, 11502, 12501, 12502, 13502, 13505, 14501, 14502, 15501, 15502};
-	@Getter private boolean removeC6FromPool = false;
-	@Getter private boolean autoStripRateUpFromFallback = true;
-	private int[][] weights4 = {{1,510}, {8,510}, {10,10000}};
-	private int[][] weights5 = {{1,75}, {73,150}, {90,10000}};
-	private int[][] poolBalanceWeights4 = {{1,255}, {17,255}, {21,10455}};
-	private int[][] poolBalanceWeights5 = {{1,30}, {147,150}, {181,10230}};
-	private int eventChance4 = 50; // Chance to win a featured event item
-	private int eventChance5 = 50; // Chance to win a featured event item
-	@Getter private BannerType bannerType = BannerType.STANDARD;
+    @Getter private int gachaType;
+    @Getter private int scheduleId;
+    @Getter private String prefabPath;
+    @Getter private String previewPrefabPath;
+    @Getter private String titlePath;
+    private int costItemId = 0;
+    private int costItemAmount = 1;
+    private int costItemId10 = 0;
+    private int costItemAmount10 = 10;
+    @Getter private int beginTime;
+    @Getter private int endTime;
+    @Getter private int sortId;
+    @Getter private int gachaTimesLimit = Integer.MAX_VALUE;
+    private int[] rateUpItems4 = {};
+    private int[] rateUpItems5 = {};
+    @Getter private int[] fallbackItems3 = {11301, 11302, 11306, 12301, 12302, 12305, 13303, 14301, 14302, 14304, 15301, 15302, 15304};
+    @Getter private int[] fallbackItems4Pool1 = {1014, 1020, 1023, 1024, 1025, 1027, 1031, 1032, 1034, 1036, 1039, 1043, 1044, 1045, 1048, 1053, 1055, 1056, 1064};
+    @Getter private int[] fallbackItems4Pool2 = {11401, 11402, 11403, 11405, 12401, 12402, 12403, 12405, 13401, 13407, 14401, 14402, 14403, 14409, 15401, 15402, 15403, 15405};
+    @Getter private int[] fallbackItems5Pool1 = {1003, 1016, 1042, 1035, 1041};
+    @Getter private int[] fallbackItems5Pool2 = {11501, 11502, 12501, 12502, 13502, 13505, 14501, 14502, 15501, 15502};
+    @Getter private boolean removeC6FromPool = false;
+    @Getter private boolean autoStripRateUpFromFallback = true;
+    private int[][] weights4 = {{1,510}, {8,510}, {10,10000}};
+    private int[][] weights5 = {{1,75}, {73,150}, {90,10000}};
+    private int[][] poolBalanceWeights4 = {{1,255}, {17,255}, {21,10455}};
+    private int[][] poolBalanceWeights5 = {{1,30}, {147,150}, {181,10230}};
+    private int eventChance4 = 50; // Chance to win a featured event item
+    private int eventChance5 = 50; // Chance to win a featured event item
+    @Getter private BannerType bannerType = BannerType.STANDARD;
 
-	// Kinda wanna deprecate these but they're in people's configs
-	private int[] rateUpItems1 = {};
-	private int[] rateUpItems2 = {};
-	private int eventChance = -1;
-	private int costItem = 0;
-	@Getter private int wishMaxProgress = 2;
+    // Kinda wanna deprecate these but they're in people's configs
+    private int[] rateUpItems1 = {};
+    private int[] rateUpItems2 = {};
+    private int eventChance = -1;
+    private int costItem = 0;
+    @Getter private int wishMaxProgress = 2;
 
-	public ItemParamData getCost(int numRolls) {
-		return switch (numRolls) {
-			case 10 -> new ItemParamData((costItemId10 > 0) ? costItemId10 : getCostItem(), costItemAmount10);
-			default -> new ItemParamData(getCostItem(), costItemAmount * numRolls);
-		};
-	}
+    public ItemParamData getCost(int numRolls) {
+        return switch (numRolls) {
+            case 10 -> new ItemParamData((costItemId10 > 0) ? costItemId10 : getCostItem(), costItemAmount10);
+            default -> new ItemParamData(getCostItem(), costItemAmount * numRolls);
+        };
+    }
 
-	public int getCostItem() {
-		return (costItem > 0) ? costItem : costItemId;
-	}
+    public int getCostItem() {
+        return (costItem > 0) ? costItem : costItemId;
+    }
 
-	public int[] getRateUpItems4() {
-		return (rateUpItems2.length > 0) ? rateUpItems2 : rateUpItems4;
-	}
-	public int[] getRateUpItems5() {
-		return (rateUpItems1.length > 0) ? rateUpItems1 : rateUpItems5;
-	}
+    public int[] getRateUpItems4() {
+        return (rateUpItems2.length > 0) ? rateUpItems2 : rateUpItems4;
+    }
+    public int[] getRateUpItems5() {
+        return (rateUpItems1.length > 0) ? rateUpItems1 : rateUpItems5;
+    }
 
-	public boolean hasEpitomized() {
-		return bannerType.equals(BannerType.WEAPON);
-	}
+    public boolean hasEpitomized() {
+        return bannerType.equals(BannerType.WEAPON);
+    }
 
-	public int getWeight(int rarity, int pity) {
-		return switch(rarity) {
-			case 4 -> Utils.lerp(pity, weights4);
-			default -> Utils.lerp(pity, weights5);
-		};
-	}
+    public int getWeight(int rarity, int pity) {
+        return switch (rarity) {
+            case 4 -> Utils.lerp(pity, weights4);
+            default -> Utils.lerp(pity, weights5);
+        };
+    }
 
-	public int getPoolBalanceWeight(int rarity, int pity) {
-		return switch(rarity) {
-			case 4 -> Utils.lerp(pity, poolBalanceWeights4);
-			default -> Utils.lerp(pity, poolBalanceWeights5);
-		};
-	}
+    public int getPoolBalanceWeight(int rarity, int pity) {
+        return switch (rarity) {
+            case 4 -> Utils.lerp(pity, poolBalanceWeights4);
+            default -> Utils.lerp(pity, poolBalanceWeights5);
+        };
+    }
 
-	public int getEventChance(int rarity) {
-		return switch(rarity) {
-			case 4 -> eventChance4;
-			default -> (eventChance > -1) ? eventChance : eventChance5;
-		};
-	}
-	
-	public GachaInfo toProto(Player player) {
-		// TODO: use other Nonce/key insteadof session key to ensure the overall security for the player
-		String sessionKey = player.getAccount().getSessionKey();
-		
-		String record = "http" + (HTTP_ENCRYPTION.useInRouting ? "s" : "") + "://"
-						+ lr(HTTP_INFO.accessAddress, HTTP_INFO.bindAddress) + ":"
-						+ lr(HTTP_INFO.accessPort, HTTP_INFO.bindPort)
-						+ "/gacha?s=" + sessionKey + "&gachaType=" + gachaType;
-		String details = "http" + (HTTP_ENCRYPTION.useInRouting ? "s" : "") + "://"
-						+ lr(HTTP_INFO.accessAddress, HTTP_INFO.bindAddress) + ":"
-						+ lr(HTTP_INFO.accessPort, HTTP_INFO.bindPort)
-						+ "/gacha/details?s=" + sessionKey + "&scheduleId=" + scheduleId;
+    public int getEventChance(int rarity) {
+        return switch (rarity) {
+            case 4 -> eventChance4;
+            default -> (eventChance > -1) ? eventChance : eventChance5;
+        };
+    }
 
-		// Grasscutter.getLogger().info("record = " + record);
-		ItemParamData costItem1 = this.getCost(1);
-		ItemParamData costItem10 = this.getCost(10);
-		PlayerGachaBannerInfo gachaInfo = player.getGachaInfo().getBannerInfo(this);
-		int leftGachaTimes = switch(gachaTimesLimit) {
-			case Integer.MAX_VALUE -> Integer.MAX_VALUE;
-			default -> Math.max(gachaTimesLimit - gachaInfo.getTotalPulls(), 0);
-		};
-		GachaInfo.Builder info = GachaInfo.newBuilder()
-				.setGachaType(this.getGachaType())
-				.setScheduleId(this.getScheduleId())
-				.setBeginTime(this.getBeginTime())
-				.setEndTime(this.getEndTime())
-				.setCostItemId(costItem1.getId())
-	            .setCostItemNum(costItem1.getCount())
-	            .setTenCostItemId(costItem10.getId())
-	            .setTenCostItemNum(costItem10.getCount())
-	            .setGachaPrefabPath(this.getPrefabPath())
-	            .setGachaPreviewPrefabPath(this.getPreviewPrefabPath())
-	            .setGachaProbUrl(details)
-	            .setGachaProbUrlOversea(details)
-	            .setGachaRecordUrl(record)
-	            .setGachaRecordUrlOversea(record)
-	            .setLeftGachaTimes(leftGachaTimes)
-	            .setGachaTimesLimit(gachaTimesLimit)
-	            .setGachaSortId(this.getSortId());
+    public GachaInfo toProto(Player player) {
+        // TODO: use other Nonce/key insteadof session key to ensure the overall security for the player
+        String sessionKey = player.getAccount().getSessionKey();
 
-		if(hasEpitomized()) {
-			info.setWishItemId(gachaInfo.getWishItemId())
-				.setWishProgress(gachaInfo.getFailedChosenItemPulls())
-				.setWishMaxProgress(this.getWishMaxProgress());
-		}
+        String record = "http" + (HTTP_ENCRYPTION.useInRouting ? "s" : "") + "://"
+                        + lr(HTTP_INFO.accessAddress, HTTP_INFO.bindAddress) + ":"
+                        + lr(HTTP_INFO.accessPort, HTTP_INFO.bindPort)
+                        + "/gacha?s=" + sessionKey + "&gachaType=" + gachaType;
+        String details = "http" + (HTTP_ENCRYPTION.useInRouting ? "s" : "") + "://"
+                        + lr(HTTP_INFO.accessAddress, HTTP_INFO.bindAddress) + ":"
+                        + lr(HTTP_INFO.accessPort, HTTP_INFO.bindPort)
+                        + "/gacha/details?s=" + sessionKey + "&scheduleId=" + scheduleId;
 
-		if (this.getTitlePath() != null) {
-			info.setTitleTextmap(this.getTitlePath());
-		}
-		
-		if (this.getRateUpItems5().length > 0) {
-			GachaUpInfo.Builder upInfo = GachaUpInfo.newBuilder().setItemParentType(1);
-			
-			for (int id : getRateUpItems5()) {
-				upInfo.addItemIdList(id);
-				info.addDisplayUp5ItemList(id);
-			}
-			
-			info.addGachaUpInfoList(upInfo);
-		}
-		
-		if (this.getRateUpItems4().length > 0) {
-			GachaUpInfo.Builder upInfo = GachaUpInfo.newBuilder().setItemParentType(2);
-			
-			for (int id : getRateUpItems4()) {
-				upInfo.addItemIdList(id);
-				if (info.getDisplayUp4ItemListCount() == 0) {
-					info.addDisplayUp4ItemList(id);
-				}
-			}
-			
-			info.addGachaUpInfoList(upInfo);
-		}
-		
-		return info.build();
-	}
-	
-	public enum BannerType {
-		STANDARD, EVENT, WEAPON;
-	}
+        // Grasscutter.getLogger().info("record = " + record);
+        ItemParamData costItem1 = this.getCost(1);
+        ItemParamData costItem10 = this.getCost(10);
+        PlayerGachaBannerInfo gachaInfo = player.getGachaInfo().getBannerInfo(this);
+        int leftGachaTimes = switch (gachaTimesLimit) {
+            case Integer.MAX_VALUE -> Integer.MAX_VALUE;
+            default -> Math.max(gachaTimesLimit - gachaInfo.getTotalPulls(), 0);
+        };
+        GachaInfo.Builder info = GachaInfo.newBuilder()
+                .setGachaType(this.getGachaType())
+                .setScheduleId(this.getScheduleId())
+                .setBeginTime(this.getBeginTime())
+                .setEndTime(this.getEndTime())
+                .setCostItemId(costItem1.getId())
+                .setCostItemNum(costItem1.getCount())
+                .setTenCostItemId(costItem10.getId())
+                .setTenCostItemNum(costItem10.getCount())
+                .setGachaPrefabPath(this.getPrefabPath())
+                .setGachaPreviewPrefabPath(this.getPreviewPrefabPath())
+                .setGachaProbUrl(details)
+                .setGachaProbUrlOversea(details)
+                .setGachaRecordUrl(record)
+                .setGachaRecordUrlOversea(record)
+                .setLeftGachaTimes(leftGachaTimes)
+                .setGachaTimesLimit(gachaTimesLimit)
+                .setGachaSortId(this.getSortId());
+
+        if (hasEpitomized()) {
+            info.setWishItemId(gachaInfo.getWishItemId())
+                .setWishProgress(gachaInfo.getFailedChosenItemPulls())
+                .setWishMaxProgress(this.getWishMaxProgress());
+        }
+
+        if (this.getTitlePath() != null) {
+            info.setTitleTextmap(this.getTitlePath());
+        }
+
+        if (this.getRateUpItems5().length > 0) {
+            GachaUpInfo.Builder upInfo = GachaUpInfo.newBuilder().setItemParentType(1);
+
+            for (int id : getRateUpItems5()) {
+                upInfo.addItemIdList(id);
+                info.addDisplayUp5ItemList(id);
+            }
+
+            info.addGachaUpInfoList(upInfo);
+        }
+
+        if (this.getRateUpItems4().length > 0) {
+            GachaUpInfo.Builder upInfo = GachaUpInfo.newBuilder().setItemParentType(2);
+
+            for (int id : getRateUpItems4()) {
+                upInfo.addItemIdList(id);
+                if (info.getDisplayUp4ItemListCount() == 0) {
+                    info.addDisplayUp4ItemList(id);
+                }
+            }
+
+            info.addGachaUpInfoList(upInfo);
+        }
+
+        return info.build();
+    }
+
+    public enum BannerType {
+        STANDARD, EVENT, WEAPON;
+    }
 }

src/main/java/emu/grasscutter/game/gacha/GachaManager.java

@@ -1,451 +0,0 @@
-package emu.grasscutter.game.gacha;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.file.*;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.ThreadLocalRandom;
-
-import com.google.gson.reflect.TypeToken;
-
-import com.sun.nio.file.SensitivityWatchEventModifier;
-import emu.grasscutter.Grasscutter;
-import emu.grasscutter.data.DataLoader;
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.common.ItemParamData;
-import emu.grasscutter.data.excels.ItemData;
-import emu.grasscutter.database.DatabaseHelper;
-import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.game.gacha.GachaBanner.BannerType;
-import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.game.inventory.Inventory;
-import emu.grasscutter.game.inventory.ItemType;
-import emu.grasscutter.game.inventory.MaterialType;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.WatcherTriggerType;
-import emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem;
-import emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem;
-import emu.grasscutter.net.proto.GetGachaInfoRspOuterClass.GetGachaInfoRsp;
-import emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam;
-import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
-import emu.grasscutter.server.game.GameServer;
-import emu.grasscutter.server.game.GameServerTickEvent;
-import emu.grasscutter.server.packet.send.PacketDoGachaRsp;
-import emu.grasscutter.server.packet.send.PacketGachaWishRsp;
-import emu.grasscutter.utils.Utils;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import it.unimi.dsi.fastutil.ints.IntArrayList;
-import it.unimi.dsi.fastutil.ints.IntList;
-import org.greenrobot.eventbus.Subscribe;
-
-import static emu.grasscutter.Configuration.*;
-
-public class GachaManager {
-	private final GameServer server;
-	private final Int2ObjectMap<GachaBanner> gachaBanners;
-	private WatchService watchService;
-
-	private static final int starglitterId = 221;
-	private static final int stardustId = 222;
-	private int[] fallbackItems4Pool2Default = {11401, 11402, 11403, 11405, 12401, 12402, 12403, 12405, 13401, 13407, 14401, 14402, 14403, 14409, 15401, 15402, 15403, 15405};
-	private int[] fallbackItems5Pool2Default = {11501, 11502, 12501, 12502, 13502, 13505, 14501, 14502, 15501, 15502};
-
-	public GachaManager(GameServer server) {
-		this.server = server;
-		this.gachaBanners = new Int2ObjectOpenHashMap<>();
-		this.load();
-		this.startWatcher(server);
-	}
-
-	public GameServer getServer() {
-		return server;
-	}
-
-	public Int2ObjectMap<GachaBanner> getGachaBanners() {
-		return gachaBanners;
-	}
-
-	public int randomRange(int min, int max) {  // Both are inclusive
-		return ThreadLocalRandom.current().nextInt(max - min + 1) + min;
-	}
-
-	public int getRandom(int[] array) {
-		return array[randomRange(0, array.length - 1)];
-	}
-
-	public synchronized void load() {
-		try (Reader fileReader = new InputStreamReader(DataLoader.load("Banners.json"))) {
-			getGachaBanners().clear();
-			List<GachaBanner> banners = Grasscutter.getGsonFactory().fromJson(fileReader, TypeToken.getParameterized(Collection.class, GachaBanner.class).getType());
-			if(banners.size() > 0) {
-				for (GachaBanner banner : banners) {
-					getGachaBanners().put(banner.getScheduleId(), banner);
-				}
-				Grasscutter.getLogger().debug("Banners successfully loaded.");
-			} else {
-				Grasscutter.getLogger().error("Unable to load banners. Banners size is 0.");
-			}
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	private class BannerPools {
-		public int[] rateUpItems4;
-		public int[] rateUpItems5;
-		public int[] fallbackItems4Pool1;
-		public int[] fallbackItems4Pool2;
-		public int[] fallbackItems5Pool1;
-		public int[] fallbackItems5Pool2;
-
-		public BannerPools(GachaBanner banner) {
-			rateUpItems4 = banner.getRateUpItems4();
-			rateUpItems5 = banner.getRateUpItems5();
-			fallbackItems4Pool1 = banner.getFallbackItems4Pool1();
-			fallbackItems4Pool2 = banner.getFallbackItems4Pool2();
-			fallbackItems5Pool1 = banner.getFallbackItems5Pool1();
-			fallbackItems5Pool2 = banner.getFallbackItems5Pool2();
-
-			if (banner.isAutoStripRateUpFromFallback()) {
-				fallbackItems4Pool1 = Utils.setSubtract(fallbackItems4Pool1, rateUpItems4);
-				fallbackItems4Pool2 = Utils.setSubtract(fallbackItems4Pool2, rateUpItems4);
-				fallbackItems5Pool1 = Utils.setSubtract(fallbackItems5Pool1, rateUpItems5);
-				fallbackItems5Pool2 = Utils.setSubtract(fallbackItems5Pool2, rateUpItems5);
-			}
-		}
-
-		public void removeFromAllPools(int[] itemIds) {
-			rateUpItems4 = Utils.setSubtract(rateUpItems4, itemIds);
-			rateUpItems5 = Utils.setSubtract(rateUpItems5, itemIds);
-			fallbackItems4Pool1 = Utils.setSubtract(fallbackItems4Pool1, itemIds);
-			fallbackItems4Pool2 = Utils.setSubtract(fallbackItems4Pool2, itemIds);
-			fallbackItems5Pool1 = Utils.setSubtract(fallbackItems5Pool1, itemIds);
-			fallbackItems5Pool2 = Utils.setSubtract(fallbackItems5Pool2, itemIds);
-		}
-	}
-
-	private synchronized int checkPlayerAvatarConstellationLevel(Player player, int itemId) {  // Maybe this would be useful in the Player class?
-		ItemData itemData = GameData.getItemDataMap().get(itemId);
-		if ((itemData == null) || (itemData.getMaterialType() != MaterialType.MATERIAL_AVATAR)){
-			return -2;  // Not an Avatar
-		}
-		Avatar avatar = player.getAvatars().getAvatarById((itemId % 1000) + 10000000);
-		if (avatar == null) {
-			return -1;  // Doesn't have
-		}
-		// Constellation
-		int constLevel = avatar.getCoreProudSkillLevel();
-		GameItem constItem = player.getInventory().getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(itemId + 100);
-		constLevel += (constItem == null)? 0 : constItem.getCount();
-		return constLevel;
-	}
-
-	private synchronized int[] removeC6FromPool(int[] itemPool, Player player) {
-		IntList temp = new IntArrayList();
-		for (int itemId : itemPool) {
-			if (checkPlayerAvatarConstellationLevel(player, itemId) < 6) {
-				temp.add(itemId);
-			}
-		}
-		return temp.toIntArray();
-	}
-
-	private synchronized int drawRoulette(int[] weights, int cutoff) {
-		// This follows the logic laid out in issue #183
-		// Simple weighted selection with an upper bound for the roll that cuts off trailing entries
-		// All weights must be >= 0
-		int total = 0;
-		for (int weight : weights) {
-			if (weight < 0) {
-				throw new IllegalArgumentException("Weights must be non-negative!");
-			}
-			total += weight;
-		}
-		int roll = ThreadLocalRandom.current().nextInt((total < cutoff)? total : cutoff);
-		int subTotal = 0;
-		for (int i=0; i<weights.length; i++) {
-			subTotal += weights[i];
-			if (roll < subTotal) {
-				return i;
-			}
-		}
-		// throw new IllegalStateException();
-		return 0;  // This should only be reachable if total==0
-	}
-
-	private synchronized int doFallbackRarePull(int[] fallback1, int[] fallback2, int rarity, GachaBanner banner, PlayerGachaBannerInfo gachaInfo) {
-		if (fallback1.length < 1) {
-			if (fallback2.length < 1) {
-				return getRandom((rarity==5)? fallbackItems5Pool2Default : fallbackItems4Pool2Default);
-			} else {
-				return getRandom(fallback2);
-			}
-		} else if (fallback2.length < 1) {
-			return getRandom(fallback1);
-		} else {  // Both pools are possible, use the pool balancer
-			int pityPool1 = banner.getPoolBalanceWeight(rarity, gachaInfo.getPityPool(rarity, 1));
-			int pityPool2 = banner.getPoolBalanceWeight(rarity, gachaInfo.getPityPool(rarity, 2));
-			int chosenPool = switch ((pityPool1 >= pityPool2)? 1 : 0) {  // Larger weight must come first for the hard cutoff to function correctly
-				case 1 -> 1 + drawRoulette(new int[] {pityPool1, pityPool2}, 10000);
-				default -> 2 - drawRoulette(new int[] {pityPool2, pityPool1}, 10000);
-			};
-			return switch (chosenPool) {
-				case 1:
-					gachaInfo.setPityPool(rarity, 1, 0);
-					yield getRandom(fallback1);
-				default:
-					gachaInfo.setPityPool(rarity, 2, 0);
-					yield getRandom(fallback2);
-			};
-		}
-	}
-
-	private synchronized int doRarePull(int[] featured, int[] fallback1, int[] fallback2, int rarity, GachaBanner banner, PlayerGachaBannerInfo gachaInfo) {
-		int itemId = 0;
-		boolean epitomized = (banner.hasEpitomized()) && (rarity == 5) && (gachaInfo.getWishItemId() != 0);
-		boolean pityEpitomized = (gachaInfo.getFailedChosenItemPulls() >= banner.getWishMaxProgress());  // Maximum fate points reached
-		boolean pityFeatured = (gachaInfo.getFailedFeaturedItemPulls(rarity) >= 1);  // Lost previous coinflip
-		boolean rollFeatured = (this.randomRange(1, 100) <= banner.getEventChance(rarity));  // Won this coinflip
-		boolean pullFeatured = pityFeatured || rollFeatured;
-
-		if (epitomized && pityEpitomized) {  // Auto pick item when epitomized points reached
-			gachaInfo.setFailedFeaturedItemPulls(rarity, 0);  // Epitomized item will always be a featured one
-			itemId = gachaInfo.getWishItemId();
-		} else {
-			if (pullFeatured && (featured.length > 0)) {
-				gachaInfo.setFailedFeaturedItemPulls(rarity, 0);
-				itemId = getRandom(featured);
-			} else {
-				gachaInfo.addFailedFeaturedItemPulls(rarity, 1);  // This could be moved into doFallbackRarePull but having it here makes it clearer
-				itemId = doFallbackRarePull(fallback1, fallback2, rarity, banner, gachaInfo);
-			}
-		}
-
-		if (epitomized) {
-			if(itemId == gachaInfo.getWishItemId()) { // Reset epitomized points when got wished item
-				gachaInfo.setFailedChosenItemPulls(0);
-			} else { // Add epitomized points if not get wished item
-				gachaInfo.addFailedChosenItemPulls(1);
-			}
-		}
-		return itemId;
-	}
-
-	private synchronized int doPull(GachaBanner banner, PlayerGachaBannerInfo gachaInfo, BannerPools pools) {
-		// Pre-increment all pity pools (yes this makes all calculations assume 1-indexed pity)
-		gachaInfo.incPityAll();
-
-		int[] weights = {banner.getWeight(5, gachaInfo.getPity5()), banner.getWeight(4, gachaInfo.getPity4()), 10000};
-		int levelWon = 5 - drawRoulette(weights, 10000);
-
-		return switch (levelWon) {
-			case 5:
-				gachaInfo.setPity5(0);
-				yield doRarePull(pools.rateUpItems5, pools.fallbackItems5Pool1, pools.fallbackItems5Pool2, 5, banner, gachaInfo);
-			case 4:
-				gachaInfo.setPity4(0);
-				yield doRarePull(pools.rateUpItems4, pools.fallbackItems4Pool1, pools.fallbackItems4Pool2, 4, banner, gachaInfo);
-			default:
-				yield getRandom(banner.getFallbackItems3());
-		};
-	}
-
-	public synchronized void doPulls(Player player, int scheduleId, int times) {
-		// Sanity check
-		if (times != 10 && times != 1) {
-			player.sendPacket(new PacketDoGachaRsp(Retcode.RET_GACHA_INVALID_TIMES));
-			return;
-		}
-		Inventory inventory = player.getInventory();
-		if (inventory.getInventoryTab(ItemType.ITEM_WEAPON).getSize() + times > inventory.getInventoryTab(ItemType.ITEM_WEAPON).getMaxCapacity()) {
-			player.sendPacket(new PacketDoGachaRsp(Retcode.RET_ITEM_EXCEED_LIMIT));
-			return;
-		}
-
-		// Get banner
-		GachaBanner banner = this.getGachaBanners().get(scheduleId);
-		if (banner == null) {
-			player.sendPacket(new PacketDoGachaRsp());
-			return;
-		}
-
-		// Check against total limit
-		PlayerGachaBannerInfo gachaInfo = player.getGachaInfo().getBannerInfo(banner);
-		int gachaTimesLimit = banner.getGachaTimesLimit();
-		if (gachaTimesLimit != Integer.MAX_VALUE && (gachaInfo.getTotalPulls() + times) > gachaTimesLimit) {
-			player.sendPacket(new PacketDoGachaRsp(Retcode.RET_GACHA_TIMES_LIMIT));
-			return;
-		}
-
-		// Spend currency
-		ItemParamData cost = banner.getCost(times);
-		if (cost.getCount() > 0 && !inventory.payItem(cost)) {
-			player.sendPacket(new PacketDoGachaRsp(Retcode.RET_GACHA_COST_ITEM_NOT_ENOUGH));
-			return;
-		}
-
-		// Add to character
-		gachaInfo.addTotalPulls(times);
-		BannerPools pools = new BannerPools(banner);
-		List<GachaItem> list = new ArrayList<>();
-		int stardust = 0, starglitter = 0;
-
-		if (banner.isRemoveC6FromPool()) {  // The ultimate form of pity (non-vanilla)
-			pools.rateUpItems4 = removeC6FromPool(pools.rateUpItems4, player);
-			pools.rateUpItems5 = removeC6FromPool(pools.rateUpItems5, player);
-			pools.fallbackItems4Pool1 = removeC6FromPool(pools.fallbackItems4Pool1, player);
-			pools.fallbackItems4Pool2 = removeC6FromPool(pools.fallbackItems4Pool2, player);
-			pools.fallbackItems5Pool1 = removeC6FromPool(pools.fallbackItems5Pool1, player);
-			pools.fallbackItems5Pool2 = removeC6FromPool(pools.fallbackItems5Pool2, player);
-		}
-
-		for (int i = 0; i < times; i++) {
-			// Roll
-			int itemId = doPull(banner, gachaInfo, pools);
-			ItemData itemData = GameData.getItemDataMap().get(itemId);
-			if (itemData == null) {
-				continue;  // Maybe we should bail out if an item fails instead of rolling the rest?
-			}
-
-			// Write gacha record
-			GachaRecord gachaRecord = new GachaRecord(itemId, player.getUid(), banner.getGachaType());
-			DatabaseHelper.saveGachaRecord(gachaRecord);
-
-			// Create gacha item
-			GachaItem.Builder gachaItem = GachaItem.newBuilder();
-			int addStardust = 0, addStarglitter = 0;
-			boolean isTransferItem = false;
-
-			// Const check
-			int constellation = checkPlayerAvatarConstellationLevel(player, itemId);
-			switch (constellation) {
-				case -2:  // Is weapon
-					switch (itemData.getRankLevel()) {
-						case 5 -> addStarglitter = 10;
-						case 4 -> addStarglitter = 2;
-						default -> addStardust = 15;
-					}
-					break;
-				case -1:  // New character
-					gachaItem.setIsGachaItemNew(true);
-					break;
-				default:
-					if (constellation >= 6) {  // C6, give consolation starglitter
-						addStarglitter = (itemData.getRankLevel()==5)? 25 : 5;
-					} else {  // C0-C5, give constellation item
-						if (banner.isRemoveC6FromPool() && constellation == 5) {  // New C6, remove it from the pools so we don't get C7 in a 10pull
-							pools.removeFromAllPools(new int[] {itemId});
-						}
-						addStarglitter = (itemData.getRankLevel()==5)? 10 : 2;
-						int constItemId = itemId + 100;
-						GameItem constItem = inventory.getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(constItemId);
-						gachaItem.addTransferItems(GachaTransferItem.newBuilder().setItem(ItemParam.newBuilder().setItemId(constItemId).setCount(1)).setIsTransferItemNew(constItem == null));
-						inventory.addItem(constItemId, 1);
-					}
-					isTransferItem = true;
-					break;
-			}
-
-			// Create item
-			GameItem item = new GameItem(itemData);
-			gachaItem.setGachaItem(item.toItemParam());
-			inventory.addItem(item);
-
-			stardust += addStardust;
-			starglitter += addStarglitter;
-
-			if (addStardust > 0) {
-				gachaItem.addTokenItemList(ItemParam.newBuilder().setItemId(stardustId).setCount(addStardust));
-			}
-			if (addStarglitter > 0) {
-				ItemParam starglitterParam = ItemParam.newBuilder().setItemId(starglitterId).setCount(addStarglitter).build();
-				if (isTransferItem) {
-					gachaItem.addTransferItems(GachaTransferItem.newBuilder().setItem(starglitterParam));
-				}
-				gachaItem.addTokenItemList(starglitterParam);
-			}
-
-			list.add(gachaItem.build());
-		}
-
-		// Add stardust/starglitter
-		if (stardust > 0) {
-			inventory.addItem(stardustId, stardust);
-		}
-		if (starglitter > 0) {
-			inventory.addItem(starglitterId, starglitter);
-		}
-
-		// Packets
-		player.sendPacket(new PacketDoGachaRsp(banner, list, gachaInfo));
-
-		// Battle Pass trigger
-		player.getBattlePassManager().triggerMission(WatcherTriggerType.TRIGGER_GACHA_NUM, 0, times);
-	}
-
-	private synchronized void startWatcher(GameServer server) {
-		if(this.watchService == null) {
-			try {
-				this.watchService = FileSystems.getDefault().newWatchService();
-				Path path = new File(DATA()).toPath();
-				path.register(watchService, new WatchEvent.Kind[]{StandardWatchEventKinds.ENTRY_MODIFY}, SensitivityWatchEventModifier.HIGH);
-			} catch (Exception e) {
-				Grasscutter.getLogger().error("Unable to load the Gacha Manager Watch Service. If ServerOptions.watchGacha is true it will not auto-reload");
-				e.printStackTrace();
-			}
-		} else {
-			Grasscutter.getLogger().error("Cannot reinitialise watcher ");
-		}
-	}
-
-	@Subscribe
-	public synchronized void watchBannerJson(GameServerTickEvent tickEvent) {
-		if(GAME_OPTIONS.watchGachaConfig) {
-			try {
-				WatchKey watchKey = watchService.take();
-
-				for (WatchEvent<?> event : watchKey.pollEvents()) {
-					final Path changed = (Path) event.context();
-					if (changed.endsWith("Banners.json")) {
-						Grasscutter.getLogger().info("Change detected with banners.json. Reloading gacha config");
-						this.load();
-					}
-				}
-
-				boolean valid = watchKey.reset();
-				if (!valid) {
-					Grasscutter.getLogger().error("Unable to reset Gacha Manager Watch Key. Auto-reload of banners.json will no longer work.");
-					return;
-				}
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
-	}
-
-	private synchronized GetGachaInfoRsp createProto(Player player) {
-		GetGachaInfoRsp.Builder proto = GetGachaInfoRsp.newBuilder().setGachaRandom(12345);
-
-		long currentTime = System.currentTimeMillis() / 1000L;
-
-		for (GachaBanner banner : getGachaBanners().values()) {
-			if ((banner.getEndTime() >= currentTime && banner.getBeginTime() <= currentTime) || (banner.getBannerType() == BannerType.STANDARD))
-			{
-				proto.addGachaInfoList(banner.toProto(player));
-			}
-		}
-
-		return proto.build();
-	}
-
-	public GetGachaInfoRsp toProto(Player player) {
-		return createProto(player);
-	}
-}

src/main/java/emu/grasscutter/game/gacha/GachaSystem.java

@@ -0,0 +1,447 @@
+package emu.grasscutter.game.gacha;
+
+import static emu.grasscutter.config.Configuration.*;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.nio.file.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
+
+import com.google.gson.reflect.TypeToken;
+
+import com.sun.nio.file.SensitivityWatchEventModifier;
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.DataLoader;
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.common.ItemParamData;
+import emu.grasscutter.data.excels.ItemData;
+import emu.grasscutter.database.DatabaseHelper;
+import emu.grasscutter.game.avatar.Avatar;
+import emu.grasscutter.game.gacha.GachaBanner.BannerType;
+import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.game.inventory.Inventory;
+import emu.grasscutter.game.inventory.ItemType;
+import emu.grasscutter.game.inventory.MaterialType;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.WatcherTriggerType;
+import emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem;
+import emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem;
+import emu.grasscutter.net.proto.GetGachaInfoRspOuterClass.GetGachaInfoRsp;
+import emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam;
+import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
+import emu.grasscutter.server.game.BaseGameSystem;
+import emu.grasscutter.server.game.GameServer;
+import emu.grasscutter.server.game.GameServerTickEvent;
+import emu.grasscutter.server.packet.send.PacketDoGachaRsp;
+import emu.grasscutter.server.packet.send.PacketGachaWishRsp;
+import emu.grasscutter.utils.Utils;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.ints.IntArrayList;
+import it.unimi.dsi.fastutil.ints.IntList;
+import org.greenrobot.eventbus.Subscribe;
+
+public class GachaSystem extends BaseGameSystem {
+    private final Int2ObjectMap<GachaBanner> gachaBanners;
+    private WatchService watchService;
+
+    private static final int starglitterId = 221;
+    private static final int stardustId = 222;
+    private int[] fallbackItems4Pool2Default = {11401, 11402, 11403, 11405, 12401, 12402, 12403, 12405, 13401, 13407, 14401, 14402, 14403, 14409, 15401, 15402, 15403, 15405};
+    private int[] fallbackItems5Pool2Default = {11501, 11502, 12501, 12502, 13502, 13505, 14501, 14502, 15501, 15502};
+
+    public GachaSystem(GameServer server) {
+        super(server);
+        this.gachaBanners = new Int2ObjectOpenHashMap<>();
+        this.load();
+        this.startWatcher(server);
+    }
+
+    public Int2ObjectMap<GachaBanner> getGachaBanners() {
+        return gachaBanners;
+    }
+
+    public int randomRange(int min, int max) {  // Both are inclusive
+        return ThreadLocalRandom.current().nextInt(max - min + 1) + min;
+    }
+
+    public int getRandom(int[] array) {
+        return array[randomRange(0, array.length - 1)];
+    }
+
+    public synchronized void load() {
+        try (Reader fileReader = DataLoader.loadReader("Banners.json")) {
+            getGachaBanners().clear();
+            List<GachaBanner> banners = Grasscutter.getGsonFactory().fromJson(fileReader, TypeToken.getParameterized(Collection.class, GachaBanner.class).getType());
+            if (banners.size() > 0) {
+                for (GachaBanner banner : banners) {
+                    getGachaBanners().put(banner.getScheduleId(), banner);
+                }
+                Grasscutter.getLogger().debug("Banners successfully loaded.");
+            } else {
+                Grasscutter.getLogger().error("Unable to load banners. Banners size is 0.");
+            }
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    private class BannerPools {
+        public int[] rateUpItems4;
+        public int[] rateUpItems5;
+        public int[] fallbackItems4Pool1;
+        public int[] fallbackItems4Pool2;
+        public int[] fallbackItems5Pool1;
+        public int[] fallbackItems5Pool2;
+
+        public BannerPools(GachaBanner banner) {
+            rateUpItems4 = banner.getRateUpItems4();
+            rateUpItems5 = banner.getRateUpItems5();
+            fallbackItems4Pool1 = banner.getFallbackItems4Pool1();
+            fallbackItems4Pool2 = banner.getFallbackItems4Pool2();
+            fallbackItems5Pool1 = banner.getFallbackItems5Pool1();
+            fallbackItems5Pool2 = banner.getFallbackItems5Pool2();
+
+            if (banner.isAutoStripRateUpFromFallback()) {
+                fallbackItems4Pool1 = Utils.setSubtract(fallbackItems4Pool1, rateUpItems4);
+                fallbackItems4Pool2 = Utils.setSubtract(fallbackItems4Pool2, rateUpItems4);
+                fallbackItems5Pool1 = Utils.setSubtract(fallbackItems5Pool1, rateUpItems5);
+                fallbackItems5Pool2 = Utils.setSubtract(fallbackItems5Pool2, rateUpItems5);
+            }
+        }
+
+        public void removeFromAllPools(int[] itemIds) {
+            rateUpItems4 = Utils.setSubtract(rateUpItems4, itemIds);
+            rateUpItems5 = Utils.setSubtract(rateUpItems5, itemIds);
+            fallbackItems4Pool1 = Utils.setSubtract(fallbackItems4Pool1, itemIds);
+            fallbackItems4Pool2 = Utils.setSubtract(fallbackItems4Pool2, itemIds);
+            fallbackItems5Pool1 = Utils.setSubtract(fallbackItems5Pool1, itemIds);
+            fallbackItems5Pool2 = Utils.setSubtract(fallbackItems5Pool2, itemIds);
+        }
+    }
+
+    private synchronized int checkPlayerAvatarConstellationLevel(Player player, int itemId) {  // Maybe this would be useful in the Player class?
+        ItemData itemData = GameData.getItemDataMap().get(itemId);
+        if ((itemData == null) || (itemData.getMaterialType() != MaterialType.MATERIAL_AVATAR)) {
+            return -2;  // Not an Avatar
+        }
+        Avatar avatar = player.getAvatars().getAvatarById((itemId % 1000) + 10000000);
+        if (avatar == null) {
+            return -1;  // Doesn't have
+        }
+        // Constellation
+        int constLevel = avatar.getCoreProudSkillLevel();
+        GameItem constItem = player.getInventory().getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(itemId + 100);
+        constLevel += (constItem == null)? 0 : constItem.getCount();
+        return constLevel;
+    }
+
+    private synchronized int[] removeC6FromPool(int[] itemPool, Player player) {
+        IntList temp = new IntArrayList();
+        for (int itemId : itemPool) {
+            if (checkPlayerAvatarConstellationLevel(player, itemId) < 6) {
+                temp.add(itemId);
+            }
+        }
+        return temp.toIntArray();
+    }
+
+    private synchronized int drawRoulette(int[] weights, int cutoff) {
+        // This follows the logic laid out in issue #183
+        // Simple weighted selection with an upper bound for the roll that cuts off trailing entries
+        // All weights must be >= 0
+        int total = 0;
+        for (int weight : weights) {
+            if (weight < 0) {
+                throw new IllegalArgumentException("Weights must be non-negative!");
+            }
+            total += weight;
+        }
+        int roll = ThreadLocalRandom.current().nextInt((total < cutoff)? total : cutoff);
+        int subTotal = 0;
+        for (int i=0; i<weights.length; i++) {
+            subTotal += weights[i];
+            if (roll < subTotal) {
+                return i;
+            }
+        }
+        // throw new IllegalStateException();
+        return 0;  // This should only be reachable if total==0
+    }
+
+    private synchronized int doFallbackRarePull(int[] fallback1, int[] fallback2, int rarity, GachaBanner banner, PlayerGachaBannerInfo gachaInfo) {
+        if (fallback1.length < 1) {
+            if (fallback2.length < 1) {
+                return getRandom((rarity==5)? fallbackItems5Pool2Default : fallbackItems4Pool2Default);
+            } else {
+                return getRandom(fallback2);
+            }
+        } else if (fallback2.length < 1) {
+            return getRandom(fallback1);
+        } else {  // Both pools are possible, use the pool balancer
+            int pityPool1 = banner.getPoolBalanceWeight(rarity, gachaInfo.getPityPool(rarity, 1));
+            int pityPool2 = banner.getPoolBalanceWeight(rarity, gachaInfo.getPityPool(rarity, 2));
+            int chosenPool = switch ((pityPool1 >= pityPool2)? 1 : 0) {  // Larger weight must come first for the hard cutoff to function correctly
+                case 1 -> 1 + drawRoulette(new int[] {pityPool1, pityPool2}, 10000);
+                default -> 2 - drawRoulette(new int[] {pityPool2, pityPool1}, 10000);
+            };
+            return switch (chosenPool) {
+                case 1:
+                    gachaInfo.setPityPool(rarity, 1, 0);
+                    yield getRandom(fallback1);
+                default:
+                    gachaInfo.setPityPool(rarity, 2, 0);
+                    yield getRandom(fallback2);
+            };
+        }
+    }
+
+    private synchronized int doRarePull(int[] featured, int[] fallback1, int[] fallback2, int rarity, GachaBanner banner, PlayerGachaBannerInfo gachaInfo) {
+        int itemId = 0;
+        boolean epitomized = (banner.hasEpitomized()) && (rarity == 5) && (gachaInfo.getWishItemId() != 0);
+        boolean pityEpitomized = (gachaInfo.getFailedChosenItemPulls() >= banner.getWishMaxProgress());  // Maximum fate points reached
+        boolean pityFeatured = (gachaInfo.getFailedFeaturedItemPulls(rarity) >= 1);  // Lost previous coinflip
+        boolean rollFeatured = (this.randomRange(1, 100) <= banner.getEventChance(rarity));  // Won this coinflip
+        boolean pullFeatured = pityFeatured || rollFeatured;
+
+        if (epitomized && pityEpitomized) {  // Auto pick item when epitomized points reached
+            gachaInfo.setFailedFeaturedItemPulls(rarity, 0);  // Epitomized item will always be a featured one
+            itemId = gachaInfo.getWishItemId();
+        } else {
+            if (pullFeatured && (featured.length > 0)) {
+                gachaInfo.setFailedFeaturedItemPulls(rarity, 0);
+                itemId = getRandom(featured);
+            } else {
+                gachaInfo.addFailedFeaturedItemPulls(rarity, 1);  // This could be moved into doFallbackRarePull but having it here makes it clearer
+                itemId = doFallbackRarePull(fallback1, fallback2, rarity, banner, gachaInfo);
+            }
+        }
+
+        if (epitomized) {
+            if (itemId == gachaInfo.getWishItemId()) { // Reset epitomized points when got wished item
+                gachaInfo.setFailedChosenItemPulls(0);
+            } else { // Add epitomized points if not get wished item
+                gachaInfo.addFailedChosenItemPulls(1);
+            }
+        }
+        return itemId;
+    }
+
+    private synchronized int doPull(GachaBanner banner, PlayerGachaBannerInfo gachaInfo, BannerPools pools) {
+        // Pre-increment all pity pools (yes this makes all calculations assume 1-indexed pity)
+        gachaInfo.incPityAll();
+
+        int[] weights = {banner.getWeight(5, gachaInfo.getPity5()), banner.getWeight(4, gachaInfo.getPity4()), 10000};
+        int levelWon = 5 - drawRoulette(weights, 10000);
+
+        return switch (levelWon) {
+            case 5:
+                gachaInfo.setPity5(0);
+                yield doRarePull(pools.rateUpItems5, pools.fallbackItems5Pool1, pools.fallbackItems5Pool2, 5, banner, gachaInfo);
+            case 4:
+                gachaInfo.setPity4(0);
+                yield doRarePull(pools.rateUpItems4, pools.fallbackItems4Pool1, pools.fallbackItems4Pool2, 4, banner, gachaInfo);
+            default:
+                yield getRandom(banner.getFallbackItems3());
+        };
+    }
+
+    public synchronized void doPulls(Player player, int scheduleId, int times) {
+        // Sanity check
+        if (times != 10 && times != 1) {
+            player.sendPacket(new PacketDoGachaRsp(Retcode.RET_GACHA_INVALID_TIMES));
+            return;
+        }
+        Inventory inventory = player.getInventory();
+        if (inventory.getInventoryTab(ItemType.ITEM_WEAPON).getSize() + times > inventory.getInventoryTab(ItemType.ITEM_WEAPON).getMaxCapacity()) {
+            player.sendPacket(new PacketDoGachaRsp(Retcode.RET_ITEM_EXCEED_LIMIT));
+            return;
+        }
+
+        // Get banner
+        GachaBanner banner = this.getGachaBanners().get(scheduleId);
+        if (banner == null) {
+            player.sendPacket(new PacketDoGachaRsp());
+            return;
+        }
+
+        // Check against total limit
+        PlayerGachaBannerInfo gachaInfo = player.getGachaInfo().getBannerInfo(banner);
+        int gachaTimesLimit = banner.getGachaTimesLimit();
+        if (gachaTimesLimit != Integer.MAX_VALUE && (gachaInfo.getTotalPulls() + times) > gachaTimesLimit) {
+            player.sendPacket(new PacketDoGachaRsp(Retcode.RET_GACHA_TIMES_LIMIT));
+            return;
+        }
+
+        // Spend currency
+        ItemParamData cost = banner.getCost(times);
+        if (cost.getCount() > 0 && !inventory.payItem(cost)) {
+            player.sendPacket(new PacketDoGachaRsp(Retcode.RET_GACHA_COST_ITEM_NOT_ENOUGH));
+            return;
+        }
+
+        // Add to character
+        gachaInfo.addTotalPulls(times);
+        BannerPools pools = new BannerPools(banner);
+        List<GachaItem> list = new ArrayList<>();
+        int stardust = 0, starglitter = 0;
+
+        if (banner.isRemoveC6FromPool()) {  // The ultimate form of pity (non-vanilla)
+            pools.rateUpItems4 = removeC6FromPool(pools.rateUpItems4, player);
+            pools.rateUpItems5 = removeC6FromPool(pools.rateUpItems5, player);
+            pools.fallbackItems4Pool1 = removeC6FromPool(pools.fallbackItems4Pool1, player);
+            pools.fallbackItems4Pool2 = removeC6FromPool(pools.fallbackItems4Pool2, player);
+            pools.fallbackItems5Pool1 = removeC6FromPool(pools.fallbackItems5Pool1, player);
+            pools.fallbackItems5Pool2 = removeC6FromPool(pools.fallbackItems5Pool2, player);
+        }
+
+        for (int i = 0; i < times; i++) {
+            // Roll
+            int itemId = doPull(banner, gachaInfo, pools);
+            ItemData itemData = GameData.getItemDataMap().get(itemId);
+            if (itemData == null) {
+                continue;  // Maybe we should bail out if an item fails instead of rolling the rest?
+            }
+
+            // Write gacha record
+            GachaRecord gachaRecord = new GachaRecord(itemId, player.getUid(), banner.getGachaType());
+            DatabaseHelper.saveGachaRecord(gachaRecord);
+
+            // Create gacha item
+            GachaItem.Builder gachaItem = GachaItem.newBuilder();
+            int addStardust = 0, addStarglitter = 0;
+            boolean isTransferItem = false;
+
+            // Const check
+            int constellation = checkPlayerAvatarConstellationLevel(player, itemId);
+            switch (constellation) {
+                case -2:  // Is weapon
+                    switch (itemData.getRankLevel()) {
+                        case 5 -> addStarglitter = 10;
+                        case 4 -> addStarglitter = 2;
+                        default -> addStardust = 15;
+                    }
+                    break;
+                case -1:  // New character
+                    gachaItem.setIsGachaItemNew(true);
+                    break;
+                default:
+                    if (constellation >= 6) {  // C6, give consolation starglitter
+                        addStarglitter = (itemData.getRankLevel()==5)? 25 : 5;
+                    } else {  // C0-C5, give constellation item
+                        if (banner.isRemoveC6FromPool() && constellation == 5) {  // New C6, remove it from the pools so we don't get C7 in a 10pull
+                            pools.removeFromAllPools(new int[] {itemId});
+                        }
+                        addStarglitter = (itemData.getRankLevel()==5)? 10 : 2;
+                        int constItemId = itemId + 100;
+                        GameItem constItem = inventory.getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(constItemId);
+                        gachaItem.addTransferItems(GachaTransferItem.newBuilder().setItem(ItemParam.newBuilder().setItemId(constItemId).setCount(1)).setIsTransferItemNew(constItem == null));
+                        inventory.addItem(constItemId, 1);
+                    }
+                    isTransferItem = true;
+                    break;
+            }
+
+            // Create item
+            GameItem item = new GameItem(itemData);
+            gachaItem.setGachaItem(item.toItemParam());
+            inventory.addItem(item);
+
+            stardust += addStardust;
+            starglitter += addStarglitter;
+
+            if (addStardust > 0) {
+                gachaItem.addTokenItemList(ItemParam.newBuilder().setItemId(stardustId).setCount(addStardust));
+            }
+            if (addStarglitter > 0) {
+                ItemParam starglitterParam = ItemParam.newBuilder().setItemId(starglitterId).setCount(addStarglitter).build();
+                if (isTransferItem) {
+                    gachaItem.addTransferItems(GachaTransferItem.newBuilder().setItem(starglitterParam));
+                }
+                gachaItem.addTokenItemList(starglitterParam);
+            }
+
+            list.add(gachaItem.build());
+        }
+
+        // Add stardust/starglitter
+        if (stardust > 0) {
+            inventory.addItem(stardustId, stardust);
+        }
+        if (starglitter > 0) {
+            inventory.addItem(starglitterId, starglitter);
+        }
+
+        // Packets
+        player.sendPacket(new PacketDoGachaRsp(banner, list, gachaInfo));
+
+        // Battle Pass trigger
+        player.getBattlePassManager().triggerMission(WatcherTriggerType.TRIGGER_GACHA_NUM, 0, times);
+    }
+
+    private synchronized void startWatcher(GameServer server) {
+        if (this.watchService == null) {
+            try {
+                this.watchService = FileSystems.getDefault().newWatchService();
+                Path path = new File(DATA()).toPath();
+                path.register(watchService, new WatchEvent.Kind[]{StandardWatchEventKinds.ENTRY_MODIFY}, SensitivityWatchEventModifier.HIGH);
+            } catch (Exception e) {
+                Grasscutter.getLogger().error("Unable to load the Gacha Manager Watch Service. If ServerOptions.watchGacha is true it will not auto-reload");
+                e.printStackTrace();
+            }
+        } else {
+            Grasscutter.getLogger().error("Cannot reinitialise watcher ");
+        }
+    }
+
+    @Subscribe
+    public synchronized void watchBannerJson(GameServerTickEvent tickEvent) {
+        if (GAME_OPTIONS.watchGachaConfig) {
+            try {
+                WatchKey watchKey = watchService.take();
+
+                for (WatchEvent<?> event : watchKey.pollEvents()) {
+                    final Path changed = (Path) event.context();
+                    if (changed.endsWith("Banners.json")) {
+                        Grasscutter.getLogger().info("Change detected with banners.json. Reloading gacha config");
+                        this.load();
+                    }
+                }
+
+                boolean valid = watchKey.reset();
+                if (!valid) {
+                    Grasscutter.getLogger().error("Unable to reset Gacha Manager Watch Key. Auto-reload of banners.json will no longer work.");
+                    return;
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private synchronized GetGachaInfoRsp createProto(Player player) {
+        GetGachaInfoRsp.Builder proto = GetGachaInfoRsp.newBuilder().setGachaRandom(12345);
+
+        long currentTime = System.currentTimeMillis() / 1000L;
+
+        for (GachaBanner banner : getGachaBanners().values()) {
+            if ((banner.getEndTime() >= currentTime && banner.getBeginTime() <= currentTime) || (banner.getBannerType() == BannerType.STANDARD))
+            {
+                proto.addGachaInfoList(banner.toProto(player));
+            }
+        }
+
+        return proto.build();
+    }
+
+    public GetGachaInfoRsp toProto(Player player) {
+        return createProto(player);
+    }
+}

src/main/java/emu/grasscutter/game/inventory/Inventory.java

@@ -1,5 +1,7 @@
 package emu.grasscutter.game.inventory;
 
+import static emu.grasscutter.config.Configuration.*;
+
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -15,6 +17,7 @@ import emu.grasscutter.data.excels.ItemData;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.game.avatar.AvatarStorage;
 import emu.grasscutter.game.avatar.Avatar;
+import emu.grasscutter.game.player.BasePlayerManager;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.ActionReason;
 import emu.grasscutter.game.props.PlayerProperty;
@@ -29,194 +32,200 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
 import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
 
-import static emu.grasscutter.Configuration.*;
+public class Inventory extends BasePlayerManager implements Iterable<GameItem> {
+    private final Long2ObjectMap<GameItem> store;
+    private final Int2ObjectMap<InventoryTab> inventoryTypes;
 
-public class Inventory implements Iterable<GameItem> {
-	private final Player player;
-	
-	private final Long2ObjectMap<GameItem> store;
-	private final Int2ObjectMap<InventoryTab> inventoryTypes;
-	
-	public Inventory(Player player) {
-		this.player = player;
-		this.store = new Long2ObjectOpenHashMap<>();
-		this.inventoryTypes = new Int2ObjectOpenHashMap<>();
-		
-		this.createInventoryTab(ItemType.ITEM_WEAPON, new EquipInventoryTab(INVENTORY_LIMITS.weapons));
-		this.createInventoryTab(ItemType.ITEM_RELIQUARY, new EquipInventoryTab(INVENTORY_LIMITS.relics));
-		this.createInventoryTab(ItemType.ITEM_MATERIAL, new MaterialInventoryTab(INVENTORY_LIMITS.materials));
-		this.createInventoryTab(ItemType.ITEM_FURNITURE, new MaterialInventoryTab(INVENTORY_LIMITS.furniture));
-	}
+    public Inventory(Player player) {
+        super(player);
 
-	public Player getPlayer() {
-		return player;
-	}
-	
-	public AvatarStorage getAvatarStorage() {
-		return this.getPlayer().getAvatars();
-	}
+        this.store = new Long2ObjectOpenHashMap<>();
+        this.inventoryTypes = new Int2ObjectOpenHashMap<>();
 
-	public Long2ObjectMap<GameItem> getItems() {
-		return store;
-	}
-	
-	public Int2ObjectMap<InventoryTab> getInventoryTypes() {
-		return inventoryTypes;
-	}
-	
-	public InventoryTab getInventoryTab(ItemType type) {
-		return getInventoryTypes().get(type.getValue());
-	}
-	
-	public void createInventoryTab(ItemType type, InventoryTab tab) {
-		this.getInventoryTypes().put(type.getValue(), tab);
-	}
-	
-	public GameItem getItemByGuid(long id) {
-		return this.getItems().get(id);
-	}
-	
-	public boolean addItem(int itemId) {
-		return addItem(itemId, 1);
-	}
-	
-	public boolean addItem(int itemId, int count) {
-		ItemData itemData = GameData.getItemDataMap().get(itemId);
-		
-		if (itemData == null) {
-			return false;
-		}
-		
-		GameItem item = new GameItem(itemData, count);
-		
-		return addItem(item);
-	}
+        this.createInventoryTab(ItemType.ITEM_WEAPON, new EquipInventoryTab(INVENTORY_LIMITS.weapons));
+        this.createInventoryTab(ItemType.ITEM_RELIQUARY, new EquipInventoryTab(INVENTORY_LIMITS.relics));
+        this.createInventoryTab(ItemType.ITEM_MATERIAL, new MaterialInventoryTab(INVENTORY_LIMITS.materials));
+        this.createInventoryTab(ItemType.ITEM_FURNITURE, new MaterialInventoryTab(INVENTORY_LIMITS.furniture));
+    }
 
-	public boolean addItem(GameItem item) {
-		GameItem result = putItem(item);
-		
-		if (result != null) {
-			getPlayer().getBattlePassManager().triggerMission(WatcherTriggerType.TRIGGER_OBTAIN_MATERIAL_NUM, result.getItemId(), result.getCount());
-			getPlayer().sendPacket(new PacketStoreItemChangeNotify(result));
-			return true;
-		}
-		
-		return false;
-	}
-	
-	public boolean addItem(GameItem item, ActionReason reason) {
-		boolean result = addItem(item);
-		
-		if (result && reason != null) {
-			getPlayer().sendPacket(new PacketItemAddHintNotify(item, reason));
-		}
-		
-		return result;
-	}
+    public AvatarStorage getAvatarStorage() {
+        return this.getPlayer().getAvatars();
+    }
 
-	public boolean addItem(GameItem item, ActionReason reason, boolean forceNotify) {
-		boolean result = addItem(item);
+    public Long2ObjectMap<GameItem> getItems() {
+        return store;
+    }
 
-		if (reason != null && (forceNotify || result)) {
-			getPlayer().sendPacket(new PacketItemAddHintNotify(item, reason));
-		}
+    public Int2ObjectMap<InventoryTab> getInventoryTypes() {
+        return inventoryTypes;
+    }
 
-		return result;
-	}
-	
-	public void addItems(Collection<GameItem> items) {
-		this.addItems(items, null);
-	}
-	
-	public void addItems(Collection<GameItem> items, ActionReason reason) {
-		List<GameItem> changedItems = new LinkedList<>();
-		
-		for (GameItem item : items) {
-			GameItem result = putItem(item);
-			
-			if (result != null) {
-				getPlayer().getBattlePassManager().triggerMission(WatcherTriggerType.TRIGGER_OBTAIN_MATERIAL_NUM, result.getItemId(), result.getCount());
-				changedItems.add(result);
-			}
-		}
-		
-		if (changedItems.size() == 0) {
-			return;
-		}
-		
-		if (reason != null) {
-			getPlayer().sendPacket(new PacketItemAddHintNotify(changedItems, reason));
-		}
-		
-		getPlayer().sendPacket(new PacketStoreItemChangeNotify(changedItems));
-	}
-	
-	public void addItemParams(Collection<ItemParam> items) {
-		addItems(items.stream().map(param -> new GameItem(param.getItemId(), param.getCount())).toList(), null);
-	}
-	
-	public void addItemParamDatas(Collection<ItemParamData> items) {
-		addItemParamDatas(items, null);
-	}
-	
-	public void addItemParamDatas(Collection<ItemParamData> items, ActionReason reason) {
-		addItems(items.stream().map(param -> new GameItem(param.getItemId(), param.getCount())).toList(), reason);
-	}
-	
-	private synchronized GameItem putItem(GameItem item) {
-		// Dont add items that dont have a valid item definition.
-		if (item.getItemData() == null) {
-			return null;
-		}
-		
-		// Add item to inventory store
-		ItemType type = item.getItemData().getItemType();
-		InventoryTab tab = getInventoryTab(type);
-		
-		// Add
-		switch (type) {
-			case ITEM_WEAPON:
-			case ITEM_RELIQUARY:
-				if (tab.getSize() >= tab.getMaxCapacity()) {
-					return null;
-				}
-				// Duplicates cause problems
-				item.setCount(Math.max(item.getCount(), 1));
-				// Adds to inventory
+    public InventoryTab getInventoryTab(ItemType type) {
+        return getInventoryTypes().get(type.getValue());
+    }
+
+    public void createInventoryTab(ItemType type, InventoryTab tab) {
+        this.getInventoryTypes().put(type.getValue(), tab);
+    }
+
+    public GameItem getItemByGuid(long id) {
+        return this.getItems().get(id);
+    }
+
+    public boolean addItem(int itemId) {
+        return addItem(itemId, 1);
+    }
+
+    public boolean addItem(int itemId, int count) {
+        return addItem(itemId, count, null);
+    }
+
+    public boolean addItem(int itemId, int count, ActionReason reason) {
+        ItemData itemData = GameData.getItemDataMap().get(itemId);
+
+        if (itemData == null) {
+            return false;
+        }
+
+        GameItem item = new GameItem(itemData, count);
+
+        return addItem(item, reason);
+    }
+
+    public boolean addItem(GameItem item) {
+        GameItem result = putItem(item);
+
+        if (result != null) {
+            getPlayer().getBattlePassManager().triggerMission(WatcherTriggerType.TRIGGER_OBTAIN_MATERIAL_NUM, result.getItemId(), result.getCount());
+            getPlayer().sendPacket(new PacketStoreItemChangeNotify(result));
+            return true;
+        }
+
+        return false;
+    }
+
+    public boolean addItem(GameItem item, ActionReason reason) {
+        boolean result = addItem(item);
+
+        if (result && reason != null) {
+            getPlayer().sendPacket(new PacketItemAddHintNotify(item, reason));
+        }
+
+        return result;
+    }
+
+    public boolean addItem(GameItem item, ActionReason reason, boolean forceNotify) {
+        boolean result = addItem(item);
+
+        if (reason != null && (forceNotify || result)) {
+            getPlayer().sendPacket(new PacketItemAddHintNotify(item, reason));
+        }
+
+        return result;
+    }
+
+    public boolean addItem(ItemParamData itemParam) {
+        return addItem(itemParam, null);
+    }
+
+    public boolean addItem(ItemParamData itemParam, ActionReason reason) {
+        if (itemParam == null) return false;
+        return addItem(itemParam.getId(), itemParam.getCount(), reason);
+    }
+
+    public void addItems(Collection<GameItem> items) {
+        this.addItems(items, null);
+    }
+
+    public void addItems(Collection<GameItem> items, ActionReason reason) {
+        List<GameItem> changedItems = new LinkedList<>();
+
+        for (GameItem item : items) {
+            GameItem result = putItem(item);
+
+            if (result != null) {
+                getPlayer().getBattlePassManager().triggerMission(WatcherTriggerType.TRIGGER_OBTAIN_MATERIAL_NUM, result.getItemId(), result.getCount());
+                changedItems.add(result);
+            }
+        }
+
+        if (changedItems.size() == 0) {
+            return;
+        }
+
+        if (reason != null) {
+            getPlayer().sendPacket(new PacketItemAddHintNotify(changedItems, reason));
+        }
+
+        getPlayer().sendPacket(new PacketStoreItemChangeNotify(changedItems));
+    }
+
+    public void addItemParams(Collection<ItemParam> items) {
+        addItems(items.stream().map(param -> new GameItem(param.getItemId(), param.getCount())).toList(), null);
+    }
+
+    public void addItemParamDatas(Collection<ItemParamData> items) {
+        addItemParamDatas(items, null);
+    }
+
+    public void addItemParamDatas(Collection<ItemParamData> items, ActionReason reason) {
+        addItems(items.stream().map(param -> new GameItem(param.getItemId(), param.getCount())).toList(), reason);
+    }
+
+    private synchronized GameItem putItem(GameItem item) {
+        // Dont add items that dont have a valid item definition.
+        if (item.getItemData() == null) {
+            return null;
+        }
+
+        // Add item to inventory store
+        ItemType type = item.getItemData().getItemType();
+        InventoryTab tab = getInventoryTab(type);
+
+        // Add
+        switch (type) {
+            case ITEM_WEAPON:
+            case ITEM_RELIQUARY:
+                if (tab.getSize() >= tab.getMaxCapacity()) {
+                    return null;
+                }
+                // Duplicates cause problems
+                item.setCount(Math.max(item.getCount(), 1));
+                // Adds to inventory
                 this.putItem(item, tab);
-				// Set ownership and save to db
-				item.save();
-				return item;
-			case ITEM_VIRTUAL:
-				// Handle
-				this.addVirtualItem(item.getItemId(), item.getCount());
-				return item;
+                // Set ownership and save to db
+                item.save();
+                return item;
+            case ITEM_VIRTUAL:
+                // Handle
+                this.addVirtualItem(item.getItemId(), item.getCount());
+                return item;
             default:
                 switch (item.getItemData().getMaterialType()) {
                     case MATERIAL_ADSORBATE:
-						this.player.getEnergyManager().handlePickupElemBall(item);
-						return null;
-					case MATERIAL_AVATAR:
-						// Get avatar id
-						int avatarId = (item.getItemId() % 1000) + 10000000;
-						// Dont let people give themselves extra main characters
-						if (avatarId == GameConstants.MAIN_CHARACTER_MALE || avatarId == GameConstants.MAIN_CHARACTER_FEMALE) {
-							return null;
-						}
-						// Add avatar
-						AvatarData avatarData = GameData.getAvatarDataMap().get(avatarId);
-						if (avatarData != null && !this.player.getAvatars().hasAvatar(avatarId)) {
-							this.player.addAvatar(new Avatar(avatarData));
-						}
-						return null;
-					case MATERIAL_FLYCLOAK:
-						AvatarFlycloakData flycloakData = GameData.getAvatarFlycloakDataMap().get(item.getItemId());
-						if (flycloakData != null && !this.player.getFlyCloakList().contains(item.getItemId())) {
-							this.player.addFlycloak(item.getItemId());
-						}
-						return null;
-					case MATERIAL_COSTUME:
-						AvatarCostumeData costumeData = GameData.getAvatarCostumeDataItemIdMap().get(item.getItemId());
+                        this.player.getEnergyManager().handlePickupElemBall(item);
+                        return null;
+                    case MATERIAL_AVATAR:
+                        // Get avatar id
+                        int avatarId = (item.getItemId() % 1000) + 10000000;
+                        // Dont let people give themselves extra main characters
+                        if (avatarId == GameConstants.MAIN_CHARACTER_MALE || avatarId == GameConstants.MAIN_CHARACTER_FEMALE) {
+                            return null;
+                        }
+                        // Add avatar
+                        AvatarData avatarData = GameData.getAvatarDataMap().get(avatarId);
+                        if (avatarData != null && !this.player.getAvatars().hasAvatar(avatarId)) {
+                            this.player.addAvatar(new Avatar(avatarData));
+                        }
+                        return null;
+                    case MATERIAL_FLYCLOAK:
+                        AvatarFlycloakData flycloakData = GameData.getAvatarFlycloakDataMap().get(item.getItemId());
+                        if (flycloakData != null && !this.player.getFlyCloakList().contains(item.getItemId())) {
+                            this.player.addFlycloak(item.getItemId());
+                        }
+                        return null;
+                    case MATERIAL_COSTUME:
+                        AvatarCostumeData costumeData = GameData.getAvatarCostumeDataItemIdMap().get(item.getItemId());
                         if (costumeData != null && !this.player.getCostumeList().contains(costumeData.getId())) {
                             this.player.addCostume(costumeData.getId());
                         }
@@ -224,51 +233,51 @@ public class Inventory implements Iterable<GameItem> {
                     case MATERIAL_NAMECARD:
                         if (!this.player.getNameCardList().contains(item.getItemId())) {
                             this.player.addNameCard(item.getItemId());
-						}
-						return null;
+                        }
+                        return null;
                     default:
                         if (tab == null) {
                             return null;
                         }
-						GameItem existingItem = tab.getItemById(item.getItemId());
-						if (existingItem == null) {
-							// Item type didnt exist before, we will add it to main inventory map if there is enough space
-							if (tab.getSize() >= tab.getMaxCapacity()) {
-								return null;
-							}
-							this.putItem(item, tab);
-							// Set ownership and save to db
-							item.save();
-							return item;
-						} else {
-							// Add count
-							existingItem.setCount(Math.min(existingItem.getCount() + item.getCount(), item.getItemData().getStackLimit()));
-							existingItem.save();
-							return existingItem;
-						}
-					}
+                        GameItem existingItem = tab.getItemById(item.getItemId());
+                        if (existingItem == null) {
+                            // Item type didnt exist before, we will add it to main inventory map if there is enough space
+                            if (tab.getSize() >= tab.getMaxCapacity()) {
+                                return null;
+                            }
+                            this.putItem(item, tab);
+                            // Set ownership and save to db
+                            item.save();
+                            return item;
+                        } else {
+                            // Add count
+                            existingItem.setCount(Math.min(existingItem.getCount() + item.getCount(), item.getItemData().getStackLimit()));
+                            existingItem.save();
+                            return existingItem;
+                        }
+                    }
         }
-	}
-	
-	private synchronized void putItem(GameItem item, InventoryTab tab) {
+    }
+
+    private synchronized void putItem(GameItem item, InventoryTab tab) {
         this.player.getCodex().checkAddedItem(item);
         // Set owner and guid FIRST!
         item.setOwner(this.player);
-		// Put in item store
-		getItems().put(item.getGuid(), item);
-		if (tab != null) {
-			tab.onAddItem(item);
-		}
-	}
-	
-	private void addVirtualItem(int itemId, int count) {
-		switch (itemId) {
-			case 101 -> // Character exp
-                this.player.getServer().getInventoryManager().upgradeAvatar(this.player, this.player.getTeamManager().getCurrentAvatarEntity().getAvatar(), count);
+        // Put in item store
+        getItems().put(item.getGuid(), item);
+        if (tab != null) {
+            tab.onAddItem(item);
+        }
+    }
+
+    private void addVirtualItem(int itemId, int count) {
+        switch (itemId) {
+            case 101 -> // Character exp
+                this.player.getServer().getInventorySystem().upgradeAvatar(this.player, this.player.getTeamManager().getCurrentAvatarEntity().getAvatar(), count);
             case 102 -> // Adventure exp
                 this.player.addExpDirectly(count);
             case 105 -> // Companionship exp
-                this.player.getServer().getInventoryManager().upgradeAvatarFetterLevel(this.player, this.player.getTeamManager().getCurrentAvatarEntity().getAvatar(), count);
+                this.player.getServer().getInventorySystem().upgradeAvatarFetterLevel(this.player, this.player.getTeamManager().getCurrentAvatarEntity().getAvatar(), count);
             case 106 -> // Resin
                 this.player.getResinManager().addResin(count);
             case 107 ->  // Legendary Key
@@ -281,216 +290,216 @@ public class Inventory implements Iterable<GameItem> {
                 this.player.setCrystals(this.player.getCrystals() + count);
             case 204 -> // Home Coin
                 this.player.setHomeCoin(this.player.getHomeCoin() + count);
-		}
-	}
+        }
+    }
 
-	private int getVirtualItemCount(int itemId) {
-		switch (itemId) {
-			case 201:  // Primogem
-				return this.player.getPrimogems();
-			case 202:  // Mora
-				return this.player.getMora();
-			case 203:  // Genesis Crystals
-				return this.player.getCrystals();
-			case 106:  // Resin
-				return this.player.getProperty(PlayerProperty.PROP_PLAYER_RESIN);
+    private int getVirtualItemCount(int itemId) {
+        switch (itemId) {
+            case 201:  // Primogem
+                return this.player.getPrimogems();
+            case 202:  // Mora
+                return this.player.getMora();
+            case 203:  // Genesis Crystals
+                return this.player.getCrystals();
+            case 106:  // Resin
+                return this.player.getProperty(PlayerProperty.PROP_PLAYER_RESIN);
             case 107:  // Legendary Key
                 return this.player.getProperty(PlayerProperty.PROP_PLAYER_LEGENDARY_KEY);
-			case 204:  // Home Coin
-				return this.player.getHomeCoin();
-			default:
-				GameItem item = getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(itemId);  // What if we ever want to operate on weapons/relics/furniture? :S
-				return (item == null) ? 0 : item.getCount();
-		}
-	}
+            case 204:  // Home Coin
+                return this.player.getHomeCoin();
+            default:
+                GameItem item = getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(itemId);  // What if we ever want to operate on weapons/relics/furniture? :S
+                return (item == null) ? 0 : item.getCount();
+        }
+    }
 
-	public boolean payItem(int id, int count) {
-		return payItem(new ItemParamData(id, count));
-	}
+    public boolean payItem(int id, int count) {
+        return payItem(new ItemParamData(id, count));
+    }
 
-	public boolean payItem(ItemParamData costItem) {
-		return payItems(new ItemParamData[] {costItem}, 1, null);
-	}
+    public boolean payItem(ItemParamData costItem) {
+        return payItems(new ItemParamData[] {costItem}, 1, null);
+    }
 
-	public boolean payItems(ItemParamData[] costItems) {
-		return payItems(costItems, 1, null);
-	}
+    public boolean payItems(ItemParamData[] costItems) {
+        return payItems(costItems, 1, null);
+    }
 
-	public boolean payItems(ItemParamData[] costItems, int quantity) {
-		return payItems(costItems, quantity, null);
-	}
-	
-	public synchronized boolean payItems(ItemParamData[] costItems, int quantity, ActionReason reason) {
-		// Make sure player has requisite items
-		for (ItemParamData cost : costItems) {
-			if (getVirtualItemCount(cost.getId()) < (cost.getCount() * quantity)) {
-				return false;
-			}
-		}
-		// All costs are satisfied, now remove them all
-		for (ItemParamData cost : costItems) {
-			switch (cost.getId()) {
-				case 201 ->  // Primogem
-					player.setPrimogems(player.getPrimogems() - (cost.getCount() * quantity));
-				case 202 ->  // Mora
-					player.setMora(player.getMora() - (cost.getCount() * quantity));
-				case 203 ->  // Genesis Crystals
-					player.setCrystals(player.getCrystals() - (cost.getCount() * quantity));
-				case 106 ->  // Resin
-					player.getResinManager().useResin(cost.getCount() * quantity);
+    public boolean payItems(ItemParamData[] costItems, int quantity) {
+        return payItems(costItems, quantity, null);
+    }
+
+    public synchronized boolean payItems(ItemParamData[] costItems, int quantity, ActionReason reason) {
+        // Make sure player has requisite items
+        for (ItemParamData cost : costItems) {
+            if (getVirtualItemCount(cost.getId()) < (cost.getCount() * quantity)) {
+                return false;
+            }
+        }
+        // All costs are satisfied, now remove them all
+        for (ItemParamData cost : costItems) {
+            switch (cost.getId()) {
+                case 201 ->  // Primogem
+                    player.setPrimogems(player.getPrimogems() - (cost.getCount() * quantity));
+                case 202 ->  // Mora
+                    player.setMora(player.getMora() - (cost.getCount() * quantity));
+                case 203 ->  // Genesis Crystals
+                    player.setCrystals(player.getCrystals() - (cost.getCount() * quantity));
+                case 106 ->  // Resin
+                    player.getResinManager().useResin(cost.getCount() * quantity);
                 case 107 ->  // LegendaryKey
                     player.useLegendaryKey(cost.getCount() * quantity);
-				case 204 ->  // Home Coin
-						player.setHomeCoin(player.getHomeCoin() - (cost.getCount() * quantity));
-				default ->
-					removeItem(getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(cost.getId()), cost.getCount() * quantity);
-			}
-		}
+                case 204 ->  // Home Coin
+                        player.setHomeCoin(player.getHomeCoin() - (cost.getCount() * quantity));
+                default ->
+                    removeItem(getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(cost.getId()), cost.getCount() * quantity);
+            }
+        }
 
-		if (reason != null) {  // Do we need these?
-			// getPlayer().sendPacket(new PacketItemAddHintNotify(changedItems, reason));
-		}
-		// getPlayer().sendPacket(new PacketStoreItemChangeNotify(changedItems));
-		return true;
-	}
-	
-	public void removeItems(List<GameItem> items) {
-		// TODO Bulk delete
-		for (GameItem item : items) {
-			this.removeItem(item, item.getCount());
-		}
-	}
-	
-	public boolean removeItem(long guid) {
-		return removeItem(guid, 1);
-	}
-	
-	public synchronized boolean removeItem(long guid, int count) {
-		GameItem item = this.getItemByGuid(guid);
-		
-		if (item == null) {
-			return false;
-		}
-		
-		return removeItem(item, count);
-	}
-	
-	public synchronized boolean removeItem(GameItem item) {
-		return removeItem(item, item.getCount());
-	}
-	
-	public synchronized boolean removeItem(GameItem item, int count) {
-		// Sanity check
-		if (count <= 0 || item == null) {
-			return false;
-		}
+        if (reason != null) {  // Do we need these?
+            // getPlayer().sendPacket(new PacketItemAddHintNotify(changedItems, reason));
+        }
+        // getPlayer().sendPacket(new PacketStoreItemChangeNotify(changedItems));
+        return true;
+    }
 
-		if (item.getItemData().isEquip()) {
-			item.setCount(0);
-		} else {
-			item.setCount(item.getCount() - count);
-		}
-		
-		if (item.getCount() <= 0) {
-			// Remove from inventory tab too
-			InventoryTab tab = null;
-			if (item.getItemData() != null) {
-				tab = getInventoryTab(item.getItemData().getItemType());
-			}
-			// Remove if less than 0
-			deleteItem(item, tab);
-			//
-			getPlayer().sendPacket(new PacketStoreItemDelNotify(item));
-		} else {
-			getPlayer().sendPacket(new PacketStoreItemChangeNotify(item));
-		}
-		
-		// Battle pass trigger
-		int removeCount = Math.min(count, item.getCount());
-		getPlayer().getBattlePassManager().triggerMission(WatcherTriggerType.TRIGGER_COST_MATERIAL, item.getItemId(), removeCount);
-		
-		// Update in db
-		item.save();
-		
-		// Returns true on success
-		return true;
-	}
-	
-	private void deleteItem(GameItem item, InventoryTab tab) {
-		getItems().remove(item.getGuid());
-		if (tab != null) {
-			tab.onRemoveItem(item);
-		}
-	}
-	
-	public boolean equipItem(long avatarGuid, long equipGuid) {
-		Avatar avatar = getPlayer().getAvatars().getAvatarByGuid(avatarGuid);
-		GameItem item = this.getItemByGuid(equipGuid);
-		
-		if (avatar != null && item != null) {
-			return avatar.equipItem(item, true);
-		}
-		
-		return false;
-	}
-	
-	public boolean unequipItem(long avatarGuid, int slot) {
-		Avatar avatar = getPlayer().getAvatars().getAvatarByGuid(avatarGuid);
-		EquipType equipType = EquipType.getTypeByValue(slot);
-		
-		if (avatar != null && equipType != EquipType.EQUIP_WEAPON) {
-			if (avatar.unequipItem(equipType)) {
-				getPlayer().sendPacket(new PacketAvatarEquipChangeNotify(avatar, equipType));
-				avatar.recalcStats();
-				return true;
-			}
-		}
-		
-		return false;
-	}
-	
-	public void loadFromDatabase() {
-		List<GameItem> items = DatabaseHelper.getInventoryItems(getPlayer());
-		
-		for (GameItem item : items) {
-			// Should never happen
-			if (item.getObjectId() == null) {
-				continue;
-			}
-			
-			ItemData itemData = GameData.getItemDataMap().get(item.getItemId());
-			if (itemData == null) {
-				continue;
-			}
-			
-			item.setItemData(itemData);
-			
-			InventoryTab tab = null;
-			if (item.getItemData() != null) {
-				tab = getInventoryTab(item.getItemData().getItemType());
-			}
-			
-			putItem(item, tab);
-			
-			// Equip to a character if possible
-			if (item.isEquipped()) {
-				Avatar avatar = getPlayer().getAvatars().getAvatarById(item.getEquipCharacter());
-				boolean hasEquipped = false;
-				
-				if (avatar != null) {
-					hasEquipped = avatar.equipItem(item, false);
-				}
-				
-				if (!hasEquipped) {
-					item.setEquipCharacter(0);
-					item.save();
-				}
-			}
-		}
-	}
+    public void removeItems(List<GameItem> items) {
+        // TODO Bulk delete
+        for (GameItem item : items) {
+            this.removeItem(item, item.getCount());
+        }
+    }
 
-	@Override
-	public Iterator<GameItem> iterator() {
-		return this.getItems().values().iterator();
-	}
+    public boolean removeItem(long guid) {
+        return removeItem(guid, 1);
+    }
+
+    public synchronized boolean removeItem(long guid, int count) {
+        GameItem item = this.getItemByGuid(guid);
+
+        if (item == null) {
+            return false;
+        }
+
+        return removeItem(item, count);
+    }
+
+    public synchronized boolean removeItem(GameItem item) {
+        return removeItem(item, item.getCount());
+    }
+
+    public synchronized boolean removeItem(GameItem item, int count) {
+        // Sanity check
+        if (count <= 0 || item == null) {
+            return false;
+        }
+
+        if (item.getItemData().isEquip()) {
+            item.setCount(0);
+        } else {
+            item.setCount(item.getCount() - count);
+        }
+
+        if (item.getCount() <= 0) {
+            // Remove from inventory tab too
+            InventoryTab tab = null;
+            if (item.getItemData() != null) {
+                tab = getInventoryTab(item.getItemData().getItemType());
+            }
+            // Remove if less than 0
+            deleteItem(item, tab);
+            //
+            getPlayer().sendPacket(new PacketStoreItemDelNotify(item));
+        } else {
+            getPlayer().sendPacket(new PacketStoreItemChangeNotify(item));
+        }
+
+        // Battle pass trigger
+        int removeCount = Math.min(count, item.getCount());
+        getPlayer().getBattlePassManager().triggerMission(WatcherTriggerType.TRIGGER_COST_MATERIAL, item.getItemId(), removeCount);
+
+        // Update in db
+        item.save();
+
+        // Returns true on success
+        return true;
+    }
+
+    private void deleteItem(GameItem item, InventoryTab tab) {
+        getItems().remove(item.getGuid());
+        if (tab != null) {
+            tab.onRemoveItem(item);
+        }
+    }
+
+    public boolean equipItem(long avatarGuid, long equipGuid) {
+        Avatar avatar = getPlayer().getAvatars().getAvatarByGuid(avatarGuid);
+        GameItem item = this.getItemByGuid(equipGuid);
+
+        if (avatar != null && item != null) {
+            return avatar.equipItem(item, true);
+        }
+
+        return false;
+    }
+
+    public boolean unequipItem(long avatarGuid, int slot) {
+        Avatar avatar = getPlayer().getAvatars().getAvatarByGuid(avatarGuid);
+        EquipType equipType = EquipType.getTypeByValue(slot);
+
+        if (avatar != null && equipType != EquipType.EQUIP_WEAPON) {
+            if (avatar.unequipItem(equipType)) {
+                getPlayer().sendPacket(new PacketAvatarEquipChangeNotify(avatar, equipType));
+                avatar.recalcStats();
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public void loadFromDatabase() {
+        List<GameItem> items = DatabaseHelper.getInventoryItems(getPlayer());
+
+        for (GameItem item : items) {
+            // Should never happen
+            if (item.getObjectId() == null) {
+                continue;
+            }
+
+            ItemData itemData = GameData.getItemDataMap().get(item.getItemId());
+            if (itemData == null) {
+                continue;
+            }
+
+            item.setItemData(itemData);
+
+            InventoryTab tab = null;
+            if (item.getItemData() != null) {
+                tab = getInventoryTab(item.getItemData().getItemType());
+            }
+
+            putItem(item, tab);
+
+            // Equip to a character if possible
+            if (item.isEquipped()) {
+                Avatar avatar = getPlayer().getAvatars().getAvatarById(item.getEquipCharacter());
+                boolean hasEquipped = false;
+
+                if (avatar != null) {
+                    hasEquipped = avatar.equipItem(item, false);
+                }
+
+                if (!hasEquipped) {
+                    item.setEquipCharacter(0);
+                    item.save();
+                }
+            }
+        }
+    }
+
+    @Override
+    public Iterator<GameItem> iterator() {
+        return this.getItems().values().iterator();
+    }
 }

src/main/java/emu/grasscutter/game/inventory/MaterialType.java

@@ -8,35 +8,45 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
 public enum MaterialType {
-	MATERIAL_NONE						(0),
-	MATERIAL_FOOD						(1),
-	MATERIAL_QUEST						(2),
-	MATERIAL_EXCHANGE					(4),
-	MATERIAL_CONSUME					(5),
-	MATERIAL_EXP_FRUIT					(6),
-	MATERIAL_AVATAR						(7),
-	MATERIAL_ADSORBATE					(8),
-	MATERIAL_CRICKET					(9),
-	MATERIAL_ELEM_CRYSTAL				(10),
-	MATERIAL_WEAPON_EXP_STONE			(11),
-	MATERIAL_CHEST						(12),
-	MATERIAL_RELIQUARY_MATERIAL 		(13),
-	MATERIAL_AVATAR_MATERIAL			(14),
-	MATERIAL_NOTICE_ADD_HP				(15),
-	MATERIAL_SEA_LAMP					(16),
-	MATERIAL_SELECTABLE_CHEST			(17),
-	MATERIAL_FLYCLOAK					(18),
-	MATERIAL_NAMECARD					(19),
-	MATERIAL_TALENT						(20),
-	MATERIAL_WIDGET						(21),
-	MATERIAL_CHEST_BATCH_USE			(22),
-	MATERIAL_FAKE_ABSORBATE				(23),
-	MATERIAL_CONSUME_BATCH_USE			(24),
-	MATERIAL_WOOD						(25),
-	MATERIAL_FURNITURE_FORMULA			(27),
-	MATERIAL_CHANNELLER_SLAB_BUFF		(28),
-	MATERIAL_FURNITURE_SUITE_FORMULA	(29),
-	MATERIAL_COSTUME					(30);
+    MATERIAL_NONE (0),
+    MATERIAL_FOOD (1),
+    MATERIAL_QUEST (2),
+    MATERIAL_EXCHANGE (4),
+    MATERIAL_CONSUME (5),
+    MATERIAL_EXP_FRUIT (6),
+    MATERIAL_AVATAR (7),
+    MATERIAL_ADSORBATE (8),
+    MATERIAL_CRICKET (9),
+    MATERIAL_ELEM_CRYSTAL (10),
+    MATERIAL_WEAPON_EXP_STONE (11),
+    MATERIAL_CHEST (12),
+    MATERIAL_RELIQUARY_MATERIAL (13),
+    MATERIAL_AVATAR_MATERIAL (14),
+    MATERIAL_NOTICE_ADD_HP (15),
+    MATERIAL_SEA_LAMP (16),
+    MATERIAL_SELECTABLE_CHEST (17),
+    MATERIAL_FLYCLOAK (18),
+    MATERIAL_NAMECARD (19),
+    MATERIAL_TALENT (20),
+    MATERIAL_WIDGET (21),
+    MATERIAL_CHEST_BATCH_USE (22),
+    MATERIAL_FAKE_ABSORBATE (23),
+    MATERIAL_CONSUME_BATCH_USE (24),
+    MATERIAL_WOOD (25),
+    MATERIAL_FURNITURE_FORMULA (27),
+    MATERIAL_CHANNELLER_SLAB_BUFF (28),
+    MATERIAL_FURNITURE_SUITE_FORMULA (29),
+    MATERIAL_COSTUME (30),
+    MATERIAL_HOME_SEED (31),
+    MATERIAL_FISH_BAIT (32),
+    MATERIAL_FISH_ROD (33),
+    MATERIAL_SUMO_BUFF (34),
+    MATERIAL_FIREWORKS (35),
+    MATERIAL_BGM (36),
+    MATERIAL_SPICE_FOOD (37),
+    MATERIAL_ACTIVITY_ROBOT (38),
+    MATERIAL_ACTIVITY_GEAR (39),
+    MATERIAL_ACTIVITY_JIGSAW (40);
 	
 	private final int value;
 	private static final Int2ObjectMap<MaterialType> map = new Int2ObjectOpenHashMap<>();

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

@@ -1,105 +1,101 @@
 package emu.grasscutter.game.mail;
 
-import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.database.DatabaseHelper;
+import emu.grasscutter.game.player.BasePlayerManager;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.server.event.player.PlayerReceiveMailEvent;
 import emu.grasscutter.server.packet.send.PacketDelMailRsp;
 import emu.grasscutter.server.packet.send.PacketMailChangeNotify;
 
-public class MailHandler {
-	private final Player player;
-	private final List<Mail> mail;
-	
-	public MailHandler(Player player) {
-		this.player = player;
-		this.mail = new ArrayList<>();
-	}
+public class MailHandler extends BasePlayerManager {
+    private final List<Mail> mail;
 
-	public Player getPlayer() {
-		return player;
-	}
+    public MailHandler(Player player) {
+        super(player);
 
-	public List<Mail> getMail() {
-		return mail;
-	}
-	
-	// ---------------------MAIL------------------------
+        this.mail = new ArrayList<>();
+    }
 
-	public void sendMail(Mail message) {
-		// Call mail receive event.
-		PlayerReceiveMailEvent event = new PlayerReceiveMailEvent(this.getPlayer(), message); event.call();
-		if(event.isCanceled()) return; message = event.getMessage();
-		
-		message.setOwnerUid(this.getPlayer().getUid());
-		message.save();
-		
-		this.mail.add(message);
-		
-		Grasscutter.getLogger().debug("Mail sent to user [" + this.getPlayer().getUid()  + ":" + this.getPlayer().getNickname() + "]!");
-		
-		if (this.getPlayer().isOnline()) {
-			this.getPlayer().sendPacket(new PacketMailChangeNotify(this.getPlayer(), message));
-		} // TODO: setup a way for the mail notification to show up when someone receives mail when they were offline
-	}
+    public List<Mail> getMail() {
+        return mail;
+    }
 
-	public boolean deleteMail(int mailId) {
-		Mail message = getMailById(mailId);
+    // ---------------------MAIL------------------------
 
-		if (message != null) {
-			this.getMail().remove(mailId);
-			message.expireTime = 0;
-			message.save();
-			
-			return true;
-		}
+    public void sendMail(Mail message) {
+        // Call mail receive event.
+        PlayerReceiveMailEvent event = new PlayerReceiveMailEvent(this.getPlayer(), message); event.call();
+        if (event.isCanceled()) return; message = event.getMessage();
 
-		return false;
-	}
-	
-	public void deleteMail(List<Integer> mailList) {
-		List<Integer> sortedMailList = new ArrayList<>();
-		sortedMailList.addAll(mailList);
-		Collections.sort(sortedMailList, Collections.reverseOrder());
-		
-		List<Integer> deleted = new ArrayList<>();
-		
-		for (int id : sortedMailList) {
-			if (this.deleteMail(id)) {
-				deleted.add(id);
-			}
-		}
-		
-		player.getSession().send(new PacketDelMailRsp(player, deleted));
-		player.getSession().send(new PacketMailChangeNotify(player, null, deleted));
-	}
+        message.setOwnerUid(this.getPlayer().getUid());
+        message.save();
 
-	public Mail getMailById(int index) { return this.mail.get(index); }
-	
-	public int getMailIndex(Mail message) {
-		return this.mail.indexOf(message);
-	}
+        this.mail.add(message);
 
-	public boolean replaceMailByIndex(int index, Mail message) {
-		if(getMailById(index) != null) {
-			this.mail.set(index, message);
-			message.save();
-			return true;
-		} else {
-			return false;
-		}
-	}
+        Grasscutter.getLogger().debug("Mail sent to user [" + this.getPlayer().getUid()  + ":" + this.getPlayer().getNickname() + "]!");
 
-	public void loadFromDatabase() {
-		List<Mail> mailList = DatabaseHelper.getAllMail(this.getPlayer());
-		
-		for (Mail mail : mailList) {
-			this.getMail().add(mail);
-		}
-	}
+        if (this.getPlayer().isOnline()) {
+            this.getPlayer().sendPacket(new PacketMailChangeNotify(this.getPlayer(), message));
+        } // TODO: setup a way for the mail notification to show up when someone receives mail when they were offline
+    }
+
+    public boolean deleteMail(int mailId) {
+        Mail message = getMailById(mailId);
+
+        if (message != null) {
+            this.getMail().remove(mailId);
+            message.expireTime = 0;
+            message.save();
+
+            return true;
+        }
+
+        return false;
+    }
+
+    public void deleteMail(List<Integer> mailList) {
+        List<Integer> sortedMailList = new ArrayList<>();
+        sortedMailList.addAll(mailList);
+        Collections.sort(sortedMailList, Collections.reverseOrder());
+
+        List<Integer> deleted = new ArrayList<>();
+
+        for (int id : sortedMailList) {
+            if (this.deleteMail(id)) {
+                deleted.add(id);
+            }
+        }
+
+        player.getSession().send(new PacketDelMailRsp(player, deleted));
+        player.getSession().send(new PacketMailChangeNotify(player, null, deleted));
+    }
+
+    public Mail getMailById(int index) { return this.mail.get(index); }
+
+    public int getMailIndex(Mail message) {
+        return this.mail.indexOf(message);
+    }
+
+    public boolean replaceMailByIndex(int index, Mail message) {
+        if (getMailById(index) != null) {
+            this.mail.set(index, message);
+            message.save();
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public void loadFromDatabase() {
+        List<Mail> mailList = DatabaseHelper.getAllMail(this.getPlayer());
+
+        for (Mail mail : mailList) {
+            this.getMail().add(mail);
+        }
+    }
 }

src/main/java/emu/grasscutter/game/managers/AccountManager.java

@@ -1,15 +0,0 @@
-package emu.grasscutter.game.managers;
-
-import emu.grasscutter.server.game.GameServer;
-
-public class AccountManager {
-	private final GameServer server;
-	
-	public AccountManager(GameServer server) {
-		this.server = server;
-	}
-
-	public GameServer getServer() {
-		return server;
-	}
-}

src/main/java/emu/grasscutter/game/managers/CookingManager.java

@@ -10,8 +10,10 @@ import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.common.ItemParamData;
 import emu.grasscutter.data.excels.ItemData;
 import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.game.player.BasePlayerManager;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.ActionReason;
+import emu.grasscutter.game.props.ItemUseOp;
 import emu.grasscutter.net.proto.CookRecipeDataOuterClass;
 import emu.grasscutter.net.proto.PlayerCookArgsReqOuterClass.PlayerCookArgsReq;
 import emu.grasscutter.net.proto.PlayerCookReqOuterClass.PlayerCookReq;
@@ -22,14 +24,12 @@ import emu.grasscutter.server.packet.send.PacketPlayerCookArgsRsp;
 import emu.grasscutter.server.packet.send.PacketPlayerCookRsp;
 import io.netty.util.internal.ThreadLocalRandom;
 
-public class CookingManager {
+public class CookingManager extends BasePlayerManager {
     private static final int MANUAL_PERFECT_COOK_QUALITY = 3;
-
     private static Set<Integer> defaultUnlockedRecipies;
-    private final Player player;
 
     public CookingManager(Player player) {
-        this.player = player;
+        super(player);
     }
 
     public static void initialize() {
@@ -48,12 +48,12 @@ public class CookingManager {
      ********************/
     public synchronized boolean unlockRecipe(GameItem recipeItem) {
         // Make sure this is actually a cooking recipe.
-        if (!recipeItem.getItemData().getItemUse().get(0).getUseOp().equals("ITEM_USE_UNLOCK_COOK_RECIPE")) {
+        if (recipeItem.getItemData().getItemUse().get(0).getUseOp() != ItemUseOp.ITEM_USE_UNLOCK_COOK_RECIPE) {
             return false;
         }
 
         // Determine the recipe we should unlock.
-        int recipeId = Integer.parseInt(recipeItem.getItemData().getItemUse().get(0).getUseParam().get(0));
+        int recipeId = Integer.parseInt(recipeItem.getItemData().getItemUse().get(0).getUseParam()[0]);
 
         // Remove the item from the player's inventory.
         // We need to do this here, before sending CookRecipeDataNotify, or the the UI won't correctly update.
@@ -103,9 +103,9 @@ public class CookingManager {
         }
 
         // Get result item information.
-        int qualityIndex = 
-            quality == 0 
-            ? 2 
+        int qualityIndex =
+            quality == 0
+            ? 2
             : quality - 1;
 
         ItemParamData resultParam = recipeData.getQualityOutputVec().get(qualityIndex);

src/main/java/emu/grasscutter/game/managers/FurnitureManager.java

@@ -4,7 +4,9 @@ import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.common.ItemParamData;
 import emu.grasscutter.game.home.FurnitureMakeSlotItem;
 import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.game.player.BasePlayerManager;
 import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.ItemUseOp;
 import emu.grasscutter.net.proto.ItemParamOuterClass;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
 import emu.grasscutter.server.packet.send.*;
@@ -13,42 +15,42 @@ import emu.grasscutter.utils.Utils;
 import java.util.ArrayList;
 import java.util.List;
 
-public class FurnitureManager {
-    private final Player player;
+public class FurnitureManager extends BasePlayerManager {
 
     public FurnitureManager(Player player) {
-        this.player = player;
+        super(player);
     }
 
-    public void onLogin(){
+    public void onLogin() {
         notifyUnlockFurniture();
         notifyUnlockFurnitureSuite();
     }
 
-    public void notifyUnlockFurniture(){
+    public void notifyUnlockFurniture() {
         player.getSession().send(new PacketUnlockedFurnitureFormulaDataNotify(player.getUnlockedFurniture()));
     }
 
-    public void notifyUnlockFurnitureSuite(){
+    public void notifyUnlockFurnitureSuite() {
         player.getSession().send(new PacketUnlockedFurnitureSuiteDataNotify(player.getUnlockedFurnitureSuite()));
     }
 
-    public synchronized boolean unlockFurnitureOrSuite(GameItem useItem){
+    public synchronized boolean unlockFurnitureOrSuite(GameItem useItem) {
+        ItemUseOp itemUseOp = useItem.getItemData().getItemUse().get(0).getUseOp();
+        
         // Check
-        if (!List.of("ITEM_USE_UNLOCK_FURNITURE_FORMULA", "ITEM_USE_UNLOCK_FURNITURE_SUITE")
-                .contains(useItem.getItemData().getItemUse().get(0).getUseOp())) {
+        if (itemUseOp != ItemUseOp.ITEM_USE_UNLOCK_FURNITURE_SUITE && itemUseOp != ItemUseOp.ITEM_USE_UNLOCK_FURNITURE_FORMULA) {
             return false;
         }
 
-        int furnitureIdOrSuiteId = Integer.parseInt(useItem.getItemData().getItemUse().get(0).getUseParam().get(0));
+        int furnitureIdOrSuiteId = Integer.parseInt(useItem.getItemData().getItemUse().get(0).getUseParam()[0]);
 
         // Remove first
         player.getInventory().removeItem(useItem, 1);
 
-        if("ITEM_USE_UNLOCK_FURNITURE_FORMULA".equals(useItem.getItemData().getItemUse().get(0).getUseOp())){
+        if (useItem.getItemData().getItemUse().get(0).getUseOp() == ItemUseOp.ITEM_USE_UNLOCK_FURNITURE_FORMULA) {
             player.getUnlockedFurniture().add(furnitureIdOrSuiteId);
             notifyUnlockFurniture();
-        }else{
+        }else {
             player.getUnlockedFurnitureSuite().add(furnitureIdOrSuiteId);
             notifyUnlockFurnitureSuite();
         }
@@ -57,19 +59,19 @@ public class FurnitureManager {
 
     public void startMake(int makeId, int avatarId) {
         var makeData = GameData.getFurnitureMakeConfigDataMap().get(makeId);
-        if(makeData == null){
+        if (makeData == null) {
             player.getSession().send(new PacketFurnitureMakeStartRsp(Retcode.RET_FURNITURE_MAKE_CONFIG_ERROR_VALUE, null));
             return;
         }
 
         // check slot count
-        if (player.getHome().getLevelData().getFurnitureMakeSlotCount() <= player.getHome().getFurnitureMakeSlotItemList().size()){
+        if (player.getHome().getLevelData().getFurnitureMakeSlotCount() <= player.getHome().getFurnitureMakeSlotItemList().size()) {
             player.getSession().send(new PacketFurnitureMakeStartRsp(Retcode.RET_FURNITURE_MAKE_SLOT_FULL_VALUE, null));
             return;
         }
 
         // pay items first
-        if(!player.getInventory().payItems(makeData.getMaterialItems().toArray(new ItemParamData[0]))){
+        if (!player.getInventory().payItems(makeData.getMaterialItems().toArray(new ItemParamData[0]))) {
             player.getSession().send(new PacketFurnitureMakeStartRsp(Retcode.RET_HOME_FURNITURE_COUNT_NOT_ENOUGH_VALUE, null));
             return;
         }
@@ -93,7 +95,7 @@ public class FurnitureManager {
     }
 
     public void queryStatus() {
-        if (player.getHome().getFurnitureMakeSlotItemList() == null){
+        if (player.getHome().getFurnitureMakeSlotItemList() == null) {
             player.getHome().setFurnitureMakeSlotItemList(new ArrayList<>());
         }
 
@@ -103,7 +105,7 @@ public class FurnitureManager {
 
     public void take(int index, int makeId, boolean isFastFinish) {
         var makeData = GameData.getFurnitureMakeConfigDataMap().get(makeId);
-        if(makeData == null){
+        if (makeData == null) {
             player.getSession().send(new PacketTakeFurnitureMakeRsp(Retcode.RET_FURNITURE_MAKE_CONFIG_ERROR_VALUE, makeId, null, null));
             return;
         }
@@ -112,19 +114,19 @@ public class FurnitureManager {
                 .filter(x -> x.getIndex() == index && x.getMakeId() == makeId)
                 .findFirst();
 
-        if(slotItem.isEmpty()){
+        if (slotItem.isEmpty()) {
             player.getSession().send(new PacketTakeFurnitureMakeRsp(Retcode.RET_FURNITURE_MAKE_NO_MAKE_DATA_VALUE, makeId, null, null));
             return;
         }
 
         // pay the speedup item
-        if(isFastFinish && !player.getInventory().payItem(107013,1)){
+        if (isFastFinish && !player.getInventory().payItem(107013,1)) {
             player.getSession().send(new PacketTakeFurnitureMakeRsp(Retcode.RET_FURNITURE_MAKE_UNFINISH_VALUE, makeId, null, null));
             return;
         }
 
         // check if player can take
-//        if(slotItem.get().getBeginTime() + slotItem.get().getDurTime() >= Utils.getCurrentSeconds() && !isFastFinish){
+//        if (slotItem.get().getBeginTime() + slotItem.get().getDurTime() >= Utils.getCurrentSeconds() && !isFastFinish) {
 //            player.getSession().send(new PacketTakeFurnitureMakeRsp(Retcode.RET_FURNITURE_MAKE_UNFINISH_VALUE, makeId, null, null));
 //            return;
 //        }

src/main/java/emu/grasscutter/game/managers/InsectCaptureManager.java

@@ -1,44 +0,0 @@
-package emu.grasscutter.game.managers;
-
-import emu.grasscutter.Grasscutter;
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.excels.EnvAnimalGatherConfigData;
-import emu.grasscutter.data.excels.ItemData;
-import emu.grasscutter.game.entity.EntityMonster;
-import emu.grasscutter.game.entity.EntityVehicle;
-import emu.grasscutter.game.entity.GameEntity;
-import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.ActionReason;
-import emu.grasscutter.net.proto.VisionTypeOuterClass;
-
-public record InsectCaptureManager(Player player) {
-    public void arrestSmallCreature(GameEntity entity) {
-        //System.out.println("arrestSmallCreature!");
-        EnvAnimalGatherConfigData gather;
-        int thingId;
-        if (entity instanceof EntityMonster monster) {
-            thingId = monster.getMonsterData().getId();
-            gather = GameData.getEnvAnimalGatherConfigDataMap().get(thingId);
-        } else if (entity instanceof EntityVehicle gadget) {
-            thingId = gadget.getGadgetId();
-            gather = GameData.getEnvAnimalGatherConfigDataMap().get(thingId);
-        } else {
-            return;
-        }
-        if (gather == null) {
-            Grasscutter.getLogger().warn("monster/gather(id={}) couldn't be caught.", thingId);
-            return;
-        }
-        String type = gather.getEntityType();
-        if ((type.equals("Monster") && entity instanceof EntityMonster) || (type.equals("Gadget") && entity instanceof EntityVehicle)) {
-            EnvAnimalGatherConfigData.GatherItem gatherItem = gather.gatherItem();
-            ItemData data = GameData.getItemDataMap().get(gatherItem.getId());
-            GameItem item = new GameItem(data, gatherItem.getCount());
-            player.getInventory().addItem(item, ActionReason.SubfieldDrop);
-            entity.getScene().removeEntity(entity, VisionTypeOuterClass.VisionType.VISION_TYPE_REMOVE);
-        } else {
-            Grasscutter.getLogger().warn("monster/gather(id={}) has a wrong type.", thingId);
-        }
-    }
-}

src/main/java/emu/grasscutter/game/managers/InventoryManager.java

@@ -1,961 +0,0 @@
-package emu.grasscutter.game.managers;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.binout.OpenConfigEntry;
-import emu.grasscutter.data.binout.OpenConfigEntry.SkillPointModifier;
-import emu.grasscutter.data.common.ItemParamData;
-import emu.grasscutter.data.excels.AvatarPromoteData;
-import emu.grasscutter.data.excels.AvatarSkillData;
-import emu.grasscutter.data.excels.AvatarSkillDepotData;
-import emu.grasscutter.data.excels.AvatarTalentData;
-import emu.grasscutter.data.excels.ItemData;
-import emu.grasscutter.data.excels.ProudSkillData;
-import emu.grasscutter.data.excels.WeaponPromoteData;
-import emu.grasscutter.data.excels.AvatarSkillDepotData.InherentProudSkillOpens;
-import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.game.inventory.ItemType;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.ActionReason;
-import emu.grasscutter.game.shop.ShopChestBatchUseTable;
-import emu.grasscutter.game.shop.ShopChestTable;
-import emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam;
-import emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo;
-import emu.grasscutter.server.game.GameServer;
-import emu.grasscutter.server.packet.send.*;
-import emu.grasscutter.utils.Utils;
-import it.unimi.dsi.fastutil.ints.Int2IntMap;
-import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
-
-public class InventoryManager {
-	private final GameServer server;
-	
-	private final static int RELIC_MATERIAL_1 = 105002; // Sanctifying Unction
-	private final static int RELIC_MATERIAL_2 = 105003; // Sanctifying Essence
-	private final static int RELIC_MATERIAL_EXP_1 = 2500; // Sanctifying Unction
-	private final static int RELIC_MATERIAL_EXP_2 = 10000; // Sanctifying Essence
-	
-	private final static int WEAPON_ORE_1 = 104011; // Enhancement Ore
-	private final static int WEAPON_ORE_2 = 104012; // Fine Enhancement Ore
-	private final static int WEAPON_ORE_3 = 104013; // Mystic Enhancement Ore
-	private final static int WEAPON_ORE_EXP_1 = 400; // Enhancement Ore
-	private final static int WEAPON_ORE_EXP_2 = 2000; // Fine Enhancement Ore
-	private final static int WEAPON_ORE_EXP_3 = 10000; // Mystic Enhancement Ore
-	
-	private final static int AVATAR_BOOK_1 = 104001; // Wanderer's Advice
-	private final static int AVATAR_BOOK_2 = 104002; // Adventurer's Experience
-	private final static int AVATAR_BOOK_3 = 104003; // Hero's Wit
-	private final static int AVATAR_BOOK_EXP_1 = 1000; // Wanderer's Advice
-	private final static int AVATAR_BOOK_EXP_2 = 5000; // Adventurer's Experience
-	private final static int AVATAR_BOOK_EXP_3 = 20000; // Hero's Wit
-	
-	public InventoryManager(GameServer server) {
-		this.server = server;
-	}
-
-	public GameServer getServer() {
-		return server;
-	}
-	
-	public void lockEquip(Player player, long targetEquipGuid, boolean isLocked) {
-		GameItem equip = player.getInventory().getItemByGuid(targetEquipGuid);
-		
-		if (equip == null || !equip.getItemData().isEquip()) {
-			return;
-		}
-		
-		equip.setLocked(isLocked);
-		equip.save();
-		
-		player.sendPacket(new PacketStoreItemChangeNotify(equip));
-		player.sendPacket(new PacketSetEquipLockStateRsp(equip));
-	}
-
-	public void upgradeRelic(Player player, long targetGuid, List<Long> foodRelicList, List<ItemParam> list) {
-		GameItem relic = player.getInventory().getItemByGuid(targetGuid);
-		
-		if (relic == null || relic.getItemType() != ItemType.ITEM_RELIQUARY) {
-			return;
-		}
-		
-		int moraCost = 0;
-		int expGain = 0;
-		
-		List<GameItem> foodRelics = new ArrayList<GameItem>();
-		for (long guid : foodRelicList) {
-			// Add to delete queue
-			GameItem food = player.getInventory().getItemByGuid(guid);
-			if (food == null || !food.isDestroyable()) {
-				continue;
-			}
-			// Calculate mora cost
-			moraCost += food.getItemData().getBaseConvExp();
-			expGain += food.getItemData().getBaseConvExp();
-			// Feeding artifact with exp already
-			if (food.getTotalExp() > 0) {
-				expGain += (food.getTotalExp() * 4) / 5;
-			}
-			foodRelics.add(food);
-		}
-		List<ItemParamData> payList = new ArrayList<ItemParamData>();
-		for (ItemParam itemParam : list) {
-			int amount = itemParam.getCount();  // Previously this capped to inventory amount, but rejecting the payment makes more sense for an invalid order
-			int gain = amount * switch(itemParam.getItemId()) {
-				case RELIC_MATERIAL_1 -> RELIC_MATERIAL_EXP_1;
-				case RELIC_MATERIAL_2 -> RELIC_MATERIAL_EXP_2;
-				default -> 0;
-			};
-			expGain += gain;
-			moraCost += gain;
-			payList.add(new ItemParamData(itemParam.getItemId(), itemParam.getCount()));
-		}
-		
-		// Make sure exp gain is valid
-		if (expGain <= 0) {
-			return;
-		}
-		
-		// Confirm payment of materials and mora (assume food relics are payable afterwards)
-		payList.add(new ItemParamData(202, moraCost));
-		if (!player.getInventory().payItems(payList.toArray(new ItemParamData[0]))) {
-			return;
-		}
-		
-		// Consume food relics
-		player.getInventory().removeItems(foodRelics);
-		
-		// Implement random rate boost
-		int rate = 1;
-		int boost = Utils.randomRange(1, 100);
-		if (boost == 100) {
-			rate = 5;
-		} else if (boost <= 9) {
-			rate = 2;
-		}
-		expGain *= rate;
-		
-		// Now we upgrade
-		int level = relic.getLevel();
-		int oldLevel = level;
-		int exp = relic.getExp();
-		int totalExp = relic.getTotalExp();
-		int reqExp = GameData.getRelicExpRequired(relic.getItemData().getRankLevel(), level);
-		int upgrades = 0;
-        List<Integer> oldAppendPropIdList = new ArrayList<>(relic.getAppendPropIdList());
-		
-		while (expGain > 0 && reqExp > 0 && level < relic.getItemData().getMaxLevel()) {
-			// Do calculations
-			int toGain = Math.min(expGain, reqExp - exp);
-			exp += toGain;
-			totalExp += toGain;
-			expGain -= toGain;
-			// Level up
-			if (exp >= reqExp) {
-				// Exp
-				exp = 0;
-				level += 1;
-				// On relic levelup
-				if (relic.getItemData().getAddPropLevelSet() != null && relic.getItemData().getAddPropLevelSet().contains(level)) {
-					upgrades += 1;
-				}
-				// Set req exp
-				reqExp = GameData.getRelicExpRequired(relic.getItemData().getRankLevel(), level);
-			}
-		}
-		
-        relic.addAppendProps(upgrades);
-		
-		// Save
-		relic.setLevel(level);
-		relic.setExp(exp);
-		relic.setTotalExp(totalExp);
-		relic.save();
-		
-		// Avatar
-		if (oldLevel != level) {
-			Avatar avatar = relic.getEquipCharacter() > 0 ? player.getAvatars().getAvatarById(relic.getEquipCharacter()) : null;
-			if (avatar != null) {
-				avatar.recalcStats();
-			}
-		}
-
-		// Packet
-		player.sendPacket(new PacketStoreItemChangeNotify(relic));
-		player.sendPacket(new PacketReliquaryUpgradeRsp(relic, rate, oldLevel, oldAppendPropIdList));
-	}
-
-	public List<ItemParam> calcWeaponUpgradeReturnItems(Player player, long targetGuid, List<Long> foodWeaponGuidList, List<ItemParam> itemParamList) {
-		GameItem weapon = player.getInventory().getItemByGuid(targetGuid);
-		
-		// Sanity checks
-		if (weapon == null || weapon.getItemType() != ItemType.ITEM_WEAPON) {
-			return null;
-		}
-		
-		WeaponPromoteData promoteData = GameData.getWeaponPromoteData(weapon.getItemData().getWeaponPromoteId(), weapon.getPromoteLevel());
-		if (promoteData == null) {
-			return null;
-		}
-		
-		// Get exp gain
-		int expGain = 0;
-		for (long guid : foodWeaponGuidList) {
-			GameItem food = player.getInventory().getItemByGuid(guid);
-			if (food == null) {
-				continue;
-			}
-			expGain += food.getItemData().getWeaponBaseExp();
-			if (food.getTotalExp() > 0) {
-				expGain += (food.getTotalExp() * 4) / 5;
-			}
-		}
-		for (ItemParam param : itemParamList) {
-			expGain += param.getCount() * switch(param.getItemId()) {
-				case WEAPON_ORE_1 -> WEAPON_ORE_EXP_1;
-				case WEAPON_ORE_2 -> WEAPON_ORE_EXP_2;
-				case WEAPON_ORE_3 -> WEAPON_ORE_EXP_3;
-				default -> 0;
-			};
-		}
-		
-		// Try
-		int maxLevel = promoteData.getUnlockMaxLevel();
-		int level = weapon.getLevel();
-		int exp = weapon.getExp();
-		int reqExp = GameData.getWeaponExpRequired(weapon.getItemData().getRankLevel(), level);
-		
-		while (expGain > 0 && reqExp > 0 && level < maxLevel) {
-			// Do calculations
-			int toGain = Math.min(expGain, reqExp - exp);
-			exp += toGain;
-			expGain -= toGain;
-			// Level up
-			if (exp >= reqExp) {
-				// Exp
-				exp = 0;
-				level += 1;
-				// Set req exp
-				reqExp = GameData.getWeaponExpRequired(weapon.getItemData().getRankLevel(), level);
-			}
-		}
-		
-		return getLeftoverOres(expGain);
-	}
-	
-
-	public void upgradeWeapon(Player player, long targetGuid, List<Long> foodWeaponGuidList, List<ItemParam> itemParamList) {
-		GameItem weapon = player.getInventory().getItemByGuid(targetGuid);
-		
-		// Sanity checks
-		if (weapon == null || weapon.getItemType() != ItemType.ITEM_WEAPON) {
-			return;
-		}
-		
-		WeaponPromoteData promoteData = GameData.getWeaponPromoteData(weapon.getItemData().getWeaponPromoteId(), weapon.getPromoteLevel());
-		if (promoteData == null) {
-			return;
-		}
-		
-		// Get exp gain
-		int expGain = 0, expGainFree = 0;
-		List<GameItem> foodWeapons = new ArrayList<GameItem>();
-		for (long guid : foodWeaponGuidList) {
-			GameItem food = player.getInventory().getItemByGuid(guid);
-			if (food == null || !food.isDestroyable()) {
-				continue;
-			}
-			expGain += food.getItemData().getWeaponBaseExp();
-			if (food.getTotalExp() > 0) {
-				expGainFree += (food.getTotalExp() * 4) / 5;  // No tax :D
-			}
-			foodWeapons.add(food);
-		}
-		List<ItemParamData> payList = new ArrayList<ItemParamData>();
-		for (ItemParam param : itemParamList) {
-			int amount = param.getCount();  // Previously this capped to inventory amount, but rejecting the payment makes more sense for an invalid order
-			int gain = amount * switch(param.getItemId()) {
-				case WEAPON_ORE_1 -> WEAPON_ORE_EXP_1;
-				case WEAPON_ORE_2 -> WEAPON_ORE_EXP_2;
-				case WEAPON_ORE_3 -> WEAPON_ORE_EXP_3;
-				default -> 0;
-			};
-			expGain += gain;
-			payList.add(new ItemParamData(param.getItemId(), amount));
-		}
-		
-		// Make sure exp gain is valid
-		int moraCost = expGain / 10;
-		expGain += expGainFree;
-		if (expGain <= 0) {
-			return;
-		}
-
-		// Confirm payment of materials and mora (assume food weapons are payable afterwards)
-		payList.add(new ItemParamData(202, moraCost));
-		if (!player.getInventory().payItems(payList.toArray(new ItemParamData[0]))) {
-			return;
-		}
-		player.getInventory().removeItems(foodWeapons);
-		
-		// Level up
-		int maxLevel = promoteData.getUnlockMaxLevel();
-		int level = weapon.getLevel();
-		int oldLevel = level;
-		int exp = weapon.getExp();
-		int totalExp = weapon.getTotalExp();
-		int reqExp = GameData.getWeaponExpRequired(weapon.getItemData().getRankLevel(), level);
-		
-		while (expGain > 0 && reqExp > 0 && level < maxLevel) {
-			// Do calculations
-			int toGain = Math.min(expGain, reqExp - exp);
-			exp += toGain;
-			totalExp += toGain;
-			expGain -= toGain;
-			// Level up
-			if (exp >= reqExp) {
-				// Exp
-				exp = 0;
-				level += 1;
-				// Set req exp
-				reqExp = GameData.getWeaponExpRequired(weapon.getItemData().getRankLevel(), level);
-			}
-		}
-		
-		List<ItemParam> leftovers = getLeftoverOres(expGain);
-		player.getInventory().addItemParams(leftovers);
-		
-		weapon.setLevel(level);
-		weapon.setExp(exp);
-		weapon.setTotalExp(totalExp);
-		weapon.save();
-		
-		// Avatar
-		if (oldLevel != level) {
-			Avatar avatar = weapon.getEquipCharacter() > 0 ? player.getAvatars().getAvatarById(weapon.getEquipCharacter()) : null;
-			if (avatar != null) {
-				avatar.recalcStats();
-			}
-		}
-		
-		// Packets
-		player.sendPacket(new PacketStoreItemChangeNotify(weapon));
-		player.sendPacket(new PacketWeaponUpgradeRsp(weapon, oldLevel, leftovers));
-	}
-	
-	private List<ItemParam> getLeftoverOres(int leftover) {
-		List<ItemParam> leftoverOreList = new ArrayList<>(3);
-		
-		if (leftover < WEAPON_ORE_EXP_1) {
-			return leftoverOreList;
-		}
-		
-		// Get leftovers
-		int ore3 = leftover / WEAPON_ORE_EXP_3;
-		leftover = leftover % WEAPON_ORE_EXP_3;
-		int ore2 = leftover / WEAPON_ORE_EXP_2;
-		leftover = leftover % WEAPON_ORE_EXP_2;
-		int ore1 = leftover / WEAPON_ORE_EXP_1;
-		
-		if (ore3 > 0) {
-			leftoverOreList.add(ItemParam.newBuilder().setItemId(WEAPON_ORE_3).setCount(ore3).build());
-		} if (ore2 > 0) {
-			leftoverOreList.add(ItemParam.newBuilder().setItemId(WEAPON_ORE_2).setCount(ore2).build());
-		} if (ore1 > 0) {
-			leftoverOreList.add(ItemParam.newBuilder().setItemId(WEAPON_ORE_1).setCount(ore1).build());
-		}
-			
-		return leftoverOreList;
-	}
-
-	public void refineWeapon(Player player, long targetGuid, long feedGuid) {
-		GameItem weapon = player.getInventory().getItemByGuid(targetGuid);
-		GameItem feed = player.getInventory().getItemByGuid(feedGuid);
-		
-		// Sanity checks
-		if (weapon == null || feed == null || !feed.isDestroyable()) {
-			return;
-		}
-		
-		if (weapon.getItemData().getAwakenMaterial() == 0) {
-			if (weapon.getItemType() != ItemType.ITEM_WEAPON || weapon.getItemId() != feed.getItemId()) {
-				return;
-			}
-		} else {
-			if (weapon.getItemType() != ItemType.ITEM_WEAPON || weapon.getItemData().getAwakenMaterial() != feed.getItemId()) {
-				return;
-			}
-		}
-		
-		if (weapon.getRefinement() >= 4 || weapon.getAffixes() == null || weapon.getAffixes().size() == 0) {
-			return;
-		}
-		
-		// Calculate
-		int oldRefineLevel = weapon.getRefinement();
-		int targetRefineLevel = Math.min(oldRefineLevel + feed.getRefinement() + 1, 4);
-		int moraCost = 0;
-		
-		try {
-			moraCost = weapon.getItemData().getAwakenCosts()[weapon.getRefinement()];
-		} catch (Exception e) {
-			return;
-		}
-		
-		// Mora check
-		if (player.getMora() >= moraCost) {
-			player.setMora(player.getMora() - moraCost);
-		} else {
-			return;
-		}
-		
-		// Consume weapon
-		player.getInventory().removeItem(feed, 1);
-		
-		// Get 
-		weapon.setRefinement(targetRefineLevel);
-		weapon.save();
-		
-		// Avatar
-		Avatar avatar = weapon.getEquipCharacter() > 0 ? player.getAvatars().getAvatarById(weapon.getEquipCharacter()) : null;
-		if (avatar != null) {
-			avatar.recalcStats();
-		}
-		
-		// Packets
-		player.sendPacket(new PacketStoreItemChangeNotify(weapon));
-		player.sendPacket(new PacketWeaponAwakenRsp(avatar, weapon, feed, oldRefineLevel));
-	}
-
-	public void promoteWeapon(Player player, long targetGuid) {
-		GameItem weapon = player.getInventory().getItemByGuid(targetGuid);
-		
-		if (weapon == null || weapon.getItemType() != ItemType.ITEM_WEAPON) {
-			return;
-		}
-		
-		int nextPromoteLevel = weapon.getPromoteLevel() + 1;
-		WeaponPromoteData currentPromoteData = GameData.getWeaponPromoteData(weapon.getItemData().getWeaponPromoteId(), weapon.getPromoteLevel());
-		WeaponPromoteData nextPromoteData = GameData.getWeaponPromoteData(weapon.getItemData().getWeaponPromoteId(), nextPromoteLevel);
-		if (currentPromoteData == null || nextPromoteData == null) {
-			return;
-		}
-		
-		// Level check
-		if (weapon.getLevel() != currentPromoteData.getUnlockMaxLevel()) {
-			return;
-		}
-		
-		// Pay materials and mora if possible
-		ItemParamData[] costs = nextPromoteData.getCostItems();  // Can this be null?
-		if (nextPromoteData.getCoinCost() > 0) {
-			costs = Arrays.copyOf(costs, costs.length + 1);
-			costs[costs.length-1] = new ItemParamData(202, nextPromoteData.getCoinCost());
-		}
-		if (!player.getInventory().payItems(costs)) {
-			return;
-		}
-		
-		int oldPromoteLevel = weapon.getPromoteLevel();
-		weapon.setPromoteLevel(nextPromoteLevel);
-		weapon.save();
-		
-		// Avatar
-		Avatar avatar = weapon.getEquipCharacter() > 0 ? player.getAvatars().getAvatarById(weapon.getEquipCharacter()) : null;
-		if (avatar != null) {
-			avatar.recalcStats();
-		}
-		
-		// Packets
-		player.sendPacket(new PacketStoreItemChangeNotify(weapon));
-		player.sendPacket(new PacketWeaponPromoteRsp(weapon, oldPromoteLevel));
-	}
-
-	public void promoteAvatar(Player player, long guid) {
-		Avatar avatar = player.getAvatars().getAvatarByGuid(guid);
-		
-		// Sanity checks
-		if (avatar == null) {
-			return;
-		}
-		
-		int nextPromoteLevel = avatar.getPromoteLevel() + 1;
-		AvatarPromoteData currentPromoteData = GameData.getAvatarPromoteData(avatar.getAvatarData().getAvatarPromoteId(), avatar.getPromoteLevel());
-		AvatarPromoteData nextPromoteData = GameData.getAvatarPromoteData(avatar.getAvatarData().getAvatarPromoteId(), nextPromoteLevel);
-		if (currentPromoteData == null || nextPromoteData == null) {
-			return;
-		}
-		
-		// Level check
-		if (avatar.getLevel() != currentPromoteData.getUnlockMaxLevel()) {
-			return;
-		}
-		
-		// Pay materials and mora if possible
-		ItemParamData[] costs = nextPromoteData.getCostItems();  // Can this be null?
-		if (nextPromoteData.getCoinCost() > 0) {
-			costs = Arrays.copyOf(costs, costs.length + 1);
-			costs[costs.length-1] = new ItemParamData(202, nextPromoteData.getCoinCost());
-		}
-		if (!player.getInventory().payItems(costs)) {
-			return;
-		}
-		
-		// Update promote level
-		avatar.setPromoteLevel(nextPromoteLevel);
-		
-		// Update proud skills
-		AvatarSkillDepotData skillDepot = GameData.getAvatarSkillDepotDataMap().get(avatar.getSkillDepotId());
-		
-		if (skillDepot != null && skillDepot.getInherentProudSkillOpens() != null) {
-			for (InherentProudSkillOpens openData : skillDepot.getInherentProudSkillOpens()) {
-				if (openData.getProudSkillGroupId() == 0) {
-					continue;
-				}
-				if (openData.getNeedAvatarPromoteLevel() == avatar.getPromoteLevel()) {
-					int proudSkillId = (openData.getProudSkillGroupId() * 100) + 1;
-					if (GameData.getProudSkillDataMap().containsKey(proudSkillId)) {
-						avatar.getProudSkillList().add(proudSkillId);
-						player.sendPacket(new PacketProudSkillChangeNotify(avatar));
-					}
-				}
-			}
-		}
-		
-		// Packets 
-		player.sendPacket(new PacketAvatarPropNotify(avatar));
-		player.sendPacket(new PacketAvatarPromoteRsp(avatar));
-		
-		// TODO Send entity prop update packet to world
-		avatar.recalcStats(true);
-		avatar.save();
-	}
-
-	public void upgradeAvatar(Player player, long guid, int itemId, int count) {
-		Avatar avatar = player.getAvatars().getAvatarByGuid(guid);
-		
-		// Sanity checks
-		if (avatar == null) {
-			return;
-		}
-		
-		AvatarPromoteData promoteData = GameData.getAvatarPromoteData(avatar.getAvatarData().getAvatarPromoteId(), avatar.getPromoteLevel());
-		if (promoteData == null) {
-			return;
-		}
-		
-		// Calc exp
-		int expGain = switch(itemId) {
-			case AVATAR_BOOK_1 -> AVATAR_BOOK_EXP_1 * count;
-			case AVATAR_BOOK_2 -> AVATAR_BOOK_EXP_2 * count;
-			case AVATAR_BOOK_3 -> AVATAR_BOOK_EXP_3 * count;
-			default -> 0;
-		};
-		
-		// Sanity check
-		if (expGain <= 0) {
-			return;
-		}
-
-		// Payment check
-		int moraCost = expGain / 5;
-		ItemParamData[] costItems = new ItemParamData[] {new ItemParamData(itemId, count), new ItemParamData(202, moraCost)};
-		if (!player.getInventory().payItems(costItems)) {
-			return;
-		}
-		
-		// Level up
-		upgradeAvatar(player, avatar, promoteData, expGain);
-	}
-
-	public void upgradeAvatar(Player player, Avatar avatar, int expGain) {
-		AvatarPromoteData promoteData = GameData.getAvatarPromoteData(avatar.getAvatarData().getAvatarPromoteId(), avatar.getPromoteLevel());
-		if (promoteData == null) {
-			return;
-		}
-		
-		upgradeAvatar(player, avatar, promoteData, expGain);
-	}
-
-	public void upgradeAvatar(Player player, Avatar avatar, AvatarPromoteData promoteData, int expGain) {
-		int maxLevel = promoteData.getUnlockMaxLevel();
-		int level = avatar.getLevel();
-		int oldLevel = level;
-		int exp = avatar.getExp();
-		int reqExp = GameData.getAvatarLevelExpRequired(level);
-
-		while (expGain > 0 && reqExp > 0 && level < maxLevel) {
-			// Do calculations
-			int toGain = Math.min(expGain, reqExp - exp);
-			exp += toGain;
-			expGain -= toGain;
-			// Level up
-			if (exp >= reqExp) {
-				// Exp
-				exp = 0;
-				level += 1;
-				// Set req exp
-				reqExp = GameData.getAvatarLevelExpRequired(level);
-			}
-		}
-
-		// Old map for packet
-		Map<Integer, Float> oldPropMap = avatar.getFightProperties();
-		if (oldLevel != level) {
-			// Deep copy if level has changed
-			oldPropMap = avatar.getFightProperties().int2FloatEntrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-		}
-		
-		// Done
-		avatar.setLevel(level);
-		avatar.setExp(exp);
-		avatar.recalcStats();
-		avatar.save();
-		
-		// TODO Send entity prop update packet to world
-		
-		// Packets
-		player.sendPacket(new PacketAvatarPropNotify(avatar));
-		player.sendPacket(new PacketAvatarUpgradeRsp(avatar, oldLevel, oldPropMap));
-	}
-
-	public void upgradeAvatarFetterLevel(Player player, Avatar avatar, int expGain) {
-		// May work. Not test.
-		int maxLevel = 10; // Keep it until I think of a more "elegant" way
-		int level = avatar.getFetterLevel();
-		int exp = avatar.getFetterExp();
-		int reqExp = GameData.getAvatarFetterLevelExpRequired(level);
-
-		while (expGain > 0 && reqExp > 0 && level < maxLevel) {
-			int toGain = Math.min(expGain, reqExp - exp);
-			exp += toGain;
-			expGain -= toGain;
-			if (exp >= reqExp) {
-				exp = 0;
-				level += 1;
-				reqExp = GameData.getAvatarFetterLevelExpRequired(level);
-			}
-		}
-		
-		avatar.setFetterLevel(level);
-		avatar.setFetterExp(exp);
-		avatar.save();
-		
-		player.sendPacket(new PacketAvatarPropNotify(avatar));
-		player.sendPacket(new PacketAvatarFetterDataNotify(avatar));
-	}
-
-	public void upgradeAvatarSkill(Player player, long guid, int skillId) {
-		// Sanity checks
-		Avatar avatar = player.getAvatars().getAvatarByGuid(guid);
-		if (avatar == null) {
-			return;
-		}
-		
-		// Make sure avatar has skill
-		if (!avatar.getSkillLevelMap().containsKey(skillId)) {
-			return;
-		}
-		
-		AvatarSkillData skillData = GameData.getAvatarSkillDataMap().get(skillId);
-		if (skillData == null) {
-			return;
-		}
-		
-		// Get data for next skill level
-		int currentLevel = avatar.getSkillLevelMap().get(skillId);
-		int nextLevel = currentLevel + 1;
-		int proudSkillId = (skillData.getProudSkillGroupId() * 100) + nextLevel;
-		
-		// Capped at level 10 talent
-		if (nextLevel > 10) {
-			return;
-		}
-		
-		// Proud skill data
-		ProudSkillData proudSkill = GameData.getProudSkillDataMap().get(proudSkillId);
-		if (proudSkill == null) {
-			return;
-		}
-		
-		// Make sure break level is correct
-		if (avatar.getPromoteLevel() < proudSkill.getBreakLevel()) {
-			return;
-		}
-		
-		// Pay materials and mora if possible
-		List<ItemParamData> costs = new ArrayList<ItemParamData>(proudSkill.getCostItems());  // Can this be null?
-		if (proudSkill.getCoinCost() > 0) {
-			costs.add(new ItemParamData(202, proudSkill.getCoinCost()));
-		}
-		if (!player.getInventory().payItems(costs.toArray(new ItemParamData[0]))) {
-			return;
-		}
-		
-		// Upgrade skill
-		avatar.getSkillLevelMap().put(skillId, nextLevel);
-		avatar.save();
-		
-		// Packet
-		player.sendPacket(new PacketAvatarSkillChangeNotify(avatar, skillId, currentLevel, nextLevel));
-		player.sendPacket(new PacketAvatarSkillUpgradeRsp(avatar, skillId, currentLevel, nextLevel));
-	}
-
-	public void unlockAvatarConstellation(Player player, long guid) {
-		// Sanity checks
-		Avatar avatar = player.getAvatars().getAvatarByGuid(guid);
-		if (avatar == null) {
-			return;
-		}
-		
-		// Get talent
-		int currentTalentLevel = avatar.getCoreProudSkillLevel();
-		int nextTalentId = ((avatar.getAvatarId() % 10000000) * 10) + currentTalentLevel + 1;
-		
-		if (avatar.getAvatarId() == 10000006) {
-			// Lisa is special in that her talentId starts with 4 instead of 6.
-			nextTalentId = 40 + currentTalentLevel + 1;
-		}
-		
-		AvatarTalentData talentData = GameData.getAvatarTalentDataMap().get(nextTalentId);
-		
-		if (talentData == null) {
-			return;
-		}
-		
-		// Pay constellation item if possible
-		if (!player.getInventory().payItem(talentData.getMainCostItemId(), 1)) {
-			return;
-		}
-		
-		// Apply + recalc
-		avatar.getTalentIdList().add(talentData.getId());
-		avatar.setCoreProudSkillLevel(currentTalentLevel + 1);
-
-		// Packet
-		player.sendPacket(new PacketAvatarUnlockTalentNotify(avatar, nextTalentId));
-		player.sendPacket(new PacketUnlockAvatarTalentRsp(avatar, nextTalentId));
-		
-		// Proud skill bonus map (Extra skills)
-		OpenConfigEntry entry = GameData.getOpenConfigEntries().get(talentData.getOpenConfig());
-		if (entry != null) {
-			if (entry.getExtraTalentIndex() > 0) {
-				// Check if new constellation adds +3 to a skill level
-				avatar.recalcConstellations();
-				// Packet
-				player.sendPacket(new PacketProudSkillExtraLevelNotify(avatar, entry.getExtraTalentIndex()));
-			} else if (entry.getSkillPointModifiers() != null) {
-				// Check if new constellation adds skill charges
-				avatar.recalcConstellations();
-				// Packet
-				for (SkillPointModifier mod : entry.getSkillPointModifiers()) {
-					player.sendPacket(
-						new PacketAvatarSkillMaxChargeCountNotify(avatar, mod.getSkillId(), avatar.getSkillExtraChargeMap().getOrDefault(mod.getSkillId(), 0))
-					);
-				}
-			}
-		}
-		
-		// Recalc + save avatar
-		avatar.recalcStats(true);
-		avatar.save();
-	}
-
-	public void destroyMaterial(Player player, List<MaterialInfo> list) {
-		// Return materials
-		Int2IntOpenHashMap returnMaterialMap = new Int2IntOpenHashMap();
-		
-		for (MaterialInfo info : list) {
-			// Sanity check
-			if (info.getCount() <= 0) {
-				continue;
-			}
-			
-			GameItem item = player.getInventory().getItemByGuid(info.getGuid());
-			if (item == null || !item.isDestroyable()) {
-				continue;
-			}
-			
-			// Remove
-			int removeAmount = Math.min(info.getCount(), item.getCount());
-			player.getInventory().removeItem(item, removeAmount);
-			
-			// Delete material return items
-			if (item.getItemData().getDestroyReturnMaterial().length > 0) {
-				for (int i = 0; i < item.getItemData().getDestroyReturnMaterial().length; i++) {
-					returnMaterialMap.addTo(item.getItemData().getDestroyReturnMaterial()[i], item.getItemData().getDestroyReturnMaterialCount()[i]);
-				}
-			}
-		}
-		
-		// Give back items
-		if (returnMaterialMap.size() > 0) {
-			for (Int2IntMap.Entry e : returnMaterialMap.int2IntEntrySet()) {
-				player.getInventory().addItem(new GameItem(e.getIntKey(), e.getIntValue()));
-			}
-		}
-		
-		// Packets
-		player.sendPacket(new PacketDestroyMaterialRsp(returnMaterialMap));
-	}
-
-	public GameItem useItem(Player player, long targetGuid, long itemGuid, int count, int optionId) {
-		Avatar target = player.getAvatars().getAvatarByGuid(targetGuid);
-		GameItem useItem = player.getInventory().getItemByGuid(itemGuid);
-		
-		if (useItem == null) {
-			return null;
-		}
-		
-		int used = 0;
-		boolean useSuccess = false;
-		
-		// Use
-		switch (useItem.getItemData().getMaterialType()) {
-			case MATERIAL_FOOD:
-				if (useItem.getItemData().getUseTarget().equals("ITEM_USE_TARGET_SPECIFY_DEAD_AVATAR")) {
-					if (target == null) {
-						break;
-					}
-
-					used = player.getTeamManager().reviveAvatar(target) ? 1 : 0;
-				}
-				break;
-			case MATERIAL_NOTICE_ADD_HP:
-				if (useItem.getItemData().getUseTarget().equals("ITEM_USE_TARGET_SPECIFY_ALIVE_AVATAR")) {
-					if (target == null) {
-						break;
-					}
-
-					int[] SatiationParams = useItem.getItemData().getSatiationParams();
-					used = player.getTeamManager().healAvatar(target, SatiationParams[0], SatiationParams[1]) ? 1 : 0;
-				}
-				break;
-			case MATERIAL_CONSUME:
-				// Make sure we have usage data for this material.
-				if (useItem.getItemData().getItemUse() == null) {
-					break;
-				}
-
-				// Handle forging blueprints.
-				if (useItem.getItemData().getItemUse().get(0).getUseOp().equals("ITEM_USE_UNLOCK_FORGE")) {
-					// Unlock.
-					useSuccess = player.getForgingManager().unlockForgingBlueprint(useItem);
-				}
-				// Handle combine diagrams.
-				if (useItem.getItemData().getItemUse().get(0).getUseOp().equals("ITEM_USE_UNLOCK_COMBINE")) {
-					// Unlock.
-					useSuccess = player.getServer().getCombineManger().unlockCombineDiagram(player, useItem);
-				}
-				// Handle cooking recipies.
-				if (useItem.getItemData().getItemUse().get(0).getUseOp().equals("ITEM_USE_UNLOCK_COOK_RECIPE")) {
-					// Unlock.
-					useSuccess = player.getCookingManager().unlockRecipe(useItem);
-				}
-				break;
-			case MATERIAL_FURNITURE_FORMULA:
-			case MATERIAL_FURNITURE_SUITE_FORMULA:
-				if (useItem.getItemData().getItemUse() == null) {
-					break;
-				}
-				useSuccess = player.getFurnitureManager().unlockFurnitureOrSuite(useItem);
-
-				break;
-			case MATERIAL_CONSUME_BATCH_USE:
-				// Make sure we have usage data for this material.
-				if (useItem.getItemData().getItemUse() == null) {
-					break;
-				}
-
-				// Handle fragile/transient resin.
-				if (useItem.getItemId() == 107009 || useItem.getItemId() == 107012){				
-					// Add resin to the inventory.
-					ItemData resinItemData = GameData.getItemDataMap().get(106);
-					player.getInventory().addItem(new GameItem(resinItemData, 60 * count), ActionReason.PlayerUseItem);
-
-					// Set used amount.
-					used = count;
-				}
-				break;
-			case MATERIAL_CHEST:
-				List<ShopChestTable> shopChestTableList = player.getServer().getShopManager().getShopChestData();
-				List<GameItem> rewardItemList = new ArrayList<>();
-				for (ShopChestTable shopChestTable : shopChestTableList) {
-					if (shopChestTable.getItemId() != useItem.getItemId()) {
-						continue;
-					}
-
-					if (shopChestTable.getContainsItem() == null) {
-						break;
-					}
-
-					for (ItemParamData itemParamData : shopChestTable.getContainsItem()) {
-						ItemData itemData = GameData.getItemDataMap().get(itemParamData.getId());
-						if (itemData == null) {
-							continue;
-						}
-						rewardItemList.add(new GameItem(itemData, itemParamData.getCount()));
-					}
-
-					if (!rewardItemList.isEmpty()) {
-						player.getInventory().addItems(rewardItemList, ActionReason.Shop);
-					}
-
-					used = 1;
-					break;
-				}
-				break;
-			case MATERIAL_CHEST_BATCH_USE:
-				if (optionId < 1) {
-					break;
-				}
-				List<ShopChestBatchUseTable> shopChestBatchUseTableList = player.getServer().getShopManager().getShopChestBatchUseData();
-				for (ShopChestBatchUseTable shopChestBatchUseTable : shopChestBatchUseTableList) {
-					if (shopChestBatchUseTable.getItemId() != useItem.getItemId()) {
-						continue;
-					}
-
-					if (shopChestBatchUseTable.getOptionItem() == null || optionId > shopChestBatchUseTable.getOptionItem().size()) {
-						break;
-					}
-
-					int optionItemId = shopChestBatchUseTable.getOptionItem().get(optionId - 1);
-					ItemData itemData = GameData.getItemDataMap().get(optionItemId);
-					if (itemData == null) {
-						break;
-					}
-
-					player.getInventory().addItem(new GameItem(itemData, count), ActionReason.Shop);
-
-					used = count;
-					break;
-				}
-				break;
-			default:
-				break;
-		}
-
-		// Welkin
-		if (useItem.getItemId() == 1202) {
-			player.rechargeMoonCard();
-			used = 1;
-		}
-
-		// If we used at least one item, or one of the methods called here reports using the item successfully,
-		// we return the item to make UseItemRsp a success.
-		if (used > 0) {
-			player.getInventory().removeItem(useItem, used);
-			return useItem;
-		}
-		if (useSuccess) {
-			return useItem;
-		}
-
-		return null;
-	}
-}