From a52d68669d0a860a3ce0aba4ee5ee98ea7743566 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Fri, 8 Nov 2024 17:44:57 +0300
Subject: [PATCH 01/80] add 'size_spread' particles parameter

---
 src/graphics/render/ParticlesRenderer.cpp | 4 +++-
 src/presets/ParticlesPreset.cpp           | 2 ++
 src/presets/ParticlesPreset.hpp           | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/graphics/render/ParticlesRenderer.cpp b/src/graphics/render/ParticlesRenderer.cpp
index 0e030dbc..c5048c55 100644
--- a/src/graphics/render/ParticlesRenderer.cpp
+++ b/src/graphics/render/ParticlesRenderer.cpp
@@ -89,11 +89,13 @@ void ParticlesRenderer::renderParticles(const Camera& camera, float delta) {
                 );
                 light *= 0.9f + (particle.random % 100) * 0.001f;
             }
+            float scale = 1.0f + ((particle.random ^ 2628172) % 1000) *
+                                     0.001f * preset.sizeSpread;
             batch->quad(
                 particle.position,
                 right,
                 preset.globalUpVector ? glm::vec3(0, 1, 0) : up,
-                preset.size,
+                preset.size * scale,
                 light,
                 glm::vec3(1.0f),
                 particle.region
diff --git a/src/presets/ParticlesPreset.cpp b/src/presets/ParticlesPreset.cpp
index 31b0cff2..181dbeb5 100644
--- a/src/presets/ParticlesPreset.cpp
+++ b/src/presets/ParticlesPreset.cpp
@@ -42,6 +42,7 @@ dv::value ParticlesPreset::serialize() const {
     root["acceleration"] = dv::to_value(acceleration);
     root["explosion"] = dv::to_value(explosion);
     root["size"] = dv::to_value(size);
+    root["size_spread"] = sizeSpread;
     root["spawn_spread"] = dv::to_value(size);
     root["spawn_shape"] = to_string(spawnShape);
     root["random_sub_uv"] = randomSubUV;
@@ -67,6 +68,7 @@ void ParticlesPreset::deserialize(const dv::value& src) {
     if (src.has("size")) {
         dv::get_vec(src["size"], size);
     }
+    src.at("size_spread").get(sizeSpread);
     if (src.has("spawn_spread")) {
         dv::get_vec(src["spawn_spread"], spawnSpread);
     }
diff --git a/src/presets/ParticlesPreset.hpp b/src/presets/ParticlesPreset.hpp
index 483ce1b4..eb9f06dd 100644
--- a/src/presets/ParticlesPreset.hpp
+++ b/src/presets/ParticlesPreset.hpp
@@ -42,6 +42,8 @@ struct ParticlesPreset : public Serializable {
     glm::vec3 explosion {2.0f};
     /// @brief Particle size
     glm::vec3 size {0.1f};
+    /// @brief Particles size spread
+    float sizeSpread = 0.2f;
     /// @brief Spawn spread shape
     ParticleSpawnShape spawnShape = BALL;
     /// @brief Spawn spread

From 3ff79a0210c33e90980ae57eaed423d447596fd8 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sat, 9 Nov 2024 20:20:17 +0300
Subject: [PATCH 02/80] update docs

---
 doc/ru/particles.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ru/particles.md b/doc/ru/particles.md
index bc20a4a3..167337f8 100644
--- a/doc/ru/particles.md
+++ b/doc/ru/particles.md
@@ -17,6 +17,7 @@
 | acceleration    | Ускорение частиц.                                                            | {0, -16, 0}     |
 | explosion       | Сила разлёта частиц при спавне.                                              | {2, 2, 2}       |
 | size            | Размер частиц.                                                               | {0.1, 0.1, 0.1} |
+| size_spread     | Максимальное отклонение времени размера частиц.                              | 0.2             |
 | spawn_shape     | Форма области спавна частиц. (ball/sphere/box)                               | ball            |
 | spawn_spread    | Размер области спавна частиц.                                                | {0, 0, 0}       |
 | random_sub_uv   | Размер случайного подрегиона текстуры (1 - будет использована вся текстура). | 1.0             |

From 5793c52ac6aff52a9730ddcce938672bff8f5f71 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Fri, 15 Nov 2024 06:47:03 +0300
Subject: [PATCH 03/80] Revert "remove 'translucent' block property (will be
 reverted later)"

This reverts commit 7aacadc926432da2583b95f6a02af08ee51c2c91.
---
 res/content/base/blocks/water.json | 3 ++-
 src/content/ContentLoader.cpp      | 1 +
 src/voxels/Block.cpp               | 1 +
 src/voxels/Block.hpp               | 3 +++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/res/content/base/blocks/water.json b/res/content/base/blocks/water.json
index 943640e8..f7785044 100644
--- a/res/content/base/blocks/water.json
+++ b/res/content/base/blocks/water.json
@@ -6,5 +6,6 @@
     "sky-light-passing": false,
     "obstacle": false,
     "selectable": false,
-    "replaceable": true
+    "replaceable": true,
+    "translucent": true
 }
diff --git a/src/content/ContentLoader.cpp b/src/content/ContentLoader.cpp
index a801500e..4414999d 100644
--- a/src/content/ContentLoader.cpp
+++ b/src/content/ContentLoader.cpp
@@ -333,6 +333,7 @@ void ContentLoader::loadBlock(
     root.at("inventory-size").get(def.inventorySize);
     root.at("tick-interval").get(def.tickInterval);
     root.at("overlay-texture").get(def.overlayTexture);
+    root.at("translucent").get(def.translucent);
 
     if (root.has("fields")) {
         def.dataStruct = std::make_unique<StructLayout>();
diff --git a/src/voxels/Block.cpp b/src/voxels/Block.cpp
index 51d9662b..6d4ff761 100644
--- a/src/voxels/Block.cpp
+++ b/src/voxels/Block.cpp
@@ -140,6 +140,7 @@ void Block::cloneTo(Block& dst) {
     dst.inventorySize = inventorySize;
     dst.tickInterval = tickInterval;
     dst.overlayTexture = overlayTexture;
+    dst.translucent = translucent;
     if (particles) {
         dst.particles = std::make_unique<ParticlesPreset>(*particles);
     }
diff --git a/src/voxels/Block.hpp b/src/voxels/Block.hpp
index 26b38469..84835534 100644
--- a/src/voxels/Block.hpp
+++ b/src/voxels/Block.hpp
@@ -172,6 +172,9 @@ public:
     /// @brief Turns off block item generation
     bool hidden = false;
 
+    /// @brief Block has semi-transparent texture
+    bool translucent = false;
+
     /// @brief Set of block physical hitboxes
     std::vector<AABB> hitboxes;
 

From 5b6256e0fa93183c1da9371d65877398ef5f6542 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sat, 16 Nov 2024 04:13:00 +0300
Subject: [PATCH 04/80] introduce ChunkMesh

---
 src/graphics/render/BlocksRenderer.cpp | 154 ++++++++++++++++++++-----
 src/graphics/render/BlocksRenderer.hpp |  12 +-
 src/graphics/render/ChunksRenderer.cpp |  14 ++-
 src/graphics/render/ChunksRenderer.hpp |   5 +-
 src/graphics/render/commons.hpp        |  29 +++++
 5 files changed, 172 insertions(+), 42 deletions(-)
 create mode 100644 src/graphics/render/commons.hpp

diff --git a/src/graphics/render/BlocksRenderer.cpp b/src/graphics/render/BlocksRenderer.cpp
index bf55ef12..25e8997d 100644
--- a/src/graphics/render/BlocksRenderer.cpp
+++ b/src/graphics/render/BlocksRenderer.cpp
@@ -12,6 +12,8 @@
 
 #include <glm/glm.hpp>
 
+#include "util/timeutil.hpp"
+
 const uint BlocksRenderer::VERTEX_SIZE = 6;
 const glm::vec3 BlocksRenderer::SUN_VECTOR (0.411934f, 0.863868f, -0.279161f);
 
@@ -433,21 +435,9 @@ glm::vec4 BlocksRenderer::pickSoftLight(
         right, up);
 }
 
-void BlocksRenderer::render(const voxel* voxels) {
-    int totalBegin = chunk->bottom * (CHUNK_W * CHUNK_D);
-    int totalEnd = chunk->top * (CHUNK_W * CHUNK_D);
-
-    int beginEnds[256][2] {};
-    for (int i = totalBegin; i < totalEnd; i++) {
-        const voxel& vox = voxels[i];
-        blockid_t id = vox.id;
-        const auto& def = *blockDefsCache[id];
-    
-        if (beginEnds[def.drawGroup][0] == 0) {
-            beginEnds[def.drawGroup][0] = i+1;
-        }
-        beginEnds[def.drawGroup][1] = i;
-    }
+void BlocksRenderer::render(
+    const voxel* voxels, int beginEnds[256][2]
+) {
     for (const auto drawGroup : *content.drawGroups) {
         int begin = beginEnds[drawGroup][0];
         if (begin == 0) {
@@ -462,13 +452,13 @@ void BlocksRenderer::render(const voxel* voxels) {
             if (id == 0 || def.drawGroup != drawGroup || state.segment) {
                 continue;
             }
+            //if (def.translucent) {
+            //    continue;
+            //}
             const UVRegion texfaces[6] {
-                cache.getRegion(id, 0), 
-                cache.getRegion(id, 1),
-                cache.getRegion(id, 2), 
-                cache.getRegion(id, 3),
-                cache.getRegion(id, 4), 
-                cache.getRegion(id, 5)
+                cache.getRegion(id, 0), cache.getRegion(id, 1),
+                cache.getRegion(id, 2), cache.getRegion(id, 3),
+                cache.getRegion(id, 4), cache.getRegion(id, 5)
             };
             int x = i % CHUNK_W;
             int y = i / (CHUNK_D * CHUNK_W);
@@ -503,43 +493,143 @@ void BlocksRenderer::render(const voxel* voxels) {
     }
 }
 
+SortingMeshData BlocksRenderer::renderTranslucent(
+    const voxel* voxels, int beginEnds[256][2]
+) {
+    timeutil::ScopeLogTimer log(555);
+    SortingMeshData sortingMesh {{}};
+
+    for (const auto drawGroup : *content.drawGroups) {
+        int begin = beginEnds[drawGroup][0];
+        if (begin == 0) {
+            continue;
+        }
+        int end = beginEnds[drawGroup][1];
+        for (int i = begin-1; i <= end; i++) {
+            const voxel& vox = voxels[i];
+            blockid_t id = vox.id;
+            blockstate state = vox.state;
+            const auto& def = *blockDefsCache[id];
+            if (id == 0 || def.drawGroup != drawGroup || state.segment) {
+                continue;
+            }
+            if (!def.translucent) {
+                continue;
+            }
+            const UVRegion texfaces[6] {
+                cache.getRegion(id, 0), cache.getRegion(id, 1),
+                cache.getRegion(id, 2), cache.getRegion(id, 3),
+                cache.getRegion(id, 4), cache.getRegion(id, 5)
+            };
+            int x = i % CHUNK_W;
+            int y = i / (CHUNK_D * CHUNK_W);
+            int z = (i / CHUNK_D) % CHUNK_W;
+            switch (def.model) {
+                case BlockModel::block:
+                    blockCube({x, y, z}, texfaces, def, vox.state, !def.shadeless,
+                              def.ambientOcclusion);
+                    break;
+                case BlockModel::xsprite: {
+                    blockXSprite(x, y, z, glm::vec3(1.0f), 
+                                texfaces[FACE_MX], texfaces[FACE_MZ], 1.0f);
+                    break;
+                }
+                case BlockModel::aabb: {
+                    blockAABB({x, y, z}, texfaces, &def, vox.state.rotation, 
+                              !def.shadeless, def.ambientOcclusion);
+                    break;
+                }
+                case BlockModel::custom: {
+                    blockCustomModel({x, y, z}, &def, vox.state.rotation, 
+                                     !def.shadeless, def.ambientOcclusion);
+                    break;
+                }
+                default:
+                    break;
+            }
+            if (vertexOffset == 0) {
+                continue;
+            }
+            SortingMeshEntry entry {glm::vec3(
+                    x + chunk->x * CHUNK_W, y, z + chunk->z * CHUNK_D
+            ), util::Buffer<float>(indexSize * VERTEX_SIZE)};
+            
+            for (int j = 0; j < indexSize; j++) {
+                std::memcpy(
+                    entry.vertexData.data(),
+                    vertexBuffer.get() + indexBuffer[j] * VERTEX_SIZE,
+                    sizeof(float) * VERTEX_SIZE
+                );
+            }
+            sortingMesh.entries.push_back(std::move(entry));
+            vertexOffset = 0;
+            indexOffset = indexSize = 0;
+        }
+    }
+    return sortingMesh;
+}
+
 void BlocksRenderer::build(const Chunk* chunk, const Chunks* chunks) {
     this->chunk = chunk;
     voxelsBuffer->setPosition(
         chunk->x * CHUNK_W - voxelBufferPadding, 0,
         chunk->z * CHUNK_D - voxelBufferPadding);
     chunks->getVoxels(voxelsBuffer.get(), settings.graphics.backlight.get());
-    overflow = false;
-    vertexOffset = 0;
-    indexOffset = indexSize = 0;
+
     if (voxelsBuffer->pickBlockId(
         chunk->x * CHUNK_W, 0, chunk->z * CHUNK_D
     ) == BLOCK_VOID) {
         cancelled = true;
         return;
     }
-    cancelled = false;
     const voxel* voxels = chunk->voxels;
-    render(voxels);
+
+    int totalBegin = chunk->bottom * (CHUNK_W * CHUNK_D);
+    int totalEnd = chunk->top * (CHUNK_W * CHUNK_D);
+
+    int beginEnds[256][2] {};
+    for (int i = totalBegin; i < totalEnd; i++) {
+        const voxel& vox = voxels[i];
+        blockid_t id = vox.id;
+        const auto& def = *blockDefsCache[id];
+    
+        if (beginEnds[def.drawGroup][0] == 0) {
+            beginEnds[def.drawGroup][0] = i+1;
+        }
+        beginEnds[def.drawGroup][1] = i;
+    }
+    cancelled = false;
+
+    overflow = false;
+    vertexOffset = 0;
+    indexOffset = indexSize = 0;
+    
+    sortingMesh = std::move(renderTranslucent(voxels, beginEnds));
+    
+    overflow = false;
+    vertexOffset = 0;
+    indexOffset = indexSize = 0;
+    
+    render(voxels, beginEnds);
 }
 
-MeshData BlocksRenderer::createMesh() {
+ChunkMeshData BlocksRenderer::createMesh() {
     const vattr attrs[]{ {3}, {2}, {1}, {0} };
-    return MeshData(
+    return ChunkMeshData{MeshData(
         util::Buffer<float>(vertexBuffer.get(), vertexOffset), 
         util::Buffer<int>(indexBuffer.get(), indexSize),
         util::Buffer<vattr>({{3}, {2}, {1}, {0}})
-    );
+    ), std::move(sortingMesh)};
 }
 
-std::shared_ptr<Mesh> BlocksRenderer::render(const Chunk* chunk, const Chunks* chunks) {
+ChunkMesh BlocksRenderer::render(const Chunk* chunk, const Chunks* chunks) {
     build(chunk, chunks);
 
     const vattr attrs[]{ {3}, {2}, {1}, {0} };
     size_t vcount = vertexOffset / BlocksRenderer::VERTEX_SIZE;
-    return std::make_shared<Mesh>(
+    return ChunkMesh{std::make_shared<Mesh>(
         vertexBuffer.get(), vcount, indexBuffer.get(), indexSize, attrs
-    );
+    ), std::move(sortingMesh)};
 }
 
 VoxelsVolume* BlocksRenderer::getVoxelsBuffer() const {
diff --git a/src/graphics/render/BlocksRenderer.hpp b/src/graphics/render/BlocksRenderer.hpp
index 828ddf7d..cdb20749 100644
--- a/src/graphics/render/BlocksRenderer.hpp
+++ b/src/graphics/render/BlocksRenderer.hpp
@@ -12,6 +12,7 @@
 #include "voxels/VoxelsVolume.hpp"
 #include "graphics/core/MeshData.hpp"
 #include "maths/util.hpp"
+#include "commons.hpp"
 
 class Content;
 class Mesh;
@@ -45,6 +46,8 @@ class BlocksRenderer {
     
     util::PseudoRandom randomizer;
 
+    SortingMeshData sortingMesh;
+
     void vertex(const glm::vec3& coord, float u, float v, const glm::vec4& light);
     void index(int a, int b, int c, int d, int e, int f);
 
@@ -115,7 +118,6 @@ class BlocksRenderer {
 
     bool isOpenForLight(int x, int y, int z) const;
 
-
     // Does block allow to see other blocks sides (is it transparent)
     inline bool isOpen(const glm::ivec3& pos, ubyte group) const {
         auto id = voxelsBuffer->pickBlockId(
@@ -135,7 +137,9 @@ class BlocksRenderer {
     glm::vec4 pickLight(const glm::ivec3& coord) const;
     glm::vec4 pickSoftLight(const glm::ivec3& coord, const glm::ivec3& right, const glm::ivec3& up) const;
     glm::vec4 pickSoftLight(float x, float y, float z, const glm::ivec3& right, const glm::ivec3& up) const;
-    void render(const voxel* voxels);
+    
+    void render(const voxel* voxels, int beginEnds[256][2]);
+    SortingMeshData renderTranslucent(const voxel* voxels, int beginEnds[256][2]);
 public:
     BlocksRenderer(
         size_t capacity,
@@ -146,8 +150,8 @@ public:
     virtual ~BlocksRenderer();
 
     void build(const Chunk* chunk, const Chunks* chunks);
-    std::shared_ptr<Mesh> render(const Chunk* chunk, const Chunks* chunks);
-    MeshData createMesh();
+    ChunkMesh render(const Chunk* chunk, const Chunks* chunks);
+    ChunkMeshData createMesh();
     VoxelsVolume* getVoxelsBuffer() const;
 
     bool isCancelled() const {
diff --git a/src/graphics/render/ChunksRenderer.cpp b/src/graphics/render/ChunksRenderer.cpp
index d0ae56b4..847163fc 100644
--- a/src/graphics/render/ChunksRenderer.cpp
+++ b/src/graphics/render/ChunksRenderer.cpp
@@ -62,7 +62,11 @@ ChunksRenderer::ChunksRenderer(
         [&](){return std::make_shared<RendererWorker>(*level, cache, settings);}, 
         [&](RendererResult& result){
             if (!result.cancelled) {
-                meshes[result.key] = std::make_shared<Mesh>(result.meshData);
+                auto meshData = std::move(result.meshData);
+                meshes[result.key] = ChunkMesh {
+                    std::make_shared<Mesh>(meshData.mesh),
+                    std::move(meshData.sortingMesh)
+                };
             }
             inwork.erase(result.key);
         }, settings.graphics.chunkMaxRenderers.get())
@@ -82,8 +86,10 @@ std::shared_ptr<Mesh> ChunksRenderer::render(const std::shared_ptr<Chunk>& chunk
     chunk->flags.modified = false;
     if (important) {
         auto mesh = renderer->render(chunk.get(), level.chunks.get());
-        meshes[glm::ivec2(chunk->x, chunk->z)] = mesh;
-        return mesh;
+        meshes[glm::ivec2(chunk->x, chunk->z)] = ChunkMesh {
+            std::move(mesh.mesh), std::move(mesh.sortingMesh)
+        };
+        return meshes[glm::ivec2(chunk->x, chunk->z)].mesh;
     }
     glm::ivec2 key(chunk->x, chunk->z);
     if (inwork.find(key) != inwork.end()) {
@@ -115,7 +121,7 @@ std::shared_ptr<Mesh> ChunksRenderer::getOrRender(const std::shared_ptr<Chunk>&
     if (chunk->flags.modified) {
         render(chunk, important);
     }
-    return found->second;
+    return found->second.mesh;
 }
 
 void ChunksRenderer::update() {
diff --git a/src/graphics/render/ChunksRenderer.hpp b/src/graphics/render/ChunksRenderer.hpp
index c08266bb..e44940ea 100644
--- a/src/graphics/render/ChunksRenderer.hpp
+++ b/src/graphics/render/ChunksRenderer.hpp
@@ -10,6 +10,7 @@
 #include "voxels/ChunksStorage.hpp"
 #include "util/ThreadPool.hpp"
 #include "graphics/core/MeshData.hpp"
+#include "commons.hpp"
 
 class Mesh;
 class Chunk;
@@ -35,7 +36,7 @@ struct ChunksSortEntry {
 struct RendererResult {
     glm::ivec2 key;
     bool cancelled;
-    MeshData meshData;
+    ChunkMeshData meshData;
 };
 
 class ChunksRenderer {
@@ -45,7 +46,7 @@ class ChunksRenderer {
     const EngineSettings& settings;
 
     std::unique_ptr<BlocksRenderer> renderer;
-    std::unordered_map<glm::ivec2, std::shared_ptr<Mesh>> meshes;
+    std::unordered_map<glm::ivec2, ChunkMesh> meshes;
     std::unordered_map<glm::ivec2, bool> inwork;
     std::vector<ChunksSortEntry> indices;
     util::ThreadPool<std::shared_ptr<Chunk>, RendererResult> threadPool;
diff --git a/src/graphics/render/commons.hpp b/src/graphics/render/commons.hpp
new file mode 100644
index 00000000..4101f8a8
--- /dev/null
+++ b/src/graphics/render/commons.hpp
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <vector>
+#include <memory>
+#include <glm/vec3.hpp>
+
+#include "graphics/core/MeshData.hpp"
+#include "util/Buffer.hpp"
+
+class Mesh;
+
+struct SortingMeshEntry {
+    glm::vec3 position;
+    util::Buffer<float> vertexData;
+};
+
+struct SortingMeshData {
+    std::vector<SortingMeshEntry> entries;
+};
+
+struct ChunkMeshData {
+    MeshData mesh;
+    SortingMeshData sortingMesh;
+};
+
+struct ChunkMesh {
+    std::shared_ptr<Mesh> mesh;
+    SortingMeshData sortingMesh;
+};

From faadfca8c3ec490c196fdb3c15970cb3f4d69710 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sat, 16 Nov 2024 07:34:58 +0300
Subject: [PATCH 05/80] add base:ice block

---
 res/content/base/blocks/ice.json         |   7 +++++++
 res/content/base/content.json            |  15 ++++++++-------
 res/content/base/textures/blocks/ice.png | Bin 0 -> 7220 bytes
 3 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 res/content/base/blocks/ice.json
 create mode 100644 res/content/base/textures/blocks/ice.png

diff --git a/res/content/base/blocks/ice.json b/res/content/base/blocks/ice.json
new file mode 100644
index 00000000..19d9af12
--- /dev/null
+++ b/res/content/base/blocks/ice.json
@@ -0,0 +1,7 @@
+{
+    "texture": "ice",
+    "material": "base:glass",
+    "draw-group": 4,
+    "light-passing": true,
+    "translucent": true
+}
diff --git a/res/content/base/content.json b/res/content/base/content.json
index cec825a8..db13bae2 100644
--- a/res/content/base/content.json
+++ b/res/content/base/content.json
@@ -1,6 +1,8 @@
 {
-  "items": [
-    "bazalt_breaker"
+  "entities": [
+    "drop",
+    "player",
+    "falling_block"
   ],
   "blocks": [
     "dirt",
@@ -27,11 +29,10 @@
     "lightbulb",
     "torch",
     "wooden_door",
-    "coal_ore"
+    "coal_ore",
+    "ice"
   ],
-  "entities": [
-    "drop",
-    "player",
-    "falling_block"
+  "items": [
+    "bazalt_breaker"
   ]
 }
\ No newline at end of file
diff --git a/res/content/base/textures/blocks/ice.png b/res/content/base/textures/blocks/ice.png
new file mode 100644
index 0000000000000000000000000000000000000000..36592775c01375a6799eb81ee7ff0a40bc01bc03
GIT binary patch
literal 7220
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

literal 0
HcmV?d00001


From 44003667197fba6a858c16a35ea8c71b9377781f Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sat, 16 Nov 2024 07:41:36 +0300
Subject: [PATCH 06/80] feat: actually working slow prototype

---
 src/graphics/render/BlocksRenderer.cpp | 26 ++++++-----
 src/graphics/render/ChunksRenderer.cpp | 60 ++++++++++++++++++++++++++
 src/graphics/render/ChunksRenderer.hpp |  2 +
 src/graphics/render/commons.hpp        |  5 +++
 4 files changed, 83 insertions(+), 10 deletions(-)

diff --git a/src/graphics/render/BlocksRenderer.cpp b/src/graphics/render/BlocksRenderer.cpp
index 25e8997d..fcba92c3 100644
--- a/src/graphics/render/BlocksRenderer.cpp
+++ b/src/graphics/render/BlocksRenderer.cpp
@@ -452,9 +452,9 @@ void BlocksRenderer::render(
             if (id == 0 || def.drawGroup != drawGroup || state.segment) {
                 continue;
             }
-            //if (def.translucent) {
-            //    continue;
-            //}
+            if (def.translucent) {
+                continue;
+            }
             const UVRegion texfaces[6] {
                 cache.getRegion(id, 0), cache.getRegion(id, 1),
                 cache.getRegion(id, 2), cache.getRegion(id, 3),
@@ -496,7 +496,6 @@ void BlocksRenderer::render(
 SortingMeshData BlocksRenderer::renderTranslucent(
     const voxel* voxels, int beginEnds[256][2]
 ) {
-    timeutil::ScopeLogTimer log(555);
     SortingMeshData sortingMesh {{}};
 
     for (const auto drawGroup : *content.drawGroups) {
@@ -550,16 +549,23 @@ SortingMeshData BlocksRenderer::renderTranslucent(
             if (vertexOffset == 0) {
                 continue;
             }
-            SortingMeshEntry entry {glm::vec3(
-                    x + chunk->x * CHUNK_W, y, z + chunk->z * CHUNK_D
-            ), util::Buffer<float>(indexSize * VERTEX_SIZE)};
-            
+            SortingMeshEntry entry {
+                glm::vec3(
+                    x + chunk->x * CHUNK_W + 0.5f,
+                    y + 0.5f,
+                    z + chunk->z * CHUNK_D + 0.5f
+                ),
+                util::Buffer<float>(indexSize * VERTEX_SIZE)};
+
             for (int j = 0; j < indexSize; j++) {
                 std::memcpy(
-                    entry.vertexData.data(),
+                    entry.vertexData.data() + j * VERTEX_SIZE,
                     vertexBuffer.get() + indexBuffer[j] * VERTEX_SIZE,
                     sizeof(float) * VERTEX_SIZE
                 );
+                entry.vertexData[j * VERTEX_SIZE + 0] += chunk->x * CHUNK_W + 0.5f;
+                entry.vertexData[j * VERTEX_SIZE + 1] += 0.5f;
+                entry.vertexData[j * VERTEX_SIZE + 2] += chunk->z * CHUNK_D + 0.5f;
             }
             sortingMesh.entries.push_back(std::move(entry));
             vertexOffset = 0;
@@ -569,7 +575,7 @@ SortingMeshData BlocksRenderer::renderTranslucent(
     return sortingMesh;
 }
 
-void BlocksRenderer::build(const Chunk* chunk, const Chunks* chunks) {
+void BlocksRenderer::build(const Chunk* chunk, const Chunks* chunks) {;
     this->chunk = chunk;
     voxelsBuffer->setPosition(
         chunk->x * CHUNK_W - voxelBufferPadding, 0,
diff --git a/src/graphics/render/ChunksRenderer.cpp b/src/graphics/render/ChunksRenderer.cpp
index 847163fc..ed313e08 100644
--- a/src/graphics/render/ChunksRenderer.cpp
+++ b/src/graphics/render/ChunksRenderer.cpp
@@ -18,6 +18,8 @@
 #include <glm/glm.hpp>
 #include <glm/ext.hpp>
 
+#include "util/timeutil.hpp"
+
 static debug::Logger logger("chunks-render");
 
 size_t ChunksRenderer::visibleChunks = 0;
@@ -204,4 +206,62 @@ void ChunksRenderer::drawChunks(
             visibleChunks += drawChunk(indices[i].index, camera, shader, culling);
         }
     //}
+    drawSortedMeshes(camera, shader);
+}
+
+void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
+    const vattr attrs[]{ {3}, {2}, {1}, {0} };
+
+    std::vector<const SortingMeshEntry*> entries;
+
+    auto pposition = camera.position;
+    
+    size_t size = 0;
+    bool culling = settings.graphics.frustumCulling.get();
+    for (size_t i = 0; i < indices.size(); i++) {
+        auto chunk = level.chunks->getChunks()[indices[i].index];
+        if (chunk == nullptr || !chunk->flags.lighted) {
+            continue;
+        }
+        const auto& found = meshes.find(glm::ivec2(chunk->x, chunk->z));
+        if (found == meshes.end()) {
+            continue;
+        }
+
+        glm::vec3 min(chunk->x * CHUNK_W, chunk->bottom, chunk->z * CHUNK_D);
+        glm::vec3 max(
+            chunk->x * CHUNK_W + CHUNK_W,
+            chunk->top,
+            chunk->z * CHUNK_D + CHUNK_D
+        );
+
+        if (!frustum.isBoxVisible(min, max)) continue;
+
+        auto& chunkEntries = found->second.sortingMesh.entries;
+        for (auto& entry : chunkEntries) {
+            entry.distance = glm::distance2(entry.position, pposition);
+        }
+        for (const auto& entry : chunkEntries) {
+            size += entry.vertexData.size();
+            entries.push_back(&entry);
+        }
+    }
+    std::sort(entries.begin(), entries.end(), [=](const auto& a, const auto& b) {
+        return *a < *b;
+    });
+
+    util::Buffer<float> buffer(size);
+    size_t offset = 0;
+    for (const auto& entry : entries) {
+        std::memcpy(
+            (buffer.data() + offset),
+            entry->vertexData.data(),
+            entry->vertexData.size() * sizeof(float)
+        );
+        offset += entry->vertexData.size();
+    }
+    Mesh mesh(buffer.data(), size / 6, attrs);
+
+    shader.uniformMatrix("u_model", glm::mat4(1.0f));
+    mesh.draw();
 }
diff --git a/src/graphics/render/ChunksRenderer.hpp b/src/graphics/render/ChunksRenderer.hpp
index e44940ea..cd1df2fb 100644
--- a/src/graphics/render/ChunksRenderer.hpp
+++ b/src/graphics/render/ChunksRenderer.hpp
@@ -75,6 +75,8 @@ public:
     );
     void drawChunks(const Camera& camera, Shader& shader);
 
+    void drawSortedMeshes(const Camera& camera, Shader& shader);
+
     void update();
 
     static size_t visibleChunks;
diff --git a/src/graphics/render/commons.hpp b/src/graphics/render/commons.hpp
index 4101f8a8..3ef8fa26 100644
--- a/src/graphics/render/commons.hpp
+++ b/src/graphics/render/commons.hpp
@@ -12,6 +12,11 @@ class Mesh;
 struct SortingMeshEntry {
     glm::vec3 position;
     util::Buffer<float> vertexData;
+    float distance;
+
+    inline bool operator<(const SortingMeshEntry& o) const noexcept {
+        return distance > o.distance;
+    }
 };
 
 struct SortingMeshData {

From b28bcf052b3bf33cd6bfe46cc09811fd8f397e97 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sat, 16 Nov 2024 09:18:14 +0300
Subject: [PATCH 07/80] optimize (part 1)

---
 src/graphics/core/Mesh.cpp             |  7 ++---
 src/graphics/render/BlocksRenderer.cpp | 39 ++++++++++++++++++++++++--
 src/graphics/render/ChunksRenderer.cpp | 30 +++++++++++++-------
 src/graphics/render/ChunksRenderer.hpp |  1 +
 src/graphics/render/commons.hpp        |  2 +-
 5 files changed, 61 insertions(+), 18 deletions(-)

diff --git a/src/graphics/core/Mesh.cpp b/src/graphics/core/Mesh.cpp
index 78380ae1..c8c114c2 100644
--- a/src/graphics/core/Mesh.cpp
+++ b/src/graphics/core/Mesh.cpp
@@ -58,10 +58,9 @@ void Mesh::reload(const float* vertexBuffer, size_t vertices, const int* indexBu
     glBindVertexArray(vao);
     glBindBuffer(GL_ARRAY_BUFFER, vbo);
     if (vertexBuffer != nullptr && vertices != 0) {
-        glBufferData(GL_ARRAY_BUFFER, sizeof(float) * vertexSize * vertices, vertexBuffer, GL_STATIC_DRAW);
-    }
-    else {
-        glBufferData(GL_ARRAY_BUFFER, 0, {}, GL_STATIC_DRAW);
+        glBufferData(GL_ARRAY_BUFFER, sizeof(float) * vertexSize * vertices, vertexBuffer, GL_STREAM_DRAW);
+    } else {
+        glBufferData(GL_ARRAY_BUFFER, 0, {}, GL_STREAM_DRAW);
     }
     if (indexBuffer != nullptr && indices != 0) {
         if (ibo == 0) glGenBuffers(1, &ibo);
diff --git a/src/graphics/render/BlocksRenderer.cpp b/src/graphics/render/BlocksRenderer.cpp
index fcba92c3..6a8c8176 100644
--- a/src/graphics/render/BlocksRenderer.cpp
+++ b/src/graphics/render/BlocksRenderer.cpp
@@ -498,6 +498,9 @@ SortingMeshData BlocksRenderer::renderTranslucent(
 ) {
     SortingMeshData sortingMesh {{}};
 
+    AABB aabb {};
+    bool aabbInit = false;
+    size_t totalSize = 0;
     for (const auto drawGroup : *content.drawGroups) {
         int begin = beginEnds[drawGroup][0];
         if (begin == 0) {
@@ -557,21 +560,51 @@ SortingMeshData BlocksRenderer::renderTranslucent(
                 ),
                 util::Buffer<float>(indexSize * VERTEX_SIZE)};
 
+            totalSize += entry.vertexData.size();
+
             for (int j = 0; j < indexSize; j++) {
                 std::memcpy(
                     entry.vertexData.data() + j * VERTEX_SIZE,
                     vertexBuffer.get() + indexBuffer[j] * VERTEX_SIZE,
                     sizeof(float) * VERTEX_SIZE
                 );
-                entry.vertexData[j * VERTEX_SIZE + 0] += chunk->x * CHUNK_W + 0.5f;
-                entry.vertexData[j * VERTEX_SIZE + 1] += 0.5f;
-                entry.vertexData[j * VERTEX_SIZE + 2] += chunk->z * CHUNK_D + 0.5f;
+                float& vx = entry.vertexData[j * VERTEX_SIZE + 0];
+                float& vy = entry.vertexData[j * VERTEX_SIZE + 1];
+                float& vz = entry.vertexData[j * VERTEX_SIZE + 2];
+
+                if (!aabbInit) {
+                    aabbInit = true;
+                    aabb.a = aabb.b = {vx, vy, vz};
+                } else {
+                    aabb.addPoint(glm::vec3(vx, vy, vz));
+                }
+                vx += chunk->x * CHUNK_W + 0.5f;
+                vy += 0.5f;
+                vz += chunk->z * CHUNK_D + 0.5f;
             }
             sortingMesh.entries.push_back(std::move(entry));
             vertexOffset = 0;
             indexOffset = indexSize = 0;
         }
     }
+
+    // additional powerful optimization
+    auto size = aabb.size();
+    if (glm::abs(size.y) < 0.01f && sortingMesh.entries.size() > 1 && false) {
+        SortingMeshEntry newEntry {
+            sortingMesh.entries[0].position,
+            util::Buffer<float>(totalSize)
+        };
+        size_t offset = 0;
+        for (const auto& entry : sortingMesh.entries) {
+            std::memcpy(
+                newEntry.vertexData.data() + offset,
+                entry.vertexData.data(), entry.vertexData.size() * sizeof(float)
+            );
+            offset += entry.vertexData.size();
+        }
+        return SortingMeshData {{std::move(newEntry)}};
+    }
     return sortingMesh;
 }
 
diff --git a/src/graphics/render/ChunksRenderer.cpp b/src/graphics/render/ChunksRenderer.cpp
index ed313e08..9a508831 100644
--- a/src/graphics/render/ChunksRenderer.cpp
+++ b/src/graphics/render/ChunksRenderer.cpp
@@ -79,6 +79,10 @@ ChunksRenderer::ChunksRenderer(
         *level->content, cache, settings
     );
     logger.info() << "created " << threadPool.getWorkersCount() << " workers";
+
+    const vattr attrs[]{ {3}, {2}, {1}, {0} };
+    float buf[]{};
+    sortedMesh = std::make_unique<Mesh>(buf, 0, attrs);
 }
 
 ChunksRenderer::~ChunksRenderer() {
@@ -210,16 +214,19 @@ void ChunksRenderer::drawChunks(
 }
 
 void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
-    const vattr attrs[]{ {3}, {2}, {1}, {0} };
+    timeutil::ScopeLogTimer log(444);
 
     std::vector<const SortingMeshEntry*> entries;
 
+    const auto& chunks = level.chunks->getChunks();
+
     auto pposition = camera.position;
     
     size_t size = 0;
     bool culling = settings.graphics.frustumCulling.get();
-    for (size_t i = 0; i < indices.size(); i++) {
-        auto chunk = level.chunks->getChunks()[indices[i].index];
+    
+    for (const auto& index : indices) {
+        const auto& chunk = chunks[index.index];
         if (chunk == nullptr || !chunk->flags.lighted) {
             continue;
         }
@@ -238,19 +245,22 @@ void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
         if (!frustum.isBoxVisible(min, max)) continue;
 
         auto& chunkEntries = found->second.sortingMesh.entries;
+        
         for (auto& entry : chunkEntries) {
-            entry.distance = glm::distance2(entry.position, pposition);
+            entry.distance = static_cast<long long>(glm::distance2(entry.position, pposition));
         }
+        std::sort(chunkEntries.begin(), chunkEntries.end());
         for (const auto& entry : chunkEntries) {
             size += entry.vertexData.size();
             entries.push_back(&entry);
         }
     }
-    std::sort(entries.begin(), entries.end(), [=](const auto& a, const auto& b) {
-        return *a < *b;
-    });
 
-    util::Buffer<float> buffer(size);
+    static util::Buffer<float> buffer;
+    
+    if (buffer.size() < size) {
+        buffer = util::Buffer<float>(size);
+    }
     size_t offset = 0;
     for (const auto& entry : entries) {
         std::memcpy(
@@ -260,8 +270,8 @@ void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
         );
         offset += entry->vertexData.size();
     }
-    Mesh mesh(buffer.data(), size / 6, attrs);
+    sortedMesh->reload(buffer.data(), size / 6);
 
     shader.uniformMatrix("u_model", glm::mat4(1.0f));
-    mesh.draw();
+    sortedMesh->draw();
 }
diff --git a/src/graphics/render/ChunksRenderer.hpp b/src/graphics/render/ChunksRenderer.hpp
index cd1df2fb..a631ae8a 100644
--- a/src/graphics/render/ChunksRenderer.hpp
+++ b/src/graphics/render/ChunksRenderer.hpp
@@ -54,6 +54,7 @@ class ChunksRenderer {
     bool drawChunk(
         size_t index, const Camera& camera, Shader& shader, bool culling
     );
+    std::unique_ptr<Mesh> sortedMesh;
 public:
     ChunksRenderer(
         const Level* level,
diff --git a/src/graphics/render/commons.hpp b/src/graphics/render/commons.hpp
index 3ef8fa26..c4c850e1 100644
--- a/src/graphics/render/commons.hpp
+++ b/src/graphics/render/commons.hpp
@@ -12,7 +12,7 @@ class Mesh;
 struct SortingMeshEntry {
     glm::vec3 position;
     util::Buffer<float> vertexData;
-    float distance;
+    long long distance;
 
     inline bool operator<(const SortingMeshEntry& o) const noexcept {
         return distance > o.distance;

From 171cbb48d099032d7e78c51a46c374104f96f0d1 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sat, 16 Nov 2024 09:30:02 +0300
Subject: [PATCH 08/80] fix blocks selection with semi-transparent blocks

---
 src/graphics/render/ChunksRenderer.cpp | 5 ++++-
 src/graphics/render/WorldRenderer.cpp  | 9 ++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/graphics/render/ChunksRenderer.cpp b/src/graphics/render/ChunksRenderer.cpp
index 9a508831..39dbb08d 100644
--- a/src/graphics/render/ChunksRenderer.cpp
+++ b/src/graphics/render/ChunksRenderer.cpp
@@ -210,11 +210,14 @@ void ChunksRenderer::drawChunks(
             visibleChunks += drawChunk(indices[i].index, camera, shader, culling);
         }
     //}
-    drawSortedMeshes(camera, shader);
 }
 
 void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
     timeutil::ScopeLogTimer log(444);
+    
+    const auto& atlas = assets.require<Atlas>("blocks");
+
+    atlas.getTexture()->bind();
 
     std::vector<const SortingMeshEntry*> entries;
 
diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp
index 1ad16a62..0593305d 100644
--- a/src/graphics/render/WorldRenderer.cpp
+++ b/src/graphics/render/WorldRenderer.cpp
@@ -164,10 +164,18 @@ void WorldRenderer::renderLevel(
     particles->render(camera, delta * !pause);
 
     auto& shader = assets.require<Shader>("main");
+    auto& linesShader = assets.require<Shader>("lines");
+
     setupWorldShader(shader, camera, settings, fogFactor);
 
     chunks->drawChunks(camera, shader);
 
+    if (hudVisible) {
+        renderLines(camera, linesShader, ctx);
+    }
+    shader.use();
+    chunks->drawSortedMeshes(camera, shader);
+
     if (!pause) {
         scripting::on_frontend_render();
     }
@@ -326,7 +334,6 @@ void WorldRenderer::draw(
                         ctx, camera, *lineBatch, linesShader, showChunkBorders
                     );
                 }
-                renderLines(camera, linesShader, ctx);
                 if (player->currentCamera == player->fpCamera) {
                     renderHands(camera, delta * !pause);
                 }

From 2327f0ddf8b5cc0d668a274147a79a5fef63368d Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sat, 16 Nov 2024 09:31:33 +0300
Subject: [PATCH 09/80] fix msvc error C2466: cannot allocate an array of
 constant size 0

---
 src/graphics/render/ChunksRenderer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphics/render/ChunksRenderer.cpp b/src/graphics/render/ChunksRenderer.cpp
index 39dbb08d..1fddfd66 100644
--- a/src/graphics/render/ChunksRenderer.cpp
+++ b/src/graphics/render/ChunksRenderer.cpp
@@ -81,7 +81,7 @@ ChunksRenderer::ChunksRenderer(
     logger.info() << "created " << threadPool.getWorkersCount() << " workers";
 
     const vattr attrs[]{ {3}, {2}, {1}, {0} };
-    float buf[]{};
+    float buf[1]{};
     sortedMesh = std::make_unique<Mesh>(buf, 0, attrs);
 }
 

From 99f159464511592f974b726be65a5eea30157497 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sat, 16 Nov 2024 15:08:25 +0300
Subject: [PATCH 10/80] fix Mesh

---
 src/graphics/core/Mesh.cpp | 8 ++++----
 src/graphics/core/Mesh.hpp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/graphics/core/Mesh.cpp b/src/graphics/core/Mesh.cpp
index c8c114c2..e0cc5484 100644
--- a/src/graphics/core/Mesh.cpp
+++ b/src/graphics/core/Mesh.cpp
@@ -21,8 +21,8 @@ Mesh::Mesh(const MeshData& data)
 
 Mesh::Mesh(const float* vertexBuffer, size_t vertices, const int* indexBuffer, size_t indices, const vattr* attrs) : 
     ibo(0),
-    vertices(vertices),
-    indices(indices)
+    vertices(0),
+    indices(0)
 {
     meshesCount++;
     vertexSize = 0;
@@ -74,7 +74,7 @@ void Mesh::reload(const float* vertexBuffer, size_t vertices, const int* indexBu
     this->indices = indices;
 }
 
-void Mesh::draw(unsigned int primitive){
+void Mesh::draw(unsigned int primitive) const {
     drawCalls++;
     glBindVertexArray(vao);
     if (ibo != 0) {
@@ -86,6 +86,6 @@ void Mesh::draw(unsigned int primitive){
     glBindVertexArray(0);
 }
 
-void Mesh::draw() {
+void Mesh::draw() const {
     draw(GL_TRIANGLES);
 }
diff --git a/src/graphics/core/Mesh.hpp b/src/graphics/core/Mesh.hpp
index 87c8e69b..b36b044d 100644
--- a/src/graphics/core/Mesh.hpp
+++ b/src/graphics/core/Mesh.hpp
@@ -28,10 +28,10 @@ public:
     
     /// @brief Draw mesh with specified primitives type
     /// @param primitive primitives type
-    void draw(unsigned int primitive);
+    void draw(unsigned int primitive) const;
 
     /// @brief Draw mesh as triangles
-    void draw();
+    void draw() const;
 
     /// @brief Total numbers of alive mesh objects
     static int meshesCount;

From 1ff89491e6f85ed04193d62a7878ecf64242e049 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sat, 16 Nov 2024 15:11:05 +0300
Subject: [PATCH 11/80] optimize (part 2)

---
 src/graphics/render/BlocksRenderer.cpp |  2 +-
 src/graphics/render/ChunksRenderer.cpp | 69 ++++++++++++++------------
 src/graphics/render/commons.hpp        |  3 +-
 3 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/src/graphics/render/BlocksRenderer.cpp b/src/graphics/render/BlocksRenderer.cpp
index 6a8c8176..aa36ead6 100644
--- a/src/graphics/render/BlocksRenderer.cpp
+++ b/src/graphics/render/BlocksRenderer.cpp
@@ -590,7 +590,7 @@ SortingMeshData BlocksRenderer::renderTranslucent(
 
     // additional powerful optimization
     auto size = aabb.size();
-    if (glm::abs(size.y) < 0.01f && sortingMesh.entries.size() > 1 && false) {
+    if (glm::abs(size.y) < 0.01f && sortingMesh.entries.size() > 1) {
         SortingMeshEntry newEntry {
             sortingMesh.entries[0].position,
             util::Buffer<float>(totalSize)
diff --git a/src/graphics/render/ChunksRenderer.cpp b/src/graphics/render/ChunksRenderer.cpp
index 1fddfd66..fc3b3eb6 100644
--- a/src/graphics/render/ChunksRenderer.cpp
+++ b/src/graphics/render/ChunksRenderer.cpp
@@ -49,6 +49,8 @@ public:
     }
 };
 
+const vattr ATTRS[]{ {3}, {2}, {1}, {0} };
+
 ChunksRenderer::ChunksRenderer(
     const Level* level, 
     const Assets& assets,
@@ -80,9 +82,8 @@ ChunksRenderer::ChunksRenderer(
     );
     logger.info() << "created " << threadPool.getWorkersCount() << " workers";
 
-    const vattr attrs[]{ {3}, {2}, {1}, {0} };
     float buf[1]{};
-    sortedMesh = std::make_unique<Mesh>(buf, 0, attrs);
+    sortedMesh = std::make_unique<Mesh>(buf, 0, ATTRS);
 }
 
 ChunksRenderer::~ChunksRenderer() {
@@ -93,7 +94,7 @@ std::shared_ptr<Mesh> ChunksRenderer::render(const std::shared_ptr<Chunk>& chunk
     if (important) {
         auto mesh = renderer->render(chunk.get(), level.chunks.get());
         meshes[glm::ivec2(chunk->x, chunk->z)] = ChunkMesh {
-            std::move(mesh.mesh), std::move(mesh.sortingMesh)
+            std::move(mesh.mesh), std::move(mesh.sortingMeshData)
         };
         return meshes[glm::ivec2(chunk->x, chunk->z)].mesh;
     }
@@ -214,19 +215,18 @@ void ChunksRenderer::drawChunks(
 
 void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
     timeutil::ScopeLogTimer log(444);
-    
+
     const auto& atlas = assets.require<Atlas>("blocks");
 
     atlas.getTexture()->bind();
 
-    std::vector<const SortingMeshEntry*> entries;
-
     const auto& chunks = level.chunks->getChunks();
 
     auto pposition = camera.position;
     
     size_t size = 0;
     bool culling = settings.graphics.frustumCulling.get();
+    shader.uniformMatrix("u_model", glm::mat4(1.0f));
     
     for (const auto& index : indices) {
         const auto& chunk = chunks[index.index];
@@ -238,43 +238,50 @@ void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
             continue;
         }
 
-        glm::vec3 min(chunk->x * CHUNK_W, chunk->bottom, chunk->z * CHUNK_D);
+        glm::vec3 min(
+            chunk->x * CHUNK_W - CHUNK_W, 0, chunk->z * CHUNK_D - CHUNK_D
+        );
         glm::vec3 max(
-            chunk->x * CHUNK_W + CHUNK_W,
-            chunk->top,
-            chunk->z * CHUNK_D + CHUNK_D
+            chunk->x * CHUNK_W + CHUNK_W*2,
+            CHUNK_H,
+            chunk->z * CHUNK_D + CHUNK_D*2
         );
 
         if (!frustum.isBoxVisible(min, max)) continue;
 
-        auto& chunkEntries = found->second.sortingMesh.entries;
+        auto& chunkEntries = found->second.sortingMeshData.entries;
         
         for (auto& entry : chunkEntries) {
             entry.distance = static_cast<long long>(glm::distance2(entry.position, pposition));
         }
+
+        if (chunkEntries.size() == 1) {
+            auto& entry = chunkEntries.at(0);
+            if (found->second.planesMesh == nullptr) {
+                found->second.planesMesh = std::make_shared<Mesh>(
+                    entry.vertexData.data(), entry.vertexData.size() / 6, ATTRS
+                );
+            }
+            found->second.planesMesh->draw();
+            continue;
+        }
+
         std::sort(chunkEntries.begin(), chunkEntries.end());
+        size_t size = 0;
         for (const auto& entry : chunkEntries) {
             size += entry.vertexData.size();
-            entries.push_back(&entry);
         }
+        util::Buffer<float> buffer(size);
+        size_t offset = 0;
+        for (const auto& entry : chunkEntries) {
+            std::memcpy(
+                (buffer.data() + offset),
+                entry.vertexData.data(),
+                entry.vertexData.size() * sizeof(float)
+            );
+            offset += entry.vertexData.size();
+        }
+        sortedMesh->reload(buffer.data(), size / 6);
+        sortedMesh->draw();
     }
-
-    static util::Buffer<float> buffer;
-    
-    if (buffer.size() < size) {
-        buffer = util::Buffer<float>(size);
-    }
-    size_t offset = 0;
-    for (const auto& entry : entries) {
-        std::memcpy(
-            (buffer.data() + offset),
-            entry->vertexData.data(),
-            entry->vertexData.size() * sizeof(float)
-        );
-        offset += entry->vertexData.size();
-    }
-    sortedMesh->reload(buffer.data(), size / 6);
-
-    shader.uniformMatrix("u_model", glm::mat4(1.0f));
-    sortedMesh->draw();
 }
diff --git a/src/graphics/render/commons.hpp b/src/graphics/render/commons.hpp
index c4c850e1..fe633012 100644
--- a/src/graphics/render/commons.hpp
+++ b/src/graphics/render/commons.hpp
@@ -30,5 +30,6 @@ struct ChunkMeshData {
 
 struct ChunkMesh {
     std::shared_ptr<Mesh> mesh;
-    SortingMeshData sortingMesh;
+    SortingMeshData sortingMeshData;
+    std::shared_ptr<Mesh> planesMesh = nullptr;
 };

From 7bdeba982b29fc166873e1c1202ad80116806fbc Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sat, 16 Nov 2024 15:24:46 +0300
Subject: [PATCH 12/80] optimize (part 3)

---
 src/graphics/render/ChunksRenderer.cpp | 45 ++++++++++++++++----------
 src/graphics/render/commons.hpp        |  2 +-
 2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/src/graphics/render/ChunksRenderer.cpp b/src/graphics/render/ChunksRenderer.cpp
index fc3b3eb6..02929c25 100644
--- a/src/graphics/render/ChunksRenderer.cpp
+++ b/src/graphics/render/ChunksRenderer.cpp
@@ -257,31 +257,42 @@ void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
 
         if (chunkEntries.size() == 1) {
             auto& entry = chunkEntries.at(0);
-            if (found->second.planesMesh == nullptr) {
-                found->second.planesMesh = std::make_shared<Mesh>(
+            if (found->second.sortedMesh == nullptr) {
+                found->second.sortedMesh = std::make_shared<Mesh>(
                     entry.vertexData.data(), entry.vertexData.size() / 6, ATTRS
                 );
             }
-            found->second.planesMesh->draw();
+            found->second.sortedMesh->draw();
             continue;
         }
 
-        std::sort(chunkEntries.begin(), chunkEntries.end());
-        size_t size = 0;
-        for (const auto& entry : chunkEntries) {
-            size += entry.vertexData.size();
+        if (chunkEntries.empty()) {
+            continue;
         }
-        util::Buffer<float> buffer(size);
-        size_t offset = 0;
-        for (const auto& entry : chunkEntries) {
-            std::memcpy(
-                (buffer.data() + offset),
-                entry.vertexData.data(),
-                entry.vertexData.size() * sizeof(float)
+
+        if (found->second.sortedMesh == nullptr) {
+            std::sort(chunkEntries.begin(), chunkEntries.end());
+            size_t size = 0;
+            for (const auto& entry : chunkEntries) {
+                size += entry.vertexData.size();
+            }
+            static util::Buffer<float> buffer;
+            if (buffer.size() < size) {
+                buffer = util::Buffer<float>(size);
+            }
+            size_t offset = 0;
+            for (const auto& entry : chunkEntries) {
+                std::memcpy(
+                    (buffer.data() + offset),
+                    entry.vertexData.data(),
+                    entry.vertexData.size() * sizeof(float)
+                );
+                offset += entry.vertexData.size();
+            }
+            found->second.sortedMesh = std::make_shared<Mesh>(
+                buffer.data(), size / 6, ATTRS
             );
-            offset += entry.vertexData.size();
         }
-        sortedMesh->reload(buffer.data(), size / 6);
-        sortedMesh->draw();
+        found->second.sortedMesh->draw();
     }
 }
diff --git a/src/graphics/render/commons.hpp b/src/graphics/render/commons.hpp
index fe633012..1bff70f5 100644
--- a/src/graphics/render/commons.hpp
+++ b/src/graphics/render/commons.hpp
@@ -31,5 +31,5 @@ struct ChunkMeshData {
 struct ChunkMesh {
     std::shared_ptr<Mesh> mesh;
     SortingMeshData sortingMeshData;
-    std::shared_ptr<Mesh> planesMesh = nullptr;
+    std::shared_ptr<Mesh> sortedMesh = nullptr;
 };

From 399943b253e5ae70a20c347d98c30e6d2acc24e9 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sat, 16 Nov 2024 15:37:30 +0300
Subject: [PATCH 13/80] fix

---
 src/graphics/render/ChunksRenderer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphics/render/ChunksRenderer.cpp b/src/graphics/render/ChunksRenderer.cpp
index 02929c25..ba340548 100644
--- a/src/graphics/render/ChunksRenderer.cpp
+++ b/src/graphics/render/ChunksRenderer.cpp
@@ -270,7 +270,7 @@ void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
             continue;
         }
 
-        if (found->second.sortedMesh == nullptr) {
+        if (found->second.sortedMesh == nullptr || true) {
             std::sort(chunkEntries.begin(), chunkEntries.end());
             size_t size = 0;
             for (const auto& entry : chunkEntries) {

From ebc890bdd62a3ca1a66c66e79a303fc64ae6424a Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sat, 16 Nov 2024 15:49:53 +0300
Subject: [PATCH 14/80] optimize (part 4) & format ChunkRenderer

---
 src/graphics/render/ChunksRenderer.cpp | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/graphics/render/ChunksRenderer.cpp b/src/graphics/render/ChunksRenderer.cpp
index ba340548..2c1534b2 100644
--- a/src/graphics/render/ChunksRenderer.cpp
+++ b/src/graphics/render/ChunksRenderer.cpp
@@ -50,6 +50,7 @@ public:
 };
 
 const vattr ATTRS[]{ {3}, {2}, {1}, {0} };
+inline constexpr int VERTEX_SIZE = 6;
 
 ChunksRenderer::ChunksRenderer(
     const Level* level, 
@@ -89,7 +90,9 @@ ChunksRenderer::ChunksRenderer(
 ChunksRenderer::~ChunksRenderer() {
 }
 
-std::shared_ptr<Mesh> ChunksRenderer::render(const std::shared_ptr<Chunk>& chunk, bool important) {
+std::shared_ptr<Mesh> ChunksRenderer::render(
+    const std::shared_ptr<Chunk>& chunk, bool important
+) {
     chunk->flags.modified = false;
     if (important) {
         auto mesh = renderer->render(chunk.get(), level.chunks.get());
@@ -120,7 +123,9 @@ void ChunksRenderer::clear() {
     threadPool.clearQueue();
 }
 
-std::shared_ptr<Mesh> ChunksRenderer::getOrRender(const std::shared_ptr<Chunk>& chunk, bool important) {
+std::shared_ptr<Mesh> ChunksRenderer::getOrRender(
+    const std::shared_ptr<Chunk>& chunk, bool important
+) {
     auto found = meshes.find(glm::ivec2(chunk->x, chunk->z));
     if (found == meshes.end()) {
         return render(chunk, important);
@@ -216,6 +221,10 @@ void ChunksRenderer::drawChunks(
 void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
     timeutil::ScopeLogTimer log(444);
 
+    const int sortInterval = 6;
+    static int frameid = 0;
+    frameid++;
+
     const auto& atlas = assets.require<Atlas>("blocks");
 
     atlas.getTexture()->bind();
@@ -252,14 +261,17 @@ void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
         auto& chunkEntries = found->second.sortingMeshData.entries;
         
         for (auto& entry : chunkEntries) {
-            entry.distance = static_cast<long long>(glm::distance2(entry.position, pposition));
+            entry.distance =
+                static_cast<long long>(glm::distance2(entry.position, pposition));
         }
 
         if (chunkEntries.size() == 1) {
             auto& entry = chunkEntries.at(0);
             if (found->second.sortedMesh == nullptr) {
                 found->second.sortedMesh = std::make_shared<Mesh>(
-                    entry.vertexData.data(), entry.vertexData.size() / 6, ATTRS
+                    entry.vertexData.data(),
+                    entry.vertexData.size() / VERTEX_SIZE,
+                    ATTRS
                 );
             }
             found->second.sortedMesh->draw();
@@ -270,7 +282,8 @@ void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
             continue;
         }
 
-        if (found->second.sortedMesh == nullptr || true) {
+        if (found->second.sortedMesh == nullptr ||
+            (frameid + chunk->x) % sortInterval == 0) {
             std::sort(chunkEntries.begin(), chunkEntries.end());
             size_t size = 0;
             for (const auto& entry : chunkEntries) {
@@ -290,7 +303,7 @@ void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
                 offset += entry.vertexData.size();
             }
             found->second.sortedMesh = std::make_shared<Mesh>(
-                buffer.data(), size / 6, ATTRS
+                buffer.data(), size / VERTEX_SIZE, ATTRS
             );
         }
         found->second.sortedMesh->draw();

From 71788e4eb9d35db01a30bb21c1532dd3be63cffc Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sat, 16 Nov 2024 16:04:00 +0300
Subject: [PATCH 15/80] remove unnecessary shared_ptrs from ChunksRenderer and
 ChunkMesh

---
 src/graphics/render/BlocksRenderer.cpp |  2 +-
 src/graphics/render/ChunksRenderer.cpp | 40 +++++++++++---------------
 src/graphics/render/ChunksRenderer.hpp |  4 +--
 src/graphics/render/commons.hpp        |  4 +--
 4 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/src/graphics/render/BlocksRenderer.cpp b/src/graphics/render/BlocksRenderer.cpp
index aa36ead6..04622e46 100644
--- a/src/graphics/render/BlocksRenderer.cpp
+++ b/src/graphics/render/BlocksRenderer.cpp
@@ -666,7 +666,7 @@ ChunkMesh BlocksRenderer::render(const Chunk* chunk, const Chunks* chunks) {
 
     const vattr attrs[]{ {3}, {2}, {1}, {0} };
     size_t vcount = vertexOffset / BlocksRenderer::VERTEX_SIZE;
-    return ChunkMesh{std::make_shared<Mesh>(
+    return ChunkMesh{std::make_unique<Mesh>(
         vertexBuffer.get(), vcount, indexBuffer.get(), indexSize, attrs
     ), std::move(sortingMesh)};
 }
diff --git a/src/graphics/render/ChunksRenderer.cpp b/src/graphics/render/ChunksRenderer.cpp
index 2c1534b2..7ef3ea68 100644
--- a/src/graphics/render/ChunksRenderer.cpp
+++ b/src/graphics/render/ChunksRenderer.cpp
@@ -69,7 +69,7 @@ ChunksRenderer::ChunksRenderer(
             if (!result.cancelled) {
                 auto meshData = std::move(result.meshData);
                 meshes[result.key] = ChunkMesh {
-                    std::make_shared<Mesh>(meshData.mesh),
+                    std::make_unique<Mesh>(meshData.mesh),
                     std::move(meshData.sortingMesh)
                 };
             }
@@ -90,7 +90,7 @@ ChunksRenderer::ChunksRenderer(
 ChunksRenderer::~ChunksRenderer() {
 }
 
-std::shared_ptr<Mesh> ChunksRenderer::render(
+const Mesh* ChunksRenderer::render(
     const std::shared_ptr<Chunk>& chunk, bool important
 ) {
     chunk->flags.modified = false;
@@ -99,7 +99,7 @@ std::shared_ptr<Mesh> ChunksRenderer::render(
         meshes[glm::ivec2(chunk->x, chunk->z)] = ChunkMesh {
             std::move(mesh.mesh), std::move(mesh.sortingMeshData)
         };
-        return meshes[glm::ivec2(chunk->x, chunk->z)].mesh;
+        return meshes[glm::ivec2(chunk->x, chunk->z)].mesh.get();
     }
     glm::ivec2 key(chunk->x, chunk->z);
     if (inwork.find(key) != inwork.end()) {
@@ -123,7 +123,7 @@ void ChunksRenderer::clear() {
     threadPool.clearQueue();
 }
 
-std::shared_ptr<Mesh> ChunksRenderer::getOrRender(
+const Mesh* ChunksRenderer::getOrRender(
     const std::shared_ptr<Chunk>& chunk, bool important
 ) {
     auto found = meshes.find(glm::ivec2(chunk->x, chunk->z));
@@ -133,7 +133,7 @@ std::shared_ptr<Mesh> ChunksRenderer::getOrRender(
     if (chunk->flags.modified) {
         render(chunk, important);
     }
-    return found->second.mesh;
+    return found->second.mesh.get();
 }
 
 void ChunksRenderer::update() {
@@ -225,16 +225,12 @@ void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
     static int frameid = 0;
     frameid++;
 
+    bool culling = settings.graphics.frustumCulling.get();
+    const auto& chunks = level.chunks->getChunks();
+    const auto& cameraPos = camera.position;
     const auto& atlas = assets.require<Atlas>("blocks");
 
     atlas.getTexture()->bind();
-
-    const auto& chunks = level.chunks->getChunks();
-
-    auto pposition = camera.position;
-    
-    size_t size = 0;
-    bool culling = settings.graphics.frustumCulling.get();
     shader.uniformMatrix("u_model", glm::mat4(1.0f));
     
     for (const auto& index : indices) {
@@ -259,16 +255,13 @@ void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
         if (!frustum.isBoxVisible(min, max)) continue;
 
         auto& chunkEntries = found->second.sortingMeshData.entries;
-        
-        for (auto& entry : chunkEntries) {
-            entry.distance =
-                static_cast<long long>(glm::distance2(entry.position, pposition));
-        }
 
-        if (chunkEntries.size() == 1) {
+        if (chunkEntries.empty()) {
+            continue;
+        } else if (chunkEntries.size() == 1) {
             auto& entry = chunkEntries.at(0);
             if (found->second.sortedMesh == nullptr) {
-                found->second.sortedMesh = std::make_shared<Mesh>(
+                found->second.sortedMesh = std::make_unique<Mesh>(
                     entry.vertexData.data(),
                     entry.vertexData.size() / VERTEX_SIZE,
                     ATTRS
@@ -277,11 +270,10 @@ void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
             found->second.sortedMesh->draw();
             continue;
         }
-
-        if (chunkEntries.empty()) {
-            continue;
+        for (auto& entry : chunkEntries) {
+            entry.distance =
+                static_cast<long long>(glm::distance2(entry.position, cameraPos));
         }
-
         if (found->second.sortedMesh == nullptr ||
             (frameid + chunk->x) % sortInterval == 0) {
             std::sort(chunkEntries.begin(), chunkEntries.end());
@@ -302,7 +294,7 @@ void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
                 );
                 offset += entry.vertexData.size();
             }
-            found->second.sortedMesh = std::make_shared<Mesh>(
+            found->second.sortedMesh = std::make_unique<Mesh>(
                 buffer.data(), size / VERTEX_SIZE, ATTRS
             );
         }
diff --git a/src/graphics/render/ChunksRenderer.hpp b/src/graphics/render/ChunksRenderer.hpp
index a631ae8a..55e3b90e 100644
--- a/src/graphics/render/ChunksRenderer.hpp
+++ b/src/graphics/render/ChunksRenderer.hpp
@@ -65,13 +65,13 @@ public:
     );
     virtual ~ChunksRenderer();
 
-    std::shared_ptr<Mesh> render(
+    const Mesh* render(
         const std::shared_ptr<Chunk>& chunk, bool important
     );
     void unload(const Chunk* chunk);
     void clear();
 
-    std::shared_ptr<Mesh> getOrRender(
+    const Mesh* getOrRender(
         const std::shared_ptr<Chunk>& chunk, bool important
     );
     void drawChunks(const Camera& camera, Shader& shader);
diff --git a/src/graphics/render/commons.hpp b/src/graphics/render/commons.hpp
index 1bff70f5..5cd92631 100644
--- a/src/graphics/render/commons.hpp
+++ b/src/graphics/render/commons.hpp
@@ -29,7 +29,7 @@ struct ChunkMeshData {
 };
 
 struct ChunkMesh {
-    std::shared_ptr<Mesh> mesh;
+    std::unique_ptr<Mesh> mesh;
     SortingMeshData sortingMeshData;
-    std::shared_ptr<Mesh> sortedMesh = nullptr;
+    std::unique_ptr<Mesh> sortedMesh = nullptr;
 };

From 608eb60514aa4345c8581cd124bb591c10fe9274 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sat, 16 Nov 2024 16:13:18 +0300
Subject: [PATCH 16/80] add 'u_alphaClip' to the blocks shader

---
 res/shaders/main.glslf                 | 4 ++--
 src/graphics/render/ChunksRenderer.cpp | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/res/shaders/main.glslf b/res/shaders/main.glslf
index 4c1cb014..7db1a544 100644
--- a/res/shaders/main.glslf
+++ b/res/shaders/main.glslf
@@ -9,14 +9,14 @@ uniform samplerCube u_cubemap;
 uniform vec3 u_fogColor;
 uniform float u_fogFactor;
 uniform float u_fogCurve;
+uniform bool u_alphaClip;
 
 void main() {
     vec3 fogColor = texture(u_cubemap, a_dir).rgb;
     vec4 tex_color = texture(u_texture0, a_texCoord);
     float depth = (a_distance/256.0);
     float alpha = a_color.a * tex_color.a;
-    // anyway it's any alpha-test alternative required
-    if (alpha < 0.3f)
+    if (u_alphaClip && alpha < 0.9f)
         discard;
     f_color = mix(a_color * tex_color, vec4(fogColor,1.0), 
               min(1.0, pow(depth*u_fogFactor, u_fogCurve)));
diff --git a/src/graphics/render/ChunksRenderer.cpp b/src/graphics/render/ChunksRenderer.cpp
index 7ef3ea68..e52cd3eb 100644
--- a/src/graphics/render/ChunksRenderer.cpp
+++ b/src/graphics/render/ChunksRenderer.cpp
@@ -209,6 +209,7 @@ void ChunksRenderer::drawChunks(
     bool culling = settings.graphics.frustumCulling.get();
 
     visibleChunks = 0;
+    shader.uniform1i("u_alphaClip", true);
     //if (GLEW_ARB_multi_draw_indirect && false) {
         // TODO: implement Multi Draw Indirect chunks draw
     //} else {
@@ -232,6 +233,7 @@ void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
 
     atlas.getTexture()->bind();
     shader.uniformMatrix("u_model", glm::mat4(1.0f));
+    shader.uniform1i("u_alphaClip", false);
     
     for (const auto& index : indices) {
         const auto& chunk = chunks[index.index];

From 65287b327326709f0d48edbff2b244aefd68ab04 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sun, 17 Nov 2024 00:54:10 +0300
Subject: [PATCH 17/80] move chunk vertex attributes info to commons.hpp

---
 src/graphics/render/BlocksRenderer.cpp | 45 +++++++++++++-------------
 src/graphics/render/BlocksRenderer.hpp |  1 -
 src/graphics/render/ChunksRenderer.cpp | 11 +++----
 src/graphics/render/commons.hpp        |  5 +++
 4 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/src/graphics/render/BlocksRenderer.cpp b/src/graphics/render/BlocksRenderer.cpp
index 04622e46..8b041b58 100644
--- a/src/graphics/render/BlocksRenderer.cpp
+++ b/src/graphics/render/BlocksRenderer.cpp
@@ -14,7 +14,6 @@
 
 #include "util/timeutil.hpp"
 
-const uint BlocksRenderer::VERTEX_SIZE = 6;
 const glm::vec3 BlocksRenderer::SUN_VECTOR (0.411934f, 0.863868f, -0.279161f);
 
 BlocksRenderer::BlocksRenderer(
@@ -23,7 +22,7 @@ BlocksRenderer::BlocksRenderer(
     const ContentGfxCache& cache,
     const EngineSettings& settings
 ) : content(content),
-    vertexBuffer(std::make_unique<float[]>(capacity * VERTEX_SIZE)),
+    vertexBuffer(std::make_unique<float[]>(capacity * CHUNK_VERTEX_SIZE)),
     indexBuffer(std::make_unique<int[]>(capacity)),
     vertexOffset(0),
     indexOffset(0),
@@ -87,7 +86,7 @@ void BlocksRenderer::face(
     const glm::vec4(&lights)[4],
     const glm::vec4& tint
 ) {
-    if (vertexOffset + BlocksRenderer::VERTEX_SIZE * 4 > capacity) {
+    if (vertexOffset + CHUNK_VERTEX_SIZE * 4 > capacity) {
         overflow = true;
         return;
     }
@@ -127,7 +126,7 @@ void BlocksRenderer::faceAO(
     const UVRegion& region,
     bool lights
 ) {
-    if (vertexOffset + BlocksRenderer::VERTEX_SIZE * 4 > capacity) {
+    if (vertexOffset + CHUNK_VERTEX_SIZE * 4 > capacity) {
         overflow = true;
         return;
     }
@@ -165,7 +164,7 @@ void BlocksRenderer::face(
     glm::vec4 tint,
     bool lights
 ) {
-    if (vertexOffset + BlocksRenderer::VERTEX_SIZE * 4 > capacity) {
+    if (vertexOffset + CHUNK_VERTEX_SIZE * 4 > capacity) {
         overflow = true;
         return;
     }
@@ -290,7 +289,7 @@ void BlocksRenderer::blockCustomModel(
 
     const auto& model = cache.getModel(block->rt.id);
     for (const auto& mesh : model.meshes) {
-        if (vertexOffset + BlocksRenderer::VERTEX_SIZE * mesh.vertices.size() > capacity) {
+        if (vertexOffset + CHUNK_VERTEX_SIZE * mesh.vertices.size() > capacity) {
             overflow = true;
             return;
         }
@@ -558,19 +557,19 @@ SortingMeshData BlocksRenderer::renderTranslucent(
                     y + 0.5f,
                     z + chunk->z * CHUNK_D + 0.5f
                 ),
-                util::Buffer<float>(indexSize * VERTEX_SIZE)};
+                util::Buffer<float>(indexSize * CHUNK_VERTEX_SIZE)};
 
             totalSize += entry.vertexData.size();
 
             for (int j = 0; j < indexSize; j++) {
                 std::memcpy(
-                    entry.vertexData.data() + j * VERTEX_SIZE,
-                    vertexBuffer.get() + indexBuffer[j] * VERTEX_SIZE,
-                    sizeof(float) * VERTEX_SIZE
+                    entry.vertexData.data() + j * CHUNK_VERTEX_SIZE,
+                    vertexBuffer.get() + indexBuffer[j] * CHUNK_VERTEX_SIZE,
+                    sizeof(float) * CHUNK_VERTEX_SIZE
                 );
-                float& vx = entry.vertexData[j * VERTEX_SIZE + 0];
-                float& vy = entry.vertexData[j * VERTEX_SIZE + 1];
-                float& vz = entry.vertexData[j * VERTEX_SIZE + 2];
+                float& vx = entry.vertexData[j * CHUNK_VERTEX_SIZE + 0];
+                float& vy = entry.vertexData[j * CHUNK_VERTEX_SIZE + 1];
+                float& vz = entry.vertexData[j * CHUNK_VERTEX_SIZE + 2];
 
                 if (!aabbInit) {
                     aabbInit = true;
@@ -653,21 +652,23 @@ void BlocksRenderer::build(const Chunk* chunk, const Chunks* chunks) {;
 }
 
 ChunkMeshData BlocksRenderer::createMesh() {
-    const vattr attrs[]{ {3}, {2}, {1}, {0} };
-    return ChunkMeshData{MeshData(
-        util::Buffer<float>(vertexBuffer.get(), vertexOffset), 
-        util::Buffer<int>(indexBuffer.get(), indexSize),
-        util::Buffer<vattr>({{3}, {2}, {1}, {0}})
-    ), std::move(sortingMesh)};
+    return ChunkMeshData {
+        MeshData(
+            util::Buffer<float>(vertexBuffer.get(), vertexOffset),
+            util::Buffer<int>(indexBuffer.get(), indexSize),
+            util::Buffer<vattr>(
+                CHUNK_VATTRS, sizeof(CHUNK_VATTRS) / sizeof(vattr)
+            )
+        ),
+        std::move(sortingMesh)};
 }
 
 ChunkMesh BlocksRenderer::render(const Chunk* chunk, const Chunks* chunks) {
     build(chunk, chunks);
 
-    const vattr attrs[]{ {3}, {2}, {1}, {0} };
-    size_t vcount = vertexOffset / BlocksRenderer::VERTEX_SIZE;
+    size_t vcount = vertexOffset / CHUNK_VERTEX_SIZE;
     return ChunkMesh{std::make_unique<Mesh>(
-        vertexBuffer.get(), vcount, indexBuffer.get(), indexSize, attrs
+        vertexBuffer.get(), vcount, indexBuffer.get(), indexSize, CHUNK_VATTRS
     ), std::move(sortingMesh)};
 }
 
diff --git a/src/graphics/render/BlocksRenderer.hpp b/src/graphics/render/BlocksRenderer.hpp
index cdb20749..c0e0086e 100644
--- a/src/graphics/render/BlocksRenderer.hpp
+++ b/src/graphics/render/BlocksRenderer.hpp
@@ -27,7 +27,6 @@ struct UVRegion;
 
 class BlocksRenderer {
     static const glm::vec3 SUN_VECTOR;
-    static const uint VERTEX_SIZE;
     const Content& content;
     std::unique_ptr<float[]> vertexBuffer;
     std::unique_ptr<int[]> indexBuffer;
diff --git a/src/graphics/render/ChunksRenderer.cpp b/src/graphics/render/ChunksRenderer.cpp
index e52cd3eb..7176500b 100644
--- a/src/graphics/render/ChunksRenderer.cpp
+++ b/src/graphics/render/ChunksRenderer.cpp
@@ -49,9 +49,6 @@ public:
     }
 };
 
-const vattr ATTRS[]{ {3}, {2}, {1}, {0} };
-inline constexpr int VERTEX_SIZE = 6;
-
 ChunksRenderer::ChunksRenderer(
     const Level* level, 
     const Assets& assets,
@@ -84,7 +81,7 @@ ChunksRenderer::ChunksRenderer(
     logger.info() << "created " << threadPool.getWorkersCount() << " workers";
 
     float buf[1]{};
-    sortedMesh = std::make_unique<Mesh>(buf, 0, ATTRS);
+    sortedMesh = std::make_unique<Mesh>(buf, 0, CHUNK_VATTRS);
 }
 
 ChunksRenderer::~ChunksRenderer() {
@@ -265,8 +262,8 @@ void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
             if (found->second.sortedMesh == nullptr) {
                 found->second.sortedMesh = std::make_unique<Mesh>(
                     entry.vertexData.data(),
-                    entry.vertexData.size() / VERTEX_SIZE,
-                    ATTRS
+                    entry.vertexData.size() / CHUNK_VERTEX_SIZE,
+                    CHUNK_VATTRS
                 );
             }
             found->second.sortedMesh->draw();
@@ -297,7 +294,7 @@ void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
                 offset += entry.vertexData.size();
             }
             found->second.sortedMesh = std::make_unique<Mesh>(
-                buffer.data(), size / VERTEX_SIZE, ATTRS
+                buffer.data(), size / CHUNK_VERTEX_SIZE, CHUNK_VATTRS
             );
         }
         found->second.sortedMesh->draw();
diff --git a/src/graphics/render/commons.hpp b/src/graphics/render/commons.hpp
index 5cd92631..b6d18003 100644
--- a/src/graphics/render/commons.hpp
+++ b/src/graphics/render/commons.hpp
@@ -7,6 +7,11 @@
 #include "graphics/core/MeshData.hpp"
 #include "util/Buffer.hpp"
 
+/// @brief Chunk mesh vertex attributes
+inline const vattr CHUNK_VATTRS[]{ {3}, {2}, {1}, {0} };
+/// @brief Chunk mesh vertex size divided by sizeof(float)
+inline constexpr int CHUNK_VERTEX_SIZE = 6;
+
 class Mesh;
 
 struct SortingMeshEntry {

From 5240fe62263242fe5b0a154f9708a702848a6274 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sun, 17 Nov 2024 01:00:27 +0300
Subject: [PATCH 18/80] rename vattr to VertexAttribute

---
 src/graphics/core/Batch2D.cpp          | 2 +-
 src/graphics/core/Batch3D.cpp          | 2 +-
 src/graphics/core/LineBatch.cpp        | 2 +-
 src/graphics/core/Mesh.cpp             | 4 ++--
 src/graphics/core/Mesh.hpp             | 4 ++--
 src/graphics/core/MeshData.hpp         | 6 +++---
 src/graphics/core/PostProcessing.cpp   | 2 +-
 src/graphics/render/BlocksRenderer.cpp | 4 ++--
 src/graphics/render/MainBatch.cpp      | 2 +-
 src/graphics/render/Skybox.cpp         | 2 +-
 src/graphics/render/commons.hpp        | 2 +-
 11 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/graphics/core/Batch2D.cpp b/src/graphics/core/Batch2D.cpp
index 13b48586..c4c67db2 100644
--- a/src/graphics/core/Batch2D.cpp
+++ b/src/graphics/core/Batch2D.cpp
@@ -11,7 +11,7 @@
 inline constexpr uint B2D_VERTEX_SIZE = 8;
 
 Batch2D::Batch2D(size_t capacity) : capacity(capacity), color(1.0f){
-    const vattr attrs[] = {
+    const VertexAttribute attrs[] = {
         {2}, {2}, {4}, {0}
     };
 
diff --git a/src/graphics/core/Batch3D.cpp b/src/graphics/core/Batch3D.cpp
index 1770fc21..a81f4ffb 100644
--- a/src/graphics/core/Batch3D.cpp
+++ b/src/graphics/core/Batch3D.cpp
@@ -12,7 +12,7 @@ inline constexpr uint B3D_VERTEX_SIZE = 9;
 
 Batch3D::Batch3D(size_t capacity) 
     : capacity(capacity) {
-    const vattr attrs[] = {
+    const VertexAttribute attrs[] = {
         {3}, {2}, {4}, {0}
     };
 
diff --git a/src/graphics/core/LineBatch.cpp b/src/graphics/core/LineBatch.cpp
index dd3f8067..aed8a249 100644
--- a/src/graphics/core/LineBatch.cpp
+++ b/src/graphics/core/LineBatch.cpp
@@ -6,7 +6,7 @@
 inline constexpr uint LB_VERTEX_SIZE = (3+4);
 
 LineBatch::LineBatch(size_t capacity) : capacity(capacity) {
-    const vattr attrs[] = { {3},{4}, {0} };
+    const VertexAttribute attrs[] = { {3},{4}, {0} };
     buffer = std::make_unique<float[]>(capacity * LB_VERTEX_SIZE * 2);
     mesh = std::make_unique<Mesh>(buffer.get(), 0, attrs);
     index = 0;
diff --git a/src/graphics/core/Mesh.cpp b/src/graphics/core/Mesh.cpp
index e0cc5484..e8cffe6f 100644
--- a/src/graphics/core/Mesh.cpp
+++ b/src/graphics/core/Mesh.cpp
@@ -4,7 +4,7 @@
 int Mesh::meshesCount = 0;
 int Mesh::drawCalls = 0;
 
-inline size_t calc_vertex_size(const vattr* attrs) {
+inline size_t calc_vertex_size(const VertexAttribute* attrs) {
     size_t vertexSize = 0;
     for (int i = 0; attrs[i].size; i++) {
         vertexSize += attrs[i].size;
@@ -19,7 +19,7 @@ Mesh::Mesh(const MeshData& data)
         data.indices.size(),
         data.attrs.data()) {}
 
-Mesh::Mesh(const float* vertexBuffer, size_t vertices, const int* indexBuffer, size_t indices, const vattr* attrs) : 
+Mesh::Mesh(const float* vertexBuffer, size_t vertices, const int* indexBuffer, size_t indices, const VertexAttribute* attrs) : 
     ibo(0),
     vertices(0),
     indices(0)
diff --git a/src/graphics/core/Mesh.hpp b/src/graphics/core/Mesh.hpp
index b36b044d..482c82bf 100644
--- a/src/graphics/core/Mesh.hpp
+++ b/src/graphics/core/Mesh.hpp
@@ -14,8 +14,8 @@ class Mesh {
     size_t vertexSize;
 public:
     Mesh(const MeshData& data);
-    Mesh(const float* vertexBuffer, size_t vertices, const int* indexBuffer, size_t indices, const vattr* attrs);
-    Mesh(const float* vertexBuffer, size_t vertices, const vattr* attrs) :
+    Mesh(const float* vertexBuffer, size_t vertices, const int* indexBuffer, size_t indices, const VertexAttribute* attrs);
+    Mesh(const float* vertexBuffer, size_t vertices, const VertexAttribute* attrs) :
         Mesh(vertexBuffer, vertices, nullptr, 0, attrs) {};
     ~Mesh();
 
diff --git a/src/graphics/core/MeshData.hpp b/src/graphics/core/MeshData.hpp
index 62b32903..39220119 100644
--- a/src/graphics/core/MeshData.hpp
+++ b/src/graphics/core/MeshData.hpp
@@ -6,7 +6,7 @@
 #include "util/Buffer.hpp"
 
 /// @brief Vertex attribute info
-struct vattr {
+struct VertexAttribute {
     ubyte size;
 };
 
@@ -14,7 +14,7 @@ struct vattr {
 struct MeshData {
     util::Buffer<float> vertices;
     util::Buffer<int> indices;
-    util::Buffer<vattr> attrs;
+    util::Buffer<VertexAttribute> attrs;
 
     MeshData() = default;
 
@@ -24,7 +24,7 @@ struct MeshData {
     MeshData(
         util::Buffer<float> vertices, 
         util::Buffer<int> indices,
-        util::Buffer<vattr> attrs
+        util::Buffer<VertexAttribute> attrs
     ) : vertices(std::move(vertices)),
         indices(std::move(indices)),
         attrs(std::move(attrs)) {}
diff --git a/src/graphics/core/PostProcessing.cpp b/src/graphics/core/PostProcessing.cpp
index 7352c3b5..3478ca08 100644
--- a/src/graphics/core/PostProcessing.cpp
+++ b/src/graphics/core/PostProcessing.cpp
@@ -14,7 +14,7 @@ PostProcessing::PostProcessing() {
         -1.0f, -1.0f, -1.0f, 1.0f, 1.0f, 1.0f,
         -1.0f, -1.0f,  1.0f, 1.0f, 1.0f, -1.0f
     };
-    vattr attrs[] {{2}, {0}};
+    VertexAttribute attrs[] {{2}, {0}};
     quadMesh = std::make_unique<Mesh>(vertices, 6, attrs);
 }
 
diff --git a/src/graphics/render/BlocksRenderer.cpp b/src/graphics/render/BlocksRenderer.cpp
index 8b041b58..5570de4c 100644
--- a/src/graphics/render/BlocksRenderer.cpp
+++ b/src/graphics/render/BlocksRenderer.cpp
@@ -656,8 +656,8 @@ ChunkMeshData BlocksRenderer::createMesh() {
         MeshData(
             util::Buffer<float>(vertexBuffer.get(), vertexOffset),
             util::Buffer<int>(indexBuffer.get(), indexSize),
-            util::Buffer<vattr>(
-                CHUNK_VATTRS, sizeof(CHUNK_VATTRS) / sizeof(vattr)
+            util::Buffer<VertexAttribute>(
+                CHUNK_VATTRS, sizeof(CHUNK_VATTRS) / sizeof(VertexAttribute)
             )
         ),
         std::move(sortingMesh)};
diff --git a/src/graphics/render/MainBatch.cpp b/src/graphics/render/MainBatch.cpp
index 1cbb6c42..e3a87db7 100644
--- a/src/graphics/render/MainBatch.cpp
+++ b/src/graphics/render/MainBatch.cpp
@@ -6,7 +6,7 @@
 #include "voxels/Chunks.hpp"
 #include "voxels/Chunk.hpp"
 
-static const vattr attrs[] = {
+static const VertexAttribute attrs[] = {
     {3}, {2}, {3}, {1}, {0}
 };
 
diff --git a/src/graphics/render/Skybox.cpp b/src/graphics/render/Skybox.cpp
index e96e894a..af3a1587 100644
--- a/src/graphics/render/Skybox.cpp
+++ b/src/graphics/render/Skybox.cpp
@@ -39,7 +39,7 @@ Skybox::Skybox(uint size, Shader& shader)
         -1.0f, -1.0f, -1.0f, 1.0f, 1.0f, 1.0f,
         -1.0f, -1.0f,  1.0f, 1.0f, 1.0f, -1.0f
     };
-    vattr attrs[] {{2}, {0}};
+    VertexAttribute attrs[] {{2}, {0}};
     mesh = std::make_unique<Mesh>(vertices, 6, attrs);
 
     sprites.push_back(skysprite {
diff --git a/src/graphics/render/commons.hpp b/src/graphics/render/commons.hpp
index b6d18003..79b77393 100644
--- a/src/graphics/render/commons.hpp
+++ b/src/graphics/render/commons.hpp
@@ -8,7 +8,7 @@
 #include "util/Buffer.hpp"
 
 /// @brief Chunk mesh vertex attributes
-inline const vattr CHUNK_VATTRS[]{ {3}, {2}, {1}, {0} };
+inline const VertexAttribute CHUNK_VATTRS[]{ {3}, {2}, {1}, {0} };
 /// @brief Chunk mesh vertex size divided by sizeof(float)
 inline constexpr int CHUNK_VERTEX_SIZE = 6;
 

From bd4a5ef7fc2d753177d9391ea501d55588af1975 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sun, 17 Nov 2024 03:19:55 +0300
Subject: [PATCH 19/80] optimize a bit

---
 src/graphics/render/BlocksRenderer.cpp |  4 +-
 src/graphics/render/ChunksRenderer.cpp | 89 +++++++++++++-------------
 src/graphics/render/ChunksRenderer.hpp |  4 +-
 3 files changed, 46 insertions(+), 51 deletions(-)

diff --git a/src/graphics/render/BlocksRenderer.cpp b/src/graphics/render/BlocksRenderer.cpp
index 5570de4c..2202931b 100644
--- a/src/graphics/render/BlocksRenderer.cpp
+++ b/src/graphics/render/BlocksRenderer.cpp
@@ -12,8 +12,6 @@
 
 #include <glm/glm.hpp>
 
-#include "util/timeutil.hpp"
-
 const glm::vec3 BlocksRenderer::SUN_VECTOR (0.411934f, 0.863868f, -0.279161f);
 
 BlocksRenderer::BlocksRenderer(
@@ -607,7 +605,7 @@ SortingMeshData BlocksRenderer::renderTranslucent(
     return sortingMesh;
 }
 
-void BlocksRenderer::build(const Chunk* chunk, const Chunks* chunks) {;
+void BlocksRenderer::build(const Chunk* chunk, const Chunks* chunks) {
     this->chunk = chunk;
     voxelsBuffer->setPosition(
         chunk->x * CHUNK_W - voxelBufferPadding, 0,
diff --git a/src/graphics/render/ChunksRenderer.cpp b/src/graphics/render/ChunksRenderer.cpp
index 7176500b..edbf83f3 100644
--- a/src/graphics/render/ChunksRenderer.cpp
+++ b/src/graphics/render/ChunksRenderer.cpp
@@ -14,12 +14,9 @@
 #include "util/listutil.hpp"
 #include "settings.hpp"
 
-#include <iostream>
 #include <glm/glm.hpp>
 #include <glm/ext.hpp>
 
-#include "util/timeutil.hpp"
-
 static debug::Logger logger("chunks-render");
 
 size_t ChunksRenderer::visibleChunks = 0;
@@ -79,9 +76,6 @@ ChunksRenderer::ChunksRenderer(
         *level->content, cache, settings
     );
     logger.info() << "created " << threadPool.getWorkersCount() << " workers";
-
-    float buf[1]{};
-    sortedMesh = std::make_unique<Mesh>(buf, 0, CHUNK_VATTRS);
 }
 
 ChunksRenderer::~ChunksRenderer() {
@@ -137,12 +131,12 @@ void ChunksRenderer::update() {
     threadPool.update();
 }
 
-bool ChunksRenderer::drawChunk(
+const Mesh* ChunksRenderer::retrieveChunk(
     size_t index, const Camera& camera, Shader& shader, bool culling
 ) {
     auto chunk = level.chunks->getChunks()[index];
     if (chunk == nullptr || !chunk->flags.lighted) {
-        return false;
+        return nullptr;
     }
     float distance = glm::distance(
         camera.position,
@@ -154,7 +148,7 @@ bool ChunksRenderer::drawChunk(
     );
     auto mesh = getOrRender(chunk, distance < CHUNK_W * 1.5f);
     if (mesh == nullptr) {
-        return false;
+        return nullptr;
     }
     if (culling) {
         glm::vec3 min(chunk->x * CHUNK_W, chunk->bottom, chunk->z * CHUNK_D);
@@ -164,13 +158,9 @@ bool ChunksRenderer::drawChunk(
             chunk->z * CHUNK_D + CHUNK_D
         );
 
-        if (!frustum.isBoxVisible(min, max)) return false;
+        if (!frustum.isBoxVisible(min, max)) return nullptr;
     }
-    glm::vec3 coord(chunk->x * CHUNK_W + 0.5f, 0.5f, chunk->z * CHUNK_D + 0.5f);
-    glm::mat4 model = glm::translate(glm::mat4(1.0f), coord);
-    shader.uniformMatrix("u_model", model);
-    mesh->draw();
-    return true;
+    return mesh;
 }
 
 void ChunksRenderer::drawChunks(
@@ -207,19 +197,38 @@ void ChunksRenderer::drawChunks(
 
     visibleChunks = 0;
     shader.uniform1i("u_alphaClip", true);
-    //if (GLEW_ARB_multi_draw_indirect && false) {
-        // TODO: implement Multi Draw Indirect chunks draw
-    //} else {
-        for (size_t i = 0; i < indices.size(); i++) {
-            visibleChunks += drawChunk(indices[i].index, camera, shader, culling);
+
+    // TODO: minimize draw calls number
+    for (size_t i = 0; i < indices.size(); i++) {
+        auto chunk = chunks.getChunks()[indices[i].index];
+        auto mesh = retrieveChunk(indices[i].index, camera, shader, culling);
+
+        if (mesh) {
+            glm::vec3 coord(chunk->x * CHUNK_W + 0.5f, 0.5f, chunk->z * CHUNK_D + 0.5f);
+            glm::mat4 model = glm::translate(glm::mat4(1.0f), coord);
+            shader.uniformMatrix("u_model", model);
+            mesh->draw();
+            visibleChunks++;
         }
-    //}
+    }
+}
+
+static inline void write_sorting_mesh_entries(
+    float* buffer, const std::vector<SortingMeshEntry>& chunkEntries
+) {
+    for (const auto& entry : chunkEntries) {
+        const auto& vertexData = entry.vertexData;
+        std::memcpy(
+            buffer,
+            vertexData.data(),
+            vertexData.size() * sizeof(float)
+        );
+        buffer += vertexData.size();
+    }
 }
 
 void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
-    timeutil::ScopeLogTimer log(444);
-
-    const int sortInterval = 6;
+    const int sortInterval = 8;
     static int frameid = 0;
     frameid++;
 
@@ -238,26 +247,22 @@ void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
             continue;
         }
         const auto& found = meshes.find(glm::ivec2(chunk->x, chunk->z));
-        if (found == meshes.end()) {
+        if (found == meshes.end() || found->second.sortingMeshData.entries.empty()) {
             continue;
         }
 
-        glm::vec3 min(
-            chunk->x * CHUNK_W - CHUNK_W, 0, chunk->z * CHUNK_D - CHUNK_D
-        );
+        glm::vec3 min(chunk->x * CHUNK_W, chunk->bottom, chunk->z * CHUNK_D);
         glm::vec3 max(
-            chunk->x * CHUNK_W + CHUNK_W*2,
-            CHUNK_H,
-            chunk->z * CHUNK_D + CHUNK_D*2
+            chunk->x * CHUNK_W + CHUNK_W,
+            chunk->top,
+            chunk->z * CHUNK_D + CHUNK_D
         );
 
         if (!frustum.isBoxVisible(min, max)) continue;
 
         auto& chunkEntries = found->second.sortingMeshData.entries;
 
-        if (chunkEntries.empty()) {
-            continue;
-        } else if (chunkEntries.size() == 1) {
+        if (chunkEntries.size() == 1) {
             auto& entry = chunkEntries.at(0);
             if (found->second.sortedMesh == nullptr) {
                 found->second.sortedMesh = std::make_unique<Mesh>(
@@ -270,8 +275,9 @@ void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
             continue;
         }
         for (auto& entry : chunkEntries) {
-            entry.distance =
-                static_cast<long long>(glm::distance2(entry.position, cameraPos));
+            entry.distance = static_cast<long long>(
+                glm::distance2(entry.position, cameraPos)
+            );
         }
         if (found->second.sortedMesh == nullptr ||
             (frameid + chunk->x) % sortInterval == 0) {
@@ -280,19 +286,12 @@ void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
             for (const auto& entry : chunkEntries) {
                 size += entry.vertexData.size();
             }
+
             static util::Buffer<float> buffer;
             if (buffer.size() < size) {
                 buffer = util::Buffer<float>(size);
             }
-            size_t offset = 0;
-            for (const auto& entry : chunkEntries) {
-                std::memcpy(
-                    (buffer.data() + offset),
-                    entry.vertexData.data(),
-                    entry.vertexData.size() * sizeof(float)
-                );
-                offset += entry.vertexData.size();
-            }
+            write_sorting_mesh_entries(buffer.data(), chunkEntries);
             found->second.sortedMesh = std::make_unique<Mesh>(
                 buffer.data(), size / CHUNK_VERTEX_SIZE, CHUNK_VATTRS
             );
diff --git a/src/graphics/render/ChunksRenderer.hpp b/src/graphics/render/ChunksRenderer.hpp
index 55e3b90e..5317c544 100644
--- a/src/graphics/render/ChunksRenderer.hpp
+++ b/src/graphics/render/ChunksRenderer.hpp
@@ -50,11 +50,9 @@ class ChunksRenderer {
     std::unordered_map<glm::ivec2, bool> inwork;
     std::vector<ChunksSortEntry> indices;
     util::ThreadPool<std::shared_ptr<Chunk>, RendererResult> threadPool;
-
-    bool drawChunk(
+    const Mesh* retrieveChunk(
         size_t index, const Camera& camera, Shader& shader, bool culling
     );
-    std::unique_ptr<Mesh> sortedMesh;
 public:
     ChunksRenderer(
         const Level* level,

From 3c94061fd33bbaa50ee9d5ef3c2777c4ae7f3bff Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sun, 17 Nov 2024 04:01:02 +0300
Subject: [PATCH 20/80] update ice texture

---
 res/content/base/textures/blocks/ice.png | Bin 7220 -> 7429 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/res/content/base/textures/blocks/ice.png b/res/content/base/textures/blocks/ice.png
index 36592775c01375a6799eb81ee7ff0a40bc01bc03..707ee89ae82e4f4c612a9cd504c28fd073aea062 100644
GIT binary patch
delta 2554
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
Q@c;k-07*qoM6N<$f^)~Y%K!iX

delta 2514
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


From 5f71522653d3bbcf7ffcf638ad5c16bfc8280cd8 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sun, 17 Nov 2024 04:31:07 +0300
Subject: [PATCH 21/80] extend that one optimization

---
 src/graphics/render/BlocksRenderer.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/graphics/render/BlocksRenderer.cpp b/src/graphics/render/BlocksRenderer.cpp
index 2202931b..cb590bcb 100644
--- a/src/graphics/render/BlocksRenderer.cpp
+++ b/src/graphics/render/BlocksRenderer.cpp
@@ -587,7 +587,8 @@ SortingMeshData BlocksRenderer::renderTranslucent(
 
     // additional powerful optimization
     auto size = aabb.size();
-    if (glm::abs(size.y) < 0.01f && sortingMesh.entries.size() > 1) {
+    if ((size.y < 0.01f || size.x < 0.01f || size.z < 0.01f) && 
+         sortingMesh.entries.size() > 1) {
         SortingMeshEntry newEntry {
             sortingMesh.entries[0].position,
             util::Buffer<float>(totalSize)

From 71d18ae3a99140e5c2b76df3a8365e5ee9277aa8 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sun, 17 Nov 2024 04:58:15 +0300
Subject: [PATCH 22/80] minor refactor

---
 src/constants.hpp                      | 8 +++++---
 src/graphics/render/ChunksRenderer.cpp | 9 ++++-----
 src/graphics/render/ChunksRenderer.hpp | 5 +++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/constants.hpp b/src/constants.hpp
index 12e12c75..84d8b22c 100644
--- a/src/constants.hpp
+++ b/src/constants.hpp
@@ -35,9 +35,6 @@ inline constexpr int CHUNK_D = 16;
 inline constexpr uint VOXEL_USER_BITS = 8;
 inline constexpr uint VOXEL_USER_BITS_OFFSET = sizeof(blockstate_t)*8-VOXEL_USER_BITS;
 
-/// @brief pixel size of an item inventory icon
-inline constexpr int ITEM_ICON_SIZE = 48;
-
 /// @brief chunk volume (count of voxels per Chunk)
 inline constexpr int CHUNK_VOL = (CHUNK_W * CHUNK_H * CHUNK_D);
 
@@ -53,6 +50,11 @@ inline constexpr uint vox_index(uint x, uint y, uint z, uint w=CHUNK_W, uint d=C
     return (y * d + z) * w + x;
 }
 
+/// @brief pixel size of an item inventory icon
+inline constexpr int ITEM_ICON_SIZE = 48;
+
+inline constexpr int TRANSLUCENT_BLOCKS_SORT_INTERVAL = 8;
+
 inline const std::string SHADERS_FOLDER = "shaders";
 inline const std::string TEXTURES_FOLDER = "textures";
 inline const std::string FONTS_FOLDER = "fonts";
diff --git a/src/graphics/render/ChunksRenderer.cpp b/src/graphics/render/ChunksRenderer.cpp
index edbf83f3..d3686a86 100644
--- a/src/graphics/render/ChunksRenderer.cpp
+++ b/src/graphics/render/ChunksRenderer.cpp
@@ -14,9 +14,6 @@
 #include "util/listutil.hpp"
 #include "settings.hpp"
 
-#include <glm/glm.hpp>
-#include <glm/ext.hpp>
-
 static debug::Logger logger("chunks-render");
 
 size_t ChunksRenderer::visibleChunks = 0;
@@ -204,7 +201,9 @@ void ChunksRenderer::drawChunks(
         auto mesh = retrieveChunk(indices[i].index, camera, shader, culling);
 
         if (mesh) {
-            glm::vec3 coord(chunk->x * CHUNK_W + 0.5f, 0.5f, chunk->z * CHUNK_D + 0.5f);
+            glm::vec3 coord(
+                chunk->x * CHUNK_W + 0.5f, 0.5f, chunk->z * CHUNK_D + 0.5f
+            );
             glm::mat4 model = glm::translate(glm::mat4(1.0f), coord);
             shader.uniformMatrix("u_model", model);
             mesh->draw();
@@ -228,7 +227,7 @@ static inline void write_sorting_mesh_entries(
 }
 
 void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
-    const int sortInterval = 8;
+    const int sortInterval = TRANSLUCENT_BLOCKS_SORT_INTERVAL;
     static int frameid = 0;
     frameid++;
 
diff --git a/src/graphics/render/ChunksRenderer.hpp b/src/graphics/render/ChunksRenderer.hpp
index 5317c544..859bca9e 100644
--- a/src/graphics/render/ChunksRenderer.hpp
+++ b/src/graphics/render/ChunksRenderer.hpp
@@ -4,10 +4,12 @@
 #include <memory>
 #include <vector>
 #include <unordered_map>
+
 #include <glm/glm.hpp>
+#define GLM_ENABLE_EXPERIMENTAL
+#include <glm/gtx/hash.hpp>
 
 #include "voxels/Block.hpp"
-#include "voxels/ChunksStorage.hpp"
 #include "util/ThreadPool.hpp"
 #include "graphics/core/MeshData.hpp"
 #include "commons.hpp"
@@ -17,7 +19,6 @@ class Chunk;
 class Level;
 class Camera;
 class Shader;
-class Chunks;
 class Assets;
 class Frustum;
 class BlocksRenderer;

From 0a33970a7ad4e3389dcc2a25a97edd4c7eef9550 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sun, 17 Nov 2024 05:19:39 +0300
Subject: [PATCH 23/80] fix base:glass visibility

---
 res/content/base/blocks/glass.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/content/base/blocks/glass.json b/res/content/base/blocks/glass.json
index 902a2cf1..9bd4f021 100644
--- a/res/content/base/blocks/glass.json
+++ b/res/content/base/blocks/glass.json
@@ -3,5 +3,6 @@
     "material": "base:glass",
     "draw-group": 2,
     "light-passing": true,
-    "sky-light-passing": true
+    "sky-light-passing": true,
+    "translucent": true
 }

From eaa5150d3edbb4dacb72afccc4c8d6396ff0cbd0 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sun, 17 Nov 2024 05:23:50 +0300
Subject: [PATCH 24/80] update doc/*/block-properties.md

---
 doc/en/block-properties.md | 6 ++++++
 doc/ru/block-properties.md | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/doc/en/block-properties.md b/doc/en/block-properties.md
index cef58a9a..18c068ca 100644
--- a/doc/en/block-properties.md
+++ b/doc/en/block-properties.md
@@ -39,6 +39,12 @@ Block model type from list:
 
 Integer specifying number of block draw group (render order). Used for semi-transparent blocks.
 
+### *translucent*
+
+Enables translucency support in block textures (examples: water, ice).
+Should only be used when needed, as it impacts performance.
+Not required for full transparency (grass, flowers).
+
 ### *rotation*
 
 Rotation profile (set of available block rotations and behaviour of placing block rotation) from list:
diff --git a/doc/ru/block-properties.md b/doc/ru/block-properties.md
index 62ef8ec4..79b08da2 100644
--- a/doc/ru/block-properties.md
+++ b/doc/ru/block-properties.md
@@ -40,6 +40,12 @@
 Целое число определяющее номер группы отрисовки данного блока. 
 Актуально для полупрозрачных блоков - решает проблемы невидимых сторон блоков за этим блоком.
 
+### Полупрозрачность - *translucent*
+
+Включает поддержку полупрозрачности в текстурах блока (примеры: вода, лёд).
+Следует использовать только при надобности, так как влияет на производительность.
+Не требуется для полной прозрачности (трава, цветы).
+
 ### Вращение - *rotation*
 
 Профиль вращения (набор положений, в которые можно установить блок) из списка:

From 255c49916cf61c6f44d5f9b4f090b584eb88871c Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sun, 17 Nov 2024 06:38:13 +0300
Subject: [PATCH 25/80] add 'ice' translation to ru_RU.txt

---
 res/content/base/texts/ru_RU.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/res/content/base/texts/ru_RU.txt b/res/content/base/texts/ru_RU.txt
index f6a3ab51..cf55ec54 100644
--- a/res/content/base/texts/ru_RU.txt
+++ b/res/content/base/texts/ru_RU.txt
@@ -1,3 +1,4 @@
+bazalt breaker=крушитель базальта
 bazalt=базальт
 blue lamp=синяя лампа
 brick=кирпич
@@ -5,8 +6,8 @@ dirt=земля
 flower=цветок
 glass=стекло
 grass block=дёрн
-tall grass=высокая трава
 green lamp=зелёная лампа
+ice=лёд
 lamp=лампа
 leaves=листва
 light bulb=лампочка
@@ -18,8 +19,8 @@ red lamp=красная лампа
 rust=ржавчина
 sand=песок
 stone=камень
+tall grass=высокая трава
+torch=факел
 water=вода
 wood=бревно
-torch=факел
-bazalt breaker=крушитель базальта
 wooden door=деревянная дверь

From 3ea213e8d3cee7be55ec39ffb18dc557dec7557b Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sun, 17 Nov 2024 15:53:25 +0300
Subject: [PATCH 26/80] fix console position

---
 res/layouts/console.xml                |  2 +-
 src/frontend/hud.cpp                   |  7 +++++--
 src/graphics/core/DrawContext.cpp      |  2 +-
 src/graphics/core/DrawContext.hpp      |  2 +-
 src/graphics/ui/elements/Container.cpp |  4 ++--
 src/window/Window.cpp                  | 16 ++++++++--------
 6 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/res/layouts/console.xml b/res/layouts/console.xml
index 3e1b802d..bae396bf 100644
--- a/res/layouts/console.xml
+++ b/res/layouts/console.xml
@@ -14,7 +14,7 @@
     <panel id="problemsLog"
         color="#00000010" 
         position-func="gui.get_viewport()[1]-350,0" 
-        size-func="351,gui.get_viewport()[2]-40"
+        size-func="350,gui.get_viewport()[2]-40"
         padding="5,15,5,15">
         <label>@Problems</label>
     </panel>
diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp
index bfaac141..f0bbf20a 100644
--- a/src/frontend/hud.cpp
+++ b/src/frontend/hud.cpp
@@ -615,8 +615,11 @@ void Hud::updateElementsPosition(const Viewport& viewport) {
             }
             if (secondUI->getPositionFunc() == nullptr) {
                 secondUI->setPos(glm::vec2(
-                    glm::min(width/2-invwidth/2, width-caWidth-(inventoryView ? 10 : 0)-invwidth),
-                    height/2-totalHeight/2
+                    glm::min(
+                        width / 2.f - invwidth / 2.f,
+                        width - caWidth - (inventoryView ? 10 : 0) - invwidth
+                    ),
+                    height / 2.f - totalHeight / 2.f
                 ));
             }
         }
diff --git a/src/graphics/core/DrawContext.cpp b/src/graphics/core/DrawContext.cpp
index 29afae2e..314bd7b5 100644
--- a/src/graphics/core/DrawContext.cpp
+++ b/src/graphics/core/DrawContext.cpp
@@ -148,7 +148,7 @@ void DrawContext::setBlendMode(BlendMode mode) {
     set_blend_mode(mode);
 }
 
-void DrawContext::setScissors(glm::vec4 area) {
+void DrawContext::setScissors(const glm::vec4& area) {
     Window::pushScissor(area);
     scissorsCount++;
 }
diff --git a/src/graphics/core/DrawContext.hpp b/src/graphics/core/DrawContext.hpp
index 9174be1b..736b053e 100644
--- a/src/graphics/core/DrawContext.hpp
+++ b/src/graphics/core/DrawContext.hpp
@@ -34,6 +34,6 @@ public:
     void setDepthTest(bool flag);
     void setCullFace(bool flag);
     void setBlendMode(BlendMode mode);
-    void setScissors(glm::vec4 area);
+    void setScissors(const glm::vec4& area);
     void setLineWidth(float width);
 };
diff --git a/src/graphics/ui/elements/Container.cpp b/src/graphics/ui/elements/Container.cpp
index 3b8fd0ac..72a44d52 100644
--- a/src/graphics/ui/elements/Container.cpp
+++ b/src/graphics/ui/elements/Container.cpp
@@ -90,7 +90,7 @@ void Container::draw(const DrawContext* pctx, Assets* assets) {
     if (!nodes.empty()) {
         batch->flush();
         DrawContext ctx = pctx->sub();
-        ctx.setScissors(glm::vec4(pos.x, pos.y, size.x, size.y));
+        ctx.setScissors(glm::vec4(pos.x, pos.y, glm::ceil(size.x), glm::ceil(size.y)));
         for (const auto& node : nodes) {
             if (node->isVisible())
                 node->draw(pctx, assets);
@@ -108,7 +108,7 @@ void Container::drawBackground(const DrawContext* pctx, Assets*) {
     auto batch = pctx->getBatch2D();
     batch->texture(nullptr);
     batch->setColor(color);
-    batch->rect(pos.x, pos.y, size.x, size.y);
+    batch->rect(pos.x, pos.y, glm::ceil(size.x), glm::ceil(size.y));
 }
 
 void Container::add(const std::shared_ptr<UINode> &node) {
diff --git a/src/window/Window.cpp b/src/window/Window.cpp
index fdfde141..99a549ca 100644
--- a/src/window/Window.cpp
+++ b/src/window/Window.cpp
@@ -258,14 +258,14 @@ void Window::pushScissor(glm::vec4 area) {
     }
     scissorStack.push(scissorArea);
 
-    area.z += area.x;
-    area.w += area.y;
+    area.z += glm::ceil(area.x);
+    area.w += glm::ceil(area.y);
 
-    area.x = fmax(area.x, scissorArea.x);
-    area.y = fmax(area.y, scissorArea.y);
+    area.x = glm::max(area.x, scissorArea.x);
+    area.y = glm::max(area.y, scissorArea.y);
 
-    area.z = fmin(area.z, scissorArea.z);
-    area.w = fmin(area.w, scissorArea.w);
+    area.z = glm::min(area.z, scissorArea.z);
+    area.w = glm::min(area.w, scissorArea.w);
 
     if (area.z < 0.0f || area.w < 0.0f) {
         glScissor(0, 0, 0, 0);
@@ -273,8 +273,8 @@ void Window::pushScissor(glm::vec4 area) {
         glScissor(
             area.x,
             Window::height - area.w,
-            std::max(0, int(area.z - area.x)),
-            std::max(0, int(area.w - area.y))
+            std::max(0, static_cast<int>(glm::ceil(area.z - area.x))),
+            std::max(0, static_cast<int>(glm::ceil(area.w - area.y)))
         );
     }
     scissorArea = area;

From 352ef6485a4b796d1cdc8dd0e00ab1a1d72a2c0a Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sun, 17 Nov 2024 16:12:59 +0300
Subject: [PATCH 27/80] fix falling block hitbox

---
 res/content/base/entities/falling_block.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/content/base/entities/falling_block.json b/res/content/base/entities/falling_block.json
index cd0459b5..cf5146fd 100644
--- a/res/content/base/entities/falling_block.json
+++ b/res/content/base/entities/falling_block.json
@@ -3,5 +3,5 @@
         "base:falling_block"
     ],
     "skeleton-name": "base:block",
-    "hitbox": [0.8, 0.8, 0.8]
+    "hitbox": [0.98, 0.98, 0.98]
 }

From 1ba5b0ce33103e539ccb199ee1cd52095e286a1f Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sun, 17 Nov 2024 16:58:58 +0300
Subject: [PATCH 28/80] fix: actual block inventory size not updating on
 inventory-size property update

---
 src/items/Inventory.cpp      |  4 ++++
 src/items/Inventory.hpp      |  2 ++
 src/voxels/ChunksStorage.cpp | 22 +++++++++++++++++++---
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/items/Inventory.cpp b/src/items/Inventory.cpp
index 92f925ef..282f361f 100644
--- a/src/items/Inventory.cpp
+++ b/src/items/Inventory.cpp
@@ -45,6 +45,10 @@ void Inventory::move(
     }
 }
 
+void Inventory::resize(uint newSize) {
+    slots.resize(newSize);
+}
+
 void Inventory::deserialize(const dv::value& src) {
     id = src["id"].asInteger(1);
     auto& slotsarr = src["slots"];
diff --git a/src/items/Inventory.hpp b/src/items/Inventory.hpp
index e12029f8..176ad7ee 100644
--- a/src/items/Inventory.hpp
+++ b/src/items/Inventory.hpp
@@ -35,6 +35,8 @@ public:
         size_t end = -1
     );
 
+    void resize(uint newSize);
+
     void deserialize(const dv::value& src) override;
 
     dv::value serialize() const override;
diff --git a/src/voxels/ChunksStorage.cpp b/src/voxels/ChunksStorage.cpp
index 596c4b78..272332fb 100644
--- a/src/voxels/ChunksStorage.cpp
+++ b/src/voxels/ChunksStorage.cpp
@@ -39,10 +39,10 @@ void ChunksStorage::remove(int x, int z) {
     }
 }
 
-static void verifyLoadedChunk(ContentIndices* indices, Chunk* chunk) {
+static void check_voxels(const ContentIndices& indices, Chunk* chunk) {
     for (size_t i = 0; i < CHUNK_VOL; i++) {
         blockid_t id = chunk->voxels[i].id;
-        if (indices->blocks.get(id) == nullptr) {
+        if (indices.blocks.get(id) == nullptr) {
             auto logline = logger.error();
             logline << "corruped block detected at " << i << " of chunk ";
             logline << chunk->x << "x" << chunk->z;
@@ -59,9 +59,26 @@ std::shared_ptr<Chunk> ChunksStorage::create(int x, int z) {
     auto chunk = std::make_shared<Chunk>(x, z);
     store(chunk);
     if (auto data = regions.getVoxels(chunk->x, chunk->z)) {
+        const auto& indices = *level->content->getIndices();
+
         chunk->decode(data.get());
+        check_voxels(indices, chunk.get());
 
         auto invs = regions.fetchInventories(chunk->x, chunk->z);
+        auto iterator = invs.begin();
+        while (iterator != invs.end()) {
+            uint index = iterator->first;
+            const auto& def = indices.blocks.require(chunk->voxels[index].id);
+            if (def.inventorySize == 0) {
+                iterator = invs.erase(iterator);
+                continue;
+            }
+            auto& inventory = iterator->second;
+            if (def.inventorySize != inventory->size()) {
+                inventory->resize(def.inventorySize);
+            }
+            ++iterator;
+        }
         chunk->setBlockInventories(std::move(invs));
 
         auto entitiesData = regions.fetchEntities(chunk->x, chunk->z);
@@ -74,7 +91,6 @@ std::shared_ptr<Chunk> ChunksStorage::create(int x, int z) {
         for (auto& entry : chunk->inventories) {
             level->inventories->store(entry.second);
         }
-        verifyLoadedChunk(level->content->getIndices(), chunk.get());
     }
     if (auto lights = regions.getLights(chunk->x, chunk->z)) {
         chunk->lightmap.set(lights.get());

From e034bda477c35efe96548e78ecc722966a7a2197 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Mon, 18 Nov 2024 04:15:51 +0300
Subject: [PATCH 29/80] fix crosshair

---
 src/frontend/hud.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp
index bfaac141..032d0602 100644
--- a/src/frontend/hud.cpp
+++ b/src/frontend/hud.cpp
@@ -571,7 +571,7 @@ void Hud::draw(const DrawContext& ctx){
 
     // Crosshair
     if (!pause && !inventoryOpen && !player->debug) {
-        DrawContext chctx = ctx.sub();
+        DrawContext chctx = ctx.sub(batch);
         chctx.setBlendMode(BlendMode::inversion);
         auto texture = assets->get<Texture>("gui/crosshair");
         batch->texture(texture);

From 8e1d6b9f0309c2e060c16d5e856197067c7e8993 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Mon, 18 Nov 2024 05:24:16 +0300
Subject: [PATCH 30/80] set default margin to 0,0,0,0

---
 src/graphics/ui/elements/UINode.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphics/ui/elements/UINode.hpp b/src/graphics/ui/elements/UINode.hpp
index 666fa01c..53967f4c 100644
--- a/src/graphics/ui/elements/UINode.hpp
+++ b/src/graphics/ui/elements/UINode.hpp
@@ -81,7 +81,7 @@ namespace gui {
         /// @brief element color when clicked
         glm::vec4 pressedColor {1.0f};
         /// @brief element margin (only supported for Panel sub-nodes)
-        glm::vec4 margin {1.0f};
+        glm::vec4 margin {0.0f};
         /// @brief is element visible
         bool visible = true;
         /// @brief is mouse over the element

From 618a9f04118302875120c83ad7897bc396a34b96 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Mon, 18 Nov 2024 07:11:07 +0300
Subject: [PATCH 31/80] add RadioButton Lua class

---
 res/layouts/pages/settings.xml     | 10 +++++-----
 res/layouts/pages/settings.xml.lua | 20 +++++++++-----------
 res/scripts/stdlib.lua             | 23 +++++++++++++++++++++++
 3 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/res/layouts/pages/settings.xml b/res/layouts/pages/settings.xml
index f5ec33d7..00437e68 100644
--- a/res/layouts/pages/settings.xml
+++ b/res/layouts/pages/settings.xml
@@ -1,9 +1,9 @@
 <container size='668,418' color='#0F1E2DB2' context='menu'>
     <panel pos='6' size='250' color='0' interval='1'>
-        <button id='s_aud' onclick='set_page("s_aud", "settings_audio")'>@Audio</button>
-        <button id='s_dsp' onclick='set_page("s_dsp", "settings_display")'>@Display</button>
-        <button id='s_gfx' onclick='set_page("s_gfx", "settings_graphics")'>@Graphics</button>
-        <button id='s_ctl' onclick='set_page("s_ctl", "settings_controls")'>@Controls</button>
+        <button id='s_aud' onclick='sections:set("audio")'>@Audio</button>
+        <button id='s_dsp' onclick='sections:set("display")'>@Display</button>
+        <button id='s_gfx' onclick='sections:set("graphics")'>@Graphics</button>
+        <button id='s_ctl' onclick='sections:set("controls")'>@Controls</button>
     </panel>
     <pagebox id='menu' pos='260,6' size='400'>
     </pagebox>
@@ -11,7 +11,7 @@
     <panel margin='6' gravity='bottom-left' size='250' color='0' interval='1'>
         <button onclick='menu.page="languages"' id='langs_btn'>-</button>
         <button onclick='core.open_folder("user:")'>@Open data folder</button>
-		<button id='s_rst' onclick='set_page("s_rst", "settings_reset")'>@Reset settings</button>
+		<button id='s_rst' onclick='sections:set("reset")'>@Reset settings</button>
         <button onclick='menu:back()'>@Back</button>
     </panel>
 </container>
diff --git a/res/layouts/pages/settings.xml.lua b/res/layouts/pages/settings.xml.lua
index 24256c84..8b41491a 100644
--- a/res/layouts/pages/settings.xml.lua
+++ b/res/layouts/pages/settings.xml.lua
@@ -3,15 +3,13 @@ function on_open()
         "%s: %s", gui.str("Language", "settings"),
         gui.get_locales_info()[core.get_setting("ui.language")].name
     )
-    set_page("s_gfx", "settings_graphics")
-end
-
-function set_page(btn, page)
-    document.s_aud.enabled = true
-    document.s_dsp.enabled = true
-    document.s_gfx.enabled = true
-    document.s_ctl.enabled = true
-    document.s_rst.enabled = true
-    document[btn].enabled = false
-    document.menu.page = page
+    sections = RadioGroup({
+        audio=document.s_aud,
+        display=document.s_dsp,
+        graphics=document.s_gfx,
+        controls=document.s_ctl,
+        reset=document.s_rst
+    }, function (page)
+        document.menu.page = "settings_"..page
+    end, "graphics")
 end
diff --git a/res/scripts/stdlib.lua b/res/scripts/stdlib.lua
index f53323db..4bade31d 100644
--- a/res/scripts/stdlib.lua
+++ b/res/scripts/stdlib.lua
@@ -84,6 +84,29 @@ function Document.new(docname)
     })
 end
 
+local _RadioGroup = {}
+function _RadioGroup.set(self, key)
+    if self.current then
+        self.elements[self.current].enabled = true
+    end
+    self.elements[key].enabled = false
+    self.current = key
+    if self.callback then
+        self.callback(key)
+    end
+end
+function _RadioGroup.__call(self, elements, onset, default)
+    local group = setmetatable({
+        elements=elements, 
+        callback=onset, 
+        current=nil
+    }, {__index=_RadioGroup})
+    group:set(default)
+    return group
+end
+setmetatable(_RadioGroup, _RadioGroup)
+RadioGroup = _RadioGroup
+
 _GUI_ROOT = Document.new("core:root")
 _MENU = _GUI_ROOT.menu
 menu = _MENU

From dcd8871ee19e3615a7480dfaa5a312ca587e1e0c Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Mon, 18 Nov 2024 09:21:16 +0300
Subject: [PATCH 32/80] add utf8.escape, string.escape & reformat extensions.md

---
 doc/en/scripting/builtins/libutf8.md     |   3 +
 doc/ru/scripting/builtins/libutf8.md     |   3 +
 doc/ru/scripting/extensions.md           | 111 ++++++++++++++---------
 res/scripts/stdmin.lua                   |   1 +
 src/logic/scripting/lua/libs/libutf8.cpp |   6 ++
 src/util/stringutil.cpp                  |   3 +-
 src/util/stringutil.hpp                  |   2 +-
 7 files changed, 85 insertions(+), 44 deletions(-)

diff --git a/doc/en/scripting/builtins/libutf8.md b/doc/en/scripting/builtins/libutf8.md
index 86714fce..bd8dd22b 100644
--- a/doc/en/scripting/builtins/libutf8.md
+++ b/doc/en/scripting/builtins/libutf8.md
@@ -27,4 +27,7 @@ utf8.upper(text: str) -> str
 
 -- Converts a string to lowercase
 utf8.lower(text: str) -> str
+
+-- Escapes a string
+utf8.escape(text: str) -> str
 ```
diff --git a/doc/ru/scripting/builtins/libutf8.md b/doc/ru/scripting/builtins/libutf8.md
index 394eb522..ce933417 100644
--- a/doc/ru/scripting/builtins/libutf8.md
+++ b/doc/ru/scripting/builtins/libutf8.md
@@ -27,4 +27,7 @@ utf8.upper(text: str) -> str
 
 -- Переводит строку в нижний регистр
 utf8.lower(text: str) -> str
+
+-- Экранирует строку
+utf8.escape(text: str) -> str
 ```
diff --git a/doc/ru/scripting/extensions.md b/doc/ru/scripting/extensions.md
index a6b40a38..d4502f64 100644
--- a/doc/ru/scripting/extensions.md
+++ b/doc/ru/scripting/extensions.md
@@ -4,92 +4,109 @@
 
 ## Расширения для table
 
-Создаёт и возвращает копию переданной таблицы путём создания новой и копирования в неё всех элементов из переданной
 ```lua
-function table.copy(t: table) -> table
+table.copy(t: table) -> table
 ```
 
-Возвращает количество пар в переданной таблице
+Создаёт и возвращает копию переданной таблицы путём создания новой и копирования в неё всех элементов из переданной.
+
 ```lua
-function table.count_pairs(t: table) -> integer
+table.count_pairs(t: table) -> integer
 ```
 
-Возвращает один элемент из переданной таблицы на случайной позиции
+Возвращает количество пар в переданной таблице.
+
 ```lua
-function table.random(t: table) -> object
+table.random(t: table) -> object
 ```
 
-Возвращает **true**, если **x** содержится в **t**
+Возвращает один элемент из переданной таблицы на случайной позиции.
+
 ```lua
-function table.has(t: table, x: object) -> bool
+table.has(t: table, x: object) -> bool
 ```
 
-Возвращает индекс обьекта **x** в **t**. Если переданный обьект не содержится в таблице, то функция вернёт значение **-1**
+Возвращает **true**, если **x** содержится в **t**.
+
 ```lua
-function table.index(t: table, x: object) -> integer
+table.index(t: table, x: object) -> integer
 ```
 
-Удаляет элемент **x** из **t**
+Возвращает индекс обьекта **x** в **t**. Если переданный обьект не содержится в таблице, то функция вернёт значение **-1**.
+
 ```lua
-function table.remove_value(t: table, x: object)
+table.remove_value(t: table, x: object)
 ```
 
-Конвертирует переданную таблицу в строку
+Удаляет элемент **x** из **t**.
+
 ```lua
-function table.tostring(t: table) -> string
+table.tostring(t: table) -> string
 ```
 
+Конвертирует переданную таблицу в строку.
+
 ## Расширения для string
 
-Разбивает строку **str** на части по указанному разделителю/выражению **separator** и возвращает результат ввиде таблицы из строк. Если **withpattern** равен **true**, то параметр **separator** будет определяться как регулярное выражение
 ```lua
-function string.explode(separator: string, str: string, withpattern: bool) -> table[string]
+string.explode(separator: string, str: string, withpattern: bool) -> table[string]
 ```
 
-Разбивает строку **str** на части по указанному разделителю **delimiter** и возвращает результат ввиде таблицы из строк
+Разбивает строку **str** на части по указанному разделителю/выражению **separator** и возвращает результат ввиде таблицы из строк. Если **withpattern** равен **true**, то параметр **separator** будет определяться как регулярное выражение.
+
 ```lua
-function string.split(str: string, delimiter: string) -> table[string]
+string.split(str: string, delimiter: string) -> table[string]
 ```
 
-Экранирует специальные символы в строке, такие как `()[]+-.$%^?*` в формате `%символ`. Символ `NUL` (`\0`) будет преобразован в `%z`
+Разбивает строку **str** на части по указанному разделителю **delimiter** и возвращает результат ввиде таблицы из строк.
+
 ```lua
-function string.pattern_safe(str: string)
+string.pattern_safe(str: string)
 ```
 
-Разбивает секунды на часы, минуты и миллисекунды и форматирует в **format** с следующим порядком параметров: `минуты, секунды, миллисекунды` и после возвращает результат. Если **format** не указан, то возвращает таблицу, где: **h** - hours, **m** - minutes, **s** - seconds, **ms** - milliseconds
+Экранирует специальные символы в строке, такие как `()[]+-.$%^?*` в формате `%символ`. Символ `NUL` (`\0`) будет преобразован в `%z`.
+
 ```lua
-function string.formatted_time(seconds: number, format: string) -> string | table
+string.formatted_time(seconds: number, format: string) -> string | table
 ```
 
-Заменяет все подстроки в **str**, равные **tofind** на **toreplace** и возвращает строку со всеми измененными подстроками
+Разбивает секунды на часы, минуты и миллисекунды и форматирует в **format** с следующим порядком параметров: `минуты, секунды, миллисекунды` и после возвращает результат. Если **format** не указан, то возвращает таблицу, где: **h** - hours, **m** - minutes, **s** - seconds, **ms** - milliseconds.
+
 ```lua
-function string.replace(str: string, tofind: string, toreplace: string) -> string
+string.replace(str: string, tofind: string, toreplace: string) -> string
+```
+
+Заменяет все подстроки в **str**, равные **tofind** на **toreplace** и возвращает строку со всеми измененными подстроками.
+
+```lua
+string.trim(str: string, char: string) -> string
 ```
 
 Удаляет все символы, равные **char** из строки **str** с левого и правого конца и возвращает результат. Если параметр **char** не определен, то будут выбраны все пустые символы.
+
 ```lua
-function string.trim(str: string, char: string) -> string
+string.trim_left(str: string, char: string) -> string
 ```
 
 Удаляет все символы, равные **char** из строки **str** с левого конца и возвращает результат. Если параметр **char** не определен, то будут выбраны все пустые символы.
+
 ```lua
-function string.trim_left(str: string, char: string) -> string
+string.trim_right(str: string, char: string) -> string
 ```
 
 Удаляет все символы, равные **char** из строки **str** с правого конца и возвращает результат. Если параметр **char** не определен, то будут выбраны все пустые символы.
+
 ```lua
-function string.trim_right(str: string, char: string) -> string
+string.starts_with(str: string, start: string) -> bool
 ```
 
 Возвращает **true**, если строка **str** начинается на подстроку **start**
+
 ```lua
-function string.starts_with(str: string, start: string) -> bool
+string.ends_with(str: string, endStr: string) -> bool
 ```
 
 Возвращает **true**, если строка **str** заканчивается на подстроку **endStr**
-```lua
-function string.ends_with(str: string, endStr: string) -> bool
-```
 
 Также важно подметить, что все выше перечисленные функции, расширяющие **string** можно использовать как мета-методы на экземплярах строк, т.е.: 
 
@@ -103,39 +120,51 @@ end
 
 Также функции `string.lower` и `string.upper` переопределены на `utf8.lower` и `utf8.upper`
 
+```lua
+string.escape(str: string) -> string
+```
+
+Экранирует строку. Является псевдонимом `utf8.escape`.
+
 ## Расширения для math
 
-Ограничивает число **_in** по лимитам **low** и **high**. Т.е.: Если **_in** больше чем **high** - вернётся **high**, если **_in** меньше чем **low** - вернётся **low**. В противном случае вернётся само число
 ```lua
-function math.clamp(_in, low, high)
+math.clamp(_in, low, high)
 ```
 
-Возвращает случайное дробное число в диапазоне от **low** до **high**
+Ограничивает число **_in** по лимитам **low** и **high**. Т.е.: Если **_in** больше чем **high** - вернётся **high**, если **_in** меньше чем **low** - вернётся **low**. В противном случае вернётся само число.
+
 ```lua
-function math.rand(low, high)
+math.rand(low, high)
 ```
 
+Возвращает случайное дробное число в диапазоне от **low** до **high**.
+
 ## Дополнительные глобальные функции
 
 В этом же скрипте также определены и другие глобальные функции которые доступны для использования. Ниже их список
 
 
-Возвращает **true**, если переданная таблица является массивом, тоесть если каждый ключ это целое число больше или равное единице и если каждый ключ следует за прошлым
 ```lua
-function is_array(x: table) -> bool
+is_array(x: table) -> bool
 ```
 
-Разбивает путь на две части и возвращает их: входную точку и путь к файлу
+Возвращает **true**, если переданная таблица является массивом, тоесть если каждый ключ это целое число больше или равное единице и если каждый ключ следует за прошлым.
+
 ```lua
 function parse_path(path: string) -> string, string
 ```
 
-Вызывает функцию **func** **iters** раз, передавая ей аргументы `...`, а после выводит в консоль время в микросекундах, которое прошло с момента вызова **timeit**
+Разбивает путь на две части и возвращает их: входную точку и путь к файлу.
+
 ```lua
 function timeit(iters: integer, func: func, ...)
 ```
 
-Вызывает остановку корутины до тех пор, пока не пройдёт количество секунд, указанное в **timesec**. Функция может быть использована только внутри корутины
+Вызывает функцию **func** **iters** раз, передавая ей аргументы `...`, а после выводит в консоль время в микросекундах, которое прошло с момента вызова **timeit**.
+
 ```lua
 function sleep(timesec: number)
-```
\ No newline at end of file
+```
+
+Вызывает остановку корутины до тех пор, пока не пройдёт количество секунд, указанное в **timesec**. Функция может быть использована только внутри корутины.
diff --git a/res/scripts/stdmin.lua b/res/scripts/stdmin.lua
index 530ec091..762610a7 100644
--- a/res/scripts/stdmin.lua
+++ b/res/scripts/stdmin.lua
@@ -162,6 +162,7 @@ end
 
 string.lower = utf8.lower
 string.upper = utf8.upper
+string.escape = utf8.escape
 
 local meta = getmetatable("")
 
diff --git a/src/logic/scripting/lua/libs/libutf8.cpp b/src/logic/scripting/lua/libs/libutf8.cpp
index 85895c5d..4c1f484f 100644
--- a/src/logic/scripting/lua/libs/libutf8.cpp
+++ b/src/logic/scripting/lua/libs/libutf8.cpp
@@ -94,6 +94,11 @@ static int l_encode(lua::State* L) {
     return lua::pushlstring(L, bytes, count);
 }
 
+static int l_escape(lua::State* L) {
+    auto string = lua::require_lstring(L, 1);
+    return lua::pushstring(L, util::escape(string));
+}
+
 const luaL_Reg utf8lib[] = {
     {"tobytes", lua::wrap<l_tobytes>},
     {"tostring", lua::wrap<l_tostring>},
@@ -103,5 +108,6 @@ const luaL_Reg utf8lib[] = {
     {"upper", lua::wrap<l_upper>},
     {"lower", lua::wrap<l_lower>},
     {"encode", lua::wrap<l_encode>},
+    {"escape", lua::wrap<l_escape>},
     {NULL, NULL}
 };
diff --git a/src/util/stringutil.cpp b/src/util/stringutil.cpp
index ca7e8e46..12f4e74c 100644
--- a/src/util/stringutil.cpp
+++ b/src/util/stringutil.cpp
@@ -7,8 +7,7 @@
 #include <sstream>
 #include <stdexcept>
 
-// TODO: finish
-std::string util::escape(const std::string& s) {
+std::string util::escape(std::string_view s) {
     std::stringstream ss;
     ss << '"';
     size_t pos = 0;
diff --git a/src/util/stringutil.hpp b/src/util/stringutil.hpp
index f584a53c..b0cd5d56 100644
--- a/src/util/stringutil.hpp
+++ b/src/util/stringutil.hpp
@@ -8,7 +8,7 @@
 
 namespace util {
     /// @brief Function used for string serialization in text formats
-    std::string escape(const std::string& s);
+    std::string escape(std::string_view s);
 
     /// @brief Function used for error messages
     std::string quote(const std::string& s);

From 712c0756b8cb607e6a226798aeb283ed303b2b7a Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Mon, 18 Nov 2024 11:09:27 +0300
Subject: [PATCH 33/80] add debug.get_traceback

---
 res/scripts/stdmin.lua | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/res/scripts/stdmin.lua b/res/scripts/stdmin.lua
index 762610a7..2b6a10fe 100644
--- a/res/scripts/stdmin.lua
+++ b/res/scripts/stdmin.lua
@@ -228,6 +228,20 @@ function file.readlines(path)
     return lines
 end
 
+function debug.get_trackback()
+    local frames = {}
+    local n = 0
+    while true do
+        local info = debug.getinfo(n)
+        if info then
+            table.insert(frames, info)
+        else
+            return frames 
+        end
+        n = n + 1
+    end
+end
+
 package = {
     loaded={}
 }

From 0bfc5d2ad4a40388ae0ee1c71561a3ba349786f3 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Mon, 18 Nov 2024 11:52:06 +0300
Subject: [PATCH 34/80] add base64 library

---
 src/logic/scripting/lua/libs/api_lua.hpp   |  1 +
 src/logic/scripting/lua/libs/libbase64.cpp | 52 ++++++++++++++++++++++
 src/logic/scripting/lua/lua_engine.cpp     |  1 +
 src/logic/scripting/lua/lua_util.hpp       |  5 +++
 src/util/stringutil.cpp                    |  4 +-
 src/util/stringutil.hpp                    |  2 +-
 6 files changed, 62 insertions(+), 3 deletions(-)
 create mode 100644 src/logic/scripting/lua/libs/libbase64.cpp

diff --git a/src/logic/scripting/lua/libs/api_lua.hpp b/src/logic/scripting/lua/libs/api_lua.hpp
index bd810833..b0edba79 100644
--- a/src/logic/scripting/lua/libs/api_lua.hpp
+++ b/src/logic/scripting/lua/libs/api_lua.hpp
@@ -15,6 +15,7 @@
 
 // Libraries
 extern const luaL_Reg audiolib[];
+extern const luaL_Reg base64lib[];
 extern const luaL_Reg bjsonlib[];
 extern const luaL_Reg blocklib[];
 extern const luaL_Reg cameralib[];
diff --git a/src/logic/scripting/lua/libs/libbase64.cpp b/src/logic/scripting/lua/libs/libbase64.cpp
new file mode 100644
index 00000000..26f77eb6
--- /dev/null
+++ b/src/logic/scripting/lua/libs/libbase64.cpp
@@ -0,0 +1,52 @@
+#include "api_lua.hpp"
+
+#include "util/stringutil.hpp"
+
+static int l_encode(lua::State* L) {
+    if (lua::istable(L, 1)) {
+        lua::pushvalue(L, 1);
+        size_t size = lua::objlen(L, 1);
+        util::Buffer<char> buffer(size);
+        for (size_t i = 0; i < size; i++) {
+            lua::rawgeti(L, i + 1);
+            buffer[i] = lua::tointeger(L, -1);
+            lua::pop(L);
+        }
+        lua::pop(L);
+        return lua::pushstring(L, util::base64_encode(
+            reinterpret_cast<const ubyte*>(buffer.data()), buffer.size()
+        ));
+    } else if (auto bytes = lua::touserdata<lua::LuaBytearray>(L, 1)) {
+        return lua::pushstring(
+            L,
+            util::base64_encode(
+                bytes->data().data(),
+                bytes->data().size()
+            )
+        );
+    }
+    throw std::runtime_error("array or ByteArray expected");
+}
+
+static int l_decode(lua::State* L) {
+    auto buffer = util::base64_decode(lua::require_lstring(L, 1));
+    if (lua::toboolean(L, 2)) {
+        lua::createtable(L, buffer.size(), 0);
+        for (size_t i = 0; i < buffer.size(); i++) {
+            lua::pushinteger(L, buffer[i] & 0xFF);
+            lua::rawseti(L, i+1);
+        }
+    } else {
+        lua::newuserdata<lua::LuaBytearray>(L, buffer.size());
+        auto bytearray = lua::touserdata<lua::LuaBytearray>(L, -1);   
+        bytearray->data().reserve(buffer.size());
+        std::memcpy(bytearray->data().data(), buffer.data(), buffer.size());
+    }
+    return 1;
+}
+
+const luaL_Reg base64lib[] = {
+    {"encode", lua::wrap<l_encode>},
+    {"decode", lua::wrap<l_decode>},
+    {NULL, NULL}
+};
diff --git a/src/logic/scripting/lua/lua_engine.cpp b/src/logic/scripting/lua/lua_engine.cpp
index fe3e75b5..1d24ec93 100644
--- a/src/logic/scripting/lua/lua_engine.cpp
+++ b/src/logic/scripting/lua/lua_engine.cpp
@@ -39,6 +39,7 @@ static void remove_lib_funcs(
 }
 
 static void create_libs(State* L, StateType stateType) {
+    openlib(L, "base64", base64lib);
     openlib(L, "bjson", bjsonlib);
     openlib(L, "block", blocklib);
     openlib(L, "core", corelib);
diff --git a/src/logic/scripting/lua/lua_util.hpp b/src/logic/scripting/lua/lua_util.hpp
index f2b51c53..70dd7705 100644
--- a/src/logic/scripting/lua/lua_util.hpp
+++ b/src/logic/scripting/lua/lua_util.hpp
@@ -240,6 +240,11 @@ namespace lua {
     inline const char* tostring(lua::State* L, int idx) {
         return lua_tostring(L, idx);
     }
+    inline std::string_view tolstring(lua::State* L, int idx) {
+        size_t len = 0;
+        auto string = lua_tolstring(L, idx, &len);
+        return std::string_view(string, len);
+    }
     inline const void* topointer(lua::State* L, int idx) {
         return lua_topointer(L, idx);
     }
diff --git a/src/util/stringutil.cpp b/src/util/stringutil.cpp
index 12f4e74c..1fabcd2c 100644
--- a/src/util/stringutil.cpp
+++ b/src/util/stringutil.cpp
@@ -363,8 +363,8 @@ util::Buffer<ubyte> util::base64_decode(const char* str, size_t size) {
     return bytes;
 }
 
-util::Buffer<ubyte> util::base64_decode(const std::string& str) {
-    return base64_decode(str.c_str(), str.size());
+util::Buffer<ubyte> util::base64_decode(std::string_view str) {
+    return base64_decode(str.data(), str.size());
 }
 
 int util::replaceAll(
diff --git a/src/util/stringutil.hpp b/src/util/stringutil.hpp
index b0cd5d56..edd0df17 100644
--- a/src/util/stringutil.hpp
+++ b/src/util/stringutil.hpp
@@ -63,7 +63,7 @@ namespace util {
 
     std::string base64_encode(const ubyte* data, size_t size);
     util::Buffer<ubyte> base64_decode(const char* str, size_t size);
-    util::Buffer<ubyte> base64_decode(const std::string& str);
+    util::Buffer<ubyte> base64_decode(std::string_view str);
 
     std::string tohex(uint64_t value);
 

From d6608803652a7cc3e36b65b91e2aea9bb2c1afe0 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Mon, 18 Nov 2024 12:37:48 +0300
Subject: [PATCH 35/80] fix util::base64_encode

---
 src/util/stringutil.cpp  |  2 +-
 test/util/stringutil.cpp | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/util/stringutil.cpp b/src/util/stringutil.cpp
index 1fabcd2c..d1148da5 100644
--- a/src/util/stringutil.cpp
+++ b/src/util/stringutil.cpp
@@ -317,7 +317,7 @@ std::string util::base64_encode(const ubyte* data, size_t size) {
         ending[i - fullsegments] = data[i];
     }
     size_t trailing = size - fullsegments;
-    {
+    if (trailing) {
         char output[] = "====";
         output[0] = B64ABC[(ending[0] & 0b11111100) >> 2];
         output[1] =
diff --git a/test/util/stringutil.cpp b/test/util/stringutil.cpp
index 7bd0f85c..2f27a243 100644
--- a/test/util/stringutil.cpp
+++ b/test/util/stringutil.cpp
@@ -15,3 +15,19 @@ TEST(stringutil, utf8) {
     std::string str2 = util::u32str2str_utf8(u32str);
     EXPECT_EQ(str, str2);
 }
+
+TEST(stringutil, base64) {
+    srand(2019);
+    for (size_t size = 0; size < 30; size++) {
+        auto bytes = std::make_unique<ubyte[]>(size);
+        for (int i = 0; i < size; i++) {
+            bytes[i] = rand();
+        }
+        auto base64 = util::base64_encode(bytes.get(), size);
+        auto decoded = util::base64_decode(base64);
+        ASSERT_EQ(size, decoded.size());
+        for (size_t i = 0; i < size; i++) {
+            ASSERT_EQ(bytes[i], decoded[i]);
+        }
+    }
+}

From 801650824ecd00d0a9024701fb65b4d35b2f229b Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Mon, 18 Nov 2024 14:03:30 +0300
Subject: [PATCH 36/80] add 'text-color' textbox property

---
 doc/en/xml-ui-layouts.md                |  1 +
 doc/ru/xml-ui-layouts.md                |  1 +
 src/graphics/ui/elements/TextBox.cpp    | 11 ++++++++++-
 src/graphics/ui/elements/TextBox.hpp    |  4 ++++
 src/graphics/ui/gui_xml.cpp             |  3 +++
 src/logic/scripting/lua/libs/libgui.cpp | 14 ++++++++++++++
 6 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/doc/en/xml-ui-layouts.md b/doc/en/xml-ui-layouts.md
index ac657e44..f4db96c6 100644
--- a/doc/en/xml-ui-layouts.md
+++ b/doc/en/xml-ui-layouts.md
@@ -105,6 +105,7 @@ Inner text - initially entered text
 - `text-wrap` - allows automatic text wrapping (works only with multiline: "true")
 - `editable` - determines whether the text can be edited.
 - `error-color` - color when entering incorrect data (the text does not pass the validator check). Type: RGBA color.
+- `text-color` - text color. Type: RGBA color.
 - `validator` - lua function that checks text for correctness. Takes a string as input, returns true if the text is correct.
 - `onup` - lua function called when the up arrow is pressed.
 - `ondown` - lua function called when the down arrow is pressed.
diff --git a/doc/ru/xml-ui-layouts.md b/doc/ru/xml-ui-layouts.md
index bdf82f1b..adffcd73 100644
--- a/doc/ru/xml-ui-layouts.md
+++ b/doc/ru/xml-ui-layouts.md
@@ -106,6 +106,7 @@
 - `text-wrap` - разрешает автоматический перенос текста (работает только при multiline: "true")
 - `editable`- определяет возможность редактирования текста.
 - `error-color` - цвет при вводе некорректных данных (текст не проходит проверку валидатора). Тип: RGBA цвет.
+- `text-color` - цвет текста. Тип: RGBA цвет.
 - `validator` - lua функция, проверяющая текст на корректность. Принимает на вход строку, возвращает true если текст корректен.
 - `onup` - lua функция вызываемая при нажатии стрелки вверх.
 - `ondown` - lua функция вызываемая при нажатии стрелки вниз.
diff --git a/src/graphics/ui/elements/TextBox.cpp b/src/graphics/ui/elements/TextBox.cpp
index 9fe44327..a4e613d3 100644
--- a/src/graphics/ui/elements/TextBox.cpp
+++ b/src/graphics/ui/elements/TextBox.cpp
@@ -126,7 +126,7 @@ void TextBox::drawBackground(const DrawContext* pctx, Assets*) {
 }
 
 void TextBox::refreshLabel() {
-    label->setColor(glm::vec4(input.empty() ? 0.5f : 1.0f));
+    label->setColor(textColor * glm::vec4(input.empty() ? 0.5f : 1.0f));
     label->setText(input.empty() && !hint.empty() ? hint : getText());
 
     if (autoresize && font) {
@@ -619,6 +619,15 @@ glm::vec4 TextBox::getFocusedColor() const {
     return focusedColor;
 }
 
+
+void TextBox::setTextColor(glm::vec4 color) {
+    this->textColor = color;
+}
+
+glm::vec4 TextBox::getTextColor() const {
+    return textColor;
+}
+
 void TextBox::setErrorColor(glm::vec4 color) {
     this->invalidColor = color;
 }
diff --git a/src/graphics/ui/elements/TextBox.hpp b/src/graphics/ui/elements/TextBox.hpp
index 834f7a64..27b6e9c9 100644
--- a/src/graphics/ui/elements/TextBox.hpp
+++ b/src/graphics/ui/elements/TextBox.hpp
@@ -12,6 +12,7 @@ namespace gui {
     protected:
         glm::vec4 focusedColor {0.0f, 0.0f, 0.0f, 1.0f};
         glm::vec4 invalidColor {0.1f, 0.05f, 0.03f, 1.0f};
+        glm::vec4 textColor {1.0f, 1.0f, 1.0f, 1.0f};
         std::shared_ptr<Label> label;
         /// @brief Current user input
         std::wstring input;
@@ -106,6 +107,9 @@ namespace gui {
         virtual void setFocusedColor(glm::vec4 color);
         virtual glm::vec4 getFocusedColor() const;
 
+        virtual void setTextColor(glm::vec4 color);
+        virtual glm::vec4 getTextColor() const;
+
         /// @brief Set color of textbox marked by validator as invalid
         virtual void setErrorColor(glm::vec4 color);
 
diff --git a/src/graphics/ui/gui_xml.cpp b/src/graphics/ui/gui_xml.cpp
index 16c09acd..c1880383 100644
--- a/src/graphics/ui/gui_xml.cpp
+++ b/src/graphics/ui/gui_xml.cpp
@@ -384,6 +384,9 @@ static std::shared_ptr<UINode> readTextBox(UiXmlReader& reader, const xml::xmlel
     if (element->has("error-color")) {
         textbox->setErrorColor(element->attr("error-color").asColor());
     }
+    if (element->has("text-color")) {
+        textbox->setTextColor(element->attr("text-color").asColor());
+    }
     if (element->has("validator")) {
         textbox->setTextValidator(scripting::create_wstring_validator(
             reader.getEnvironment(),
diff --git a/src/logic/scripting/lua/libs/libgui.cpp b/src/logic/scripting/lua/libs/libgui.cpp
index 223bef0d..ff6ef83c 100644
--- a/src/logic/scripting/lua/libs/libgui.cpp
+++ b/src/logic/scripting/lua/libs/libgui.cpp
@@ -221,6 +221,13 @@ static int p_get_track_color(UINode* node, lua::State* L) {
     return 0;
 }
 
+static int p_get_text_color(UINode* node, lua::State* L) {
+    if (auto box = dynamic_cast<TextBox*>(node)) {
+        return lua::pushcolor(L, box->getTextColor());
+    }
+    return 0;
+}
+
 static int p_is_valid(UINode* node, lua::State* L) {
     if (auto box = dynamic_cast<TextBox*>(node)) {
         return lua::pushboolean(L, box->validate());
@@ -383,6 +390,7 @@ static int l_gui_getattr(lua::State* L) {
             {"step", p_get_step},
             {"trackWidth", p_get_track_width},
             {"trackColor", p_get_track_color},
+            {"textColor", p_get_text_color},
             {"checked", p_is_checked},
             {"page", p_get_page},
             {"back", p_get_back},
@@ -497,6 +505,11 @@ static void p_set_track_color(UINode* node, lua::State* L, int idx) {
         bar->setTrackColor(lua::tocolor(L, idx));
     }
 }
+static void p_set_text_color(UINode* node, lua::State* L, int idx) {
+    if (auto box = dynamic_cast<TextBox*>(node)) {
+        box->setTextColor(lua::tocolor(L, idx));
+    }
+}
 static void p_set_checked(UINode* node, lua::State* L, int idx) {
     if (auto box = dynamic_cast<CheckBox*>(node)) {
         box->setChecked(lua::toboolean(L, idx));
@@ -564,6 +577,7 @@ static int l_gui_setattr(lua::State* L) {
             {"step", p_set_step},
             {"trackWidth", p_set_track_width},
             {"trackColor", p_set_track_color},
+            {"textColor", p_set_text_color},
             {"checked", p_set_checked},
             {"page", p_set_page},
             {"inventory", p_set_inventory},

From e3cb736519ec4b4dce49478bca1755868d3e5ed7 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Mon, 18 Nov 2024 14:05:45 +0300
Subject: [PATCH 37/80] update lua chunks sources to the engine format

---
 src/assets/assetload_funcs.cpp            |  4 +++-
 src/content/ContentLoader.cpp             | 28 +++++++++++++++++++----
 src/frontend/UiDocument.cpp               | 17 ++++++++++----
 src/frontend/UiDocument.hpp               | 11 +++++++--
 src/frontend/menu.cpp                     |  7 ++++--
 src/logic/scripting/lua/lua_engine.cpp    |  5 ++--
 src/logic/scripting/scripting.cpp         | 23 ++++++++++++-------
 src/logic/scripting/scripting.hpp         | 18 ++++++++++++++-
 src/logic/scripting/scripting_commons.hpp |  8 +++++--
 9 files changed, 95 insertions(+), 26 deletions(-)

diff --git a/src/assets/assetload_funcs.cpp b/src/assets/assetload_funcs.cpp
index b73a3882..ce8b65c9 100644
--- a/src/assets/assetload_funcs.cpp
+++ b/src/assets/assetload_funcs.cpp
@@ -172,7 +172,9 @@ assetload::postfunc assetload::layout(
     return [=](auto assets) {
         try {
             auto cfg = std::dynamic_pointer_cast<LayoutCfg>(config);
-            assets->store(UiDocument::read(cfg->env, name, file), name);
+            assets->store(
+                UiDocument::read(cfg->env, name, file, "abs:" + file), name
+            );
         } catch (const parsing_error& err) {
             throw std::runtime_error(
                 "failed to parse layout XML '" + file + "':\n" + err.errorLog()
diff --git a/src/content/ContentLoader.cpp b/src/content/ContentLoader.cpp
index 4414999d..263a25c2 100644
--- a/src/content/ContentLoader.cpp
+++ b/src/content/ContentLoader.cpp
@@ -485,7 +485,13 @@ void ContentLoader::loadBlock(
 
     auto scriptfile = folder / fs::path("scripts/" + def.scriptName + ".lua");
     if (fs::is_regular_file(scriptfile)) {
-        scripting::load_block_script(env, full, scriptfile, def.rt.funcsset);
+        scripting::load_block_script(
+            env,
+            full,
+            scriptfile,
+            pack->id + ":scripts/" + def.scriptName + ".lua",
+            def.rt.funcsset
+        );
     }
     if (!def.hidden) {
         auto& item = builder.items.create(full + BLOCK_ITEM_SUFFIX);
@@ -511,7 +517,13 @@ void ContentLoader::loadItem(
 
     auto scriptfile = folder / fs::path("scripts/" + def.scriptName + ".lua");
     if (fs::is_regular_file(scriptfile)) {
-        scripting::load_item_script(env, full, scriptfile, def.rt.funcsset);
+        scripting::load_item_script(
+            env,
+            full,
+            scriptfile,
+            pack->id + ":scripts/" + def.scriptName + ".lua",
+            def.rt.funcsset
+        );
     }
 }
 
@@ -720,7 +732,11 @@ void ContentLoader::load() {
     fs::path scriptFile = folder / fs::path("scripts/world.lua");
     if (fs::is_regular_file(scriptFile)) {
         scripting::load_world_script(
-            env, pack->id, scriptFile, runtime->worldfuncsset
+            env,
+            pack->id,
+            scriptFile,
+            pack->id + ":scripts/world.lua",
+            runtime->worldfuncsset
         );
     }
 
@@ -795,7 +811,11 @@ void ContentLoader::load() {
     fs::path componentsDir = folder / fs::u8path("scripts/components");
     foreach_file(componentsDir, [this](const fs::path& file) {
         auto name = pack->id + ":" + file.stem().u8string();
-        scripting::load_entity_component(name, file);
+        scripting::load_entity_component(
+            name,
+            file,
+            pack->id + ":scripts/components/" + file.stem().u8string()
+        );
     });
 
     // Process content.json and load defined content units
diff --git a/src/frontend/UiDocument.cpp b/src/frontend/UiDocument.cpp
index e218d975..fff98f3f 100644
--- a/src/frontend/UiDocument.cpp
+++ b/src/frontend/UiDocument.cpp
@@ -53,7 +53,12 @@ scriptenv UiDocument::getEnvironment() const {
     return env;
 }
 
-std::unique_ptr<UiDocument> UiDocument::read(const scriptenv& penv, const std::string& name, const fs::path& file) {
+std::unique_ptr<UiDocument> UiDocument::read(
+    const scriptenv& penv,
+    const std::string& name,
+    const fs::path& file,
+    const std::string& fileName
+) {
     const std::string text = files::read_string(file);
     auto xmldoc = xml::parse(file.u8string(), text);
 
@@ -69,12 +74,16 @@ std::unique_ptr<UiDocument> UiDocument::read(const scriptenv& penv, const std::s
     uidocscript script {};
     auto scriptFile = fs::path(file.u8string()+".lua");
     if (fs::is_regular_file(scriptFile)) {
-        scripting::load_layout_script(env, name, scriptFile, script);
+        scripting::load_layout_script(
+            env, name, scriptFile, fileName + ".lua", script
+        );
     }
     return std::make_unique<UiDocument>(name, script, view, env);
 }
 
-std::shared_ptr<gui::UINode> UiDocument::readElement(const fs::path& file) {
-    auto document = read(nullptr, file.filename().u8string(), file);
+std::shared_ptr<gui::UINode> UiDocument::readElement(
+    const fs::path& file, const std::string& fileName
+) {
+    auto document = read(nullptr, file.filename().u8string(), file, fileName);
     return document->getRoot();
 }
diff --git a/src/frontend/UiDocument.hpp b/src/frontend/UiDocument.hpp
index dcd2a34e..dbf91ef1 100644
--- a/src/frontend/UiDocument.hpp
+++ b/src/frontend/UiDocument.hpp
@@ -45,6 +45,13 @@ public:
     const uidocscript& getScript() const;
     scriptenv getEnvironment() const;
 
-    static std::unique_ptr<UiDocument> read(const scriptenv& parent_env, const std::string& name, const fs::path& file);
-    static std::shared_ptr<gui::UINode> readElement(const fs::path& file);
+    static std::unique_ptr<UiDocument> read(
+        const scriptenv& parent_env,
+        const std::string& name,
+        const fs::path& file,
+        const std::string& fileName
+    );
+    static std::shared_ptr<gui::UINode> readElement(
+        const fs::path& file, const std::string& fileName
+    );
 };
diff --git a/src/frontend/menu.cpp b/src/frontend/menu.cpp
index 7955fad5..0aa0a74e 100644
--- a/src/frontend/menu.cpp
+++ b/src/frontend/menu.cpp
@@ -62,7 +62,10 @@ gui::page_loader_func menus::create_page_loader(Engine* engine) {
         auto fullname = "core:pages/"+name;
 
         auto document_ptr = UiDocument::read(
-            scripting::get_root_environment(), fullname, file
+            scripting::get_root_environment(),
+            fullname,
+            file,
+            "core:layout/pages/" + name
         );
         auto document = document_ptr.get();
         engine->getAssets()->store(std::move(document_ptr), fullname);
@@ -110,7 +113,7 @@ UiDocument* menus::show(Engine* engine, const std::string& name, std::vector<dv:
     auto fullname = "core:layouts/"+name;
 
     auto document_ptr = UiDocument::read(
-        scripting::get_root_environment(), fullname, file
+        scripting::get_root_environment(), fullname, file, "core:layouts/"+name
     );
     auto document = document_ptr.get();
     engine->getAssets()->store(std::move(document_ptr), fullname);
diff --git a/src/logic/scripting/lua/lua_engine.cpp b/src/logic/scripting/lua/lua_engine.cpp
index 1d24ec93..93585c41 100644
--- a/src/logic/scripting/lua/lua_engine.cpp
+++ b/src/logic/scripting/lua/lua_engine.cpp
@@ -144,7 +144,8 @@ State* lua::create_state(const EnginePaths& paths, StateType stateType) {
     init_state(L, stateType);
     
     auto resDir = paths.getResourcesFolder();
-    auto src = files::read_string(resDir / fs::u8path("scripts/stdmin.lua"));
-    lua::pop(L, lua::execute(L, 0, src, "<stdmin>"));
+    auto file = resDir / fs::u8path("scripts/stdmin.lua");
+    auto src = files::read_string(file);
+    lua::pop(L, lua::execute(L, 0, src, "core:scripts/stdmin.lua"));
     return L;
 }
diff --git a/src/logic/scripting/scripting.cpp b/src/logic/scripting/scripting.cpp
index 72360ce1..aeeb3978 100644
--- a/src/logic/scripting/scripting.cpp
+++ b/src/logic/scripting/scripting.cpp
@@ -44,7 +44,7 @@ void scripting::load_script(const fs::path& name, bool throwable) {
     fs::path file = paths->getResourcesFolder() / fs::path("scripts") / name;
     std::string src = files::read_string(file);
     auto L = lua::get_main_state();
-    lua::loadbuffer(L, 0, src, file.u8string());
+    lua::loadbuffer(L, 0, src, "core:scripts/"+name.u8string());
     if (throwable) {
         lua::call(L, 0, 0);
     } else {
@@ -53,11 +53,14 @@ void scripting::load_script(const fs::path& name, bool throwable) {
 }
 
 int scripting::load_script(
-    int env, const std::string& type, const fs::path& file
+    int env,
+    const std::string& type,
+    const fs::path& file,
+    const std::string& fileName
 ) {
     std::string src = files::read_string(file);
     logger.info() << "script (" << type << ") " << file.u8string();
-    return lua::execute(lua::get_main_state(), env, src, file.u8string());
+    return lua::execute(lua::get_main_state(), env, src, fileName);
 }
 
 void scripting::initialize(Engine* engine) {
@@ -657,10 +660,11 @@ void scripting::load_block_script(
     const scriptenv& senv,
     const std::string& prefix,
     const fs::path& file,
+    const std::string& fileName,
     block_funcs_set& funcsset
 ) {
     int env = *senv;
-    lua::pop(lua::get_main_state(), load_script(env, "block", file));
+    lua::pop(lua::get_main_state(), load_script(env, "block", file, fileName));
     funcsset.init = register_event(env, "init", prefix + ".init");
     funcsset.update = register_event(env, "on_update", prefix + ".update");
     funcsset.randupdate =
@@ -677,10 +681,11 @@ void scripting::load_item_script(
     const scriptenv& senv,
     const std::string& prefix,
     const fs::path& file,
+    const std::string& fileName,
     item_funcs_set& funcsset
 ) {
     int env = *senv;
-    lua::pop(lua::get_main_state(), load_script(env, "item", file));
+    lua::pop(lua::get_main_state(), load_script(env, "item", file, fileName));
     funcsset.init = register_event(env, "init", prefix + ".init");
     funcsset.on_use = register_event(env, "on_use", prefix + ".use");
     funcsset.on_use_on_block =
@@ -690,7 +695,7 @@ void scripting::load_item_script(
 }
 
 void scripting::load_entity_component(
-    const std::string& name, const fs::path& file
+    const std::string& name, const fs::path& file, const std::string& fileName
 ) {
     auto L = lua::get_main_state();
     std::string src = files::read_string(file);
@@ -703,10 +708,11 @@ void scripting::load_world_script(
     const scriptenv& senv,
     const std::string& prefix,
     const fs::path& file,
+    const std::string& fileName,
     world_funcs_set& funcsset
 ) {
     int env = *senv;
-    lua::pop(lua::get_main_state(), load_script(env, "world", file));
+    lua::pop(lua::get_main_state(), load_script(env, "world", file, fileName));
     register_event(env, "init", prefix + ".init");
     register_event(env, "on_world_open", prefix + ":.worldopen");
     register_event(env, "on_world_tick", prefix + ":.worldtick");
@@ -724,11 +730,12 @@ void scripting::load_layout_script(
     const scriptenv& senv,
     const std::string& prefix,
     const fs::path& file,
+    const std::string& fileName,
     uidocscript& script
 ) {
     int env = *senv;
 
-    lua::pop(lua::get_main_state(), load_script(env, "layout", file));
+    lua::pop(lua::get_main_state(), load_script(env, "layout", file, fileName));
     script.onopen = register_event(env, "on_open", prefix + ".open");
     script.onprogress =
         register_event(env, "on_progress", prefix + ".progress");
diff --git a/src/logic/scripting/scripting.hpp b/src/logic/scripting/scripting.hpp
index 2b3eab90..c103a97a 100644
--- a/src/logic/scripting/scripting.hpp
+++ b/src/logic/scripting/scripting.hpp
@@ -125,11 +125,13 @@ namespace scripting {
     /// @param env environment
     /// @param prefix pack id
     /// @param file item script file
+    /// @param fileName script file path using the engine format
     /// @param funcsset block callbacks set
     void load_block_script(
         const scriptenv& env,
         const std::string& prefix,
         const fs::path& file,
+        const std::string& fileName,
         block_funcs_set& funcsset
     );
 
@@ -137,15 +139,25 @@ namespace scripting {
     /// @param env environment
     /// @param prefix pack id
     /// @param file item script file
+    /// @param fileName script file path using the engine format
     /// @param funcsset item callbacks set
     void load_item_script(
         const scriptenv& env,
         const std::string& prefix,
         const fs::path& file,
+        const std::string& fileName,
         item_funcs_set& funcsset
     );
 
-    void load_entity_component(const std::string& name, const fs::path& file);
+    /// @brief Load component script
+    /// @param name component full name (packid:name)
+    /// @param file component script file path
+    /// @param fileName script file path using the engine format
+    void load_entity_component(
+        const std::string& name,
+        const fs::path& file,
+        const std::string& fileName
+    );
 
     std::unique_ptr<GeneratorScript> load_generator(
         const GeneratorDef& def,
@@ -157,10 +169,12 @@ namespace scripting {
     /// @param env environment
     /// @param packid content-pack id
     /// @param file script file path
+    /// @param fileName script file path using the engine format
     void load_world_script(
         const scriptenv& env,
         const std::string& packid,
         const fs::path& file,
+        const std::string& fileName,
         world_funcs_set& funcsset
     );
 
@@ -168,11 +182,13 @@ namespace scripting {
     /// @param env environment
     /// @param prefix pack id
     /// @param file item script file
+    /// @param fileName script file path using the engine format
     /// @param script document script info
     void load_layout_script(
         const scriptenv& env,
         const std::string& prefix,
         const fs::path& file,
+        const std::string& fileName,
         uidocscript& script
     );
 
diff --git a/src/logic/scripting/scripting_commons.hpp b/src/logic/scripting/scripting_commons.hpp
index 93e05ca7..3bc31825 100644
--- a/src/logic/scripting/scripting_commons.hpp
+++ b/src/logic/scripting/scripting_commons.hpp
@@ -6,6 +6,10 @@
 namespace scripting {
     void load_script(const std::filesystem::path& name, bool throwable);
 
-    [[nodiscard]]
-    int load_script(int env, const std::string& type, const std::filesystem::path& file);
+    [[nodiscard]] int load_script(
+        int env,
+        const std::string& type,
+        const std::filesystem::path& file,
+        const std::string& fileName
+    );
 }

From 3146bf01339f92ddb1145ff8860fd9551742c383 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Mon, 18 Nov 2024 14:44:44 +0300
Subject: [PATCH 38/80] fix

---
 res/scripts/stdmin.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/scripts/stdmin.lua b/res/scripts/stdmin.lua
index 2b6a10fe..e3f8a707 100644
--- a/res/scripts/stdmin.lua
+++ b/res/scripts/stdmin.lua
@@ -228,7 +228,7 @@ function file.readlines(path)
     return lines
 end
 
-function debug.get_trackback()
+function debug.get_traceback()
     local frames = {}
     local n = 0
     while true do
@@ -253,7 +253,7 @@ function on_deprecated_call(name, alternatives)
         return
     end
     __warnings_hidden[name] = true
-    events.emit("core:warning", "deprecated call", name)
+    events.emit("core:warning", "deprecated call", name, debug.get_traceback())
     if alternatives then
         debug.warning("deprecated function called ("..name.."), use "..
             alternatives.." instead\n"..debug.traceback())

From 9dc09e920c5c1dc6a9a9453d09122c888bf31ee0 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Mon, 18 Nov 2024 14:48:05 +0300
Subject: [PATCH 39/80] remove extra frames from debug.get_traceback result

---
 res/scripts/stdmin.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/scripts/stdmin.lua b/res/scripts/stdmin.lua
index e3f8a707..d24c3be4 100644
--- a/res/scripts/stdmin.lua
+++ b/res/scripts/stdmin.lua
@@ -230,7 +230,7 @@ end
 
 function debug.get_traceback()
     local frames = {}
-    local n = 0
+    local n = 2
     while true do
         local info = debug.getinfo(n)
         if info then

From 2cf51a694107ab4837d69aa4dd5e5b717e4a0c4d Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Tue, 19 Nov 2024 04:21:05 +0300
Subject: [PATCH 40/80] add 'line-numbers' property to textbox & make TextBox
 extend Container instead of Panel

---
 doc/en/xml-ui-layouts.md                |   1 +
 doc/ru/xml-ui-layouts.md                |   1 +
 src/graphics/ui/elements/TextBox.cpp    | 119 +++++++++++++++++++-----
 src/graphics/ui/elements/TextBox.hpp    |  11 ++-
 src/graphics/ui/gui_xml.cpp             |  14 ++-
 src/logic/scripting/lua/libs/libgui.cpp |  14 +++
 6 files changed, 135 insertions(+), 25 deletions(-)

diff --git a/doc/en/xml-ui-layouts.md b/doc/en/xml-ui-layouts.md
index f4db96c6..b039a29b 100644
--- a/doc/en/xml-ui-layouts.md
+++ b/doc/en/xml-ui-layouts.md
@@ -104,6 +104,7 @@ Inner text - initially entered text
 - `multiline` - allows display of multiline text.
 - `text-wrap` - allows automatic text wrapping (works only with multiline: "true")
 - `editable` - determines whether the text can be edited.
+- `line-numbers` - enables line numbers display.
 - `error-color` - color when entering incorrect data (the text does not pass the validator check). Type: RGBA color.
 - `text-color` - text color. Type: RGBA color.
 - `validator` - lua function that checks text for correctness. Takes a string as input, returns true if the text is correct.
diff --git a/doc/ru/xml-ui-layouts.md b/doc/ru/xml-ui-layouts.md
index adffcd73..dc9455f7 100644
--- a/doc/ru/xml-ui-layouts.md
+++ b/doc/ru/xml-ui-layouts.md
@@ -105,6 +105,7 @@
 - `multiline` - разрешает отображение многострочного текста.
 - `text-wrap` - разрешает автоматический перенос текста (работает только при multiline: "true")
 - `editable`- определяет возможность редактирования текста.
+- `line-numbers` - включает отображение номеров строк.
 - `error-color` - цвет при вводе некорректных данных (текст не проходит проверку валидатора). Тип: RGBA цвет.
 - `text-color` - цвет текста. Тип: RGBA цвет.
 - `validator` - lua функция, проверяющая текст на корректность. Принимает на вход строку, возвращает true если текст корректен.
diff --git a/src/graphics/ui/elements/TextBox.cpp b/src/graphics/ui/elements/TextBox.cpp
index a4e613d3..6a123fca 100644
--- a/src/graphics/ui/elements/TextBox.cpp
+++ b/src/graphics/ui/elements/TextBox.cpp
@@ -1,5 +1,6 @@
 #include "TextBox.hpp"
 
+#include <sstream>
 #include <utility>
 #include <algorithm>
 
@@ -14,16 +15,30 @@
 
 using namespace gui;
 
+inline constexpr int LINE_NUMBERS_PANE_WIDTH = 40;
+
 TextBox::TextBox(std::wstring placeholder, glm::vec4 padding) 
-  : Panel(glm::vec2(200,32), padding, 0), 
+  : Container(glm::vec2(200,32)), 
+    padding(padding),
     input(L""),
     placeholder(std::move(placeholder))
 {
     setOnUpPressed(nullptr);
     setOnDownPressed(nullptr);
+    setColor(glm::vec4(0.0f, 0.0f, 0.0f, 0.75f));
     label = std::make_shared<Label>(L"");
     label->setSize(size-glm::vec2(padding.z+padding.x, padding.w+padding.y));
+    label->setPos(glm::vec2(
+        padding.x + LINE_NUMBERS_PANE_WIDTH * showLineNumbers, padding.y
+    ));
     add(label);
+
+    lineNumbersLabel = std::make_shared<Label>(L"");
+    lineNumbersLabel->setMultiline(true);
+    lineNumbersLabel->setSize(size-glm::vec2(padding.z+padding.x, padding.w+padding.y));
+    lineNumbersLabel->setVerticalAlign(Align::top);
+    add(lineNumbersLabel);
+    
     setHoverColor(glm::vec4(0.05f, 0.1f, 0.2f, 0.75f));
 
     textInitX = label->getPos().x;
@@ -31,7 +46,7 @@ TextBox::TextBox(std::wstring placeholder, glm::vec4 padding)
 }
 
 void TextBox::draw(const DrawContext* pctx, Assets* assets) {
-    Panel::draw(pctx, assets);
+    Container::draw(pctx, assets);
 
     font = assets->get<Font>(label->getFontName());
 
@@ -76,6 +91,44 @@ void TextBox::draw(const DrawContext* pctx, Assets* assets) {
             batch->rect(lcoord.x, lcoord.y+label->getLineYOffset(endLine), end, lineHeight);
         }
     }
+
+    if (isFocused() && multiline) {
+        auto selectionCtx = subctx.sub(batch);
+        selectionCtx.setBlendMode(BlendMode::addition);
+
+        batch->setColor(glm::vec4(1, 1, 1, 0.1f));
+
+        uint line = label->getLineByTextIndex(caret);
+        while (label->isFakeLine(line)) {
+            line--;
+        }
+        do {
+            int lineY = label->getLineYOffset(line);
+            int lineHeight = font->getLineHeight() * label->getLineInterval();
+
+            batch->setColor(glm::vec4(1, 1, 1, 0.05f));
+            if (showLineNumbers) {
+                batch->rect(
+                    lcoord.x - 8,
+                    lcoord.y + lineY,
+                    label->getSize().x,
+                    lineHeight
+                );
+                batch->setColor(glm::vec4(1, 1, 1, 0.10f));
+                batch->rect(
+                    lcoord.x - LINE_NUMBERS_PANE_WIDTH,
+                    lcoord.y + lineY,
+                    LINE_NUMBERS_PANE_WIDTH - 8,
+                    lineHeight
+                );
+            } else {
+                batch->rect(
+                    lcoord.x, lcoord.y + lineY, label->getSize().x, lineHeight
+                );
+            }
+            line++;
+        } while (line < label->getLinesNumber() && label->isFakeLine(line));
+    }
 }
 
 void TextBox::drawBackground(const DrawContext* pctx, Assets*) {
@@ -103,31 +156,31 @@ void TextBox::drawBackground(const DrawContext* pctx, Assets*) {
     if (!isFocused() && supplier) {
         input = supplier();
     }
-
-    if (isFocused() && multiline) {
-        batch->setColor(glm::vec4(1, 1, 1, 0.1f));
-        glm::vec2 lcoord = label->calcPos();
-        lcoord.y -= 2;
-
-        uint line = label->getLineByTextIndex(caret);
-        while (label->isFakeLine(line)) {
-            line--;
-        }
-        batch->setColor(glm::vec4(1, 1, 1, 0.05f));
-        do {
-            int lineY = label->getLineYOffset(line);
-            int lineHeight = font->getLineHeight() * label->getLineInterval();
-
-            batch->rect(lcoord.x, lcoord.y+lineY, label->getSize().x, lineHeight);
-            line++;
-        } while (line < label->getLinesNumber() && label->isFakeLine(line));
-    }
     refreshLabel();
 }
 
 void TextBox::refreshLabel() {
     label->setColor(textColor * glm::vec4(input.empty() ? 0.5f : 1.0f));
     label->setText(input.empty() && !hint.empty() ? hint : getText());
+    
+    if (showLineNumbers) {
+        if (lineNumbersLabel->getLinesNumber() != label->getLinesNumber()) {
+            std::wstringstream ss;
+            int n = 1;
+            for (int i = 1; i <= label->getLinesNumber(); i++) {
+                if (!label->isFakeLine(i-1)) {
+                    ss << n;
+                    n++;
+                }
+                if (i + 1 <= label->getLinesNumber()) {
+                    ss << "\n";
+                }
+            }
+            lineNumbersLabel->setText(ss.str());
+        }
+        lineNumbersLabel->setPos(padding);
+        lineNumbersLabel->setColor(glm::vec4(1, 1, 1, 0.25f));
+    }
 
     if (autoresize && font) {
         auto size = getSize();
@@ -293,7 +346,7 @@ bool TextBox::isAutoResize() const {
 }
 
 void TextBox::onFocus(GUI* gui) {
-    Panel::onFocus(gui);
+    Container::onFocus(gui);
     if (onEditStart){
         setCaret(input.size());
         onEditStart();
@@ -302,8 +355,11 @@ void TextBox::onFocus(GUI* gui) {
 }
 
 void TextBox::refresh() {
-    Panel::refresh();
+    Container::refresh();
     label->setSize(size-glm::vec2(padding.z+padding.x, padding.w+padding.y));
+    label->setPos(glm::vec2(
+        padding.x + LINE_NUMBERS_PANE_WIDTH * showLineNumbers, padding.y
+    ));
 }
 
 /// @brief Clamp index to range [0, input.length()]
@@ -705,3 +761,20 @@ void TextBox::setCaret(ptrdiff_t position) {
         setCaret(static_cast<size_t>(position));
     }
 }
+
+void TextBox::setPadding(glm::vec4 padding) {
+    this->padding = padding;
+    refresh();
+}
+
+glm::vec4 TextBox::getPadding() const {
+    return padding;
+}
+
+void TextBox::setShowLineNumbers(bool flag) {
+    showLineNumbers = flag;
+}
+
+bool TextBox::isShowLineNumbers() const {
+    return showLineNumbers;
+}
diff --git a/src/graphics/ui/elements/TextBox.hpp b/src/graphics/ui/elements/TextBox.hpp
index 27b6e9c9..1415d89b 100644
--- a/src/graphics/ui/elements/TextBox.hpp
+++ b/src/graphics/ui/elements/TextBox.hpp
@@ -8,12 +8,14 @@ class Font;
 namespace gui {
     class Label;
     
-    class TextBox : public Panel {
+    class TextBox : public Container {
     protected:
         glm::vec4 focusedColor {0.0f, 0.0f, 0.0f, 1.0f};
         glm::vec4 invalidColor {0.1f, 0.05f, 0.03f, 1.0f};
         glm::vec4 textColor {1.0f, 1.0f, 1.0f, 1.0f};
+        glm::vec4 padding {2};
         std::shared_ptr<Label> label;
+        std::shared_ptr<Label> lineNumbersLabel;
         /// @brief Current user input
         std::wstring input;
         /// @brief Text will be used if nothing entered
@@ -53,6 +55,7 @@ namespace gui {
         bool multiline = false;
         bool editable = true;
         bool autoresize = false;
+        bool showLineNumbers = false;
 
         void stepLeft(bool shiftPressed, bool breakSelection);
         void stepRight(bool shiftPressed, bool breakSelection);
@@ -181,12 +184,18 @@ namespace gui {
         /// @brief Check if text editing feature is enabled 
         virtual bool isEditable() const;
 
+        virtual void setPadding(glm::vec4 padding);
+        glm::vec4 getPadding() const;
+
         /// @brief Set runnable called on textbox focus
         virtual void setOnEditStart(runnable oneditstart);
 
         virtual void setAutoResize(bool flag);
         virtual bool isAutoResize() const;
 
+        virtual void setShowLineNumbers(bool flag);
+        virtual bool isShowLineNumbers() const;
+
         virtual void onFocus(GUI*) override;
         virtual void refresh() override;
         virtual void doubleClick(GUI*, int x, int y) override;
diff --git a/src/graphics/ui/gui_xml.cpp b/src/graphics/ui/gui_xml.cpp
index c1880383..7e30a31d 100644
--- a/src/graphics/ui/gui_xml.cpp
+++ b/src/graphics/ui/gui_xml.cpp
@@ -342,7 +342,16 @@ static std::shared_ptr<UINode> readTextBox(UiXmlReader& reader, const xml::xmlel
     auto textbox = std::make_shared<TextBox>(placeholder, glm::vec4(0.0f));
     textbox->setHint(hint);
     
-    _readPanel(reader, element, *textbox);
+    _readContainer(reader, element, *textbox);
+    if (element->has("padding")) {
+        glm::vec4 padding = element->attr("padding").asVec4();
+        textbox->setPadding(padding);
+        glm::vec2 size = textbox->getSize();
+        textbox->setSize(glm::vec2(
+            size.x + padding.x + padding.z,
+            size.y + padding.y + padding.w
+        ));
+    }
     textbox->setText(text);
 
     if (element->has("multiline")) {
@@ -357,6 +366,9 @@ static std::shared_ptr<UINode> readTextBox(UiXmlReader& reader, const xml::xmlel
     if (element->has("autoresize")) {
         textbox->setAutoResize(element->attr("autoresize").asBool());
     }
+    if (element->has("line-numbers")) {
+        textbox->setShowLineNumbers(element->attr("line-numbers").asBool());
+    }
     if (element->has("consumer")) {
         textbox->setTextConsumer(scripting::create_wstring_consumer(
             reader.getEnvironment(),
diff --git a/src/logic/scripting/lua/libs/libgui.cpp b/src/logic/scripting/lua/libs/libgui.cpp
index ff6ef83c..078a3529 100644
--- a/src/logic/scripting/lua/libs/libgui.cpp
+++ b/src/logic/scripting/lua/libs/libgui.cpp
@@ -274,6 +274,13 @@ static int p_get_editable(UINode* node, lua::State* L) {
     return 0;
 }
 
+static int p_get_line_numbers(UINode* node, lua::State* L) {
+    if (auto box = dynamic_cast<TextBox*>(node)) {
+        return lua::pushboolean(L, box->isShowLineNumbers());
+    }
+    return 0;
+}
+
 static int p_get_src(UINode* node, lua::State* L) {
     if (auto image = dynamic_cast<Image*>(node)) {
         return lua::pushstring(L, image->getTexture());
@@ -383,6 +390,7 @@ static int l_gui_getattr(lua::State* L) {
             {"caret", p_get_caret},
             {"text", p_get_text},
             {"editable", p_get_editable},
+            {"lineNumbers", p_get_line_numbers},
             {"src", p_get_src},
             {"value", p_get_value},
             {"min", p_get_min},
@@ -470,6 +478,11 @@ static void p_set_editable(UINode* node, lua::State* L, int idx) {
         box->setEditable(lua::toboolean(L, idx));
     }
 }
+static void p_set_line_numbers(UINode* node, lua::State* L, int idx) {
+    if (auto box = dynamic_cast<TextBox*>(node)) {
+        box->setShowLineNumbers(lua::toboolean(L, idx));
+    }
+}
 static void p_set_src(UINode* node, lua::State* L, int idx) {
     if (auto image = dynamic_cast<Image*>(node)) {
         image->setTexture(lua::require_string(L, idx));
@@ -569,6 +582,7 @@ static int l_gui_setattr(lua::State* L) {
             {"hint", p_set_hint},
             {"text", p_set_text},
             {"editable", p_set_editable},
+            {"lineNumbers", p_set_line_numbers},
             {"src", p_set_src},
             {"caret", p_set_caret},
             {"value", p_set_value},

From 2bc6cbda2e809b14fa6cffe09161b53c1636675f Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Tue, 19 Nov 2024 04:38:36 +0300
Subject: [PATCH 41/80] fix `\'` escape parsing

---
 src/coders/commons.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/coders/commons.cpp b/src/coders/commons.cpp
index 985c3440..de4fb755 100644
--- a/src/coders/commons.cpp
+++ b/src/coders/commons.cpp
@@ -373,7 +373,7 @@ std::string BasicParser::parseString(char quote, bool closeRequired) {
                 case 'b': ss << '\b'; break;
                 case 't': ss << '\t'; break;
                 case 'f': ss << '\f'; break;
-                case '\'': ss << '\\'; break;
+                case '\'': ss << '\''; break;
                 case '"': ss << '"'; break;
                 case '\\': ss << '\\'; break;
                 case '/': ss << '/'; break;

From 6a466cf1ec4f007c551746787869a37b034b86ac Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Tue, 19 Nov 2024 05:57:02 +0300
Subject: [PATCH 42/80] fix DrawContext

---
 src/graphics/core/DrawContext.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/graphics/core/DrawContext.cpp b/src/graphics/core/DrawContext.cpp
index 314bd7b5..7062ad56 100644
--- a/src/graphics/core/DrawContext.cpp
+++ b/src/graphics/core/DrawContext.cpp
@@ -91,6 +91,7 @@ DrawContext DrawContext::sub(Flushable* flushable) const {
     auto ctx = DrawContext(*this);
     ctx.parent = this;
     ctx.flushable = flushable;
+    ctx.scissorsCount = 0;
     return ctx;
 }
 

From c5c9ef379e2a45397da12f133e89fd77a6e0906f Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Tue, 19 Nov 2024 05:57:46 +0300
Subject: [PATCH 43/80] add textbox:lineAt and textbox:linePos

---
 doc/en/scripting/ui.md                  | 10 +++++++---
 doc/ru/scripting/ui.md                  | 10 +++++++---
 src/graphics/ui/elements/TextBox.cpp    | 10 +++++++++-
 src/graphics/ui/elements/TextBox.hpp    | 10 ++++++++++
 src/logic/scripting/lua/libs/libgui.cpp | 26 +++++++++++++++++++++++++
 5 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/doc/en/scripting/ui.md b/doc/en/scripting/ui.md
index 0a6ad4c3..4f132462 100644
--- a/doc/en/scripting/ui.md
+++ b/doc/en/scripting/ui.md
@@ -78,14 +78,18 @@ Properties:
 | caret       | int    | yes  | yes   | carriage position. `textbox.caret = -1` will set the position to the end of the text |
 | editable    | bool   | yes  | yes   | text mutability                                                                      |
 | multiline   | bool   | yes  | yes   | multiline support                                                                    |
+| lineNumbers | bool   | yes  | yes   | display line numbers                                                                 |
 | textWrap    | bool   | yes  | yes   | automatic text wrapping (only with multiline: "true")                                |
 | valid       | bool   | yes  | no    | is the entered text correct                                                          |
+| textColor   | vec4   | yes  | yes   | text color                                                                           |
 
 Methods:
 
-| Method      | Description                                      |
-| ----------- | ------------------------------------------------ |
-| paste(text) | inserts the specified text at the caret position |
+| Method                    | Description                                                      |
+| ------------------------- | ---------------------------------------------------------------- |
+| paste(text: str)          | inserts the specified text at the caret position                 |
+| lineAt(pos: int) -> int   | determines the line number by position in the text               |
+| linePos(line: int) -> int | determines the position of the beginning of the line in the text |
 
 ## Slider (trackbar)
 
diff --git a/doc/ru/scripting/ui.md b/doc/ru/scripting/ui.md
index 0a955947..4d244210 100644
--- a/doc/ru/scripting/ui.md
+++ b/doc/ru/scripting/ui.md
@@ -78,14 +78,18 @@ document["worlds-panel"]:clear()
 | caret       | int    | да     | да     | позиция каретки. `textbox.caret = -1` установит позицию в конец текста |
 | editable    | bool   | да     | да     | изменяемость текста                                                    |
 | multiline   | bool   | да     | да     | поддержка многострочности                                              |
+| lineNumbers | bool   | да     | да     | отображение номеров строк                                              |
 | textWrap    | bool   | да     | да     | автоматический перенос текста (только при multiline: "true")           |
 | valid       | bool   | да     | нет    | является ли введенный текст корректным                                 |
+| textColor   | vec4   | да     | да     | цвет текста                                                            |
 
 Методы:
 
-| Метод       | Описание                                     |
-| ----------- | -------------------------------------------- |
-| paste(text) | вставляет указанный текст на позицию каретки |
+| Метод                     | Описание                                     |
+| ------------------------- | -------------------------------------------- |
+| paste(text: str)          | вставляет указанный текст на позицию каретки |
+| lineAt(pos: int) -> int   | определяет номер строки по позиции в тексте  |
+| linePos(line: int) -> int | определяет позицию начала строки в тексте    |
 
 ##  Ползунок (trackbar)
 
diff --git a/src/graphics/ui/elements/TextBox.cpp b/src/graphics/ui/elements/TextBox.cpp
index 6a123fca..90a4c256 100644
--- a/src/graphics/ui/elements/TextBox.cpp
+++ b/src/graphics/ui/elements/TextBox.cpp
@@ -623,6 +623,14 @@ void TextBox::select(int start, int end) {
     setCaret(selectionEnd);
 }
 
+uint TextBox::getLineAt(size_t position) const {
+    return label->getLineByTextIndex(position);
+}
+
+size_t TextBox::getLinePos(uint line) const {
+    return label->getTextLineOffset(line);
+}
+
 std::shared_ptr<UINode> TextBox::getAt(glm::vec2 pos, std::shared_ptr<UINode> self) {
     return UINode::getAt(pos, self);
 }
@@ -740,7 +748,7 @@ void TextBox::setCaret(size_t position) {
     uint lineHeight = font->getLineHeight()*label->getLineInterval();
     scrollStep = lineHeight;
     if (offset < 0) {
-        scrolled(1);
+        scrolled(-glm::floor(offset/static_cast<double>(scrollStep)+0.5f));
     } else if (offset >= getSize().y) {
         offset -= getSize().y;
         scrolled(-glm::ceil(offset/static_cast<double>(scrollStep)+0.5f));
diff --git a/src/graphics/ui/elements/TextBox.hpp b/src/graphics/ui/elements/TextBox.hpp
index 1415d89b..d2c4fd8c 100644
--- a/src/graphics/ui/elements/TextBox.hpp
+++ b/src/graphics/ui/elements/TextBox.hpp
@@ -159,6 +159,16 @@ namespace gui {
         /// @param end index of the last selected character + 1
         virtual void select(int start, int end);
 
+        /// @brief Get number of line at specific position in text
+        /// @param position target position
+        /// @return line number
+        virtual uint getLineAt(size_t position) const;
+
+        /// @brief Get specific line text position
+        /// @param line target line
+        /// @return line position in text
+        virtual size_t getLinePos(uint line) const;
+
         /// @brief Check text with validator set with setTextValidator
         /// @return true if text is valid
         virtual bool validate();
diff --git a/src/logic/scripting/lua/libs/libgui.cpp b/src/logic/scripting/lua/libs/libgui.cpp
index 078a3529..c83e7410 100644
--- a/src/logic/scripting/lua/libs/libgui.cpp
+++ b/src/logic/scripting/lua/libs/libgui.cpp
@@ -134,6 +134,24 @@ static int l_move_into(lua::State* L) {
     return 0;
 }
 
+static int l_get_line_at(lua::State* L) {
+    auto node = getDocumentNode(L, 1);
+    auto position = lua::tointeger(L, 2);
+    if (auto box = dynamic_cast<TextBox*>(node.node.get())) {
+        return lua::pushinteger(L, box->getLineAt(position));
+    }
+    return 0;
+}
+
+static int l_get_line_pos(lua::State* L) {
+    auto node = getDocumentNode(L, 1);
+    auto line = lua::tointeger(L, 2);
+    if (auto box = dynamic_cast<TextBox*>(node.node.get())) {
+        return lua::pushinteger(L, box->getLinePos(line));
+    }
+    return 0;
+}
+
 static int p_get_inventory(UINode* node, lua::State* L) {
     if (auto inventory = dynamic_cast<InventoryView*>(node)) {
         auto inv = inventory->getInventory();
@@ -356,6 +374,12 @@ static int p_move_into(UINode*, lua::State* L) {
 static int p_get_focused(UINode* node, lua::State* L) {
     return lua::pushboolean(L, node->isFocused());
 }
+static int p_get_line_at(UINode*, lua::State* L) {
+    return lua::pushcfunction(L, l_get_line_at);
+}
+static int p_get_line_pos(UINode*, lua::State* L) {
+    return lua::pushcfunction(L, l_get_line_pos);
+}
 
 static int l_gui_getattr(lua::State* L) {
     auto docname = lua::require_string(L, 1);
@@ -391,6 +415,8 @@ static int l_gui_getattr(lua::State* L) {
             {"text", p_get_text},
             {"editable", p_get_editable},
             {"lineNumbers", p_get_line_numbers},
+            {"lineAt", p_get_line_at},
+            {"linePos", p_get_line_pos},
             {"src", p_get_src},
             {"value", p_get_value},
             {"min", p_get_min},

From 5c005b4f9af29b07b3accc67339de01cebe2ac7a Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Tue, 19 Nov 2024 06:01:59 +0300
Subject: [PATCH 44/80] remove extra frames from on_deprecated_call traceback

---
 res/scripts/stdmin.lua | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/res/scripts/stdmin.lua b/res/scripts/stdmin.lua
index d24c3be4..219ac5cb 100644
--- a/res/scripts/stdmin.lua
+++ b/res/scripts/stdmin.lua
@@ -228,22 +228,22 @@ function file.readlines(path)
     return lines
 end
 
-function debug.get_traceback()
+function debug.get_traceback(start)
     local frames = {}
-    local n = 2
+    local n = 2 + (start or 0)
     while true do
         local info = debug.getinfo(n)
         if info then
             table.insert(frames, info)
         else
-            return frames 
+            return frames
         end
         n = n + 1
     end
 end
 
 package = {
-    loaded={}
+    loaded = {}
 }
 local __cached_scripts = {}
 local __warnings_hidden = {}
@@ -253,7 +253,7 @@ function on_deprecated_call(name, alternatives)
         return
     end
     __warnings_hidden[name] = true
-    events.emit("core:warning", "deprecated call", name, debug.get_traceback())
+    events.emit("core:warning", "deprecated call", name, debug.get_traceback(2))
     if alternatives then
         debug.warning("deprecated function called ("..name.."), use "..
             alternatives.." instead\n"..debug.traceback())

From 2412699b89c44fe789cc4b4e9875cb7b60c87c99 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Tue, 19 Nov 2024 06:46:54 +0300
Subject: [PATCH 45/80] add 'scroll-step' property to container

---
 doc/en/xml-ui-layouts.md               | 3 ++-
 doc/ru/xml-ui-layouts.md               | 3 ++-
 src/graphics/ui/elements/Container.cpp | 8 ++++++++
 src/graphics/ui/elements/Container.hpp | 2 ++
 src/graphics/ui/elements/TextBox.cpp   | 5 ++++-
 src/graphics/ui/gui_xml.cpp            | 3 +++
 6 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/doc/en/xml-ui-layouts.md b/doc/en/xml-ui-layouts.md
index b039a29b..788814e5 100644
--- a/doc/en/xml-ui-layouts.md
+++ b/doc/en/xml-ui-layouts.md
@@ -56,7 +56,8 @@ Buttons and panels are also containers.
 
 - `padding` - element padding. Type: 4D vector.
   *left, top, right, bottom*
-  `scrollable` - element scrollability. Works on panels only. Type: boolean
+- `scrollable` - element scrollability. Type: boolean.
+- `scroll-step` - scrolling step. Type: integer.
 
 # Common *panel* attributes
 
diff --git a/doc/ru/xml-ui-layouts.md b/doc/ru/xml-ui-layouts.md
index dc9455f7..28777950 100644
--- a/doc/ru/xml-ui-layouts.md
+++ b/doc/ru/xml-ui-layouts.md
@@ -59,7 +59,8 @@
 В число контейнеров также входят панели и кнопки.
 - `padding` - внутренний отступ элемента. Тип: 4D вектор.
     Порядок: `"left,top,right,bottom"`
-- `scrollable` - возможность скроллинга. Работает только у Panel. Тип: логический.
+- `scrollable` - возможность скроллинга. Тип: логический.
+- `scroll-step` - шаг скроллинга. Тип: целочисленный.
 
 # Общие атрибуты панелей
 
diff --git a/src/graphics/ui/elements/Container.cpp b/src/graphics/ui/elements/Container.cpp
index 72a44d52..fdd0bc02 100644
--- a/src/graphics/ui/elements/Container.cpp
+++ b/src/graphics/ui/elements/Container.cpp
@@ -165,6 +165,14 @@ void Container::setSize(glm::vec2 size) {
     }
 }
 
+int Container::getScrollStep() const {
+    return scrollStep;
+}
+
+void Container::setScrollStep(int step) {
+    scrollStep = step;
+}
+
 void Container::refresh() {
     std::stable_sort(nodes.begin(), nodes.end(), [](const auto& a, const auto& b) {
         return a->getZIndex() < b->getZIndex();
diff --git a/src/graphics/ui/elements/Container.hpp b/src/graphics/ui/elements/Container.hpp
index a5cca04c..bfe40ab5 100644
--- a/src/graphics/ui/elements/Container.hpp
+++ b/src/graphics/ui/elements/Container.hpp
@@ -32,6 +32,8 @@ namespace gui {
         void listenInterval(float interval, ontimeout callback, int repeat=-1);
         virtual glm::vec2 getContentOffset() override {return glm::vec2(0.0f, scroll);};
         virtual void setSize(glm::vec2 size) override;
+        virtual int getScrollStep() const;
+        virtual void setScrollStep(int step);
         virtual void refresh() override;
 
         const std::vector<std::shared_ptr<UINode>>& getNodes() const;
diff --git a/src/graphics/ui/elements/TextBox.cpp b/src/graphics/ui/elements/TextBox.cpp
index 90a4c256..6a54d682 100644
--- a/src/graphics/ui/elements/TextBox.cpp
+++ b/src/graphics/ui/elements/TextBox.cpp
@@ -43,6 +43,7 @@ TextBox::TextBox(std::wstring placeholder, glm::vec4 padding)
 
     textInitX = label->getPos().x;
     scrollable = true;
+    scrollStep = 0;
 }
 
 void TextBox::draw(const DrawContext* pctx, Assets* assets) {
@@ -746,7 +747,9 @@ void TextBox::setCaret(size_t position) {
     uint line = label->getLineByTextIndex(caret);
     int offset = label->getLineYOffset(line) + getContentOffset().y;
     uint lineHeight = font->getLineHeight()*label->getLineInterval();
-    scrollStep = lineHeight;
+    if (scrollStep == 0) {
+        scrollStep = lineHeight;
+    }
     if (offset < 0) {
         scrolled(-glm::floor(offset/static_cast<double>(scrollStep)+0.5f));
     } else if (offset >= getSize().y) {
diff --git a/src/graphics/ui/gui_xml.cpp b/src/graphics/ui/gui_xml.cpp
index 7e30a31d..ffdf0e16 100644
--- a/src/graphics/ui/gui_xml.cpp
+++ b/src/graphics/ui/gui_xml.cpp
@@ -172,6 +172,9 @@ static void _readContainer(UiXmlReader& reader, const xml::xmlelement& element,
     if (element->has("scrollable")) {
         container.setScrollable(element->attr("scrollable").asBool());
     }
+    if (element->has("scroll-step")) {
+        container.setScrollStep(element->attr("scroll-step").asInt());
+    }
     for (auto& sub : element->getElements()) {
         if (sub->isText())
             continue;

From 66be21510148a922879815edd02ce16c67c2a58a Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Tue, 19 Nov 2024 07:26:28 +0300
Subject: [PATCH 46/80] add advanced lua errors handler & fix hud script source
 path in traceback

---
 res/scripts/stdmin.lua                |  7 +++++++
 src/frontend/screens/LevelScreen.cpp  |  7 ++++++-
 src/logic/scripting/lua/lua_util.cpp  | 15 ++++++++++++---
 src/logic/scripting/scripting_hud.cpp |  7 +++++--
 src/logic/scripting/scripting_hud.hpp |  6 +++++-
 5 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/res/scripts/stdmin.lua b/res/scripts/stdmin.lua
index 219ac5cb..996af40e 100644
--- a/res/scripts/stdmin.lua
+++ b/res/scripts/stdmin.lua
@@ -307,3 +307,10 @@ function __scripts_cleanup()
         end
     end
 end
+
+function __vc__error(msg, frame)
+    if events then
+        events.emit("core:error", msg, debug.get_traceback(1))
+    end
+    return debug.traceback(msg, frame)
+end
diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp
index fed19cdd..1acd9200 100644
--- a/src/frontend/screens/LevelScreen.cpp
+++ b/src/frontend/screens/LevelScreen.cpp
@@ -83,7 +83,12 @@ void LevelScreen::initializePack(ContentPackRuntime* pack) {
     const ContentPack& info = pack->getInfo();
     fs::path scriptFile = info.folder/fs::path("scripts/hud.lua");
     if (fs::is_regular_file(scriptFile)) {
-        scripting::load_hud_script(pack->getEnvironment(), info.id, scriptFile);
+        scripting::load_hud_script(
+            pack->getEnvironment(),
+            info.id,
+            scriptFile,
+            pack->getId() + ":scripts/hud.lua"
+        );
     }
 }
 
diff --git a/src/logic/scripting/lua/lua_util.cpp b/src/logic/scripting/lua/lua_util.cpp
index 44583e4c..86419906 100644
--- a/src/logic/scripting/lua/lua_util.cpp
+++ b/src/logic/scripting/lua/lua_util.cpp
@@ -145,10 +145,14 @@ static int l_error_handler(lua_State* L) {
     if (!isstring(L, 1)) {  // 'message' not a string?
         return 1;           // keep it intact
     }
-    if (get_from(L, "debug", "traceback")) {
+    if (getglobal(L, "__vc__error")) {
         lua_pushvalue(L, 1);    // pass error message
         lua_pushinteger(L, 2);  // skip this function and traceback
         lua_call(L, 2, 1);      // call debug.traceback
+    } if (get_from(L, "debug", "traceback")) {
+        lua_pushvalue(L, 1);
+        lua_pushinteger(L, 2);
+        lua_call(L, 2, 1);
     }
     return 1;
 }
@@ -172,8 +176,13 @@ int lua::call_nothrow(State* L, int argc, int nresults) {
     pushcfunction(L, l_error_handler);
     insert(L, handler_pos);
     if (lua_pcall(L, argc, LUA_MULTRET, handler_pos)) {
-        log_error(tostring(L, -1));
-        pop(L);
+        auto errorstr = tostring(L, -1);
+        if (errorstr) {
+            log_error(errorstr);
+            pop(L);
+        } else {
+            log_error("");
+        }
         remove(L, handler_pos);
         return 0;
     }
diff --git a/src/logic/scripting/scripting_hud.cpp b/src/logic/scripting/scripting_hud.cpp
index 41fb163f..a7be1892 100644
--- a/src/logic/scripting/scripting_hud.cpp
+++ b/src/logic/scripting/scripting_hud.cpp
@@ -76,13 +76,16 @@ void scripting::on_frontend_close() {
 }
 
 void scripting::load_hud_script(
-    const scriptenv& senv, const std::string& packid, const fs::path& file
+    const scriptenv& senv,
+    const std::string& packid,
+    const fs::path& file,
+    const std::string& fileName
 ) {
     int env = *senv;
     std::string src = files::read_string(file);
     logger.info() << "loading script " << file.u8string();
 
-    lua::execute(lua::get_main_state(), env, src, file.u8string());
+    lua::execute(lua::get_main_state(), env, src, fileName);
 
     register_event(env, "init", packid + ":.init");
     register_event(env, "on_hud_open", packid + ":.hudopen");
diff --git a/src/logic/scripting/scripting_hud.hpp b/src/logic/scripting/scripting_hud.hpp
index cea7e8ec..7eed738c 100644
--- a/src/logic/scripting/scripting_hud.hpp
+++ b/src/logic/scripting/scripting_hud.hpp
@@ -22,7 +22,11 @@ namespace scripting {
     /// @param env environment id
     /// @param packid content-pack id
     /// @param file script file path
+    /// @param fileName script file path using the engine format
     void load_hud_script(
-        const scriptenv &env, const std::string &packid, const fs::path &file
+        const scriptenv& env,
+        const std::string& packid,
+        const fs::path& file,
+        const std::string& fileName
     );
 }

From 29d8c4bbb879e94fc66b594d1754d3ab35240dfc Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Tue, 19 Nov 2024 07:32:03 +0300
Subject: [PATCH 47/80] add Lua traceback inspector (WIP) && add chat prototype

---
 res/layouts/console.xml               |  38 +++++++-
 res/layouts/console.xml.lua           | 120 ++++++++++++++++++++++++--
 res/layouts/templates/problem.xml     |   3 +-
 res/layouts/templates/stack_frame.xml |   3 +
 res/scripts/stdcmd.lua                |   8 ++
 res/texts/en_US.txt                   |   2 +
 res/texts/ru_RU.txt                   |   8 ++
 7 files changed, 174 insertions(+), 8 deletions(-)
 create mode 100644 res/layouts/templates/stack_frame.xml

diff --git a/res/layouts/console.xml b/res/layouts/console.xml
index bae396bf..96d01191 100644
--- a/res/layouts/console.xml
+++ b/res/layouts/console.xml
@@ -1,5 +1,18 @@
 <container color='#00000080' size='400' size-func="unpack(gui.get_viewport())">
-    <container size-func="gui.get_viewport()[1],gui.get_viewport()[2]-40">
+    <panel interval="0"
+           orientation="horizontal"
+           color="#00000010"
+           size-func="gui.get_viewport()[1]-350,30">
+        <button id="s_chat" size="110,30" onclick="modes:set('chat')">@Chat</button>
+        <button id="s_console" size="110,30" onclick="modes:set('console')">@Console</button>
+        <button id="s_debug" size="110,30" onclick="modes:set('debug')">@Debug</button>
+    </panel>
+    <container pos="0,30" size-func="gui.get_viewport()[1]-350,30" color="#00000020">
+        <label id="title" pos="8,8"></label>
+    </container>
+    
+    <container id="logContainer" pos="0,60"
+               size-func="unpack(vec2.add(gui.get_viewport(), {0,-70}))">
         <textbox 
             id='log' 
             color='0'
@@ -11,12 +24,33 @@
             gravity="bottom-left"
         ></textbox>
     </container>
+    <container id="editorContainer" pos="0,60" color="#00000080"
+               size-func="unpack(vec2.add(gui.get_viewport(), {-350,-230}))">
+        <textbox
+            id='editor'
+            color='0'
+            autoresize='true'
+            margin='0'
+            padding='5'
+            editable='false'
+            multiline='true'
+            line-numbers='true'
+            text-color="#FFFFFFA0"
+            size-func="gui.get_viewport()[1]-350,40"
+            gravity="top-left"
+            text-wrap='false'
+            scroll-step='50'
+        ></textbox>
+    </container>
+    <panel id="traceback" gravity="bottom-left" padding="4" color="#000000A0" 
+        max-length="170" size-func="gui.get_viewport()[1]-350,170">
+    </panel>
     <panel id="problemsLog"
         color="#00000010" 
         position-func="gui.get_viewport()[1]-350,0" 
         size-func="350,gui.get_viewport()[2]-40"
         padding="5,15,5,15">
-        <label>@Problems</label>
+        <label margin="0,0,0,5">@Problems</label>
     </panel>
     <textbox id='prompt' 
              consumer='submit' 
diff --git a/res/layouts/console.xml.lua b/res/layouts/console.xml.lua
index 6aef32ca..8e73a136 100644
--- a/res/layouts/console.xml.lua
+++ b/res/layouts/console.xml.lua
@@ -1,21 +1,93 @@
+console_mode = "console"
+
 history = session.get_entry("commands_history")
 history_pointer = #history
 
 local warnings_all = {}
+local errors_all = {}
 
 local warning_id = 0
-events.on("core:warning", function (wtype, text)
+local error_id = 0
+
+events.on("core:warning", function (wtype, text, traceback)
     local full = wtype..": "..text
     if table.has(warnings_all, full) then
         return
     end
+    local encoded = base64.encode(bjson.tobytes({frames=traceback}))
     document.problemsLog:add(gui.template("problem", {
-        type="warning", text=full, id=tostring(warning_id)
+        type="warning", 
+        text=full, 
+        traceback=encoded, 
+        id=tostring(warning_id)
     }))
     warning_id = warning_id + 1
     table.insert(warnings_all, full)
 end)
 
+events.on("core:error", function (msg, traceback)
+    local _, endindex = string.find(msg, ": ")
+    local full = ""
+    for i,frame in ipairs(traceback) do
+        full = full..frame.source..tostring(frame.currentline)
+    end
+    if table.has(errors_all, full) then
+        return
+    end
+    local encoded = base64.encode(bjson.tobytes({frames=traceback}))
+    document.problemsLog:add(gui.template("problem", {
+        type="error", 
+        text=msg:sub(endindex), 
+        traceback=encoded,
+        id=tostring(error_id)
+    }))
+    error_id = error_id + 1
+    table.insert(errors_all, full)
+end)
+
+events.on("core:open_traceback", function(traceback_b64)
+    local traceback = bjson.frombytes(base64.decode(traceback_b64))
+    modes:set('debug')
+
+    local tb_list = document.traceback
+    local srcsize = tb_list.size
+    tb_list:clear()
+    tb_list:add("<label enabled='false' margin='2'>@devtools.traceback</label>")
+    for _, frame in ipairs(traceback.frames) do
+        local callback = ""
+        local framestr = ""
+        if frame.what == "C" then
+            framestr = "C/C++ "
+        else
+            framestr = frame.source..":"..tostring(frame.currentline).." "
+            if file.exists(frame.source) then
+                callback = "local source = file.read('"..frame.source.."') "..
+                           "document.editor.text = source "..
+                           "document.editor.focused = true "..
+                           "time.post_runnable(function() document.editor.caret = document.editor:linePos("..
+                           tostring(frame.currentline-1)..") end)"
+            else
+                callback = "document.editor.text = 'Could not open source file'"
+            end
+            callback = callback.." document.title.text = gui.str('File')..' - "
+                       ..frame.source.."'"
+        end
+        if frame.name then
+            framestr = framestr.."("..tostring(frame.name)..")"
+        end
+        local color = "#FFFFFF"
+        if frame.source:starts_with("core:") then
+            color = "#C0D0C5"
+        end
+        tb_list:add(gui.template("stack_frame", {
+            location=framestr, 
+            color=color,
+            callback=callback
+        }))
+    end
+    tb_list.size = srcsize
+end)
+
 function setup_variables()
     local pid = hud.get_player()
     local x,y,z = player.get_pos(pid)
@@ -56,10 +128,19 @@ function add_to_history(text)
 end
 
 function submit(text)
+    text = text:trim()
     add_to_history(text)
+
+    if console_mode == "chat" then
+        if not text:starts_with("/") then
+            text = "chat "..string.escape(text)
+        else
+            text = text:sub(2)
+        end
+    end
+
     setup_variables()
     
-    text = text:trim()
     local name
     for s in text:gmatch("%S+") do
         name = s
@@ -84,6 +165,35 @@ function submit(text)
     document.prompt.focused = true
 end
 
-function on_open()
-    document.prompt.focused = true
+function set_mode(mode)
+    local show_prompt = mode == 'chat' or mode == 'console'
+
+    document.title.text = ""
+    document.editorContainer.visible = mode == 'debug'
+    document.logContainer.visible = mode ~= 'debug'
+
+    if mode == 'debug' then
+        document.root.color = {16, 18, 20, 220}
+    else
+        document.root.color = {0, 0, 0, 128}
+    end
+
+    document.traceback.visible = mode == 'debug'
+    document.prompt.visible = show_prompt
+    if show_prompt then
+        document.prompt.focused = true
+    end
+    console_mode = mode
+end
+
+function on_open()
+    if modes == nil then
+        modes = RadioGroup({
+            chat=document.s_chat,
+            console=document.s_console,
+            debug=document.s_debug
+        }, function (mode)
+            set_mode(mode)
+        end, "console")
+    end
 end
diff --git a/res/layouts/templates/problem.xml b/res/layouts/templates/problem.xml
index 0dfb2794..ea70022a 100644
--- a/res/layouts/templates/problem.xml
+++ b/res/layouts/templates/problem.xml
@@ -1,4 +1,5 @@
-<container id="%{id}" size="32" tooltip="%{text}">
+<container id="%{id}" size="32" tooltip="%{text}" 
+           onclick="events.emit('core:open_traceback', '%{traceback}')">
     <image src="gui/%{type}" size="32"/>
     <label pos="36,2">%{text}</label>
     <image src="gui/cross" interactive="true" size="16" gravity="top-right" 
diff --git a/res/layouts/templates/stack_frame.xml b/res/layouts/templates/stack_frame.xml
new file mode 100644
index 00000000..5f1f34cb
--- /dev/null
+++ b/res/layouts/templates/stack_frame.xml
@@ -0,0 +1,3 @@
+<label hover-color="#A0A0FF" interactive="true" onclick="%{callback}" color="%{color}">
+    %{location}    
+</label>
diff --git a/res/scripts/stdcmd.lua b/res/scripts/stdcmd.lua
index 98609688..ccb65a71 100644
--- a/res/scripts/stdcmd.lua
+++ b/res/scripts/stdcmd.lua
@@ -256,6 +256,14 @@ console.add_command(
     end
 )
 
+console.add_command(
+    "chat text:str",
+    "Send chat message",
+    function (args, kwargs)
+        console.log("[you] "..args[1])
+    end
+)
+
 console.cheats = {
     "blocks.fill",
     "tp",
diff --git a/res/texts/en_US.txt b/res/texts/en_US.txt
index 9c9cc2a5..c19fe00a 100644
--- a/res/texts/en_US.txt
+++ b/res/texts/en_US.txt
@@ -11,6 +11,8 @@ world.delete-confirm=Do you want to delete world forever?
 world.generators.default=Default
 world.generators.flat=Flat
 
+devtools.traceback=Traceback (most recent call first)
+
 # Tooltips
 graphics.gamma.tooltip=Lighting brightness curve
 graphics.backlight.tooltip=Backlight to prevent total darkness
diff --git a/res/texts/ru_RU.txt b/res/texts/ru_RU.txt
index 74717336..346c5993 100644
--- a/res/texts/ru_RU.txt
+++ b/res/texts/ru_RU.txt
@@ -12,7 +12,15 @@ Dependencies=Зависимости
 Description=Описание
 Converting world...=Выполняется конвертация мира...
 Unlimited=Неограниченно
+Chat=Чат
+Console=Консоль
+Log=Лог
+Problems=Проблемы
+Monitor=Мониторинг
+Debug=Отладка
+File=Файл
 
+devtools.traceback=Стек вызовов (от последнего)
 error.pack-not-found=Не удалось найти пакет
 error.dependency-not-found=Используемая зависимость не найдена
 pack.remove-confirm=Удалить весь поставляемый паком/паками контент из мира (безвозвратно)?

From f9f150f0aa0494169720cc5985e9441149d8a292 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Tue, 19 Nov 2024 07:35:38 +0300
Subject: [PATCH 48/80] fix entity component script source path in lua
 traceback

---
 src/content/ContentLoader.cpp     | 2 +-
 src/logic/scripting/scripting.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/content/ContentLoader.cpp b/src/content/ContentLoader.cpp
index 263a25c2..cb50e4a5 100644
--- a/src/content/ContentLoader.cpp
+++ b/src/content/ContentLoader.cpp
@@ -814,7 +814,7 @@ void ContentLoader::load() {
         scripting::load_entity_component(
             name,
             file,
-            pack->id + ":scripts/components/" + file.stem().u8string()
+            pack->id + ":scripts/components/" + file.filename().u8string()
         );
     });
 
diff --git a/src/logic/scripting/scripting.cpp b/src/logic/scripting/scripting.cpp
index aeeb3978..3f3161ae 100644
--- a/src/logic/scripting/scripting.cpp
+++ b/src/logic/scripting/scripting.cpp
@@ -700,7 +700,7 @@ void scripting::load_entity_component(
     auto L = lua::get_main_state();
     std::string src = files::read_string(file);
     logger.info() << "script (component) " << file.u8string();
-    lua::loadbuffer(L, 0, src, "C!" + name);
+    lua::loadbuffer(L, 0, src, fileName);
     lua::store_in(L, lua::CHUNKS_TABLE, name);
 }
 

From 53c54dc91d132c221ff5fea2f7e9fb4568db9a0f Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Tue, 19 Nov 2024 07:41:26 +0300
Subject: [PATCH 49/80] fix xml text escapes handling

---
 src/coders/xml.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/coders/xml.cpp b/src/coders/xml.cpp
index 6a8777c5..ba2f36a9 100644
--- a/src/coders/xml.cpp
+++ b/src/coders/xml.cpp
@@ -250,7 +250,8 @@ std::string Parser::parseText() {
         }
         nextChar();
     }
-    return std::string(source.substr(start, pos - start));
+    return Parser("<string>", std::string(source.substr(start, pos - start)))
+        .parseString('\0', false);
 }
 
 inline bool is_xml_identifier_start(char c) {

From b9d085c1b3f22cc2edd1273a8e95950a8abd4f1f Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Tue, 19 Nov 2024 08:04:30 +0300
Subject: [PATCH 50/80] minor refactor

---
 res/layouts/console.xml.lua | 22 +++++++++++++++-------
 src/coders/xml.cpp          |  2 +-
 src/coders/xml.hpp          |  2 +-
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/res/layouts/console.xml.lua b/res/layouts/console.xml.lua
index 8e73a136..f251e120 100644
--- a/res/layouts/console.xml.lua
+++ b/res/layouts/console.xml.lua
@@ -61,16 +61,24 @@ events.on("core:open_traceback", function(traceback_b64)
         else
             framestr = frame.source..":"..tostring(frame.currentline).." "
             if file.exists(frame.source) then
-                callback = "local source = file.read('"..frame.source.."') "..
-                           "document.editor.text = source "..
-                           "document.editor.focused = true "..
-                           "time.post_runnable(function() document.editor.caret = document.editor:linePos("..
-                           tostring(frame.currentline-1)..") end)"
+                callback = string.format(
+                    "local editor = document.editor "..
+                    "local source = file.read('%s') "..
+                    "editor.text = source "..
+                    "editor.focused = true "..
+                    "time.post_runnable(function()"..
+                      "editor.caret = editor:linePos(%s) "..
+                    "end)",
+                    frame.source, frame.currentline-1
+                )
             else
                 callback = "document.editor.text = 'Could not open source file'"
             end
-            callback = callback.." document.title.text = gui.str('File')..' - "
-                       ..frame.source.."'"
+            callback = string.format(
+                "%s document.title.text = gui.str('File')..' - %s'",
+                callback,
+                frame.source
+            )
         end
         if frame.name then
             framestr = framestr.."("..tostring(frame.name)..")"
diff --git a/src/coders/xml.cpp b/src/coders/xml.cpp
index ba2f36a9..3110d98a 100644
--- a/src/coders/xml.cpp
+++ b/src/coders/xml.cpp
@@ -337,7 +337,7 @@ xmldocument Parser::parse() {
     return document;
 }
 
-xmldocument xml::parse(const std::string& filename, const std::string& source) {
+xmldocument xml::parse(std::string_view filename, std::string_view source) {
     Parser parser(filename, source);
     return parser.parse();
 }
diff --git a/src/coders/xml.hpp b/src/coders/xml.hpp
index 136c60df..54a2b589 100644
--- a/src/coders/xml.hpp
+++ b/src/coders/xml.hpp
@@ -140,6 +140,6 @@ namespace xml {
     /// @param source xml source code string
     /// @return xml document
     extern xmldocument parse(
-        const std::string& filename, const std::string& source
+        std::string_view filename, std::string_view source
     );
 }

From e80b10dbdac04fe0905ab65903af536dddf8642f Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Tue, 19 Nov 2024 08:17:56 +0300
Subject: [PATCH 51/80] fix logContainer size

---
 res/layouts/console.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/layouts/console.xml b/res/layouts/console.xml
index 96d01191..c367545c 100644
--- a/res/layouts/console.xml
+++ b/res/layouts/console.xml
@@ -12,7 +12,7 @@
     </container>
     
     <container id="logContainer" pos="0,60"
-               size-func="unpack(vec2.add(gui.get_viewport(), {0,-70}))">
+               size-func="unpack(vec2.add(gui.get_viewport(), {0,-100}))">
         <textbox 
             id='log' 
             color='0'

From 78ea12aa26925853d5489de2661b5ee7d2d6ea51 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Tue, 19 Nov 2024 08:30:50 +0300
Subject: [PATCH 52/80] add console on_open 'mode' argument

---
 res/layouts/console.xml.lua |  5 ++++-
 res/scripts/stdlib.lua      |  3 +++
 src/frontend/hud.cpp        | 17 ++++++++++++-----
 src/frontend/hud.hpp        |  8 ++++++--
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/res/layouts/console.xml.lua b/res/layouts/console.xml.lua
index f251e120..2957c187 100644
--- a/res/layouts/console.xml.lua
+++ b/res/layouts/console.xml.lua
@@ -194,7 +194,7 @@ function set_mode(mode)
     console_mode = mode
 end
 
-function on_open()
+function on_open(mode)
     if modes == nil then
         modes = RadioGroup({
             chat=document.s_chat,
@@ -204,4 +204,7 @@ function on_open()
             set_mode(mode)
         end, "console")
     end
+    if mode then
+        modes:set(mode)
+    end
 end
diff --git a/res/scripts/stdlib.lua b/res/scripts/stdlib.lua
index 4bade31d..7fc726f8 100644
--- a/res/scripts/stdlib.lua
+++ b/res/scripts/stdlib.lua
@@ -86,6 +86,9 @@ end
 
 local _RadioGroup = {}
 function _RadioGroup.set(self, key)
+    if type(self) ~= 'table' then
+        error("called as non-OOP via '.', use radiogroup:set")
+    end
     if self.current then
         self.elements[self.current].enabled = true
     end
diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp
index 89672c50..889b102f 100644
--- a/src/frontend/hud.cpp
+++ b/src/frontend/hud.cpp
@@ -230,7 +230,11 @@ void Hud::processInput(bool visible) {
         }
     }
     if (!pause && Events::jactive(BIND_DEVTOOLS_CONSOLE)) {
-        showOverlay(assets->get<UiDocument>("core:console"), false);
+        showOverlay(
+            assets->get<UiDocument>("core:console"),
+            false,
+            std::string("console")
+        );
     }
     if (!Window::isFocused() && !pause && !isInventoryOpen()) {
         setPause(true);
@@ -465,7 +469,9 @@ void Hud::showExchangeSlot() {
 
 }
 
-void Hud::showOverlay(UiDocument* doc, bool playerInventory) {
+void Hud::showOverlay(
+    UiDocument* doc, bool playerInventory, const dv::value& arg
+) {
     if (isInventoryOpen()) {
         closeInventory();
     }
@@ -476,7 +482,8 @@ void Hud::showOverlay(UiDocument* doc, bool playerInventory) {
         showExchangeSlot();
         inventoryOpen = true;
     }
-    add(HudElement(hud_element_mode::inventory_bound, doc, secondUI, false));
+    add(HudElement(hud_element_mode::inventory_bound, doc, secondUI, false),
+        arg);
 }
 
 void Hud::openPermanent(UiDocument* doc) {
@@ -508,13 +515,13 @@ void Hud::closeInventory() {
     cleanup();
 }
 
-void Hud::add(const HudElement& element) {
+void Hud::add(const HudElement& element, const dv::value& arg) {
     gui->add(element.getNode());
     auto document = element.getDocument();
     if (document) {
         auto invview = std::dynamic_pointer_cast<InventoryView>(element.getNode());
         auto inventory = invview ? invview->getInventory() : nullptr;
-        std::vector<dv::value> args;
+        std::vector<dv::value> args {arg};
         args.emplace_back(inventory ? inventory.get()->getId() : 0);
         for (int i = 0; i < 3; i++) {
             args.emplace_back(static_cast<integer_t>(blockPos[i]));
diff --git a/src/frontend/hud.hpp b/src/frontend/hud.hpp
index c5708527..4a2ecfd5 100644
--- a/src/frontend/hud.hpp
+++ b/src/frontend/hud.hpp
@@ -2,6 +2,7 @@
 
 #include "typedefs.hpp"
 #include "util/ObjectsKeeper.hpp"
+#include "data/dv.hpp"
 
 #include <string>
 #include <memory>
@@ -173,7 +174,10 @@ public:
     /// @brief Show element in inventory-mode
     /// @param doc element layout
     /// @param playerInventory show player inventory too
-    void showOverlay(UiDocument* doc, bool playerInventory);
+    /// @param arg first argument passing to on_open
+    void showOverlay(
+        UiDocument* doc, bool playerInventory, const dv::value& arg = nullptr
+    );
 
     /// @brief Close all open inventories and overlay
     void closeInventory();
@@ -182,7 +186,7 @@ public:
     /// @param doc element layout
     void openPermanent(UiDocument* doc);
 
-    void add(const HudElement& element);
+    void add(const HudElement& element, const dv::value& arg=nullptr);
     void onRemove(const HudElement& element);
     void remove(const std::shared_ptr<gui::UINode>& node);
 

From 6e0434c5c8db867c81f4cca32fce9f52426fb548 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Tue, 19 Nov 2024 08:56:07 +0300
Subject: [PATCH 53/80] import '\t' to editor as 4 spaces

---
 res/layouts/console.xml.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/layouts/console.xml.lua b/res/layouts/console.xml.lua
index 2957c187..679645b7 100644
--- a/res/layouts/console.xml.lua
+++ b/res/layouts/console.xml.lua
@@ -63,7 +63,7 @@ events.on("core:open_traceback", function(traceback_b64)
             if file.exists(frame.source) then
                 callback = string.format(
                     "local editor = document.editor "..
-                    "local source = file.read('%s') "..
+                    "local source = file.read('%s'):gsub('\t', '    ') "..
                     "editor.text = source "..
                     "editor.focused = true "..
                     "time.post_runnable(function()"..

From 134deb0ae63f63208c1b81195532a535acfc74a4 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Tue, 19 Nov 2024 09:39:46 +0300
Subject: [PATCH 54/80] fix typo

---
 src/frontend/menu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/menu.cpp b/src/frontend/menu.cpp
index 0aa0a74e..0591441e 100644
--- a/src/frontend/menu.cpp
+++ b/src/frontend/menu.cpp
@@ -65,7 +65,7 @@ gui::page_loader_func menus::create_page_loader(Engine* engine) {
             scripting::get_root_environment(),
             fullname,
             file,
-            "core:layout/pages/" + name
+            "core:layouts/pages/" + name
         );
         auto document = document_ptr.get();
         engine->getAssets()->store(std::move(document_ptr), fullname);

From c5435751501a3ad274efea9d26b2e162a123e925 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Tue, 19 Nov 2024 09:53:15 +0300
Subject: [PATCH 55/80] replace '<string>' source name with '[string]'

---
 src/coders/json.cpp                          |  2 +-
 src/coders/xml.cpp                           |  2 +-
 src/graphics/ui/gui_util.cpp                 |  2 +-
 src/logic/CommandsInterpreter.cpp            |  4 ++--
 src/logic/scripting/lua/libs/libjson.cpp     |  2 +-
 src/logic/scripting/lua/libs/libtoml.cpp     |  2 +-
 src/logic/scripting/scripting_functional.hpp | 22 ++++++++++----------
 test/coders/toml.cpp                         |  4 ++--
 8 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/coders/json.cpp b/src/coders/json.cpp
index 05db4e13..f6b27f51 100644
--- a/src/coders/json.cpp
+++ b/src/coders/json.cpp
@@ -265,5 +265,5 @@ dv::value json::parse(
 }
 
 dv::value json::parse(std::string_view source) {
-    return parse("<string>", source);
+    return parse("[string]", source);
 }
diff --git a/src/coders/xml.cpp b/src/coders/xml.cpp
index 3110d98a..faf84f15 100644
--- a/src/coders/xml.cpp
+++ b/src/coders/xml.cpp
@@ -250,7 +250,7 @@ std::string Parser::parseText() {
         }
         nextChar();
     }
-    return Parser("<string>", std::string(source.substr(start, pos - start)))
+    return Parser("[string]", std::string(source.substr(start, pos - start)))
         .parseString('\0', false);
 }
 
diff --git a/src/graphics/ui/gui_util.cpp b/src/graphics/ui/gui_util.cpp
index 70bd94f5..95e37514 100644
--- a/src/graphics/ui/gui_util.cpp
+++ b/src/graphics/ui/gui_util.cpp
@@ -20,7 +20,7 @@ std::shared_ptr<gui::UINode> guiutil::create(const std::string& source, scripten
         env = scripting::get_root_environment();
     }
     UiXmlReader reader(env);
-    return reader.readXML("<string>", source);
+    return reader.readXML("[string]", source);
 }
 
 void guiutil::alert(GUI* gui, const std::wstring& text, const runnable& on_hidden) {
diff --git a/src/logic/CommandsInterpreter.cpp b/src/logic/CommandsInterpreter.cpp
index 14dfe42c..c13e4895 100644
--- a/src/logic/CommandsInterpreter.cpp
+++ b/src/logic/CommandsInterpreter.cpp
@@ -418,7 +418,7 @@ Command Command::create(
     std::string_view description,
     executor_func executor
 ) {
-    return CommandParser("<string>", scheme)
+    return CommandParser("[string]", scheme)
         .parseScheme(std::move(executor), description);
 }
 
@@ -440,5 +440,5 @@ Command* CommandsRepository::get(const std::string& name) {
 }
 
 Prompt CommandsInterpreter::parse(std::string_view text) {
-    return CommandParser("<string>", text).parsePrompt(this);
+    return CommandParser("[string]", text).parsePrompt(this);
 }
diff --git a/src/logic/scripting/lua/libs/libjson.cpp b/src/logic/scripting/lua/libs/libjson.cpp
index da0bec38..693b83be 100644
--- a/src/logic/scripting/lua/libs/libjson.cpp
+++ b/src/logic/scripting/lua/libs/libjson.cpp
@@ -11,7 +11,7 @@ static int l_json_stringify(lua::State* L) {
 
 static int l_json_parse(lua::State* L) {
     auto string = lua::require_string(L, 1);
-    auto element = json::parse("<string>", string);
+    auto element = json::parse("[string]", string);
     return lua::pushvalue(L, element);
 }
 
diff --git a/src/logic/scripting/lua/libs/libtoml.cpp b/src/logic/scripting/lua/libs/libtoml.cpp
index 4a5cb1bf..d2f7b87e 100644
--- a/src/logic/scripting/lua/libs/libtoml.cpp
+++ b/src/logic/scripting/lua/libs/libtoml.cpp
@@ -16,7 +16,7 @@ static int l_toml_stringify(lua::State* L) {
 
 static int l_toml_parse(lua::State* L) {
     auto string = lua::require_string(L, 1);
-    auto element = toml::parse("<string>", string);
+    auto element = toml::parse("[string]", string);
     return lua::pushvalue(L, element);
 }
 
diff --git a/src/logic/scripting/scripting_functional.hpp b/src/logic/scripting/scripting_functional.hpp
index 2b962dee..f2d4c68b 100644
--- a/src/logic/scripting/scripting_functional.hpp
+++ b/src/logic/scripting/scripting_functional.hpp
@@ -14,66 +14,66 @@ namespace scripting {
     runnable create_runnable(
         const scriptenv& env,
         const std::string& src,
-        const std::string& file = "<string>"
+        const std::string& file = "[string]"
     );
 
     wstringconsumer create_wstring_consumer(
         const scriptenv& env,
         const std::string& src,
-        const std::string& file = "<string>"
+        const std::string& file = "[string]"
     );
 
     wstringsupplier create_wstring_supplier(
         const scriptenv& env,
         const std::string& src,
-        const std::string& file = "<string>"
+        const std::string& file = "[string]"
     );
 
     wstringchecker create_wstring_validator(
         const scriptenv& env,
         const std::string& src,
-        const std::string& file = "<string>"
+        const std::string& file = "[string]"
     );
 
     boolconsumer create_bool_consumer(
         const scriptenv& env,
         const std::string& src,
-        const std::string& file = "<string>"
+        const std::string& file = "[string]"
     );
 
     boolsupplier create_bool_supplier(
         const scriptenv& env,
         const std::string& src,
-        const std::string& file = "<string>"
+        const std::string& file = "[string]"
     );
 
     doubleconsumer create_number_consumer(
         const scriptenv& env,
         const std::string& src,
-        const std::string& file = "<string>"
+        const std::string& file = "[string]"
     );
 
     doublesupplier create_number_supplier(
         const scriptenv& env,
         const std::string& src,
-        const std::string& file = "<string>"
+        const std::string& file = "[string]"
     );
 
     int_array_consumer create_int_array_consumer(
         const scriptenv& env,
         const std::string& src,
-        const std::string& file = "<string>"
+        const std::string& file = "[string]"
     );
 
     vec2supplier create_vec2_supplier(
         const scriptenv& env,
         const std::string& src,
-        const std::string& file = "<string>"
+        const std::string& file = "[string]"
     );
 
     value_to_string_func create_tostring(
         const scriptenv& env,
         const std::string& src,
-        const std::string& file = "<string>"
+        const std::string& file = "[string]"
     );
 }
diff --git a/test/coders/toml.cpp b/test/coders/toml.cpp
index e8a63f19..c520298f 100644
--- a/test/coders/toml.cpp
+++ b/test/coders/toml.cpp
@@ -31,7 +31,7 @@ TEST(TOML, EncodeDecode) {
         std::cout << text << std::endl;
     }
     try {
-        auto object = toml::parse("<string>", text);
+        auto object = toml::parse("[string]", text);
         EXPECT_EQ(object["name"].asString(), name);
         EXPECT_EQ(object["year"].asInteger(), year);
         EXPECT_FLOAT_EQ(object["score"].asNumber(), score);
@@ -86,7 +86,7 @@ inline std::string SRC_EXAMPLE =
 TEST(TOML, ExampleCode) {
     try {
         std::cout << SRC_EXAMPLE << std::endl;
-        auto object = toml::parse("<string>", SRC_EXAMPLE);
+        auto object = toml::parse("[string]", SRC_EXAMPLE);
         std::cout << object << std::endl;
     } catch (const parsing_error& err) {
         std::cerr << err.errorLog() << std::endl;

From a015d74af5fd7de6bc187c7d96e136090f0608a6 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Tue, 19 Nov 2024 10:04:26 +0300
Subject: [PATCH 56/80] update file library warnings

---
 res/scripts/stdmin.lua                   | 7 +++++++
 src/logic/scripting/lua/libs/libfile.cpp | 7 ++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/res/scripts/stdmin.lua b/res/scripts/stdmin.lua
index 996af40e..924c235f 100644
--- a/res/scripts/stdmin.lua
+++ b/res/scripts/stdmin.lua
@@ -314,3 +314,10 @@ function __vc__error(msg, frame)
     end
     return debug.traceback(msg, frame)
 end
+
+function __vc_warning(msg, detail, n)
+    if events then
+        events.emit(
+            "core:warning", msg, detail, debug.get_traceback(1 + (n or 0)))
+    end
+end
diff --git a/src/logic/scripting/lua/libs/libfile.cpp b/src/logic/scripting/lua/libs/libfile.cpp
index 2c0c2f9e..d436bdfd 100644
--- a/src/logic/scripting/lua/libs/libfile.cpp
+++ b/src/logic/scripting/lua/libs/libfile.cpp
@@ -57,11 +57,12 @@ static fs::path get_writeable_path(lua::State* L) {
     fs::path path = resolve_path(rawpath);
     auto entryPoint = rawpath.substr(0, rawpath.find(':'));
     if (writeable_entry_points.find(entryPoint) == writeable_entry_points.end()) {
-        lua::emit_event(L, "core:warning", [=](auto L) {
+        if (lua::getglobal(L, "__vc_warning")) {
             lua::pushstring(L, "writing to read-only entry point");
             lua::pushstring(L, entryPoint);
-            return 2;
-        });
+            lua::pushinteger(L, 1);
+            lua::call_nothrow(L, 3);
+        }
     }
     return path;
 }

From 24d198b236907ebc596ccf0aaf7766efa5cb6813 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Tue, 19 Nov 2024 10:41:57 +0300
Subject: [PATCH 57/80] update some xml templates

---
 res/layouts/templates/problem.xml     | 4 +++-
 res/layouts/templates/stack_frame.xml | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/res/layouts/templates/problem.xml b/res/layouts/templates/problem.xml
index ea70022a..17085392 100644
--- a/res/layouts/templates/problem.xml
+++ b/res/layouts/templates/problem.xml
@@ -1,7 +1,9 @@
 <container id="%{id}" size="32" tooltip="%{text}" 
            onclick="events.emit('core:open_traceback', '%{traceback}')">
     <image src="gui/%{type}" size="32"/>
-    <label pos="36,2">%{text}</label>
+    <container pos="36,2" size="280,32" interactive="false">
+        <label>%{text}</label>
+    </container>
     <image src="gui/cross" interactive="true" size="16" gravity="top-right" 
            onclick="document['%{id}']:destruct()"></image>
 </container>
diff --git a/res/layouts/templates/stack_frame.xml b/res/layouts/templates/stack_frame.xml
index 5f1f34cb..c73890bb 100644
--- a/res/layouts/templates/stack_frame.xml
+++ b/res/layouts/templates/stack_frame.xml
@@ -1,3 +1,3 @@
 <label hover-color="#A0A0FF" interactive="true" onclick="%{callback}" color="%{color}">
-    %{location}    
+    %{location}
 </label>

From 6f6c2a916afd6b9b79221111fc72b1a86109be13 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Tue, 19 Nov 2024 11:46:04 +0300
Subject: [PATCH 58/80] fix block inventory unbinding

---
 src/voxels/Chunks.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/voxels/Chunks.cpp b/src/voxels/Chunks.cpp
index 0ce0e5c1..c27ed9e7 100644
--- a/src/voxels/Chunks.cpp
+++ b/src/voxels/Chunks.cpp
@@ -386,7 +386,7 @@ void Chunks::set(
     // block finalization
     voxel& vox = chunk->voxels[(y * CHUNK_D + lz) * CHUNK_W + lx];
     const auto& prevdef = indices->blocks.require(vox.id);
-    if (prevdef.inventorySize == 0) {
+    if (prevdef.inventorySize != 0) {
         chunk->removeBlockInventory(lx, y, lz);
     }
     if (prevdef.rt.extended && !vox.state.segment) {

From 371fdaedcef2c163edd226160f388068b2bf5e83 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Tue, 19 Nov 2024 12:04:56 +0300
Subject: [PATCH 59/80] fix World::nextInventoryId

---
 src/world/World.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/world/World.hpp b/src/world/World.hpp
index fcd0fcac..61e92cfc 100644
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -58,7 +58,7 @@ class World {
     const Content* const content;
     std::vector<ContentPack> packs;
 
-    int64_t nextInventoryId = 0;
+    int64_t nextInventoryId = 1;
 
     void writeResources(const Content* content);
 public:

From e70d30b9a259aebbb8f2be84efa6af37c03ed965 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Tue, 19 Nov 2024 12:18:59 +0300
Subject: [PATCH 60/80] feat: auto patch invalid inventory id pre 0.25

---
 src/world/World.cpp | 5 +++++
 src/world/World.hpp | 6 ++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/world/World.cpp b/src/world/World.cpp
index 6401fa0e..0f6ea373 100644
--- a/src/world/World.cpp
+++ b/src/world/World.cpp
@@ -148,6 +148,11 @@ std::unique_ptr<Level> World::load(
                         0
                     );
                     player->deserialize(playerMap);
+                    auto& inventory = player->getInventory();
+                    // invalid inventory id pre 0.25
+                    if (inventory->getId() == 0) {
+                        inventory->setId(level->getWorld()->getNextInventoryId());
+                    }
                     level->inventories->store(player->getInventory());
                 }
             } else {
diff --git a/src/world/World.hpp b/src/world/World.hpp
index 61e92cfc..2f8e7fb3 100644
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -27,7 +27,7 @@ struct WorldInfo : public Serializable {
     std::string name;
     std::string generator;
     uint64_t seed;
-    int64_t nextInventoryId = 0;
+    int64_t nextInventoryId = 1;
 
     /// @brief Day/night loop timer in range 0..1 where
     /// 0.0 - is midnight and
@@ -58,8 +58,6 @@ class World {
     const Content* const content;
     std::vector<ContentPack> packs;
 
-    int64_t nextInventoryId = 1;
-
     void writeResources(const Content* content);
 public:
     std::shared_ptr<WorldFiles> wfile;
@@ -155,7 +153,7 @@ public:
     /// @brief Get next inventory id and increment it's counter
     /// @return integer >= 1
     int64_t getNextInventoryId() {
-        return nextInventoryId++;
+        return info.nextInventoryId++;
     }
 
     /// @brief Get current world Content instance

From 495e444d1ff06f6a45b099fdab1985e219a8e511 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Tue, 19 Nov 2024 13:30:52 +0300
Subject: [PATCH 61/80] fix MainBatch::cube

---
 src/graphics/render/MainBatch.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/graphics/render/MainBatch.cpp b/src/graphics/render/MainBatch.cpp
index e3a87db7..a440a43b 100644
--- a/src/graphics/render/MainBatch.cpp
+++ b/src/graphics/render/MainBatch.cpp
@@ -97,38 +97,38 @@ void MainBatch::cube(
     const glm::vec3 Z(0.0f, 0.0f, 1.0f);
 
     quad(
-        coord + glm::vec3(0.0f, 0.0f, 0.0f),
+        coord + Z * size.z * 0.5f,
         X, Y, glm::vec2(size.x, size.y),
         (shading ? do_tint(0.8) * tint : tint),
         glm::vec3(1.0f), texfaces[5]
     );
     quad(
-        coord + glm::vec3(size.x, 0.0f, -size.z),
+        coord - Z * size.z * 0.5f,
         -X, Y, glm::vec2(size.x, size.y),
-        (shading ? do_tint(0.8) * tint : tint),
+        (shading ? do_tint(0.9f) * tint : tint),
         glm::vec3(1.0f), texfaces[4]
     );
     quad(
-        coord + glm::vec3(0.0f, size.y, 0.0f),
-        X, -Z, glm::vec2(size.x, size.z),
+        coord + Y * size.y * 0.5f,
+        -X, Z, glm::vec2(size.x, size.z),
         (shading ? do_tint(1.0f) * tint : tint),
         glm::vec3(1.0f), texfaces[3]
     );
     quad(
-        coord + glm::vec3(0.0f, 0.0f, -size.z),
+        coord - Y * size.y * 0.5f,
         X, Z, glm::vec2(size.x, size.z),
         (shading ? do_tint(0.7f) * tint : tint),
         glm::vec3(1.0f), texfaces[2]
     );
     quad(
-        coord + glm::vec3(0.0f, 0.0f, -size.z),
-        Z, Y, glm::vec2(size.z, size.y),
-        (shading ? do_tint(0.9f) * tint : tint),
-        glm::vec3(1.0f), texfaces[0]
+        coord + X * size.x * 0.5f,
+        -Z, Y, glm::vec2(size.z, size.y),
+        (shading ? do_tint(0.8f) * tint : tint),
+        glm::vec3(1.0f), texfaces[1]
     );
     quad(
-        coord + glm::vec3(size.x, 0.0f, 0.0f),
-        -Z, Y, glm::vec2(size.z, size.y),
+        coord - X * size.x * 0.5f,
+        Z, Y, glm::vec2(size.z, size.y),
         (shading ? do_tint(0.9f) * tint : tint),
         glm::vec3(1.0f), texfaces[1]
     );

From 0144709e037db1454f7e2358559221cbc1c47872 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Tue, 19 Nov 2024 14:33:14 +0300
Subject: [PATCH 62/80] add 'u_alphaClip' to entity shader

---
 res/shaders/entity.glslf              | 3 ++-
 src/graphics/render/WorldRenderer.cpp | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/res/shaders/entity.glslf b/res/shaders/entity.glslf
index 5da4142c..143b3eaa 100644
--- a/res/shaders/entity.glslf
+++ b/res/shaders/entity.glslf
@@ -9,6 +9,7 @@ uniform samplerCube u_cubemap;
 uniform vec3 u_fogColor;
 uniform float u_fogFactor;
 uniform float u_fogCurve;
+uniform bool u_alphaClip;
 
 void main() {
     vec3 fogColor = texture(u_cubemap, a_dir).rgb;
@@ -16,7 +17,7 @@ void main() {
     float depth = (a_distance/256.0);
     float alpha = a_color.a * tex_color.a;
     // anyway it's any alpha-test alternative required
-    if (alpha < 0.5f)
+    if (alpha < (u_alphaClip ? 0.5f : 0.2f))
         discard;
     f_color = mix(a_color * tex_color, vec4(fogColor,1.0), 
               min(1.0, pow(depth*u_fogFactor, u_fogCurve)));
diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp
index 0593305d..30284187 100644
--- a/src/graphics/render/WorldRenderer.cpp
+++ b/src/graphics/render/WorldRenderer.cpp
@@ -153,6 +153,7 @@ void WorldRenderer::renderLevel(
         frustumCulling->update(camera.getProjView());
     }
 
+    entityShader.uniform1i("u_alphaClip", true);
     level.entities->render(
         assets,
         *modelBatch,

From 58d2637e9d95241849d6f953b8ec814ada9fb141 Mon Sep 17 00:00:00 2001
From: LumperBumper <130532332+callfishxt@users.noreply.github.com>
Date: Tue, 19 Nov 2024 19:16:32 +0500
Subject: [PATCH 63/80] worlds menu added

---
 res/layouts/pages/main.xml       | 4 ++--
 res/layouts/pages/worlds.xml     | 6 ++++++
 res/layouts/pages/worlds.xml.lua | 6 ++++++
 res/texts/be_BY.txt              | 2 ++
 res/texts/de_DE.txt              | 2 ++
 res/texts/fi_FI.txt              | 2 ++
 res/texts/pl_PL.txt              | 2 ++
 res/texts/ru_RU.txt              | 2 ++
 res/texts/uk_UA.txt              | 2 ++
 res/texts/uz_UZ.txt              | 2 ++
 10 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 res/layouts/pages/worlds.xml
 create mode 100644 res/layouts/pages/worlds.xml.lua

diff --git a/res/layouts/pages/main.xml b/res/layouts/pages/main.xml
index 11f53136..95f84237 100644
--- a/res/layouts/pages/main.xml
+++ b/res/layouts/pages/main.xml
@@ -1,7 +1,7 @@
 <panel size='400' color='0' interval='1' context='menu'>
+    <button onclick='menu.page="worlds"'>@Worlds</button>
     <button onclick='menu.page="new_world"'>@New World</button>
-    <panel id='worlds' size='390,1' padding='5' color='#FFFFFF11' max-length='400'>
-    </panel>
+    <label padding='5'></label>
     <button onclick='menu.page="settings"'>@Settings</button>
     <button onclick='menu.page="content_menu"'>@Contents Menu</button>
     <button onclick='core.quit()'>@Quit</button>
diff --git a/res/layouts/pages/worlds.xml b/res/layouts/pages/worlds.xml
new file mode 100644
index 00000000..cda3af8d
--- /dev/null
+++ b/res/layouts/pages/worlds.xml
@@ -0,0 +1,6 @@
+<panel size='400' color='0' interval='1' context='menu'>
+    <panel id='worlds' size='390,1' padding='5' color='#FFFFFF11' max-length='400'>
+    </panel>
+    <button pos='485,525' size='500,40' onclick='core.open_folder("user:worlds")'>@Open worlds folder</button>
+    <button onclick='menu:back()'>@Back</button>
+</panel>
diff --git a/res/layouts/pages/worlds.xml.lua b/res/layouts/pages/worlds.xml.lua
new file mode 100644
index 00000000..37c348a9
--- /dev/null
+++ b/res/layouts/pages/worlds.xml.lua
@@ -0,0 +1,6 @@
+function on_open()
+    local worlds = world.get_list()
+    for _, info in ipairs(worlds) do
+        document.worlds:add(gui.template("world", info))
+    end
+end
diff --git a/res/texts/be_BY.txt b/res/texts/be_BY.txt
index 9bbff6a9..4d325060 100644
--- a/res/texts/be_BY.txt
+++ b/res/texts/be_BY.txt
@@ -33,6 +33,8 @@ menu.Display=Дысплей
 menu.Graphics=Графіка
 menu.missing-content=Адсутнічае Кантэнт!
 menu.New World=Новы Свет
+menu.Open worlds folder=Адкрыць папку з сусветамі
+menu.Worlds=Сусветы
 menu.Page not found=Старонка не знойдзена
 menu.Quit=Выхад
 menu.Save and Quit to Menu=Захаваць і Выйсці ў Меню
diff --git a/res/texts/de_DE.txt b/res/texts/de_DE.txt
index 0251f395..8e125159 100644
--- a/res/texts/de_DE.txt
+++ b/res/texts/de_DE.txt
@@ -23,6 +23,8 @@ menu.Controls=Kontrolle
 menu.Create World=Erschaffe eine Welt
 menu.missing-content=Fehlender Inhalt!
 menu.New World=Neue Welt
+menu.Worlds=Welten
+menu.Open worlds folder=Weltenordner öffnen
 menu.Quit=Ausfahrt
 menu.Save and Quit to Menu=Speichern und zum Menü zurückkehren
 menu.Settings=Einstellungen
diff --git a/res/texts/fi_FI.txt b/res/texts/fi_FI.txt
index 6a84f24d..40c5dadc 100644
--- a/res/texts/fi_FI.txt
+++ b/res/texts/fi_FI.txt
@@ -23,6 +23,8 @@ menu.Controls=Ohjaus
 menu.Graphics=Grafiikka
 menu.missing-content=Sisältö Puuttuu!
 menu.New World=Uusi Maailma
+menu.Worlds=Maailmat
+menu.Open worlds folder=Avaa maailmat-kansio
 menu.Page not found=Sivu ei löytynyt!
 menu.Quit=Poistu
 menu.Save and Quit to Menu=Tallenna ja Takaisin Valikkoon
diff --git a/res/texts/pl_PL.txt b/res/texts/pl_PL.txt
index 39f1a1a7..caae775b 100644
--- a/res/texts/pl_PL.txt
+++ b/res/texts/pl_PL.txt
@@ -21,6 +21,8 @@ menu.Graphics=Grafika
 menu.Create World=Stwórz świat
 menu.missing-content=Brakująca treść!
 menu.New World=Nowy Świat
+menu.Worlds=Światy
+menu.Open worlds folder=Otwórz folder światów
 menu.Page not found=Strona nie znaleziona
 menu.Quit=Wyjście
 menu.Save and Quit to Menu=Zapisz i wyjdź do menu
diff --git a/res/texts/ru_RU.txt b/res/texts/ru_RU.txt
index 346c5993..ae591042 100644
--- a/res/texts/ru_RU.txt
+++ b/res/texts/ru_RU.txt
@@ -41,6 +41,8 @@ menu.Display=Дисплей
 menu.Graphics=Графика
 menu.missing-content=Отсутствует Контент!
 menu.New World=Новый Мир
+menu.Open worlds folder=Открыть папку с мирами
+menu.Worlds=Миры
 menu.Page not found=Страница не найдена
 menu.Quit=Выход
 menu.Save and Quit to Menu=Сохранить и Выйти в Меню
diff --git a/res/texts/uk_UA.txt b/res/texts/uk_UA.txt
index 175c172f..b5eab139 100644
--- a/res/texts/uk_UA.txt
+++ b/res/texts/uk_UA.txt
@@ -21,6 +21,8 @@ menu.Controls=Керування
 menu.Graphics=Графіка
 menu.missing-content=Відсутній Контент!
 menu.New World=Новий Світ
+menu.Open worlds folder=Відкрити папку зі світами
+menu.Worlds=Світи
 menu.Page not found=Сторінка не знайдена
 menu.Quit=Вихід
 menu.Save and Quit to Menu=Зберегти і Вийти в Меню
diff --git a/res/texts/uz_UZ.txt b/res/texts/uz_UZ.txt
index ae525503..0ad6ec37 100644
--- a/res/texts/uz_UZ.txt
+++ b/res/texts/uz_UZ.txt
@@ -33,6 +33,8 @@ menu.Display=Displey
 menu.Graphics=Grafika
 menu.missing-content=Kontent etishmayapti!
 menu.New World=Yangi Dunyo
+menu.Worlds=Dunyo
+menu.Open worlds folder=Dunyo papkasini ochish
 menu.Page not found=Sahifa topilmadi
 menu.Quit=Chiqish
 menu.Save and Quit to Menu=Saqlash va menyuga chiqish

From bfab6c7ef1b0cb443b8a3bb4cd240616c8cd785d Mon Sep 17 00:00:00 2001
From: LumperBumper <130532332+callfishxt@users.noreply.github.com>
Date: Tue, 19 Nov 2024 19:17:45 +0500
Subject: [PATCH 64/80] Delete res/layouts/pages/main.xml.lua

---
 res/layouts/pages/main.xml.lua | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 res/layouts/pages/main.xml.lua

diff --git a/res/layouts/pages/main.xml.lua b/res/layouts/pages/main.xml.lua
deleted file mode 100644
index 37c348a9..00000000
--- a/res/layouts/pages/main.xml.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-function on_open()
-    local worlds = world.get_list()
-    for _, info in ipairs(worlds) do
-        document.worlds:add(gui.template("world", info))
-    end
-end

From 1dbb6354dc45ae6cc8712c057eb73b51650c4aa8 Mon Sep 17 00:00:00 2001
From: LumperBumper <130532332+callfishxt@users.noreply.github.com>
Date: Tue, 19 Nov 2024 19:40:06 +0500
Subject: [PATCH 65/80] main  update

---
 res/layouts/pages/main.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/res/layouts/pages/main.xml b/res/layouts/pages/main.xml
index 95f84237..bbdf5105 100644
--- a/res/layouts/pages/main.xml
+++ b/res/layouts/pages/main.xml
@@ -1,6 +1,5 @@
 <panel size='400' color='0' interval='1' context='menu'>
     <button onclick='menu.page="worlds"'>@Worlds</button>
-    <button onclick='menu.page="new_world"'>@New World</button>
     <label padding='5'></label>
     <button onclick='menu.page="settings"'>@Settings</button>
     <button onclick='menu.page="content_menu"'>@Contents Menu</button>

From 374297d3a0d18acee127ee142bfabd32976bcb64 Mon Sep 17 00:00:00 2001
From: LumperBumper <130532332+callfishxt@users.noreply.github.com>
Date: Tue, 19 Nov 2024 19:40:33 +0500
Subject: [PATCH 66/80] Update worlds.xml

---
 res/layouts/pages/worlds.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/layouts/pages/worlds.xml b/res/layouts/pages/worlds.xml
index cda3af8d..dd323f82 100644
--- a/res/layouts/pages/worlds.xml
+++ b/res/layouts/pages/worlds.xml
@@ -1,6 +1,7 @@
 <panel size='400' color='0' interval='1' context='menu'>
     <panel id='worlds' size='390,1' padding='5' color='#FFFFFF11' max-length='400'>
     </panel>
+    <button onclick='menu.page="new_world"'>@New World</button>
     <button pos='485,525' size='500,40' onclick='core.open_folder("user:worlds")'>@Open worlds folder</button>
     <button onclick='menu:back()'>@Back</button>
 </panel>

From 208282a156ceb3f4f7ad369388d1763849f7d22f Mon Sep 17 00:00:00 2001
From: LumperBumper <130532332+callfishxt@users.noreply.github.com>
Date: Tue, 19 Nov 2024 20:03:18 +0500
Subject: [PATCH 67/80] Update worlds.xml

---
 res/layouts/pages/worlds.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/res/layouts/pages/worlds.xml b/res/layouts/pages/worlds.xml
index dd323f82..13765930 100644
--- a/res/layouts/pages/worlds.xml
+++ b/res/layouts/pages/worlds.xml
@@ -1,7 +1,9 @@
 <panel size='400' color='0' interval='1' context='menu'>
+    
+    <button onclick='menu.page="new_world"'>@New World</button>
+    
     <panel id='worlds' size='390,1' padding='5' color='#FFFFFF11' max-length='400'>
     </panel>
-    <button onclick='menu.page="new_world"'>@New World</button>
     <button pos='485,525' size='500,40' onclick='core.open_folder("user:worlds")'>@Open worlds folder</button>
     <button onclick='menu:back()'>@Back</button>
 </panel>

From 784f93666cffa9bf7fcad69a4ebee302bf506341 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Wed, 20 Nov 2024 04:30:19 +0300
Subject: [PATCH 68/80] add 'separate' atlas type & get rid of assets loading
 entries duplicates

---
 src/assets/AssetsLoader.cpp    | 14 ++++++++++++++
 src/assets/AssetsLoader.hpp    | 13 +++++++++++++
 src/assets/assetload_funcs.cpp | 17 +++++++++++++++--
 3 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp
index 142934d1..d3806157 100644
--- a/src/assets/AssetsLoader.cpp
+++ b/src/assets/AssetsLoader.cpp
@@ -43,7 +43,11 @@ void AssetsLoader::add(
     const std::string& alias,
     std::shared_ptr<AssetCfg> settings
 ) {
+    if (enqueued.find({tag, alias}) != enqueued.end()){
+        return;
+    }
     entries.push(aloader_entry {tag, filename, alias, std::move(settings)});
+    enqueued.insert({tag, alias});
 }
 
 bool AssetsLoader::hasNext() const {
@@ -148,6 +152,16 @@ void AssetsLoader::processPreload(
                 std::make_shared<SoundCfg>(map.at("keep-pcm").get(keepPCM)));
             break;
         }
+        case AssetType::ATLAS: {
+            std::string typeName = "atlas";
+            map.at("type").get(typeName);
+            auto type = AtlasType::ATLAS;
+            if (typeName == "separate") {
+                type = AtlasType::SEPARATE;
+            }
+            add(tag, path, name, std::make_shared<AtlasCfg>(type));
+            break;
+        }
         default:
             add(tag, path, name);
             break;
diff --git a/src/assets/AssetsLoader.hpp b/src/assets/AssetsLoader.hpp
index 2321f9a3..cd6db950 100644
--- a/src/assets/AssetsLoader.hpp
+++ b/src/assets/AssetsLoader.hpp
@@ -3,6 +3,7 @@
 #include <filesystem>
 #include <functional>
 #include <map>
+#include <set>
 #include <memory>
 #include <queue>
 #include <string>
@@ -37,6 +38,17 @@ struct SoundCfg : AssetCfg {
     }
 };
 
+enum class AtlasType {
+    ATLAS, SEPARATE
+};
+
+struct AtlasCfg : AssetCfg {
+    AtlasType type;
+
+    AtlasCfg(AtlasType type) : type(type) {
+    }
+};
+
 using aloader_func = std::function<
     assetload::
         postfunc(AssetsLoader*, const ResPaths*, const std::string&, const std::string&, std::shared_ptr<AssetCfg>)>;
@@ -52,6 +64,7 @@ class AssetsLoader {
     Assets* assets;
     std::map<AssetType, aloader_func> loaders;
     std::queue<aloader_entry> entries;
+    std::set<std::pair<AssetType, std::string>> enqueued;
     const ResPaths* paths;
 
     void tryAddSound(const std::string& name);
diff --git a/src/assets/assetload_funcs.cpp b/src/assets/assetload_funcs.cpp
index ce8b65c9..813d1c87 100644
--- a/src/assets/assetload_funcs.cpp
+++ b/src/assets/assetload_funcs.cpp
@@ -103,12 +103,25 @@ static bool append_atlas(AtlasBuilder& atlas, const fs::path& file) {
 }
 
 assetload::postfunc assetload::atlas(
-    AssetsLoader*,
+    AssetsLoader* loader,
     const ResPaths* paths,
     const std::string& directory,
     const std::string& name,
-    const std::shared_ptr<AssetCfg>&
+    const std::shared_ptr<AssetCfg>& config
 ) {
+    auto atlasConfig = std::dynamic_pointer_cast<AtlasCfg>(config);
+    if (atlasConfig && atlasConfig->type == AtlasType::SEPARATE) {
+        for (const auto& file : paths->listdir(directory)) {
+            if (!imageio::is_read_supported(file.extension().u8string()))
+                continue;
+            loader->add(
+                AssetType::TEXTURE,
+                directory + "/" + file.stem().u8string(),
+                name + "/" + file.stem().u8string()
+            );
+        }
+        return [](auto){};
+    }
     AtlasBuilder builder;
     for (const auto& file : paths->listdir(directory)) {
         if (!imageio::is_read_supported(file.extension().u8string())) continue;

From 4edab4a89a02e0603a45f7cf7e52a85233dade38 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Wed, 20 Nov 2024 04:58:56 +0300
Subject: [PATCH 69/80] add 'cracks' separate atlas to base

---
 res/content/base/preload.json                  |   3 +++
 res/content/base/textures/cracks/cracks_0.png  | Bin 0 -> 4757 bytes
 res/content/base/textures/cracks/cracks_1.png  | Bin 0 -> 4768 bytes
 res/content/base/textures/cracks/cracks_10.png | Bin 0 -> 4904 bytes
 res/content/base/textures/cracks/cracks_2.png  | Bin 0 -> 5018 bytes
 res/content/base/textures/cracks/cracks_3.png  | Bin 0 -> 4798 bytes
 res/content/base/textures/cracks/cracks_4.png  | Bin 0 -> 5050 bytes
 res/content/base/textures/cracks/cracks_5.png  | Bin 0 -> 5062 bytes
 res/content/base/textures/cracks/cracks_6.png  | Bin 0 -> 4846 bytes
 res/content/base/textures/cracks/cracks_7.png  | Bin 0 -> 4847 bytes
 res/content/base/textures/cracks/cracks_8.png  | Bin 0 -> 4872 bytes
 res/content/base/textures/cracks/cracks_9.png  | Bin 0 -> 4877 bytes
 12 files changed, 3 insertions(+)
 create mode 100644 res/content/base/textures/cracks/cracks_0.png
 create mode 100644 res/content/base/textures/cracks/cracks_1.png
 create mode 100644 res/content/base/textures/cracks/cracks_10.png
 create mode 100644 res/content/base/textures/cracks/cracks_2.png
 create mode 100644 res/content/base/textures/cracks/cracks_3.png
 create mode 100644 res/content/base/textures/cracks/cracks_4.png
 create mode 100644 res/content/base/textures/cracks/cracks_5.png
 create mode 100644 res/content/base/textures/cracks/cracks_6.png
 create mode 100644 res/content/base/textures/cracks/cracks_7.png
 create mode 100644 res/content/base/textures/cracks/cracks_8.png
 create mode 100644 res/content/base/textures/cracks/cracks_9.png

diff --git a/res/content/base/preload.json b/res/content/base/preload.json
index 33f38f36..56b9896e 100644
--- a/res/content/base/preload.json
+++ b/res/content/base/preload.json
@@ -1,4 +1,7 @@
 {
+    "atlases": [
+        {"name": "cracks", "type": "separate"}
+    ],
     "sounds": [
         "blocks/door_open",
         "blocks/door_close",
diff --git a/res/content/base/textures/cracks/cracks_0.png b/res/content/base/textures/cracks/cracks_0.png
new file mode 100644
index 0000000000000000000000000000000000000000..84d56c433a4d837eb460db23a805ea5121f65e58
GIT binary patch
literal 4757
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
IH+KF109r`~e*gdg

literal 0
HcmV?d00001

diff --git a/res/content/base/textures/cracks/cracks_1.png b/res/content/base/textures/cracks/cracks_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..40bd0ce87bf410b3f8d9fc8d744cac70b3d5cb18
GIT binary patch
literal 4768
zcmeHKc~leE8jom!vZ%;Xa2<nv4}~O?1Of?!#Sno?AOa82iaME0LVzqJ1BA^|7Yewb
zSWxSNA}CbEC+N{q0Sf{ysHm|nltr{kMJ<XRH<WiLpu%bY@toKH$ec-L?)`ng@B4oD
zyEpe{3xoX3O{SWVNF?(Bf8P-BJDIqR4Z-)U{y~I98gHKx7Kw)-Nsvmdl*r;R2v1gF
z5T=z$NF?p8M_Z%v9yu5{cSbcj`FKy*iaLj1m?(MGe|;NXn5w+~EX|{(Av?Wj_JmEd
z=3KiyaOZ`^%7$MSh5E<rUU<>MZ(f<IvHniN^xi=Fq5j&e7v21syQi6LUQy6n*;i1w
z2^GAlj{7&>+nG5t*xK>!iAB8yvkpH+r-=tIw{G<Ac{=^g$`#Y5bXb)1RzJ#8$EV(0
zqHNRLA`ia&l78`rvr{f+?^{fbbZ-`)krsZtu?e%g;<z`rtG4z(cJwE6=U7NL&nRhG
zo@c_oy}p;!c*2)#C(U<!V&Pz6K&G@U+7Qg}x_{5!Z~64jo8fD=#0UKztn)Ovd(3mU
zb^7d1tWVf~QhCPl*KLKbwyLkRwWjlCdJWvHI^NvB?zg+~M>Nkqe_`9+e9Jj;QRo8d
z(+*ut{;^dZ^r{oP&)M2&ysvR=G*)K0E-YPGuKBLS6;WBgtP~an<s0sbRp=&*y0@4!
zHKtArdosdK?6op(%<x$)$id^o0={<neobLy^iP!YQTDmq(?LRP6}{emP`l>Oc^m1e
z*$%I_IG%2-a<|~m=_<6;d9P^-`mtg{=bdI$Z9Q3+FKIT6^{B_Xg|8i`i}!q%lk@69
zN@cA%#8(|MHcT&YkW49ApSAvG)+T?WJvptHH>72d%G7?FcD80_tbUxK^gxe>Eq*oS
z&Y^j8_Xw(NZ&;OO<mVNwbYjPp{umu{t$cq4KeoWbohCis|9q*yY5Niub5eMDwO0N7
z;l0O=vA4<E^jM!l8(N9Z<bZX7<L(M!>GLk$M!aY9B=-S_+ok5eUk$lhu){@Ja_wRi
zXX?rOiuTk$o)=q|;QK=_rQP~N%I@_pGq;oVoN1`<TeKj(R9^12q0VOm%Vk;d{vxgp
za`{=%nzpM)Y$)1ke9BzsZMK%XoqynaZQhQSKJNSo2YdfrDvm$|Z3`03c=q46y9U<>
zGrxwH|Ms#o&(yNr_3Yc0M-jT$1798GKa6SEu5;+AMfO$RnN-+$_<mo6N$0N4%#IP)
zyBC?_^%k6Wre@z5XoRPG>!st{NThLVWIUcQfX913UBD#SnZB9p-ypPF8ys3vWNpOE
zaub&Z+4%COA2Z>XPL5d{J|l41Ya@YKK+d{-T}xDb(jyPLy2}r)J_s4V%W!jdn_KOl
z{o>2DHuPoMleztm*(Z}`K|064<L*tQc2zmfn2l*1L+)C0CtJ)n%d3ymgcpPwmmf}j
zP+YyPzr3r~>tMwBHZ$XZ)6ABm)4LP8%LL7LPX;?x<`r2KTIMdneY*WB4tmzbQ&XJ!
z0xzE{zMsVxmECBHnO2ooVi`Q8*|~jB+U(w{rsQ>1%gQS6abKD4OGcBkdyi&rI&EMx
zo3|=w-nr6KK06avTTPR3f+xH*;?@OH^Os_<x&<B2vAQ(rol%`M_KSZty)BM5=t+xj
z&qbh0Q|Fk9H|Y<nH&{XgW=riTg9~PCdpD=%*DE4F?@pE~zWs`h+od+L)iSIXJ}HJN
zdxfNqOFcW(-h-6Zng^E-C2zcH1o5iAY9|?ecglZr<#mIO_G_NUze)X}|IIjsqq?N#
zg1iSTYg1)l`HB<-a!{q5iinjWjH;EZ!16{Sd3b462pWswkO-5?6kPJ3Ki82VnV3tC
za1p=)6%UJ+`KPF{(3GGsG$j^gi^*P|CLUT2Adq7?0%_%O3JpigCF^-P;F)Nqks&<<
zkL8jh1wx3YRAZ1c)tL%Y_*z*agY0Pnd8ow_PKfV<VG8iZB}e19ibJC%B_&alm{g@&
zN~5#cY#Pj<F&GqpplFg6IHIK}H1-6=5Qi_OLDe!9E>kKXf)f!b6L2n>4Emw>@yS&J
z!3TPUW>^KF2ThBpXmlz}lgnu%Ei^bk5s(ZA^tTq8Fz_!x3&AwX1T~8B6EOvDKaxU>
zey~?1sN?kMh*26Ahsgm{1H95lx%3MV2tQa55=doomEH=7Jqn4-Bp<~Z6&ul`PiJHx
z!2AR6DD?Z>^<aP!2spk<G=T^&z?VxV{By)gR3_%=9~sUfOe{fJ6wH<FN^yo^7KM#s
z7=`Idr(-aS&6coOBd7ut8XQre7(oTdsWQOBW{MC%flwq81`H_ZB8rIa%%(6AgpRqf
zFa{lS89@=OmVv57;zmYAP>BH*CZfB!VyH7kA`&wI73xMoFcFg?Vk2Ud4ZFf3hMS&B
zjB*wz)p7(3r%aAWF`7yt)prnrb9{sWTrz_Se{2!PA-Dt>aLIu(MS}KYN0>~Gh2jXI
zCf$|EfLSaS9cH_@F<sanLE)HM11gc=q{CF^5HB$-9FPnU79r{s5a=yHE*zd3LvW=!
zOsS0Hl8KNY!ct$}kjK!V_{%f^kxW$laLtEe@k4JzQy@;J?}8wG*>Vtc$cY9?#Kd|>
zz;37ujYbqw49xH0f_mRB`@6w%!Ccs`V00L+bTC+$gh635BrFOdLERW^I>S|jBBR+g
zN(r8Xs4*WY$P{D)3P_&~<e-;w?r3yUG)CwIGn^@OI)wp;!Ok2ei{k=2!b}bflWD^V
z(}-F9K4TBsUo`R114b+Zz;37wEH7ZSqJ3DdhBYH({0Be7WAP7q0MuhnK1ts(xyI!B
zBn3VRJXT#}a($8lp9CJOuK$}{CLa$xm;&sAlE87stHJ6ga1=5WE%fsx4HDO$ngd%v
z%jYWp#TpWcYERtbv?X4NpwS2q5b%w9Os&SvVeHSh{SGwQ;rvLPr<4=>W|Dq8hl!yi
z86FK0+qsBuCw>7y_5r>=VQ%Nq6}F%8NCSg|bvA__mKIZII2=i*U8sRg49Am5QD-N{
U-iVqN2jHXtevog){1vPI2OWA6j{pDw

literal 0
HcmV?d00001

diff --git a/res/content/base/textures/cracks/cracks_10.png b/res/content/base/textures/cracks/cracks_10.png
new file mode 100644
index 0000000000000000000000000000000000000000..8253dd6d988a667399ed4839beb2f3fe2a7dd218
GIT binary patch
literal 4904
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
Js+YuX{u4*6PXzz~

literal 0
HcmV?d00001

diff --git a/res/content/base/textures/cracks/cracks_2.png b/res/content/base/textures/cracks/cracks_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..d13052d2cdba2f20531ad7a134d38f07417efd81
GIT binary patch
literal 5018
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

literal 0
HcmV?d00001

diff --git a/res/content/base/textures/cracks/cracks_3.png b/res/content/base/textures/cracks/cracks_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..40275992bb1f1b460471b9e1aa6ecb463378cfe3
GIT binary patch
literal 4798
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

literal 0
HcmV?d00001

diff --git a/res/content/base/textures/cracks/cracks_4.png b/res/content/base/textures/cracks/cracks_4.png
new file mode 100644
index 0000000000000000000000000000000000000000..ced0d18925c30bbb02dbba10f8ed50276a827690
GIT binary patch
literal 5050
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
Rs~&ivNW>9Al~WTl{tGdGUETly

literal 0
HcmV?d00001

diff --git a/res/content/base/textures/cracks/cracks_5.png b/res/content/base/textures/cracks/cracks_5.png
new file mode 100644
index 0000000000000000000000000000000000000000..3db95bf439c3f5699f39408d3de3994d8af2e8c3
GIT binary patch
literal 5062
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

literal 0
HcmV?d00001

diff --git a/res/content/base/textures/cracks/cracks_6.png b/res/content/base/textures/cracks/cracks_6.png
new file mode 100644
index 0000000000000000000000000000000000000000..1eda5a644e4e08b5b7f89830a8c39c0c9e4b9ab9
GIT binary patch
literal 4846
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

literal 0
HcmV?d00001

diff --git a/res/content/base/textures/cracks/cracks_7.png b/res/content/base/textures/cracks/cracks_7.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9b9092d9e3dc79d14b565778a1965bfbb6b7aac
GIT binary patch
literal 4847
zcmeHKc~}$I77x-I1YAIYx|K05rRpS;g=`WiBoU$nDWKw7Co_{UNEVVI3w6Z}wSwSM
z>rxS+O2G|Klxo#hv0!~zv=pmYihRNYwJ5Jus>OFFpu+e1kKgzDpP6rxnRCziopXNo
z+>?9PM@NMZbRXf)U@!)%A`~&;cL;sE^#|Yn9nVn)!*y(GTs#$n+8~qJs3nsKh;o<+
zh_I7d2E+dI{ZFT7HwAdEeY{(fv0~in3(3fi^i!e!%a=vmD=K=hp};XYHS3F-MRT^V
z4zA2_Z_W$}f8xpvSC1)huqEN63i7`3@yN`)6R+Dq?s=>{?aO&&`ejl2TO~nk4`b&5
zNp0zo%hs?@yNH%Q;*QlcZ<<^7%)ZV4CiGM%pVDvNy5_pat~WQgX9UO&-^>W`EBo}&
z?<Zsj;784z^~tr7+f7lUu9(mNESVq=e(FgH*q1j4d#8FFZkxW%Yv|rE?_}Q_A67jZ
zU$A-TzfKN{{$%<%jkvIB+Y`5~ZZ28d?;os~@|nM-<NF`{F4<1_{EF|6?Q}h^TY0+n
z(wSUN(^sB`#LpiObX*+KA$uMZl{&oK@ZJ4&A*p{@KVFu#>lWLZ5!~?Z{-^P~D%got
z-zjhJDnC&?>*^G(?@zJAzts#nIQNn!Bkk8?6>E349@}?qP>~0>Zt%401vNRAE1O1y
zMJ_2uwT6|%fYF=XMO*vrdk0B4s>)(#Oe71}X19;_fXj$ei<^$Es~hlTBr?_B^igK}
zf{R=&$4hzEvgV}S`d)7OThA<MBhs(dseatnuy{%EgxM~k3rK6y(TcG_k)x(nH)g**
zH|O9E{{=H@%Utr@4*Q(XsrJ4YnY-01i#yWG``?T>FKKz!;33e=2X5J0BKnV_m`m;q
z-=AMqHJE$*%j|EGVoM8GMZaCNb=dD%<%jZ_$}L}N15@C+B~3RRl6jvWX-?EsUN8R4
zaa8l;#Vv(8k&Uy^!|#0CJdZz1?eFK$5+6D`{~@&|>=4u6oF~s*Quk~4fN*`l-t9Y2
z+$wTRI%IuN^FxEo)^>aPk@xll<n#BW-n|wTa(NDOn*O^8dHB1&YcqMRYCZNB`OG!3
zwBR8t(C7Xa{R?goX?NQc@9~G+Q7{ZS{WSsiDkn?xFKoGmul>!dJZyMq>*{Nyx9fSz
zyDeu|{RF?0T_Ly9IvXpVZ=1iP<!jXgo#AY5ZS(A0Sd%H-t=g3KV5D&3l&<#9zfuP+
zKhR#^sc-3hm5Ih-pIm+T(V{0Fb=4OhT|Gs0G8itaNx3{)C6~WgE?|-DUYaF~_%?dj
zni;YAxjsyOx)?tg<*QJRI_|DKI3#h+tkIDR|75B?RU0<$Z<uRp*BxtZXe=sRRS3Ct
ztq@NUzh54){_*%VzTAcO)0rI)B&Tiu(Dg}?Wm75`^`;_<H-@lGifQtZ4e<)|1XE*~
zwLR9Y=*Y*ddF2~BiW<HSDV%-zrl*_g0{{EcQH?2$1?o#pr)Nwq&d&APJ2Z1H71|hn
zxG?x^GCOs0d*lyQdClocO+j5n;>eQh{Gl_vFA3^%mW*jDsc>v8Sy)hfSJvsV-+?*S
zx0SBle4(H37<t-;iB$*Bh3>Yl8a9%Y&UotyQ+76zy=^{$n7_wdrNgQRcQMcE7W+-8
z_$x1=U(1r@`b-om_7Ef<e!BEt`KF=JGtc?M;pbCF@8}wLrnW{C{=qLoQ*wRHby<U%
z`Hr3EGyP#60`H4v+^%lfW&YqfeDzFg^&v;bH6|o4nO4tWt~(czRs2)G+x0&Nmo5Kz
zXU9_)!z6S5nJfAh(AGwfpnb)wBc+&8&qi^hhG5(ECeYp(jGz#^3B?u@6r>?^q(R2|
z?W?mah{R>A*@0?AZITlSWJIc&h)s=(!%`Px5}Xwh>>gy70suWhp^#mlWUxr>GL{op
z3Z7{(hXpxRsKqi?ygC|^8_fhHU<=p?thAF>9xK=#3NqtbX^diO4+MCVu@WfCB;{~y
zHXGZ<XB*8r4p$<Pa1b7c$Af_eY;hPU)D9agV`+$P3<Y7q%%q7TjRuIuL^Z|~O2%S=
zap*;SdXrlH65e3xVFB>Lv7;sqmyK}rdQNW(3#GIIke-14*1{48{slNOgvFR*#t5aA
zFi>NAL*Up;dsB)z$(at0afl>B4^%C{E4Po!aFsgxr3Foaj?|l+R)Fk2niQ#hMOL5K
z=n-c+y#oQ}FLC>5zsTLG47Aj0slte*(BY{RG8XM$iW@N!mpUH_2^T|nJORuVixF6W
zVSHGF@dYrBi7*i^5fgy|K`$tk!9t-1jG&<aIGY4G!ax)kY9%;~^8*86fhbS|qY{x8
zM#MOxK_z?~7xQ{S%rKLnD$%6gQPEI1fYK5|92KGfiie0{frcl6HC!Br1I1b~$`cVn
zLL_!V;h1!)(X2<obdq{hM{rCAopXRDTpAj!lCgMf<dq~k38l2aK*owB4Jr0l197CD
zh^0`PO|FQ~Lxe)1NGRd)gox;s(k#Mk0hLH&auGJa8<(CIDM$toi_&!p0Gt*e7pdG#
zpp?-ZXEY|sSae7bZRsp;D5!f<B1j9+aL^UsQ}eMza`#*J5=bJQLlERFTPcclJF%cv
z0(UwBcHKi*0&36^V14%#)C)QJH<P8+O0)=y3SkUEFj#<!d9Wssr-8KuswMas8i@0V
zzUUUCma?H{B2))51=)ZCa%KYsIH`QUueL3Lpm{>*isHgNBn}Zs`66kca1z3oA_$Aq
zlQ4%~)h{v*;`|RMK~9BUZ2;JH%RqYp-HP+FUG;EA)A$d5dgkIE^Z=mWIC(98-_Z4j
zuGeDVwUpmf*BiQCi-Fftep6llH@e(k9e4->*ag|Zai)FQUIZM4`fH|#D;Uq|E9cCC
zEkH8B6fwubV6ey1w~IYL#0rE=N~KmZTReujj2C}2?_3=a4X2dxl-#JN_stCFc8<Uy
z8%ZTV^mcCc%0YfW$*fX@#)&T<kEtAZ4sly`r96J&o=Gu6OR#do5N>+_hrLRo=<;Ul
zZ`|Kt_F~-e#LKIz6RID%iCRC|H@`(~Eb~iL2Gx~($g8rPtkrR5E`=}s=V(buhjQux
w?xNCFHIE$=^8M4JDucIJwHJRLdwj*{8>Na`EmGM6j(`k?N*Sd%9JVO!zfY++kN^Mx

literal 0
HcmV?d00001

diff --git a/res/content/base/textures/cracks/cracks_8.png b/res/content/base/textures/cracks/cracks_8.png
new file mode 100644
index 0000000000000000000000000000000000000000..79669ab131e86074456f240d204a4c5479e004e8
GIT binary patch
literal 4872
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
Yd$MeM6lbi-z%7C>EIPC{WWmzE0IJk7$N&HU

literal 0
HcmV?d00001

diff --git a/res/content/base/textures/cracks/cracks_9.png b/res/content/base/textures/cracks/cracks_9.png
new file mode 100644
index 0000000000000000000000000000000000000000..18eb1a5364c961a4be3d103f711e13b7e64f8317
GIT binary patch
literal 4877
zcmeHKc~}$I77uP9AO#UzKpi4l6q3v&F(Hw#7$8ImAfO`k`8p(%FhCY214$6;f~_nS
zl#151qNt##RiIQWN-Yl++@;nk6p9KwQEOcaR+QcesQA79<M+M(N9LPk<}AN^&hMUk
za&J~dm}Hdo1Zx_NHcA>27zuvusoQD<_@4Zv7p2jLPDzW7AtO-(q$9LSJPCtHlMaJ0
zBd(;;j5i-_nwx*e!}hbTZE?9P+*j8m!(V0|3z)q8laTwRr4O@9OkQd0_g?*Y(Z<!j
z=W?yv^ZX>;LoFpTw-OUmAaN}zI_+eWmv=ixm5p!j3OeD;daP^yICEH;57S2be5Bxd
z`QiH1*_&Qr9e+e0x!S%qwz9`qF!>hrLM5Ixq;O69jjo}$);-Gg5FNUe>oK-+)4^xo
zi1slax3jX6uZM2bg}GiJzP~A$CiZ<{OLCd@>wHJ2*&OPeTj1dM)$Gy9&Ogtq>zP`z
z&hg^6b`hV?b#LtqUX+#RpJi{4|D2m};)~}9|B~yn<aE_X4q>%|0>6l*&Sw*sHG2Lz
z`(%B~-ZoS7x`m}k^ApzHqD_UJpEZ8cy<4TNY#)2<+=ICGj-d~c<9QYM{at%MUwo&k
zB+)Z*c$Hk4EGj^}+E(mO@oMuJHz_fxxMY%x@Im!)`;3=61Gmo@CH$$e*sZ4KLl<S6
zbIiue79~3Ibo*?Jj1gPM{MW;J<2MN&Bb$$0CO+EuUGSu(ncH{P4U?~yyn1HUJl|FR
z$LM)aXD!UkQ5opjA=Q2#7O%8gyFL0}BTv@0%Lym@h63f85s5yhf2b*Z>cw2Nb9i?4
z^DEC3%Ut}kTVfq-|MZ%7-hIw^hw)_&ZtLy*oeFomJf~Si-pz#sS&HfaLp6T~61%^&
z$Nu)g8PhZ8I1k-QcltUqvLSD(WYl~o+5Rm*HdMr4$XB)BO){O_aUg4IRK2q8`|SB+
z!w>CfYOFFc77shDWprF?-LoO~*YeZEf37)MS4>JjyWURp7+o`Ys%u4IdThc?qO9#;
z`ORZ<B^h0f2bZ#{c96R^TqN&p4xjbXOEuA>!fnc^iKduwzIDa?inY)7{r*AmmA$n&
z4bkOWClo0+jofnBar=4y&mAqkT{$7M@aqrDIyQ_BC%zbeQqp0K4J&aB+b6Xhc1>EE
zp-J7k*x$K#tmgal<lDV-n4x5|dl#qj-}5@3cwTWnB5}D`6dces%B5i9^6s8bL~Bk(
zbwBLkJso)6a>+-6JGxnL&+r=;Y98P9t=7<J7OQcwI6^8Gzg{k2k!)MGUKH{}#F$UR
zqxS4_vgBlXD~iLM1A|;Etb>Z}6FyxqF?7kFmNHvucFyjWSluJlk$Wwzr3W$&Kvu6-
zc+c{lemo?rYwD-Y$P(j;yeAI@Ck&IJ2G7vSS+%q#T`9?S!}Ok!cbr7_4zq3ZPbcXY
zY>cuhJ-qZ@(ea!or7b7@4lJy{Wosp^;hZmbZB1z{k)647BHZg}{w{~F9P?tyfL6(&
z1HPw{nQ2~+La)>nwPyy!mE5RJa4E~*;}|~r47X`#x?5*ittqE$Ny*VR(Q}*KCb=oA
zv;4DlHA9@;#H+Gr)D>3;Y)j1;<AMvrhjm+uPK7cH7Gp4RUOrSf=F$hREKjKt$4;w#
zSrk8{BR#n(4~34}a1#!_Sa$#TT1TkIcJX*dZ}7w~U%6LZzZxg;Z|3Qeo31v9S_sQ=
zMz+)3--}>IVFc}$OC4JY|6a!Bs(Y6XnsTpMLgKPHO*G3j)gkMT{xsy5rXPJPmoMG&
z<b{RClh{*rLEQn`+5{Z5uNYaVP_9)oQH3@RV;a>u(B5b?A3viGl_z2(6o;vBjfno+
zcc<tOt`N}|&XmD2ofwP9L(&K=DlIHpo|Y&VDCmB^);>ld08nEj3K`W&8okgcqMLDr
z;F%J$=#bfjOcc>$WD$^9OJER}$z{TfAS0g2ru$k$K7>Lkj0_C!hX8LPdOS($ge;c9
zU|<?JOf8{eAp(Jb1+!UfHUn5N^d=378W|e>6bhmbBM{Te30z0wS`9>DqH)?3QbeZ%
zJ@h(0wN55`1FzBdvjF&D8BrYzVZto6nl;cvPX?s|kp6)F)<Yi+{smZ(m|mMg$g!YQ
zOhZl?2%(U_@z<pgN#=AEau$|^se!2;jEcN7q(mx<c;i7)pu*KUvlk%y9ZM2dz9s9O
z*eH!Toq>S>_cyrjSijEQYz(YqGGU-ro<fBu4HVI-@r4Sl99Ia<k8Bi0I7%LeA>eWO
z3@*&&GU5b$nBmQb*#d7q%E1Jj0Z>wno<ucrjDiB-OdR0w5R?a_N;U)LP!I?QWeAkm
zOa^BrM~-6rnOp>64}b_Ka8Q+K(!i)FC<TDR5DY_L9vk?wc?>QaQ!u<yP$C?R&sOl1
zTn@}tn4uJMVX&4^qhLC5HLAi`I*rP#pa>TRL`X$+HWPj;iAX|8C2$bYLvc-t@vR~n
zS7T8mO0kLXIc%86;|T<8Z!VuZz<U8k=s_h?m<Y_|^l7MR5rSj@u_#ri0Kg0jauJFN
z3?;Qhv{suWqEjJ3l&878A)mfU3BmQi!bDYkf6Yf>$$f8qOCSk1t02f+wn9|iH;5ih
z#rik^etjx=JgQM)V14%&)N48ZH<N|L@%e0&12Y71Y%YV#<0=?&D8^$5xR^rV%|n!k
zKxt0n4Z2>dBn>Em1*kx#ARACX=4>DjGnLcdwKl|K6i+Y!M-T=Zj)u8Hj<*mIc)}bZ
z4AWWt3A3nG{W@bG*8gzgV>TGj27q6m473-}typi`RX=AGjsM`Me=h#P5dieyAn(QR
zAYFrWy%z)TWjt72gLJ(Y1Mg)#SY7`&x~$(GcrXpv1sT9`CV9!D7vLx~B5tlEkk(6G
zJFE760VE@JA&c}h8gmMDTNwBFr2?TPDU}6TcG!%unC5t+F5x2}8cznrkYcTx+Beh8
z+c``D8E`TlqPBAjSK5sQM(d=30ny&|Yoh|}sv)by<=-fNdt7eV+|5bdY$K0&w(EMN
zwF7O%=9%vG=VQ|keEXZY(bH>wG(Eew?6}achuP#^s#Se;r)J*a)g1x(o2J;Q?m(vC
zN_SS~#jco6vK86CrD+1qjwV;WeCnCXKPD-)yV%&>RyTQb!>!Rrre)+L-3*usCoqf7
hhP4o1r&``0(Ku$#Dz9^_UqNg%X;4_;q1hj=`U_ihJfr{s

literal 0
HcmV?d00001


From eb9a89ed9619f899d4eadcd6eaace6b65c4689d6 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Wed, 20 Nov 2024 06:56:48 +0300
Subject: [PATCH 70/80] fix first console open

---
 res/layouts/console.xml.lua | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/res/layouts/console.xml.lua b/res/layouts/console.xml.lua
index 679645b7..7d4c2771 100644
--- a/res/layouts/console.xml.lua
+++ b/res/layouts/console.xml.lua
@@ -202,9 +202,8 @@ function on_open(mode)
             debug=document.s_debug
         }, function (mode)
             set_mode(mode)
-        end, "console")
-    end
-    if mode then
+        end, mode or "console")
+    elseif mode then
         modes:set(mode)
     end
 end

From 02578a62763f563057e58ef84fd5b9109adfc348 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Wed, 20 Nov 2024 07:49:21 +0300
Subject: [PATCH 71/80] simplify local modules loading

---
 res/scripts/stdmin.lua | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/res/scripts/stdmin.lua b/res/scripts/stdmin.lua
index 924c235f..14479c7d 100644
--- a/res/scripts/stdmin.lua
+++ b/res/scripts/stdmin.lua
@@ -292,6 +292,10 @@ function __load_script(path, nocache)
 end
 
 function require(path)
+    if not string.find(path, ':') then
+        local prefix, _ = parse_path(debug.getinfo(2).source)
+        return require(prefix..':'..path)
+    end
     local prefix, file = parse_path(path)
     return __load_script(prefix..":modules/"..file..".lua")
 end

From e842b217da5eae5eaf8e756b09668f50234c2b2e Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Wed, 20 Nov 2024 11:10:05 +0300
Subject: [PATCH 72/80] add 'args' parameter to hud.show_overlay

---
 doc/en/scripting/builtins/libhud.md     |  4 +++-
 doc/ru/scripting/builtins/libhud.md     |  4 +++-
 src/frontend/hud.cpp                    | 15 ++++++++++-----
 src/logic/scripting/lua/libs/libhud.cpp |  6 ++++--
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/doc/en/scripting/builtins/libhud.md b/doc/en/scripting/builtins/libhud.md
index 4beb5d93..963e428c 100644
--- a/doc/en/scripting/builtins/libhud.md
+++ b/doc/en/scripting/builtins/libhud.md
@@ -24,7 +24,9 @@ hud.open_block(x: int, y: int, z: int) -> int, str
 ```lua
 -- Show overlay with layout specified.
 -- Shows player inventory also if playerinv is true.
-hud.show_overlay(layoutid: str, playerinv: bool)
+-- Using `args` you can specify an array of parameter values ​​that will be passed
+-- to on_open of the overlay being shown.
+hud.show_overlay(layoutid: str, playerinv: bool, [optional] args: table)
 
 -- Add element to the screen. 
 -- The element will be removed on world close only.
diff --git a/doc/ru/scripting/builtins/libhud.md b/doc/ru/scripting/builtins/libhud.md
index ae5a69c3..4bf14d99 100644
--- a/doc/ru/scripting/builtins/libhud.md
+++ b/doc/ru/scripting/builtins/libhud.md
@@ -25,7 +25,9 @@ hud.open_block(x: int, y: int, z: int) -> int, str
 ```lua
 -- Показывает элемент в режиме оверлея. 
 -- Также показывает инвентарь игрока, если playerinv - **true**.
-hud.show_overlay(layoutid: str, playerinv: bool)
+-- Через args можно указать массив значений параметров, что будут переданы
+-- в on_open показываемого оверлея.
+hud.show_overlay(layoutid: str, playerinv: bool, [опционально] args: table)
 
 -- Добавляет постоянный элемент на экран. Элемент не удаляется при 
 -- закрытии инвентаря. Чтобы не перекрывать затенение в режиме 
diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp
index 889b102f..f81a4c26 100644
--- a/src/frontend/hud.cpp
+++ b/src/frontend/hud.cpp
@@ -233,7 +233,7 @@ void Hud::processInput(bool visible) {
         showOverlay(
             assets->get<UiDocument>("core:console"),
             false,
-            std::string("console")
+            dv::list({std::string("console")})
         );
     }
     if (!Window::isFocused() && !pause && !isInventoryOpen()) {
@@ -470,7 +470,7 @@ void Hud::showExchangeSlot() {
 }
 
 void Hud::showOverlay(
-    UiDocument* doc, bool playerInventory, const dv::value& arg
+    UiDocument* doc, bool playerInventory, const dv::value& args
 ) {
     if (isInventoryOpen()) {
         closeInventory();
@@ -483,7 +483,7 @@ void Hud::showOverlay(
         inventoryOpen = true;
     }
     add(HudElement(hud_element_mode::inventory_bound, doc, secondUI, false),
-        arg);
+        args);
 }
 
 void Hud::openPermanent(UiDocument* doc) {
@@ -515,13 +515,18 @@ void Hud::closeInventory() {
     cleanup();
 }
 
-void Hud::add(const HudElement& element, const dv::value& arg) {
+void Hud::add(const HudElement& element, const dv::value& argsArray) {
     gui->add(element.getNode());
     auto document = element.getDocument();
     if (document) {
         auto invview = std::dynamic_pointer_cast<InventoryView>(element.getNode());
         auto inventory = invview ? invview->getInventory() : nullptr;
-        std::vector<dv::value> args {arg};
+        std::vector<dv::value> args;
+        if (argsArray != nullptr) {
+            for (const auto& arg : argsArray) {
+                args.push_back(arg);
+            }
+        }
         args.emplace_back(inventory ? inventory.get()->getId() : 0);
         for (int i = 0; i < 3; i++) {
             args.emplace_back(static_cast<integer_t>(blockPos[i]));
diff --git a/src/logic/scripting/lua/libs/libhud.cpp b/src/logic/scripting/lua/libs/libhud.cpp
index 17e1211a..460cf66b 100644
--- a/src/logic/scripting/lua/libs/libhud.cpp
+++ b/src/logic/scripting/lua/libs/libhud.cpp
@@ -98,7 +98,8 @@ static int l_show_overlay(lua::State* L) {
     if (layout == nullptr) {
         throw std::runtime_error("there is no ui layout " + util::quote(name));
     }
-    hud->showOverlay(layout, playerInventory);
+    auto args = lua::tovalue(L, 3);
+    hud->showOverlay(layout, playerInventory, std::move(args));
     return 0;
 }
 
@@ -188,4 +189,5 @@ const luaL_Reg hudlib[] = {
     {"_is_content_access", lua::wrap<l_is_content_access>},
     {"_set_content_access", lua::wrap<l_set_content_access>},
     {"_set_debug_cheats", lua::wrap<l_set_debug_cheats>},
-    {NULL, NULL}};
+    {NULL, NULL}
+};

From f4f479d3897f0472119cea4c940b699cd374fd0b Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Wed, 20 Nov 2024 12:15:09 +0300
Subject: [PATCH 73/80] move 'devtools:console' binding handler to
 __vc_on_hud_open

---
 res/scripts/stdlib.lua                | 10 +++++++++-
 src/core_defs.hpp                     |  1 -
 src/frontend/hud.cpp                  |  8 --------
 src/logic/scripting/scripting_hud.cpp |  2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/res/scripts/stdlib.lua b/res/scripts/stdlib.lua
index 7fc726f8..2c48bdfc 100644
--- a/res/scripts/stdlib.lua
+++ b/res/scripts/stdlib.lua
@@ -269,7 +269,7 @@ function _rules.clear()
     _rules.create("allow-cheats", true)
 end
 
-function __vc_create_hud_rules()
+function __vc_on_hud_open()
     _rules.create("allow-content-access", hud._is_content_access(), function(value)
         hud._set_content_access(value)
         input.set_enabled("player.pick", value)
@@ -295,6 +295,14 @@ function __vc_create_hud_rules()
     _rules.create("allow-debug-cheats", true, function(value)
         hud._set_debug_cheats(value)
     end)
+    input.add_callback("devtools.console", function()
+        if hud.is_paused() then
+            return
+        end
+        time.post_runnable(function()
+            hud.show_overlay("core:console", false, {"console"})
+        end)
+    end)
 end
 
 local RULES_FILE = "world:rules.toml"
diff --git a/src/core_defs.hpp b/src/core_defs.hpp
index 4a02cac9..9f26b1c8 100644
--- a/src/core_defs.hpp
+++ b/src/core_defs.hpp
@@ -10,7 +10,6 @@ inline const std::string CORE_STRUCT_AIR = "core:struct_air";
 inline const std::string TEXTURE_NOTFOUND = "notfound";
 
 // built-in bindings
-inline const std::string BIND_DEVTOOLS_CONSOLE = "devtools.console";
 inline const std::string BIND_CHUNKS_RELOAD = "chunks.reload";
 inline const std::string BIND_MOVE_FORWARD = "movement.forward";
 inline const std::string BIND_MOVE_BACK = "movement.back";
diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp
index f81a4c26..cc9c54d0 100644
--- a/src/frontend/hud.cpp
+++ b/src/frontend/hud.cpp
@@ -229,17 +229,9 @@ void Hud::processInput(bool visible) {
             setPause(true);
         }
     }
-    if (!pause && Events::jactive(BIND_DEVTOOLS_CONSOLE)) {
-        showOverlay(
-            assets->get<UiDocument>("core:console"),
-            false,
-            dv::list({std::string("console")})
-        );
-    }
     if (!Window::isFocused() && !pause && !isInventoryOpen()) {
         setPause(true);
     }
-
     if (!pause && visible && Events::jactive(BIND_HUD_INVENTORY)) {
         if (inventoryOpen) {
             closeInventory();
diff --git a/src/logic/scripting/scripting_hud.cpp b/src/logic/scripting/scripting_hud.cpp
index a7be1892..146fe817 100644
--- a/src/logic/scripting/scripting_hud.cpp
+++ b/src/logic/scripting/scripting_hud.cpp
@@ -37,7 +37,7 @@ void scripting::on_frontend_init(Hud* hud, WorldRenderer* renderer) {
 
     load_script("hud_classes.lua");
 
-    if (lua::getglobal(L, "__vc_create_hud_rules")) {
+    if (lua::getglobal(L, "__vc_on_hud_open")) {
         lua::call_nothrow(L, 0, 0);
     }
 

From 14b596140d50a35f54b921876063e69281c41ec2 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Wed, 20 Nov 2024 13:19:49 +0300
Subject: [PATCH 74/80] add player.is_infinite_items, .set_infinite_items

---
 doc/en/scripting/builtins/libplayer.md     |  9 ++++++++-
 doc/ru/scripting/builtins/libplayer.md     |  7 +++++++
 src/logic/PlayerController.cpp             |  8 ++++++--
 src/logic/scripting/lua/libs/libplayer.cpp | 19 ++++++++++++++++++-
 src/objects/Player.cpp                     | 11 +++++++++++
 src/objects/Player.hpp                     |  4 ++++
 6 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/doc/en/scripting/builtins/libplayer.md b/doc/en/scripting/builtins/libplayer.md
index 4ef892dd..932b17d6 100644
--- a/doc/en/scripting/builtins/libplayer.md
+++ b/doc/en/scripting/builtins/libplayer.md
@@ -56,12 +56,19 @@ player.set_noclip(bool)
 
 Getter and setter for player noclip mode (collisions disabled)
 
+```lua
+player.is_infinite_items() -> bool
+player.set_infinite_items(bool)
+```
+
+Getter and setter for infinite items (not removed from inventory after use)
+
 ``` lua
 player.set_spawnpoint(playerid: int, x: number, y: number, z: number)
 player.get_spawnpoint(playerid: int) -> number, number, number
 ```
 
-Point setter and getter added by player
+Spawn point setter and getter
 
 ```lua
 player.get_selected_block(playerid: int) -> x,y,z
diff --git a/doc/ru/scripting/builtins/libplayer.md b/doc/ru/scripting/builtins/libplayer.md
index bd2e8f65..6da5028b 100644
--- a/doc/ru/scripting/builtins/libplayer.md
+++ b/doc/ru/scripting/builtins/libplayer.md
@@ -56,6 +56,13 @@ player.set_noclip(bool)
 
 Геттер и сеттер noclip режима (выключенная коллизия игрока)
 
+```lua
+player.is_infinite_items() -> bool
+player.set_infinite_items(bool)
+```
+
+Геттер и сеттер бесконечных предметов (не удаляются из инвентаря при использовании)
+
 ```lua
 player.set_spawnpoint(playerid: int, x: number, y: number, z: number) 
 player.get_spawnpoint(playerid: int) -> number, number, number
diff --git a/src/logic/PlayerController.cpp b/src/logic/PlayerController.cpp
index 57af3c13..0471d080 100644
--- a/src/logic/PlayerController.cpp
+++ b/src/logic/PlayerController.cpp
@@ -461,6 +461,10 @@ void PlayerController::processRightClick(const Block& def, const Block& target)
         }
     }
     if (chosenBlock != vox->id && chosenBlock) {
+        if (!player->isInfiniteItems()) {
+            auto& slot = player->getInventory()->getSlot(player->getChosenSlot());
+            slot.setCount(slot.getCount()-1);
+        }
         blocksController->placeBlock(
             player.get(), def, state, coord.x, coord.y, coord.z
         );
@@ -522,8 +526,8 @@ void PlayerController::updateInteraction(float delta) {
     auto iend = selection.position;
     if (lclick && !input.shift && item.rt.funcsset.on_block_break_by) {
         if (scripting::on_item_break_block(
-                player.get(), item, iend.x, iend.y, iend.z
-            )) {
+            player.get(), item, iend.x, iend.y, iend.z
+        )) {
             return;
         }
     }
diff --git a/src/logic/scripting/lua/libs/libplayer.cpp b/src/logic/scripting/lua/libs/libplayer.cpp
index 0d0a7223..cbd166a6 100644
--- a/src/logic/scripting/lua/libs/libplayer.cpp
+++ b/src/logic/scripting/lua/libs/libplayer.cpp
@@ -128,6 +128,20 @@ static int l_set_noclip(lua::State* L) {
     return 0;
 }
 
+static int l_is_infinite_items(lua::State* L) {
+    if (auto player = get_player(L, 1)) {
+        return lua::pushboolean(L, player->isInfiniteItems());
+    }
+    return 0;
+}
+
+static int l_set_infinite_items(lua::State* L) {
+    if (auto player = get_player(L, 1)) {
+        player->setInfiniteItems(lua::toboolean(L, 2));
+    }
+    return 0;
+}
+
 static int l_get_selected_block(lua::State* L) {
     if (auto player = get_player(L, 1)) {
         if (player->selection.vox.id == BLOCK_VOID) {
@@ -220,6 +234,8 @@ const luaL_Reg playerlib[] = {
     {"set_flight", lua::wrap<l_set_flight>},
     {"is_noclip", lua::wrap<l_is_noclip>},
     {"set_noclip", lua::wrap<l_set_noclip>},
+    {"is_infinite_items", lua::wrap<l_is_infinite_items>},
+    {"set_infinite_items", lua::wrap<l_set_infinite_items>},
     {"get_selected_block", lua::wrap<l_get_selected_block>},
     {"get_selected_entity", lua::wrap<l_get_selected_entity>},
     {"set_spawnpoint", lua::wrap<l_set_spawnpoint>},
@@ -228,4 +244,5 @@ const luaL_Reg playerlib[] = {
     {"set_entity", lua::wrap<l_set_entity>},
     {"get_camera", lua::wrap<l_get_camera>},
     {"set_camera", lua::wrap<l_set_camera>},
-    {NULL, NULL}};
+    {NULL, NULL}
+};
diff --git a/src/objects/Player.cpp b/src/objects/Player.cpp
index 5b925f58..2ab41eea 100644
--- a/src/objects/Player.cpp
+++ b/src/objects/Player.cpp
@@ -240,6 +240,14 @@ void Player::setNoclip(bool flag) {
     this->noclip = flag;
 }
 
+bool Player::isInfiniteItems() const {
+    return infiniteItems;
+}
+
+void Player::setInfiniteItems(bool flag) {
+    infiniteItems = flag;
+}
+
 entityid_t Player::getEntity() const {
     return eid;
 }
@@ -273,6 +281,7 @@ dv::value Player::serialize() const {
 
     root["flight"] = flight;
     root["noclip"] = noclip;
+    root["infinite-items"] = infiniteItems;
     root["chosen-slot"] = chosenSlot;
     root["entity"] = eid;
     root["inventory"] = inventory->serialize();
@@ -300,6 +309,8 @@ void Player::deserialize(const dv::value& src) {
 
     flight = src["flight"].asBoolean();
     noclip = src["noclip"].asBoolean();
+    src.at("infinite-items").get(infiniteItems);
+    
     setChosenSlot(src["chosen-slot"].asInteger());
     eid = src["entity"].asNumber();
 
diff --git a/src/objects/Player.hpp b/src/objects/Player.hpp
index 985aba55..62c818a6 100644
--- a/src/objects/Player.hpp
+++ b/src/objects/Player.hpp
@@ -49,6 +49,7 @@ class Player : public Object, public Serializable {
     std::shared_ptr<Inventory> inventory;
     bool flight = false;
     bool noclip = false;
+    bool infiniteItems = true;
     entityid_t eid;
     entityid_t selectedEid;
 public:
@@ -86,6 +87,9 @@ public:
     bool isNoclip() const;
     void setNoclip(bool flag);
 
+    bool isInfiniteItems() const;
+    void setInfiniteItems(bool flag);
+
     entityid_t getEntity() const;
     void setEntity(entityid_t eid);
 

From 9e02f1122f58e1b9afd3dd02b27ccd62ea78e29f Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Wed, 20 Nov 2024 14:42:53 +0300
Subject: [PATCH 75/80] add BlockWrapsRenderer (WIP)

---
 src/graphics/render/BlockWrapsRenderer.cpp | 103 +++++++++++++++++++++
 src/graphics/render/BlockWrapsRenderer.hpp |  38 ++++++++
 src/graphics/render/ChunksRenderer.cpp     |   1 +
 src/graphics/render/WorldRenderer.cpp      |   5 +-
 src/graphics/render/WorldRenderer.hpp      |   2 +
 src/maths/UVRegion.hpp                     |  11 +++
 src/world/Level.hpp                        |   2 +-
 7 files changed, 160 insertions(+), 2 deletions(-)
 create mode 100644 src/graphics/render/BlockWrapsRenderer.cpp
 create mode 100644 src/graphics/render/BlockWrapsRenderer.hpp

diff --git a/src/graphics/render/BlockWrapsRenderer.cpp b/src/graphics/render/BlockWrapsRenderer.cpp
new file mode 100644
index 00000000..82ddf951
--- /dev/null
+++ b/src/graphics/render/BlockWrapsRenderer.cpp
@@ -0,0 +1,103 @@
+#include "BlockWrapsRenderer.hpp"
+
+#include "assets/Assets.hpp"
+#include "assets/assets_util.hpp"
+#include "constants.hpp"
+#include "content/Content.hpp"
+#include "graphics/core/Atlas.hpp"
+#include "graphics/core/Shader.hpp"
+#include "graphics/core/DrawContext.hpp"
+#include "graphics/render/MainBatch.hpp"
+#include "objects/Player.hpp"
+#include "voxels/Block.hpp"
+#include "voxels/Chunks.hpp"
+#include "window/Window.hpp"
+#include "world/Level.hpp"
+
+BlockWrapsRenderer::BlockWrapsRenderer(const Assets& assets, const Level& level)
+    : assets(assets), level(level), batch(std::make_unique<MainBatch>(1024)) {
+}
+
+BlockWrapsRenderer::~BlockWrapsRenderer() = default;
+
+void BlockWrapsRenderer::draw(const BlockWrapper& wrapper) {
+    const auto& chunks = *level.chunks;
+
+    auto textureRegion = util::get_texture_region(assets, wrapper.texture, "");
+
+    auto& shader = assets.require<Shader>("entity");
+    shader.use();
+    shader.uniform1i("u_alphaClip", false);
+
+    const UVRegion& cracksRegion = textureRegion.region;
+    UVRegion regions[6] {
+        cracksRegion, cracksRegion, cracksRegion,
+        cracksRegion, cracksRegion, cracksRegion
+    };
+    batch->setTexture(textureRegion.texture);
+
+    const voxel* vox = chunks.get(wrapper.position);
+    if (vox == nullptr) {
+        return;
+    }
+    if (vox->id != BLOCK_VOID) {
+        const auto& def =
+            level.content->getIndices()->blocks.require(vox->id);
+        switch (def.model) {
+            case BlockModel::block:
+                batch->cube(
+                    glm::vec3(wrapper.position) + glm::vec3(0.5f),
+                    glm::vec3(1.01f),
+                    regions,
+                    glm::vec4(0),
+                    false
+                );
+                break;
+            case BlockModel::aabb: {
+                const auto& aabb = def.rt.hitboxes[vox->state.rotation].at(0);
+                const auto& size = aabb.size();
+                regions[0].scale(size.z, size.y);
+                regions[1].scale(size.z, size.y);
+                regions[2].scale(size.x, size.z);
+                regions[3].scale(size.x, size.z);
+                regions[4].scale(size.x, size.y);
+                regions[5].scale(size.x, size.y);
+                batch->cube(
+                    glm::vec3(wrapper.position) + aabb.center(),
+                    size * glm::vec3(1.01f),
+                    regions,
+                    glm::vec4(0),
+                    false
+                );
+                break;
+            }
+            default:
+                break;
+        }
+    }
+}
+
+void BlockWrapsRenderer::draw(const DrawContext& pctx, const Player& player) {
+    auto ctx = pctx.sub();
+    
+    
+    batch->flush();
+}
+
+u64id_t BlockWrapsRenderer::add(
+    const glm::ivec3& position, const std::string& texture
+) {
+    u64id_t id = nextWrapper++;
+    wrappers[id] = std::make_unique<BlockWrapper>(
+        BlockWrapper {position, texture}
+    );
+    return id;
+}
+
+BlockWrapper* BlockWrapsRenderer::get(u64id_t id) const {
+    const auto& found = wrappers.find(id);
+    if (found == wrappers.end()) {
+        return nullptr;
+    }
+    return found->second.get();
+}
diff --git a/src/graphics/render/BlockWrapsRenderer.hpp b/src/graphics/render/BlockWrapsRenderer.hpp
new file mode 100644
index 00000000..3cb21cba
--- /dev/null
+++ b/src/graphics/render/BlockWrapsRenderer.hpp
@@ -0,0 +1,38 @@
+#pragma once
+
+#include <string>
+#include <memory>
+#include <unordered_map>
+
+#include "MainBatch.hpp"
+#include "typedefs.hpp"
+
+class Assets;
+class Player;
+class Level;
+class DrawContext;
+
+struct BlockWrapper {
+    glm::ivec3 position;
+    std::string texture;
+};
+
+class BlockWrapsRenderer {
+    const Assets& assets;
+    const Level& level;
+    std::unique_ptr<MainBatch> batch;
+
+    std::unordered_map<u64id_t, std::unique_ptr<BlockWrapper>> wrappers;
+    u64id_t nextWrapper = 1;
+
+    void draw(const BlockWrapper& wrapper);
+public:
+    BlockWrapsRenderer(const Assets& assets, const Level& level);
+    ~BlockWrapsRenderer();
+
+    void draw(const DrawContext& ctx, const Player& player);
+
+    u64id_t add(const glm::ivec3& position, const std::string& texture);
+
+    BlockWrapper* get(u64id_t id) const;
+};
diff --git a/src/graphics/render/ChunksRenderer.cpp b/src/graphics/render/ChunksRenderer.cpp
index d3686a86..78ed45bf 100644
--- a/src/graphics/render/ChunksRenderer.cpp
+++ b/src/graphics/render/ChunksRenderer.cpp
@@ -236,6 +236,7 @@ void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
     const auto& cameraPos = camera.position;
     const auto& atlas = assets.require<Atlas>("blocks");
 
+    shader.use();
     atlas.getTexture()->bind();
     shader.uniformMatrix("u_model", glm::mat4(1.0f));
     shader.uniform1i("u_alphaClip", false);
diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp
index 30284187..7084d2de 100644
--- a/src/graphics/render/WorldRenderer.cpp
+++ b/src/graphics/render/WorldRenderer.cpp
@@ -41,6 +41,7 @@
 #include "graphics/core/Shader.hpp"
 #include "graphics/core/Texture.hpp"
 #include "graphics/core/Font.hpp"
+#include "BlockWrapsRenderer.hpp"
 #include "ParticlesRenderer.hpp"
 #include "TextsRenderer.hpp"
 #include "ChunksRenderer.hpp"
@@ -80,7 +81,8 @@ WorldRenderer::WorldRenderer(
           *frustumCulling,
           frontend.getContentGfxCache(),
           engine->getSettings()
-      )) {
+      )),
+      blockWraps(std::make_unique<BlockWrapsRenderer>(assets, level)) {
     auto& settings = engine->getSettings();
     level.events->listen(
         EVT_CHUNK_HIDDEN,
@@ -170,6 +172,7 @@ void WorldRenderer::renderLevel(
     setupWorldShader(shader, camera, settings, fogFactor);
 
     chunks->drawChunks(camera, shader);
+    blockWraps->draw(ctx, *player);
 
     if (hudVisible) {
         renderLines(camera, linesShader, ctx);
diff --git a/src/graphics/render/WorldRenderer.hpp b/src/graphics/render/WorldRenderer.hpp
index b94694bd..94105726 100644
--- a/src/graphics/render/WorldRenderer.hpp
+++ b/src/graphics/render/WorldRenderer.hpp
@@ -17,6 +17,7 @@ class Batch3D;
 class LineBatch;
 class ChunksRenderer;
 class ParticlesRenderer;
+class BlockWrapsRenderer;
 class GuidesRenderer;
 class TextsRenderer;
 class Shader;
@@ -39,6 +40,7 @@ class WorldRenderer {
     std::unique_ptr<LineBatch> lineBatch;
     std::unique_ptr<Batch3D> batch3d;
     std::unique_ptr<ChunksRenderer> chunks;
+    std::unique_ptr<BlockWrapsRenderer> blockWraps;
     std::unique_ptr<GuidesRenderer> guides;
     std::unique_ptr<Skybox> skybox;
     std::unique_ptr<ModelBatch> modelBatch;
diff --git a/src/maths/UVRegion.hpp b/src/maths/UVRegion.hpp
index 75b0ab6b..019c8760 100644
--- a/src/maths/UVRegion.hpp
+++ b/src/maths/UVRegion.hpp
@@ -40,4 +40,15 @@ struct UVRegion {
         float h = getHeight();
         return glm::vec2(u1 + uv.x * w, v1 + uv.y * h);
     }
+
+    void scale(float x, float y) {
+        float w = getWidth();
+        float h = getHeight();
+        float cx = (u1 + u2) * 0.5f;
+        float cy = (v1 + v2) * 0.5f;
+        u1 = cx - w * 0.5f * x;
+        v1 = cy - h * 0.5f * y;
+        u2 = cx + w * 0.5f * x;
+        v2 = cy + h * 0.5f * y;
+    }
 };
diff --git a/src/world/Level.hpp b/src/world/Level.hpp
index c88a1617..767844cf 100644
--- a/src/world/Level.hpp
+++ b/src/world/Level.hpp
@@ -72,7 +72,7 @@ public:
     }
 
     template <class T>
-    std::shared_ptr<T> getObject(uint64_t id) {
+    std::shared_ptr<T> getObject(uint64_t id) const {
         static_assert(
             std::is_base_of<Object, T>::value,
             "T must be a derived of Object class"

From 005bcfb43610c14a1f80fe3d484d68b6db888d1a Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Wed, 20 Nov 2024 18:03:39 +0300
Subject: [PATCH 76/80] minor controllers refactor

---
 src/logic/BlocksController.cpp | 54 ++++++++++++++++------------------
 src/logic/BlocksController.hpp |  8 ++---
 src/logic/ChunksController.cpp | 36 +++++++++++------------
 src/logic/ChunksController.hpp |  8 ++---
 src/logic/LevelController.cpp  |  8 ++---
 5 files changed, 56 insertions(+), 58 deletions(-)

diff --git a/src/logic/BlocksController.cpp b/src/logic/BlocksController.cpp
index b0362fd9..01679546 100644
--- a/src/logic/BlocksController.cpp
+++ b/src/logic/BlocksController.cpp
@@ -14,10 +14,10 @@
 #include "world/Level.hpp"
 #include "world/World.hpp"
 
-BlocksController::BlocksController(Level* level, uint padding)
+BlocksController::BlocksController(const Level& level, uint padding)
     : level(level),
-      chunks(level->chunks.get()),
-      lighting(level->lighting.get()),
+      chunks(*level.chunks),
+      lighting(*level.lighting),
       randTickClock(20, 3),
       blocksTickClock(20, 1),
       worldTickClock(20, 1),
@@ -34,8 +34,8 @@ void BlocksController::updateSides(int x, int y, int z) {
 }
 
 void BlocksController::updateSides(int x, int y, int z, int w, int h, int d) {
-    voxel* vox = chunks->get(x, y, z);
-    const auto& def = level->content->getIndices()->blocks.require(vox->id);
+    voxel* vox = chunks.get(x, y, z);
+    const auto& def = level.content->getIndices()->blocks.require(vox->id);
     const auto& rot = def.rotations.variants[vox->state.rotation];
     const auto& xaxis = rot.axisX;
     const auto& yaxis = rot.axisY;
@@ -62,8 +62,8 @@ void BlocksController::breakBlock(
     onBlockInteraction(
         player, glm::ivec3(x, y, z), def, BlockInteraction::destruction
     );
-    chunks->set(x, y, z, 0, {});
-    lighting->onBlockSet(x, y, z, 0);
+    chunks.set(x, y, z, 0, {});
+    lighting.onBlockSet(x, y, z, 0);
     scripting::on_block_broken(player, def, glm::ivec3(x, y, z));
     if (def.rt.extended) {
         updateSides(x, y, z , def.size.x, def.size.y, def.size.z);
@@ -78,8 +78,8 @@ void BlocksController::placeBlock(
     onBlockInteraction(
         player, glm::ivec3(x, y, z), def, BlockInteraction::placing
     );
-    chunks->set(x, y, z, def.rt.id, state);
-    lighting->onBlockSet(x, y, z, def.rt.id);
+    chunks.set(x, y, z, def.rt.id, state);
+    lighting.onBlockSet(x, y, z, def.rt.id);
     scripting::on_block_placed(player, def, glm::ivec3(x, y, z));
     if (def.rt.extended) {
         updateSides(x, y, z , def.size.x, def.size.y, def.size.z);
@@ -89,12 +89,12 @@ void BlocksController::placeBlock(
 }
 
 void BlocksController::updateBlock(int x, int y, int z) {
-    voxel* vox = chunks->get(x, y, z);
+    voxel* vox = chunks.get(x, y, z);
     if (vox == nullptr) return;
-    const auto& def = level->content->getIndices()->blocks.require(vox->id);
+    const auto& def = level.content->getIndices()->blocks.require(vox->id);
     if (def.grounded) {
         const auto& vec = get_ground_direction(def, vox->state.rotation);
-        if (!chunks->isSolidBlock(x + vec.x, y + vec.y, z + vec.z)) {
+        if (!chunks.isSolidBlock(x + vec.x, y + vec.y, z + vec.z)) {
             breakBlock(nullptr, def, x, y, z);
             return;
         }
@@ -117,12 +117,11 @@ void BlocksController::update(float delta) {
 }
 
 void BlocksController::onBlocksTick(int tickid, int parts) {
-    auto content = level->content;
-    auto indices = content->getIndices();
+    const auto& indices = level.content->getIndices()->blocks;
     int tickRate = blocksTickClock.getTickRate();
-    for (size_t id = 0; id < indices->blocks.count(); id++) {
+    for (size_t id = 0; id < indices.count(); id++) {
         if ((id + tickid) % parts != 0) continue;
-        auto& def = indices->blocks.require(id);
+        auto& def = indices.require(id);
         auto interval = def.tickInterval;
         if (def.rt.funcsset.onblockstick && tickid / parts % interval == 0) {
             scripting::on_blocks_tick(def, tickRate / interval);
@@ -155,9 +154,9 @@ void BlocksController::randomTick(
 }
 
 void BlocksController::randomTick(int tickid, int parts) {
-    auto indices = level->content->getIndices();
-    int width = chunks->getWidth();
-    int height = chunks->getHeight();
+    auto indices = level.content->getIndices();
+    int width = chunks.getWidth();
+    int height = chunks.getHeight();
     int segments = 4;
 
     for (uint z = padding; z < height - padding; z++) {
@@ -166,7 +165,7 @@ void BlocksController::randomTick(int tickid, int parts) {
             if ((index + tickid) % parts != 0) {
                 continue;
             }
-            auto& chunk = chunks->getChunks()[index];
+            auto& chunk = chunks.getChunks()[index];
             if (chunk == nullptr || !chunk->flags.lighted) {
                 continue;
             }
@@ -176,7 +175,7 @@ void BlocksController::randomTick(int tickid, int parts) {
 }
 
 int64_t BlocksController::createBlockInventory(int x, int y, int z) {
-    auto chunk = chunks->getChunkByVoxel(x, y, z);
+    auto chunk = chunks.getChunkByVoxel(x, y, z);
     if (chunk == nullptr) {
         return 0;
     }
@@ -184,21 +183,20 @@ int64_t BlocksController::createBlockInventory(int x, int y, int z) {
     int lz = z - chunk->z * CHUNK_D;
     auto inv = chunk->getBlockInventory(lx, y, lz);
     if (inv == nullptr) {
-        auto indices = level->content->getIndices();
-        auto& def =
-            indices->blocks.require(chunk->voxels[vox_index(lx, y, lz)].id);
+        const auto& indices = level.content->getIndices()->blocks;
+        auto& def = indices.require(chunk->voxels[vox_index(lx, y, lz)].id);
         int invsize = def.inventorySize;
         if (invsize == 0) {
             return 0;
         }
-        inv = level->inventories->create(invsize);
+        inv = level.inventories->create(invsize);
         chunk->addBlockInventory(inv, lx, y, lz);
     }
     return inv->getId();
 }
 
 void BlocksController::bindInventory(int64_t invid, int x, int y, int z) {
-    auto chunk = chunks->getChunkByVoxel(x, y, z);
+    auto chunk = chunks.getChunkByVoxel(x, y, z);
     if (chunk == nullptr) {
         throw std::runtime_error("block does not exists");
     }
@@ -207,11 +205,11 @@ void BlocksController::bindInventory(int64_t invid, int x, int y, int z) {
     }
     int lx = x - chunk->x * CHUNK_W;
     int lz = z - chunk->z * CHUNK_D;
-    chunk->addBlockInventory(level->inventories->get(invid), lx, y, lz);
+    chunk->addBlockInventory(level.inventories->get(invid), lx, y, lz);
 }
 
 void BlocksController::unbindInventory(int x, int y, int z) {
-    auto chunk = chunks->getChunkByVoxel(x, y, z);
+    auto chunk = chunks.getChunkByVoxel(x, y, z);
     if (chunk == nullptr) {
         throw std::runtime_error("block does not exists");
     }
diff --git a/src/logic/BlocksController.hpp b/src/logic/BlocksController.hpp
index 86bbe395..0937b3f7 100644
--- a/src/logic/BlocksController.hpp
+++ b/src/logic/BlocksController.hpp
@@ -24,9 +24,9 @@ using on_block_interaction = std::function<
 
 /// BlocksController manages block updates and data (inventories, metadata)
 class BlocksController {
-    Level* level;
-    Chunks* chunks;
-    Lighting* lighting;
+    const Level& level;
+    Chunks& chunks;
+    Lighting& lighting;
     util::Clock randTickClock;
     util::Clock blocksTickClock;
     util::Clock worldTickClock;
@@ -34,7 +34,7 @@ class BlocksController {
     FastRandom random {};
     std::vector<on_block_interaction> blockInteractionCallbacks;
 public:
-    BlocksController(Level* level, uint padding);
+    BlocksController(const Level& level, uint padding);
 
     void updateSides(int x, int y, int z);
     void updateSides(int x, int y, int z, int w, int h, int d);
diff --git a/src/logic/ChunksController.cpp b/src/logic/ChunksController.cpp
index 07492f29..f61a2755 100644
--- a/src/logic/ChunksController.cpp
+++ b/src/logic/ChunksController.cpp
@@ -22,15 +22,15 @@
 const uint MAX_WORK_PER_FRAME = 128;
 const uint MIN_SURROUNDING = 9;
 
-ChunksController::ChunksController(Level* level, uint padding)
+ChunksController::ChunksController(Level& level, uint padding)
     : level(level),
-      chunks(level->chunks.get()),
-      lighting(level->lighting.get()),
+      chunks(*level.chunks),
+      lighting(*level.lighting),
       padding(padding),
       generator(std::make_unique<WorldGenerator>(
-          level->content->generators.require(level->getWorld()->getGenerator()),
-          level->content,
-          level->getWorld()->getSeed()
+          level.content->generators.require(level.getWorld()->getGenerator()),
+          level.content,
+          level.getWorld()->getSeed()
       )) {}
 
 ChunksController::~ChunksController() = default;
@@ -56,8 +56,8 @@ void ChunksController::update(
 }
 
 bool ChunksController::loadVisible() {
-    int sizeX = chunks->getWidth();
-    int sizeY = chunks->getHeight();
+    int sizeX = chunks.getWidth();
+    int sizeY = chunks.getHeight();
 
     int nearX = 0;
     int nearZ = 0;
@@ -66,7 +66,7 @@ bool ChunksController::loadVisible() {
     for (uint z = padding; z < sizeY - padding; z++) {
         for (uint x = padding; x < sizeX - padding; x++) {
             int index = z * sizeX + x;
-            auto& chunk = chunks->getChunks()[index];
+            auto& chunk = chunks.getChunks()[index];
             if (chunk != nullptr) {
                 if (chunk->flags.loaded && !chunk->flags.lighted) {
                     if (buildLights(chunk)) {
@@ -87,12 +87,12 @@ bool ChunksController::loadVisible() {
         }
     }
 
-    const auto& chunk = chunks->getChunks()[nearZ * sizeX + nearX];
+    const auto& chunk = chunks.getChunks()[nearZ * sizeX + nearX];
     if (chunk != nullptr || !assigned) {
         return false;
     }
-    int offsetX = chunks->getOffsetX();
-    int offsetY = chunks->getOffsetY();
+    int offsetX = chunks.getOffsetX();
+    int offsetY = chunks.getOffsetY();
     createChunk(nearX + offsetX, nearZ + offsetY);
     return true;
 }
@@ -101,15 +101,15 @@ bool ChunksController::buildLights(const std::shared_ptr<Chunk>& chunk) {
     int surrounding = 0;
     for (int oz = -1; oz <= 1; oz++) {
         for (int ox = -1; ox <= 1; ox++) {
-            if (chunks->getChunk(chunk->x + ox, chunk->z + oz)) surrounding++;
+            if (chunks.getChunk(chunk->x + ox, chunk->z + oz)) surrounding++;
         }
     }
     if (surrounding == MIN_SURROUNDING) {
         bool lightsCache = chunk->flags.loadedLights;
         if (!lightsCache) {
-            lighting->buildSkyLight(chunk->x, chunk->z);
+            lighting.buildSkyLight(chunk->x, chunk->z);
         }
-        lighting->onChunkLoaded(chunk->x, chunk->z, !lightsCache);
+        lighting.onChunkLoaded(chunk->x, chunk->z, !lightsCache);
         chunk->flags.lighted = true;
         return true;
     }
@@ -117,8 +117,8 @@ bool ChunksController::buildLights(const std::shared_ptr<Chunk>& chunk) {
 }
 
 void ChunksController::createChunk(int x, int z) {
-    auto chunk = level->chunksStorage->create(x, z);
-    chunks->putChunk(chunk);
+    auto chunk = level.chunksStorage->create(x, z);
+    chunks.putChunk(chunk);
     auto& chunkFlags = chunk->flags;
 
     if (!chunkFlags.loaded) {
@@ -128,7 +128,7 @@ void ChunksController::createChunk(int x, int z) {
     chunk->updateHeights();
 
     if (!chunkFlags.loadedLights) {
-        Lighting::prebuildSkyLight(chunk.get(), level->content->getIndices());
+        Lighting::prebuildSkyLight(chunk.get(), level.content->getIndices());
     }
     chunkFlags.loaded = true;
     chunkFlags.ready = true;
diff --git a/src/logic/ChunksController.hpp b/src/logic/ChunksController.hpp
index 8566ee1b..e9f1ab62 100644
--- a/src/logic/ChunksController.hpp
+++ b/src/logic/ChunksController.hpp
@@ -13,9 +13,9 @@ class WorldGenerator;
 /// @brief ChunksController manages chunks dynamic loading/unloading
 class ChunksController {
 private:
-    Level* level;
-    Chunks* chunks;
-    Lighting* lighting;
+    Level& level;
+    Chunks& chunks;
+    Lighting& lighting;
     uint padding;
     std::unique_ptr<WorldGenerator> generator;
 
@@ -24,7 +24,7 @@ private:
     bool buildLights(const std::shared_ptr<Chunk>& chunk);
     void createChunk(int x, int y);
 public:
-    ChunksController(Level* level, uint padding);
+    ChunksController(Level& level, uint padding);
     ~ChunksController();
 
     /// @param maxDuration milliseconds reserved for chunks loading
diff --git a/src/logic/LevelController.cpp b/src/logic/LevelController.cpp
index 2cd491d4..bd8af15c 100644
--- a/src/logic/LevelController.cpp
+++ b/src/logic/LevelController.cpp
@@ -16,14 +16,14 @@
 
 static debug::Logger logger("level-control");
 
-LevelController::LevelController(Engine* engine, std::unique_ptr<Level> level)
+LevelController::LevelController(Engine* engine, std::unique_ptr<Level> levelPtr)
     : settings(engine->getSettings()),
-      level(std::move(level)),
+      level(std::move(levelPtr)),
       blocks(std::make_unique<BlocksController>(
-          this->level.get(), settings.chunks.padding.get()
+          *level, settings.chunks.padding.get()
       )),
       chunks(std::make_unique<ChunksController>(
-          this->level.get(), settings.chunks.padding.get()
+          *level, settings.chunks.padding.get()
       )),
       player(std::make_unique<PlayerController>(
         settings, this->level.get(), blocks.get()

From 2ba90625ce2f12633c278a1904ad752b1400994d Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Thu, 21 Nov 2024 05:02:45 +0300
Subject: [PATCH 77/80] add player.is_instant_destruction,
 .set_instant_destruction

---
 doc/en/scripting/builtins/libplayer.md     |  7 +++++++
 doc/ru/scripting/builtins/libplayer.md     |  7 +++++++
 src/logic/scripting/lua/libs/libplayer.cpp | 16 ++++++++++++++++
 src/objects/Player.cpp                     | 10 ++++++++++
 src/objects/Player.hpp                     |  4 ++++
 5 files changed, 44 insertions(+)

diff --git a/doc/en/scripting/builtins/libplayer.md b/doc/en/scripting/builtins/libplayer.md
index 932b17d6..99482c68 100644
--- a/doc/en/scripting/builtins/libplayer.md
+++ b/doc/en/scripting/builtins/libplayer.md
@@ -63,6 +63,13 @@ player.set_infinite_items(bool)
 
 Getter and setter for infinite items (not removed from inventory after use)
 
+```lua
+player.is_instant_destruction() -> bool
+player.set_instant_destruction(bool)
+```
+
+Getter and setter for instant destruction of blocks when the `player.destroy` binding is activated.
+
 ``` lua
 player.set_spawnpoint(playerid: int, x: number, y: number, z: number)
 player.get_spawnpoint(playerid: int) -> number, number, number
diff --git a/doc/ru/scripting/builtins/libplayer.md b/doc/ru/scripting/builtins/libplayer.md
index 6da5028b..179e6b18 100644
--- a/doc/ru/scripting/builtins/libplayer.md
+++ b/doc/ru/scripting/builtins/libplayer.md
@@ -63,6 +63,13 @@ player.set_infinite_items(bool)
 
 Геттер и сеттер бесконечных предметов (не удаляются из инвентаря при использовании)
 
+```lua
+player.is_instant_destruction() -> bool
+player.set_instant_destruction(bool)
+```
+
+Геттер и сеттер мнгновенного разрушения блоков при активации привязки `player.destroy`.
+
 ```lua
 player.set_spawnpoint(playerid: int, x: number, y: number, z: number) 
 player.get_spawnpoint(playerid: int) -> number, number, number
diff --git a/src/logic/scripting/lua/libs/libplayer.cpp b/src/logic/scripting/lua/libs/libplayer.cpp
index cbd166a6..18b29405 100644
--- a/src/logic/scripting/lua/libs/libplayer.cpp
+++ b/src/logic/scripting/lua/libs/libplayer.cpp
@@ -142,6 +142,20 @@ static int l_set_infinite_items(lua::State* L) {
     return 0;
 }
 
+static int l_is_instant_destruction(lua::State* L) {
+    if (auto player = get_player(L, 1)) {
+        return lua::pushboolean(L, player->isInstantDestruction());
+    }
+    return 0;
+}
+
+static int l_set_instant_destruction(lua::State* L) {
+    if (auto player = get_player(L, 1)) {
+        player->setInstantDestruction(lua::toboolean(L, 2));
+    }
+    return 0;
+}
+
 static int l_get_selected_block(lua::State* L) {
     if (auto player = get_player(L, 1)) {
         if (player->selection.vox.id == BLOCK_VOID) {
@@ -236,6 +250,8 @@ const luaL_Reg playerlib[] = {
     {"set_noclip", lua::wrap<l_set_noclip>},
     {"is_infinite_items", lua::wrap<l_is_infinite_items>},
     {"set_infinite_items", lua::wrap<l_set_infinite_items>},
+    {"is_instant_destruction", lua::wrap<l_is_instant_destruction>},
+    {"set_instant_destruction", lua::wrap<l_set_instant_destruction>},
     {"get_selected_block", lua::wrap<l_get_selected_block>},
     {"get_selected_entity", lua::wrap<l_get_selected_entity>},
     {"set_spawnpoint", lua::wrap<l_set_spawnpoint>},
diff --git a/src/objects/Player.cpp b/src/objects/Player.cpp
index 2ab41eea..5c2a2b85 100644
--- a/src/objects/Player.cpp
+++ b/src/objects/Player.cpp
@@ -248,6 +248,14 @@ void Player::setInfiniteItems(bool flag) {
     infiniteItems = flag;
 }
 
+bool Player::isInstantDestruction() const {
+    return instantDestruction;
+}
+
+void Player::setInstantDestruction(bool flag) {
+    instantDestruction = flag;
+}
+
 entityid_t Player::getEntity() const {
     return eid;
 }
@@ -282,6 +290,7 @@ dv::value Player::serialize() const {
     root["flight"] = flight;
     root["noclip"] = noclip;
     root["infinite-items"] = infiniteItems;
+    root["instant-destruction"] = instantDestruction;
     root["chosen-slot"] = chosenSlot;
     root["entity"] = eid;
     root["inventory"] = inventory->serialize();
@@ -310,6 +319,7 @@ void Player::deserialize(const dv::value& src) {
     flight = src["flight"].asBoolean();
     noclip = src["noclip"].asBoolean();
     src.at("infinite-items").get(infiniteItems);
+    src.at("instant-destruction").get(instantDestruction);
     
     setChosenSlot(src["chosen-slot"].asInteger());
     eid = src["entity"].asNumber();
diff --git a/src/objects/Player.hpp b/src/objects/Player.hpp
index 62c818a6..2badd9dc 100644
--- a/src/objects/Player.hpp
+++ b/src/objects/Player.hpp
@@ -50,6 +50,7 @@ class Player : public Object, public Serializable {
     bool flight = false;
     bool noclip = false;
     bool infiniteItems = true;
+    bool instantDestruction = true;
     entityid_t eid;
     entityid_t selectedEid;
 public:
@@ -90,6 +91,9 @@ public:
     bool isInfiniteItems() const;
     void setInfiniteItems(bool flag);
 
+    bool isInstantDestruction() const;
+    void setInstantDestruction(bool flag);
+
     entityid_t getEntity() const;
     void setEntity(entityid_t eid);
 

From 61b1aa8e3d6c355bb3db4c0e4902b09278a56d60 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Thu, 21 Nov 2024 06:48:23 +0300
Subject: [PATCH 78/80] add gfx.blockwraps library & add on_player_tick world
 event

---
 src/content/ContentPack.hpp                   |  1 +
 src/graphics/render/BlockWrapsRenderer.cpp    |  9 +++-
 src/graphics/render/BlockWrapsRenderer.hpp    |  2 +
 src/graphics/render/WorldRenderer.hpp         |  2 +-
 src/logic/PlayerController.cpp                | 22 +++++++---
 src/logic/PlayerController.hpp                |  2 +
 src/logic/scripting/lua/libs/api_lua.hpp      |  5 ++-
 .../scripting/lua/libs/libblockwraps.cpp      | 43 +++++++++++++++++++
 src/logic/scripting/scripting.cpp             | 17 ++++++++
 src/logic/scripting/scripting.hpp             |  1 +
 src/logic/scripting/scripting_hud.cpp         |  1 +
 src/voxels/Chunks.cpp                         |  4 +-
 src/voxels/Chunks.hpp                         |  4 +-
 13 files changed, 98 insertions(+), 15 deletions(-)
 create mode 100644 src/logic/scripting/lua/libs/libblockwraps.cpp

diff --git a/src/content/ContentPack.hpp b/src/content/ContentPack.hpp
index 9d25d752..b790d0e7 100644
--- a/src/content/ContentPack.hpp
+++ b/src/content/ContentPack.hpp
@@ -99,6 +99,7 @@ struct world_funcs_set {
     bool onblockplaced : 1;
     bool onblockbroken : 1;
     bool onblockinteract : 1;
+    bool onplayertick : 1;
 };
 
 class ContentPackRuntime {
diff --git a/src/graphics/render/BlockWrapsRenderer.cpp b/src/graphics/render/BlockWrapsRenderer.cpp
index 82ddf951..ddb93d3a 100644
--- a/src/graphics/render/BlockWrapsRenderer.cpp
+++ b/src/graphics/render/BlockWrapsRenderer.cpp
@@ -79,8 +79,9 @@ void BlockWrapsRenderer::draw(const BlockWrapper& wrapper) {
 
 void BlockWrapsRenderer::draw(const DrawContext& pctx, const Player& player) {
     auto ctx = pctx.sub();
-    
-    
+    for (const auto& [_, wrapper] : wrappers) {
+        draw(*wrapper);
+    }
     batch->flush();
 }
 
@@ -101,3 +102,7 @@ BlockWrapper* BlockWrapsRenderer::get(u64id_t id) const {
     }
     return found->second.get();
 }
+
+void BlockWrapsRenderer::remove(u64id_t id) {
+    wrappers.erase(id);
+}
diff --git a/src/graphics/render/BlockWrapsRenderer.hpp b/src/graphics/render/BlockWrapsRenderer.hpp
index 3cb21cba..728e664a 100644
--- a/src/graphics/render/BlockWrapsRenderer.hpp
+++ b/src/graphics/render/BlockWrapsRenderer.hpp
@@ -35,4 +35,6 @@ public:
     u64id_t add(const glm::ivec3& position, const std::string& texture);
 
     BlockWrapper* get(u64id_t id) const;
+
+    void remove(u64id_t id);
 };
diff --git a/src/graphics/render/WorldRenderer.hpp b/src/graphics/render/WorldRenderer.hpp
index 94105726..c3ea72f1 100644
--- a/src/graphics/render/WorldRenderer.hpp
+++ b/src/graphics/render/WorldRenderer.hpp
@@ -40,7 +40,6 @@ class WorldRenderer {
     std::unique_ptr<LineBatch> lineBatch;
     std::unique_ptr<Batch3D> batch3d;
     std::unique_ptr<ChunksRenderer> chunks;
-    std::unique_ptr<BlockWrapsRenderer> blockWraps;
     std::unique_ptr<GuidesRenderer> guides;
     std::unique_ptr<Skybox> skybox;
     std::unique_ptr<ModelBatch> modelBatch;
@@ -70,6 +69,7 @@ class WorldRenderer {
 public:
     std::unique_ptr<TextsRenderer> texts;
     std::unique_ptr<ParticlesRenderer> particles;
+    std::unique_ptr<BlockWrapsRenderer> blockWraps;
 
     static bool showChunkBorders;
     static bool showEntitiesDebug;
diff --git a/src/logic/PlayerController.cpp b/src/logic/PlayerController.cpp
index 0471d080..0ad5ef6b 100644
--- a/src/logic/PlayerController.cpp
+++ b/src/logic/PlayerController.cpp
@@ -195,7 +195,8 @@ PlayerController::PlayerController(
     : settings(settings), level(level),
       player(level->getObject<Player>(0)),
       camControl(player, settings.camera),
-      blocksController(blocksController) {
+      blocksController(blocksController),
+      playerTickClock(20, 3) {
 }
 
 void PlayerController::onFootstep(const Hitbox& hitbox) {
@@ -249,6 +250,13 @@ void PlayerController::update(float delta, bool input, bool pause) {
             resetKeyboard();
         }
         updatePlayer(delta);
+
+        if (playerTickClock.update(delta)) {
+            if (player->getId() % playerTickClock.getParts() ==
+                playerTickClock.getPart()) {
+                scripting::on_player_tick(player.get(), playerTickClock.getTickRate());
+            }
+        }
     }
 }
 
@@ -302,7 +310,7 @@ void PlayerController::updatePlayer(float delta) {
 }
 
 static int determine_rotation(
-    const Block* def, const glm::ivec3& norm, glm::vec3& camDir
+    const Block* def, const glm::ivec3& norm, const glm::vec3& camDir
 ) {
     if (def && def->rotatable) {
         const std::string& name = def->rotations.name;
@@ -532,10 +540,12 @@ void PlayerController::updateInteraction(float delta) {
         }
     }
     auto& target = indices->blocks.require(vox->id);
-    if (lclick && target.breakable) {
-        blocksController->breakBlock(
-            player.get(), target, iend.x, iend.y, iend.z
-        );
+    if (lclick) {
+        if (player->isInstantDestruction() && target.breakable) {
+            blocksController->breakBlock(
+                player.get(), target, iend.x, iend.y, iend.z
+            );
+        }
     }
     if (rclick && !input.shift) {
         bool preventDefault = false;
diff --git a/src/logic/PlayerController.hpp b/src/logic/PlayerController.hpp
index 6affa43d..3fe3decf 100644
--- a/src/logic/PlayerController.hpp
+++ b/src/logic/PlayerController.hpp
@@ -5,6 +5,7 @@
 #include <vector>
 
 #include "objects/Player.hpp"
+#include "util/Clock.hpp"
 
 class Engine;
 class Camera;
@@ -53,6 +54,7 @@ class PlayerController {
     PlayerInput input {};
     CameraControl camControl;
     BlocksController* blocksController;
+    util::Clock playerTickClock;
 
     float interactionTimer = 0.0f;
     void updateKeyboard();
diff --git a/src/logic/scripting/lua/libs/api_lua.hpp b/src/logic/scripting/lua/libs/api_lua.hpp
index b0edba79..12df1d66 100644
--- a/src/logic/scripting/lua/libs/api_lua.hpp
+++ b/src/logic/scripting/lua/libs/api_lua.hpp
@@ -18,6 +18,7 @@ extern const luaL_Reg audiolib[];
 extern const luaL_Reg base64lib[];
 extern const luaL_Reg bjsonlib[];
 extern const luaL_Reg blocklib[];
+extern const luaL_Reg blockwrapslib[]; // gfx.blockwraps
 extern const luaL_Reg cameralib[];
 extern const luaL_Reg consolelib[];
 extern const luaL_Reg corelib[];
@@ -32,10 +33,10 @@ extern const luaL_Reg itemlib[];
 extern const luaL_Reg jsonlib[];
 extern const luaL_Reg mat4lib[];
 extern const luaL_Reg packlib[];
-extern const luaL_Reg particleslib[];
+extern const luaL_Reg particleslib[]; // gfx.particles
 extern const luaL_Reg playerlib[];
 extern const luaL_Reg quatlib[];
-extern const luaL_Reg text3dlib[];
+extern const luaL_Reg text3dlib[]; // gfx.text3d
 extern const luaL_Reg timelib[];
 extern const luaL_Reg tomllib[];
 extern const luaL_Reg utf8lib[];
diff --git a/src/logic/scripting/lua/libs/libblockwraps.cpp b/src/logic/scripting/lua/libs/libblockwraps.cpp
new file mode 100644
index 00000000..fec1c5d7
--- /dev/null
+++ b/src/logic/scripting/lua/libs/libblockwraps.cpp
@@ -0,0 +1,43 @@
+#include "api_lua.hpp"
+
+#include "logic/scripting/scripting_hud.hpp"
+#include "graphics/render/WorldRenderer.hpp"
+#include "graphics/render/BlockWrapsRenderer.hpp"
+
+using namespace scripting;
+
+static int l_wrap(lua::State* L) {
+    auto position = lua::tovec3(L, 1);
+    std::string texture = lua::require_string(L, 2);
+
+    return lua::pushinteger(
+        L, renderer->blockWraps->add(position, std::move(texture))
+    );
+}
+
+static int l_unwrap(lua::State* L) {
+    renderer->blockWraps->remove(lua::tointeger(L, 1));
+    return 0;
+}
+
+static int l_set_pos(lua::State* L) {
+    if (auto wrapper = renderer->blockWraps->get(lua::tointeger(L, 1))) {
+        wrapper->position = lua::tovec3(L, 2);
+    }
+    return 0;
+}
+
+static int l_set_texture(lua::State* L) {
+    if (auto wrapper = renderer->blockWraps->get(lua::tointeger(L, 1))) {
+        wrapper->texture = lua::require_string(L, 2);
+    }
+    return 0;
+}
+
+const luaL_Reg blockwrapslib[] = {
+    {"wrap", lua::wrap<l_wrap>},
+    {"unwrap", lua::wrap<l_unwrap>},
+    {"set_pos", lua::wrap<l_set_pos>},
+    {"set_texture", lua::wrap<l_set_texture>},
+    {NULL, NULL}
+};
diff --git a/src/logic/scripting/scripting.cpp b/src/logic/scripting/scripting.cpp
index 3f3161ae..f0082a3c 100644
--- a/src/logic/scripting/scripting.cpp
+++ b/src/logic/scripting/scripting.cpp
@@ -323,6 +323,21 @@ bool scripting::on_block_interact(
     }
 }
 
+void scripting::on_player_tick(Player* player, int tps) {
+    auto args = [=](lua::State* L) {
+        lua::pushinteger(L, player ? player->getId() : -1);
+        lua::pushinteger(L, tps);
+        return 2;
+    };
+    for (auto& [packid, pack] : content->getPacks()) {
+        if (pack->worldfuncsset.onplayertick) {
+            lua::emit_event(
+                lua::get_main_state(), packid + ":.playertick", args
+            );
+        }
+    }
+}
+
 bool scripting::on_item_use(Player* player, const ItemDef& item) {
     std::string name = item.name + ".use";
     return lua::emit_event(
@@ -724,6 +739,8 @@ void scripting::load_world_script(
         register_event(env, "on_block_broken", prefix + ":.blockbroken");
     funcsset.onblockinteract =
         register_event(env, "on_block_interact", prefix + ":.blockinteract");
+    funcsset.onplayertick =
+        register_event(env, "on_player_tick", prefix + ":.playertick");
 }
 
 void scripting::load_layout_script(
diff --git a/src/logic/scripting/scripting.hpp b/src/logic/scripting/scripting.hpp
index c103a97a..ca0ea433 100644
--- a/src/logic/scripting/scripting.hpp
+++ b/src/logic/scripting/scripting.hpp
@@ -73,6 +73,7 @@ namespace scripting {
         Player* player, const Block& block, const glm::ivec3& pos
     );
     bool on_block_interact(Player* player, const Block& block, const glm::ivec3& pos);
+    void on_player_tick(Player* player, int tps);
 
     /// @brief Called on RMB click with the item selected
     /// @return true if prevents default action
diff --git a/src/logic/scripting/scripting_hud.cpp b/src/logic/scripting/scripting_hud.cpp
index 146fe817..7adb5076 100644
--- a/src/logic/scripting/scripting_hud.cpp
+++ b/src/logic/scripting/scripting_hud.cpp
@@ -32,6 +32,7 @@ void scripting::on_frontend_init(Hud* hud, WorldRenderer* renderer) {
     auto L = lua::get_main_state();
 
     lua::openlib(L, "hud", hudlib);
+    lua::openlib(L, "gfx", "blockwraps", blockwrapslib);
     lua::openlib(L, "gfx", "particles", particleslib);
     lua::openlib(L, "gfx", "text3d", text3dlib);
 
diff --git a/src/voxels/Chunks.cpp b/src/voxels/Chunks.cpp
index c27ed9e7..0942550e 100644
--- a/src/voxels/Chunks.cpp
+++ b/src/voxels/Chunks.cpp
@@ -438,7 +438,7 @@ voxel* Chunks::rayCast(
     glm::ivec3& norm,
     glm::ivec3& iend,
     std::set<blockid_t> filter
-) {
+) const {
     float px = start.x;
     float py = start.y;
     float pz = start.z;
@@ -571,7 +571,7 @@ voxel* Chunks::rayCast(
 
 glm::vec3 Chunks::rayCastToObstacle(
     const glm::vec3& start, const glm::vec3& dir, float maxDist
-) {
+) const {
     const float px = start.x;
     const float py = start.y;
     const float pz = start.z;
diff --git a/src/voxels/Chunks.hpp b/src/voxels/Chunks.hpp
index 38a5be8c..01648301 100644
--- a/src/voxels/Chunks.hpp
+++ b/src/voxels/Chunks.hpp
@@ -102,11 +102,11 @@ public:
         glm::ivec3& norm,
         glm::ivec3& iend,
         std::set<blockid_t> filter = {}
-    );
+    ) const;
 
     glm::vec3 rayCastToObstacle(
         const glm::vec3& start, const glm::vec3& dir, float maxDist
-    );
+    ) const;
 
     const AABB* isObstacleAt(float x, float y, float z) const;
 

From 3cd3fe94dec1fa422b1d02bb7f219ed29180b517 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Thu, 21 Nov 2024 07:25:31 +0300
Subject: [PATCH 79/80] update doc/*/scripting/events.md

---
 doc/en/scripting/events.md | 8 +++++++-
 doc/ru/scripting/events.md | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/doc/en/scripting/events.md b/doc/en/scripting/events.md
index ccc61673..8dcd1a06 100644
--- a/doc/en/scripting/events.md
+++ b/doc/en/scripting/events.md
@@ -38,7 +38,13 @@ Called on random block update (grass growth)
 function on_blocks_tick(tps: int)
 ```
 
-Called tps (20) times per second.
+Called tps (20) times per second. Use 1/tps instead of `time.delta()`.
+
+```lua
+function on_player_tick(playerid: int, tps: int)
+```
+
+Called tps (20) times per second. Use 1/tps instead of `time.delta()`.
 
 ## Item events
 
diff --git a/doc/ru/scripting/events.md b/doc/ru/scripting/events.md
index 31c958fc..6d908459 100644
--- a/doc/ru/scripting/events.md
+++ b/doc/ru/scripting/events.md
@@ -38,7 +38,13 @@ function on_random_update(x, y, z)
 function on_blocks_tick(tps: int)
 ```
 
-Вызывается tps (20) раз в секунду
+Вызывается tps (20) раз в секунду. Используйте 1/tps вместо `time.delta()`.
+
+```lua
+function on_player_tick(playerid: int, tps: int)
+```
+
+Вызывается tps (20) раз в секунду. Используйте 1/tps вместо `time.delta()`.
 
 ## События предметов
 

From 1c7a7cedcc84675f55db729e5a15c9ebb0b127a3 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Thu, 21 Nov 2024 07:36:53 +0300
Subject: [PATCH 80/80] remove space between Worlds and Settings buttons

---
 res/layouts/pages/main.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/res/layouts/pages/main.xml b/res/layouts/pages/main.xml
index bbdf5105..9c562fb4 100644
--- a/res/layouts/pages/main.xml
+++ b/res/layouts/pages/main.xml
@@ -1,6 +1,5 @@
 <panel size='400' color='0' interval='1' context='menu'>
     <button onclick='menu.page="worlds"'>@Worlds</button>
-    <label padding='5'></label>
     <button onclick='menu.page="settings"'>@Settings</button>
     <button onclick='menu.page="content_menu"'>@Contents Menu</button>
     <button onclick='core.quit()'>@Quit</button>