tidying up after refactor, fix update-package-json task, try to fix factorio-client launcher

modules/events-mod/build.gradle.kts

@@ -153,6 +153,7 @@ val factorioModProvider by configurations.registering {
 
 tasks.updatePackageJson {
   propertiesToCheck["name"] = "${rootProject.name}-${project.name}"
+  packageJsonFile.set(layout.projectDirectory.file("src/main/typescript/package.json"))
 }
 
 tasks.assemble { dependsOn(fetchEventsSchema, tasks.updatePackageJson) }

modules/events-mod/src/main/typescript/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "kafkatorio-events",
+  "name": "kafkatorio-events-mod",
   "version": "0.0.7",
   "private": true,
   "scripts": {
@@ -9,7 +9,8 @@
   "engines": {
     "node": ">=10.13.0"
   },
-  "devDependencies": {},
+  "devDependencies": {
+  },
   "dependencies": {
     "lua-types": "^2.11.0",
     "@types/node": "^12.0.8",
@@ -20,7 +21,10 @@
   "//": {
     "typed-factorio": "0.10.0"
   },
-  "peerDependencies": {},
-  "optionalDependencies": {},
-  "bundledDependencies": []
+  "peerDependencies": {
+  },
+  "optionalDependencies": {
+  },
+  "bundledDependencies": [
+  ]
 }

modules/infra-factorio-client/build.gradle.kts

@@ -1,7 +1,7 @@
 import dev.adamko.kafkatorio.gradle.asConsumer
 import dev.adamko.kafkatorio.gradle.factorioModAttributes
-import dev.adamko.isProcessRunning
-import dev.adamko.not
+import dev.adamko.kafkatorio.gradle.isProcessRunning
+import dev.adamko.kafkatorio.gradle.not
 import org.jetbrains.kotlin.util.parseSpaceSeparatedArgs
 
 plugins {
@@ -52,7 +52,7 @@ val clientLaunch by tasks.registering(Exec::class) {
   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 -applaunch $factorioGameId --mp-connect localhost """
+    """ $steamExe -applaunch $factorioGameId --mp-connect localhost --mod-directory $clientModsDirectory  """
   )
   doFirst { logger.lifecycle("Launching factorio.exe") }
 }