Merge branch 'MultiMC:develop' into develop

UltimMC · Mar 10, 2024 · e5d1091 · e5d1091
2 parents 7747f08 + d22707c
commit e5d1091
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/launcher/ui/pages/modplatform/import_ftb/Model.cpp b/launcher/ui/pages/modplatform/import_ftb/Model.cpp
@@ -186,6 +186,7 @@ void resolveModloader(QString mcVersion, ModLoader &loader) {
     {
         QJsonDocument doc = Json::requireDocument(data);
         QJsonObject root = Json::requireObject(doc, "version.json");
+        bool isProbablyNeoforge = false;
         for (auto library: Json::ensureArray(root, "libraries", {}))
         {
             if (!library.isObject())
@@ -197,6 +198,10 @@ void resolveModloader(QString mcVersion, ModLoader &loader) {
             GradleSpecifier name = Json::requireString(libraryObject, "name");
             auto artifactPrefix = name.artifactPrefix();
 
+            if(artifactPrefix.startsWith("net.neoforged.fancymodloader:")) {
+                isProbablyNeoforge = true;
+                break;
+            }
             if(artifactPrefix == "net.minecraftforge:forge") {
                 QString libraryVersion = name.version();
                 loader.type = ModLoaderType::Forge;
@@ -231,7 +236,12 @@ void resolveModloader(QString mcVersion, ModLoader &loader) {
         for (auto arg: gameArgs) {
             QString value = Json::ensureValueString(arg, QString());
             if(versionIsNext) {
-                loader.type = ModLoaderType::Forge;
+                if(isProbablyNeoforge) {
+                    loader.type = ModLoaderType::NeoForge;
+                }
+                else {
+                    loader.type = ModLoaderType::Forge;
+                }
                 loader.version = value;
                 return;
             }

diff --git a/launcher/ui/pages/modplatform/import_ftb/Model.h b/launcher/ui/pages/modplatform/import_ftb/Model.h
@@ -25,6 +25,7 @@ enum class ModLoaderType {
     Unresolved,
     None,
     Forge,
+    NeoForge,
     Fabric,
     Quilt
 };

diff --git a/launcher/ui/pages/modplatform/import_ftb/PackInstallTask.cpp b/launcher/ui/pages/modplatform/import_ftb/PackInstallTask.cpp
@@ -62,6 +62,10 @@ void PackInstallTask::copyFinished() {
             components->setComponentVersion("net.minecraftforge", modloader.version, true);
             break;
         }
+        case ModLoaderType::NeoForge: {
+            components->setComponentVersion("net.neoforged", modloader.version, true);
+            break;
+        }
         case ModLoaderType::Fabric: {
             components->setComponentVersion("net.fabricmc.fabric-loader", modloader.version, true);
             break;
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,6 +25,7 @@ enum class ModLoaderType { @@
         Unresolved,
         None,
         Forge,
+        NeoForge,
         Fabric,
         Quilt
     };
@@ Expand Down @@