Skip to content

在修改游戏版本时清除已选的模组加载器 #6475

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
CiiLu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

在修改游戏版本时清除已选的模组加载器 #6475

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 3 additions & 25 deletions HMCL/src/main/java/org/jackhuang/hmcl/ui/download/AdditionalInstallersPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@
package org.jackhuang.hmcl.ui.download;

import javafx.beans.binding.Bindings;
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleBooleanProperty;
import org.jackhuang.hmcl.download.DownloadProvider;
import org.jackhuang.hmcl.download.LibraryAnalyzer;
import org.jackhuang.hmcl.download.RemoteVersion;
import org.jackhuang.hmcl.game.GameRepository;
import org.jackhuang.hmcl.game.HMCLGameRepository;
Expand All @@ -33,11 +30,9 @@

import java.util.Optional;

import static org.jackhuang.hmcl.download.LibraryAnalyzer.LibraryType.MINECRAFT;
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

class AdditionalInstallersPage extends AbstractInstallersPage {
protected final BooleanProperty compatible = new SimpleBooleanProperty();
protected final GameRepository repository;
protected final String gameVersion;
protected final Version version;
Expand All @@ -60,7 +55,7 @@ public AdditionalInstallersPage(String gameVersion, Version version, WizardContr
});
}

installable.bind(Bindings.createBooleanBinding(() -> compatible.get() && txtName.validate(), txtName.textProperty(), compatible));
installable.bind(Bindings.createBooleanBinding(() -> txtName.validate(), txtName.textProperty()));
}

@Override
Expand All @@ -81,31 +76,14 @@ private String getVersion(String id) {

@Override
protected void reload() {
Version resolved = version.resolvePreservingPatches(repository);
LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(resolved, repository.getGameVersion(resolved).orElse(null));
String game = analyzer.getVersion(MINECRAFT).orElse(null);
String currentGameVersion = Lang.nonNull(getVersion("game"), game);

boolean compatible = true;

for (InstallerItem library : group.getLibraries()) {
String libraryId = library.getLibraryId();
String version = analyzer.getVersion(libraryId).orElse(null);
String libraryVersion = Lang.requireNonNullElse(getVersion(libraryId), version);
boolean alreadyInstalled = version != null && !(controller.getSettings().get(libraryId) instanceof UpdateInstallerWizardProvider.RemoveVersionAction);
if (!"game".equals(libraryId) && currentGameVersion != null && !currentGameVersion.equals(game) && getVersion(libraryId) == null && alreadyInstalled) {
// For third-party libraries, if game version is being changed, and the library is not being reinstalled,
// warns the user that we should update the library.
library.versionProperty().set(new InstallerItem.InstalledState(libraryVersion, false, true));
compatible = false;
} else if (alreadyInstalled || getVersion(libraryId) != null) {
library.versionProperty().set(new InstallerItem.InstalledState(libraryVersion, false, false));
if (controller.getSettings().containsKey(libraryId)) {
library.versionProperty().set(new InstallerItem.InstalledState(getVersion(libraryId), false, false));
Comment on lines +81 to +82

@chatgpt-codex-connector chatgpt-codex-connector Bot Jul 22, 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 Queue removal of existing loaders when changing game version

When a user updates a modded instance to a different Minecraft version and leaves its old Forge/Fabric/etc. card unselected, this branch only renders that card as absent; it does not add a RemoveVersionAction. UpdateInstallerWizardProvider.finish will consequently process only the new game selection, leaving the old loader patch in the saved version. The prior compatibility guard prevented completing this incompatible combination, whereas this now permits an installation that retains a loader built for the previous game version.

Useful? React with 👍 / 👎.

} else {
library.versionProperty().set(null);
}
}

this.compatible.set(compatible);
}

@Override
Expand Down
Loading