ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Removed update disabled warning

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2023-08-15 20:52:17 +03:00
parent 8f5bb982cd
commit f7f7bc6865
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
launcher/minecraft/mod/ModFolderModel.cpp
View File

@ -196,7 +196,10 @@ Task* ModFolderModel::createParseTask(Resource& resource)
bool ModFolderModel::uninstallMod(const QString& filename, bool preserve_metadata)
{
for (auto mod : allMods()) {
if (mod->fileinfo().fileName() == filename) {
auto modfilename = mod->fileinfo().fileName();
if (!mod->enabled() && modfilename.endsWith(".disabled"))
modfilename.chop(9);
if (modfilename == filename) {
auto index_dir = indexDir();
mod->destroy(index_dir, preserve_metadata, false);

11
launcher/modplatform/CheckUpdateTask.h
View File

@ -24,6 +24,7 @@ class CheckUpdateTask : public Task {
QString old_version;
QString new_version;
QString changelog;
bool enabled;
ModPlatform::ResourceProvider provider;
shared_qobject_ptr<ResourceDownloadTask> download;
@ -33,9 +34,17 @@ class CheckUpdateTask : public Task {
QString old_v,
QString new_v,
QString changelog,
bool enabled,
ModPlatform::ResourceProvider p,
shared_qobject_ptr<ResourceDownloadTask> t)
: name(name), old_hash(old_h), old_version(old_v), new_version(new_v), changelog(changelog), provider(p), download(t)
: name(name)
, old_hash(old_h)
, old_version(old_v)
, new_version(new_v)
, changelog(changelog)
, enabled(enabled)
, provider(p)
, download(t)
{}
};

7
launcher/modplatform/flame/FlameCheckUpdate.cpp
View File

@ -124,11 +124,6 @@ void FlameCheckUpdate::executeTask()
int i = 0;
for (auto* mod : m_mods) {
if (!mod->enabled()) {
emit checkFailed(mod, tr("Disabled mods won't be updated, to prevent mod duplication issues!"));
continue;
}
setStatus(tr("Getting API response from CurseForge for '%1'...").arg(mod->name()));
setProgress(i++, m_mods.size());
@ -176,7 +171,7 @@ void FlameCheckUpdate::executeTask()
auto download_task = makeShared<ResourceDownloadTask>(pack, latest_ver, m_mods_folder);
m_updatable.emplace_back(pack->name, mod->metadata()->hash, old_version, latest_ver.version,
api.getModFileChangelog(latest_ver.addonId.toInt(), latest_ver.fileId.toInt()),
api.getModFileChangelog(latest_ver.addonId.toInt(), latest_ver.fileId.toInt()), mod->enabled(),
ModPlatform::ResourceProvider::FLAME, download_task);
}
}

7
launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp
View File

@ -41,11 +41,6 @@ void ModrinthCheckUpdate::executeTask()
ConcurrentTask hashing_task(this, "MakeModrinthHashesTask", 10);
for (auto* mod : m_mods) {
if (!mod->enabled()) {
emit checkFailed(mod, tr("Disabled mods won't be updated, to prevent mod duplication issues!"));
continue;
}
auto hash = mod->metadata()->hash;
// Sadly the API can only handle one hash type per call, se we
@ -163,7 +158,7 @@ void ModrinthCheckUpdate::executeTask()
auto download_task = makeShared<ResourceDownloadTask>(pack, project_ver, m_mods_folder);
m_updatable.emplace_back(pack->name, hash, mod->version(), project_ver.version_number, project_ver.changelog,
ModPlatform::ResourceProvider::MODRINTH, download_task);
mod->enabled(), ModPlatform::ResourceProvider::MODRINTH, download_task);
}
}
} catch (Json::JsonException& e) {

4
launcher/ui/dialogs/ModUpdateDialog.cpp
View File

@ -5,8 +5,6 @@
#include "ScrollMessageBox.h"
#include "ui_ReviewMessageBox.h"
#include "FileSystem.h"
#include "Json.h"
#include "Markdown.h"
#include "tasks/ConcurrentTask.h"
@ -351,7 +349,7 @@ void ModUpdateDialog::onMetadataFailed(Mod* mod, bool try_others, ModPlatform::R
void ModUpdateDialog::appendMod(CheckUpdateTask::UpdatableMod const& info)
{
auto item_top = new QTreeWidgetItem(ui->modTreeWidget);
item_top->setCheckState(0, Qt::CheckState::Checked);
item_top->setCheckState(0, info.enabled ? Qt::CheckState::Checked : Qt::CheckState::Unchecked);
item_top->setText(0, info.name);
item_top->setExpanded(true);