External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-10-04 09:08:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

NOISSUE consider classifier when comparing library names

Browse Source
This commit is contained in:
Petr Mrázek
2023-09-01 23:13:03 +02:00
parent 33a8b916a1
commit 9ec1d43565
11 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
launcher/minecraft/OneSixVersionFormat.cpp
View File

@@ -207,7 +207,7 @@ VersionFilePtr OneSixVersionFormat::versionFileFromJson(const QJsonDocument &doc
if (root.contains("requires"))
{
Meta::parseRequires(root, &out->requires);
Meta::parseRequires(root, &out->depends);
}
QString dependsOnMinecraftVersion = root.value("mcVersion").toString();
if(!dependsOnMinecraftVersion.isEmpty())
@@ -215,9 +215,9 @@ VersionFilePtr OneSixVersionFormat::versionFileFromJson(const QJsonDocument &doc
Meta::Require mcReq;
mcReq.uid = "net.minecraft";
mcReq.equalsVersion = dependsOnMinecraftVersion;
if (out->requires.count(mcReq) == 0)
if (out->depends.count(mcReq) == 0)
{
out->requires.insert(mcReq);
out->depends.insert(mcReq);
}
}
if (root.contains("conflicts"))
@@ -309,9 +309,9 @@ QJsonDocument OneSixVersionFormat::versionFileToJson(const VersionFilePtr &patch
}
root.insert("mods", array);
}
if(!patch->requires.empty())
if(!patch->depends.empty())
{
Meta::serializeRequires(root, &patch->requires, "requires");
Meta::serializeRequires(root, &patch->depends, "requires");
}
if(!patch->conflicts.empty())
{