Skip to content

Commit 8e6ac94

Browse files
authored
fix: 安装整合包部分任务未正确归类 (#5922)
1 parent 20e321f commit 8e6ac94

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

HMCL/src/main/java/org/jackhuang/hmcl/game/ModpackHelper.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,10 @@
5151
import java.nio.file.Files;
5252
import java.nio.file.Path;
5353
import java.nio.file.Paths;
54-
import java.util.*;
54+
import java.util.List;
55+
import java.util.Map;
56+
import java.util.Objects;
57+
import java.util.Optional;
5558
import java.util.stream.Stream;
5659

5760
import static org.jackhuang.hmcl.util.Lang.mapOf;
@@ -167,7 +170,7 @@ public static Task<?> getInstallTask(Profile profile, ServerModpackManifest mani
167170

168171
return new ServerModpackRemoteInstallTask(profile.getDependency(), manifest, name)
169172
.whenComplete(Schedulers.defaultScheduler(), success, failure)
170-
.withStagesHints("hmcl.modpack", "hmcl.modpack.download");
173+
.withStagesHints(new Task.StagesHint("hmcl.modpack"), new Task.StagesHint("hmcl.modpack.download", List.of("hmcl.install.assets", "hmcl.install.libraries")));
171174
}
172175

173176
public static boolean isExternalGameNameConflicts(String name) {
@@ -211,24 +214,24 @@ public static Task<?> getInstallTask(Profile profile, Path zipFile, String name,
211214
return modpack.getInstallTask(profile.getDependency(), zipFile, name, iconUrl)
212215
.whenComplete(Schedulers.defaultScheduler(), success, failure)
213216
.thenComposeAsync(createMultiMCPostInstallTask(profile, (MultiMCInstanceConfiguration) modpack.getManifest(), name))
214-
.withStagesHints("hmcl.modpack", "hmcl.modpack.download");
217+
.withStagesHints(new Task.StagesHint("hmcl.modpack"), new Task.StagesHint("hmcl.modpack.download", List.of("hmcl.install.assets", "hmcl.install.libraries")));
215218
else if (modpack.getManifest() instanceof McbbsModpackManifest)
216219
return modpack.getInstallTask(profile.getDependency(), zipFile, name, iconUrl)
217220
.whenComplete(Schedulers.defaultScheduler(), success, failure)
218221
.thenComposeAsync(createMcbbsPostInstallTask(profile, (McbbsModpackManifest) modpack.getManifest(), name))
219-
.withStagesHints("hmcl.modpack", "hmcl.modpack.download");
222+
.withStagesHints(new Task.StagesHint("hmcl.modpack"), new Task.StagesHint("hmcl.modpack.download", List.of("hmcl.install.assets", "hmcl.install.libraries")));
220223
else
221224
return modpack.getInstallTask(profile.getDependency(), zipFile, name, iconUrl)
222225
.whenComplete(Schedulers.javafx(), success, failure)
223-
.withStagesHints("hmcl.modpack", "hmcl.modpack.download");
226+
.withStagesHints(new Task.StagesHint("hmcl.modpack"), new Task.StagesHint("hmcl.modpack.download", List.of("hmcl.install.assets", "hmcl.install.libraries")));
224227
}
225228

226229
public static Task<Void> getUpdateTask(Profile profile, ServerModpackManifest manifest, Charset charset, String name, ModpackConfiguration<?> configuration) throws UnsupportedModpackException {
227230
switch (configuration.getType()) {
228231
case ServerModpackRemoteInstallTask.MODPACK_TYPE:
229232
return new ModpackUpdateTask(profile.getRepository(), name, new ServerModpackRemoteInstallTask(profile.getDependency(), manifest, name))
230233
.thenComposeAsync(profile.getRepository().refreshVersionsAsync())
231-
.withStagesHints("hmcl.modpack", "hmcl.modpack.download");
234+
.withStagesHints(new Task.StagesHint("hmcl.modpack"), new Task.StagesHint("hmcl.modpack.download", List.of("hmcl.install.assets", "hmcl.install.libraries")));
232235
default:
233236
throw new UnsupportedModpackException();
234237
}

0 commit comments

Comments
 (0)