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

feat: load block and item scripts after content load

Browse source
This commit is contained in:
MihailRis 2024-11-22 08:56:59 +03:00
parent 4c0c6dd51a
commit a641099d36
5 changed files with 45 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -157,10 +157,13 @@ void scripting::process_post_runnables() {
}
}
void scripting::on_content_load(Content* content) {
scripting::content = content;
scripting::indices = content->getIndices();
}
void scripting::on_world_load(LevelController* controller) {
scripting::level = controller->getLevel();
scripting::content = level->content;
scripting::indices = level->content->getIndices();
scripting::blocks = controller->getBlocksController();
scripting::controller = controller;
@ -671,7 +674,7 @@ int scripting::get_values_on_stack() {
return lua::gettop(lua::get_main_state());
}
void scripting::load_block_script(
void scripting::load_content_script(
const scriptenv& senv,
const std::string& prefix,
const fs::path& file,
@ -692,7 +695,7 @@ void scripting::load_block_script(
register_event(env, "on_blocks_tick", prefix + ".blockstick");
}
void scripting::load_item_script(
void scripting::load_content_script(
const scriptenv& senv,
const std::string& prefix,
const fs::path& file,

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

@ -45,6 +45,8 @@ namespace scripting {
void initialize(Engine* engine);
void on_content_load(Content* content);
bool register_event(
int env, const std::string& name, const std::string& id
);
@ -128,7 +130,7 @@ namespace scripting {
/// @param file item script file
/// @param fileName script file path using the engine format
/// @param funcsset block callbacks set
void load_block_script(
void load_content_script(
const scriptenv& env,
const std::string& prefix,
const fs::path& file,
@ -142,7 +144,7 @@ namespace scripting {
/// @param file item script file
/// @param fileName script file path using the engine format
/// @param funcsset item callbacks set
void load_item_script(
void load_content_script(
const scriptenv& env,
const std::string& prefix,
const fs::path& file,