Restructured the config file in preperation for server run modes

src/main/java/emu/grasscutter/Config.java

 package emu.grasscutter;
 
 public final class Config {
-	public String DispatchServerIp = "127.0.0.1";
-	public String DispatchServerPublicIp = "";
-	public int DispatchServerPort = 443;
-	public String DispatchServerKeystorePath = "./keystore.p12";
-	public String DispatchServerKeystorePassword = "";
-	public Boolean UseSSL = true;
-	
-	public String GameServerName = "Test";
-	public String GameServerIp = "127.0.0.1";
-	public String GameServerPublicIp = "";
-	public int GameServerPort = 22102;
-	
-	public int UploadLogPort = 80;
-	
+
 	public String DatabaseUrl = "mongodb://localhost:27017";
 	public String DatabaseCollection = "grasscutter";
 	
@@ -23,26 +10,36 @@ public final class Config {
 	public String PACKETS_FOLDER = "./packets/";
 	public String DUMPS_FOLDER = "./dumps/";
 	public String KEY_FOLDER = "./keys/";
-	public boolean LOG_PACKETS = false;
 
-	public GameRates Game = new GameRates();
-	public ServerOptions ServerOptions = new ServerOptions();
-	
-	public GameRates getGameRates() {
-		return Game;
-	}
-	
-	public ServerOptions getServerOptions() {
-		return ServerOptions;
+	public GameServerOptions GameServer = new GameServerOptions();
+	public DispatchServerOptions DispatchServer = new DispatchServerOptions();
+
+	public GameServerOptions getGameServerOptions() {
+		return GameServer;
 	}
-	
-	public static class GameRates {
-		public float ADVENTURE_EXP_RATE = 1.0f;
-		public float MORA_RATE = 1.0f;
-		public float DOMAIN_DROP_RATE = 1.0f;
+
+	public DispatchServerOptions getDispatchOptions() { return DispatchServer; }
+
+	public static class DispatchServerOptions {
+		public String Ip = "127.0.0.1";
+		public String PublicIp = "";
+		public int Port = 443;
+		public int UploadLogPort = 80;
+		public String KeystorePath = "./keystore.p12";
+		public String KeystorePassword = "";
+		public Boolean UseSSL = true;
+
+		public boolean AutomaticallyCreateAccounts = false;
 	}
 	
-	public static class ServerOptions {
+	public static class GameServerOptions {
+		public String Name = "Test";
+		public String Ip = "127.0.0.1";
+		public String PublicIp = "";
+		public int Port = 22102;
+
+		public boolean LOG_PACKETS = false;
+
 		public int InventoryLimitWeapon = 2000;
 		public int InventoryLimitRelic = 2000;
 		public int InventoryLimitMaterial = 2000;
@@ -54,6 +51,15 @@ public final class Config {
 		public boolean WatchGacha = false;
 		public int[] WelcomeEmotes = {2007, 1002, 4010};
 		public String WelcomeMotd = "Welcome to Grasscutter emu";
-		public boolean AutomaticallyCreateAccounts = false;
+
+		public GameRates Game = new GameRates();
+
+		public GameRates getGameRates() { return Game; }
+
+		public static class GameRates {
+			public float ADVENTURE_EXP_RATE = 1.0f;
+			public float MORA_RATE = 1.0f;
+			public float DOMAIN_DROP_RATE = 1.0f;
+		}
 	}
 }

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

@@ -76,7 +76,7 @@ public final class Grasscutter {
 		dispatchServer = new DispatchServer();
 		dispatchServer.start();
 		
-		gameServer = new GameServer(new InetSocketAddress(getConfig().GameServerIp, getConfig().GameServerPort));
+		gameServer = new GameServer(new InetSocketAddress(getConfig().getGameServerOptions().Ip, getConfig().getGameServerOptions().Port));
 		gameServer.start();
 		
 		// Open console.

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

@@ -288,7 +288,7 @@ public class GenshinPlayer {
 	}
 	
 	private float getExpModifier() {
-		return Grasscutter.getConfig().getGameRates().ADVENTURE_EXP_RATE;
+		return Grasscutter.getConfig().getGameServerOptions().getGameRates().ADVENTURE_EXP_RATE;
 	}
 	
 	// Affected by exp rate

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

@@ -13,7 +13,7 @@ public class TeamInfo {
 	
 	public TeamInfo() {
 		this.name = "";
-		this.avatars = new ArrayList<>(Grasscutter.getConfig().getServerOptions().MaxAvatarsInTeam);
+		this.avatars = new ArrayList<>(Grasscutter.getConfig().getGameServerOptions().MaxAvatarsInTeam);
 	}
 
 	public String getName() {
@@ -37,7 +37,7 @@ public class TeamInfo {
 	}
 
 	public boolean addAvatar(GenshinAvatar avatar) {
-		if (size() >= Grasscutter.getConfig().getServerOptions().MaxAvatarsInTeam || contains(avatar)) {
+		if (size() >= Grasscutter.getConfig().getGameServerOptions().MaxAvatarsInTeam || contains(avatar)) {
 			return false;
 		}
 		
@@ -57,7 +57,7 @@ public class TeamInfo {
 	}
 	
 	public void copyFrom(TeamInfo team) {
-		copyFrom(team, Grasscutter.getConfig().getServerOptions().MaxAvatarsInTeam);
+		copyFrom(team, Grasscutter.getConfig().getGameServerOptions().MaxAvatarsInTeam);
 	}
 	
 	public void copyFrom(TeamInfo team, int maxTeamSize) {

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

@@ -164,13 +164,13 @@ public class TeamManager {
 	
 	public int getMaxTeamSize() {
 		if (getPlayer().isInMultiplayer()) {
-			int max = Grasscutter.getConfig().getServerOptions().MaxAvatarsInTeamMultiplayer;
+			int max = Grasscutter.getConfig().getGameServerOptions().MaxAvatarsInTeamMultiplayer;
 			if (getPlayer().getWorld().getHost() == this.getPlayer()) {
 				return Math.max(1, (int) Math.ceil(max / (double) getWorld().getPlayerCount()));
 			}
 			return Math.max(1, (int) Math.floor(max / (double) getWorld().getPlayerCount()));
 		}
-		return Grasscutter.getConfig().getServerOptions().MaxAvatarsInTeam;
+		return Grasscutter.getConfig().getGameServerOptions().MaxAvatarsInTeam;
 	}
 	
 	// Methods

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

@@ -92,7 +92,7 @@ public class GachaBanner {
 	}
 
 	public GachaInfo toProto() {
-		String record = "http://" + (Grasscutter.getConfig().DispatchServerPublicIp.isEmpty() ? Grasscutter.getConfig().DispatchServerIp : Grasscutter.getConfig().DispatchServerPublicIp) + "/gacha";
+		String record = "http://" + (Grasscutter.getConfig().getDispatchOptions().PublicIp.isEmpty() ? Grasscutter.getConfig().getDispatchOptions().Ip : Grasscutter.getConfig().getDispatchOptions().PublicIp) + "/gacha";
 		
 		GachaInfo.Builder info = GachaInfo.newBuilder()
 				.setGachaType(this.getGachaType())

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

@@ -299,7 +299,7 @@ public class GachaManager {
 
 	@Subscribe
 	public synchronized void watchBannerJson(GameServerTickEvent tickEvent) {
-		if(Grasscutter.getConfig().getServerOptions().WatchGacha) {
+		if(Grasscutter.getConfig().getGameServerOptions().WatchGacha) {
 			try {
 				WatchKey watchKey = watchService.take();
 

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

@@ -37,10 +37,10 @@ public class Inventory implements Iterable<GenshinItem> {
 		this.store = new Long2ObjectOpenHashMap<>();
 		this.inventoryTypes = new Int2ObjectOpenHashMap<>();
 		
-		this.createInventoryTab(ItemType.ITEM_WEAPON, new EquipInventoryTab(Grasscutter.getConfig().getServerOptions().InventoryLimitWeapon));
-		this.createInventoryTab(ItemType.ITEM_RELIQUARY, new EquipInventoryTab(Grasscutter.getConfig().getServerOptions().InventoryLimitRelic));
-		this.createInventoryTab(ItemType.ITEM_MATERIAL, new MaterialInventoryTab(Grasscutter.getConfig().getServerOptions().InventoryLimitMaterial));
-		this.createInventoryTab(ItemType.ITEM_FURNITURE, new MaterialInventoryTab(Grasscutter.getConfig().getServerOptions().InventoryLimitFurniture));
+		this.createInventoryTab(ItemType.ITEM_WEAPON, new EquipInventoryTab(Grasscutter.getConfig().getGameServerOptions().InventoryLimitWeapon));
+		this.createInventoryTab(ItemType.ITEM_RELIQUARY, new EquipInventoryTab(Grasscutter.getConfig().getGameServerOptions().InventoryLimitRelic));
+		this.createInventoryTab(ItemType.ITEM_MATERIAL, new MaterialInventoryTab(Grasscutter.getConfig().getGameServerOptions().InventoryLimitMaterial));
+		this.createInventoryTab(ItemType.ITEM_FURNITURE, new MaterialInventoryTab(Grasscutter.getConfig().getGameServerOptions().InventoryLimitFurniture));
 	}
 
 	public GenshinPlayer getPlayer() {

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

@@ -55,7 +55,7 @@ public final class DispatchServer {
 	public static String query_cur_region = "";
 	
 	public DispatchServer() {
-		this.address = new InetSocketAddress(Grasscutter.getConfig().DispatchServerIp, Grasscutter.getConfig().DispatchServerPort);
+		this.address = new InetSocketAddress(Grasscutter.getConfig().getDispatchOptions().Ip, Grasscutter.getConfig().getDispatchOptions().Port);
 		this.gson = new GsonBuilder().create();
 		
 		this.loadQueries();
@@ -99,19 +99,19 @@ public final class DispatchServer {
 			
 			byte[] decoded2 = Base64.getDecoder().decode(query_cur_region);
 			QueryCurrRegionHttpRsp regionQuery = QueryCurrRegionHttpRsp.parseFrom(decoded2);
-			
+
 			RegionSimpleInfo server = RegionSimpleInfo.newBuilder()
 					.setName("os_usa")
-					.setTitle(Grasscutter.getConfig().GameServerName)
+					.setTitle(Grasscutter.getConfig().getGameServerOptions().Name)
 					.setType("DEV_PUBLIC")
-					.setDispatchUrl("https://" + (Grasscutter.getConfig().DispatchServerPublicIp.isEmpty() ? Grasscutter.getConfig().DispatchServerIp : Grasscutter.getConfig().DispatchServerPublicIp) + ":" + getAddress().getPort() + "/query_cur_region")
+					.setDispatchUrl("https://" + (Grasscutter.getConfig().getDispatchOptions().PublicIp.isEmpty() ? Grasscutter.getConfig().getDispatchOptions().Ip : Grasscutter.getConfig().getDispatchOptions().PublicIp) + ":" + getAddress().getPort() + "/query_cur_region")
 					.build();
 			
 			RegionSimpleInfo serverTest2 = RegionSimpleInfo.newBuilder()
 					.setName("os_euro")
 					.setTitle("Grasscutter")
 					.setType("DEV_PUBLIC")
-					.setDispatchUrl("https://" + (Grasscutter.getConfig().DispatchServerPublicIp.isEmpty() ? Grasscutter.getConfig().DispatchServerIp : Grasscutter.getConfig().DispatchServerPublicIp) + ":" + getAddress().getPort() + "/query_cur_region")
+					.setDispatchUrl("https://" + (Grasscutter.getConfig().getDispatchOptions().PublicIp.isEmpty() ? Grasscutter.getConfig().getDispatchOptions().Ip : Grasscutter.getConfig().getDispatchOptions().PublicIp) + ":" + getAddress().getPort() + "/query_cur_region")
 					.build();
 				
 			QueryRegionListHttpRsp regionList = QueryRegionListHttpRsp.newBuilder()
@@ -123,8 +123,8 @@ public final class DispatchServer {
 				.build();
 						
 			RegionInfo currentRegion = regionQuery.getRegionInfo().toBuilder()
-					.setIp((Grasscutter.getConfig().GameServerPublicIp.isEmpty() ? Grasscutter.getConfig().GameServerIp : Grasscutter.getConfig().GameServerPublicIp))
-					.setPort(Grasscutter.getConfig().GameServerPort)
+					.setIp((Grasscutter.getConfig().getGameServerOptions().PublicIp.isEmpty() ? Grasscutter.getConfig().getGameServerOptions().Ip : Grasscutter.getConfig().getGameServerOptions().PublicIp))
+					.setPort(Grasscutter.getConfig().getGameServerOptions().Port)
 					.setSecretKey(ByteString.copyFrom(FileUtils.read(Grasscutter.getConfig().KEY_FOLDER + "dispatchSeed.bin")))
 					.build();
 			
@@ -140,12 +140,12 @@ public final class DispatchServer {
 
 	public void start() throws Exception {
 		HttpServer server;
-		if(Grasscutter.getConfig().UseSSL) {
+		if(Grasscutter.getConfig().getDispatchOptions().UseSSL) {
 			HttpsServer httpsServer;
 			httpsServer = HttpsServer.create(getAddress(), 0);
 			SSLContext sslContext = SSLContext.getInstance("TLS");
-			try (FileInputStream fis = new FileInputStream(Grasscutter.getConfig().DispatchServerKeystorePath)) {
-				char[] keystorePassword = Grasscutter.getConfig().DispatchServerKeystorePassword.toCharArray();
+			try (FileInputStream fis = new FileInputStream(Grasscutter.getConfig().getDispatchOptions().KeystorePath)) {
+				char[] keystorePassword = Grasscutter.getConfig().getDispatchOptions().KeystorePassword.toCharArray();
 				KeyStore ks = KeyStore.getInstance("PKCS12");
 				ks.load(fis, keystorePassword);
 				KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
@@ -228,7 +228,7 @@ public final class DispatchServer {
 			// 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
-				if (Grasscutter.getConfig().ServerOptions.AutomaticallyCreateAccounts) {
+				if (Grasscutter.getConfig().getDispatchOptions().AutomaticallyCreateAccounts) {
 					// This account has been created AUTOMATICALLY. There will be no permissions added.
 					account = DatabaseHelper.createAccountWithId(requestData.account, 0);
 					
@@ -410,7 +410,7 @@ public final class DispatchServer {
 		Grasscutter.getLogger().info("Dispatch server started on port " + getAddress().getPort());
 		
 		// Logging servers
-		HttpServer overseaLogServer = HttpServer.create(new InetSocketAddress(Grasscutter.getConfig().DispatchServerIp, 8888), 0);
+		HttpServer overseaLogServer = HttpServer.create(new InetSocketAddress(Grasscutter.getConfig().getDispatchOptions().Ip, 8888), 0);
 		overseaLogServer.createContext( // overseauspider.yuanshen.com
 				"/log", 
 				new DispatchHttpJsonHandler("{\"code\":0}")
@@ -418,7 +418,7 @@ public final class DispatchServer {
 		overseaLogServer.start();
 		Grasscutter.getLogger().info("Log server (overseauspider) started on port " + 8888);
 		
-		HttpServer uploadLogServer = HttpServer.create(new InetSocketAddress(Grasscutter.getConfig().DispatchServerIp, Grasscutter.getConfig().UploadLogPort), 0);
+		HttpServer uploadLogServer = HttpServer.create(new InetSocketAddress(Grasscutter.getConfig().getDispatchOptions().Ip, Grasscutter.getConfig().getDispatchOptions().UploadLogPort), 0);
 		uploadLogServer.createContext( // log-upload-os.mihoyo.com
 				"/crash/dataUpload", 
 				new DispatchHttpJsonHandler("{\"code\":0}")
@@ -435,7 +435,7 @@ public final class DispatchServer {
 			os.close();
 		});
 		uploadLogServer.start();
-		Grasscutter.getLogger().info("Log server (log-upload-os) started on port " + Grasscutter.getConfig().UploadLogPort);
+		Grasscutter.getLogger().info("Log server (log-upload-os) started on port " + Grasscutter.getConfig().getDispatchOptions().UploadLogPort);
 	}
 	
 	private Map<String, String> parseQueryString(String qs) {

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

@@ -87,7 +87,7 @@ public class GameServerPacketHandler {
 		}
 		
 		// Log unhandled packets
-		if (Grasscutter.getConfig().LOG_PACKETS) {
+		if (Grasscutter.getConfig().getGameServerOptions().LOG_PACKETS) {
 			//Grasscutter.getLogger().info("Unhandled packet (" + opcode + "): " + PacketOpcodesUtil.getOpcodeName(opcode));
 		}
 	}

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

@@ -165,7 +165,7 @@ public class GameSession extends MihoyoKcpChannel {
     	byte[] data = genshinPacket.build();
     	
     	// Log
-    	if (Grasscutter.getConfig().LOG_PACKETS) {
+    	if (Grasscutter.getConfig().getGameServerOptions().LOG_PACKETS) {
     		logPacket(genshinPacket);
     	}
     	
@@ -225,7 +225,7 @@ public class GameSession extends MihoyoKcpChannel {
 				}
 				
 				// Log packet
-				if (Grasscutter.getConfig().LOG_PACKETS) {
+				if (Grasscutter.getConfig().getGameServerOptions().LOG_PACKETS) {
 					Grasscutter.getLogger().info("RECV: " + PacketOpcodesUtil.getOpcodeName(opcode) + " (" + opcode + ")");
 					System.out.println(Utils.bytesToHex(payload));
 				}

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

@@ -19,7 +19,7 @@ public class PacketPlayerStoreNotify extends GenshinPacket {
 		
 		PlayerStoreNotify.Builder p = PlayerStoreNotify.newBuilder()
 				.setStoreType(StoreType.StorePack)
-				.setWeightLimit(Grasscutter.getConfig().getServerOptions().InventoryLimitAll);
+				.setWeightLimit(Grasscutter.getConfig().getGameServerOptions().InventoryLimitAll);
 		
 		for (GenshinItem item : player.getInventory()) {
 			Item itemProto = item.toProto();

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

 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.Config.ServerOptions;
+import emu.grasscutter.Config.GameServerOptions;
 import emu.grasscutter.GenshinConstants;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.game.GenshinPlayer;
@@ -14,7 +14,7 @@ public class PacketPullRecentChatRsp extends GenshinPacket {
 	public PacketPullRecentChatRsp(GenshinPlayer player) {
 		super(PacketOpcodes.PullRecentChatRsp);
 		
-		ServerOptions serverOptions = Grasscutter.getConfig().getServerOptions();
+		GameServerOptions serverOptions = Grasscutter.getConfig().getGameServerOptions();
 		PullRecentChatRsp.Builder proto = PullRecentChatRsp.newBuilder();
 		
 		if (serverOptions.WelcomeEmotes != null && serverOptions.WelcomeEmotes.length > 0) {
@@ -33,7 +33,7 @@ public class PacketPullRecentChatRsp extends GenshinPacket {
 				.setTime((int) (System.currentTimeMillis() / 1000))
 				.setUid(GenshinConstants.SERVER_CONSOLE_UID)
 				.setToUid(player.getUid())
-				.setText(Grasscutter.getConfig().getServerOptions().WelcomeMotd)
+				.setText(Grasscutter.getConfig().getGameServerOptions().WelcomeMotd)
 				.build();
 			
 			proto.addChatInfo(welcomeMotd);

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

@@ -13,11 +13,11 @@ public class PacketStoreWeightLimitNotify extends GenshinPacket {
 
 		StoreWeightLimitNotify p = StoreWeightLimitNotify.newBuilder()
 				.setStoreType(StoreType.StorePack)
-				.setWeightLimit(Grasscutter.getConfig().getServerOptions().InventoryLimitAll)
-				.setWeaponCountLimit(Grasscutter.getConfig().getServerOptions().InventoryLimitWeapon)
-				.setReliquaryCountLimit(Grasscutter.getConfig().getServerOptions().InventoryLimitRelic)
-				.setMaterialCountLimit(Grasscutter.getConfig().getServerOptions().InventoryLimitMaterial)
-				.setFurnitureCountLimit(Grasscutter.getConfig().getServerOptions().InventoryLimitFurniture)
+				.setWeightLimit(Grasscutter.getConfig().getGameServerOptions().InventoryLimitAll)
+				.setWeaponCountLimit(Grasscutter.getConfig().getGameServerOptions().InventoryLimitWeapon)
+				.setReliquaryCountLimit(Grasscutter.getConfig().getGameServerOptions().InventoryLimitRelic)
+				.setMaterialCountLimit(Grasscutter.getConfig().getGameServerOptions().InventoryLimitMaterial)
+				.setFurnitureCountLimit(Grasscutter.getConfig().getGameServerOptions().InventoryLimitFurniture)
 				.build();
 		
 		this.setData(p);