diff options
| -rw-r--r-- | autocrafter.lua | 1 | ||||
| -rw-r--r-- | autoplace_tubes.lua | 173 | ||||
| -rw-r--r-- | compat.lua | 197 | ||||
| -rw-r--r-- | flowing_logic.lua | 2 |
4 files changed, 186 insertions, 187 deletions
diff --git a/autocrafter.lua b/autocrafter.lua index 070b3de..b2e50c1 100644 --- a/autocrafter.lua +++ b/autocrafter.lua @@ -49,7 +49,6 @@ local function autocraft(inventory, pos) end end - local input = inventory:get_list("input") if result.item:is_empty() then return end result = result.item if not inventory:room_for_item("dst", result) then return end diff --git a/autoplace_tubes.lua b/autoplace_tubes.lua index 0c648e1..dfac997 100644 --- a/autoplace_tubes.lua +++ b/autoplace_tubes.lua @@ -12,7 +12,7 @@ local function is_tube(nodename) end if pipeworks == nil then - pipeworks = {} + pipeworks = {} end --a function for determining which side of the node we are on @@ -23,105 +23,100 @@ local function nodeside(node, tubedir) return "back" end - --get a vector pointing back - local backdir = minetest.facedir_to_dir(node.param2) - - --check whether the vector is equivalent to the tube direction; if it is, the tube's on the backside - if backdir.x == tubedir.x and backdir.y == tubedir.y and backdir.z == tubedir.z then - return "back" - end - - --check whether the vector is antiparallel with the tube direction; that indicates the front - if backdir.x == -tubedir.x and backdir.y == -tubedir.y and backdir.z == -tubedir.z then - return "front" - end - - --facedir is defined in terms of the top-bottom axis of the node; we'll take advantage of that - 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(node.param2/4)] - - --is this the top? - if topdir.x == tubedir.x and topdir.y == tubedir.y and topdir.z == tubedir.z then - return "top" - end - - --or the bottom? - if topdir.x == -tubedir.x and topdir.y == -tubedir.y and topdir.z == -tubedir.z then - return "bottom" - end - - --we shall apply some maths to obtain the right-facing vector - local rightdir = {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} - - --is this the right side? - if rightdir.x == tubedir.x and rightdir.y == tubedir.y and rightdir.z == tubedir.z then - return "right" - end - - --or the left? - if rightdir.x == -tubedir.x and rightdir.y == -tubedir.y and rightdir.z == -tubedir.z then - return "left" - end - - --we should be done by now; initiate panic mode - minetest.log("error", "nodeside has been confused by its parameters; see pipeworks autoplace_tubes.lua, line 78") + --get a vector pointing back + local backdir = minetest.facedir_to_dir(node.param2) + + --check whether the vector is equivalent to the tube direction; if it is, the tube's on the backside + if backdir.x == tubedir.x and backdir.y == tubedir.y and backdir.z == tubedir.z then + return "back" + end + + --check whether the vector is antiparallel with the tube direction; that indicates the front + if backdir.x == -tubedir.x and backdir.y == -tubedir.y and backdir.z == -tubedir.z then + return "front" + end + + --facedir is defined in terms of the top-bottom axis of the node; we'll take advantage of that + 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(node.param2/4)] + + --is this the top? + if topdir.x == tubedir.x and topdir.y == tubedir.y and topdir.z == tubedir.z then + return "top" + end + + --or the bottom? + if topdir.x == -tubedir.x and topdir.y == -tubedir.y and topdir.z == -tubedir.z then + return "bottom" + end + + --we shall apply some maths to obtain the right-facing vector + local rightdir = {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} + + --is this the right side? + if rightdir.x == tubedir.x and rightdir.y == tubedir.y and rightdir.z == tubedir.z then + return "right" + end + + --or the left? + if rightdir.x == -tubedir.x and rightdir.y == -tubedir.y and rightdir.z == -tubedir.z then + return "left" + end + + --we should be done by now; initiate panic mode + minetest.log("error", "nodeside has been confused by its parameters; see pipeworks autoplace_tubes.lua, line 78") end local function tube_autoroute(pos) local active = {0, 0, 0, 0, 0, 0} - local nctr = minetest.get_node(pos) - if not is_tube(nctr.name) then return end - - local adjustments = { - { x=-1, y=0, z=0 }, - { x=1, y=0, z=0 }, - { x=0, y=-1, z=0 }, - { x=0, y=1, z=0 }, - { x=0, y=0, z=-1 }, - { x=0, y=0, z=1 } - } - -- xm = 1, xp = 2, ym = 3, yp = 4, zm = 5, zp = 6 - - local positions = {} - local nodes = {} - for i,adj in ipairs(adjustments) do - positions[i] = {x=pos.x+adj.x, y=pos.y+adj.y, z=pos.z+adj.z} - nodes[i] = minetest.get_node(positions[i]) - end - - for i,node in ipairs(nodes) do - local idef = minetest.registered_nodes[node.name] - -- handle the tubes themselves - if is_tube(node.name) then - active[i] = 1 - -- handle new style connectors - elseif idef.tube and idef.tube.connect_sides then - local dir = adjustments[i] - if idef.tube.connect_sides[nodeside(node, {x=-dir.x, y=-dir.y, z=-dir.z})] then active[i] = 1 end - end - end - - -- all sides checked, now figure which tube to use. + local nctr = minetest.get_node(pos) + if not is_tube(nctr.name) then return end + + local adjustments = { + { x=-1, y=0, z=0 }, + { x=1, y=0, z=0 }, + { x=0, y=-1, z=0 }, + { x=0, y=1, z=0 }, + { x=0, y=0, z=-1 }, + { x=0, y=0, z=1 } + } + -- xm = 1, xp = 2, ym = 3, yp = 4, zm = 5, zp = 6 + + local positions = {} + local nodes = {} + for i,adj in ipairs(adjustments) do + positions[i] = {x=pos.x+adj.x, y=pos.y+adj.y, z=pos.z+adj.z} + nodes[i] = minetest.get_node(positions[i]) + end + + for i,node in ipairs(nodes) do + local idef = minetest.registered_nodes[node.name] + -- handle the tubes themselves + if is_tube(node.name) then + active[i] = 1 + -- handle new style connectors + elseif idef.tube and idef.tube.connect_sides then + local dir = adjustments[i] + if idef.tube.connect_sides[nodeside(node, {x=-dir.x, y=-dir.y, z=-dir.z})] then active[i] = 1 end + end + end + + -- all sides checked, now figure which tube to use. local nsurround = "" for i,n in ipairs(active) do nsurround = nsurround .. n end - local newname=string.sub(nctr.name,1,-7)..nsurround + local newname = string.sub(nctr.name, 1, -7)..nsurround if newname == nctr.name then return end - local meta=minetest.get_meta(pos) - local meta0=meta:to_table() -- XXX: hacky_swap_node nctr.name = newname - minetest.add_node(pos, nctr) - local meta=minetest.get_meta(pos) - meta:from_table(meta0) - local nctr = minetest.get_node(pos) + minetest.swap_node(pos, nctr) end function pipeworks.scan_for_tube_objects(pos) @@ -1,114 +1,117 @@ -- this bit of code modifies the default chests and furnaces to be compatible -- with pipeworks. -function pipeworks:clone_node(name) - local node2={} - local node=minetest.registered_nodes[name] - for k,v in pairs(node) do - node2[k]=v +function pipeworks.clone_node(name) + local node2 = {} + local node = minetest.registered_nodes[name] + for k, v in pairs(node) do + node2[k] = v end return node2 end -local furnace=pipeworks:clone_node("default:furnace") +local furnace = pipeworks.clone_node("default:furnace") furnace.tiles[2] = "default_furnace_bottom.png^pipeworks_tube_connection_stony.png" furnace.tiles[3] = "default_furnace_side.png^pipeworks_tube_connection_stony.png" furnace.tiles[4] = "default_furnace_side.png^pipeworks_tube_connection_stony.png" furnace.tiles[5] = "default_furnace_side.png^pipeworks_tube_connection_stony.png" - -- note we don't redefine entries 1 and 6 (top and front) - furnace.groups.tubedevice=1 - furnace.groups.tubedevice_receiver=1 - furnace.tube={insert_object = function(pos,node,stack,direction) - local meta=minetest.get_meta(pos) - local inv=meta:get_inventory() - if direction.y==1 then + -- note we don't redefine entries 1 and 6 (top and front) + furnace.groups.tubedevice = 1 + furnace.groups.tubedevice_receiver = 1 + furnace.tube = { + insert_object = function(pos, node, stack, direction) + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + if direction.y == 1 then return inv:add_item("fuel",stack) else return inv:add_item("src",stack) end end, - can_insert=function(pos,node,stack,direction) - local meta=minetest.get_meta(pos) - local inv=meta:get_inventory() - if direction.y==1 then - return inv:room_for_item("fuel",stack) - elseif direction.y==-1 then - return inv:room_for_item("src",stack) - else - return 0 - end - end, - input_inventory="dst", - connect_sides={left=1, right=1, back=1, bottom=1}} - furnace.after_place_node= function(pos) + can_insert = function(pos,node,stack,direction) + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + if direction.y == 1 then + return inv:room_for_item("fuel", stack) + else + return inv:room_for_item("src", stack) + end + end, + input_inventory = "dst", + connect_sides = {left=1, right=1, back=1, bottom=1, front=1, top=1} + } + furnace.after_place_node = function(pos) pipeworks.scan_for_tube_objects(pos) end furnace.after_dig_node = function(pos) pipeworks.scan_for_tube_objects(pos) end -minetest.register_node(":default:furnace",furnace) +minetest.register_node(":default:furnace", furnace) -local furnace=pipeworks:clone_node("default:furnace_active") - furnace.tiles[2] = "default_furnace_bottom.png^pipeworks_tube_connection_stony.png" - furnace.tiles[3] = "default_furnace_side.png^pipeworks_tube_connection_stony.png" - furnace.tiles[4] = "default_furnace_side.png^pipeworks_tube_connection_stony.png" - furnace.tiles[5] = "default_furnace_side.png^pipeworks_tube_connection_stony.png" - -- note we don't redefine entries 1 and 6 (top and front) - furnace.groups.tubedevice=1 - furnace.groups.tubedevice_receiver=1 - furnace.tube={insert_object=function(pos,node,stack,direction) - local meta=minetest.get_meta(pos) - local inv=meta:get_inventory() - if direction.y==1 then - return inv:add_item("fuel",stack) - else - return inv:add_item("src",stack) - end - end, - can_insert=function(pos,node,stack,direction) - local meta=minetest.get_meta(pos) - local inv=meta:get_inventory() - if direction.y==1 then - return inv:room_for_item("fuel",stack) - elseif direction.y==-1 then - return inv:room_for_item("src",stack) - else - return 0 - end - end, - input_inventory="dst", - connect_sides={left=1, right=1, back=1, bottom=1}} - furnace.after_place_node= function(pos) +local furnace_active = pipeworks.clone_node("default:furnace_active") + furnace_active.tiles[2] = "default_furnace_bottom.png^pipeworks_tube_connection_stony.png" + furnace_active.tiles[3] = "default_furnace_side.png^pipeworks_tube_connection_stony.png" + furnace_active.tiles[4] = "default_furnace_side.png^pipeworks_tube_connection_stony.png" + furnace_active.tiles[5] = "default_furnace_side.png^pipeworks_tube_connection_stony.png" + -- note we don't redefine entries 1 and 6 (top and front) + furnace_active.groups.tubedevice = 1 + furnace_active.groups.tubedevice_receiver = 1 + furnace_active.tube = { + insert_object = function(pos,node,stack,direction) + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + if direction.y == 1 then + return inv:add_item("fuel", stack) + else + return inv:add_item("src", stack) + end + end, + can_insert = function(pos, node, stack, direction) + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + if direction.y == 1 then + return inv:room_for_item("fuel", stack) + else + return inv:room_for_item("src", stack) + end + end, + input_inventory = "dst", + connect_sides = {left=1, right=1, back=1, bottom=1, front=1, top=1} + } + furnace_active.after_place_node= function(pos) pipeworks.scan_for_tube_objects(pos) end - furnace.after_dig_node = function(pos) + furnace_active.after_dig_node = function(pos) pipeworks.scan_for_tube_objects(pos) end - minetest.register_node(":default:furnace_active",furnace) +minetest.register_node(":default:furnace_active", furnace_active) -local chest=pipeworks:clone_node("default:chest") + +local chest = pipeworks.clone_node("default:chest") chest.tiles[1] = "default_chest_top.png^pipeworks_tube_connection_wooden.png" chest.tiles[2] = "default_chest_top.png^pipeworks_tube_connection_wooden.png" chest.tiles[3] = "default_chest_side.png^pipeworks_tube_connection_wooden.png" chest.tiles[4] = "default_chest_side.png^pipeworks_tube_connection_wooden.png" chest.tiles[5] = "default_chest_side.png^pipeworks_tube_connection_wooden.png" - -- note we don't redefine entry 6 (front). - chest.groups.tubedevice=1 - chest.groups.tubedevice_receiver=1 - chest.tube={insert_object = function(pos,node,stack,direction) - local meta=minetest.get_meta(pos) - local inv=meta:get_inventory() - return inv:add_item("main",stack) - end, - can_insert=function(pos,node,stack,direction) - local meta=minetest.get_meta(pos) - local inv=meta:get_inventory() - return inv:room_for_item("main",stack) - end, - input_inventory="main", - connect_sides={left=1, right=1, back=1, bottom=1, top=1}} + -- note we don't redefine entry 6 (front). + chest.groups.tubedevice = 1 + chest.groups.tubedevice_receiver = 1 + chest.tube = { + insert_object = function(pos, node, stack, direction) + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + return inv:add_item("main", stack) + end, + can_insert = function(pos, node, stack, direction) + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + return inv:room_for_item("main", stack) + end, + input_inventory = "main", + connect_sides = {left=1, right=1, back=1, bottom=1, top=1, front=1} + } chest.after_place_node = function(pos) pipeworks.scan_for_tube_objects(pos) end @@ -116,36 +119,38 @@ local chest=pipeworks:clone_node("default:chest") pipeworks.scan_for_tube_objects(pos) end -minetest.register_node(":default:chest",chest) +minetest.register_node(":default:chest", chest) -local chest_locked=pipeworks:clone_node("default:chest_locked") +local chest_locked = pipeworks.clone_node("default:chest_locked") chest_locked.tiles[1] = "default_chest_top.png^pipeworks_tube_connection_wooden.png" chest_locked.tiles[2] = "default_chest_top.png^pipeworks_tube_connection_wooden.png" chest_locked.tiles[3] = "default_chest_side.png^pipeworks_tube_connection_wooden.png" chest_locked.tiles[4] = "default_chest_side.png^pipeworks_tube_connection_wooden.png" chest_locked.tiles[5] = "default_chest_side.png^pipeworks_tube_connection_wooden.png" - -- note we don't redefine entry 6 (front). - chest_locked.groups.tubedevice=1 - chest_locked.groups.tubedevice_receiver=1 - chest_locked.tube={insert_object = function(pos,node,stack,direction) - local meta=minetest.env:get_meta(pos) - local inv=meta:get_inventory() - return inv:add_item("main",stack) - end, - can_insert=function(pos,node,stack,direction) - local meta=minetest.env:get_meta(pos) - local inv=meta:get_inventory() - return inv:room_for_item("main",stack) - end, - connect_sides={left=1, right=1, back=1, bottom=1, top=1}} - local old_after_place = minetest.registered_nodes["default:chest_locked"].after_place_node; + -- note we don't redefine entry 6 (front). + chest_locked.groups.tubedevice = 1 + chest_locked.groups.tubedevice_receiver = 1 + chest_locked.tube = { + insert_object = function(pos, node, stack, direction) + local meta = minetest.env:get_meta(pos) + local inv = meta:get_inventory() + return inv:add_item("main", stack) + end, + can_insert = function(pos, node, stack, direction) + local meta = minetest.env:get_meta(pos) + local inv = meta:get_inventory() + return inv:room_for_item("main", stack) + end, + connect_sides = {left=1, right=1, back=1, bottom=1, top=1, front=1} + } + local old_after_place = minetest.registered_nodes["default:chest_locked"].after_place_node chest_locked.after_place_node = function(pos, placer) pipeworks.scan_for_tube_objects(pos) - old_after_place(pos, placer) + old_after_place(pos, placer) end chest_locked.after_dig_node = function(pos) pipeworks.scan_for_tube_objects(pos) end -minetest.register_node(":default:chest_locked",chest_locked) +minetest.register_node(":default:chest_locked", chest_locked) diff --git a/flowing_logic.lua b/flowing_logic.lua index 6b5d30f..e0a6236 100644 --- a/flowing_logic.lua +++ b/flowing_logic.lua @@ -39,7 +39,7 @@ pipeworks.check_for_inflows = function(pos,node) local name = minetest.get_node(coords[i]).name if name and (name == "pipeworks:pump_on" and pipeworks.check_for_liquids(coords[i])) or string.find(name,"_loaded") then if string.find(name,"_loaded") then - local source = minetest.get_meta(coords[i]):get_string("source") + source = minetest.get_meta(coords[i]):get_string("source") if source == minetest.pos_to_string(pos) then break end end newnode = string.gsub(node.name,"empty","loaded") |