diff options
author | Petr Mrázek <peterix@gmail.com> | 2016-03-07 02:01:28 +0100 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2016-03-07 02:03:36 +0100 |
commit | d4eacb56b30baaef801f42545398a4f29755fadf (patch) | |
tree | 0a185b0841f12c5af431cdedeb8695691ac0bce9 /logic/minecraft/VersionFile.cpp | |
parent | 3d8728f52f220845fc4079d34b97458a122ac031 (diff) | |
download | MultiMC-d4eacb56b30baaef801f42545398a4f29755fadf.tar MultiMC-d4eacb56b30baaef801f42545398a4f29755fadf.tar.gz MultiMC-d4eacb56b30baaef801f42545398a4f29755fadf.tar.lz MultiMC-d4eacb56b30baaef801f42545398a4f29755fadf.tar.xz MultiMC-d4eacb56b30baaef801f42545398a4f29755fadf.zip |
NOISSUE make new Mojang version format pass through MultiMC structures
Not yet used effectively, but it is read and written properly
Diffstat (limited to 'logic/minecraft/VersionFile.cpp')
-rw-r--r-- | logic/minecraft/VersionFile.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/logic/minecraft/VersionFile.cpp b/logic/minecraft/VersionFile.cpp index 08f53a37..410f6659 100644 --- a/logic/minecraft/VersionFile.cpp +++ b/logic/minecraft/VersionFile.cpp @@ -4,7 +4,7 @@ #include <QDebug> #include "minecraft/VersionFile.h" -#include "minecraft/RawLibrary.h" +#include "minecraft/Library.h" #include "minecraft/MinecraftProfile.h" #include "minecraft/JarMod.h" #include "ParseUtils.h" @@ -12,7 +12,7 @@ #include "VersionBuildError.h" #include <Version.h> -int findLibraryByName(QList<RawLibraryPtr> haystack, const GradleSpecifier &needle) +int findLibraryByName(QList<LibraryPtr> haystack, const GradleSpecifier &needle) { int retval = -1; for (int i = 0; i < haystack.size(); ++i) @@ -112,10 +112,10 @@ void VersionFile::applyTo(MinecraftProfile *version) version->traits.unite(traits); if (shouldOverwriteLibs) { - QList<RawLibraryPtr> libs; + QList<LibraryPtr> libs; for (auto lib : overwriteLibs) { - libs.append(RawLibrary::limitedCopy(lib)); + libs.append(Library::limitedCopy(lib)); } if (isMinecraftVersion()) { @@ -130,14 +130,14 @@ void VersionFile::applyTo(MinecraftProfile *version) // library not found? just add it. if (index < 0) { - version->libraries.append(RawLibrary::limitedCopy(addedLibrary)); + version->libraries.append(Library::limitedCopy(addedLibrary)); continue; } auto existingLibrary = version->libraries.at(index); // if we are higher it means we should update if (Version(addedLibrary->version()) > Version(existingLibrary->version())) { - auto library = RawLibrary::limitedCopy(addedLibrary); + auto library = Library::limitedCopy(addedLibrary); version->libraries.replace(index, library); } } |