WIP raycast base buckets

mods/ITEMS/mcl_buckets/init.lua

@@ -44,21 +44,59 @@ local place_liquid = function(pos, itemstring)
 	sound_place(itemstring, pos)
 	minetest.add_node(pos, {name=itemstring, param2=fullness})
 end
+local function give_bucket(new_bucket, itemstack, user)
+	if itemstack:get_count() == 1 then
+		return new_bucket
+	else
+		local inv = user:get_inventory()
+		if inv:room_for_item("main", new_bucket) then
+			inv:add_item("main", new_bucket)
+		else
+			minetest.add_item(user:get_pos(), new_bucket)
+		end
+		if not minetest.is_creative_enabled(user:get_player_name()) then
+			itemstack:take_item()
+		end
+		return itemstack
+	end
+end
+
+local function bucket_raycast(user)
+	local pos = user:get_pos()
+	pos.y = pos.y + user:get_properties().eye_height
+	local look_dir = user:get_look_dir()
+	look_dir = vector.multiply(look_dir, 6)
+	local pos2 = vector.add(pos, look_dir)
+
+	local ray = raycast(pos, pos2, false, true)		
+	if ray then
+		for pointed_thing in ray do
+			if pointed_thing and get_node_group(get_node(pointed_thing.above).name, "_mcl_bucket_pointable") == 1 then
+				--minetest.chat_send_all("found!")
+				return {under=pointed_thing.under,above=pointed_thing.above}
+			end
+		end
+	end
+	return nil
+end
 
 function mcl_buckets.register_liquid(def)
-	for i=1, #def.source_take do
+	for _,source in ipairs(def.source_take) do
-		mcl_buckets.liquids[def.source_take[i]] = {
+		mcl_buckets.liquids[source] = {
 			source_place = def.source_place,
-			source_take = def.source_take[i],
+			source_take = source,
 			on_take = def.on_take,
 			itemname = def.itemname,
 		}
 		if type(def.source_place) == "string" then
-			mcl_buckets.liquids[def.source_place] = mcl_buckets.liquids[def.source_take[i]]
+			mcl_buckets.liquids[def.source_place] = mcl_buckets.liquids[source]
 		end
 	end
 
-	if def.itemname ~= nil then
+	if def.itemname == nil or def.itemname == "" then
+		error(string.format("[mcl_bucket] Invalid itemname then registering [%s]!", def.name))
+	end
+
 	minetest.register_craftitem(def.itemname, {
 		description = def.name,
 		_doc_items_longdesc = def.longdesc,
@@ -167,33 +205,31 @@ function mcl_buckets.register_liquid(def)
 		end,
 	})
 end
-end
 
 minetest.register_craftitem("mcl_buckets:bucket_empty", {
 	description = S("Empty Bucket"),
 	_doc_items_longdesc = S("A bucket can be used to collect and release liquids."),
 	_doc_items_usagehelp = S("Punch a liquid source to collect it. You can then use the filled bucket to place the liquid somewhere else."),
 	_tt_help = S("Collects liquids"),
-
+	--liquids_pointable = true,
-	liquids_pointable = true,
 	inventory_image = "bucket.png",
 	stack_max = 16,
 	on_place = function(itemstack, user, pointed_thing)
-		-- Must be pointing to node
+		--[[-- Must be pointing to node
 		if pointed_thing.type ~= "node" then
 			return itemstack
 		end
 
 		-- Call on_rightclick if the pointed node defines it
-		local node = minetest.get_node(pointed_thing.under)
+
-		local nn = node.name
+
-		if user and not user:get_player_control().sneak then
+		local pointed_liquid = bucket_raycast(user)
-			if minetest.registered_nodes[nn] and minetest.registered_nodes[nn].on_rightclick then
-				return minetest.registered_nodes[nn].on_rightclick(pointed_thing.under, node, user, itemstack) or itemstack
-			end
-		end
 
 		-- Can't steal liquids
+		if minetest.is_protected(pointed_liquid.above, user:get_player_name()) then
+			minetest.record_protection_violation(pointed_liquid.under, user:get_player_name())
+			return itemstack
+		end
 		if minetest.is_protected(pointed_thing.above, user:get_player_name()) then
 			minetest.record_protection_violation(pointed_thing.under, user:get_player_name())
 			return itemstack
@@ -252,6 +288,72 @@ minetest.register_craftitem("mcl_buckets:bucket_empty", {
 				end
 				return itemstack
 			end
+		end]]
+		if pointed_thing.type ~= "node" then
+			return itemstack
+		end
+		local node = minetest.get_node(pointed_thing.under)
+		local nn = node.name
+		if user and not user:get_player_control().sneak then
+			if minetest.registered_nodes[nn] and minetest.registered_nodes[nn].on_rightclick then
+				return minetest.registered_nodes[nn].on_rightclick(pointed_thing.under, node, user, itemstack) or itemstack
+			end
+		end
+		
+		local liquid_node = bucket_raycast(user)
+		if liquid_node then
+			if minetest.is_protected(liquid_node.above, user:get_player_name()) then
+				minetest.record_protection_violation(liquid_node.above, user:get_player_name())
+			end
+			local liquid_name = get_node(liquid_node.above).name
+			if liquid_name then
+				local liquid_def = mcl_buckets.liquids[liquid_name]
+				if liquid_def then
+					local new_bucket
+					--minetest.chat_send_all("test")
+					-- Fill bucket, but not in Creative Mode
+					-- FIXME: remove this line
+					--if not minetest.is_creative_enabled(user:get_player_name()) then
+					if not false then
+						new_bucket = ItemStack({name = liquid_def.itemname})
+						if liquid_def.on_take then
+							liquid_def.on_take(user)
+						end
+					end
+					add_node(liquid_node.above, {name="air"})
+					sound_take(nn, liquid_node.above)
+
+					if mod_doc and doc.entry_exists("nodes", liquid_name) then
+						doc.mark_entry_as_revealed(user:get_player_name(), "nodes", liquid_name)
+					end
+					if new_bucket then
+						return give_bucket(new_bucket, itemstack, user)
+					end
+				else
+					minetest.log("error", string.format("[mcl_buckets] Node [%s] has invalid group [_mcl_bucket_pointable]!", liquid_name))
+				end
+			end
+			return itemstack
+		else
+			-- FIXME: replace this ugly code by cauldrons API
+			if nn == "mcl_cauldrons:cauldron_3" then
+				-- Take water out of full cauldron
+				minetest.set_node(pointed_thing.under, {name="mcl_cauldrons:cauldron"})
+				if not minetest.is_creative_enabled(user:get_player_name()) then
+					new_bucket = ItemStack("mcl_buckets:bucket_water")
+				end
+				sound_take("mcl_core:water_source", pointed_thing.under)
+			elseif nn == "mcl_cauldrons:cauldron_3r" then
+				-- Take river water out of full cauldron
+				minetest.set_node(pointed_thing.under, {name="mcl_cauldrons:cauldron"})
+				if not minetest.is_creative_enabled(user:get_player_name()) then
+					new_bucket = ItemStack("mcl_buckets:bucket_river_water")
+				end
+				sound_take("mclx_core:river_water_source", pointed_thing.under)
+			end
+			if new_bucket then
+				return give_bucket(new_bucket, itemstack, user)
+			end
         end
 	end,
 	_on_dispense = function(stack, pos, droppos, dropnode, dropdir)