Merge pull request #890 from Scrumplex/fix-technic-forge

Fix Technic instances using Forge

1 files changed, 7 insertions, 7 deletions

diff --git a/launcher/modplatform/technic/TechnicPackProcessor.cpp b/launcher/modplatform/technic/TechnicPackProcessor.cpp
index 471b4a2f..95feb4b2 100644
--- a/launcher/modplatform/technic/TechnicPackProcessor.cpp
+++ b/launcher/modplatform/technic/TechnicPackProcessor.cpp
@@ -187,17 +187,17 @@ void Technic::TechnicPackProcessor::run(SettingsObjectPtr globalSettings, const
             }
             else
             {
-                static QStringList possibleLoaders{
-                        "net.minecraftforge:minecraftforge:",
-                        "net.fabricmc:fabric-loader:",
-                        "org.quiltmc:quilt-loader:"
+                // <Technic library name prefix> -> <our component name>
+                static QMap<QString, QString> loaderMap {
+                    {"net.minecraftforge:minecraftforge:", "net.minecraftforge"},
+                    {"net.fabricmc:fabric-loader:", "net.fabricmc.fabric-loader"},
+                    {"org.quiltmc:quilt-loader:", "org.quiltmc.quilt-loader"}
                 };
-                for (const auto& loader : possibleLoaders)
+                for (const auto& loader : loaderMap.keys())
                 {
                     if (libraryName.startsWith(loader))
                     {
-                        auto loaderComponent = loader.chopped(1).replace(":", ".");
-                        components->setComponentVersion(loaderComponent, libraryName.section(':', 2));
+                        components->setComponentVersion(loaderMap.value(loader), libraryName.section(':', 2));
                         break;
                     }
                 }