From fb93388f06fe87ee75aaaf04cf6edcf01a26d981 Mon Sep 17 00:00:00 2001 From: SmallJoker <mk939@ymail.com> Date: Thu, 19 Jul 2018 14:36:21 +0200 Subject: [PATCH] Replace deprecated invsize[] with size[] --- technic_chests/register.lua | 276 +++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 219 insertions(+), 57 deletions(-) diff --git a/technic_chests/register.lua b/technic_chests/register.lua index 765a9a5..61d49d3 100644 --- a/technic_chests/register.lua +++ b/technic_chests/register.lua @@ -1,10 +1,33 @@ +local S = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end +local pipeworks = rawget(_G, "pipeworks") +local fs_helpers = rawget(_G, "fs_helpers") -local S -if intllib then - S = intllib.Getter() +local allow_label = "" +local tube_entry = "" +local shift_edit_field = 0 + +if not minetest.get_modpath("pipeworks") then + -- Pipeworks is not installed. Simulate using a dummy table... + pipeworks = {} + fs_helpers = {} + local pipeworks_meta = {} + setmetatable(pipeworks, pipeworks_meta) + local dummy = function() + end + pipeworks_meta.__index = function(table, key) + print("[technic_chests] WARNING: variable or method '"..key.."' not present in dummy pipeworks table - assuming it is a method...") + pipeworks[key] = dummy + return dummy + end + pipeworks.after_place = dummy + pipeworks.after_dig = dummy + fs_helpers.cycling_button = function() return "" end else - S = function(s) return s end + fs_helpers = pipeworks.fs_helpers + allow_label = "label[0.9,0.36;Allow splitting incoming stacks from tubes]" + shift_edit_field = 3 + tube_entry = "^pipeworks_tube_connection_metallic.png" end local chest_mark_colors = { @@ -31,13 +54,13 @@ end -local function get_color_buttons() +local function get_color_buttons(coleft, lotop) local buttons_string = "" for y = 0, 3 do for x = 0, 3 do local file_name = "technic_colorbutton"..(y * 4 + x)..".png" buttons_string = buttons_string.."image_button[" - ..(8.1 + x * 0.7)..","..(6.1 + y * 0.7) + ..(coleft + 0.1 + x * 0.7)..","..(lotop + 0.1 + y * 0.7) ..";0.8,0.8;"..file_name..";color_button" ..(y * 4 + x + 1)..";]" end @@ -49,78 +72,161 @@ local function check_color_buttons(pos, meta, chest_name, fields) for i = 1, 16 do if fields["color_button"..i] then - technic.swap_node(pos, chest_name..colorid_to_postfix(i)) + local node = minetest.get_node(pos) + node.name = chest_name..colorid_to_postfix(i) + minetest.swap_node(pos, node) meta:set_string("color", i) return end end end +local function set_formspec(pos, data, page) + local meta = minetest.get_meta(pos) + local node = minetest.get_node(pos) + local formspec = data.base_formspec + formspec = formspec..fs_helpers.cycling_button( + meta, + "image_button[0,0.35;1,0.6", + "splitstacks", + { + pipeworks.button_off, + pipeworks.button_on + } + )..allow_label + + if data.autosort then + local status = meta:get_int("autosort") + formspec = formspec.."button["..(data.hileft+2)..","..(data.height+1.1)..";3,0.8;autosort_to_"..(1-status)..";"..S("Auto-sort is %s"):format(status == 1 and S("On") or S("Off")).."]" + end + if data.infotext then + local formspec_infotext = minetest.formspec_escape(meta:get_string("infotext")) + if page == "main" then + formspec = formspec.."image_button["..(shift_edit_field+data.hileft+2.1)..",0.1;0.8,0.8;" + .."technic_pencil_icon.png;edit_infotext;]" + .."label["..(shift_edit_field+data.hileft+3)..",0;"..formspec_infotext.."]" + elseif page == "edit_infotext" then + formspec = formspec.."image_button["..(shift_edit_field+data.hileft+2.1)..",0.1;0.8,0.8;" + .."technic_checkmark_icon.png;save_infotext;]" + .."field["..(shift_edit_field+data.hileft+3.3)..",0.2;4.8,1;" + .."infotext_box;"..S("Edit chest description:")..";" + ..formspec_infotext.."]" + end + end + if data.color then + local colorID = meta:get_int("color") + local colorName + if chest_mark_colors[colorID] then + colorName = chest_mark_colors[colorID][2] + else + colorName = S("None") + end + formspec = formspec.."label["..(data.coleft+0.2)..","..(data.lotop+3)..";"..S("Color Filter: %s"):format(colorName).."]" + end + meta:set_string("formspec", formspec) +end + +local function sort_inventory(inv) + local inlist = inv:get_list("main") + local typecnt = {} + local typekeys = {} + for _, st in ipairs(inlist) do + if not st:is_empty() then + local n = st:get_name() + local w = st:get_wear() + local m = st:get_metadata() + local k = string.format("%s %05d %s", n, w, m) + if not typecnt[k] then + typecnt[k] = {st} + table.insert(typekeys, k) + else + table.insert(typecnt[k], st) + end + end + end + table.sort(typekeys) + inv:set_list("main", {}) + for _, k in ipairs(typekeys) do + for _, item in ipairs(typecnt[k]) do + inv:add_item("main", item) + end + end +end local function get_receive_fields(name, data) - if not data.infotext and not data.color then - return nil - end local lname = name:lower() return function(pos, formname, fields, sender) local meta = minetest.get_meta(pos) - local node = minetest.get_node(pos) local page = "main" + if fields.sort or (data.autosort and fields.quit and meta:get_int("autosort") == 1) then + sort_inventory(meta:get_inventory()) + end if fields.edit_infotext then page = "edit_infotext" end - if fields.save_infotext then + if fields.autosort_to_1 then meta:set_int("autosort", 1) end + if fields.autosort_to_0 then meta:set_int("autosort", 0) end + if fields.infotext_box then meta:set_string("infotext", fields.infotext_box) - end - local formspec = data.formspec - local formspec_infotext = minetest.formspec_escape(meta:get_string("infotext")) - if page == "main" and data.infotext then - formspec = formspec.."image_button[2.1,0.1;0.8,0.8;" - .."technic_pencil_icon.png;edit_infotext;]" - .."label[3,0;"..formspec_infotext.."]" - end - if page == "edit_infotext" then - formspec = formspec.."image_button[2.1,0.1;0.8,0.8;" - .."technic_checkmark_icon.png;save_infotext;]" - .."field[3.3,0.2;4.8,1;" - .."infotext_box;"..S("Edit chest description:")..";" - ..formspec_infotext.."]" end if data.color then -- This sets the node local nn = "technic:"..lname..(data.locked and "_locked" or "").."_chest" check_color_buttons(pos, meta, nn, fields) - local colorID = meta:get_int("color") - local colorName - if chest_mark_colors[colorID] then - colorName = chest_mark_colors[colorID][2] - else - colorName = S("None") - end - formspec = formspec.."label[8.2,9;"..S("Color Filter: %s"):format(colorName).."]" end - meta:set_string("formspec", formspec) + if fields["fs_helpers_cycling:0:splitstacks"] + or fields["fs_helpers_cycling:1:splitstacks"] then + if not pipeworks.may_configure(pos, sender) then return end + fs_helpers.on_receive_fields(pos, fields) + end + + meta:get_inventory():set_size("main", data.width * data.height) + set_formspec(pos, data, page) end end - -function technic.chests:register(name, data) +function technic.chests:definition(name, data) local lname = name:lower() name = S(name) + local d = {} + for k, v in pairs(data) do d[k] = v end + data = d - local width = math.max(data.color and 11 or 8, data.width) + data.lowidth = 8 + data.ovwidth = math.max(data.lowidth, data.width) + data.hileft = (data.ovwidth - data.width) / 2 + data.loleft = (data.ovwidth - data.lowidth) / 2 + if data.color then + if data.lowidth + 3 <= data.ovwidth then + data.coleft = data.ovwidth - 3 + if data.loleft + data.lowidth > data.coleft then + data.loleft = data.coleft - data.lowidth + end + else + data.loleft = 0 + data.coleft = data.lowidth + data.ovwidth = data.lowidth + 3 + end + end + data.lotop = data.height + 2 + data.ovheight = data.lotop + 4 local locked_after_place = nil local front = {"technic_"..lname.."_chest_front.png"} - data.formspec = "invsize["..width..",10;]".. + data.base_formspec = "size["..data.ovwidth..","..data.ovheight.."]".. "label[0,0;"..S("%s Chest"):format(name).."]".. - "list[current_name;main;0,1;"..width..",4;]".. - "list[current_player;main;0,6;8,4;]".. - "background[-0.19,-0.25;"..width..".4,10.75;ui_form_bg.png]".. - "background[0,1;"..width..",4;technic_"..lname.."_chest_inventory.png]".. - "background[0,6;8,4;ui_main_inventory.png]" + "list[context;main;"..data.hileft..",1;"..data.width..","..data.height..";]".. + "list[current_player;main;"..data.loleft..","..data.lotop..";8,4;]".. + "background[-0.19,-0.25;"..(data.ovwidth+0.4)..","..(data.ovheight+0.75)..";technic_chest_form_bg.png]".. + "background["..data.hileft..",1;"..data.width..","..data.height..";technic_"..lname.."_chest_inventory.png]".. + "background["..data.loleft..","..data.lotop..";8,4;technic_main_inventory.png]".. + "listring[]" + + if data.sort then + data.base_formspec = data.base_formspec.."button["..data.hileft..","..(data.height+1.1)..";1,0.8;sort;"..S("Sort").."]" + end if data.color then - data.formspec = data.formspec..get_color_buttons() + data.base_formspec = data.base_formspec..get_color_buttons(data.coleft, data.lotop) end if data.locked then @@ -130,8 +236,11 @@ meta:set_string("infotext", S("%s Locked Chest (owned by %s)") :format(name, meta:get_string("owner"))) + pipeworks.after_place(pos) end table.insert(front, "technic_"..lname.."_chest_lock_overlay.png") + else + locked_after_place = pipeworks.after_place end local desc @@ -141,45 +250,99 @@ desc = S("%s Chest"):format(name) end + local tentry = tube_entry + if tube_entry ~= "" then + if lname == "wooden" then + tentry = "^pipeworks_tube_connection_wooden.png" + elseif lname == "mithril" then + tentry = "^pipeworks_tube_connection_stony.png" + end + end local def = { description = desc, - tiles = {"technic_"..lname.."_chest_top.png", "technic_"..lname.."_chest_top.png", - "technic_"..lname.."_chest_side.png", "technic_"..lname.."_chest_side.png", - "technic_"..lname.."_chest_side.png", table.concat(front, "^")}, + tiles = { + "technic_"..lname.."_chest_top.png"..tentry, + "technic_"..lname.."_chest_top.png"..tentry, + "technic_"..lname.."_chest_side.png"..tentry, + "technic_"..lname.."_chest_side.png"..tentry, + "technic_"..lname.."_chest_side.png"..tentry, + table.concat(front, "^") + }, paramtype2 = "facedir", groups = self.groups, tube = self.tube, legacy_facedir_simple = true, sounds = default.node_sound_wood_defaults(), after_place_node = locked_after_place, + after_dig_node = pipeworks.after_dig, + on_construct = function(pos) local meta = minetest.get_meta(pos) - meta:set_string("formspec", data.formspec - ..(data.color and "label[8.2,9;Color Filter: None" or "") - ..(data.infotext and "image_button[2.1,0.1;0.8,0.8;" - .."technic_pencil_icon.png;edit_infotext;]" or "")) meta:set_string("infotext", S("%s Chest"):format(name)) + set_formspec(pos, data, "main") local inv = meta:get_inventory() - inv:set_size("main", data.width * 4) + inv:set_size("main", data.width * data.height) end, can_dig = self.can_dig, on_receive_fields = get_receive_fields(name, data), on_metadata_inventory_move = self.on_inv_move, on_metadata_inventory_put = self.on_inv_put, on_metadata_inventory_take = self.on_inv_take, + on_blast = function(pos) + local drops = {} + default.get_inventory_drops(pos, "main", drops) + drops[#drops+1] = "technic:"..name:lower()..(data.locked and "_locked" or "").."_chest" + minetest.remove_node(pos) + return drops + end, } if data.locked then def.allow_metadata_inventory_move = self.inv_move def.allow_metadata_inventory_put = self.inv_put def.allow_metadata_inventory_take = self.inv_take + def.on_blast = function() end + def.can_dig = function(pos,player) + local meta = minetest.get_meta(pos); + local inv = meta:get_inventory() + return inv:is_empty("main") and default.can_interact_with_node(player, pos) + end + def.on_skeleton_key_use = function(pos, player, newsecret) + local meta = minetest.get_meta(pos) + local owner = meta:get_string("owner") + local name = player:get_player_name() + + -- verify placer is owner of lockable chest + if owner ~= name then + minetest.record_protection_violation(pos, name) + minetest.chat_send_player(name, "You do not own this chest.") + return nil + end + + local secret = meta:get_string("key_lock_secret") + if secret == "" then + secret = newsecret + meta:set_string("key_lock_secret", secret) + end + + return secret, "a locked chest", owner + end end + return def +end - local nn = "technic:"..lname..(data.locked and "_locked" or "").."_chest" +function technic.chests:register(name, data) + local def = technic.chests:definition(name, data) + local nn = "technic:"..name:lower()..(data.locked and "_locked" or "").."_chest" minetest.register_node(":"..nn, def) if data.color then - front[3] = front[2] + local mk_front + if string.find(def.tiles[6], "%^") then + mk_front = function (overlay) return def.tiles[6]:gsub("%^", "^"..overlay.."^") end + else + mk_front = function (overlay) return def.tiles[6].."^"..overlay end + end for i = 1, 15 do local postfix = colorid_to_postfix(i) local colordef = {} @@ -188,8 +351,7 @@ end colordef.drop = nn colordef.groups = self.groups_noinv - front[2] = "technic_chest_overlay"..postfix..".png" - colordef.tiles[6] = table.concat(front, "^") + colordef.tiles = { def.tiles[1], def.tiles[2], def.tiles[3], def.tiles[4], def.tiles[5], mk_front("technic_chest_overlay"..postfix..".png") } minetest.register_node(":"..nn..postfix, colordef) end end -- Gitblit v1.8.0