From 44fd5416a9a110a12f8b3f2d369e5638055b306e Mon Sep 17 00:00:00 2001 From: MihailRis Date: Tue, 29 Oct 2024 21:06:49 +0300 Subject: [PATCH 1/5] fix string.replace --- res/scripts/stdlib.lua | 4 +++- res/scripts/stdmin.lua | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/res/scripts/stdlib.lua b/res/scripts/stdlib.lua index 8fbc779f..2dcb91ed 100644 --- a/res/scripts/stdlib.lua +++ b/res/scripts/stdlib.lua @@ -9,7 +9,9 @@ function sleep(timesec) end end --- events +------------------------------------------------ +------------------- Events --------------------- +------------------------------------------------ events = { handlers = {} } diff --git a/res/scripts/stdmin.lua b/res/scripts/stdmin.lua index 9a955fff..ec3b1fec 100644 --- a/res/scripts/stdmin.lua +++ b/res/scripts/stdmin.lua @@ -109,7 +109,8 @@ function string.explode(separator, str, withpattern) local current_pos = 1 for i = 1, string_len(str) do - local start_pos, end_pos = string_find(str, separator, current_pos, not withpattern) + local start_pos, end_pos = string_find( + str, separator, current_pos, not withpattern) if (not start_pos) then break end ret[i] = string_sub(str, current_pos, start_pos - 1) current_pos = end_pos + 1 @@ -139,7 +140,7 @@ function string.formatted_time(seconds, format) end function string.replace(str, tofind, toreplace) - local tbl = string.Explode(tofind, str) + local tbl = string.explode(tofind, str) if (tbl[1]) then return table.concat(tbl, toreplace) end return str end From 1543a0ce4c856127d6ceb225c414f91dfc1b134c Mon Sep 17 00:00:00 2001 From: MihailRis Date: Tue, 29 Oct 2024 21:34:40 +0300 Subject: [PATCH 2/5] update events system --- res/scripts/stdlib.lua | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/res/scripts/stdlib.lua b/res/scripts/stdlib.lua index 2dcb91ed..5f3a9d74 100644 --- a/res/scripts/stdlib.lua +++ b/res/scripts/stdlib.lua @@ -17,16 +17,17 @@ events = { } function events.on(event, func) - -- why an array? length is always = 1 - -- FIXME: temporary fixed - events.handlers[event] = {} -- events.handlers[event] or {} - table.insert(events.handlers[event], func) + events.handlers[event] = func end function events.remove_by_prefix(prefix) for name, handlers in pairs(events.handlers) do - if name:sub(1, #prefix) == prefix then - events.handlers[name] = nil + local actualname = name + if type(name) == 'table' then + actualname = name[1] + end + if actualname:sub(1, #prefix+1) == prefix..':' then + events.handlers[actualname] = nil end end end @@ -38,9 +39,7 @@ end function events.emit(event, ...) result = nil if events.handlers[event] then - for _, func in ipairs(events.handlers[event]) do - result = result or func(...) - end + result = result or events.handlers[event](...) end return result end From 72d5eca632512df52edbc3f56dfed8b7e7bdd711 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Fri, 1 Nov 2024 15:05:06 +0300 Subject: [PATCH 3/5] update events & update some built-in events codes --- res/scripts/stdlib.lua | 15 +++++++++++---- src/logic/scripting/scripting.cpp | 26 +++++++++++++------------- src/logic/scripting/scripting_hud.cpp | 14 +++++++------- 3 files changed, 31 insertions(+), 24 deletions(-) diff --git a/res/scripts/stdlib.lua b/res/scripts/stdlib.lua index 5f3a9d74..fb2c7702 100644 --- a/res/scripts/stdlib.lua +++ b/res/scripts/stdlib.lua @@ -17,7 +17,10 @@ events = { } function events.on(event, func) - events.handlers[event] = func + if events.handlers[event] == nil then + events.handlers[event] = {} + end + table.insert(events.handlers[event], func) end function events.remove_by_prefix(prefix) @@ -37,9 +40,13 @@ function pack.unload(prefix) end function events.emit(event, ...) - result = nil - if events.handlers[event] then - result = result or events.handlers[event](...) + local result = nil + local handlers = events.handlers[event] + if handlers == nil then + return nil + end + for _, func in ipairs(handlers) do + result = result or func(...) end return result end diff --git a/src/logic/scripting/scripting.cpp b/src/logic/scripting/scripting.cpp index 8456e220..67d20a5b 100644 --- a/src/logic/scripting/scripting.cpp +++ b/src/logic/scripting/scripting.cpp @@ -164,32 +164,32 @@ void scripting::on_world_load(LevelController* controller) { auto L = lua::get_main_state(); for (auto& pack : scripting::engine->getContentPacks()) { - lua::emit_event(L, pack.id + ".worldopen"); + lua::emit_event(L, pack.id + ":.worldopen"); } } void scripting::on_world_tick() { auto L = lua::get_main_state(); for (auto& pack : scripting::engine->getContentPacks()) { - lua::emit_event(L, pack.id + ".worldtick"); + lua::emit_event(L, pack.id + ":.worldtick"); } } void scripting::on_world_save() { auto L = lua::get_main_state(); for (auto& pack : scripting::engine->getContentPacks()) { - lua::emit_event(L, pack.id + ".worldsave"); + lua::emit_event(L, pack.id + ":.worldsave"); } } void scripting::on_world_quit() { auto L = lua::get_main_state(); for (auto& pack : scripting::engine->getContentPacks()) { - lua::emit_event(L, pack.id + ".worldquit"); + lua::emit_event(L, pack.id + ":.worldquit"); } lua::getglobal(L, "pack"); - for (auto& pack : scripting::engine->getContentPacks()) { + for (auto& pack : scripting::engine->getAllContentPacks()) { lua::getfield(L, "unload"); lua::pushstring(L, pack.id); lua::call_nothrow(L, 1); @@ -248,7 +248,7 @@ void scripting::on_block_placed( if (pack->worldfuncsset.onblockplaced) { lua::emit_event( lua::get_main_state(), - packid + ".blockplaced", + packid + ":.blockplaced", world_event_args ); } @@ -280,7 +280,7 @@ void scripting::on_block_broken( if (pack->worldfuncsset.onblockbroken) { lua::emit_event( lua::get_main_state(), - packid + ".blockbroken", + packid + ":.blockbroken", world_event_args ); } @@ -686,14 +686,14 @@ void scripting::load_world_script( int env = *senv; lua::pop(lua::get_main_state(), load_script(env, "world", file)); register_event(env, "init", prefix + ".init"); - register_event(env, "on_world_open", prefix + ".worldopen"); - register_event(env, "on_world_tick", prefix + ".worldtick"); - register_event(env, "on_world_save", prefix + ".worldsave"); - register_event(env, "on_world_quit", prefix + ".worldquit"); + register_event(env, "on_world_open", prefix + ":.worldopen"); + register_event(env, "on_world_tick", prefix + ":.worldtick"); + register_event(env, "on_world_save", prefix + ":.worldsave"); + register_event(env, "on_world_quit", prefix + ":.worldquit"); funcsset.onblockplaced = - register_event(env, "on_block_placed", prefix + ".blockplaced"); + register_event(env, "on_block_placed", prefix + ":.blockplaced"); funcsset.onblockbroken = - register_event(env, "on_block_broken", prefix + ".blockbroken"); + register_event(env, "on_block_broken", prefix + ":.blockbroken"); } void scripting::load_layout_script( diff --git a/src/logic/scripting/scripting_hud.cpp b/src/logic/scripting/scripting_hud.cpp index a711453c..a8856837 100644 --- a/src/logic/scripting/scripting_hud.cpp +++ b/src/logic/scripting/scripting_hud.cpp @@ -22,7 +22,7 @@ void scripting::on_frontend_init(Hud* hud) { for (auto& pack : engine->getContentPacks()) { lua::emit_event( lua::get_main_state(), - pack.id + ".hudopen", + pack.id + ":.hudopen", [&](lua::State* L) { return lua::pushinteger(L, hud->getPlayer()->getId()); } @@ -34,7 +34,7 @@ void scripting::on_frontend_render() { for (auto& pack : engine->getContentPacks()) { lua::emit_event( lua::get_main_state(), - pack.id + ".hudrender", + pack.id + ":.hudrender", [&](lua::State* L) { return 0; } ); } @@ -44,7 +44,7 @@ void scripting::on_frontend_close() { for (auto& pack : engine->getContentPacks()) { lua::emit_event( lua::get_main_state(), - pack.id + ".hudclose", + pack.id + ":.hudclose", [&](lua::State* L) { return lua::pushinteger(L, hud->getPlayer()->getId()); } @@ -62,8 +62,8 @@ void scripting::load_hud_script( lua::execute(lua::get_main_state(), env, src, file.u8string()); - register_event(env, "init", packid + ".init"); - register_event(env, "on_hud_open", packid + ".hudopen"); - register_event(env, "on_hud_render", packid + ".hudrender"); - register_event(env, "on_hud_close", packid + ".hudclose"); + register_event(env, "init", packid + ":.init"); + register_event(env, "on_hud_open", packid + ":.hudopen"); + register_event(env, "on_hud_render", packid + ":.hudrender"); + register_event(env, "on_hud_close", packid + ":.hudclose"); } From a47bdc04094f77e6d214368b91513a088b2a3368 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Fri, 1 Nov 2024 15:14:25 +0300 Subject: [PATCH 4/5] update doc/*/scripting/events.md --- doc/en/scripting/events.md | 21 +++++++++++++++++++++ doc/ru/scripting/events.md | 21 +++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/doc/en/scripting/events.md b/doc/en/scripting/events.md index 45b8969b..186943f9 100644 --- a/doc/en/scripting/events.md +++ b/doc/en/scripting/events.md @@ -136,3 +136,24 @@ function on_hud_close(playerid: int) ``` Called on world close (before saving) + +## *events* library + +```lua +events.on(code: str, handler: function) +``` + +Adds an event handler by its code, not limited to the standard ones. + +```lua +events.emit(code: str, args...) -> bool +``` + +Emits an event by code. If the event does not exist, nothing will happen. +The existence of an event is determined by the presence of handlers. + +```lua +events.unload(packid: str) +``` + +Removes all events with the prefix `packid:`. When you exit the world, events from all packs are unloaded, including `core:`. diff --git a/doc/ru/scripting/events.md b/doc/ru/scripting/events.md index f3a3045b..d6795b26 100644 --- a/doc/ru/scripting/events.md +++ b/doc/ru/scripting/events.md @@ -135,3 +135,24 @@ function on_hud_close(playerid: int) ``` Вызывается при выходе из мира, перед его сохранением. + +## Библиотека *events* + +```lua +events.on(code: str, handler: function) +``` + +Добавляет обработчик события по его коду, не ограничиваясь стандартными. + +```lua +events.emit(code: str, args...) -> bool +``` + +Генерирует событие по коду. Если событие не существует, ничего не произойдет. +Существование события определяется наличием обработчиков. + +```lua +events.unload(packid: str) +``` + +Удаляет все события с префиксом `packid:`. Вы выходе из мира выгружаются события всех паков, включая `core:`. From 9444fa79370292f87fe9ebd93a859d94dbe97e3b Mon Sep 17 00:00:00 2001 From: MihailRis Date: Fri, 1 Nov 2024 15:15:48 +0300 Subject: [PATCH 5/5] update doc/*/scripting/events.md --- doc/en/scripting/events.md | 2 +- doc/ru/scripting/events.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/en/scripting/events.md b/doc/en/scripting/events.md index 186943f9..0d3f83e4 100644 --- a/doc/en/scripting/events.md +++ b/doc/en/scripting/events.md @@ -153,7 +153,7 @@ Emits an event by code. If the event does not exist, nothing will happen. The existence of an event is determined by the presence of handlers. ```lua -events.unload(packid: str) +events.remove_by_prefix(packid: str) ``` Removes all events with the prefix `packid:`. When you exit the world, events from all packs are unloaded, including `core:`. diff --git a/doc/ru/scripting/events.md b/doc/ru/scripting/events.md index d6795b26..cf61343f 100644 --- a/doc/ru/scripting/events.md +++ b/doc/ru/scripting/events.md @@ -152,7 +152,7 @@ events.emit(code: str, args...) -> bool Существование события определяется наличием обработчиков. ```lua -events.unload(packid: str) +events.remove_by_prefix(packid: str) ``` Удаляет все события с префиксом `packid:`. Вы выходе из мира выгружаются события всех паков, включая `core:`.