diff options
| author | Jan Dalheimer <jan@dalheimer.de> | 2014-02-20 17:06:32 +0100 |
|---|---|---|
| committer | Jan Dalheimer <jan@dalheimer.de> | 2014-02-20 17:06:32 +0100 |
| commit | 43881b9cdba95259395c8bf633b670c8a6fead9a (patch) | |
| tree | f8cfab198d6ca3d04888e2bf453179ab7ee03499 /logic/OneSixInstance.cpp | |
| parent | 5cf599673db88b39100ffca78e10bbe5e10200d7 (diff) | |
| download | MultiMC-43881b9cdba95259395c8bf633b670c8a6fead9a.tar MultiMC-43881b9cdba95259395c8bf633b670c8a6fead9a.tar.gz MultiMC-43881b9cdba95259395c8bf633b670c8a6fead9a.tar.lz MultiMC-43881b9cdba95259395c8bf633b670c8a6fead9a.tar.xz MultiMC-43881b9cdba95259395c8bf633b670c8a6fead9a.zip | |
Use FTB's libraries/ and versions/ folders for non-copied instances
Diffstat (limited to 'logic/OneSixInstance.cpp')
| -rw-r--r-- | logic/OneSixInstance.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/logic/OneSixInstance.cpp b/logic/OneSixInstance.cpp index ae172f21..8b4de641 100644 --- a/logic/OneSixInstance.cpp +++ b/logic/OneSixInstance.cpp @@ -192,12 +192,10 @@ MinecraftProcess *OneSixInstance::prepareForLaunch(AuthSessionPtr session) auto libs = version->getActiveNormalLibs(); for (auto lib : libs) { - QFileInfo fi(QString("libraries/") + lib->storagePath()); - launchScript += "cp " + fi.absoluteFilePath() + "\n"; + launchScript += "cp " + librariesPath().absoluteFilePath(lib->storagePath()) + "\n"; } - QString targetstr = "versions/" + version->id + "/" + version->id + ".jar"; - QFileInfo fi(targetstr); - launchScript += "cp " + fi.absoluteFilePath() + "\n"; + QString targetstr = version->id + "/" + version->id + ".jar"; + launchScript += "cp " + versionsPath().absoluteFilePath(targetstr) + "\n"; } launchScript += "mainClass " + version->mainClass + "\n"; @@ -374,6 +372,15 @@ QString OneSixInstance::getStatusbarDescription() return descr; } +QDir OneSixInstance::librariesPath() const +{ + return QDir::current().absoluteFilePath("libraries"); +} +QDir OneSixInstance::versionsPath() const +{ + return QDir::current().absoluteFilePath("versions"); +} + QString OneSixInstance::loaderModsDir() const { return PathCombine(minecraftRoot(), "mods"); |