aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-27 11:35:22 +09:00
Code Issues Packages Projects Releases Wiki Activity

Switch to sp/mp init events (#404)

Browse Source
This commit is contained in:
Cooldude2606
2025-08-30 20:39:54 +01:00
committed by GitHub
parent 82c2c7f23c
commit 8bcb65101b
7 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
exp_util/module/async.lua
View File

@@ -408,13 +408,10 @@ end
local e = defines.events
local events = {
[e.on_tick] = on_tick,
[e.on_singleplayer_init] = Async.on_init,
[e.on_multiplayer_init] = Async.on_init,
}
local Clustorio = ExpUtil.optional_require("modules/clusterio/api")
if Clustorio then
events[Clustorio.events.on_server_startup] = Async.on_init
end
Async._function_metatable.__call = Async._function_prototype.start_soon
Async.events = events --- @package
return Async

7
exp_util/module/include/package.lua
View File

@@ -1,7 +1,5 @@
-- luacheck:ignore global package
local Clustorio = require("modules/clusterio/api")
--- Enum values for the different lifecycle stages within a factorio module
-- Info on the data lifecycle and how we use it: https://lua-api.factorio.com/latest/auxiliary/data-lifecycle.html
-- We start in control stage and so values 1 thorough 3 are only present for completeness
@@ -25,10 +23,9 @@ return setmetatable({
on_load = function() package.lifecycle = package.lifecycle_stage.load end,
on_configuration_changed = function() package.lifecycle = package.lifecycle_stage.config_change end,
events = {
-- TODO find a reliable way to set to runtime because currently it will desync if accessed before player joined
-- TODO make clusterio optional dependency
[defines.events.on_player_joined_game] = function() package.lifecycle = package.lifecycle_stage.runtime end,
[Clustorio.events.on_server_startup] = function() package.lifecycle = package.lifecycle_stage.runtime end,
[defines.events.on_singleplayer_init] = function() package.lifecycle = package.lifecycle_stage.runtime end,
[defines.events.on_multiplayer_init] = function() package.lifecycle = package.lifecycle_stage.runtime end,
},
}, {
__index = package,

12
exp_util/module/storage.lua
View File

@@ -119,12 +119,10 @@ function Storage.on_init()
end
end
local events = {}
--- @package
Storage.events = {
[defines.events.on_multiplayer_init] = Storage.on_init,
[defines.events.on_singleplayer_init] = Storage.on_init,
}
local Clustorio = ExpUtil.optional_require("modules/clusterio/api")
if Clustorio then
events[Clustorio.events.on_server_startup] = Storage.on_init
end
Storage.events = events --- @package
return Storage