evert/fluid_lib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bucket now fully supports Node IO

Browse Source
This commit is contained in:
Evert Prants 2018-08-24 21:49:43 +03:00
parent a4f05fc337
commit 9db0dc184c
Signed by: evert
GPG Key ID: 1688DA83D222D0B5
4 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bucket/depends.txt
View File

@ -1,2 +1,3 @@
default default
fluid_lib fluid_lib
node_io?

39
bucket/init.lua
View File

@ -1,6 +1,8 @@
-- Minetest 0.4 mod: bucket -- Minetest 0.4 mod: bucket
-- See README.md for licensing and other information. -- See README.md for licensing and other information.
local napi = minetest.get_modpath("node_io")
minetest.register_alias("bucket", "bucket:bucket_empty") minetest.register_alias("bucket", "bucket:bucket_empty")
minetest.register_alias("bucket_water", "bucket:bucket_water") minetest.register_alias("bucket_water", "bucket:bucket_water")
minetest.register_alias("bucket_lava", "bucket:bucket_lava") minetest.register_alias("bucket_lava", "bucket:bucket_lava")
@ -112,9 +114,21 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image, name
local place = true local place = true
local ppos = pointed_thing.under local ppos = pointed_thing.under
local node = minetest.get_node(ppos) local node = minetest.get_node(ppos)
if ndef.node_io_can_put_liquid and ndef.node_io_can_put_liquid(ppos, node, "N") then
if ndef.node_io_room_for_liquid(ppos, node, "N", source, 1000) >= 1000 then -- Node IO Support
ndef.node_io_put_liquid(ppos, node, "N", user, source, 1000) local usedef = ndef
local defpref = "node_io_"
local lookat = "N"
if napi then
usedef = node_io
lookat = node_io.get_pointed_side(user, pointed_thing)
defpref = ""
end
if usedef[defpref..'can_put_liquid'] and usedef[defpref..'can_put_liquid'](ppos, node, lookat) then
if usedef[defpref..'room_for_liquid'](ppos, node, lookat, source, 1000) >= 1000 then
usedef[defpref..'put_liquid'](ppos, node, lookat, user, source, 1000)
if ndef.on_timer then if ndef.on_timer then
minetest.get_node_timer(ppos):start(ndef.node_timer_seconds or 1.0) minetest.get_node_timer(ppos):start(ndef.node_timer_seconds or 1.0)
end end
@ -242,18 +256,29 @@ minetest.register_craftitem("bucket:bucket_empty", {
itemstack = ItemStack("bucket:bucket_empty") itemstack = ItemStack("bucket:bucket_empty")
-- Node IO Support
local usedef = ndef
local defpref = "node_io_"
local lookat = "N"
if napi then
usedef = node_io
lookat = node_io.get_pointed_side(user, pointed_thing)
defpref = ""
end
-- Remove fluid from buffers if present -- Remove fluid from buffers if present
if ndef.node_io_can_take_liquid and ndef.node_io_can_take_liquid(lpos, node, "N") then if usedef[defpref..'can_take_liquid'] and usedef[defpref..'can_take_liquid'](lpos, node, lookat) then
local bfc = ndef.node_io_get_liquid_size(lpos, node, "N") local bfc = usedef[defpref..'get_liquid_size'](lpos, node, lookat)
local buffers = {} local buffers = {}
for i = 1, bfc do for i = 1, bfc do
buffers[i] = ndef.node_io_get_liquid_name(lpos, node, "N", i) buffers[i] = usedef[defpref..'get_liquid_name'](lpos, node, lookat, i)
end end
if #buffers > 0 then if #buffers > 0 then
for id,fluid in pairs(buffers) do for id,fluid in pairs(buffers) do
if fluid ~= "" then if fluid ~= "" then
local took = ndef.node_io_take_liquid(lpos, node, "", user, fluid, 1000) local took = usedef[defpref..'take_liquid'](lpos, node, lookat, user, fluid, 1000)
if took.millibuckets == 1000 and took.name == fluid then if took.millibuckets == 1000 and took.name == fluid then
if bucket.liquids[fluid] then if bucket.liquids[fluid] then
itemstack = ItemStack(bucket.liquids[fluid].itemname) itemstack = ItemStack(bucket.liquids[fluid].itemname)

1
bucket/mod.conf
View File

@ -1,2 +1,3 @@
name = bucket name = bucket
depends = default,fluid_lib depends = default,fluid_lib
optional_depends = node_io

4
fluid_lib/buffer.lua
View File

@ -87,8 +87,8 @@ end
function fluid_lib.insert_into_buffer(pos, buffer, fluid, count) function fluid_lib.insert_into_buffer(pos, buffer, fluid, count)
local bfdata = fluid_lib.get_buffer_data(pos, buffer) local bfdata = fluid_lib.get_buffer_data(pos, buffer)
if not bfdata then return nil end if not bfdata then return 0 end
if bfdata.fluid ~= fluid and bfdata.fluid ~= "" then return nil end if bfdata.fluid ~= fluid and bfdata.fluid ~= "" then return 0 end
local can_put = fluid_lib.can_insert_into_buffer(pos, buffer, fluid, count) local can_put = fluid_lib.can_insert_into_buffer(pos, buffer, fluid, count)