From 383dcde2e77cdb7ca672203c8bb21b5806a6d155 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Tue, 28 Jul 2026 23:18:41 +0300
Subject: [PATCH] move default block material name to defaults.toml

---
 res/content/base/config/defaults.toml | 1 +
 src/content/ContentBuilder.cpp        | 3 +++
 src/voxels/Block.hpp                  | 4 +---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/res/content/base/config/defaults.toml b/res/content/base/config/defaults.toml
index 650c24d74..d2c5142cc 100644
--- a/res/content/base/config/defaults.toml
+++ b/res/content/base/config/defaults.toml
@@ -1,3 +1,4 @@
 generator = "base:demo"
 player-entity = "base:player"
 hand-skeleton = "base:hand"
+block-material = "base:stone"
diff --git a/src/content/ContentBuilder.cpp b/src/content/ContentBuilder.cpp
index 25029963b..97498b497 100644
--- a/src/content/ContentBuilder.cpp
+++ b/src/content/ContentBuilder.cpp
@@ -39,6 +39,9 @@ std::unique_ptr<Content> ContentBuilder::build() {
         } else {
             def.defaults.rt.solid = isSolid(def.defaults) || def.explictlySolid;
         }
+        if (def.material.empty()) {
+            defaults.at("block-material").get(def.material);
+        }
 
         const float EPSILON = 0.01f;
         def.rt.solid =
diff --git a/src/voxels/Block.hpp b/src/voxels/Block.hpp
index 5ba3bb267..ded51244e 100644
--- a/src/voxels/Block.hpp
+++ b/src/voxels/Block.hpp
@@ -37,8 +37,6 @@ inline constexpr size_t MAX_USER_BLOCK_FIELDS_SIZE = 240;
 
 inline constexpr int BLOCK_MAX_VARIANTS = 16;
 
-inline std::string DEFAULT_MATERIAL = "base:stone";
-
 struct BlockFuncsSet {
     bool init : 1;
     bool update : 1;
@@ -206,7 +204,7 @@ public:
     dv::value properties = nullptr;
 
     /// @brief id of used BlockMaterial, may specify non-existing material
-    std::string material = DEFAULT_MATERIAL;
+    std::string material;
 
     /// @brief Light emission R, G, B, S (sky lights: sun, moon, radioactive
     /// clouds)