Merge branch 'main' into heightmaps

2024-08-23 00:01:57 +03:00
parent 777453718a 719135fe19
commit f2395dede8
9 changed files with 256 additions and 34 deletions
@@ -46,13 +46,13 @@ class ContentLoader {

    static void loadCustomBlockModel(Block& def, dynamic::Map* primitives);
    static void loadBlockMaterial(BlockMaterial& def, const fs::path& file);
-    static void loadBlock(
+    void loadBlock(
        Block& def, const std::string& name, const fs::path& file
    );
-    static void loadItem(
+    void loadItem(
        ItemDef& def, const std::string& name, const fs::path& file
    );
-    static void loadEntity(
+    void loadEntity(
        EntityDef& def, const std::string& name, const fs::path& file
    );
    void loadResources(ResourceType type, dynamic::List* list);