Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-22 03:05:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/Grasscutters/Grasscutter into development

Browse Source
This commit is contained in:
Melledy 2022-05-06 19:12:58 -07:00
commit 759cd6ae37
4 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
proxy_config.py
View File

@ -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
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))

8
src/main/java/emu/grasscutter/Grasscutter.java
View File

@ -51,7 +51,7 @@ public final class Grasscutter {
private static PluginManager pluginManager;
public static final Reflections reflector = new Reflections("emu.grasscutter");
static {
// Declare logback configuration.
System.setProperty("logback.configurationFile", "src/main/resources/logback.xml");
@ -66,7 +66,7 @@ public final class Grasscutter {
Utils.startupCheck();
}
public static void main(String[] args) throws Exception {
public static void main(String[] args) throws Exception {
Crypto.loadKeys(); // Load keys from buffers.
// Parse arguments.
@ -93,7 +93,7 @@ public final class Grasscutter {
ResourceLoader.loadAll();
ScriptLoader.init();
// Database
// Initialize database.
DatabaseManager.initialize();
// Create server instances.
@ -127,7 +127,7 @@ public final class Grasscutter {
// Open console.
startConsole();
}
}
/**
* Server shutdown event.

2
src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
View File

@ -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);

8
src/main/java/emu/grasscutter/utils/Language.java
View File

@ -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;
}
}
/**