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

Merge pull request #3335 from PrismLauncher/backport-3294-to-release-9.x

Browse Source 
[Backport release-9.x] Fix updating Curseforge mods with missing mod loader
This commit is contained in:
Alexandru Ionut Tripon 2025-01-21 23:45:40 +02:00 committed by GitHub
commit ed2eddc258
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
launcher/modplatform/flame/FlameAPI.cpp
View File

@ -270,6 +270,7 @@ std::optional<ModPlatform::IndexedVersion> FlameAPI::getLatestVersion(QList<ModP
QList<ModPlatform::ModLoaderType> instanceLoaders, QList<ModPlatform::ModLoaderType> instanceLoaders,
ModPlatform::ModLoaderTypes modLoaders) ModPlatform::ModLoaderTypes modLoaders)
{ {
static const auto noLoader = ModPlatform::ModLoaderType(0);
QHash<ModPlatform::ModLoaderType, ModPlatform::IndexedVersion> bestMatch; QHash<ModPlatform::ModLoaderType, ModPlatform::IndexedVersion> bestMatch;
auto checkVersion = [&bestMatch](const ModPlatform::IndexedVersion& version, const ModPlatform::ModLoaderType& loader) { auto checkVersion = [&bestMatch](const ModPlatform::IndexedVersion& version, const ModPlatform::ModLoaderType& loader) {
if (bestMatch.contains(loader)) { if (bestMatch.contains(loader)) {
@ -284,7 +285,7 @@ std::optional<ModPlatform::IndexedVersion> FlameAPI::getLatestVersion(QList<ModP
for (auto file_tmp : versions) { for (auto file_tmp : versions) {
auto loaders = ModPlatform::modLoaderTypesToList(file_tmp.loaders); auto loaders = ModPlatform::modLoaderTypesToList(file_tmp.loaders);
if (loaders.isEmpty()) { if (loaders.isEmpty()) {
checkVersion(file_tmp, ModPlatform::ModLoaderType(0)); checkVersion(file_tmp, noLoader);
} else { } else {
for (auto loader : loaders) { for (auto loader : loaders) {
checkVersion(file_tmp, loader); checkVersion(file_tmp, loader);
@ -293,11 +294,19 @@ std::optional<ModPlatform::IndexedVersion> FlameAPI::getLatestVersion(QList<ModP
} }
// edge case: mod has installed for forge but the instance is fabric => fabric version will be prioritizated on update // edge case: mod has installed for forge but the instance is fabric => fabric version will be prioritizated on update
auto currentLoaders = instanceLoaders + ModPlatform::modLoaderTypesToList(modLoaders); auto currentLoaders = instanceLoaders + ModPlatform::modLoaderTypesToList(modLoaders);
currentLoaders.append(ModPlatform::ModLoaderType(0)); // add a fallback in case the versions do not define a loader currentLoaders.append(noLoader); // add a fallback in case the versions do not define a loader
for (auto loader : currentLoaders) { for (auto loader : currentLoaders) {
if (bestMatch.contains(loader)) { if (bestMatch.contains(loader)) {
return bestMatch.value(loader); auto bestForLoader = bestMatch.value(loader);
// awkward case where the mod has only two loaders and one of them is not specified
if (loader != noLoader && bestMatch.contains(noLoader) && bestMatch.size() == 2) {
auto bestForNoLoader = bestMatch.value(noLoader);
if (bestForNoLoader.date > bestForLoader.date) {
return bestForNoLoader;
}
}
return bestForLoader;
} }
} }
return {}; return {};