aboutsummaryrefslogtreecommitdiff
path: root/launcher
diff options
context:
space:
mode:
authorTheKodeToad <TheKodeToad@proton.me>2023-08-19 23:10:56 +0100
committerGitHub <noreply@github.com>2023-08-19 23:10:56 +0100
commitebbc8838a8f127f03c5ca373c1ff8b56b94d66cd (patch)
treef2d0e5dd9b0bf0e307b632a2c1fdf779c04fd48a /launcher
parentf99b04bd1656a8e5cd871c1fadc1550e663fc33a (diff)
parent0138cd65cb259966fa9902732bb03e3e7888cc64 (diff)
downloadPrismLauncher-ebbc8838a8f127f03c5ca373c1ff8b56b94d66cd.tar.gz
PrismLauncher-ebbc8838a8f127f03c5ca373c1ff8b56b94d66cd.tar.bz2
PrismLauncher-ebbc8838a8f127f03c5ca373c1ff8b56b94d66cd.zip
Merge pull request #1541 from Trial97/neoforge_search
feat:neoforge can download forge mods
Diffstat (limited to 'launcher')
-rw-r--r--launcher/modplatform/flame/FlameAPI.h7
-rw-r--r--launcher/modplatform/modrinth/ModrinthAPI.h2
2 files changed, 6 insertions, 3 deletions
diff --git a/launcher/modplatform/flame/FlameAPI.h b/launcher/modplatform/flame/FlameAPI.h
index a1256e17..e423189a 100644
--- a/launcher/modplatform/flame/FlameAPI.h
+++ b/launcher/modplatform/flame/FlameAPI.h
@@ -47,9 +47,10 @@ class FlameAPI : public NetworkResourceAPI {
return 4;
// TODO: remove this once Quilt drops official Fabric support
if (loaders & Quilt) // NOTE: Most if not all Fabric mods should work *currently*
- return 4; // FIXME: implement multiple loaders filter
- if (loaders & NeoForge)
- return 6;
+ return 4; // FIXME: implement multiple loaders filter (this should be 5)
+ // TODO: remove this once NeoForge drops official Forge support
+ if (loaders & NeoForge) // NOTE: Most if not all Forge mods should work *currently*
+ return 1; // FIXME: implement multiple loaders filter (this should be 6)
return 0;
}
diff --git a/launcher/modplatform/modrinth/ModrinthAPI.h b/launcher/modplatform/modrinth/ModrinthAPI.h
index 0f150e97..fb42c532 100644
--- a/launcher/modplatform/modrinth/ModrinthAPI.h
+++ b/launcher/modplatform/modrinth/ModrinthAPI.h
@@ -43,6 +43,8 @@ class ModrinthAPI : public NetworkResourceAPI {
l << getModLoaderString(loader);
}
}
+ if ((types & NeoForge) && (~types & Forge)) // Add Forge if NeoForge is in use, if Forge isn't already there
+ l << getModLoaderString(Forge);
if ((types & Quilt) && (~types & Fabric)) // Add Fabric if Quilt is in use, if Fabric isn't already there
l << getModLoaderString(Fabric);
return l;