From 6e2a7c8a7eda6ddca3af7bb23efa13233c7764c7 Mon Sep 17 00:00:00 2001
From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Wed, 7 Apr 2021 13:47:48 +0200
Subject: [PATCH 1/7] Make gateway enderpearl teleports easier

---
 mods/ITEMS/mcl_portals/portal_gateway.lua | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mods/ITEMS/mcl_portals/portal_gateway.lua b/mods/ITEMS/mcl_portals/portal_gateway.lua
index fd455ee766..c738da1a46 100644
--- a/mods/ITEMS/mcl_portals/portal_gateway.lua
+++ b/mods/ITEMS/mcl_portals/portal_gateway.lua
@@ -105,6 +105,11 @@ minetest.register_abm({
 		if preparing[minetest.pos_to_string(pos)] then return end
 		for _, obj in pairs(minetest.get_objects_inside_radius(pos, 1)) do
 			if obj:get_hp() > 0 then
+				local luaentity = obj:get_luaentity()
+				if luaentity and luaentity.name == "mcl_throwing:ender_pearl" then
+					obj:remove()
+					obj = luaentity._thrower
+				end
 				teleport(pos, obj)
 				return
 			end

From 61cef21cd11f5c187eae908ce57a774c954dbfb1 Mon Sep 17 00:00:00 2001
From: iliekprogrammar <iliekprogrammar@gmail.com>
Date: Wed, 7 Apr 2021 20:39:49 +0800
Subject: [PATCH 2/7] Add right-to-left statbars, for hunger and air.

---
 mods/HUD/hudbars/API.md         |  5 +++--
 mods/HUD/hudbars/init.lua       | 33 +++++++++++++++++++++------------
 mods/HUD/mcl_hbarmor/init.lua   |  2 +-
 mods/PLAYER/mcl_hunger/init.lua |  6 +++---
 4 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/mods/HUD/hudbars/API.md b/mods/HUD/hudbars/API.md
index ca6144ad1c..ee112ecebc 100644
--- a/mods/HUD/hudbars/API.md
+++ b/mods/HUD/hudbars/API.md
@@ -17,7 +17,7 @@ To give you a *very* brief overview over this API, here is the basic workflow on
 In order to use this API, you should be aware of a few basic rules in order to understand it:
 
 * A HUD bar is an approximate graphical representation of the ratio of a current value and a maximum value, i.e. current health of 15 and maximum health of 20. A full HUD bar represents 100%, an empty HUD bar represents 0%.
-* The current value must always be equal to or smaller then the maximum 
+* The current value must always be equal to or smaller then the maximum
 * Both current value and maximum must not be smaller than 0
 * Both current value and maximum must be real numbers. So no NaN, infinity, etc.
 * The HUD bar will be hidden if the maximum equals 0. This is intentional.
@@ -45,7 +45,7 @@ a vertical gradient.
 ### Icon
 A 16×16 image shown left of the HUD bar. This is optional.
 
-### `hb.register_hudbar(identifier, text_color, label, textures, default_start_value, default_start_max, default_start_hidden, format_string, format_string_config)`
+### `hb.register_hudbar(identifier, text_color, label, textures, direction, default_start_value, default_start_max, default_start_hidden, format_string, format_string_config)`
 This function registers a new custom HUD bar definition to the HUD bars mod, so it can be later used to be displayed, changed, hidden
 and unhidden on a per-player basis.
 Note this does not yet display the HUD bar.
@@ -63,6 +63,7 @@ for more information.
  * `bar`: The file name of the bar image (as string). This is only used for the `progress_bar` bar type (see `README.txt`, settings section).
  * `icon`: The file name of the icon, as string. For the `progress_bar` type, it is shown as single image left of the bar, for the two statbar bar types, it is used as the statbar icon and will be repeated. This field can be `nil`, in which case no icon will be used, but this is not recommended, because the HUD bar will be invisible if the one of the statbar bar types is used.
  * `bgicon`: The file name of the background icon, it is used as the background for the modern statbar mode only. This field can be `nil`, in which case no background icon will be displayed in this mode.
+* `direction`: Either left to right(0), or right to left(1).
 * `default_start_value`: If this HUD bar is added to a player, and no initial value is specified, this value will be used as initial current value
 * `default_max_value`: If this HUD bar is added to a player, and no initial maximum value is specified, this value will be used as initial maximum value
 * `default_start_hidden`: The HUD bar will be initially start hidden by default when added to a player. Use `hb.unhide_hudbar` to unhide it.
diff --git a/mods/HUD/hudbars/init.lua b/mods/HUD/hudbars/init.lua
index e1ff3f5f11..6f90aa03d8 100644
--- a/mods/HUD/hudbars/init.lua
+++ b/mods/HUD/hudbars/init.lua
@@ -124,7 +124,7 @@ function hb.get_hudbar_position_index(identifier)
 	end
 end
 
-function hb.register_hudbar(identifier, text_color, label, textures, default_start_value, default_start_max, default_start_hidden, format_string, format_string_config)
+function hb.register_hudbar(identifier, text_color, label, textures, direction, default_start_value, default_start_max, default_start_hidden, format_string, format_string_config)
 	minetest.log("action", "hb.register_hudbar: "..tostring(identifier))
 	local hudtable = {}
 	local pos, offset
@@ -133,30 +133,33 @@ function hb.register_hudbar(identifier, text_color, label, textures, default_sta
 	if hb.settings.alignment_pattern == "stack_up" then
 		pos = hb.settings.pos_left
 		offset = {
-			x = hb.settings.start_offset_left.x,
+			x = direction == 0 and hb.settings.start_offset_left.x or -hb.settings.start_offset_right.x,
 			y = hb.settings.start_offset_left.y - hb.settings.vmargin * index
 		}
 	elseif hb.settings.alignment_pattern == "stack_down" then
 		pos = hb.settings.pos_left
 		offset = {
-			x = hb.settings.start_offset_left.x,
+			x = direction == 0 and hb.settings.start_offset_right.x or -hb.settings.start_offset_left.x,
 			y = hb.settings.start_offset_left.y + hb.settings.vmargin * index
 		}
-	else
+	else -- zigzag
 		if index % 2 == 0 then
 			pos = hb.settings.pos_left
 			offset = {
-				x = hb.settings.start_offset_left.x,
+				-- -(24+18) = -42. using linear eq, -42 = -258m - 24.
+				x = direction == 0 and hb.settings.start_offset_left.x or (-42+24)/(-258.0) * hb.settings.start_offset_left.x - 24,
 				y = hb.settings.start_offset_left.y - hb.settings.vmargin * (index/2)
 			}
 		else
 			pos = hb.settings.pos_right
 			offset = {
-				x = hb.settings.start_offset_right.x,
+				-- 24*10+30 - 24 = 234. using linear eq, 234 = 16m - 24.
+				x = direction == 0 and hb.settings.start_offset_right.x or (234+24)/(16) * hb.settings.start_offset_right.x - 24,
 				y = hb.settings.start_offset_right.y - hb.settings.vmargin * ((index-1)/2)
 			}
 		end
 	end
+
 	if format_string == nil then
 		format_string = N("@1: @2/@3")
 	end
@@ -181,6 +184,7 @@ function hb.register_hudbar(identifier, text_color, label, textures, default_sta
 		local state = {}
 		local name = player:get_player_name()
 		local bgscale, iconscale, text, barnumber, bgiconnumber
+
 		if start_max == 0 or start_hidden then
 			bgscale = { x=0, y=0 }
 		else
@@ -197,6 +201,7 @@ function hb.register_hudbar(identifier, text_color, label, textures, default_sta
 			bgiconnumber = hb.settings.statbar_length
 			text = make_label(format_string, format_string_config, label, start_value, start_max)
 		end
+
 		if hb.settings.bar_type == "progress_bar" then
 			ids.bg = player:hud_add({
 				hud_elem_type = "image",
@@ -219,6 +224,7 @@ function hb.register_hudbar(identifier, text_color, label, textures, default_sta
 				})
 			end
 		end
+
 		local bar_image, bgicon, bar_size
 		if hb.settings.bar_type == "progress_bar" then
 			bar_image = textures.bar
@@ -234,10 +240,12 @@ function hb.register_hudbar(identifier, text_color, label, textures, default_sta
 			bgicon = textures.bgicon
 			bar_size = {x=24, y=24}
 		end
+
 		local text2
 		if hb.settings.bar_type == "statbar_modern" then
 			text2 = bgicon
 		end
+
 		ids.bar = player:hud_add({
 			hud_elem_type = "statbar",
 			position = pos,
@@ -247,7 +255,7 @@ function hb.register_hudbar(identifier, text_color, label, textures, default_sta
 			item = bgiconnumber,
 			alignment = {x=-1,y=-1},
 			offset = offset,
-			direction = 0,
+			direction = direction,
 			size = bar_size,
 			z_index = 1,
 		})
@@ -258,7 +266,7 @@ function hb.register_hudbar(identifier, text_color, label, textures, default_sta
 				text = text,
 				alignment = {x=1,y=1},
 				number = text_color,
-				direction = 0,
+				direction = direction,
 				offset = { x = offset.x + 2,  y = offset.y - 1},
 				z_index = 2,
 		})
@@ -298,7 +306,7 @@ function hb.register_hudbar(identifier, text_color, label, textures, default_sta
 	hudtable.default_start_max = default_start_max
 
 	hb.hudbars_count= hb.hudbars_count + 1
-	
+
 	hb.hudtables[identifier] = hudtable
 end
 
@@ -359,6 +367,7 @@ function hb.change_hudbar(player, identifier, new_value, new_max_value, new_icon
 		if new_text_color ~= nil then
 			player:hud_change(hudtable.hudids[name].text, "number", new_text_color)
 		end
+
 	else
 		if new_icon ~= nil and hudtable.hudids[name].bar ~= nil then
 			player:hud_change(hudtable.hudids[name].bar, "text", new_icon)
@@ -474,8 +483,8 @@ end
 
 --register built-in HUD bars
 if minetest.settings:get_bool("enable_damage") or hb.settings.forceload_default_hudbars then
-	hb.register_hudbar("health", 0xFFFFFF, S("Health"), { bar = "hudbars_bar_health.png", icon = "hudbars_icon_health.png", bgicon = "hudbars_bgicon_health.png" }, 20, 20, false)
-	hb.register_hudbar("breath", 0xFFFFFF, S("Breath"), { bar = "hudbars_bar_breath.png", icon = "hudbars_icon_breath.png", bgicon = "hudbars_bgicon_breath.png" }, 10, 10, true)
+	hb.register_hudbar("health", 0xFFFFFF, S("Health"), { bar = "hudbars_bar_health.png", icon = "hudbars_icon_health.png", bgicon = "hudbars_bgicon_health.png" }, 0, 20, 20, false)
+	hb.register_hudbar("breath", 0xFFFFFF, S("Breath"), { bar = "hudbars_bar_breath.png", icon = "hudbars_icon_breath.png", bgicon = "hudbars_bgicon_breath.png" }, 1, 10, 10, true)
 end
 
 local function hide_builtin(player)
@@ -520,7 +529,7 @@ local function update_hud(player, has_damage)
 		--air
 		local breath_max = player:get_properties().breath_max
 		local breath = player:get_breath()
-		
+
 		if breath >= breath_max and hb.settings.autohide_breath == true then
 			hb.hide_hudbar(player, "breath")
 		else
diff --git a/mods/HUD/mcl_hbarmor/init.lua b/mods/HUD/mcl_hbarmor/init.lua
index 4434f5dad2..89b2db7a89 100644
--- a/mods/HUD/mcl_hbarmor/init.lua
+++ b/mods/HUD/mcl_hbarmor/init.lua
@@ -57,7 +57,7 @@ local function custom_hud(player)
 end
 
 --register and define armor HUD bar
-hb.register_hudbar("armor", 0xFFFFFF, S("Armor"), { icon = "hbarmor_icon.png", bgicon = "hbarmor_bgicon.png", bar = "hbarmor_bar.png" }, 0, 20, mcl_hbarmor.autohide)
+hb.register_hudbar("armor", 0xFFFFFF, S("Armor"), { icon = "hbarmor_icon.png", bgicon = "hbarmor_bgicon.png", bar = "hbarmor_bar.png" }, 0, 0, 20, mcl_hbarmor.autohide)
 
 function mcl_hbarmor.get_armor(player)
 	if not player or not armor.def then
diff --git a/mods/PLAYER/mcl_hunger/init.lua b/mods/PLAYER/mcl_hunger/init.lua
index 5ae45591c2..b640dfdc9b 100644
--- a/mods/PLAYER/mcl_hunger/init.lua
+++ b/mods/PLAYER/mcl_hunger/init.lua
@@ -89,10 +89,10 @@ function mcl_hunger.update_exhaustion_hud(player, exhaustion)
 end
 
 -- register saturation hudbar
-hb.register_hudbar("hunger", 0xFFFFFF, S("Food"), { icon = "hbhunger_icon.png", bgicon = "hbhunger_bgicon.png",  bar = "hbhunger_bar.png" }, 20, 20, false)
+hb.register_hudbar("hunger", 0xFFFFFF, S("Food"), { icon = "hbhunger_icon.png", bgicon = "hbhunger_bgicon.png",  bar = "hbhunger_bar.png" }, 1, 20, 20, false)
 if mcl_hunger.debug then
-	hb.register_hudbar("saturation", 0xFFFFFF, S("Saturation"), { icon = "mcl_hunger_icon_saturation.png", bgicon = "mcl_hunger_bgicon_saturation.png", bar = "mcl_hunger_bar_saturation.png" }, mcl_hunger.SATURATION_INIT, 200, false, S("%s: %.1f/%d"))
-	hb.register_hudbar("exhaustion", 0xFFFFFF, S("Exhaust."), { icon = "mcl_hunger_icon_exhaustion.png", bgicon = "mcl_hunger_bgicon_exhaustion.png", bar = "mcl_hunger_bar_exhaustion.png" }, 0, mcl_hunger.EXHAUST_LVL, false, S("%s: %d/%d"))
+	hb.register_hudbar("saturation", 0xFFFFFF, S("Saturation"), { icon = "mcl_hunger_icon_saturation.png", bgicon = "mcl_hunger_bgicon_saturation.png", bar = "mcl_hunger_bar_saturation.png" }, 1, mcl_hunger.SATURATION_INIT, 200, false, S("%s: %.1f/%d"))
+	hb.register_hudbar("exhaustion", 0xFFFFFF, S("Exhaust."), { icon = "mcl_hunger_icon_exhaustion.png", bgicon = "mcl_hunger_bgicon_exhaustion.png", bar = "mcl_hunger_bar_exhaustion.png" }, 1, 0, mcl_hunger.EXHAUST_LVL, false, S("%s: %d/%d"))
 end
 
 minetest.register_on_joinplayer(function(player)

From 3449b3eb7c9dbb49ca4ecfc207d5038091ed4197 Mon Sep 17 00:00:00 2001
From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Wed, 7 Apr 2021 16:47:14 +0200
Subject: [PATCH 3/7] Improve bossbars API

---
 mods/HUD/mcl_bossbars/init.lua | 57 +++++++++++++++++++++++++++++-----
 1 file changed, 50 insertions(+), 7 deletions(-)

diff --git a/mods/HUD/mcl_bossbars/init.lua b/mods/HUD/mcl_bossbars/init.lua
index 38dbbe3762..6a33523386 100644
--- a/mods/HUD/mcl_bossbars/init.lua
+++ b/mods/HUD/mcl_bossbars/init.lua
@@ -1,6 +1,7 @@
 mcl_bossbars = {
 	bars = {},
 	huds = {},
+	static = {},
 	colors = {"light_purple", "blue", "red", "green", "yellow", "dark_purple", "white"},
 }
 
@@ -27,21 +28,52 @@ function mcl_bossbars.recalculate_colors()
 	mcl_bossbars.colors_sorted = sorted
 end
 
-function mcl_bossbars.update_bar(player, text, color, percentage)
+local function get_color_info(color, percentage)
 	local cdef = mcl_bossbars.colors_sorted[color]
-	table.insert(mcl_bossbars.bars[player:get_player_name()], {color = cdef.hex, text = text, image = string.format(cdef.image, percentage)})
+	return cdef.hex, string.format(cdef.image, percentage)
+end
+
+local last_id = 0
+
+function mcl_bossbars.add_bar(player, def)
+	local name = player:get_player_name()
+	local bar = {text = def.text}
+	bar.color, bar.image = get_color_info(def.color, def.percentage)
+	table.insert(mcl_bossbars.bars[name], bar)
+	if not def.dynamic then
+		bar.raw_color = def.color
+		bar.id = last_id + 1
+		last_id = bar.id
+		mcl_bossbars.static[bar.id] = bar
+		return id
+	end
+end
+
+function mcl_bossbars.remove_bar(id)
+	mcl_bossbars.static[id].bar.static = false
+	mcl_bossbars.static[id] = nil
+end
+
+function mcl_bossbars.update_bar(id, def)
+	local old = mcl_bossbars.static[id]
+	old.color = get_color_info(def.color or old.raw_color, def.percentage or old.percentage)
+	old.text = def.text or old.text
 end
 
 function mcl_bossbars.update_boss(luaentity, name, color)
 	local object = luaentity.object
-	local text = luaentity.nametag
-	if not text or text == "" then
-		text = name
+	local bardef = {
+		text = luaentity.nametag,
+		percentage = math.floor(luaentity.health / luaentity.hp_max * 100),
+		color = color,
+		dynamic = true,
+	}
+	if not bardef.text or bardef.text == "" then
+		bardef.text = name
 	end
-	local percentage = math.floor(luaentity.health / luaentity.hp_max * 100)
 	for _, obj in pairs(minetest.get_objects_inside_radius(object:get_pos(), 128)) do
 		if obj:is_player() then
-			mcl_bossbars.update_bar(obj, text, color, percentage)
+			mcl_bossbars.add_bar(obj, bardef)
 		end
 	end
 end
@@ -55,6 +87,11 @@ end)
 minetest.register_on_leaveplayer(function(player)
 	local name = player:get_player_name()
 	mcl_bossbars.huds[name] = nil
+	for _, bar in pairs(mcl_bossbars.bars[name]) do
+		if bar.id then
+			mcl_bossbars.static[bar.id] = nil
+		end
+	end
 	mcl_bossbars.bars[name] = nil
 end)
 
@@ -64,12 +101,17 @@ minetest.register_globalstep(function()
 		local bars = mcl_bossbars.bars[name]
 		local huds = mcl_bossbars.huds[name]
 		local huds_new = {}
+		local bars_new = {}
 		local i = 0
 
 		while #huds > 0 or #bars > 0 do
 			local bar = table.remove(bars, 1)
 			local hud = table.remove(huds, 1)
 
+			if bar and bar.id then
+				table.insert(bars_new, bar)
+			end
+
 			if bar and not hud then
 				hud = {
 					color = bar.color,
@@ -118,6 +160,7 @@ minetest.register_globalstep(function()
 		end
 
 		mcl_bossbars.huds[name] = huds_new
+		mcl_bossbars.bars[name] = bars_new
 	end
 end)
 

From f282cd0c4dacb56c2b578d4d6d26e0214602fe5c Mon Sep 17 00:00:00 2001
From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Wed, 7 Apr 2021 16:56:21 +0200
Subject: [PATCH 4/7] Allow bossbars to be grouped

---
 mods/HUD/mcl_bossbars/init.lua | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/mods/HUD/mcl_bossbars/init.lua b/mods/HUD/mcl_bossbars/init.lua
index 6a33523386..504fc3aefb 100644
--- a/mods/HUD/mcl_bossbars/init.lua
+++ b/mods/HUD/mcl_bossbars/init.lua
@@ -37,9 +37,23 @@ local last_id = 0
 
 function mcl_bossbars.add_bar(player, def)
 	local name = player:get_player_name()
+	local bars = mcl_bossbars.bars[name]
 	local bar = {text = def.text}
 	bar.color, bar.image = get_color_info(def.color, def.percentage)
-	table.insert(mcl_bossbars.bars[name], bar)
+	if def.dynamic then
+		for _, other in pairs(bars) do
+			if not other.id and other.color == bar.color and (other.original_text or other.text) == bar.text and other.image == bar.image then
+				if not other.count then
+					other.count = 1
+					other.original_text = other.text
+				end
+				other.count = other.count + 1
+				other.text = other.original_text .. " x" .. other.count
+				return
+			end
+		end
+	end
+	table.insert(bars, bar)
 	if not def.dynamic then
 		bar.raw_color = def.color
 		bar.id = last_id + 1

From 567f157541973b3034e44ae1bbb730177b652539 Mon Sep 17 00:00:00 2001
From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Wed, 7 Apr 2021 17:02:03 +0200
Subject: [PATCH 5/7] Add a bossbar limit setting

---
 mods/HUD/mcl_bossbars/init.lua | 43 ++++++++++++++++++----------------
 settingtypes.txt               |  3 +++
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/mods/HUD/mcl_bossbars/init.lua b/mods/HUD/mcl_bossbars/init.lua
index 504fc3aefb..3ba0bd7558 100644
--- a/mods/HUD/mcl_bossbars/init.lua
+++ b/mods/HUD/mcl_bossbars/init.lua
@@ -3,6 +3,7 @@ mcl_bossbars = {
 	huds = {},
 	static = {},
 	colors = {"light_purple", "blue", "red", "green", "yellow", "dark_purple", "white"},
+	max_bars = tonumber(minetest.settings:get("max_bossbars")) or 6
 }
 
 function mcl_bossbars.recalculate_colors()
@@ -127,27 +128,29 @@ minetest.register_globalstep(function()
 			end
 
 			if bar and not hud then
-				hud = {
-					color = bar.color,
-					image = bar.image,
-					text = bar.text,
-					text_id = player:hud_add({
-						hud_elem_type = "text",
+				if i < mcl_bossbars.max_bars then
+					hud = {
+						color = bar.color,
+						image = bar.image,
 						text = bar.text,
-						number = bar.color,
-						position = {x = 0.5, y = 0},
-						alignment = {x = 0, y = 1},
-						offset = {x = 0, y = i * 40},
-					}),
-					image_id = player:hud_add({
-						hud_elem_type = "image",
-						text = bar.image,
-						position = {x = 0.5, y = 0},
-						alignment = {x = 0, y = 1},
-						offset = {x = 0, y = i * 40 + 25},
-						scale = {x = 3, y = 3},
-					}),
-				}
+						text_id = player:hud_add({
+							hud_elem_type = "text",
+							text = bar.text,
+							number = bar.color,
+							position = {x = 0.5, y = 0},
+							alignment = {x = 0, y = 1},
+							offset = {x = 0, y = i * 40},
+						}),
+						image_id = player:hud_add({
+							hud_elem_type = "image",
+							text = bar.image,
+							position = {x = 0.5, y = 0},
+							alignment = {x = 0, y = 1},
+							offset = {x = 0, y = i * 40 + 25},
+							scale = {x = 3, y = 3},
+						}),
+					}
+				end
 			elseif hud and not bar then
 				player:hud_remove(hud.text_id)
 				player:hud_remove(hud.image_id)
diff --git a/settingtypes.txt b/settingtypes.txt
index 67e686d1eb..4ba6034eb5 100644
--- a/settingtypes.txt
+++ b/settingtypes.txt
@@ -97,6 +97,9 @@ animated_chests (Animated chests) bool true
 # Whether to preview the player in inventory in 3D (requires Minetest 5.4)
 3d_player_preview (3D Player preview) bool true
 
+# The maximum number of boss bars to simultaniously display on the screen
+max_bossbars (Maximum Boss bars) int 6
+
 [Experimental]
 # Whether ice is translucent. If disabled, ice is fully opaque.
 #

From 6a1a634cba4e0530a4cb72cf319f203f4a770d7f Mon Sep 17 00:00:00 2001
From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Wed, 7 Apr 2021 17:20:56 +0200
Subject: [PATCH 6/7] Revert "Merge pull request 'Massively overhaul spawning
 algorithm for mobs' (#1487) from jordan4ibanez/MineClone2-MobTweaks:master
 into master"

This reverts commit 4f2a6b2db001b98abd99e32e531aedc243118161, reversing
changes made to 0970981252e32901b18ce00fa7498507818c0245.
---
 mods/ENTITIES/mcl_mobs/api.lua             | 255 +--------------------
 mods/ENTITIES/mobs_mc/agent.lua            |   2 +-
 mods/ENTITIES/mobs_mc/bat.lua              |   2 +-
 mods/ENTITIES/mobs_mc/blaze.lua            |   4 +-
 mods/ENTITIES/mobs_mc/chicken.lua          |   2 +-
 mods/ENTITIES/mobs_mc/cow+mooshroom.lua    |   5 +-
 mods/ENTITIES/mobs_mc/creeper.lua          |   7 +-
 mods/ENTITIES/mobs_mc/enderman.lua         |   6 +-
 mods/ENTITIES/mobs_mc/ghast.lua            |   2 +-
 mods/ENTITIES/mobs_mc/guardian_elder.lua   |   2 +-
 mods/ENTITIES/mobs_mc/horse.lua            |   4 +-
 mods/ENTITIES/mobs_mc/llama.lua            |   2 +-
 mods/ENTITIES/mobs_mc/ocelot.lua           |   8 +-
 mods/ENTITIES/mobs_mc/parrot.lua           |   4 +-
 mods/ENTITIES/mobs_mc/pig.lua              |   2 +-
 mods/ENTITIES/mobs_mc/polar_bear.lua       |   2 +-
 mods/ENTITIES/mobs_mc/rabbit.lua           |   6 +-
 mods/ENTITIES/mobs_mc/sheep.lua            |   2 +-
 mods/ENTITIES/mobs_mc/shulker.lua          |   2 +-
 mods/ENTITIES/mobs_mc/skeleton+stray.lua   |   6 +-
 mods/ENTITIES/mobs_mc/skeleton_wither.lua  |   2 +-
 mods/ENTITIES/mobs_mc/slime+magma_cube.lua |  18 +-
 mods/ENTITIES/mobs_mc/spider.lua           |   2 +-
 mods/ENTITIES/mobs_mc/squid.lua            |   2 +-
 mods/ENTITIES/mobs_mc/villager.lua         |   2 +-
 mods/ENTITIES/mobs_mc/villager_zombie.lua  |   4 +-
 mods/ENTITIES/mobs_mc/witch.lua            |   2 +-
 mods/ENTITIES/mobs_mc/wolf.lua             |   2 +-
 mods/ENTITIES/mobs_mc/zombie.lua           |   8 +-
 mods/ENTITIES/mobs_mc/zombiepig.lua        |   6 +-
 30 files changed, 57 insertions(+), 316 deletions(-)

diff --git a/mods/ENTITIES/mcl_mobs/api.lua b/mods/ENTITIES/mcl_mobs/api.lua
index d856334214..94d6340ea3 100644
--- a/mods/ENTITIES/mcl_mobs/api.lua
+++ b/mods/ENTITIES/mcl_mobs/api.lua
@@ -3562,7 +3562,7 @@ local mob_step = function(self, dtime)
 	end
 
 	-- mob plays random sound at times
-	if random(1, 70) == 1 then
+	if random(1, 100) == 1 then
 		mob_sound(self, "random", true)
 	end
 
@@ -3925,35 +3925,7 @@ end
 end -- END mobs:register_mob function
 
 
-
-
-
-
-
-
-
-
-
-
-
---BEGIN SPAWNING ALGORITHM
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 -- count how many mobs of one type are inside an area
---[[
 local count_mobs = function(pos, mobtype)
 
 	local num = 0
@@ -3997,7 +3969,7 @@ local count_mobs = function(pos, mobtype)
 
 	return num
 end
-]]--
+
 
 -- global functions
 
@@ -4007,49 +3979,9 @@ function mobs:spawn_abm_check(pos, node, name)
 end
 
 
---[[
-	Custom elements changed:
-name:
-the mobs name
+function mobs:spawn_specific(name, nodes, neighbors, min_light, max_light,
+	interval, chance, aoc, min_height, max_height, day_toggle, on_spawn)
 
-dimension: 
-"overworld"
-"nether"
-"end"
-
-types of spawning:
-"air"
-"water"
-"ground"
-"lava"
-
-what is aoc???
-
-WARNING: BIOME INTEGRATION NEEDED -> How to get biome through lua??
-]]--
-
---this is where all of the spawning information is kept
-local spawn_dictionary = {
-	["overworld"] = {},
-	["nether"] = {},
-	["end"] = {}
-}
-
-function mobs:spawn_specific(
-	name,
-	dimension,
-	type_of_spawning, 
-	min_light, 
-	max_light, 
-	interval, 
-	chance, 
-	aoc, 
-	min_height, 
-	max_height, 
-	day_toggle, 
-	on_spawn)
-
-	
 	-- Do mobs spawn at all?
 	if not mobs_spawn then
 		return
@@ -4070,6 +4002,7 @@ function mobs:spawn_specific(
 
 		minetest.log("action",
 			string.format("[mobs] Chance setting for %s changed to %s (total: %s)", name, chance, aoc))
+
 	end
 
 	local spawn_action
@@ -4234,24 +4167,6 @@ function mobs:spawn_specific(
 		spawn_action(pos, node, active_object_count, active_object_count_wider, name)
 	end
 
-
-	--load information into the spawn dictionary
-	local key = #spawn_dictionary[dimension] + 1
-
-	spawn_dictionary[dimension][key] = {}
-	spawn_dictionary[dimension][key]["name"]       = name
-	spawn_dictionary[dimension][key]["type"]       = type_of_spawning
-	spawn_dictionary[dimension][key]["min_light"]  = min_light
-	spawn_dictionary[dimension][key]["max_light"]  = max_light
-	spawn_dictionary[dimension][key]["interval"]   = interval
-	spawn_dictionary[dimension][key]["chance"]     = chance
-	spawn_dictionary[dimension][key]["aoc"]        = aoc
-	spawn_dictionary[dimension][key]["min_height"] = min_height
-	spawn_dictionary[dimension][key]["max_height"] = max_height
-	spawn_dictionary[dimension][key]["day_toggle"] = day_toggle
-	spawn_dictionary[dimension][key]["on_spawn"]   = spawn_abm_action
-	
-	--[[
 	minetest.register_abm({
 		label = name .. " spawning",
 		nodenames = nodes,
@@ -4261,24 +4176,18 @@ function mobs:spawn_specific(
 		catch_up = false,
 		action = spawn_abm_action,
 	})
-	]]--
 end
 
 
 -- compatibility with older mob registration
--- we're going to forget about this for now -j4i
---[[
 function mobs:register_spawn(name, nodes, max_light, min_light, chance, active_object_count, max_height, day_toggle)
 
 	mobs:spawn_specific(name, nodes, {"air"}, min_light, max_light, 30,
 		chance, active_object_count, -31000, max_height, day_toggle)
 end
-]]--
 
 
---I'm not sure what this does but disabling it doesn't cause a crash -j4i
 -- MarkBu's spawn function
---[[
 function mobs:spawn(def)
 
 	local name = def.name
@@ -4297,160 +4206,6 @@ function mobs:spawn(def)
 	mobs:spawn_specific(name, nodes, neighbors, min_light, max_light, interval,
 		chance, active_object_count, min_height, max_height, day_toggle, on_spawn)
 end
-]]--
-
-
-local axis
---inner and outer part of square donut radius
-local inner = 1
-local outer = 70
-local int = {-1,1}
-local position_calculation = function(pos)
-
-	pos = vector.floor(pos)
-
-	--this is used to determine the axis buffer from the player
-	axis = math.random(0,1)
-
-	--cast towards the direction
-	if axis == 0 then --x
-		pos.x = pos.x + math.random(inner,outer)*int[math.random(1,2)]
-		pos.z = pos.z + math.random(-outer,outer)
-	else --z
-		pos.z = pos.z + math.random(inner,outer)*int[math.random(1,2)]
-		pos.x = pos.x + math.random(-outer,outer)
-	end
-	return(pos)
-end
-
---[[
-local decypher_limits_dictionary = {
-	["overworld"] = {mcl_vars.mg_overworld_min,mcl_vars.mg_overworld_max},
-	["nether"]    = {mcl_vars.mg_nether_min,   mcl_vars.mg_nether_max},
-	["end"]       = {mcl_vars.mg_end_min,      mcl_vars.mg_end_max}
-}
-]]--
-
-local function decypher_limits(posy)
-	--local min_max_table = decypher_limits_dictionary[dimension]
-	--return min_max_table[1],min_max_table[2]
-	posy = math.floor(posy)
-	return posy - 32, posy + 32
-end
-
-
---todo mob limiting
---MAIN LOOP
-local timer = 0
-minetest.register_globalstep(function(dtime)
-	timer = timer + dtime
-	if timer >= 15 then
-		timer = 0
-		for _,player in ipairs(minetest.get_connected_players()) do
-			for i = 1,math.random(5) do
-				local player_pos = player:get_pos()
-				local _,dimension = mcl_worlds.y_to_layer(player_pos.y)
-				local min,max = decypher_limits(player_pos.y)
-
-				local goal_pos = position_calculation(player_pos)
-				
-
-				local mob_def = spawn_dictionary[dimension][math.random(1,#spawn_dictionary[dimension])]
-
-				if not mob_def then --to catch a crazy error if it ever happens
-					minetest.log("error", "WARNING!! mob spawning attempted to index a NIL mob!")
-					goto continue
-				end
-
-				if mob_def.type == "ground" then
-
-					local spawning_position_list = minetest.find_nodes_in_area_under_air(vector.new(goal_pos.x,min,goal_pos.z), vector.new(goal_pos.x,max,goal_pos.z), {"group:solid"})
-
-					if #spawning_position_list <= 0 then
-						goto continue
-					end
-					
-					local spawning_position = spawning_position_list[math.random(1,#spawning_position_list)]
-
-					spawning_position.y = spawning_position.y + 1
-
-					local gotten_light = minetest.get_node_light(spawning_position)
-
-					if gotten_light and gotten_light >= mob_def.min_light and gotten_light <= mob_def.max_light then
-						minetest.add_entity(spawning_position, mob_def.name)
-					end
-				elseif mob_def.type == "air" then
-					local spawning_position_list = minetest.find_nodes_in_area(vector.new(goal_pos.x,min,goal_pos.z), vector.new(goal_pos.x,max,goal_pos.z), {"air"})
-
-					if #spawning_position_list <= 0 then
-						goto continue
-					end
-					
-					local spawning_position = spawning_position_list[math.random(1,#spawning_position_list)]
-
-					local gotten_light = minetest.get_node_light(spawning_position)
-
-					if gotten_light and gotten_light >= mob_def.min_light and gotten_light <= mob_def.max_light then
-						minetest.add_entity(spawning_position, mob_def.name)
-					end
-				elseif mob_def.type == "water" then
-					local spawning_position_list = minetest.find_nodes_in_area(vector.new(goal_pos.x,min,goal_pos.z), vector.new(goal_pos.x,max,goal_pos.z), {"group:water"})
-
-					if #spawning_position_list <= 0 then
-						goto continue
-					end
-					
-					local spawning_position = spawning_position_list[math.random(1,#spawning_position_list)]
-
-					local gotten_light = minetest.get_node_light(spawning_position)
-
-					if gotten_light and gotten_light >= mob_def.min_light and gotten_light <= mob_def.max_light then
-						minetest.add_entity(spawning_position, mob_def.name)
-					end
-				--elseif mob_def.type == "lava" then
-					--implement later
-				end
-				--local spawn minetest.find_nodes_in_area_under_air(vector.new(pos.x,pos.y-find_node_height,pos.z), vector.new(pos.x,pos.y+find_node_height,pos.z), {"group:solid"})
-
-
-				::continue:: --this is a safety catch
-			end
-		end
-	end
-end)
-
-
-
-
-
-
-
-
-
-
-
-
-
---END SPAWNING ALGORITHM
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 -- register arrow for shoot attack
diff --git a/mods/ENTITIES/mobs_mc/agent.lua b/mods/ENTITIES/mobs_mc/agent.lua
index cc9910ee6d..8fa7314cf2 100644
--- a/mods/ENTITIES/mobs_mc/agent.lua
+++ b/mods/ENTITIES/mobs_mc/agent.lua
@@ -1,5 +1,5 @@
 --###################
---################### AGENT - seemingly unused
+--################### AGENT
 --###################
 
 local S = minetest.get_translator("mobs_mc")
diff --git a/mods/ENTITIES/mobs_mc/bat.lua b/mods/ENTITIES/mobs_mc/bat.lua
index b6825bbbf4..103579b67f 100644
--- a/mods/ENTITIES/mobs_mc/bat.lua
+++ b/mods/ENTITIES/mobs_mc/bat.lua
@@ -64,7 +64,7 @@ else
 end
 
 -- Spawn on solid blocks at or below Sea level and the selected light level
-mobs:spawn_specific("mobs_mc:bat", "overworld", "air", 0, maxlight, 20, 5000, 2, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.water-1)
+mobs:spawn_specific("mobs_mc:bat", mobs_mc.spawn.solid, {"air"}, 0, maxlight, 20, 5000, 2, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.water-1)
 
 
 -- spawn eggs
diff --git a/mods/ENTITIES/mobs_mc/blaze.lua b/mods/ENTITIES/mobs_mc/blaze.lua
index d56acdf380..fbffa79200 100644
--- a/mods/ENTITIES/mobs_mc/blaze.lua
+++ b/mods/ENTITIES/mobs_mc/blaze.lua
@@ -1,6 +1,6 @@
 -- daufinsyd
 -- My work is under the LGPL terms
--- Model and mobs_blaze.png see https://github.com/22i/minecraft-voxel-blender-models -hi 22i ~jordan4ibanez
+-- Model and mobs_blaze.png see https://github.com/22i/minecraft-voxel-blender-models
 -- blaze.lua partial copy of mobs_mc/ghast.lua
 
 local S = minetest.get_translator("mobs_mc")
@@ -128,7 +128,7 @@ mobs:register_mob("mobs_mc:blaze", {
 	end,
 })
 
-mobs:spawn_specific("mobs_mc:blaze", "nether", "ground", 0, minetest.LIGHT_MAX+1, 30, 5000, 3, mobs_mc.spawn_height.nether_min, mobs_mc.spawn_height.nether_max)
+mobs:spawn_specific("mobs_mc:blaze", mobs_mc.spawn.nether_fortress, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 5000, 3, mobs_mc.spawn_height.nether_min, mobs_mc.spawn_height.nether_max)
 
 -- Blaze fireball
 mobs:register_arrow("mobs_mc:blaze_fireball", {
diff --git a/mods/ENTITIES/mobs_mc/chicken.lua b/mods/ENTITIES/mobs_mc/chicken.lua
index 397b6b8da0..325371e2b2 100644
--- a/mods/ENTITIES/mobs_mc/chicken.lua
+++ b/mods/ENTITIES/mobs_mc/chicken.lua
@@ -100,7 +100,7 @@ mobs:register_mob("mobs_mc:chicken", {
 })
 
 --spawn
-mobs:spawn_specific("mobs_mc:chicken", "overworld", "ground", 9, minetest.LIGHT_MAX+1, 30, 17000, 3, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
+mobs:spawn_specific("mobs_mc:chicken", mobs_mc.spawn.grassland, {"air"}, 9, minetest.LIGHT_MAX+1, 30, 17000, 3, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
 
 -- spawn eggs
 mobs:register_egg("mobs_mc:chicken", S("Chicken"), "mobs_mc_spawn_icon_chicken.png", 0)
diff --git a/mods/ENTITIES/mobs_mc/cow+mooshroom.lua b/mods/ENTITIES/mobs_mc/cow+mooshroom.lua
index a094d6d355..005af29807 100644
--- a/mods/ENTITIES/mobs_mc/cow+mooshroom.lua
+++ b/mods/ENTITIES/mobs_mc/cow+mooshroom.lua
@@ -145,9 +145,8 @@ mobs:register_mob("mobs_mc:mooshroom", mooshroom_def)
 
 
 -- Spawning
-mobs:spawn_specific("mobs_mc:cow", "overworld", "ground", 9, minetest.LIGHT_MAX+1, 30, 17000, 10, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
---WARNING: THIS NEEDS A BIOME INTEGRATION
-mobs:spawn_specific("mobs_mc:mooshroom", "overworld", "ground", 9, minetest.LIGHT_MAX+1, 30, 17000, 5, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
+mobs:spawn_specific("mobs_mc:cow", mobs_mc.spawn.grassland, {"air"}, 9, minetest.LIGHT_MAX+1, 30, 17000, 10, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
+mobs:spawn_specific("mobs_mc:mooshroom", mobs_mc.spawn.mushroom_island, {"air"}, 9, minetest.LIGHT_MAX+1, 30, 17000, 5, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
 
 -- spawn egg
 mobs:register_egg("mobs_mc:cow", S("Cow"), "mobs_mc_spawn_icon_cow.png", 0)
diff --git a/mods/ENTITIES/mobs_mc/creeper.lua b/mods/ENTITIES/mobs_mc/creeper.lua
index f1f0a3ef69..de44ba8c60 100644
--- a/mods/ENTITIES/mobs_mc/creeper.lua
+++ b/mods/ENTITIES/mobs_mc/creeper.lua
@@ -39,8 +39,6 @@ mobs:register_mob("mobs_mc:creeper", {
 	runaway_from = { "mobs_mc:ocelot", "mobs_mc:cat" },
 	attack_type = "explode",
 
-	--hssssssssssss
-
 	explosion_strength = 3,
 	explosion_radius = 3.5,
 	explosion_damage_radius = 3.5,
@@ -140,9 +138,6 @@ mobs:register_mob("mobs_mc:creeper_charged", {
 	pathfinding = 1,
 	visual = "mesh",
 	mesh = "mobs_mc_creeper.b3d",
-
-	--BOOM
-	
 	textures = {
 		{"mobs_mc_creeper.png",
 		"mobs_mc_creeper_charge.png"},
@@ -253,7 +248,7 @@ mobs:register_mob("mobs_mc:creeper_charged", {
 	glow = 3,
 })
 
-mobs:spawn_specific("mobs_mc:creeper", "overworld", "ground", 0, 7, 20, 16500, 2, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
+mobs:spawn_specific("mobs_mc:creeper", mobs_mc.spawn.solid, {"air"}, 0, 7, 20, 16500, 2, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
 
 -- spawn eggs
 mobs:register_egg("mobs_mc:creeper", S("Creeper"), "mobs_mc_spawn_icon_creeper.png", 0)
diff --git a/mods/ENTITIES/mobs_mc/enderman.lua b/mods/ENTITIES/mobs_mc/enderman.lua
index ca3bc84cea..f93f131cb8 100644
--- a/mods/ENTITIES/mobs_mc/enderman.lua
+++ b/mods/ENTITIES/mobs_mc/enderman.lua
@@ -562,11 +562,11 @@ mobs:register_mob("mobs_mc:enderman", {
 
 
 -- End spawn
-mobs:spawn_specific("mobs_mc:enderman", "end", "ground", 0, minetest.LIGHT_MAX+1, 30, 3000, 12, mobs_mc.spawn_height.end_min, mobs_mc.spawn_height.end_max)
+mobs:spawn_specific("mobs_mc:enderman", mobs_mc.spawn.solid, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 3000, 12, mobs_mc.spawn_height.end_min, mobs_mc.spawn_height.end_max)
 -- Overworld spawn
-mobs:spawn_specific("mobs_mc:enderman", "overworld", "ground", 0, 7, 30, 19000, 2, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
+mobs:spawn_specific("mobs_mc:enderman", mobs_mc.spawn.solid, {"air"}, 0, 7, 30, 19000, 2, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
 -- Nether spawn (rare)
-mobs:spawn_specific("mobs_mc:enderman", "nether", "ground", 0, 7, 30, 27500, 4, mobs_mc.spawn_height.nether_min, mobs_mc.spawn_height.nether_max)
+mobs:spawn_specific("mobs_mc:enderman", mobs_mc.spawn.solid, {"air"}, 0, 7, 30, 27500, 4, mobs_mc.spawn_height.nether_min, mobs_mc.spawn_height.nether_max)
 
 -- spawn eggs
 mobs:register_egg("mobs_mc:enderman", S("Enderman"), "mobs_mc_spawn_icon_enderman.png", 0)
diff --git a/mods/ENTITIES/mobs_mc/ghast.lua b/mods/ENTITIES/mobs_mc/ghast.lua
index e2f6b13692..7aed9395e1 100644
--- a/mods/ENTITIES/mobs_mc/ghast.lua
+++ b/mods/ENTITIES/mobs_mc/ghast.lua
@@ -75,7 +75,7 @@ mobs:register_mob("mobs_mc:ghast", {
 })
 
 
-mobs:spawn_specific("mobs_mc:ghast", "nether", "air", 0, minetest.LIGHT_MAX+1, 30, 18000, 2, mobs_mc.spawn_height.nether_min, mobs_mc.spawn_height.nether_max)
+mobs:spawn_specific("mobs_mc:ghast", mobs_mc.spawn.nether, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 18000, 2, mobs_mc.spawn_height.nether_min, mobs_mc.spawn_height.nether_max)
 
 -- fireball (projectile)
 mobs:register_arrow("mobs_mc:fireball", {
diff --git a/mods/ENTITIES/mobs_mc/guardian_elder.lua b/mods/ENTITIES/mobs_mc/guardian_elder.lua
index 089f6e38f7..a58a4a5b76 100644
--- a/mods/ENTITIES/mobs_mc/guardian_elder.lua
+++ b/mods/ENTITIES/mobs_mc/guardian_elder.lua
@@ -106,7 +106,7 @@ mobs:register_mob("mobs_mc:guardian_elder", {
 	view_range = 16,
 })
 
--- Spawning disabled due to size issues <- what do you mean? -j4i
+-- Spawning disabled due to size issues
 -- TODO: Re-enable spawning
 -- mobs:spawn_specific("mobs_mc:guardian_elder", mobs_mc.spawn.water, mobs_mc.spawn_water, 0, minetest.LIGHT_MAX+1, 30, 40000, 2, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.water-18)
 
diff --git a/mods/ENTITIES/mobs_mc/horse.lua b/mods/ENTITIES/mobs_mc/horse.lua
index 00c292c1de..3da63831ee 100644
--- a/mods/ENTITIES/mobs_mc/horse.lua
+++ b/mods/ENTITIES/mobs_mc/horse.lua
@@ -510,8 +510,8 @@ mobs:register_mob("mobs_mc:mule", mule)
 
 --===========================
 --Spawn Function
-mobs:spawn_specific("mobs_mc:horse", "overworld", "ground", 0, minetest.LIGHT_MAX+1, 30, 15000, 4, mobs_mc.spawn_height.water+3, mobs_mc.spawn_height.overworld_max)
-mobs:spawn_specific("mobs_mc:donkey", "overworld", "ground", 0, minetest.LIGHT_MAX+1, 30, 15000, 4, mobs_mc.spawn_height.water+3, mobs_mc.spawn_height.overworld_max)
+mobs:spawn_specific("mobs_mc:horse", mobs_mc.spawn.grassland_savanna, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 15000, 4, mobs_mc.spawn_height.water+3, mobs_mc.spawn_height.overworld_max)
+mobs:spawn_specific("mobs_mc:donkey", mobs_mc.spawn.grassland_savanna, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 15000, 4, mobs_mc.spawn_height.water+3, mobs_mc.spawn_height.overworld_max)
 
 -- spawn eggs
 mobs:register_egg("mobs_mc:horse", S("Horse"), "mobs_mc_spawn_icon_horse.png", 0)
diff --git a/mods/ENTITIES/mobs_mc/llama.lua b/mods/ENTITIES/mobs_mc/llama.lua
index 0efb8e0ab2..36d020a656 100644
--- a/mods/ENTITIES/mobs_mc/llama.lua
+++ b/mods/ENTITIES/mobs_mc/llama.lua
@@ -217,7 +217,7 @@ mobs:register_mob("mobs_mc:llama", {
 })
 
 --spawn
-mobs:spawn_specific("mobs_mc:llama", "overworld", "ground", 0, minetest.LIGHT_MAX+1, 30, 15000, 5, mobs_mc.spawn_height.water+15, mobs_mc.spawn_height.overworld_max)
+mobs:spawn_specific("mobs_mc:llama", mobs_mc.spawn.savanna, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 15000, 5, mobs_mc.spawn_height.water+15, mobs_mc.spawn_height.overworld_max)
 
 -- spawn eggs
 mobs:register_egg("mobs_mc:llama", S("Llama"), "mobs_mc_spawn_icon_llama.png", 0)
diff --git a/mods/ENTITIES/mobs_mc/ocelot.lua b/mods/ENTITIES/mobs_mc/ocelot.lua
index 3b5273185e..eca74d3ba5 100644
--- a/mods/ENTITIES/mobs_mc/ocelot.lua
+++ b/mods/ENTITIES/mobs_mc/ocelot.lua
@@ -152,9 +152,6 @@ mobs:register_mob("mobs_mc:cat", cat)
 local base_spawn_chance = 5000
 
 -- Spawn ocelot
---they get the same as the llama because I'm trying to rework so much of this code right now -j4i
-mobs:spawn_specific("mobs_mc:ocelot", "overworld", "ground", 0, minetest.LIGHT_MAX+1, 30, 15000, 5, mobs_mc.spawn_height.water+15, mobs_mc.spawn_height.overworld_max)
---[[
 mobs:spawn({
 	name = "mobs_mc:ocelot",
 	nodes = mobs_mc.spawn.jungle,
@@ -166,8 +163,8 @@ mobs:spawn({
 	min_height = mobs_mc.spawn_height.water+1, -- Right above ocean level
 	max_height = mobs_mc.spawn_height.overworld_max,
 	on_spawn = function(self, pos)
-		 Note: Minecraft has a 1/3 spawn failure rate.
-		In this mod it is emulated by reducing the spawn rate accordingly (see above). 
+		--[[ Note: Minecraft has a 1/3 spawn failure rate.
+		In this mod it is emulated by reducing the spawn rate accordingly (see above). ]]
 
 		-- 1/7 chance to spawn 2 ocelot kittens
 		if pr:next(1,7) == 1 then
@@ -210,7 +207,6 @@ mobs:spawn({
 		end
 	end,
 })
-]]--
 
 -- spawn eggs
 -- FIXME: The spawn icon shows a cat texture, not an ocelot texture
diff --git a/mods/ENTITIES/mobs_mc/parrot.lua b/mods/ENTITIES/mobs_mc/parrot.lua
index c67263fb92..407cb44667 100644
--- a/mods/ENTITIES/mobs_mc/parrot.lua
+++ b/mods/ENTITIES/mobs_mc/parrot.lua
@@ -90,8 +90,8 @@ mobs:register_mob("mobs_mc:parrot", {
 
 })
 
--- Parrots spawn rarely in jungles. TODO: Also check for jungle *biome* <- I'll get to this eventually -j4i
-mobs:spawn_specific("mobs_mc:parrot","overworld", "air", 0, minetest.LIGHT_MAX+1, 7, 30000, 1, mobs_mc.spawn_height.water+7, mobs_mc.spawn_height.overworld_max)
+-- Parrots spawn rarely in jungles. TODO: Also check for jungle *biome*
+mobs:spawn_specific("mobs_mc:parrot", {"mcl_core:jungletree", "mcl_core:jungleleaves"}, {"air"}, 0, minetest.LIGHT_MAX+1, 7, 30000, 1, mobs_mc.spawn_height.water+7, mobs_mc.spawn_height.overworld_max)
 
 -- spawn eggs
 mobs:register_egg("mobs_mc:parrot", S("Parrot"), "mobs_mc_spawn_icon_parrot.png", 0)
diff --git a/mods/ENTITIES/mobs_mc/pig.lua b/mods/ENTITIES/mobs_mc/pig.lua
index 143fcb4950..38700b6ca7 100644
--- a/mods/ENTITIES/mobs_mc/pig.lua
+++ b/mods/ENTITIES/mobs_mc/pig.lua
@@ -182,7 +182,7 @@ mobs:register_mob("mobs_mc:pig", {
 	end,
 })
 
-mobs:spawn_specific("mobs_mc:pig", "overworld", "ground", 9, minetest.LIGHT_MAX+1, 30, 15000, 8, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
+mobs:spawn_specific("mobs_mc:pig", mobs_mc.spawn.grassland, {"air"}, 9, minetest.LIGHT_MAX+1, 30, 15000, 8, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
 
 -- spawn eggs
 mobs:register_egg("mobs_mc:pig", S("Pig"), "mobs_mc_spawn_icon_pig.png", 0)
diff --git a/mods/ENTITIES/mobs_mc/polar_bear.lua b/mods/ENTITIES/mobs_mc/polar_bear.lua
index 745c13a26c..459ca29b4a 100644
--- a/mods/ENTITIES/mobs_mc/polar_bear.lua
+++ b/mods/ENTITIES/mobs_mc/polar_bear.lua
@@ -67,7 +67,7 @@ mobs:register_mob("mobs_mc:polar_bear", {
 })
 
 
-mobs:spawn_specific("mobs_mc:polar_bear", "overworld", "ground", 0, minetest.LIGHT_MAX+1, 30, 7000, 3, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
+mobs:spawn_specific("mobs_mc:polar_bear", mobs_mc.spawn.snow, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 7000, 3, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
 
 -- spawn egg
 mobs:register_egg("mobs_mc:polar_bear", S("Polar Bear"), "mobs_mc_spawn_icon_polarbear.png", 0)
diff --git a/mods/ENTITIES/mobs_mc/rabbit.lua b/mods/ENTITIES/mobs_mc/rabbit.lua
index f09a70584a..e167649f6f 100644
--- a/mods/ENTITIES/mobs_mc/rabbit.lua
+++ b/mods/ENTITIES/mobs_mc/rabbit.lua
@@ -107,11 +107,8 @@ end
 mobs:register_mob("mobs_mc:killer_bunny", killer_bunny)
 
 -- Mob spawning rules.
--- Different skins depending on spawn location <- we'll get to this when the spawning algorithm is fleshed out
+-- Different skins depending on spawn location
 
-mobs:spawn_specific("mobs_mc:rabbit", "overworld", "ground", 9, minetest.LIGHT_MAX+1, 30, 15000, 8, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
-
---[[
 local spawn = {
 	name = "mobs_mc:rabbit",
 	neighbors = {"air"},
@@ -168,7 +165,6 @@ spawn_grass.on_spawn = function(self, pos)
 	self.object:set_properties({textures = self.base_texture})
 end
 mobs:spawn(spawn_grass)
-]]--
 
 -- Spawn egg
 mobs:register_egg("mobs_mc:rabbit", S("Rabbit"), "mobs_mc_spawn_icon_rabbit.png", 0)
diff --git a/mods/ENTITIES/mobs_mc/sheep.lua b/mods/ENTITIES/mobs_mc/sheep.lua
index b3400ab5f5..84650b4ddd 100644
--- a/mods/ENTITIES/mobs_mc/sheep.lua
+++ b/mods/ENTITIES/mobs_mc/sheep.lua
@@ -303,7 +303,7 @@ mobs:register_mob("mobs_mc:sheep", {
 		end
 	end,
 })
-mobs:spawn_specific("mobs_mc:sheep", "overworld", "ground", 0, minetest.LIGHT_MAX+1, 30, 15000, 3, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
+mobs:spawn_specific("mobs_mc:sheep", mobs_mc.spawn.grassland, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 15000, 3, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
 
 -- spawn eggs
 mobs:register_egg("mobs_mc:sheep", S("Sheep"), "mobs_mc_spawn_icon_sheep.png", 0)
diff --git a/mods/ENTITIES/mobs_mc/shulker.lua b/mods/ENTITIES/mobs_mc/shulker.lua
index 583c5eed1e..faaf2ac405 100644
--- a/mods/ENTITIES/mobs_mc/shulker.lua
+++ b/mods/ENTITIES/mobs_mc/shulker.lua
@@ -81,4 +81,4 @@ mobs:register_arrow("mobs_mc:shulkerbullet", {
 
 mobs:register_egg("mobs_mc:shulker", S("Shulker"), "mobs_mc_spawn_icon_shulker.png", 0)
 
-mobs:spawn_specific("mobs_mc:shulker", "end", "ground", 0, minetest.LIGHT_MAX+1, 30, 5000, 2, mobs_mc.spawn_height.end_min, mobs_mc.spawn_height.end_max)
+mobs:spawn_specific("mobs_mc:shulker", mobs_mc.spawn.end_city, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 5000, 2, mobs_mc.spawn_height.end_min, mobs_mc.spawn_height.end_max)
diff --git a/mods/ENTITIES/mobs_mc/skeleton+stray.lua b/mods/ENTITIES/mobs_mc/skeleton+stray.lua
index 84e51c5170..cb12e905d5 100644
--- a/mods/ENTITIES/mobs_mc/skeleton+stray.lua
+++ b/mods/ENTITIES/mobs_mc/skeleton+stray.lua
@@ -139,13 +139,13 @@ table.insert(stray.drops, {
 mobs:register_mob("mobs_mc:stray", stray)
 
 -- Overworld spawn
-mobs:spawn_specific("mobs_mc:skeleton", "overworld", "ground", 0, 7, 20, 17000, 2, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
+mobs:spawn_specific("mobs_mc:skeleton", mobs_mc.spawn.solid, {"air"}, 0, 7, 20, 17000, 2, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
 -- Nether spawn
-mobs:spawn_specific("mobs_mc:skeleton", "nether", "ground", 0, 7, 30, 10000, 3, mobs_mc.spawn_height.nether_min, mobs_mc.spawn_height.nether_max)
+mobs:spawn_specific("mobs_mc:skeleton", mobs_mc.spawn.nether_fortress, {"air"}, 0, 7, 30, 10000, 3, mobs_mc.spawn_height.nether_min, mobs_mc.spawn_height.nether_max)
 
 -- Stray spawn
 -- TODO: Spawn directly under the sky
-mobs:spawn_specific("mobs_mc:stray", "overworld", "ground", 0, 7, 20, 19000, 2, mobs_mc.spawn_height.water, mobs_mc.spawn_height.overworld_max)
+mobs:spawn_specific("mobs_mc:stray", mobs_mc.spawn.snow, {"air"}, 0, 7, 20, 19000, 2, mobs_mc.spawn_height.water, mobs_mc.spawn_height.overworld_max)
 
 
 -- spawn eggs
diff --git a/mods/ENTITIES/mobs_mc/skeleton_wither.lua b/mods/ENTITIES/mobs_mc/skeleton_wither.lua
index d9de90d84b..e4a1f86fc6 100644
--- a/mods/ENTITIES/mobs_mc/skeleton_wither.lua
+++ b/mods/ENTITIES/mobs_mc/skeleton_wither.lua
@@ -94,7 +94,7 @@ mobs:register_mob("mobs_mc:witherskeleton", {
 })
 
 --spawn
-mobs:spawn_specific("mobs_mc:witherskeleton", "nether", "ground", 0, 7, 30, 5000, 5, mobs_mc.spawn_height.nether_min, mobs_mc.spawn_height.nether_max)
+mobs:spawn_specific("mobs_mc:witherskeleton", mobs_mc.spawn.nether_fortress, {"air"}, 0, 7, 30, 5000, 5, mobs_mc.spawn_height.nether_min, mobs_mc.spawn_height.nether_max)
 
 -- spawn eggs
 mobs:register_egg("mobs_mc:witherskeleton", S("Wither Skeleton"), "mobs_mc_spawn_icon_witherskeleton.png", 0)
diff --git a/mods/ENTITIES/mobs_mc/slime+magma_cube.lua b/mods/ENTITIES/mobs_mc/slime+magma_cube.lua
index 2f9e8c8a90..fd1f92bb49 100644
--- a/mods/ENTITIES/mobs_mc/slime+magma_cube.lua
+++ b/mods/ENTITIES/mobs_mc/slime+magma_cube.lua
@@ -157,9 +157,9 @@ mobs:register_mob("mobs_mc:slime_tiny", slime_tiny)
 local smin = mobs_mc.spawn_height.overworld_min
 local smax = mobs_mc.spawn_height.water - 23
 
-mobs:spawn_specific("mobs_mc:slime_tiny", "overworld", "ground", 0, minetest.LIGHT_MAX+1, 30, 12000, 4, smin, smax)
-mobs:spawn_specific("mobs_mc:slime_small", "overworld", "ground", 0, minetest.LIGHT_MAX+1, 30, 8500, 4, smin, smax)
-mobs:spawn_specific("mobs_mc:slime_big", "overworld", "ground", 0, minetest.LIGHT_MAX+1, 30, 10000, 4, smin, smax)
+mobs:spawn_specific("mobs_mc:slime_tiny", mobs_mc.spawn.solid, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 12000, 4, smin, smax)
+mobs:spawn_specific("mobs_mc:slime_small", mobs_mc.spawn.solid, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 8500, 4, smin, smax)
+mobs:spawn_specific("mobs_mc:slime_big", mobs_mc.spawn.solid, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 10000, 4, smin, smax)
 
 -- Magma cube
 local magma_cube_big = {
@@ -272,13 +272,13 @@ mobs:register_mob("mobs_mc:magma_cube_tiny", magma_cube_tiny)
 local mmin = mobs_mc.spawn_height.nether_min
 local mmax = mobs_mc.spawn_height.nether_max
 
-mobs:spawn_specific("mobs_mc:magma_cube_tiny", "nether", "ground", 0, minetest.LIGHT_MAX+1, 30, 15000, 4, mmin, mmax)
-mobs:spawn_specific("mobs_mc:magma_cube_small", "nether", "ground", 0, minetest.LIGHT_MAX+1, 30, 15500, 4, mmin, mmax)
-mobs:spawn_specific("mobs_mc:magma_cube_big", "nether", "ground", 0, minetest.LIGHT_MAX+1, 30, 16000, 4, mmin, mmax)
+mobs:spawn_specific("mobs_mc:magma_cube_tiny", mobs_mc.spawn.nether, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 15000, 4, mmin, mmax)
+mobs:spawn_specific("mobs_mc:magma_cube_small", mobs_mc.spawn.nether, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 15500, 4, mmin, mmax)
+mobs:spawn_specific("mobs_mc:magma_cube_big", mobs_mc.spawn.nether, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 16000, 4, mmin, mmax)
 
---mobs:spawn_specific("mobs_mc:magma_cube_tiny", mobs_mc.spawn.nether_fortress, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 11000, 4, mmin, mmax)
---mobs:spawn_specific("mobs_mc:magma_cube_small", mobs_mc.spawn.nether_fortress, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 11100, 4, mmin, mmax)
---mobs:spawn_specific("mobs_mc:magma_cube_big", mobs_mc.spawn.nether_fortress, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 11200, 4, mmin, mmax)
+mobs:spawn_specific("mobs_mc:magma_cube_tiny", mobs_mc.spawn.nether_fortress, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 11000, 4, mmin, mmax)
+mobs:spawn_specific("mobs_mc:magma_cube_small", mobs_mc.spawn.nether_fortress, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 11100, 4, mmin, mmax)
+mobs:spawn_specific("mobs_mc:magma_cube_big", mobs_mc.spawn.nether_fortress, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 11200, 4, mmin, mmax)
 
 
 -- spawn eggs
diff --git a/mods/ENTITIES/mobs_mc/spider.lua b/mods/ENTITIES/mobs_mc/spider.lua
index 1361e6a3ae..0bb03a9c7c 100644
--- a/mods/ENTITIES/mobs_mc/spider.lua
+++ b/mods/ENTITIES/mobs_mc/spider.lua
@@ -87,7 +87,7 @@ cave_spider.sounds.base_pitch = 1.25
 mobs:register_mob("mobs_mc:cave_spider", cave_spider)
 
 
-mobs:spawn_specific("mobs_mc:spider", "overworld", "ground", 0, 7, 30, 17000, 2, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
+mobs:spawn_specific("mobs_mc:spider", mobs_mc.spawn.solid, {"air"}, 0, 7, 30, 17000, 2, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
 
 -- spawn eggs
 mobs:register_egg("mobs_mc:spider", S("Spider"), "mobs_mc_spawn_icon_spider.png", 0)
diff --git a/mods/ENTITIES/mobs_mc/squid.lua b/mods/ENTITIES/mobs_mc/squid.lua
index 2dbb7c557d..1877a2104c 100644
--- a/mods/ENTITIES/mobs_mc/squid.lua
+++ b/mods/ENTITIES/mobs_mc/squid.lua
@@ -62,7 +62,7 @@ mobs:register_mob("mobs_mc:squid", {
 
 local water = mobs_mc.spawn_height.water
 --name, nodes, neighbours, minlight, maxlight, interval, chance, active_object_count, min_height, max_height
-mobs:spawn_specific("mobs_mc:squid", "overworld", "water", 0, minetest.LIGHT_MAX+1, 30, 5500, 3, water-16, water)
+mobs:spawn_specific("mobs_mc:squid", mobs_mc.spawn.water, {mobs_mc.items.water_source}, 0, minetest.LIGHT_MAX+1, 30, 5500, 3, water-16, water)
 
 -- spawn eggs
 mobs:register_egg("mobs_mc:squid", S("Squid"), "mobs_mc_spawn_icon_squid.png", 0)
diff --git a/mods/ENTITIES/mobs_mc/villager.lua b/mods/ENTITIES/mobs_mc/villager.lua
index 0b53d8015f..68644266f4 100644
--- a/mods/ENTITIES/mobs_mc/villager.lua
+++ b/mods/ENTITIES/mobs_mc/villager.lua
@@ -1074,7 +1074,7 @@ mobs:register_mob("mobs_mc:villager", {
 
 
 
-mobs:spawn_specific("mobs_mc:villager", "overworld", "ground", 0, minetest.LIGHT_MAX+1, 30, 20, 4, mobs_mc.spawn_height.water+1, mobs_mc.spawn_height.overworld_max)
+mobs:spawn_specific("mobs_mc:villager", mobs_mc.spawn.village, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 20, 4, mobs_mc.spawn_height.water+1, mobs_mc.spawn_height.overworld_max)
 
 -- spawn eggs
 mobs:register_egg("mobs_mc:villager", S("Villager"), "mobs_mc_spawn_icon_villager.png", 0)
diff --git a/mods/ENTITIES/mobs_mc/villager_zombie.lua b/mods/ENTITIES/mobs_mc/villager_zombie.lua
index bcede2183c..09539fa76e 100644
--- a/mods/ENTITIES/mobs_mc/villager_zombie.lua
+++ b/mods/ENTITIES/mobs_mc/villager_zombie.lua
@@ -146,8 +146,8 @@ mobs:register_mob("mobs_mc:villager_zombie", {
 	harmed_by_heal = true,
 })
 
-mobs:spawn_specific("mobs_mc:villager_zombie", "overworld", "ground", 0, 7, 30, 4090, 4, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
-mobs:spawn_specific("mobs_mc:villager_zombie", "overworld", "ground", 0, 7, 30, 60000, 4, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
+mobs:spawn_specific("mobs_mc:villager_zombie", mobs_mc.spawn.village, {"air"}, 0, 7, 30, 4090, 4, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
+mobs:spawn_specific("mobs_mc:villager_zombie", mobs_mc.spawn.solid, {"air"}, 0, 7, 30, 60000, 4, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
 
 -- spawn eggs
 mobs:register_egg("mobs_mc:villager_zombie", S("Zombie Villager"), "mobs_mc_spawn_icon_zombie_villager.png", 0)
diff --git a/mods/ENTITIES/mobs_mc/witch.lua b/mods/ENTITIES/mobs_mc/witch.lua
index f9f9b8d1f0..383cbd36fe 100644
--- a/mods/ENTITIES/mobs_mc/witch.lua
+++ b/mods/ENTITIES/mobs_mc/witch.lua
@@ -99,7 +99,7 @@ mobs:register_arrow("mobs_mc:potion_arrow", {
 	end
 })
 
--- TODO: Spawn when witch works properly <- eventually -j4i
+-- TODO: Spawn when witch works properly
 --mobs:spawn_specific("mobs_mc:witch", mobs_mc.spawn.jungle, {"air"}, 0, minetest.LIGHT_MAX-6, 12, 20000, 2, mobs_mc.spawn_height.water-6, mobs_mc.spawn_height.overworld_max)
 
 -- spawn eggs
diff --git a/mods/ENTITIES/mobs_mc/wolf.lua b/mods/ENTITIES/mobs_mc/wolf.lua
index 953c2df729..fe30318954 100644
--- a/mods/ENTITIES/mobs_mc/wolf.lua
+++ b/mods/ENTITIES/mobs_mc/wolf.lua
@@ -232,6 +232,6 @@ end
 mobs:register_mob("mobs_mc:dog", dog)
 
 -- Spawn
-mobs:spawn_specific("mobs_mc:wolf", "overworld", "ground", 0, minetest.LIGHT_MAX+1, 30, 9000, 7, mobs_mc.spawn_height.water+3, mobs_mc.spawn_height.overworld_max)
+mobs:spawn_specific("mobs_mc:wolf", mobs_mc.spawn.wolf, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 9000, 7, mobs_mc.spawn_height.water+3, mobs_mc.spawn_height.overworld_max)
 
 mobs:register_egg("mobs_mc:wolf", S("Wolf"), "mobs_mc_spawn_icon_wolf.png", 0)
diff --git a/mods/ENTITIES/mobs_mc/zombie.lua b/mods/ENTITIES/mobs_mc/zombie.lua
index 64f99d34dd..df9727d34f 100644
--- a/mods/ENTITIES/mobs_mc/zombie.lua
+++ b/mods/ENTITIES/mobs_mc/zombie.lua
@@ -135,11 +135,11 @@ mobs:register_mob("mobs_mc:baby_husk", baby_husk)
 
 -- Spawning
 
-mobs:spawn_specific("mobs_mc:zombie", "overworld", "ground", 0, 7, 30, 6000, 4, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
+mobs:spawn_specific("mobs_mc:zombie", mobs_mc.spawn.solid, {"air"}, 0, 7, 30, 6000, 4, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
 -- Baby zombie is 20 times less likely than regular zombies
-mobs:spawn_specific("mobs_mc:baby_zombie", "overworld", "ground", 0, 7, 30, 60000, 4, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
-mobs:spawn_specific("mobs_mc:husk", "overworld", "ground", 0, 7, 30, 6500, 4, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
-mobs:spawn_specific("mobs_mc:baby_husk", "overworld", "ground", 0, 7, 30, 65000, 4, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
+mobs:spawn_specific("mobs_mc:baby_zombie", mobs_mc.spawn.solid, {"air"}, 0, 7, 30, 60000, 4, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
+mobs:spawn_specific("mobs_mc:husk", mobs_mc.spawn.desert, {"air"}, 0, 7, 30, 6500, 4, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
+mobs:spawn_specific("mobs_mc:baby_husk", mobs_mc.spawn.desert, {"air"}, 0, 7, 30, 65000, 4, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
 
 -- Spawn eggs
 mobs:register_egg("mobs_mc:husk", S("Husk"), "mobs_mc_spawn_icon_husk.png", 0)
diff --git a/mods/ENTITIES/mobs_mc/zombiepig.lua b/mods/ENTITIES/mobs_mc/zombiepig.lua
index e996425c8b..8c29a4bff7 100644
--- a/mods/ENTITIES/mobs_mc/zombiepig.lua
+++ b/mods/ENTITIES/mobs_mc/zombiepig.lua
@@ -111,12 +111,12 @@ baby_pigman.child = 1
 mobs:register_mob("mobs_mc:baby_pigman", baby_pigman)
 
 -- Regular spawning in the Nether
-mobs:spawn_specific("mobs_mc:pigman", "nether", "ground", 0, minetest.LIGHT_MAX+1, 30, 6000, 3, mobs_mc.spawn_height.nether_min, mobs_mc.spawn_height.nether_max)
+mobs:spawn_specific("mobs_mc:pigman", mobs_mc.spawn.solid, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 6000, 3, mobs_mc.spawn_height.nether_min, mobs_mc.spawn_height.nether_max)
 -- Baby zombie is 20 times less likely than regular zombies
-mobs:spawn_specific("mobs_mc:baby_pigman", "nether", "ground", 0, minetest.LIGHT_MAX+1, 30, 100000, 4, mobs_mc.spawn_height.nether_min, mobs_mc.spawn_height.nether_max)
+mobs:spawn_specific("mobs_mc:baby_pigman", mobs_mc.spawn.solid, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 100000, 4, mobs_mc.spawn_height.nether_min, mobs_mc.spawn_height.nether_max)
 
 -- Spawning in Nether portals in the Overworld
---mobs:spawn_specific("mobs_mc:pigman", mobs_mc.spawn.nether_portal, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 500, 4, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
+mobs:spawn_specific("mobs_mc:pigman", mobs_mc.spawn.nether_portal, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 500, 4, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
 
 -- spawn eggs
 mobs:register_egg("mobs_mc:pigman", S("Zombie Pigman"), "mobs_mc_spawn_icon_zombie_pigman.png", 0)

From d77affca91be1b17462851d3559ee32038ea5bf0 Mon Sep 17 00:00:00 2001
From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Wed, 7 Apr 2021 17:39:13 +0200
Subject: [PATCH 7/7] Change max_bossbars default to 4

---
 mods/HUD/mcl_bossbars/init.lua | 2 +-
 settingtypes.txt               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mods/HUD/mcl_bossbars/init.lua b/mods/HUD/mcl_bossbars/init.lua
index 3ba0bd7558..3a144aac49 100644
--- a/mods/HUD/mcl_bossbars/init.lua
+++ b/mods/HUD/mcl_bossbars/init.lua
@@ -3,7 +3,7 @@ mcl_bossbars = {
 	huds = {},
 	static = {},
 	colors = {"light_purple", "blue", "red", "green", "yellow", "dark_purple", "white"},
-	max_bars = tonumber(minetest.settings:get("max_bossbars")) or 6
+	max_bars = tonumber(minetest.settings:get("max_bossbars")) or 4
 }
 
 function mcl_bossbars.recalculate_colors()
diff --git a/settingtypes.txt b/settingtypes.txt
index 4ba6034eb5..bfda9b3ba8 100644
--- a/settingtypes.txt
+++ b/settingtypes.txt
@@ -98,7 +98,7 @@ animated_chests (Animated chests) bool true
 3d_player_preview (3D Player preview) bool true
 
 # The maximum number of boss bars to simultaniously display on the screen
-max_bossbars (Maximum Boss bars) int 6
+max_bossbars (Maximum Boss bars) int 4
 
 [Experimental]
 # Whether ice is translucent. If disabled, ice is fully opaque.