Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-12 21:27:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix liteloader, some cleanups.

Browse Source
This commit is contained in:
Petr Mrázek
2014-07-06 11:15:15 +02:00
parent a218d7b7f6
commit cc499488db
18 changed files with 93 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
logic/liteloader/LiteLoaderInstaller.cpp
View File

@ -49,13 +49,12 @@ bool LiteLoaderInstaller::add(OneSixInstance *to)
QJsonArray libraries;
for (auto libStr : m_version->libraries)
for (auto rawLibrary : m_version->libraries)
{
OneSixLibrary lib(libStr);
rawLibrary->insertType = RawLibrary::Prepend;
OneSixLibrary lib(rawLibrary);
lib.finalize();
QJsonObject libObj = lib.toJson();
libObj.insert("insert", QString("prepend"));
libraries.append(libObj);
libraries.append(lib.toJson());
}
// liteloader

17
logic/liteloader/LiteLoaderVersionList.cpp
View File

@ -16,6 +16,7 @@
#include "LiteLoaderVersionList.h"
#include "MultiMC.h"
#include "logic/net/URLConstants.h"
#include <MMCError.h>
#include <QtXml>
@ -206,7 +207,21 @@ void LLListLoadTask::listDownloaded()
const QJsonArray libs = artefact.value("libraries").toArray();
for (auto lIt = libs.begin(); lIt != libs.end(); ++lIt)
{
version->libraries.append((*lIt).toObject().value("name").toString());
auto libobject = (*lIt).toObject();
try
{
auto lib = RawLibrary::fromJson(libobject, "versions.json");
if(lib->m_name.startsWith("org.ow2.asm:asm-all:"))
{
lib->m_base_url = "http://repo.maven.apache.org/maven2/";
}
version->libraries.append(lib);
}
catch (MMCError &e)
{
QLOG_ERROR() << "Couldn't read JSON object:";
continue;
}
}
perMcVersionList.append(version);
}

3
logic/liteloader/LiteLoaderVersionList.h
View File

@ -23,6 +23,7 @@
#include "logic/BaseVersionList.h"
#include "logic/tasks/Task.h"
#include "logic/net/NetJob.h"
#include <logic/minecraft/RawLibrary.h>
class LLListLoadTask;
class QNetworkReply;
@ -55,7 +56,7 @@ public:
int timestamp;
bool isLatest;
QString tweakClass;
QStringList libraries;
QList<RawLibraryPtr> libraries;
// meta
QString defaultUrl;