From d4eacb56b30baaef801f42545398a4f29755fadf Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Mon, 7 Mar 2016 02:01:28 +0100 Subject: NOISSUE make new Mojang version format pass through MultiMC structures Not yet used effectively, but it is read and written properly --- logic/minecraft/liteloader/LiteLoaderInstaller.cpp | 8 ++++---- logic/minecraft/liteloader/LiteLoaderVersionList.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'logic/minecraft/liteloader') diff --git a/logic/minecraft/liteloader/LiteLoaderInstaller.cpp b/logic/minecraft/liteloader/LiteLoaderInstaller.cpp index 81e51cd7..25297fa4 100644 --- a/logic/minecraft/liteloader/LiteLoaderInstaller.cpp +++ b/logic/minecraft/liteloader/LiteLoaderInstaller.cpp @@ -21,7 +21,7 @@ #include #include "minecraft/MinecraftProfile.h" -#include "minecraft/RawLibrary.h" +#include "minecraft/Library.h" #include "minecraft/onesix/OneSixInstance.h" #include #include "minecraft/liteloader/LiteLoaderVersionList.h" @@ -50,14 +50,14 @@ bool LiteLoaderInstaller::add(OneSixInstance *to) QJsonArray libraries; - for (auto rawLibrary : m_version->libraries) + for (auto Library : m_version->libraries) { - libraries.append(OneSixVersionFormat::libraryToJson(rawLibrary.get())); + libraries.append(OneSixVersionFormat::libraryToJson(Library.get())); } // liteloader { - RawLibrary liteloaderLib("com.mumfrey:liteloader:" + m_version->version); + Library 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 = OneSixVersionFormat::libraryToJson(&liteloaderLib); libraries.append(llLibObj); diff --git a/logic/minecraft/liteloader/LiteLoaderVersionList.h b/logic/minecraft/liteloader/LiteLoaderVersionList.h index 43bb270d..1dba4b6a 100644 --- a/logic/minecraft/liteloader/LiteLoaderVersionList.h +++ b/logic/minecraft/liteloader/LiteLoaderVersionList.h @@ -23,7 +23,7 @@ #include "BaseVersionList.h" #include "tasks/Task.h" #include "net/NetJob.h" -#include +#include #include "multimc_logic_export.h" @@ -58,7 +58,7 @@ public: int timestamp; bool isLatest; QString tweakClass; - QList libraries; + QList libraries; // meta QString defaultUrl; -- cgit