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

* update

* update

HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java

@@ -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)) {

HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackInfoPage.java

@@ -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://docs.hmcl.net/modpack/serverpack.htm");
+                        FXUtils.openLink("https://docs.hmcl.net/modpack/serverpack.html");
                     });
                     borderPane.setTop(hyperlink);
                 } else {

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

@@ -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;
         }
     }
 

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

@@ -827,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
@@ -855,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

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

@@ -511,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 安裝器
@@ -703,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
@@ -731,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=世界生成

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

@@ -702,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
@@ -730,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=世界生成

HMCLCore/src/main/java/org/jackhuang/hmcl/auth/offline/OfflineAccount.java

@@ -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

HMCLCore/src/main/java/org/jackhuang/hmcl/game/GameVersion.java

@@ -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;
+                    }
                 }
             }
 

HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java

@@ -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);