Merge pull request 'water mobs' (#2403) from water_mobs into master

Reviewed-on: MineClone2/MineClone2#2403
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>

mods/ENTITIES/mcl_mobs/api.lua

@@ -4036,6 +4036,7 @@ minetest.register_entity(name, {
 	fire_resistant = def.fire_resistant or false,
 	fire_damage_resistant = def.fire_damage_resistant or false,
 	ignited_by_sunlight = def.ignited_by_sunlight or false,
+	spawn_in_group = def.spawn_in_group,
 	-- End of MCL2 extensions
 
 	on_spawn = def.on_spawn,

mods/ENTITIES/mcl_mobs/spawning.lua

@@ -379,6 +379,20 @@ local function is_farm_animal(n)
 	return n == "mobs_mc:pig" or n == "mobs_mc:cow" or n == "mobs_mc:sheep" or n == "mobs_mc:chicken" or n == "mobs_mc:horse" or n == "mobs_mc:donkey"
 end
 
+local function get_water_spawn(p)
+		local nn = minetest.find_nodes_in_area(vector.offset(p,-2,-1,-2),vector.offset(p,2,-15,2),{"group:water"})
+		if nn and #nn > 0 then
+			return nn[math.random(#nn)]
+		end
+end
+
+local function spawn_group(p,mob,spawn_on,group_max)
+	local nn = minetest.find_nodes_in_area(vector.offset(p,-3,-3,-3),vector.offset(p,3,3,3),spawn_on)
+	for i = 1, math.random(group_max) do
+		minetest.add_entity(nn[math.random(#nn)],mob)
+	end
+end
+
 if mobs_spawn then
 
 	local perlin_noise
@@ -442,6 +456,7 @@ if mobs_spawn then
 			end
 			local mob_def = mob_library_worker_table[mob_index]
 			local mob_type = minetest.registered_entities[mob_def.name].type
+			local spawn_in_group = minetest.registered_entities[mob_def.name].spawn_in_group
 			if mob_def
 				and spawning_position.y >= mob_def.min_height
 				and spawning_position.y <= mob_def.max_height
@@ -453,10 +468,19 @@ if mobs_spawn then
 				and (mob_def.check_position and mob_def.check_position(spawning_position) or true)
 				and (not is_farm_animal(mob_def.name) or is_grass)
 				and (mob_type ~= "npc" or has_bed)
-				and (mob_def.type_of_spawning ~= water or is_water)
+				and (mob_def.type_of_spawning ~= "water" or is_water)
 				then
+					if mob_def.type_of_spawning == "water" then
+						spawning_position = get_water_spawn(spawning_position)
+						if not spawning_position then
+							return
+						end
+					end
 					--everything is correct, spawn mob
 					local object = minetest.add_entity(spawning_position, mob_def.name)
+					if spawn_in_group then
+						spawn_group(spawning_position,mob_def.name,{gotten_node},spawn_in_group)
+					end
 					if object then
 						return mob_def.on_spawn and mob_def.on_spawn(object, spawning_position)
 					end

mods/ENTITIES/mobs_mc/cod.lua

@@ -0,0 +1,273 @@
+--MCmobs v0.4
+--maikerumine
+--made for MC like Survival game
+--License for code WTFPL and otherwise stated in readmes
+
+local pi = math.pi
+local atann = math.atan
+local atan = function(x)
+	if not x or x ~= x then
+		return 0
+	else
+		return atann(x)
+	end
+end
+
+local dir_to_pitch = function(dir)
+	local dir2 = vector.normalize(dir)
+	local xz = math.abs(dir.x) + math.abs(dir.z)
+	return -math.atan2(-dir.y, xz)
+end
+
+local function degrees(rad)
+	return rad * 180.0 / math.pi
+end
+
+local S = minetest.get_translator(minetest.get_current_modname())
+
+--###################
+--################### cod
+--###################
+
+local cod = {
+	type = "animal",
+	spawn_class = "water",
+	can_despawn = true,
+	passive = true,
+	hp_min = 3,
+	hp_max = 3,
+	xp_min = 1,
+	xp_max = 3,
+	armor = 100,
+	rotate = 180,
+	spawn_in_group = 10,
+	tilt_swim = true,
+	collisionbox = {-0.3, 0.0, -0.3, 0.3, 0.79, 0.3},
+	visual = "mesh",
+	mesh = "extra_mobs_cod.b3d",
+	textures = {
+		{"extra_mobs_cod.png"}
+	},
+	sounds = {
+	},
+	animation = {
+		stand_start = 1,
+		stand_end = 20,
+		walk_start = 1,
+		walk_end = 20,
+		run_start = 1,
+		run_end = 20,
+	},
+	drops = {
+		{name = "mcl_fishing:fish_raw",
+		chance = 1,
+		min = 1,
+		max = 1,},
+		{name = "mcl_dye:white",
+		chance = 20,
+		min = 1,
+		max = 1,},
+	},
+	visual_size = {x=3, y=3},
+	makes_footstep_sound = false,
+    fly = true,
+    fly_in = { "mcl_core:water_source", "mclx_core:river_water_source" },
+	breathes_in_water = true,
+	jump = false,
+	view_range = 16,
+	runaway = true,
+	fear_height = 4,
+	do_custom = function(self)
+		--[[ this is supposed to make them jump out the water but doesn't appear to work very well
+		self.object:set_bone_position("body", vector.new(0,1,0), vector.new(degrees(dir_to_pitch(self.object:get_velocity())) * -1 + 90,0,0))
+		if minetest.get_item_group(self.standing_in, "water") ~= 0 then
+			if self.object:get_velocity().y < 5 then
+				self.object:add_velocity({ x = 0 , y = math.random(-.007, .007), z = 0 })
+			end
+		end
+--]]
+		for _,object in pairs(minetest.get_objects_inside_radius(self.object:get_pos(), 10)) do
+			local lp = object:get_pos()
+			local s = self.object:get_pos()
+			local vec = {
+				x = lp.x - s.x,
+				y = lp.y - s.y,
+				z = lp.z - s.z
+			}
+			if object and not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "mobs_mc:cod" then
+				self.state = "runaway"
+				self.object:set_rotation({x=0,y=(atan(vec.z / vec.x) + 3 * pi / 2) - self.rotate,z=0})
+			end
+		end
+	end,
+	on_rightclick = function(self, clicker)
+		if clicker:get_wielded_item():get_name() == "mcl_buckets:bucket_water" then
+			self.object:remove()
+			clicker:set_wielded_item("mcl_fishing:bucket_cod")
+			awards.unlock(clicker:get_player_name(), "mcl:tacticalFishing")
+		end
+	end
+}
+
+mcl_mobs:register_mob("mobs_mc:cod", cod)
+
+
+--spawning TODO: in schools
+
+local water = 0
+
+mcl_mobs:spawn_specific(
+"mobs_mc:cod",
+"overworld",
+"water",
+{
+"Mesa",
+"FlowerForest",
+"Swampland",
+"Taiga",
+"ExtremeHills",
+"Jungle",
+"Savanna",
+"BirchForest",
+"MegaSpruceTaiga",
+"MegaTaiga",
+"ExtremeHills+",
+"Forest",
+"Plains",
+"Desert",
+"ColdTaiga",
+"MushroomIsland",
+"IcePlainsSpikes",
+"SunflowerPlains",
+"IcePlains",
+"RoofedForest",
+"ExtremeHills+_snowtop",
+"MesaPlateauFM_grasstop",
+"JungleEdgeM",
+"ExtremeHillsM",
+"JungleM",
+"BirchForestM",
+"MesaPlateauF",
+"MesaPlateauFM",
+"MesaPlateauF_grasstop",
+"MesaBryce",
+"JungleEdge",
+"SavannaM",
+"FlowerForest_beach",
+"Forest_beach",
+"StoneBeach",
+"ColdTaiga_beach_water",
+"Taiga_beach",
+"Savanna_beach",
+"Plains_beach",
+"ExtremeHills_beach",
+"ColdTaiga_beach",
+"Swampland_shore",
+"MushroomIslandShore",
+"JungleM_shore",
+"Jungle_shore",
+"MesaPlateauFM_sandlevel",
+"MesaPlateauF_sandlevel",
+"MesaBryce_sandlevel",
+"Mesa_sandlevel",
+"RoofedForest_ocean",
+"JungleEdgeM_ocean",
+"BirchForestM_ocean",
+"BirchForest_ocean",
+"IcePlains_deep_ocean",
+"Jungle_deep_ocean",
+"Savanna_ocean",
+"MesaPlateauF_ocean",
+"ExtremeHillsM_deep_ocean",
+"Savanna_deep_ocean",
+"SunflowerPlains_ocean",
+"Swampland_deep_ocean",
+"Swampland_ocean",
+"MegaSpruceTaiga_deep_ocean",
+"ExtremeHillsM_ocean",
+"JungleEdgeM_deep_ocean",
+"SunflowerPlains_deep_ocean",
+"BirchForest_deep_ocean",
+"IcePlainsSpikes_ocean",
+"Mesa_ocean",
+"StoneBeach_ocean",
+"Plains_deep_ocean",
+"JungleEdge_deep_ocean",
+"SavannaM_deep_ocean",
+"Desert_deep_ocean",
+"Mesa_deep_ocean",
+"ColdTaiga_deep_ocean",
+"Plains_ocean",
+"MesaPlateauFM_ocean",
+"Forest_deep_ocean",
+"JungleM_deep_ocean",
+"FlowerForest_deep_ocean",
+"MushroomIsland_ocean",
+"MegaTaiga_ocean",
+"StoneBeach_deep_ocean",
+"IcePlainsSpikes_deep_ocean",
+"ColdTaiga_ocean",
+"SavannaM_ocean",
+"MesaPlateauF_deep_ocean",
+"MesaBryce_deep_ocean",
+"ExtremeHills+_deep_ocean",
+"ExtremeHills_ocean",
+"MushroomIsland_deep_ocean",
+"Forest_ocean",
+"MegaTaiga_deep_ocean",
+"JungleEdge_ocean",
+"MesaBryce_ocean",
+"MegaSpruceTaiga_ocean",
+"ExtremeHills+_ocean",
+"Jungle_ocean",
+"RoofedForest_deep_ocean",
+"IcePlains_ocean",
+"FlowerForest_ocean",
+"ExtremeHills_deep_ocean",
+"MesaPlateauFM_deep_ocean",
+"Desert_ocean",
+"Taiga_ocean",
+"BirchForestM_deep_ocean",
+"Taiga_deep_ocean",
+"JungleM_ocean",
+"FlowerForest_underground",
+"JungleEdge_underground",
+"StoneBeach_underground",
+"MesaBryce_underground",
+"Mesa_underground",
+"RoofedForest_underground",
+"Jungle_underground",
+"Swampland_underground",
+"MushroomIsland_underground",
+"BirchForest_underground",
+"Plains_underground",
+"MesaPlateauF_underground",
+"ExtremeHills_underground",
+"MegaSpruceTaiga_underground",
+"BirchForestM_underground",
+"SavannaM_underground",
+"MesaPlateauFM_underground",
+"Desert_underground",
+"Savanna_underground",
+"Forest_underground",
+"SunflowerPlains_underground",
+"ColdTaiga_underground",
+"IcePlains_underground",
+"IcePlainsSpikes_underground",
+"MegaTaiga_underground",
+"Taiga_underground",
+"ExtremeHills+_underground",
+"JungleM_underground",
+"ExtremeHillsM_underground",
+"JungleEdgeM_underground",
+},
+0,
+minetest.LIGHT_MAX+1,
+30,
+4000,
+3,
+water-16,
+water+1)
+
+--spawn egg
+mcl_mobs:register_egg("mobs_mc:cod", S("Cod"), "extra_mobs_spawn_icon_cod.png", 0)

mods/ENTITIES/mobs_mc/dolphin.lua

@@ -0,0 +1,253 @@
+--MCmobs v0.4
+--maikerumine
+--made for MC like Survival game
+--License for code WTFPL and otherwise stated in readmes
+
+local pi = math.pi
+local atann = math.atan
+local atan = function(x)
+	if not x or x ~= x then
+		return 0
+	else
+		return atann(x)
+	end
+end
+
+local dir_to_pitch = function(dir)
+	local dir2 = vector.normalize(dir)
+	local xz = math.abs(dir.x) + math.abs(dir.z)
+	return -math.atan2(-dir.y, xz)
+end
+
+local function degrees(rad)
+	return rad * 180.0 / math.pi
+end
+
+local S = minetest.get_translator(minetest.get_current_modname())
+
+--###################
+--################### dolphin
+--###################
+
+local dolphin = {
+	type = "monster",
+	spawn_class = "water",
+	can_despawn = true,
+	passive = true,
+	hp_min = 10,
+	hp_max = 10,
+	xp_min = 1,
+	xp_max = 3,
+	armor = 100,
+	walk_chance = 100,
+	breath_max = 120,
+	rotate = 180,
+	spawn_in_group = 3,
+	tilt_swim = true,
+	collisionbox = {-0.3, 0.0, -0.3, 0.3, 0.79, 0.3},
+	visual = "mesh",
+	mesh = "extra_mobs_dolphin.b3d",
+	textures = {
+		{"extra_mobs_dolphin.png"}
+	},
+	sounds = {
+	},
+	animation = {
+		stand_start = 20,
+		stand_end = 20,
+		walk_start = 0,
+		walk_end = 15,
+		run_start = 30,
+		run_end = 45,
+		},
+		drops = {
+			{name = "mcl_fishing:fish_raw",
+			chance = 1,
+			min = 0,
+			max = 1,},
+	},
+	visual_size = {x=3, y=3},
+	makes_footstep_sound = false,
+    fly = true,
+    fly_in = { "mcl_core:water_source", "mclx_core:river_water_source" },
+	breathes_in_water = true,
+	jump = false,
+	view_range = 16,
+	fear_height = 4,
+	walk_velocity = 3,
+	run_velocity = 6,
+	reach = 2,
+	damage = 2.5,
+	attack_type = "dogfight",
+	do_custom = function(self,dtime)
+			--[[ this is supposed to make them jump out the water but doesn't appear to work very well
+		self.object:set_bone_position("body", vector.new(0,1,0), vector.new(degrees(dir_to_pitch(self.object:get_velocity())) * -1 + 90,0,0))
+		if minetest.get_item_group(self.standing_in, "water") ~= 0 then
+			if self.object:get_velocity().y < 5 then
+				self.object:add_velocity({ x = 0 , y = math.random(-.007, .007), z = 0 })
+			end
+		end
+		--]]
+	end,
+}
+
+mcl_mobs:register_mob("mobs_mc:dolphin", dolphin)
+
+
+--spawning TO DO: in schools
+local water = 0
+mcl_mobs:spawn_specific(
+"mobs_mc:dolphin",
+"overworld",
+"water",
+{
+"Mesa",
+"FlowerForest",
+"Swampland",
+"Taiga",
+"ExtremeHills",
+"Jungle",
+"Savanna",
+"BirchForest",
+"MegaSpruceTaiga",
+"MegaTaiga",
+"ExtremeHills+",
+"Forest",
+"Plains",
+"Desert",
+"ColdTaiga",
+"MushroomIsland",
+"IcePlainsSpikes",
+"SunflowerPlains",
+"IcePlains",
+"RoofedForest",
+"ExtremeHills+_snowtop",
+"MesaPlateauFM_grasstop",
+"JungleEdgeM",
+"ExtremeHillsM",
+"JungleM",
+"BirchForestM",
+"MesaPlateauF",
+"MesaPlateauFM",
+"MesaPlateauF_grasstop",
+"MesaBryce",
+"JungleEdge",
+"SavannaM",
+"FlowerForest_beach",
+"Forest_beach",
+"StoneBeach",
+"ColdTaiga_beach_water",
+"Taiga_beach",
+"Savanna_beach",
+"Plains_beach",
+"ExtremeHills_beach",
+"ColdTaiga_beach",
+"Swampland_shore",
+"MushroomIslandShore",
+"JungleM_shore",
+"Jungle_shore",
+"MesaPlateauFM_sandlevel",
+"MesaPlateauF_sandlevel",
+"MesaBryce_sandlevel",
+"Mesa_sandlevel",
+"RoofedForest_ocean",
+"JungleEdgeM_ocean",
+"BirchForestM_ocean",
+"BirchForest_ocean",
+"IcePlains_deep_ocean",
+"Jungle_deep_ocean",
+"Savanna_ocean",
+"MesaPlateauF_ocean",
+"ExtremeHillsM_deep_ocean",
+"Savanna_deep_ocean",
+"SunflowerPlains_ocean",
+"Swampland_deep_ocean",
+"Swampland_ocean",
+"MegaSpruceTaiga_deep_ocean",
+"ExtremeHillsM_ocean",
+"JungleEdgeM_deep_ocean",
+"SunflowerPlains_deep_ocean",
+"BirchForest_deep_ocean",
+"IcePlainsSpikes_ocean",
+"Mesa_ocean",
+"StoneBeach_ocean",
+"Plains_deep_ocean",
+"JungleEdge_deep_ocean",
+"SavannaM_deep_ocean",
+"Desert_deep_ocean",
+"Mesa_deep_ocean",
+"ColdTaiga_deep_ocean",
+"Plains_ocean",
+"MesaPlateauFM_ocean",
+"Forest_deep_ocean",
+"JungleM_deep_ocean",
+"FlowerForest_deep_ocean",
+"MushroomIsland_ocean",
+"MegaTaiga_ocean",
+"StoneBeach_deep_ocean",
+"IcePlainsSpikes_deep_ocean",
+"ColdTaiga_ocean",
+"SavannaM_ocean",
+"MesaPlateauF_deep_ocean",
+"MesaBryce_deep_ocean",
+"ExtremeHills+_deep_ocean",
+"ExtremeHills_ocean",
+"MushroomIsland_deep_ocean",
+"Forest_ocean",
+"MegaTaiga_deep_ocean",
+"JungleEdge_ocean",
+"MesaBryce_ocean",
+"MegaSpruceTaiga_ocean",
+"ExtremeHills+_ocean",
+"Jungle_ocean",
+"RoofedForest_deep_ocean",
+"IcePlains_ocean",
+"FlowerForest_ocean",
+"ExtremeHills_deep_ocean",
+"MesaPlateauFM_deep_ocean",
+"Desert_ocean",
+"Taiga_ocean",
+"BirchForestM_deep_ocean",
+"Taiga_deep_ocean",
+"JungleM_ocean",
+"FlowerForest_underground",
+"JungleEdge_underground",
+"StoneBeach_underground",
+"MesaBryce_underground",
+"Mesa_underground",
+"RoofedForest_underground",
+"Jungle_underground",
+"Swampland_underground",
+"MushroomIsland_underground",
+"BirchForest_underground",
+"Plains_underground",
+"MesaPlateauF_underground",
+"ExtremeHills_underground",
+"MegaSpruceTaiga_underground",
+"BirchForestM_underground",
+"SavannaM_underground",
+"MesaPlateauFM_underground",
+"Desert_underground",
+"Savanna_underground",
+"Forest_underground",
+"SunflowerPlains_underground",
+"ColdTaiga_underground",
+"IcePlains_underground",
+"IcePlainsSpikes_underground",
+"MegaTaiga_underground",
+"Taiga_underground",
+"ExtremeHills+_underground",
+"JungleM_underground",
+"ExtremeHillsM_underground",
+"JungleEdgeM_underground",
+},
+0,
+minetest.LIGHT_MAX+1,
+30,
+4000,
+3,
+water-16,
+water+1)
+
+--spawn egg
+mcl_mobs:register_egg("mobs_mc:dolphin", S("Dolphin"), "extra_mobs_spawn_icon_dolphin.png", 0)

mods/ENTITIES/mobs_mc/init.lua

@@ -142,3 +142,7 @@ dofile(path .. "/slime+magma_cube.lua") -- Wuzzy
 dofile(path .. "/spider.lua") -- Spider by AspireMint (fishyWET (CC-BY-SA 3.0 license for texture)
 dofile(path .. "/vex.lua") -- KrupnoPavel
 dofile(path .. "/wither.lua") -- Mesh and animation by toby109tt  / https://github.com/22i
+
+dofile(path .. "/cod.lua")
+dofile(path .. "/salmon.lua")
+dofile(path .. "/dolphin.lua")

mods/ENTITIES/mobs_mc/locale/template.txt

@@ -62,3 +62,6 @@ Weapon Smith=
 Tool Smith=
 Cleric=
 Nitwit=
+Cod=
+Salmon=
+Dolphin=

mods/ENTITIES/mobs_mc/salmon.lua

@@ -0,0 +1,228 @@
+--MCmobs v0.4
+--maikerumine
+--made for MC like Survival game
+--License for code WTFPL and otherwise stated in readmes
+
+local S = minetest.get_translator(minetest.get_current_modname())
+
+--###################
+--################### salmon
+--###################
+
+local salmon = {
+	type = "animal",
+	spawn_class = "water",
+	can_despawn = true,
+	passive = true,
+	hp_min = 3,
+	hp_max = 3,
+	xp_min = 1,
+	xp_max = 3,
+	armor = 100,
+	spawn_in_group = 5,
+	tilt_swim = true,
+	collisionbox = {-0.4, 0.0, -0.4, 0.4, 0.79, 0.4},
+	visual = "mesh",
+	mesh = "extra_mobs_salmon.b3d",
+	textures = {
+		{"extra_mobs_salmon.png"}
+	},
+	sounds = {
+	},
+	animation = {
+		stand_start = 1,
+		stand_end = 20,
+		walk_start = 1,
+		walk_end = 20,
+		run_start = 1,
+		run_end = 20,
+	},
+	drops = {
+		{name = "mcl_fishing:salmon_raw",
+		chance = 1,
+		min = 1,
+		max = 1,},
+		{name = "mcl_dye:white",
+		chance = 20,
+		min = 1,
+		max = 1,},
+	},
+	visual_size = {x=3, y=3},
+	makes_footstep_sound = false,
+	swim = true,
+	fly = true,
+	fly_in = "mcl_core:water_source",
+	breathes_in_water = true,
+	jump = false,
+	view_range = 16,
+	runaway = true,
+	fear_height = 4,
+	on_rightclick = function(self, clicker)
+		if clicker:get_wielded_item():get_name() == "mcl_buckets:bucket_water" then
+			self.object:remove()
+			clicker:set_wielded_item("mcl_fishing:bucket_salmon")
+			awards.unlock(clicker:get_player_name(), "mcl:tacticalFishing")
+		end
+	end
+}
+
+mcl_mobs:register_mob("mobs_mc:salmon", salmon)
+
+
+--spawning TODO: in schools
+local water = 0
+mcl_mobs:spawn_specific(
+"mobs_mc:salmon",
+"overworld",
+"water",
+{
+"Mesa",
+"FlowerForest",
+"Swampland",
+"Taiga",
+"ExtremeHills",
+"Jungle",
+"Savanna",
+"BirchForest",
+"MegaSpruceTaiga",
+"MegaTaiga",
+"ExtremeHills+",
+"Forest",
+"Plains",
+"Desert",
+"ColdTaiga",
+"MushroomIsland",
+"IcePlainsSpikes",
+"SunflowerPlains",
+"IcePlains",
+"RoofedForest",
+"ExtremeHills+_snowtop",
+"MesaPlateauFM_grasstop",
+"JungleEdgeM",
+"ExtremeHillsM",
+"JungleM",
+"BirchForestM",
+"MesaPlateauF",
+"MesaPlateauFM",
+"MesaPlateauF_grasstop",
+"MesaBryce",
+"JungleEdge",
+"SavannaM",
+"FlowerForest_beach",
+"Forest_beach",
+"StoneBeach",
+"ColdTaiga_beach_water",
+"Taiga_beach",
+"Savanna_beach",
+"Plains_beach",
+"ExtremeHills_beach",
+"ColdTaiga_beach",
+"Swampland_shore",
+"MushroomIslandShore",
+"JungleM_shore",
+"Jungle_shore",
+"MesaPlateauFM_sandlevel",
+"MesaPlateauF_sandlevel",
+"MesaBryce_sandlevel",
+"Mesa_sandlevel",
+"RoofedForest_ocean",
+"JungleEdgeM_ocean",
+"BirchForestM_ocean",
+"BirchForest_ocean",
+"IcePlains_deep_ocean",
+"Jungle_deep_ocean",
+"Savanna_ocean",
+"MesaPlateauF_ocean",
+"ExtremeHillsM_deep_ocean",
+"Savanna_deep_ocean",
+"SunflowerPlains_ocean",
+"Swampland_deep_ocean",
+"Swampland_ocean",
+"MegaSpruceTaiga_deep_ocean",
+"ExtremeHillsM_ocean",
+"JungleEdgeM_deep_ocean",
+"SunflowerPlains_deep_ocean",
+"BirchForest_deep_ocean",
+"IcePlainsSpikes_ocean",
+"Mesa_ocean",
+"StoneBeach_ocean",
+"Plains_deep_ocean",
+"JungleEdge_deep_ocean",
+"SavannaM_deep_ocean",
+"Desert_deep_ocean",
+"Mesa_deep_ocean",
+"ColdTaiga_deep_ocean",
+"Plains_ocean",
+"MesaPlateauFM_ocean",
+"Forest_deep_ocean",
+"JungleM_deep_ocean",
+"FlowerForest_deep_ocean",
+"MushroomIsland_ocean",
+"MegaTaiga_ocean",
+"StoneBeach_deep_ocean",
+"IcePlainsSpikes_deep_ocean",
+"ColdTaiga_ocean",
+"SavannaM_ocean",
+"MesaPlateauF_deep_ocean",
+"MesaBryce_deep_ocean",
+"ExtremeHills+_deep_ocean",
+"ExtremeHills_ocean",
+"MushroomIsland_deep_ocean",
+"Forest_ocean",
+"MegaTaiga_deep_ocean",
+"JungleEdge_ocean",
+"MesaBryce_ocean",
+"MegaSpruceTaiga_ocean",
+"ExtremeHills+_ocean",
+"Jungle_ocean",
+"RoofedForest_deep_ocean",
+"IcePlains_ocean",
+"FlowerForest_ocean",
+"ExtremeHills_deep_ocean",
+"MesaPlateauFM_deep_ocean",
+"Desert_ocean",
+"Taiga_ocean",
+"BirchForestM_deep_ocean",
+"Taiga_deep_ocean",
+"JungleM_ocean",
+"FlowerForest_underground",
+"JungleEdge_underground",
+"StoneBeach_underground",
+"MesaBryce_underground",
+"Mesa_underground",
+"RoofedForest_underground",
+"Jungle_underground",
+"Swampland_underground",
+"MushroomIsland_underground",
+"BirchForest_underground",
+"Plains_underground",
+"MesaPlateauF_underground",
+"ExtremeHills_underground",
+"MegaSpruceTaiga_underground",
+"BirchForestM_underground",
+"SavannaM_underground",
+"MesaPlateauFM_underground",
+"Desert_underground",
+"Savanna_underground",
+"Forest_underground",
+"SunflowerPlains_underground",
+"ColdTaiga_underground",
+"IcePlains_underground",
+"IcePlainsSpikes_underground",
+"MegaTaiga_underground",
+"Taiga_underground",
+"ExtremeHills+_underground",
+"JungleM_underground",
+"ExtremeHillsM_underground",
+"JungleEdgeM_underground",
+},
+0,
+minetest.LIGHT_MAX+1,
+30,
+4000,
+3,
+water-16,
+water+1)
+
+--spawn egg
+mcl_mobs:register_egg("mobs_mc:salmon", S("Salmon"), "extra_mobs_spawn_icon_salmon.png", 0)

mods/ENTITIES/mobs_mc/squid.lua

@@ -55,17 +55,6 @@ mcl_mobs:register_mob("mobs_mc:squid", {
     view_range = 16,
     runaway = true,
     fear_height = 4,
-    on_spawn = function(self)
-		--make sure squids always spawn in water (and at variable heights)
-		--can be removed once this is provided by the api
-		local p = self.object:get_pos()
-		local nn = minetest.find_nodes_in_area(vector.offset(p,-2,-1,-2),vector.offset(p,2,-15,2),{"group:water"})
-		if nn and #nn > 0 then
-			self.object:set_pos(nn[math.random(#nn)])
-		else
-			self.object:remove()
-		end
-    end,
 })
 
 -- TODO: Behaviour: squirt

mods/HUD/mcl_achievements/init.lua

@@ -225,6 +225,12 @@ awards.register_achievement("mcl:whatAdeal", {
 	icon = "mcl_core_emerald.png",
 })
 
+awards.register_achievement("mcl:tacticalFishing", {
+	title = S("Tactical Fishing"),
+	description = S("Catch a fish... without a fishing rod!"),
+	icon = "pufferfish_bucket.png",
+})
+
 -- Triggered in mcl_fishing
 awards.register_achievement("mcl:fishyBusiness", {
 	title = S("Fishy Business"),

mods/ITEMS/mcl_fishing/init.lua

@@ -516,3 +516,30 @@ minetest.register_on_item_eat(function (hp_change, replace_with_item, itemstack,
 	end
 
 end )
+
+-- Fish Buckets
+fish_names = {
+	{ techname = "cod", name = "Cod" },
+	{ techname = "salmon", name = "Salmon" }
+	--{ techname = "pufferfish", name = "Pufferfish" } FIXME: Uncomment when pufferfish mobs are added.
+	--{ techname = "tropical_fish", name = "Tropical Fish" } FIXME: Uncomment when pufferfish mobs are added.
+}
+
+for _, fish in pairs(fish_names) do
+	mcl_buckets.register_liquid({
+		bucketname = "mcl_fishing:bucket_" .. fish.techname,
+		source_place = function(pos)
+			minetest.add_entity(pos, "mobs_mc:" .. fish.techname)
+			return "mcl_core:water_source"
+		end,
+		source_take = {"mobs_mc:" .. fish.techname},
+		inventory_image = fish.techname .. "_bucket.png",
+		name = S("Bucket of @1", S(fish.name)),
+		longdesc = S("This bucket is filled with water and @1.", S(fish.name)),
+		usagehelp = S("Place it to empty the bucket and place a @1. Obtain by right clicking on a @2 fish with a bucket of water.", S(fish.name), S(fish.name)),
+		tt_help = S("Places a water source and a @1 fish.", S(fish.name)),
+		extra_check = function(pos, placer)
+			return true, true
+		end,
+	})
+end

mods/ITEMS/mcl_fishing/locale/template.txt

@@ -16,3 +16,9 @@ Pufferfish=
 Pufferfish are a common species of fish and can be obtained by fishing. They can technically be eaten, but they are very bad for humans. Eating a pufferfish only restores 1 hunger point and will poison you very badly (which drains your health non-fatally) and causes serious food poisoning (which increases your hunger).=
 Catches fish in water=
 Very poisonous=
+Cod=
+Salmon=
+Bucket of @1=
+This bucket is filled with water and @1.=
+Place it to empty the bucket and place a @1. Obtain by right clicking on a @2 fish with a bucket of water.=
+Places a water source and a @1 fish.=

mods/ITEMS/mcl_fishing/mod.conf

@@ -1,3 +1,3 @@
 name = mcl_fishing
 description = Adds fish and fishing poles to go fishing.
-depends = mcl_core, mcl_sounds, mcl_loot, mcl_mobs, mcl_enchanting, mcl_throwing, mcl_colors
+depends = mcl_core, mcl_sounds, mcl_loot, mcl_mobs, mcl_enchanting, mcl_throwing, mcl_colors, mcl_buckets