mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-07-07 05:46:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

rework parse dependency function

Browse source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2025-07-29 17:50:29 +03:00
parent 36e540ed11
commit 1a82a83e36
No known key found for this signature in database
GPG key ID: 55EF5DA53DB36318
1 changed files with 25 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

40
launcher/minecraft/mod/tasks/LocalModParseTask.cpp
View file

@ -82,11 +82,11 @@ ModDetails ReadMCModInfo(QByteArray contents)
};
if (firstObj.contains("requiredMods")) {
for (auto dep : firstObj.value("dependencies").toArray().toVariantList()) {
for (auto dep : firstObj.value("requiredMods").toArray()) {
addDep(dep.toString());
}
} else if (firstObj.contains("dependencies")) {
for (auto dep : firstObj.value("dependencies").toArray().toVariantList()) {
for (auto dep : firstObj.value("dependencies").toArray()) {
addDep(dep.toString());
}
}
@ -229,19 +229,29 @@ ModDetails ReadMCModTOML(QByteArray contents)
details.icon_file = logoFile;
auto parseDep = [&details](toml::array* dependencies) {
if (dependencies) {
for (auto& dep : *dependencies) {
auto dep_table = dep.as_table();
if (dep_table) {
auto modId = dep_table->get("modId")->value_or<std::string>("");
if (modId != "forge" && modId != "neoforge" && modId != "minecraft") {
if (dep_table->contains("type") && (dep_table->get("type"))->value_or<std::string>("") == "required") {
details.dependencies.append(QString::fromStdString(modId));
} else if (dep_table->contains("mandatory") && (dep_table->get("mandatory"))->value_or(false)) {
details.dependencies.append(QString::fromStdString(modId));
}
}
}
static const QStringList ignoreModIds = { "", "forge", "neoforge", "minecraft" };
if (!dependencies) {
return;
}
auto isNeoForgeDep = [](toml::table* t) {
auto type = (*t)["type"].as_string();
return type && type->get() == "required";
};
auto isForgeDep = [](toml::table* t) {
auto mandatory = (*t)["mandatory"].as_boolean();
return mandatory && mandatory->get();
};
for (auto& dep : *dependencies) {
auto dep_table = dep.as_table();
if (!dep_table) {
continue;
}
auto modId = (*dep_table)["modId"].as_string();
if (!modId || ignoreModIds.contains(modId->get())) {
continue;
}
if (isNeoForgeDep(dep_table) || isForgeDep(dep_table)) {
details.dependencies.append(QString::fromStdString(modId->get()));
}
}
};