0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE Support CurseForge modpacks using Fabric Loader

Browse Source
This commit is contained in:
Jamie Mansfield 2021-06-09 20:48:46 +01:00
parent 6dd1fdbaf9
commit 3390367d93
No known key found for this signature in database
GPG Key ID: 36F61598F39F67B0
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api/logic/InstanceImportTask.cpp
View File

@ -238,6 +238,7 @@ void InstanceImportTask::processFlame()
} }
QString forgeVersion; QString forgeVersion;
QString fabricVersion;
for(auto &loader: pack.minecraft.modLoaders) for(auto &loader: pack.minecraft.modLoaders)
{ {
auto id = loader.id; auto id = loader.id;
@ -247,6 +248,12 @@ void InstanceImportTask::processFlame()
forgeVersion = id; forgeVersion = id;
continue; continue;
} }
if(id.startsWith("fabric-"))
{
id.remove("fabric-");
fabricVersion = id;
continue;
}
logWarning(tr("Unknown mod loader in manifest: %1").arg(id)); logWarning(tr("Unknown mod loader in manifest: %1").arg(id));
} }
@ -281,6 +288,10 @@ void InstanceImportTask::processFlame()
} }
components->setComponentVersion("net.minecraftforge", forgeVersion); components->setComponentVersion("net.minecraftforge", forgeVersion);
} }
if(!fabricVersion.isEmpty())
{
components->setComponentVersion("net.fabricmc.fabric-loader", fabricVersion);
}
if (m_instIcon != "default") if (m_instIcon != "default")
{ {
instance.setIconKey(m_instIcon); instance.setIconKey(m_instIcon);