CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove version patch reordering. Remove the main class display from onesix edit mods.

Browse Source
This commit is contained in:
Petr Mrázek
2014-03-09 17:38:42 +01:00
parent 47bc7e5ee3
commit ffff2cd324
5 changed files with 45 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
logic/OneSixVersionBuilder.cpp
View File

@ -71,6 +71,7 @@ void OneSixVersionBuilder::buildInternal(const bool onlyVanilla, const QStringLi
file->version = QString();
file->mcVersion = QString();
file->applyTo(m_version);
m_version->versionFiles.append(file);
}
// else, if there's custom json, we just do that.
else if (QFile::exists(root.absoluteFilePath("custom.json")))
@ -82,6 +83,7 @@ void OneSixVersionBuilder::buildInternal(const bool onlyVanilla, const QStringLi
file->fileId = "org.multimc.custom.json";
file->version = QString();
file->applyTo(m_version);
m_version->versionFiles.append(file);
// QObject::tr("The version descriptors of this instance are not compatible with the current version of MultiMC"));
// QObject::tr("Error while applying %1. Please check MultiMC-0.log for more info.")
}
@ -96,6 +98,7 @@ void OneSixVersionBuilder::buildInternal(const bool onlyVanilla, const QStringLi
file->version = m_instance->intendedVersionId();
file->mcVersion = m_instance->intendedVersionId();
file->applyTo(m_version);
m_version->versionFiles.append(file);
// QObject::tr("Error while applying %1. Please check MultiMC-0.log for more info.").arg(root.absoluteFilePath("version.json")));
if (onlyVanilla)
@ -103,17 +106,12 @@ void OneSixVersionBuilder::buildInternal(const bool onlyVanilla, const QStringLi
// patches/
// load all, put into map for ordering, apply in the right order
QMap<QString, int> overrideOrder = readOverrideOrders(m_instance);
QMap<int, QPair<QString, VersionFilePtr>> files;
for (auto info : patches.entryInfoList(QStringList() << "*.json", QDir::Files))
{
QLOG_INFO() << "Reading" << info.fileName();
auto file = parseJsonFile(info, true);
if (overrideOrder.contains(file->fileId))
{
file->order = overrideOrder.value(file->fileId);
}
if (files.contains(file->order))
{
throw VersionBuildError(QObject::tr("%1 has the same order as %2").arg(file->fileId, files[file->order].second->fileId));
@ -125,6 +123,7 @@ void OneSixVersionBuilder::buildInternal(const bool onlyVanilla, const QStringLi
QLOG_DEBUG() << "Applying file with order" << order;
auto & filePair = files[order];
filePair.second->applyTo(m_version);
m_version->versionFiles.append(filePair.second);
}
} while(0);
@ -167,6 +166,7 @@ void OneSixVersionBuilder::readJsonAndApply(const QJsonObject &obj)
// QObject::tr("Error while reading. Please check MultiMC-0.log for more info."));
file->applyTo(m_version);
m_version->versionFiles.append(file);
// QObject::tr("Error while applying. Please check MultiMC-0.log for more info."));
// QObject::tr("The version descriptors of this instance are not compatible with the current version of MultiMC"));
}

10
logic/VersionFinal.cpp
View File

@ -56,7 +56,7 @@ bool VersionFinal::canRemove(const int index) const
{
if (index < versionFiles.size())
{
return versionFiles.at(index).id != "org.multimc.version.json";
return versionFiles.at(index)->fileId != "org.multimc.version.json";
}
return false;
}
@ -67,14 +67,14 @@ QString VersionFinal::versionFileId(const int index) const
{
return QString();
}
return versionFiles.at(index).id;
return versionFiles.at(index)->fileId;
}
bool VersionFinal::remove(const int index)
{
if (canRemove(index))
{
return QFile::remove(versionFiles.at(index).filename);
return QFile::remove(versionFiles.at(index)->filename);
}
return false;
}
@ -135,9 +135,9 @@ QVariant VersionFinal::data(const QModelIndex &index, int role) const
switch (column)
{
case 0:
return versionFiles.at(row).name;
return versionFiles.at(row)->name;
case 1:
return versionFiles.at(row).version;
return versionFiles.at(row)->version;
default:
return QVariant();
}

5
logic/VersionFinal.h
View File

@ -119,11 +119,8 @@ public:
*/
// QList<Rule> rules;
QList<VersionFile> versionFiles;
QList<VersionFilePtr> versionFiles;
private:
OneSixInstance *m_instance;
};
QDebug operator<<(QDebug &dbg, const VersionFinal *version);
QDebug operator<<(QDebug &dbg, const OneSixLibrary *library);