Merge remote-tracking branch 'upstream/development' into dev-mail

src/main/java/emu/grasscutter/utils/Position.java

@@ -2,8 +2,10 @@ package emu.grasscutter.utils;
 
 import java.io.Serializable;
 
+import dev.morphia.annotations.Entity;
 import emu.grasscutter.net.proto.VectorOuterClass.Vector;
 
+@Entity
 public class Position implements Serializable {
 	private static final long serialVersionUID = -2001232313615923575L;
 	

src/main/java/emu/grasscutter/utils/Utils.java

@@ -158,7 +158,7 @@ public final class Utils {
 		// Check for GenshinData.
 		if(!fileExists(resourcesFolder + "BinOutput") ||
 				!fileExists(resourcesFolder + "ExcelBinOutput")) {
-			logger.info("Place a copy of 'GenshinData' in the resources folder.");
+			logger.info("Place a copy of 'BinOutput' and 'ExcelBinOutput' in the resources folder.");
 			exit = true;
 		}
 

src/main/resources/logback.xml

@@ -4,8 +4,19 @@
       <pattern>[%d{HH:mm:ss}] [%highlight(%level)] %msg%n</pattern>
     </encoder>
   </appender>
+  <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>logs/latest.log</file>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>logs/log.%d{yyyy-MM-dd}_%d{HH}.log.tar.gz</fileNamePattern>
+      <maxHistory>24</maxHistory>
+    </rollingPolicy>
+    <encoder>
+      <pattern>%d{yyyy-MM-dd'T'HH:mm:ss'Z'} - %m%n</pattern>
+    </encoder>
+  </appender>
   <logger name="org.reflections" level="OFF"/>
   <root level="INFO">
     <appender-ref ref="STDOUT" />
+    <appender-ref ref="FILE" />
   </root>
 </Configuration>
\ No newline at end of file

start.cmd

@@ -74,8 +74,10 @@ for /f "tokens=2*" %%a in ('reg query "HKCU\Software\Microsoft\Windows\CurrentVe
 
 @rem TODO: External proxy when ORIG_PROXY_ENABLE == 0x1
 echo set ws = createobject("wscript.shell") > "%temp%\proxy.vbs"
+if not "%MITMDUMP_PATH%" == "" (
 	echo ws.currentdirectory = "%MITMDUMP_PATH%" >> "%temp%\proxy.vbs"
-echo ws.run "cmd /c mitmdump.exe -s "^&chr(34)^&"%PROXY_SCRIPT_NAME%"^&chr(34)^&" -k",0 >> "%temp%\proxy.vbs"
+)
+echo ws.run "cmd /c mitmdump.exe -s "^&chr(34)^&"%CUR_PATH%%PROXY_SCRIPT_NAME%"^&chr(34)^&" -k",0 >> "%temp%\proxy.vbs"
 "%temp%\proxy.vbs"
 del /f /q "%temp%\proxy.vbs" >nul 2>nul
 
@@ -117,7 +119,9 @@ set DATABASE=true
 mkdir "%DATABASE_STORAGE_PATH%" >nul 2>nul
 
 echo set ws = createobject("wscript.shell") > "%temp%\db.vbs"
+if not "%MONGODB_PATH%" == "" (
 echo ws.currentdirectory = "%MONGODB_PATH%" >> "%temp%\db.vbs"
+)
 echo ws.run "cmd /c mongod.exe --dbpath "^&chr(34)^&"%DATABASE_STORAGE_PATH%"^&chr(34)^&"",0 >> "%temp%\db.vbs"
 "%temp%\db.vbs"
 del /f /q "%temp%\db.vbs" >nul 2>nul