From 2aaf9827a67bf3de23b6b8ad9e85a42686659d1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Fri, 14 Apr 2017 12:21:10 +0200 Subject: NOISSUE slightly refactor jarMod entry reading --- api/logic/minecraft/onesix/OneSixVersionFormat.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'api') diff --git a/api/logic/minecraft/onesix/OneSixVersionFormat.cpp b/api/logic/minecraft/onesix/OneSixVersionFormat.cpp index 1da375ad..267ad888 100644 --- a/api/logic/minecraft/onesix/OneSixVersionFormat.cpp +++ b/api/logic/minecraft/onesix/OneSixVersionFormat.cpp @@ -103,12 +103,6 @@ VersionFilePtr OneSixVersionFormat::versionFileFromJson(const QJsonDocument &doc QJsonObject libObj = requireObject(libVal); // parse the jarmod 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 out->jarMods.append(lib); } @@ -248,6 +242,12 @@ JarmodPtr OneSixVersionFormat::jarModFromJson(const QJsonObject &libObj, const Q } out->name = libObj.value("name").toString(); out->originalName = libObj.value("originalName").toString(); + if(out->originalName.isEmpty()) + { + auto fixed = originalName; + fixed.remove(" (jar mod)"); + out->originalName = originalName; + } return out; } -- cgit v1.2.3