summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xitem_transport.lua10
-rwxr-xr-xtubes.lua4
-rw-r--r--wielder.lua2
3 files changed, 10 insertions, 6 deletions
diff --git a/item_transport.lua b/item_transport.lua
index 3e0f3b8..02ef5f8 100755
--- a/item_transport.lua
+++ b/item_transport.lua
@@ -4,7 +4,11 @@ local fakePlayer = {
-- perhaps a custom metaclass that errors specially when fakePlayer.<property> is not found?
}
-function pipeworks.tube_item(pos, start_pos, velocity, item)
+function pipeworks.tube_item(pos, item)
+ error("obsolete pipeworks.tube_item() called; change caller to use pipeworks.tube_inject_item() instead")
+end
+
+function pipeworks.tube_inject_item(pos, start_pos, velocity, item)
-- Take item in any format
local stack = ItemStack(item)
local obj = luaentity.add_entity(pos, "pipeworks:tubed_item")
@@ -112,7 +116,7 @@ local function grabAndFire(data,slotseq_mode,filtmeta,frominv,frominvname,frompo
end
local pos = vector.add(frompos, vector.multiply(dir, 1.4))
local start_pos = vector.add(frompos, dir)
- local item1 = pipeworks.tube_item(pos, start_pos, dir, item)
+ local item1 = pipeworks.tube_inject_item(pos, start_pos, dir, item)
return true-- only fire one item, please
end
end
@@ -322,7 +326,7 @@ minetest.register_entity("pipeworks:tubed_item", {
return
end
local item = minetest.deserialize(staticdata)
- pipeworks.tube_item(self.object:getpos(), item.start_pos, item.velocity, item.itemstring)
+ pipeworks.tube_inject_item(self.object:getpos(), item.start_pos, item.velocity, item.itemstring)
self.object:remove()
end,
})
diff --git a/tubes.lua b/tubes.lua
index 10a7c64..e7e3579 100755
--- a/tubes.lua
+++ b/tubes.lua
@@ -496,7 +496,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
- pipeworks.tube_item(pos, pos, vector.new(0, 0, 0), object:get_luaentity().itemstring)
+ pipeworks.tube_inject_item(pos, pos, vector.new(0, 0, 0), object:get_luaentity().itemstring)
end
object:get_luaentity().itemstring = ""
object:remove()
@@ -556,7 +556,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
- pipeworks.tube_item(pos, pos, vector.new(0, 0, 0), object:get_luaentity().itemstring)
+ pipeworks.tube_inject_item(pos, pos, vector.new(0, 0, 0), object:get_luaentity().itemstring)
end
object:get_luaentity().itemstring = ""
object:remove()
diff --git a/wielder.lua b/wielder.lua
index 4bc9a4f..3ce73f6 100644
--- a/wielder.lua
+++ b/wielder.lua
@@ -101,7 +101,7 @@ local function wielder_on(data, wielder_pos, wielder_node)
if data.eject_drops then
for i, stack in ipairs(inv:get_list("main")) do
if not stack:is_empty() then
- pipeworks.tube_item(wielder_pos, wielder_pos, dir, stack)
+ pipeworks.tube_inject_item(wielder_pos, wielder_pos, dir, stack)
inv:set_stack("main", i, ItemStack(""))
end
end