fede/prismlauncher-crack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix FTBA instance loading (#4347)

Browse Source
This commit is contained in:
Alexandru Ionut Tripon
2025-11-24 15:23:35 +02:00
committed by GitHub
parent f9331a1d43 9e614f94cd
commit f77871a580
2 changed files with 47 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
launcher/modplatform/import_ftb/PackHelpers.cpp
View File

@@ -74,17 +74,49 @@ Modpack parseDirectory(QString path)
modpack.mcVersion = Json::requireString(root, "mcVersion", "mcVersion");
modpack.jvmArgs = root["jvmArgs"].toVariant();
modpack.totalPlayTime = Json::requireInteger(root, "totalPlayTime", "totalPlayTime");
auto modLoader = Json::requireString(root, "modLoader", "modLoader");
if (!modLoader.isEmpty()) {
const auto parts = modLoader.split('-', Qt::KeepEmptyParts);
if (parts.size() >= 2) {
const auto loader = parts.first().toLower();
modpack.version = parts.at(1).trimmed();
if (loader == "neoforge") {
modpack.loaderType = ModPlatform::NeoForge;
} else if (loader == "forge") {
modpack.loaderType = ModPlatform::Forge;
} else if (loader == "fabric") {
modpack.loaderType = ModPlatform::Fabric;
} else if (loader == "quilt") {
modpack.loaderType = ModPlatform::Quilt;
}
}
} else {
legacyInstanceParsing(path, &modpack.loaderType, &modpack.loaderVersion);
}
} catch (const Exception& e) {
qDebug() << "Couldn't load ftb instance json: " << e.cause();
return {};
}
auto iconFile = QFileInfo(FS::PathCombine(path, "folder.jpg"));
if (iconFile.exists() && iconFile.isFile()) {
modpack.icon = QIcon(iconFile.absoluteFilePath());
} else { // the logo is a file that the first bit denotes the image tipe followed by the actual image data
modpack.icon = loadFTBIcon(FS::PathCombine(path, ".ftbapp", "logo"));
}
return modpack;
}
void legacyInstanceParsing(QString path, std::optional<ModPlatform::ModLoaderType>* loaderType, QString* loaderVersion)
{
auto versionsFile = QFileInfo(FS::PathCombine(path, ".ftbapp", "version.json"));
if (!versionsFile.exists() || !versionsFile.isFile()) {
versionsFile = QFileInfo(FS::PathCombine(path, "version.json"));
}
if (!versionsFile.exists() || !versionsFile.isFile()) {
return {};
qDebug() << "Couldn't find ftb version json";
return;
}
try {
auto doc = Json::requireDocument(versionsFile.absoluteFilePath(), "FTB_APP version JSON file");
@@ -96,34 +128,29 @@ Modpack parseDirectory(QString path)
auto name = Json::requireString(obj, "name", "name");
auto version = Json::requireString(obj, "version", "version");
if (name == "neoforge") {
modpack.loaderType = ModPlatform::NeoForge;
modpack.version = version;
*loaderType = ModPlatform::NeoForge;
*loaderVersion = version;
break;
} else if (name == "forge") {
modpack.loaderType = ModPlatform::Forge;
modpack.version = version;
*loaderType = ModPlatform::Forge;
*loaderVersion = version;
break;
} else if (name == "fabric") {
modpack.loaderType = ModPlatform::Fabric;
modpack.version = version;
*loaderType = ModPlatform::Fabric;
*loaderVersion = version;
break;
} else if (name == "quilt") {
modpack.loaderType = ModPlatform::Quilt;
modpack.version = version;
*loaderType = ModPlatform::Quilt;
*loaderVersion = version;
break;
}
}
} catch (const Exception& e) {
}
catch (const Exception& e)
{
qDebug() << "Couldn't load ftb version json: " << e.cause();
return {};
return;
}
auto iconFile = QFileInfo(FS::PathCombine(path, "folder.jpg"));
if (iconFile.exists() && iconFile.isFile()) {
modpack.icon = QIcon(iconFile.absoluteFilePath());
} else { // the logo is a file that the first bit denotes the image tipe followed by the actual image data
modpack.icon = loadFTBIcon(FS::PathCombine(path, ".ftbapp", "logo"));
}
return modpack;
}
} // namespace FTBImportAPP

2
launcher/modplatform/import_ftb/PackHelpers.h
View File

@@ -49,7 +49,7 @@ struct Modpack {
using ModpackList = QList<Modpack>;
Modpack parseDirectory(QString path);
void legacyInstanceParsing(QString path, std::optional<ModPlatform::ModLoaderType>* loaderType, QString* loaderVersion);
} // namespace FTBImportAPP
// We need it for the proxy model