CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rearrange RawLibrary and OneSixLibrary heavily.

Browse Source 
Fix #396
This commit is contained in:
Petr Mrázek
2014-07-26 23:00:35 +02:00
parent 9b82c87c92
commit 03b13b0b3f
12 changed files with 335 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
logic/liteloader/LiteLoaderInstaller.cpp
View File

@ -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"));

2
logic/liteloader/LiteLoaderVersionList.cpp
View File

@ -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/";
}