Merge pull request #5 from lilmayofuksu/main

Add support for specifying a Public IP
Birdulon · Apr 18, 2022 · 2b0ce0a · 2b0ce0a
2 parents dd2d4b9 + f769ef1
commit 2b0ce0a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/emu/grasscutter/Config.java b/src/main/java/emu/grasscutter/Config.java
@@ -2,12 +2,14 @@
 
 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 String GameServerName = "Test";
 	public String GameServerIp = "127.0.0.1";
+	public String GameServerPublicIp = "";
 	public int GameServerPort = 22102;
 
 	public String DatabaseUrl = "mongodb://localhost:27017";

diff --git a/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java b/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java
@@ -92,7 +92,7 @@ public int getEventChance() {
 	}
 
 	public GachaInfo toProto() {
-		String record = "http://" + Grasscutter.getConfig().DispatchServerIp + "/gacha";
+		String record = "http://" + (Grasscutter.getConfig().DispatchServerPublicIp.isEmpty() ? Grasscutter.getConfig().DispatchServerIp : Grasscutter.getConfig().DispatchServerPublicIp) + "/gacha";
 
 		GachaInfo.Builder info = GachaInfo.newBuilder()
 				.setGachaType(this.getGachaType())

diff --git a/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java b/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
@@ -104,14 +104,14 @@ private void initRegion() {
 					.setName("os_usa")
 					.setTitle(Grasscutter.getConfig().GameServerName)
 					.setType("DEV_PUBLIC")
-					.setDispatchUrl("https://" + Grasscutter.getConfig().DispatchServerIp + ":" + getAddress().getPort() + "/query_cur_region")
+					.setDispatchUrl("https://" + (Grasscutter.getConfig().DispatchServerPublicIp.isEmpty() ? Grasscutter.getConfig().DispatchServerIp : Grasscutter.getConfig().DispatchServerPublicIp) + ":" + getAddress().getPort() + "/query_cur_region")
 					.build();
 
 			RegionSimpleInfo serverTest2 = RegionSimpleInfo.newBuilder()
 					.setName("os_euro")
 					.setTitle("Grasscutter")
 					.setType("DEV_PUBLIC")
-					.setDispatchUrl("https://" + Grasscutter.getConfig().DispatchServerIp + ":" + getAddress().getPort() + "/query_cur_region")
+					.setDispatchUrl("https://" + (Grasscutter.getConfig().DispatchServerPublicIp.isEmpty() ? Grasscutter.getConfig().DispatchServerIp : Grasscutter.getConfig().DispatchServerPublicIp) + ":" + getAddress().getPort() + "/query_cur_region")
 					.build();
 
 			QueryRegionListHttpRsp regionList = QueryRegionListHttpRsp.newBuilder()
@@ -123,7 +123,7 @@ private void initRegion() {
 				.build();
 
 			RegionInfo currentRegion = regionQuery.getRegionInfo().toBuilder()
-					.setIp(Grasscutter.getConfig().GameServerIp)
+					.setIp((Grasscutter.getConfig().GameServerPublicIp.isEmpty() ? Grasscutter.getConfig().GameServerIp : Grasscutter.getConfig().GameServerPublicIp))
 					.setPort(Grasscutter.getConfig().GameServerPort)
 					.setSecretKey(ByteString.copyFrom(FileUtils.read(Grasscutter.getConfig().KEY_FOLDER + "dispatchSeed.bin")))
 					.build();