2 files changed, 10 insertions, 10 deletions
diff --git a/launcher/modplatform/technic/SingleZipPackInstallTask.h b/launcher/modplatform/technic/SingleZipPackInstallTask.h
index 4d1fcbff..981ccf8a 100644
--- a/launcher/modplatform/technic/SingleZipPackInstallTask.h
+++ b/launcher/modplatform/technic/SingleZipPackInstallTask.h
@@ -24,7 +24,7 @@
 #include <QStringList>
 #include <QUrl>
 
-#include <nonstd/optional>
+#include <optional>
 
 namespace Technic {
 
@@ -57,8 +57,8 @@ private:
     QString m_archivePath;
     NetJob::Ptr m_filesNetJob;
     std::unique_ptr<QuaZip> m_packZip;
-    QFuture<nonstd::optional<QStringList>> m_extractFuture;
-    QFutureWatcher<nonstd::optional<QStringList>> m_extractFutureWatcher;
+    QFuture<std::optional<QStringList>> m_extractFuture;
+    QFutureWatcher<std::optional<QStringList>> m_extractFutureWatcher;
 };
 
 } // namespace Technic
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;
                     }
                 }