diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/VersionSetting.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/VersionSetting.java index 7d38d7c7a..4dce2963f 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/VersionSetting.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/VersionSetting.java @@ -537,6 +537,7 @@ public final class VersionSetting { .setGameDir(gameDir) .setJava(javaVersion) .setVersionName(Metadata.TITLE) + .setVersionType(Metadata.TITLE) .setProfileName(Metadata.TITLE) .setMinecraftArgs(getMinecraftArgs()) .setJavaArgs(getJavaArgs()) diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/LaunchOptions.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/LaunchOptions.java index b8bbea001..a972b588c 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/LaunchOptions.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/LaunchOptions.java @@ -17,11 +17,11 @@ */ package org.jackhuang.hmcl.game; +import org.jackhuang.hmcl.util.platform.JavaVersion; + import java.io.File; import java.io.Serializable; -import org.jackhuang.hmcl.util.platform.JavaVersion; - /** * * @author huangyuhui @@ -31,6 +31,7 @@ public class LaunchOptions implements Serializable { private File gameDir; private JavaVersion java; private String versionName; + private String versionType; private String profileName; private String minecraftArgs; private String javaArgs; @@ -71,6 +72,14 @@ public class LaunchOptions implements Serializable { return versionName; } + /** + * Will shown in the left bottom corner of the main menu of Minecraft. + * null if use Version.versionType. + */ + public String getVersionType() { + return versionType; + } + /** * Don't know what the hell this is. */ @@ -215,6 +224,11 @@ public class LaunchOptions implements Serializable { return this; } + public Builder setVersionType(String versionType) { + options.versionType = versionType; + return this; + } + public Builder setProfileName(String profileName) { options.profileName = profileName; return this; diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java index 2eba4448e..c46aeeb49 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java @@ -259,7 +259,7 @@ public class DefaultLauncher extends Launcher { pair("${auth_uuid}", UUIDTypeAdapter.fromUUID(authInfo.getUUID())), pair("${version_name}", Optional.ofNullable(options.getVersionName()).orElse(version.getId())), pair("${profile_name}", Optional.ofNullable(options.getProfileName()).orElse("Minecraft")), - pair("${version_type}", version.getType().getId()), + pair("${version_type}", Optional.ofNullable(options.getVersionType()).orElse(version.getType().getId())), pair("${game_directory}", repository.getRunDirectory(version.getId()).getAbsolutePath()), pair("${user_type}", "mojang"), pair("${assets_index_name}", version.getAssetIndex().getId()),