minetest-mods/technic
1
0
Fork 1
mirror of https://github.com/minetest-mods/technic.git synced 2025-03-20 11:20:31 +01:00
Code Issues Releases Wiki Activity

Fix pipeworks switch in machines formspec

Browse Source
This commit is contained in:
Denis Tereshkin 2017-04-25 23:18:55 +07:00
parent 8056cc27d6
commit 62d605d788
1 changed files with 18 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
technic/machines/register/machine_base.lua
View File

@ -43,7 +43,7 @@ function technic.register_base_machine(data)
local active_groups = {not_in_creative_inventory = 1} local active_groups = {not_in_creative_inventory = 1}
for k, v in pairs(groups) do active_groups[k] = v end for k, v in pairs(groups) do active_groups[k] = v end
local function make_formspec(data, progress_percentage) local function make_formspec(data, progress_percentage, meta)
local formspec_string = "size[8,9;]".. local formspec_string = "size[8,9;]"..
"list[current_name;src;"..(3.75-input_size)..",1.5;"..input_size..",1;]".. "list[current_name;src;"..(3.75-input_size)..",1.5;"..input_size..",1;]"..
"list[current_name;dst;5,1;2,2;]".. "list[current_name;dst;5,1;2,2;]"..
@ -65,6 +65,18 @@ function technic.register_base_machine(data)
"listring[current_name;upgrade2]".. "listring[current_name;upgrade2]"..
"listring[current_player;main]" "listring[current_player;main]"
end end
if tier ~= "LV" then
formspec_string = formspec_string..
fs_helpers.cycling_button(
meta,
pipeworks.button_base,
"splitstacks",
{
pipeworks.button_off,
pipeworks.button_on
}
)..pipeworks.button_label
end
return formspec_string return formspec_string
end end
@ -79,9 +91,9 @@ function technic.register_base_machine(data)
local function update_formspec(result) local function update_formspec(result)
if result and result.time ~= 0 then if result and result.time ~= 0 then
meta:set_string("formspec", make_formspec(data, 100.0 * meta:get_int("src_time") / round(result.time * 10))) meta:set_string("formspec", make_formspec(data, 100.0 * meta:get_int("src_time") / round(result.time * 10), meta))
else else
meta:set_string("formspec", make_formspec(data, 0)) meta:set_string("formspec", make_formspec(data, 0, meta))
end end
end end
@ -180,22 +192,9 @@ function technic.register_base_machine(data)
local node = minetest.get_node(pos) local node = minetest.get_node(pos)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local form_buttons = ""
if not string.find(node.name, ":lv_") then
form_buttons = fs_helpers.cycling_button(
meta,
pipeworks.button_base,
"splitstacks",
{
pipeworks.button_off,
pipeworks.button_on
}
)..pipeworks.button_label
end
meta:set_string("infotext", machine_desc:format(tier)) meta:set_string("infotext", machine_desc:format(tier))
meta:set_int("tube_time", 0) meta:set_int("tube_time", 0)
meta:set_string("formspec", make_formspec(data, 0)..form_buttons) meta:set_string("formspec", make_formspec(data, 0, meta))
local inv = meta:get_inventory() local inv = meta:get_inventory()
inv:set_size("src", input_size) inv:set_size("src", input_size)
inv:set_size("dst", 4) inv:set_size("dst", 4)
@ -214,19 +213,7 @@ function technic.register_base_machine(data)
if not pipeworks.may_configure(pos, sender) then return end if not pipeworks.may_configure(pos, sender) then return end
fs_helpers.on_receive_fields(pos, fields) fs_helpers.on_receive_fields(pos, fields)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local form_buttons = "" meta:set_string("formspec", make_formspec(data, 0, meta))
if not string.find(node.name, ":lv_") then
form_buttons = fs_helpers.cycling_button(
meta,
pipeworks.button_base,
"splitstacks",
{
pipeworks.button_off,
pipeworks.button_on
}
)..pipeworks.button_label
end
meta:set_string("formspec", make_formspec(data, 0)..form_buttons)
end, end,
}) })
@ -270,7 +257,7 @@ function technic.register_base_machine(data)
} }
)..pipeworks.button_label )..pipeworks.button_label
end end
meta:set_string("formspec", make_formspec(data, 0)..form_buttons) meta:set_string("formspec", make_formspec(data, 0, meta))
end, end,
}) })