lazzexus/Kafkatorio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tidy up after refactoring Gradle Factorio plugin

Browse source
This commit is contained in:
Adam 2022-12-19 16:53:18 +01:00
parent a99ed5bb85
commit 76c47d9756
7 changed files with 14 additions and 273 deletions
Download patch file Download diff file Expand all files Collapse all files

42
gradle-plugins/factorio-gradle/src/main/kotlin/dev/adamko/gradle/factorio/configureIdea.kt
View file

@ -4,16 +4,15 @@ import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.withType
import org.gradle.plugins.ide.idea.IdeaPlugin
import org.gradle.plugins.ide.idea.model.IdeaModel
import org.gradle.plugins.ide.idea.model.Module
//import org.gradle.plugins.ide.idea.model.Module as IdeaModule
internal fun FactorioModPlugin.PluginContext.configureIdea() {
project.plugins.withType<IdeaPlugin>().configureEach {
// project.afterEvaluate {
project.extensions.configure<IdeaModel> {
module {
// this.scopes["MAIN"]?.plusAssign(mutableMapOf("plus" to listOf(project.configurations.create("main"))))
//
// scopes["MAIN"] = mapOf("plus" to listOf(configurations.factorioMod.get()))
sourceDirs.plusAssign(settings.mainSources.typescript.srcDirs)
sourceDirs.plusAssign(settings.mainSources.lua.srcDirs)
sourceDirs.plusAssign(settings.generatedSources.lua.srcDirs)
@ -27,39 +26,12 @@ internal fun FactorioModPlugin.PluginContext.configureIdea() {
generatedSourceDirs.plusAssign(settings.generatedSources.lua.srcDirs)
generatedSourceDirs.plusAssign(settings.generatedSources.typescript.srcDirs)
// sourceDirs.plusAssign(
// listOf(
// settings.typescriptSrcDir.get().asFile,
// settings.generatedLuaSrcDir.get().asFile,
// )
// )
//// sourceDirs = sourceDirs + file("src/main/lua")
// resourceDirs = resourceDirs + settings.modDataResourcesDir
// testSources.from(typescriptTestSrcDir)
//// testSourceDirs = testSourceDirs + typescriptTestSrcDir
// iml {
// whenMerged {
// require(this is IdeaModule)
//
// generatedSourceDirs = generatedSourceDirs + generatedSrcDir
//// excludeDirs = excludeDirs + generatedSrcDir
iml {
whenMerged {
require(this is Module)
// sourceDirs.plusAssign(settings.mainSources.typescript.srcDirs)
// sourceDirs.plusAssign(settings.mainSources.lua.srcDirs)
// sourceDirs.plusAssign(settings.generatedSources.lua.srcDirs)
//
// testSources.from(settings.testSources.typescript)
// testSources.from(settings.testSources.lua)
//
// resourceDirs.plusAssign(settings.mainSources.resources.srcDirs)
// testResources.from(settings.testSources.resources)
//
// generatedSourceDirs.plusAssign(settings.generatedSources.lua.srcDirs)
// generatedSourceDirs.plusAssign(settings.generatedSources.typescript.srcDirs)
}
}
// }
// }
}
}
}

6
gradle-plugins/factorio-gradle/src/main/kotlin/dev/adamko/gradle/factorio/tasks/LaunchFactorioClientTask.kt
View file

@ -67,6 +67,12 @@ abstract class LaunchFactorioClientTask @Inject constructor(
val modsDirFlag = clientModsPath.map { """--mod-directory "$it"""" }.getOrElse("")
val mpConnectFlag = serverConnectHost.map { "--mp-connect $it" }.getOrElse("")
// commandLine = parseSpaceSeparatedArgs(
//// """explorer "steam://rungameid/$factorioGameId// --mp-connect localhost/" """ // not working
//// """explorer "steam://run/$factorioGameId//--mp-connect localhost/" """ // works! But has annoying pop-up
// """ ${steamExe.asFile.orNull?.canonicalPath} -applaunch $factorioGameId --mp-connect localhost --mod-directory ${clientModsDirectory.asFile.orNull?.canonicalPath} """
// )
return """
$steamExe --applaunch $factorioId $modsDirFlag $mpConnectFlag
""".trimIndent()