From 24718a29933dee7d357c592353b1c132a6e26956 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Tue, 3 Nov 2026 22:08:44 +0300 Subject: [PATCH] reverting it because voices are not reasom This reverts commit ecc4c1794ef7fee0bd1135bb21f79afa2572bebb. --- res/layouts/reports/missing_content.xml.lua | 13 ++------ src/logic/scripting/lua/libs/libapp.cpp | 35 +++++++-------------- src/world/files/WorldFiles.cpp | 4 +-- src/world/files/WorldFiles.hpp | 3 +- 4 files changed, 16 insertions(+), 39 deletions(-) diff --git a/res/layouts/reports/missing_content.xml.lua b/res/layouts/reports/missing_content.xml.lua index 0add26f42..50ac29c2d 100644 --- a/res/layouts/reports/missing_content.xml.lua +++ b/res/layouts/reports/missing_content.xml.lua @@ -1,19 +1,12 @@ content_report = nil function delete_content() - local blocks = {} - local items = {} + local units = {} for i, entry in ipairs(content_report.content) do - local type = entry.type - if type == "block" then - table.insert(blocks, entry.name) - elseif type == "item" then - table.insert(items, entry.name) - end + table.insert(units, entry.name) end local request = { - blocks = blocks, - items = items + units = units } app.delete_world_content(content_report.world, request, true) end diff --git a/src/logic/scripting/lua/libs/libapp.cpp b/src/logic/scripting/lua/libs/libapp.cpp index c046567e1..0cb38a808 100644 --- a/src/logic/scripting/lua/libs/libapp.cpp +++ b/src/logic/scripting/lua/libs/libapp.cpp @@ -328,34 +328,21 @@ static int l_delete_world(lua::State* L) { return 0; } -static ContentRemovalRequest parse_content_removal_request( - lua::State* L, int idx -) { +static ContentRemovalRequest parse_content_removal_request(lua::State* L, int idx) { ContentRemovalRequest request; if (!lua::istable(L, idx)) { throw std::runtime_error("table expected as argument"); } - lua::pushnil(L); - while (lua::next(L, idx)) { - auto key = lua::require_lstring(L, -2); - int len = lua::objlen(L, -1); - - for (int i = 0; i < len; i++) { - lua::rawgeti(L, i + 1); - auto value = lua::require_lstring(L, -1); - - if (key == "blocks") { - request.blocks.emplace_back(value); - } else if (key == "items") { - request.items.emplace_back(value); - } else { - throw std::runtime_error( - "invalid key in content removal request: " + - std::string(key) - ); - } - lua::pop(L); - } + if (!lua::getfield(L, "units", idx)) { + throw std::runtime_error("table with 'units' field expected"); + } + if (!lua::istable(L, -1)) { + throw std::runtime_error("'units' field must be a table"); + } + int len = lua::objlen(L, -1); + for (int i = 0; i < len; i++) { + lua::rawgeti(L, i + 1); + request.units.emplace_back(lua::require_lstring(L, -1)); lua::pop(L); } return request; diff --git a/src/world/files/WorldFiles.cpp b/src/world/files/WorldFiles.cpp index ea4f70c02..c06df4160 100644 --- a/src/world/files/WorldFiles.cpp +++ b/src/world/files/WorldFiles.cpp @@ -249,10 +249,8 @@ static void replace_all( void WorldFiles::deleteContent(const ContentRemovalRequest& request) { auto root = io::read_json(getIndicesFile()); - for (const auto& unit : request.blocks) { + for (const auto& unit : request.units) { replace_all(root["blocks"], unit, CORE_AIR); - } - for (const auto& unit : request.items) { replace_all(root["items"], unit, CORE_EMPTY); } io::write_json(getIndicesFile(), root); diff --git a/src/world/files/WorldFiles.hpp b/src/world/files/WorldFiles.hpp index b0d70c159..31f859e2d 100644 --- a/src/world/files/WorldFiles.hpp +++ b/src/world/files/WorldFiles.hpp @@ -24,8 +24,7 @@ struct WorldInfo; struct DebugSettings; struct ContentRemovalRequest { - std::vector blocks; - std::vector items; + std::vector units; }; class WorldFiles {