Merge remote-tracking branch 'upstream/master'

cow.lua

@@ -35,7 +35,7 @@ mobs:register_mob("mobs_animal:cow", {
 		{name = "mobs:leather", chance = 1, min = 0, max = 2},
 		{name = "maptools:silver_coin", chance = 10, min = 0, max = 1,},
 	},
-	water_damage = 0,
+	water_damage = 0.01,
 	lava_damage = 5,
 	light_damage = 0,
 	animation = {
@@ -71,6 +71,7 @@ mobs:register_mob("mobs_animal:cow", {
 	},
 --	stay_near = {{"farming:straw", "group:grass"}, 10},
 	fear_height = 2,
+
 	on_rightclick = function(self, clicker)
 
 		-- feed or tame
@@ -93,7 +94,8 @@ mobs:register_mob("mobs_animal:cow", {
 
 		-- milk cow with empty bucket
 		if item == "bucket:bucket_empty"
-		or item == "wooden_bucket:bucket_wood_empty" then
+		or item == "wooden_bucket:bucket_wood_empty"
+		or item == "bucket_wooden:bucket_empty" then
 
 			--if self.gotten == true
 			if self.child == true then
@@ -101,8 +103,9 @@ mobs:register_mob("mobs_animal:cow", {
 			end
 
 			if self.gotten == true then
-				minetest.chat_send_player(name,
-					S("Cow already milked!"))
+
+				minetest.chat_send_player(name, S("Cow already milked!"))
+
 				return
 			end
 
@@ -113,7 +116,9 @@ mobs:register_mob("mobs_animal:cow", {
 
 			-- which bucket are we using
 			local ret_item = "mobs:bucket_milk"
-			if item == "wooden_bucket:bucket_wood_empty" then
+
+			if item == "wooden_bucket:bucket_wood_empty"
+			or item == "bucket_wooden:bucket_empty" then
 				ret_item = "mobs:wooden_bucket_milk"
 			end
 
@@ -121,7 +126,9 @@ mobs:register_mob("mobs_animal:cow", {
 				clicker:get_inventory():add_item("main", ret_item)
 			else
 				local pos = self.object:get_pos()
+
 				pos.y = pos.y + 0.5
+
 				minetest.add_item(pos, {name = ret_item})
 			end
 
@@ -145,17 +152,18 @@ mobs:register_mob("mobs_animal:cow", {
 
 
 if not mobs.custom_spawn_animal then
-mobs:spawn({
-	name = "mobs_animal:cow",
-	nodes = {"default:dirt_with_grass", "ethereal:green_dirt"},
-	neighbors = {"group:grass"},
-	min_light = 14,
-	interval = 60,
-	chance = 8000,
-	min_height = 5,
-	max_height = 200,
-	day_toggle = true
-})
+
+	mobs:spawn({
+		name = "mobs_animal:cow",
+		nodes = {"default:dirt_with_grass", "ethereal:green_dirt"},
+		neighbors = {"group:grass"},
+		min_light = 14,
+		interval = 60,
+		chance = 8000,
+		min_height = 5,
+		max_height = 200,
+		day_toggle = true
+	})
 end
 
 
@@ -171,7 +179,7 @@ minetest.register_craftitem(":mobs:bucket_milk", {
 	inventory_image = "mobs_bucket_milk.png",
 	stack_max = 1,
 	on_use = minetest.item_eat(8, "bucket:bucket_empty"),
-	groups = {food_milk = 1, flammable = 3, drink = 1},
+	groups = {food_milk = 1, flammable = 3, drink = 1}
 })
 
 -- glass of milk
@@ -179,7 +187,7 @@ minetest.register_craftitem(":mobs:glass_milk", {
 	description = S("Glass of Milk"),
 	inventory_image = "mobs_glass_milk.png",
 	on_use = minetest.item_eat(2, "vessels:drinking_glass"),
-	groups = {food_milk_glass = 1, flammable = 3, vessel = 1, drink = 1},
+	groups = {food_milk_glass = 1, flammable = 3, vessel = 1, drink = 1}
 })
 
 minetest.register_craft({
@@ -247,7 +255,7 @@ minetest.register_node(":mobs:cheeseblock", {
 	tiles = {"mobs_cheeseblock.png"},
 	is_ground_content = false,
 	groups = {oddly_breakable_by_hand = 3},
-	sounds = default.node_sound_dirt_defaults()
+	sounds = default and default.node_sound_dirt_defaults()
 })
 
 minetest.register_craft({
@@ -293,14 +301,20 @@ minetest.register_craft({
 	burntime = "8",
 })
 
--- check for wooden bucket mod and add compatibility
-if minetest.get_modpath("wooden_bucket") then
+-- check for either of the wood bucket mods and add compatibility
+local wb = minetest.get_modpath("wooden_bucket")
+local bw = minetest.get_modpath("bucket_wooden")
+
+if wb or bw then
+
+	local return_item = wb and "wooden_bucket:bucket_wood_empty"
+			or "bucket_wooden:bucket_empty"
 
 	minetest.register_craftitem(":mobs:wooden_bucket_milk", {
 		description = S("Wooden Bucket of Milk"),
 		inventory_image = "mobs_wooden_bucket_milk.png",
 		stack_max = 1,
-		on_use = minetest.item_eat(8, "wooden_bucket:bucket_wood_empty"),
+		on_use = minetest.item_eat(8, return_item),
 		groups = {food_milk = 1, flammable = 3, drink = 1}
 	})
 
@@ -311,7 +325,7 @@ if minetest.get_modpath("wooden_bucket") then
 			{"vessels:drinking_glass", "vessels:drinking_glass"},
 			{"mobs:wooden_bucket_milk", ""}
 		},
-		replacements = {{"mobs:wooden_bucket_milk", "wooden_bucket:bucket_wood_empty"}}
+		replacements = {{"mobs:wooden_bucket_milk", return_item}}
 	})
 
 	minetest.register_craft({
@@ -319,7 +333,7 @@ if minetest.get_modpath("wooden_bucket") then
 		recipe = {
 			{"group:food_milk_glass", "group:food_milk_glass"},
 			{"group:food_milk_glass", "group:food_milk_glass"},
-			{"wooden_bucket:bucket_wood_empty", ""}
+			{return_item, ""}
 		},
 		replacements = {
 			{"group:food_milk_glass", "vessels:drinking_glass 4"}
@@ -329,6 +343,6 @@ if minetest.get_modpath("wooden_bucket") then
 	minetest.register_craft({
 		output = "mobs:butter",
 		recipe = {{"mobs:wooden_bucket_milk", salt_item}},
-		replacements = {{"mobs:wooden_bucket_milk", "wooden_bucket:bucket_wood_empty"}}
+		replacements = {{"mobs:wooden_bucket_milk", return_item}}
 	})
 end