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

NOISSUE even more version file refactors

Browse Source 
There is no end to them in sight
This commit is contained in:
Petr Mrázek
2016-02-28 19:01:54 +01:00
parent a0b47aee5b
commit 9497b7e96c
16 changed files with 290 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,7 @@ void ForgeInstaller::prepare(const QString &filename, const QString &universalUr
// read the forge version info
{
newVersion = OneSixVersionFormat::readProfileFromSingleFile(versionInfoVal.toObject());
newVersion = OneSixVersionFormat::profileFromSingleJson(versionInfoVal.toObject());
if (!newVersion)
return;
}
@ -192,7 +192,7 @@ bool ForgeInstaller::add(OneSixInstance *to)
}
}
QJsonObject libObj = lib->toJson();
QJsonObject libObj = OneSixVersionFormat::libraryToJson(lib.get());
bool found = false;
bool equals = false;
@ -202,7 +202,7 @@ bool ForgeInstaller::add(OneSixInstance *to)
if (tolib->artifactId() != libName)
continue;
found = true;
if (tolib->toJson() == libObj)
if (OneSixVersionFormat::libraryToJson(tolib.get()) == libObj)
{
equals = true;
}