inline modpack

PlumyGames · Dec 19, 2023 · db82f78 · db82f78
1 parent fc1167b
commit db82f78
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 1 deletion.
diff --git a/TestProjectGroovy/build.gradle b/TestProjectGroovy/build.gradle
@@ -70,6 +70,13 @@ runMindustry {
         official version: "v146"
         putDataAt "${buildDir}/customDataDir"
     }
+    addClient("inline modpack") {
+        official version: "v146"
+        useModpack { it
+            it.testingUtilities
+            it.jvm repo: "liplum/CyberIO"
+        }
+    }
     addClient {
         // anonymous 2
         fooClient tag: "v8.0.0", file: "erekir-client.jar"

diff --git a/TestProjectKt/build.gradle.kts b/TestProjectKt/build.gradle.kts
@@ -83,6 +83,13 @@ runMindustry {
         // anonymous 1
         official(version = "v146")
     }
+    addClient("inline modpack") {
+        official(version = "v146")
+        useModpack {
+            `testingUtilities`
+            jvm(repo = "liplum/CyberIO")
+        }
+    }
     addClient("debugging") {
         official(version = "v146")
         useModpack(name = "for debugging")

diff --git a/main/src/run/RunMindustry.kt b/main/src/run/RunMindustry.kt
@@ -207,7 +207,7 @@ open class RunMindustryExtension(
      * }
      */
     inline fun addModpack(
-        name: String = "",
+        name: String = defaultModpackName,
         config: AddModpackSpec.() -> Unit
     ): Modpack {
         val (newName, isAnonymous) = allocModelName(name, modpacks)

diff --git a/main/src/run/model/GameSide.kt b/main/src/run/model/GameSide.kt
@@ -6,6 +6,7 @@ import io.github.liplum.dsl.plusAssign
 import io.github.liplum.mindustry.LocalProperties.local
 import io.github.liplum.mindustry.RunMindustryExtension.Companion.defaultModpackName
 import io.github.liplum.mindustry.run.model.NamedModel
+import org.gradle.api.Action
 import org.gradle.api.Project
 import java.io.File
 
@@ -104,6 +105,26 @@ abstract class AddGameSideSpec<T : GameSide> {
         this.modpack = modpack.name
     }
 
+    fun useModpack(
+        name: String = defaultModpackName,
+        config: AddModpackSpec.() -> Unit
+    ) {
+        useModpack(proj.runMindustry.addModpack(name, config))
+    }
+
+    fun useModpack(
+        name: String,
+        config: Action<AddModpackSpec>
+    ) {
+        useModpack(proj.runMindustry.addModpack(name, config))
+    }
+
+    fun useModpack(
+        config: Action<AddModpackSpec>
+    ) {
+        useModpack(proj.runMindustry.addModpack(defaultModpackName, config))
+    }
+
     protected fun IGameLoc.checkAndSet() {
         if (backend.location != null) {
             proj.logger.warn("The game is already set to ${backend.location}, and will be overridden by $this.")