PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

feat: load world scripts after content load

Browse Source
This commit is contained in:
MihailRis 2024-11-22 09:47:43 +03:00
parent 8543be87df
commit 0ec081a3ae
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/content/ContentLoader.cpp
View File

@ -707,18 +707,6 @@ void ContentLoader::load() {
auto folder = pack->folder;
// Load main world script
fs::path scriptFile = folder / fs::path("scripts/world.lua");
if (fs::is_regular_file(scriptFile)) {
scripting::load_world_script(
env,
pack->id,
scriptFile,
pack->id + ":scripts/world.lua",
runtime->worldfuncsset
);
}
// Load world generators
fs::path generatorsDir = folder / fs::u8path("generators");
foreach_file(generatorsDir, [this](const fs::path& file) {
@ -830,6 +818,21 @@ static void load_scripts(Content& content, ContentUnitDefs<T>& units) {
void ContentLoader::loadScripts(Content& content) {
load_scripts(content, content.blocks);
load_scripts(content, content.items);
for (const auto& [packid, runtime] : content.getPacks()) {
const auto& pack = runtime->getInfo();
// Load main world script
fs::path scriptFile = pack.folder / fs::path("scripts/world.lua");
if (fs::is_regular_file(scriptFile)) {
scripting::load_world_script(
runtime->getEnvironment(),
pack.id,
scriptFile,
pack.id + ":scripts/world.lua",
runtime->worldfuncsset
);
}
}
}
void ContentLoader::loadResources(ResourceType type, const dv::value& list) {