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

Fix #3086 修复模组下载界面版本推荐功能 (#3089)

Browse Source 
* Fix #3086

* Update
This commit is contained in:
Burning_TNT 2024-05-31 23:12:33 +08:00 committed by GitHub
parent 1275e38995
commit 15c1042991
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadPage.java
View File

@ -94,22 +94,11 @@ public class DownloadPage extends Control implements DecoratorPage {
} }
private void loadModVersions() { private void loadModVersions() {
File versionJar = StringUtils.isNotBlank(version.getVersion())
? version.getProfile().getRepository().getVersionJar(version.getVersion())
: null;
setLoading(true); setLoading(true);
setFailed(false); setFailed(false);
Task.supplyAsync(() -> { Task.supplyAsync(() -> {
Stream<RemoteMod.Version> versions = addon.getData().loadVersions(repository); Stream<RemoteMod.Version> versions = addon.getData().loadVersions(repository);
// if (StringUtils.isNotBlank(version.getVersion())) {
// Optional<String> gameVersion = GameVersion.minecraftVersion(versionJar);
// if (gameVersion.isPresent()) {
// return sortVersions(
// .filter(file -> file.getGameVersions().contains(gameVersion.get())));
// }
// }
return sortVersions(versions); return sortVersions(versions);
}).whenComplete(Schedulers.javafx(), (result, exception) -> { }).whenComplete(Schedulers.javafx(), (result, exception) -> {
if (exception == null) { if (exception == null) {
@ -286,19 +275,27 @@ public class DownloadPage extends Control implements DecoratorPage {
if (control.version.getProfile() != null && control.version.getVersion() != null) { if (control.version.getProfile() != null && control.version.getVersion() != null) {
HMCLGameRepository repository = control.version.getProfile().getRepository(); HMCLGameRepository repository = control.version.getProfile().getRepository();
Version game = repository.getResolvedPreservingPatchesVersion(control.version.getVersion()); Version game = repository.getResolvedPreservingPatchesVersion(control.version.getVersion());
LibraryAnalyzer libraryAnalyzer = LibraryAnalyzer.analyze(game, repository.getGameVersion(game).orElse(null)); String gameVersion = repository.getGameVersion(game).orElse(null);
libraryAnalyzer.getVersion(LibraryAnalyzer.LibraryType.MINECRAFT).ifPresent(currentGameVersion -> {
Set<ModLoaderType> currentGameModLoaders = libraryAnalyzer.getModLoaders(); if (gameVersion != null) {
if (control.versions.containsKey(currentGameVersion)) { List<RemoteMod.Version> modVersions = control.versions.get(gameVersion);
control.versions.get(currentGameVersion).stream() if (modVersions != null && !modVersions.isEmpty()) {
.filter(version1 -> version1.getLoaders().isEmpty() || version1.getLoaders().stream().anyMatch(currentGameModLoaders::contains)) Set<ModLoaderType> targetLoaders = LibraryAnalyzer.analyze(game, gameVersion).getModLoaders();
.findFirst()
.ifPresent(value -> list.getContent().addAll( resolve:
ComponentList.createComponentListTitle(i18n("mods.download.recommend", currentGameVersion)), for (RemoteMod.Version modVersion : modVersions) {
new ModItem(value, control) for (ModLoaderType loader : modVersion.getLoaders()) {
)); if (targetLoaders.contains(loader)) {
list.getContent().addAll(
ComponentList.createComponentListTitle(i18n("mods.download.recommend", gameVersion)),
new ModItem(modVersion, control)
);
break resolve;
}
}
}
} }
}); }
} }
for (String gameVersion : control.versions.keys().stream() for (String gameVersion : control.versions.keys().stream()