Merge branch 'Grasscutters:development' into development

src/main/java/emu/grasscutter/server/packet/send/PacketSitRsp.java

+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.SitRspOuterClass.SitRsp;
+import emu.grasscutter.utils.Position;
+
+public class PacketSitRsp extends GenshinPacket {
+
+    public PacketSitRsp(long chairId, Position pos, int EntityId) {
+        super(PacketOpcodes.SitRsp);
+
+        SitRsp proto = SitRsp.newBuilder()
+                .setEntityId(EntityId)
+                .setPosition(pos.toProto())
+                .setChairId(chairId)
+                .build();
+
+        this.setData(proto);
+    }
+}

src/main/java/emu/grasscutter/tools/Tools.java

 package emu.grasscutter.tools;
 
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.FileWriter;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
+import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -30,13 +35,13 @@ public final class Tools {
 		ResourceLoader.loadResources();
 		
 		Map<Long, String> map;
-		try (FileReader fileReader = new FileReader(Utils.toFilePath(Grasscutter.getConfig().RESOURCE_FOLDER + "TextMap/TextMapEN.json"))) {
+		try (InputStreamReader fileReader = new InputStreamReader(new FileInputStream(Utils.toFilePath(Grasscutter.getConfig().RESOURCE_FOLDER + "TextMap/TextMapEN.json")), StandardCharsets.UTF_8)) {
 			map = Grasscutter.getGsonFactory().fromJson(fileReader, new TypeToken<Map<Long, String>>() {}.getType());
 		}
 		
 		List<Integer> list;
 		String fileName = "./GM Handbook.txt";
-		try (FileWriter fileWriter = new FileWriter(fileName); PrintWriter writer = new PrintWriter(fileWriter)) {
+		try (PrintWriter writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(fileName), StandardCharsets.UTF_8), false)) {
 			DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss");  
 			LocalDateTime now = LocalDateTime.now();
 			   

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;
 	

start.cmd

@@ -74,8 +74,11 @@ 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"
-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"
+
+if not "%MITMDUMP_PATH%" == "" (
+	echo ws.currentdirectory = "%MITMDUMP_PATH%" >> "%temp%\proxy.vbs"
+)
+echo ws.run "cmd /c mitmdump.exe -s "^&chr(34)^&"%CUR_PATH%%PROXY_SCRIPT_NAME%"^&chr(34)^&" -k --allow-hosts "^&chr(34)^&".*\.yuanshen\.com|.*\.mihoyo\.com|.*\.hoyoverse\.com"^&chr(34),0 >> "%temp%\proxy.vbs"
 "%temp%\proxy.vbs"
 del /f /q "%temp%\proxy.vbs" >nul 2>nul
 
@@ -117,7 +120,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
@@ -157,4 +162,4 @@ call :LOG [INFO] See you again :)
 goto :EOF
 
 :LOG
-echo [%time:~0,8%] %*
\ No newline at end of file
+echo [%time:~0,8%] %*