From 76839961c60008d29b99c21e5e79e9a34119ed2f Mon Sep 17 00:00:00 2001
From: opfromthestart <opfromthestart@gmail.com>
Date: Mon, 8 Aug 2022 20:12:44 -0400
Subject: [PATCH 01/21] Adds fire and lava collision to boats

---
 mods/ENTITIES/mcl_boats/init.lua | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/mods/ENTITIES/mcl_boats/init.lua b/mods/ENTITIES/mcl_boats/init.lua
index 087cd7eae..1f1d85274 100644
--- a/mods/ENTITIES/mcl_boats/init.lua
+++ b/mods/ENTITIES/mcl_boats/init.lua
@@ -24,6 +24,10 @@ local function is_ice(pos)
 	return is_group(pos, "ice")
 end
 
+local function is_fire(pos)
+	return is_group(pos, "set_on_fire")
+end
+
 local function get_sign(i)
 	if i == 0 then
 		return 0
@@ -216,6 +220,13 @@ function boat.on_step(self, dtime, moveresult)
 		on_water = false
 		if not in_water and is_ice(waterp) then
 			on_ice = true
+		elseif is_fire({x=p.x, y=p.y-boat_y_offset, z=p.z}) then
+			if self.object:get_hp() <= 0 then
+				boat.on_death(self, nil)
+				self.object:remove()
+				return
+			end
+			self.object:set_hp(self.object:get_hp()-1)
 		else
 			v_slowdown = 0.04
 			v_factor = 0.5

From b8af222538411204ef6bfd54941561d1797879a0 Mon Sep 17 00:00:00 2001
From: opfromthestart <opfromthestart@gmail.com>
Date: Mon, 8 Aug 2022 20:26:31 -0400
Subject: [PATCH 02/21] Fixed remaining get_sky calls

---
 mods/ENVIRONMENT/mcl_weather/rain.lua     | 2 +-
 mods/ENVIRONMENT/mcl_weather/skycolor.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mods/ENVIRONMENT/mcl_weather/rain.lua b/mods/ENVIRONMENT/mcl_weather/rain.lua
index 2cf95022e..83b5359ba 100644
--- a/mods/ENVIRONMENT/mcl_weather/rain.lua
+++ b/mods/ENVIRONMENT/mcl_weather/rain.lua
@@ -91,7 +91,7 @@ end
 function mcl_weather.rain.add_player(player)
 	if mcl_weather.players[player:get_player_name()] == nil then
 		local player_meta = {}
-		player_meta.origin_sky = {player:get_sky()}
+		player_meta.origin_sky = {player:get_sky(true)}
 		mcl_weather.players[player:get_player_name()] = player_meta
 		update_sound[player:get_player_name()]=true
 	end
diff --git a/mods/ENVIRONMENT/mcl_weather/skycolor.lua b/mods/ENVIRONMENT/mcl_weather/skycolor.lua
index b70702b4c..f98ee18c0 100644
--- a/mods/ENVIRONMENT/mcl_weather/skycolor.lua
+++ b/mods/ENVIRONMENT/mcl_weather/skycolor.lua
@@ -246,7 +246,7 @@ mcl_weather.skycolor = {
 		get_current_bg_color = function()
 			local players = mcl_weather.skycolor.utils.get_players(nil)
 			if players[1] then
-				return players[1]:get_sky()
+				return players[1]:get_sky(true).sky_color
 			end
 			return nil
 		end

From 5da6f6812fc3efa7fa878c739d0cc56d1a31c26c Mon Sep 17 00:00:00 2001
From: opfromthestart <opfromthestart@gmail.com>
Date: Tue, 9 Aug 2022 12:23:44 -0400
Subject: [PATCH 03/21] faster boat death

---
 mods/ENTITIES/mcl_boats/init.lua | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/mods/ENTITIES/mcl_boats/init.lua b/mods/ENTITIES/mcl_boats/init.lua
index f750e80eb..0b2d67730 100644
--- a/mods/ENTITIES/mcl_boats/init.lua
+++ b/mods/ENTITIES/mcl_boats/init.lua
@@ -223,12 +223,9 @@ function boat.on_step(self, dtime, moveresult)
 		if not in_water and is_ice(waterp) then
 			on_ice = true
 		elseif is_fire({x=p.x, y=p.y-boat_y_offset, z=p.z}) then
-			if self.object:get_hp() <= 0 then
-				boat.on_death(self, nil)
-				self.object:remove()
-				return
-			end
-			self.object:set_hp(self.object:get_hp()-1)
+			boat.on_death(self, nil)
+			self.object:remove()
+			return
 		else
 			v_slowdown = 0.04
 			v_factor = 0.5

From 9603ee606cae66a9818abb183818c610798c9845 Mon Sep 17 00:00:00 2001
From: cora <coradelamouche@gmx.ch>
Date: Tue, 9 Aug 2022 01:32:48 +0200
Subject: [PATCH 04/21] fix at mod loadtime warning in mcl_info

---
 mods/HUD/mcl_info/init.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mods/HUD/mcl_info/init.lua b/mods/HUD/mcl_info/init.lua
index 5331a9bd6..71f8d8ad0 100644
--- a/mods/HUD/mcl_info/init.lua
+++ b/mods/HUD/mcl_info/init.lua
@@ -106,7 +106,7 @@ local function info()
 	end
 	after(refresh_interval, info)
 end
-info()
+minetest.after(0,info)
 
 minetest.register_on_leaveplayer(function(p)
 	local name = p:get_player_name()

From 701aee323857a52b87a01ec7e4cddf0c566af72c Mon Sep 17 00:00:00 2001
From: cora <coradelamouche@gmx.ch>
Date: Tue, 9 Aug 2022 01:34:43 +0200
Subject: [PATCH 05/21] Add modname to beacons mod.conf

---
 mods/ITEMS/mcl_beacons/mod.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mods/ITEMS/mcl_beacons/mod.conf b/mods/ITEMS/mcl_beacons/mod.conf
index 139a264b3..a8b7a467a 100644
--- a/mods/ITEMS/mcl_beacons/mod.conf
+++ b/mods/ITEMS/mcl_beacons/mod.conf
@@ -1,2 +1,3 @@
+name = mcl_beacons
 author=chmodsayshello
 depends=mcl_formspec, mcl_init, mcl_wip, mesecons_mvps, mcl_core, mcl_sounds, awards, mcl_achievements, mcl_mobitems, mcl_nether

From e8baa1ae00acf1d4952dfd2b455d430e60f28841 Mon Sep 17 00:00:00 2001
From: cora <coradelamouche@gmx.ch>
Date: Tue, 9 Aug 2022 01:35:57 +0200
Subject: [PATCH 06/21] Fix undeclared var warning in mcl_weather

---
 mods/ENVIRONMENT/mcl_weather/rain.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mods/ENVIRONMENT/mcl_weather/rain.lua b/mods/ENVIRONMENT/mcl_weather/rain.lua
index 83b5359ba..7dcc48637 100644
--- a/mods/ENVIRONMENT/mcl_weather/rain.lua
+++ b/mods/ENVIRONMENT/mcl_weather/rain.lua
@@ -2,6 +2,7 @@ local PARTICLES_COUNT_RAIN = tonumber(minetest.settings:get("mcl_weather_rain_pa
 local PARTICLES_COUNT_THUNDER = tonumber(minetest.settings:get("mcl_weather_thunder_particles")) or 900
 
 local get_connected_players = minetest.get_connected_players
+local mgname = minetest.get_mapgen_setting("mg_name")
 
 mcl_weather.rain = {
 	-- max rain particles created at time

From 34ecb782a855af100c775e03adbffd309e4d16fd Mon Sep 17 00:00:00 2001
From: cora <coradelamouche@gmx.ch>
Date: Tue, 9 Aug 2022 21:47:11 +0200
Subject: [PATCH 07/21] Fix dispenser and dropper crashing in 5.4

---
 mods/ITEMS/REDSTONE/mcl_dispensers/init.lua | 4 ++--
 mods/ITEMS/REDSTONE/mcl_droppers/init.lua   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua b/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua
index 94f0fcd8d..dce69f26a 100644
--- a/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua
+++ b/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua
@@ -261,7 +261,7 @@ local dispenserdef = {
 									local item_entity = minetest.add_item(droppos, dropitem)
 									local drop_vel = vector.subtract(droppos, pos)
 									local speed = 3
-									item_entity:set_velocity(drop_vel * speed)
+									item_entity:set_velocity(vector.multiply(drop_vel,speed))
 								end
 							else
 								stack:take_item()
@@ -278,7 +278,7 @@ local dispenserdef = {
 							local item_entity = minetest.add_item(droppos, dropitem)
 							local drop_vel = vector.subtract(droppos, pos)
 							local speed = 3
-							item_entity:set_velocity(drop_vel * speed)
+							item_entity:set_velocity(vector.multiply(drop_vel,speed))
 							stack:take_item()
 							inv:set_stack("main", stack_id, stack)
 						end
diff --git a/mods/ITEMS/REDSTONE/mcl_droppers/init.lua b/mods/ITEMS/REDSTONE/mcl_droppers/init.lua
index 6dac4495f..b9c46d6b8 100644
--- a/mods/ITEMS/REDSTONE/mcl_droppers/init.lua
+++ b/mods/ITEMS/REDSTONE/mcl_droppers/init.lua
@@ -143,7 +143,7 @@ local dropperdef = {
 					local item_entity = minetest.add_item(droppos, dropitem)
 					local drop_vel = vector.subtract(droppos, pos)
 					local speed = 3
-					item_entity:set_velocity(drop_vel * speed)
+					item_entity:set_velocity(vector.multiply(drop_vel,speed))
 					stack:take_item()
 					inv:set_stack("main", stack_id, stack)
 				end

From 3ff9ed4419a06611fd2fac21f7782b98c7db131c Mon Sep 17 00:00:00 2001
From: iliekprogrammar <iliekprogrammar@gmail.com>
Date: Sun, 7 Aug 2022 17:45:39 +0800
Subject: [PATCH 08/21] [heads] refactor and trivial renames

---
 mods/ITEMS/mcl_heads/init.lua | 353 +++++++++++++++++++++-------------
 1 file changed, 214 insertions(+), 139 deletions(-)

diff --git a/mods/ITEMS/mcl_heads/init.lua b/mods/ITEMS/mcl_heads/init.lua
index c14079393..14f79bfa9 100644
--- a/mods/ITEMS/mcl_heads/init.lua
+++ b/mods/ITEMS/mcl_heads/init.lua
@@ -1,5 +1,6 @@
 local S = minetest.get_translator(minetest.get_current_modname())
 
+local minetest = minetest
 local mod_doc = minetest.get_modpath("doc")
 local mod_screwdriver = minetest.get_modpath("screwdriver")
 
@@ -8,159 +9,233 @@ if minetest.get_modpath("mcl_armor") then
 	equip_armor = mcl_armor.equip_on_use
 end
 
--- Heads system
+mcl_heads = {}
 
-local function addhead(name, texture, desc, longdesc, rangemob, rangefactor)
-	local on_rotate_floor, on_rotate_wall
-	if mod_screwdriver then
-		on_rotate_floor = function(pos, node, user, mode, new_param2)
-			if mode == screwdriver.ROTATE_AXIS then
-				node.name = node.name .. "_wall"
-				node.param2 = minetest.dir_to_wallmounted(minetest.facedir_to_dir(node.param2))
-				minetest.set_node(pos, node)
-				return true
-			end
-		end
-		on_rotate_wall = function(pos, node, user, mode, new_param2)
-			if mode == screwdriver.ROTATE_AXIS then
-				node.name = string.sub(node.name, 1, string.len(node.name)-5)
-				node.param2 = minetest.dir_to_facedir(minetest.wallmounted_to_dir(node.param2))
-				minetest.set_node(pos, node)
-				return true
-			end
+-- box of head nodes
+mcl_heads.FLOOR_BOX = { -0.25, -0.5, -0.25, 0.25, 0.0, 0.25, }
+
+-- floor head node nodedef template ------------------------------------------------------------------------------------
+
+--- node definition template for floor mod heads
+mcl_heads.deftemplate_floor = {
+	drawtype = "nodebox",
+	node_box = {
+		type = "fixed",
+		fixed = mcl_heads.FLOOR_BOX,
+	},
+	groups = {
+		handy = 1,
+		armor = 1,
+		armor_head = 1,
+		non_combat_armor = 1,
+		non_combat_armor_head = 1,
+		head = 1,
+		deco_block = 1,
+		dig_by_piston = 1,
+	},
+	use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "opaque" or false,
+	paramtype = "light",
+	paramtype2 = "facedir",
+	stack_max = 64,
+	sunlight_propagates = true,
+	sounds = mcl_sounds.node_sound_defaults{
+		footstep = {name="default_hard_footstep", gain=0.3},
+	},
+	is_ground_content = false,
+
+	_mcl_armor_element = "head",
+	_mcl_blast_resistance = 1,
+	_mcl_hardness = 1,
+
+	on_secondary_use = equip_armor,
+}
+
+function mcl_heads.deftemplate_floor.on_rotate(pos, node, user, mode, new_param2)
+	if mode == screwdriver.ROTATE_AXIS then
+		node.name = node.name .. "_wall"
+		node.param2 = minetest.dir_to_wallmounted(minetest.facedir_to_dir(node.param2))
+		minetest.set_node(pos, node)
+		return true
+	end
+end
+
+function mcl_heads.deftemplate_floor.on_place(itemstack, placer, pointed_thing)
+	if pointed_thing.type ~= "node" then
+		return itemstack
+	end
+
+	local under = pointed_thing.under
+	local node = minetest.get_node(under)
+	local def = minetest.registered_nodes[node.name]
+	if not def then return itemstack end
+
+	-- Allow pointed node's on_rightclick callback to override place.
+	if placer and not placer:get_player_control().sneak then
+		if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
+			return minetest.registered_nodes[node.name].on_rightclick(under, node, placer, itemstack) or itemstack
 		end
 	end
 
-	minetest.register_node("mcl_heads:"..name, {
-		description = desc,
-		_doc_items_longdesc = longdesc,
-		drawtype = "nodebox",
-		is_ground_content = false,
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{ -0.25, -0.5, -0.25, 0.25, 0.0, 0.25, },
-			},
-		},
-		groups = {handy = 1, armor = 1, armor_head = 1, non_combat_armor = 1, non_combat_armor_head = 1, head = 1, deco_block = 1, dig_by_piston = 1},
+	local above = pointed_thing.above
+	local dir = {x = under.x - above.x, y = under.y - above.y, z = under.z - above.z}
+	local wdir = minetest.dir_to_wallmounted(dir)
+
+	-- place floor mob head
+	if wdir == 0 or wdir == 1 then
+		return minetest.item_place(itemstack, placer, pointed_thing)
+	end
+
+	-- place wall mob head
+	local itemstring = itemstack:get_name()
+	local placestack = ItemStack(itemstack)
+	placestack:set_name(itemstring .."_wall")
+	itemstack = minetest.item_place(placestack, placer, pointed_thing, wdir)
+	itemstack:set_name(itemstring)
+	return itemstack
+end
+
+-- wall head node nodedef template -------------------------------------------------------------------------------------
+
+--- node definition template for wall mod heads
+mcl_heads.deftemplate_wall = {
+	drawtype = "nodebox",
+	node_box = {
+		type = "wallmounted",
+		wall_bottom = { -0.25, -0.5, -0.25, 0.25, 0.0, 0.25, },
+		wall_top = { -0.25, 0.0, -0.25, 0.25, 0.5, 0.25, },
+		wall_side = { -0.5, -0.25, -0.25, 0.0, 0.25, 0.25, },
+	},
+	groups = {
+		handy = 1,
+		head = 1,
+		deco_block = 1,
+		dig_by_piston = 1,
+		not_in_creative_inventory = 1,
+	},
+	use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "opaque" or false,
+	paramtype = "light",
+	paramtype2 = "wallmounted",
+	stack_max = 64,
+	sunlight_propagates = true,
+	sounds = mcl_sounds.node_sound_defaults{
+		footstep = {name="default_hard_footstep", gain=0.3},
+	},
+	is_ground_content = false,
+
+	_doc_items_create_entry = false,
+	_mcl_blast_resistance = 1,
+	_mcl_hardness = 1,
+}
+
+function mcl_heads.deftemplate_wall.on_rotate(pos, node, user, mode, new_param2)
+	if mode == screwdriver.ROTATE_AXIS then
+		node.name = string.sub(node.name, 1, string.len(node.name)-5)
+		node.param2 = minetest.dir_to_facedir(minetest.wallmounted_to_dir(node.param2))
+		minetest.set_node(pos, node)
+		return true
+	end
+end
+
+-- API functions -------------------------------------------------------------------------------------------------------
+
+--- @class HeadDef
+--- @field name string identifier for node
+--- @field texture string texture filename for node
+--- @field description string translated description
+--- @field longdesc string translated doc description
+--- @field armor_texture string texture filename for armor
+--- @field range_mob string name of mob affected by range reduction
+--- @field range_factor number factor of range reduction
+
+--- registers a head
+--- @param head_def HeadDef head node definition
+function mcl_heads.register_head(head_def)
+	local name = "mcl_heads:" ..head_def.name
+
+	-- register the floor head node
+	minetest.register_node(name, table.update(table.copy(mcl_heads.deftemplate_floor), {
+		description = head_def.description,
+		_doc_items_longdesc = head_def.longdesc,
+
 		-- The head textures are based off the textures of an actual mob.
 		tiles = {
 			-- Note: bottom texture is overlaid over top texture to get rid of possible transparency.
 			-- This is required for skeleton skull and wither skeleton skull.
-			"[combine:16x16:-4,4="..texture, -- top
-			"([combine:16x16:-4,4="..texture..")^([combine:16x16:-12,4="..texture..")", -- bottom
-			"[combine:16x16:-12,0="..texture, -- left
-			"[combine:16x16:4,0="..texture, -- right
-			"[combine:16x16:-20,0="..texture, -- back
-			"[combine:16x16:-4,0="..texture, -- front
+			"[combine:16x16:-4,4="  ..head_def.texture, -- top
+			"([combine:16x16:-4,4=" ..head_def.texture..")^([combine:16x16:-12,4="..head_def.texture..")", -- bottom
+			"[combine:16x16:-12,0=" ..head_def.texture, -- left
+			"[combine:16x16:4,0="   ..head_def.texture, -- right
+			"[combine:16x16:-20,0=" ..head_def.texture, -- back
+			"[combine:16x16:-4,0="  ..head_def.texture, -- front
 		},
-		use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "opaque" or false,
-		paramtype = "light",
-		stack_max = 64,
-		paramtype2 = "facedir",
-		sunlight_propagates = true,
-		walkable = true,
-		selection_box = {
-			type = "fixed",
-			fixed = { -0.25, -0.5, -0.25, 0.25, 0.0, 0.25, },
-		},
-		sounds = mcl_sounds.node_sound_defaults({
-			footstep = {name="default_hard_footstep", gain=0.3}
-		}),
-		on_place = function(itemstack, placer, pointed_thing)
-			if pointed_thing.type ~= "node" then
-				-- no interaction possible with entities, for now.
-				return itemstack
-			end
 
-			local under = pointed_thing.under
-			local node = minetest.get_node(under)
-			local def = minetest.registered_nodes[node.name]
-			if not def then return itemstack end
+		_mcl_armor_mob_range_mob = head_def.range_mob,
+		_mcl_armor_mob_range_factor = head_def.range_factor,
+		_mcl_armor_texture = head_def.armor_texture
+	}))
 
-			-- Call on_rightclick if the pointed node defines it
-			if placer and not placer:get_player_control().sneak then
-				if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
-					return minetest.registered_nodes[node.name].on_rightclick(under, node, placer, itemstack) or itemstack
-				end
-			end
-
-			local above = pointed_thing.above
-			local diff = {x = under.x - above.x, y = under.y - above.y, z = under.z - above.z}
-			local wdir = minetest.dir_to_wallmounted(diff)
-
-			local itemstring = itemstack:get_name()
-			local fakestack = ItemStack(itemstack)
-			--local idef = fakestack:get_definition()
-			local retval
-			if wdir == 0 or wdir == 1 then
-				return minetest.item_place(itemstack, placer, pointed_thing)
-			else
-				retval = fakestack:set_name("mcl_heads:"..name.."_wall")
-			end
-			if not retval then
-				return itemstack
-			end
-			itemstack = minetest.item_place(fakestack, placer, pointed_thing, wdir)
-			itemstack:set_name(itemstring)
-			return itemstack
-		end,
-		on_secondary_use = equip_armor,
-
-		on_rotate = on_rotate_floor,
-
-		_mcl_armor_mob_range_mob = rangemob,
-		_mcl_armor_mob_range_factor = rangefactor,
-		_mcl_armor_element = "head",
-		_mcl_armor_texture = "mcl_heads_" .. name .. ".png",
-		_mcl_blast_resistance = 1,
-		_mcl_hardness = 1,
-	})
-
-	minetest.register_node("mcl_heads:"..name.."_wall", {
-		_doc_items_create_entry = false,
-		drawtype = "nodebox",
-		is_ground_content = false,
-		node_box = {
-			type = "wallmounted",
-			wall_bottom = { -0.25, -0.5, -0.25, 0.25, 0.0, 0.25, },
-			wall_top = { -0.25, 0.0, -0.25, 0.25, 0.5, 0.25, },
-			wall_side = { -0.5, -0.25, -0.25, 0.0, 0.25, 0.25, },
-		},
-		groups = {handy=1, head=1, deco_block=1, dig_by_piston=1, not_in_creative_inventory=1},
+	-- register the wall head node
+	minetest.register_node(name .."_wall", table.update(table.copy(mcl_heads.deftemplate_wall), {
 		-- The head textures are based off the textures of an actual mob.
 		tiles = {
-			{ name = "[combine:16x16:-4,-4="..texture, align_style = "world" }, -- front
-			{ name = "[combine:16x16:-20,-4="..texture, align_style = "world" }, -- back
-			{ name = "[combine:16x16:-8,-4="..texture, align_style = "world" }, -- left
-			{ name = "[combine:16x16:0,-4="..texture, align_style = "world" }, -- right
-			{ name = "([combine:16x16:-4,0="..texture..")^[transformR180", align_style = "node" }, -- top
-			{ name = "([combine:16x16:-4,8="..texture..")^([combine:16x16:-12,8="..texture..")", align_style = "node" }, -- bottom
+			{ name = "[combine:16x16:-4,-4=" ..head_def.texture, align_style = "world" }, -- front
+			{ name = "[combine:16x16:-20,-4="..head_def.texture, align_style = "world" }, -- back
+			{ name = "[combine:16x16:-8,-4=" ..head_def.texture, align_style = "world" }, -- left
+			{ name = "[combine:16x16:0,-4="  ..head_def.texture, align_style = "world" }, -- right
+			{ name = "([combine:16x16:-4,0=" ..head_def.texture ..")^[transformR180", align_style = "node" }, -- top
+			-- Note: bottom texture is overlaid over top texture to get rid of possible transparency.
+			-- This is required for skeleton skull and wither skeleton skull.
+			{ name = "([combine:16x16:-4,8=" ..head_def.texture ..")^([combine:16x16:-12,8=" ..head_def.texture..")", align_style = "node" }, -- bottom
 		},
-		use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "opaque" or false,
-		paramtype = "light",
-		stack_max = 64,
-		paramtype2 = "wallmounted",
-		sunlight_propagates = true,
-		walkable = true,
-		sounds = mcl_sounds.node_sound_defaults({
-			footstep = {name="default_hard_footstep", gain=0.3}
-		}),
-		drop = "mcl_heads:"..name,
-		on_rotate = on_rotate_wall,
-		_mcl_blast_resistance = 1,
-		_mcl_hardness = 1,
-	})
-
-	if mod_doc then
-		doc.add_entry_alias("nodes", "mcl_heads:" .. name, "nodes", "mcl_heads:" .. name .. "_wall")
-	end
+		drop = name,
+	}))
 end
 
--- Add heads
-addhead("zombie", "mcl_heads_zombie_node.png", S("Zombie Head"), S("A zombie head is a small decorative block which resembles the head of a zombie. It can also be worn as a helmet, which reduces the detection range of zombies by 50%."), "mobs_mc:zombie", 0.5)
-addhead("creeper", "mcl_heads_creeper_node.png", S("Creeper Head"), S("A creeper head is a small decorative block which resembles the head of a creeper. It can also be worn as a helmet, which reduces the detection range of creepers by 50%."), "mobs_mc:creeper", 0.5)
+-- initial heads -------------------------------------------------------------------------------------------------------
+
+mcl_heads.register_head{
+	name = "zombie",
+	texture = "mcl_heads_zombie_node.png",
+	description = S("Zombie Head"),
+	longdesc = S("A zombie head is a small decorative block which resembles the head of a zombie. It can also be worn as a helmet, which reduces the detection range of zombies by 50%."),
+	armor_texture = "mcl_heads_zombie.png",
+	range_mob = "mobs_mc:zombie",
+	range_factor = 0.5,
+}
+
+mcl_heads.register_head{
+	name = "creeper",
+	texture = "mcl_heads_creeper_node.png",
+	description = S("Creeper Head"),
+	longdesc = S("A creeper head is a small decorative block which resembles the head of a creeper. It can also be worn as a helmet, which reduces the detection range of creepers by 50%."),
+	armor_texture = "mcl_heads_creeper.png",
+	range_mob = "mobs_mc:creeper",
+	range_factor = 0.5,
+}
+
 -- Original Minecraft name: “Head”
-addhead("steve", "mcl_heads_steve_node.png", S("Human Head"), S("A human head is a small decorative block which resembles the head of a human (i.e. a player character). It can also be worn as a helmet for fun, but does not offer any protection."))
-addhead("skeleton", "mcl_heads_skeleton_node.png", S("Skeleton Skull"), S("A skeleton skull is a small decorative block which resembles the skull of a skeleton. It can also be worn as a helmet, which reduces the detection range of skeletons by 50%."), "mobs_mc:skeleton", 0.5)
-addhead("wither_skeleton", "mcl_heads_wither_skeleton_node.png", S("Wither Skeleton Skull"), S("A wither skeleton skull is a small decorative block which resembles the skull of a wither skeleton. It can also be worn as a helmet for fun, but does not offer any protection."))
+mcl_heads.register_head{
+	name = "steve",
+	texture = "mcl_heads_steve_node.png",
+	description = S("Human Head"),
+	longdesc = S("A human head is a small decorative block which resembles the head of a human (i.e. a player character). It can also be worn as a helmet for fun, but does not offer any protection."),
+	armor_texture = "mcl_heads_steve.png",
+}
+
+mcl_heads.register_head{
+	name = "skeleton",
+	texture = "mcl_heads_skeleton_node.png",
+	description = S("Skeleton Skull"),
+	longdesc = S("A skeleton skull is a small decorative block which resembles the skull of a skeleton. It can also be worn as a helmet, which reduces the detection range of skeletons by 50%."),
+	armor_texture = "mcl_heads_skeleton.png",
+	range_mob = "mobs_mc:skeleton",
+	range_factor = 0.5,
+}
+
+mcl_heads.register_head{
+	name = "wither_skeleton",
+	texture = "mcl_heads_wither_skeleton_node.png",
+	description = S("Wither Skeleton Skull"),
+	longdesc = S("A wither skeleton skull is a small decorative block which resembles the skull of a wither skeleton. It can also be worn as a helmet for fun, but does not offer any protection."),
+	armor_texture = "mcl_heads_wither_skeleton.png",
+}

From 44d234dd2c6c211649fae753d999990359753a8f Mon Sep 17 00:00:00 2001
From: iliekprogrammar <iliekprogrammar@gmail.com>
Date: Thu, 11 Aug 2022 17:12:18 +0800
Subject: [PATCH 09/21] [heads] implement 16 directional head node

---
 mods/ITEMS/mcl_heads/init.lua                 | 74 +++++++++++++++++--
 .../mcl_heads/models/mcl_heads_floor22_5.obj  | 42 +++++++++++
 .../mcl_heads/models/mcl_heads_floor45.obj    | 42 +++++++++++
 .../mcl_heads/models/mcl_heads_floor67_5.obj  | 42 +++++++++++
 4 files changed, 192 insertions(+), 8 deletions(-)
 create mode 100644 mods/ITEMS/mcl_heads/models/mcl_heads_floor22_5.obj
 create mode 100644 mods/ITEMS/mcl_heads/models/mcl_heads_floor45.obj
 create mode 100644 mods/ITEMS/mcl_heads/models/mcl_heads_floor67_5.obj

diff --git a/mods/ITEMS/mcl_heads/init.lua b/mods/ITEMS/mcl_heads/init.lua
index 14f79bfa9..25f1b9d2f 100644
--- a/mods/ITEMS/mcl_heads/init.lua
+++ b/mods/ITEMS/mcl_heads/init.lua
@@ -11,6 +11,9 @@ end
 
 mcl_heads = {}
 
+-- rotations of head nodes within a quadrant (0° ≤ θ ≤ 90°)
+mcl_heads.FLOOR_DEGREES = { [0]='', '22_5', '45', '67_5', }
+
 -- box of head nodes
 mcl_heads.FLOOR_BOX = { -0.25, -0.5, -0.25, 0.25, 0.0, 0.25, }
 
@@ -50,6 +53,38 @@ mcl_heads.deftemplate_floor = {
 	on_secondary_use = equip_armor,
 }
 
+mcl_heads.deftemplate_floor_angled = {
+	drawtype = "mesh",
+	selection_box = {
+		type = "fixed",
+		fixed = mcl_heads.FLOOR_BOX,
+	},
+	collision_box = {
+		type = "fixed",
+		fixed = mcl_heads.FLOOR_BOX,
+	},
+	groups = {
+		handy = 1,
+		head = 1,
+		deco_block = 1,
+		dig_by_piston = 1,
+		not_in_creative_inventory = 1,
+	},
+	use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "opaque" or false,
+	paramtype = "light",
+	paramtype2 = "facedir",
+	stack_max = 64,
+	sunlight_propagates = true,
+	sounds = mcl_sounds.node_sound_defaults{
+		footstep = {name="default_hard_footstep", gain=0.3},
+	},
+	is_ground_content = false,
+
+	_doc_items_create_entry = false,
+	_mcl_blast_resistance = 1,
+	_mcl_hardness = 1,
+}
+
 function mcl_heads.deftemplate_floor.on_rotate(pos, node, user, mode, new_param2)
 	if mode == screwdriver.ROTATE_AXIS then
 		node.name = node.name .. "_wall"
@@ -80,16 +115,30 @@ function mcl_heads.deftemplate_floor.on_place(itemstack, placer, pointed_thing)
 	local dir = {x = under.x - above.x, y = under.y - above.y, z = under.z - above.z}
 	local wdir = minetest.dir_to_wallmounted(dir)
 
-	-- place floor mob head
-	if wdir == 0 or wdir == 1 then
-		return minetest.item_place(itemstack, placer, pointed_thing)
-	end
-
-	-- place wall mob head
 	local itemstring = itemstack:get_name()
 	local placestack = ItemStack(itemstack)
-	placestack:set_name(itemstring .."_wall")
-	itemstack = minetest.item_place(placestack, placer, pointed_thing, wdir)
+
+	-- place wall head node (elsewhere)
+	if wdir ~= 0 and wdir ~= 1 then
+		placestack:set_name(itemstring .."_wall")
+		itemstack = minetest.item_place(placestack, placer, pointed_thing, wdir)
+	-- place floor head node (floor and ceiling)
+	else
+		local fdir = minetest.dir_to_facedir(dir)
+
+		-- determine the head node rotation based on player's yaw (in cw direction from North/Z+)
+		local yaw = math.pi*2 - placer:get_look_horizontal()
+
+		local rotation_level = math.min(math.max(math.round((yaw / (math.pi*2)) * 16), 0), 15)
+		placestack:set_name(itemstring ..mcl_heads.FLOOR_DEGREES[rotation_level % 4])
+
+		-- determine the head node face direction based on rotation level
+		fdir = math.floor(rotation_level / 4)
+
+		itemstack = minetest.item_place(placestack, placer, pointed_thing, fdir)
+	end
+
+	-- restore item from angled and wall head nodes
 	itemstack:set_name(itemstring)
 	return itemstack
 end
@@ -174,6 +223,15 @@ function mcl_heads.register_head(head_def)
 		_mcl_armor_texture = head_def.armor_texture
 	}))
 
+	-- register the angled floor head nodes
+	for i, d in ipairs(mcl_heads.FLOOR_DEGREES) do
+		minetest.register_node(name ..d, table.update(table.copy(mcl_heads.deftemplate_floor_angled), {
+			mesh = "mcl_heads_floor" ..d ..".obj",
+			tiles = { head_def.armor_texture },
+			drop = name,
+		}))
+	end
+
 	-- register the wall head node
 	minetest.register_node(name .."_wall", table.update(table.copy(mcl_heads.deftemplate_wall), {
 		-- The head textures are based off the textures of an actual mob.
diff --git a/mods/ITEMS/mcl_heads/models/mcl_heads_floor22_5.obj b/mods/ITEMS/mcl_heads/models/mcl_heads_floor22_5.obj
new file mode 100644
index 000000000..8e48015fc
--- /dev/null
+++ b/mods/ITEMS/mcl_heads/models/mcl_heads_floor22_5.obj
@@ -0,0 +1,42 @@
+# Blender v2.93.9 OBJ File: 'mcl_heads_floor_0.blend'
+# www.blender.org
+mtllib mcl_heads_floor22_5.mtl
+o Cube.001
+v -0.326641 -0.500000 0.135299
+v -0.326641 0.000000 0.135299
+v -0.135299 -0.500000 -0.326641
+v -0.135299 0.000000 -0.326641
+v 0.135299 -0.500000 0.326641
+v 0.135299 0.000000 0.326641
+v 0.326641 -0.500000 -0.135299
+v 0.326641 0.000000 -0.135299
+vt 0.875000 0.500000
+vt 0.875000 0.750000
+vt 0.750000 0.750000
+vt 0.750000 0.500000
+vt 0.625000 0.750000
+vt 0.625000 0.500000
+vt 0.500000 0.750000
+vt 0.500000 0.500000
+vt 1.000000 0.500000
+vt 1.000000 0.750000
+vt 0.875000 0.750000
+vt 0.875000 1.000000
+vt 0.750000 1.000000
+vt 0.750000 0.750000
+vt 0.750000 1.000000
+vt 0.625000 1.000000
+vn -0.9239 0.0000 -0.3827
+vn 0.3827 0.0000 -0.9239
+vn 0.9239 0.0000 0.3827
+vn -0.3827 0.0000 0.9239
+vn 0.0000 -1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+usemtl Material.001
+s off
+f 1/1/1 2/2/1 4/3/1 3/4/1
+f 3/4/2 4/3/2 8/5/2 7/6/2
+f 7/6/3 8/5/3 6/7/3 5/8/3
+f 5/9/4 6/10/4 2/2/4 1/1/4
+f 3/11/5 7/12/5 5/13/5 1/14/5
+f 8/5/6 4/3/6 2/15/6 6/16/6
diff --git a/mods/ITEMS/mcl_heads/models/mcl_heads_floor45.obj b/mods/ITEMS/mcl_heads/models/mcl_heads_floor45.obj
new file mode 100644
index 000000000..6300d4484
--- /dev/null
+++ b/mods/ITEMS/mcl_heads/models/mcl_heads_floor45.obj
@@ -0,0 +1,42 @@
+# Blender v2.93.9 OBJ File: 'mcl_heads_floor_0.blend'
+# www.blender.org
+mtllib mcl_heads_floor45.mtl
+o Cube.002
+v -0.353553 -0.500000 0.000000
+v -0.353553 0.000000 0.000000
+v 0.000000 -0.500000 -0.353553
+v 0.000000 0.000000 -0.353553
+v 0.000000 -0.500000 0.353553
+v 0.000000 0.000000 0.353553
+v 0.353553 -0.500000 0.000000
+v 0.353553 0.000000 0.000000
+vt 0.875000 0.500000
+vt 0.875000 0.750000
+vt 0.750000 0.750000
+vt 0.750000 0.500000
+vt 0.625000 0.750000
+vt 0.625000 0.500000
+vt 0.500000 0.750000
+vt 0.500000 0.500000
+vt 1.000000 0.500000
+vt 1.000000 0.750000
+vt 0.875000 0.750000
+vt 0.875000 1.000000
+vt 0.750000 1.000000
+vt 0.750000 0.750000
+vt 0.750000 1.000000
+vt 0.625000 1.000000
+vn -0.7071 0.0000 -0.7071
+vn 0.7071 0.0000 -0.7071
+vn 0.7071 0.0000 0.7071
+vn -0.7071 0.0000 0.7071
+vn 0.0000 -1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+usemtl Material.002
+s off
+f 1/1/1 2/2/1 4/3/1 3/4/1
+f 3/4/2 4/3/2 8/5/2 7/6/2
+f 7/6/3 8/5/3 6/7/3 5/8/3
+f 5/9/4 6/10/4 2/2/4 1/1/4
+f 3/11/5 7/12/5 5/13/5 1/14/5
+f 8/5/6 4/3/6 2/15/6 6/16/6
diff --git a/mods/ITEMS/mcl_heads/models/mcl_heads_floor67_5.obj b/mods/ITEMS/mcl_heads/models/mcl_heads_floor67_5.obj
new file mode 100644
index 000000000..0fe5567e3
--- /dev/null
+++ b/mods/ITEMS/mcl_heads/models/mcl_heads_floor67_5.obj
@@ -0,0 +1,42 @@
+# Blender v2.93.9 OBJ File: 'mcl_heads_floor_0.blend'
+# www.blender.org
+mtllib mcl_heads_floor67_5.mtl
+o Cube.003
+v -0.326641 -0.500000 -0.135299
+v -0.326641 0.000000 -0.135299
+v 0.135299 -0.500000 -0.326641
+v 0.135299 0.000000 -0.326641
+v -0.135299 -0.500000 0.326641
+v -0.135299 0.000000 0.326641
+v 0.326641 -0.500000 0.135299
+v 0.326641 0.000000 0.135299
+vt 0.875000 0.500000
+vt 0.875000 0.750000
+vt 0.750000 0.750000
+vt 0.750000 0.500000
+vt 0.625000 0.750000
+vt 0.625000 0.500000
+vt 0.500000 0.750000
+vt 0.500000 0.500000
+vt 1.000000 0.500000
+vt 1.000000 0.750000
+vt 0.875000 0.750000
+vt 0.875000 1.000000
+vt 0.750000 1.000000
+vt 0.750000 0.750000
+vt 0.750000 1.000000
+vt 0.625000 1.000000
+vn -0.3827 0.0000 -0.9239
+vn 0.9239 0.0000 -0.3827
+vn 0.3827 0.0000 0.9239
+vn -0.9239 0.0000 0.3827
+vn 0.0000 -1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+usemtl Material.003
+s off
+f 1/1/1 2/2/1 4/3/1 3/4/1
+f 3/4/2 4/3/2 8/5/2 7/6/2
+f 7/6/3 8/5/3 6/7/3 5/8/3
+f 5/9/4 6/10/4 2/2/4 1/1/4
+f 3/11/5 7/12/5 5/13/5 1/14/5
+f 8/5/6 4/3/6 2/15/6 6/16/6

From 29d221eed58664c4877e0af1cc5791946b485eb0 Mon Sep 17 00:00:00 2001
From: iliekprogrammar <iliekprogrammar@gmail.com>
Date: Thu, 11 Aug 2022 17:15:39 +0800
Subject: [PATCH 10/21] [heads] remove unnecessarily duplicative textures

these textures are unnecessary to texture the head nodes. we can reuse
the available armor texture for both the headgear/helmet and the nodes.
---
 mods/ITEMS/mcl_heads/init.lua                 |  48 ++++++++----------
 .../textures/mcl_heads_creeper_node.png       | Bin 676 -> 0 bytes
 .../textures/mcl_heads_skeleton_node.png      | Bin 432 -> 0 bytes
 .../textures/mcl_heads_steve_node.png         | Bin 1852 -> 0 bytes
 .../mcl_heads_wither_skeleton_node.png        | Bin 432 -> 0 bytes
 .../textures/mcl_heads_zombie_node.png        | Bin 1112 -> 0 bytes
 6 files changed, 22 insertions(+), 26 deletions(-)
 delete mode 100644 mods/ITEMS/mcl_heads/textures/mcl_heads_creeper_node.png
 delete mode 100644 mods/ITEMS/mcl_heads/textures/mcl_heads_skeleton_node.png
 delete mode 100644 mods/ITEMS/mcl_heads/textures/mcl_heads_steve_node.png
 delete mode 100644 mods/ITEMS/mcl_heads/textures/mcl_heads_wither_skeleton_node.png
 delete mode 100644 mods/ITEMS/mcl_heads/textures/mcl_heads_zombie_node.png

diff --git a/mods/ITEMS/mcl_heads/init.lua b/mods/ITEMS/mcl_heads/init.lua
index 25f1b9d2f..a971d7b91 100644
--- a/mods/ITEMS/mcl_heads/init.lua
+++ b/mods/ITEMS/mcl_heads/init.lua
@@ -189,10 +189,9 @@ end
 
 --- @class HeadDef
 --- @field name string identifier for node
---- @field texture string texture filename for node
+--- @field texture string armor texture for node
 --- @field description string translated description
 --- @field longdesc string translated doc description
---- @field armor_texture string texture filename for armor
 --- @field range_mob string name of mob affected by range reduction
 --- @field range_factor number factor of range reduction
 
@@ -210,24 +209,25 @@ function mcl_heads.register_head(head_def)
 		tiles = {
 			-- Note: bottom texture is overlaid over top texture to get rid of possible transparency.
 			-- This is required for skeleton skull and wither skeleton skull.
-			"[combine:16x16:-4,4="  ..head_def.texture, -- top
-			"([combine:16x16:-4,4=" ..head_def.texture..")^([combine:16x16:-12,4="..head_def.texture..")", -- bottom
-			"[combine:16x16:-12,0=" ..head_def.texture, -- left
-			"[combine:16x16:4,0="   ..head_def.texture, -- right
-			"[combine:16x16:-20,0=" ..head_def.texture, -- back
-			"[combine:16x16:-4,0="  ..head_def.texture, -- front
+			-- Note: -x coords go right per-pixel, -y coords go down per-pixel
+			"[combine:16x16:-36,4="  ..head_def.texture, -- top
+			"([combine:16x16:-36,4=" ..head_def.texture..")^([combine:16x16:-44,4="..head_def.texture..")", -- bottom
+			"[combine:16x16:-28,0=" ..head_def.texture, -- left
+			"[combine:16x16:-44,0=" ..head_def.texture, -- right
+			"[combine:16x16:-52,0=" ..head_def.texture, -- back
+			"[combine:16x16:-36,0="  ..head_def.texture, -- front
 		},
 
 		_mcl_armor_mob_range_mob = head_def.range_mob,
 		_mcl_armor_mob_range_factor = head_def.range_factor,
-		_mcl_armor_texture = head_def.armor_texture
+		_mcl_armor_texture = head_def.texture
 	}))
 
 	-- register the angled floor head nodes
 	for i, d in ipairs(mcl_heads.FLOOR_DEGREES) do
 		minetest.register_node(name ..d, table.update(table.copy(mcl_heads.deftemplate_floor_angled), {
 			mesh = "mcl_heads_floor" ..d ..".obj",
-			tiles = { head_def.armor_texture },
+			tiles = { head_def.texture },
 			drop = name,
 		}))
 	end
@@ -235,15 +235,16 @@ function mcl_heads.register_head(head_def)
 	-- register the wall head node
 	minetest.register_node(name .."_wall", table.update(table.copy(mcl_heads.deftemplate_wall), {
 		-- The head textures are based off the textures of an actual mob.
+		-- Note: -x coords go right per-pixel, -y coords go down per-pixel
 		tiles = {
-			{ name = "[combine:16x16:-4,-4=" ..head_def.texture, align_style = "world" }, -- front
-			{ name = "[combine:16x16:-20,-4="..head_def.texture, align_style = "world" }, -- back
-			{ name = "[combine:16x16:-8,-4=" ..head_def.texture, align_style = "world" }, -- left
-			{ name = "[combine:16x16:0,-4="  ..head_def.texture, align_style = "world" }, -- right
-			{ name = "([combine:16x16:-4,0=" ..head_def.texture ..")^[transformR180", align_style = "node" }, -- top
+			{ name = "[combine:16x16:-36,-4=" ..head_def.texture, align_style = "world" }, -- front
+			{ name = "[combine:16x16:-52,-4="..head_def.texture, align_style = "world" }, -- back
+			{ name = "[combine:16x16:-40,-4=" ..head_def.texture, align_style = "world" }, -- right
+			{ name = "[combine:16x16:-32,-4="  ..head_def.texture, align_style = "world" }, -- left
+			{ name = "([combine:16x16:-36,0=" ..head_def.texture ..")^[transformR180", align_style = "node" }, -- top
 			-- Note: bottom texture is overlaid over top texture to get rid of possible transparency.
 			-- This is required for skeleton skull and wither skeleton skull.
-			{ name = "([combine:16x16:-4,8=" ..head_def.texture ..")^([combine:16x16:-12,8=" ..head_def.texture..")", align_style = "node" }, -- bottom
+			{ name = "([combine:16x16:-36,0=" ..head_def.texture ..")^([combine:16x16:-44,8=" ..head_def.texture..")", align_style = "node" }, -- bottom
 		},
 		drop = name,
 	}))
@@ -253,20 +254,18 @@ end
 
 mcl_heads.register_head{
 	name = "zombie",
-	texture = "mcl_heads_zombie_node.png",
+	texture = "mcl_heads_zombie.png",
 	description = S("Zombie Head"),
 	longdesc = S("A zombie head is a small decorative block which resembles the head of a zombie. It can also be worn as a helmet, which reduces the detection range of zombies by 50%."),
-	armor_texture = "mcl_heads_zombie.png",
 	range_mob = "mobs_mc:zombie",
 	range_factor = 0.5,
 }
 
 mcl_heads.register_head{
 	name = "creeper",
-	texture = "mcl_heads_creeper_node.png",
+	texture = "mcl_heads_creeper.png",
 	description = S("Creeper Head"),
 	longdesc = S("A creeper head is a small decorative block which resembles the head of a creeper. It can also be worn as a helmet, which reduces the detection range of creepers by 50%."),
-	armor_texture = "mcl_heads_creeper.png",
 	range_mob = "mobs_mc:creeper",
 	range_factor = 0.5,
 }
@@ -274,26 +273,23 @@ mcl_heads.register_head{
 -- Original Minecraft name: “Head”
 mcl_heads.register_head{
 	name = "steve",
-	texture = "mcl_heads_steve_node.png",
+	texture = "mcl_heads_steve.png",
 	description = S("Human Head"),
 	longdesc = S("A human head is a small decorative block which resembles the head of a human (i.e. a player character). It can also be worn as a helmet for fun, but does not offer any protection."),
-	armor_texture = "mcl_heads_steve.png",
 }
 
 mcl_heads.register_head{
 	name = "skeleton",
-	texture = "mcl_heads_skeleton_node.png",
+	texture = "mcl_heads_skeleton.png",
 	description = S("Skeleton Skull"),
 	longdesc = S("A skeleton skull is a small decorative block which resembles the skull of a skeleton. It can also be worn as a helmet, which reduces the detection range of skeletons by 50%."),
-	armor_texture = "mcl_heads_skeleton.png",
 	range_mob = "mobs_mc:skeleton",
 	range_factor = 0.5,
 }
 
 mcl_heads.register_head{
 	name = "wither_skeleton",
-	texture = "mcl_heads_wither_skeleton_node.png",
+	texture = "mcl_heads_wither_skeleton.png",
 	description = S("Wither Skeleton Skull"),
 	longdesc = S("A wither skeleton skull is a small decorative block which resembles the skull of a wither skeleton. It can also be worn as a helmet for fun, but does not offer any protection."),
-	armor_texture = "mcl_heads_wither_skeleton.png",
 }
diff --git a/mods/ITEMS/mcl_heads/textures/mcl_heads_creeper_node.png b/mods/ITEMS/mcl_heads/textures/mcl_heads_creeper_node.png
deleted file mode 100644
index 99b432ac67db7900cdbf4ad0075288fc59381168..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 676
zcmV;V0$crwP)<h;3K|Lk000e1NJLTq002M$001Ba0{{R3P_tvV0000aP)t-s0000+
zXg6k=QB{0EXi`UaUQ+-6|4}|Qgt};3Nj#Z;Z-i@HQP33d00007bW%=J0RR90|Nj7p
zeMxoz00JmUL_t(|0d>-`Z<|gO2k=b4ojZ{2kvo1$J@UYc88LTiDHF~+Rm6Mu)TyY)
z)R98Q*dPn_-@rrTf3D`-AS1co>B0Mm<LTa28-oFtLddHwU%Ti>-}Vfd=lD;shQj@r
z=MP=K%+%+sOqzF4(1Q0sBlbzNR~_(}zx;9zR2k=Df%Q8Wu}9<hh3_4RD^z0l5WfR}
zg5&v5iv6#>MAZS;pe~+|*}NsHN*0S20C<!U0N3UWfDsMqQpBsI(SQ*?1K=~C+u!^t
z0}Vulhu>u^Tfnz`KKSvx<jk8{L&MV`Ip7^0#J&a5>yq6ppYQpH`&%FbSA)AI&P#j{
zEpT7M!uLGe{&dgj#vN!-3ss8UX$mJz*JQ9Xz3A08w_{U-L#z%-ldW1XNd=Aa+;G!+
zY^6SGuusaj1;+XaQ=pkHuZ<8zP@yF?5DS#qYVr3js4GSLmU6IB={i%m6L^=M0E4(X
ztqq}ZU6;plw-PE-qB;T2PT<&QnFd|{)4*V;PX<buUc7#|V^ijF4jf==&=8JA4=`>s
zW{(&H*w76z*mOpEpa`yi2KIRB0^3G205+WS9(WoJUQFM;vB^5TJ+`k2tb1Tmi=c8%
zpV5~w3}1%65j^&Q{9j5;<z%=GJVu{9b~ARbE@ilJD35?Rro%6Sh&Y0VB(iYgTm)%h
zLX;AJR9XH-Fn*kaLK?=Eur2~C*ka^_Qq6<vBEV6F(FCOueeef=y1j``>_^N10000<
KMNUMnLSTaNDmEqn

diff --git a/mods/ITEMS/mcl_heads/textures/mcl_heads_skeleton_node.png b/mods/ITEMS/mcl_heads/textures/mcl_heads_skeleton_node.png
deleted file mode 100644
index 0af86cd6a5e79a56e21ea9fb18cc64e40cc99731..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 432
zcmV;h0Z;ykP)<h;3K|Lk000e1NJLTq002M$001Ba0{{R3P_tvV0000UP)t-s|NsAe
zeSMCOj&yW%V`F1ZPEMbnpE@`=l$4ZkaBxcaxQYM(00DGTPE!Ct=GbNc00BTrL_t(|
z0i}>J${R5dg`bu`y)-C>?L6Z|>8%S`W(g^ikPBD@yH8<Xz(rb@d)r7W;>E*mntaAu
zcznz}1{I2thXU5v#kha}?&~+K5epVD{}i@B_kY5|3RMzVFX;-2*hBHW0lC2STmMVr
zKWsL9I+itc6*MJd;S<p=PAmx|IWVsY5=Ac8%T*-GKE@q1!Xn}4XAvO@A{iQDai4Ct
zUrvbY51N63P{=HqhcEZvcR)i)olIxkW5yb5R5lh~1(iMee$*>kHb)N>5@jH;x82s%
zY!-&87AznHm}Cy#Ny{cUw?-+P`FPHr{SV?mvoMBdq0XXU4yB|URd0YO_m99_C)6JJ
z%eHGm;qcZbv`h;m9!N4xSQ2L1gtxha7CQTy4doCh5IbXCdn?d5_mTK}d$EL1lsvZ=
anE3-#<3ZF1Q5;kN0000<MNUMnLSTZvzp#=3

diff --git a/mods/ITEMS/mcl_heads/textures/mcl_heads_steve_node.png b/mods/ITEMS/mcl_heads/textures/mcl_heads_steve_node.png
deleted file mode 100644
index 43c1beb5ac0285b8664bd9f32b05e15bd5db1696..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1852
zcmV-C2gCS@P)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru<pL1`3MWKa%7g#_2FXc8
zK~!ko)tF0c8|M+nf7Bx+mt1nW6iv#K%vg5n8UdmP%EPh|6>bbSMJ~EDEo$_TqK^Ox
z8bCex;P%oMNP7v;A~~dh+f#wUMu7lD^DycbP+KcSYQ*xzZDYxjNkvQ1B$wRfl7wZm
z2WnTl%N0dcX)MiUzsKx{o%!bfpPBWsg*=j!ng>S)xRtqs`zeKkeE-xl9pC@vTNixn
zV(HsTK?(<nh+#%jO;V`@Yj<1Ed_gA`3t4*6xafGVT+rAH($kHS5DK=f#Uh&<zuDTJ
zbwIaLE@*q^=6B?PY-W|=k$sLeF&gq5?{?|i$;+iu)iEC)O|jQxO9!ZW&1vMwKC+or
zPotx8c^wKx#As+wL_${)peT7X-QdQJMTUmrXu5%-<SplzhI=_;w~OzQq|}tcL1M8G
zf)Lp7Om81cw{xg^&5`$Gu~1tr;C|OI>Xb@VRK1224q9iFN>zr2;w&#0taCojsSmVH
z=sP$vKq{5MsMaVJHyFHBsiGTo0A4x$MbDRiaQ^qGdX2UFO=5SOj=iHtA4XB~Em8~%
zRt*t}h*ZioQmI6XLvreag}|-M9oE)AzEr7l=;0JXD2QCG@oXwZ`cR6X=#AxHd}oTK
zd4<c0f)EN~RBOyHD#RiovYAyfN`ZqT0~T+%Gsmt-gXRYUoIm#xFF!X)HnYn7qC)ym
zir9e6oA1r=+QoN>#$}>$nb$79!<+BT5F3z5A4)O5sF2O9^73<&oIm%HMV4mRyHn_{
zBf)HDl~Sc@k(Mlr43F%iqP9N%;-5d_bIB-TTms<M?N$Dh`<Qos^dc3t6*U{hP?1ul
z3Yk^<`hBQ+4WsJJB(f}GRBLS+=7B*VECiT7JxO*!AsQF0F#h#AhJ)g(j6FKa3)4RX
zVC>OR{&4Qwym9Go0Ic0@QmRzZ%2mn*jp@^qynboM;t=yZyCdcomEDmAe)q~(n?fXF
z<?QT&!t0l2THfjL5sQV0h+&FFjTeuN1Mr&<t|H4K6-}p9s<L*!#UazDC#||bD_1cp
z6##zz$G=+rL#a}=o@bwbhOfVI@xf++(t7P~R4PQI5dHm4zI*Ho{OW^isJa=ZcL0bd
z1OPHhfs9gc95nr<WAyhosc97pI_BADpZ9K=OS_<NX!HJ=laDvebSTTMj!qK8t*TJd
z`R!jm>Ud*sJ^5tw`e49w@3ECSGvPJsJV(W;=>S`v|I^2wXeRtEm3*Vgi8IF$6B3`?
zTt<wBIC=J$zHO7BUF@|$v8XYc9^Cjh;PK&Yt#jB9z{1jsV|_F|h!FN8iGj8~yUtdU
z@cR(Lehj@q!tZPG);jm>KRoo=HbYy989{cZe%dlTnnFxS!1AZl3&^sF9RjMRJ0P%?
z7<vQ5fMvYh5r*DCWer&tJHnuo<Qq*AG_0{;ivTgY{i@P;=H%neP73bZvl|8=WnnPb
z3&2Y49?54%>AAAR-+ihh0!}m~5`G`o)isCyV6fK;Yljno-1q^KS8umFz{UZa!NlDE
z;q`y|w)`O?iDAc$xaYDgIt;h(o5q;qx?yntc$yPUiDFT681JQTH{Q@27<vOC>?b#V
zfVyE=ykhE@=h(*yzt1st@BiO_iLKP`u~NI&ssv{h>V`q$Yfm%vP>iXEVx;2%#|_){
zJz;cejJjbUT+4SP+HT0WYYvD?8#itro407c{iqbCta{^hFxU&%^5g`8<kV9Lf0}cI
z@0K$46uFFoa4p}}4eq!ZG7Z|UM5XYiX))pV(Q{>qTt>k-HRiyz7pa;1x$y%m{d<9)
zD@&x~fvyO#o3)M+U}s)83!8I0nYr}`>2=`R?u6@?7pPAd1db#fWaid4jjtO9<ynQa
z)Q6!r9E9f?;*Gke(cOlB8wAXh=Z*;XO}imrXWbUIdo6}vnN?sSMQ;26xyuU{@!9q7
zA0M@h9}M<d2AOA>hFW5qySZdA*vnF({@JBLcd6_cXF(lyI?$`Ga68!4Q8k@nQQJ{L
z_3qrwjzrRT<j5$=kyZzn%d}cl`@C)#1cX)-WRC6ov$Jz;glT@TI_!j!+kj36ndP#(
z6n8tYn+xg~0bdzA+}ueCJ25fl>A+k@aXdG3uzl{9Tt*>z^|qr<Ffnd&gd2kHe&Kr`
ze(2ja1h(Vh&73qbF~;od98)iRnYS;z|39axpS=1FKDoKf{=-9#XStwp^y$x|<<<3G
z0Bd~XAO9j67ukP!h$p`F<IWK1)ZuyUby~BBdU7NMvva(C;eAK#zgchL#RH~MtxgZC
q-fwk%%V_!b+F#47mhoQuZuu`*mWC5$FZe_N0000<MNUMnLSTXyj+L|k

diff --git a/mods/ITEMS/mcl_heads/textures/mcl_heads_wither_skeleton_node.png b/mods/ITEMS/mcl_heads/textures/mcl_heads_wither_skeleton_node.png
deleted file mode 100644
index 671f4054799ad1b8277f6f460b8f0ec35d431a2f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 432
zcmV;h0Z;ykP)<h;3K|Lk000e1NJLTq002M$001Ba0{{R3P_tvV0000UP)t-s0000o
zGBP$cHZU+SEG#T0CMG*OJ0T$<I5;>jFE42HUQz%600DGTPE!Ct=GbNc00BTrL_t(|
z0i}>J${R5dg`bu`y)-C>?L6Z|>8%S`W(g^ikPBD@yH8<Xz(rb@d)r7W;>E*mntaAu
zcznz}1{I2thXU5v#kha}?&~+K5epVD{}i@B_kY5|3RMzVFX;-2*hBHW0lC2STmMVr
zKWsL9I+itc6*MJd;S<p=PAmx|IWVsY5=Ac8%T*-GKE@q1!Xn}4XAvO@A{iQDai4Ct
zUrvbY51N63P{=HqhcEZvcR)i)olIxkW5yb5R5lh~1(iMee$*>kHb)N>5@jH;x82s%
zY!-&87AznHm}Cy#Ny{cUw?-+P`FPHr{SV?mvoMBdq0XXU4yB|URd0YO_m99_C)6JJ
z%eHGm;qcZbv`h;m9!N4xSQ2L1gtxha7CQTy4doCh5IbXCdn?d5_mTK}d$EL1lsvZ=
anE3-#<3ZF1Q5;kN0000<MNUMnLSTX%4W<DA

diff --git a/mods/ITEMS/mcl_heads/textures/mcl_heads_zombie_node.png b/mods/ITEMS/mcl_heads/textures/mcl_heads_zombie_node.png
deleted file mode 100644
index ef85701e8f5f965cf902bee67349bf5d1fc54a96..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1112
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!?gjXSxPk;TT*8~eqdTH~D+6P@
zVtq<|3_{Gqo1_2#|G#Bj$L6)I8&)^w&CFiCuyoeMWQ!OZ-(uf@iU5}^_n@jE=XB?k
z$tg3p_RFZt1~?mNc^P;H>`LiLigq;2_Oo?wY4$Ae^wd}JpE6l5GSYwA)QF`^tQ=+=
zS+qwiUS#jK%D%KDZS9)WHLKm*TJ1_p4C7*_wMMU;RkUD2YI{YHuG=glztyI}J1V*p
z+GgbjN9`-FJf&vc+`p*YKJHjj%|)5)Z27V>iP+fUG`E?p*+6Ien`sx!%&v;_Y|01*
zisU7WSp$9ORubeF%mDNc7ytzr{sR%|0H{&iGAM+Bf$6cQi(^OyW6k77zC{KCF4oMO
z)&#8YnD^p;{R`iVv+lUna?Z>th%4k=$yoNck(tMO8k58^!FP3Y(hOyTTmCY(`?1Yn
z2uhGJj`8{Ic_z54MBumb8wJ)Y?cG1WxX*be(kQp!{Ym*I!Tl_6Sod+>QEk}9AU>a!
zWx?y+4sCOeuV-plB-x;GLFlN(jvqT*L>05PbLnvTIPCcG-gMg2J#o{rH->LNYdD*M
zc{8^Gx03Gbr7`DDi?aPuz3^<tG{vH~!L_UEcb}Ya&h-Tcv-K&Upw@~fQyBDu--bJD
zStZ0yXU!^Cxg|6C_O#F20z)oK|78tSx#0VkBe!qn{Pi2B{p^udn;Y1rH{rW=r`d6q
z&5>#iSqk^PuiW)A6i``n)^KL*ii2E79Qal=xeM}FUwk&Bg6rP=>eC@V-K8Q|m<q5M
z&RG9VV5{cgo!NKq|6k~_?f9dA<>~4khn~(T2@w9%`Lg8J>$A^N%yz#PxDfrt?aH)%
zre)i|y!>;|U_0ZgrVmH|Gl}iJm(Iw4<w#-71B=b;4xi@wuz%fy(jN`cjT@6!sB)+r
zkO+Be!``y+c;oHo*EB9!^u>ycZ&mALlbAI{x<*ofQN3@jh_fsUXOE+UvHK#A1E(82
zCH&MBwH;<Pn4H~Y<9#{0!DZ2QhHHrjIBqb^%4IOCKUf&Rpg%E6G%v<AQp`0}wB`3@
zE~cQ81a8F-%8nUTmipQc9^90?5_;gWHD8sB3r}FI$k)?9zudpEMfbeWbU}%(w5@UL
z<C2)oZoh3azWE^G{j9WhMeEfYza{iKf0nwzAiv?iaQowr1s0zUpJlx9;_pXqn~9%)
zmM~7SKAc$oq{=b$bMe}Yb?Zt~na|0Z6wki5B{<;mBdv8;x2||~+%YDRr-<<{qq@|B
z>5S*jX|U~ZV9ez$ILgY_%D9+K;Xr~}!@rrGlO-H>GTu0_f{}wEYs1Ekjki+s@*X{M
zVAQ$QzL{}GgATKZs3Wgac{xA7zyI@z84OEb3NWZ#7Lh(?cYX&bzj(U(xvX<aXaWH5
C@B!lh


From de072096541d58aa347d8c0dd6657ff05e471456 Mon Sep 17 00:00:00 2001
From: iliekprogrammar <iliekprogrammar@gmail.com>
Date: Thu, 11 Aug 2022 17:34:20 +0800
Subject: [PATCH 11/21] [heads] optimize textures

`optipng -strip all -o7 -zm9`
---
 .../mcl_heads/textures/mcl_heads_steve.png      | Bin 970 -> 382 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/mods/ITEMS/mcl_heads/textures/mcl_heads_steve.png b/mods/ITEMS/mcl_heads/textures/mcl_heads_steve.png
index 361795a52b7b2e15923bea8f1a5b76bc2f60e9cd..471a8b3c82f753601954ecb79e11ff9c28499000 100644
GIT binary patch
delta 366
zcmV-!0g?X72mS((8Gi!+005Okj<x^*06b7kR7C&)03{X<B^MAeAs96y8A2~3Ml>W)
zJ}gv0FkVbKmsv=oXI7|eRkC_xwtQf}iEhV`a?YH9+pm!S|Nnex_>lkr00DGTPE!Ct
z=GbNc008hwL_t&-8STMaQUXB`MZr_I3kM;B{clu>vAb`n0e?RJX80#F*hx8Z<j}&+
z8#l>LQft+wK!Eun_6oiT#24{HJkI8ic*ICRAbur}F_8Qtb~2Da3JE25$zHR1t7!xX
zbC+z86cEE$W$~tfveW4{HIfb4YJ!Vpfra4`aF|3ZxjERNh7VE7;9CtxbuqJzWMmf`
zGPx|Hr`D@<U1ybjEEh5j3_xrdHtoee_lSPB4-I?Z0$RDTp*WhgJR0xo3+wdEncX;|
z)JZm+LJS;Q=aCO^;p9|Yjp3ARu%=>JZD`C19HWeR<(qkWdV0G11jM>|RXv=xo&W#<
M07*qoM6N<$g8#gmK>z>%

delta 959
zcmV;w13>)#0?G%F8Gi-<005$$euMx300v@9M??Vs0RI60puMM)00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-^q5dsPl66y}8000A5Nkl<ZXx{CYKWrOi6u^IWZOYlc
zv+wMrCncvOSgn)|i6uo!kN`!MIx{kKL6urDgrP%))U9G+K!55$rHB=X%GQ!10aDr_
z11PW%snpcXx#eQlzRUeh>tHiDx!}}I!(>~%-}2pkckkWz-uJ%u-o+SjPM*lMr?dhO
z^d}q~a~Xk;-=95H{=+Z7jUDzpG3XA+WdtNKgQm7o)e&}@ov~JTk>zywUN$dw$!*o0
zBk7Mb1f<f!bANNP^kU;*G&i&kI4WCp=g2!h)DEcVRmQc^t~oKA?s@$(62rXXrs;Lv
zkH4Y*Zyf{g0Lu-!jnqb|=+&M^XY<PLQD`7$(?^Pgp@;y(sNuLi>+5C4#_~9>k73k8
z=j<8Y%MmXlHVAb-ml2TVG^y0<`#W<i!NZMBEH~(?`+u^Wey$fdDC_&%n5Kv22IMkA
zsKYcp#>VnIdQ=bf^gRNmv;wL+g6{=18v7aCv^`vZ8-R=R@AQ=YWbp=;8?e)ABRAV!
z&!(p*F^pO#DP~e(4<Sh+_EvzZj$oSJU_^kX=0l^4lPamSfbRvor>aa8RRmG$DH}L8
z4@(9=8h=J8Qz{!_kDwd%(82$$9DCR6>*fBJ!6~f}E^P7gc`lrpqoP+Sl?^6}Dsn;L
z+VTolmu`{GD`fKuSC?*aZFvQ`pfFKXDU}T>dX)=j=2*OZK1`N-VSliM4qOtf=v7SH
z3zL?jh>UBa*j8upOFyk~>O>YXp9A2*MwNS;e}D4*r{}P(PSor-Lk&#Z1HDQj8N+e|
ze6PEbD2j;h1z2vtv3?sL|EG1O)oQaaKZk9)#Nsi&ySqm7X_MdoHdwvCfo7H1ux+k?
zv&_=%yG)<b5bpiL7q{=QRx$9rr##*?dHdufwZ{!k7bp1nkNZ^XHUOTtjd1)m5{WoL
z@P7<JI8Lc-@T|Gh{~Yl3#ShvkNeXLr<u8NJe^}{+XFP^1r;)@AjfTUynYRG=YV}tX
zMZ|VoOw(hh)k%O0^K)Te;B0yLcE<sq-Mkb2KbW=`j+f5P_WuZ&yS=+_+eo=I$z+?4
zX5Qrb>Tg(Xuv_b&0FWO^g~?4f>Royk-Z-5hnQRj{c6fC5bYD6<d+4_#A|fIpA|fIp
hA|fIpA|hTb{sm_hfdSP<3JU-L002ovPDHLkV1jq;%|-wK


From f86898b2f432bc63e8654bad0ee277bed19f5400 Mon Sep 17 00:00:00 2001
From: cora <coradelamouche@gmx.ch>
Date: Sun, 7 Aug 2022 00:44:02 +0200
Subject: [PATCH 12/21] make ruined portals rarer

---
 mods/MAPGEN/mcl_structures/ruined_portal.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mods/MAPGEN/mcl_structures/ruined_portal.lua b/mods/MAPGEN/mcl_structures/ruined_portal.lua
index 002195f76..618cc407b 100644
--- a/mods/MAPGEN/mcl_structures/ruined_portal.lua
+++ b/mods/MAPGEN/mcl_structures/ruined_portal.lua
@@ -16,7 +16,7 @@ local def = {
 	flags = "place_center_x, place_center_z, all_floors",
 	solid_ground = true,
 	make_foundation = true,
-	chunk_probability = 400,
+	chunk_probability = 800,
 	y_max = mcl_vars.mg_overworld_max,
 	y_min = 1,
 	sidelen = 10,

From cef559c57304ae9b5294916f3111a22bae3dcb5c Mon Sep 17 00:00:00 2001
From: cora <coradelamouche@gmx.ch>
Date: Sun, 7 Aug 2022 01:03:54 +0200
Subject: [PATCH 13/21] Fix ruined portals y offset

---
 mods/MAPGEN/mcl_structures/ruined_portal.lua    |   2 +-
 .../mcl_structures_ruined_portal_1.mts          | Bin 524 -> 537 bytes
 .../mcl_structures_ruined_portal_2.mts          | Bin 521 -> 563 bytes
 .../mcl_structures_ruined_portal_99.mts         | Bin 521 -> 555 bytes
 4 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/mods/MAPGEN/mcl_structures/ruined_portal.lua b/mods/MAPGEN/mcl_structures/ruined_portal.lua
index 618cc407b..00d2d682c 100644
--- a/mods/MAPGEN/mcl_structures/ruined_portal.lua
+++ b/mods/MAPGEN/mcl_structures/ruined_portal.lua
@@ -20,7 +20,7 @@ local def = {
 	y_max = mcl_vars.mg_overworld_max,
 	y_min = 1,
 	sidelen = 10,
-	y_offset = -4,
+	y_offset = -5,
 	filenames = {
 		modpath.."/schematics/mcl_structures_ruined_portal_1.mts",
 		modpath.."/schematics/mcl_structures_ruined_portal_2.mts",
diff --git a/mods/MAPGEN/mcl_structures/schematics/mcl_structures_ruined_portal_1.mts b/mods/MAPGEN/mcl_structures/schematics/mcl_structures_ruined_portal_1.mts
index ae37576dc259184903dd7af589154b8c066aeeda..55a6f2ae306ebb6575b0e82769f9c91cf5b160c9 100644
GIT binary patch
delta 347
zcmV-h0i^zn1epX4O;l4&00aOB01W^Me~}DGk!wE|6>Vc|Ut@1_WjbtOc41#;Y;SjI
zZfB9HNq^my?G}O{42GGrwEvZt%dLm<;a);T4C^#bhcg@R9tKXO4jGv-TXRh86dQ>d
zxEc1q5RG2D;?>wYxu2!J1ZwMD19zi3$lrlVsn_q|q{yQ%`_Y(s`O!?wt;yGZpl(Rb
z(Z4ZS+M__NB5GUfnVKq4_l6p)O^aTd+EV%(GJjHHt!q%f*BWh$ngX>Yw<g~zyw|tW
z@3pk}hOl5>?;79lA<~m4@hkmWYdcjC)>a!ctW7zpW2}?*8FYSzWFo)Z%o=Ro!#Wa3
zdoeKy+!E;!sPSo#mXd|k33$MbSdv8fhl=M{d~j*)kYeAue>c|(d1}amy63LT3?!F?
t)F{@sX}8g&xJ!CakF5}9Rg0RLg_vWZrD$Q#9PwO=(l1QWx)%%=Rg>b-sLKEV

delta 334
zcmV-U0kQs>1dId>O;l4&00aOB01N;Lkqt-|6>Vc|Ut@1_WjbtOc41#;Y;SjIZfB8H
zK#{9Rf4!FN7J?uQhBu~S|0^%oTMq<eBgy#Cm($4|<lW;27C@oUj3@<EYH))r;~+Q(
z!$~XxF~>Fjh*T#!@NAZI+AHcJ+DR2?kx>hm+GsA|M9<2HGBpW9ZIq+QFm|Yo<dj{(
zBtmh`D;POlJtHSxz&RVvd_|8r9areP<&yQhe}XfuXI^M_pXH03j@5~u2f05VH}6l!
z7_RMkpIEhjo$$NQyA+CDaYcqAt*iaiDd*VeDV<jcZv8l0%ot~^VCz$-oXpctwR^Je
zv|+CMqkqwM>`{kS<vfGNvl}Wjbu{&VSV&vb1)l$|JG&9RJH{N%!p*A4bAeZOjtDw(
g9O`X35iu8^9WzU~-iL(A_o<3s^;N$OAMuePVWkb4X8-^I

diff --git a/mods/MAPGEN/mcl_structures/schematics/mcl_structures_ruined_portal_2.mts b/mods/MAPGEN/mcl_structures/schematics/mcl_structures_ruined_portal_2.mts
index fd17f1365b9e9770b5337aea9e266e52b6ff8e12..9da16e2ed30b2b3a18fdca438bb2c31a01d88fb5 100644
GIT binary patch
delta 344
zcmV-e0jK_n1hWJUO;l4&00aOB01W^Me~}F4f9+P=mck$m3{YG5-OK0Z*G0l5V=YFu
zNB3dF5eU%9Fik<Ct~uzfJqP2y5B4#8##8%2t)S?U(VIHnetUPBoy$e~2bv#dbnFG<
zFMwzFa1X~f7;EmXW`!<3>Q#zQv8EV(8qy6}JMi$0ZSh16-DdHro)v39$Qs{~PuRtd
zf04CKZOjSOdafCAM@OyQ$F*LwZr<U6wJ;acUlnTh^M$<DIWi~SWjrX(f9niEt?{Hl
z|6AuZOH~_|KJN)FfXv*6P0b5<zW+)sO`iB&AkHAnQdcX1wg`2gH8Xx<eds)e&1wlF
zYcfF_1ZiO#ChmxMSnH|?HJ<xq2#ST!LjShFQFx`3^+Dr8Ioagjo%L=qnoEcg`rLuO
q(plC9<@GEC+Mo53p@Rae%sQ5DgG*;g$oHz5=I9MG^xO@h7GrcF0jTT%

delta 302
zcmV+}0nz@m1c?L;O;l4&00aOB01N;Lkqzd5)t2iLf*=rufi<!JnUBk>#|r4K3d&`y
z4x_~&$B%=cLS#zXvP$K4zeUIhj1yRUs@5fHZAL5of#-+lmqg_*Tg~pMnalMWryepm
zrDvr@*-S!FvwLUn*A->MIVGz>qK)PxNp74I&pqK(g`9jI)a)HJSk8E&$DEEU%scvj
z@jT@XdB%m$B=W7Cj@5~-2cFCG=I7HfhX1(Udoto*TJKzZm4AKzGzO0{#T+X=xw8?$
ztsQ5L8R1+LtR3~1lX&{3dQUPtb(m%u`i{2Y95tA#nCG8JvyEyJud5x;E_B<E`#`$-
zS~!!Ot*qym@SMcxt_4y%6hKQ(J$DBg0OGQ+B;<GJ_aWit_f*+iebKw&15!94TpanA
ACjbBd

diff --git a/mods/MAPGEN/mcl_structures/schematics/mcl_structures_ruined_portal_99.mts b/mods/MAPGEN/mcl_structures/schematics/mcl_structures_ruined_portal_99.mts
index 0834d8923e7ec5617c12bd757dc0119fa6d4133f..463bf19df5f0c1a596663bb38ba9510ccbf539fd 100644
GIT binary patch
delta 398
zcmV;90df9`1giubO;l4&00aOB01f~Oe}8{}e}8{}e}8{}e}4c8ks7Ff7Hwl}Ut?%x
zb98e$V`yb_bYF9AVQg%8oZVJ|wt^rG-B{N9fO>r{zn-FljYn&gdVF0^$`p3*Wsm}_
z1WZ2^cfwk!cf+Kg(wTjbdTvE0BU*nZP|Y>wV{Q-mDMv-gpw!5E0i2D<a&+m^U8}Am
zR7V(@`3Q-*v|BnYSdMgmHEY${L9JRp!77?O%ylRpaMW^gt_!I;s8L~5U82hvc`MPH
z_geL=nb*>!S=Rw~uS4xYy0JYBVi!ohkgCJ@*?m7qwD&Z(N$umK{x8|k4*%c#VFFfb
z<UoiJ<I>oQA)zohF0Q0G_i~0<ZhDEDd?htsq5|_h8*VT}79X=|P9eU*&`PasHakMm
zu2aJwhHekCOM{_QItw&%zOH+e<)~G!vX-6@zB$~*uwCx&0m;jqZr*X%E*4x!5PCi%
sIvMCC!yRsOUlNf6M6j_3A`&^XP6Nw3`nQ9_+wsHK|3SYV9`J}~pWT4DI{*Lx

delta 364
zcmZ3@(#ay_8xrixz{0@Jz{9{<j|3RFCd#a+7tKx1iBHZiO0~*KEK7_}%gHa#%u8nw
z0}E%Q7MB!TC4;E=;@rfXoQgSDr`{B5R^V~vym)Kh^<O*xRYj_9)KTim)qm{4wo~TN
zB7vz)p-m~d-@TVePApW)KJV(R_R2WAp#Q1N_MTrFJ!YE(U)HqjNL?iJHRK>?-_&}s
zm3L|<9<#lYtYi6f#m`j-^q9hyOY+Pyo8KsWrQ+~G(<LdBzE0}Wahcq8NwT*%N^k$W
zS>4Zt^-iQmDZFdbFX&4N5Ax64^ycf1iux$G`0LN-&YK%=^*-i6+0pCo&zD|3Z@E-P
z+IHt>tv%89=fsQ;NgCa-dTp!zvBdZ7yp+;g2A<b*U&(Kgy}sgb&{CWKt{(B+=iGnW
za=(3$<0$iAcM8j~RS$M{+^p+X>Eha`{yb%uvQpvA2&1CypS8VqREvk!UY-BTd=I1B
HZAEPWe!{39


From f1c70fe19da3f1d0a48b92aecb6a91dc91b54cf3 Mon Sep 17 00:00:00 2001
From: cora <coradelamouche@gmx.ch>
Date: Sun, 7 Aug 2022 01:30:49 +0200
Subject: [PATCH 14/21] grass border for water lake

---
 mods/MAPGEN/mcl_terrain_features/init.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mods/MAPGEN/mcl_terrain_features/init.lua b/mods/MAPGEN/mcl_terrain_features/init.lua
index 18f242e36..052f99c8d 100644
--- a/mods/MAPGEN/mcl_terrain_features/init.lua
+++ b/mods/MAPGEN/mcl_terrain_features/init.lua
@@ -205,7 +205,7 @@ mcl_structures.register_structure("water_lake",{
 	y_max = mcl_vars.mg_overworld_max,
 	y_min = minetest.get_mapgen_setting("water_level"),
 	place_func = function(pos,def,pr)
-		return makelake(pos,5,"mcl_core:water_source",{"group:material_stone", "group:sand", "group:dirt","group:grass_block"},nil,pr)
+		return makelake(pos,5,"mcl_core:water_source",{"group:material_stone", "group:sand", "group:dirt","group:grass_block"},"mcl_core:dirt_with_grass",pr)
 	end
 })
 

From 4f96b38fa3a96668da35b5ba4ed0de54811e4603 Mon Sep 17 00:00:00 2001
From: cora <coradelamouche@gmx.ch>
Date: Mon, 1 Aug 2022 01:43:23 +0200
Subject: [PATCH 15/21] Make foundations less cubic

---
 mods/MAPGEN/mcl_structures/api.lua | 90 ++++++++++++++++++++++--------
 1 file changed, 68 insertions(+), 22 deletions(-)

diff --git a/mods/MAPGEN/mcl_structures/api.lua b/mods/MAPGEN/mcl_structures/api.lua
index af08caf07..6850255b3 100644
--- a/mods/MAPGEN/mcl_structures/api.lua
+++ b/mods/MAPGEN/mcl_structures/api.lua
@@ -38,6 +38,73 @@ function mcl_structures.find_highest_y(pp)
 	return y
 end
 
+local function smooth_cube(nn,pos,plane,amnt)
+	local r = {}
+	local amnt = amnt or 9
+	table.sort(nn,function(a, b)
+		if false or plane then
+			return vector.distance(vector.new(pos.x,0,pos.z), vector.new(a.x,0,a.z)) < vector.distance(vector.new(pos.x,0,pos.z), vector.new(b.x,0,b.z))
+		else
+			return vector.distance(pos, a) < vector.distance(pos, b)
+		end
+	end)
+	for i=1,math.max(1,#nn-amnt) do table.insert(r,nn[i]) end
+	return r
+end
+
+local function get_foundation_nodes(ground_p1,ground_p2,pos,sidelen)
+	local replace = {"air","group:liquid","mcl_core:snow","group:tree","group:leaves","group:plant"}
+	local nn = smooth_cube(minetest.find_nodes_in_area(vector.offset(ground_p1,0,-1,0),vector.offset(ground_p2,0,-30,0),replace),vector.offset(pos,0,-30,0),true,sidelen * 64)
+	local stone = {}
+	local filler = {}
+	local top = {}
+	local dust = {}
+	for l,v in pairs(nn) do
+		if v.y == ground_p1.y - 1 then
+			table.insert(filler,v)
+			table.insert(top,vector.offset(v,0,1,0))
+			table.insert(dust,vector.offset(v,0,2,0))
+		elseif v.y < ground_p1.y -1 and v.y > ground_p2.y -4 then table.insert(filler,v)
+		elseif v.y < ground_p2.y - 3 and v.y > ground_p2.y -5 then
+			if math.random(3) == 1 then
+				table.insert(filler,v)
+			else
+				table.insert(stone,v)
+			end
+		else
+			table.insert(stone,v)
+		end
+	end
+	return stone,filler,top,dust
+end
+
+local function foundation(ground_p1,ground_p2,pos,sidelen)
+	local stone,filler,top,dust = get_foundation_nodes(ground_p1,ground_p2,pos,sidelen)
+	local node_stone = "mcl_core:stone"
+	local node_filler = "mcl_core:dirt"
+	local node_top = "mcl_core:dirt_with_grass" or minetest.get_node(ground_p1).name
+	local node_dust = nil
+
+	if minetest.get_mapgen_setting("mg_name") ~= "v6" then
+		local b = minetest.registered_biomes[minetest.get_biome_name(minetest.get_biome_data(pos).biome)]
+		--minetest.log(dump(b.node_top))
+		if b then
+			if b.node_top then node_top = b.node_top end
+			if b.node_filler then node_filler = b.node_filler end
+			if b.node_stone then node_stone = b.node_stone end
+			if b.node_dust then node_dust = b.node_dust end
+		end
+	end
+
+	minetest.bulk_set_node(top,{name=node_top})
+
+	if node_dust then
+		minetest.bulk_set_node(dust,{name=node_dust})
+	end
+	minetest.bulk_set_node(filler,{name=node_filler})
+	minetest.bulk_set_node(stone,{name=node_stone})
+end
+
 function mcl_structures.place_structure(pos, def, pr, blockseed)
 	if not def then	return end
 	local logging = not def.terrain_feature
@@ -55,28 +122,7 @@ function mcl_structures.place_structure(pos, def, pr, blockseed)
 		local solid = minetest.find_nodes_in_area(ground_p1,ground_p2,{"group:solid"})
 		if #solid < ( def.sidelen * def.sidelen ) then
 			if def.make_foundation then
-				local node_stone = "mcl_core:stone"
-				local node_filler = "mcl_core:dirt"
-				local node_top = "mcl_core:dirt_with_grass" or minetest.get_node(ground_p1).name
-				local node_dust = nil
-
-				if minetest.get_mapgen_setting("mg_name") ~= "v6" then
-					local b = minetest.registered_biomes[minetest.get_biome_name(minetest.get_biome_data(pos).biome)]
-					--minetest.log(dump(b.node_top))
-					if b then
-						if b.node_top then node_top = b.node_top end
-						if b.node_filler then node_filler = b.node_filler end
-						if b.node_stone then node_stone = b.node_stone end
-						if b.node_dust then node_dust = b.node_dust end
-					end
-				end
-				local replace = {"air","group:liquid","mcl_core:snow","group:tree","group:leaves"}
-				minetest.bulk_set_node(minetest.find_nodes_in_area(ground_p1,ground_p2,replace),{name=node_top})
-				if node_dust then
-					minetest.bulk_set_node(minetest.find_nodes_in_area(vector.offset(ground_p1,0,1,0),vector.offset(ground_p2,0,1,0),{"air"}),{name=node_dust})
-				end
-				minetest.bulk_set_node(minetest.find_nodes_in_area(vector.offset(ground_p1,0,-1,0),vector.offset(ground_p2,0,-4,0),replace),{name=node_filler})
-				minetest.bulk_set_node(minetest.find_nodes_in_area(vector.offset(ground_p1,0,-5,0),vector.offset(ground_p2,0,-30,0),replace),{name=node_stone})
+				foundation(vector.offset(pos,-def.sidelen/2 - 3,-1,-def.sidelen/2 - 3),vector.offset(pos,def.sidelen/2 + 3,-1,def.sidelen/2 + 3),pos,def.sidelen)
 			else
 				if logging then
 					minetest.log("warning","[mcl_structures] "..def.name.." at "..minetest.pos_to_string(pp).." not placed. No solid ground.")

From b7f26e2ddca9b7e88c89210332a4b41e8d589505 Mon Sep 17 00:00:00 2001
From: cora <coradelamouche@gmx.ch>
Date: Tue, 9 Aug 2022 19:28:30 +0200
Subject: [PATCH 16/21] Add setting to selectively disable strucutres

---
 mods/MAPGEN/mcl_structures/api.lua | 8 ++++++++
 settingtypes.txt                   | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/mods/MAPGEN/mcl_structures/api.lua b/mods/MAPGEN/mcl_structures/api.lua
index 6850255b3..c883c4d7a 100644
--- a/mods/MAPGEN/mcl_structures/api.lua
+++ b/mods/MAPGEN/mcl_structures/api.lua
@@ -1,5 +1,12 @@
 mcl_structures.registered_structures = {}
 
+local disabled_structures = minetest.settings:get("mcl_disabled_structures")
+if disabled_structures then	disabled_structures = disabled_structures:split(",")
+else disabled_structures = {} end
+
+function mcl_structures.is_disabled(structname)
+	if table.indexof(disabled_structures,structname) ~= -1 then return true end
+end
 
 function mcl_structures.fill_chests(p1,p2,loot,pr)
 	for it,lt in pairs(loot) do
@@ -168,6 +175,7 @@ function mcl_structures.place_structure(pos, def, pr, blockseed)
 end
 
 function mcl_structures.register_structure(name,def,nospawn) --nospawn means it will be placed by another (non-nospawn) structure that contains it's structblock i.e. it will not be placed by mapgen directly
+	if mcl_structures.is_disabled(name) then return end
 	local structblock = "mcl_structures:structblock_"..name
 	local flags = "place_center_x, place_center_z, force_placement"
 	local y_offset = 0
diff --git a/settingtypes.txt b/settingtypes.txt
index 35db8bde7..7c8bc651e 100644
--- a/settingtypes.txt
+++ b/settingtypes.txt
@@ -39,6 +39,9 @@ mcl_doTileDrops (Blocks have drops) bool true
 # If enabled, TNT explosions destroy blocks.
 mcl_tnt_griefing (TNT destroys blocks) bool true
 
+# Comma separated list of disabled structure names
+mcl_disabled_structures (Disabled structures) string
+
 [Players]
 # If enabled, players respawn at the bed they last lay on instead of normal
 # spawn.

From 0bcbea4ce3de2a826a14707724645393795aef50 Mon Sep 17 00:00:00 2001
From: cora <coradelamouche@gmx.ch>
Date: Wed, 10 Aug 2022 13:52:19 +0200
Subject: [PATCH 17/21] Add lots of water lakes to mangrove swamps

---
 mods/MAPGEN/mcl_terrain_features/init.lua | 25 +++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/mods/MAPGEN/mcl_terrain_features/init.lua b/mods/MAPGEN/mcl_terrain_features/init.lua
index 052f99c8d..eab33e78e 100644
--- a/mods/MAPGEN/mcl_terrain_features/init.lua
+++ b/mods/MAPGEN/mcl_terrain_features/init.lua
@@ -29,7 +29,7 @@ local function airtower(pos,tbl,h)
 	end
 end
 
-local function makelake(pos,size,liquid,placein,border,pr)
+local function makelake(pos,size,liquid,placein,border,pr,noair)
 	local node_under = minetest.get_node(vector.offset(pos,0,-1,0))
 	local p1 = vector.offset(pos,-size,-1,-size)
 	local p2 = vector.offset(pos,size,-1,size)
@@ -70,7 +70,7 @@ local function makelake(pos,size,liquid,placein,border,pr)
 					end
 					if border == nil or border == "mcl_core:dirt" then border = "mcl_core:dirt_with_grass" end
 				end
-				if an.name ~= liquid then
+				if not noair and an.name ~= liquid then
 					table.insert(br,pp)
 					if un.name ~= liquid then
 						airtower(pp,air,55)
@@ -209,6 +209,27 @@ mcl_structures.register_structure("water_lake",{
 	end
 })
 
+mcl_structures.register_structure("water_lake_mangrove_swamp",{
+	place_on = {"mcl_mud:mud"},
+	biomes = { "MangroveSwamp" },
+	terrain_feature = true,
+	noise_params = {
+		offset = 0,
+		scale = 0.0032,
+		spread = {x = 250, y = 250, z = 250},
+		seed = 6343241353,
+		octaves = 3,
+		persist = 0.001,
+		flags = "absvalue",
+	},
+	flags = "place_center_x, place_center_z, force_placement",
+	y_max = mcl_vars.mg_overworld_max,
+	y_min = minetest.get_mapgen_setting("water_level"),
+	place_func = function(pos,def,pr)
+		return makelake(pos,3,"mcl_core:water_source",{"group:material_stone", "group:sand", "group:dirt","group:grass_block","mcl_mud:mud"},"mcl_mud:mud",pr,true)
+	end
+})
+
 local pool_adjacents = {
 	vector.new(1,0,0),
 	vector.new(-1,0,0),

From 79ce9f89d34ea20121d1e2063ce7d94be6fbbb1d Mon Sep 17 00:00:00 2001
From: cora <coradelamouche@gmx.ch>
Date: Wed, 10 Aug 2022 15:14:51 +0200
Subject: [PATCH 18/21] More adaptive foundation height

---
 mods/MAPGEN/mcl_structures/api.lua | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/mods/MAPGEN/mcl_structures/api.lua b/mods/MAPGEN/mcl_structures/api.lua
index c883c4d7a..e57d4f6be 100644
--- a/mods/MAPGEN/mcl_structures/api.lua
+++ b/mods/MAPGEN/mcl_structures/api.lua
@@ -59,9 +59,24 @@ local function smooth_cube(nn,pos,plane,amnt)
 	return r
 end
 
-local function get_foundation_nodes(ground_p1,ground_p2,pos,sidelen)
-	local replace = {"air","group:liquid","mcl_core:snow","group:tree","group:leaves","group:plant"}
-	local nn = smooth_cube(minetest.find_nodes_in_area(vector.offset(ground_p1,0,-1,0),vector.offset(ground_p2,0,-30,0),replace),vector.offset(pos,0,-30,0),true,sidelen * 64)
+local function find_ground(pos,nn,gn)
+	local r = 0
+	for _,v in pairs(nn) do
+		local p=vector.new(v)
+		repeat
+			local n = minetest.get_node(p).name
+			p = vector.offset(p,0,-1,0)
+		until not n or n == "mcl_core:bedrock" or n == "ignore" or n == gn
+	--minetest.log(tostring(pos.y - p.y))
+		if pos.y - p.y > r then r = pos.y - p.y end
+	end
+	return r
+end
+
+local function get_foundation_nodes(ground_p1,ground_p2,pos,sidelen,node_stone)
+	local replace = {"air","group:liquid","mcl_core:snow","group:tree","group:leaves","group:plant","grass_block","group:dirt"}
+	local depth = find_ground(pos,minetest.find_nodes_in_area(ground_p1,ground_p2,replace),node_stone)
+	local nn = smooth_cube(minetest.find_nodes_in_area(vector.offset(ground_p1,0,-1,0),vector.offset(ground_p2,0,-depth,0),replace),vector.offset(pos,0,-depth,0),true,sidelen * 64)
 	local stone = {}
 	local filler = {}
 	local top = {}
@@ -86,7 +101,6 @@ local function get_foundation_nodes(ground_p1,ground_p2,pos,sidelen)
 end
 
 local function foundation(ground_p1,ground_p2,pos,sidelen)
-	local stone,filler,top,dust = get_foundation_nodes(ground_p1,ground_p2,pos,sidelen)
 	local node_stone = "mcl_core:stone"
 	local node_filler = "mcl_core:dirt"
 	local node_top = "mcl_core:dirt_with_grass" or minetest.get_node(ground_p1).name
@@ -103,7 +117,8 @@ local function foundation(ground_p1,ground_p2,pos,sidelen)
 		end
 	end
 
-	minetest.bulk_set_node(top,{name=node_top})
+	local stone,filler,top,dust = get_foundation_nodes(ground_p1,ground_p2,pos,sidelen,node_stone)
+	minetest.bulk_set_node(top,{name=node_top},node_stone)
 
 	if node_dust then
 		minetest.bulk_set_node(dust,{name=node_dust})

From 6101de8d68e186664eddf70418b8b5960cae8d87 Mon Sep 17 00:00:00 2001
From: cora <coradelamouche@gmx.ch>
Date: Wed, 10 Aug 2022 20:00:30 +0200
Subject: [PATCH 19/21] Fix parrot punch spam

---
 mods/ENTITIES/mobs_mc/parrot.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mods/ENTITIES/mobs_mc/parrot.lua b/mods/ENTITIES/mobs_mc/parrot.lua
index 80a5b9318..9ee03ac58 100644
--- a/mods/ENTITIES/mobs_mc/parrot.lua
+++ b/mods/ENTITIES/mobs_mc/parrot.lua
@@ -118,7 +118,7 @@ end
 
 mcl_mobs:register_mob("mobs_mc:parrot", {
 	description = S("Parrot"),
-	type = "npc",
+	type = "passive",
 	spawn_class = "passive",
 	pathfinding = 1,
 	hp_min = 6,

From 374e30b4a55bfaac152f153b15b5ae1905eafe36 Mon Sep 17 00:00:00 2001
From: cora <coradelamouche@gmx.ch>
Date: Wed, 10 Aug 2022 20:05:25 +0200
Subject: [PATCH 20/21] stay on players shoulder in when flying in creative

---
 mods/ENTITIES/mobs_mc/parrot.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mods/ENTITIES/mobs_mc/parrot.lua b/mods/ENTITIES/mobs_mc/parrot.lua
index 9ee03ac58..d4b6c12e6 100644
--- a/mods/ENTITIES/mobs_mc/parrot.lua
+++ b/mods/ENTITIES/mobs_mc/parrot.lua
@@ -92,7 +92,8 @@ local function check_perch(self,dtime)
 					local n1 = minetest.get_node(vector.offset(p:get_pos(),0,-0.6,0)).name
 					local n2 = minetest.get_node(vector.offset(p:get_pos(),0,0,0)).name
 					local n3 = minetest.get_node(vector.offset(p:get_pos(),0,1,0)).name
-					if n1 == "air" or minetest.get_item_group(n2,"water") > 0 or minetest.get_item_group(n2,"lava") > 0 then
+					if ( n1 == "air" or minetest.get_item_group(n2,"water") > 0 or minetest.get_item_group(n2,"lava") > 0) and
+					not minetest.is_creative_enabled(p:get_player_name()) then
 						o:set_detach()
 						self.detach_timer = 0
 						return

From f0837bdee62453b78806f3e440e0af315e407e99 Mon Sep 17 00:00:00 2001
From: opfromthestart <opfromthestart@gmail.com>
Date: Mon, 8 Aug 2022 14:17:30 -0400
Subject: [PATCH 21/21] Swimming collides with ice properly

---
 mods/PLAYER/mcl_playerplus/init.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mods/PLAYER/mcl_playerplus/init.lua b/mods/PLAYER/mcl_playerplus/init.lua
index c3876269c..7ca56eb17 100644
--- a/mods/PLAYER/mcl_playerplus/init.lua
+++ b/mods/PLAYER/mcl_playerplus/init.lua
@@ -377,8 +377,8 @@ minetest.register_globalstep(function(dtime)
 			set_properties_conditional(player,{collisionbox = {-0.312,0,-0.312,0.312,0.8,0.312}, eye_height = 0.5, nametag_color = { r = 225, b = 225, a = 225, g = 225 }})
 			-- control body bone when swimming
 			set_bone_position_conditional(player,"Body_Control", vector.new(0,6.3,0), vector.new(degrees(dir_to_pitch(player_velocity)) - 90,-player_vel_yaw + yaw + 180,0))
-		elseif get_item_group(mcl_playerinfo[name].node_head, "opaque") == 0
-		and get_item_group(mcl_playerinfo[name].node_head_top, "opaque") == 0 then
+		elseif get_item_group(mcl_playerinfo[name].node_head, "solid") == 0
+		and get_item_group(mcl_playerinfo[name].node_head_top, "solid") == 0 then
 			-- sets eye height, and nametag color accordingly
 			is_swimming = false
 			set_properties_conditional(player,{collisionbox = {-0.312,0,-0.312,0.312,1.8,0.312}, eye_height = 1.5, nametag_color = { r = 225, b = 225, a = 225, g = 225 }})