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

Merge pull request #880 from Scrumplex/fix-loader-importance

Browse Source 
Make loader components not important
This commit is contained in:
txtsd 2022-07-10 15:44:17 +05:30 committed by GitHub
commit c1bcbf8c63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
launcher/InstanceImportTask.cpp
View File

@ -722,11 +722,11 @@ void InstanceImportTask::processModrinth()
components->buildingFromScratch(); components->buildingFromScratch();
components->setComponentVersion("net.minecraft", minecraftVersion, true); components->setComponentVersion("net.minecraft", minecraftVersion, true);
if (!fabricVersion.isEmpty()) if (!fabricVersion.isEmpty())
components->setComponentVersion("net.fabricmc.fabric-loader", fabricVersion, true); components->setComponentVersion("net.fabricmc.fabric-loader", fabricVersion);
if (!quiltVersion.isEmpty()) if (!quiltVersion.isEmpty())
components->setComponentVersion("org.quiltmc.quilt-loader", quiltVersion, true); components->setComponentVersion("org.quiltmc.quilt-loader", quiltVersion);
if (!forgeVersion.isEmpty()) if (!forgeVersion.isEmpty())
components->setComponentVersion("net.minecraftforge", forgeVersion, true); components->setComponentVersion("net.minecraftforge", forgeVersion);
if (m_instIcon != "default") if (m_instIcon != "default")
{ {
instance.setIconKey(m_instIcon); instance.setIconKey(m_instIcon);

4
launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
View File

@ -830,14 +830,14 @@ void PackInstallTask::install()
auto version = getVersionForLoader("net.minecraftforge"); auto version = getVersionForLoader("net.minecraftforge");
if(version == Q_NULLPTR) return; if(version == Q_NULLPTR) return;
components->setComponentVersion("net.minecraftforge", version, true); components->setComponentVersion("net.minecraftforge", version);
} }
else if(m_version.loader.type == QString("fabric")) else if(m_version.loader.type == QString("fabric"))
{ {
auto version = getVersionForLoader("net.fabricmc.fabric-loader"); auto version = getVersionForLoader("net.fabricmc.fabric-loader");
if(version == Q_NULLPTR) return; if(version == Q_NULLPTR) return;
components->setComponentVersion("net.fabricmc.fabric-loader", version, true); components->setComponentVersion("net.fabricmc.fabric-loader", version);
} }
else if(m_version.loader.type != QString()) else if(m_version.loader.type != QString())
{ {

4
launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
View File

@ -216,10 +216,10 @@ void PackInstallTask::install()
if(target.type != "modloader") continue; if(target.type != "modloader") continue;
if(target.name == "forge") { if(target.name == "forge") {
components->setComponentVersion("net.minecraftforge", target.version, true); components->setComponentVersion("net.minecraftforge", target.version);
} }
else if(target.name == "fabric") { else if(target.name == "fabric") {
components->setComponentVersion("net.fabricmc.fabric-loader", target.version, true); components->setComponentVersion("net.fabricmc.fabric-loader", target.version);
} }
} }