Merge branch 'stable' into development

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

src/main/java/emu/grasscutter/Grasscutter.java

@@ -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.
@@ -127,7 +127,7 @@ public static void main(String[] args) throws Exception {
 
 		// Open console.
 		startConsole();
-    }
+ }
 
 	/**
 	 * Server shutdown event.