update

Author: Calboot

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

@@ -301,7 +301,7 @@ protected ModDownloadPageSkin(DownloadPage control) {
 
                     for (String gameVersion : control.versions.keys().stream()
                             .sorted(Collections.reverseOrder(GameVersionNumber::compare))
-                            .collect(Collectors.toList())) {
+                            .toList()) {
                         List<RemoteMod.Version> versions = control.versions.get(gameVersion);
                         if (versions == null || versions.isEmpty()) {
                             continue;
@@ -449,22 +449,12 @@ 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;
-            }
+            String title = switch (type) {
+                case WORLD -> "world.download.title";
+                case MODPACK -> "modpack.download.title";
+                case RESOURCE_PACK -> "resourcepack.download.title";
+                default -> "mods.download.title";
+            };
             this.setHeading(new HBox(new Label(i18n(title, version.getName()))));
 
             VBox box = new VBox(8);
@@ -530,12 +520,13 @@ private void loadChangelogAndDependencies(RemoteMod.Version version, DownloadPag
             Task.supplyAsync(() -> {
                 Optional<String> changelog;
                 if (version.getChangelog() != null) {
-                    changelog = Optional.ofNullable(version.getChangelog().isBlank() ? null : version.getChangelog());
+                    changelog = StringUtils.nullIfBlank(version.getChangelog());
                 } else {
                     try {
-                        String changelogText = StringUtils.htmlToText(selfPage.repository.getModChangelog(version.getModid(), version.getVersionId()));
-                        changelog = changelogText.isBlank() ? Optional.empty() : Optional.of(changelogText);
-                    } catch (UnsupportedOperationException e) {
+                        changelog = StringUtils.nullIfBlank(
+                                StringUtils.htmlToText(selfPage.repository.getModChangelog(version.getModid(), version.getVersionId()))
+                        );
+                    } catch (UnsupportedOperationException e) { // Should be impossible
                         changelog = Optional.empty();
                     }
                 }

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

@@ -39,7 +39,6 @@
 import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.ui.construct.*;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
-import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.Pair;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.TaskCancellationAction;
@@ -351,8 +350,7 @@ private static final class ModItem extends StackPane {
                 pane.getChildren().add(descPane);
             }
 
-            RipplerContainer container = new RipplerContainer(pane);
-            getChildren().setAll(container);
+            getChildren().setAll(new RipplerContainer(pane));
 
             // Workaround for https://github.com/HMCL-dev/HMCL/issues/2129
             this.setMinHeight(50);
@@ -370,13 +368,11 @@ public ModDetail(RemoteMod.Version targetVersion, RemoteModRepository repository
 
             VBox box = new VBox(8);
             box.setPadding(new Insets(8));
-            ModItem modItem = new ModItem(targetVersion, source);
-            modItem.setMouseTransparent(true); // Item is displayed for info, clicking shouldn't open the dialog again
-            box.getChildren().setAll(modItem);
+            box.getChildren().setAll(new ModItem(targetVersion, source));
 
             SpinnerPane spinnerPane = new SpinnerPane();
             ScrollPane scrollPane = new ScrollPane();
-            ComponentList changelogComponent = new ComponentList(Lang::immutableListOf);
+            ComponentList changelogComponent = new ComponentList(null);
             loadChangelog(targetVersion, spinnerPane, changelogComponent);
             spinnerPane.setOnFailedAction(e -> loadChangelog(targetVersion, spinnerPane, changelogComponent));
 
@@ -405,25 +401,19 @@ private void loadChangelog(RemoteMod.Version version, SpinnerPane spinnerPane, C
             spinnerPane.setLoading(true);
             Task.supplyAsync(() -> {
                 if (version.getChangelog() != null) {
-                    return version.getChangelog().isBlank() ? null : version.getChangelog();
+                    return StringUtils.nullIfBlank(version.getChangelog());
                 } else {
                     try {
-                        String changelog = StringUtils.htmlToText(repository.getModChangelog(version.getModid(), version.getVersionId()));
-                        return changelog.isBlank() ? null : changelog;
+                        return StringUtils.nullIfBlank(StringUtils.htmlToText(repository.getModChangelog(version.getModid(), version.getVersionId())));
                     } catch (UnsupportedOperationException e) {
-                        return null;
+                        return Optional.<String>empty();
                     }
                 }
             }).whenComplete(Schedulers.javafx(), (result, exception) -> {
                 if (exception == null) {
-                    if (result != null) {
-                        componentList.getContent().setAll(new HBox(new Text(result)));
-                    } else {
-                        componentList.getContent().setAll();
-                    }
+                    result.ifPresent(s -> componentList.getContent().setAll(new HBox(new Text(s))));
                     spinnerPane.setFailedReason(null);
                 } else {
-                    componentList.getContent().setAll();
                     spinnerPane.setFailedReason(i18n("download.failed.refresh"));
                 }
                 spinnerPane.setLoading(false);

HMCLCore/src/main/java/org/jackhuang/hmcl/util/StringUtils.java

@@ -534,6 +534,11 @@ public static boolean isAlphabeticOrNumber(String str) {
         return true;
     }
 
+    @Contract(pure = true)
+    public static Optional<String> nullIfBlank(String str) {
+        return Optional.ofNullable(str).map(s -> s.isBlank() ? null : s);
+    }
+
     @Contract(value = "null -> null", pure = true)
     public static String htmlToText(String html) {
         if (html == null) {
@@ -546,7 +551,7 @@ public static String htmlToText(String html) {
         document.select("p").prepend("\\n");
         document.select("p").append("\\n");
         String newHtml = document.html().replaceAll("\\\\n", System.lineSeparator());
-        return Jsoup.clean(newHtml, "", Safelist.none(), outputSettings).trim();
+        return Jsoup.clean(newHtml, "", Safelist.none(), outputSettings);
     }
 
     public static class LevCalculator {