Refactor make_formspec to always return formspec

This commit is contained in:
Paul Ouellette 2019-01-19 22:11:58 -05:00
parent 6229821384
commit 159fc89155
1 changed files with 4 additions and 10 deletions

View File

@ -393,21 +393,15 @@ local function make_formspec(player_name)
fs[#fs + 1] = get_recipe_fs(data, iY) fs[#fs + 1] = get_recipe_fs(data, iY)
end end
fs = concat(fs) return concat(fs)
if sfinv_only then
return fs
else
data.formspec = fs
end
end end
local show_fs = function(player, player_name) local show_fs = function(player, player_name)
if sfinv_only then if sfinv_only then
sfinv.set_player_inventory_formspec(player) sfinv.set_player_inventory_formspec(player)
else else
make_formspec(player_name)
local data = player_data[player_name] local data = player_data[player_name]
data.formspec = make_formspec(player_name)
show_formspec(player_name, "craftguide", data.formspec) show_formspec(player_name, "craftguide", data.formspec)
end end
end end
@ -766,12 +760,12 @@ else
if not data then if not data then
init_data(user, player_name) init_data(user, player_name)
make_formspec(player_name)
data = player_data[player_name] data = player_data[player_name]
data.formspec = make_formspec(player_name)
elseif progressive_mode then elseif progressive_mode then
data.progressive_items = get_progressive_items(user) data.progressive_items = get_progressive_items(user)
filter_items(data) filter_items(data)
make_formspec(player_name) data.formspec = make_formspec(player_name)
end end
show_formspec(player_name, "craftguide", data.formspec) show_formspec(player_name, "craftguide", data.formspec)