From 3dcf268df2d9e56ae58f6a38428179b4da701ecb Mon Sep 17 00:00:00 2001
From: MysticTempest <molecularmarc.he@gmail.com>
Date: Wed, 13 Jul 2022 12:29:33 -0500
Subject: [PATCH] Update node_specific spawns for mobs, and fix llama biome
 spawn.

---
 mods/ENTITIES/mobs_mc/chicken.lua       |  2 +-
 mods/ENTITIES/mobs_mc/cow+mooshroom.lua |  4 ++--
 mods/ENTITIES/mobs_mc/llama.lua         | 13 ++++++-------
 mods/ENTITIES/mobs_mc/ocelot.lua        |  2 +-
 mods/ENTITIES/mobs_mc/parrot.lua        |  2 +-
 mods/ENTITIES/mobs_mc/pig.lua           |  2 +-
 mods/ENTITIES/mobs_mc/polar_bear.lua    |  2 +-
 mods/ENTITIES/mobs_mc/rabbit.lua        |  2 +-
 mods/ENTITIES/mobs_mc/sheep.lua         |  2 +-
 mods/ENTITIES/mobs_mc/wolf.lua          | 10 +++++++++-
 10 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/mods/ENTITIES/mobs_mc/chicken.lua b/mods/ENTITIES/mobs_mc/chicken.lua
index fc4c30447..f96271d36 100644
--- a/mods/ENTITIES/mobs_mc/chicken.lua
+++ b/mods/ENTITIES/mobs_mc/chicken.lua
@@ -109,7 +109,7 @@ mcl_mobs:register_mob("mobs_mc:chicken", {
 mcl_mobs:spawn_specific(
 "mobs_mc:chicken",
 "overworld",
-"ground",
+"mcl_core:dirt_with_grass",
 {
 	"flat",
 	"ColdTaiga",
diff --git a/mods/ENTITIES/mobs_mc/cow+mooshroom.lua b/mods/ENTITIES/mobs_mc/cow+mooshroom.lua
index 2a9825f72..e11ceaa51 100644
--- a/mods/ENTITIES/mobs_mc/cow+mooshroom.lua
+++ b/mods/ENTITIES/mobs_mc/cow+mooshroom.lua
@@ -148,7 +148,7 @@ mcl_mobs:register_mob("mobs_mc:mooshroom", mooshroom_def)
 mcl_mobs:spawn_specific(
 "mobs_mc:cow",
 "overworld",
-"ground",
+"mcl_core:dirt_with_grass",
 {
 	"flat",
 	"ColdTaiga",
@@ -199,7 +199,7 @@ mcl_vars.mg_overworld_max)
 mcl_mobs:spawn_specific(
 "mobs_mc:mooshroom",
 "overworld",
-"ground",
+"mcl_core:mycelium",
 {
 "MushroomIslandShore",
 "MushroomIsland"
diff --git a/mods/ENTITIES/mobs_mc/llama.lua b/mods/ENTITIES/mobs_mc/llama.lua
index a211b117a..ce5370d84 100644
--- a/mods/ENTITIES/mobs_mc/llama.lua
+++ b/mods/ENTITIES/mobs_mc/llama.lua
@@ -215,7 +215,7 @@ mcl_mobs:register_mob("mobs_mc:llama", {
 mcl_mobs:spawn_specific(
 "mobs_mc:llama",
 "overworld",
-"ground",
+"mcl_core:dirt_with_grass",
 {
 	"Mesa",
 	"MesaPlateauFM_grasstop",
@@ -223,12 +223,11 @@ mcl_mobs:spawn_specific(
 	"MesaPlateauFM",
 	"MesaPlateauF_grasstop",
 	"MesaBryce",
-	"Jungle",
-	"Jungle_shore",
-	"JungleM",
-	"JungleM_shore",
-	"JungleEdge",
-	"JungleEdgeM",
+	"ExtremeHills",
+	"ExtremeHills_beach",
+	"ExtremeHillsM",
+	"ExtremeHills+",
+	"ExtremeHills+_snowtop",
 },
 0,
 minetest.LIGHT_MAX+1,
diff --git a/mods/ENTITIES/mobs_mc/ocelot.lua b/mods/ENTITIES/mobs_mc/ocelot.lua
index 983199762..5bc3617a0 100644
--- a/mods/ENTITIES/mobs_mc/ocelot.lua
+++ b/mods/ENTITIES/mobs_mc/ocelot.lua
@@ -157,7 +157,7 @@ local base_spawn_chance = 5000
 mcl_mobs:spawn_specific(
 "mobs_mc:ocelot",
 "overworld",
-"ground",
+"mcl_core:dirt_with_grass",
 {
 "Jungle",
 "JungleEdgeM",
diff --git a/mods/ENTITIES/mobs_mc/parrot.lua b/mods/ENTITIES/mobs_mc/parrot.lua
index 84b3aaead..138bc8aa8 100644
--- a/mods/ENTITIES/mobs_mc/parrot.lua
+++ b/mods/ENTITIES/mobs_mc/parrot.lua
@@ -171,7 +171,7 @@ mcl_mobs:register_mob("mobs_mc:parrot", {
 mcl_mobs:spawn_specific(
 "mobs_mc:parrot",
 "overworld",
-"ground",
+{"mcl_core:dirt_with_grass", "group:leaves", "group:tree"},
 {
 "Jungle",
 "JungleEdgeM",
diff --git a/mods/ENTITIES/mobs_mc/pig.lua b/mods/ENTITIES/mobs_mc/pig.lua
index 252f15973..c8ee9892a 100644
--- a/mods/ENTITIES/mobs_mc/pig.lua
+++ b/mods/ENTITIES/mobs_mc/pig.lua
@@ -191,7 +191,7 @@ mcl_mobs:register_mob("mobs_mc:pig", {
 mcl_mobs:spawn_specific(
 "mobs_mc:pig",
 "overworld",
-"ground",
+"mcl_core:dirt_with_grass",
 {
 	"flat",
 	"ColdTaiga",
diff --git a/mods/ENTITIES/mobs_mc/polar_bear.lua b/mods/ENTITIES/mobs_mc/polar_bear.lua
index 4b2f338b2..ca13b9726 100644
--- a/mods/ENTITIES/mobs_mc/polar_bear.lua
+++ b/mods/ENTITIES/mobs_mc/polar_bear.lua
@@ -71,7 +71,7 @@ mcl_mobs:register_mob("mobs_mc:polar_bear", {
 mcl_mobs:spawn_specific(
 "mobs_mc:polar_bear",
 "overworld",
-"ground",
+{"mcl_core:dirt_with_grass","group:ice"},
 {
 "ColdTaiga",
 "IcePlainsSpikes",
diff --git a/mods/ENTITIES/mobs_mc/rabbit.lua b/mods/ENTITIES/mobs_mc/rabbit.lua
index 2632eafce..9b44434b6 100644
--- a/mods/ENTITIES/mobs_mc/rabbit.lua
+++ b/mods/ENTITIES/mobs_mc/rabbit.lua
@@ -127,7 +127,7 @@ mcl_mobs:register_mob("mobs_mc:killer_bunny", killer_bunny)
 mcl_mobs:spawn_specific(
 "mobs_mc:rabbit",
 "overworld",
-"ground",
+{"mcl_core:dirt_with_grass","group:sand","mcl_core:snow_block"},
 {
 "Desert",
 "FlowerForest",
diff --git a/mods/ENTITIES/mobs_mc/sheep.lua b/mods/ENTITIES/mobs_mc/sheep.lua
index 8d2b6d50f..93678e7df 100644
--- a/mods/ENTITIES/mobs_mc/sheep.lua
+++ b/mods/ENTITIES/mobs_mc/sheep.lua
@@ -307,7 +307,7 @@ mcl_mobs:register_mob("mobs_mc:sheep", {
 mcl_mobs:spawn_specific(
 "mobs_mc:sheep",
 "overworld",
-"ground",
+"mcl_core:dirt_with_grass",
 {
 	"flat",
 	"ColdTaiga",
diff --git a/mods/ENTITIES/mobs_mc/wolf.lua b/mods/ENTITIES/mobs_mc/wolf.lua
index d875bebf9..957624564 100644
--- a/mods/ENTITIES/mobs_mc/wolf.lua
+++ b/mods/ENTITIES/mobs_mc/wolf.lua
@@ -236,7 +236,15 @@ mcl_mobs:register_mob("mobs_mc:dog", dog)
 mcl_mobs:spawn_specific(
 "mobs_mc:wolf",
 "overworld",
-"ground",
+{
+"mcl_core:dirt_with_grass",
+"mcl_core:dirt_with_grass_snow",
+"mcl_core:podzol",
+"mcl_core:podzol_snow",
+"mcl_core:dirt",
+"mcl_core:coarse_dirt",
+"mcl_core:snow_block"
+},
 {
 	"Taiga",
 	"MegaSpruceTaiga",