0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use FTB's libraries/ and versions/ folders for non-copied instances

Browse Source
This commit is contained in:
Jan Dalheimer
2014-02-20 17:06:32 +01:00
parent 5cf599673d
commit 43881b9cdb
4 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
logic/OneSixFTBInstance.cpp
View File

@@ -95,6 +95,15 @@ QString OneSixFTBInstance::id() const
return "FTB/" + BaseInstance::id();
}
QDir OneSixFTBInstance::librariesPath() const
{
return QDir(MMC->settings()->get("FTBRoot").toString() + "/libraries");
}
QDir OneSixFTBInstance::versionsPath() const
{
return QDir(MMC->settings()->get("FTBRoot").toString() + "/versions");
}
QString OneSixFTBInstance::getStatusbarDescription()
{
return "OneSix FTB: " + intendedVersionId();

3
logic/OneSixFTBInstance.h
View File

@@ -17,6 +17,9 @@ public:
virtual QString id() const;
virtual QDir librariesPath() const override;
virtual QDir versionsPath() const override;
private:
std::shared_ptr<OneSixLibrary> m_forge;
};

17
logic/OneSixInstance.cpp
View File

@@ -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");

3
logic/OneSixInstance.h
View File

@@ -68,6 +68,9 @@ public:
virtual bool menuActionEnabled(QString action_name) const override;
virtual QString getStatusbarDescription() override;
virtual QDir librariesPath() const;
virtual QDir versionsPath() const;
signals:
void versionReloaded();