Merge remote-tracking branch 'official/main' into prs-base

HMCL/src/main/java/org/jackhuang/hmcl/countly/CrashReport.java

@@ -5,39 +5,25 @@
 import org.jackhuang.hmcl.util.platform.Architecture;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
 
-import java.io.File;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Map;
-
-import static org.jackhuang.hmcl.util.Lang.mapOf;
-import static org.jackhuang.hmcl.util.Pair.pair;
-import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 
 public class CrashReport {
 
     private final Thread thread;
     private final Throwable throwable;
     private final String stackTrace;
 
-    private boolean nonFatal;
-
     public CrashReport(Thread thread, Throwable throwable) {
         this.thread = thread;
         this.throwable = throwable;
         stackTrace = StringUtils.getStackTrace(throwable);
-        nonFatal = false;
     }
 
     public Throwable getThrowable() {
         return this.throwable;
     }
 
-    public CrashReport setNonFatal() {
-        nonFatal = true;
-        return this;
-    }
-
     public boolean shouldBeReport() {
         if (!stackTrace.contains("org.jackhuang"))
             return false;
@@ -48,23 +34,6 @@ public boolean shouldBeReport() {
         return true;
     }
 
-    public Map<String, Object> getMetrics(long runningTime) {
-        return mapOf(
-                pair("_run", runningTime),
-                pair("_app_version", Metadata.VERSION),
-                pair("_os", OperatingSystem.SYSTEM_NAME),
-                pair("_os_version", OperatingSystem.SYSTEM_VERSION),
-                pair("_disk_current", getDiskAvailable()),
-                pair("_disk_total", getDiskTotal()),
-                pair("_ram_current", getMemoryAvailable()),
-                pair("_ram_total", Runtime.getRuntime().maxMemory() / BYTES_IN_MB),
-                pair("_error", stackTrace),
-                pair("_logs", LOG.getLogs()),
-                pair("_name", throwable.getLocalizedMessage()),
-                pair("_nonfatal", nonFatal)
-        );
-    }
-
     public String getDisplayText() {
         return "---- Hello Minecraft! Crash Report ----\n" +
                 "  Version: " + Metadata.VERSION + "\n" +
@@ -82,29 +51,4 @@ public String getDisplayText() {
                 "  JVM Total Memory: " + Runtime.getRuntime().totalMemory() + "\n" +
                 "  JVM Free Memory: " + Runtime.getRuntime().freeMemory() + "\n";
     }
-
-    private static final Long BYTES_IN_MB = 1024L * 1024;
-
-    private static long getMemoryAvailable() {
-        Long total = Runtime.getRuntime().totalMemory();
-        Long availMem = Runtime.getRuntime().freeMemory();
-        return (total - availMem) / BYTES_IN_MB;
-    }
-
-    private static long getDiskAvailable() {
-        long total = 0, free = 0;
-        for (File f : File.listRoots()) {
-            total += f.getTotalSpace();
-            free += f.getUsableSpace();
-        }
-        return (total - free) / BYTES_IN_MB;
-    }
-
-    private static long getDiskTotal() {
-        long total = 0;
-        for (File f : File.listRoots()) {
-            total += f.getTotalSpace();
-        }
-        return total / BYTES_IN_MB;
-    }
 }

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

@@ -59,15 +59,11 @@
 import org.jackhuang.hmcl.util.io.NetworkUtils;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
 import java.nio.file.FileSystem;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-import java.util.Optional;
+import java.util.*;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -297,25 +293,65 @@ class ModInfoDialog extends JFXDialogLayout {
             titleContainer.setSpacing(8);
 
             ImageView imageView = new ImageView();
-            if (StringUtils.isNotBlank(modInfo.getModInfo().getLogoPath())) {
-                Task.supplyAsync(() -> {
-                    try (FileSystem fs = CompressingUtils.createReadOnlyZipFileSystem(modInfo.getModInfo().getFile())) {
-                        Path iconPath = fs.getPath(modInfo.getModInfo().getLogoPath());
+            Task.supplyAsync(() -> {
+                try (FileSystem fs = CompressingUtils.createReadOnlyZipFileSystem(modInfo.getModInfo().getFile())) {
+                    String logoPath = modInfo.getModInfo().getLogoPath();
+                    if (StringUtils.isNotBlank(logoPath)) {
+                        Path iconPath = fs.getPath(logoPath);
                         if (Files.exists(iconPath)) {
-                            ByteArrayOutputStream stream = new ByteArrayOutputStream();
-                            Files.copy(iconPath, stream);
-                            return new ByteArrayInputStream(stream.toByteArray());
+                            try (InputStream stream = Files.newInputStream(iconPath)) {
+                                Image image = new Image(stream, 40, 40, true, true);
+                                if (!image.isError() && image.getWidth() == image.getHeight())
+                                    return image;
+                            } catch (Throwable e) {
+                                LOG.warning("Failed to load image " + logoPath, e);
+                            }
                         }
                     }
-                    return null;
-                }).whenComplete(Schedulers.javafx(), (stream, exception) -> {
-                    if (stream != null) {
-                        imageView.setImage(new Image(stream, 40, 40, true, true));
-                    } else {
-                        imageView.setImage(FXUtils.newBuiltinImage("/assets/img/command.png", 40, 40, true, true));
+
+                    List<String> defaultPaths = new ArrayList<>(Arrays.asList(
+                            "icon.png",
+                            "logo.png",
+                            "mod_logo.png",
+                            "pack.png",
+                            "logoFile.png"
+                    ));
+
+                    String id = modInfo.getModInfo().getId();
+                    if (StringUtils.isNotBlank(id)) {
+                        defaultPaths.addAll(Arrays.asList(
+                                "assets/" + id + "/icon.png",
+                                "assets/" + id.replace("-", "") + "/icon.png",
+                                id + ".png",
+                                id + "-logo.png",
+                                id + "-icon.png",
+                                id + "_logo.png",
+                                id + "_icon.png"
+                        ));
                     }
-                }).start();
-            }
+
+                    for (String path : defaultPaths) {
+                        Path iconPath = fs.getPath(path);
+                        if (Files.exists(iconPath)) {
+                            try (InputStream stream = Files.newInputStream(iconPath)) {
+                                Image image = new Image(stream, 40, 40, true, true);
+                                if (!image.isError() && image.getWidth() == image.getHeight())
+                                    return image;
+                            }
+                        }
+                    }
+                } catch (Exception e) {
+                    LOG.warning("Failed to load icon", e);
+                }
+
+                return null;
+            }).whenComplete(Schedulers.javafx(), (image, exception) -> {
+                if (image != null) {
+                    imageView.setImage(image);
+                } else {
+                    imageView.setImage(FXUtils.newBuiltinImage("/assets/img/command.png", 40, 40, true, true));
+                }
+            }).start();
 
             TwoLineListItem title = new TwoLineListItem();
             title.setTitle(modInfo.getModInfo().getName());

HMCL/src/main/resources/assets/lang/I18N.properties

@@ -211,6 +211,7 @@ curse.category.4482=Extra Large
 curse.category.4472=Tech
 curse.category.4473=Magic
 curse.category.5128=Vanilla+
+curse.category.7418=Horror
 
 # https://addons-ecs.forgesvc.net/api/v2/category/section/6
 curse.category.5299=Education

HMCL/src/main/resources/assets/lang/I18N_es.properties

@@ -187,6 +187,7 @@ curse.category.4482=Extra grande
 curse.category.4472=Tecnología
 curse.category.4473=Magia
 curse.category.5128=Vanilla+
+curse.category.7418=Horror
 
 # https://addons-ecs.forgesvc.net/api/v2/category/section/6
 curse.category.5299=Educación

HMCL/src/main/resources/assets/lang/I18N_ja.properties

@@ -173,6 +173,7 @@ curse.category.4479=ハードコア
 curse.category.4482=特大
 curse.category.4472=Tech
 curse.category.4473=魔法
+curse.category.7418=ホラー
 
 # https://addons-ecs.forgesvc.net/api/v2/category/section/6
 curse.category.5129=Vanilla+

HMCL/src/main/resources/assets/lang/I18N_ru.properties

@@ -184,6 +184,7 @@ curse.category.4482=Extra Large
 curse.category.4472=Tech
 curse.category.4473=Magic
 curse.category.5128=Vanilla+
+curse.category.7418=Horror
 
 # https://addons-ecs.forgesvc.net/api/v2/category/section/6
 curse.category.5299=Education

HMCL/src/main/resources/assets/lang/I18N_zh.properties

@@ -221,6 +221,7 @@ curse.category.4482=大型模組包
 curse.category.4472=科技
 curse.category.4473=魔法
 curse.category.5128=原版增強
+curse.category.7418=恐怖
 
 # https://addons-ecs.forgesvc.net/api/v2/category/section/6
 curse.category.5299=教育

HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties

@@ -222,6 +222,7 @@ curse.category.4482=大型整合包
 curse.category.4472=科技
 curse.category.4473=魔法
 curse.category.5128=原版增强
+curse.category.7418=恐怖
 
 # https://addons-ecs.forgesvc.net/api/v2/category/section/6
 curse.category.5299=教育

HMCLCore/src/main/java/org/jackhuang/hmcl/download/MojangDownloadProvider.java

@@ -19,7 +19,7 @@
 
 import org.jackhuang.hmcl.download.fabric.FabricAPIVersionList;
 import org.jackhuang.hmcl.download.fabric.FabricVersionList;
-import org.jackhuang.hmcl.download.forge.ForgeBMCLVersionList;
+import org.jackhuang.hmcl.download.forge.ForgeVersionList;
 import org.jackhuang.hmcl.download.game.GameVersionList;
 import org.jackhuang.hmcl.download.liteloader.LiteLoaderVersionList;
 import org.jackhuang.hmcl.download.neoforge.NeoForgeOfficialVersionList;
@@ -35,7 +35,7 @@ public class MojangDownloadProvider implements DownloadProvider {
     private final GameVersionList game;
     private final FabricVersionList fabric;
     private final FabricAPIVersionList fabricApi;
-    private final ForgeBMCLVersionList forge;
+    private final ForgeVersionList forge;
     private final NeoForgeOfficialVersionList neoforge;
     private final LiteLoaderVersionList liteLoader;
     private final OptiFineBMCLVersionList optifine;
@@ -49,7 +49,7 @@ public MojangDownloadProvider() {
         this.game = new GameVersionList(this);
         this.fabric = new FabricVersionList(this);
         this.fabricApi = new FabricAPIVersionList(this);
-        this.forge = new ForgeBMCLVersionList(apiRoot);
+        this.forge = new ForgeVersionList(this);
         this.neoforge = new NeoForgeOfficialVersionList(this);
         this.liteLoader = new LiteLoaderVersionList(this);
         this.optifine = new OptiFineBMCLVersionList(apiRoot);