Skip to content

fix: 通过 cf / mr 直接安装整合包页面返回有一个多余整合包安装选择页面 #5556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Glavo merged 2 commits into from
Feb 20, 2026
Merged

fix: 通过 cf / mr 直接安装整合包页面返回有一个多余整合包安装选择页面 #5556

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aaa6541
fix: 通过 cf / mr 直接安装整合包页面返回有一个多余整合包安装选择页面
CiiLu Feb 17, 2026
317e26e
update
Glavo Feb 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 23 additions & 12 deletions HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackInstallWizardProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,20 +145,31 @@ public Object finish(SettingsMap settings) {
return finishModpackInstallingAsync(settings);
}

private static Node createModpackInstallPage(WizardController controller) {
if (controller.getSettings().containsKey(LocalModpackPage.MODPACK_FILE))
return new LocalModpackPage(controller);
else if (controller.getSettings().containsKey(RemoteModpackPage.MODPACK_SERVER_MANIFEST))
return new RemoteModpackPage(controller);
else
throw new IllegalArgumentException();
}

@Override
public Node createPage(WizardController controller, int step, SettingsMap settings) {
switch (step) {
case 0:
return new ModpackSelectionPage(controller);
case 1:
if (controller.getSettings().containsKey(LocalModpackPage.MODPACK_FILE))
return new LocalModpackPage(controller);
else if (controller.getSettings().containsKey(RemoteModpackPage.MODPACK_SERVER_MANIFEST))
return new RemoteModpackPage(controller);
else
throw new IllegalArgumentException();
default:
throw new IllegalStateException("error step " + step + ", settings: " + settings + ", pages: " + controller.getPages());
boolean hasSource = controller.getSettings().containsKey(LocalModpackPage.MODPACK_FILE) || settings.containsKey(RemoteModpackPage.MODPACK_SERVER_MANIFEST);
if (hasSource) {
return switch (step) {
case 0 -> createModpackInstallPage(controller);
default -> throw new IllegalStateException(
"error step " + step + ", settings: " + settings + ", pages: " + controller.getPages());
};
} else {
return switch (step) {
case 0 -> new ModpackSelectionPage(controller);
case 1 -> createModpackInstallPage(controller);
default -> throw new IllegalStateException(
"error step " + step + ", settings: " + settings + ", pages: " + controller.getPages());
};
}
}

Expand Down