diff --git a/mods/ENTITIES/mobs_mc/chicken.lua b/mods/ENTITIES/mobs_mc/chicken.lua
index 615ec86e7..0b43fca0d 100644
--- a/mods/ENTITIES/mobs_mc/chicken.lua
+++ b/mods/ENTITIES/mobs_mc/chicken.lua
@@ -106,22 +106,42 @@ mobs:spawn_specific(
 "overworld",
 "ground",
 {
-"FlowerForest",
-"Swampland",
-"Taiga",
-"ExtremeHills",
-"BirchForest",
-"MegaSpruceTaiga",
-"MegaTaiga",
-"ExtremeHills+",
-"Forest",
-"Plains",
-"ColdTaiga",
-"SunflowerPlains",
-"RoofedForest",
-"MesaPlateauFM_grasstop",
-"ExtremeHillsM",
-"BirchForestM",
+	"flat",
+	"IcePlainsSpikes",
+	"ColdTaiga",
+	"ColdTaiga_beach",
+	"ColdTaiga_beach_water",
+	"MegaTaiga",
+	"MegaSpruceTaiga",
+	"ExtremeHills",
+	"ExtremeHills_beach",
+	"ExtremeHillsM",
+	"ExtremeHills+",
+	"ExtremeHills+_snowtop",
+	"StoneBeach",
+	"Plains",
+	"Plains_beach",
+	"SunflowerPlains",
+	"Taiga",
+	"Taiga_beach",
+	"Forest",
+	"Forest_beach",
+	"FlowerForest",
+	"FlowerForest_beach",
+	"BirchForest",
+	"BirchForestM",
+	"RoofedForest",
+	"Savanna",
+	"Savanna_beach",
+	"SavannaM",
+	"Jungle",
+	"Jungle_shore",
+	"JungleM",
+	"JungleM_shore",
+	"JungleEdge",
+	"JungleEdgeM",
+	"Swampland",
+	"Swampland_shore"
 },
 9,
 minetest.LIGHT_MAX+1,
diff --git a/mods/ENTITIES/mobs_mc/cow+mooshroom.lua b/mods/ENTITIES/mobs_mc/cow+mooshroom.lua
index 62e124463..0b9a7ec71 100644
--- a/mods/ENTITIES/mobs_mc/cow+mooshroom.lua
+++ b/mods/ENTITIES/mobs_mc/cow+mooshroom.lua
@@ -151,22 +151,42 @@ mobs:spawn_specific(
 "overworld",
 "ground",
 {
-"FlowerForest",
-"Swampland",
-"Taiga",
-"ExtremeHills",
-"BirchForest",
-"MegaSpruceTaiga",
-"MegaTaiga",
-"ExtremeHills+",
-"Forest",
-"Plains",
-"ColdTaiga",
-"SunflowerPlains",
-"RoofedForest",
-"MesaPlateauFM_grasstop",
-"ExtremeHillsM",
-"BirchForestM",
+	"flat",
+	"IcePlainsSpikes",
+	"ColdTaiga",
+	"ColdTaiga_beach",
+	"ColdTaiga_beach_water",
+	"MegaTaiga",
+	"MegaSpruceTaiga",
+	"ExtremeHills",
+	"ExtremeHills_beach",
+	"ExtremeHillsM",
+	"ExtremeHills+",
+	"ExtremeHills+_snowtop",
+	"StoneBeach",
+	"Plains",
+	"Plains_beach",
+	"SunflowerPlains",
+	"Taiga",
+	"Taiga_beach",
+	"Forest",
+	"Forest_beach",
+	"FlowerForest",
+	"FlowerForest_beach",
+	"BirchForest",
+	"BirchForestM",
+	"RoofedForest",
+	"Savanna",
+	"Savanna_beach",
+	"SavannaM",
+	"Jungle",
+	"Jungle_shore",
+	"JungleM",
+	"JungleM_shore",
+	"JungleEdge",
+	"JungleEdgeM",
+	"Swampland",
+	"Swampland_shore"
 },
 9,
 minetest.LIGHT_MAX+1,
diff --git a/mods/ENTITIES/mobs_mc/horse.lua b/mods/ENTITIES/mobs_mc/horse.lua
index ac631f205..5fe605573 100644
--- a/mods/ENTITIES/mobs_mc/horse.lua
+++ b/mods/ENTITIES/mobs_mc/horse.lua
@@ -520,22 +520,42 @@ mobs:spawn_specific(
 "overworld",
 "ground",
 {
-"FlowerForest",
-"Swampland",
-"Taiga",
-"ExtremeHills",
-"BirchForest",
-"MegaSpruceTaiga",
-"MegaTaiga",
-"ExtremeHills+",
-"Forest",
-"Plains",
-"ColdTaiga",
-"SunflowerPlains",
-"RoofedForest",
-"MesaPlateauFM_grasstop",
-"ExtremeHillsM",
-"BirchForestM",
+	"flat",
+	"IcePlainsSpikes",
+	"ColdTaiga",
+	"ColdTaiga_beach",
+	"ColdTaiga_beach_water",
+	"MegaTaiga",
+	"MegaSpruceTaiga",
+	"ExtremeHills",
+	"ExtremeHills_beach",
+	"ExtremeHillsM",
+	"ExtremeHills+",
+	"ExtremeHills+_snowtop",
+	"StoneBeach",
+	"Plains",
+	"Plains_beach",
+	"SunflowerPlains",
+	"Taiga",
+	"Taiga_beach",
+	"Forest",
+	"Forest_beach",
+	"FlowerForest",
+	"FlowerForest_beach",
+	"BirchForest",
+	"BirchForestM",
+	"RoofedForest",
+	"Savanna",
+	"Savanna_beach",
+	"SavannaM",
+	"Jungle",
+	"Jungle_shore",
+	"JungleM",
+	"JungleM_shore",
+	"JungleEdge",
+	"JungleEdgeM",
+	"Swampland",
+	"Swampland_shore"
 },
 0,
 minetest.LIGHT_MAX+1,
diff --git a/mods/ENTITIES/mobs_mc/llama.lua b/mods/ENTITIES/mobs_mc/llama.lua
index 655cddfb6..b6566059a 100644
--- a/mods/ENTITIES/mobs_mc/llama.lua
+++ b/mods/ENTITIES/mobs_mc/llama.lua
@@ -223,12 +223,18 @@ mobs:spawn_specific(
 "overworld",
 "ground",
 {
-"Mesa",
-"MesaPlateauFM_grasstop",
-"MesaPlateauF",
-"MesaPlateauFM",
-"MesaPlateauF_grasstop",
-"MesaBryce",
+	"Mesa",
+	"MesaPlateauFM_grasstop",
+	"MesaPlateauF",
+	"MesaPlateauFM",
+	"MesaPlateauF_grasstop",
+	"MesaBryce",
+	"Jungle",
+	"Jungle_shore",
+	"JungleM",
+	"JungleM_shore",
+	"JungleEdge",
+	"JungleEdgeM",
 },
 0,
 minetest.LIGHT_MAX+1,
diff --git a/mods/ENTITIES/mobs_mc/pig.lua b/mods/ENTITIES/mobs_mc/pig.lua
index b7d919cff..837d743f0 100644
--- a/mods/ENTITIES/mobs_mc/pig.lua
+++ b/mods/ENTITIES/mobs_mc/pig.lua
@@ -188,22 +188,42 @@ mobs:spawn_specific(
 "overworld",
 "ground",
 {
-"FlowerForest",
-"Swampland",
-"Taiga",
-"ExtremeHills",
-"BirchForest",
-"MegaSpruceTaiga",
-"MegaTaiga",
-"ExtremeHills+",
-"Forest",
-"Plains",
-"ColdTaiga",
-"SunflowerPlains",
-"RoofedForest",
-"MesaPlateauFM_grasstop",
-"ExtremeHillsM",
-"BirchForestM",
+	"flat",
+	"IcePlainsSpikes",
+	"ColdTaiga",
+	"ColdTaiga_beach",
+	"ColdTaiga_beach_water",
+	"MegaTaiga",
+	"MegaSpruceTaiga",
+	"ExtremeHills",
+	"ExtremeHills_beach",
+	"ExtremeHillsM",
+	"ExtremeHills+",
+	"ExtremeHills+_snowtop",
+	"StoneBeach",
+	"Plains",
+	"Plains_beach",
+	"SunflowerPlains",
+	"Taiga",
+	"Taiga_beach",
+	"Forest",
+	"Forest_beach",
+	"FlowerForest",
+	"FlowerForest_beach",
+	"BirchForest",
+	"BirchForestM",
+	"RoofedForest",
+	"Savanna",
+	"Savanna_beach",
+	"SavannaM",
+	"Jungle",
+	"Jungle_shore",
+	"JungleM",
+	"JungleM_shore",
+	"JungleEdge",
+	"JungleEdgeM",
+	"Swampland",
+	"Swampland_shore"
 },
 9,
 minetest.LIGHT_MAX+1,
diff --git a/mods/ENTITIES/mobs_mc/sheep.lua b/mods/ENTITIES/mobs_mc/sheep.lua
index 9ddc0adee..f16b64c66 100644
--- a/mods/ENTITIES/mobs_mc/sheep.lua
+++ b/mods/ENTITIES/mobs_mc/sheep.lua
@@ -309,22 +309,42 @@ mobs:spawn_specific(
 "overworld",
 "ground",
 {
-"FlowerForest",
-"Swampland",
-"Taiga",
-"ExtremeHills",
-"BirchForest",
-"MegaSpruceTaiga",
-"MegaTaiga",
-"ExtremeHills+",
-"Forest",
-"Plains",
-"ColdTaiga",
-"SunflowerPlains",
-"RoofedForest",
-"MesaPlateauFM_grasstop",
-"ExtremeHillsM",
-"BirchForestM",
+	"flat",
+	"IcePlainsSpikes",
+	"ColdTaiga",
+	"ColdTaiga_beach",
+	"ColdTaiga_beach_water",
+	"MegaTaiga",
+	"MegaSpruceTaiga",
+	"ExtremeHills",
+	"ExtremeHills_beach",
+	"ExtremeHillsM",
+	"ExtremeHills+",
+	"ExtremeHills+_snowtop",
+	"StoneBeach",
+	"Plains",
+	"Plains_beach",
+	"SunflowerPlains",
+	"Taiga",
+	"Taiga_beach",
+	"Forest",
+	"Forest_beach",
+	"FlowerForest",
+	"FlowerForest_beach",
+	"BirchForest",
+	"BirchForestM",
+	"RoofedForest",
+	"Savanna",
+	"Savanna_beach",
+	"SavannaM",
+	"Jungle",
+	"Jungle_shore",
+	"JungleM",
+	"JungleM_shore",
+	"JungleEdge",
+	"JungleEdgeM",
+	"Swampland",
+	"Swampland_shore"
 },
 0,
 minetest.LIGHT_MAX+1,