CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE fix some forge version processing issues

Browse Source
This commit is contained in:
Petr Mrázek 2016-04-03 22:17:06 +02:00
parent f184eff71a
commit b29ef49415
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
logic/minecraft/forge/ForgeInstaller.cpp
View File

@ -99,7 +99,7 @@ void ForgeInstaller::prepare(const QString &filename, const QString &universalUr
QJsonObject installObj = installVal.toObject(); QJsonObject installObj = installVal.toObject();
QString libraryName = installObj.value("path").toString(); QString libraryName = installObj.value("path").toString();
internalPath = installObj.value("filePath").toString(); internalPath = installObj.value("filePath").toString();
m_forgeVersionString = installObj.value("version").toString().remove("Forge").trimmed(); m_forgeVersionString = installObj.value("version").toString().remove("Forge", Qt::CaseInsensitive).trimmed();
// where do we put the library? decode the mojang path // where do we put the library? decode the mojang path
GradleSpecifier lib(libraryName); GradleSpecifier lib(libraryName);
@ -265,9 +265,16 @@ bool ForgeInstaller::add(OneSixInstance *to)
m_forge_json->fileId = id(); m_forge_json->fileId = id();
m_forge_json->version = m_forgeVersionString; m_forge_json->version = m_forgeVersionString;
m_forge_json->dependsOnMinecraftVersion = to->intendedVersionId(); m_forge_json->dependsOnMinecraftVersion = to->intendedVersionId();
m_forge_json->minecraftVersion.clear();
m_forge_json->order = 5; m_forge_json->order = 5;
// reset some things we do not want to be passed along.
m_forge_json->m_releaseTime = QDateTime();
m_forge_json->m_updateTime = QDateTime();
m_forge_json->minimumLauncherVersion = -1;
m_forge_json->type.clear();
m_forge_json->minecraftArguments.clear();
m_forge_json->minecraftVersion.clear();
QSaveFile file(filename(to->instanceRoot())); QSaveFile file(filename(to->instanceRoot()));
if (!file.open(QFile::WriteOnly)) if (!file.open(QFile::WriteOnly))
{ {