From d839da7dab6837d7dd705b506780b50d16530f26 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Thu, 26 Sep 2024 01:30:55 +0300
Subject: [PATCH] collect generator voxel fragments to directory

---
 .../generators/demo/{ => fragments}/coal_ore0.vox   | Bin
 .../base/generators/demo/{ => fragments}/tower.vox  | Bin
 .../base/generators/demo/{ => fragments}/tree0.vox  | Bin
 .../base/generators/demo/{ => fragments}/tree1.vox  | Bin
 .../base/generators/demo/{ => fragments}/tree2.vox  | Bin
 src/content/ContentLoader.hpp                       |   2 +-
 src/content/loading/GeneratorLoader.cpp             |   2 +-
 src/logic/scripting/lua/libcore.cpp                 |   4 +++-
 8 files changed, 5 insertions(+), 3 deletions(-)
 rename res/content/base/generators/demo/{ => fragments}/coal_ore0.vox (100%)
 rename res/content/base/generators/demo/{ => fragments}/tower.vox (100%)
 rename res/content/base/generators/demo/{ => fragments}/tree0.vox (100%)
 rename res/content/base/generators/demo/{ => fragments}/tree1.vox (100%)
 rename res/content/base/generators/demo/{ => fragments}/tree2.vox (100%)

diff --git a/res/content/base/generators/demo/coal_ore0.vox b/res/content/base/generators/demo/fragments/coal_ore0.vox
similarity index 100%
rename from res/content/base/generators/demo/coal_ore0.vox
rename to res/content/base/generators/demo/fragments/coal_ore0.vox
diff --git a/res/content/base/generators/demo/tower.vox b/res/content/base/generators/demo/fragments/tower.vox
similarity index 100%
rename from res/content/base/generators/demo/tower.vox
rename to res/content/base/generators/demo/fragments/tower.vox
diff --git a/res/content/base/generators/demo/tree0.vox b/res/content/base/generators/demo/fragments/tree0.vox
similarity index 100%
rename from res/content/base/generators/demo/tree0.vox
rename to res/content/base/generators/demo/fragments/tree0.vox
diff --git a/res/content/base/generators/demo/tree1.vox b/res/content/base/generators/demo/fragments/tree1.vox
similarity index 100%
rename from res/content/base/generators/demo/tree1.vox
rename to res/content/base/generators/demo/fragments/tree1.vox
diff --git a/res/content/base/generators/demo/tree2.vox b/res/content/base/generators/demo/fragments/tree2.vox
similarity index 100%
rename from res/content/base/generators/demo/tree2.vox
rename to res/content/base/generators/demo/fragments/tree2.vox
diff --git a/src/content/ContentLoader.hpp b/src/content/ContentLoader.hpp
index fdd93ef8..ae01a955 100644
--- a/src/content/ContentLoader.hpp
+++ b/src/content/ContentLoader.hpp
@@ -55,7 +55,7 @@ class ContentLoader {
 public:
     ContentLoader(ContentPack* pack, ContentBuilder& builder);
 
-    bool fixPackIndices(
+    static bool fixPackIndices(
         const fs::path& folder,
         dv::value& indicesRoot,
         const std::string& contentSection
diff --git a/src/content/loading/GeneratorLoader.cpp b/src/content/loading/GeneratorLoader.cpp
index 256a1b28..fd6fdf38 100644
--- a/src/content/loading/GeneratorLoader.cpp
+++ b/src/content/loading/GeneratorLoader.cpp
@@ -22,7 +22,7 @@ static VoxelStructureMeta load_structure_meta(
 static std::vector<std::unique_ptr<GeneratingVoxelStructure>> load_structures(
     const fs::path& structuresFile
 ) {
-    auto structuresDir = structuresFile.parent_path();
+    auto structuresDir = structuresFile.parent_path() / fs::path("fragments");
     auto map = files::read_json(structuresFile);
 
     std::vector<std::unique_ptr<GeneratingVoxelStructure>> structures;
diff --git a/src/logic/scripting/lua/libcore.cpp b/src/logic/scripting/lua/libcore.cpp
index 3ab665c2..38267e4d 100644
--- a/src/logic/scripting/lua/libcore.cpp
+++ b/src/logic/scripting/lua/libcore.cpp
@@ -180,12 +180,14 @@ static int l_get_default_generator(lua::State* L) {
 /// @brief Get a list of all world generators
 /// @return A table with the IDs of all world generators
 static int l_get_generators(lua::State* L) {
+    if (content == nullptr) {
+        throw std::runtime_error("content is not initialized");
+    }
     const auto& generators = content->generators.getDefs();
     lua::createtable(L, generators.size(), 0);
 
     int i = 0;
     for (auto& [name, _] : generators) {
-        std::cout << name << std::endl;
         lua::pushstring(L, name);
         lua::rawseti(L, i + 1);
         i++;