diff options
| author | Tayou <31988415+TayouVR@users.noreply.github.com> | 2023-06-07 18:57:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-07 18:57:46 +0200 |
| commit | 9b9d439fce9408712a594bb294e3bd5f108e31bc (patch) | |
| tree | 7a5d4ab7647433f2dd51aef5f7400e22a09fa166 /launcher/minecraft | |
| parent | 62d1bc87aececcc365fe24d19e9160d78cbb891b (diff) | |
| parent | 1043d29dd5b399991ed7055df5a1eced982f4c4c (diff) | |
| download | PrismLauncher-9b9d439fce9408712a594bb294e3bd5f108e31bc.tar.gz PrismLauncher-9b9d439fce9408712a594bb294e3bd5f108e31bc.tar.bz2 PrismLauncher-9b9d439fce9408712a594bb294e3bd5f108e31bc.zip | |
Merge pull request #1111 from Trial97/requires
Diffstat (limited to 'launcher/minecraft')
| -rw-r--r-- | launcher/minecraft/Component.cpp | 4 | ||||
| -rw-r--r-- | launcher/minecraft/OneSixVersionFormat.cpp | 10 | ||||
| -rw-r--r-- | launcher/minecraft/VersionFile.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/launcher/minecraft/Component.cpp b/launcher/minecraft/Component.cpp index 7e5b6058..ff81fcbb 100644 --- a/launcher/minecraft/Component.cpp +++ b/launcher/minecraft/Component.cpp @@ -451,9 +451,9 @@ void Component::updateCachedData() m_cachedVolatile = file->m_volatile; changed = true; } - if(!deepCompare(m_cachedRequires, file->requires)) + if(!deepCompare(m_cachedRequires, file->m_requires)) { - m_cachedRequires = file->requires; + m_cachedRequires = file->m_requires; changed = true; } if(!deepCompare(m_cachedConflicts, file->conflicts)) diff --git a/launcher/minecraft/OneSixVersionFormat.cpp b/launcher/minecraft/OneSixVersionFormat.cpp index 888b6860..b586198b 100644 --- a/launcher/minecraft/OneSixVersionFormat.cpp +++ b/launcher/minecraft/OneSixVersionFormat.cpp @@ -276,7 +276,7 @@ VersionFilePtr OneSixVersionFormat::versionFileFromJson(const QJsonDocument &doc if (root.contains("requires")) { - Meta::parseRequires(root, &out->requires); + Meta::parseRequires(root, &out->m_requires); } QString dependsOnMinecraftVersion = root.value("mcVersion").toString(); if(!dependsOnMinecraftVersion.isEmpty()) @@ -284,9 +284,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->m_requires.count(mcReq) == 0) { - out->requires.insert(mcReq); + out->m_requires.insert(mcReq); } } if (root.contains("conflicts")) @@ -392,9 +392,9 @@ QJsonDocument OneSixVersionFormat::versionFileToJson(const VersionFilePtr &patch } root.insert("mods", array); } - if(!patch->requires.empty()) + if(!patch->m_requires.empty()) { - Meta::serializeRequires(root, &patch->requires, "requires"); + Meta::serializeRequires(root, &patch->m_requires, "requires"); } if(!patch->conflicts.empty()) { diff --git a/launcher/minecraft/VersionFile.h b/launcher/minecraft/VersionFile.h index 11c5a3af..8e9dd167 100644 --- a/launcher/minecraft/VersionFile.h +++ b/launcher/minecraft/VersionFile.h @@ -138,7 +138,7 @@ public: /* data */ * Prism Launcher: set of packages this depends on * NOTE: this is shared with the meta format!!! */ - Meta::RequireSet requires; + Meta::RequireSet m_requires; /** * Prism Launcher: set of packages this conflicts with |