HerozDotExe/PLCracked
1
0
Fork 0
forked from Github/PrismLauncher
Code Pull requests Activity Actions

Merge pull request #2135 from PrismLauncher/backport-2110-to-release-8.x

Browse source 
[Backport release-8.x] Fixed curseforge neoforge import for 1.20.1 versions
This commit is contained in:
Alexandru Ionut Tripon 2024-02-18 15:02:54 +02:00 • committed by GitHub
commit 80f863f6b6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
launcher/modplatform/flame/FlameInstanceCreationTask.cpp
View file

@ -354,6 +354,8 @@ bool FlameCreationTask::createInstance()
auto id = loader.id; auto id = loader.id;
if (id.startsWith("neoforge-")) { if (id.startsWith("neoforge-")) {
id.remove("neoforge-"); id.remove("neoforge-");
if (id.startsWith("1.20.1-"))
id.remove("1.20.1-"); // this is a mess for curseforge
loaderType = "neoforge"; loaderType = "neoforge";
loaderUid = "net.neoforged"; loaderUid = "net.neoforged";
} else if (id.startsWith("forge-")) { } else if (id.startsWith("forge-")) {

8
launcher/modplatform/flame/FlamePackExportTask.cpp
View file

@ -398,8 +398,12 @@ QByteArray FlamePackExportTask::generateIndex()
id = "fabric-" + fabric->getVersion(); id = "fabric-" + fabric->getVersion();
else if (forge != nullptr) else if (forge != nullptr)
id = "forge-" + forge->getVersion(); id = "forge-" + forge->getVersion();
else if (neoforge != nullptr) else if (neoforge != nullptr) {
id = "neoforge-" + neoforge->getVersion(); id = "neoforge-";
if (minecraft->m_version == "1.20.1")
id += "1.20.1-";
id += neoforge->getVersion();
}
version["modLoaders"] = QJsonArray(); version["modLoaders"] = QJsonArray();
if (!id.isEmpty()) { if (!id.isEmpty()) {
QJsonObject loader; QJsonObject loader;