mirror of
https://github.com/UltimMC/Launcher.git
synced 2025-12-21 19:27:15 +00:00
Use FTB's libraries/ and versions/ folders for non-copied instances
This commit is contained in:
@@ -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");
|
||||
|
||||
Reference in New Issue
Block a user