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

suppoer non mods deps

Browse source 
fixes #3962

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2026-04-03 15:20:25 +03:00
parent 245ff2b555
commit 2e45d135c5
No known key found for this signature in database
GPG key ID: 55EF5DA53DB36318
17 changed files with 282 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

31
launcher/modplatform/flame/FileResolvingTask.cpp
View file

@ -86,30 +86,6 @@ void Flame::FileResolvingTask::executeTask()
m_task->start();
}
ModPlatform::ResourceType getResourceType(int classId)
{
switch (classId) {
case 17: // Worlds
return ModPlatform::ResourceType::World;
case 6: // Mods
return ModPlatform::ResourceType::Mod;
case 12: // Resource Packs
// return ModPlatform::ResourceType::ResourcePack; // not really a resourcepack
/* fallthrough */
case 4546: // Customization
// return ModPlatform::ResourceType::ShaderPack; // not really a shaderPack
/* fallthrough */
case 4471: // Modpacks
/* fallthrough */
case 5: // Bukkit Plugins
/* fallthrough */
case 4559: // Addons
/* fallthrough */
default:
return ModPlatform::ResourceType::Unknown;
}
}
void Flame::FileResolvingTask::netJobFinished(QByteArray* response)
{
setProgress(1, 3);
@ -171,8 +147,8 @@ void Flame::FileResolvingTask::netJobFinished(QByteArray* response)
getFlameProjects();
return;
}
if (APPLICATION->settings()->get("FallbackMRBlockedMods").toBool()){
}
if (APPLICATION->settings()->get("FallbackMRBlockedMods").toBool()) {
try {
auto entries = Json::requireObject(doc);
for (auto& out : m_manifest.files) {
@ -253,8 +229,7 @@ void Flame::FileResolvingTask::getFlameProjects()
setStatus(tr("Parsing API response from CurseForge for '%1'...").arg(file->version.fileName));
FlameMod::loadIndexedPack(file->pack, entry_obj);
file->resourceType = getResourceType(Json::requireInteger(entry_obj, "classId", "modClassId"));
if (file->resourceType == ModPlatform::ResourceType::World) {
if (file->pack.resourceType == ModPlatform::ResourceType::World) {
file->targetFolder = "saves";
}
}