Merge pull request 'Mob Spawn Egg Texture Updates' (#2702) from spawn_egg_texture_updates into master

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2702 Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-10-04 09:39:58 +00:00 · 2022-10-04 09:39:58 +00:00 · 60cfbe4bfe
commit 60cfbe4bfe
parent aeaaa45026 361edc5728
47 changed files with 59 additions and 59 deletions
--- a/mods/ENTITIES/mcl_mobs/api.lua
+++ b/mods/ENTITIES/mcl_mobs/api.lua
@ -4287,7 +4287,7 @@ end
 -- Note: This also introduces the “spawn_egg” group:
 -- * spawn_egg=1: Spawn egg (generic mob, no metadata)
 -- * spawn_egg=2: Spawn egg (captured/tamed mob, metadata)
-function mcl_mobs:register_egg(mob, desc, background, addegg, no_creative)
+function mcl_mobs:register_egg(mob, desc, background_color, overlay_color, addegg, no_creative)

 	local grp = {spawn_egg = 1}

@ -4296,7 +4296,7 @@ function mcl_mobs:register_egg(mob, desc, background, addegg, no_creative)
 		grp.not_in_creative_inventory = 1
 	end

-	local invimg = background
+	local invimg = "(spawn_egg.png^[multiply:" .. background_color ..")^(spawn_egg_overlay.png^[multiply:" .. overlay_color .. ")"

 	if addegg == 1 then
 		invimg = "mobs_chicken_egg.png^(" .. invimg ..
--- a/mods/ENTITIES/mcl_mobs/api.txt
+++ b/mods/ENTITIES/mcl_mobs/api.txt
@ -486,13 +486,13 @@ This function registers a arrow for mobs with the attack type shoot.
 Spawn Eggs
 ----------

-mobs:register_egg(name, description, background, addegg, no_creative)
+mobs:register_egg(name, description, background_color, overlay_color, addegg, no_creative)

 This function registers a spawn egg which can be used by admin to properly spawn in a mob.

 	'name'		this is the name of your new mob to spawn e.g. "mob:sheep"
 	'description' the name of the new egg you are creating e.g. "Spawn Sheep"
-	'background'the texture displayed for the egg in inventory
+	'background_color' and 'overlay_color' define the colors for the texture displayed for the egg in inventory
 	'addegg'	would you like an egg image in front of your texture (1 = yes,
 				 0 = no)
 	'no_creative' when set to true this stops spawn egg appearing in creative
--- a/mods/ENTITIES/mobs_mc/bat.lua
+++ b/mods/ENTITIES/mobs_mc/bat.lua
@ -144,4 +144,4 @@ mobs_mc.water_level-1)


 -- spawn eggs
-mcl_mobs:register_egg("mobs_mc:bat", S("Bat"), "(spawn_egg.png^[multiply:#4c3e30)^(spawn_egg_overlay.png^[multiply:#0f0f0f)", 0)
+mcl_mobs:register_egg("mobs_mc:bat", S("Bat"), "#4c3e30", "#0f0f0f", 0)
--- a/mods/ENTITIES/mobs_mc/blaze.lua
+++ b/mods/ENTITIES/mobs_mc/blaze.lua
@ -202,4 +202,4 @@ mcl_mobs:register_arrow("mobs_mc:blaze_fireball", {
 })

 -- spawn eggs
-mcl_mobs:register_egg("mobs_mc:blaze", S("Blaze"), "(spawn_egg.png^[multiply:#f6b201)^(spawn_egg_overlay.png^[multiply:#fff87e)", 0)
+mcl_mobs:register_egg("mobs_mc:blaze", S("Blaze"), "#f6b201", "#fff87e", 0)
--- a/mods/ENTITIES/mobs_mc/chicken.lua
+++ b/mods/ENTITIES/mobs_mc/chicken.lua
@ -156,4 +156,4 @@ mobs_mc.water_level,
 mcl_vars.mg_overworld_max)

 -- spawn eggs
-mcl_mobs:register_egg("mobs_mc:chicken", S("Chicken"), "(spawn_egg.png^[multiply:#a1a1a1)^(spawn_egg_overlay.png^[multiply:#ff0000)", 0)
+mcl_mobs:register_egg("mobs_mc:chicken", S("Chicken"), "#a1a1a1", "#ff0000", 0)
--- a/mods/ENTITIES/mobs_mc/cod.lua
+++ b/mods/ENTITIES/mobs_mc/cod.lua
@ -271,4 +271,4 @@ water-16,
 water+1)

 --spawn egg
-mcl_mobs:register_egg("mobs_mc:cod", S("Cod"), "(spawn_egg.png^[multiply:#c1a76a)^(spawn_egg_overlay.png^[multiply:#e5c48b)", 0)
+mcl_mobs:register_egg("mobs_mc:cod", S("Cod"), "#c1a76a", "#e5c48b", 0)
--- a/mods/ENTITIES/mobs_mc/cow+mooshroom.lua
+++ b/mods/ENTITIES/mobs_mc/cow+mooshroom.lua
@ -212,5 +212,5 @@ mcl_vars.mg_overworld_min,
 mcl_vars.mg_overworld_max)

 -- spawn egg
-mcl_mobs:register_egg("mobs_mc:cow", S("Cow"), "(spawn_egg.png^[multiply:#443626)^(spawn_egg_overlay.png^[multiply:#a1a1a1)", 0)
-mcl_mobs:register_egg("mobs_mc:mooshroom", S("Mooshroom"), "(spawn_egg.png^[multiply:#a00f10)^(spawn_egg_overlay.png^[multiply:#b7b7b7)", 0)
+mcl_mobs:register_egg("mobs_mc:cow", S("Cow"), "#443626", "#a1a1a1", 0)
+mcl_mobs:register_egg("mobs_mc:mooshroom", S("Mooshroom"), "#a00f10", "#b7b7b7", 0)
--- a/mods/ENTITIES/mobs_mc/creeper.lua
+++ b/mods/ENTITIES/mobs_mc/creeper.lua
@ -404,4 +404,4 @@ mcl_vars.mg_overworld_min,
 mcl_vars.mg_overworld_max)

 -- spawn eggs
-mcl_mobs:register_egg("mobs_mc:creeper", S("Creeper"), "(spawn_egg.png^[multiply:#0da70a)^(spawn_egg_overlay.png^[multiply:#000000)", 0)
+mcl_mobs:register_egg("mobs_mc:creeper", S("Creeper"), "#0da70a", "#000000", 0)
--- a/mods/ENTITIES/mobs_mc/dolphin.lua
+++ b/mods/ENTITIES/mobs_mc/dolphin.lua
@ -250,4 +250,4 @@ water-16,
 water+1)

 --spawn egg
-mcl_mobs:register_egg("mobs_mc:dolphin", S("Dolphin"), "(spawn_egg.png^[multiply:#223b4d)^(spawn_egg_overlay.png^[multiply:#f9f9f9)", 0)
+mcl_mobs:register_egg("mobs_mc:dolphin", S("Dolphin"), "#223b4d", "#f9f9f9", 0)
--- a/mods/ENTITIES/mobs_mc/ender_dragon.lua
+++ b/mods/ENTITIES/mobs_mc/ender_dragon.lua
@ -170,7 +170,7 @@ mcl_mobs:register_arrow("mobs_mc:dragon_fireball", {
 	end
 })

-mcl_mobs:register_egg("mobs_mc:enderdragon", S("Ender Dragon"), "(spawn_egg.png^[multiply:#252525)^(spawn_egg_overlay.png^[multiply:#b313c9)", 0, true)
+mcl_mobs:register_egg("mobs_mc:enderdragon", S("Ender Dragon"), "#252525", "#b313c9", 0, true)


 mcl_wip.register_wip_item("mobs_mc:enderdragon")
--- a/mods/ENTITIES/mobs_mc/enderman.lua
+++ b/mods/ENTITIES/mobs_mc/enderman.lua
@ -829,4 +829,4 @@ mcl_vars.mg_nether_min,
 mcl_vars.mg_nether_max)

 -- spawn eggs
-mcl_mobs:register_egg("mobs_mc:enderman", S("Enderman"), "(spawn_egg.png^[multiply:#252525)^(spawn_egg_overlay.png^[multiply:#151515)", 0)
+mcl_mobs:register_egg("mobs_mc:enderman", S("Enderman"), "#252525", "#151515", 0)
--- a/mods/ENTITIES/mobs_mc/endermite.lua
+++ b/mods/ENTITIES/mobs_mc/endermite.lua
@ -38,4 +38,4 @@ mcl_mobs:register_mob("mobs_mc:endermite", {
 	reach = 1,
 })

-mcl_mobs:register_egg("mobs_mc:endermite", S("Endermite"), "(spawn_egg.png^[multiply:#161616)^(spawn_egg_overlay.png^[multiply:#6d6d6d)", 0)
+mcl_mobs:register_egg("mobs_mc:endermite", S("Endermite"), "#161616", "#6d6d6d", 0)
--- a/mods/ENTITIES/mobs_mc/ghast.lua
+++ b/mods/ENTITIES/mobs_mc/ghast.lua
@ -141,4 +141,4 @@ mcl_mobs:register_arrow("mobs_mc:fireball", {


 -- spawn eggs
-mcl_mobs:register_egg("mobs_mc:ghast", S("Ghast"), "(spawn_egg.png^[multiply:#f9f9f9)^(spawn_egg_overlay.png^[multiply:#bcbcbc)", 0)
+mcl_mobs:register_egg("mobs_mc:ghast", S("Ghast"), "#f9f9f9", "#bcbcbc", 0)
--- a/mods/ENTITIES/mobs_mc/guardian.lua
+++ b/mods/ENTITIES/mobs_mc/guardian.lua
@ -104,4 +104,4 @@ mcl_mobs:register_mob("mobs_mc:guardian", {
 --mcl_mobs:spawn_specific("mobs_mc:guardian", { "mcl_core:water_source", "mclx_core:river_water_source" }, { "mcl_core:water_source", "mclx_core:river_water_source" }, 0, minetest.LIGHT_MAX+1, 30, 25000, 2, mcl_vars.mg_overworld_min, mobs_mc.water_level - 10)

 -- spawn eggs
-mcl_mobs:register_egg("mobs_mc:guardian", S("Guardian"), "(spawn_egg.png^[multiply:#5a8272)^(spawn_egg_overlay.png^[multiply:#f17d31)", 0)
+mcl_mobs:register_egg("mobs_mc:guardian", S("Guardian"), "#5a8272", "#f17d31", 0)
--- a/mods/ENTITIES/mobs_mc/guardian_elder.lua
+++ b/mods/ENTITIES/mobs_mc/guardian_elder.lua
@ -112,6 +112,6 @@ mcl_mobs:register_mob("mobs_mc:guardian_elder", {
 -- mcl_mobs:spawn_specific("mobs_mc:guardian_elder", { "mcl_core:water_source", "mclx_core:river_water_source" }, { "mcl_core:water_source", "mclx_core:river_water_source" }, 0, minetest.LIGHT_MAX+1, 30, 40000, 2, mcl_vars.mg_overworld_min, mobs_mc.water_level-18)

 -- spawn eggs
-mcl_mobs:register_egg("mobs_mc:guardian_elder", S("Elder Guardian"), "(spawn_egg.png^[multiply:#ceccba)^(spawn_egg_overlay.png^[multiply:#747693)", 0)
+mcl_mobs:register_egg("mobs_mc:guardian_elder", S("Elder Guardian"), "#ceccba", "#747693", 0)


--- a/mods/ENTITIES/mobs_mc/horse.lua
+++ b/mods/ENTITIES/mobs_mc/horse.lua
@ -587,8 +587,8 @@ mobs_mc.water_level+3,
 mcl_vars.mg_overworld_max)

 -- spawn eggs
-mcl_mobs:register_egg("mobs_mc:horse", S("Horse"), "(spawn_egg.png^[multiply:#c09e7d)^(spawn_egg_overlay.png^[multiply:#eee500)", 0)
-mcl_mobs:register_egg("mobs_mc:skeleton_horse", S("Skeleton Horse"), "(spawn_egg.png^[multiply:#68684f)^(spawn_egg_overlay.png^[multiply:#e5e5d8)", 0)
--mobs:register_egg("mobs_mc:zombie_horse", S("Zombie Horse"), "(spawn_egg.png^[multiply:#2a5a37)^(spawn_egg_overlay.png^[multiply:#84d080)", 0)
-mcl_mobs:register_egg("mobs_mc:donkey", S("Donkey"), "(spawn_egg.png^[multiply:#534539)^(spawn_egg_overlay.png^[multiply:#867566)", 0)
-mcl_mobs:register_egg("mobs_mc:mule", S("Mule"), "(spawn_egg.png^[multiply:#1b0200)^(spawn_egg_overlay.png^[multiply:#51331d)", 0)
+mcl_mobs:register_egg("mobs_mc:horse", S("Horse"), "#c09e7d", "#eee500", 0)
+mcl_mobs:register_egg("mobs_mc:skeleton_horse", S("Skeleton Horse"), "#68684f", "#e5e5d8", 0)
+--mobs:register_egg("mobs_mc:zombie_horse", S("Zombie Horse"), "#2a5a37", "#84d080", 0)
+mcl_mobs:register_egg("mobs_mc:donkey", S("Donkey"), "#534539", "#867566", 0)
+mcl_mobs:register_egg("mobs_mc:mule", S("Mule"), "#1b0200", "#51331d", 0)
--- a/mods/ENTITIES/mobs_mc/iron_golem.lua
+++ b/mods/ENTITIES/mobs_mc/iron_golem.lua
@ -93,7 +93,7 @@ mcl_mobs:register_mob("mobs_mc:iron_golem", {


 -- spawn eggs
-mcl_mobs:register_egg("mobs_mc:iron_golem", S("Iron Golem"), "(spawn_egg.png^[multiply:#3b3b3b)^(spawn_egg_overlay.png^[multiply:#f57223)", 0)
+mcl_mobs:register_egg("mobs_mc:iron_golem", S("Iron Golem"), "#3b3b3b", "#f57223", 0)

 --[[ This is to be called when a pumpkin or jack'o lantern has been placed. Recommended: In the on_construct function of the node.
 This summons an iron golen if placing the pumpkin created an iron golem summon pattern:
--- a/mods/ENTITIES/mobs_mc/llama.lua
+++ b/mods/ENTITIES/mobs_mc/llama.lua
@ -275,4 +275,4 @@ mobs_mc.water_level+15,
 mcl_vars.mg_overworld_max)

 -- spawn eggs
-mcl_mobs:register_egg("mobs_mc:llama", S("Llama"), "(spawn_egg.png^[multiply:#c09e7d)^(spawn_egg_overlay.png^[multiply:#995f40)", 0)
+mcl_mobs:register_egg("mobs_mc:llama", S("Llama"), "#c09e7d", "#995f40", 0)
--- a/mods/ENTITIES/mobs_mc/ocelot.lua
+++ b/mods/ENTITIES/mobs_mc/ocelot.lua
@ -233,4 +233,4 @@ mobs:spawn({
 ]]--

 -- spawn eggs
-mcl_mobs:register_egg("mobs_mc:ocelot", S("Ocelot"), "(spawn_egg.png^[multiply:#efde7d)^(spawn_egg_overlay.png^[multiply:#564434)", 0)
+mcl_mobs:register_egg("mobs_mc:ocelot", S("Ocelot"), "#efde7d", "#564434", 0)
--- a/mods/ENTITIES/mobs_mc/parrot.lua
+++ b/mods/ENTITIES/mobs_mc/parrot.lua
@ -237,4 +237,4 @@ mobs_mc.water_level+7,
 mcl_vars.mg_overworld_max)

 -- spawn eggs
-mcl_mobs:register_egg("mobs_mc:parrot", S("Parrot"), "(spawn_egg.png^[multiply:#0da70a)^(spawn_egg_overlay.png^[multiply:#ff0000)", 0)
+mcl_mobs:register_egg("mobs_mc:parrot", S("Parrot"), "#0da70a", "#ff0000", 0)
--- a/mods/ENTITIES/mobs_mc/pig.lua
+++ b/mods/ENTITIES/mobs_mc/pig.lua
@ -232,4 +232,4 @@ mcl_vars.mg_overworld_min,
 mcl_vars.mg_overworld_max)

 -- spawn eggs
-mcl_mobs:register_egg("mobs_mc:pig", S("Pig"), "(spawn_egg.png^[multiply:#f0a5a2)^(spawn_egg_overlay.png^[multiply:#db635f)", 0)
+mcl_mobs:register_egg("mobs_mc:pig", S("Pig"), "#f0a5a2", "#db635f", 0)
--- a/mods/ENTITIES/mobs_mc/pillager.lua
+++ b/mods/ENTITIES/mobs_mc/pillager.lua
@ -120,4 +120,4 @@ pillager = {
 }

 mcl_mobs:register_mob("mobs_mc:pillager", pillager)
-mcl_mobs:register_egg("mobs_mc:pillager", S("Pillager"), "(spawn_egg.png^[multiply:#532f36)^(spawn_egg_overlay.png^[multiply:#959b9b)", 0)
+mcl_mobs:register_egg("mobs_mc:pillager", S("Pillager"), "#532f36", "#959b9b", 0)
--- a/mods/ENTITIES/mobs_mc/polar_bear.lua
+++ b/mods/ENTITIES/mobs_mc/polar_bear.lua
@ -86,4 +86,4 @@ mcl_vars.mg_overworld_min,
 mcl_vars.mg_overworld_max)

 -- spawn egg
-mcl_mobs:register_egg("mobs_mc:polar_bear", S("Polar Bear"), "(spawn_egg.png^[multiply:#f2f2f2)^(spawn_egg_overlay.png^[multiply:#959590)", 0)
+mcl_mobs:register_egg("mobs_mc:polar_bear", S("Polar Bear"), "#f2f2f2", "#959590", 0)
--- a/mods/ENTITIES/mobs_mc/rabbit.lua
+++ b/mods/ENTITIES/mobs_mc/rabbit.lua
@ -208,7 +208,7 @@ mcl_mobs:spawn(spawn_grass)
 ]]--

 -- Spawn egg
-mcl_mobs:register_egg("mobs_mc:rabbit", S("Rabbit"), "(spawn_egg.png^[multiply:#995f40)^(spawn_egg_overlay.png^[multiply:#734831)", 0)
+mcl_mobs:register_egg("mobs_mc:rabbit", S("Rabbit"), "#995f40", "#734831", 0)

 -- Note: This spawn egg does not exist in Minecraft
-mcl_mobs:register_egg("mobs_mc:killer_bunny", S("Killer Bunny"), "(spawn_egg.png^[multiply:#f2f2f2)^(spawn_egg_overlay.png^[multiply:#ff0000)", 0)
+mcl_mobs:register_egg("mobs_mc:killer_bunny", S("Killer Bunny"), "#f2f2f2", "#ff0000", 0)
--- a/mods/ENTITIES/mobs_mc/salmon.lua
+++ b/mods/ENTITIES/mobs_mc/salmon.lua
@ -225,4 +225,4 @@ water-16,
 water+1)

 --spawn egg
-mcl_mobs:register_egg("mobs_mc:salmon", S("Salmon"), "(spawn_egg.png^[multiply:#a00f10)^(spawn_egg_overlay.png^[multiply:#0e8474)", 0)
+mcl_mobs:register_egg("mobs_mc:salmon", S("Salmon"), "#a00f10", "#0e8474", 0)
--- a/mods/ENTITIES/mobs_mc/sheep.lua
+++ b/mods/ENTITIES/mobs_mc/sheep.lua
@ -360,4 +360,4 @@ mcl_vars.mg_overworld_min,
 mcl_vars.mg_overworld_max)

 -- spawn eggs
-mcl_mobs:register_egg("mobs_mc:sheep", S("Sheep"), "(spawn_egg.png^[multiply:#e7e7e7)^(spawn_egg_overlay.png^[multiply:#ffb5b5)", 0)
+mcl_mobs:register_egg("mobs_mc:sheep", S("Sheep"), "#e7e7e7", "#ffb5b5", 0)
--- a/mods/ENTITIES/mobs_mc/shulker.lua
+++ b/mods/ENTITIES/mobs_mc/shulker.lua
@ -177,7 +177,7 @@ mcl_mobs:register_arrow("mobs_mc:shulkerbullet", {
 })


-mcl_mobs:register_egg("mobs_mc:shulker", S("Shulker"), "(spawn_egg.png^[multiply:#946694)^(spawn_egg_overlay.png^[multiply:#4d3852)", 0)
+mcl_mobs:register_egg("mobs_mc:shulker", S("Shulker"), "#946694", "#4d3852", 0)

 --[[
 mcl_mobs:spawn_specific(
--- a/mods/ENTITIES/mobs_mc/silverfish.lua
+++ b/mods/ENTITIES/mobs_mc/silverfish.lua
@ -56,7 +56,7 @@ mcl_mobs:register_mob("mobs_mc:silverfish", {
 	reach = 1,
 })

-mcl_mobs:register_egg("mobs_mc:silverfish", S("Silverfish"), "(spawn_egg.png^[multiply:#6d6d6d)^(spawn_egg_overlay.png^[multiply:#313131)", 0)
+mcl_mobs:register_egg("mobs_mc:silverfish", S("Silverfish"), "#6d6d6d", "#313131", 0)

 -- Monster egg blocks (Minetest Game)
 if minetest.get_modpath("default") and mobs_mc.create_monster_egg_nodes then
--- a/mods/ENTITIES/mobs_mc/skeleton+stray.lua
+++ b/mods/ENTITIES/mobs_mc/skeleton+stray.lua
@ -329,6 +329,6 @@ mcl_vars.mg_overworld_max)


 -- spawn eggs
-mcl_mobs:register_egg("mobs_mc:skeleton", S("Skeleton"), "(spawn_egg.png^[multiply:#c1c1c1)^(spawn_egg_overlay.png^[multiply:#494949)", 0)
+mcl_mobs:register_egg("mobs_mc:skeleton", S("Skeleton"), "#c1c1c1", "#494949", 0)

-mcl_mobs:register_egg("mobs_mc:stray", S("Stray"), "(spawn_egg.png^[multiply:#5f7476)^(spawn_egg_overlay.png^[multiply:#dae8e7)", 0)
+mcl_mobs:register_egg("mobs_mc:stray", S("Stray"), "#5f7476", "#dae8e7", 0)
--- a/mods/ENTITIES/mobs_mc/skeleton_wither.lua
+++ b/mods/ENTITIES/mobs_mc/skeleton_wither.lua
@ -113,4 +113,4 @@ mcl_vars.mg_nether_min,
 mcl_vars.mg_nether_max)

 -- spawn eggs
-mcl_mobs:register_egg("mobs_mc:witherskeleton", S("Wither Skeleton"), "(spawn_egg.png^[multiply:#141414)^(spawn_egg_overlay.png^[multiply:#474d4d)", 0)
+mcl_mobs:register_egg("mobs_mc:witherskeleton", S("Wither Skeleton"), "#141414", "#474d4d", 0)
--- a/mods/ENTITIES/mobs_mc/slime+magma_cube.lua
+++ b/mods/ENTITIES/mobs_mc/slime+magma_cube.lua
@ -447,6 +447,6 @@ mmin,
 mmax)

 -- spawn eggs
-mcl_mobs:register_egg("mobs_mc:magma_cube_big", S("Magma Cube"), "(spawn_egg.png^[multiply:#350000)^(spawn_egg_overlay.png^[multiply:#fcfc00)")
+mcl_mobs:register_egg("mobs_mc:magma_cube_big", S("Magma Cube"), "#350000", "#fcfc00")

-mcl_mobs:register_egg("mobs_mc:slime_big", S("Slime"), "(spawn_egg.png^[multiply:#52a03e)^(spawn_egg_overlay.png^[multiply:#7ebf6d)")
+mcl_mobs:register_egg("mobs_mc:slime_big", S("Slime"), "#52a03e", "#7ebf6d")
--- a/mods/ENTITIES/mobs_mc/snowman.lua
+++ b/mods/ENTITIES/mobs_mc/snowman.lua
@ -196,4 +196,4 @@ function mobs_mc.check_snow_golem_summon(pos)
 end

 -- Spawn egg
-mcl_mobs:register_egg("mobs_mc:snowman", S("Snow Golem"), "(spawn_egg.png^[multiply:#f2f2f2)^(spawn_egg_overlay.png^[multiply:#fd8f47)", 0)
+mcl_mobs:register_egg("mobs_mc:snowman", S("Snow Golem"), "#f2f2f2", "#fd8f47", 0)
--- a/mods/ENTITIES/mobs_mc/spider.lua
+++ b/mods/ENTITIES/mobs_mc/spider.lua
@ -238,5 +238,5 @@ mcl_vars.mg_overworld_min,
 mcl_vars.mg_overworld_max)

 -- spawn eggs
-mcl_mobs:register_egg("mobs_mc:spider", S("Spider"), "(spawn_egg.png^[multiply:#342d26)^(spawn_egg_overlay.png^[multiply:#a80e0e)", 0)
-mcl_mobs:register_egg("mobs_mc:cave_spider", S("Cave Spider"),  "(spawn_egg.png^[multiply:#0c424e)^(spawn_egg_overlay.png^[multiply:#a80e0e)", 0)
+mcl_mobs:register_egg("mobs_mc:spider", S("Spider"), "#342d26", "#a80e0e", 0)
+mcl_mobs:register_egg("mobs_mc:cave_spider", S("Cave Spider"), "#0c424e", "#a80e0e", 0)
--- a/mods/ENTITIES/mobs_mc/squid.lua
+++ b/mods/ENTITIES/mobs_mc/squid.lua
@ -217,4 +217,4 @@ water-16,
 water+1)

 -- spawn eggs
-mcl_mobs:register_egg("mobs_mc:squid", S("Squid"), "(spawn_egg.png^[multiply:#223b4d)^(spawn_egg_overlay.png^[multiply:#708999)", 0)
+mcl_mobs:register_egg("mobs_mc:squid", S("Squid"), "#223b4d", "#708999", 0)
--- a/mods/ENTITIES/mobs_mc/tropical_fish.lua
+++ b/mods/ENTITIES/mobs_mc/tropical_fish.lua
@ -183,4 +183,4 @@ water-16,
 water+1)

 --spawn egg
-mcl_mobs:register_egg("mobs_mc:tropical_fish", S("Tropical fish"), "(spawn_egg.png^[multiply:#ef6915)^(spawn_egg_overlay.png^[multiply:#fff9ef)", 0)
+mcl_mobs:register_egg("mobs_mc:tropical_fish", S("Tropical fish"), "#ef6915", "#fff9ef", 0)
--- a/mods/ENTITIES/mobs_mc/vex.lua
+++ b/mods/ENTITIES/mobs_mc/vex.lua
@ -94,4 +94,4 @@ mcl_mobs:register_mob("mobs_mc:vex", {


 -- spawn eggs
-mcl_mobs:register_egg("mobs_mc:vex", S("Vex"), "(spawn_egg.png^[multiply:#7a90a4)^(spawn_egg_overlay.png^[multiply:#e8edf1)", 0)
+mcl_mobs:register_egg("mobs_mc:vex", S("Vex"), "#7a90a4", "#e8edf1", 0)
--- a/mods/ENTITIES/mobs_mc/villager.lua
+++ b/mods/ENTITIES/mobs_mc/villager.lua
@ -1479,4 +1479,4 @@ mobs_mc.water_level+1,
 mcl_vars.mg_overworld_max)
 --]]
 -- spawn eggs
-mcl_mobs:register_egg("mobs_mc:villager", S("Villager"), "(spawn_egg.png^[multiply:#563d33)^(spawn_egg_overlay.png^[multiply:#bc8b72)", 0)
+mcl_mobs:register_egg("mobs_mc:villager", S("Villager"), "#563d33", "#bc8b72", 0)
--- a/mods/ENTITIES/mobs_mc/villager_evoker.lua
+++ b/mods/ENTITIES/mobs_mc/villager_evoker.lua
@ -74,4 +74,4 @@ mcl_mobs:register_mob("mobs_mc:evoker", {
 })

 -- spawn eggs
-mcl_mobs:register_egg("mobs_mc:evoker", S("Evoker"), "(spawn_egg.png^[multiply:#959b9b)^(spawn_egg_overlay.png^[multiply:#1e1c1a)", 0)
+mcl_mobs:register_egg("mobs_mc:evoker", S("Evoker"), "#959b9b", "#1e1c1a", 0)
--- a/mods/ENTITIES/mobs_mc/villager_illusioner.lua
+++ b/mods/ENTITIES/mobs_mc/villager_illusioner.lua
@ -61,4 +61,4 @@ mcl_mobs:register_mob("mobs_mc:illusioner", {
 	fear_height = 4,
 })

-mcl_mobs:register_egg("mobs_mc:illusioner", S("Illusioner"), "(spawn_egg.png^[multiply:#3f5cbb)^(spawn_egg_overlay.png^[multiply:#8a8686)", 0)
+mcl_mobs:register_egg("mobs_mc:illusioner", S("Illusioner"), "#3f5cbb", "#8a8686", 0)
--- a/mods/ENTITIES/mobs_mc/villager_vindicator.lua
+++ b/mods/ENTITIES/mobs_mc/villager_vindicator.lua
@ -73,4 +73,4 @@ mcl_mobs:register_mob("mobs_mc:vindicator", {
 })

 -- spawn eggs
-mcl_mobs:register_egg("mobs_mc:vindicator", S("Vindicator"), "(spawn_egg.png^[multiply:#959b9b)^(spawn_egg_overlay.png^[multiply:#275e61)", 0)
+mcl_mobs:register_egg("mobs_mc:vindicator", S("Vindicator"), "#959b9b", "#275e61", 0)
--- a/mods/ENTITIES/mobs_mc/villager_zombie.lua
+++ b/mods/ENTITIES/mobs_mc/villager_zombie.lua
@ -228,4 +228,4 @@ mcl_vars.mg_overworld_max)
 --mcl_mobs:spawn_specific("mobs_mc:villager_zombie", "overworld", "ground", 0, 7, 30, 60000, 4, mcl_vars.mg_overworld_min, mcl_vars.mg_overworld_max)

 -- spawn eggs
-mcl_mobs:register_egg("mobs_mc:villager_zombie", S("Zombie Villager"), "(spawn_egg.png^[multiply:#563d33)^(spawn_egg_overlay.png^[multiply:#799c66)", 0)
+mcl_mobs:register_egg("mobs_mc:villager_zombie", S("Zombie Villager"), "#563d33", "#799c66", 0)
--- a/mods/ENTITIES/mobs_mc/witch.lua
+++ b/mods/ENTITIES/mobs_mc/witch.lua
@ -104,6 +104,6 @@ mcl_mobs:register_arrow("mobs_mc:potion_arrow", {
 --mcl_mobs:spawn_specific("mobs_mc:witch", { "mcl_core:jungletree", "mcl_core:jungleleaves", "mcl_flowers:fern", "mcl_core:vine" }, {"air"}, 0, minetest.LIGHT_MAX-6, 12, 20000, 2, mobs_mc.water_level-6, mcl_vars.mg_overworld_max)

 -- spawn eggs
-mcl_mobs:register_egg("mobs_mc:witch", S("Witch"), "(spawn_egg.png^[multiply:#340000)^(spawn_egg_overlay.png^[multiply:#51a03e)", 0, true)
+mcl_mobs:register_egg("mobs_mc:witch", S("Witch"), "#340000", "#51a03e", 0, true)

 mcl_wip.register_wip_item("mobs_mc:witch")
--- a/mods/ENTITIES/mobs_mc/wither.lua
+++ b/mods/ENTITIES/mobs_mc/wither.lua
@ -115,6 +115,6 @@ mcl_mobs:register_arrow("mobs_mc:wither_skull", {
 -- TODO: Add blue wither skull

 --Spawn egg
-mcl_mobs:register_egg("mobs_mc:wither", S("Wither"), "(spawn_egg.png^[multiply:#4f4f4f)^(spawn_egg_overlay.png^[multiply:#4f4f4f)", 0, true)
+mcl_mobs:register_egg("mobs_mc:wither", S("Wither"), "#4f4f4f", "#4f4f4f", 0, true)

 mcl_wip.register_wip_item("mobs_mc:wither")
--- a/mods/ENTITIES/mobs_mc/wolf.lua
+++ b/mods/ENTITIES/mobs_mc/wolf.lua
@ -252,4 +252,4 @@ minetest.LIGHT_MAX+1,
 mobs_mc.water_level+3,
 mcl_vars.mg_overworld_max)

-mcl_mobs:register_egg("mobs_mc:wolf", S("Wolf"), "(spawn_egg.png^[multiply:#d7d3d3)^(spawn_egg_overlay.png^[multiply:#ceaf96)", 0)
+mcl_mobs:register_egg("mobs_mc:wolf", S("Wolf"), "#d7d3d3", "#ceaf96", 0)
--- a/mods/ENTITIES/mobs_mc/zombie.lua
+++ b/mods/ENTITIES/mobs_mc/zombie.lua
@ -366,5 +366,5 @@ mcl_vars.mg_overworld_min,
 mcl_vars.mg_overworld_max)

 -- Spawn eggs
-mcl_mobs:register_egg("mobs_mc:husk", S("Husk"), "(spawn_egg.png^[multiply:#777361)^(spawn_egg_overlay.png^[multiply:#ded88f)", 0)
-mcl_mobs:register_egg("mobs_mc:zombie", S("Zombie"), "(spawn_egg.png^[multiply:#00afaf)^(spawn_egg_overlay.png^[multiply:#799c66)", 0)
+mcl_mobs:register_egg("mobs_mc:husk", S("Husk"), "#777361", "#ded88f", 0)
+mcl_mobs:register_egg("mobs_mc:zombie", S("Zombie"), "#00afaf", "#799c66", 0)
--- a/mods/ENTITIES/mobs_mc/zombiepig.lua
+++ b/mods/ENTITIES/mobs_mc/zombiepig.lua
@ -149,4 +149,4 @@ mcl_vars.mg_nether_max)
 --mobs:spawn_specific("mobs_mc:pigman", {"mcl_portals:portal"}, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 500, 4, mcl_vars.mg_overworld_min, mcl_vars.mg_overworld_max)

 -- spawn eggs
-mcl_mobs:register_egg("mobs_mc:pigman", S("Zombie Pigman"), "(spawn_egg.png^[multiply:#ea9393)^(spawn_egg_overlay.png^[multiply:#4c7129)", 0)
+mcl_mobs:register_egg("mobs_mc:pigman", S("Zombie Pigman"), "#ea9393", "#4c7129", 0)
--- a/mods/HUD/mcl_achievements/init.lua
+++ b/mods/HUD/mcl_achievements/init.lua
@ -252,7 +252,7 @@ awards.register_achievement("mcl:witheringHeights", {
 awards.register_achievement("mcl:freeTheEnd", {
 	title = S("Free the End"),
 	description = S("Kill the ender dragon. Good Luck!"),
-	icon = "mobs_mc_spawn_icon_dragon.png", -- TODO: Dragon Head Icon
+	icon = "(spawn_egg.png^[multiply:#252525)^(spawn_egg_overlay.png^[multiply:#b313c9)", -- TODO: Dragon Head Icon
 })

 -- Triggered in mcl_fishing