Shorten lines in bucket and support nil placers
[oweals/minetest_game.git] / mods / bucket / init.lua
index 2bd45d3b2db4fa73d6e6ac17ea92a70aabca9e19..3751cfe93c79436f5e5b7b32a9b40374c803d18b 100644 (file)
@@ -1,6 +1,8 @@
 -- Minetest 0.4 mod: bucket
 -- See README.txt for licensing and other information.
 
+local LIQUID_MAX = 8  --The number of water levels when liquid_finite is enabled
+
 minetest.register_alias("bucket", "bucket:bucket_empty")
 minetest.register_alias("bucket_water", "bucket:bucket_water")
 minetest.register_alias("bucket_lava", "bucket:bucket_lava")
@@ -16,13 +18,26 @@ minetest.register_craft({
 bucket = {}
 bucket.liquids = {}
 
+local function check_protection(pos, name, text)
+       if minetest.is_protected(pos, name) then
+               minetest.log("action", (name ~= "" and name or "A mod")
+                       .. " tried to " .. text
+                       .. " at protected position "
+                       .. minetest.pos_to_string(pos)
+                       .. " with a bucket")
+               minetest.record_protection_violation(pos, name)
+               return true
+       end
+       return false
+end
+
 -- Register a new liquid
 --   source = name of the source node
 --   flowing = name of the flowing node
 --   itemname = name of the new bucket item (or nil if liquid is not takeable)
 --   inventory_image = texture of the new bucket item (ignored if itemname == nil)
 -- This function can be called from any mod (that depends on bucket).
-function bucket.register_liquid(source, flowing, itemname, inventory_image)
+function bucket.register_liquid(source, flowing, itemname, inventory_image, name)
        bucket.liquids[source] = {
                source = source,
                flowing = flowing,
@@ -32,22 +47,77 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image)
 
        if itemname ~= nil then
                minetest.register_craftitem(itemname, {
+                       description = name,
                        inventory_image = inventory_image,
                        stack_max = 1,
                        liquids_pointable = true,
-                       on_use = function(itemstack, user, pointed_thing)
+                       groups = {not_in_creative_inventory=1},
+                       on_place = function(itemstack, user, pointed_thing)
                                -- Must be pointing to node
                                if pointed_thing.type ~= "node" then
                                        return
                                end
-                               -- Check if pointing to a liquid
-                               n = minetest.env:get_node(pointed_thing.under)
-                               if bucket.liquids[n.name] == nil then
-                                       -- Not a liquid
-                                       minetest.env:add_node(pointed_thing.above, {name=source})
-                               elseif n.name ~= source then
-                                       -- It's a liquid
-                                       minetest.env:add_node(pointed_thing.under, {name=source})
+                               
+                               -- Call on_rightclick if the pointed node defines it
+                               if user and not user:get_player_control().sneak then
+                                       local n = minetest.get_node(pointed_thing.under)
+                                       local nn = n.name
+                                       local ndef = minetest.registered_nodes[nn]
+                                       if ndef and ndef.on_rightclick then
+                                               return ndef.on_rightclick(
+                                                       pointed_thing.under,
+                                                       n, user,
+                                                       itemstack) or itemstack
+                                       end
+                               end
+
+                               local place_liquid = function(pos, node, source, flowing, fullness)
+                                       if check_protection(pos,
+                                                       user and user:get_player_name() or "",
+                                                       "place "..source) then
+                                               return
+                                       end
+                                       if math.floor(fullness/128) == 1 or
+                                               not minetest.setting_getbool("liquid_finite") then
+                                               minetest.add_node(pos, {name=source,
+                                                               param2=fullness})
+                                               return
+                                       elseif node.name == flowing then
+                                               fullness = fullness + node.param2
+                                       elseif node.name == source then
+                                               fullness = LIQUID_MAX
+                                       end
+
+                                       if fullness >= LIQUID_MAX then
+                                               minetest.add_node(pos, {name=source,
+                                                               param2=LIQUID_MAX})
+                                       else
+                                               minetest.add_node(pos, {name=flowing,
+                                                               param2=fullness})
+                                       end
+                               end
+
+                               -- Check if pointing to a buildable node
+                               local node = minetest.get_node(pointed_thing.under)
+                               local fullness = tonumber(itemstack:get_metadata())
+                               if not fullness then fullness = LIQUID_MAX end
+
+                               if minetest.registered_nodes[node.name].buildable_to then
+                                       -- buildable; replace the node
+                                       place_liquid(pointed_thing.under, node,
+                                                       source, flowing, fullness)
+                               else
+                                       -- not buildable to; place the liquid above
+                                       -- check if the node above can be replaced
+                                       local node = minetest.get_node(pointed_thing.above)
+                                       if minetest.registered_nodes[node.name].buildable_to then
+                                               place_liquid(pointed_thing.above,
+                                                               node, source,
+                                                               flowing, fullness)
+                                       else
+                                               -- do not remove the bucket with the liquid
+                                               return
+                                       end
                                end
                                return {name="bucket:bucket_empty"}
                        end
@@ -56,6 +126,7 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image)
 end
 
 minetest.register_craftitem("bucket:bucket_empty", {
+       description = "Empty Bucket",
        inventory_image = "bucket.png",
        stack_max = 1,
        liquids_pointable = true,
@@ -65,11 +136,25 @@ minetest.register_craftitem("bucket:bucket_empty", {
                        return
                end
                -- Check if pointing to a liquid source
-               n = minetest.env:get_node(pointed_thing.under)
-               liquiddef = bucket.liquids[n.name]
-               if liquiddef ~= nil and liquiddef.source == n.name and liquiddef.itemname ~= nil then
-                       minetest.env:add_node(pointed_thing.under, {name="air"})
-                       return {name=liquiddef.itemname}
+               node = minetest.get_node(pointed_thing.under)
+               liquiddef = bucket.liquids[node.name]
+               if liquiddef ~= nil and liquiddef.itemname ~= nil and
+                       (node.name == liquiddef.source or
+                       (node.name == liquiddef.flowing and
+                               minetest.setting_getbool("liquid_finite"))) then
+                       if check_protection(pointed_thing.under,
+                                       user:get_player_name(),
+                                       "take ".. node.name) then
+                               return
+                       end
+
+                       minetest.add_node(pointed_thing.under, {name="air"})
+
+                       if node.name == liquiddef.source then
+                               node.param2 = LIQUID_MAX
+                       end
+                       return ItemStack({name = liquiddef.itemname,
+                                       metadata = tostring(node.param2)})
                end
        end,
 })
@@ -78,18 +163,21 @@ bucket.register_liquid(
        "default:water_source",
        "default:water_flowing",
        "bucket:bucket_water",
-       "bucket_water.png"
+       "bucket_water.png",
+       "Water Bucket"
 )
 
 bucket.register_liquid(
        "default:lava_source",
        "default:lava_flowing",
        "bucket:bucket_lava",
-       "bucket_lava.png"
+       "bucket_lava.png",
+       "Lava Bucket"
 )
 
 minetest.register_craft({
        type = "fuel",
-       recipe = "default:bucket_lava",
+       recipe = "bucket:bucket_lava",
        burntime = 60,
+       replacements = {{"bucket:bucket_lava", "bucket:bucket_empty"}},
 })