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,7 +6,7 @@ import emu.grasscutter.utils.Position;
 import emu.grasscutter.utils.Utils;
 
 public final class GameConstants {
-	public static String VERSION = "2.7.0";
+    public static String VERSION = "2.8.0";
 
     public static final int MAX_TEAMS = 4;
     public static final int MAIN_CHARACTER_MALE = 10000005;

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;

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,11 +14,19 @@ 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) {

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

@@ -1,12 +1,21 @@
 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;
 
 /**
@@ -18,7 +27,8 @@ 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();
@@ -79,11 +89,116 @@ public final class DefaultAuthenticators {
         }
     }
 
+    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();
+                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;
+        }
+    }
+
     /**
      * 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();
@@ -138,12 +253,14 @@ 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) {
+        @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();
@@ -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,12 +7,10 @@ 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 "";

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);
@@ -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.

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;
+                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(null, translate(sender, "commands.account.invalid"));
+                            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,25 +13,24 @@ 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)) {
             case "tpl":
                 if (args.size() < 2) {
-                    CommandHandler.sendTranslatedMessage(sender, "commands.announce.command_usage");
+                    sendUsageMessage(sender);
                     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,13 +8,13 @@ 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;
         }
 
@@ -25,7 +25,7 @@ public final class EnterDungeonCommand implements CommandHandler {
                 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 {

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,7 +9,7 @@ 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
@@ -18,9 +18,9 @@ public final class ReloadCommand implements CommandHandler {
 
         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
@@ -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));

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

@@ -10,7 +10,7 @@ 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")
+@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,
@@ -95,7 +95,7 @@ public final class SetPropCommand implements CommandHandler {
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
         if (args.size() != 2) {
-            CommandHandler.sendTranslatedMessage(sender, "commands.setProp.usage");
+            sendUsageMessage(sender);
             return;
         }
         String propStr = args.get(0).toLowerCase();
@@ -103,7 +103,7 @@ public final class SetPropCommand implements CommandHandler {
         int value;
 
         if (!props.containsKey(propStr)) {
-            CommandHandler.sendTranslatedMessage(sender, "commands.setProp.usage");
+            sendUsageMessage(sender);
             return;
         }
         try {
@@ -146,7 +146,7 @@ public final class SetPropCommand implements CommandHandler {
     }
 
     private boolean setTowerLevel(Player sender, Player targetPlayer, int topFloor) {
-        List<Integer> floorIds = targetPlayer.getServer().getTowerScheduleManager().getAllFloors();
+        List<Integer> floorIds = targetPlayer.getServer().getTowerSystem().getAllFloors();
         if (topFloor < 0 || topFloor > floorIds.size()) {
             String min = Integer.toString(0);
             String max = Integer.toString(floorIds.size());

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
@@ -61,7 +60,7 @@ public final class SpawnCommand implements CommandHandler {
                 }
                 break;
             default:
-                CommandHandler.sendMessage(sender, translate(sender, "commands.spawn.usage"));
+                sendUsageMessage(sender);
                 return;
         }
 
@@ -85,7 +84,7 @@ public final class SpawnCommand implements CommandHandler {
 
         double maxRadius = Math.sqrt(amount * 0.2 / Math.PI);
         for (int i = 0; i < amount; i++) {
-            Position pos = GetRandomPositionInCircle(targetPlayer.getPos(), maxRadius).addY(3);
+            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);
             }

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

@@ -6,20 +6,24 @@ 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;
 
-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")
+@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()) {
-            CommandHandler.sendTranslatedMessage(sender, "commands.team.usage");
+            sendUsageMessage(sender);
             return;
         }
 
@@ -38,7 +42,7 @@ public final class TeamCommand implements CommandHandler {
 
             default:
                 CommandHandler.sendTranslatedMessage(sender, "commands.team.invalid_usage");
-                CommandHandler.sendTranslatedMessage(sender, "commands.team.usage");
+                sendUsageMessage(sender);
                 return;
         }
 
@@ -49,7 +53,7 @@ public final class TeamCommand implements CommandHandler {
     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");
+            sendUsageMessage(sender);
             return false;
         }
 
@@ -74,7 +78,8 @@ public final class TeamCommand implements CommandHandler {
 
         for (var avatarId: avatarIds) {
             int id = Integer.parseInt(avatarId);
-            var success = addAvatar(sender, targetPlayer, id, index);
+            if (!addAvatar(sender, targetPlayer, id, index))
+                CommandHandler.sendTranslatedMessage(sender, "commands.team.failed_to_add_avatar", avatarId);
             if (index > 0) ++index;
         }
         return true;
@@ -83,7 +88,7 @@ public final class TeamCommand implements CommandHandler {
     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");
+            sendUsageMessage(sender);
             return false;
         }
 
@@ -131,7 +136,7 @@ public final class TeamCommand implements CommandHandler {
     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");
+            sendUsageMessage(sender);
             return false;
         }
 

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;
@@ -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;

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,27 +5,25 @@ 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<>();
+    private static HashMap<SpawnDataEntry.GridBlockId, ArrayList<SpawnDataEntry>> spawnLists = new HashMap<>();
 
     public static void load() {
         for (ReliquaryMainPropData data : GameData.getReliquaryMainPropDataMap().values()) {
@@ -66,19 +64,19 @@ public class GameDepot {
         return relicAffixDepot.get(depot);
     }
 
-	public static Int2ObjectMap<SpatialIndex<SpawnGroupEntry>> getSpawnLists() {
+    public static HashMap<SpawnDataEntry.GridBlockId, ArrayList<SpawnDataEntry>> getSpawnLists() {
         return spawnLists;
     }
 
-	public static SpatialIndex<SpawnGroupEntry> getSpawnListById(int sceneId) {
-		return getSpawnLists().computeIfAbsent(sceneId, id -> new FlexibleQuadTree<>());
-	}
-
-	public static Map<String, AvatarConfig> getPlayerAbilities() {
-		return 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,9 +28,8 @@ 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 {
@@ -309,22 +308,16 @@ public class ResourceLoader {
 
     private static void loadSpawnData() {
         String[] spawnDataNames = {"Spawns.json", "GadgetSpawns.json"};
-		Int2ObjectMap<SpawnGroupEntry> spawnEntryMap = new Int2ObjectOpenHashMap<>();
+        ArrayList<SpawnGroupEntry> spawnEntryMap = new ArrayList<>();
 
         for (String name : spawnDataNames) {
             // Load spawn entries from file
-			try (InputStream spawnDataEntries = DataLoader.load(name)) {
+            try (InputStreamReader reader = DataLoader.loadReader(name)) {
                 Type type = TypeToken.getParameterized(Collection.class, SpawnGroupEntry.class).getType();
-				List<SpawnGroupEntry> list = Grasscutter.getGsonFactory().fromJson(new InputStreamReader(spawnDataEntries), type);
+                List<SpawnGroupEntry> list = Grasscutter.getGsonFactory().fromJson(reader, 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);
-					}
-				}
+                spawnEntryMap.addAll(list);
             } catch (Exception ignored) {}
         }
 
@@ -333,10 +326,21 @@ public class ResourceLoader {
             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());
+        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() {

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

@@ -2,6 +2,7 @@ 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;
@@ -10,6 +11,7 @@ public class ItemParamData {
     private int count;
 
     public ItemParamData() {}
+
     public ItemParamData(int id, int count) {
         this.id = id;
         this.count = 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;
 	}
@@ -70,14 +61,6 @@ public class AvatarSkillData extends GameResource {
 		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

@@ -4,37 +4,32 @@ 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<GatherItem> gatherItemId;
+    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 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;
-        }
+
+    public ItemParamData getGatherItem() {
+        return gatherItemId.size() > 0 ? gatherItemId.get(0) : null;
     }
 }

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;
+    private int[] destroyReturnMaterial;
+    private int[] destroyReturnMaterialCount;
     
-    @Getter private List<ItemUseData> itemUse;
-    
-    // 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;
+        return this.weaponProp;
     }
     
     public boolean canAddRelicProp(int level) {
@@ -121,29 +95,23 @@ 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) {
@@ -154,15 +122,10 @@ public class ItemData extends GameResource {
         }
     }
     
+    @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,13 +5,15 @@ 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 Int2FloatMap propMap;
 
     private int rank;
     private int level;
@@ -40,15 +42,15 @@ public class ReliquaryLevelData extends GameResource {
     }
 
     public float getPropValue(int id) {
-		return propMap.get(id);
+        return propMap.getOrDefault(id, 0f);
     }
 
     @Override
     public void onLoad() {
         this.id = (rank << 8) + this.getLevel();
-		this.propMap = new Int2ObjectOpenHashMap<>();
+        this.propMap = new Int2FloatOpenHashMap();
         for (RelicLevelProperty p : addProps) {
-			this.propMap.put(FightProperty.getPropByName(p.getPropType()).getId(), (Float) p.getValue());
+            this.propMap.put(FightProperty.getPropByName(p.getPropType()).getId(), p.getValue());
         }
     }
 

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,8 +28,6 @@ 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;

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

@@ -5,13 +5,13 @@ 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;
@@ -187,6 +187,7 @@ public class Account {
     }
 
     public boolean hasPermission(String permission) {
+        if (permission.isEmpty()) return true;
         if (this.permissions.contains("*") && this.permissions.size() == 1) return true;
 
         // Add default permissions if it doesn't exist

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,23 +17,15 @@ 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;
+        super(player);
         this.healAbilityManager = new HealAbilityManager(player);
     }
 
-	public Player getPlayer() {
-		return this.player;
-	}
-
     public void onAbilityInvoke(AbilityInvokeEntry invoke) throws Exception {
         healAbilityManager.healHandler(invoke);
 

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,9 +45,9 @@ 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());
 
 
@@ -79,7 +80,7 @@ public class ActivityManager {
     }
 
     public ActivityManager(Player player) {
-        this.player = player;
+        super(player);
 
         playerActivityDataMap = new ConcurrentHashMap<>();
         // load data for player

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

@@ -29,13 +29,12 @@ 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())

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

@@ -71,8 +71,7 @@ public class MusicGamePlayerData {
                 .setMaxScore(musicGameBeatmap.getMaxScore())
                 .setPosition(musicGameBeatmap.getSavePosition())
                 .setMusicNoteCount(musicGameBeatmap.getMusicNoteCount())
-                .setMusicShareId(musicShareId)
-                ;
+                .setMusicShareId(musicShareId);
         }
 
         public MusicBriefInfoOuterClass.MusicBriefInfo.Builder toOthersBriefProto() {

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

@@ -1,5 +1,7 @@
 package emu.grasscutter.game.avatar;
 
+import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -62,8 +64,6 @@ import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
-import static emu.grasscutter.Configuration.GAME_OPTIONS;
-
 @Entity(value = "avatars", useDiscriminator = false)
 public class Avatar {
     @Id private ObjectId id;
@@ -496,7 +496,7 @@ public class Avatar {
         item.setEquipCharacter(this.getAvatarId());
         item.save();
 
-		if (this.getPlayer().hasSentAvatarDataNotify()) {
+        if (this.getPlayer().hasSentLoginPackets()) {
             this.getPlayer().sendPacket(new PacketAvatarEquipChangeNotify(this, item));
         }
 
@@ -632,7 +632,7 @@ public class Avatar {
             WeaponCurveData curveData = GameData.getWeaponCurveDataMap().get(weapon.getLevel());
             if (curveData != null) {
                 for (WeaponProperty weaponProperty : weapon.getItemData().getWeaponProperties()) {
-					this.addFightProperty(weaponProperty.getFightProp(), weaponProperty.getInitValue() * curveData.getMultByProp(weaponProperty.getType()));
+                    this.addFightProperty(weaponProperty.getPropType(), weaponProperty.getInitValue() * curveData.getMultByProp(weaponProperty.getType()));
                 }
             }
             // Weapon promotion stats
@@ -732,7 +732,7 @@ public class Avatar {
         this.setFightProperty(FightProperty.FIGHT_PROP_CUR_HP, this.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP) * hpPercent);
 
         // Packet
-		if (getPlayer() != null && getPlayer().hasSentAvatarDataNotify()) {
+        if (getPlayer() != null && getPlayer().hasSentLoginPackets()) {
             // Update stats for client
             getPlayer().sendPacket(new PacketAvatarFightPropNotify(this));
             // Update client abilities

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,21 +18,16 @@ 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;
+public class AvatarStorage extends BasePlayerManager implements Iterable<Avatar> {
     private final Int2ObjectMap<Avatar> avatars;
     private final Long2ObjectMap<Avatar> avatarsGuid;
 
     public AvatarStorage(Player player) {
-		this.player = player;
+        super(player);
         this.avatars = new Int2ObjectOpenHashMap<>();
         this.avatarsGuid = new Long2ObjectOpenHashMap<>();
     }
 
-	public Player getPlayer() {
-		return player;
-	}
-
     public Int2ObjectMap<Avatar> getAvatars() {
         return avatars;
     }

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,9 +42,8 @@ import emu.grasscutter.server.packet.send.PacketTakeBattlePassRewardRsp;
 import lombok.Getter;
 
 @Entity(value = "battlepass", useDiscriminator = false)
-public class BattlePassManager {
+public class BattlePassManager extends BasePlayerDataManager {
     @Id @Getter private ObjectId id;
-	@Transient @Getter private Player player;
 
     @Indexed private int ownerUid;
     @Getter private int point;
@@ -60,7 +60,8 @@ public class BattlePassManager {
     public BattlePassManager() {}
 
     public BattlePassManager(Player player) {
-        this.setPlayer(player);
+        super(player);
+        this.ownerUid = player.getUid();
     }
 
     public void setPlayer(Player player) {
@@ -141,11 +142,11 @@ public class BattlePassManager {
 
     // Mission triggers
     public void triggerMission(WatcherTriggerType triggerType) {
-		getPlayer().getServer().getBattlePassMissionManager().triggerMission(getPlayer(), triggerType);
+        getPlayer().getServer().getBattlePassSystem().triggerMission(getPlayer(), triggerType);
     }
 
     public void triggerMission(WatcherTriggerType triggerType, int param, int progress) {
-		getPlayer().getServer().getBattlePassMissionManager().triggerMission(getPlayer(), triggerType, param, progress);
+        getPlayer().getServer().getBattlePassSystem().triggerMission(getPlayer(), triggerType, param, progress);
     }
 
     // Handlers
@@ -196,7 +197,7 @@ public class BattlePassManager {
         }
 
         // Get possible item choices.
-		String[] choices = rewardItemData.getItemUse().get(0).getUseParam().get(0).split(",");
+        String[] choices = rewardItemData.getItemUse().get(0).getUseParam()[0].split(",");
         if (choices.length < index) {
             return;
         }
@@ -206,7 +207,7 @@ public class BattlePassManager {
         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().equals("ITEM_USE_ADD_SELECT_ITEM")) {
+        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);
         }

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,21 +31,16 @@ import java.util.List;
 
 import com.google.gson.reflect.TypeToken;
 
-public class CombineManger {
-    private final GameServer gameServer;
+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"))) {
+        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) {
@@ -59,12 +56,12 @@ public class CombineManger {
 
     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")) {
+        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));
+        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

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,27 +24,21 @@ 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) {

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

@@ -46,7 +46,7 @@ public class DungeonChallenge extends WorldChallenge {
 
     public static void initialize() {
         // Read the data we need for dungeon rewards drops.
-		try (Reader fileReader = new InputStreamReader(DataLoader.load("DungeonDrop.json"))) {
+        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) {

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;
@@ -70,7 +69,7 @@ public class EntityAvatar extends GameEntity {
 
     @Override
     public Position getPosition() {
-		return getPlayer().getPos();
+        return getPlayer().getPosition();
 	}
 
 	@Override
@@ -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)
 			);
 		}
 

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;
@@ -151,6 +154,19 @@ public class EntityGadget extends EntityBaseGadget {
         return this.fightProp;
     }
 
+    @Override
+    public void onInteract(Player player, GadgetInteractReq interactReq) {
+        if (this.getContent() == null) {
+            return;
+        }
+
+        boolean shouldDelete = this.getContent().onInteract(player, interactReq);
+
+        if (shouldDelete) {
+            this.getScene().killEntity(this);
+        }
+    }
+
     @Override
     public void onCreate() {
         // Lua event
@@ -213,8 +229,4 @@ public class EntityGadget extends EntityBaseGadget {
 
         return entityInfo.build();
     }
-	public void die() {
-		getScene().broadcastPacket(new PacketLifeStateChangeNotify(this, LifeState.LIFE_DEAD));
-		this.onDeath(0);
-	}
 }

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,6 +22,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.server.packet.send.PacketGadgetInteractRsp;
 import emu.grasscutter.utils.Position;
 import emu.grasscutter.utils.ProtoHelper;
 import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
@@ -100,6 +104,30 @@ public class EntityItem extends EntityBaseGadget {
         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()

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;
@@ -112,6 +120,19 @@ public class EntityMonster extends GameEntity {
         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

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;

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;
@@ -239,6 +241,15 @@ 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
      */

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,6 +12,7 @@ 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 {
 
@@ -19,7 +21,7 @@ public class GadgetChest extends GadgetContent {
     }
 
     public boolean onInteract(Player player, GadgetInteractReq req) {
-		var chestInteractHandlerMap = getGadget().getScene().getWorld().getServer().getWorldDataManager().getChestInteractHandlerMap();
+        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());
@@ -37,8 +39,7 @@ public class GadgetChest extends GadgetContent {
 
             getGadget().updateState(ScriptGadgetState.ChestOpened);
             player.sendPacket(new PacketGadgetInteractRsp(this.getGadget(), InteractTypeOuterClass.InteractType.INTERACT_TYPE_OPEN_CHEST));
-			// let the chest disappear
-			getGadget().die();
+
             return true;
         }
     }

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

@@ -19,7 +19,7 @@ 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);
 

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

@@ -3,37 +3,34 @@ 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) {

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,24 +14,18 @@ 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;
-	
+public class FriendsList extends BasePlayerManager {
     private final Int2ObjectMap<Friendship> friends;
     private final Int2ObjectMap<Friendship> pendingFriends;
 
     private boolean loaded = false;
 
     public FriendsList(Player player) {
-		this.player = player;
+        super(player);
         this.friends = new Int2ObjectOpenHashMap<Friendship>();
         this.pendingFriends = new Int2ObjectOpenHashMap<Friendship>();
     }
 
-	public Player getPlayer() {
-		return player;
-	}
-	
     public boolean hasLoaded() {
         return loaded;
     }

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,8 +9,6 @@ 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;

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,16 +32,13 @@ 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 implements Iterable<GameItem> {
-	private final Player player;
-	
+public class Inventory extends BasePlayerManager implements Iterable<GameItem> {
     private final Long2ObjectMap<GameItem> store;
     private final Int2ObjectMap<InventoryTab> inventoryTypes;
 
     public Inventory(Player player) {
-		this.player = player;
+        super(player);
+
         this.store = new Long2ObjectOpenHashMap<>();
         this.inventoryTypes = new Int2ObjectOpenHashMap<>();
 
@@ -48,10 +48,6 @@ public class Inventory implements Iterable<GameItem> {
         this.createInventoryTab(ItemType.ITEM_FURNITURE, new MaterialInventoryTab(INVENTORY_LIMITS.furniture));
     }
 
-	public Player getPlayer() {
-		return player;
-	}
-	
     public AvatarStorage getAvatarStorage() {
         return this.getPlayer().getAvatars();
     }
@@ -81,6 +77,10 @@ public class Inventory implements Iterable<GameItem> {
     }
 
     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) {
@@ -89,7 +89,7 @@ public class Inventory implements Iterable<GameItem> {
 
         GameItem item = new GameItem(itemData, count);
 
-		return addItem(item);
+        return addItem(item, reason);
     }
 
     public boolean addItem(GameItem item) {
@@ -124,6 +124,15 @@ public class Inventory implements Iterable<GameItem> {
         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);
     }
@@ -264,11 +273,11 @@ public class Inventory implements Iterable<GameItem> {
     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);
+                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

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

@@ -36,7 +36,17 @@ public enum MaterialType {
     MATERIAL_FURNITURE_FORMULA (27),
     MATERIAL_CHANNELLER_SLAB_BUFF (28),
     MATERIAL_FURNITURE_SUITE_FORMULA (29),
-	MATERIAL_COSTUME					(30);
+    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,28 +1,24 @@
 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;
+public class MailHandler extends BasePlayerManager {
     private final List<Mail> mail;
 
     public MailHandler(Player player) {
-		this.player = player;
-		this.mail = new ArrayList<>();
-	}
+        super(player);
 
-	public Player getPlayer() {
-		return player;
+        this.mail = new ArrayList<>();
     }
 
     public List<Mail> getMail() {

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.

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,11 +15,10 @@ 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() {
@@ -34,18 +35,19 @@ public class FurnitureManager {
     }
 
     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 {

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;
-	}
-}

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

@@ -1,159 +0,0 @@
-package emu.grasscutter.game.managers;
-
-import emu.grasscutter.game.CoopRequest;
-import emu.grasscutter.game.props.EnterReason;
-import emu.grasscutter.game.world.World;
-import emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType;
-import emu.grasscutter.net.proto.PlayerApplyEnterMpReasonOuterClass.PlayerApplyEnterMpReason;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.player.Player.SceneLoadState;
-import emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass;
-import emu.grasscutter.server.game.GameServer;
-import emu.grasscutter.server.packet.send.PacketPlayerApplyEnterMpNotify;
-import emu.grasscutter.server.packet.send.PacketPlayerApplyEnterMpResultNotify;
-import emu.grasscutter.server.packet.send.PacketPlayerEnterSceneNotify;
-
-public class MultiplayerManager {
-	private final GameServer server;
-	
-	public MultiplayerManager(GameServer server) {
-		this.server = server;
-	}
-
-	public GameServer getServer() {
-		return server;
-	}
-
-	public void applyEnterMp(Player player, int targetUid) {
-		Player target = getServer().getPlayerByUid(targetUid);
-		if (target == null) {
-			player.sendPacket(new PacketPlayerApplyEnterMpResultNotify(targetUid, "", false, PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason.REASON_PLAYER_CANNOT_ENTER_MP));
-			return;
-		}
-		
-		// Sanity checks - Dont let player join if already in multiplayer
-		if (player.getWorld().isMultiplayer()) {
-			return;
-		}
-		
-		/*
-		if (target.getWorld().isDungeon()) {
-			player.sendPacket(new PacketPlayerApplyEnterMpResultNotify(targetUid, "", false, PlayerApplyEnterMpReason.SceneCannotEnter));
-			return;
-		}
-		*/
-		
-		// Get request
-		CoopRequest request = target.getCoopRequests().get(player.getUid());
-		
-		if (request != null && !request.isExpired()) {
-			// Join request already exists
-			return;
-		}
-		
-		// Put request in
-		request = new CoopRequest(player);
-		target.getCoopRequests().put(player.getUid(), request);
-		
-		// Packet
-		target.sendPacket(new PacketPlayerApplyEnterMpNotify(player));
-	}
-
-	public void applyEnterMpReply(Player hostPlayer, int applyUid, boolean isAgreed) {
-		// Checks
-		CoopRequest request = hostPlayer.getCoopRequests().get(applyUid);
-		if (request == null || request.isExpired()) {
-			return;
-		}
-		
-		// Remove now that we are handling it
-		Player requester = request.getRequester();
-		hostPlayer.getCoopRequests().remove(applyUid);
-		
-		// Sanity checks - Dont let the requesting player join if they are already in multiplayer
-		if (requester.getWorld().isMultiplayer()) {
-			request.getRequester().sendPacket(new PacketPlayerApplyEnterMpResultNotify(hostPlayer, false, PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason.REASON_PLAYER_CANNOT_ENTER_MP));
-			return;
-		}
-		
-		// Response packet
-		request.getRequester().sendPacket(new PacketPlayerApplyEnterMpResultNotify(hostPlayer, isAgreed, PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason.REASON_PLAYER_JUDGE));
-		
-		// Declined
-		if (!isAgreed) {
-			return;
-		}
-
-		// Success
-		if (!hostPlayer.getWorld().isMultiplayer()) {
-			// Player not in multiplayer, create multiplayer world
-			World world = new World(hostPlayer, true);
-
-			// Add
-			world.addPlayer(hostPlayer);
-			
-			// Rejoin packet
-			hostPlayer.sendPacket(new PacketPlayerEnterSceneNotify(hostPlayer, hostPlayer, EnterType.ENTER_TYPE_SELF, EnterReason.HostFromSingleToMp, hostPlayer.getScene().getId(), hostPlayer.getPos()));
-		}
-		
-		// Set scene pos and id of requester to the host player's
-		requester.getPos().set(hostPlayer.getPos());
-		requester.getRotation().set(hostPlayer.getRotation());
-		requester.setSceneId(hostPlayer.getSceneId());
-		
-		// Make requester join
-		hostPlayer.getWorld().addPlayer(requester);
-
-		// Packet
-		requester.sendPacket(new PacketPlayerEnterSceneNotify(requester, hostPlayer, EnterType.ENTER_TYPE_OTHER, EnterReason.TeamJoin, hostPlayer.getScene().getId(), hostPlayer.getPos()));
-	}
-	
-	public boolean leaveCoop(Player player) {
-		// Make sure player's world is multiplayer
-		if (!player.getWorld().isMultiplayer()) {
-			return false;
-		}
-		
-		// Make sure everyone's scene is loaded
-		for (Player p : player.getWorld().getPlayers()) {
-			if (p.getSceneLoadState() != SceneLoadState.LOADED) {
-				return false;
-			}
-		}
-		
-		// Create new world for player
-		World world = new World(player);
-		world.addPlayer(player);
-	
-		// Packet
-		player.sendPacket(new PacketPlayerEnterSceneNotify(player, EnterType.ENTER_TYPE_SELF, EnterReason.TeamBack, player.getScene().getId(), player.getPos()));
-		
-		return true;
-	}
-
-	public boolean kickPlayer(Player player, int targetUid) {
-		// Make sure player's world is multiplayer and that player is owner
-		if (!player.getWorld().isMultiplayer() || player.getWorld().getHost() != player) {
-			return false;
-		}
-		
-		// Get victim and sanity checks
-		Player victim = player.getServer().getPlayerByUid(targetUid);
-		
-		if (victim == null || victim == player) {
-			return false;
-		}
-		
-		// Make sure victim's scene has loaded
-		if (victim.getSceneLoadState() != SceneLoadState.LOADED) {
-			return false;
-		}
-		
-		// Kick
-		World world = new World(victim);
-		world.addPlayer(victim);
-		
-		victim.sendPacket(new PacketPlayerEnterSceneNotify(victim, EnterType.ENTER_TYPE_SELF, EnterReason.TeamKick, victim.getScene().getId(), victim.getPos()));
-		return true;
-	}
-}