Merge branch 'biomes'

mods/PLAYER/mcl_playerplus/depends.txt

@@ -6,3 +6,4 @@ mcl_hunger
 mcl_death_messages
 mcl_playerinfo
 3d_armor?
+weather_pack

mods/PLAYER/mcl_playerplus/init.lua

@@ -152,14 +152,22 @@ minetest.register_globalstep(function(dtime)
 		end
 
 		-- Apply black sky in the Void and deal Void damage
-		if pos.y < mcl_vars.mg_bedrock_overworld_max then
-			-- Player reached the void, set black sky box
-			player:set_sky("#000000", "plain", nil, false)
-			-- FIXME: Sky handling in MCL2 is held together with lots of duct tape.
-			-- This only works beause weather_pack currently does not touch the sky for players below the height used for this check.
-			-- There should be a real skybox API.
-		end
 		local void, void_deadly = mcl_util.is_in_void(pos)
+		local _, dim = mcl_util.y_to_layer(pos.y)
+		-- Set dimension skies.
+		-- FIXME: Sky handling in MCL2 is held together with lots of duct tape.
+		-- This only works beause weather_pack currently does not touch the sky for players below the height used for this check.
+		-- There should be a real skybox API.
+		if dim == "void" then
+			player:set_sky("#000000", "plain", nil, false)
+		elseif dim == "end" then
+			local t = "mcl_playerplus_end_sky.png"
+			player:set_sky("#000000", "skybox", {t,t,t,t,t,t}, false)
+		elseif dim == "nether" then
+			player:set_sky("#300808", "plain", nil, false)
+		else
+			skycolor.update_sky_color({player})
+		end
 		if void_deadly then
 			-- Player is deep into the void, deal void damage
 			if player:get_hp() > 0 then