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

feat: allow not checking modpack completion when option "Do not check game completion" is checked. Closes #1038.

Browse Source
This commit is contained in:
huanghongxun
2021-09-20 21:58:47 +08:00
parent b95119bb0e
commit e5754c70da
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java
View File

@@ -141,18 +141,22 @@ public final class LauncherHelper {
else else
return dependencyManager.checkGameCompletionAsync(version, integrityCheck); return dependencyManager.checkGameCompletionAsync(version, integrityCheck);
}), Task.composeAsync(() -> { }), Task.composeAsync(() -> {
try { if (setting.isNotCheckGame()) {
ModpackConfiguration<?> configuration = ModpackHelper.readModpackConfiguration(repository.getModpackConfiguration(selectedVersion));
if (CurseInstallTask.MODPACK_TYPE.equals(configuration.getType()))
return new CurseCompletionTask(dependencyManager, selectedVersion);
else if (ServerModpackLocalInstallTask.MODPACK_TYPE.equals(configuration.getType()))
return new ServerModpackCompletionTask(dependencyManager, selectedVersion);
else if (McbbsModpackLocalInstallTask.MODPACK_TYPE.equals(configuration.getType()))
return new McbbsModpackCompletionTask(dependencyManager, selectedVersion);
else
return null;
} catch (IOException e) {
return null; return null;
} else {
try {
ModpackConfiguration<?> configuration = ModpackHelper.readModpackConfiguration(repository.getModpackConfiguration(selectedVersion));
if (CurseInstallTask.MODPACK_TYPE.equals(configuration.getType()))
return new CurseCompletionTask(dependencyManager, selectedVersion);
else if (ServerModpackLocalInstallTask.MODPACK_TYPE.equals(configuration.getType()))
return new ServerModpackCompletionTask(dependencyManager, selectedVersion);
else if (McbbsModpackLocalInstallTask.MODPACK_TYPE.equals(configuration.getType()))
return new McbbsModpackCompletionTask(dependencyManager, selectedVersion);
else
return null;
} catch (IOException e) {
return null;
}
} }
}))).withStage("launch.state.dependencies") }))).withStage("launch.state.dependencies")
.thenComposeAsync(() -> { .thenComposeAsync(() -> {