PowerOlive/minetest-smart_inventory
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

filter: unify get_description and descr_func

Browse Source
This commit is contained in:
Alexander Weber 2017-04-15 16:46:53 +02:00
parent 8d5e1f1ce0
commit c07c4fcabd
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
API.md
View File

@ -30,7 +30,7 @@ Maybe the framework will be moved to own mod in the feature if needed. Please no
smart_inventory.filter.register_filter({
name = string,
check_item_by_def = function,
shortdesc_func = function,
get_description = function,
})
```
- name - unique filter name

17
libs/filter.lua
View File

@ -16,11 +16,9 @@ function filter_class:check_item_by_def(def)
error("check_item_by_def needs redefinition:"..debug.traceback())
end
function filter_class:get_description(group)
function filter_class:_get_description(group)
local ret_desc
if self.shortdesc_func then
ret_desc = self:shortdesc_func(group)
elseif txt[group.name] then
if txt[group.name] then
ret_desc = txt[group.name].label
elseif group.parent and group.parent.childs[group.name] and txt[group.parent.name] then
ret_desc = txt[group.parent.name].label.." "..group.parent.childs[group.name]
@ -33,6 +31,7 @@ function filter_class:get_description(group)
return group.name
end
end
filter_class.get_description = filter_class._get_description
local filter = {}
filter.registered_filter = {}
@ -212,15 +211,11 @@ filter.register_filter({
]]
return rettab
end,
shortdesc_func = function(self, group)
get_description = function(self, group)
if group.name == "max_drop_level" or group.name == "full_punch_interval" or group.name == "damage" then
return false
elseif txt[group.name] then
return txt[group.name].label
elseif group.parent and group.parent.childs[group.name] and txt[group.parent.name] then
return txt[group.parent.name].label.." "..group.parent.childs[group.name]
else
return group.name
return self:_get_description(group)
end
end
})
@ -242,7 +237,7 @@ filter.register_filter({
filter.register_filter({
name = "ingredient",
check_item_by_def = function(self, def) end,
shortdesc_func = function(self, group)
get_description = function(self, group)
local itemname = group.name:sub(12)
if txt["ingredient"] and txt["ingredient"].label and
minetest.registered_items[itemname] and minetest.registered_items[itemname].description then