diff options
Diffstat (limited to 'tubes.lua')
| -rwxr-xr-x[-rw-r--r--] | tubes.lua | 271 |
1 files changed, 106 insertions, 165 deletions
diff --git a/tubes.lua b/tubes.lua index 97f0237..c0375ef 100644..100755 --- a/tubes.lua +++ b/tubes.lua @@ -20,7 +20,7 @@ local register_one_tube = function(name, tname, dropname, desc, plain, noctrs, e end for _, v in ipairs(connects) do - pipeworks.add_node_box(outboxes, pipeworks.tube_boxes[v]) + table.extend(outboxes, pipeworks.tube_boxes[v]) table.insert(outsel, pipeworks.tube_selectboxes[v]) outimgs[vti[v]] = noctrs[v] end @@ -31,13 +31,13 @@ local register_one_tube = function(name, tname, dropname, desc, plain, noctrs, e outimgs[vti[v]] = ends[v] end - local tgroups = {snappy = 3, tube = 1, not_in_creative_inventory = 1} + local tgroups = {snappy = 3, tube = 1, tubedevice = 1, not_in_creative_inventory = 1} local tubedesc = desc.." "..dump(connects).."... You hacker, you." local iimg = plain[1] local wscale = {x = 1, y = 1, z = 1} if #connects == 0 then - tgroups = {snappy = 3, tube = 1} + tgroups = {snappy = 3, tube = 1, tubedevice = 1} tubedesc = desc iimg=inv outimgs = { @@ -50,7 +50,8 @@ local register_one_tube = function(name, tname, dropname, desc, plain, noctrs, e wscale = {x = 1, y = 1, z = 0.01} end - table.insert(pipeworks.tubenodes, name.."_"..tname) + local rname = name.."_"..tname + table.insert(pipeworks.tubenodes, rname) local nodedef = { description = tubedesc, @@ -62,7 +63,7 @@ local register_one_tube = function(name, tname, dropname, desc, plain, noctrs, e wield_scale = wscale, paramtype = "light", selection_box = { - type = "fixed", + type = "fixed", fixed = outsel }, node_box = { @@ -77,26 +78,22 @@ local register_one_tube = function(name, tname, dropname, desc, plain, noctrs, e style = style, drop = name.."_"..dropname, tubelike = 1, - tube = {connect_sides = {front = 1, back = 1, left = 1, right = 1, top = 1, bottom = 1}}, - on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_int("tubelike", 1) - if minetest.registered_nodes[name.."_"..tname].on_construct_ then - minetest.registered_nodes[name.."_"..tname].on_construct_(pos) - end - end, - after_place_node = function(pos) + tube = { + connect_sides = {front = 1, back = 1, left = 1, right = 1, top = 1, bottom = 1}, + priority = 50 + }, + --[[after_place_node = function(pos) pipeworks.scan_for_tube_objects(pos) - if minetest.registered_nodes[name.."_"..tname].after_place_node_ then - minetest.registered_nodes[name.."_"..tname].after_place_node_(pos) + if minetest.registered_nodes[rname].after_place_node_ then + minetest.registered_nodes[rname].after_place_node_(pos) end end, after_dig_node = function(pos) pipeworks.scan_for_tube_objects(pos) - if minetest.registered_nodes[name.."_"..tname].after_dig_node_ then - minetest.registered_nodes[name.."_"..tname].after_dig_node_(pos) + if minetest.registered_nodes[rname].after_dig_node_ then + minetest.registered_nodes[rname].after_dig_node_(pos) end - end + end]] } if style == "6d" then nodedef.paramtype2 = "facedir" @@ -105,9 +102,9 @@ local register_one_tube = function(name, tname, dropname, desc, plain, noctrs, e if special == nil then special = {} end for key, value in pairs(special) do - if key == "on_construct" or key == "after_dig_node" or key == "after_place_node" then - nodedef[key.."_"] = value - elseif key == "groups" then + --if key == "after_dig_node" or key == "after_place_node" then + -- nodedef[key.."_"] = value + if key == "groups" then for group, val in pairs(value) do nodedef.groups[group] = val end @@ -115,19 +112,12 @@ local register_one_tube = function(name, tname, dropname, desc, plain, noctrs, e for key, val in pairs(value) do nodedef.tube[key] = val end - elseif type(value) == "table" then - nodedef[key] = pipeworks.replace_name(value, "#id", tname) - elseif type(value) == "string" then - nodedef[key] = string.gsub(value, "#id", tname) else - nodedef[key] = value + nodedef[key] = table.recursive_replace(value, "#id", tname) end end - local prefix = ":" - if string.find(name, "pipeworks:") then prefix = "" end - - minetest.register_node(prefix..name.."_"..tname, nodedef) + minetest.register_node(rname, nodedef) end pipeworks.register_tube = function(name, desc, plain, noctrs, ends, short, inv, special, old_registration) @@ -181,22 +171,18 @@ pipeworks.register_tube = function(name, desc, plain, noctrs, ends, short, inv, wield_image = inv, paramtype = "light", sunlight_propagates = true, - description = desc.." (legacy)", - on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_int("tubelike", 1) - end, - after_place_node = function(pos) + description = "Pneumatic tube segment (legacy)", + --[[after_place_node = function(pos) pipeworks.scan_for_tube_objects(pos) if minetest.registered_nodes[name.."_1"].after_place_node_ then minetest.registered_nodes[name.."_1"].after_place_node_(pos) end - end, - groups = {not_in_creative_inventory = 1, tube_to_update = 1}, + end,]] + groups = {not_in_creative_inventory = 1, tube_to_update = 1, tube = 1}, tube = {connect_sides = {front = 1, back = 1, left = 1, right = 1, top = 1, bottom = 1}}, drop = name.."_1", }) - table.insert(pipeworks.tubenodes,cname) + table.insert(pipeworks.tubenodes, cname) for xm = 0, 1 do for xp = 0, 1 do for ym = 0, 1 do @@ -221,8 +207,8 @@ if REGISTER_COMPATIBILITY then interval = 1, chance = 1, action = function(pos, node, active_object_count, active_object_count_wider) - local minp = {x = pos.x-1, y = pos.y-1, z = pos.z-1} - local maxp = {x = pos.x+1, y = pos.y+1, z = pos.z+1} + local minp = vector.subtract(pos, 1) + local maxp = vector.add(pos, 1) if table.getn(minetest.find_nodes_in_area(minp, maxp, "ignore")) == 0 then pipeworks.scan_for_tube_objects(pos) end @@ -241,7 +227,7 @@ local end_textures = {"pipeworks_tube_end.png", "pipeworks_tube_end.png", "pipew local short_texture = "pipeworks_tube_short.png" local inv_texture = "pipeworks_tube_inv.png" -pipeworks.register_tube("pipeworks:tube", "Pneumatic Tube Segment", plain_textures, noctr_textures, end_textures, short_texture, inv_texture) +pipeworks.register_tube("pipeworks:tube", "Pneumatic tube segment", plain_textures, noctr_textures, end_textures, short_texture, inv_texture) if pipeworks.enable_mese_tube then local mese_noctr_textures = {"pipeworks_mese_tube_noctr_1.png", "pipeworks_mese_tube_noctr_2.png", "pipeworks_mese_tube_noctr_3.png", @@ -252,6 +238,39 @@ if pipeworks.enable_mese_tube then "pipeworks_mese_tube_end.png", "pipeworks_mese_tube_end.png", "pipeworks_mese_tube_end.png"} local mese_short_texture = "pipeworks_mese_tube_short.png" local mese_inv_texture = "pipeworks_mese_tube_inv.png" + local function update_formspec(pos) + local meta = minetest.get_meta(pos) + local old_formspec = meta:get_string("formspec") + if string.find(old_formspec, "button0") then -- Old version + local inv = meta:get_inventory() + for i = 1, 6 do + for _, stack in ipairs(inv:get_list("line"..i)) do + minetest.item_drop(stack, "", pos) + end + end + end + meta:set_string("formspec", + "size[8,11]".. + "list[current_name;line1;1,0;6,1;]".. + "list[current_name;line2;1,1;6,1;]".. + "list[current_name;line3;1,2;6,1;]".. + "list[current_name;line4;1,3;6,1;]".. + "list[current_name;line5;1,4;6,1;]".. + "list[current_name;line6;1,5;6,1;]".. + "image[0,0;1,1;pipeworks_white.png]".. + "image[0,1;1,1;pipeworks_black.png]".. + "image[0,2;1,1;pipeworks_green.png]".. + "image[0,3;1,1;pipeworks_yellow.png]".. + "image[0,4;1,1;pipeworks_blue.png]".. + "image[0,5;1,1;pipeworks_red.png]".. + fs_helpers.cycling_button(meta, "button[7,0;1,1", "b1s", {"Off", "On"}).. + fs_helpers.cycling_button(meta, "button[7,1;1,1", "b2s", {"Off", "On"}).. + fs_helpers.cycling_button(meta, "button[7,2;1,1", "b3s", {"Off", "On"}).. + fs_helpers.cycling_button(meta, "button[7,3;1,1", "b4s", {"Off", "On"}).. + fs_helpers.cycling_button(meta, "button[7,4;1,1", "b5s", {"Off", "On"}).. + fs_helpers.cycling_button(meta, "button[7,5;1,1", "b6s", {"Off", "On"}).. + "list[current_player;main;0,7;8,4;]") + end pipeworks.register_tube("pipeworks:mese_tube", "Sorting Pneumatic Tube Segment", mese_plain_textures, mese_noctr_textures, mese_end_textures, mese_short_texture, mese_inv_texture, {tube = {can_go = function(pos, node, velocity, stack) @@ -266,6 +285,7 @@ if pipeworks.enable_mese_tube then if st:get_name() == name then found = true table.insert(tbl, vect) + break end end end @@ -288,71 +308,37 @@ if pipeworks.enable_mese_tube then meta:set_int("l"..tostring(i).."s", 1) inv:set_size("line"..tostring(i), 6*1) end - meta:set_string("formspec", - "size[8,11]".. - "list[current_name;line1;1,0;6,1;]".. - "list[current_name;line2;1,1;6,1;]".. - "list[current_name;line3;1,2;6,1;]".. - "list[current_name;line4;1,3;6,1;]".. - "list[current_name;line5;1,4;6,1;]".. - "list[current_name;line6;1,5;6,1;]".. - "image[0,0;1,1;pipeworks_white.png]".. - "image[0,1;1,1;pipeworks_black.png]".. - "image[0,2;1,1;pipeworks_green.png]".. - "image[0,3;1,1;pipeworks_yellow.png]".. - "image[0,4;1,1;pipeworks_blue.png]".. - "image[0,5;1,1;pipeworks_red.png]".. - "button[7,0;1,1;button10;On]".. - "button[7,1;1,1;button20;On]".. - "button[7,2;1,1;button30;On]".. - "button[7,3;1,1;button40;On]".. - "button[7,4;1,1;button50;On]".. - "button[7,5;1,1;button60;On]".. - "list[current_player;main;0,7;8,4;]") - meta:set_string("infotext", "Sorting Pneumatic Tube Segment") + update_formspec(pos) + meta:set_string("infotext", "Mese pneumatic tube") end, + on_punch = update_formspec, on_receive_fields = function(pos, formname, fields, sender) - local meta = minetest.get_meta(pos) - local i - if fields.quit then return end - for key, _ in pairs(fields) do - if key:sub(1, 6) == "button" then - local i = key:sub(7, 7) - local s = key:sub(8, 8) - if s == "" then s = 1 - meta:get_int("l"..i.."s") end - meta:set_int("l"..i.."s", s) - end - end - local frm = "size[8,11]".. - "list[current_name;line1;1,0;6,1;]".. - "list[current_name;line2;1,1;6,1;]".. - "list[current_name;line3;1,2;6,1;]".. - "list[current_name;line4;1,3;6,1;]".. - "list[current_name;line5;1,4;6,1;]".. - "list[current_name;line6;1,5;6,1;]".. - "image[0,0;1,1;pipeworks_white.png]".. - "image[0,1;1,1;pipeworks_black.png]".. - "image[0,2;1,1;pipeworks_green.png]".. - "image[0,3;1,1;pipeworks_yellow.png]".. - "image[0,4;1,1;pipeworks_blue.png]".. - "image[0,5;1,1;pipeworks_red.png]" - for i = 1, 6 do - local st = meta:get_int("l"..tostring(i).."s") - if st == 0 then - frm = frm.."button[7,"..tostring(i-1)..";1,1;button"..tostring(i).."1;Off]" - else - frm = frm.."button[7,"..tostring(i-1)..";1,1;button"..tostring(i).."0;On]" - end - end - frm = frm.."list[current_player;main;0,7;8,4;]" - meta:set_string("formspec", frm) + fs_helpers.on_receive_fields(pos, fields) + update_formspec(pos) end, can_dig = function(pos, player) local meta = minetest.get_meta(pos) local inv = meta:get_inventory() return (inv:is_empty("line1") and inv:is_empty("line2") and inv:is_empty("line3") and inv:is_empty("line4") and inv:is_empty("line5") and inv:is_empty("line6")) - end + end, + allow_metadata_inventory_put = function(pos, listname, index, stack, player) + local inv = minetest.get_meta(pos):get_inventory() + local stack_copy = ItemStack(stack) + stack_copy:set_count(1) + inv:set_stack(listname, index, stack_copy) + return 0 + end, + allow_metadata_inventory_take = function(pos, listname, index, stack, player) + local inv = minetest.get_meta(pos):get_inventory() + inv:set_stack(listname, index, ItemStack("")) + return 0 + end, + allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) + local inv = minetest.get_meta(pos):get_inventory() + inv:set_stack(from_list, from_index, ItemStack("")) + return 0 + end, }, true) -- Must use old tubes, since the textures are rotated with 6d ones end @@ -360,6 +346,7 @@ if pipeworks.enable_detector_tube then local detector_plain_textures = {"pipeworks_detector_tube_plain.png", "pipeworks_detector_tube_plain.png", "pipeworks_detector_tube_plain.png", "pipeworks_detector_tube_plain.png", "pipeworks_detector_tube_plain.png", "pipeworks_detector_tube_plain.png"} local detector_inv_texture = "pipeworks_detector_tube_inv.png" + local detector_tube_step = 2 * tonumber(minetest.setting_get("dedicated_server_step")) pipeworks.register_tube("pipeworks:detector_tube_on", "Detecting Pneumatic Tube Segment on (you hacker you)", detector_plain_textures, noctr_textures, end_textures, short_texture, detector_inv_texture, {tube = {can_go = function(pos, node, velocity, stack) @@ -367,12 +354,8 @@ if pipeworks.enable_detector_tube then local name = minetest.get_node(pos).name local nitems = meta:get_int("nitems")+1 meta:set_int("nitems", nitems) - local saved_pos = { x = pos.x, y = pos.y, z = pos.z } - minetest.after(0, function () - minetest.after(0, function () - minetest.after(0, minetest.registered_nodes[name].item_exit, saved_pos) - end) - end) + local saved_pos = vector.new(pos) + minetest.after(detector_tube_step, minetest.registered_nodes[name].item_exit, saved_pos) return pipeworks.notvel(pipeworks.meseadjlist,velocity) end}, groups = {mesecon = 2, not_in_creative_inventory = 1}, @@ -396,13 +379,11 @@ if pipeworks.enable_detector_tube then local meta = minetest.get_meta(pos) meta:set_int("nitems", 1) local name = minetest.get_node(pos).name - local saved_pos = { x = pos.x, y = pos.y, z = pos.z } - minetest.after(0, function () - minetest.after(0, function () - minetest.after(0, minetest.registered_nodes[name].item_exit, saved_pos) - end) - end) - end}) + local saved_pos = vector.new(pos) + minetest.after(detector_tube_step, minetest.registered_nodes[name].item_exit, saved_pos) + + end + }) pipeworks.register_tube("pipeworks:detector_tube_off", "Detecting Pneumatic Tube Segment", detector_plain_textures, noctr_textures, end_textures, short_texture, detector_inv_texture, {tube = {can_go = function(pos, node, velocity, stack) @@ -474,7 +455,6 @@ if pipeworks.enable_accelerator_tube then end if pipeworks.enable_crossing_tube then - -- FIXME: The textures are not the correct ones local crossing_noctr_textures = {"pipeworks_crossing_tube_noctr.png", "pipeworks_crossing_tube_noctr.png", "pipeworks_crossing_tube_noctr.png", "pipeworks_crossing_tube_noctr.png", "pipeworks_crossing_tube_noctr.png", "pipeworks_crossing_tube_noctr.png"} local crossing_plain_textures = {"pipeworks_crossing_tube_plain.png" ,"pipeworks_crossing_tube_plain.png", "pipeworks_crossing_tube_plain.png", @@ -513,10 +493,7 @@ if pipeworks.enable_sand_tube then for _, object in ipairs(minetest.get_objects_inside_radius(pos, 2)) do if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then if object:get_luaentity().itemstring ~= "" then - local titem = pipeworks.tube_item(pos,object:get_luaentity().itemstring) - titem:get_luaentity().start_pos = {x = pos.x, y = pos.y-1, z = pos.z} - titem:setvelocity({x = 0.01, y = 1, z = -0.01}) - titem:setacceleration({x = 0, y = 0, z = 0}) + pipeworks.tube_item(pos, pos, vector.new(0, 0, 0), object:get_luaentity().itemstring) end object:get_luaentity().itemstring = "" object:remove() @@ -576,10 +553,7 @@ if pipeworks.enable_mese_sand_tube then for _,object in ipairs(get_objects_with_square_radius(pos, minetest.env:get_meta(pos):get_int("dist"))) do if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then if object:get_luaentity().itemstring ~= "" then - local titem = pipeworks.tube_item(pos, object:get_luaentity().itemstring) - titem:get_luaentity().start_pos = {x = pos.x, y = pos.y-1, z = pos.z} - titem:setvelocity({x = 0.01, y = 1, z = -0.01}) - titem:setacceleration({x = 0, y = 0, z = 0}) + pipeworks.tube_item(pos, pos, vector.new(0, 0, 0), object:get_luaentity().itemstring) end object:get_luaentity().itemstring = "" object:remove() @@ -589,26 +563,9 @@ if pipeworks.enable_mese_sand_tube then }) end -local function facedir_to_right_dir(facedir) - - --find the other directions - local backdir = minetest.facedir_to_dir(facedir) - local topdir = ({[0] = {x = 0, y = 1, z = 0}, - {x = 0, y = 0, z = 1}, - {x = 0, y = 0, z = -1}, - {x = 1, y = 0, z = 0}, - {x = -1, y = 0, z = 0}, - {x = 0, y = -1, z = 0}})[math.floor(facedir/4)] - - --return a cross product - return {x = topdir.y*backdir.z - backdir.y*topdir.z, - y = topdir.z*backdir.x - backdir.z*topdir.x, - z = topdir.x*backdir.y - backdir.x*topdir.y} -end - if pipeworks.enable_one_way_tube then minetest.register_node("pipeworks:one_way_tube", { - description = "One-way Pneumatic Tube Segment", + description = "One way tube", tiles = {"pipeworks_one_way_tube_top.png", "pipeworks_one_way_tube_top.png", "pipeworks_one_way_tube_output.png", "pipeworks_one_way_tube_input.png", "pipeworks_one_way_tube_side.png", "pipeworks_one_way_tube_top.png"}, paramtype2 = "facedir", @@ -616,35 +573,19 @@ if pipeworks.enable_one_way_tube then paramtype = "light", node_box = {type = "fixed", fixed = {{-1/2, -9/64, -9/64, 1/2, 9/64, 9/64}}}, - groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, tubedevice = 1, tubedevice_receiver = 1}, + groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, tubedevice = 1}, legacy_facedir_simple = true, sounds = default.node_sound_wood_defaults(), - on_construct = function(pos) - minetest.get_meta(pos):set_int("tubelike", 1) - end, - after_place_node = function(pos) - pipeworks.scan_for_tube_objects(pos) - end, - after_dig_node = function(pos) - pipeworks.scan_for_tube_objects(pos) - end, - tube = {connect_sides = {left = 1, right = 1}, + tube = { + connect_sides = {left = 1, right = 1}, can_go = function(pos, node, velocity, stack) - return velocity - end, - insert_object = function(pos, node, stack, direction) - item1 = pipeworks.tube_item(pos, stack) - item1:get_luaentity().start_pos = pos - item1:setvelocity({x = direction.x*direction.speed, y = direction.y*direction.speed, z = direction.z*direction.speed}) - item1:setacceleration({x = 0, y = 0, z = 0}) - return ItemStack("") + return {velocity} end, can_insert = function(pos, node, stack, direction) - local dir = facedir_to_right_dir(node.param2) - if dir.x == direction.x and dir.y == direction.y and dir.z == direction.z then - return true - end - return false - end}, + local dir = minetest.facedir_to_right_dir(node.param2) + return vector.equals(dir, direction) + end, + priority = 75 -- Higher than normal tubes, but lower than receivers + }, }) end |