Copying of FTB instances working again
This commit is contained in:
parent
f54705e1c5
commit
4883d15262
9 changed files with 92 additions and 5 deletions
|
@ -6,7 +6,9 @@
|
|||
#include "ForgeInstaller.h"
|
||||
#include "lists/ForgeVersionList.h"
|
||||
#include "OneSixInstance_p.h"
|
||||
#include "OneSixVersionBuilder.h"
|
||||
#include "MultiMC.h"
|
||||
#include "pathutils.h"
|
||||
|
||||
class OneSixFTBInstanceForge : public Task
|
||||
{
|
||||
|
@ -88,6 +90,70 @@ void OneSixFTBInstance::init()
|
|||
reloadVersion();
|
||||
}
|
||||
|
||||
void OneSixFTBInstance::copy(const QDir &newDir)
|
||||
{
|
||||
QStringList libraryNames;
|
||||
// create patch file
|
||||
{
|
||||
QLOG_DEBUG() << "Creating patch file for FTB instance...";
|
||||
QFile f(minecraftRoot() + "/pack.json");
|
||||
if (!f.open(QFile::ReadOnly))
|
||||
{
|
||||
QLOG_ERROR() << "Couldn't open" << f.fileName() << ":" << f.errorString();
|
||||
return;
|
||||
}
|
||||
QJsonObject root = QJsonDocument::fromJson(f.readAll()).object();
|
||||
QJsonArray libs = root.value("libraries").toArray();
|
||||
QJsonArray outLibs;
|
||||
for (auto lib : libs)
|
||||
{
|
||||
QJsonObject libObj = lib.toObject();
|
||||
libObj.insert("MMC-hint", QString("local"));
|
||||
libObj.insert("insert", QString("prepend"));
|
||||
libraryNames.append(libObj.value("name").toString());
|
||||
outLibs.append(libObj);
|
||||
}
|
||||
root.remove("libraries");
|
||||
root.remove("id");
|
||||
root.insert("+libraries", outLibs);
|
||||
root.insert("order", 1);
|
||||
root.insert("fileId", QString("org.multimc.ftb.pack.json"));
|
||||
root.insert("name", name());
|
||||
root.insert("mcVersion", intendedVersionId());
|
||||
root.insert("version", intendedVersionId());
|
||||
ensureFilePathExists(newDir.absoluteFilePath("patches/ftb.json"));
|
||||
QFile out(newDir.absoluteFilePath("patches/ftb.json"));
|
||||
if (!out.open(QFile::WriteOnly | QFile::Truncate))
|
||||
{
|
||||
QLOG_ERROR() << "Couldn't open" << out.fileName() << ":" << out.errorString();
|
||||
return;
|
||||
}
|
||||
out.write(QJsonDocument(root).toJson());
|
||||
}
|
||||
// copy libraries
|
||||
{
|
||||
QLOG_DEBUG() << "Copying FTB libraries";
|
||||
for (auto library : libraryNames)
|
||||
{
|
||||
OneSixLibrary *lib = new OneSixLibrary(library);
|
||||
lib->finalize();
|
||||
const QString out = QDir::current().absoluteFilePath("libraries/" + lib->storagePath());
|
||||
if (QFile::exists(out))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
if (!ensureFilePathExists(out))
|
||||
{
|
||||
QLOG_ERROR() << "Couldn't create folder structure for" << out;
|
||||
}
|
||||
if (!QFile::copy(librariesPath().absoluteFilePath(lib->storagePath()), out))
|
||||
{
|
||||
QLOG_ERROR() << "Couldn't copy" << lib->rawName();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
QString OneSixFTBInstance::id() const
|
||||
{
|
||||
return "FTB/" + BaseInstance::id();
|
||||
|
@ -109,6 +175,11 @@ QStringList OneSixFTBInstance::externalPatches() const
|
|||
<< minecraftRoot() + "/pack.json";
|
||||
}
|
||||
|
||||
bool OneSixFTBInstance::providesVersionFile() const
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
QString OneSixFTBInstance::getStatusbarDescription()
|
||||
{
|
||||
return "OneSix FTB: " + intendedVersionId();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue