Merge branch 'development' into development

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