Merge branch 'development' into java-16

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

@@ -13,17 +13,6 @@ public class PacketSceneTransToPointRsp extends GenshinPacket {
 	public PacketSceneTransToPointRsp(GenshinPlayer player, int pointId, int sceneId) {
 		super(PacketOpcodes.SceneTransToPointRsp);
 
-		String code = sceneId + "_" + pointId;
-		ScenePointEntry scenePointEntry = GenshinData.getScenePointEntries().get(code);
-
-		float x = scenePointEntry.getPointData().getTranPos().getX();
-		float y = scenePointEntry.getPointData().getTranPos().getY();
-		float z = scenePointEntry.getPointData().getTranPos().getZ();
-
-		player.getPos().set(new Position(x, y, z));
-
-		player.getWorld().forceTransferPlayerToScene(player, sceneId, player.getPos());
-
 		SceneTransToPointRsp proto = SceneTransToPointRsp.newBuilder()
 				.setRetcode(0)
 	            .setPointId(pointId)
@@ -32,4 +21,14 @@ public class PacketSceneTransToPointRsp extends GenshinPacket {
 
 		this.setData(proto);
 	}
+
+	public PacketSceneTransToPointRsp() {
+		super(PacketOpcodes.SceneTransToPointRsp);
+		
+		SceneTransToPointRsp proto = SceneTransToPointRsp.newBuilder()
+				.setRetcode(1) // Internal server error
+	            .build();
+
+		this.setData(proto);
+	}
 }

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

@@ -12,8 +12,8 @@ public class PacketSceneUnlockInfoNotify extends GenshinPacket {
 
 		SceneUnlockInfoNotify proto = SceneUnlockInfoNotify.newBuilder()
 				.addUnlockInfos(SceneUnlockInfo.newBuilder().setSceneId(1))
-				.addUnlockInfos(SceneUnlockInfo.newBuilder().setSceneId(3))
-				.addUnlockInfos(SceneUnlockInfo.newBuilder().setSceneId(4))
+				.addUnlockInfos(SceneUnlockInfo.newBuilder().setSceneId(3).addSceneTagIdList(102).addSceneTagIdList(113).addSceneTagIdList(117))
+				.addUnlockInfos(SceneUnlockInfo.newBuilder().setSceneId(4).addSceneTagIdList(106).addSceneTagIdList(109))
 				.addUnlockInfos(SceneUnlockInfo.newBuilder().setSceneId(5))
 				.addUnlockInfos(SceneUnlockInfo.newBuilder().setSceneId(6))
 				.addUnlockInfos(SceneUnlockInfo.newBuilder().setSceneId(7))

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

@@ -13,11 +13,11 @@ public class PacketStoreWeightLimitNotify extends GenshinPacket {
 
 		StoreWeightLimitNotify p = StoreWeightLimitNotify.newBuilder()
 				.setStoreType(StoreType.StorePack)
-				.setWeightLimit(Grasscutter.getConfig().getServerOptions().InventoryLimitAll)
-				.setWeaponCountLimit(Grasscutter.getConfig().getServerOptions().InventoryLimitWeapon)
-				.setReliquaryCountLimit(Grasscutter.getConfig().getServerOptions().InventoryLimitRelic)
-				.setMaterialCountLimit(Grasscutter.getConfig().getServerOptions().InventoryLimitMaterial)
-				.setFurnitureCountLimit(Grasscutter.getConfig().getServerOptions().InventoryLimitFurniture)
+				.setWeightLimit(Grasscutter.getConfig().getGameServerOptions().InventoryLimitAll)
+				.setWeaponCountLimit(Grasscutter.getConfig().getGameServerOptions().InventoryLimitWeapon)
+				.setReliquaryCountLimit(Grasscutter.getConfig().getGameServerOptions().InventoryLimitRelic)
+				.setMaterialCountLimit(Grasscutter.getConfig().getGameServerOptions().InventoryLimitMaterial)
+				.setFurnitureCountLimit(Grasscutter.getConfig().getGameServerOptions().InventoryLimitFurniture)
 				.build();
 		
 		this.setData(p);

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

@@ -14,7 +14,7 @@ public class PacketWorldPlayerLocationNotify extends GenshinPacket {
 		WorldPlayerLocationNotify.Builder proto = WorldPlayerLocationNotify.newBuilder();
 		
 		for (GenshinPlayer p : world.getPlayers()) {
-			proto.addPlayerLocList(p.getPlayerLocationInfo());
+			proto.addPlayerLocList(p.getWorldPlayerLocationInfo());
 		}
 		
 		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/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

run.cmd → start.cmd

@@ -4,30 +4,54 @@
 
 @if "%DEBUG%" == "" echo off
 pushd %~dp0
+set CUR_PATH=%~dp0
 title Grasscutter
-call :LOG [INFO] Grasscutter
+call :LOG [INFO] Welcome to Grasscutter
+call :LOG [INFO] To proper exit this console, use [Ctrl + C] and enter N not Y.
+call :LOG [INFO]
 call :LOG [INFO] Initializing...
 
-@rem This will not work if your java or mitmproxy is in a different location, plugin as necessary
-@rem this just saves you from changing your PATH
-set JAVA_PATH=C:\Program Files\Java\jdk1.8.0_202\
-set MITMPROXY_PATH=%~dp0
-set PROXY_SCRIPT=proxy
-@rem TODO: MongoDB integration
-set SERVER_PATH=%~dp0
+set CONFIG=start_config
+
+set JAVA_PATH=DO_NOT_CHECK_PATH
+set MITMDUMP_PATH=DO_NOT_CHECK_PATH
+set MONGODB_PATH=DO_NOT_CHECK_PATH
+
+set SERVER_JAR_PATH=%CUR_PATH%
+set DATABASE_STORAGE_PATH=%CUR_PATH%resources\Database
+
+set SERVER_JAR_NAME=grasscutter.jar
+set PROXY_SCRIPT_NAME=proxy
+
+if exist "%CUR_PATH%%CONFIG%.cmd" (
+	call "%CUR_PATH%%CONFIG%.cmd" >nul 2>nul
+)
+
+if not "%JAVA_PATH%" == "DO_NOT_CHECK_PATH" (
+	if not exist "%JAVA_PATH%java.exe" (
+		call :LOG [ERROR] Java not found.
+		goto :EXIT
+	)
+) else set JAVA_PATH=
+if not exist "%SERVER_PATH%grasscutter.jar" (
+	call :LOG [ERROR] Server jar not found.
+	goto :EXIT
+)
 
 @rem mitmproxy not found, server only
-if not exist "%MITMPROXY_PATH%mitmdump.exe" (
-	call :LOG [WARN] mitmproxy not found, server only mode.
+if not "%MITMDUMP_PATH%" == "DO_NOT_CHECK_PATH" (
+	if not exist "%MITMDUMP_PATH%mitmdump.exe" (
+		call :LOG [WARN] mitmdump not found, server only mode.
 		goto :SERVER
 	)
+) else set MITMDUMP_PATH=
 @rem proxy script not found, server only
-if not exist "%PROXY_SCRIPT%.py" (
-	if not exist "%PROXY_SCRIPT%.pyc" (
+if not exist "%PROXY_SCRIPT_NAME%.py" (
+	if not exist "%PROXY_SCRIPT_NAME%.pyc" (
 		call :LOG [WARN] Missing proxy script or compiled proxy script, server only mode.
 		goto :SERVER
-	) else set PROXY_SCRIPT=%PROXY_SCRIPT%.pyc
-) else set PROXY_SCRIPT=%PROXY_SCRIPT%.py
+	) else set PROXY_SCRIPT_NAME=%PROXY_SCRIPT_NAME%.pyc
+) else set PROXY_SCRIPT_NAME=%PROXY_SCRIPT_NAME%.py
 
 :PROXY
 @rem UAC Administrator privileges
@@ -40,31 +64,39 @@ if not exist "%PROXY_SCRIPT%.py" (
 	exit /b
 )
 
+call :LOG [INFO] Starting proxy daemon...
+
 set PROXY=true
+
 @rem Store original proxy settings
 for /f "tokens=2*" %%a in ('reg query "HKCU\Software\Microsoft\Windows\CurrentVersion\Internet Settings" /v ProxyEnable 2^>nul') do set "ORIG_PROXY_ENABLE=%%b"
 for /f "tokens=2*" %%a in ('reg query "HKCU\Software\Microsoft\Windows\CurrentVersion\Internet Settings" /v ProxyServer 2^>nul') do set "ORIG_PROXY_SERVER=%%b"
 
-call :LOG [INFO] Starting proxy daemon...
 @rem TODO: External proxy when ORIG_PROXY_ENABLE == 0x1
-start /min "" "%MITMPROXY_PATH%mitmdump.exe" -s %PROXY_SCRIPT% --ssl-insecure
+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"
+"%temp%\proxy.vbs"
+del /f /q "%temp%\proxy.vbs" >nul 2>nul
 
-@rem CA certificate for possible HTTPS scheme
+@rem CA certificate for HTTPS scheme
 call :LOG [INFO] Waiting for CA certificate generation...
 set CA_CERT_FILE="%USERPROFILE%\.mitmproxy\mitmproxy-ca-cert.cer"
 
-set /A TIMEOUT_COUNT=0
+set /a TIMEOUT_COUNT=0
 
 :CERT_CA_CHECK
 if not exist %CA_CERT_FILE% (
-	timeout /T 1 >nul 2>nul
-	set /A TIMEOUT_COUNT+=1
+	timeout /t 1 >nul 2>nul
+	set /a TIMEOUT_COUNT+=1
 	goto CERT_CA_CHECK
 )
 :EXTRA_TIMEOUT
 if %TIMEOUT_COUNT% LEQ 2 (
-	timeout /T 1 >nul 2>nul
-	set /A TIMEOUT_COUNT+=1
+	timeout /t 1 >nul 2>nul
+	set /a TIMEOUT_COUNT+=1
 	goto EXTRA_TIMEOUT
 )
 call :LOG [INFO] Adding CA certificate to store...
@@ -75,21 +107,39 @@ reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Internet Settings" /v Pr
 reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Internet Settings" /v ProxyServer /d "127.0.0.1:8080" /f >nul 2>nul
 
 :SERVER
-if not exist "%JAVA_PATH%bin\java.exe" (
-	call :LOG [ERROR] Java not found.
-	goto :EXIT
+if not "%MONGODB_PATH%" == "DO_NOT_CHECK_PATH" (
+	if not exist "%MONGODB_PATH%mongod.exe" (
+		call :LOG [WARN] MongoDB daemon not found, server only mode.
+		goto :GAME
 	)
-if not exist "%SERVER_PATH%grasscutter.jar" (
-	call :LOG [ERROR] Server jar not found.
-	goto :EXIT
+) else set MONGODB_PATH=
+call :LOG [INFO] Starting MongoDB daemon...
+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
+
+:GAME
 call :LOG [INFO] Starting server...
-"%JAVA_PATH%bin\java.exe" -jar "%SERVER_PATH%grasscutter.jar"
+"%JAVA_PATH%java.exe" -jar "%SERVER_PATH%grasscutter.jar"
 call :LOG [INFO] Server stopped
 
 :EXIT
+if "%DATABASE%" == "" (
+	call :LOG [INFO] MongoDB daemon not started, no need to clean up.
+) else (
+	call :LOG [INFO] Shutting down MongoDB daemon...
+	taskkill /t /f /im mongod.exe >nul 2>nul
+)
 if "%PROXY%" == "" (
-	call :LOG [INFO] Proxy not started, no need to clean up.
+	call :LOG [INFO] Proxy daemon not started, no need to clean up.
 ) else (
 	call :LOG [INFO] Restoring network settings...
 
@@ -100,7 +150,6 @@ if "%PROXY%" == "" (
 	taskkill /t /f /im mitmdump.exe >nul 2>nul
 
 	call :LOG [INFO] Removing CA certificate...
-
 	for /F "tokens=2" %%s in ('certutil -dump %CA_CERT_FILE% ^| findstr ^"^sha1^"') do (
 		set SERIAL=%%s
 	)

start_config.cmd

+@rem
+@rem Copyright (C) 2002-2022 MlgmXyysd All Rights Reserved.
+@rem
+
+@echo off
+pushd %~dp0
+set CUR_PATH=%~dp0
+
+@rem This will not work if your java or mitmproxy is in a different location, plugin as necessary
+@rem this just saves you from changing your PATH
+
+@rem Executable Path
+@rem Note: Fill DO_NOT_CHECK_PATH if you need to run it from PATH
+@rem without detecting whether the executable file exists
+set JAVA_PATH=C:\Program Files\Java\jdk1.8.0_202\bin\
+set MITMDUMP_PATH=%CUR_PATH%
+set MONGODB_PATH=%CUR_PATH%
+
+@rem Utility Path
+set SERVER_JAR_PATH=%CUR_PATH%
+set DATABASE_STORAGE_PATH=%CUR_PATH%resources\Database
+
+@rem Utility Name
+set SERVER_JAR_NAME=grasscutter.jar
+set PROXY_SCRIPT_NAME=proxy
\ No newline at end of file