Show HMCL version in game main menu

This commit is contained in:
huanghongxun 2019-08-18 10:54:05 +08:00
parent c11bbf8836
commit c62cc499c5
3 changed files with 18 additions and 3 deletions

View File

@ -537,6 +537,7 @@ public final class VersionSetting {
.setGameDir(gameDir) .setGameDir(gameDir)
.setJava(javaVersion) .setJava(javaVersion)
.setVersionName(Metadata.TITLE) .setVersionName(Metadata.TITLE)
.setVersionType(Metadata.TITLE)
.setProfileName(Metadata.TITLE) .setProfileName(Metadata.TITLE)
.setMinecraftArgs(getMinecraftArgs()) .setMinecraftArgs(getMinecraftArgs())
.setJavaArgs(getJavaArgs()) .setJavaArgs(getJavaArgs())

View File

@ -17,11 +17,11 @@
*/ */
package org.jackhuang.hmcl.game; package org.jackhuang.hmcl.game;
import org.jackhuang.hmcl.util.platform.JavaVersion;
import java.io.File; import java.io.File;
import java.io.Serializable; import java.io.Serializable;
import org.jackhuang.hmcl.util.platform.JavaVersion;
/** /**
* *
* @author huangyuhui * @author huangyuhui
@ -31,6 +31,7 @@ public class LaunchOptions implements Serializable {
private File gameDir; private File gameDir;
private JavaVersion java; private JavaVersion java;
private String versionName; private String versionName;
private String versionType;
private String profileName; private String profileName;
private String minecraftArgs; private String minecraftArgs;
private String javaArgs; private String javaArgs;
@ -71,6 +72,14 @@ public class LaunchOptions implements Serializable {
return versionName; 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. * Don't know what the hell this is.
*/ */
@ -215,6 +224,11 @@ public class LaunchOptions implements Serializable {
return this; return this;
} }
public Builder setVersionType(String versionType) {
options.versionType = versionType;
return this;
}
public Builder setProfileName(String profileName) { public Builder setProfileName(String profileName) {
options.profileName = profileName; options.profileName = profileName;
return this; return this;

View File

@ -259,7 +259,7 @@ public class DefaultLauncher extends Launcher {
pair("${auth_uuid}", UUIDTypeAdapter.fromUUID(authInfo.getUUID())), pair("${auth_uuid}", UUIDTypeAdapter.fromUUID(authInfo.getUUID())),
pair("${version_name}", Optional.ofNullable(options.getVersionName()).orElse(version.getId())), pair("${version_name}", Optional.ofNullable(options.getVersionName()).orElse(version.getId())),
pair("${profile_name}", Optional.ofNullable(options.getProfileName()).orElse("Minecraft")), 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("${game_directory}", repository.getRunDirectory(version.getId()).getAbsolutePath()),
pair("${user_type}", "mojang"), pair("${user_type}", "mojang"),
pair("${assets_index_name}", version.getAssetIndex().getId()), pair("${assets_index_name}", version.getAssetIndex().getId()),