AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-09-13 05:46:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1939 (#2352)

Browse Source
This commit is contained in:
zkitefly 2023-07-06 23:19:54 +08:00 committed by GitHub
parent 648b671210
commit 097a8eaf26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
HMCLCore/src/main/java/org/jackhuang/hmcl/mod/multimc/MultiMCModpackInstallTask.java
View File

@ -134,12 +134,20 @@ public final class MultiMCModpackInstallTask extends Task<Void> {
String subDirectory; String subDirectory;
try (FileSystem fs = CompressingUtils.readonly(zipFile.toPath()).setEncoding(modpack.getEncoding()).build()) { try (FileSystem fs = CompressingUtils.readonly(zipFile.toPath()).setEncoding(modpack.getEncoding()).build()) {
if (Files.exists(fs.getPath("/" + manifest.getName() + "/.minecraft"))) { // /.minecraft
if (Files.exists(fs.getPath("/.minecraft"))) {
subDirectory = "/.minecraft";
// /minecraft
} else if (Files.exists(fs.getPath("/minecraft"))) {
subDirectory = "/minecraft";
// /[name]/.minecraft
} else if (Files.exists(fs.getPath("/" + manifest.getName() + "/.minecraft"))) {
subDirectory = "/" + manifest.getName() + "/.minecraft"; subDirectory = "/" + manifest.getName() + "/.minecraft";
// /[name]/minecraft
} else if (Files.exists(fs.getPath("/" + manifest.getName() + "/minecraft"))) { } else if (Files.exists(fs.getPath("/" + manifest.getName() + "/minecraft"))) {
subDirectory = "/" + manifest.getName() + "/minecraft"; subDirectory = "/" + manifest.getName() + "/minecraft";
} else { } else {
subDirectory = "/" + manifest.getName() + "/minecraft"; subDirectory = "/" + manifest.getName() + "/.minecraft";
} }
} }