mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-29 01:54:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: sort mod Minecraft versions as version lists

Browse source 
Signed-off-by: Andrey Kurlin <superkurlin2013@yandex.ru>
This commit is contained in:
Andrey Kurlin 2026-06-21 23:35:20 +05:00
parent f654ce8212
commit 9752f9dfd7
3 changed files with 40 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

40
launcher/minecraft/mod/Mod.cpp
View file

@ -40,6 +40,7 @@
#include <QDir> #include <QDir>
#include <QRegularExpression> #include <QRegularExpression>
#include <QString> #include <QString>
#include <algorithm>
#include "MTPixmapCache.h" #include "MTPixmapCache.h"
#include "MetadataHandler.h" #include "MetadataHandler.h"
@ -49,6 +50,34 @@
#include "minecraft/mod/tasks/LocalModParseTask.h" #include "minecraft/mod/tasks/LocalModParseTask.h"
#include "modplatform/ModIndex.h" #include "modplatform/ModIndex.h"
namespace {
int compareVersionLists(const QStringList& leftVersions, const QStringList& rightVersions)
{
const qsizetype commonSize = std::min(leftVersions.size(), rightVersions.size());
for (qsizetype i = 0; i < commonSize; i++) {
const auto leftVersion = Version(leftVersions.at(i).trimmed());
const auto rightVersion = Version(rightVersions.at(i).trimmed());
if (leftVersion > rightVersion)
return 1;
if (leftVersion < rightVersion)
return -1;
}
if (leftVersions.size() > rightVersions.size())
return 1;
if (leftVersions.size() < rightVersions.size())
return -1;
return 0;
}
} // namespace
Mod::Mod(const QFileInfo& file) : Resource(file), m_local_details() Mod::Mod(const QFileInfo& file) : Resource(file), m_local_details()
{ {
m_enabled = (file.suffix() != "disabled"); m_enabled = (file.suffix() != "disabled");
@ -88,7 +117,7 @@ int Mod::compare(const Resource& other, SortType type) const
break; break;
} }
case SortType::McVersions: { case SortType::McVersions: {
auto compare_result = QString::compare(mcVersions(), cast_other->mcVersions(), Qt::CaseInsensitive); auto compare_result = compareVersionLists(mcVersions(), cast_other->mcVersions());
if (compare_result != 0) if (compare_result != 0)
return compare_result; return compare_result;
break; break;
@ -197,14 +226,19 @@ auto Mod::side() const -> QString
return ModPlatform::SideUtils::toString(ModPlatform::Side::UniversalSide); return ModPlatform::SideUtils::toString(ModPlatform::Side::UniversalSide);
} }
auto Mod::mcVersions() const -> QString auto Mod::mcVersions() const -> QStringList
{ {
if (metadata()) if (metadata())
return metadata()->mcVersions.join(", "); return metadata()->mcVersions;
return {}; return {};
} }
auto Mod::mcVersionsString() const -> QString
{
return mcVersions().join(", ");
}
auto Mod::releaseType() const -> QString auto Mod::releaseType() const -> QString
{ {
if (metadata()) if (metadata())

3
launcher/minecraft/mod/Mod.h
View file

@ -68,7 +68,8 @@ class Mod : public Resource {
auto issueTracker() const -> QString; auto issueTracker() const -> QString;
auto side() const -> QString; auto side() const -> QString;
auto loaders() const -> QString; auto loaders() const -> QString;
auto mcVersions() const -> QString; auto mcVersions() const -> QStringList;
auto mcVersionsString() const -> QString;
auto releaseType() const -> QString; auto releaseType() const -> QString;
QStringList dependencies() const; QStringList dependencies() const;

2
launcher/minecraft/mod/ModFolderModel.cpp
View file

@ -110,7 +110,7 @@ QVariant ModFolderModel::data(const QModelIndex& index, int role) const
return at(row).loaders(); return at(row).loaders();
} }
case McVersionsColumn: { case McVersionsColumn: {
return at(row).mcVersions(); return at(row).mcVersionsString();
} }
case ReleaseTypeColumn: { case ReleaseTypeColumn: {
return at(row).releaseType(); return at(row).releaseType();