update events & update some built-in events codes

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
+    local result = nil
-    if events.handlers[event] then
+    local handlers = events.handlers[event]
-        result = result or events.handlers[event](...)
+    if handlers == nil then
+        return nil
+    end
+    for _, func in ipairs(handlers) do
+        result = result or func(...)
     end
     return result
 end

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_open", prefix + ":.worldopen");
-    register_event(env, "on_world_tick", prefix + ".worldtick");
+    register_event(env, "on_world_tick", prefix + ":.worldtick");
-    register_event(env, "on_world_save", prefix + ".worldsave");
+    register_event(env, "on_world_save", prefix + ":.worldsave");
-    register_event(env, "on_world_quit", prefix + ".worldquit");
+    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(

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, "init", packid + ":.init");
-    register_event(env, "on_hud_open", packid + ".hudopen");
+    register_event(env, "on_hud_open", packid + ":.hudopen");
-    register_event(env, "on_hud_render", packid + ".hudrender");
+    register_event(env, "on_hud_render", packid + ":.hudrender");
-    register_event(env, "on_hud_close", packid + ".hudclose");
+    register_event(env, "on_hud_close", packid + ":.hudclose");
 }