Merge pull request 'Optionally bring back the old spawn icons' (#2705) from spawn_icons_setting into master

Reviewed-on: MineClone2/MineClone2#2705

mods/CORE/mcl_util/init.lua

@@ -22,6 +22,15 @@ function table.update_nil(t, ...)
 	return t
 end
 
+function mcl_util.file_exists(name)
+	local f = io.open(name)
+	if not f then
+		return false
+	end
+	f:close()
+	return true
+end
+
 -- Based on minetest.rotate_and_place
 
 --[[

mods/ENTITIES/mcl_mobs/api.lua

@@ -71,7 +71,7 @@ local spawn_protected = minetest.settings:get_bool("mobs_spawn_protected") ~= fa
 local remove_far = true
 local difficulty = tonumber(minetest.settings:get("mob_difficulty")) or 1.0
 local show_health = false
-
+local old_spawn_icons = minetest.settings:get_bool("mcl_old_spawn_icons",false)
 -- Shows helpful debug info above each mob
 local mobs_debug = minetest.settings:get_bool("mobs_debug", false)
 local spawn_logging = minetest.settings:get_bool("mcl_logging_mobs_spawn",true)
@@ -4442,7 +4442,13 @@ function mcl_mobs:register_egg(mob, desc, background_color, overlay_color, addeg
 	end
 
 	local invimg = "(spawn_egg.png^[multiply:" .. background_color ..")^(spawn_egg_overlay.png^[multiply:" .. overlay_color .. ")"
-
+	if old_spawn_icons then
+		local mobname = mob:gsub("mobs_mc:","")
+		local fn = "mobs_mc_spawn_icon_"..mobname..".png"
+		if mcl_util.file_exists(minetest.get_modpath("mobs_mc").."/textures/"..fn) then
+			invimg = fn
+		end
+	end
 	if addegg == 1 then
 		invimg = "mobs_chicken_egg.png^(" .. invimg ..
 			"^[mask:mobs_chicken_egg_overlay.png)"

settingtypes.txt

@@ -108,6 +108,9 @@ mcl_mob_cap_animal (Mob cap animals) int 10 0 1024
 #Maximum amount of ambient mobs that will spawn near a player (default:15)
 mcl_mob_cap_ambient (Mob cap ambient mobs) int 15 0 1024
 
+#Display mob icons in inventory instead of mc-like spawn eggs
+mcl_old_spawn_icons (Old spawn icons instead of eggs) bool false
+
 [Audio]
 # Enable flame sound.
 flame_sound (Flame sound) bool true