From c930c637e47db3114353fac6cbaa8476e8b037c2 Mon Sep 17 00:00:00 2001 From: Melledy <52122272+Melledy@users.noreply.github.com> Date: Tue, 3 May 2022 03:19:43 -0700 Subject: [PATCH] Add languages folder to config as well --- src/main/java/emu/grasscutter/Config.java | 1 + src/main/java/emu/grasscutter/Grasscutter.java | 4 ++-- src/main/java/emu/grasscutter/Language.java | 4 ++-- src/main/java/emu/grasscutter/server/game/GameServer.java | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/emu/grasscutter/Config.java b/src/main/java/emu/grasscutter/Config.java index 4963f8d1f..4504df2aa 100644 --- a/src/main/java/emu/grasscutter/Config.java +++ b/src/main/java/emu/grasscutter/Config.java @@ -16,6 +16,7 @@ public final class Config { public String KEY_FOLDER = "./keys/"; public String SCRIPTS_FOLDER = "./resources/Scripts/"; public String PLUGINS_FOLDER = "./plugins/"; + public String LANGUAGE_FOLDER = "./languages/"; public ServerDebugMode DebugMode = ServerDebugMode.NONE; // ALL, MISSING, NONE public ServerRunMode RunMode = ServerRunMode.HYBRID; // HYBRID, DISPATCH_ONLY, GAME_ONLY diff --git a/src/main/java/emu/grasscutter/Grasscutter.java b/src/main/java/emu/grasscutter/Grasscutter.java index 19c59a7e8..d4529aabb 100644 --- a/src/main/java/emu/grasscutter/Grasscutter.java +++ b/src/main/java/emu/grasscutter/Grasscutter.java @@ -134,7 +134,7 @@ public final class Grasscutter { } public static void loadLanguage() { - try (FileReader file = new FileReader(String.format("./language/%s.json", Grasscutter.config.Language))) { + try (FileReader file = new FileReader(String.format(getConfig().LANGUAGE_FOLDER + "%s.json", Grasscutter.config.Language))) { language = gson.fromJson(file, Language.class); } catch (Exception e) { Grasscutter.language = new Language(); @@ -183,7 +183,7 @@ public final class Grasscutter { } } } catch (Exception e) { - Grasscutter.getLogger().error(language.error, e); + Grasscutter.getLogger().error(language.Error, e); } } diff --git a/src/main/java/emu/grasscutter/Language.java b/src/main/java/emu/grasscutter/Language.java index e5150a6fe..6d30eb404 100644 --- a/src/main/java/emu/grasscutter/Language.java +++ b/src/main/java/emu/grasscutter/Language.java @@ -9,8 +9,8 @@ public final class Language { public String Start_done = "Done! For help, type \"help\""; public String Dispatch_mode_not_support_command = "Commands are not supported in dispatch only mode."; public String Command_error = "Command error:"; - public String error = "An error occurred."; - public String grasscutter_is_free = "Grasscutter is FREE software. If you have paid for this, you may have been scammed. Homepage: https://github.com/Grasscutters/Grasscutter"; + public String Error = "An error occurred."; + public String Grasscutter_is_free = "Grasscutter is FREE software. If you have paid for this, you may have been scammed. Homepage: https://github.com/Grasscutters/Grasscutter"; public String Game_start_port = "Game Server started on port %s"; public String Client_connect = "Client connected from %s"; public String Client_disconnect = "Client disconnected from %s"; diff --git a/src/main/java/emu/grasscutter/server/game/GameServer.java b/src/main/java/emu/grasscutter/server/game/GameServer.java index 2bab992cf..bbc1cdce5 100644 --- a/src/main/java/emu/grasscutter/server/game/GameServer.java +++ b/src/main/java/emu/grasscutter/server/game/GameServer.java @@ -207,7 +207,7 @@ public final class GameServer extends KcpServer { @Override public void onStartFinish() { - Grasscutter.getLogger().info(Grasscutter.getLanguage().grasscutter_is_free); + Grasscutter.getLogger().info(Grasscutter.getLanguage().Grasscutter_is_free); Grasscutter.getLogger().info(String.format(Grasscutter.getLanguage().Game_start_port, address.getPort())); ServerStartEvent event = new ServerStartEvent(ServerEvent.Type.GAME, OffsetDateTime.now()); event.call(); }