voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-08 20:41:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

fixes

Browse source
This commit is contained in:
Xertis 2026-03-23 00:03:43 +03:00
parent 89a6747c21
commit b035621249
5 changed files with 11 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/logic/scripting/scripting.cpp
View file

@ -627,16 +627,6 @@ void scripting::on_ui_close(UiDocument* layout, Inventory* inventory) {
});
}
void scripting::on_content_initialization() {
auto L = lua::get_main_state();
for (auto& pack : content_control->getAllContentPacks()) {
lua::emit_event(L, pack.id + ":.oncontentinitialization", [](auto L) {
return 0;
});
}
}
void scripting::on_scripts_loading() {
auto L = lua::get_main_state();
@ -793,17 +783,15 @@ void scripting::load_world_script(
register_event(env, "on_inventory_closed", prefix + ":.inventoryclosed");
}
void scripting::load_main_script(
void scripting::load_content_script(
const scriptenv& senv,
const std::string& prefix,
const io::path& file,
const std::string& fileName,
MainFuncsSet& funcsset
const std::string& fileName
) {
int env = *senv;
lua::pop(lua::get_main_state(), load_script(env, "main", file, fileName));
lua::pop(lua::get_main_state(), load_script(env, "content", file, fileName));
register_event(env, "on_content_initialization", prefix + ":.oncontentinitialization");
register_event(env, "on_scripts_loading", prefix + ":.onscriptsloading");
register_event(env, "on_content_loaded", prefix + ":.oncontentloaded");
}

9
src/logic/scripting/scripting.hpp
View file

@ -27,7 +27,6 @@ struct BlockFuncNamesCache;
struct ItemFuncsSet;
struct ItemFuncNamesCache;
struct WorldFuncsSet;
struct MainFuncsSet;
struct UserComponent;
struct UiDocScript;
class BlocksController;
@ -161,9 +160,6 @@ namespace scripting {
/// @brief Called on UI view close
void on_ui_close(UiDocument* layout, Inventory* inventory);
/// @brief Called before loading
void on_content_initialization();
/// @brief Called on Content loading
void on_scripts_loading();
@ -231,12 +227,11 @@ namespace scripting {
WorldFuncsSet& funcsset
);
void load_main_script(
void load_content_script(
const scriptenv& env,
const std::string& packid,
const io::path& file,
const std::string& fileName,
MainFuncsSet& funcsset
const std::string& fileName
);
/// @brief Load script associated with an UiDocument