From bac14db4329f9c95b7f8fdbe92faea3db60e653d Mon Sep 17 00:00:00 2001 From: Glavo Date: Sun, 13 Nov 2022 23:39:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E5=A4=84=E7=90=86=E5=B8=A6=E6=9C=89=20Quilt=20?= =?UTF-8?q?=E7=9A=84=20MultiMC=20=E6=95=B4=E5=90=88=E5=8C=85=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20(#1841)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix #1760: typo * export quilt info in mmc modpack --- .../jackhuang/hmcl/mod/multimc/MultiMCModpackExportTask.java | 2 ++ .../jackhuang/hmcl/mod/multimc/MultiMCModpackInstallTask.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/multimc/MultiMCModpackExportTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/multimc/MultiMCModpackExportTask.java index 0f1778a93..531054b49 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/multimc/MultiMCModpackExportTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/multimc/MultiMCModpackExportTask.java @@ -81,6 +81,8 @@ public class MultiMCModpackExportTask extends Task { components.add(new MultiMCManifest.MultiMCManifestComponent(false, false, "com.mumfrey.liteloader", liteLoaderVersion))); analyzer.getVersion(FABRIC).ifPresent(fabricVersion -> components.add(new MultiMCManifest.MultiMCManifestComponent(false, false, "net.fabricmc.fabric-loader", fabricVersion))); + analyzer.getVersion(QUILT).ifPresent(quiltVersion -> + components.add(new MultiMCManifest.MultiMCManifestComponent(false, false, "org.quiltmc.quilt-loader", quiltVersion))); MultiMCManifest mmcPack = new MultiMCManifest(1, components); zip.putTextFile(JsonUtils.GSON.toJson(mmcPack), "mmc-pack.json"); diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/multimc/MultiMCModpackInstallTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/multimc/MultiMCModpackInstallTask.java index c23d460c2..7bb19a97c 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/multimc/MultiMCModpackInstallTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/multimc/MultiMCModpackInstallTask.java @@ -90,7 +90,7 @@ public final class MultiMCModpackInstallTask extends Task { builder.version("fabric", c.getVersion()); }); - Optional quilt = manifest.getMmcPack().getComponents().stream().filter(e -> e.getUid().equals("net.quiltmc.quilt-loader")).findAny(); + Optional quilt = manifest.getMmcPack().getComponents().stream().filter(e -> e.getUid().equals("org.quiltmc.quilt-loader")).findAny(); quilt.ifPresent(c -> { if (c.getVersion() != null) builder.version("quilt", c.getVersion());