Mirrorlandia_minetest/modlib
1
0
Fork 0
mirror of https://github.com/appgurueu/modlib.git synced 2024-11-22 07:13:45 +01:00
Code Issues Projects Releases Wiki Activity

Turn conf.build_tree error into warning

Browse Source
This commit is contained in:
Lars Mueller 2022-06-01 11:31:15 +02:00
parent 7989f40615
commit b974113fa9
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
init.lua
View File

@ -119,7 +119,7 @@ end
local rawget, rawset = rawget, rawset local rawget, rawset = rawget, rawset
modlib = setmetatable({ modlib = setmetatable({
-- TODO bump on release -- TODO bump on release
version = 94, version = 95,
modname = minetest and minetest.get_current_modname(), modname = minetest and minetest.get_current_modname(),
_RG = setmetatable({}, { _RG = setmetatable({}, {
__index = function(_, index) __index = function(_, index)

17
minetest/conf.lua
View File

@ -1,11 +1,13 @@
-- Localize globals -- Localize globals
local assert, dump, error, ipairs, minetest, modlib, pairs, pcall, table, tonumber, type = assert, dump, error, ipairs, minetest, modlib, pairs, pcall, table, tonumber, type local assert, dump, error, ipairs, minetest, modlib, pairs, pcall, table, tonumber, type, unpack = assert, dump, error, ipairs, minetest, modlib, pairs, pcall, table, tonumber, type, unpack
-- Set environment -- Set environment
local _ENV = {} local _ENV = {}
setfenv(1, _ENV) setfenv(1, _ENV)
-- not deprecated -- not deprecated
-- TODO find a better way to deal with settings used as both parent & leaf, ideally preserving the data of both (store in boolean field?)
local warn_parent_leaf = "modlib.minetest.conf.build_tree: setting %s used both as parent setting and as leaf, ignoring children"
function build_tree(dict) function build_tree(dict)
local tree = {} local tree = {}
for key, value in pairs(dict) do for key, value in pairs(dict) do
@ -15,8 +17,17 @@ function build_tree(dict)
local index = tonumber(path[i]) or path[i] local index = tonumber(path[i]) or path[i]
subtree[index] = subtree[index] or {} subtree[index] = subtree[index] or {}
subtree = subtree[index] subtree = subtree[index]
if type(subtree) ~= "table" then
minetest.log("warning", warn_parent_leaf:format(table.concat({unpack(path, 1, i)}, ".")))
break
end
end
if type(subtree) == "table" then
if type(subtree[path[#path]]) == "table" then
minetest.log("warning", warn_parent_leaf:format(key))
end
subtree[path[#path]] = value
end end
subtree[path[#path]] = value
end end
return tree return tree
end end
@ -303,4 +314,4 @@ function check_constraints(value, constraints)
end end
-- Export environment -- Export environment
return _ENV return _ENV