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

fix ftb import for old packs

Browse source 
fixes #4786

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 3496b7b3a0)
This commit is contained in:
Trial97 2026-01-16 15:21:02 +02:00 • committed by github-actions[bot]
parent 6bd74bedac
commit d1605ec02a
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
launcher/modplatform/import_ftb/PackHelpers.cpp
View file

@ -80,7 +80,7 @@ Modpack parseDirectory(QString path)
const auto parts = modLoader.split('-', Qt::KeepEmptyParts);
if (parts.size() >= 2) {
const auto loader = parts.first().toLower();
modpack.version = parts.at(1).trimmed();
modpack.loaderVersion = parts.at(1).trimmed();
if (loader == "neoforge") {
modpack.loaderType = ModPlatform::NeoForge;
} else if (loader == "forge") {
@ -91,13 +91,14 @@ Modpack parseDirectory(QString path)
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 {};
}
if (!modpack.loaderType.has_value()) {
legacyInstanceParsing(path, &modpack.loaderType, &modpack.loaderVersion);
}
auto iconFile = QFileInfo(FS::PathCombine(path, "folder.jpg"));
if (iconFile.exists() && iconFile.isFile()) {

8
launcher/modplatform/import_ftb/PackInstallTask.cpp
View file

@ -70,19 +70,19 @@ void PackInstallTask::copySettings()
if (modloader.has_value())
switch (modloader.value()) {
case ModPlatform::NeoForge: {
components->setComponentVersion("net.neoforged", m_pack.version, true);
components->setComponentVersion("net.neoforged", m_pack.loaderVersion, true);
break;
}
case ModPlatform::Forge: {
components->setComponentVersion("net.minecraftforge", m_pack.version, true);
components->setComponentVersion("net.minecraftforge", m_pack.loaderVersion, true);
break;
}
case ModPlatform::Fabric: {
components->setComponentVersion("net.fabricmc.fabric-loader", m_pack.version, true);
components->setComponentVersion("net.fabricmc.fabric-loader", m_pack.loaderVersion, true);
break;
}
case ModPlatform::Quilt: {
components->setComponentVersion("org.quiltmc.quilt-loader", m_pack.version, true);
components->setComponentVersion("org.quiltmc.quilt-loader", m_pack.loaderVersion, true);
break;
}
case ModPlatform::Cauldron: