diff options
Diffstat (limited to 'api/logic/minecraft/onesix')
-rw-r--r-- | api/logic/minecraft/onesix/OneSixInstance.cpp | 14 | ||||
-rw-r--r-- | api/logic/minecraft/onesix/OneSixInstance.h | 2 | ||||
-rw-r--r-- | api/logic/minecraft/onesix/update/LibrariesTask.cpp | 2 |
3 files changed, 13 insertions, 5 deletions
diff --git a/api/logic/minecraft/onesix/OneSixInstance.cpp b/api/logic/minecraft/onesix/OneSixInstance.cpp index 1bf75bdb..d89a7612 100644 --- a/api/logic/minecraft/onesix/OneSixInstance.cpp +++ b/api/logic/minecraft/onesix/OneSixInstance.cpp @@ -145,6 +145,12 @@ QString OneSixInstance::getNativePath() const return natives_dir.absolutePath(); } +QString OneSixInstance::getLocalLibraryPath() const +{ + QDir libraries_dir(FS::PathCombine(instanceRoot(), "libraries/")); + return libraries_dir.absolutePath(); +} + QString OneSixInstance::mainJarPath() const { auto jarMods = getJarMods(); @@ -207,7 +213,7 @@ QString OneSixInstance::createLaunchScript(AuthSessionPtr session) { QStringList jars, nativeJars; auto javaArchitecture = settings()->get("JavaArchitecture").toString(); - m_profile->getLibraryFiles(javaArchitecture, jars, nativeJars); + m_profile->getLibraryFiles(javaArchitecture, jars, nativeJars, getLocalLibraryPath()); for(auto file: jars) { launchScript += "cp " + file + "\n"; @@ -251,7 +257,7 @@ QStringList OneSixInstance::verboseDescription(AuthSessionPtr session) out << "Libraries:"; QStringList jars, nativeJars; auto javaArchitecture = settings()->get("JavaArchitecture").toString(); - m_profile->getLibraryFiles(javaArchitecture, jars, nativeJars); + m_profile->getLibraryFiles(javaArchitecture, jars, nativeJars, getLocalLibraryPath()); auto printLibFile = [&](const QString & path) { QFileInfo info(path); @@ -654,7 +660,7 @@ QStringList OneSixInstance::getClassPath() const { QStringList jars, nativeJars; auto javaArchitecture = settings()->get("JavaArchitecture").toString(); - m_profile->getLibraryFiles(javaArchitecture, jars, nativeJars); + m_profile->getLibraryFiles(javaArchitecture, jars, nativeJars, getLocalLibraryPath()); jars.append(mainJarPath()); return jars; } @@ -668,6 +674,6 @@ QStringList OneSixInstance::getNativeJars() const { QStringList jars, nativeJars; auto javaArchitecture = settings()->get("JavaArchitecture").toString(); - m_profile->getLibraryFiles(javaArchitecture, jars, nativeJars); + m_profile->getLibraryFiles(javaArchitecture, jars, nativeJars, getLocalLibraryPath()); return nativeJars; } diff --git a/api/logic/minecraft/onesix/OneSixInstance.h b/api/logic/minecraft/onesix/OneSixInstance.h index c857075f..170921ae 100644 --- a/api/logic/minecraft/onesix/OneSixInstance.h +++ b/api/logic/minecraft/onesix/OneSixInstance.h @@ -104,6 +104,8 @@ public: QStringList getNativeJars() const override; QString getNativePath() const override; + QString getLocalLibraryPath() const override; + QStringList processMinecraftArgs(AuthSessionPtr account) const override; protected: diff --git a/api/logic/minecraft/onesix/update/LibrariesTask.cpp b/api/logic/minecraft/onesix/update/LibrariesTask.cpp index 123b14a3..1efbc64c 100644 --- a/api/logic/minecraft/onesix/update/LibrariesTask.cpp +++ b/api/logic/minecraft/onesix/update/LibrariesTask.cpp @@ -42,7 +42,7 @@ void LibrariesTask::executeTask() QStringList failedFiles; for (auto lib : libs) { - auto dls = lib->getDownloads(currentSystem, metacache.get(), failedFiles); + auto dls = lib->getDownloads(currentSystem, metacache.get(), failedFiles, inst->getLocalLibraryPath()); for(auto dl : dls) { downloadJob->addNetAction(dl); |