putDataAt

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

Hide file tree

Showing 5 changed files with 47 additions and 19 deletions.
diff --git a/TestProjectGroovy/build.gradle b/TestProjectGroovy/build.gradle
@@ -64,12 +64,16 @@ runMindustry {
     }
     addClient("debugging") {
         official version: "v146"
-        useModpack("for debugging")
+        useModpack "for debugging"
+    }
+    addClient("custom data dir") {
+        official version: "v146"
+        putDataAt "${buildDir}/customDataDir"
     }
     addClient {
         // anonymous 2
         fooClient tag: "v8.0.0", file: "erekir-client.jar"
-        useModpack(modpack2nd)
+        useModpack modpack2nd
     }
     addClient("Old Mindustry") {
         official version: "v126"

diff --git a/TestProjectKt/build.gradle.kts b/TestProjectKt/build.gradle.kts
@@ -87,6 +87,10 @@ runMindustry {
         official(version = "v146")
         useModpack(name = "for debugging")
     }
+    addClient("custom data dir") {
+        official(version = "v146")
+        putDataAt(file = buildDir.resolve("customDataDir"))
+    }
     addClient("debugging") {
         official(version = "v146")
         useModpack(name = "for debugging 2")

diff --git a/main/src/run/RunMindustry.kt b/main/src/run/RunMindustry.kt
@@ -233,7 +233,7 @@ open class RunMindustryExtension(
     fun addModpack(
         name: String,
         config: Action<AddModpackSpec>
-    ): Modpack? {
+    ): Modpack {
         return addModpack(name) {
             config.execute(this)
         }
@@ -248,7 +248,7 @@ open class RunMindustryExtension(
      * }
      * ```
      */
-    fun addModpack(config: Action<AddModpackSpec>): Modpack? {
+    fun addModpack(config: Action<AddModpackSpec>): Modpack {
         return addModpack(defaultModpackName, config)
     }
 }

diff --git a/main/src/run/model/GameSide.kt b/main/src/run/model/GameSide.kt
@@ -52,19 +52,38 @@ abstract class AddGameSideSpec<T : GameSide> {
      *  ## Default data directory of Mindustry server
      *  `./config/`
      */
-    var dataDir: Any?
-        get() = when (val dir = backend.dataDir) {
-            is ProjBuildDataDirLoc -> dir.name
-            is LocalDataDirLoc -> dir.dir
-            else -> null
-        }
+    var dataDir: IDataDirLoc?
+        get() = backend.dataDir
         set(value) {
-            when (value) {
-                is File -> backend.dataDir = LocalDataDirLoc(value)
-                is String -> backend.dataDir = LocalDataDirLoc(File(value))
-                is IDataDirLoc -> backend.dataDir = value
-            }
+            backend.dataDir = value
+        }
+
+    fun putDataAt(props: Map<String, Any>) {
+        val path = props["path"]
+        val file = props["file"]
+        if (path != null) {
+            putDataAt(path = path.toString())
+        } else if (file != null) {
+            putDataAt(file = proj.project.file(file))
+        } else {
+            proj.logger.error(
+                "Neither \"path\" nor \"file\" given in putDataAt(Map<String,Any>)"
+            )
         }
+    }
+
+    fun putDataAt(path: String) {
+        dataDir = LocalDataDirLoc(File(path))
+    }
+
+    fun putDataAt(file: File) {
+        dataDir = LocalDataDirLoc(file)
+    }
+
+    fun putDataAt(loc: IDataDirLoc) {
+        dataDir = loc
+    }
+
     var modpack: String?
         get() = backend.modpack
         set(value) {
@@ -76,6 +95,7 @@ abstract class AddGameSideSpec<T : GameSide> {
             name = props["name"] ?: defaultModpackName,
         )
     }
+
     fun useModpack(name: String) {
         modpack = formatValidGradleName(name)
     }
@@ -199,12 +219,12 @@ abstract class AddGameSideSpec<T : GameSide> {
         val path = props["path"]
         val file = props["file"]
         if (path != null) {
-            LocalGameLoc(File(path as String)).checkAndSet()
+            localFile(path = path.toString())
         } else if (file != null) {
-            LocalGameLoc(file as File).checkAndSet()
+            localFile(file = file as File)
         } else {
             proj.logger.error(
-                "Neither \"path\" nor \"file\" given in fromLocalDisk(Map<String,Any>)"
+                "Neither \"path\" nor \"file\" given in localFile(Map<String,Any>)"
             )
         }
     }

diff --git a/main/src/run/model/Modpack.kt b/main/src/run/model/Modpack.kt
@@ -132,7 +132,7 @@ class AddModpackSpec(
         val path = props["path"]
         val file = props["file"]
         if (path != null) {
-            local(path as String)
+            local(path.toString())
         } else if (file != null) {
             local(file as File)
         } else {