Compatibility with latest pipeworks
authorNovatux <nathanael.courant@laposte.net>
Thu, 14 Aug 2014 19:29:56 +0000 (21:29 +0200)
committerNovatux <nathanael.courant@laposte.net>
Thu, 14 Aug 2014 19:29:56 +0000 (21:29 +0200)
technic/machines/HV/quarry.lua
technic/machines/other/injector.lua
technic/machines/register/common.lua

index 628c44395cd9415039d57f761954833d3b06a9c2..d75a9e3fae8517a5d37f0686b03f5aad755794cd 100644 (file)
@@ -119,10 +119,7 @@ end
 
 local function send_items(items, pos, node)
        for _, item in pairs(items) do
-               local tube_item = pipeworks.tube_item(vector.new(pos), item)
-               tube_item:get_luaentity().start_pos = vector.new(pos)
-               tube_item:setvelocity(vector.new(0, 1, 0))
-               tube_item:setacceleration({x=0, y=0, z=0})
+               pipeworks.tube_item(pos, pos, vector.new(0, 1, 0), item)
        end
 end
 
index 11c545542aad553aec23b7035eeb255110cb4fbf..485974c0a6da2f4ec3c21379ad49b09a89672843 100644 (file)
@@ -12,12 +12,9 @@ local function inject_items (pos)
                                if stack then
                                local item0=stack:to_table()
                                if item0 then 
-                                       item0["count"]="1"
-                                       local item1=pipeworks.tube_item({x=pos.x,y=pos.y,z=pos.z},item0)
-                                       item1:get_luaentity().start_pos = {x=pos.x,y=pos.y,z=pos.z}
-                                       item1:setvelocity({x=0, y=-1, z=0})
-                                       item1:setacceleration({x=0, y=0, z=0})
-                                       stack:take_item(1);
+                                       item0["count"] = "1"
+                                       pipeworks.tube_item(pos, pos, vector.new(0, -1, 0), item0)
+                                       stack:take_item(1)
                                        inv:set_stack("main", i, stack)
                                        return
                                        end
@@ -31,10 +28,7 @@ local function inject_items (pos)
                                if stack then
                                local item0=stack:to_table()
                                if item0 then 
-                                       local item1=pipeworks.tube_item({x=pos.x,y=pos.y,z=pos.z},item0)
-                                       item1:get_luaentity().start_pos = {x=pos.x,y=pos.y,z=pos.z}
-                                       item1:setvelocity({x=0, y=-1, z=0})
-                                       item1:setacceleration({x=0, y=0, z=0})
+                                       pipeworks.tube_item(pos, pos, vector.new(0, -1, 0), item0)
                                        stack:clear()
                                        inv:set_stack("main", i, stack)
                                        return
index a3702abeb77d02d2f41675658af3edb6877cfacd..366009c0caa9a85dc7774eade59763d868fb2d41 100644 (file)
@@ -52,10 +52,7 @@ function technic.send_items(pos, x_velocity, z_velocity, output_name)
                        local item0 = stack:to_table()
                        if item0 then 
                                item0["count"] = "1"
-                               local item1 = pipeworks.tube_item({x=pos.x, y=pos.y, z=pos.z}, item0)
-                               item1:get_luaentity().start_pos = {x=pos.x, y=pos.y, z=pos.z}
-                               item1:setvelocity({x=x_velocity, y=0, z=z_velocity})
-                               item1:setacceleration({x=0, y=0, z=0})
+                               pipeworks.tube_item(pos, pos, vector.new(x_velocity, 0, z_velocity), item0)
                                stack:take_item(1)
                                inv:set_stack(output_name, i, stack)
                                return