Simplify Rule

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad
2025-08-04 13:29:19 +01:00
parent 79b7e277f1
commit 3ba9483011
5 changed files with 73 additions and 119 deletions

View File

@@ -319,7 +319,11 @@ LibraryPtr MojangVersionFormat::libraryFromJson(ProblemContainer& problems, cons
}
if (libObj.contains("rules")) {
out->applyRules = true;
out->m_rules = rulesFromJsonV4(libObj);
QJsonArray rulesArray = requireArray(libObj.value("rules"));
for (auto rule : rulesArray) {
out->m_rules.append(Rule::fromJson(requireObject(rule)));
}
}
if (libObj.contains("downloads")) {
out->m_mojangDownloads = libDownloadInfoFromJson(libObj);
@@ -355,7 +359,7 @@ QJsonObject MojangVersionFormat::libraryToJson(Library* library)
if (!library->m_rules.isEmpty()) {
QJsonArray allRules;
for (auto& rule : library->m_rules) {
QJsonObject ruleObj = rule->toJson();
QJsonObject ruleObj = rule.toJson();
allRules.append(ruleObj);
}
libRoot.insert("rules", allRules);