From 03b13b0b3f43e830ca924338b38e1947cd0cc739 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 26 Jul 2014 23:00:35 +0200 Subject: Rearrange RawLibrary and OneSixLibrary heavily. Fix #396 --- logic/liteloader/LiteLoaderInstaller.cpp | 2 -- logic/liteloader/LiteLoaderVersionList.cpp | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'logic/liteloader') diff --git a/logic/liteloader/LiteLoaderInstaller.cpp b/logic/liteloader/LiteLoaderInstaller.cpp index 863c7fcb..f1f9885a 100644 --- a/logic/liteloader/LiteLoaderInstaller.cpp +++ b/logic/liteloader/LiteLoaderInstaller.cpp @@ -53,7 +53,6 @@ bool LiteLoaderInstaller::add(OneSixInstance *to) { rawLibrary->insertType = RawLibrary::Prepend; OneSixLibrary lib(rawLibrary); - lib.finalize(); libraries.append(lib.toJson()); } @@ -63,7 +62,6 @@ bool LiteLoaderInstaller::add(OneSixInstance *to) liteloaderLib.setAbsoluteUrl( QString("http://dl.liteloader.com/versions/com/mumfrey/liteloader/%1/%2") .arg(m_version->mcVersion, m_version->file)); - liteloaderLib.finalize(); QJsonObject llLibObj = liteloaderLib.toJson(); llLibObj.insert("insert", QString("prepend")); llLibObj.insert("MMC-depend", QString("hard")); diff --git a/logic/liteloader/LiteLoaderVersionList.cpp b/logic/liteloader/LiteLoaderVersionList.cpp index af8509d6..bf57867a 100644 --- a/logic/liteloader/LiteLoaderVersionList.cpp +++ b/logic/liteloader/LiteLoaderVersionList.cpp @@ -212,7 +212,7 @@ void LLListLoadTask::listDownloaded() { auto lib = RawLibrary::fromJson(libobject, "versions.json"); // hack to make liteloader 1.7.10_00 work - if(lib->m_name == GradleSpecifier("org.ow2.asm:asm-all:5.0.3")) + if(lib->rawName() == GradleSpecifier("org.ow2.asm:asm-all:5.0.3")) { lib->m_base_url = "http://repo.maven.apache.org/maven2/"; } -- cgit v1.2.3