NOISSUE fix debranding changes affecting version file format

This commit is contained in:
Petr Mrázek 2021-10-24 12:25:44 +02:00
parent 7f28f0bf01
commit 6f6c9c6f68

View File

@ -16,11 +16,11 @@ static void readString(const QJsonObject &root, const QString &key, QString &var
LibraryPtr OneSixVersionFormat::libraryFromJson(ProblemContainer & problems, const QJsonObject &libObj, const QString &filename)
{
LibraryPtr out = MojangVersionFormat::libraryFromJson(problems, libObj, filename);
readString(libObj, "LAUNCHER-hint", out->m_hint);
readString(libObj, "LAUNCHER-absulute_url", out->m_absoluteURL);
readString(libObj, "LAUNCHER-absoluteUrl", out->m_absoluteURL);
readString(libObj, "LAUNCHER-filename", out->m_filename);
readString(libObj, "LAUNCHER-displayname", out->m_displayname);
readString(libObj, "MMC-hint", out->m_hint);
readString(libObj, "MMC-absulute_url", out->m_absoluteURL);
readString(libObj, "MMC-absoluteUrl", out->m_absoluteURL);
readString(libObj, "MMC-filename", out->m_filename);
readString(libObj, "MMC-displayname", out->m_displayname);
return out;
}
@ -28,13 +28,13 @@ QJsonObject OneSixVersionFormat::libraryToJson(Library *library)
{
QJsonObject libRoot = MojangVersionFormat::libraryToJson(library);
if (library->m_absoluteURL.size())
libRoot.insert("LAUNCHER-absoluteUrl", library->m_absoluteURL);
libRoot.insert("MMC-absoluteUrl", library->m_absoluteURL);
if (library->m_hint.size())
libRoot.insert("LAUNCHER-hint", library->m_hint);
libRoot.insert("MMC-hint", library->m_hint);
if (library->m_filename.size())
libRoot.insert("LAUNCHER-filename", library->m_filename);
libRoot.insert("MMC-filename", library->m_filename);
if (library->m_displayname.size())
libRoot.insert("LAUNCHER-displayname", library->m_displayname);
libRoot.insert("MMC-displayname", library->m_displayname);
return libRoot;
}