extract loadMods from RunClient and RunServer

PlumyGames · Dec 25, 2023 · 3962201 · 3962201
1 parent 294d19f
commit 3962201
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 37 deletions.
diff --git a/TestProjectGroovy/build.gradle b/TestProjectGroovy/build.gradle
@@ -30,9 +30,9 @@ dependencies {
 
 mindustry {
     dependency {
-        mindustry version: latest
+        mindustry version: "v146"
         // mindustryMirror version: latest
-        arc version: latest
+        arc version: "v146"
     }
     modMeta {
         name = 'mgpp-groovy'

diff --git a/TestProjectKt/build.gradle.kts b/TestProjectKt/build.gradle.kts
@@ -46,8 +46,8 @@ tasks.register<TestOutputTask>("anyTask") {
 }
 mindustry {
     dependency {
-        mindustry(version = latest)
-        arc(version = latestTag)
+        mindustry(version = "v146")
+        arc(version = "v146")
     }
     modMeta {
         name = "mgpp-kt"

diff --git a/main/src/dsl/OS.kt b/main/src/dsl/OS.kt
@@ -1,13 +1,13 @@
 package io.github.liplum.dsl
 
 enum class OS {
-    Unknown, Windows, Linux, Mac
+    Unknown, Windows, Linux, MacOS
 }
 
 fun getOs(): OS = (System.getProperty("os.name").lowercase()).let {
     when {
         it.contains("windows") -> OS.Windows
-        it.contains("mac os x") || it.contains("darwin") || it.contains("osx") -> OS.Mac
+        it.contains("mac os x") || it.contains("darwin") || it.contains("osx") -> OS.MacOS
         it.contains("linux") -> OS.Linux
         else -> OS.Unknown
     }

diff --git a/main/src/run/model/DataDirLoc.kt → main/src/run/model/DataDir.kt b/main/src/run/model/DataDirLoc.kt → main/src/run/model/DataDir.kt
@@ -49,6 +49,6 @@ fun resolveDefaultClientDataDir(): File? {
         OS.Unknown -> null
         OS.Windows -> FileAt(System.getenv("AppData"), "Mindustry")
         OS.Linux -> FileAt(System.getenv("XDG_DATA_HOME") ?: System.getenv("HOME"), ".local", "share", "Mindustry")
-        OS.Mac -> FileAt(System.getenv("HOME"), "Library", "Application Support", "Mindustry")
+        OS.MacOS -> FileAt(System.getenv("HOME"), "Library", "Application Support", "Mindustry")
     }
 }
diff --git a/main/src/task/DexJar.kt b/main/src/task/DexJar.kt
@@ -108,7 +108,7 @@ fun List<File>.platformFindD8(): File? =
     when (getOs()) {
         OS.Windows -> find { File(it, "d8.bat").exists() }?.run { File(this, "d8.bat") }
         OS.Linux -> find { File(it, "d8").exists() }?.run { File(this, "d8") }
-        OS.Mac -> find { File(it, "d8").exists() }?.run { File(this, "d8") }
+        OS.MacOS -> find { File(it, "d8").exists() }?.run { File(this, "d8") }
         else -> null
     }
 

diff --git a/main/src/task/RunClient.kt b/main/src/task/RunClient.kt
@@ -1,7 +1,6 @@
 package io.github.liplum.mindustry
 
 import io.github.liplum.dsl.*
-import org.apache.tools.ant.taskdefs.condition.Os
 import org.gradle.api.tasks.*
 
 open class RunClient : RunMindustryAbstract() {
@@ -15,23 +14,11 @@ open class RunClient : RunMindustryAbstract() {
         logger.lifecycle("Run client in $dataDir.")
         environment[R.env.mindustryDataDir] = dataDir.absoluteFile
         workingDir = dataDir
-        if (dataDir.isDirectory) {
-            // TODO: Record the mod signature.
-            // TODO: Don't always delete all.
-            dataDir.deleteRecursively()
-        }
         dataDir.mkdirs()
-        val modsFolder = dataDir.resolve("mods")
-        for (modFile in mods) {
-            if (modFile.isFile) {
-                createSymbolicLinkOrCopy(link = modsFolder.resolve(modFile.name), target = modFile)
-            } else {
-                logger.error("Mod<$modFile> doesn't exist.")
-            }
-        }
+        loadMods(dataDir.resolve("mods"))
         standardInput = System.`in`
         args = listOf(gameFile.get().absolutePath) + startupArgs.get()
-        if (Os.isFamily(Os.FAMILY_MAC)) {
+        if (getOs() == OS.MacOS) {
             // Lwjgl3 application requires it to run on macOS
             jvmArgs = (jvmArgs ?: mutableListOf()) + "-XstartOnFirstThread"
         }

diff --git a/main/src/task/RunMindustryAbstract.kt b/main/src/task/RunMindustryAbstract.kt
@@ -4,6 +4,7 @@ import io.github.liplum.dsl.*
 import io.github.liplum.dsl.fileProp
 import io.github.liplum.dsl.stringsProp
 import org.gradle.api.tasks.*
+import java.io.File
 
 abstract class RunMindustryAbstract : JavaExec() {
     val gameFile = project.fileProp()
@@ -18,4 +19,19 @@ abstract class RunMindustryAbstract : JavaExec() {
     init {
         mainClass.set("-jar")
     }
+
+    fun loadMods(modsDir: File) {
+        modsDir.mkdirs()
+        if (modsDir.isDirectory) {
+            // TODO: Record the mod signature, and don't always delete all.
+            modsDir.deleteRecursively()
+        }
+        for (modFile in mods) {
+            if (modFile.isFile) {
+                createSymbolicLinkOrCopy(link = modsDir.resolve(modFile.name), target = modFile)
+            } else {
+                logger.error("Mod<$modFile> doesn't exist.")
+            }
+        }
+    }
 }
diff --git a/main/src/task/RunServer.kt b/main/src/task/RunServer.kt
@@ -1,6 +1,5 @@
 package io.github.liplum.mindustry
 
-import io.github.liplum.dsl.createSymbolicLinkOrCopy
 import org.gradle.api.tasks.*
 
 open class RunServer : RunMindustryAbstract() {
@@ -12,20 +11,8 @@ open class RunServer : RunMindustryAbstract() {
     override fun exec() {
         val dataDir = dataDir.get().resolveDir(this, GameSideType.Server) ?: temporaryDir.resolve(name)
         logger.lifecycle("Run server in $dataDir.")
-        if (dataDir.isDirectory) {
-            // TODO: Record the mod signature.
-            // TODO: Don't always delete all.
-            dataDir.deleteRecursively()
-        }
         dataDir.mkdirs()
-        val modsFolder = dataDir.resolve("config").resolve("mods")
-        for (modFile in mods) {
-            if (modFile.exists()) {
-                createSymbolicLinkOrCopy(link = modsFolder.resolve(modFile.name), target = modFile)
-            } else {
-                logger.error("Mod<$modFile> doesn't exist.")
-            }
-        }
+        loadMods(dataDir.resolve("mods"))
         standardInput = System.`in`
         args = listOf(gameFile.get().absolutePath) + startupArgs.get()
         workingDir = dataDir