Skip to content

perf(download): skip re-installing loader if identical version patch … #6594

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
+52 −1
Open

perf(download): skip re-installing loader if identical version patch … #6594

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
f66592e
perf(installer): skip re-installing loader if identical version patch…
fatelove42 Aug 4, 2026
fd56d5c
fix(installer): exclude minecraft game patch from loader skip shortcut
fatelove42 Aug 14, 2026
f351e1c
fix(installer): validate all patch-contributed libraries and preserve…
fatelove42 Aug 16, 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
44 changes: 44 additions & 0 deletions HMCLCore/src/main/java/org/jackhuang/hmcl/download/DefaultDependencyManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@
import org.jackhuang.hmcl.game.Artifact;
import org.jackhuang.hmcl.game.DefaultGameRepository;
import org.jackhuang.hmcl.game.GameInstanceManifest;
import org.jackhuang.hmcl.game.GameInstancePatch;
import org.jackhuang.hmcl.game.Library;
import org.jackhuang.hmcl.task.Task;
import org.jackhuang.hmcl.util.io.FileUtils;
import org.jetbrains.annotations.Nullable;

import java.io.IOException;
import java.nio.file.Files;
Expand Down Expand Up @@ -155,8 +157,50 @@ public Task<GameInstanceManifest> installLibraryAsync(String gameVersion, GameIn
.withStage(String.format("hmcl.install.%s:%s", libraryId, libraryVersion));
}

/// Checks if a matching library patch is already installed for the target instance on disk and intact.
///
/// @param baseVersion the base game instance manifest
/// @param libraryVersion the remote library version to install
/// @return the existing intact matching patch, or `null` if the library is not installed, version mismatches, or files need repair
private @Nullable GameInstancePatch getIntactMatchingPatch(GameInstanceManifest baseVersion, RemoteVersion libraryVersion) {
if (LibraryAnalyzer.LibraryType.MINECRAFT.getPatchId().equals(libraryVersion.getLibraryId()) || !repository.hasInstance(baseVersion.id())) {
return null;
}

try {
GameInstanceManifest existingManifest = repository.getInstanceManifest(baseVersion.id());
Comment thread
fatelove42 marked this conversation as resolved.
String currentGameVersion = repository.getGameVersion(existingManifest).orElse(null);
if (!java.util.Objects.equals(currentGameVersion, libraryVersion.getGameVersion())) {
Comment on lines +171 to +173

@chatgpt-codex-connector chatgpt-codex-connector Bot Aug 17, 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 Reinstall same-version loaders after changing Minecraft

When DefaultGameBuilder changes Minecraft while retaining the same Fabric or Quilt version, GameInstallTask has already saved the new game patch alongside the old loader patch before this check runs. Consequently currentGameVersion matches the requested remote version even though the matching loader patch was generated for the previous game, so the incompatible patch is reused. Fresh evidence beyond the earlier report is the new GameInstallTask behavior that rewrites the on-disk game version while preserving the old loader patch; compare the patch's original game compatibility rather than the now-updated manifest.

Useful? React with 👍 / 👎.

return null;
}

GameInstancePatch matchingPatch = existingManifest.getPatches().stream()
.filter(patch -> libraryVersion.getLibraryId().equals(patch.id())
&& java.util.Objects.equals(patch.version(), libraryVersion.getSelfVersion()))
.findFirst()
.orElse(null);
if (matchingPatch == null) {
return null;
}

List<Library> patchLibraries = matchingPatch.libraries();
boolean needsRepair = patchLibraries != null && patchLibraries.stream()
.filter(Library::appliesToCurrentEnvironment)
.anyMatch(lib -> GameLibrariesTask.shouldDownloadLibrary(repository, existingManifest, lib, true));

return needsRepair ? null : matchingPatch;
} catch (Exception ignored) {
return null;
}
}

@Override
public Task<GameInstanceManifest> installLibraryAsync(GameInstanceManifest baseVersion, RemoteVersion libraryVersion) {
GameInstancePatch matchingPatch = getIntactMatchingPatch(baseVersion, libraryVersion);
if (matchingPatch != null) {
return Task.completed(baseVersion.addPatch(matchingPatch));
}

AtomicReference<GameInstanceManifest> removedLibraryVersion = new AtomicReference<>();

return removeLibraryAsync(baseVersion, libraryVersion.getLibraryId())
Expand Down
9 changes: 8 additions & 1 deletion HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameInstallTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,14 @@ public void execute() throws Exception {
GameInstancePatch.PRIORITY_MC).withJar(null);
setResult(patch);

GameInstanceManifest version = new GameInstanceManifest(this.manifest.id()).addPatch(patch);
GameInstanceManifest existingManifest = null;
if (gameRepository.hasInstance(this.manifest.id())) {
try {
existingManifest = gameRepository.getInstanceManifest(this.manifest.id());
} catch (Exception ignored) {
}
}
GameInstanceManifest version = (existingManifest != null ? existingManifest : this.manifest).addPatch(patch);

@chatgpt-codex-connector chatgpt-codex-connector Bot Aug 17, 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 Drop loader patches omitted by the requested build

When a modpack update removes a loader or switches loader families, this uses the complete existing manifest as the base and replaces only the Minecraft patch. The builder subsequently installs only loaders listed by the new pack, so an omitted old Forge/Fabric/OptiFine patch is never removed and is saved into the final manifest; switching Forge to Fabric can therefore leave both loaders active. Preserve only patches that are part of the requested build, rather than every existing patch.

Useful? React with 👍 / 👎.

dependencies.add(Task.allOf(
new GameDownloadTask(dependencyManager, remote.getGameVersion(), version),
Task.allOf(
Expand Down