[Feature] 资源包管理 #4980 reforged

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/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, mod, file) -> download(profile, version, file, "mods");
+    public static final org.jackhuang.hmcl.ui.versions.DownloadPage.DownloadCallback FOR_RESOURCE_PACK =
+            (profile, version, mod, file) -> download(profile, version, file, "resourcepacks");
+    public static final org.jackhuang.hmcl.ui.versions.DownloadPage.DownloadCallback FOR_SHADER =
+            (profile, version, mod, 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, mod, file) -> download(profile, version, file, "mods"), true)));
-        resourcePackTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofResourcePack((profile, version, mod, file) -> download(profile, version, file, "resourcepacks"), true)));
-        shaderTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofShaderPack((profile, version, mod, 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(() -> HMCLLocalizedDownloadListPage.ofShaderPack(FOR_SHADER, true)));
         worldTab.setNodeSupplier(loadVersionFor(() -> new DownloadListPage(CurseForgeRemoteModRepository.WORLDS)));
         tab = new TabHeader(transitionPane, newGameTab, modpackTab, modTab, resourcePackTab, shaderTab, worldTab);
 
@@ -195,8 +202,9 @@ public void showModpackDownloads() {
         tab.select(modpackTab, false);
     }
 
-    public void showResourcepackDownloads() {
+    public DownloadListPage showResourcePackDownloads() {
         tab.select(resourcePackTab, false);
+        return resourcePackTab.getNode();
     }
 
     public DownloadListPage showModDownloads() {

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

@@ -17,7 +17,7 @@
  */
 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.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
@@ -29,31 +29,31 @@
 
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 
-public class ModCheckUpdatesTask extends Task<List<LocalModFile.ModUpdate>> {
-    private final List<Task<LocalModFile.ModUpdate>> dependents;
+public class AddonCheckUpdatesTask<T extends LocalAddonFile> extends Task<List<LocalAddonFile.AddonUpdate>> {
+    private final List<Task<LocalAddonFile.AddonUpdate>> dependents;
 
-    public ModCheckUpdatesTask(String gameVersion, Collection<LocalModFile> mods) {
-        dependents = mods.stream().map(mod ->
+    public AddonCheckUpdatesTask(String gameVersion, Collection<T> addons) {
+        dependents = addons.stream().map(addon ->
                 Task.supplyAsync(Schedulers.io(), () -> {
-                    LocalModFile.ModUpdate candidate = null;
+                    LocalAddonFile.AddonUpdate candidate = null;
                     for (RemoteMod.Type type : RemoteMod.Type.values()) {
-                        LocalModFile.ModUpdate update = null;
+                        LocalAddonFile.AddonUpdate update = null;
                         try {
-                            update = mod.checkUpdates(gameVersion, type.getRemoteModRepository());
+                            update = addon.checkUpdates(gameVersion, type);
                         } catch (IOException e) {
-                            LOG.warning(String.format("Cannot check update for mod %s.", mod.getFileName()), e);
+                            LOG.warning(String.format("Cannot check update for addon %s.", addon.getFileName()), e);
                         }
                         if (update == null) {
                             continue;
                         }
 
-                        if (candidate == null || candidate.getCandidate().getDatePublished().isBefore(update.getCandidate().getDatePublished())) {
+                        if (candidate == null || candidate.targetVersion().getDatePublished().isBefore(update.targetVersion().getDatePublished())) {
                             candidate = update;
                         }
                     }
 
                     return candidate;
-                }).setName(mod.getFileName()).setSignificance(TaskSignificance.MAJOR).withCounter("update.checking")
+                }).setName(addon.getFileName()).setSignificance(TaskSignificance.MAJOR).withCounter("update.checking")
         ).toList();
 
         setStage("update.checking");

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModUpdatesPage.java → HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/AddonUpdatesPage.java

@@ -29,8 +29,8 @@
 import javafx.scene.control.TableView;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
-import org.jackhuang.hmcl.mod.LocalModFile;
-import org.jackhuang.hmcl.mod.ModManager;
+import org.jackhuang.hmcl.mod.LocalAddonFile;
+import org.jackhuang.hmcl.mod.LocalAddonManager;
 import org.jackhuang.hmcl.mod.RemoteMod;
 import org.jackhuang.hmcl.task.FileDownloadTask;
 import org.jackhuang.hmcl.task.Schedulers;
@@ -41,10 +41,11 @@
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
 import org.jackhuang.hmcl.ui.construct.PageCloseEvent;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
-import org.jackhuang.hmcl.util.Pair;
+import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.TaskCancellationAction;
 import org.jackhuang.hmcl.util.io.CSVTable;
 
+import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.LocalDateTime;
@@ -56,50 +57,49 @@
 import java.util.stream.Collectors;
 
 import static org.jackhuang.hmcl.ui.FXUtils.onEscPressed;
-import static org.jackhuang.hmcl.util.Pair.pair;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
-public class ModUpdatesPage extends BorderPane implements DecoratorPage {
+public class AddonUpdatesPage<F extends LocalAddonFile> extends BorderPane implements DecoratorPage {
     private final ReadOnlyObjectWrapper<State> state = new ReadOnlyObjectWrapper<>(DecoratorPage.State.fromTitle(i18n("mods.check_updates")));
 
-    private final ModManager modManager;
-    private final ObservableList<ModUpdateObject> objects;
+    private final LocalAddonManager<F> localAddonManager;
+    private final ObservableList<AddonUpdateObject> objects;
 
     @SuppressWarnings("unchecked")
-    public ModUpdatesPage(ModManager modManager, List<LocalModFile.ModUpdate> updates) {
-        this.modManager = modManager;
+    public AddonUpdatesPage(LocalAddonManager<F> localAddonManager, List<LocalAddonFile.AddonUpdate> updates) {
+        this.localAddonManager = localAddonManager;
 
         getStyleClass().add("gray-background");
 
-        TableColumn<ModUpdateObject, Boolean> enabledColumn = new TableColumn<>();
+        TableColumn<AddonUpdateObject, Boolean> enabledColumn = new TableColumn<>();
         var allEnabledBox = new JFXCheckBox();
         enabledColumn.setStyle("-fx-alignment: CENTER;");
         enabledColumn.setGraphic(allEnabledBox);
         enabledColumn.setCellFactory(JFXCheckBoxTableCell.forTableColumn(enabledColumn));
-        setupCellValueFactory(enabledColumn, ModUpdateObject::enabledProperty);
+        setupCellValueFactory(enabledColumn, AddonUpdateObject::enabledProperty);
         enabledColumn.setEditable(true);
         enabledColumn.setMaxWidth(40);
         enabledColumn.setMinWidth(40);
 
-        TableColumn<ModUpdateObject, String> fileNameColumn = new TableColumn<>(i18n("mods.check_updates.file"));
+        TableColumn<AddonUpdateObject, String> fileNameColumn = new TableColumn<>(i18n("mods.check_updates.file"));
         fileNameColumn.setPrefWidth(200);
-        setupCellValueFactory(fileNameColumn, ModUpdateObject::fileNameProperty);
+        setupCellValueFactory(fileNameColumn, AddonUpdateObject::fileNameProperty);
 
-        TableColumn<ModUpdateObject, String> currentVersionColumn = new TableColumn<>(i18n("mods.check_updates.current_version"));
+        TableColumn<AddonUpdateObject, String> currentVersionColumn = new TableColumn<>(i18n("mods.check_updates.current_version"));
         currentVersionColumn.setPrefWidth(200);
-        setupCellValueFactory(currentVersionColumn, ModUpdateObject::currentVersionProperty);
+        setupCellValueFactory(currentVersionColumn, AddonUpdateObject::currentVersionProperty);
 
-        TableColumn<ModUpdateObject, String> targetVersionColumn = new TableColumn<>(i18n("mods.check_updates.target_version"));
+        TableColumn<AddonUpdateObject, String> targetVersionColumn = new TableColumn<>(i18n("mods.check_updates.target_version"));
         targetVersionColumn.setPrefWidth(200);
-        setupCellValueFactory(targetVersionColumn, ModUpdateObject::targetVersionProperty);
+        setupCellValueFactory(targetVersionColumn, AddonUpdateObject::targetVersionProperty);
 
-        TableColumn<ModUpdateObject, String> sourceColumn = new TableColumn<>(i18n("mods.check_updates.source"));
-        setupCellValueFactory(sourceColumn, ModUpdateObject::sourceProperty);
+        TableColumn<AddonUpdateObject, String> sourceColumn = new TableColumn<>(i18n("mods.check_updates.source"));
+        setupCellValueFactory(sourceColumn, AddonUpdateObject::sourceProperty);
 
-        objects = FXCollections.observableList(updates.stream().map(ModUpdateObject::new).collect(Collectors.toList()));
+        objects = FXCollections.observableList(updates.stream().map(AddonUpdateObject::new).collect(Collectors.toList()));
         FXUtils.bindAllEnabled(allEnabledBox.selectedProperty(), objects.stream().map(o -> o.enabled).toArray(BooleanProperty[]::new));
 
-        TableView<ModUpdateObject> table = new TableView<>(objects);
+        TableView<AddonUpdateObject> table = new TableView<>(objects);
         table.setEditable(true);
         table.getColumns().setAll(enabledColumn, fileNameColumn, currentVersionColumn, targetVersionColumn, sourceColumn);
         setMargin(table, new Insets(10, 10, 5, 10));
@@ -114,7 +114,7 @@ public ModUpdatesPage(ModManager modManager, List<LocalModFile.ModUpdate> update
         exportListButton.setOnAction(e -> exportList());
 
         JFXButton nextButton = FXUtils.newRaisedButton(i18n("mods.check_updates.confirm"));
-        nextButton.setOnAction(e -> updateMods());
+        nextButton.setOnAction(e -> updateFiles());
 
         JFXButton cancelButton = FXUtils.newRaisedButton(i18n("button.cancel"));
         cancelButton.setOnAction(e -> fireEvent(new PageCloseEvent()));
@@ -125,23 +125,24 @@ public ModUpdatesPage(ModManager modManager, List<LocalModFile.ModUpdate> update
         setBottom(actions);
     }
 
-    private <T> void setupCellValueFactory(TableColumn<ModUpdateObject, T> column, Function<ModUpdateObject, ObservableValue<T>> mapper) {
+    private <T> void setupCellValueFactory(TableColumn<AddonUpdateObject, T> column, Function<AddonUpdateObject, ObservableValue<T>> mapper) {
         column.setCellValueFactory(param -> mapper.apply(param.getValue()));
     }
 
-    private void updateMods() {
-        ModUpdateTask task = new ModUpdateTask(
-                modManager,
+    private void updateFiles() {
+        AddonUpdateTask task = new AddonUpdateTask(
+                localAddonManager.getDirectory(),
                 objects.stream()
-                        .filter(o -> o.enabled.get())
-                        .map(object -> pair(object.data.getLocalMod(), object.data.getCandidate()))
-                        .collect(Collectors.toList()));
+                        .filter(AddonUpdateObject::isEnabled)
+                        .map(AddonUpdateObject::getData)
+                        .toList()
+        );
         Controllers.taskDialog(
                 task.whenComplete(Schedulers.javafx(), exception -> {
                     fireEvent(new PageCloseEvent());
-                    if (!task.getFailedMods().isEmpty()) {
+                    if (!task.getFailedAddons().isEmpty()) {
                         Controllers.dialog(i18n("mods.check_updates.failed_download") + "\n" +
-                                        task.getFailedMods().stream().map(LocalModFile::getFileName).collect(Collectors.joining("\n")),
+                                        task.getFailedAddons().stream().map(LocalAddonFile::getFileName).collect(Collectors.joining("\n")),
                                 i18n("install.failed"),
                                 MessageDialogPane.MessageType.ERROR);
                     }
@@ -189,22 +190,22 @@ public ReadOnlyObjectWrapper<State> stateProperty() {
         return state;
     }
 
-    private static final class ModUpdateObject {
-        final LocalModFile.ModUpdate data;
+    private static final class AddonUpdateObject {
+        final LocalAddonFile.AddonUpdate data;
         final BooleanProperty enabled = new SimpleBooleanProperty();
         final StringProperty fileName = new SimpleStringProperty();
         final StringProperty currentVersion = new SimpleStringProperty();
         final StringProperty targetVersion = new SimpleStringProperty();
         final StringProperty source = new SimpleStringProperty();
 
-        public ModUpdateObject(LocalModFile.ModUpdate data) {
+        public AddonUpdateObject(LocalAddonFile.AddonUpdate data) {
             this.data = data;
 
-            enabled.set(!data.getLocalMod().getModManager().isDisabled(data.getLocalMod().getFile()));
-            fileName.set(data.getLocalMod().getFileName());
-            currentVersion.set(data.getCurrentVersion().getVersion());
-            targetVersion.set(data.getCandidate().getVersion());
-            switch (data.getCurrentVersion().getSelf().getType()) {
+            enabled.set(!data.localAddonFile().isDisabled());
+            fileName.set(data.localAddonFile().getFileName());
+            currentVersion.set(data.currentVersion().getVersion());
+            targetVersion.set(data.targetVersion().getVersion());
+            switch (data.currentVersion().getSelf().getType()) {
                 case CURSEFORGE:
                     source.set(i18n("mods.curseforge"));
                     break;
@@ -213,6 +214,10 @@ public ModUpdateObject(LocalModFile.ModUpdate data) {
             }
         }
 
+        public LocalAddonFile.AddonUpdate getData() {
+            return data;
+        }
+
         public boolean isEnabled() {
             return enabled.get();
         }
@@ -274,30 +279,32 @@ public void setSource(String source) {
         }
     }
 
-    public static class ModUpdateTask extends Task<Void> {
+    public static class AddonUpdateTask extends Task<Void> {
         private final Collection<Task<?>> dependents;
-        private final List<LocalModFile> failedMods = new ArrayList<>();
+        private final List<LocalAddonFile> failedAddons = new ArrayList<>();
 
-        ModUpdateTask(ModManager modManager, List<Pair<LocalModFile, RemoteMod.Version>> mods) {
+        AddonUpdateTask(Path addonDirectory, List<LocalAddonFile.AddonUpdate> addons) {
             setStage("mods.check_updates.confirm");
-            getProperties().put("total", mods.size());
+            getProperties().put("total", addons.size());
 
             this.dependents = new ArrayList<>();
-            for (Pair<LocalModFile, RemoteMod.Version> mod : mods) {
-                LocalModFile local = mod.getKey();
-                RemoteMod.Version remote = mod.getValue();
-                boolean isDisabled = local.getModManager().isDisabled(local.getFile());
+            for (LocalAddonFile.AddonUpdate addon : addons) {
+                LocalAddonFile local = addon.localAddonFile();
+                RemoteMod.Version remote = addon.targetVersion();
+                boolean isDisabled = local.isDisabled();
+                String originalFileName = local.getFile().getFileName().toString();
 
                 dependents.add(Task
                         .runAsync(Schedulers.javafx(), () -> local.setOld(true))
                         .thenComposeAsync(() -> {
-                            String fileName = remote.getFile().getFilename();
+                            String fileName = addon.useRemoteFileName() ? remote.getFile().getFilename() : originalFileName;
                             if (isDisabled)
-                                fileName += ModManager.DISABLED_EXTENSION;
+                                fileName = StringUtils.addSuffix(fileName, LocalAddonManager.DISABLED_EXTENSION);
 
                             var task = new FileDownloadTask(
                                     remote.getFile().getUrl(),
-                                    modManager.getModsDirectory().resolve(fileName));
+                                    addonDirectory.resolve(fileName)
+                            );
 
                             task.setName(remote.getName());
                             return task;
@@ -307,16 +314,22 @@ public static class ModUpdateTask extends Task<Void> {
                                 // restore state if failed
                                 local.setOld(false);
                                 if (isDisabled)
-                                    local.disable();
-                                failedMods.add(local);
+                                    local.markDisabled();
+                                failedAddons.add(local);
+                            } else if (!local.keepOldFiles()) {
+                                try {
+                                    local.delete();
+                                } catch (IOException e) {
+                                    // ignore
+                                }
                             }
                         })
                         .withCounter("mods.check_updates.confirm"));
             }
         }
 
-        public List<LocalModFile> getFailedMods() {
-            return failedMods;
+        public List<LocalAddonFile> getFailedAddons() {
+            return failedAddons;
         }
 
         @Override