No end in sight :<

This commit is contained in:
Petr Mrázek
2014-03-03 01:44:07 +01:00
parent 29cdc9364b
commit d66f2500a6
3 changed files with 27 additions and 19 deletions

View File

@ -130,29 +130,32 @@ void OneSixVersionBuilder::buildInternal(const bool onlyVanilla, const QStringLi
} while(0);
// some final touches
finalizeVersion();
}
void OneSixVersionBuilder::finalizeVersion()
{
if (m_version->assets.isEmpty())
{
if (m_version->assets.isEmpty())
m_version->assets = "legacy";
}
if (m_version->minecraftArguments.isEmpty())
{
QString toCompare = m_version->processArguments.toLower();
if (toCompare == "legacy")
{
m_version->assets = "legacy";
m_version->minecraftArguments = " ${auth_player_name} ${auth_session}";
}
if (m_version->minecraftArguments.isEmpty())
else if (toCompare == "username_session")
{
QString toCompare = m_version->processArguments.toLower();
if (toCompare == "legacy")
{
m_version->minecraftArguments = " ${auth_player_name} ${auth_session}";
}
else if (toCompare == "username_session")
{
m_version->minecraftArguments =
"--username ${auth_player_name} --session ${auth_session}";
}
else if (toCompare == "username_session_version")
{
m_version->minecraftArguments = "--username ${auth_player_name} "
"--session ${auth_session} "
"--version ${profile_name}";
}
m_version->minecraftArguments =
"--username ${auth_player_name} --session ${auth_session}";
}
else if (toCompare == "username_session_version")
{
m_version->minecraftArguments = "--username ${auth_player_name} "
"--session ${auth_session} "
"--version ${profile_name}";
}
}
}

View File

@ -41,6 +41,7 @@ private:
void buildInternal(const bool onlyVanilla, const QStringList &external);
void readJsonAndApply(const QJsonObject &obj);
void finalizeVersion();
VersionFile parseJsonFile(const QFileInfo &fileInfo, const bool requireOrder, bool isFTB = false);
};