diff --git a/mods/CORE/mcl_util/table.lua b/mods/CORE/mcl_util/table.lua
index 602ca687c..5f66e3113 100644
--- a/mods/CORE/mcl_util/table.lua
+++ b/mods/CORE/mcl_util/table.lua
@@ -44,13 +44,6 @@ function table.pairs_by_keys(t, f)
return iter
end
-function table.find(t, item)
- for k,v in pairs(t) do
- if v == item then return k end
- end
- return nil
-end
-
---@param a table
---@param b table
---@return table
diff --git a/mods/ENTITIES/mcl_mobs/spawning.lua b/mods/ENTITIES/mcl_mobs/spawning.lua
index 342bc00f8..45559be5f 100644
--- a/mods/ENTITIES/mcl_mobs/spawning.lua
+++ b/mods/ENTITIES/mcl_mobs/spawning.lua
@@ -923,11 +923,12 @@ if mobs_spawn then
if #spawn_table == 0 then return nil end
local mob_chance_offset = math_random() * spawn_table.cumulative_chance
+ -- Deliberately one less that the table size. The last item will always
+ -- be chosen when all others aren't selected
for i = 1,(#spawn_table-1) do
local mob_def = spawn_table[i]
local mob_chance = mob_def.chance
if mob_chance_offset <= mob_chance then
- --minetest.log(mob_def.name.." "..mob_chance)
return mob_def
end
@@ -1008,7 +1009,7 @@ if mobs_spawn then
if not spawning_position then
fail_count = fail_count + 1
if logging and fail_count > 16 then
- minetest.log("action", "[Mobs spawn] Cannot find a valid spawn position in last 16 attemtps")
+ minetest.log("action", "[Mobs spawn] Could not find a valid spawn position in last 16 attempts")
end
return
end
@@ -1046,13 +1047,13 @@ if mobs_spawn then
if mob_def.type_of_spawning == "water" then
spawning_position = get_water_spawn(spawning_position)
if not spawning_position then
- minetest.log("warning","[mcl_mobs] no water spawn for mob "..mob_def.name.." found at "..minetest.pos_to_string(vector.round(pos)))
+ mcl_log("[mcl_mobs] no water spawn for mob "..mob_def.name.." found at "..minetest.pos_to_string(vector.round(pos)))
return
end
end
if mob_def_ent.can_spawn and not mob_def_ent.can_spawn(spawning_position) then
- minetest.log("warning","[mcl_mobs] mob "..mob_def.name.." refused to spawn at "..minetest.pos_to_string(vector.round(spawning_position)))
+ mcl_log("[mcl_mobs] mob "..mob_def.name.." refused to spawn at "..minetest.pos_to_string(vector.round(spawning_position)))
return
end
diff --git a/mods/ENTITIES/mobs_mc/guardian.lua b/mods/ENTITIES/mobs_mc/guardian.lua
index d4f6c50c7..fdbc17d6a 100644
--- a/mods/ENTITIES/mobs_mc/guardian.lua
+++ b/mods/ENTITIES/mobs_mc/guardian.lua
@@ -103,147 +103,7 @@ mcl_mobs:spawn_specific(
"mobs_mc:guardian", -- name
"overworld", -- dimension
"water", -- type_of_spawning
- { -- biomes
- "Mesa",
- "FlowerForest",
- "Swampland",
- "Taiga",
- "ExtremeHills",
- "Jungle",
- "Savanna",
- "BirchForest",
- "MegaSpruceTaiga",
- "MegaTaiga",
- "ExtremeHills+",
- "Forest",
- "Plains",
- "Desert",
- "ColdTaiga",
- "MushroomIsland",
- "IcePlainsSpikes",
- "SunflowerPlains",
- "IcePlains",
- "RoofedForest",
- "ExtremeHills+_snowtop",
- "MesaPlateauFM_grasstop",
- "JungleEdgeM",
- "ExtremeHillsM",
- "JungleM",
- "BirchForestM",
- "MesaPlateauF",
- "MesaPlateauFM",
- "MesaPlateauF_grasstop",
- "MesaBryce",
- "JungleEdge",
- "SavannaM",
- "FlowerForest_beach",
- "Forest_beach",
- "StoneBeach",
- "ColdTaiga_beach_water",
- "Taiga_beach",
- "Savanna_beach",
- "Plains_beach",
- "ExtremeHills_beach",
- "ColdTaiga_beach",
- "Swampland_shore",
- "MushroomIslandShore",
- "JungleM_shore",
- "Jungle_shore",
- "MesaPlateauFM_sandlevel",
- "MesaPlateauF_sandlevel",
- "MesaBryce_sandlevel",
- "Mesa_sandlevel",
- "RoofedForest_ocean",
- "JungleEdgeM_ocean",
- "BirchForestM_ocean",
- "BirchForest_ocean",
- "IcePlains_deep_ocean",
- "Jungle_deep_ocean",
- "Savanna_ocean",
- "MesaPlateauF_ocean",
- "ExtremeHillsM_deep_ocean",
- "Savanna_deep_ocean",
- "SunflowerPlains_ocean",
- "Swampland_deep_ocean",
- "Swampland_ocean",
- "MegaSpruceTaiga_deep_ocean",
- "ExtremeHillsM_ocean",
- "JungleEdgeM_deep_ocean",
- "SunflowerPlains_deep_ocean",
- "BirchForest_deep_ocean",
- "IcePlainsSpikes_ocean",
- "Mesa_ocean",
- "StoneBeach_ocean",
- "Plains_deep_ocean",
- "JungleEdge_deep_ocean",
- "SavannaM_deep_ocean",
- "Desert_deep_ocean",
- "Mesa_deep_ocean",
- "ColdTaiga_deep_ocean",
- "Plains_ocean",
- "MesaPlateauFM_ocean",
- "Forest_deep_ocean",
- "JungleM_deep_ocean",
- "FlowerForest_deep_ocean",
- "MushroomIsland_ocean",
- "MegaTaiga_ocean",
- "StoneBeach_deep_ocean",
- "IcePlainsSpikes_deep_ocean",
- "ColdTaiga_ocean",
- "SavannaM_ocean",
- "MesaPlateauF_deep_ocean",
- "MesaBryce_deep_ocean",
- "ExtremeHills+_deep_ocean",
- "ExtremeHills_ocean",
- "MushroomIsland_deep_ocean",
- "Forest_ocean",
- "MegaTaiga_deep_ocean",
- "JungleEdge_ocean",
- "MesaBryce_ocean",
- "MegaSpruceTaiga_ocean",
- "ExtremeHills+_ocean",
- "Jungle_ocean",
- "RoofedForest_deep_ocean",
- "IcePlains_ocean",
- "FlowerForest_ocean",
- "ExtremeHills_deep_ocean",
- "MesaPlateauFM_deep_ocean",
- "Desert_ocean",
- "Taiga_ocean",
- "BirchForestM_deep_ocean",
- "Taiga_deep_ocean",
- "JungleM_ocean",
- "FlowerForest_underground",
- "JungleEdge_underground",
- "StoneBeach_underground",
- "MesaBryce_underground",
- "Mesa_underground",
- "RoofedForest_underground",
- "Jungle_underground",
- "Swampland_underground",
- "MushroomIsland_underground",
- "BirchForest_underground",
- "Plains_underground",
- "MesaPlateauF_underground",
- "ExtremeHills_underground",
- "MegaSpruceTaiga_underground",
- "BirchForestM_underground",
- "SavannaM_underground",
- "MesaPlateauFM_underground",
- "Desert_underground",
- "Savanna_underground",
- "Forest_underground",
- "SunflowerPlains_underground",
- "ColdTaiga_underground",
- "IcePlains_underground",
- "IcePlainsSpikes_underground",
- "MegaTaiga_underground",
- "Taiga_underground",
- "ExtremeHills+_underground",
- "JungleM_underground",
- "ExtremeHillsM_underground",
- "JungleEdgeM_underground",
- },
+ {}, -- no biomes, only spawn in structures
0, -- min_light
core.LIGHT_MAX+1, -- max_light
30, -- interval
diff --git a/mods/ENTITIES/mobs_mc/guardian_elder.lua b/mods/ENTITIES/mobs_mc/guardian_elder.lua
index 9e79f1f1a..3c47e137e 100644
--- a/mods/ENTITIES/mobs_mc/guardian_elder.lua
+++ b/mods/ENTITIES/mobs_mc/guardian_elder.lua
@@ -116,147 +116,7 @@ mcl_mobs:spawn_specific(
"mobs_mc:guardian_elder", -- name
"overworld", -- dimension
"water", -- type_of_spawning
- { -- biomes
- "Mesa",
- "FlowerForest",
- "Swampland",
- "Taiga",
- "ExtremeHills",
- "Jungle",
- "Savanna",
- "BirchForest",
- "MegaSpruceTaiga",
- "MegaTaiga",
- "ExtremeHills+",
- "Forest",
- "Plains",
- "Desert",
- "ColdTaiga",
- "MushroomIsland",
- "IcePlainsSpikes",
- "SunflowerPlains",
- "IcePlains",
- "RoofedForest",
- "ExtremeHills+_snowtop",
- "MesaPlateauFM_grasstop",
- "JungleEdgeM",
- "ExtremeHillsM",
- "JungleM",
- "BirchForestM",
- "MesaPlateauF",
- "MesaPlateauFM",
- "MesaPlateauF_grasstop",
- "MesaBryce",
- "JungleEdge",
- "SavannaM",
- "FlowerForest_beach",
- "Forest_beach",
- "StoneBeach",
- "ColdTaiga_beach_water",
- "Taiga_beach",
- "Savanna_beach",
- "Plains_beach",
- "ExtremeHills_beach",
- "ColdTaiga_beach",
- "Swampland_shore",
- "MushroomIslandShore",
- "JungleM_shore",
- "Jungle_shore",
- "MesaPlateauFM_sandlevel",
- "MesaPlateauF_sandlevel",
- "MesaBryce_sandlevel",
- "Mesa_sandlevel",
- "RoofedForest_ocean",
- "JungleEdgeM_ocean",
- "BirchForestM_ocean",
- "BirchForest_ocean",
- "IcePlains_deep_ocean",
- "Jungle_deep_ocean",
- "Savanna_ocean",
- "MesaPlateauF_ocean",
- "ExtremeHillsM_deep_ocean",
- "Savanna_deep_ocean",
- "SunflowerPlains_ocean",
- "Swampland_deep_ocean",
- "Swampland_ocean",
- "MegaSpruceTaiga_deep_ocean",
- "ExtremeHillsM_ocean",
- "JungleEdgeM_deep_ocean",
- "SunflowerPlains_deep_ocean",
- "BirchForest_deep_ocean",
- "IcePlainsSpikes_ocean",
- "Mesa_ocean",
- "StoneBeach_ocean",
- "Plains_deep_ocean",
- "JungleEdge_deep_ocean",
- "SavannaM_deep_ocean",
- "Desert_deep_ocean",
- "Mesa_deep_ocean",
- "ColdTaiga_deep_ocean",
- "Plains_ocean",
- "MesaPlateauFM_ocean",
- "Forest_deep_ocean",
- "JungleM_deep_ocean",
- "FlowerForest_deep_ocean",
- "MushroomIsland_ocean",
- "MegaTaiga_ocean",
- "StoneBeach_deep_ocean",
- "IcePlainsSpikes_deep_ocean",
- "ColdTaiga_ocean",
- "SavannaM_ocean",
- "MesaPlateauF_deep_ocean",
- "MesaBryce_deep_ocean",
- "ExtremeHills+_deep_ocean",
- "ExtremeHills_ocean",
- "MushroomIsland_deep_ocean",
- "Forest_ocean",
- "MegaTaiga_deep_ocean",
- "JungleEdge_ocean",
- "MesaBryce_ocean",
- "MegaSpruceTaiga_ocean",
- "ExtremeHills+_ocean",
- "Jungle_ocean",
- "RoofedForest_deep_ocean",
- "IcePlains_ocean",
- "FlowerForest_ocean",
- "ExtremeHills_deep_ocean",
- "MesaPlateauFM_deep_ocean",
- "Desert_ocean",
- "Taiga_ocean",
- "BirchForestM_deep_ocean",
- "Taiga_deep_ocean",
- "JungleM_ocean",
- "FlowerForest_underground",
- "JungleEdge_underground",
- "StoneBeach_underground",
- "MesaBryce_underground",
- "Mesa_underground",
- "RoofedForest_underground",
- "Jungle_underground",
- "Swampland_underground",
- "MushroomIsland_underground",
- "BirchForest_underground",
- "Plains_underground",
- "MesaPlateauF_underground",
- "ExtremeHills_underground",
- "MegaSpruceTaiga_underground",
- "BirchForestM_underground",
- "SavannaM_underground",
- "MesaPlateauFM_underground",
- "Desert_underground",
- "Savanna_underground",
- "Forest_underground",
- "SunflowerPlains_underground",
- "ColdTaiga_underground",
- "IcePlains_underground",
- "IcePlainsSpikes_underground",
- "MegaTaiga_underground",
- "Taiga_underground",
- "ExtremeHills+_underground",
- "JungleM_underground",
- "ExtremeHillsM_underground",
- "JungleEdgeM_underground",
- },
+ {}, -- no biomes, only spawn in structures
0, -- min_light
core.LIGHT_MAX+1, -- max_light
30, -- interval