mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2025-03-12 07:14:23 +00:00
Code Issues Projects Releases Wiki Activity

NOISSUE Use ModpacksCH rather than FTB in error messages

Browse Source 
As the platform will now be used more widely than Feed The Beast, its
more appropriate that these error messages use the platform name.
This commit is contained in:
Jamie Mansfield 2022-05-02 15:48:12 +01:00 committed by Petr Mrázek
parent f7acde4389
commit 40e67d2bc6
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
View File

@ -85,7 +85,7 @@ void PackInstallTask::onDownloadSucceeded()
QJsonParseError parse_error {}; QJsonParseError parse_error {};
QJsonDocument doc = QJsonDocument::fromJson(response, &parse_error); QJsonDocument doc = QJsonDocument::fromJson(response, &parse_error);
if(parse_error.error != QJsonParseError::NoError) { if(parse_error.error != QJsonParseError::NoError) {
qWarning() << "Error while parsing JSON response from FTB at " << parse_error.offset << " reason: " << parse_error.errorString(); qWarning() << "Error while parsing JSON response from ModpacksCH at " << parse_error.offset << " reason: " << parse_error.errorString();
qWarning() << response; qWarning() << response;
return; return;
} }

12
launcher/ui/pages/modplatform/ftb/FtbListModel.cpp
View File

@ -122,10 +122,10 @@ void ListModel::requestFinished()
jobPtr.reset(); jobPtr.reset();
remainingPacks.clear(); remainingPacks.clear();
QJsonParseError parse_error; QJsonParseError parse_error {};
QJsonDocument doc = QJsonDocument::fromJson(response, &parse_error); QJsonDocument doc = QJsonDocument::fromJson(response, &parse_error);
if(parse_error.error != QJsonParseError::NoError) { if(parse_error.error != QJsonParseError::NoError) {
qWarning() << "Error while parsing JSON response from FTB at " << parse_error.offset << " reason: " << parse_error.errorString(); qWarning() << "Error while parsing JSON response from ModpacksCH at " << parse_error.offset << " reason: " << parse_error.errorString();
qWarning() << response; qWarning() << response;
return; return;
} }
@ -169,7 +169,7 @@ void ListModel::packRequestFinished()
QJsonDocument doc = QJsonDocument::fromJson(response, &parse_error); QJsonDocument doc = QJsonDocument::fromJson(response, &parse_error);
if(parse_error.error != QJsonParseError::NoError) { if(parse_error.error != QJsonParseError::NoError) {
qWarning() << "Error while parsing JSON response from FTB at " << parse_error.offset << " reason: " << parse_error.errorString(); qWarning() << "Error while parsing JSON response from ModpacksCH at " << parse_error.offset << " reason: " << parse_error.errorString();
qWarning() << response; qWarning() << response;
return; return;
} }
@ -184,7 +184,7 @@ void ListModel::packRequestFinished()
catch (const JSONValidationError &e) catch (const JSONValidationError &e)
{ {
qDebug() << QString::fromUtf8(response); qDebug() << QString::fromUtf8(response);
qWarning() << "Error while reading pack manifest from FTB: " << e.cause(); qWarning() << "Error while reading pack manifest from ModpacksCH: " << e.cause();
return; return;
} }
@ -192,7 +192,7 @@ void ListModel::packRequestFinished()
// ignore those "dud" packs. // ignore those "dud" packs.
if (pack.versions.empty()) if (pack.versions.empty())
{ {
qWarning() << "FTB Pack " << pack.id << " ignored. reason: lacking any versions"; qWarning() << "ModpacksCH Pack " << pack.id << " ignored. reason: lacking any versions";
} }
else else
{ {
@ -270,7 +270,7 @@ void ListModel::requestLogo(QString logo, QString url)
bool stale = entry->isStale(); bool stale = entry->isStale();
NetJob *job = new NetJob(QString("FTB Icon Download %1").arg(logo), APPLICATION->network()); auto *job = new NetJob(QString("ModpacksCH Icon Download %1").arg(logo), APPLICATION->network());
job->addNetAction(Net::Download::makeCached(QUrl(url), entry)); job->addNetAction(Net::Download::makeCached(QUrl(url), entry));
auto fullPath = entry->getFullPath(); auto fullPath = entry->getFullPath();