Skip to content

Fix/兼容从hmcl旧版本安装的整合包升级 #6599

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

Open
fatelove42 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix/兼容从hmcl旧版本安装的整合包升级 #6599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb6eee3
fix(modpack): allow type to be null in ModpackConfiguration for legac…
fatelove42 Aug 4, 2026
9b4eb0e
fix(modpack): read concrete modpack configuration in HMCLModpackInsta…
fatelove42 Aug 19, 2026
65e3fa3
style: remove unused import in HMCLModpackInstallTask
fatelove42 Aug 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
9 changes: 4 additions & 5 deletions HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLModpackInstallTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
*/
package org.jackhuang.hmcl.game;

import com.google.gson.JsonParseException;
import org.jackhuang.hmcl.download.DefaultDependencyManager;
import org.jackhuang.hmcl.download.LibraryAnalyzer;
import org.jackhuang.hmcl.modpack.MinecraftInstanceTask;
Expand Down Expand Up @@ -62,15 +61,15 @@ public HMCLModpackInstallTask(HMCLGameRepository repository, Path zipFile, Modpa
if (event.isFailed()) repository.removeInstanceFromDisk(this.instanceId);
});

ModpackConfiguration<Modpack> config = null;
ModpackConfiguration<?> config = null;
try {
if (Files.exists(json)) {
config = JsonUtils.fromJsonFile(json, ModpackConfiguration.typeOf(Modpack.class));
config = ModpackHelper.readModpackConfiguration(json);

if (!HMCLModpackProvider.INSTANCE.getName().equals(config.getType()))
if (config.getType() != null && !HMCLModpackProvider.INSTANCE.getName().equals(config.getType()))
throw new IllegalArgumentException("Instance " + instanceId + " is not a HMCL modpack. Cannot update this instance.");
}
} catch (JsonParseException | IOException ignore) {
} catch (IOException ignore) {
}
dependents.add(new ModpackInstallTask<>(zipFile, run, modpack.getEncoding(), Collections.singletonList("/minecraft"), it -> !"pack.json".equals(it), config));
dependents.add(new MinecraftInstanceTask<>(zipFile, modpack.getEncoding(), Collections.singletonList("/minecraft"), modpack, HMCLModpackProvider.INSTANCE, modpack.getName(), modpack.getVersion(), repository.getModpackConfiguration(this.instanceId)).withStage("hmcl.modpack"));
Expand Down
14 changes: 7 additions & 7 deletions HMCL/src/main/java/org/jackhuang/hmcl/game/ModpackHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,13 +236,13 @@ else if (modpack.getManifest() instanceof McbbsModpackManifest)
}

public static Task<Void> getUpdateTask(HMCLGameRepository repository, ServerModpackManifest manifest, Charset charset, GameInstanceID instanceId, ModpackConfiguration<?> configuration) throws UnsupportedModpackException {
switch (configuration.getType()) {
case ServerModpackRemoteInstallTask.MODPACK_TYPE:
return new ModpackUpdateTask(repository, instanceId, new ServerModpackRemoteInstallTask(repository.getDependency(), manifest, instanceId))
.thenComposeAsync(repository.refreshAsync())
.withStagesHints(new Task.StagesHint("hmcl.modpack"), new Task.StagesHint("hmcl.modpack.download", List.of("hmcl.install.assets", "hmcl.install.libraries")));
default:
throw new UnsupportedModpackException();
String type = configuration.getType();
if (ServerModpackRemoteInstallTask.MODPACK_TYPE.equals(type)) {
return new ModpackUpdateTask(repository, instanceId, new ServerModpackRemoteInstallTask(repository.getDependency(), manifest, instanceId))
.thenComposeAsync(repository.refreshAsync())
.withStagesHints(new Task.StagesHint("hmcl.modpack"), new Task.StagesHint("hmcl.modpack.download", List.of("hmcl.install.assets", "hmcl.install.libraries")));
} else {
throw new UnsupportedModpackException();
}
}

Expand Down
42 changes: 37 additions & 5 deletions HMCLCore/src/main/java/org/jackhuang/hmcl/modpack/ModpackConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;

@Immutable
public final class ModpackConfiguration<T> implements Validation {
Expand All @@ -36,7 +37,7 @@ public static <T> TypeToken<ModpackConfiguration<T>> typeOf(Class<T> clazz) {
}

private final T manifest;
private final String type;
private final @Nullable String type;
private final String name;
private final String version;
private final List<FileInformation> overrides;
Expand All @@ -45,7 +46,7 @@ public ModpackConfiguration() {
this(null, null, "", null, Collections.emptyList());
}

public ModpackConfiguration(T manifest, String type, String name, String version, List<FileInformation> overrides) {
public ModpackConfiguration(T manifest, @Nullable String type, String name, String version, List<FileInformation> overrides) {
this.manifest = manifest;
this.type = type;
this.name = name;
Expand All @@ -57,8 +58,41 @@ public T getManifest() {
return manifest;
}

@Nullable
public String getType() {
return type;
if (type != null) {
return type;
}
if (manifest instanceof ModpackManifest modpackManifest) {
return modpackManifest.getProvider().getName();
}
if (manifest instanceof Modpack modpack) {
if (modpack.getManifest() != null) {
return modpack.getManifest().getProvider().getName();
}
return "HMCL";
}
if (manifest instanceof Map<?, ?> map) {
if (map.containsKey("instanceType") || map.containsKey("components") || map.containsKey("mmcPack")) {
return "MultiMC";
}
if (map.containsKey("formatVersion") && map.containsKey("game")) {
return "Modrinth";
}
if (map.containsKey("files") && map.containsKey("minecraft")) {
return "Curse";
}
if (map.containsKey("fileApi") && !map.containsKey("manifestType")) {
return "Server";
}
if (map.containsKey("addons") || map.containsKey("manifestType")) {
return "Mcbbs";
}
if (map.containsKey("manifest") || map.containsKey("gameVersion") || map.containsKey("description")) {
return "HMCL";
Comment thread
fatelove42 marked this conversation as resolved.
}
}
return null;
}

public String getName() {
Expand Down Expand Up @@ -90,8 +124,6 @@ public List<FileInformation> getOverrides() {
public void validate() throws JsonParseException {
if (manifest == null)
throw new JsonParseException("MinecraftInstanceConfiguration missing `manifest`");
if (type == null)
throw new JsonParseException("MinecraftInstanceConfiguration missing `type`");
}
Comment on lines 124 to 127

@chatgpt-codex-connector chatgpt-codex-connector Bot Aug 4, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Infer the provider before accepting a null type

When an existing modpack.cfg omits type, this relaxed validation lets finishModpackInstallingAsync proceed, but it then calls ModpackHelper.getUpdateTask before any of the modified installer checks run. The local-file path passes null to getProviderByType and reports the pack as unsupported, while the server-manifest path switches on null and throws an uncaught NullPointerException; consequently, the legacy configurations targeted by this change still cannot be updated. The provider must be inferred or normalized before these dispatch points rather than merely allowing type to remain null.

Useful? React with 👍 / 👎.


@Immutable
Expand Down
4 changes: 2 additions & 2 deletions HMCLCore/src/main/java/org/jackhuang/hmcl/modpack/curse/CurseInstallTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ public CurseInstallTask(DefaultDependencyManager dependencyManager, Path zipFile
if (Files.exists(json)) {
config = JsonUtils.fromJsonFile(json, ModpackConfiguration.typeOf(CurseManifest.class));

if (!CurseModpackProvider.INSTANCE.getName().equals(config.getType()))
throw new IllegalArgumentException("Instance " + instanceId + " is not a Curse modpack. Cannot update this instance.");
if (config.getType() != null && !CurseModpackProvider.INSTANCE.getName().equals(config.getType()))
throw new IllegalArgumentException("Instance " + instanceId + " is not a CurseForge modpack. Cannot update this instance.");
}
} catch (JsonParseException | IOException ignore) {
}
Expand Down
4 changes: 2 additions & 2 deletions HMCLCore/src/main/java/org/jackhuang/hmcl/modpack/mcbbs/McbbsModpackLocalInstallTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ public McbbsModpackLocalInstallTask(DefaultDependencyManager dependencyManager,
if (Files.exists(json)) {
config = JsonUtils.fromJsonFile(json, ModpackConfiguration.typeOf(McbbsModpackManifest.class));

if (!McbbsModpackProvider.INSTANCE.getName().equals(config.getType()))
throw new IllegalArgumentException("Instance " + instanceId + " is not a Mcbbs modpack. Cannot update this instance.");
if (config.getType() != null && !McbbsModpackProvider.INSTANCE.getName().equals(config.getType()))
throw new IllegalArgumentException("Instance " + instanceId + " is not a MCBBS modpack. Cannot update this instance.");
}
} catch (JsonParseException | IOException ignore) {
}
Expand Down
2 changes: 1 addition & 1 deletion HMCLCore/src/main/java/org/jackhuang/hmcl/modpack/mcbbs/McbbsModpackRemoteInstallTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public McbbsModpackRemoteInstallTask(DefaultDependencyManager dependencyManager,
if (Files.exists(json)) {
config = JsonUtils.fromJsonFile(json, ModpackConfiguration.typeOf(McbbsModpackManifest.class));

if (!MODPACK_TYPE.equals(config.getType()))
if (config.getType() != null && !MODPACK_TYPE.equals(config.getType()))
throw new IllegalArgumentException("Instance " + instanceId + " is not a Mcbbs modpack. Cannot update this instance.");
}
} catch (JsonParseException | IOException ignore) {
Expand Down
2 changes: 1 addition & 1 deletion HMCLCore/src/main/java/org/jackhuang/hmcl/modpack/modrinth/ModrinthInstallTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public ModrinthInstallTask(DefaultDependencyManager dependencyManager, Path zipF
if (Files.exists(json)) {
config = JsonUtils.fromJsonFile(json, ModpackConfiguration.typeOf(ModrinthManifest.class));

if (!ModrinthModpackProvider.INSTANCE.getName().equals(config.getType()))
if (config.getType() != null && !ModrinthModpackProvider.INSTANCE.getName().equals(config.getType()))
throw new IllegalArgumentException("Instance " + instanceId + " is not a Modrinth modpack. Cannot update this instance.");
}
} catch (JsonParseException | IOException ignore) {
Expand Down
2 changes: 1 addition & 1 deletion HMCLCore/src/main/java/org/jackhuang/hmcl/modpack/multimc/MultiMCModpackInstallTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public void preExecute() throws Exception {
if (Files.exists(json)) {
config = JsonUtils.fromJsonFile(json, ModpackConfiguration.typeOf(MultiMCInstanceConfiguration.class));

if (!MultiMCModpackProvider.INSTANCE.getName().equals(config.getType()))
if (config.getType() != null && !MultiMCModpackProvider.INSTANCE.getName().equals(config.getType()))
throw new IllegalArgumentException("Instance " + instanceId + " is not a MultiMC modpack. Cannot update this instance.");
}
} catch (JsonParseException | IOException ignore) {
Expand Down
2 changes: 1 addition & 1 deletion HMCLCore/src/main/java/org/jackhuang/hmcl/modpack/server/ServerModpackLocalInstallTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public ServerModpackLocalInstallTask(DefaultDependencyManager dependencyManager,
if (Files.exists(json)) {
config = JsonUtils.fromJsonFile(json, ModpackConfiguration.typeOf(ServerModpackManifest.class));

if (!ServerModpackProvider.INSTANCE.getName().equals(config.getType()))
if (config.getType() != null && !ServerModpackProvider.INSTANCE.getName().equals(config.getType()))
throw new IllegalArgumentException("Instance " + instanceId + " is not a Server modpack. Cannot update this instance.");
}
} catch (JsonParseException | IOException ignore) {
Expand Down
2 changes: 1 addition & 1 deletion HMCLCore/src/main/java/org/jackhuang/hmcl/modpack/server/ServerModpackRemoteInstallTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public ServerModpackRemoteInstallTask(DefaultDependencyManager dependencyManager
if (Files.exists(json)) {
config = JsonUtils.fromJsonFile(json, ModpackConfiguration.typeOf(ServerModpackManifest.class));

if (!MODPACK_TYPE.equals(config.getType()))
if (config.getType() != null && !MODPACK_TYPE.equals(config.getType()))
throw new IllegalArgumentException("Instance " + instanceId + " is not a Server modpack. Cannot update this instance.");
}
} catch (JsonParseException | IOException ignore) {
Expand Down