From 35cfb41a9c8cf1328f3d2d14022cf51cbfc67f1f Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 20 Feb 2022 20:55:26 +0100 Subject: fix: check for Quilt as Fabric-compatible loader --- launcher/modplatform/modrinth/ModrinthAPI.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'launcher/modplatform/modrinth') diff --git a/launcher/modplatform/modrinth/ModrinthAPI.h b/launcher/modplatform/modrinth/ModrinthAPI.h index 30952e99..711649d9 100644 --- a/launcher/modplatform/modrinth/ModrinthAPI.h +++ b/launcher/modplatform/modrinth/ModrinthAPI.h @@ -55,11 +55,13 @@ class ModrinthAPI : public NetworkModAPI { { switch (modLoader) { case Any: - return "fabric, forge"; + return "fabric, forge, quilt"; case Forge: return "forge"; case Fabric: return "fabric"; + case Quilt: + return "quilt"; default: return ""; } @@ -67,7 +69,7 @@ class ModrinthAPI : public NetworkModAPI { inline auto validateModLoader(ModLoaderType modLoader) const -> bool { - return modLoader == Any || modLoader == Forge || modLoader == Fabric; + return modLoader == Any || modLoader == Forge || modLoader == Fabric || modLoader == Quilt; } }; -- cgit From 9fb5674233c21775fac76cf96cd2a77c4098e908 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Thu, 14 Apr 2022 21:55:03 +0200 Subject: refactor: cleanup ModLoaderType --- launcher/modplatform/modrinth/ModrinthAPI.h | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'launcher/modplatform/modrinth') diff --git a/launcher/modplatform/modrinth/ModrinthAPI.h b/launcher/modplatform/modrinth/ModrinthAPI.h index 711649d9..eefa4a85 100644 --- a/launcher/modplatform/modrinth/ModrinthAPI.h +++ b/launcher/modplatform/modrinth/ModrinthAPI.h @@ -51,25 +51,16 @@ class ModrinthAPI : public NetworkModAPI { return s; } - inline auto getModLoaderString(ModLoaderType modLoader) const -> QString + static auto getModLoaderString(ModLoaderType type) -> const QString { - switch (modLoader) { - case Any: - return "fabric, forge, quilt"; - case Forge: - return "forge"; - case Fabric: - return "fabric"; - case Quilt: - return "quilt"; - default: - return ""; - } + if (type == Unspecified) + return "fabric, forge, quilt"; + return ModAPI::getModLoaderString(type); } inline auto validateModLoader(ModLoaderType modLoader) const -> bool { - return modLoader == Any || modLoader == Forge || modLoader == Fabric || modLoader == Quilt; + return modLoader == Unspecified || modLoader == Forge || modLoader == Fabric || modLoader == Quilt; } }; -- cgit