From 3a2523a778b035064a433dd3eac11ab7971f103e Mon Sep 17 00:00:00 2001 From: Ciilu <109708109+Ciilu@users.noreply.github.com> Date: Sat, 2 Aug 2025 18:22:36 +0800 Subject: [PATCH 1/2] update --- .../hmcl/ui/download/ModpackInstallWizardProvider.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackInstallWizardProvider.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackInstallWizardProvider.java index cda2d5a6b..48a1b63ae 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackInstallWizardProvider.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackInstallWizardProvider.java @@ -18,11 +18,11 @@ package org.jackhuang.hmcl.ui.download; import javafx.scene.Node; -import org.jackhuang.hmcl.game.ModpackHelper; import org.jackhuang.hmcl.game.ManuallyCreatedModpackException; -import org.jackhuang.hmcl.mod.ModpackCompletionException; +import org.jackhuang.hmcl.game.ModpackHelper; import org.jackhuang.hmcl.mod.MismatchedModpackTypeException; import org.jackhuang.hmcl.mod.Modpack; +import org.jackhuang.hmcl.mod.ModpackCompletionException; import org.jackhuang.hmcl.mod.UnsupportedModpackException; import org.jackhuang.hmcl.mod.server.ServerModpackManifest; import org.jackhuang.hmcl.setting.Profile; @@ -102,7 +102,7 @@ public class ModpackInstallWizardProvider implements WizardProvider { } catch (UnsupportedModpackException | ManuallyCreatedModpackException e) { Controllers.dialog(i18n("modpack.unsupported"), i18n("message.error"), MessageType.ERROR); } catch (MismatchedModpackTypeException e) { - Controllers.dialog(i18n("modpack.mismatched_type"), i18n("message.error"), MessageType.ERROR); + Controllers.dialog(i18n("modpack.mismatched_type", e.getFound(), e.getRequired()), i18n("message.error"), MessageType.ERROR); } catch (IOException e) { Controllers.dialog(i18n("modpack.invalid"), i18n("message.error"), MessageType.ERROR); } From 5247bfc5b2a3839a965539cfa028f9cc64ed4698 Mon Sep 17 00:00:00 2001 From: Ciilu <109708109+Ciilu@users.noreply.github.com> Date: Sat, 2 Aug 2025 18:23:11 +0800 Subject: [PATCH 2/2] update --- .../hmcl/ui/download/ModpackInstallWizardProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackInstallWizardProvider.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackInstallWizardProvider.java index 48a1b63ae..f45009203 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackInstallWizardProvider.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackInstallWizardProvider.java @@ -102,7 +102,7 @@ public class ModpackInstallWizardProvider implements WizardProvider { } catch (UnsupportedModpackException | ManuallyCreatedModpackException e) { Controllers.dialog(i18n("modpack.unsupported"), i18n("message.error"), MessageType.ERROR); } catch (MismatchedModpackTypeException e) { - Controllers.dialog(i18n("modpack.mismatched_type", e.getFound(), e.getRequired()), i18n("message.error"), MessageType.ERROR); + Controllers.dialog(i18n("modpack.mismatched_type", e.getRequired(), e.getFound()), i18n("message.error"), MessageType.ERROR); } catch (IOException e) { Controllers.dialog(i18n("modpack.invalid"), i18n("message.error"), MessageType.ERROR); }