diff --git a/mods/API/ApiLoader/src/Api.lua b/mods/API/ApiLoader/src/Api.lua index 78bfd64..84215ff 100644 --- a/mods/API/ApiLoader/src/Api.lua +++ b/mods/API/ApiLoader/src/Api.lua @@ -3,4 +3,4 @@ Api = {} local modInfo = Mod.getInfo('smc__api__api_loader') local require = modInfo.require -require('GlobalStep') \ No newline at end of file +require('Api.GlobalStep') \ No newline at end of file diff --git a/mods/API/ApiLoader/src/Api/GlobalStep.lua b/mods/API/ApiLoader/src/Api/GlobalStep.lua index 7ecb4f8..434af7c 100644 --- a/mods/API/ApiLoader/src/Api/GlobalStep.lua +++ b/mods/API/ApiLoader/src/Api/GlobalStep.lua @@ -32,7 +32,7 @@ end) local callsForEachPlayer = {} ---@param timeDelay number ----@param callbackFunc fun(player:Player, deltaTime:number) +---@param callbackFunc fun(deltaTime:number, player:Player) function Api.registerGlobalStepForEachPlayer(timeDelay, callbackFunc) table.insert(callsWithDelay, { timeDelay = timeDelay, diff --git a/mods/CORE/Control/init.lua b/mods/CORE/Control/init.lua index 73c3e80..d73de9d 100644 --- a/mods/CORE/Control/init.lua +++ b/mods/CORE/Control/init.lua @@ -1,4 +1,4 @@ -local modInfo = Mod.getInfo('smc__api__callbacks_control') +local modInfo = Mod.getInfo('smc__core__control') local require = modInfo.require return require('Control') \ No newline at end of file diff --git a/mods/CORE/Control/mod.conf b/mods/CORE/Control/mod.conf index 3be755d..885c8da 100644 --- a/mods/CORE/Control/mod.conf +++ b/mods/CORE/Control/mod.conf @@ -1,2 +1,2 @@ -name = smc__api__callbacks_control -depends = smc__api__callbacks +name = smc__core__control +depends = smc__api__api_loader diff --git a/mods/CORE/Control/src/Control.lua b/mods/CORE/Control/src/Control.lua index 5136a2a..d79069a 100644 --- a/mods/CORE/Control/src/Control.lua +++ b/mods/CORE/Control/src/Control.lua @@ -80,7 +80,7 @@ core.register_on_leaveplayer(function(player, timed_out) playersControlTimer[playerName] = nil end) -Api.registerGlobalStepForEachPlayer(0, function(player, deltaTime) +Api.registerGlobalStepForEachPlayer(0, function(deltaTime, player) if player == nil then return end diff --git a/mods/CORE/Formspec/init.lua b/mods/CORE/Formspec/init.lua index b82ceb5..ee75934 100644 --- a/mods/CORE/Formspec/init.lua +++ b/mods/CORE/Formspec/init.lua @@ -1,4 +1,4 @@ -local modInfo = Mod.getInfo('smc__ui__formspec') +local modInfo = Mod.getInfo('smc__core__formspec') local require = modInfo.require return require('Formspec') \ No newline at end of file diff --git a/mods/CORE/Item/mod.conf b/mods/CORE/Item/mod.conf index d238ca3..8419ee5 100644 --- a/mods/CORE/Item/mod.conf +++ b/mods/CORE/Item/mod.conf @@ -1,2 +1,2 @@ name = smc__core__item -depends = smc__api__api_loader, smc__core__enum, smc__core__item_factory +depends = smc__api__api_loader, smc__core__item_factory diff --git a/mods/ENVIRONMENT/MapGenerator/src/asyncInit.lua b/mods/ENVIRONMENT/MapGenerator/src/asyncInit.lua index 9a42943..71f6d26 100644 --- a/mods/ENVIRONMENT/MapGenerator/src/asyncInit.lua +++ b/mods/ENVIRONMENT/MapGenerator/src/asyncInit.lua @@ -5,9 +5,6 @@ -- so global tables need to be preloaded manually. -- --- Global APIs load -- --- Api loader -dofile(core.get_modpath('smc__api__api_loader')..'/init.lua') - -- Class dofile(core.get_modpath('smc__api__class')..'/init.lua') @@ -37,6 +34,10 @@ dofile(core.get_modpath('smc__api__mod')..'/init.lua') -- Table dofile(core.get_modpath('smc__api__table')..'/init.lua') +-- TODO: пока что закоментировано, поскольку вызывает ошибку из-за global_step +-- Api loader +-- dofile(core.get_modpath('smc__api__api_loader')..'/init.lua') + ---@type MapGen local mapGenerator = dofile(core.get_modpath('smc__core__map_generator')..'/src/mapGenerator.lua')