AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-09-19 00:36:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix displaying "null" in GameItem

Browse Source
This commit is contained in:
huanghongxun 2019-08-19 14:57:42 +08:00
parent 0dd9dc6c17
commit e7142e4032
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HMCL/src/main/java/org/jackhuang/hmcl/ui/download/UpdateInstallerWizardProvider.java
View File

@ -25,6 +25,7 @@ import org.jackhuang.hmcl.setting.Profile;
import org.jackhuang.hmcl.ui.Controllers; import org.jackhuang.hmcl.ui.Controllers;
import org.jackhuang.hmcl.ui.wizard.WizardController; import org.jackhuang.hmcl.ui.wizard.WizardController;
import org.jackhuang.hmcl.ui.wizard.WizardProvider; import org.jackhuang.hmcl.ui.wizard.WizardProvider;
import org.jetbrains.annotations.NotNull;
import java.util.Map; import java.util.Map;
@ -38,7 +39,7 @@ public final class UpdateInstallerWizardProvider implements WizardProvider {
private final String libraryId; private final String libraryId;
private final String oldLibraryVersion; private final String oldLibraryVersion;
public UpdateInstallerWizardProvider(Profile profile, String gameVersion, Version version, String libraryId, String oldLibraryVersion) { public UpdateInstallerWizardProvider(@NotNull Profile profile, @NotNull String gameVersion, @NotNull Version version, @NotNull String libraryId, @NotNull String oldLibraryVersion) {
this.profile = profile; this.profile = profile;
this.gameVersion = gameVersion; this.gameVersion = gameVersion;
this.version = version; this.version = version;

9
HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameItem.java
View File

@ -60,10 +60,11 @@ public class GameItem extends Control {
StringBuilder libraries = new StringBuilder(game); StringBuilder libraries = new StringBuilder(game);
LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(profile.getRepository().getResolvedPreservingPatchesVersion(id)); LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(profile.getRepository().getResolvedPreservingPatchesVersion(id));
analyzer.forEachLibrary((libraryId, libraryVersion) -> { analyzer.forEachLibrary((libraryId, libraryVersion) -> {
if (I18n.hasKey("install.installer." + libraryId)) if (I18n.hasKey("install.installer." + libraryId)) {
libraries libraries.append(", ").append(i18n("install.installer." + libraryId));
.append(", ").append(i18n("install.installer." + libraryId)) if (libraryVersion != null)
.append(": ").append(modifyVersion(game, libraryVersion.replaceAll("(?i)" + libraryId, ""))); libraries.append(": ").append(modifyVersion("", libraryVersion.replaceAll("(?i)" + libraryId, "")));
}
}); });
subtitle.set(libraries.toString()); subtitle.set(libraries.toString());