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

small refactor, make all event handlers have same parameter order

Browse source
This commit is contained in:
Adam 2022-01-09 15:41:58 +01:00
parent 4d2f574827
commit 05a693720d
2 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,39 +1,39 @@
import {Converters} from "./converters"
import {emitEvent} from "./emitEvent";
export function handlePlayerUpdate(tick: uint, playerIndex: uint, eventType: string) {
export function handlePlayerUpdate(tick: uint, eventType: string, playerIndex: uint) {
let player: LuaPlayer = game.players[playerIndex]
let table = Converters.playerToTable(player)
emitEvent(table, tick, eventType)
handleCharactersEvent(tick, playerIndex, eventType)
handleCharactersEvent(tick, eventType, playerIndex)
}
export function handleCharactersEvent(tick: uint, playerIndex: uint, eventType: string) {
export function handleCharactersEvent(tick: uint, eventType: string, playerIndex: uint) {
let player: LuaPlayer = game.players[playerIndex]
if (player.character != undefined) {
handleEntityUpdate(tick, player.character, eventType)
handleEntityUpdate(tick, eventType, player.character)
}
for (const character of player.get_associated_characters()) {
if (character != undefined) {
handleEntityUpdate(tick, character, eventType)
handleEntityUpdate(tick, eventType, character)
}
}
}
export function handleEntityUpdate(tick: uint, entity: LuaEntity, eventType: string) {
export function handleEntityUpdate(tick: uint, eventType: string, entity: LuaEntity) {
let table = Converters.entityToTable(entity)
emitEvent(table, tick, eventType)
}
export function handleSurfaceUpdate(
tick: uint,
eventType: string,
surface: LuaSurface,
eventType: string
) {
let table = Converters.surfaceToTable(surface)
emitEvent(table, tick, eventType)
@ -41,9 +41,9 @@ export function handleSurfaceUpdate(
export function handleConsoleChat(
tick: uint,
eventType: string,
playerIndex: uint | undefined,
message: string,
eventType: string,
) {
let table = Converters.consoleChat(message, playerIndex)
emitEvent(table, tick, eventType)

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

@ -22,24 +22,22 @@ script.on_event(
defines.events.on_player_mined_entity,
(e: OnPlayerMinedEntityEvent) => {
let eventName = mapEventIdToName.get(e.name)
handlePlayerUpdate(e.tick, e.player_index, eventName)
handleEntityUpdate(e.tick, e.entity, eventName)
handlePlayerUpdate(e.tick, eventName, e.player_index)
handleEntityUpdate(e.tick, eventName, e.entity)
}
)
script.on_event(
defines.events.on_player_joined_game,
(e: OnPlayerJoinedGameEvent) => {
let eventName = mapEventIdToName.get(e.name)
handlePlayerUpdate(e.tick, e.player_index, eventName)
handlePlayerUpdate(e.tick, mapEventIdToName.get(e.name), e.player_index)
}
)
script.on_event(
defines.events.on_player_changed_position,
(e: OnPlayerChangedPositionEvent) => {
let eventName = mapEventIdToName.get(e.name)
handlePlayerUpdate(e.tick, e.player_index, eventName)
handlePlayerUpdate(e.tick, mapEventIdToName.get(e.name), e.player_index)
}
)
@ -47,8 +45,8 @@ script.on_event(
defines.events.on_tick,
(e: OnTickEvent) => {
if (e.tick % 60 == 0) {
for (const [_, surface] of pairs(game.surfaces)) {
handleSurfaceUpdate(e.tick, surface, mapEventIdToName.get(e.name))
for (const [, surface] of pairs(game.surfaces)) {
handleSurfaceUpdate(e.tick, mapEventIdToName.get(e.name), surface)
}
// for (const [index, _] of pairs(game.surfaces)) {
@ -66,7 +64,7 @@ script.on_event(
script.on_event(
defines.events.on_console_chat,
(e: OnConsoleChatEvent) => {
handleConsoleChat(e.tick, e.player_index, e.message, mapEventIdToName.get(e.name))
handleConsoleChat(e.tick, mapEventIdToName.get(e.name), e.player_index, e.message)
}
)