From 4704c522e002e0da2c9ce49f71456fce684ab3a1 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Wed, 23 Aug 2023 10:26:57 +0300
Subject: moved modloaderTypes to ModPlatform

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/import_ftb/PackHelpers.cpp     |  8 ++++----
 launcher/modplatform/import_ftb/PackHelpers.h       |  2 +-
 launcher/modplatform/import_ftb/PackInstallTask.cpp | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'launcher/modplatform/import_ftb')

diff --git a/launcher/modplatform/import_ftb/PackHelpers.cpp b/launcher/modplatform/import_ftb/PackHelpers.cpp
index 118bdd15..ecf97345 100644
--- a/launcher/modplatform/import_ftb/PackHelpers.cpp
+++ b/launcher/modplatform/import_ftb/PackHelpers.cpp
@@ -60,19 +60,19 @@ Modpack parseDirectory(QString path)
             auto name = Json::requireString(obj, "name", "name");
             auto version = Json::requireString(obj, "version", "version");
             if (name == "neoforge") {
-                modpack.loaderType = ResourceAPI::NeoForge;
+                modpack.loaderType = ModPlatform::NeoForge;
                 modpack.version = version;
                 break;
             } else if (name == "forge") {
-                modpack.loaderType = ResourceAPI::Forge;
+                modpack.loaderType = ModPlatform::Forge;
                 modpack.version = version;
                 break;
             } else if (name == "fabric") {
-                modpack.loaderType = ResourceAPI::Fabric;
+                modpack.loaderType = ModPlatform::Fabric;
                 modpack.version = version;
                 break;
             } else if (name == "quilt") {
-                modpack.loaderType = ResourceAPI::Quilt;
+                modpack.loaderType = ModPlatform::Quilt;
                 modpack.version = version;
                 break;
             }
diff --git a/launcher/modplatform/import_ftb/PackHelpers.h b/launcher/modplatform/import_ftb/PackHelpers.h
index 8ea4f3fa..5400252b 100644
--- a/launcher/modplatform/import_ftb/PackHelpers.h
+++ b/launcher/modplatform/import_ftb/PackHelpers.h
@@ -39,7 +39,7 @@ struct Modpack {
     // not needed for instance creation
     QVariant jvmArgs;
 
-    std::optional<ResourceAPI::ModLoaderType> loaderType;
+    std::optional<ModPlatform::ModLoaderType> loaderType;
     QString loaderVersion;
 
     QIcon icon;
diff --git a/launcher/modplatform/import_ftb/PackInstallTask.cpp b/launcher/modplatform/import_ftb/PackInstallTask.cpp
index 9e4decb0..9a3b2595 100644
--- a/launcher/modplatform/import_ftb/PackInstallTask.cpp
+++ b/launcher/modplatform/import_ftb/PackInstallTask.cpp
@@ -68,25 +68,25 @@ void PackInstallTask::copySettings()
     auto modloader = m_pack.loaderType;
     if (modloader.has_value())
         switch (modloader.value()) {
-            case ResourceAPI::NeoForge: {
+            case ModPlatform::NeoForge: {
                 components->setComponentVersion("net.neoforged", m_pack.version, true);
                 break;
             }
-            case ResourceAPI::Forge: {
+            case ModPlatform::Forge: {
                 components->setComponentVersion("net.minecraftforge", m_pack.version, true);
                 break;
             }
-            case ResourceAPI::Fabric: {
+            case ModPlatform::Fabric: {
                 components->setComponentVersion("net.fabricmc.fabric-loader", m_pack.version, true);
                 break;
             }
-            case ResourceAPI::Quilt: {
+            case ModPlatform::Quilt: {
                 components->setComponentVersion("org.quiltmc.quilt-loader", m_pack.version, true);
                 break;
             }
-            case ResourceAPI::Cauldron:
+            case ModPlatform::Cauldron:
                 break;
-            case ResourceAPI::LiteLoader:
+            case ModPlatform::LiteLoader:
                 break;
         }
     components->saveNow();
-- 
cgit