Fix setting loaders when projects have unusual loaders

juraj-hrivnak · Oct 8, 2024 · a9ad32e · a9ad32e
1 parent f5adf5f
commit a9ad32e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/commonMain/kotlin/teksturepako/pakku/api/platforms/Platform.kt b/src/commonMain/kotlin/teksturepako/pakku/api/platforms/Platform.kt
@@ -41,8 +41,6 @@ abstract class Platform(
 
     // -- FILES --
 
-    val validLoaders = listOf("minecraft", "iris", "optifine", "datapack")
-
     /**
      * Requests [project files][ProjectFile] based on [minecraft versions][mcVersions], [loaders], [projectId] or
      * [projectId] & [fileId].
@@ -85,4 +83,9 @@ abstract class Platform(
     abstract suspend fun requestMultipleProjectsWithFiles(
         mcVersions: List<String>, loaders: List<String>, ids: List<String>, numberOfFiles: Int
     ): MutableSet<Project>
+
+    companion object
+    {
+        val validLoaders = listOf("minecraft", "iris", "optifine", "datapack")
+    }
 }
diff --git a/src/commonMain/kotlin/teksturepako/pakku/cli/cmd/Set.kt b/src/commonMain/kotlin/teksturepako/pakku/cli/cmd/Set.kt
@@ -13,6 +13,7 @@ import com.github.ajalt.mordant.terminal.danger
 import com.github.ajalt.mordant.terminal.success
 import kotlinx.coroutines.runBlocking
 import teksturepako.pakku.api.data.LockFile
+import teksturepako.pakku.api.platforms.Platform
 import teksturepako.pakku.api.projects.ProjectSide
 import teksturepako.pakku.api.projects.UpdateStrategy
 
@@ -131,7 +132,7 @@ class Set : CliktCommand()
             lockFile.getAllProjects().forEach { project ->
                 for (file in project.files)
                 {
-                    if (file.loaders.isNotEmpty() && file.loaders.none { it in loaders })
+                    if (file.loaders.isNotEmpty() && file.loaders.none { it in loaders || it in Platform.validLoaders })
                     {
                         terminal.danger(
                             "Can not set to $loaders,"