From 61af474116cf15eec3d78deae3c84eefbcd607a8 Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 29 Jan 2015 22:52:13 +0100 Subject: rename tubes to tube_registration to avoid catch-all usage --- init.lua | 2 +- tube_registration.lua | 234 ++++++++++++++++++++++++++++++++++++++++++++++++++ tubes.lua | 234 -------------------------------------------------- 3 files changed, 235 insertions(+), 235 deletions(-) create mode 100644 tube_registration.lua delete mode 100644 tubes.lua diff --git a/init.lua b/init.lua index 872ac44..ef8c00a 100644 --- a/init.lua +++ b/init.lua @@ -115,7 +115,7 @@ dofile(pipeworks.modpath.."/luaentity.lua") dofile(pipeworks.modpath.."/item_transport.lua") dofile(pipeworks.modpath.."/flowing_logic.lua") dofile(pipeworks.modpath.."/crafts.lua") -dofile(pipeworks.modpath.."/tubes.lua") +dofile(pipeworks.modpath.."/tube_registration.lua") dofile(pipeworks.modpath.."/routing_tubes.lua") dofile(pipeworks.modpath.."/sorting_tubes.lua") dofile(pipeworks.modpath.."/vacuum_tubes.lua") diff --git a/tube_registration.lua b/tube_registration.lua new file mode 100644 index 0000000..6ef4fee --- /dev/null +++ b/tube_registration.lua @@ -0,0 +1,234 @@ +-- This file supplies the various kinds of pneumatic tubes + +pipeworks.tubenodes = {} + +minetest.register_alias("pipeworks:tube", "pipeworks:tube_000000") + +-- now, a function to define the tubes + +local REGISTER_COMPATIBILITY = true + +local vti = {4, 3, 2, 1, 6, 5} + +local default_textures = { + noctrs = { "pipeworks_tube_noctr.png", "pipeworks_tube_noctr.png", "pipeworks_tube_noctr.png", + "pipeworks_tube_noctr.png", "pipeworks_tube_noctr.png", "pipeworks_tube_noctr.png"}, + plain = { "pipeworks_tube_plain.png", "pipeworks_tube_plain.png", "pipeworks_tube_plain.png", + "pipeworks_tube_plain.png", "pipeworks_tube_plain.png", "pipeworks_tube_plain.png"}, + ends = { "pipeworks_tube_end.png", "pipeworks_tube_end.png", "pipeworks_tube_end.png", + "pipeworks_tube_end.png", "pipeworks_tube_end.png", "pipeworks_tube_end.png"}, + short = "pipeworks_tube_short.png", + inv = "pipeworks_tube_inv.png", +} + +local register_one_tube = function(name, tname, dropname, desc, plain, noctrs, ends, short, inv, special, connects, style) + noctrs = noctrs or default_textures.noctrs + plain = plain or default_textures.plain + ends = ends or default_textures.ends + short = short or default_textures.short + inv = inv or default_textures.inv + + local outboxes = {} + local outsel = {} + local outimgs = {} + + for i = 1, 6 do + outimgs[vti[i]] = plain[i] + end + + for _, v in ipairs(connects) do + table.extend(outboxes, pipeworks.tube_boxes[v]) + table.insert(outsel, pipeworks.tube_selectboxes[v]) + outimgs[vti[v]] = noctrs[v] + end + + if #connects == 1 then + local v = connects[1] + v = v-1 + 2*(v%2) -- Opposite side + outimgs[vti[v]] = ends[v] + end + + 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, tubedevice = 1} + tubedesc = desc + iimg=inv + outimgs = { + short, short, + ends[3],ends[4], + short, short + } + outboxes = { -24/64, -9/64, -9/64, 24/64, 9/64, 9/64 } + outsel = { -24/64, -10/64, -10/64, 24/64, 10/64, 10/64 } + wscale = {x = 1, y = 1, z = 0.01} + end + + local rname = name.."_"..tname + table.insert(pipeworks.tubenodes, rname) + + local nodedef = { + description = tubedesc, + drawtype = "nodebox", + tiles = outimgs, + sunlight_propagates = true, + inventory_image = iimg, + wield_image = iimg, + wield_scale = wscale, + paramtype = "light", + selection_box = { + type = "fixed", + fixed = outsel + }, + node_box = { + type = "fixed", + fixed = outboxes + }, + groups = tgroups, + sounds = default.node_sound_wood_defaults(), + walkable = true, + stack_max = 99, + basename = name, + style = style, + drop = name.."_"..dropname, + tubelike = 1, + 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[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[rname].after_dig_node_ then + minetest.registered_nodes[rname].after_dig_node_(pos) + end + end]] + } + if style == "6d" then + nodedef.paramtype2 = "facedir" + end + + if special == nil then special = {} end + + for key, value in pairs(special) do + --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 + elseif key == "tube" then + for key, val in pairs(value) do + nodedef.tube[key] = val + end + else + nodedef[key] = table.recursive_replace(value, "#id", tname) + end + end + + minetest.register_node(rname, nodedef) +end + +pipeworks.register_tube = function(name, desc, plain, noctrs, ends, short, inv, special, old_registration) + if old_registration then + for xm = 0, 1 do + for xp = 0, 1 do + for ym = 0, 1 do + for yp = 0, 1 do + for zm = 0, 1 do + for zp = 0, 1 do + local connects = {} + if xm == 1 then + connects[#connects+1] = 1 + end + if xp == 1 then + connects[#connects+1] = 2 + end + if ym == 1 then + connects[#connects+1] = 3 + end + if yp == 1 then + connects[#connects+1] = 4 + end + if zm == 1 then + connects[#connects+1] = 5 + end + if zp == 1 then + connects[#connects+1] = 6 + end + local tname = xm..xp..ym..yp..zm..zp + register_one_tube(name, tname, "000000", desc, plain, noctrs, ends, short, inv, special, connects, "old") + end + end + end + end + end + end + else + -- 6d tubes: uses only 10 nodes instead of 64, but the textures must be rotated + local cconnects = {{}, {1}, {1, 2}, {1, 3}, {1, 3, 5}, {1, 2, 3}, {1, 2, 3, 5}, {1, 2, 3, 4}, {1, 2, 3, 4, 5}, {1, 2, 3, 4, 5, 6}} + for index, connects in ipairs(cconnects) do + register_one_tube(name, tostring(index), "1", desc, plain, noctrs, ends, short, inv, special, connects, "6d") + end + if REGISTER_COMPATIBILITY then + local cname = name.."_compatibility" + minetest.register_node(cname, { + drawtype = "airlike", + style = "6d", + basename = name, + inventory_image = inv, + wield_image = inv, + paramtype = "light", + sunlight_propagates = true, + 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, 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) + for xm = 0, 1 do + for xp = 0, 1 do + for ym = 0, 1 do + for yp = 0, 1 do + for zm = 0, 1 do + for zp = 0, 1 do + local tname = xm..xp..ym..yp..zm..zp + minetest.register_alias(name.."_"..tname, cname) + end + end + end + end + end + end + end + end +end + +if REGISTER_COMPATIBILITY then + minetest.register_abm({ + nodenames = {"group:tube_to_update"}, + interval = 1, + chance = 1, + action = function(pos, node, active_object_count, active_object_count_wider) + 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 + end + }) +end diff --git a/tubes.lua b/tubes.lua deleted file mode 100644 index 6ef4fee..0000000 --- a/tubes.lua +++ /dev/null @@ -1,234 +0,0 @@ --- This file supplies the various kinds of pneumatic tubes - -pipeworks.tubenodes = {} - -minetest.register_alias("pipeworks:tube", "pipeworks:tube_000000") - --- now, a function to define the tubes - -local REGISTER_COMPATIBILITY = true - -local vti = {4, 3, 2, 1, 6, 5} - -local default_textures = { - noctrs = { "pipeworks_tube_noctr.png", "pipeworks_tube_noctr.png", "pipeworks_tube_noctr.png", - "pipeworks_tube_noctr.png", "pipeworks_tube_noctr.png", "pipeworks_tube_noctr.png"}, - plain = { "pipeworks_tube_plain.png", "pipeworks_tube_plain.png", "pipeworks_tube_plain.png", - "pipeworks_tube_plain.png", "pipeworks_tube_plain.png", "pipeworks_tube_plain.png"}, - ends = { "pipeworks_tube_end.png", "pipeworks_tube_end.png", "pipeworks_tube_end.png", - "pipeworks_tube_end.png", "pipeworks_tube_end.png", "pipeworks_tube_end.png"}, - short = "pipeworks_tube_short.png", - inv = "pipeworks_tube_inv.png", -} - -local register_one_tube = function(name, tname, dropname, desc, plain, noctrs, ends, short, inv, special, connects, style) - noctrs = noctrs or default_textures.noctrs - plain = plain or default_textures.plain - ends = ends or default_textures.ends - short = short or default_textures.short - inv = inv or default_textures.inv - - local outboxes = {} - local outsel = {} - local outimgs = {} - - for i = 1, 6 do - outimgs[vti[i]] = plain[i] - end - - for _, v in ipairs(connects) do - table.extend(outboxes, pipeworks.tube_boxes[v]) - table.insert(outsel, pipeworks.tube_selectboxes[v]) - outimgs[vti[v]] = noctrs[v] - end - - if #connects == 1 then - local v = connects[1] - v = v-1 + 2*(v%2) -- Opposite side - outimgs[vti[v]] = ends[v] - end - - 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, tubedevice = 1} - tubedesc = desc - iimg=inv - outimgs = { - short, short, - ends[3],ends[4], - short, short - } - outboxes = { -24/64, -9/64, -9/64, 24/64, 9/64, 9/64 } - outsel = { -24/64, -10/64, -10/64, 24/64, 10/64, 10/64 } - wscale = {x = 1, y = 1, z = 0.01} - end - - local rname = name.."_"..tname - table.insert(pipeworks.tubenodes, rname) - - local nodedef = { - description = tubedesc, - drawtype = "nodebox", - tiles = outimgs, - sunlight_propagates = true, - inventory_image = iimg, - wield_image = iimg, - wield_scale = wscale, - paramtype = "light", - selection_box = { - type = "fixed", - fixed = outsel - }, - node_box = { - type = "fixed", - fixed = outboxes - }, - groups = tgroups, - sounds = default.node_sound_wood_defaults(), - walkable = true, - stack_max = 99, - basename = name, - style = style, - drop = name.."_"..dropname, - tubelike = 1, - 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[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[rname].after_dig_node_ then - minetest.registered_nodes[rname].after_dig_node_(pos) - end - end]] - } - if style == "6d" then - nodedef.paramtype2 = "facedir" - end - - if special == nil then special = {} end - - for key, value in pairs(special) do - --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 - elseif key == "tube" then - for key, val in pairs(value) do - nodedef.tube[key] = val - end - else - nodedef[key] = table.recursive_replace(value, "#id", tname) - end - end - - minetest.register_node(rname, nodedef) -end - -pipeworks.register_tube = function(name, desc, plain, noctrs, ends, short, inv, special, old_registration) - if old_registration then - for xm = 0, 1 do - for xp = 0, 1 do - for ym = 0, 1 do - for yp = 0, 1 do - for zm = 0, 1 do - for zp = 0, 1 do - local connects = {} - if xm == 1 then - connects[#connects+1] = 1 - end - if xp == 1 then - connects[#connects+1] = 2 - end - if ym == 1 then - connects[#connects+1] = 3 - end - if yp == 1 then - connects[#connects+1] = 4 - end - if zm == 1 then - connects[#connects+1] = 5 - end - if zp == 1 then - connects[#connects+1] = 6 - end - local tname = xm..xp..ym..yp..zm..zp - register_one_tube(name, tname, "000000", desc, plain, noctrs, ends, short, inv, special, connects, "old") - end - end - end - end - end - end - else - -- 6d tubes: uses only 10 nodes instead of 64, but the textures must be rotated - local cconnects = {{}, {1}, {1, 2}, {1, 3}, {1, 3, 5}, {1, 2, 3}, {1, 2, 3, 5}, {1, 2, 3, 4}, {1, 2, 3, 4, 5}, {1, 2, 3, 4, 5, 6}} - for index, connects in ipairs(cconnects) do - register_one_tube(name, tostring(index), "1", desc, plain, noctrs, ends, short, inv, special, connects, "6d") - end - if REGISTER_COMPATIBILITY then - local cname = name.."_compatibility" - minetest.register_node(cname, { - drawtype = "airlike", - style = "6d", - basename = name, - inventory_image = inv, - wield_image = inv, - paramtype = "light", - sunlight_propagates = true, - 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, 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) - for xm = 0, 1 do - for xp = 0, 1 do - for ym = 0, 1 do - for yp = 0, 1 do - for zm = 0, 1 do - for zp = 0, 1 do - local tname = xm..xp..ym..yp..zm..zp - minetest.register_alias(name.."_"..tname, cname) - end - end - end - end - end - end - end - end -end - -if REGISTER_COMPATIBILITY then - minetest.register_abm({ - nodenames = {"group:tube_to_update"}, - interval = 1, - chance = 1, - action = function(pos, node, active_object_count, active_object_count_wider) - 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 - end - }) -end -- cgit v1.2.3