lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #2552: 对于 Minecraft 1.19+ 不应特殊处理中文路径 (#2670)

Browse Source
This commit is contained in:
Glavo
2024-01-23 11:22:54 +08:00
committed by GitHub
parent 308086b876
commit 2cad6f33f5
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java
View File

@@ -222,12 +222,15 @@ public class DefaultLauncher extends Launcher {
configuration.put("${game_assets}", gameAssets.toAbsolutePath().toString()); configuration.put("${game_assets}", gameAssets.toAbsolutePath().toString());
configuration.put("${assets_root}", gameAssets.toAbsolutePath().toString()); configuration.put("${assets_root}", gameAssets.toAbsolutePath().toString());
Optional<String> gameVersion = repository.getGameVersion(version);
// lwjgl assumes path to native libraries encoded by ASCII. // lwjgl assumes path to native libraries encoded by ASCII.
// Here is a workaround for this issue: https://github.com/HMCL-dev/HMCL/issues/1141. // Here is a workaround for this issue: https://github.com/HMCL-dev/HMCL/issues/1141.
String nativeFolderPath = nativeFolder.getAbsolutePath(); String nativeFolderPath = nativeFolder.getAbsolutePath();
Path tempNativeFolder = null; Path tempNativeFolder = null;
if ((OperatingSystem.CURRENT_OS == OperatingSystem.LINUX || OperatingSystem.CURRENT_OS == OperatingSystem.OSX) if ((OperatingSystem.CURRENT_OS == OperatingSystem.LINUX || OperatingSystem.CURRENT_OS == OperatingSystem.OSX)
&& !StringUtils.isASCII(nativeFolderPath)) { && !StringUtils.isASCII(nativeFolderPath)
&& gameVersion.isPresent() && VersionNumber.VERSION_COMPARATOR.compare(gameVersion.get(), "1.19") < 0) {
tempNativeFolder = Paths.get("/", "tmp", "hmcl-natives-" + UUID.randomUUID()); tempNativeFolder = Paths.get("/", "tmp", "hmcl-natives-" + UUID.randomUUID());
nativeFolderPath = tempNativeFolder + File.pathSeparator + nativeFolderPath; nativeFolderPath = tempNativeFolder + File.pathSeparator + nativeFolderPath;
} }
@@ -256,7 +259,7 @@ public class DefaultLauncher extends Launcher {
if (StringUtils.isNotBlank(options.getServerIp())) { if (StringUtils.isNotBlank(options.getServerIp())) {
String[] args = options.getServerIp().split(":"); String[] args = options.getServerIp().split(":");
if (VersionNumber.VERSION_COMPARATOR.compare(repository.getGameVersion(version).orElse("0.0"), "1.20") < 0) { if (VersionNumber.VERSION_COMPARATOR.compare(gameVersion.orElse("0.0"), "1.20") < 0) {
res.add("--server"); res.add("--server");
res.add(args[0]); res.add(args[0]);
res.add("--port"); res.add("--port");