Compare commits

...
2 changed files with 236 additions and 108 deletions

No files matched your search

+190 -88
View File
@@ -781,17 +781,6 @@
}
}
},
"org.lwjgl:lwjgl:3.4.1": {
"name": "org.lwjgl:lwjgl:3.4.1",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl/3.4.1/lwjgl-3.4.1.jar",
"url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl/3.4.1/lwjgl-3.4.1.jar",
"sha1": "6105690714874b995aa7812e4f7732a21109276c",
"size": 1157957
}
}
},
"org.lwjgl:lwjgl:3.4.1:natives-linux": {
"name": "org.lwjgl:lwjgl:3.4.1:natives-linux-arm64",
"downloads": {
@@ -803,17 +792,6 @@
}
}
},
"org.lwjgl:lwjgl-jemalloc:3.4.1": {
"name": "org.lwjgl:lwjgl-jemalloc:3.4.1",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-jemalloc/3.4.1/lwjgl-jemalloc-3.4.1.jar",
"url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-jemalloc/3.4.1/lwjgl-jemalloc-3.4.1.jar",
"sha1": "16b663092854fc6adfe0a941e61cae2bb2e437b6",
"size": 47872
}
}
},
"org.lwjgl:lwjgl-jemalloc:3.4.1:natives-linux": {
"name": "org.lwjgl:lwjgl-jemalloc:3.4.1:natives-linux-arm64",
"downloads": {
@@ -825,17 +803,6 @@
}
}
},
"org.lwjgl:lwjgl-openal:3.4.1": {
"name": "org.lwjgl:lwjgl-openal:3.4.1",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-openal/3.4.1/lwjgl-openal-3.4.1.jar",
"url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-openal/3.4.1/lwjgl-openal-3.4.1.jar",
"sha1": "8508bd60589de0539aa465b78fcf838efd07ae9a",
"size": 153919
}
}
},
"org.lwjgl:lwjgl-openal:3.4.1:natives-linux": {
"name": "org.lwjgl:lwjgl-openal:3.4.1:natives-linux-arm64",
"downloads": {
@@ -847,17 +814,6 @@
}
}
},
"org.lwjgl:lwjgl-opengl:3.4.1": {
"name": "org.lwjgl:lwjgl-opengl:3.4.1",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-opengl/3.4.1/lwjgl-opengl-3.4.1.jar",
"url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-opengl/3.4.1/lwjgl-opengl-3.4.1.jar",
"sha1": "830412cab823c029cda6b9729f9d2ed36cf79959",
"size": 937660
}
}
},
"org.lwjgl:lwjgl-opengl:3.4.1:natives-linux": {
"name": "org.lwjgl:lwjgl-opengl:3.4.1:natives-linux-arm64",
"downloads": {
@@ -869,17 +825,6 @@
}
}
},
"org.lwjgl:lwjgl-glfw:3.4.1": {
"name": "org.lwjgl:lwjgl-glfw:3.4.1",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-glfw/3.4.1/lwjgl-glfw-3.4.1.jar",
"url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-glfw/3.4.1/lwjgl-glfw-3.4.1.jar",
"sha1": "a782b1ddd175c9107bf300fd92920579ea65e2a4",
"size": 151893
}
}
},
"org.lwjgl:lwjgl-glfw:3.4.1:natives-linux": {
"name": "org.lwjgl:lwjgl-glfw:3.4.1:natives-linux-arm64",
"downloads": {
@@ -891,17 +836,6 @@
}
}
},
"org.lwjgl:lwjgl-stb:3.4.1": {
"name": "org.lwjgl:lwjgl-stb:3.4.1",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-stb/3.4.1/lwjgl-stb-3.4.1.jar",
"url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-stb/3.4.1/lwjgl-stb-3.4.1.jar",
"sha1": "f077c3dafc31924fbe8acb0b913f08977ba27f8e",
"size": 142927
}
}
},
"org.lwjgl:lwjgl-stb:3.4.1:natives-linux": {
"name": "org.lwjgl:lwjgl-stb:3.4.1:natives-linux-arm64",
"downloads": {
@@ -913,17 +847,6 @@
}
}
},
"org.lwjgl:lwjgl-tinyfd:3.4.1": {
"name": "org.lwjgl:lwjgl-tinyfd:3.4.1",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-tinyfd/3.4.1/lwjgl-tinyfd-3.4.1.jar",
"url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-tinyfd/3.4.1/lwjgl-tinyfd-3.4.1.jar",
"sha1": "562697d40dbd2ed0424bf24dcf65d51170f81adf",
"size": 15931
}
}
},
"org.lwjgl:lwjgl-tinyfd:3.4.1:natives-linux": {
"name": "org.lwjgl:lwjgl-tinyfd:3.4.1:natives-linux-arm64",
"downloads": {
@@ -935,17 +858,6 @@
}
}
},
"org.lwjgl:lwjgl-freetype:3.4.1": {
"name": "org.lwjgl:lwjgl-freetype:3.4.1",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-freetype/3.4.1/lwjgl-freetype-3.4.1.jar",
"url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-freetype/3.4.1/lwjgl-freetype-3.4.1.jar",
"sha1": "caa75a37e857efc9b0686e434d708d6420c5b6ea",
"size": 464342
}
}
},
"org.lwjgl:lwjgl-freetype:3.4.1:natives-linux": {
"name": "org.lwjgl:lwjgl-freetype:3.4.1:natives-linux-arm64",
"downloads": {
@@ -957,6 +869,39 @@
}
}
},
"org.lwjgl:lwjgl-shaderc:3.4.1:natives-linux": {
"name": "org.lwjgl:lwjgl-shaderc:3.4.1:natives-linux-arm64",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-shaderc/3.4.1/lwjgl-shaderc-3.4.1-natives-linux-arm64.jar",
"url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-shaderc/3.4.1/lwjgl-shaderc-3.4.1-natives-linux-arm64.jar",
"sha1": "bc5c99b2eb7e2109c6db21cfced15a6851f8111b",
"size": 3397476
}
}
},
"org.lwjgl:lwjgl-spvc:3.4.1:natives-linux": {
"name": "org.lwjgl:lwjgl-spvc:3.4.1:natives-linux-arm64",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-spvc/3.4.1/lwjgl-spvc-3.4.1-natives-linux-arm64.jar",
"url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-spvc/3.4.1/lwjgl-spvc-3.4.1-natives-linux-arm64.jar",
"sha1": "e2eaa8f516d43fe11b8253e6243b3d8e1315c9c8",
"size": 1139919
}
}
},
"org.lwjgl:lwjgl-vma:3.4.1:natives-linux": {
"name": "org.lwjgl:lwjgl-vma:3.4.1:natives-linux-arm64",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-vma/3.4.1/lwjgl-vma-3.4.1-natives-linux-arm64.jar",
"url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-vma/3.4.1/lwjgl-vma-3.4.1-natives-linux-arm64.jar",
"sha1": "de40d43c5947c4a4f91376af8f2c00e5396cc109",
"size": 59715
}
}
},
"org.lwjgl.lwjgl:lwjgl-platform:2.9.0:natives": {
"name": "org.glavo.hmcl:lwjgl2-natives:2.9.3",
"downloads": {
@@ -2689,6 +2634,9 @@
"org.lwjgl:lwjgl-stb:3.4.1:natives-linux": null,
"org.lwjgl:lwjgl-tinyfd:3.4.1:natives-linux": null,
"org.lwjgl:lwjgl-freetype:3.4.1:natives-linux": null,
"org.lwjgl:lwjgl-shaderc:3.4.1:natives-linux": null,
"org.lwjgl:lwjgl-spvc:3.4.1:natives-linux": null,
"org.lwjgl:lwjgl-vma:3.4.1:natives-linux": null,
"net.java.dev.jna:jna:5.8.0": {
"name": "net.java.dev.jna:jna:5.13.0",
"downloads": {
@@ -4359,6 +4307,83 @@
}
}
},
"org.lwjgl:lwjgl-shaderc:3.4.1": {
"name": "org.lwjgl:lwjgl-shaderc:3.4.1",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-shaderc/3.4.1/lwjgl-shaderc-3.4.1.jar",
"url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-shaderc/3.4.1/lwjgl-shaderc-3.4.1.jar",
"sha1": "5c02c88f0d879529014c78463b76f43fdecfd272",
"size": 153051
}
}
},
"org.lwjgl:lwjgl-shaderc:3.4.1:natives-linux": {
"name": "org.lwjgl:lwjgl-shaderc:3.4.1:natives-linux-riscv64",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-shaderc/3.4.1/lwjgl-shaderc-3.4.1-natives-linux-riscv64.jar",
"url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-shaderc/3.4.1/lwjgl-shaderc-3.4.1-natives-linux-riscv64.jar",
"sha1": "5598b0b86d4b3ca0ae78817719d5814efb9c7a77",
"size": 3147886
}
}
},
"org.lwjgl:lwjgl-spvc:3.4.1": {
"name": "org.lwjgl:lwjgl-spvc:3.4.1",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-spvc/3.4.1/lwjgl-spvc-3.4.1.jar",
"url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-spvc/3.4.1/lwjgl-spvc-3.4.1.jar",
"sha1": "188553592e97b5ab2dba54a1b403ee80b48dad4c",
"size": 148285
}
}
},
"org.lwjgl:lwjgl-spvc:3.4.1:natives-linux": {
"name": "org.lwjgl:lwjgl-spvc:3.4.1:natives-linux-riscv64",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-spvc/3.4.1/lwjgl-spvc-3.4.1-natives-linux-riscv64.jar",
"url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-spvc/3.4.1/lwjgl-spvc-3.4.1-natives-linux-riscv64.jar",
"sha1": "ea09f614c961b14962e4cc55a05c6767f9440f3f",
"size": 1215586
}
}
},
"org.lwjgl:lwjgl-vma:3.4.1": {
"name": "org.lwjgl:lwjgl-vma:3.4.1",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-vma/3.4.1/lwjgl-vma-3.4.1.jar",
"url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-vma/3.4.1/lwjgl-vma-3.4.1.jar",
"sha1": "2c54ce10154feb1ede4d23c5947438cdbfdcc003",
"size": 109209
}
}
},
"org.lwjgl:lwjgl-vma:3.4.1:natives-linux": {
"name": "org.lwjgl:lwjgl-vma:3.4.1:natives-linux-riscv64",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-vma/3.4.1/lwjgl-vma-3.4.1-natives-linux-riscv64.jar",
"url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-vma/3.4.1/lwjgl-vma-3.4.1-natives-linux-riscv64.jar",
"sha1": "9616440ee3cb2cfeacd99a61eefded856b5d7efe",
"size": 57091
}
}
},
"org.lwjgl:lwjgl-vulkan:3.4.1": {
"name": "org.lwjgl:lwjgl-vulkan:3.4.1",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-vulkan/3.4.1/lwjgl-vulkan-3.4.1.jar",
"url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-vulkan/3.4.1/lwjgl-vulkan-3.4.1.jar",
"sha1": "d0601fdc38890755e5638048c14cc0f7b990964b",
"size": 8356700
}
}
},
"com.github.oshi:oshi-core:6.6.5": {
"name": "com.github.oshi:oshi-core:6.8.0",
"downloads": {
@@ -6325,6 +6350,83 @@
}
}
},
"org.lwjgl:lwjgl-shaderc:3.4.1": {
"name": "org.lwjgl:lwjgl-shaderc:3.4.1",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-shaderc/3.4.1/lwjgl-shaderc-3.4.1.jar",
"url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-shaderc/3.4.1/lwjgl-shaderc-3.4.1.jar",
"sha1": "5c02c88f0d879529014c78463b76f43fdecfd272",
"size": 153051
}
}
},
"org.lwjgl:lwjgl-shaderc:3.4.1:natives-linux": {
"name": "org.lwjgl:lwjgl-shaderc:3.4.1:natives-freebsd",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-shaderc/3.4.1/lwjgl-shaderc-3.4.1-natives-freebsd.jar",
"url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-shaderc/3.4.1/lwjgl-shaderc-3.4.1-natives-freebsd.jar",
"sha1": "872460f4b007ed3a13a2d311e90bda5370406fc8",
"size": 2953522
}
}
},
"org.lwjgl:lwjgl-spvc:3.4.1": {
"name": "org.lwjgl:lwjgl-spvc:3.4.1",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-spvc/3.4.1/lwjgl-spvc-3.4.1.jar",
"url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-spvc/3.4.1/lwjgl-spvc-3.4.1.jar",
"sha1": "188553592e97b5ab2dba54a1b403ee80b48dad4c",
"size": 148285
}
}
},
"org.lwjgl:lwjgl-spvc:3.4.1:natives-linux": {
"name": "org.lwjgl:lwjgl-spvc:3.4.1:natives-freebsd",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-spvc/3.4.1/lwjgl-spvc-3.4.1-natives-freebsd.jar",
"url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-spvc/3.4.1/lwjgl-spvc-3.4.1-natives-freebsd.jar",
"sha1": "7a3d0e4a74f022b3196ecd33d9ebffafec7767f4",
"size": 1094646
}
}
},
"org.lwjgl:lwjgl-vma:3.4.1": {
"name": "org.lwjgl:lwjgl-vma:3.4.1",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-vma/3.4.1/lwjgl-vma-3.4.1.jar",
"url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-vma/3.4.1/lwjgl-vma-3.4.1.jar",
"sha1": "2c54ce10154feb1ede4d23c5947438cdbfdcc003",
"size": 109209
}
}
},
"org.lwjgl:lwjgl-vma:3.4.1:natives-linux": {
"name": "org.lwjgl:lwjgl-vma:3.4.1:natives-freebsd",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-vma/3.4.1/lwjgl-vma-3.4.1-natives-freebsd.jar",
"url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-vma/3.4.1/lwjgl-vma-3.4.1-natives-freebsd.jar",
"sha1": "85851480bef99188bf9a84b36cbe862cb4a52016",
"size": 62862
}
}
},
"org.lwjgl:lwjgl-vulkan:3.4.1": {
"name": "org.lwjgl:lwjgl-vulkan:3.4.1",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-vulkan/3.4.1/lwjgl-vulkan-3.4.1.jar",
"url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-vulkan/3.4.1/lwjgl-vulkan-3.4.1.jar",
"sha1": "d0601fdc38890755e5638048c14cc0f7b990964b",
"size": 8356700
}
}
},
"net.java.jinput:jinput-platform:2.0.5:natives": null,
"com.mojang:text2speech:1.10.3:natives": null,
"com.mojang:text2speech:1.11.3:natives": null,
@@ -28,6 +28,7 @@ import org.jackhuang.hmcl.util.io.FileUtils;
import org.jackhuang.hmcl.util.io.Unzipper;
import org.jackhuang.hmcl.util.platform.*;
import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
import org.jetbrains.annotations.Nullable;
import java.io.*;
import java.nio.charset.Charset;
@@ -296,7 +297,36 @@ public class DefaultLauncher extends Launcher {
}
configuration.put("${natives_directory}", nativeFolderPath);
res.addAll(Arguments.parseArguments(version.getArguments().map(Arguments::getJvm).orElseGet(this::getDefaultJVMArguments), configuration));
Path javaNativeFolder = FileUtils.toAbsolute(nativeFolder);
@Nullable List<Argument> jvmArguments = version.getArguments().map(Arguments::getJvm).orElse(null);
if (jvmArguments != null) {
for (Argument jvmArgument : jvmArguments) {
if (jvmArgument instanceof StringArgument stringArgument
&& stringArgument.getArgument().startsWith("-Djava.library.path=")) {
// We conservatively handle parameters like "-Djava.library.path=${natives_directory}/java"
// to avoid extracting native libraries to unexpected locations.
String prefix = "-Djava.library.path=${natives_directory}/";
if (stringArgument.getArgument().startsWith(prefix)) {
try {
String subDir = stringArgument.getArgument().substring(prefix.length());
Path actualNativeFolder = FileUtils.toAbsolute(javaNativeFolder.resolve(subDir));
if (actualNativeFolder.startsWith(javaNativeFolder)) {
javaNativeFolder = actualNativeFolder;
}
} catch (IllegalArgumentException ignored) {
}
}
break;
}
}
}
res.addAll(Arguments.parseArguments(Objects.requireNonNullElseGet(jvmArguments, this::getDefaultJVMArguments), configuration));
Arguments argumentsFromAuthInfo = authInfo.getLaunchArguments(options);
if (argumentsFromAuthInfo != null && argumentsFromAuthInfo.getJvm() != null && !argumentsFromAuthInfo.getJvm().isEmpty())
res.addAll(Arguments.parseArguments(argumentsFromAuthInfo.getJvm(), configuration));
@@ -368,7 +398,7 @@ public class DefaultLauncher extends Launcher {
res.addAllWithoutParsing(Arguments.parseStringArguments(options.getGameArguments(), configuration));
res.removeIf(it -> getForbiddens().containsKey(it) && getForbiddens().get(it).get());
return new Command(res, tempNativeFolder, encoding);
return new Command(res, tempNativeFolder, javaNativeFolder, encoding);
}
public Map<String, Boolean> getFeatures() {
@@ -405,6 +435,8 @@ public class DefaultLauncher extends Launcher {
}
public void decompressNatives(Path destination) throws NotDecompressingNativesException {
LOG.info("Decompress native libraries to " + destination);
try {
FileUtils.cleanDirectoryQuietly(destination);
for (Library library : version.getLibraries())
@@ -523,7 +555,7 @@ public class DefaultLauncher extends Launcher {
}
if (options.getNativesDirType() == NativesDirectoryType.VERSION_FOLDER) {
decompressNatives(nativeFolder);
decompressNatives(command.javaNativeFolder);
}
if (isUsingLog4j())
@@ -633,13 +665,6 @@ public class DefaultLauncher extends Launcher {
nativeFolder = Path.of(options.getNativesDir());
}
if (options.getNativesDirType() == NativesDirectoryType.VERSION_FOLDER) {
decompressNatives(nativeFolder);
}
if (isUsingLog4j())
extractLog4jConfigurationFile();
String scriptExtension = FileUtils.getExtension(scriptFile);
boolean usePowerShell = "ps1".equals(scriptExtension);
@@ -662,6 +687,12 @@ public class DefaultLauncher extends Launcher {
}
}
if (isUsingLog4j())
extractLog4jConfigurationFile();
if (options.getNativesDirType() == NativesDirectoryType.VERSION_FOLDER)
decompressNatives(commandLine.javaNativeFolder);
Files.createDirectories(scriptFile.getParent());
try (OutputStream outputStream = Files.newOutputStream(scriptFile)) {
@@ -816,15 +847,10 @@ public class DefaultLauncher extends Launcher {
}), "exit-waiter", isDaemon));
}
private static final class Command {
final CommandBuilder commandLine;
final Path tempNativeFolder;
final Charset encoding;
Command(CommandBuilder commandBuilder, Path tempNativeFolder, Charset encoding) {
this.commandLine = commandBuilder;
this.tempNativeFolder = tempNativeFolder;
this.encoding = encoding;
}
private record Command(
CommandBuilder commandLine,
@Nullable Path tempNativeFolder,
Path javaNativeFolder,
Charset encoding) {
}
}