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

Prevent from potential conflict that a MultiMC modpack has ".minecraft" and "minecraft" at the same time

Browse Source
This commit is contained in:
huanghongxun
2019-01-13 17:10:23 +08:00
parent 320e579844
commit c41737364c
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,7 +63,6 @@ public final class MultiMCModpackInstallTask extends Task {
this.name = name; this.name = name;
this.repository = dependencyManager.getGameRepository(); this.repository = dependencyManager.getGameRepository();
File run = repository.getRunDirectory(name);
File json = repository.getModpackConfiguration(name); File json = repository.getModpackConfiguration(name);
if (repository.hasVersion(name) && !json.exists()) if (repository.hasVersion(name) && !json.exists())
throw new IllegalArgumentException("Version " + name + " already exists."); throw new IllegalArgumentException("Version " + name + " already exists.");
@@ -89,6 +88,17 @@ public final class MultiMCModpackInstallTask extends Task {
if (event.isFailed()) if (event.isFailed())
repository.removeVersionFromDisk(name); repository.removeVersionFromDisk(name);
}); });
}
@Override
public List<Task> getDependencies() {
return dependencies;
}
@Override
public void preExecute() throws Exception {
File run = repository.getRunDirectory(name);
File json = repository.getModpackConfiguration(name);
ModpackConfiguration<MultiMCInstanceConfiguration> config = null; ModpackConfiguration<MultiMCInstanceConfiguration> config = null;
try { try {
@@ -102,13 +112,12 @@ public final class MultiMCModpackInstallTask extends Task {
} catch (JsonParseException | IOException ignore) { } catch (JsonParseException | IOException ignore) {
} }
dependents.add(new ModpackInstallTask<>(zipFile, run, modpack.getEncoding(), "/" + manifest.getName() + "/minecraft", any -> true, config)); try (FileSystem fs = CompressingUtils.readonly(zipFile.toPath()).setEncoding(modpack.getEncoding()).build()) {
if (Files.exists(fs.getPath("/" + manifest.getName() + "/.minecraft")))
dependents.add(new ModpackInstallTask<>(zipFile, run, modpack.getEncoding(), "/" + manifest.getName() + "/.minecraft", any -> true, config)); dependents.add(new ModpackInstallTask<>(zipFile, run, modpack.getEncoding(), "/" + manifest.getName() + "/.minecraft", any -> true, config));
else if (Files.exists(fs.getPath("/" + manifest.getName() + "/minecraft")))
dependents.add(new ModpackInstallTask<>(zipFile, run, modpack.getEncoding(), "/" + manifest.getName() + "/minecraft", any -> true, config));
} }
@Override
public List<Task> getDependencies() {
return dependencies;
} }
@Override @Override