Rename mcl_monster_spawners to mcl_mobspawners.

Sorry for the trouble, but the long name annoyed me. :P

README.md

@@ -62,7 +62,7 @@ map builders. They can not be obtained in-game or in the creative inventory.
 
 * Barrier: `mcl_core:barrier`
 * Command Block: `mesecons_commandblock:commandblock_off`
-* Monster Spawner (WIP): `mcl_monster_spawners:spawner`
+* Monster Spawner (WIP): `mcl_mobspawners:spawner`
 * Huge mushroom blocks: See `mods/ITEMS/mcl_mushrooms/README.md`
 
 Use the `/giveme` chat command to obtain them. See the in-game help for

mods/ENTITIES/mobs/api.lua

@@ -2842,6 +2842,8 @@ function mobs:register_egg(mob, desc, background, addegg, no_creative)
 		inventory_image = invimg,
 		groups = grp,
 
+		_mobs_spawns_mob = mob,
+
 		on_place = function(itemstack, placer, pointed_thing)
 
 			-- Call on_rightclick if the pointed node defines it

mods/ITEMS/REDSTONE/mesecons_mvps/init.lua

@@ -192,7 +192,7 @@ mesecon:register_mvps_stopper("mcl_anvils:anvil")
 mesecon:register_mvps_stopper("mcl_anvils:anvil_damage_1")
 mesecon:register_mvps_stopper("mcl_anvils:anvil_damage_2")
 mesecon:register_mvps_stopper("mcl_jukebox:jukebox")
-mesecon:register_mvps_stopper("mcl_monster_spawners:spawner")
+mesecon:register_mvps_stopper("mcl_mobspawners:spawner")
 mesecon:register_mvps_stopper("signs:sign_yard")
 mesecon:register_mvps_stopper("signs:sign_wall")
 mesecon:register_mvps_stopper("mesecons_commandblock:commandblock_off")

mods/ITEMS/mcl_mobspawners/README.md

@@ -10,7 +10,7 @@ placing.
 ## Programmer notes
 To set the mob spawned by a monster spawner, first place the monster spawner
 (e.g. with `minetest.set_node`), then use the function
-`mcl_monster_spawner.setup_spawner` to set its attributes. See the comment
+`mcl_mobspawners.setup_spawner` to set its attributes. See the comment
 in `init.lua` for more info.
 
 ## License (code and texture)

mods/ITEMS/mcl_mobspawners/init.lua

@@ -1,6 +1,6 @@
 local S = mobs.intllib
 
-mcl_monster_spawners = {}
+mcl_mobspawners = {}
 
 local default_mob = "mobs_mc:pig"
 
@@ -15,7 +15,7 @@ end
 local function find_doll(pos)
 	for  _,obj in ipairs(minetest.env:get_objects_inside_radius(pos, 1)) do
 		if not obj:is_player() then
-			if obj ~= nil and obj:get_luaentity().name == "mcl_monster_spawners:doll" then
+			if obj ~= nil and obj:get_luaentity().name == "mcl_mobspawners:doll" then
 				return obj
 			end
 		end
@@ -52,7 +52,7 @@ All the arguments are optional!
 * YOffset: Y offset to spawn mobs; 0 to disable (default: 0)
 ]]
 
-function mcl_monster_spawners.setup_spawner(pos, Mob, MinLight, MaxLight, MaxMobsInArea, PlayerDistance, YOffset)
+function mcl_mobspawners.setup_spawner(pos, Mob, MinLight, MaxLight, MaxMobsInArea, PlayerDistance, YOffset)
 	-- Activate monster spawner and disable editing functionality
 	if Mob == nil then Mob = default_mob end
 	if MinLight == nil then MinLight = 0 end
@@ -69,7 +69,7 @@ function mcl_monster_spawners.setup_spawner(pos, Mob, MinLight, MaxLight, MaxMob
 	meta:set_int("YOffset", YOffset)
 
 	-- Create doll
-	local doll = minetest.add_entity({x=pos.x, y=pos.y-0.3, z=pos.z}, "mcl_monster_spawners:doll")
+	local doll = minetest.add_entity({x=pos.x, y=pos.y-0.3, z=pos.z}, "mcl_mobspawners:doll")
 	set_doll_properties(doll, Mob)
 
 	-- Start spawning very soon
@@ -183,7 +183,7 @@ local spawn_monsters = function(pos, elapsed)
 
 end
 
-minetest.register_node("mcl_monster_spawners:spawner", {
+minetest.register_node("mcl_mobspawners:spawner", {
 	tiles = {"mob_spawner.png"},
 	drawtype = "glasslike",
 	paramtype = "light",
@@ -195,7 +195,7 @@ minetest.register_node("mcl_monster_spawners:spawner", {
 	is_ground_content = false,
 	drop = "",
 
-	on_construct = mcl_monster_spawners.setup_spawner,
+	on_construct = mcl_mobspawners.setup_spawner,
 
 	on_destruct = function(pos)
 		local meta = minetest.get_meta(pos)
@@ -236,7 +236,7 @@ minetest.register_node("mcl_monster_spawners:spawner", {
 		and pla and pla >=0 and pla <= 20
 		and yof and yof > -10 and yof < 10 then
 
-			mcl_monster_spawners.setup_spawner(pos, mob, mlig, xlig, num, pla, yof)
+			mcl_mobspawners.setup_spawner(pos, mob, mlig, xlig, num, pla, yof)
 		else
 			minetest.chat_send_player(name, S("Mob Spawner settings failed!"))
 			minetest.chat_send_player(name,
@@ -283,7 +283,7 @@ doll_def.on_step = function(self, dtime)
 	self.timer = self.timer + 0.01
 	local n = minetest.get_node_or_nil(self.object:getpos())
 	if self.timer > 1 then
-		if n and n.name and n.name ~= "mcl_monster_spawners:spawner" then
+		if n and n.name and n.name ~= "mcl_mobspawners:spawner" then
 			self.object:remove()
 		end
 	end
@@ -291,7 +291,7 @@ end
 
 doll_def.on_punch = function(self, hitter) end
 
-minetest.register_entity("mcl_monster_spawners:doll", doll_def)
+minetest.register_entity("mcl_mobspawners:doll", doll_def)
 
 
 

mods/ITEMS/mcl_mobspawners/mod.conf

@@ -0,0 +1 @@
+name = mcl_mobspawners

mods/ITEMS/mcl_monster_spawners/mod.conf

@@ -1 +0,0 @@
-name = mcl_monster_spawners

mods/ITEMS/mcl_torches/init.lua

@@ -79,7 +79,7 @@ mcl_torches.register_torch = function(substring, description, doc_items_longdesc
 			-- * Piston
 			-- * Sticky piston
 			if not def.buildable_to then
-				if node.name ~= "mcl_nether:soul_sand" and node.name ~= "mcl_monster_spawners:spawner" and
+				if node.name ~= "mcl_nether:soul_sand" and node.name ~= "mcl_mobspawners:spawner" and
 						((not def.groups.solid) or (not def.groups.opaque)) then
 					-- Only allow top placement on these nodes
 					if def.groups.glass or node.name == "mcl_hoppers:hopper" or node.name == "mcl_hoppers:hopper_side" or def.groups.fence or def.groups.wall then

mods/MAPGEN/mcl_dungeons/depends.txt

@@ -1,5 +1,5 @@
 mcl_init
 mcl_core
 mcl_chests
-mcl_monster_spawners
+mcl_mobspawners
 mobs_mc

mods/MAPGEN/mcl_dungeons/init.lua

@@ -329,7 +329,7 @@ minetest.register_on_generated(function(minp, maxp)
 			if minetest.registered_nodes[n].is_ground_content then
 
 				-- ... and place it and select a random mob
-				minetest.set_node(sp, {name = "mcl_monster_spawners:spawner"})
+				minetest.set_node(sp, {name = "mcl_mobspawners:spawner"})
 				local mobs = {
 					"mobs_mc:zombie",
 					"mobs_mc:zombie",
@@ -338,7 +338,7 @@ minetest.register_on_generated(function(minp, maxp)
 				}
 				local spawner_mob = mobs[math.random(1, #mobs)]
 
-				mcl_monster_spawners.setup_spawner(sp, spawner_mob)
+				mcl_mobspawners.setup_spawner(sp, spawner_mob)
 			end
 		end
 

mods/MISC/mcl_wip/depends.txt

@@ -11,4 +11,3 @@ gemalde
 signs
 mcl_observers
 doc_identifier
-mcl_monster_spawners

mods/MISC/mcl_wip/init.lua

@@ -26,7 +26,6 @@ local wip_items = {
 	"mcl_observers:observer",
 	"mcl_chests:trapped_chest",
 	"mcl_core:cobweb",
-	"mcl_monster_spawners:spawner",
 }
 
 for i=1,#wip_items do