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

custom.json overrides all. For user patching there now is instance.json

Browse Source
This commit is contained in:
Jan Dalheimer 2014-01-28 07:39:43 +01:00
parent 986141b503
commit 556d8f0ec1
1 changed files with 71 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
logic/OneSixVersionBuilder.cpp
View File

@ -695,7 +695,29 @@ bool OneSixVersionBuilder::build(const bool excludeCustom)
QDir root(m_instance->instanceRoot()); QDir root(m_instance->instanceRoot());
QDir patches(root.absoluteFilePath("patches/")); QDir patches(root.absoluteFilePath("patches/"));
// version.json -> patches/*.json -> custom.json if (QFile::exists(root.absoluteFilePath("custom.json")))
{
QLOG_INFO() << "Reading custom.json";
VersionFile file;
if (!read(QFileInfo(root.absoluteFilePath("custom.json")), false, &file))
{
return false;
}
bool isError = false;
file.applyTo(m_version, isError);
if (isError)
{
QMessageBox::critical(
m_widgetParent, QObject::tr("Error"),
QObject::tr(
"Error while applying %1. Please check MultiMC-0.log for more info.")
.arg(root.absoluteFilePath("custom.json")));
return false;
}
}
else
{
// version.json -> patches/*.json -> instance.json
// version.json // version.json
{ {
@ -751,14 +773,14 @@ bool OneSixVersionBuilder::build(const bool excludeCustom)
} }
} }
// custom.json // instance.json
if (!excludeCustom) if (!excludeCustom)
{ {
if (QFile::exists(root.absoluteFilePath("custom.json"))) if (QFile::exists(root.absoluteFilePath("instance.json")))
{ {
QLOG_INFO() << "Reading custom.json"; QLOG_INFO() << "Reading instance.json";
VersionFile file; VersionFile file;
if (!read(QFileInfo(root.absoluteFilePath("custom.json")), false, &file)) if (!read(QFileInfo(root.absoluteFilePath("instance.json")), false, &file))
{ {
return false; return false;
} }
@ -770,11 +792,12 @@ bool OneSixVersionBuilder::build(const bool excludeCustom)
m_widgetParent, QObject::tr("Error"), m_widgetParent, QObject::tr("Error"),
QObject::tr( QObject::tr(
"Error while applying %1. Please check MultiMC-0.log for more info.") "Error while applying %1. Please check MultiMC-0.log for more info.")
.arg(root.absoluteFilePath("custom.json"))); .arg(root.absoluteFilePath("instance.json")));
return false; return false;
} }
} }
} }
}
// some final touches // some final touches
{ {