0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE slightly refactor jarMod entry reading

Browse Source
This commit is contained in:
Petr Mrázek 2017-04-14 12:21:10 +02:00
parent 910766458d
commit 2aaf9827a6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/logic/minecraft/onesix/OneSixVersionFormat.cpp
View File

@ -103,12 +103,6 @@ VersionFilePtr OneSixVersionFormat::versionFileFromJson(const QJsonDocument &doc
QJsonObject libObj = requireObject(libVal); QJsonObject libObj = requireObject(libVal);
// parse the jarmod // parse the jarmod
auto lib = OneSixVersionFormat::jarModFromJson(libObj, filename, out->name); auto lib = OneSixVersionFormat::jarModFromJson(libObj, filename, out->name);
if(lib->originalName.isEmpty())
{
auto fixed = out->name;
fixed.remove(" (jar mod)");
lib->originalName = out->name;
}
// and add to jar mods // and add to jar mods
out->jarMods.append(lib); out->jarMods.append(lib);
} }
@ -248,6 +242,12 @@ JarmodPtr OneSixVersionFormat::jarModFromJson(const QJsonObject &libObj, const Q
} }
out->name = libObj.value("name").toString(); out->name = libObj.value("name").toString();
out->originalName = libObj.value("originalName").toString(); out->originalName = libObj.value("originalName").toString();
if(out->originalName.isEmpty())
{
auto fixed = originalName;
fixed.remove(" (jar mod)");
out->originalName = originalName;
}
return out; return out;
} }