Fix #2938 : 修复 DefaultLauncher 会多次添加包装命令的问题 (#2939 )

Fix #2934 : 修复无法读取远古版本版本号的问题 (#2936 )
* update * update
2024-03-16 11:08:17 +08:00 · 2024-03-15 20:57:45 +08:00 · 2024-03-15 13:39:50 +08:00 · 2024-03-15 12:56:29 +08:00 · 2024-03-15 12:24:43 +08:00 · 2024-03-14 21:23:06 +08:00
45 changed files with 351 additions and 677 deletions
@@ -284,8 +284,10 @@ public final class Launcher extends Application {
                    .findAny()
                    .map(bean -> bean.getUsage().getUsed() / 1024 / 1024 + "MB")
                    .orElse("Unknown"));
-            if (OperatingSystem.CURRENT_OS.isLinuxOrBSD())
+            if (OperatingSystem.CURRENT_OS.isLinuxOrBSD()) {
                LOG.info("XDG Session Type: " + System.getenv("XDG_SESSION_TYPE"));
+                LOG.info("XDG Current Desktop: " + System.getenv("XDG_CURRENT_DESKTOP"));
+            }

            launch(Launcher.class, args);
        } catch (Throwable e) { // Fucking JavaFX will suppress the exception and will break our crash reporter.
@@ -55,8 +55,8 @@ public final class Main {
    }

    public static void main(String[] args) {
-        System.setProperty("java.net.useSystemProxies", "true");
-        System.setProperty("javafx.autoproxy.disable", "true");
+        System.getProperties().putIfAbsent("java.net.useSystemProxies", "true");
+        System.getProperties().putIfAbsent("javafx.autoproxy.disable", "true");
        System.getProperties().putIfAbsent("http.agent", "HMCL/" + Metadata.VERSION);

        checkDirectoryPath();
@@ -333,7 +333,8 @@ public final class LauncherHelper {
    }

    private static Task<JavaVersion> checkGameState(Profile profile, VersionSetting setting, Version version) {
-        GameVersionNumber gameVersion = GameVersionNumber.asGameVersion(profile.getRepository().getGameVersion(version));
+        LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(version, profile.getRepository().getGameVersion(version).orElse(null));
+        GameVersionNumber gameVersion = GameVersionNumber.asGameVersion(analyzer.getVersion(LibraryAnalyzer.LibraryType.MINECRAFT));

        if (setting.isNotCheckJVM()) {
            return Task.composeAsync(() -> setting.getJavaVersion(gameVersion, version))
@@ -417,7 +418,6 @@ public final class LauncherHelper {
            JavaVersionConstraint violatedMandatoryConstraint = null;
            List<JavaVersionConstraint> violatedSuggestedConstraints = null;

-            LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(version, gameVersion.toString());
            for (JavaVersionConstraint constraint : JavaVersionConstraint.ALL) {
                if (constraint.appliesToVersion(gameVersion, version, javaVersion, analyzer)) {
                    if (!constraint.checkJava(gameVersion, version, javaVersion)) {
@@ -835,7 +835,7 @@ public final class LauncherHelper {
        @Override
        public void onExit(int exitCode, ExitType exitType) {
            if (showLogs) {
-                Platform.runLater(() -> logWindow.logLine(String.format("[HMCL ProcessListener] Minecraft exit with code %d(0x%x).", exitCode, exitCode), Log4jLevel.INFO));
+                Platform.runLater(() -> logWindow.logLine(String.format("[HMCL ProcessListener] Minecraft exit with code %d(0x%x), type is %s.", exitCode, exitCode, exitType), Log4jLevel.INFO));
            }

            launchingLatch.countDown();
@@ -94,8 +94,12 @@ public final class LogExporter {
                if (Files.isRegularFile(file)) {
                    FileTime time = Files.readAttributes(file, BasicFileAttributes.class).lastModifiedTime();
                    if (time.toMillis() >= processStartTime) {
-                        String crashLog = Logging.filterForbiddenToken(FileUtils.readText(file, OperatingSystem.NATIVE_CHARSET));
-                        zipper.putTextFile(crashLog, file.getFileName().toString());
+                        try {
+                            String crashLog = Logging.filterForbiddenToken(FileUtils.readText(file, OperatingSystem.NATIVE_CHARSET));
+                            zipper.putTextFile(crashLog, file.getFileName().toString());
+                        } catch (IOException e) {
+                            LOG.log(Level.WARNING, "Failed to read log file: " + file, e);
+                        }
                    }
                }
            }
@@ -21,12 +21,14 @@ import com.google.gson.JsonParseException;
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.util.InvocationDispatcher;
 import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.i18n.I18n;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.io.JarUtils;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;

 import java.io.IOException;
 import java.nio.file.*;
+import java.util.Locale;
 import java.util.logging.Level;

 import static org.jackhuang.hmcl.util.Logging.LOG;
@@ -87,6 +89,8 @@ public final class ConfigHolder {
        globalConfigInstance = loadGlobalConfig();
        globalConfigInstance.addListener(source -> markGlobalConfigDirty());

+        Locale.setDefault(config().getLocalization().getLocale());
+        I18n.setLocale(configInstance.getLocalization());
        Settings.init();

        if (newlyCreated) {
@@ -55,7 +55,6 @@ public final class DownloadProviders {

    private static final MojangDownloadProvider MOJANG;
    private static final BMCLAPIDownloadProvider BMCLAPI;
-    // private static final BMCLAPIDownloadProvider MCBBS;

    public static final String DEFAULT_PROVIDER_ID = "balanced";
    public static final String DEFAULT_RAW_PROVIDER_ID = "bmclapi";
@@ -69,27 +68,19 @@ public final class DownloadProviders {

        MOJANG = new MojangDownloadProvider();
        BMCLAPI = new BMCLAPIDownloadProvider(bmclapiRoot);
-        // MCBBS = new BMCLAPIDownloadProvider("https://download.mcbbs.net");
        rawProviders = mapOf(
                pair("mojang", MOJANG),
                pair("bmclapi", BMCLAPI)
-                // pair("mcbbs", MCBBS)
        );

        AdaptedDownloadProvider fileProvider = new AdaptedDownloadProvider();
-        fileProvider.setDownloadProviderCandidates(Arrays.asList(
-            // MCBBS,
-            BMCLAPI,
-            MOJANG));
-        BalancedDownloadProvider balanced = new BalancedDownloadProvider(
-            MOJANG,
-            // MCBBS,
-            BMCLAPI);
+        fileProvider.setDownloadProviderCandidates(Arrays.asList(BMCLAPI, MOJANG));
+        BalancedDownloadProvider balanced = new BalancedDownloadProvider(MOJANG, BMCLAPI);

        providersById = mapOf(
                pair("official", new AutoDownloadProvider(MOJANG, fileProvider)),
                pair("balanced", new AutoDownloadProvider(balanced, fileProvider)),
-                pair("mirror", new AutoDownloadProvider(BMCLAPI /* MCBBS */, fileProvider)));
+                pair("mirror", new AutoDownloadProvider(BMCLAPI, fileProvider)));

        observer = FXUtils.observeWeak(() -> {
            FetchTask.setDownloadExecutorConcurrency(
@@ -108,12 +99,11 @@ public final class DownloadProviders {
                    .orElse(providersById.get(DEFAULT_PROVIDER_ID));
        });

-        FXUtils.onChangeAndOperate(config().downloadTypeProperty(), downloadType -> {
-            if (!rawProviders.containsKey(downloadType)) {
-                config().setDownloadType(DEFAULT_RAW_PROVIDER_ID);
-                return;
-            }
+        if (!rawProviders.containsKey(config().getDownloadType())) {
+            config().setDownloadType(DEFAULT_RAW_PROVIDER_ID);
+        }

+        FXUtils.onChangeAndOperate(config().downloadTypeProperty(), downloadType -> {
            DownloadProvider primary = Optional.ofNullable(rawProviders.get(downloadType))
                    .orElse(rawProviders.get(DEFAULT_RAW_PROVIDER_ID));
            fileDownloadProvider.setDownloadProviderCandidates(
@@ -21,9 +21,7 @@ import com.google.gson.*;
 import com.google.gson.annotations.JsonAdapter;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
-import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.IntegerProperty;
-import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import org.jackhuang.hmcl.util.javafx.ObservableHelper;
 import org.jackhuang.hmcl.util.javafx.PropertyUtils;
@@ -33,7 +31,7 @@ import java.lang.reflect.Type;
 import java.util.*;

@JsonAdapter(GlobalConfig.Serializer.class)
-public class GlobalConfig implements Cloneable, Observable {
+public final class GlobalConfig implements Cloneable, Observable {

    @Nullable
    public static GlobalConfig fromJson(String json) throws JsonParseException {
@@ -47,17 +45,13 @@ public class GlobalConfig implements Cloneable, Observable {
        return instance;
    }

-    private IntegerProperty agreementVersion = new SimpleIntegerProperty();
+    private final IntegerProperty agreementVersion = new SimpleIntegerProperty();

-    private IntegerProperty platformPromptVersion = new SimpleIntegerProperty();
-
-    private BooleanProperty multiplayerRelay = new SimpleBooleanProperty();
-
-    private IntegerProperty multiplayerAgreementVersion = new SimpleIntegerProperty(0);
+    private final IntegerProperty platformPromptVersion = new SimpleIntegerProperty();

    private final Map<String, Object> unknownFields = new HashMap<>();

-    private transient ObservableHelper helper = new ObservableHelper(this);
+    private final transient ObservableHelper helper = new ObservableHelper(this);

    public GlobalConfig() {
        PropertyUtils.attachListener(this, helper);
@@ -106,37 +100,10 @@ public class GlobalConfig implements Cloneable, Observable {
        this.platformPromptVersion.set(platformPromptVersion);
    }

-    public boolean isMultiplayerRelay() {
-        return multiplayerRelay.get();
-    }
-
-    public BooleanProperty multiplayerRelayProperty() {
-        return multiplayerRelay;
-    }
-
-    public void setMultiplayerRelay(boolean multiplayerRelay) {
-        this.multiplayerRelay.set(multiplayerRelay);
-    }
-
-    public int getMultiplayerAgreementVersion() {
-        return multiplayerAgreementVersion.get();
-    }
-
-    public IntegerProperty multiplayerAgreementVersionProperty() {
-        return multiplayerAgreementVersion;
-    }
-
-    public void setMultiplayerAgreementVersion(int multiplayerAgreementVersion) {
-        this.multiplayerAgreementVersion.set(multiplayerAgreementVersion);
-    }
-
-    public static class Serializer implements JsonSerializer<GlobalConfig>, JsonDeserializer<GlobalConfig> {
+    public static final class Serializer implements JsonSerializer<GlobalConfig>, JsonDeserializer<GlobalConfig> {
        private static final Set<String> knownFields = new HashSet<>(Arrays.asList(
                "agreementVersion",
-                "platformPromptVersion",
-                "multiplayerToken",
-                "multiplayerRelay",
-                "multiplayerAgreementVersion"
+                "platformPromptVersion"
        ));

        @Override
@@ -148,8 +115,6 @@ public class GlobalConfig implements Cloneable, Observable {
            JsonObject jsonObject = new JsonObject();
            jsonObject.add("agreementVersion", context.serialize(src.getAgreementVersion()));
            jsonObject.add("platformPromptVersion", context.serialize(src.getPlatformPromptVersion()));
-            jsonObject.add("multiplayerRelay", context.serialize(src.isMultiplayerRelay()));
-            jsonObject.add("multiplayerAgreementVersion", context.serialize(src.getMultiplayerAgreementVersion()));
            for (Map.Entry<String, Object> entry : src.unknownFields.entrySet()) {
                jsonObject.add(entry.getKey(), context.serialize(entry.getValue()));
            }
@@ -166,8 +131,6 @@ public class GlobalConfig implements Cloneable, Observable {
            GlobalConfig config = new GlobalConfig();
            config.setAgreementVersion(Optional.ofNullable(obj.get("agreementVersion")).map(JsonElement::getAsInt).orElse(0));
            config.setPlatformPromptVersion(Optional.ofNullable(obj.get("platformPromptVersion")).map(JsonElement::getAsInt).orElse(0));
-            config.setMultiplayerRelay(Optional.ofNullable(obj.get("multiplayerRelay")).map(JsonElement::getAsBoolean).orElse(false));
-            config.setMultiplayerAgreementVersion(Optional.ofNullable(obj.get("multiplayerAgreementVersion")).map(JsonElement::getAsInt).orElse(0));

            for (Map.Entry<String, JsonElement> entry : obj.entrySet()) {
                if (!knownFields.contains(entry.getKey())) {
@@ -1,164 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2021  huangyuhui <huanghongxun2008@126.com> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.setting;
-
-import com.google.gson.annotations.SerializedName;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import org.jackhuang.hmcl.auth.OAuth;
-import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.util.gson.JsonUtils;
-import org.jackhuang.hmcl.util.gson.UUIDTypeAdapter;
-import org.jackhuang.hmcl.util.io.HttpRequest;
-import org.jackhuang.hmcl.util.io.NetworkUtils;
-
-import java.util.UUID;
-
-import static org.jackhuang.hmcl.util.Lang.mapOf;
-import static org.jackhuang.hmcl.util.Pair.pair;
-
-public final class HMCLAccounts {
-
-    private static final ObjectProperty<HMCLAccount> account = new SimpleObjectProperty<>();
-
-    private HMCLAccounts() {
-    }
-
-    public static HMCLAccount getAccount() {
-        return account.get();
-    }
-
-    public static ObjectProperty<HMCLAccount> accountProperty() {
-        return account;
-    }
-
-    public static void setAccount(HMCLAccount account) {
-        HMCLAccounts.account.set(account);
-    }
-
-    public static Task<Void> login() {
-        String nonce = UUIDTypeAdapter.fromUUID(UUID.randomUUID());
-        String scope = "openid offline_access";
-
-        return Task.supplyAsync(() -> {
-            OAuth.Session session = Accounts.OAUTH_CALLBACK.startServer();
-            Accounts.OAUTH_CALLBACK.openBrowser(NetworkUtils.withQuery(
-                    "https://login.microsoftonline.com/common/oauth2/v2.0/authorize",
-                    mapOf(
-                            pair("client_id", Accounts.OAUTH_CALLBACK.getClientId()),
-                            pair("response_type", "id_token code"),
-                            pair("response_mode", "form_post"),
-                            pair("scope", scope),
-                            pair("redirect_uri", session.getRedirectURI()),
-                            pair("nonce", nonce)
-                    )));
-            String code = session.waitFor();
-
-            // Authorization Code -> Token
-            String responseText = HttpRequest.POST("https://login.microsoftonline.com/common/oauth2/v2.0/token")
-                    .form(mapOf(pair("client_id", Accounts.OAUTH_CALLBACK.getClientId()), pair("code", code),
-                            pair("grant_type", "authorization_code"), pair("client_secret", Accounts.OAUTH_CALLBACK.getClientSecret()),
-                            pair("redirect_uri", session.getRedirectURI()), pair("scope", scope)))
-                    .getString();
-            OAuth.AuthorizationResponse response = JsonUtils.fromNonNullJson(responseText,
-                    OAuth.AuthorizationResponse.class);
-
-            HMCLAccountProfile profile = HttpRequest.GET("https://hmcl.huangyuhui.net/api/user")
-                    .header("Token-Type", response.tokenType)
-                    .header("Access-Token", response.accessToken)
-                    .header("Authorization-Provider", "microsoft")
-                    .authorization("Bearer", session.getIdToken())
-                    .getJson(HMCLAccountProfile.class);
-
-            return new HMCLAccount("microsoft", profile.nickname, profile.email, profile.role, session.getIdToken(), response.tokenType, response.accessToken, response.refreshToken);
-        }).thenAcceptAsync(Schedulers.javafx(), account -> {
-            setAccount(account);
-        });
-    }
-
-    public static class HMCLAccount implements HttpRequest.Authorization {
-        private final String provider;
-        private final String nickname;
-        private final String email;
-        private final String role;
-        private final String idToken;
-        private final String tokenType;
-        private final String accessToken;
-        private final String refreshToken;
-
-        public HMCLAccount(String provider, String nickname, String email, String role, String idToken, String tokenType, String accessToken, String refreshToken) {
-            this.provider = provider;
-            this.nickname = nickname;
-            this.email = email;
-            this.role = role;
-            this.idToken = idToken;
-            this.tokenType = tokenType;
-            this.accessToken = accessToken;
-            this.refreshToken = refreshToken;
-        }
-
-        public String getProvider() {
-            return provider;
-        }
-
-        public String getNickname() {
-            return nickname;
-        }
-
-        public String getEmail() {
-            return email;
-        }
-
-        public String getRole() {
-            return role;
-        }
-
-        public String getIdToken() {
-            return idToken;
-        }
-
-        @Override
-        public String getTokenType() {
-            return tokenType;
-        }
-
-        @Override
-        public String getAccessToken() {
-            return accessToken;
-        }
-
-        public String getRefreshToken() {
-            return refreshToken;
-        }
-    }
-
-    private static class HMCLAccountProfile {
-        @SerializedName("ID")
-        String id;
-        @SerializedName("Provider")
-        String provider;
-        @SerializedName("Email")
-        String email;
-        @SerializedName("NickName")
-        String nickname;
-        @SerializedName("Role")
-        String role;
-    }
-
-}
@@ -24,8 +24,6 @@ import org.jackhuang.hmcl.ui.animation.AnimationUtils;
 import org.jackhuang.hmcl.util.CacheRepository;
 import org.jackhuang.hmcl.util.io.FileUtils;

-import java.util.Locale;
-
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;

 public final class Settings {
@@ -47,9 +45,6 @@ public final class Settings {
    }

    private Settings() {
-        config().localizationProperty().addListener(unused -> updateSystemLocale());
-        updateSystemLocale();
-
        DownloadProviders.init();
        ProxyManager.init();
        Accounts.init();
@@ -81,8 +76,4 @@ public final class Settings {
                return null;
        }
    }
-
-    private static void updateSystemLocale() {
-        Locale.setDefault(config().getLocalization().getLocale());
-    }
 }
@@ -79,6 +79,7 @@ import java.lang.ref.WeakReference;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
@@ -943,7 +944,14 @@ public final class FXUtils {
                    if ("a".equals(element.getTagName())) {
                        String href = element.getAttribute("href");
                        JFXHyperlink hyperlink = new JFXHyperlink(element.getTextContent());
-                        hyperlink.setOnAction(e -> hyperlinkAction.accept(href));
+                        hyperlink.setOnAction(e -> {
+                            String link = href;
+                            try {
+                                link = new URI(href).toASCIIString();
+                            } catch (URISyntaxException ignored) {
+                            }
+                            hyperlinkAction.accept(link);
+                        });
                        texts.add(hyperlink);
                    } else if ("b".equals(element.getTagName())) {
                        Text text = new Text(element.getTextContent());
@@ -46,6 +46,7 @@ import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
 import org.jackhuang.hmcl.util.Log4jLevel;
 import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.Pair;
+import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.platform.Architecture;
 import org.jackhuang.hmcl.util.platform.CommandBuilder;
@@ -102,7 +103,7 @@ public class GameCrashWindow extends Stage {

        memory = Optional.ofNullable(launchOptions.getMaxMemory()).map(i -> i + " MB").orElse("-");

-        total_memory = Optional.ofNullable(OperatingSystem.TOTAL_MEMORY).map(i -> i + " MB").orElse("-");
+        total_memory = OperatingSystem.TOTAL_MEMORY + " MB";

        this.java = launchOptions.getJava().getArchitecture() == Architecture.SYSTEM_ARCH
                ? launchOptions.getJava().getVersion()
@@ -169,56 +170,51 @@ public class GameCrashWindow extends Stage {
                    keywords.addAll(pair.getValue());
                }

-                List<Node> segments = new ArrayList<>();
+                List<Node> segments = new ArrayList<>(FXUtils.parseSegment(i18n("game.crash.feedback"), Controllers::onHyperlinkAction));

-                boolean hasMultipleRules = results.keySet().stream().distinct().count() > 1;
-                if (hasMultipleRules) {
-                    segments.addAll(FXUtils.parseSegment(i18n("game.crash.feedback"), Controllers::onHyperlinkAction));
+                LOG.log(Level.INFO, "Number of reasons: " + results.size());
+                if (results.size() > 1) {
                    segments.add(new Text("\n"));
                    segments.addAll(FXUtils.parseSegment(i18n("game.crash.reason.multiple"), Controllers::onHyperlinkAction));
-                    LOG.log(Level.INFO, "Multiple reasons detected");
+                } else {
+                    segments.add(new Text("\n\n"));
                }

                for (CrashReportAnalyzer.Result result : results.values()) {
+                    String message;
                    switch (result.getRule()) {
                        case TOO_OLD_JAVA:
-                            segments.addAll(FXUtils.parseSegment(i18n("game.crash.reason.too_old_java",
-                                    CrashReportAnalyzer.getJavaVersionFromMajorVersion(Integer.parseInt(result.getMatcher().group("expected")))), Controllers::onHyperlinkAction));
+                            message = i18n("game.crash.reason.too_old_java", CrashReportAnalyzer.getJavaVersionFromMajorVersion(Integer.parseInt(result.getMatcher().group("expected"))));
                            break;
                        case MOD_RESOLUTION_CONFLICT:
                        case MOD_RESOLUTION_MISSING:
                        case MOD_RESOLUTION_COLLECTION:
-                            segments.addAll(FXUtils.parseSegment(i18n("game.crash.reason." + result.getRule().name().toLowerCase(Locale.ROOT),
+                            message = i18n("game.crash.reason." + result.getRule().name().toLowerCase(Locale.ROOT),
                                    translateFabricModId(result.getMatcher().group("sourcemod")),
                                    parseFabricModId(result.getMatcher().group("destmod")),
-                                    parseFabricModId(result.getMatcher().group("destmod"))), Controllers::onHyperlinkAction));
+                                    parseFabricModId(result.getMatcher().group("destmod")));
                            break;
                        case MOD_RESOLUTION_MISSING_MINECRAFT:
-                            segments.addAll(FXUtils.parseSegment(i18n("game.crash.reason." + result.getRule().name().toLowerCase(Locale.ROOT),
+                            message = i18n("game.crash.reason." + result.getRule().name().toLowerCase(Locale.ROOT),
                                    translateFabricModId(result.getMatcher().group("mod")),
-                                    result.getMatcher().group("version")), Controllers::onHyperlinkAction));
+                                    result.getMatcher().group("version"));
                            break;
                        case MOD_FOREST_OPTIFINE:
                        case TWILIGHT_FOREST_OPTIFINE:
                        case PERFORMANT_FOREST_OPTIFINE:
                        case JADE_FOREST_OPTIFINE:
-                            segments.addAll(FXUtils.parseSegment(i18n("game.crash.reason.mod", "OptiFine"), Controllers::onHyperlinkAction));
+                            message = i18n("game.crash.reason.mod", "OptiFine");
+                            LOG.log(Level.INFO, "Crash cause: " + result.getRule() + ": " + i18n("game.crash.reason.mod", "OptiFine"));
                            break;
                        default:
-                            segments.addAll(FXUtils.parseSegment(i18n("game.crash.reason." + result.getRule().name().toLowerCase(Locale.ROOT),
+                            message = i18n("game.crash.reason." + result.getRule().name().toLowerCase(Locale.ROOT),
                                    Arrays.stream(result.getRule().getGroupNames()).map(groupName -> result.getMatcher().group(groupName))
-                                            .toArray()), Controllers::onHyperlinkAction));
+                                            .toArray());
                            break;
                    }
-                    segments.add(new Text("\n"));
-                    if (hasMultipleRules) {
-                        segments.add(new Text("\n"));
-                    } else {
-                        segments.add(new Text("\n"));
-                        segments.addAll(FXUtils.parseSegment(i18n("game.crash.feedback"), Controllers::onHyperlinkAction));
-                        segments.add(new Text("\n"));
-                    }
-                    LOG.log(Level.INFO, "Crash cause: " + result.getRule());
+                    LOG.log(Level.INFO, "Crash cause: " + result.getRule() + ": " + message);
+                    segments.addAll(FXUtils.parseSegment(message, Controllers::onHyperlinkAction));
+                    segments.add(new Text("\n\n"));
                }
                if (results.isEmpty()) {
                    if (!keywords.isEmpty()) {
@@ -284,15 +280,20 @@ public class GameCrashWindow extends Stage {
                        logs.stream().map(Pair::getKey).collect(Collectors.joining(OperatingSystem.LINE_SEPARATOR)))
                .thenComposeAsync(logs ->
                        LogExporter.exportLogs(logFile, repository, launchOptions.getVersionName(), logs, new CommandBuilder().addAll(managedProcess.getCommands()).toString()))
-                .thenRunAsync(() -> {
-                    FXUtils.showFileInExplorer(logFile);
+                .handleAsync((result, exception) -> {
+                    Alert alert;
+
+                    if (exception == null) {
+                        FXUtils.showFileInExplorer(logFile);
+                        alert = new Alert(Alert.AlertType.INFORMATION, i18n("settings.launcher.launcher_log.export.success", logFile));
+                    } else {
+                        LOG.log(Level.WARNING, "Failed to export game crash info", exception);
+                        alert = new Alert(Alert.AlertType.WARNING, i18n("settings.launcher.launcher_log.export.failed") + "\n" + StringUtils.getStackTrace(exception));
+                    }

-                    Alert alert = new Alert(Alert.AlertType.INFORMATION, i18n("settings.launcher.launcher_log.export.success", logFile));
                    alert.setTitle(i18n("settings.launcher.launcher_log.export"));
                    alert.showAndWait();
-                }, Schedulers.javafx())
-                .exceptionally(e -> {
-                    LOG.log(Level.WARNING, "Failed to export game crash info", e);
+
                    return null;
                });
    }
@@ -50,6 +50,10 @@ import org.jackhuang.hmcl.ui.wizard.WizardProvider;
 import org.jackhuang.hmcl.util.io.NetworkUtils;

 import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -168,8 +172,23 @@ public class DecoratorController {
                break;
            case NETWORK:
                String backgroundImageUrl = config().getBackgroundImageUrl();
-                if (backgroundImageUrl != null && NetworkUtils.isURL(backgroundImageUrl))
-                    image = tryLoadImage(backgroundImageUrl).orElse(null);
+                if (backgroundImageUrl != null) {
+                    try {
+                        URLConnection connection = NetworkUtils.createConnection(new URL(backgroundImageUrl));
+                        if (connection instanceof HttpURLConnection) {
+                            connection = NetworkUtils.resolveConnection((HttpURLConnection) connection);
+                        }
+
+                        try (InputStream input = connection.getInputStream()) {
+                            image = new Image(input);
+                            if (image.isError()) {
+                                throw image.getException();
+                            }
+                        }
+                    } catch (Exception e) {
+                        LOG.log(WARNING, "Couldn't load background image", e);
+                    }
+                }
                break;
            case CLASSIC:
                image = newBuiltinImage("/assets/img/background-classic.jpg");
@@ -41,6 +41,7 @@ import org.jackhuang.hmcl.download.quilt.QuiltAPIRemoteVersion;
 import org.jackhuang.hmcl.download.quilt.QuiltRemoteVersion;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.setting.VersionIconType;
+import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
 import org.jackhuang.hmcl.ui.animation.TransitionPane;
@@ -51,7 +52,6 @@ import org.jackhuang.hmcl.ui.construct.RipplerContainer;
 import org.jackhuang.hmcl.ui.wizard.Navigation;
 import org.jackhuang.hmcl.ui.wizard.Refreshable;
 import org.jackhuang.hmcl.ui.wizard.WizardPage;
-import org.jackhuang.hmcl.util.HMCLService;
 import org.jackhuang.hmcl.util.Holder;

 import java.util.List;
@@ -263,7 +263,7 @@ public final class VersionsPage extends BorderPane implements WizardPage, Refres
    private void onBack() { navigation.onPrev(true); }

    private void onSponsor() {
-        HMCLService.openRedirectLink("bmclapi_sponsor");
+        FXUtils.openLink("https://bmclapidoc.bangbang93.com");
    }

    private static class RemoteVersionListCell extends ListCell<RemoteVersion> {
@@ -179,7 +179,7 @@ public final class ModpackInfoPage extends Control implements WizardPage {
                if (skinnable.controller.getSettings().get(MODPACK_TYPE) == MODPACK_TYPE_SERVER) {
                    Hyperlink hyperlink = new Hyperlink(i18n("modpack.wizard.step.initialization.server"));
                    hyperlink.setOnMouseClicked(e -> {
-                        FXUtils.openLink("https://hmcl.huangyuhui.net/api/redirect/server-modpack");
+                        FXUtils.openLink("https://docs.hmcl.net/modpack/serverpack.html");
                    });
                    borderPane.setTop(hyperlink);
                } else {
@@ -80,6 +80,18 @@ public class AboutPage extends StackPane {
            zkitefly.setSubtitle(i18n("about.thanks_to.zkitefly.statement"));
            zkitefly.setExternalLink("https://github.com/zkitefly");

+            IconedTwoLineListItem burningtnt = new IconedTwoLineListItem();
+            burningtnt.setImage(FXUtils.newBuiltinImage("/assets/img/burningtnt.png"));
+            burningtnt.setTitle("Burning_TNT");
+            burningtnt.setSubtitle(i18n("about.thanks_to.burningtnt.statement"));
+            burningtnt.setExternalLink("https://github.com/burningtnt");
+
+            IconedTwoLineListItem shulkerSakura = new IconedTwoLineListItem();
+            shulkerSakura.setTitle("ShulkerSakura");
+            shulkerSakura.setImage(FXUtils.newBuiltinImage("/assets/img/ShulkerSakura.png"));
+            shulkerSakura.setSubtitle(i18n("about.thanks_to.shulkersakura.statement"));
+            shulkerSakura.setExternalLink("https://github.com/ShulkerSakura");
+
            IconedTwoLineListItem gamerteam = new IconedTwoLineListItem();
            gamerteam.setTitle("gamerteam");
            gamerteam.setImage(FXUtils.newBuiltinImage("/assets/img/gamerteam.png"));
@@ -91,12 +103,6 @@ public class AboutPage extends StackPane {
            redLnn.setImage(FXUtils.newBuiltinImage("/assets/img/red_lnn.png"));
            redLnn.setSubtitle(i18n("about.thanks_to.red_lnn.statement"));

-            // IconedTwoLineListItem mcbbs = new IconedTwoLineListItem();
-            // mcbbs.setImage(FXUtils.newBuiltinImage("/assets/img/chest.png"));
-            // mcbbs.setTitle(i18n("about.thanks_to.mcbbs"));
-            // mcbbs.setSubtitle(i18n("about.thanks_to.mcbbs.statement"));
-            // mcbbs.setExternalLink("https://www.mcbbs.net/");
-
            IconedTwoLineListItem mcmod = new IconedTwoLineListItem();
            mcmod.setImage(FXUtils.newBuiltinImage("/assets/img/mcmod.png"));
            mcmod.setTitle(i18n("about.thanks_to.mcmod"));
@@ -113,9 +119,9 @@ public class AboutPage extends StackPane {
            users.setImage(FXUtils.newBuiltinImage("/assets/img/icon.png"));
            users.setTitle(i18n("about.thanks_to.users"));
            users.setSubtitle(i18n("about.thanks_to.users.statement"));
-            users.setExternalLink("https://hmcl.huangyuhui.net/api/redirect/sponsor");
+            users.setExternalLink("https://docs.hmcl.net/groups.html");

-            thanks.getContent().setAll(yushijinhun, bangbang93, glavo, zekerzhayard, zkitefly, /* mcbbs, */ mcmod, gamerteam, redLnn, contributors, users);
+            thanks.getContent().setAll(yushijinhun, bangbang93, glavo, zekerzhayard, zkitefly, burningtnt, mcmod, shulkerSakura, gamerteam, redLnn, contributors, users);
        }

        ComponentList dep = new ComponentList();
@@ -32,6 +32,7 @@ import org.jackhuang.hmcl.upgrade.UpdateChannel;
 import org.jackhuang.hmcl.upgrade.UpdateChecker;
 import org.jackhuang.hmcl.upgrade.UpdateHandler;
 import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.i18n.Locales;
 import org.jackhuang.hmcl.util.io.FileUtils;

@@ -132,7 +133,7 @@ public final class SettingsPage extends SettingsView {
            try {
                Files.write(logFile, Logging.getRawLogs());
            } catch (IOException e) {
-                Platform.runLater(() -> Controllers.dialog(i18n("settings.launcher.launcher_log.export.failed") + "\n" + e, null, MessageType.ERROR));
+                Platform.runLater(() -> Controllers.dialog(i18n("settings.launcher.launcher_log.export.failed") + "\n" + StringUtils.getStackTrace(e), null, MessageType.ERROR));
                LOG.log(Level.WARNING, "Failed to export logs", e);
                return;
            }
@@ -144,7 +145,7 @@ public final class SettingsPage extends SettingsView {

    @Override
    protected void onSponsor() {
-        FXUtils.openLink("https://hmcl.huangyuhui.net/api/redirect/sponsor");
+        FXUtils.openLink("https://github.com/HMCL-dev/HMCL");
    }

    @Override
@@ -37,6 +37,7 @@ import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.ui.construct.ComponentList;
 import org.jackhuang.hmcl.ui.construct.ComponentSublist;
 import org.jackhuang.hmcl.ui.construct.MultiFileItem;
+import org.jackhuang.hmcl.util.i18n.I18n;
 import org.jackhuang.hmcl.util.i18n.Locales.SupportedLocale;

 import java.util.Arrays;
@@ -176,8 +177,8 @@ public abstract class SettingsView extends StackPane {
                    languagePane.setLeft(left);

                    cboLanguage = new JFXComboBox<>();
-                    cboLanguage.setConverter(stringConverter(locale -> locale.getName(config().getLocalization().getResourceBundle())));
-                    FXUtils.setLimitWidth(cboLanguage, 400);
+                    cboLanguage.setConverter(stringConverter(locale -> locale.getName(I18n.getCurrentLocale().getResourceBundle())));
+                    FXUtils.setLimitWidth(cboLanguage, 300);
                    languagePane.setRight(cboLanguage);

                    settingsPane.getContent().add(languagePane);
@@ -1,174 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2021  huangyuhui <huanghongxun2008@126.com> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.ui.main;
-
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.reflect.TypeToken;
-import com.jfoenix.controls.JFXListCell;
-import com.jfoenix.controls.JFXListView;
-import javafx.geometry.Insets;
-import javafx.geometry.VPos;
-import javafx.scene.Cursor;
-import javafx.scene.control.Label;
-import javafx.scene.layout.*;
-import javafx.scene.text.TextAlignment;
-import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.ui.FXUtils;
-import org.jackhuang.hmcl.util.Holder;
-import org.jackhuang.hmcl.util.io.HttpRequest;
-
-import java.math.BigDecimal;
-import java.time.Instant;
-import java.util.List;
-
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
-public class SponsorPage extends StackPane {
-    private final JFXListView<Sponsor> listView;
-
-    public SponsorPage() {
-        VBox content = new VBox();
-        content.setPadding(new Insets(10));
-        content.setSpacing(10);
-        content.setFillWidth(true);
-
-        {
-            StackPane sponsorPane = new StackPane();
-            sponsorPane.getStyleClass().add("card");
-            sponsorPane.setCursor(Cursor.HAND);
-            sponsorPane.setOnMouseClicked(e -> onSponsor());
-
-            GridPane gridPane = new GridPane();
-
-            ColumnConstraints col = new ColumnConstraints();
-            col.setHgrow(Priority.SOMETIMES);
-            col.setMaxWidth(Double.POSITIVE_INFINITY);
-
-            gridPane.getColumnConstraints().setAll(col);
-
-            RowConstraints row = new RowConstraints();
-            row.setMinHeight(Double.NEGATIVE_INFINITY);
-            row.setValignment(VPos.TOP);
-            row.setVgrow(Priority.SOMETIMES);
-            gridPane.getRowConstraints().setAll(row);
-
-            {
-                Label label = new Label(i18n("sponsor.hmcl"));
-                label.setWrapText(true);
-                label.setTextAlignment(TextAlignment.JUSTIFY);
-                GridPane.setRowIndex(label, 0);
-                GridPane.setColumnIndex(label, 0);
-                gridPane.getChildren().add(label);
-            }
-
-            sponsorPane.getChildren().setAll(gridPane);
-            content.getChildren().add(sponsorPane);
-        }
-
-        {
-            StackPane pane = new StackPane();
-            pane.getStyleClass().add("card");
-            listView = new JFXListView<>();
-            Holder<Object> lastCell = new Holder<>();
-            listView.setCellFactory((listView) -> new JFXListCell<Sponsor>() {
-                @Override
-                public void updateItem(Sponsor item, boolean empty) {
-                    super.updateItem(item, empty);
-
-                    // https://mail.openjdk.org/pipermail/openjfx-dev/2022-July/034764.html
-                    if (this == lastCell.value && !isVisible())
-                        return;
-                    lastCell.value = this;
-
-                    if (!empty) {
-                        setText(item.getName());
-                        setGraphic(null);
-                    }
-                }
-            });
-            VBox.setVgrow(pane, Priority.ALWAYS);
-            pane.getChildren().setAll(listView);
-            content.getChildren().add(pane);
-        }
-
-        loadSponsorList();
-
-        getChildren().setAll(content);
-    }
-
-    private void onSponsor() {
-        FXUtils.openLink("https://hmcl.huangyuhui.net/api/redirect/sponsor");
-    }
-
-    private void loadSponsorList() {
-        Task.<List<Sponsor>>supplyAsync(() -> HttpRequest.GET("https://hmcl.huangyuhui.net/api/sponsor").getJson(new TypeToken<List<Sponsor>>() {
-        }.getType())).thenAcceptAsync(Schedulers.javafx(), sponsors -> {
-            listView.getItems().setAll(sponsors);
-        }).start();
-    }
-
-    private static class Sponsor {
-        @SerializedName("name")
-        private final String name;
-
-        @SerializedName("create_time")
-        private final Instant createTime;
-
-        @SerializedName("money")
-        private final BigDecimal money;
-
-        @SerializedName("contact")
-        private final String contact;
-
-        @SerializedName("afdian_id")
-        private final String afdianId;
-
-        public Sponsor() {
-            this("", Instant.now(), BigDecimal.ZERO, "", "");
-        }
-
-        public Sponsor(String name, Instant createTime, BigDecimal money, String contact, String afdianId) {
-            this.name = name;
-            this.createTime = createTime;
-            this.money = money;
-            this.contact = contact;
-            this.afdianId = afdianId;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public Instant getCreateTime() {
-            return createTime;
-        }
-
-        public BigDecimal getMoney() {
-            return money;
-        }
-
-        public String getContact() {
-            return contact;
-        }
-
-        public String getAfdianId() {
-            return afdianId;
-        }
-    }
-}
@@ -21,7 +21,12 @@ import org.jackhuang.hmcl.game.LocalizedRemoteModRepository;
 import org.jackhuang.hmcl.mod.RemoteModRepository;
 import org.jackhuang.hmcl.mod.curse.CurseForgeRemoteModRepository;
 import org.jackhuang.hmcl.mod.modrinth.ModrinthRemoteModRepository;
+import org.jackhuang.hmcl.util.i18n.I18n;

+import java.util.MissingResourceException;
+import java.util.logging.Level;
+
+import static org.jackhuang.hmcl.util.Logging.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 public class ResourcePackDownloadListPage extends DownloadListPage {
@@ -66,10 +71,18 @@ public class ResourcePackDownloadListPage extends DownloadListPage {

    @Override
    protected String getLocalizedCategory(String category) {
+        String key;
        if ("mods.modrinth".equals(downloadSource.get())) {
-            return i18n("modrinth.category." + category);
+            key = "modrinth.category." + category;
        } else {
-            return i18n("curse.category." + category);
+            key = "curse.category." + category;
+        }
+
+        try {
+            return I18n.getResourceBundle().getString(key);
+        } catch (MissingResourceException e) {
+            LOG.log(Level.WARNING, "Cannot find key " + key + " in resource bundle", e);
+            return category;
        }
    }

@@ -164,7 +164,9 @@ public class VersionPage extends DecoratorAnimatedPage implements DecoratorPage
    }

    private void clearAssets() {
-        FileUtils.deleteDirectoryQuietly(new File(getProfile().getRepository().getBaseDirectory(), "assets"));
+        File baseDirectory = getProfile().getRepository().getBaseDirectory();
+        FileUtils.deleteDirectoryQuietly(new File(baseDirectory, "assets"));
+        FileUtils.deleteDirectoryQuietly(new File(baseDirectory, "resources"));
    }

    private void clearJunkFiles() {
@@ -1,29 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2021  huangyuhui <huanghongxun2008@126.com> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.util;
-
-import org.jackhuang.hmcl.ui.FXUtils;
-
-public final class HMCLService {
-    private HMCLService() {
-    }
-
-    public static void openRedirectLink(String id) {
-        FXUtils.openLink("https://hmcl.huangyuhui.net/api/redirect/" + id);
-    }
-}
@@ -17,7 +17,6 @@
 */
 package org.jackhuang.hmcl.util.i18n;

-import org.jackhuang.hmcl.setting.ConfigHolder;
 import org.jackhuang.hmcl.util.i18n.Locales.SupportedLocale;

 import java.time.Instant;
@@ -34,14 +33,14 @@ public final class I18n {
    private I18n() {
    }

+    private static volatile SupportedLocale locale = Locales.DEFAULT;
+
+    public static void setLocale(SupportedLocale locale) {
+        I18n.locale = locale;
+    }
+
    public static SupportedLocale getCurrentLocale() {
-        try {
-            return ConfigHolder.config().getLocalization();
-        } catch (IllegalStateException e) {
-            // e is thrown by ConfigHolder.config(), indicating the config hasn't been loaded
-            // fallback to use default locale
-            return Locales.DEFAULT;
-        }
+        return locale;
    }

    public static ResourceBundle getResourceBundle() {
@@ -30,17 +30,19 @@ about.dependency=Third-party Libraries
 about.legal=Legal Acknowledgement
 about.thanks_to=Thanks to
 about.thanks_to.bangbang93.statement=For providing BMCLAPI download API, please consider donating.
+about.thanks_to.burningtnt.statement=Contribute a lot of technical support to HMCL.
 about.thanks_to.contributors=All contributors on GitHub
 about.thanks_to.contributors.statement=Without the awesome open-source community, Hello Minecraft! Launcher would not make it so far.
 about.thanks_to.gamerteam.statement=For providing the default background image.
-about.thanks_to.glavo.statement=Contribute a lot of technical support to HMCL.
+about.thanks_to.glavo.statement=Responsible for maintaining HMCL.
 about.thanks_to.zekerzhayard.statement=Contribute a lot of technical support to HMCL.
-about.thanks_to.zkitefly.statement=Contribute a lot of technical support to HMCL.
+about.thanks_to.zkitefly.statement=Responsible for maintaining documentation of HMCL.
 about.thanks_to.mcbbs=MCBBS (Minecraft Chinese Forum)
 about.thanks_to.mcbbs.statement=For providing mcbbs.net download mirror for Mainland China users.
 about.thanks_to.mcmod=mcmod.cn
 about.thanks_to.mcmod.statement=For providing Chinese translations and wiki for various mods.
 about.thanks_to.red_lnn.statement=For providing the default background image.
+about.thanks_to.shulkersakura.statement=For providing the icon for HMCL
 about.thanks_to.users=HMCL User Group Members
 about.thanks_to.users.statement=Thanks for donations, bug reports, and so on.
 about.thanks_to.yushijinhun.statement=For providing authlib-injector related support.
@@ -183,7 +185,7 @@ button.save_as=Save As
 button.select_all=Select All
 button.yes=Yes

-chat=QQ Groups
+chat=Join Group Chat

 color.recent=Recommended
 color.custom=Custom Color
@@ -825,26 +827,39 @@ Keep in mind that you are not allowed to add mods and resource packs that are ex
 modpack.wizard.step.initialization.server=Click here for more tutorials for making a server modpack that can be automatically updated.

 modrinth.category.adventure=Adventure
+modrinth.category.audio=Audio
+modrinth.category.blocks=Blocks
 modrinth.category.bukkit=Bukkit
 modrinth.category.bungeecord=BungeeCord
 modrinth.category.challenging=Challenging
+modrinth.category.core-shaders=Core Shaders
 modrinth.category.combat=Combat
 modrinth.category.cursed=Cursed
 modrinth.category.decoration=Decoration
 modrinth.category.economy=Economy
+modrinth.category.entities=Entities
+modrinth.category.environment=Environment
 modrinth.category.equipment=Equipment
 modrinth.category.fabric=Fabric
+modrinth.category.fonts=Fonts
 modrinth.category.food=Food
 modrinth.category.forge=Forge
 modrinth.category.game-mechanics=Game Mechanics
+modrinth.category.gui=GUI
+modrinth.category.items=Items
 modrinth.category.kitchen-sink=Kitchen-Sink
 modrinth.category.library=Library
 modrinth.category.lightweight=Lightweight
+modrinth.category.liteloader=LiteLoader
+modrinth.category.locale=Locale
 modrinth.category.magic=Magic
 modrinth.category.management=Management
+modrinth.category.minecraft=Minecraft
 modrinth.category.minigame=Minigame
 modrinth.category.misc=Misc
 modrinth.category.mobs=Mobs
+modrinth.category.modded=Modded
+modrinth.category.models=Models
 modrinth.category.modloader=Modloader
 modrinth.category.multiplayer=Multiplayer
 modrinth.category.neoforge=NeoForge
@@ -853,19 +868,32 @@ modrinth.category.paper=Paper
 modrinth.category.purpur=Purpur
 modrinth.category.quests=Quests
 modrinth.category.quilt=Quilt
+modrinth.category.realistic=Realistic
 modrinth.category.rift=Rift
+modrinth.category.simplistic=Simplistic
 modrinth.category.social=Social
 modrinth.category.spigot=Spigot
 modrinth.category.sponge=Sponge
 modrinth.category.storage=Storage
 modrinth.category.technology=Technology
+modrinth.category.themed=Themed
 modrinth.category.transportation=Transportation
+modrinth.category.tweaks=Tweaks
 modrinth.category.utility=Utility
+modrinth.category.vanilla-like=Vanilla-like
 modrinth.category.velocity=Velocity
 modrinth.category.waterfall=Waterfall
 modrinth.category.worldgen=Worldgen
 modrinth.category.datapack=Datapack
 modrinth.category.folia=Folia
+modrinth.category.8x-=8x-
+modrinth.category.16x=16x
+modrinth.category.32x=32x
+modrinth.category.48x=48x
+modrinth.category.64x=64x
+modrinth.category.128x=128x
+modrinth.category.256x=256x
+modrinth.category.512x+=512x+

 mods=Mods
 mods.add=Add Mods
@@ -1118,7 +1146,7 @@ settings.launcher.download_source.auto=Auto Choose Download Mirror
 settings.launcher.enable_game_list=Show version list in home page
 settings.launcher.font=Font
 settings.launcher.general=General
-settings.launcher.language=Language
+settings.launcher.language=Language (applies after restart)
 settings.launcher.launcher_log.export=Export launcher logs
 settings.launcher.launcher_log.export.failed=Unable to export logs
 settings.launcher.launcher_log.export.success=Logs have been exported to %s
@@ -1162,7 +1190,7 @@ settings.type.special.edit.hint=Current instance [%s] has enabled per-instance s

 sponsor=Donators
 sponsor.bmclapi=Downloads are provided by BMCLAPI. Click here for more information.
-sponsor.hmcl=Hello Minecraft! Launcher is a FOSS Minecraft launcher which allows users to manage multiple Minecraft instances easily. You can donate to us on Afdian to support our file hosting and project development. Click here for more information.
+sponsor.hmcl=Hello Minecraft! Launcher is a FOSS Minecraft launcher which allows users to manage multiple Minecraft instances easily. Click here for more information.

 system.architecture=Architecture
 system.operating_system=Operating System
@@ -484,7 +484,7 @@ game.crash.reason.mod_profile_causes_game_crash=El juego actual no puede seguir
 game.crash.reason.fabric_reports_an_error_and_gives_a_solution=Forge puede haber dado un mensaje de error.\nPuede ver el registro y realizar las acciones correspondientes de acuerdo con la información de registro en el informe de errores.\nSi no ve un mensaje de error, puede consultar el informe de errores para saber cómo ocurrió el error.
 game.crash.reason.java_version_is_too_high=El juego actual se bloqueó porque la versión de Java es demasiado alta y no puede seguir ejecutándose.\nCambie a una versión anterior de Java en la pestaña Java Path de Configuración global del juego o Configuración específica del juego antes de iniciar el juego.\nSi no es así, puede descargarlo desde <a href="https://www.java.com/download/">java.com (Java8)</a> o <a href="https://bell-sw.com/pages/downloads/#downloads">BellSoft Liberica Full JRE (Java17)</a> y otras plataformas para descargar e instalar una (reinicie el iniciador después de la instalación).
 game.crash.reason.mod_name=El juego actual no puede continuar ejecutándose debido a un problema con el nombre del archivo mod. El nombre del archivo de\nMod solo debe usar mayúsculas y minúsculas (Aa ~ Zz), números (0 ~ 9), líneas horizontales (-), subrayado (_) y puntos (.) en toda la mitad del inglés.\n Por favor, vaya a la carpeta mod para agregar un carácter de Cumplimiento anterior a todos los nombres de archivo mod que no cumplan.
-game.crash.reason.incomplete_forge_installation=O jogo atual não pode continuar devido a uma instalação incompleta do Forge / NeoForge.\nDesinstale e reinstale o Forge em Configurações de versão - Instalação automática.
+game.crash.reason.incomplete_forge_installation=O jogo atual não pode continuar devido a uma instalação incompleta do Forge / NeoForge.\nDesinstale e reinstale o Forge / NeoForge em Configurações de versão - Instalação automática.
 game.crash.reason.forge_error=Forge puede haber proporcionado un mensaje de error. \nPuede ver el registro y realizar las acciones correspondientes de acuerdo con la información de registro en el informe de errores. \nSi no ve un mensaje de error, puede consultar el informe de errores para saber cómo ocurrió el error.\n%1$s
 game.crash.reason.mod_solution0=El juego actual no puede seguir ejecutándose debido a algunos problemas de modificación. \nPuede consultar el registro para ver si hay un mod incorrecto.
 game.crash.reason.mod_profile_causes_game_crash=El juego actual no puede seguir ejecutándose debido a un problema con el perfil de mod. \nPuede consultar el registro del mod defectuoso y su archivo de configuración.
@@ -361,7 +361,7 @@ game.crash.reason.mod_profile_causes_game_crash=mod プロファイルに問題
 game.crash.reason.fabric_reports_an_error_and_gives_a_solution=Forge がエラー メッセージを表示した可能性があります。 \nログを表示し、エラー レポートのログ情報に従って対応するアクションを実行できます。 \nエラー メッセージが表示されない場合は、エラー レポートをチェックして、エラーがどのように発生したかを知ることができます。
 game.crash.reason.java_version_is_too_high=Java のバージョンが高すぎて実行を継続できないため、現在のゲームがクラッシュしました。 \nゲームを起動する前に、グローバル ゲーム設定またはゲーム固有の設定の Java パス タブで Java の以前のバージョンに切り替えてください。 \nそうでない場合は、<a href="https://www.java.com/download/">java.com (Java8)</a> または <a href="https://bell-sw.com/pages/downloads/#downloads">BellSoft Liberica Full JRE (Java17)</a> およびその他のプラットフォームをダウンロードしてインストールします (インストール後にランチャーを再起動します)。
 game.crash.reason.mod_name=現在のゲームはModファイル名の問題で続行できません。\nModファイル名は、英文の全半角の大文字と小文字（Aa ~ Zz）、数字（0 ~ 9）、横線（-）、アンダースコア（_）、点（.）のみを使用してください。\n上記のコンプライアンス文字をModフォルダに追加してください。
-game.crash.reason.incomplete_forge_installation=Forge / NeoForge のインストールが不完全なため、現在のゲームを続行できません。\nバージョン設定 - 自動インストールで Forge をアンインストールしてから再インストールしてください。
+game.crash.reason.incomplete_forge_installation=Forge / NeoForge のインストールが不完全なため、現在のゲームを続行できません。\nバージョン設定 - 自動インストールで Forge / NeoForge をアンインストールしてから再インストールしてください。
 game.crash.reason.file_already_exists=ファイル %1$s が既に存在するので、現在のゲームは続行できません。\このファイルを削除してもよいと思われる場合は、このファイルをバックアップして、ゲームを再起動してから削除してみてください。
 game.crash.reason.need_jdk11=Java 仮想マシンのバージョンが不適切なため、現在のゲームは実行を続行できません。\nJava 11 をダウンロードしてインストールし、グローバル (特定) ゲーム設定で Java を 11 で始まるバージョンに設定する必要があります。
 game.crash.reason.file_changed=ファイルのチェックサムに失敗したため、現在のゲームを続行できません。\nMinecraft.jar ファイルを手動で変更した場合、変更をロールバックするか、ゲームを再度ダウンロードする必要があります。
@@ -28,17 +28,19 @@ about.dependency=相依元件
 about.legal=法律聲明
 about.thanks_to=鳴謝
 about.thanks_to.bangbang93.statement=提供 BMCLAPI 下載地點。請贊助支持 BMCLAPI！
+about.thanks_to.burningtnt.statement=為 HMCL 貢獻許多技術支持
 about.thanks_to.contributors=所有通過 Issues、Pull Requests 等管道參與本項目的貢獻者
 about.thanks_to.contributors.statement=沒有開源社區的支持，Hello Minecraft! Launcher 無法走到今天
 about.thanks_to.gamerteam.statement=提供預設背景圖
-about.thanks_to.glavo.statement=為 HMCL 貢獻許多技術支持
+about.thanks_to.glavo.statement=負責 HMCL 的日常維護
 about.thanks_to.zekerzhayard.statement=為 HMCL 貢獻許多技術支持
-about.thanks_to.zkitefly.statement=為 HMCL 貢獻許多技術支持
+about.thanks_to.zkitefly.statement=負責維護 HMCL 的文檔
 about.thanks_to.mcbbs=MCBBS 我的世界中文論壇
 about.thanks_to.mcbbs.statement=提供 MCBBS 下載地點
 about.thanks_to.mcmod=MC 百科
 about.thanks_to.mcmod.statement=提供 Mod 中文名映射表與 Mod 百科
 about.thanks_to.red_lnn.statement=提供預設背景圖
+about.thanks_to.shulkersakura.statement=提供 HMCL 的圖標
 about.thanks_to.users=HMCL 用戶群成員
 about.thanks_to.users.statement=感謝用戶群成員贊助充電、積極催更、迴響問題、出謀劃策
 about.thanks_to.yushijinhun.statement=authlib-injector 相关支援
@@ -509,7 +511,7 @@ install.installer.forge=Forge
 install.installer.neoforge=NeoForge
 install.installer.game=Minecraft
 install.installer.incompatible=與 %s 不相容
-install.installer.install=安裝%s
+install.installer.install=安裝 %s
 install.installer.install_offline=從本機檔案安裝或升級
 install.installer.install_offline.extension=Forge/OptiFine 安裝器
 install.installer.install_offline.tooltip=支援匯入已經下載好的 Forge/OptiFine 安裝器
@@ -701,26 +703,39 @@ modpack.wizard.step.initialization.warning=在製作模組包前，請您確認
 modpack.wizard.step.initialization.server=點選此處查看有關伺服器自動更新模組包的製作教學

 modrinth.category.adventure=冒險
+modrinth.category.audio=聲音
+modrinth.category.blocks=方塊
 modrinth.category.bukkit=Bukkit
 modrinth.category.bungeecord=BungeeCord
 modrinth.category.challenging=高難度
+modrinth.category.core-shaders=覈心著色器
 modrinth.category.combat=戰鬥
 modrinth.category.cursed=Cursed
 modrinth.category.decoration=裝飾
 modrinth.category.economy=經濟
+modrinth.category.entities=實體
+modrinth.category.environment=環境
 modrinth.category.equipment=裝備
 modrinth.category.fabric=Fabric
+modrinth.category.fonts=字體
 modrinth.category.food=食物
 modrinth.category.forge=Forge
 modrinth.category.game-mechanics=遊戲機制
+modrinth.category.gui=GUI
+modrinth.category.items=物品
 modrinth.category.kitchen-sink=大雜燴
 modrinth.category.library=支持庫
 modrinth.category.lightweight=輕量
+modrinth.category.liteloader=LiteLoader
+modrinth.category.locale=在地化
 modrinth.category.magic=魔法
 modrinth.category.management=管理
+modrinth.category.minecraft=Minecraft
 modrinth.category.minigame=小遊戲
 modrinth.category.misc=其他
 modrinth.category.mobs=生物
+modrinth.category.modded=Modded
+modrinth.category.models=模型
 modrinth.category.modloader=Modloader
 modrinth.category.multiplayer=多人
 modrinth.category.neoforge=NeoForge
@@ -729,14 +744,19 @@ modrinth.category.paper=Paper
 modrinth.category.purpur=Purpur
 modrinth.category.quests=任務
 modrinth.category.quilt=Quilt
+modrinth.category.realistic=寫實
 modrinth.category.rift=Rift
+modrinth.category.simplistic=簡單
 modrinth.category.social=社交
 modrinth.category.spigot=Spigot
 modrinth.category.sponge=Sponge
 modrinth.category.storage=儲存
 modrinth.category.technology=科技
+modrinth.category.themed=主題
 modrinth.category.transportation=運輸
+modrinth.category.tweaks=優化
 modrinth.category.utility=實用
+modrinth.category.vanilla-like=類原生
 modrinth.category.velocity=Velocity
 modrinth.category.waterfall=Waterfall
 modrinth.category.worldgen=世界生成
@@ -984,7 +1004,7 @@ settings.launcher.download_source.auto=自動選擇下載來源
 settings.launcher.enable_game_list=在首頁內顯示遊戲列表
 settings.launcher.font=字體
 settings.launcher.general=通用
-settings.launcher.language=語言
+settings.launcher.language=語言 (重啟後生效)
 settings.launcher.launcher_log.export=匯出啟動器日誌
 settings.launcher.launcher_log.export.failed=無法匯出日誌
 settings.launcher.launcher_log.export.success=日誌已儲存到 %s
@@ -1028,7 +1048,7 @@ settings.type.special.edit.hint=當前遊戲版本 %s 啟動了遊戲特定設

 sponsor=贊助
 sponsor.bmclapi=大中華區下載源由 BMCLAPI 提供高速下載服務
-sponsor.hmcl=Hello Minecraft! Launcher 是一個免費、開源的 Minecraft 啟動器，允許玩家方便快捷地安裝、管理、執行遊戲。您的贊助將幫助 Hello Minecraft! Launcher 獲得更好的發展、支援穩定高速的遊戲安裝與檔案下載服務。點選此處查閱更多詳細訊息。
+sponsor.hmcl=Hello Minecraft! Launcher 是一個免費、開源的 Minecraft 啟動器，允許玩家方便快捷地安裝、管理、執行遊戲。點選此處查閱更多詳細訊息。

 system.architecture=架構
 system.operating_system=操作系統
@@ -28,17 +28,19 @@ about.dependency=依赖
 about.legal=法律声明
 about.thanks_to=鸣谢
 about.thanks_to.bangbang93.statement=提供 BMCLAPI 下载源。请赞助支持 BMCLAPI！
+about.thanks_to.burningtnt.statement=为 HMCL 贡献许多技术支持
 about.thanks_to.contributors=所有通过 Issues、Pull Requests 等方式参与本项目的贡献者
 about.thanks_to.contributors.statement=没有开源社区的支持，Hello Minecraft! Launcher 就无法走到今天
 about.thanks_to.gamerteam.statement=提供默认背景图
-about.thanks_to.glavo.statement=为 HMCL 贡献许多技术支持
+about.thanks_to.glavo.statement=负责 HMCL 的日常维护
 about.thanks_to.zekerzhayard.statement=为 HMCL 贡献许多技术支持
-about.thanks_to.zkitefly.statement=为 HMCL 贡献许多技术支持
+about.thanks_to.zkitefly.statement=负责维护 HMCL 的文档
 about.thanks_to.mcbbs=MCBBS 我的世界中文论坛
 about.thanks_to.mcbbs.statement=提供 MCBBS 下载源
 about.thanks_to.mcmod=MC 百科
 about.thanks_to.mcmod.statement=提供模组中文名映射表与 Mod 百科
 about.thanks_to.red_lnn.statement=提供默认背景图
+about.thanks_to.shulkersakura.statement=提供 HMCL 的图标
 about.thanks_to.users=HMCL 用户群成员
 about.thanks_to.users.statement=感谢用户群成员赞助充电、积极催更、反馈问题、出谋划策
 about.thanks_to.yushijinhun.statement=authlib-injector 相关支持
@@ -415,13 +417,13 @@ game.crash.reason.multiple=检测到多个原因：\n\n
 game.crash.reason.debug_crash=当前游戏因为手动触发崩溃，无法继续运行。\n事实上游戏并没有问题，问题都是你造成的！
 game.crash.reason.duplicated_mod=当前游戏因为模组 %1$s 重复安装，无法继续运行。\n%2$s\n每种模组只能安装一个，请你删除多余的模组再试。
 game.crash.reason.entity=当前游戏因为某个实体不能正常工作，无法继续运行。\n你可以尝试通过 <a href="https://www.mcedit.net">MCEdit</a> 工具编辑存档删除该实体，或者直接删除相应的模组。\n实体类型：%1$s\n实体坐标：%2$s 
-game.crash.reason.fabric_version_0_12=Fabric 0.12 及以上版本与当前已经安装的模组可能不兼容，你需要将 Fabric 降级至 0.11.7。 
-game.crash.reason.fabric_warnings=Fabric 提供了一些警告信息：\n%1$s 
-game.crash.reason.file_already_exists=当前游戏因为文件 %1$s 已经存在，无法继续运行。\n如果你认为这个文件可以删除，你可以在备份这个文件后尝试删除它，并重新启动游戏。 
-game.crash.reason.file_changed=当前游戏因为文件校验失败，无法继续运行。\n如果你手动修改了 Minecraft.jar 文件，你需要回退修改，或者重新下载游戏。 
-game.crash.reason.gl_operation_failure=当前游戏因为你使用的某些模组、光影包、材质包，无法继续运行。\n请先尝试禁用你所使用的模组/光影包/材质包再试。 
+game.crash.reason.fabric_version_0_12=Fabric 0.12 及以上版本与当前已经安装的模组可能不兼容，你需要将 Fabric 降级至 0.11.7。
+game.crash.reason.fabric_warnings=Fabric 提供了一些警告信息：\n%1$s
+game.crash.reason.file_already_exists=当前游戏因为文件 %1$s 已经存在，无法继续运行。\n如果你认为这个文件可以删除，你可以在备份这个文件后尝试删除它，并重新启动游戏。
+game.crash.reason.file_changed=当前游戏因为文件校验失败，无法继续运行。\n如果你手动修改了 Minecraft.jar 文件，你需要回退修改，或者重新下载游戏。
+game.crash.reason.gl_operation_failure=当前游戏因为你使用的某些模组、光影包、材质包，无法继续运行。\n请先尝试禁用你所使用的模组/光影包/材质包再试。
 game.crash.reason.graphics_driver=当前游戏因为显卡驱动问题而崩溃，请尝试以下操作：\n\
-  - 如果你的电脑存在独立显卡，请尝试使用 独立显卡 而非 Intel 核显启动 HMCL 与游戏 <a href="https://www.bing.com/search?q=%E4%BD%BF%E7%94%A8%E7%8B%AC%E7%AB%8B%E6%98%BE%E5%8D%A1%E8%BF%90%E8%A1%8CMinecraft">详情</a>；\n\
+  - 如果你的电脑存在独立显卡，请尝试使用 独立显卡 而非 Intel 核显启动 HMCL 与游戏 <a href="https://www.bing.com/search?q=使用独立显卡运行Minecraft">详情</a> ；\n\
  - <a href="https://minecrafthopper.net/help/pixel-format-not-accelerated/">尝试升级你的 显卡驱动 到最新版本</a>，或回退到出厂版本；\n\
  - 如果你确实需要使用核芯显卡，请检查你的电脑的 CPU 是否是 Intel(R) Core(TM) 3000 系列或更旧的处理器，如果是，对于 Minecraft 1.16.5 及更旧版本，请你将游戏所使用的 Java 版本降级至 1.8.0_51 及以下版本 <a href="https://github.com/frekele/oracle-java/releases/8u51-b16">Java 1.8.0 历史版本</a> ，否则请跳过；\n\
  - 在全局（特定）游戏设置，高级设置中打开“使用 OpenGL 软渲染器”（开启此选项后帧数会显著降低，仅推荐在以调试为目的或应急时开启）。\n\
@@ -433,7 +435,7 @@ game.crash.reason.jdk_9=当前游戏因为 Java 版本过高，无法继续运
 game.crash.reason.jvm_32bit=当前游戏因为内存分配过大，超过了 32 位 Java 内存限制，无法继续运行。\n如果你的电脑是 64 位系统，请下载安装并更换 64 位 Java。<a href="https://bell-sw.com/pages/downloads/#downloads">下载 Java</a>\n如果你的电脑是 32 位系统，你或许可以重新安装 64 位系统，或换一台新电脑。\n或者，你可以关闭游戏内存的自动分配，并且把内存限制调节为 1024 MB 或以下。
 game.crash.reason.loading_crashed_forge=当前游戏因为模组 %1$s (%2$s) 错误，无法继续运行。\n你可以尝试删除或更新该模组以解决问题。
 game.crash.reason.loading_crashed_fabric=当前游戏因为模组 %1$s 错误，无法继续运行。\n你可以尝试删除或更新该模组以解决问题。
-game.crash.reason.memory_exceeded=当前游戏因为分配的内存过大，无法继续运行。\n该问题是由于系统页面文件太小导致的。\n你需要在全局（特定）游戏设置中关闭游戏内存的自动分配，并将游戏内存调低至游戏能正常启动为止。\n你还可以尝试将 虚拟内存 设置调整至「自动管理所有驱动器分页文件大小」，<a href="https://docs.hmcl.net/assets/img/hmcl/%E8%87%AA%E5%8A%A8%E7%AE%A1%E7%90%86%E6%89%80%E6%9C%89%E9%A9%B1%E5%8A%A8%E5%99%A8%E5%88%86%E9%A1%B5%E6%96%87%E4%BB%B6%E5%A4%A7%E5%B0%8F.webp">详情</a>。
+game.crash.reason.memory_exceeded=当前游戏因为分配的内存过大，无法继续运行。\n该问题是由于系统页面文件太小导致的。\n你需要在全局（特定）游戏设置中关闭游戏内存的自动分配，并将游戏内存调低至游戏能正常启动为止。\n你还可以尝试将 虚拟内存 设置调整至「自动管理所有驱动器分页文件大小」，<a href="https://docs.hmcl.net/assets/img/hmcl/自动管理所有驱动器分页文件大小.webp">详情</a>。
 game.crash.reason.mac_jdk_8u261=当前游戏因为你所使用的 Forge 或 OptiFine 与 Java 冲突崩溃。\n请尝试更新 Forge 和 OptiFine，或使用 Java 8u251 及更早版本启动。
 game.crash.reason.mod=当前游戏因为 %1$s 的问题，无法继续运行。\n你可以更新或删除已经安装的 %1$s 再试。
 game.crash.reason.mod_resolution=当前游戏因为 Mod 依赖问题，无法继续运行。Fabric 提供了如下信息：\n%1$s 
@@ -445,17 +447,8 @@ game.crash.reason.mod_resolution_mod_version=%1$s (版本号 %2$s)
 game.crash.reason.mod_resolution_mod_version.any=%1$s (任意版本)
 game.crash.reason.forge_repeat_installation=当前游戏因为 Forge 重复安装，无法继续运行。<a href="https://github.com/HMCL-dev/HMCL/issues/1880">此为已知问题</a>\n建议将日志上传反馈至 GitHub ，以便我们找到更多线索并修复此问题。\n目前你可以到 自动安装 里头卸载 Forge 并重新安装。
 game.crash.reason.optifine_repeat_installation=当前游戏因为 Optifine 重复安装，无法继续运行。\n请删除 Mod 文件夹下的 Optifine 或前往 游戏管理-自动安装 卸载自动安装的 Optifine。
-game.crash.reason.mod_resolution=当前游戏因为模组依赖问题，无法继续运行。Fabric 提供了如下信息：\n%1$s 
 game.crash.reason.forgemod_resolution=当前游戏因为模组依赖问题，无法继续运行。Forge 提供了如下信息：\n%1$s 
 game.crash.reason.forge_found_duplicate_mods=当前游戏因为模组重复问题，无法继续运行。Forge 提供了如下信息：\n%1$s 
-game.crash.reason.mod_resolution_collection=当前游戏因为前置模组版本不匹配，无法继续运行。\n%1$s 需要前置模组：%2$s 才能继续运行。\n这表示你需要更新或降级前置。你可以到下载页的模组下载，或到网上下载 %3$s。 
-game.crash.reason.mod_resolution_conflict=当前游戏因为模组冲突，无法继续运行。\n%1$s 与 %2$s 不能兼容。 
-game.crash.reason.mod_resolution_missing=当前游戏因为缺少模组前置，无法继续运行。\n%1$s 需要前置模组：%2$s 才能继续运行。\n这表示你少安装了模组，或该模组版本不够。你可以到下载页的模组下载，或到网上下载 %3$s。 
-game.crash.reason.mod_resolution_missing_minecraft=当前游戏因为模组和 Minecraft 游戏版本不匹配，无法继续运行。\n%1$s 需要 Minecraft %2$s 才能运行。\n如果你要继续使用你已经安装的模组，你可以选择安装对应的 Minecraft 版本；如果你要继续使用当前 Minecraft 版本，你需要安装对应版本的模组。 
-game.crash.reason.mod_resolution_mod_version=%1$s (版本号 %2$s)
-game.crash.reason.mod_resolution_mod_version.any=%1$s (任意版本)
-game.crash.reason.forge_repeat_installation=当前游戏因为 Forge 重复安装，无法继续运行。<a href="https://github.com/HMCL-dev/HMCL/issues/1880">此为已知问题</a>\n建议将日志上传反馈至 GitHub ，以便我们找到更多线索并修复此问题。\n目前你可以到 自动安装 里头卸载 Forge 并重新安装。
-game.crash.reason.optifine_repeat_installation=当前游戏因为 OptiFine 重复安装，无法继续运行。\n请删除 Mod 文件夹下的 OptiFine 或前往 游戏管理-自动安装 卸载自动安装的 OptiFine。
 game.crash.reason.modmixin_failure=当前游戏因为某些 Mod 注入失败，无法继续运行。\n这一般代表着该 Mod 存在 Bug，或与当前环境不兼容。\n你可以查看日志寻找出错模组。
 game.crash.reason.night_config_fixes=当前游戏因为 Night Config 库的一些问题，无法继续运行。\n你可以尝试安装 <a href="https://www.curseforge.com/minecraft/mc-mods/night-config-fixes">Night Config Fixes</a> 模组，这或许能帮助你解决这个问题。\n了解更多，可访问该模组的 <a href="https://www.github.com/Fuzss/nightconfigfixes">GitHub 仓库</a>。
 game.crash.reason.forge_error=Forge 可能已经提供了错误信息。\n你可以查看日志，并根据错误报告中的日志信息进行对应处。\n如果没有看到报错信息，可以查看错误报告了解错误具体是如何发生的。\n%1$s
@@ -463,14 +456,14 @@ game.crash.reason.mod_resolution0=当前游戏因为一些模组出现问题，
 game.crash.reason.fabric_reports_an_error_and_gives_a_solution=Fabric 可能已经提供了错误信息。\n你可以查看日志，并根据错误报告中的日志信息进行对应处。\n如果没有看到报错信息，可以查看错误报告了解错误具体是如何发生的。
 game.crash.reason.java_version_is_too_high=当前游戏因为 Java 虚拟机版本过高，无法继续运行。\n请在全局（特定）游戏设置的 Java 路径选项卡中改用较低版本的 Java，然后再启动游戏。\n如果没有，可以从 <a href="https://www.java.com/download/">java.com（Java8）</a> 或 <a href="https://bell-sw.com/pages/downloads/#downloads">BellSoft Liberica Full JRE（Java17）</a> 等平台下载、安装一个（安装完后需重启启动器）。
 game.crash.reason.mod_name=当前游戏因为模组文件名称问题，无法继续运行。\n模组文件名称应只使用英文全半角的大小写字母（Aa~Zz）、数字（0~9）、横线（-）、下划线（_）和点（.）。\n请到模组文件夹中将所有不合规的模组文件名称添加一个上述的合规的字符。
-game.crash.reason.incomplete_forge_installation=当前游戏因为 Forge 安装不完整，无法继续运行。\n请在 版本设置 - 自动安装 中卸载 Forge 并重新安装。
+game.crash.reason.incomplete_forge_installation=当前游戏因为 Forge / NeoForge 安装不完整，无法继续运行。\n请在 版本设置 - 自动安装 中卸载 Forge 并重新安装。
 game.crash.reason.optifine_is_not_compatible_with_forge=当前游戏因为 OptiFine 与当前版本的 Forge 不兼容，导致了游戏崩溃。\n点击 <a href="https://zkitefly.github.io/optifine-forge-support-list">此处</a> 查看 OptiFine 所兼容的 Forge 版本，并严格按照对应版本重新安装游戏或在 版本设置 - 自动安装 中更换版本。\n经测试，Forge 版本过高或过低都可能导致崩溃。 
 game.crash.reason.mod_files_are_decompressed=当前游戏因为模组文件被解压了，无法继续运行。\n请直接把整个模组文件放进模组文件夹中即可。\n解压模组会导致游戏出错，请删除模组文件夹中已被解压的模组，然后再启动游戏。 
 game.crash.reason.shaders_mod=当前游戏因为同时安装了 OptiFine 和 Shaders 模组，无法继续运行。\n因为 OptiFine 已集成 Shaders 模组的功能，只需删除 Shaders 模组即可。
 game.crash.reason.rtss_forest_sodium=当前游戏因为 RivaTuner Statistics Server (RTSS) 与 Sodium 不兼容，导致了游戏崩溃。\n点击 <a href="https://github.com/CaffeineMC/sodium-fabric/wiki/Known-Issues#rtss-incompatible">此处</a> 查看详情。
-game.crash.reason.too_many_mods_lead_to_exceeding_the_id_limit=当前游戏因为您所安装的模组过多，超出了游戏的 ID 限制，无法继续运行。\n请尝试安装 <a href="https://www.curseforge.com/minecraft/mc-mods/jeid">JEID</a> 等修复模组，或删除部分大型模组。 
+game.crash.reason.too_many_mods_lead_to_exceeding_the_id_limit=当前游戏因为您所安装的模组过多，超出了游戏的 ID 限制，无法继续运行。\n请尝试安装 <a href="https://www.curseforge.com/minecraft/mc-mods/jeid">JEID</a> 等修复模组，或删除部分大型模组。
 game.crash.reason.optifine_causes_the_world_to_fail_to_load=当前游戏可能因为 OptiFine ，无法继续运行。\n该问题只在特定 OptiFine 版本中出现，你可以尝试在 版本设置 - 自动安装 中更换 OptiFine 的版本。 
-game.crash.reason.modlauncher_8=当前游戏因为您所使用的 Forge 版本与当前使用的 Java 冲突崩溃，请尝试更新 Forge 到 36.2.26 或更高版本或换用版本低于 1.8.0.320 的 Java，<a href="https://github.com/bell-sw/Liberica/releases/8u312%2B7">Liberica JDK 8u312+7</a>。
+game.crash.reason.modlauncher_8=当前游戏因为您所使用的 Forge 版本与当前使用的 Java 冲突崩溃，请尝试更新 Forge 到 36.2.26 或更高版本或换用版本低于 1.8.0.320 的 Java，<a href="https://bell-sw.com/pages/downloads/?version=java-8&package=jre-full">Liberica JDK 8u312+7</a>。
 game.crash.reason.no_class_def_found_error=当前游戏因为代码不完整，无法继续运行。\n你的游戏可能缺失了某个模组，或者某些模组文件不完整，或者模组与游戏的版本不匹配。\n你可能需要重新安装游戏和模组，或请求他人帮助。\n缺失：\n%1$s 
 game.crash.reason.no_such_method_error=当前游戏因为代码不完整，无法继续运行。\n你的游戏可能缺失了某个模组，或者某些模组文件不完整，或者模组与游戏的版本不匹配。\n你可能需要重新安装游戏和模组，或请求他人帮助。 
 game.crash.reason.opengl_not_supported=当前游戏因为你的显卡驱动存在问题，无法继续运行。\n原因是 OpenGL 不受支持，你现在是否在远程桌面或者串流模式下？如果是，请直接使用原电脑启动游戏。\n或者尝试升级你的显卡驱动到最新版本后再尝试启动游戏。如果你的电脑存在独立显卡，你需要检查游戏是否使用集成/核心显卡启动，如果是，请尝试使用独立显卡启动 HMCL 与游戏。如果仍有问题，你可能需要考虑换一个新显卡或新电脑。 
@@ -562,7 +555,7 @@ launch.advice.too_large_memory_for_32bit=您设置的内存大小过大，由于
 launch.advice.vanilla_linux_java_8=对于 Linux x86-64 平台，Minecraft 1.12.2 及以下版本与 Java 9+ 不兼容，请使用 Java 8 启动游戏。\n如遇到问题，你可以点击右上角帮助按钮进行求助。
 launch.advice.vanilla_x86.translation=Minecraft 尚未为您的平台提供完善支持，所以可能影响游戏体验或无法启动游戏。\n你可以在 <a href="https://docs.microsoft.com/java/openjdk/download"> 这里 </a> 下载 <b> X86-64 </b> 架构的 Java 以获得更完整的体验。
 launch.failed=启动失败
-launch.failed.cannot_create_jvm=截获到无法创建 Java 虚拟机，可能是 Java 参数有问题，可以在设置中开启无参数模式启动。\n你可以点击右上角帮助按钮进行求助。
+launch.failed.cannot_create_jvm=截获到无法创建 Java 虚拟机，可能是 Java 参数有问题，可以在设置中开启无参数模式启动。
 launch.failed.creating_process=启动失败，在创建新进程时发生错误，可能是 Java 路径错误。
 launch.failed.command_too_long=命令长度超过限制，无法创建 bat 脚本，请导出为 PowerShell 脚本。
 launch.failed.decompressing_natives=未能解压游戏本地库。
@@ -709,26 +702,39 @@ modpack.wizard.step.initialization.warning=在制作整合包前，请您确认
 modpack.wizard.step.initialization.server=点击此处查看有关服务器自动更新整合包的制作教程

 modrinth.category.adventure=冒险
+modrinth.category.audio=声音
+modrinth.category.blocks=方块
 modrinth.category.bukkit=Bukkit
 modrinth.category.bungeecord=BungeeCord
 modrinth.category.challenging=高难度
+modrinth.category.core-shaders=核心着色器
 modrinth.category.combat=战斗
 modrinth.category.cursed=Cursed
 modrinth.category.decoration=装饰
 modrinth.category.economy=经济
+modrinth.category.entities=实体
+modrinth.category.environment=环境
 modrinth.category.equipment=装备
 modrinth.category.fabric=Fabric
+modrinth.category.fonts=字体
 modrinth.category.food=食物
 modrinth.category.forge=Forge
 modrinth.category.game-mechanics=游戏机制
+modrinth.category.gui=GUI
+modrinth.category.items=物品
 modrinth.category.kitchen-sink=大杂烩
 modrinth.category.library=支持库
 modrinth.category.lightweight=轻量
+modrinth.category.liteloader=LiteLoader
+modrinth.category.locale=本地化
 modrinth.category.magic=魔法
 modrinth.category.management=管理
+modrinth.category.minecraft=Minecraft
 modrinth.category.minigame=小游戏
 modrinth.category.misc=其他
 modrinth.category.mobs=生物
+modrinth.category.modded=Modded
+modrinth.category.models=模型
 modrinth.category.modloader=Modloader
 modrinth.category.multiplayer=多人
 modrinth.category.neoforge=NeoForge
@@ -737,14 +743,19 @@ modrinth.category.paper=Paper
 modrinth.category.purpur=Purpur
 modrinth.category.quests=任务
 modrinth.category.quilt=Quilt
+modrinth.category.realistic=写实
 modrinth.category.rift=Rift
+modrinth.category.simplistic=简单
 modrinth.category.social=社交
 modrinth.category.spigot=Spigot
 modrinth.category.sponge=Sponge
 modrinth.category.storage=存储
 modrinth.category.technology=科技
+modrinth.category.themed=主题
 modrinth.category.transportation=运输
+modrinth.category.tweaks=优化
 modrinth.category.utility=实用
+modrinth.category.vanilla-like=类原生
 modrinth.category.velocity=Velocity
 modrinth.category.waterfall=Waterfall
 modrinth.category.worldgen=世界生成
@@ -992,7 +1003,7 @@ settings.launcher.download_source.auto=自动选择下载源
 settings.launcher.enable_game_list=在主页内显示版本列表
 settings.launcher.font=字体
 settings.launcher.general=通用
-settings.launcher.language=语言
+settings.launcher.language=语言 (重启后生效)
 settings.launcher.launcher_log.export=导出启动器日志
 settings.launcher.launcher_log.export.failed=无法导出日志
 settings.launcher.launcher_log.export.success=日志已保存到 %s
@@ -1036,7 +1047,7 @@ settings.type.special.edit.hint=当前游戏版本 %s 启用了游戏特定设

 sponsor=赞助
 sponsor.bmclapi=国内下载源由 BMCLAPI 提供高速下载服务。BMCLAPI 为公益服务，赞助 BMCLAPI 可以帮助作者更好的提供稳定高速的下载服务，[点击此处查阅详细信息]
-sponsor.hmcl=Hello Minecraft! Launcher 是一个免费、自由、开放源代码的 Minecraft 启动器。您的赞助将帮助 Hello Minecraft! Launcher 获得更好的发展，还可以获得 HMCL 的开发进展。[点击此处查阅更多详细信息]
+sponsor.hmcl=Hello Minecraft! Launcher 是一个免费、自由、开放源代码的 Minecraft 启动器。[点击此处查阅更多详细信息]

 system.architecture=架构
 system.operating_system=操作系统
@@ -84,16 +84,20 @@ public class MicrosoftAccount extends OAuthAccount {

    @Override
    public AuthInfo logIn() throws AuthenticationException {
-        if (!authenticated || !service.validate(session.getNotAfter(), session.getTokenType(), session.getAccessToken())) {
-            MicrosoftSession acquiredSession = service.refresh(session);
-            if (!Objects.equals(acquiredSession.getProfile().getId(), session.getProfile().getId())) {
-                throw new ServerResponseMalformedException("Selected profile changed");
+        if (!authenticated) {
+            if (service.validate(session.getNotAfter(), session.getTokenType(), session.getAccessToken())) {
+                authenticated = true;
+            } else {
+                MicrosoftSession acquiredSession = service.refresh(session);
+                if (!Objects.equals(acquiredSession.getProfile().getId(), session.getProfile().getId())) {
+                    throw new ServerResponseMalformedException("Selected profile changed");
+                }
+
+                session = acquiredSession;
+
+                authenticated = true;
+                invalidate();
            }
-
-            session = acquiredSession;
-
-            authenticated = true;
-            invalidate();
        }

        return session.toAuthInfo();
@@ -25,7 +25,6 @@ import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorArtifactInfo;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorArtifactProvider;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorDownloadException;
 import org.jackhuang.hmcl.auth.yggdrasil.Texture;
-import org.jackhuang.hmcl.auth.yggdrasil.TextureModel;
 import org.jackhuang.hmcl.auth.yggdrasil.TextureType;
 import org.jackhuang.hmcl.game.Arguments;
 import org.jackhuang.hmcl.game.LaunchOptions;
@@ -101,14 +100,7 @@ public class OfflineAccount extends Account {
    }

    protected boolean loadAuthlibInjector(Skin skin) {
-        if (skin == null) return false;
-        if (skin.getType() == Skin.Type.DEFAULT) return false;
-        TextureModel defaultModel = TextureModel.detectUUID(getUUID());
-        if (skin.getType() == Skin.Type.ALEX && defaultModel == TextureModel.ALEX ||
-            skin.getType() == Skin.Type.STEVE && defaultModel == TextureModel.STEVE) {
-            return false;
-        }
-        return true;
+        return skin != null && skin.getType() != Skin.Type.DEFAULT;
    }

    @Override
@@ -18,7 +18,6 @@
 package org.jackhuang.hmcl.download.game;

 import org.jackhuang.hmcl.download.AbstractDependencyManager;
-import org.jackhuang.hmcl.download.ArtifactMalformedException;
 import org.jackhuang.hmcl.download.DefaultCacheRepository;
 import org.jackhuang.hmcl.game.Library;
 import org.jackhuang.hmcl.task.DownloadException;
@@ -26,13 +25,12 @@ import org.jackhuang.hmcl.task.FileDownloadTask;
 import org.jackhuang.hmcl.task.FileDownloadTask.IntegrityCheck;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.util.DigestUtils;
-import org.jackhuang.hmcl.util.Pack200Utils;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.io.IOUtils;
-import org.jackhuang.hmcl.util.io.NetworkUtils;
-import org.tukaani.xz.XZInputStream;

-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -41,7 +39,6 @@ import java.util.*;
 import java.util.concurrent.CancellationException;
 import java.util.jar.JarEntry;
 import java.util.jar.JarInputStream;
-import java.util.jar.JarOutputStream;
 import java.util.logging.Level;

 import static org.jackhuang.hmcl.util.Logging.LOG;
@@ -51,10 +48,8 @@ public class LibraryDownloadTask extends Task<Void> {
    protected final File jar;
    protected final DefaultCacheRepository cacheRepository;
    protected final AbstractDependencyManager dependencyManager;
-    private final File xzFile;
    protected final Library library;
    protected final String url;
-    protected boolean xz;
    private final Library originalLibrary;
    private boolean cached = false;

@@ -72,8 +67,6 @@ public class LibraryDownloadTask extends Task<Void> {

        url = library.getDownload().getUrl();
        jar = file;
-
-        xzFile = new File(file.getAbsoluteFile().getParentFile(), file.getName() + ".pack.xz");
    }

    @Override
@@ -101,8 +94,6 @@ public class LibraryDownloadTask extends Task<Void> {
                throw new CancellationException();
            else
                throw new LibraryDownloadException(library, t);
-        } else {
-            if (xz) unpackLibrary(jar, Files.readAllBytes(xzFile.toPath()));
        }
    }

@@ -126,36 +117,13 @@ public class LibraryDownloadTask extends Task<Void> {
            }
        }

-        if (Pack200Utils.isSupported() && testURLExistence(url)) {
-            List<URL> urls = dependencyManager.getDownloadProvider().injectURLWithCandidates(url + ".pack.xz");
-            task = new FileDownloadTask(urls, xzFile, null);
-            task.setCacheRepository(cacheRepository);
-            task.setCaching(true);
-            xz = true;
-        } else {
-            List<URL> urls = dependencyManager.getDownloadProvider().injectURLWithCandidates(url);
-            task = new FileDownloadTask(urls, jar,
-                    library.getDownload().getSha1() != null ? new IntegrityCheck("SHA-1", library.getDownload().getSha1()) : null);
-            task.setCacheRepository(cacheRepository);
-            task.setCaching(true);
-            task.addIntegrityCheckHandler(FileDownloadTask.ZIP_INTEGRITY_CHECK_HANDLER);
-            xz = false;
-        }
-    }

-    private boolean testURLExistence(String rawUrl) {
-        List<URL> urls = dependencyManager.getDownloadProvider().injectURLWithCandidates(rawUrl);
-        for (URL url : urls) {
-            URL xzURL = NetworkUtils.toURL(url.toString() + ".pack.xz");
-            for (int retry = 0; retry < 3; retry++) {
-                try {
-                    return NetworkUtils.urlExists(xzURL);
-                } catch (IOException e) {
-                    LOG.log(Level.WARNING, "Failed to test for url existence: " + url + ".pack.xz", e);
-                }
-            }
-        }
-        return false; // maybe some ugly implementation will give timeout for not existent url.
+        List<URL> urls = dependencyManager.getDownloadProvider().injectURLWithCandidates(url);
+        task = new FileDownloadTask(urls, jar,
+                library.getDownload().getSha1() != null ? new IntegrityCheck("SHA-1", library.getDownload().getSha1()) : null);
+        task.setCacheRepository(cacheRepository);
+        task.setCaching(true);
+        task.addIntegrityCheckHandler(FileDownloadTask.ZIP_INTEGRITY_CHECK_HANDLER);
    }

    @Override
@@ -167,7 +135,7 @@ public class LibraryDownloadTask extends Task<Void> {
    public void postExecute() throws Exception {
        if (!cached) {
            try {
-                cacheRepository.cacheLibrary(library, jar.toPath(), xz);
+                cacheRepository.cacheLibrary(library, jar.toPath(), false);
            } catch (IOException e) {
                LOG.log(Level.WARNING, "Failed to cache downloaded library " + library, e);
            }
@@ -232,44 +200,4 @@ public class LibraryDownloadTask extends Task<Void> {
        }
        return false;
    }
-
-    private static void unpackLibrary(File dest, byte[] src) throws IOException {
-        if (dest.exists())
-            if (!dest.delete())
-                throw new IOException("Unable to delete file " + dest);
-
-        byte[] decompressed;
-        try {
-            decompressed = IOUtils.readFullyAsByteArray(new XZInputStream(new ByteArrayInputStream(src)));
-        } catch (IOException e) {
-            throw new ArtifactMalformedException("Library " + dest + " is malformed");
-        }
-
-        String end = new String(decompressed, decompressed.length - 4, 4);
-        if (!end.equals("SIGN"))
-            throw new IOException("Unpacking failed, signature missing " + end);
-
-        int x = decompressed.length;
-        int len = decompressed[(x - 8)] & 0xFF | (decompressed[(x - 7)] & 0xFF) << 8 | (decompressed[(x - 6)] & 0xFF) << 16 | (decompressed[(x - 5)] & 0xFF) << 24;
-
-        Path temp = Files.createTempFile("minecraft", ".pack");
-
-        byte[] checksums = Arrays.copyOfRange(decompressed, decompressed.length - len - 8, decompressed.length - 8);
-
-        try (OutputStream out = Files.newOutputStream(temp)) {
-            out.write(decompressed, 0, decompressed.length - len - 8);
-        }
-
-        try (FileOutputStream jarBytes = new FileOutputStream(dest); JarOutputStream jos = new JarOutputStream(jarBytes)) {
-            Pack200Utils.unpack(temp.toFile(), jos);
-
-            JarEntry checksumsFile = new JarEntry("checksums.sha1");
-            checksumsFile.setTime(0L);
-            jos.putNextEntry(checksumsFile);
-            jos.write(checksums);
-            jos.closeEntry();
-        }
-
-        Files.delete(temp);
-    }
 }
@@ -52,6 +52,10 @@ public final class AssetIndex {
        return virtual || mapToResources;
    }

+    public boolean needMapToResources() {
+        return mapToResources;
+    }
+
    public Map<String, AssetObject> getObjects() {
        return Collections.unmodifiableMap(objects);
    }
@@ -459,6 +459,8 @@ public class DefaultGameRepository implements GameRepository {
            return assetsDir;

        if (index.isVirtual()) {
+            Path resourcesDir = getBaseDirectory().toPath().resolve("resources");
+
            int cnt = 0;
            int tot = index.getObjects().entrySet().size();
            for (Map.Entry<String, AssetObject> entry : index.getObjects().entrySet()) {
@@ -468,6 +470,12 @@ public class DefaultGameRepository implements GameRepository {
                    cnt++;
                    if (!Files.isRegularFile(target))
                        FileUtils.copyFile(original, target);
+
+                    if (index.needMapToResources()) {
+                        target = resourcesDir.resolve(entry.getKey());
+                        if (!Files.isRegularFile(target))
+                            FileUtils.copyFile(original, target);
+                    }
                }
            }

@@ -104,8 +104,13 @@ final class GameVersion {
            if (minecraft != null) {
                try (InputStream is = gameJar.getInputStream(minecraft)) {
                    Optional<String> result = getVersionOfClassMinecraft(is);
-                    if (result.isPresent())
+                    if (result.isPresent()) {
+                        String version = result.get();
+                        if (version.startsWith("Beta ")) {
+                            result = Optional.of("b" + version.substring("Beta ".length()));
+                        }
                        return result;
+                    }
                }
            }

@@ -102,7 +102,7 @@ public class DefaultLauncher extends Launcher {

        // Executable
        if (StringUtils.isNotBlank(options.getWrapper()))
-            res.addAllWithoutParsing(StringUtils.tokenize(options.getWrapper()));
+            res.addAllWithoutParsing(StringUtils.tokenize(options.getWrapper(), getEnvVars()));

        res.add(options.getJava().getBinary().toString());

@@ -429,9 +429,6 @@ public class DefaultLauncher extends Launcher {

        // To guarantee that when failed to generate launch command line, we will not call pre-launch command
        List<String> rawCommandLine = command.commandLine.asList();
-        if (StringUtils.isNotBlank(options.getWrapper())) {
-            rawCommandLine.addAll(0, StringUtils.tokenize(options.getWrapper(), getEnvVars()));
-        }

        if (command.tempNativeFolder != null) {
            Files.deleteIfExists(command.tempNativeFolder);
@@ -44,7 +44,7 @@ public final class CurseForgeRemoteModRepository implements RemoteModRepository
    private static final String PREFIX = "https://api.curseforge.com";
    private static final String apiKey = System.getProperty("hmcl.curseforge.apikey", JarUtils.getManifestAttribute("CurseForge-Api-Key", ""));

-    private static final int WORD_PERFECT_MATCH_WEIGHT = 50;
+    private static final int WORD_PERFECT_MATCH_WEIGHT = 5;

    public static boolean isAvailable() {
        return !apiKey.isEmpty();
@@ -111,9 +111,8 @@ public final class CurseForgeRemoteModRepository implements RemoteModRepository
                .header("X-API-KEY", apiKey)
                .getJson(new TypeToken<Response<List<CurseAddon>>>() {
                }.getType());
-        Stream<RemoteMod> res = response.getData().stream().map(CurseAddon::toMod);
-        if (sortType != SortType.NAME || searchFilter.isEmpty()) {
-            return new SearchResult(res, (int)Math.ceil((double)response.pagination.totalCount / pageSize));
+        if (searchFilter.isEmpty()) {
+            return new SearchResult(response.getData().stream().map(CurseAddon::toMod), (int)Math.ceil((double)response.pagination.totalCount / pageSize));
        }

        // https://github.com/HMCL-dev/HMCL/issues/1549
@@ -125,7 +124,7 @@ public final class CurseForgeRemoteModRepository implements RemoteModRepository

        StringUtils.LevCalculator levCalculator = new StringUtils.LevCalculator();

-        return new SearchResult(res.map(remoteMod -> {
+        return new SearchResult(response.getData().stream().map(CurseAddon::toMod).map(remoteMod -> {
            String lowerCaseResult = remoteMod.getTitle().toLowerCase();
            int diff = levCalculator.calc(lowerCaseSearchFilter, lowerCaseResult);

@@ -136,7 +135,7 @@ public final class CurseForgeRemoteModRepository implements RemoteModRepository
            }

            return pair(remoteMod, diff);
-        }).sorted(Comparator.comparingInt(Pair::getValue)).map(Pair::getKey), res, response.pagination.totalCount);
+        }).sorted(Comparator.comparingInt(Pair::getValue)).map(Pair::getKey), response.getData().stream().map(CurseAddon::toMod), response.pagination.totalCount);
    }

    @Override
@@ -94,6 +94,7 @@ public abstract class FetchTask<T> extends Task<T> {
                    break download;
                }

+                List<String> redirects = null;
                try {
                    beforeDownload(url);

@@ -103,7 +104,9 @@ public abstract class FetchTask<T> extends Task<T> {
                    if (checkETag) repository.injectConnection(conn);

                    if (conn instanceof HttpURLConnection) {
-                        conn = NetworkUtils.resolveConnection((HttpURLConnection) conn);
+                        redirects = new ArrayList<>();
+
+                        conn = NetworkUtils.resolveConnection((HttpURLConnection) conn, redirects);
                        int responseCode = ((HttpURLConnection) conn).getResponseCode();

                        if (responseCode == HttpURLConnection.HTTP_NOT_MODIFIED) {
@@ -164,13 +167,13 @@ public abstract class FetchTask<T> extends Task<T> {
                } catch (FileNotFoundException ex) {
                    failedURL = url;
                    exception = ex;
-                    Logging.LOG.log(Level.WARNING, "Failed to download " + url + ", not found", ex);
+                    Logging.LOG.log(Level.WARNING, "Failed to download " + url + ", not found" + ((redirects == null || redirects.isEmpty()) ? "" : ", redirects: " + redirects), ex);

                    break; // we will not try this URL again
                } catch (IOException ex) {
                    failedURL = url;
                    exception = ex;
-                    Logging.LOG.log(Level.WARNING, "Failed to download " + url + ", repeat times: " + (++repeat), ex);
+                    Logging.LOG.log(Level.WARNING, "Failed to download " + url + ", repeat times: " + (++repeat) + ((redirects == null || redirects.isEmpty()) ? "" : ", redirects: " + redirects), ex);
                }
            }
        }
@@ -293,8 +293,12 @@ public class CacheRepository {
                ETagIndex indexOnDisk = JsonUtils.fromMaybeMalformedJson(new String(IOUtils.readFullyWithoutClosing(Channels.newInputStream(channel)), UTF_8), ETagIndex.class);
                Map<String, ETagItem> newIndex = joinETagIndexes(indexOnDisk == null ? null : indexOnDisk.eTag, index.values());
                channel.truncate(0);
-                ETagIndex writeTo = new ETagIndex(newIndex.values());
-                channel.write(ByteBuffer.wrap(JsonUtils.GSON.toJson(writeTo).getBytes(UTF_8)));
+                ByteBuffer writeTo = ByteBuffer.wrap(JsonUtils.GSON.toJson(new ETagIndex(newIndex.values())).getBytes(UTF_8));
+                while (writeTo.hasRemaining()) {
+                    if (channel.write(writeTo) == 0) {
+                        throw new IOException("No value is written");
+                    }
+                }
                this.index = newIndex;
            } finally {
                lock.release();
@@ -20,36 +20,37 @@ package org.jackhuang.hmcl.util;
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
-import java.util.function.Supplier;

 /**
- * When {@link #accept(ARG)} is called, this class invokes the handler on another thread.
- * If {@link #accept(ARG)} is called more than one time before the handler starts processing,
+ * When {@link #accept(T)} is called, this class invokes the handler on another thread.
+ * If {@link #accept(T)} is called more than one time before the handler starts processing,
 * the handler will only be invoked once, taking the latest argument as its input.
 *
 * @author yushijinhun
 */
-public final class InvocationDispatcher<ARG> implements Consumer<ARG> {
+public final class InvocationDispatcher<T> implements Consumer<T> {

-    public static <ARG> InvocationDispatcher<ARG> runOn(Executor executor, Consumer<ARG> action) {
-        return new InvocationDispatcher<>(arg -> executor.execute(() -> {
-            synchronized (action) {
-                action.accept(arg.get());
-            }
-        }));
+    public static <T> InvocationDispatcher<T> runOn(Executor executor, Consumer<T> action) {
+        return new InvocationDispatcher<>(executor, action);
    }

-    private final Consumer<Supplier<ARG>> handler;
-    private final AtomicReference<Holder<ARG>> pendingArg = new AtomicReference<>();
+    private final Executor executor;
+    private final Consumer<T> action;
+    private final AtomicReference<Holder<T>> pendingArg = new AtomicReference<>();

-    public InvocationDispatcher(Consumer<Supplier<ARG>> handler) {
-        this.handler = handler;
+    private InvocationDispatcher(Executor executor, Consumer<T> action) {
+        this.executor = executor;
+        this.action = action;
    }

    @Override
-    public void accept(ARG arg) {
-        if (pendingArg.getAndSet(new Holder<>(arg)) == null) {
-            handler.accept(() -> pendingArg.getAndSet(null).value);
+    public void accept(T t) {
+        if (pendingArg.getAndSet(new Holder<>(t)) == null) {
+            executor.execute(() -> {
+                synchronized (InvocationDispatcher.this) {
+                    action.accept(pendingArg.getAndSet(null).value);
+                }
+            });
        }
    }
 }
@@ -32,6 +32,7 @@ import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Predicate;
@@ -283,6 +284,32 @@ public final class FileUtils {
        });
    }

+    public static boolean hasKnownDesktop() {
+        if (!OperatingSystem.CURRENT_OS.isLinuxOrBSD())
+            return true;
+
+        String desktops = System.getenv("XDG_CURRENT_DESKTOP");
+        if (desktops == null) {
+            desktops = System.getenv("XDG_SESSION_DESKTOP");
+        }
+
+        if (desktops == null) {
+            return false;
+        }
+        for (String desktop : desktops.split(":")) {
+            switch (desktop.toLowerCase(Locale.ROOT)) {
+                case "gnome":
+                case "xfce":
+                case "kde":
+                case "mate":
+                case "deepin":
+                    return true;
+            }
+        }
+
+        return false;
+    }
+
    /**
     * Move file to trash.
     * <p>
@@ -299,7 +326,7 @@ public final class FileUtils {
     * @see FileUtils#isMovingToTrashSupported()
     */
    public static boolean moveToTrash(File file) {
-        if (OperatingSystem.CURRENT_OS.isLinuxOrBSD()) {
+        if (OperatingSystem.CURRENT_OS.isLinuxOrBSD() && hasKnownDesktop()) {
            if (!file.exists()) {
                return false;
            }
@@ -365,7 +392,7 @@ public final class FileUtils {
     * @return true if the method exists.
     */
    public static boolean isMovingToTrashSupported() {
-        if (OperatingSystem.CURRENT_OS.isLinuxOrBSD()) {
+        if (OperatingSystem.CURRENT_OS.isLinuxOrBSD() && hasKnownDesktop()) {
            return true;
        }

@@ -29,7 +29,6 @@ import static org.jackhuang.hmcl.util.Pair.pair;
 import static org.jackhuang.hmcl.util.StringUtils.*;

 /**
- *
 * @author huangyuhui
 */
 public final class NetworkUtils {
@@ -131,16 +130,20 @@ public final class NetworkUtils {
        return sb.toString();
    }

+    public static HttpURLConnection resolveConnection(HttpURLConnection conn) throws IOException {
+        return resolveConnection(conn, null);
+    }
+
    /**
     * This method is a work-around that aims to solve problem when "Location" in
     * stupid server's response is not encoded.
-     * 
+     *
     * @see <a href="https://github.com/curl/curl/issues/473">Issue with libcurl</a>
     * @param conn the stupid http connection.
     * @return manually redirected http connection.
     * @throws IOException if an I/O error occurs.
     */
-    public static HttpURLConnection resolveConnection(HttpURLConnection conn) throws IOException {
+    public static HttpURLConnection resolveConnection(HttpURLConnection conn, List<String> redirects) throws IOException {
        int redirect = 0;
        while (true) {
            conn.setUseCaches(false);
@@ -154,6 +157,9 @@ public final class NetworkUtils {
                String newURL = conn.getHeaderField("Location");
                conn.disconnect();

+                if (redirects != null) {
+                    redirects.add(newURL);
+                }
                if (redirect > 20) {
                    throw new IOException("Too much redirects");
                }
Author	SHA1	Message	Date
Glavo	1187ae4f04	Fix #2938 : 修复 DefaultLauncher 会多次添加包装命令的问题 (#2939 )	2024-03-16 11:08:17 +08:00
Glavo	8efdc536ee	Fix #2934 : 修复无法读取远古版本版本号的问题 (#2936 ) * update * update	2024-03-15 20:57:45 +08:00
Glavo	78f080b6cc	Fix #2784 : 离线账户选择 Steve/Alex 皮肤时强制使用本地 Yggdrasil 服务器 (#2933 )	2024-03-15 13:39:50 +08:00
Glavo	cc8bcfd924	Fix i18n (#2931 ) * Fix i18n * update	2024-03-15 12:56:29 +08:00
Glavo	806ca3f64a	更新 Modrinth 翻译 (#2929 ) * update * update * update * update * update * update	2024-03-15 12:24:43 +08:00
lyuxc_	4a16fa13ee	Update ModpackInfoPage.java (#2928 )	2024-03-14 21:23:06 +08:00
Glavo	b88d7c4fd2	修复 saveETagIndex 可能写入不全的问题 (#2926 )	2024-03-14 19:24:30 +08:00
Burning_TNTandGlavo	c0838468b1	Close #2911 : 下载失败时打印重定向链 (#2912 ) * Support #2911. * update * update * update * update * update --------- Co-authored-by: Glavo <zjx001202@gmail.com>	2024-03-14 13:50:25 +08:00
Glavo	90cfe3d0b7	加载网络背景时设置超时 (#2856 )	2024-03-13 16:25:55 +08:00
Burning_TNT	baf1d22bc4	Fix bugs. (#2920 ) * Always sort the results while searching in CurseForge. * Fix bugs.	2024-03-12 22:14:32 +08:00
Glavo	7ca5744559	允许使用系统属性禁用系统代理 (#2921 )	2024-03-12 21:44:08 +08:00
Glavo	57e728991b	Fix #1938 : 正确处理 map_to_resources (#2919 ) * Fix #1938: 正确处理 map_to_resources * fix checkstyle	2024-03-12 20:01:30 +08:00
Glavo	e08ba4d421	不再尝试下载 .pack.xz 文件 (#2917 ) * 不再尝试下载 .pack.xz 文件 * update	2024-03-11 20:21:17 +08:00
Burning_TNT	ba91c60e95	Always sort the results while searching in CurseForge. (#2916 )	2024-03-10 22:45:34 +08:00
zkitefly 何杰豪 Glavo	389b93178e	fix #2796 (#2804 ) * fix https://github.com/HMCL-dev/HMCL/issues/2796 * 调整 game.crash.feedback 显示位置 * fix i18n * 添加导出崩溃信息失败的弹窗 * updata * 在崩溃窗口的日志窗口添加更多信息 * fix i18n * Update HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties Co-authored-by: 何杰豪 <hejiehao12@126.com> * Update HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties Co-authored-by: 何杰豪 <hejiehao12@126.com> * Revert "在崩溃窗口的日志窗口添加更多信息" This reverts commit `e8ed43291e`. * updata * add log * updat log * Update GameCrashWindow.java * 添加更多日志输出格式：Processing log file: /home/zkitefly/.minecraft/hs_err_pid20074.log, processStartTime: 1709952457315, lastModifiedTime: 1709952504054 * update * update * update * update * update * update * update * update * update * update * update --------- Co-authored-by: 何杰豪 <hejiehao12@126.com> Co-authored-by: Glavo <zjx001202@gmail.com>	2024-03-10 22:02:56 +08:00
Glavo	37aaf153f8	更新文本和链接 (#2915 ) * update * update * update * update * update * update	2024-03-10 20:29:44 +08:00
ShulkerSakuraandGlavo	2249f4ee0e	在未知桌面环境禁用 moveToTrash (#2885 ) * Added Optifine Icon * Updated Optifine Icons * Updated Optifine Icons * Added new HMCL logo * update * Add ChromeOS Detection * ChromeOS Detection * Removed useless import * Style Checked * Add private constructor * Style Check * Simplification * update * update * update * update * update * update --------- Co-authored-by: Glavo <zjx001202@gmail.com>	2024-03-09 20:38:48 +08:00
Glavo	eadfff349a	Revert "auth: Always check token.exp when launch game (#2642 )" (#2908 ) This reverts commit `8678c0dcf2`.	2024-03-09 20:25:59 +08:00
Glavo	cb4cd696a0	修复未初始化 fileDownloadProvider 的问题 (#2906 )	2024-03-08 16:26:37 +08:00
Glavo	c85c074eee	更改语言应在重启后生效 (#2905 )	2024-03-08 15:04:40 +08:00
Glavo	b26c478d4a	更新 I18N (#2904 ) * 更新 I18N * 更新 I18N	2024-03-08 14:21:05 +08:00
Glavo	2d83de7c31	简化 InvocationDispatcher (#2674 ) * 优化 InvocationDispatcher * update * Rename type parameter * update	2024-03-08 10:06:08 +08:00
Glavo	20d93dd085	清理 GlobalConfig (#2903 )	2024-03-08 10:01:01 +08:00