Refactor common.lua to simplify code and make locale strings searchable

This commit is contained in:
codexp 2018-07-13 23:02:01 +02:00 committed by Hugo Locurcio
parent 83f419101c
commit 8e8078e74b
No known key found for this signature in database
GPG Key ID: 39E8F8BE30B0A49C

View File

@ -7,27 +7,28 @@ Licensed under the zlib license. See LICENSE.md for more information.
local S = moreblocks.S
local descriptions = {
["micro"] = S("%s Microblock"),
["slab"] = S("%s Slab"),
["slope"] = S("%s Slope"),
["panel"] = S("%s Panel"),
["stair"] = S("%s Stairs"),
}
stairsplus.register_single = function(category, alternate, info, modname, subname, recipeitem, fields)
local descriptions = {
["micro"] = S("Microblock"),
["slab"] = S("Slab"),
["slope"] = S("Slope"),
["panel"] = S("Panel"),
["stair"] = S("Stairs"),
}
local desc_base = descriptions[category]:format(fields.description)
local def = {}
if category ~= "slab" then
def = table.copy(info)
end
-- copy fields to def
for k, v in pairs(fields) do
def[k] = v
end
def.drawtype = "nodebox"
if category == "slope" then
def.drawtype = "mesh"
end
def.paramtype = "light"
def.paramtype2 = def.paramtype2 or "facedir"
@ -35,10 +36,9 @@ stairsplus.register_single = function(category, alternate, info, modname, subnam
def.place_param2 = nil
def.on_place = minetest.rotate_node
if category ~= "slab" then
def.description = S("%s " .. descriptions[category]):format(fields.description)
else
local desc_base = S("%s " .. descriptions[category]):format(fields.description)
def.groups = stairsplus:prepare_groups(fields.groups)
if category == "slab" then
if type(info) ~= "table" then
def.node_box = {
type = "fixed",
@ -52,14 +52,19 @@ stairsplus.register_single = function(category, alternate, info, modname, subnam
}
def.description = desc_base .. alternate:gsub("_", " "):gsub("(%a)(%S*)", function(a, b) return a:upper() .. b end)
end
else
def.description = desc_base
if category == "slope" then
def.drawtype = "mesh"
elseif category == "stair" and alternate == "" then
def.groups.stair = 1
end
end
def.groups = stairsplus:prepare_groups(fields.groups)
if category == "stair" and alternate == "" then
def.groups.stair = 1
end
if fields.drop and not (type(fields.drop) == "table") then
def.drop = modname.. ":" .. category .. "_" .. fields.drop .. alternate
end
minetest.register_node(":" ..modname.. ":" .. category .. "_" .. subname .. alternate, def)
stairsplus.register_recipes(category, alternate, modname, subname, recipeitem)
end