[Feature] [Bugfix] 资源包有关优化与修复

HMCL/src/main/java/org/jackhuang/hmcl/game/LocalizedRemoteModRepository.java

@@ -18,7 +18,6 @@
 package org.jackhuang.hmcl.game;
 
 import org.jackhuang.hmcl.download.DownloadProvider;
-import org.jackhuang.hmcl.mod.LocalModFile;
 import org.jackhuang.hmcl.mod.RemoteMod;
 import org.jackhuang.hmcl.mod.RemoteModRepository;
 import org.jackhuang.hmcl.ui.versions.ModTranslations;
@@ -110,8 +109,8 @@ public Stream<Category> getCategories() throws IOException {
     }
 
     @Override
-    public Optional<RemoteMod.Version> getRemoteVersionByLocalFile(LocalModFile localModFile, Path file) throws IOException {
-        return getBackedRemoteModRepository().getRemoteVersionByLocalFile(localModFile, file);
+    public Optional<RemoteMod.Version> getRemoteVersionByLocalFile(Path file) throws IOException {
+        return getBackedRemoteModRepository().getRemoteVersionByLocalFile(file);
     }
 
     @Override

HMCL/src/main/java/org/jackhuang/hmcl/setting/GlobalConfig.java

@@ -148,6 +148,17 @@ public ObservableSet<String> getDisabledJava() {
         return disabledJava;
     }
 
+    @SerializedName("resourcePackWarningShown")
+    private final BooleanProperty resourcePackWarningShown = new SimpleBooleanProperty(false);
+
+    public boolean isResourcePackWarningShown() {
+        return resourcePackWarningShown.get();
+    }
+
+    public void onResourcePackWarningShown() {
+        resourcePackWarningShown.set(true);
+    }
+
     static final class Adapter extends ObservableSetting.Adapter<GlobalConfig> {
         @Override
         protected GlobalConfig createInstance() {

HMCL/src/main/java/org/jackhuang/hmcl/ui/download/DownloadPage.java

@@ -63,6 +63,13 @@
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public class DownloadPage extends DecoratorAnimatedPage implements DecoratorPage {
+    public static final org.jackhuang.hmcl.ui.versions.DownloadPage.DownloadCallback FOR_MOD =
+            (profile, version, file) -> download(profile, version, file, "mods");
+    public static final org.jackhuang.hmcl.ui.versions.DownloadPage.DownloadCallback FOR_RESOURCE_PACK =
+            (profile, version, file) -> download(profile, version, file, "resourcepacks");
+    public static final org.jackhuang.hmcl.ui.versions.DownloadPage.DownloadCallback FOR_SHADER =
+            (profile, version, file) -> download(profile, version, file, "shaderpacks");
+
     private final ReadOnlyObjectWrapper<DecoratorPage.State> state = new ReadOnlyObjectWrapper<>(DecoratorPage.State.fromTitle(i18n("download"), -1));
     private final TabHeader tab;
     private final TabHeader.Tab<VersionsPage> newGameTab = new TabHeader.Tab<>("newGameTab");
@@ -94,9 +101,9 @@ public DownloadPage(String uploadVersion) {
             page.getActions().add(installLocalModpackButton);
             return page;
         }));
-        modTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofMod((profile, version, file) -> download(profile, version, file, "mods"), true)));
-        resourcePackTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofResourcePack((profile, version, file) -> download(profile, version, file, "resourcepacks"), true)));
-        shaderTab.setNodeSupplier(loadVersionFor(() -> new DownloadListPage(ModrinthRemoteModRepository.SHADER_PACKS, (profile, version, file) -> download(profile, version, file, "shaderpacks"), true)));
+        modTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofMod(FOR_MOD, true)));
+        resourcePackTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofResourcePack(FOR_RESOURCE_PACK, true)));
+        shaderTab.setNodeSupplier(loadVersionFor(() -> new DownloadListPage(ModrinthRemoteModRepository.SHADER_PACKS, FOR_SHADER, true)));
         worldTab.setNodeSupplier(loadVersionFor(() -> new DownloadListPage(CurseForgeRemoteModRepository.WORLDS)));
         tab = new TabHeader(transitionPane, newGameTab, modpackTab, modTab, resourcePackTab, shaderTab, worldTab);
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModCheckUpdatesTask.java → HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/CheckUpdatesTask.java

@@ -17,36 +17,39 @@
  */
 package org.jackhuang.hmcl.ui.versions;
 
-import org.jackhuang.hmcl.mod.LocalModFile;
+import org.jackhuang.hmcl.mod.LocalAddonFile;
 import org.jackhuang.hmcl.mod.RemoteMod;
+import org.jackhuang.hmcl.mod.RemoteModRepository;
 import org.jackhuang.hmcl.task.Task;
 
 import java.util.*;
 import java.util.stream.Collectors;
 
-public class ModCheckUpdatesTask extends Task<List<LocalModFile.ModUpdate>> {
-    private final String gameVersion;
-    private final Collection<LocalModFile> mods;
-    private final Collection<Collection<Task<LocalModFile.ModUpdate>>> dependents;
-
-    public ModCheckUpdatesTask(String gameVersion, Collection<LocalModFile> mods) {
-        this.gameVersion = gameVersion;
-        this.mods = mods;
+public class CheckUpdatesTask<T extends LocalAddonFile> extends Task<List<LocalAddonFile.ModUpdate>> {
+    private final Collection<Collection<Task<LocalAddonFile.ModUpdate>>> dependents;
 
+    public CheckUpdatesTask(String gameVersion, Collection<T> mods, RemoteModRepository.Type repoType) {
+        Map<String, RemoteModRepository> repos = new LinkedHashMap<>(2);
+        for (RemoteMod.Type modType : RemoteMod.Type.values()) {
+            RemoteModRepository repo = modType.getRepoForType(repoType);
+            if (repo != null) {
+                repos.put(modType.name(), repo);
+            }
+        }
         dependents = mods.stream()
                 .map(mod ->
-                        Arrays.stream(RemoteMod.Type.values())
-                                .map(type ->
-                                        Task.supplyAsync(() -> mod.checkUpdates(gameVersion, type.getRemoteModRepository()))
+                        repos.entrySet().stream()
+                                .map(entry ->
+                                        Task.supplyAsync(() -> mod.checkUpdates(gameVersion, entry.getValue()))
                                                 .setSignificance(TaskSignificance.MAJOR)
-                                                .setName(String.format("%s (%s)", mod.getFileName(), type.name())).withCounter("update.checking")
+                                                .setName(String.format("%s (%s)", mod.getFileName(), entry.getKey())).withCounter("update.checking")
                                 )
                                 .collect(Collectors.toList())
                 )
                 .collect(Collectors.toList());
 
         setStage("update.checking");
-        getProperties().put("total", dependents.size() * RemoteMod.Type.values().length);
+        getProperties().put("total", dependents.size() * repos.size());
     }
 
     @Override
@@ -75,8 +78,8 @@ public void execute() throws Exception {
                 .map(tasks -> tasks.stream()
                         .filter(task -> task.getResult() != null)
                         .map(Task::getResult)
-                        .filter(modUpdate -> !modUpdate.getCandidates().isEmpty())
-                        .max(Comparator.comparing((LocalModFile.ModUpdate modUpdate) -> modUpdate.getCandidates().get(0).getDatePublished()))
+                        .filter(modUpdate -> !modUpdate.candidates().isEmpty())
+                        .max(Comparator.comparing((LocalAddonFile.ModUpdate modUpdate) -> modUpdate.candidates().get(0).getDatePublished()))
                         .orElse(null)
                 )
                 .filter(Objects::nonNull)

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

@@ -73,14 +73,20 @@ public class DownloadPage extends Control implements DecoratorPage {
     private final Profile.ProfileVersion version;
     private final DownloadCallback callback;
     private final DownloadListPage page;
+    private final RemoteModRepository.Type type;
 
     private SimpleMultimap<String, RemoteMod.Version, List<RemoteMod.Version>> versions;
 
     public DownloadPage(DownloadListPage page, RemoteMod addon, Profile.ProfileVersion version, @Nullable DownloadCallback callback) {
+        this(page, addon, version, callback, null);
+    }
+
+    public DownloadPage(DownloadListPage page, RemoteMod addon, Profile.ProfileVersion version, @Nullable DownloadCallback callback, @Nullable RemoteModRepository.Type type) {
         this.page = page;
         this.repository = page.repository;
         this.addon = addon;
-        this.translations = ModTranslations.getTranslationsByRepositoryType(repository.getType());
+        this.type = Objects.requireNonNullElse(type, repository.getType());
+        this.translations = ModTranslations.getTranslationsByRepositoryType(this.type);
         this.mod = translations.getModByCurseForgeId(addon.getSlug());
         this.version = version;
         this.callback = callback;
@@ -283,14 +289,22 @@ protected ModDownloadPageSkin(DownloadPage control) {
 
                                 resolve:
                                 for (RemoteMod.Version modVersion : modVersions) {
-                                    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;
+                                    if (getSkinnable().type == RemoteModRepository.Type.MOD) {
+                                        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;
+                                            }
                                         }
+                                    } else {
+                                        list.getContent().addAll(
+                                                ComponentList.createComponentListTitle(i18n("mods.download.recommend", gameVersion)),
+                                                new ModItem(modVersion, control)
+                                        );
+                                        break;
                                     }
                                 }
                             }
@@ -335,7 +349,7 @@ private static final class DependencyModItem extends StackPane {
                 Pair.pair(RemoteMod.DependencyType.BROKEN, "mods.dependency.broken")
         ));
 
-        DependencyModItem(DownloadListPage page, RemoteMod addon, Profile.ProfileVersion version, DownloadCallback callback) {
+        DependencyModItem(DownloadListPage page, RemoteMod addon, Profile.ProfileVersion version) {
             HBox pane = new HBox(8);
             pane.setPadding(new Insets(0, 8, 0, 8));
             pane.setAlignment(Pos.CENTER_LEFT);
@@ -346,15 +360,24 @@ private static final class DependencyModItem extends StackPane {
             imageView.setFitHeight(40);
             pane.getChildren().setAll(FXUtils.limitingSize(imageView, 40, 40), content);
 
+            RemoteModRepository.Type type = addon.getRepositoryType();
+
+            DownloadCallback callback = switch (type) {
+                case MOD -> org.jackhuang.hmcl.ui.download.DownloadPage.FOR_MOD;
+                case RESOURCE_PACK -> org.jackhuang.hmcl.ui.download.DownloadPage.FOR_RESOURCE_PACK;
+                case SHADER -> org.jackhuang.hmcl.ui.download.DownloadPage.FOR_SHADER;
+                default -> null;
+            };
+
             RipplerContainer container = new RipplerContainer(pane);
             FXUtils.onClicked(container, () -> {
                 fireEvent(new DialogCloseEvent());
-                Controllers.navigate(new DownloadPage(page, addon, version, callback));
+                Controllers.navigate(new DownloadPage(page, addon, version, callback, type));
             });
             getChildren().setAll(container);
 
             if (addon != RemoteMod.BROKEN) {
-                ModTranslations.Mod mod = ModTranslations.getTranslationsByRepositoryType(page.repository.getType()).getModByCurseForgeId(addon.getSlug());
+                ModTranslations.Mod mod = ModTranslations.getTranslationsByRepositoryType(type).getModByCurseForgeId(addon.getSlug());
                 content.setTitle(mod != null && I18n.isUseChinese() ? mod.getDisplayName() : addon.getTitle());
                 content.setSubtitle(addon.getDescription());
                 addon.getCategories().stream()
@@ -445,24 +468,15 @@ private static final class ModItem extends StackPane {
 
     private static final class ModVersion extends JFXDialogLayout {
         public ModVersion(RemoteMod.Version version, DownloadPage selfPage) {
-            RemoteModRepository.Type type = selfPage.repository.getType();
-
-            String title;
-            switch (type) {
-                case WORLD:
-                    title = "world.download.title";
-                    break;
-                case MODPACK:
-                    title = "modpack.download.title";
-                    break;
-                case RESOURCE_PACK:
-                    title = "resourcepack.download.title";
-                    break;
-                case MOD:
-                default:
-                    title = "mods.download.title";
-                    break;
-            }
+            RemoteModRepository.Type type = selfPage.type;
+
+            String title = switch (type) {
+                case WORLD -> "world.download.title";
+                case MODPACK -> "modpack.download.title";
+                case RESOURCE_PACK -> "resourcepack.download.title";
+                case SHADER -> "download.shader.title";
+                default -> "mods.download.title";
+            };
             this.setHeading(new HBox(new Label(i18n(title, version.getName()))));
 
             VBox box = new VBox(8);
@@ -538,7 +552,7 @@ private void loadDependencies(RemoteMod.Version version, DownloadPage selfPage,
                         list.add(title);
                         dependencies.put(dependency.getType(), list);
                     }
-                    DependencyModItem dependencyModItem = new DependencyModItem(selfPage.page, dependency.load(), selfPage.version, selfPage.callback);
+                    DependencyModItem dependencyModItem = new DependencyModItem(selfPage.page, dependency.load(), selfPage.version);
                     dependencies.get(dependency.getType()).add(dependencyModItem);
                 }
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPage.java

@@ -28,6 +28,7 @@
 import org.jackhuang.hmcl.mod.LocalModFile;
 import org.jackhuang.hmcl.mod.ModLoaderType;
 import org.jackhuang.hmcl.mod.ModManager;
+import org.jackhuang.hmcl.mod.RemoteModRepository;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
@@ -103,8 +104,8 @@ private void loadMods(ModManager modManager) {
         CompletableFuture.supplyAsync(() -> {
             lock.lock();
             try {
-                modManager.refreshMods();
-                return modManager.getMods().stream().map(ModListPageSkin.ModInfoObject::new).toList();
+                modManager.refresh();
+                return modManager.getLocalFiles().stream().map(ModListPageSkin.ModInfoObject::new).toList();
             } catch (IOException e) {
                 throw new UncheckedIOException(e);
             } finally {
@@ -234,7 +235,7 @@ public void checkUpdates() {
                         .composeAsync(() -> {
                             Optional<String> gameVersion = profile.getRepository().getGameVersion(instanceId);
                             if (gameVersion.isPresent()) {
-                                return new ModCheckUpdatesTask(gameVersion.get(), modManager.getMods());
+                                return new CheckUpdatesTask<>(gameVersion.get(), modManager.getLocalFiles(), RemoteModRepository.Type.MOD);
                             }
                             return null;
                         })
@@ -244,7 +245,7 @@ public void checkUpdates() {
                             } else if (result.isEmpty()) {
                                 Controllers.dialog(i18n("mods.check_updates.empty"));
                             } else {
-                                Controllers.navigateForward(new ModUpdatesPage(modManager, result));
+                                Controllers.navigateForward(new UpdatesPage<>(modManager, result));
                             }
                         })
                         .withStagesHint(Collections.singletonList("update.checking")),

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java

@@ -452,7 +452,7 @@ final class ModInfoDialog extends JFXDialogLayout {
                     RemoteModRepository repository = item.getValue();
                     JFXHyperlink button = new JFXHyperlink(i18n(item.getKey()));
                     Task.runAsync(() -> {
-                        Optional<RemoteMod.Version> versionOptional = repository.getRemoteVersionByLocalFile(modInfo.getModInfo(), modInfo.getModInfo().getFile());
+                        Optional<RemoteMod.Version> versionOptional = repository.getRemoteVersionByLocalFile(modInfo.getModInfo().getFile());
                         if (versionOptional.isPresent()) {
                             RemoteMod remoteMod = repository.getModById(versionOptional.get().getModid());
                             FXUtils.runInFX(() -> {
@@ -493,7 +493,7 @@ final class ModInfoDialog extends JFXDialogLayout {
                                             repository instanceof CurseForgeRemoteModRepository ? HMCLLocalizedDownloadListPage.ofCurseForgeMod(null, false) : HMCLLocalizedDownloadListPage.ofModrinthMod(null, false),
                                             remoteMod,
                                             new Profile.ProfileVersion(ModListPageSkin.this.getSkinnable().getProfile(), ModListPageSkin.this.getSkinnable().getInstanceId()),
-                                            (profile, version, file) -> org.jackhuang.hmcl.ui.download.DownloadPage.download(profile, version, file, "mods")
+                                            org.jackhuang.hmcl.ui.download.DownloadPage.FOR_MOD
                                     ));
                                 });
                                 button.setDisable(false);