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

- version bump to 0.1.4

Browse source 
- update some node deps versions
- get Factorio event names programmatically
This commit is contained in:
Adam 2021-12-22 23:25:16 +01:00
parent 7e134b5353
commit 4732a66f87
5 changed files with 26 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build.gradle.kts
View file

@ -6,7 +6,7 @@ plugins {
}
group = "dev.adamko.kafkatorio"
version = "0.1.3"
version = "0.1.4"
val licenseFile: RegularFile by extra(layout.projectDirectory.file("LICENSE"))

30
modules/events-mod/src/main/typescript/events.ts
View file

@ -68,22 +68,25 @@ function emitEvent<T extends FactorioObjectData>(eventData: T, tick: uint, event
script.on_event(
defines.events.on_player_mined_entity,
(e: OnPlayerMinedEntityEvent) => {
handlePlayerUpdate(e.tick, e.player_index, "on_player_mined_entity")
handleEntityUpdate(e.tick, e.entity, "on_player_mined_entity")
let eventName = mapEventIdToName.get(e.name)
handlePlayerUpdate(e.tick, e.player_index, eventName)
handleEntityUpdate(e.tick, e.entity, eventName)
}
)
script.on_event(
defines.events.on_player_joined_game,
(e: OnPlayerJoinedGameEvent) => {
handlePlayerUpdate(e.tick, e.player_index, "on_player_joined_game")
let eventName = mapEventIdToName.get(e.name)
handlePlayerUpdate(e.tick, e.player_index, eventName)
}
)
script.on_event(
defines.events.on_player_changed_position,
// this is actually a character update, not a player update?
(e: OnPlayerChangedPositionEvent) => {
handlePlayerUpdate(e.tick, e.player_index, "on_player_changed_position")
let eventName = mapEventIdToName.get(e.name)
handlePlayerUpdate(e.tick, e.player_index, eventName)
}
)
@ -92,21 +95,14 @@ script.on_event(
(e: OnTickEvent) => {
if (e.tick % 60 == 0) {
for (const [index, _] of pairs(game.surfaces)) {
let s = game.get_surface(index) // TODO fix / report can't iterate over surfaces
// let surface = game.surfaces[index]
if (s != undefined) {
surfaceEvent(e.tick, s, mapEventIdToName.get(e.name))
let surface = game.get_surface(index) // TODO fix / report can't iterate over surfaces
if (surface != undefined) {
surfaceEvent(e.tick, surface, mapEventIdToName.get(e.name))
}
// surfaceEvent(e.tick, surface, "on_tick")
// let surface = game.surfaces[index]
// surfaceEvent(e.tick, surface, mapEventIdToName.get(e.name))
}
// let filename: string = table.concat([entity.unit_number, eventType, tick], "_")
// let msg = "test mod tick: " + e.tick + "\n"
// game.write_file("tick.log", msg, true, SERVER_ID)
// let filename: string = `OnTickEvent/${e.tick}`
// outputEvent(filename, e)
}
}
);

18
modules/events-mod/src/main/typescript/package-lock.json generated
View file

@ -74,19 +74,19 @@
"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="
},
"typed-factorio": {
"version": "0.13.0",
"resolved": "https://registry.npmjs.org/typed-factorio/-/typed-factorio-0.13.0.tgz",
"integrity": "sha512-a6z8pciAtBQ+FXMJYUI1YqL/zhtFeEW2370rpuxZSaP6RdfWpZ98Vu8Hl19t98h+ULLXnmWsC/g6OW/TJcLbAQ=="
"version": "0.14.0",
"resolved": "https://registry.npmjs.org/typed-factorio/-/typed-factorio-0.14.0.tgz",
"integrity": "sha512-9T9z7S3vmFbl2EHIHzAUEmujxkuAMWGe+DXDNLgVXewIgR1gx6REh7iy+qHtivzzDLq0XOjHQGTUibhNSONAig=="
},
"typescript": {
"version": "4.5.2",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.2.tgz",
"integrity": "sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw=="
"version": "4.5.4",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.4.tgz",
"integrity": "sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg=="
},
"typescript-to-lua": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/typescript-to-lua/-/typescript-to-lua-1.2.0.tgz",
"integrity": "sha512-hbAagI6DgP4MjaPKqGlxtiD/rsZE5hO9ypIz96xukKIjzxp5c/TSItik0BMriX5yIIhRiYLfyAQBp+X1cO8MkQ==",
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/typescript-to-lua/-/typescript-to-lua-1.3.0.tgz",
"integrity": "sha512-hFjZ7+Cv08WUql2VJChOEb1JH2nqYspyjw+9Og0cDLkP0QaEmM+Eh/slO2exdngDyQye/rrQysLy3zVzJe+PVg==",
"requires": {
"enhanced-resolve": "^5.8.2",
"resolve": "^1.15.1",

6
modules/events-mod/src/main/typescript/package.json
View file

@ -13,9 +13,9 @@
"dependencies": {
"lua-types": "^2.11.0",
"@types/node": "^12.0.8",
"typescript-to-lua": "1.2.0",
"typed-factorio": "0.13.0",
"typescript": "4.5.2"
"typescript-to-lua": "1.3.0",
"typed-factorio": "0.14.0",
"typescript": "4.5.4"
},
"license": "UNLICENSED",
"peerDependencies": {},

1
modules/web-map/build.gradle.kts
View file

@ -52,7 +52,6 @@ kotlin {
implementation("io.kvision:kvision-state:$kvisionVersion")
implementation("io.kvision:kvision-chart:$kvisionVersion")
// implementation(npm("kafkajs", "1.15.0"))
}
val webDir = file("src/main/web")