mirror of
https://github.com/PrismLauncher/PrismLauncher.git
synced 2026-06-29 01:54:20 +03:00
Updated Resource Pack Formats
superseeds #4242 also this adds support for min_format and max_format and the major.minor versioning. Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97
parent
98c3129424
commit
d3f8dfe65c
7 changed files with 309 additions and 115 deletions
|
|
@ -24,6 +24,7 @@
|
|||
#include <QDebug>
|
||||
#include <QMap>
|
||||
#include <QRegularExpression>
|
||||
#include <utility>
|
||||
|
||||
#include "MTPixmapCache.h"
|
||||
#include "Version.h"
|
||||
|
|
@ -31,61 +32,121 @@
|
|||
|
||||
// Values taken from:
|
||||
// https://minecraft.wiki/w/Pack_format#List_of_data_pack_formats
|
||||
static const QMap<int, std::pair<Version, Version>> s_pack_format_versions = { { 4, { Version("1.13"), Version("1.14.4") } },
|
||||
{ 5, { Version("1.15"), Version("1.16.1") } },
|
||||
{ 6, { Version("1.16.2"), Version("1.16.5") } },
|
||||
{ 7, { Version("1.17"), Version("1.17.1") } },
|
||||
{ 8, { Version("1.18"), Version("1.18.1") } },
|
||||
{ 9, { Version("1.18.2"), Version("1.18.2") } },
|
||||
{ 10, { Version("1.19"), Version("1.19.3") } },
|
||||
{ 11, { Version("23w03a"), Version("23w05a") } },
|
||||
{ 12, { Version("1.19.4"), Version("1.19.4") } },
|
||||
{ 13, { Version("23w12a"), Version("23w14a") } },
|
||||
{ 14, { Version("23w16a"), Version("23w17a") } },
|
||||
{ 15, { Version("1.20"), Version("1.20.1") } },
|
||||
{ 16, { Version("23w31a"), Version("23w31a") } },
|
||||
{ 17, { Version("23w32a"), Version("23w35a") } },
|
||||
{ 18, { Version("1.20.2"), Version("1.20.2") } },
|
||||
{ 19, { Version("23w40a"), Version("23w40a") } },
|
||||
{ 20, { Version("23w41a"), Version("23w41a") } },
|
||||
{ 21, { Version("23w42a"), Version("23w42a") } },
|
||||
{ 22, { Version("23w43a"), Version("23w43b") } },
|
||||
{ 23, { Version("23w44a"), Version("23w44a") } },
|
||||
{ 24, { Version("23w45a"), Version("23w45a") } },
|
||||
{ 25, { Version("23w46a"), Version("23w46a") } },
|
||||
{ 26, { Version("1.20.3"), Version("1.20.4") } },
|
||||
{ 27, { Version("23w51a"), Version("23w51b") } },
|
||||
{ 28, { Version("24w05a"), Version("24w05b") } },
|
||||
{ 29, { Version("24w04a"), Version("24w04a") } },
|
||||
{ 30, { Version("24w05a"), Version("24w05b") } },
|
||||
{ 31, { Version("24w06a"), Version("24w06a") } },
|
||||
{ 32, { Version("24w07a"), Version("24w07a") } },
|
||||
{ 33, { Version("24w09a"), Version("24w09a") } },
|
||||
{ 34, { Version("24w10a"), Version("24w10a") } },
|
||||
{ 35, { Version("24w11a"), Version("24w11a") } },
|
||||
{ 36, { Version("24w12a"), Version("24w12a") } },
|
||||
{ 37, { Version("24w13a"), Version("24w13a") } },
|
||||
{ 38, { Version("24w14a"), Version("24w14a") } },
|
||||
{ 39, { Version("1.20.5-pre1"), Version("1.20.5-pre1") } },
|
||||
{ 40, { Version("1.20.5-pre2"), Version("1.20.5-pre2") } },
|
||||
{ 41, { Version("1.20.5"), Version("1.20.6") } },
|
||||
{ 42, { Version("24w18a"), Version("24w18a") } },
|
||||
{ 43, { Version("24w19a"), Version("24w19b") } },
|
||||
{ 44, { Version("24w20a"), Version("24w20a") } },
|
||||
{ 45, { Version("21w21a"), Version("21w21b") } },
|
||||
{ 46, { Version("1.21-pre1"), Version("1.21-pre1") } },
|
||||
{ 47, { Version("1.21-pre2"), Version("1.21-pre2") } },
|
||||
{ 48, { Version("1.21"), Version("1.21") } } };
|
||||
static const QMap<std::pair<int, int>, std::pair<Version, Version>> s_pack_format_versions = {
|
||||
{ { 4, 0 }, { Version("1.13"), Version("1.14.4") } },
|
||||
{ { 5, 0 }, { Version("1.15"), Version("1.16.1") } },
|
||||
{ { 6, 0 }, { Version("1.16.2"), Version("1.16.5") } },
|
||||
{ { 7, 0 }, { Version("1.17"), Version("1.17.1") } },
|
||||
{ { 8, 0 }, { Version("1.18"), Version("1.18.1") } },
|
||||
{ { 9, 0 }, { Version("1.18.2"), Version("1.18.2") } },
|
||||
{ { 10, 0 }, { Version("1.19"), Version("1.19.3") } },
|
||||
{ { 11, 0 }, { Version("23w03a"), Version("23w05a") } },
|
||||
{ { 12, 0 }, { Version("1.19.4"), Version("1.19.4") } },
|
||||
{ { 13, 0 }, { Version("23w12a"), Version("23w14a") } },
|
||||
{ { 14, 0 }, { Version("23w16a"), Version("23w17a") } },
|
||||
{ { 15, 0 }, { Version("1.20"), Version("1.20.1") } },
|
||||
{ { 16, 0 }, { Version("23w31a"), Version("23w31a") } },
|
||||
{ { 17, 0 }, { Version("23w32a"), Version("23w35a") } },
|
||||
{ { 18, 0 }, { Version("1.20.2"), Version("1.20.2") } },
|
||||
{ { 19, 0 }, { Version("23w40a"), Version("23w40a") } },
|
||||
{ { 20, 0 }, { Version("23w41a"), Version("23w41a") } },
|
||||
{ { 21, 0 }, { Version("23w42a"), Version("23w42a") } },
|
||||
{ { 22, 0 }, { Version("23w43a"), Version("23w43b") } },
|
||||
{ { 23, 0 }, { Version("23w44a"), Version("23w44a") } },
|
||||
{ { 24, 0 }, { Version("23w45a"), Version("23w45a") } },
|
||||
{ { 25, 0 }, { Version("23w46a"), Version("23w46a") } },
|
||||
{ { 26, 0 }, { Version("1.20.3"), Version("1.20.4") } },
|
||||
{ { 27, 0 }, { Version("23w51a"), Version("23w51b") } },
|
||||
{ { 28, 0 }, { Version("24w03a"), Version("24w03b") } },
|
||||
{ { 29, 0 }, { Version("24w04a"), Version("24w04a") } },
|
||||
{ { 30, 0 }, { Version("24w05a"), Version("24w05b") } },
|
||||
{ { 31, 0 }, { Version("24w06a"), Version("24w06a") } },
|
||||
{ { 32, 0 }, { Version("24w07a"), Version("24w07a") } },
|
||||
{ { 33, 0 }, { Version("24w09a"), Version("24w09a") } },
|
||||
{ { 34, 0 }, { Version("24w10a"), Version("24w10a") } },
|
||||
{ { 35, 0 }, { Version("24w11a"), Version("24w11a") } },
|
||||
{ { 36, 0 }, { Version("24w12a"), Version("24w12a") } },
|
||||
{ { 37, 0 }, { Version("24w13a"), Version("24w13a") } },
|
||||
{ { 38, 0 }, { Version("24w14a"), Version("24w14a") } },
|
||||
{ { 39, 0 }, { Version("1.20.5-pre1"), Version("1.20.5-pre1") } },
|
||||
{ { 40, 0 }, { Version("1.20.5-pre2"), Version("1.20.5-pre2") } },
|
||||
{ { 41, 0 }, { Version("1.20.5"), Version("1.20.6") } },
|
||||
{ { 42, 0 }, { Version("24w18a"), Version("24w18a") } },
|
||||
{ { 43, 0 }, { Version("24w19a"), Version("24w19b") } },
|
||||
{ { 44, 0 }, { Version("24w20a"), Version("24w20a") } },
|
||||
{ { 45, 0 }, { Version("24w21a"), Version("24w21b") } },
|
||||
{ { 46, 0 }, { Version("1.21-pre1"), Version("1.21-pre1") } },
|
||||
{ { 47, 0 }, { Version("1.21-pre2"), Version("1.21-pre2") } },
|
||||
{ { 48, 0 }, { Version("1.21"), Version("1.21.1") } },
|
||||
{ { 49, 0 }, { Version("24w33a"), Version("24w33a") } },
|
||||
{ { 50, 0 }, { Version("24w34a"), Version("24w34a") } },
|
||||
{ { 51, 0 }, { Version("24w35a"), Version("24w35a") } },
|
||||
{ { 52, 0 }, { Version("24w36a"), Version("24w36a") } },
|
||||
{ { 53, 0 }, { Version("24w37a"), Version("24w37a") } },
|
||||
{ { 54, 0 }, { Version("24w38a"), Version("24w38a") } },
|
||||
{ { 55, 0 }, { Version("24w39a"), Version("24w39a") } },
|
||||
{ { 56, 0 }, { Version("24w40a"), Version("24w40a") } },
|
||||
{ { 57, 0 }, { Version("1.21.2"), Version("1.21.3") } },
|
||||
{ { 58, 0 }, { Version("24w44a"), Version("24w44a") } },
|
||||
{ { 59, 0 }, { Version("24w45a"), Version("24w45a") } },
|
||||
{ { 60, 0 }, { Version("24w46a"), Version("1.21.4-pre1") } },
|
||||
{ { 61, 0 }, { Version("1.21.4"), Version("1.21.4") } },
|
||||
{ { 62, 0 }, { Version("25w02a"), Version("25w02a") } },
|
||||
{ { 63, 0 }, { Version("25w03a"), Version("25w03a") } },
|
||||
{ { 64, 0 }, { Version("25w04a"), Version("25w04a") } },
|
||||
{ { 65, 0 }, { Version("25w05a"), Version("25w05a") } },
|
||||
{ { 66, 0 }, { Version("25w06a"), Version("25w06a") } },
|
||||
{ { 67, 0 }, { Version("25w07a"), Version("25w07a") } },
|
||||
{ { 68, 0 }, { Version("25w08a"), Version("25w08a") } },
|
||||
{ { 69, 0 }, { Version("25w09a"), Version("25w09b") } },
|
||||
{ { 70, 0 }, { Version("25w10a"), Version("1.21.5-pre1") } },
|
||||
{ { 71, 0 }, { Version("1.21.5"), Version("1.21.5") } },
|
||||
{ { 72, 0 }, { Version("25w15a"), Version("25w15a") } },
|
||||
{ { 73, 0 }, { Version("25w16a"), Version("25w16a") } },
|
||||
{ { 74, 0 }, { Version("25w17a"), Version("25w17a") } },
|
||||
{ { 75, 0 }, { Version("25w18a"), Version("25w18a") } },
|
||||
{ { 76, 0 }, { Version("25w19a"), Version("25w19a") } },
|
||||
{ { 77, 0 }, { Version("25w20a"), Version("25w20a") } },
|
||||
{ { 78, 0 }, { Version("25w21a"), Version("25w21a") } },
|
||||
{ { 79, 0 }, { Version("1.21.6-pre1"), Version("1.21.6-pre2") } },
|
||||
{ { 80, 0 }, { Version("1.21.6"), Version("1.21.6") } },
|
||||
{ { 81, 0 }, { Version("1.21.7"), Version("1.21.8") } },
|
||||
{ { 82, 0 }, { Version("25w31a"), Version("25w31a") } },
|
||||
{ { 83, 0 }, { Version("25w32a"), Version("25w32a") } },
|
||||
{ { 83, 1 }, { Version("25w33a"), Version("25w33a") } },
|
||||
{ { 84, 0 }, { Version("25w34a"), Version("25w34b") } },
|
||||
{ { 85, 0 }, { Version("25w35a"), Version("25w35a") } },
|
||||
{ { 86, 0 }, { Version("25w36a"), Version("25w36b") } },
|
||||
{ { 87, 0 }, { Version("25w37a"), Version("1.21.9-pre1") } },
|
||||
{ { 87, 1 }, { Version("1.21.9-pre1"), Version("1.21.9-pre1") } },
|
||||
{ { 88, 0 }, { Version("1.21.9"), Version("1.21.10") } },
|
||||
{ { 89, 0 }, { Version("25w41a"), Version("25w41a") } },
|
||||
{ { 90, 0 }, { Version("25w42a"), Version("25w42a") } },
|
||||
{ { 91, 0 }, { Version("25w43a"), Version("25w43a") } },
|
||||
{ { 92, 0 }, { Version("25w44a"), Version("25w44a") } },
|
||||
{ { 93, 0 }, { Version("25w45a"), Version("25w45a") } },
|
||||
{ { 93, 1 }, { Version("25w46a"), Version("25w46a") } },
|
||||
{ { 94, 0 }, { Version("1.21.11-pre1"), Version("1.21.11-pre3") } },
|
||||
{ { 94, 1 }, { Version("1.21.11-pre4"), Version("1.21.11") } },
|
||||
{ { 95, 0 }, { Version("26.1-snap1"), Version("26.1-snap1") } },
|
||||
{ { 96, 0 }, { Version("26.1-snap2"), Version("26.1-snap2") } },
|
||||
{ { 97, 0 }, { Version("26.1-snap3"), Version("26.1-snap3") } },
|
||||
{ { 97, 1 }, { Version("26.1-snap4"), Version("26.1-snap4") } },
|
||||
{ { 98, 0 }, { Version("26.1-snap5"), Version("26.1-snap5") } },
|
||||
{ { 99, 0 }, { Version("26.1-snap6"), Version("26.1-snap6") } },
|
||||
{ { 99, 1 }, { Version("26.1-snap7"), Version("26.1-snap7") } },
|
||||
{ { 99, 2 }, { Version("26.1-snap8"), Version("26.1-snap9") } },
|
||||
{ { 99, 3 }, { Version("26.1-snap10"), Version("26.1-snap10") } },
|
||||
{ { 100, 0 }, { Version("26.1-snap11"), Version("26.1-snap11") } },
|
||||
};
|
||||
|
||||
void DataPack::setPackFormat(int new_format_id)
|
||||
void DataPack::setPackFormat(int new_format_id, std::pair<int, int> min_format, std::pair<int, int> max_format)
|
||||
{
|
||||
QMutexLocker locker(&m_data_lock);
|
||||
|
||||
if (!s_pack_format_versions.contains(new_format_id)) {
|
||||
qWarning() << "Pack format '" << new_format_id << "' is not a recognized data pack id!";
|
||||
}
|
||||
|
||||
m_pack_format = new_format_id;
|
||||
m_min_format = min_format;
|
||||
m_max_format = max_format;
|
||||
}
|
||||
|
||||
void DataPack::setDescription(QString new_description)
|
||||
|
|
@ -140,18 +201,21 @@ QPixmap DataPack::image(QSize size, Qt::AspectRatioMode mode) const
|
|||
return image(size);
|
||||
}
|
||||
|
||||
std::pair<Version, Version> DataPack::compatibleVersions() const
|
||||
static std::pair<Version, Version> map(std::pair<int, int> format, const QMap<std::pair<int, int>, std::pair<Version, Version>>& versions)
|
||||
{
|
||||
if (!s_pack_format_versions.contains(m_pack_format)) {
|
||||
if (format.first == 0 || !versions.contains(format)) {
|
||||
return { {}, {} };
|
||||
}
|
||||
|
||||
return s_pack_format_versions.constFind(m_pack_format).value();
|
||||
return versions.constFind(format).value();
|
||||
}
|
||||
static std::pair<Version, Version> map(int format, const QMap<std::pair<int, int>, std::pair<Version, Version>>& versions)
|
||||
{
|
||||
return map({ format, 0 }, versions);
|
||||
}
|
||||
|
||||
int DataPack::compare(const Resource& other, SortType type) const
|
||||
{
|
||||
auto const& cast_other = static_cast<DataPack const&>(other);
|
||||
const auto& cast_other = static_cast<const DataPack&>(other);
|
||||
if (type == SortType::PACK_FORMAT) {
|
||||
auto this_ver = packFormat();
|
||||
auto other_ver = cast_other.packFormat();
|
||||
|
|
@ -168,21 +232,64 @@ int DataPack::compare(const Resource& other, SortType type) const
|
|||
|
||||
bool DataPack::applyFilter(QRegularExpression filter) const
|
||||
{
|
||||
if (filter.match(description()).hasMatch())
|
||||
if (filter.match(description()).hasMatch()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (filter.match(QString::number(packFormat())).hasMatch())
|
||||
return true;
|
||||
|
||||
if (filter.match(compatibleVersions().first.toString()).hasMatch())
|
||||
return true;
|
||||
if (filter.match(compatibleVersions().second.toString()).hasMatch())
|
||||
if (filter.match(QString::number(packFormat())).hasMatch()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
auto versions = { map(m_pack_format, mappings()), map(m_min_format, mappings()), map(m_max_format, mappings()) };
|
||||
for (const auto& version : versions) {
|
||||
if (!version.first.isEmpty()) {
|
||||
if (filter.match(version.first.toString()).hasMatch()) {
|
||||
return true;
|
||||
}
|
||||
if (filter.match(version.second.toString()).hasMatch()) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return Resource::applyFilter(filter);
|
||||
}
|
||||
|
||||
bool DataPack::valid() const
|
||||
{
|
||||
return m_pack_format != 0;
|
||||
return m_pack_format != 0 || (m_min_format.first != 0 && m_max_format.first != 0);
|
||||
}
|
||||
|
||||
QMap<std::pair<int, int>, std::pair<Version, Version>> DataPack::mappings() const
|
||||
{
|
||||
return s_pack_format_versions;
|
||||
}
|
||||
|
||||
QString DataPack::packFormatStr() const
|
||||
{
|
||||
if (m_pack_format != 0) {
|
||||
auto version_bounds = map(m_pack_format, mappings());
|
||||
if (version_bounds.first.toString().isEmpty()) {
|
||||
return QString::number(m_pack_format);
|
||||
}
|
||||
return QString("%1 (%2 - %3)")
|
||||
.arg(QString::number(m_pack_format), version_bounds.first.toString(), version_bounds.second.toString());
|
||||
}
|
||||
auto min_bound = map(m_min_format, mappings());
|
||||
auto max_bound = map(m_max_format, mappings());
|
||||
auto min_version = min_bound.first;
|
||||
auto max_version = max_bound.second;
|
||||
if (min_version.isEmpty() || max_version.isEmpty()) {
|
||||
return tr("Unrecognized");
|
||||
}
|
||||
auto str = QString("[") + QString::number(m_min_format.first);
|
||||
if (m_min_format.second != 0) {
|
||||
str += "." + QString::number(m_min_format.second);
|
||||
}
|
||||
|
||||
str += QString(" - ") + QString::number(m_max_format.first);
|
||||
if (m_max_format.second != 0) {
|
||||
str += "." + QString::number(m_max_format.second);
|
||||
}
|
||||
|
||||
return str + QString(" (%2 - %3)").arg(min_version.toString(), max_version.toString());
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue