diff options
| author | Petr Mrázek <peterix@gmail.com> | 2016-02-21 01:44:27 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2016-02-21 01:44:27 +0100 |
| commit | 1a0bbdd9acaf1c5edaad6d3f0790c1b02674c0ae (patch) | |
| tree | 2c2fbc7a74ea5035fdfd8752272e011852eb1b85 /logic/minecraft/OneSixInstance.cpp | |
| parent | 495d320ce267cf6d7c7e4468dbc36d3536bcb401 (diff) | |
| download | MultiMC-1a0bbdd9acaf1c5edaad6d3f0790c1b02674c0ae.tar MultiMC-1a0bbdd9acaf1c5edaad6d3f0790c1b02674c0ae.tar.gz MultiMC-1a0bbdd9acaf1c5edaad6d3f0790c1b02674c0ae.tar.lz MultiMC-1a0bbdd9acaf1c5edaad6d3f0790c1b02674c0ae.tar.xz MultiMC-1a0bbdd9acaf1c5edaad6d3f0790c1b02674c0ae.zip | |
GH-1453 report version file problems in the version page
Diffstat (limited to 'logic/minecraft/OneSixInstance.cpp')
| -rw-r--r-- | logic/minecraft/OneSixInstance.cpp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/logic/minecraft/OneSixInstance.cpp b/logic/minecraft/OneSixInstance.cpp index da1b21cb..9a3920cc 100644 --- a/logic/minecraft/OneSixInstance.cpp +++ b/logic/minecraft/OneSixInstance.cpp @@ -111,6 +111,14 @@ QStringList OneSixInstance::processMinecraftArgs(AuthSessionPtr session) // blatant self-promotion. token_mapping["profile_name"] = token_mapping["version_name"] = "MultiMC5"; + if(m_version->isVanilla()) + { + token_mapping["version_type"] = m_version->type; + } + else + { + token_mapping["version_type"] = "custom"; + } QString absRootDir = QDir(minecraftRoot()).absolutePath(); token_mapping["game_directory"] = absRootDir; @@ -119,10 +127,21 @@ QStringList OneSixInstance::processMinecraftArgs(AuthSessionPtr session) token_mapping["user_properties"] = session->serializeUserProperties(); token_mapping["user_type"] = session->user_type; + // 1.7.3+ assets tokens token_mapping["assets_root"] = absAssetsDir; token_mapping["assets_index_name"] = m_version->assets; + // 1.9+ version type token + if(m_version->isVanilla()) + { + token_mapping["version_type"] = m_version->type; + } + else + { + token_mapping["version_type"] = "custom"; + } + QStringList parts = args_pattern.split(' ', QString::SkipEmptyParts); for (int i = 0; i < parts.length(); i++) { |