diff options
| author | Petr Mrázek <peterix@gmail.com> | 2016-02-28 19:01:54 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2016-02-28 19:01:54 +0100 |
| commit | 9497b7e96cfac6e60a53fe05c0ca945ecc839533 (patch) | |
| tree | a7b129de1109995e4416304e0e873af44bcca5ee /logic/minecraft/liteloader | |
| parent | a0b47aee5ba8d96e5ceec12798be9f63a16dbcd5 (diff) | |
| download | MultiMC-9497b7e96cfac6e60a53fe05c0ca945ecc839533.tar MultiMC-9497b7e96cfac6e60a53fe05c0ca945ecc839533.tar.gz MultiMC-9497b7e96cfac6e60a53fe05c0ca945ecc839533.tar.lz MultiMC-9497b7e96cfac6e60a53fe05c0ca945ecc839533.tar.xz MultiMC-9497b7e96cfac6e60a53fe05c0ca945ecc839533.zip | |
NOISSUE even more version file refactors
There is no end to them in sight
Diffstat (limited to 'logic/minecraft/liteloader')
| -rw-r--r-- | logic/minecraft/liteloader/LiteLoaderInstaller.cpp | 5 | ||||
| -rw-r--r-- | logic/minecraft/liteloader/LiteLoaderVersionList.cpp | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/logic/minecraft/liteloader/LiteLoaderInstaller.cpp b/logic/minecraft/liteloader/LiteLoaderInstaller.cpp index 3fefe273..81e51cd7 100644 --- a/logic/minecraft/liteloader/LiteLoaderInstaller.cpp +++ b/logic/minecraft/liteloader/LiteLoaderInstaller.cpp @@ -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); } diff --git a/logic/minecraft/liteloader/LiteLoaderVersionList.cpp b/logic/minecraft/liteloader/LiteLoaderVersionList.cpp index 1d200e48..42698ccc 100644 --- a/logic/minecraft/liteloader/LiteLoaderVersionList.cpp +++ b/logic/minecraft/liteloader/LiteLoaderVersionList.cpp @@ -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")) { |