Merge branch 'development' into development

src/main/java/emu/grasscutter/plugin/api/PlayerHook.java

@@ -28,6 +28,7 @@ public final class PlayerHook {
     
     /**
      * Kicks a player from the server.
+     * TODO: Refactor to kick using a packet.
      */
     public void kick() {
         this.player.getSession().close();

src/main/java/emu/grasscutter/plugin/api/README.md

-# Grasscutter Plugin API
-**Warning!** As of now, this is a work in progress and isn't completely documented.
\ No newline at end of file

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

@@ -166,7 +166,7 @@ public class SceneScriptManager {
 			List<SceneBlock> blocks = ScriptLoader.getSerializer().toList(SceneBlock.class, bindings.get("block_rects"));
 			
 			for (int i = 0; i < blocks.size(); i++) {
-				SceneBlock block = blocks.get(0);
+				SceneBlock block = blocks.get(i);
 				block.id = blockIds.get(i);
 				
 				loadBlockFromScript(block);

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

@@ -207,4 +207,19 @@ public class ScriptLib {
 	public void PrintContextLog(String msg) {
 		Grasscutter.getLogger().info("[LUA] " + msg);
 	}
+
+	public int TowerCountTimeStatus(int var1, int var2){
+		return 0;
+	}
+	public int GetGroupMonsterCount(int var1){
+		// Maybe...
+		return GetGroupMonsterCountByGroupId(var1);
+	}
+	public int SetMonsterBattleByGroup(int var1, int var2, int var3){
+		return 0;
+	}
+
+	public int CauseDungeonFail(int var1){
+		return 0;
+	}
 }

src/main/java/emu/grasscutter/server/dispatch/DispatchHttpJsonHandler.java

@@ -2,6 +2,7 @@ package emu.grasscutter.server.dispatch;
 
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.Objects;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.Grasscutter.ServerDebugMode;
@@ -9,6 +10,8 @@ import express.http.HttpContextHandler;
 import express.http.Request;
 import express.http.Response;
 
+import static emu.grasscutter.utils.Language.translate;
+
 public final class DispatchHttpJsonHandler implements HttpContextHandler {
 	private final String response;
 	private final String[] missingRoutes = { // TODO: When http requests for theses routes are found please remove it from this list and update the route request type in the DispatchServer
@@ -31,8 +34,8 @@ public final class DispatchHttpJsonHandler implements HttpContextHandler {
 	@Override
 	public void handle(Request req, Response res) throws IOException {
 		// Checking for ALL here isn't required as when ALL is enabled enableDevLogging() gets enabled
-		if(Grasscutter.getConfig().DebugMode == ServerDebugMode.MISSING && Arrays.stream(missingRoutes).anyMatch(x -> x == req.baseUrl())) {
-			Grasscutter.getLogger().info(Grasscutter.getLanguage().Client_request.replace("{ip}", req.ip()).replace("{method}", req.method()).replace("{url}", req.baseUrl()) + (Grasscutter.getConfig().DebugMode == ServerDebugMode.MISSING ? "(MISSING)" : ""));
+		if(Grasscutter.getConfig().DebugMode == ServerDebugMode.MISSING && Arrays.stream(missingRoutes).anyMatch(x -> Objects.equals(x, req.baseUrl()))) {
+			Grasscutter.getLogger().info(translate("messages.dispatch.request", req.ip(), req.method(), req.baseUrl()) + (Grasscutter.getConfig().DebugMode == ServerDebugMode.MISSING ? "(MISSING)" : ""));
 		}
 		res.send(response);
 	}

src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java

@@ -35,6 +35,8 @@ import java.io.*;
 import java.net.URLDecoder;
 import java.util.*;
 
+import static emu.grasscutter.utils.Language.translate;
+
 public final class DispatchServer {
 	public static String query_region_list = "";
 	public static String query_cur_region = "";
@@ -213,21 +215,21 @@ public final class DispatchServer {
 							sslContextFactory.setKeyStorePassword(Grasscutter.getConfig().getDispatchOptions().KeystorePassword);
 						} catch (Exception e) {
 							e.printStackTrace();
-							Grasscutter.getLogger().warn(Grasscutter.getLanguage().Not_load_keystore);
+							Grasscutter.getLogger().warn(translate("messages.dispatch.keystore.password_error"));
 
 							try {
 								sslContextFactory.setKeyStorePath(keystoreFile.getPath());
 								sslContextFactory.setKeyStorePassword("123456");
-								Grasscutter.getLogger().warn(Grasscutter.getLanguage().Use_default_keystore);
+								Grasscutter.getLogger().warn(translate("messages.dispatch.keystore.default_password"));
 							} catch (Exception e2) {
-								Grasscutter.getLogger().warn(Grasscutter.getLanguage().Load_keystore_error);
+								Grasscutter.getLogger().warn(translate("messages.dispatch.keystore.general_error"));
 								e2.printStackTrace();
 							}
 						}
 
 						serverConnector = new ServerConnector(server, sslContextFactory);
 					} else {
-						Grasscutter.getLogger().warn(Grasscutter.getLanguage().Not_find_ssl_cert);
+						Grasscutter.getLogger().warn(translate("messages.dispatch.keystore.no_keystore_error"));
 						Grasscutter.getConfig().getDispatchOptions().UseSSL = false;
 
 						serverConnector = new ServerConnector(server);
@@ -245,13 +247,16 @@ public final class DispatchServer {
 			if(Grasscutter.getConfig().DebugMode == ServerDebugMode.ALL) {
 				config.enableDevLogging();
 			}
+			if (Grasscutter.getConfig().getDispatchOptions().CORS){
+				if (Grasscutter.getConfig().getDispatchOptions().CORSAllowedOrigins.length > 0) config.enableCorsForOrigin(Grasscutter.getConfig().getDispatchOptions().CORSAllowedOrigins);
+				else config.enableCorsForAllOrigins();
+			}
 		});
-
-		httpServer.get("/", (req, res) -> res.send(Grasscutter.getLanguage().Welcome));
+		httpServer.get("/", (req, res) -> res.send(translate("messages.status.welcome")));
 
 		httpServer.raw().error(404, ctx -> {
 			if(Grasscutter.getConfig().DebugMode == ServerDebugMode.MISSING) {
-				Grasscutter.getLogger().info(Grasscutter.getLanguage().Potential_unhandled_request.replace("{method}", ctx.method()).replace("{url}", ctx.url()));
+				Grasscutter.getLogger().info(translate("messages.dispatch.unhandled_request_error", ctx.method(), ctx.url()));
 			}
 			ctx.contentType("text/html");
 			ctx.result("<!doctype html><html lang=\"en\"><body><img src=\"https://http.cat/404\" /></body></html>"); // I'm like 70% sure this won't break anything.
@@ -309,7 +314,7 @@ public final class DispatchServer {
 			if (requestData == null) {
 				return;
 			}
-			Grasscutter.getLogger().info(Grasscutter.getLanguage().Client_try_login.replace("{ip}", req.ip()));
+			Grasscutter.getLogger().info(translate("messages.dispatch.account.login_attempt", req.ip()));
 
 			res.send(this.getAuthHandler().handleGameLogin(req, requestData));
 		});
@@ -329,7 +334,7 @@ public final class DispatchServer {
 				return;
 			}
 			LoginResultJson responseData = new LoginResultJson();
-			Grasscutter.getLogger().info(Grasscutter.getLanguage().Client_login_token.replace("{ip}", req.ip()));
+			Grasscutter.getLogger().info(translate("messages.dispatch.account.login_token_attempt"));
 
 			// Login
 			Account account = DatabaseHelper.getAccountById(requestData.uid);
@@ -337,16 +342,16 @@ public final class DispatchServer {
 			// Test
 			if (account == null || !account.getSessionKey().equals(requestData.token)) {
 				responseData.retcode = -111;
-				responseData.message = Grasscutter.getLanguage().Game_account_cache_error;
+				responseData.message = translate("messages.dispatch.account.account_cache_error");
 
-				Grasscutter.getLogger().info(Grasscutter.getLanguage().Client_token_login_failed.replace("{ip}", req.ip()));
+				Grasscutter.getLogger().info(translate("messages.dispatch.account.login_token_error", req.ip()));
 			} else {
 				responseData.message = "OK";
 				responseData.data.account.uid = requestData.uid;
 				responseData.data.account.token = requestData.token;
 				responseData.data.account.email = account.getEmail();
 
-				Grasscutter.getLogger().info(Grasscutter.getLanguage().Client_login_in_token.replace("{ip}", req.ip()).replace("{uid}", responseData.data.account.uid));
+				Grasscutter.getLogger().info(translate("messages.dispatch.account.login_token_success", req.ip(), requestData.uid));
 			}
 
 			res.send(responseData);
@@ -376,16 +381,16 @@ public final class DispatchServer {
 			// Test
 			if (account == null || !account.getSessionKey().equals(loginData.token)) {
 				responseData.retcode = -201;
-				responseData.message = Grasscutter.getLanguage().Wrong_session_key;
+				responseData.message = translate("messages.dispatch.account.session_key_error");
 
-				Grasscutter.getLogger().info(Grasscutter.getLanguage().Client_failed_exchange_combo_token.replace("{ip}", req.ip()));
+				Grasscutter.getLogger().info(translate("messages.dispatch.account.combo_token_error", req.ip()));
 			} else {
 				responseData.message = "OK";
 				responseData.data.open_id = loginData.uid;
 				responseData.data.combo_id = "157795300";
 				responseData.data.combo_token = account.generateLoginToken();
 
-				Grasscutter.getLogger().info(Grasscutter.getLanguage().Client_exchange_combo_token.replace("{ip}", req.ip()));
+				Grasscutter.getLogger().info(translate("messages.dispatch.account.combo_token_success", req.ip()));
 			}
 
 			res.send(responseData);
@@ -458,7 +463,7 @@ public final class DispatchServer {
 		httpServer.raw().config.precompressStaticFiles = false; // If this isn't set to false, files such as images may appear corrupted when serving static files
 
 		httpServer.listen(Grasscutter.getConfig().getDispatchOptions().Port);
-		Grasscutter.getLogger().info(Grasscutter.getLanguage().Dispatch_start_server_port.replace("{port}", Integer.toString(httpServer.raw().port())));
+		Grasscutter.getLogger().info(translate("messages.dispatch.port_bind", Integer.toString(httpServer.raw().port())));
 	}
 
 	private Map<String, String> parseQueryString(String qs) {

src/main/java/emu/grasscutter/server/dispatch/authentication/DefaultAuthenticationHandler.java

@@ -8,6 +8,8 @@ import emu.grasscutter.server.dispatch.json.LoginResultJson;
 import express.http.Request;
 import express.http.Response;
 
+import static emu.grasscutter.utils.Language.translate;
+
 public class DefaultAuthenticationHandler implements AuthenticationHandler {
 
     @Override
@@ -34,11 +36,9 @@ public class DefaultAuthenticationHandler implements AuthenticationHandler {
 
         // Check if account exists, else create a new one.
         if (account == null) {
-            // Account doesnt exist, so we can either auto create it if the config value is
-            // set
+            // Account doesn't exist, so we can either auto create it if the config value is set.
             if (Grasscutter.getConfig().getDispatchOptions().AutomaticallyCreateAccounts) {
-                // This account has been created AUTOMATICALLY. There will be no permissions
-                // added.
+                // This account has been created AUTOMATICALLY. There will be no permissions added.
                 account = DatabaseHelper.createAccountWithId(requestData.account, 0);
 
                 for (String permission : Grasscutter.getConfig().getDispatchOptions().defaultPermissions) {
@@ -51,19 +51,18 @@ public class DefaultAuthenticationHandler implements AuthenticationHandler {
                     responseData.data.account.token = account.generateSessionKey();
                     responseData.data.account.email = account.getEmail();
 
-                    Grasscutter.getLogger().info(Grasscutter.getLanguage().Client_failed_login_account_create.replace("{ip}", req.ip()).replace("{uid}", responseData.data.account.uid));
+                    Grasscutter.getLogger().info(translate("messages.dispatch.account.account_login_create_success", req.ip(), responseData.data.account.uid));
                 } else {
                     responseData.retcode = -201;
-                    responseData.message = Grasscutter.getLanguage().Username_not_found_create_failed;
+                    responseData.message = translate("messages.dispatch.account.username_create_error");
 
-                    Grasscutter.getLogger().info(Grasscutter.getLanguage().Client_failed_login_account_no_found.replace("{ip}", req.ip()));
+                    Grasscutter.getLogger().info(translate("messages.dispatch.account.account_login_create_error", req.ip()));
                 }
             } else {
                 responseData.retcode = -201;
-                responseData.message = Grasscutter.getLanguage().Username_not_found;
+                responseData.message = translate("messages.dispatch.account.username_error");
 
-                Grasscutter.getLogger().info(String
-                        .format(Grasscutter.getLanguage().Client_failed_login_account_no_found, req.ip()));
+                Grasscutter.getLogger().info(translate("messages.dispatch.account.account_login_exist_error", req.ip()));
             }
         } else {
             // Account was found, log the player in
@@ -72,7 +71,7 @@ public class DefaultAuthenticationHandler implements AuthenticationHandler {
             responseData.data.account.token = account.generateSessionKey();
             responseData.data.account.email = account.getEmail();
 
-            Grasscutter.getLogger().info(Grasscutter.getLanguage().Client_login.replace("{ip}", req.ip()).replace("{uid}", responseData.data.account.uid));
+            Grasscutter.getLogger().info(translate("messages.dispatch.account.login_success", req.ip(), responseData.data.account.uid));
         }
 
         return responseData;

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

@@ -8,6 +8,7 @@ import emu.grasscutter.game.Account;
 import emu.grasscutter.game.combine.CombineManger;
 import emu.grasscutter.game.drop.DropManager;
 import emu.grasscutter.game.dungeons.DungeonManager;
+import emu.grasscutter.game.expedition.ExpeditionManager;
 import emu.grasscutter.game.gacha.GachaManager;
 import emu.grasscutter.game.managers.ChatManager;
 import emu.grasscutter.game.managers.InventoryManager;
@@ -32,6 +33,8 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
+import static emu.grasscutter.utils.Language.translate;
+
 public final class GameServer extends KcpServer {
 	private final InetSocketAddress address;
 	private final GameServerPacketHandler packetHandler;
@@ -45,12 +48,20 @@ public final class GameServer extends KcpServer {
 	private final ShopManager shopManager;
 	private final MultiplayerManager multiplayerManager;
 	private final DungeonManager dungeonManager;
+	private final ExpeditionManager expeditionManager;
 	private final CommandMap commandMap;
 	private final TaskMap taskMap;
 	private final DropManager dropManager;
 
 	private final CombineManger combineManger;
 
+	public GameServer() {
+		this(new InetSocketAddress(
+				Grasscutter.getConfig().getGameServerOptions().Ip, 
+				Grasscutter.getConfig().getGameServerOptions().Port
+		));
+	}
+	
 	public GameServer(InetSocketAddress address) {
 		super(address);
 
@@ -69,6 +80,7 @@ public final class GameServer extends KcpServer {
 		this.commandMap = new CommandMap(true);
 		this.taskMap = new TaskMap(true);
 		this.dropManager = new DropManager(this);
+		this.expeditionManager = new ExpeditionManager(this);
 		this.combineManger = new CombineManger(this);
 		
 		// Hook into shutdown event.
@@ -114,7 +126,11 @@ public final class GameServer extends KcpServer {
 	public DungeonManager getDungeonManager() {
 		return dungeonManager;
 	}
-	
+
+	public ExpeditionManager getExpeditionManager() {
+		return expeditionManager;
+	}
+
 	public CommandMap getCommandMap() {
 		return this.commandMap;
 	}
@@ -122,6 +138,7 @@ public final class GameServer extends KcpServer {
 	public CombineManger getCombineManger(){
 		return this.combineManger;
 	}
+
 	public TaskMap getTaskMap() {
 		return this.taskMap;
 	}
@@ -212,7 +229,7 @@ public final class GameServer extends KcpServer {
 				try {
 					onTick();
 				} catch (Exception e) {
-					Grasscutter.getLogger().error(Grasscutter.getLanguage().An_error_occurred_during_game_update, e);
+					Grasscutter.getLogger().error(translate("messages.game.game_update_error"), e);
 				}
 			}
 		}, new Date(), 1000L);
@@ -222,8 +239,8 @@ public final class GameServer extends KcpServer {
 
 	@Override
 	public void onStartFinish() {
-		Grasscutter.getLogger().info(Grasscutter.getLanguage().Grasscutter_is_free);
-		Grasscutter.getLogger().info(Grasscutter.getLanguage().Game_start_port.replace("{port}", Integer.toString(address.getPort())));
+		Grasscutter.getLogger().info(translate("messages.status.free_software"));
+		Grasscutter.getLogger().info(translate("messages.game.port_bind", Integer.toString(address.getPort())));
 		ServerStartEvent event = new ServerStartEvent(ServerEvent.Type.GAME, OffsetDateTime.now()); event.call();
 	}
 	

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

@@ -14,6 +14,7 @@ import emu.grasscutter.server.game.GameSession.SessionState;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
+@SuppressWarnings("unchecked")
 public class GameServerPacketHandler {
 	private final Int2ObjectMap<PacketHandler> handlers;
 	

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

@@ -22,6 +22,8 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 
+import static emu.grasscutter.utils.Language.translate;
+
 public class GameSession extends KcpChannel {
 	private GameServer server;
 	
@@ -113,21 +115,21 @@ public class GameSession extends KcpChannel {
 	
 	@Override
 	protected void onConnect() {
-		Grasscutter.getLogger().info(Grasscutter.getLanguage().Client_connect.replace("{address}", getAddress().getHostString().toLowerCase()));
+		Grasscutter.getLogger().info(translate("messages.game.connect", this.getAddress().getHostString().toLowerCase()));
 	}
 
 	@Override
-	protected synchronized void onDisconnect() { // Synchronize so we dont add character at the same time
-		Grasscutter.getLogger().info(Grasscutter.getLanguage().Client_disconnect.replace("{address}", getAddress().getHostString().toLowerCase()));
+	protected synchronized void onDisconnect() { // Synchronize so we don't add character at the same time.
+		Grasscutter.getLogger().info(translate("messages.game.disconnect", this.getAddress().getHostString().toLowerCase()));
 
 		// Set state so no more packets can be handled
 		this.setState(SessionState.INACTIVE);
 		
 		// Save after disconnecting
 		if (this.isLoggedIn()) {
-			// Save
+			// Call logout event.
 			getPlayer().onLogout();
-			// Remove from gameserver
+			// Remove from server.
 			getServer().getPlayers().remove(getPlayer().getUid());
 		}
 	}

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

+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketAvatarExpeditionAllDataRsp;
+
+@Opcodes(PacketOpcodes.AvatarExpeditionAllDataReq)
+public class HandlerAvatarExpeditionAllDataReq extends PacketHandler {
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        session.send(new PacketAvatarExpeditionAllDataRsp(session.getPlayer()));
+    }
+}

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

+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.AvatarExpeditionCallBackReqOuterClass.AvatarExpeditionCallBackReq;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketAvatarExpeditionCallBackRsp;
+import emu.grasscutter.server.packet.send.PacketAvatarExpeditionStartRsp;
+import emu.grasscutter.utils.Utils;
+
+@Opcodes(PacketOpcodes.AvatarExpeditionCallBackReq)
+public class HandlerAvatarExpeditionCallBackReq extends PacketHandler {
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        AvatarExpeditionCallBackReq req = AvatarExpeditionCallBackReq.parseFrom(payload);
+
+        for (int i = 0; i < req.getAvatarGuidCount(); i++) {
+            session.getPlayer().removeExpeditionInfo(req.getAvatarGuid(i));
+        }
+
+        session.getPlayer().save();
+        session.send(new PacketAvatarExpeditionCallBackRsp(session.getPlayer()));
+    }
+}

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

+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.game.drop.DropData;
+import emu.grasscutter.game.expedition.ExpeditionInfo;
+import emu.grasscutter.game.expedition.ExpeditionRewardData;
+import emu.grasscutter.game.expedition.ExpeditionRewardDataList;
+import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.ActionReason;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.AvatarExpeditionGetRewardReqOuterClass.AvatarExpeditionGetRewardReq;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketAvatarExpeditionCallBackRsp;
+import emu.grasscutter.server.packet.send.PacketAvatarExpeditionGetRewardRsp;
+import emu.grasscutter.server.packet.send.PacketGadgetInteractRsp;
+import emu.grasscutter.server.packet.send.PacketItemAddHintNotify;
+import emu.grasscutter.utils.Utils;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
+@Opcodes(PacketOpcodes.AvatarExpeditionGetRewardReq)
+public class HandlerAvatarExpeditionGetRewardReq extends PacketHandler {
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        AvatarExpeditionGetRewardReq req = AvatarExpeditionGetRewardReq.parseFrom(payload);
+
+        ExpeditionInfo expInfo = session.getPlayer().getExpeditionInfo(req.getAvatarGuid());
+
+        List<GameItem> items = new LinkedList<>();
+
+        if (session.getServer().getExpeditionManager().getExpeditionRewardDataList().containsKey(expInfo.getExpId())) {
+            for (ExpeditionRewardDataList RewardDataList : session.getServer().getExpeditionManager().getExpeditionRewardDataList().get(expInfo.getExpId())) {
+                if(RewardDataList.getHourTime() == expInfo.getHourTime()){
+                    if(!RewardDataList.getExpeditionRewardData().isEmpty()){
+                        for (ExpeditionRewardData RewardData :RewardDataList.getExpeditionRewardData()) {
+                            int num = RewardData.getMinCount();
+                            if(RewardData.getMinCount() != RewardData.getMaxCount()){
+                                num = Utils.randomRange(RewardData.getMinCount(), RewardData.getMaxCount());
+                            }
+                            items.add(new GameItem(RewardData.getItemId(), num));
+                        }
+                    }
+                }
+            }
+        }
+
+        session.getPlayer().getInventory().addItems(items);
+        session.getPlayer().sendPacket(new PacketItemAddHintNotify(items, ActionReason.ExpeditionReward));
+
+        session.getPlayer().removeExpeditionInfo(req.getAvatarGuid());
+        session.getPlayer().save();
+        session.send(new PacketAvatarExpeditionGetRewardRsp(session.getPlayer(), items));
+    }
+}
+

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

+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.AvatarExpeditionStartReqOuterClass.AvatarExpeditionStartReq;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketAvatarExpeditionStartRsp;
+import emu.grasscutter.utils.Utils;
+
+@Opcodes(PacketOpcodes.AvatarExpeditionStartReq)
+public class HandlerAvatarExpeditionStartReq extends PacketHandler {
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        AvatarExpeditionStartReq req = AvatarExpeditionStartReq.parseFrom(payload);
+
+        int startTime = Utils.getCurrentSeconds();
+        session.getPlayer().addExpeditionInfo(req.getAvatarGuid(), req.getExpId(), req.getHourTime(), startTime);
+        session.getPlayer().save();
+        session.send(new PacketAvatarExpeditionStartRsp(session.getPlayer()));
+    }
+}

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

+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.game.managers.SotSManager.SotSManager;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.server.game.GameSession;
+
+@Opcodes(PacketOpcodes.ExitTransPointRegionNotify)
+public class HandlerExitTransPointRegionNotify extends PacketHandler {
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception{
+        Player player = session.getPlayer();
+        SotSManager sotsManager = player.getSotSManager();
+        sotsManager.cancelAutoRecover();
+    }
+}

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

+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.game.expedition.ExpeditionInfo;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.AvatarExpeditionAllDataRspOuterClass.AvatarExpeditionAllDataRsp;
+import emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo;
+
+import java.util.*;
+
+public class PacketAvatarExpeditionAllDataRsp extends BasePacket {
+    public PacketAvatarExpeditionAllDataRsp(Player player) {
+        super(PacketOpcodes.AvatarExpeditionAllDataRsp);
+
+        List<Integer> openExpeditionList  = new ArrayList<>(List.of(306,305,304,303,302,301,206,105,204,104,203,103,202,101,102,201,106,205));
+        Map<Long, AvatarExpeditionInfo> avatarExpeditionInfoList = new HashMap<Long, AvatarExpeditionInfo>();
+
+        var expeditionInfo = player.getExpeditionInfo();
+        for (Long key : player.getExpeditionInfo().keySet()) {
+            ExpeditionInfo e = expeditionInfo.get(key);
+            avatarExpeditionInfoList.put(key, AvatarExpeditionInfo.newBuilder().setStateValue(e.getState()).setExpId(e.getExpId()).setHourTime(e.getHourTime()).setStartTime(e.getStartTime()).build());
+        };
+
+        AvatarExpeditionAllDataRsp.Builder proto = AvatarExpeditionAllDataRsp.newBuilder()
+                .addAllOpenExpeditionList(openExpeditionList)
+                .setExpeditionCountLimit(5)
+                .putAllExpeditionInfoMap(avatarExpeditionInfoList);
+
+        this.setData(proto.build());
+    }
+}

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

+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.expedition.ExpeditionInfo;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.AvatarExpeditionCallBackRspOuterClass.AvatarExpeditionCallBackRsp;
+import emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo;
+
+public class PacketAvatarExpeditionCallBackRsp extends BasePacket {
+    public PacketAvatarExpeditionCallBackRsp(Player player) {
+        super(PacketOpcodes.AvatarExpeditionCallBackRsp);
+
+        AvatarExpeditionCallBackRsp.Builder proto = AvatarExpeditionCallBackRsp.newBuilder();
+        var expeditionInfo = player.getExpeditionInfo();
+        for (Long key : player.getExpeditionInfo().keySet()) {
+            ExpeditionInfo e = expeditionInfo.get(key);
+            proto.putExpeditionInfoMap(key, AvatarExpeditionInfo.newBuilder().setStateValue(e.getState()).setExpId(e.getExpId()).setHourTime(e.getHourTime()).setStartTime(e.getStartTime()).build());
+        };
+
+        this.setData(proto.build());
+    }
+}
\ No newline at end of file

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

+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.expedition.ExpeditionInfo;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.AvatarExpeditionDataNotifyOuterClass.AvatarExpeditionDataNotify;
+import emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo;
+
+import java.util.*;
+
+public class PacketAvatarExpeditionDataNotify extends BasePacket {
+    public PacketAvatarExpeditionDataNotify(Player player) {
+        super(PacketOpcodes.AvatarExpeditionDataNotify);
+
+        Map<Long, AvatarExpeditionInfo> avatarExpeditionInfoList = new HashMap<Long, AvatarExpeditionInfo>();
+
+        var expeditionInfo = player.getExpeditionInfo();
+        for (Long key : player.getExpeditionInfo().keySet()) {
+            ExpeditionInfo e = expeditionInfo.get(key);
+            avatarExpeditionInfoList.put(key, AvatarExpeditionInfo.newBuilder().setStateValue(e.getState()).setExpId(e.getExpId()).setHourTime(e.getHourTime()).setStartTime(e.getStartTime()).build());
+        };
+
+        AvatarExpeditionDataNotify.Builder proto = AvatarExpeditionDataNotify.newBuilder()
+                .putAllExpeditionInfoMap(avatarExpeditionInfoList);
+
+        this.setData(proto.build());
+    }
+}

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

+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.expedition.ExpeditionInfo;
+import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.AvatarExpeditionGetRewardRspOuterClass.AvatarExpeditionGetRewardRsp;
+import emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo;
+
+import java.util.Collection;
+
+public class PacketAvatarExpeditionGetRewardRsp extends BasePacket {
+    public PacketAvatarExpeditionGetRewardRsp(Player player, Collection<GameItem> items) {
+        super(PacketOpcodes.AvatarExpeditionGetRewardRsp);
+
+        AvatarExpeditionGetRewardRsp.Builder proto = AvatarExpeditionGetRewardRsp.newBuilder();
+        var expeditionInfo = player.getExpeditionInfo();
+        for (Long key : player.getExpeditionInfo().keySet()) {
+            ExpeditionInfo e = expeditionInfo.get(key);
+            proto.putExpeditionInfoMap(key, AvatarExpeditionInfo.newBuilder().setStateValue(e.getState()).setExpId(e.getExpId()).setHourTime(e.getHourTime()).setStartTime(e.getStartTime()).build());
+        };
+
+        for (GameItem item : items) {
+            proto.addItemList(item.toItemParam());
+        }
+
+        this.setData(proto.build());
+    }
+}

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

+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.expedition.ExpeditionInfo;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo;
+import emu.grasscutter.net.proto.AvatarExpeditionStartRspOuterClass.AvatarExpeditionStartRsp;
+
+public class PacketAvatarExpeditionStartRsp extends BasePacket {
+    public PacketAvatarExpeditionStartRsp(Player player) {
+        super(PacketOpcodes.AvatarExpeditionStartRsp);
+
+        AvatarExpeditionStartRsp.Builder proto = AvatarExpeditionStartRsp.newBuilder();
+        var expeditionInfo = player.getExpeditionInfo();
+        for (Long key : player.getExpeditionInfo().keySet()) {
+            ExpeditionInfo e = expeditionInfo.get(key);
+            proto.putExpeditionInfoMap(key, AvatarExpeditionInfo.newBuilder().setStateValue(e.getState()).setExpId(e.getExpId()).setHourTime(e.getHourTime()).setStartTime(e.getStartTime()).build());
+        };
+
+        this.setData(proto.build());
+    }
+}