Show accessAddress in bold yellow on startup

This should make it easier to help people troubleshoot networked setups. Consider telling people to try connecting to the address with a web browser on the client's machine.
bellavee · Aug 25, 2022 · 6d65b71 · 6d65b71
1 parent f5c8959
commit 6d65b71
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 2 deletions.
diff --git a/src/main/java/emu/grasscutter/server/game/GameServer.java b/src/main/java/emu/grasscutter/server/game/GameServer.java
@@ -253,7 +253,7 @@ public void run() {
             }
         }, new Date(), 1000L);
         Grasscutter.getLogger().info(translate("messages.status.free_software"));
-        Grasscutter.getLogger().info(translate("messages.game.port_bind", Integer.toString(address.getPort())));
+        Grasscutter.getLogger().info(translate("messages.game.address_bind", GAME_INFO.accessAddress, address.getPort()));
         ServerStartEvent event = new ServerStartEvent(ServerEvent.Type.GAME, OffsetDateTime.now());
         event.call();
     }

diff --git a/src/main/java/emu/grasscutter/server/http/HttpServer.java b/src/main/java/emu/grasscutter/server/http/HttpServer.java
@@ -137,7 +137,7 @@ public void start() throws UnsupportedEncodingException {
         }
 
         // Log bind information.
-        Grasscutter.getLogger().info(translate("messages.dispatch.port_bind", Integer.toString(this.express.raw().port())));
+        Grasscutter.getLogger().info(translate("messages.dispatch.address_bind", HTTP_INFO.accessAddress, this.express.raw().port()));
     }
 
     /**

diff --git a/src/main/resources/languages/en-US.json b/src/main/resources/languages/en-US.json
@@ -1,13 +1,15 @@
 {
   "messages": {
     "game": {
+      "address_bind": "Game Server started at \u001B[1m\u001B[33m%s:%s\u001B[0m",
       "port_bind": "Game Server started on port %s",
       "connect": "Client connected from %s",
       "disconnect": "Client disconnected from %s",
       "game_update_error": "An error occurred during game update.",
       "command_error": "Command error:"
     },
     "dispatch": {
+      "address_bind": "[Dispatch] Dispatch server started at \u001B[1m\u001B[33m%s:%s\u001B[0m",
       "port_bind": "[Dispatch] Dispatch server started on port %s",
       "request": "[Dispatch] Client %s %s request: %s",
       "keystore": {

diff --git a/src/main/resources/languages/es-ES.json b/src/main/resources/languages/es-ES.json
@@ -1,13 +1,15 @@
 {
   "messages": {
     "game": {
+      "address_bind": "🇺🇸Game Server started at \u001b[1m\u001b[33m%s:%s\u001b[0m",
       "port_bind": "Servidor del juego iniciado en el puerto %s",
       "connect": "Cliente conectado desde %s",
       "disconnect": "Cliente desconectado desde %s",
       "game_update_error": "Ha ocurrido un error durante la actualización del juego.",
       "command_error": "Comando de error:"
     },
     "dispatch": {
+      "address_bind": "🇺🇸[Dispatch] Dispatch server started at \u001b[1m\u001b[33m%s:%s\u001b[0m",
       "port_bind": "[Dispatch] El servidor de envío se inició en el puerto %s",
       "request": "[Dispatch] Petición %s %s del cliente: %s",
       "keystore": {

diff --git a/src/main/resources/languages/fr-FR.json b/src/main/resources/languages/fr-FR.json
@@ -1,13 +1,15 @@
 {
   "messages": {
     "game": {
+      "address_bind": "🇺🇸Game Server started at \u001b[1m\u001b[33m%s:%s\u001b[0m",
       "port_bind": "Serveur de jeu démarré sur le port %s",
       "connect": "Client connecté depuis %s",
       "disconnect": "Client déconnecté depuis %s",
       "game_update_error": "Une erreur est survenue lors de la mise à jour du jeu.",
       "command_error": "Erreur de commande:"
     },
     "dispatch": {
+      "address_bind": "🇺🇸[Dispatch] Dispatch server started at \u001b[1m\u001b[33m%s:%s\u001b[0m",
       "port_bind": "[Dispatch] Serveur de répartition démarré sur le port %s",
       "request": "[Dispatch] Le client %s %s demande : %s",
       "keystore": {

diff --git a/src/main/resources/languages/ko-KR.json b/src/main/resources/languages/ko-KR.json
@@ -1,13 +1,15 @@
 {
   "messages": {
     "game": {
+      "address_bind": "🇺🇸Game Server started at \u001b[1m\u001b[33m%s:%s\u001b[0m",
       "port_bind": "게임 서버가 포트 %s에서 열렸습니다.",
       "connect": "클라이언트가 %s에서 연결됐습니다.",
       "disconnect": "클라이언트가 %s에서 연결이 끊겼습니다.",
       "game_update_error": "게임 업데이트 도중 오류가 발생했습니다.",
       "command_error": "명령어 오류:"
     },
     "dispatch": {
+      "address_bind": "🇺🇸[Dispatch] Dispatch server started at \u001b[1m\u001b[33m%s:%s\u001b[0m",
       "port_bind": "[Dispatch] 디스패치 서버가 포트 %s에서 열렸습니다.",
       "request": "🇺🇸[Dispatch] Client %s %s request: %s",
       "keystore": {

diff --git a/src/main/resources/languages/pl-PL.json b/src/main/resources/languages/pl-PL.json
@@ -1,13 +1,15 @@
 {
   "messages": {
     "game": {
+      "address_bind": "🇺🇸Game Server started at \u001b[1m\u001b[33m%s:%s\u001b[0m",
       "port_bind": "Serwer gry został uruchomiony na porcie %s.",
       "connect": "Klient połączył się z %s.",
       "disconnect": "Klient rozłączył się z %s.",
       "game_update_error": "Wystąpił błąd podczas aktualizacji gry.",
       "command_error": "Błąd komendy: "
     },
     "dispatch": {
+      "address_bind": "🇺🇸[Dispatch] Dispatch server started at \u001b[1m\u001b[33m%s:%s\u001b[0m",
       "port_bind": "[Dispatch] Serwer Dispatch został uruchomiony na porcie %s.",
       "request": "[Dispatch] Żądanie klienta %s (metoda %s): %s",
       "keystore": {

diff --git a/src/main/resources/languages/ro-RO.json b/src/main/resources/languages/ro-RO.json
@@ -1,13 +1,15 @@
 {
   "messages": {
     "game": {
+      "address_bind": "🇺🇸Game Server started at \u001b[1m\u001b[33m%s:%s\u001b[0m",
       "port_bind": "Serverul de joc a început pe port %s",
       "connect": "Client conectat de la %s",
       "disconnect": "Client deconectat de la %s",
       "game_update_error": "A apărut o eroare în timpul actualizării jocului.",
       "command_error": "Eroare de comandă:"
     },
     "dispatch": {
+      "address_bind": "🇺🇸[Dispatch] Dispatch server started at \u001b[1m\u001b[33m%s:%s\u001b[0m",
       "port_bind": "[Dispatch] Server de dispecerat pornit pe portul %s",
       "request": "[Dispatch] Clientul %s %s cere: %s",
       "keystore": {

diff --git a/src/main/resources/languages/ru-RU.json b/src/main/resources/languages/ru-RU.json
@@ -1,13 +1,15 @@
 {
   "messages": {
     "game": {
+      "address_bind": "🇺🇸Game Server started at \u001b[1m\u001b[33m%s:%s\u001b[0m",
       "port_bind": "Игровой сервер запущен на порте %s",
       "connect": "Клиент подключился с %s",
       "disconnect": "Клиент отсоединился с %s",
       "game_update_error": "Произошла ошибка при обновлении игры.",
       "command_error": "Командная ошибка:"
     },
     "dispatch": {
+      "address_bind": "🇺🇸[Dispatch] Dispatch server started at \u001b[1m\u001b[33m%s:%s\u001b[0m",
       "port_bind": "[Dispatch] Распределительный сервер запущен на порте %s",
       "request": "[Dispatch] Клиент %s %s, запрос: %s",
       "keystore": {

diff --git a/src/main/resources/languages/zh-CN.json b/src/main/resources/languages/zh-CN.json
@@ -1,13 +1,15 @@
 {
   "messages": {
     "game": {
+      "address_bind": "🇺🇸Game Server started at \u001b[1m\u001b[33m%s:%s\u001b[0m",
       "port_bind": "游戏服务器已在端口 %s 上启动。",
       "connect": "客户端 %s 已连接。",
       "disconnect": "客户端 %s 已断开连接。",
       "game_update_error": "游戏更新时发生错误。",
       "command_error": "命令发生错误："
     },
     "dispatch": {
+      "address_bind": "🇺🇸[Dispatch] Dispatch server started at \u001b[1m\u001b[33m%s:%s\u001b[0m",
       "port_bind": "[Dispatch] 服务器已在端口 %s 上启动",
       "request": "[Dispatch] 客户端 %s 请求：%s %s",
       "keystore": {

diff --git a/src/main/resources/languages/zh-TW.json b/src/main/resources/languages/zh-TW.json
@@ -1,13 +1,15 @@
 {
   "messages": {
     "game": {
+      "address_bind": "🇺🇸Game Server started at \u001b[1m\u001b[33m%s:%s\u001b[0m",
       "port_bind": "遊戲伺服器已成功啟動。端口號：%s",
       "connect": "客戶端已連接至 %s",
       "disconnect": "客戶端 %s 已斷開連接。",
       "game_update_error": "遊戲更新時發生了錯誤。",
       "command_error": "指令發生錯誤："
     },
     "dispatch": {
+      "address_bind": "🇺🇸[Dispatch] Dispatch server started at \u001b[1m\u001b[33m%s:%s\u001b[0m",
       "port_bind": "[Dispatch] 伺服器已在端口 %s 上開啟。",
       "request": "[Dispatch] 客戶端 %s 請求： %s %s",
       "keystore": {