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

try making files in build script system independent (temp fix)

Browse source
This commit is contained in:
Adam 2022-06-23 23:59:48 +02:00
parent aeb5d2a69d
commit 3fa4eba4b3
1 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
modules/infra-factorio-client/build.gradle.kts
View file

@ -11,9 +11,19 @@ plugins {
description = "Start the Factorio game client" description = "Start the Factorio game client"
val clientModsDirectory = file("""D:\Users\Adam\AppData\Roaming\Factorio\mods""") val clientModsDirectory: DirectoryProperty = objects.directoryProperty().apply {
val modDir = File("""D:\Users\Adam\AppData\Roaming\Factorio\mods""")
if (modDir.exists()) {
set(modDir)
}
}
val factorioGameId = "427520" val factorioGameId = "427520"
val steamExe = """C:\Program Files (x86)\Steam\steam.exe""" val steamExe: RegularFileProperty = objects.fileProperty().apply {
val steam = File("""C:\Program Files (x86)\Steam\steam.exe""")
if (steam.exists()) {
set(steam)
}
}
val factorioMod: Configuration by configurations.creating { val factorioMod: Configuration by configurations.creating {
asConsumer() asConsumer()
@ -29,6 +39,8 @@ val deployModToClient by tasks.registering(Copy::class) {
description = "Copy the mod to the Factorio client" description = "Copy the mod to the Factorio client"
group = project.name group = project.name
onlyIf { clientModsDirectory.orNull?.asFile?.exists() == true }
from(factorioMod) from(factorioMod)
into(clientModsDirectory) into(clientModsDirectory)
@ -47,6 +59,8 @@ val clientLaunch by tasks.registering(Exec::class) {
group = project.name group = project.name
onlyIf(!serviceOf<ExecOperations>().isFactorioRunning()) onlyIf(!serviceOf<ExecOperations>().isFactorioRunning())
onlyIf { steamExe.orNull?.asFile?.exists() == true }
onlyIf { clientModsDirectory.orNull?.asFile?.exists() == true }
dependsOn(deployModToClient) dependsOn(deployModToClient)
mustRunAfter(clientKill, ":modules:infra-factorio-server:processRun") mustRunAfter(clientKill, ":modules:infra-factorio-server:processRun")
@ -54,7 +68,7 @@ val clientLaunch by tasks.registering(Exec::class) {
commandLine = parseSpaceSeparatedArgs( commandLine = parseSpaceSeparatedArgs(
// """explorer "steam://rungameid/$factorioGameId// --mp-connect localhost/" """ // not working // """explorer "steam://rungameid/$factorioGameId// --mp-connect localhost/" """ // not working
// """explorer "steam://run/$factorioGameId//--mp-connect localhost/" """ // works! But has annoying pop-up // """explorer "steam://run/$factorioGameId//--mp-connect localhost/" """ // works! But has annoying pop-up
""" $steamExe -applaunch $factorioGameId --mp-connect localhost --mod-directory $clientModsDirectory """ """ ${steamExe.asFile.get().canonicalPath} -applaunch $factorioGameId --mp-connect localhost --mod-directory ${clientModsDirectory.asFile.get().canonicalPath} """
) )
doFirst { logger.lifecycle("Launching factorio.exe") } doFirst { logger.lifecycle("Launching factorio.exe") }
} }