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

add ores

Browse source
This commit is contained in:
MihailRis 2024-09-30 13:14:53 +03:00
parent e590d06bb0
commit e30e0083a0
5 changed files with 44 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/content/loading/GeneratorLoader.cpp
View file

@ -212,5 +212,6 @@ void ContentLoader::loadGenerator(
);
}
load_biomes(def, biomesFiles);
def.script = scripting::load_generator(def, scriptFile);
def.script = scripting::load_generator(
def, scriptFile, pack->id+":generators/"+name+".files");
}

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

@ -149,7 +149,8 @@ namespace scripting {
std::unique_ptr<GeneratorScript> load_generator(
const GeneratorDef& def,
const fs::path& file
const fs::path& file,
const std::string& dirPath
);
/// @brief Load package-specific world script

10
src/logic/scripting/scripting_world_generation.cpp
View file

@ -126,12 +126,20 @@ public:
};
std::unique_ptr<GeneratorScript> scripting::load_generator(
const GeneratorDef& def, const fs::path& file
const GeneratorDef& def, const fs::path& file, const std::string& dirPath
) {
auto env = create_environment();
auto L = lua::get_main_thread();
lua::stackguard _(L);
lua::pushenv(L, *env);
lua::pushstring(L, dirPath);
lua::setfield(L, "__DIR__");
lua::pushstring(L, dirPath + "/script.lua");
lua::setfield(L, "__FILE__");
lua::pop(L);
if (fs::exists(file)) {
lua::pop(L, load_script(*env, "generator", file));
} else {