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

NOISSUE even more version file refactors

Browse Source 
There is no end to them in sight
This commit is contained in:
Petr Mrázek
2016-02-28 19:01:54 +01:00
parent a0b47aee5b
commit 9497b7e96c
16 changed files with 290 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
logic/minecraft/liteloader/LiteLoaderInstaller.cpp
View File

@ -23,6 +23,7 @@
#include "minecraft/MinecraftProfile.h"
#include "minecraft/RawLibrary.h"
#include "minecraft/onesix/OneSixInstance.h"
#include <minecraft/onesix/OneSixVersionFormat.h>
#include "minecraft/liteloader/LiteLoaderVersionList.h"
#include "Exception.h"
@ -51,14 +52,14 @@ bool LiteLoaderInstaller::add(OneSixInstance *to)
for (auto rawLibrary : m_version->libraries)
{
libraries.append(rawLibrary->toJson());
libraries.append(OneSixVersionFormat::libraryToJson(rawLibrary.get()));
}
// liteloader
{
RawLibrary liteloaderLib("com.mumfrey:liteloader:" + m_version->version);
liteloaderLib.setAbsoluteUrl(QString("http://dl.liteloader.com/versions/com/mumfrey/liteloader/%1/%2").arg(m_version->mcVersion, m_version->file));
QJsonObject llLibObj = liteloaderLib.toJson();
QJsonObject llLibObj = OneSixVersionFormat::libraryToJson(&liteloaderLib);
libraries.append(llLibObj);
}

3
logic/minecraft/liteloader/LiteLoaderVersionList.cpp
View File

@ -14,6 +14,7 @@
*/
#include "LiteLoaderVersionList.h"
#include <minecraft/onesix/OneSixVersionFormat.h>
#include "Env.h"
#include "net/URLConstants.h"
#include "Exception.h"
@ -246,7 +247,7 @@ void LLListLoadTask::listDownloaded()
auto libobject = (*lIt).toObject();
try
{
auto lib = RawLibrary::fromJson(libobject, "versions.json");
auto lib = OneSixVersionFormat::libraryFromJson(libobject, "versions.json");
// hack to make liteloader 1.7.10_00 work
if(lib->rawName() == GradleSpecifier("org.ow2.asm:asm-all:5.0.3"))
{