revamped pumps so that now they should sit in/on liquid and be connected only

from the top, relegated grates to decorational-only, added outlet spigot.  Got
rid of a few obsolete textures.  Got rid of that whole _x and _z naming thing,
now all directional devices (pumps, valves, spigots, tanks) use facedir.
Valves, spigots no longer auto-rotate to find nearby pipes.

diff --git a/autoplace.lua b/autoplace.lua
index 390c66a1ca3b70e81b5287be712354555ee1b7e6..2e5556f05f74229e13167782f5b12e6b882fbf78 100644 (file)
--- a/autoplace.lua
+++ b/autoplace.lua
@@ -83,29 +83,6 @@ end
 
 -- auto-rotation code for various devices the tubes attach to
 
-function pipe_device_autorotate(pos, state, bname)
-
-       if state == nil then
-               nname = bname
-       else
-               nname = bname.."_"..state
-       end
-
-       local nctr = minetest.env:get_node(pos)
-
-       pipes_scansurroundings(pos)
-
-       if (pxm+pxp) ~= 0 then
-               minetest.env:add_node(pos, { name = nname.."_x" })
-               return
-       end
-
-       if (pzm+pzp) ~= 0 then
-               minetest.env:add_node(pos, { name = nname.."_z" })
-       end
-       
-end
-
 function pipes_scansurroundings(pos)
        pxm=0
        pxp=0
@@ -128,39 +105,55 @@ function pipes_scansurroundings(pos)
        if (string.find(nzm.name, "pipeworks:pipe_") ~= nil) then pzm=1 end
        if (string.find(nzp.name, "pipeworks:pipe_") ~= nil) then pzp=1 end
 
-       for p in ipairs(pipes_devicelist) do
-               pdev = pipes_devicelist[p]
-               if (string.find(nxm.name, "pipeworks:"..pdev.."_off_x") ~= nil) or
-                  (string.find(nxm.name, "pipeworks:"..pdev.."_on_x") ~= nil) or
-                  (string.find(nxm.name, "pipeworks:"..pdev.."_x") ~= nil) then
-                       pxm=1
-               end
-
-               if (string.find(nxp.name, "pipeworks:"..pdev.."_off_x") ~= nil) or
-                  (string.find(nxp.name, "pipeworks:"..pdev.."_on_x") ~= nil) or
-                  (string.find(nxp.name, "pipeworks:"..pdev.."_x") ~= nil)  then
-                       pxp=1
-               end
-
-               if (string.find(nzm.name, "pipeworks:"..pdev.."_off_z") ~= nil) or
-                  (string.find(nzm.name, "pipeworks:"..pdev.."_on_z") ~= nil) or
-                  (string.find(nzm.name, "pipeworks:"..pdev.."_z") ~= nil)  then
-                       pzm=1
-               end
-
-               if (string.find(nzp.name, "pipeworks:"..pdev.."_off_z") ~= nil) or
-                  (string.find(nzp.name, "pipeworks:"..pdev.."_on_z") ~= nil) or
-                  (string.find(nzp.name, "pipeworks:"..pdev.."_z") ~= nil)  then
-                       pzp=1
-               end
+-- Special handling for valves...
+
+       if (string.find(nxm.name, "pipeworks:valve") ~= nil)
+         and (nxm.param2 == 0 or nxm.param2 == 2) then
+               pxm=1
+       end
+
+       if (string.find(nxp.name, "pipeworks:valve") ~= nil)
+         and (nxp.param2 == 0 or nxp.param2 == 2) then
+               pxp=1
+       end
+
+       if (string.find(nzm.name, "pipeworks:valve") ~= nil)
+         and (nzm.param2 == 1 or nzm.param2 == 3) then
+               pzm=1
+       end
+
+       if (string.find(nzp.name, "pipeworks:valve") ~= nil)
+         and (nzp.param2 == 1 or nzp.param2 == 3) then
+               pzp=1
+       end
+
+-- ...spigots...
+
+       if (string.find(nxm.name, "pipeworks:spigot") ~= nil)
+         and nxm.param2 == 2 then
+               pxm=1
+       end
+
+       if (string.find(nxp.name, "pipeworks:spigot") ~= nil)
+         and nxp.param2 == 0 then
+               pxp=1
+       end
+
+       if (string.find(nzm.name, "pipeworks:spigot") ~= nil)
+         and nzm.param2 == 1 then
+               pzm=1
+       end
+
+       if (string.find(nzp.name, "pipeworks:spigot") ~= nil)
+         and nzp.param2 == 3 then
+               pzp=1
        end
 
-       -- storage tanks and intake grates have vertical connections
-       -- also, so they require a special case
+-- ...pumps, grates, and storage tanks
 
        if (string.find(nym.name, "pipeworks:storage_tank_") ~= nil) or
-          (string.find(nym.name, "pipeworks:intake") ~= nil) or
-          (string.find(nym.name, "pipeworks:outlet") ~= nil) then
+          (string.find(nym.name, "pipeworks:grating") ~= nil) or
+          (string.find(nym.name, "pipeworks:pump") ~= nil) then
                pym=1
        end
 end

diff --git a/devices.lua b/devices.lua
index 5f1ce0df1a51c6fd6aab7999662a4b2317da5ec6..513104acbfa3673b68a1449eb947001afa661a84 100644 (file)
--- a/devices.lua
+++ b/devices.lua
@@ -18,42 +18,23 @@ pipes_devicelist = {
 
 -- tables
 
-minetest.register_alias("pipeworks:pump", "pipeworks:pump_off_x")
-minetest.register_alias("pipeworks:valve", "pipeworks:valve_off_x")
-minetest.register_alias("pipeworks:storage_tank", "pipeworks:storage_tank_0_x")
-
-pipe_pumpbody_x = {
-       { -6/16, -8/16, -6/16, 6/16, 8/16, 6/16 }
-}
-
-pipe_pumpbody_z = {
-       { -6/16, -8/16, -6/16, 6/16, 8/16, 6/16 }
+pipe_pumpbody = {
+       { -7/16, -6/16, -7/16, 7/16,  5/16, 7/16 },
+       { -8/16, -8/16, -8/16, 8/16, -6/16, 8/16 }
 }
 
-pipe_valvebody_x = {
+pipe_valvebody = {
        { -4/16, -4/16, -4/16, 4/16, 4/16, 4/16 }
 }
 
-pipe_valvebody_z = {
-       { -4/16, -4/16, -4/16, 4/16, 4/16, 4/16 }
-}
-
-pipe_valvehandle_on_x = {
+pipe_valvehandle_on = {
        { -5/16, 4/16, -1/16, 0, 5/16, 1/16 }
 }
 
-pipe_valvehandle_on_z = {
-       { -1/16, 4/16, -5/16, 1/16, 5/16, 0 }
-}
-
-pipe_valvehandle_off_x = {
+pipe_valvehandle_off = {
        { -1/16, 4/16, -5/16, 1/16, 5/16, 0 }
 }
 
-pipe_valvehandle_off_z = {
-       { -5/16, 4/16, -1/16, 0, 5/16, 1/16 }
-}
-
 -- Now define the nodes.
 
 local states = { "on", "off" }
@@ -68,24 +49,22 @@ for s in ipairs(states) do
        end
 
        local pumpboxes = {}
-       pipe_addbox(pumpboxes, pipe_leftstub)
-       pipe_addbox(pumpboxes, pipe_pumpbody_x)
-       pipe_addbox(pumpboxes, pipe_rightstub)
-       local tilex = "pipeworks_pump_ends.png"
-       local tilez = "pipeworks_pump_"..states[s]..".png"
+       pipe_addbox(pumpboxes, pipe_pumpbody)
+       pipe_addbox(pumpboxes, pipe_topstub)
 
-       minetest.register_node("pipeworks:pump_"..states[s].."_x", {
-               description = "Pump Module ("..states[s]..")",
+       minetest.register_node("pipeworks:pump_"..states[s], {
+               description = "Pump/Intake Module",
                drawtype = "nodebox",
                tiles = {
-                       "pipeworks_pump_top_x.png",
+                       "pipeworks_pump_top.png",
+                       "pipeworks_pump_bottom.png",
                        "pipeworks_pump_sides.png",
-                       tilex,
-                       tilex,
                        "pipeworks_pump_sides.png",
-                       tilez
+                       "pipeworks_pump_sides.png",
+                       "pipeworks_pump_"..states[s]..".png"
                },
                paramtype = "light",
+               paramtype2 = "facedir",
                selection_box = {
                        type = "fixed",
                        fixed = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 }
@@ -99,71 +78,31 @@ for s in ipairs(states) do
                walkable = true,
                stack_max = 99,
                after_place_node = function(pos)
-                       pipe_device_autorotate(pos, states[s], "pipeworks:pump")
                        pipe_scanforobjects(pos)
                end,
                after_dig_node = function(pos)
                        pipe_scanforobjects(pos)
                end,
-               drop = "pipeworks:pump_off_x"
+               drop = "pipeworks:pump_off"
        })
        
-       local pumpboxes = {}
-       pipe_addbox(pumpboxes, pipe_frontstub)
-       pipe_addbox(pumpboxes, pipe_pumpbody_z)
-       pipe_addbox(pumpboxes, pipe_backstub)
-
-       minetest.register_node("pipeworks:pump_"..states[s].."_z", {
-               description = "Pump Module ("..states[s]..", Z-axis)",
-               drawtype = "nodebox",
-               tiles = {
-                       "pipeworks_pump_top_z.png",
-                       "pipeworks_pump_sides.png",
-                       tilez,
-                       tilez,
-                       "pipeworks_pump_sides.png",
-                       tilex
-               },
-               paramtype = "light",
-               selection_box = {
-                       type = "fixed",
-                       fixed = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 }
-               },
-               node_box = {
-                       type = "fixed",
-                       fixed = pumpboxes
-               },
-               groups = {snappy=3, pipe=1, not_in_creative_inventory=1},
-               sounds = default.node_sound_wood_defaults(),
-               walkable = true,
-               stack_max = 99,
-               after_place_node = function(pos)
-                       pipe_device_autorotate(pos, states[s], "pipeworks:pump")
-                       pipe_scanforobjects(pos)
-               end,
-               after_dig_node = function(pos)
-                       pipe_scanforobjects(pos)
-               end,
-               drop = "pipeworks:pump_off_x"
-       })
-
        local valveboxes = {}
        pipe_addbox(valveboxes, pipe_leftstub)
-       pipe_addbox(valveboxes, pipe_valvebody_x)
+       pipe_addbox(valveboxes, pipe_valvebody)
        if states[s] == "off" then 
-               pipe_addbox(valveboxes, pipe_valvehandle_off_x)
+               pipe_addbox(valveboxes, pipe_valvehandle_off)
        else
-               pipe_addbox(valveboxes, pipe_valvehandle_on_x)
+               pipe_addbox(valveboxes, pipe_valvehandle_on)
        end
        pipe_addbox(valveboxes, pipe_rightstub)
        local tilex = "pipeworks_valvebody_ends.png"
        local tilez = "pipeworks_valvebody_sides.png"
 
-       minetest.register_node("pipeworks:valve_"..states[s].."_x", {
-               description = "Valve ("..states[s]..")",
+       minetest.register_node("pipeworks:valve_"..states[s], {
+               description = "Valve",
                drawtype = "nodebox",
                tiles = {
-                       "pipeworks_valvebody_top_"..states[s].."_x.png",
+                       "pipeworks_valvebody_top_"..states[s]..".png",
                        "pipeworks_valvebody_bottom.png",
                        tilex,
                        tilex,
@@ -171,6 +110,7 @@ for s in ipairs(states) do
                        tilez,
                },
                paramtype = "light",
+               paramtype2 = "facedir",
                selection_box = {
                        type = "fixed",
                        fixed = { -8/16, -4/16, -5/16, 8/16, 5/16, 5/16 }
@@ -184,63 +124,12 @@ for s in ipairs(states) do
                walkable = true,
                stack_max = 99,
                after_place_node = function(pos)
-                       pipe_device_autorotate(pos, states[s], "pipeworks:valve")
                        pipe_scanforobjects(pos)
                end,
                after_dig_node = function(pos)
                        pipe_scanforobjects(pos)
                end,
-               drop = "pipeworks:valve_off_x",
-               pipelike=1,
-               on_construct = function(pos)
-               local meta = minetest.env:get_meta(pos)
-               meta:set_int("pipelike",1)
-               end,
-       })
-
-       local valveboxes = {}
-       pipe_addbox(valveboxes, pipe_frontstub)
-       pipe_addbox(valveboxes, pipe_valvebody_z)
-       if states[s] == "off" then 
-               pipe_addbox(valveboxes, pipe_valvehandle_off_z)
-       else
-               pipe_addbox(valveboxes, pipe_valvehandle_on_z)
-       end
-       pipe_addbox(valveboxes, pipe_backstub)
-
-       minetest.register_node("pipeworks:valve_"..states[s].."_z", {
-               description = "Valve ("..states[s]..", Z-axis)",
-               drawtype = "nodebox",
-               tiles = {
-                       "pipeworks_valvebody_top_"..states[s].."_z.png",
-                       "pipeworks_valvebody_bottom.png",
-                       tilez,
-                       tilez,
-                       tilex,
-                       tilex,
-               },
-               paramtype = "light",
-               selection_box = {
-                       type = "fixed",
-                       fixed = { -5/16, -4/16, -8/16, 5/16, 5/16, 8/16 }
-               },
-               node_box = {
-                       type = "fixed",
-                       fixed = valveboxes
-               },
-               groups = {snappy=3, pipe=1, not_in_creative_inventory=1},
-               sounds = default.node_sound_wood_defaults(),
-               walkable = true,
-               stack_max = 99,
-               after_place_node = function(pos)
-                       pipe_device_autorotate(pos, states[s], "pipeworks:valve")
-                       pipe_scanforobjects(pos)
-
-               end,
-               after_dig_node = function(pos)
-                       pipe_scanforobjects(pos)
-               end,
-               drop = "pipeworks:valve_off_x",
+               drop = "pipeworks:valve_off",
                pipelike=1,
                on_construct = function(pos)
                local meta = minetest.env:get_meta(pos)
@@ -249,26 +138,17 @@ for s in ipairs(states) do
        })
 end
 
--- intake grate
+-- grating
 
-minetest.register_node("pipeworks:intake", {
-       description = "Intake grate",
-       drawtype = "nodebox",
+minetest.register_node("pipeworks:grating", {
+       description = "Decorative grating",
        tiles = {
-               "pipeworks_intake_top.png",
-               "pipeworks_intake_sides.png",
-               "pipeworks_intake_sides.png",
-               "pipeworks_intake_sides.png",
-               "pipeworks_intake_sides.png",
-               "pipeworks_intake_sides.png"
-       },
-       selection_box = {
-               type = "fixed",
-               fixed = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 }
-       },
-       node_box = {
-               type = "fixed",
-               fixed = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 }
+               "pipeworks_grating_top.png",
+               "pipeworks_grating_sides.png",
+               "pipeworks_grating_sides.png",
+               "pipeworks_grating_sides.png",
+               "pipeworks_grating_sides.png",
+               "pipeworks_grating_sides.png"
        },
        paramtype = "light",
        groups = {snappy=3, pipe=1},
@@ -288,28 +168,26 @@ minetest.register_node("pipeworks:intake", {
        end,
 })
 
--- outlet grate
+-- outlet spigot
+
+       local spigotboxes = {}
+       pipe_addbox(spigotboxes, pipe_leftstub)
+       pipe_addbox(spigotboxes, spigot_bottomstub)
+       pipe_addbox(spigotboxes, pipe_bendsphere)
 
-minetest.register_node("pipeworks:outlet", {
-       description = "Outlet grate",
+minetest.register_node("pipeworks:spigot", {
+       description = "Spigot outlet",
        drawtype = "nodebox",
        tiles = {
-               "pipeworks_outlet_top.png",
-               "pipeworks_outlet_sides.png",
-               "pipeworks_outlet_sides.png",
-               "pipeworks_outlet_sides.png",
-               "pipeworks_outlet_sides.png",
-               "pipeworks_outlet_sides.png"
-       },
-       selection_box = {
-               type = "fixed",
-               fixed = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 }
-       },
-       node_box = {
-               type = "fixed",
-               fixed = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 }
+               "pipeworks_spigot_sides.png",
+               "pipeworks_pipe_end_empty.png",
+               "pipeworks_spigot_sides.png",
+               "pipeworks_pipe_end_empty.png",
+               "pipeworks_spigot_sides.png",
+               "pipeworks_spigot_sides.png"
        },
        paramtype = "light",
+       paramtype2 = "facedir",
        groups = {snappy=3, pipe=1},
        sounds = default.node_sound_wood_defaults(),
        walkable = true,
@@ -325,6 +203,14 @@ minetest.register_node("pipeworks:outlet", {
        local meta = minetest.env:get_meta(pos)
        meta:set_int("pipelike",1)
        end,
+       node_box = {
+               type = "fixed",
+               fixed = spigotboxes,
+       },
+       selection_box = {
+               type = "fixed",
+               fixed = { -8/16, -6/16, -2/16, 2/16, 2/16, 2/16 }
+       }
 })
 
 -- tanks
@@ -354,7 +240,7 @@ for fill = 0, 10 do
                sounds = default.node_sound_wood_defaults(),
                walkable = true,
                stack_max = 99,
-               drop = "pipeworks:storage_tank_"..fill.."_x",
+               drop = "pipeworks:storage_tank_"..fill,
                after_place_node = function(pos)
                        pipe_look_for_stackable_tanks(pos)
                        pipe_scanforobjects(pos)
@@ -369,59 +255,24 @@ for fill = 0, 10 do
                end,
        })
 
-       minetest.register_node("pipeworks:storage_tank_"..fill.."_x", {
+       minetest.register_node("pipeworks:storage_tank_"..fill, {
                description = "Fluid Storage Tank ("..filldesc..")",
                tiles = {
                        "pipeworks_storage_tank_fittings.png",
                        "pipeworks_storage_tank_back.png",
-                       "pipeworks_storage_tank_fittings.png",
-                       "pipeworks_storage_tank_fittings.png",
                        "pipeworks_storage_tank_back.png",
-                       "pipeworks_storage_tank_front_"..fill..".png"
-               },
-               paramtype = "light",
-               groups = sgroups,
-               sounds = default.node_sound_wood_defaults(),
-               walkable = true,
-               stack_max = 99,
-               after_place_node = function(pos)
-                       pipe_look_for_stackable_tanks(pos)
-                       if string.find(minetest.env:get_node(pos).name, "pipeworks:storage_tank_") ~= nil then
-                               pipe_device_autorotate(pos, nil, "pipeworks:storage_tank_"..fill)
-                       end
-                       pipe_scanforobjects(pos)
-               end,
-               after_dig_node = function(pos)
-                       pipe_scanforobjects(pos)
-               end,
-               pipelike=1,
-               on_construct = function(pos)
-               local meta = minetest.env:get_meta(pos)
-               meta:set_int("pipelike",1)
-               end,
-       })
-       
-       minetest.register_node("pipeworks:storage_tank_"..fill.."_z", {
-               description = "Fluid Storage Tank (Z axis, "..filldesc..")... You hacker, you.",
-               tiles = {
-                       "pipeworks_storage_tank_fittings.png",
                        "pipeworks_storage_tank_back.png",
-                       "pipeworks_storage_tank_front_"..fill..".png",
                        "pipeworks_storage_tank_back.png",
-                       "pipeworks_storage_tank_fittings.png",
-                       "pipeworks_storage_tank_fittings.png"
+                       "pipeworks_storage_tank_front_"..fill..".png"
                },
                paramtype = "light",
-               groups = {snappy=3, pipe=1, tankfill=fill+1, not_in_creative_inventory=1},
+               paramtype2 = "facedir",
+               groups = sgroups,
                sounds = default.node_sound_wood_defaults(),
                walkable = true,
                stack_max = 99,
-               drop = "pipeworks:storage_tank_"..fill.."_x",
                after_place_node = function(pos)
                        pipe_look_for_stackable_tanks(pos)
-                       if string.find(minetest.env:get_node(pos).name, "pipeworks:storage_tank_") ~= nil then
-                               pipe_device_autorotate(pos, nil, "pipeworks:storage_tank_"..fill)
-                       end
                        pipe_scanforobjects(pos)
                end,
                after_dig_node = function(pos)
@@ -437,35 +288,70 @@ end
 
 -- various actions
 
-local axes = { "x", "z" }
-
-for a in ipairs(axes) do
-       minetest.register_on_punchnode(function (pos, node)
-               if node.name=="pipeworks:valve_on_"..axes[a] then 
-                       minetest.env:add_node(pos, { name = "pipeworks:valve_off_"..axes[a] })
-                       local meta = minetest.env:get_meta(pos)
-                       meta:set_int("pipelike",0)
-               end
-       end)
+minetest.register_on_punchnode(function (pos, node)
+       if node.name=="pipeworks:valve_on" then 
+               fdir = minetest.env:get_node(pos).param2
+               minetest.env:add_node(pos, { name = "pipeworks:valve_off", param2 = fdir })
+               local meta = minetest.env:get_meta(pos)
+               meta:set_int("pipelike",0)
+       end
+end)
 
-       minetest.register_on_punchnode(function (pos, node)
-               if node.name=="pipeworks:valve_off_"..axes[a] then 
-                       minetest.env:add_node(pos, { name = "pipeworks:valve_on_"..axes[a] })
-                       local meta = minetest.env:get_meta(pos)
-                       meta:set_int("pipelike",1)
-               end
-       end)
+minetest.register_on_punchnode(function (pos, node)
+       if node.name=="pipeworks:valve_off" then 
+               fdir = minetest.env:get_node(pos).param2
+               minetest.env:add_node(pos, { name = "pipeworks:valve_on", param2 = fdir })
+               local meta = minetest.env:get_meta(pos)
+               meta:set_int("pipelike",1)
+       end
+end)
 
-       minetest.register_on_punchnode(function (pos, node)
-               if node.name=="pipeworks:pump_on_"..axes[a] then 
-                       minetest.env:add_node(pos, { name = "pipeworks:pump_off_"..axes[a] })
-               end
-       end)
+minetest.register_on_punchnode(function (pos, node)
+       if node.name=="pipeworks:pump_on" then 
+               fdir = minetest.env:get_node(pos).param2
+               minetest.env:add_node(pos, { name = "pipeworks:pump_off", param2 = fdir })
+       end
+end)
 
-       minetest.register_on_punchnode(function (pos, node)
-               if node.name=="pipeworks:pump_off_"..axes[a] then 
-                       minetest.env:add_node(pos, { name = "pipeworks:pump_on_"..axes[a] })
-               end
-       end)
-end
+minetest.register_on_punchnode(function (pos, node)
+       if node.name=="pipeworks:pump_off" then 
+               fdir = minetest.env:get_node(pos).param2
+               minetest.env:add_node(pos, { name = "pipeworks:pump_on", param2 = fdir })
+       end
+end)
+
+-- backwards compatibility
+
+minetest.register_alias("pipeworks:intake", "pipeworks:grating")
+minetest.register_alias("pipeworks:outlet", "pipeworks:grating")
+minetest.register_alias("pipeworks:pump_off_x", "pipeworks:pump_off")
+minetest.register_alias("pipeworks:pump_off_z", "pipeworks:pump_off")
+minetest.register_alias("pipeworks:pump_on_x", "pipeworks:pump_on")
+minetest.register_alias("pipeworks:pump_on_z", "pipeworks:pump_on")
+minetest.register_alias("pipeworks:valve_off_x", "pipeworks:valve_off")
+minetest.register_alias("pipeworks:valve_off_z", "pipeworks:valve_off")
+minetest.register_alias("pipeworks:valve_on_x", "pipeworks:valve_on")
+minetest.register_alias("pipeworks:valve_on_z", "pipeworks:valve_on")
+minetest.register_alias("pipeworks:storage_tank_0_x", "pipeworks:storage_tank_0")
+minetest.register_alias("pipeworks:storage_tank_0_z", "pipeworks:storage_tank_0")
+minetest.register_alias("pipeworks:storage_tank_1_x", "pipeworks:storage_tank_1")
+minetest.register_alias("pipeworks:storage_tank_1_z", "pipeworks:storage_tank_1")
+minetest.register_alias("pipeworks:storage_tank_2_x", "pipeworks:storage_tank_2")
+minetest.register_alias("pipeworks:storage_tank_2_z", "pipeworks:storage_tank_2")
+minetest.register_alias("pipeworks:storage_tank_3_x", "pipeworks:storage_tank_3")
+minetest.register_alias("pipeworks:storage_tank_3_z", "pipeworks:storage_tank_3")
+minetest.register_alias("pipeworks:storage_tank_4_x", "pipeworks:storage_tank_4")
+minetest.register_alias("pipeworks:storage_tank_4_z", "pipeworks:storage_tank_4")
+minetest.register_alias("pipeworks:storage_tank_5_x", "pipeworks:storage_tank_5")
+minetest.register_alias("pipeworks:storage_tank_5_z", "pipeworks:storage_tank_5")
+minetest.register_alias("pipeworks:storage_tank_6_x", "pipeworks:storage_tank_6")
+minetest.register_alias("pipeworks:storage_tank_6_z", "pipeworks:storage_tank_6")
+minetest.register_alias("pipeworks:storage_tank_7_x", "pipeworks:storage_tank_7")
+minetest.register_alias("pipeworks:storage_tank_7_z", "pipeworks:storage_tank_7")
+minetest.register_alias("pipeworks:storage_tank_8_x", "pipeworks:storage_tank_8")
+minetest.register_alias("pipeworks:storage_tank_8_z", "pipeworks:storage_tank_8")
+minetest.register_alias("pipeworks:storage_tank_9_x", "pipeworks:storage_tank_9")
+minetest.register_alias("pipeworks:storage_tank_9_z", "pipeworks:storage_tank_9")
+minetest.register_alias("pipeworks:storage_tank_10_x", "pipeworks:storage_tank_10")
+minetest.register_alias("pipeworks:storage_tank_10_z", "pipeworks:storage_tank_10")
 

diff --git a/init.lua b/init.lua
index 0c6a5017c9e5221cbe1bdc5d1b49effd6be5d791..f875ce302c0eb60dc25d85d8dc526c4b0970baf1 100644 (file)
--- a/init.lua
+++ b/init.lua
@@ -108,6 +108,19 @@ pipe_bendsphere = {
        { -3/64, -3/64, -5/64, 3/64, 3/64, 5/64 }
 }
 
+spigot_bottomstub = {
+       { -2/64, -16/64, -6/64,   2/64, 1/64, 6/64 },   -- pipe segment against -Y face
+       { -4/64, -16/64, -5/64,   4/64, 1/64, 5/64 },
+       { -5/64, -16/64, -4/64,   5/64, 1/64, 4/64 },
+       { -6/64, -16/64, -2/64,   6/64, 1/64, 2/64 },
+
+       { -3/64, -16/64, -8/64, 3/64, -14/64, 8/64 },   -- (the flange for it)
+       { -5/64, -16/64, -7/64, 5/64, -14/64, 7/64 },
+       { -6/64, -16/64, -6/64, 6/64, -14/64, 6/64 },
+       { -7/64, -16/64, -5/64, 7/64, -14/64, 5/64 },
+       { -8/64, -16/64, -3/64, 8/64, -14/64, 3/64 }
+}
+
 --  Functions
 
 dbg = function(s)

diff --git a/textures/pipeworks_grating_sides.png b/textures/pipeworks_grating_sides.png
new file mode 100644 (file)
index 0000000..5237f0e
Binary files /dev/null and b/textures/pipeworks_grating_sides.png differ

diff --git a/textures/pipeworks_grating_top.png b/textures/pipeworks_grating_top.png
new file mode 100644 (file)
index 0000000..3ca91a8
Binary files /dev/null and b/textures/pipeworks_grating_top.png differ

diff --git a/textures/pipeworks_intake_sides.png b/textures/pipeworks_intake_sides.png
deleted file mode 100644 (file)
index 5237f0e..0000000
Binary files a/textures/pipeworks_intake_sides.png and /dev/null differ

diff --git a/textures/pipeworks_intake_top.png b/textures/pipeworks_intake_top.png
deleted file mode 100644 (file)
index 3ca91a8..0000000
Binary files a/textures/pipeworks_intake_top.png and /dev/null differ

diff --git a/textures/pipeworks_outlet_sides.png b/textures/pipeworks_outlet_sides.png
deleted file mode 100644 (file)
index fa85d0c..0000000
Binary files a/textures/pipeworks_outlet_sides.png and /dev/null differ

diff --git a/textures/pipeworks_outlet_top.png b/textures/pipeworks_outlet_top.png
deleted file mode 100644 (file)
index 7de76de..0000000
Binary files a/textures/pipeworks_outlet_top.png and /dev/null differ

diff --git a/textures/pipeworks_pump_bottom.png b/textures/pipeworks_pump_bottom.png
new file mode 100644 (file)
index 0000000..5237f0e
Binary files /dev/null and b/textures/pipeworks_pump_bottom.png differ

diff --git a/textures/pipeworks_pump_ends.png b/textures/pipeworks_pump_ends.png
deleted file mode 100644 (file)
index a76aea1..0000000
Binary files a/textures/pipeworks_pump_ends.png and /dev/null differ

diff --git a/textures/pipeworks_pump_off.png b/textures/pipeworks_pump_off.png
index 4705a9a391ee9455eca2f12c1ff354822e7c071b..6cb3fb0ee587b9422b2a41df9a3e2b5e8c8a7410 100644 (file)
Binary files a/textures/pipeworks_pump_off.png and b/textures/pipeworks_pump_off.png differ

diff --git a/textures/pipeworks_pump_on.png b/textures/pipeworks_pump_on.png
index 4f35b085ed1916e57c2c2d3a721e4f804aeccd8f..0e2ed7c37094879310dd8417f3a0d4a0c6f307d8 100644 (file)
Binary files a/textures/pipeworks_pump_on.png and b/textures/pipeworks_pump_on.png differ

diff --git a/textures/pipeworks_pump_sides.png b/textures/pipeworks_pump_sides.png
index 14129f784ed3fb3c125d6197e99ebdcf29e83c9b..d479e533b57dd8d888940b54675e34941e158265 100644 (file)
Binary files a/textures/pipeworks_pump_sides.png and b/textures/pipeworks_pump_sides.png differ

diff --git a/textures/pipeworks_pump_top.png b/textures/pipeworks_pump_top.png
new file mode 100644 (file)
index 0000000..11b5c3f
Binary files /dev/null and b/textures/pipeworks_pump_top.png differ

diff --git a/textures/pipeworks_pump_top_x.png b/textures/pipeworks_pump_top_x.png
deleted file mode 100644 (file)
index 9228bdd..0000000
Binary files a/textures/pipeworks_pump_top_x.png and /dev/null differ

diff --git a/textures/pipeworks_pump_top_z.png b/textures/pipeworks_pump_top_z.png
deleted file mode 100644 (file)
index 45837e7..0000000
Binary files a/textures/pipeworks_pump_top_z.png and /dev/null differ

diff --git a/textures/pipeworks_spigot_sides.png b/textures/pipeworks_spigot_sides.png
new file mode 100644 (file)
index 0000000..e41599f
Binary files /dev/null and b/textures/pipeworks_spigot_sides.png differ

diff --git a/textures/pipeworks_valvebody_top_off_x.png b/textures/pipeworks_valvebody_top_off_x.png
deleted file mode 100644 (file)
index 0ab4938..0000000
Binary files a/textures/pipeworks_valvebody_top_off_x.png and /dev/null differ

diff --git a/textures/pipeworks_valvebody_top_off_z.png b/textures/pipeworks_valvebody_top_off_z.png
deleted file mode 100644 (file)
index d645b2d..0000000
Binary files a/textures/pipeworks_valvebody_top_off_z.png and /dev/null differ

diff --git a/textures/pipeworks_valvebody_top_on_x.png b/textures/pipeworks_valvebody_top_on_x.png
deleted file mode 100644 (file)
index e2d33a0..0000000
Binary files a/textures/pipeworks_valvebody_top_on_x.png and /dev/null differ

diff --git a/textures/pipeworks_valvebody_top_on_z.png b/textures/pipeworks_valvebody_top_on_z.png
deleted file mode 100644 (file)
index 7199797..0000000
Binary files a/textures/pipeworks_valvebody_top_on_z.png and /dev/null differ