diff options
| author | Petr Mrázek <peterix@gmail.com> | 2016-03-13 02:28:55 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2016-03-26 17:05:27 +0100 |
| commit | 576d808d7197b4b7ef798891dfd138e2e8aae54f (patch) | |
| tree | 1499c6ec2e2d0430bed906dd32ab1b75876d3e80 /logic/minecraft/onesix | |
| parent | f63d1bc99c93705bdadb8221430bda60c89cc062 (diff) | |
| download | MultiMC-576d808d7197b4b7ef798891dfd138e2e8aae54f.tar MultiMC-576d808d7197b4b7ef798891dfd138e2e8aae54f.tar.gz MultiMC-576d808d7197b4b7ef798891dfd138e2e8aae54f.tar.lz MultiMC-576d808d7197b4b7ef798891dfd138e2e8aae54f.tar.xz MultiMC-576d808d7197b4b7ef798891dfd138e2e8aae54f.zip | |
NOISSUE resolve library activeness during application to profile
Diffstat (limited to 'logic/minecraft/onesix')
| -rw-r--r-- | logic/minecraft/onesix/OneSixInstance.cpp | 4 | ||||
| -rw-r--r-- | logic/minecraft/onesix/OneSixUpdate.cpp | 4 | ||||
| -rw-r--r-- | logic/minecraft/onesix/OneSixVersionFormat.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/logic/minecraft/onesix/OneSixInstance.cpp b/logic/minecraft/onesix/OneSixInstance.cpp index 93034925..c64d527f 100644 --- a/logic/minecraft/onesix/OneSixInstance.cpp +++ b/logic/minecraft/onesix/OneSixInstance.cpp @@ -179,7 +179,7 @@ QString OneSixInstance::createLaunchScript(AuthSessionPtr session) // libraries and class path. { - auto libs = m_version->getActiveNormalLibs(); + auto libs = m_version->getLibraries(); for (auto lib : libs) { launchScript += "cp " + QFileInfo(lib->storagePath()).absoluteFilePath() + "\n"; @@ -234,7 +234,7 @@ QString OneSixInstance::createLaunchScript(AuthSessionPtr session) // native libraries (mostly LWJGL) { QDir natives_dir(FS::PathCombine(instanceRoot(), "natives/")); - for (auto native : m_version->getActiveNativeLibs()) + for (auto native : m_version->getNativeLibraries()) { QFileInfo finfo(native->storagePath()); launchScript += "ext " + finfo.absoluteFilePath() + "\n"; diff --git a/logic/minecraft/onesix/OneSixUpdate.cpp b/logic/minecraft/onesix/OneSixUpdate.cpp index c12674d4..78938a4f 100644 --- a/logic/minecraft/onesix/OneSixUpdate.cpp +++ b/logic/minecraft/onesix/OneSixUpdate.cpp @@ -207,8 +207,8 @@ void OneSixUpdate::jarlibStart() jarlibDownloadJob.reset(job); } - auto libs = version->getActiveNativeLibs(); - libs.append(version->getActiveNormalLibs()); + auto libs = version->getNativeLibraries(); + libs.append(version->getLibraries()); auto metacache = ENV.metacache(); QList<ForgeXzDownloadPtr> ForgeLibs; diff --git a/logic/minecraft/onesix/OneSixVersionFormat.cpp b/logic/minecraft/onesix/OneSixVersionFormat.cpp index ff26ab92..d9aff535 100644 --- a/logic/minecraft/onesix/OneSixVersionFormat.cpp +++ b/logic/minecraft/onesix/OneSixVersionFormat.cpp @@ -153,7 +153,7 @@ VersionFilePtr OneSixVersionFormat::versionFileFromJson(const QJsonDocument &doc QJsonObject libObj = requireObject(libVal); // parse the library auto lib = libraryFromJson(libObj, filename); - out->addLibs.append(lib); + out->libraries.append(lib); } }; bool hasPlusLibs = root.contains("+libraries"); @@ -230,10 +230,10 @@ static QJsonDocument versionFileToJson(VersionFilePtr patch, bool saveOrder) } writeStringList(root, "+tweakers", patch->addTweakers); writeStringList(root, "+traits", patch->traits.toList()); - if (!patch->addLibs.isEmpty()) + if (!patch->libraries.isEmpty()) { QJsonArray array; - for (auto value: patch->addLibs) + for (auto value: patch->libraries) { array.append(OneSixVersionFormat::libraryToJson(value.get())); } |