From cc093be67bffa68c770ff3088d6cbc7da0e6575d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=B1=BBC=E8=AF=AD=E8=A8=80=E6=98=AF=E4=B8=80=E5=AE=B6?= <51352133+F-Unction@users.noreply.github.com> Date: Tue, 26 Apr 2022 10:19:37 +0800 Subject: [PATCH 1/7] update org.reflections 0.9.12->0.10.2 to avoid `[INFO] Unknown command` (#148) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 97477456a..6dc53ca61 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ dependencies { implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.8' implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.18.1' - implementation group: 'org.reflections', name: 'reflections', version: '0.9.12' + implementation group: 'org.reflections', name: 'reflections', version: '0.10.2' implementation group: 'dev.morphia.morphia', name: 'core', version: '1.6.1' From 317bf5c78b28417a729701784293eb8be3814975 Mon Sep 17 00:00:00 2001 From: Magix Date: Tue, 26 Apr 2022 21:37:28 -0400 Subject: [PATCH 2/7] Update Grasscutter.java why do i have to fix stable --- src/main/java/emu/grasscutter/Grasscutter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/emu/grasscutter/Grasscutter.java b/src/main/java/emu/grasscutter/Grasscutter.java index abcdc3557..ad1107e8e 100644 --- a/src/main/java/emu/grasscutter/Grasscutter.java +++ b/src/main/java/emu/grasscutter/Grasscutter.java @@ -34,7 +34,7 @@ public final class Grasscutter { private static DispatchServer dispatchServer; private static GameServer gameServer; - public static final Reflections reflector = new Reflections(); + public static final Reflections reflector = new Reflections("emu.grasscutter"); static { // Declare logback configuration. From 1ee3d284c871e12e6e8d0de5e8eedce404bd76c1 Mon Sep 17 00:00:00 2001 From: memetrollsXD Date: Sat, 30 Apr 2022 23:01:28 +0200 Subject: [PATCH 3/7] Delete bug_report.md --- .github/ISSUE_TEMPLATE/bug_report.md | 38 ---------------------------- 1 file changed, 38 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index dd84ea782..000000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,38 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '' -labels: '' -assignees: '' - ---- - -**Describe the bug** -A clear and concise description of what the bug is. - -**To Reproduce** -Steps to reproduce the behavior: -1. Go to '...' -2. Click on '....' -3. Scroll down to '....' -4. See error - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots** -If applicable, add screenshots to help explain your problem. - -**Desktop (please complete the following information):** - - OS: [e.g. iOS] - - Browser [e.g. chrome, safari] - - Version [e.g. 22] - -**Smartphone (please complete the following information):** - - Device: [e.g. iPhone6] - - OS: [e.g. iOS8.1] - - Browser [e.g. stock browser, safari] - - Version [e.g. 22] - -**Additional context** -Add any other context about the problem here. From 6e007a4be0cf88d5983a0f6f3ae3432b80ec1ba5 Mon Sep 17 00:00:00 2001 From: memetrollsXD Date: Sat, 30 Apr 2022 23:01:35 +0200 Subject: [PATCH 4/7] Delete feature_request.md --- .github/ISSUE_TEMPLATE/feature_request.md | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index bbcbbe7d6..000000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this project -title: '' -labels: '' -assignees: '' - ---- - -**Is your feature request related to a problem? Please describe.** -A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] - -**Describe the solution you'd like** -A clear and concise description of what you want to happen. - -**Describe alternatives you've considered** -A clear and concise description of any alternative solutions or features you've considered. - -**Additional context** -Add any other context or screenshots about the feature request here. From 3f46100d801a4a857324dc3bc54895fba5dcaea9 Mon Sep 17 00:00:00 2001 From: 66Leo66 <33322229+66Leo66@users.noreply.github.com> Date: Thu, 5 May 2022 21:22:29 +0800 Subject: [PATCH 5/7] Allow overriding config with ENV (#506) Allow overriding config with ENV (handy when running with docker or debugging without modifying script) Also log proxy config for easier debugging (when sharing screenshots) --- proxy_config.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/proxy_config.py b/proxy_config.py index 5025a974e..07bac1a3a 100644 --- a/proxy_config.py +++ b/proxy_config.py @@ -1,4 +1,17 @@ +import os + # This can also be replaced with another IP address. USE_SSL = True -REMOTE_HOST = "127.0.0.1" -REMOTE_PORT = 443 \ No newline at end of file +REMOTE_HOST = "localhost" +REMOTE_PORT = 443 + +if os.getenv('MITM_REMOTE_HOST') != None: + REMOTE_HOST = os.getenv('MITM_REMOTE_HOST') +if os.getenv('MITM_REMOTE_PORT') != None: + REMOTE_PORT = int(os.getenv('MITM_REMOTE_PORT')) +if os.getenv('MITM_USE_SSL') != None: + USE_SSL = bool(os.getenv('MITM_USE_SSL')) + +print('MITM Remote Host: ' + REMOTE_HOST) +print('MITM Remote Port: ' + str(REMOTE_PORT)) +print('MITM Use SSL ' + str(USE_SSL)) From 32b9e8f9d2676dad54054a46c9e74327f18afdc8 Mon Sep 17 00:00:00 2001 From: KingRainbow44 Date: Fri, 6 May 2022 21:20:41 -0400 Subject: [PATCH 6/7] Rename & refactor --- src/main/resources/languages/{en_US.json => en-US.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/resources/languages/{en_US.json => en-US.json} (100%) diff --git a/src/main/resources/languages/en_US.json b/src/main/resources/languages/en-US.json similarity index 100% rename from src/main/resources/languages/en_US.json rename to src/main/resources/languages/en-US.json From a93371a0d0aa0c650c83abdd110f1f87b9095922 Mon Sep 17 00:00:00 2001 From: KingRainbow44 Date: Fri, 6 May 2022 21:52:10 -0400 Subject: [PATCH 7/7] Fix for translation errors --- src/main/java/emu/grasscutter/Grasscutter.java | 2 +- .../emu/grasscutter/server/dispatch/DispatchServer.java | 2 +- src/main/java/emu/grasscutter/utils/Language.java | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/emu/grasscutter/Grasscutter.java b/src/main/java/emu/grasscutter/Grasscutter.java index d05939c05..8295cc599 100644 --- a/src/main/java/emu/grasscutter/Grasscutter.java +++ b/src/main/java/emu/grasscutter/Grasscutter.java @@ -93,7 +93,7 @@ public final class Grasscutter { ResourceLoader.loadAll(); ScriptLoader.init(); - // Database + // Initialize database. DatabaseManager.initialize(); // Create server instances. diff --git a/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java b/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java index 1695e0208..7e4b1655e 100644 --- a/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java +++ b/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java @@ -334,7 +334,7 @@ public final class DispatchServer { return; } LoginResultJson responseData = new LoginResultJson(); - Grasscutter.getLogger().info(translate("messages.dispatch.account.login_token_attempt")); + Grasscutter.getLogger().info(translate("messages.dispatch.account.login_token_attempt", req.ip())); // Login Account account = DatabaseHelper.getAccountById(requestData.uid); diff --git a/src/main/java/emu/grasscutter/utils/Language.java b/src/main/java/emu/grasscutter/utils/Language.java index ec56b41d9..8acb05cd4 100644 --- a/src/main/java/emu/grasscutter/utils/Language.java +++ b/src/main/java/emu/grasscutter/utils/Language.java @@ -29,7 +29,13 @@ public final class Language { * @return A translated value with arguments substituted. */ public static String translate(String key, Object... args) { - return Grasscutter.getLanguage().get(key).formatted(args); + String translated = Grasscutter.getLanguage().get(key); + try { + return translated.formatted(args); + } catch (Exception exception) { + Grasscutter.getLogger().error("Failed to format string: " + key, exception); + return translated; + } } /**