Sneederix/sneedmc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: query for Fabric mods if Quilt is in use

Browse Source 
Right now we want to include Fabric mods in our searches where possible.
Modrinth allows definining multiple loaders, while Flame only allows a
single value.

As a compromise we ask for Fabric mods only on Flame and for both Fabric
and Quilt mods on Modrinth.
This commit is contained in:
Sefa Eyeoglu 2022-04-15 12:38:27 +02:00
parent a42d2afcee
commit cab9afa45f
No known key found for this signature in database
GPG Key ID: C10411294912A422
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
launcher/modplatform/flame/FlameAPI.h
View File

@ -23,7 +23,7 @@ class FlameAPI : public NetworkModAPI {
.arg(args.offset) .arg(args.offset)
.arg(args.search) .arg(args.search)
.arg(args.sorting) .arg(args.sorting)
.arg(args.mod_loader) .arg(getMappedModLoader(args.mod_loader))
.arg(gameVersionStr); .arg(gameVersionStr);
}; };
@ -31,4 +31,13 @@ class FlameAPI : public NetworkModAPI {
{ {
return QString("https://addons-ecs.forgesvc.net/api/v2/addon/%1/files").arg(args.addonId); return QString("https://addons-ecs.forgesvc.net/api/v2/addon/%1/files").arg(args.addonId);
}; };
public:
static auto getMappedModLoader(const ModLoaderType type) -> const ModLoaderType
{
// TODO: remove this once Quilt drops official Fabric support
if (type == Quilt) // NOTE: Most if not all Fabric mods should work *currently*
return Fabric;
return type;
}
}; };

6
launcher/modplatform/flame/FlameModIndex.cpp
View File

@ -3,6 +3,7 @@
#include "Json.h" #include "Json.h"
#include "minecraft/MinecraftInstance.h" #include "minecraft/MinecraftInstance.h"
#include "minecraft/PackProfile.h" #include "minecraft/PackProfile.h"
#include "modplatform/flame/FlameAPI.h"
#include "net/NetJob.h" #include "net/NetJob.h"
void FlameMod::loadIndexedPack(ModPlatform::IndexedPack& pack, QJsonObject& obj) void FlameMod::loadIndexedPack(ModPlatform::IndexedPack& pack, QJsonObject& obj)
@ -43,8 +44,9 @@ void FlameMod::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
BaseInstance* inst) BaseInstance* inst)
{ {
QVector<ModPlatform::IndexedVersion> unsortedVersions; QVector<ModPlatform::IndexedVersion> unsortedVersions;
bool hasFabric = !(dynamic_cast<MinecraftInstance*>(inst))->getPackProfile()->getComponentVersion("net.fabricmc.fabric-loader").isEmpty(); auto profile = (dynamic_cast<MinecraftInstance*>(inst))->getPackProfile();
QString mcVersion = (dynamic_cast<MinecraftInstance*>(inst))->getPackProfile()->getComponentVersion("net.minecraft"); bool hasFabric = FlameAPI::getMappedModLoader(profile->getModLoader()) == ModAPI::Fabric;
QString mcVersion = profile->getComponentVersion("net.minecraft");
for (auto versionIter : arr) { for (auto versionIter : arr) {
auto obj = versionIter.toObject(); auto obj = versionIter.toObject();

3
launcher/modplatform/modrinth/ModrinthAPI.h
View File

@ -54,6 +54,9 @@ class ModrinthAPI : public NetworkModAPI {
{ {
if (type == Unspecified) if (type == Unspecified)
return "fabric, forge, quilt"; return "fabric, forge, quilt";
// TODO: remove this once Quilt drops official Fabric support
if (type == Quilt) // NOTE: Most if not all Fabric mods should work *currently*
return "fabric, quilt";
return ModAPI::getModLoaderString(type); return ModAPI::getModLoaderString(type);
} }