NOISSUE share logic for new attributes between mojang and onesix format

This commit is contained in:
Petr Mrázek
2016-03-19 03:06:32 +01:00
parent 9e3534f2f6
commit ec6204e447
11 changed files with 131 additions and 181 deletions

View File

@ -56,7 +56,7 @@ void OneSixProfileStrategy::upgradeDeprecatedFiles()
file->fileId = "net.minecraft";
file->version = file->id;
file->name = "Minecraft";
auto data = OneSixVersionFormat::profilePatchToJson(file, false).toJson();
auto data = OneSixVersionFormat::versionFileToJson(file, false).toJson();
QSaveFile newPatchFile(mcJson);
if(!newPatchFile.open(QIODevice::WriteOnly))
{
@ -299,7 +299,12 @@ bool OneSixProfileStrategy::customizePatch(ProfilePatchPtr patch)
{
return false;
}
auto document = OneSixVersionFormat::profilePatchToJson(patch, true);
auto vfile = patch->getVersionFile();
if(!vfile)
{
return false;
}
auto document = OneSixVersionFormat::versionFileToJson(vfile, true);
jsonFile.write(document.toJson());
if(!jsonFile.commit())
{
@ -402,7 +407,7 @@ bool OneSixProfileStrategy::installJarMods(QStringList filepaths)
<< "for reading:" << file.errorString();
return false;
}
file.write(OneSixVersionFormat::profilePatchToJson(f, true).toJson());
file.write(OneSixVersionFormat::versionFileToJson(f, true).toJson());
file.close();
profile->appendPatch(f);
}