Skip to content

Commit 1329d63

Browse files
committed
跟紧主线
1 parent 3ecedb0 commit 1329d63

1 file changed

Lines changed: 10 additions & 6 deletions

File tree

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -203,14 +203,11 @@ private void removeSelected(List<ResourcePackInfoObject> selectedItems) {
203203
}
204204
}
205205

206-
public void checkUpdates() {
206+
public void checkUpdates(Collection<ResourcePackFile> resourcePacks) {
207207
Runnable action = () -> Controllers.taskDialog(Task
208208
.composeAsync(() -> {
209209
Optional<String> gameVersion = profile.getRepository().getGameVersion(instanceId);
210-
if (gameVersion.isPresent()) {
211-
return new CheckUpdatesTask<>(gameVersion.get(), resourcePackManager.getLocalFiles());
212-
}
213-
return null;
210+
return gameVersion.map(g -> new CheckUpdatesTask<>(g, resourcePacks)).orElse(null);
214211
})
215212
.whenComplete(Schedulers.javafx(), (result, exception) -> {
216213
if (exception != null || result == null) {
@@ -270,6 +267,11 @@ private ResourcePackListPageSkin(ResourcePackListPage control) {
270267
control.setSelectedEnabled(listView.getSelectionModel().getSelectedItems(), true)),
271268
createToolbarButton2(i18n("button.disable"), SVG.CLOSE, () ->
272269
control.setSelectedEnabled(listView.getSelectionModel().getSelectedItems(), false)),
270+
createToolbarButton2(i18n("mods.check_updates.button"), SVG.UPDATE, () ->
271+
control.checkUpdates(
272+
listView.getSelectionModel().getSelectedItems().stream().map(ResourcePackInfoObject::getFile).toList()
273+
)
274+
),
273275
createToolbarButton2(i18n("button.select_all"), SVG.SELECT_ALL, () ->
274276
listView.getSelectionModel().selectAll()),
275277
createToolbarButton2(i18n("button.cancel"), SVG.CANCEL, () ->
@@ -308,7 +310,9 @@ private ResourcePackListPageSkin(ResourcePackListPage control) {
308310
createToolbarButton2(i18n("button.refresh"), SVG.REFRESH, control::refresh),
309311
createToolbarButton2(i18n("resourcepack.add"), SVG.ADD, control::onAddFiles),
310312
createToolbarButton2(i18n("button.reveal_dir"), SVG.FOLDER_OPEN, control::onOpenFolder),
311-
createToolbarButton2(i18n("mods.check_updates.button"), SVG.UPDATE, control::checkUpdates),
313+
createToolbarButton2(i18n("mods.check_updates.button"), SVG.UPDATE, () ->
314+
control.checkUpdates(listView.getItems().stream().map(ResourcePackInfoObject::getFile).toList())
315+
),
312316
createToolbarButton2(i18n("download"), SVG.DOWNLOAD, control::onDownload),
313317
createToolbarButton2(i18n("search"), SVG.SEARCH, () -> changeToolbar(searchBar))
314318
);

0 commit comments

Comments
 (0)