Mirrorlandia_minetest/modlib
1
0
Fork 0
mirror of https://github.com/appgurueu/modlib.git synced 2024-11-25 16:53:46 +01:00
Code Issues Projects Releases Wiki Activity

Schema: Fix settingtypes subtree ordering & level

Browse Source
This commit is contained in:
Lars Mueller 2022-05-13 12:13:16 +02:00
parent 11d47f1041
commit 8391532f6e
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
schema.lua
View File

@ -40,7 +40,7 @@ function generate_settingtypes(self)
if self._level > 0 then if self._level > 0 then
-- HACK: Minetest automatically adds the modname -- HACK: Minetest automatically adds the modname
-- TODO simple names (not modname.field.other_field) -- TODO simple names (not modname.field.other_field)
settings = {"[" .. ("*"):rep(self._level) .. self.name .. "]"} settings = {"[" .. ("*"):rep(self._level - 1) .. self.name .. "]"}
end end
local function setting(key, value_scheme) local function setting(key, value_scheme)
key = tostring(key) key = tostring(key)
@ -54,11 +54,19 @@ function generate_settingtypes(self)
for key in pairs(self.entries or {}) do for key in pairs(self.entries or {}) do
table.insert(keys, key) table.insert(keys, key)
end end
table.sort(keys) table.sort(keys, function(key, other_key)
-- Force leaves before subtrees to prevent them from being accidentally graphically treated as part of the subtree
local is_subtree = self.entries[key].type == "table"
local other_is_subtree = self.entries[other_key].type == "table"
if is_subtree ~= other_is_subtree then
return not is_subtree
end
return key < other_key
end)
for _, key in ipairs(keys) do for _, key in ipairs(keys) do
setting(key, self.entries[key]) setting(key, self.entries[key])
end end
return table.concat(settings, "\n") return table.concat(settings, "\n\n")
end end
if not typ then if not typ then
return "" return ""