teknomunk
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity

Make sure overworld always gets a sky update regardless of weather, add assert to enforce sky color gets set every update

This commit is contained in:
teknomunk 2024-06-26 19:51:33 -05:00
parent e407e2e290
commit 09307292bc
2 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mods/ENVIRONMENT/mcl_weather/skycolor.lua
View File

@ -155,7 +155,9 @@ function skycolor.update_player_sky_color(player)
skycolor_filters[i](player, sky_data) skycolor_filters[i](player, sky_data)
end end
if sky_data.sky then player:set_sky(sky_data.sky) end assert(sky_data.sky)
player:set_sky(sky_data.sky)
if sky_data.sun then player:set_sun(sky_data.sun) end if sky_data.sun then player:set_sun(sky_data.sun) end
if sky_data.moon then player:set_moon(sky_data.moon) end if sky_data.moon then player:set_moon(sky_data.moon) end
if sky_data.stars then player:set_stars(sky_data.stars) end if sky_data.stars then player:set_stars(sky_data.stars) end

44
mods/ENVIRONMENT/mcl_weather/skycolor/dimensions.lua
View File

@ -39,12 +39,29 @@ function dimension_handlers.overworld(player, sky_data)
end end
end end
if mcl_weather.state == "none" then -- Use overworld defaults
-- Clear weather local day_color = mcl_weather.skycolor.get_sky_layer_color(0.15)
mcl_weather.set_sky_box_clear(player,biomesky,biomefog) local dawn_color = mcl_weather.skycolor.get_sky_layer_color(0.27)
local night_color = mcl_weather.skycolor.get_sky_layer_color(0.1)
sky_data.sky = {
type = "regular",
sky_color = {
day_sky = day_color,
day_horizon = day_color,
dawn_sky = dawn_color,
dawn_horizon = dawn_color,
night_sky = night_color,
night_horizon = night_color,
},
clouds = true,
}
sky_data.sun = {visible = true, sunrise_visible = true} sky_data.sun = {visible = true, sunrise_visible = true}
sky_data.moon = {visible = true} sky_data.moon = {visible = true}
sky_data.stars = {visible = true} sky_data.stars = {visible = true}
if mcl_weather.state == "none" then
-- Clear weather
mcl_weather.set_sky_box_clear(player,biomesky,biomefog)
return return
end end
@ -83,28 +100,7 @@ function dimension_handlers.overworld(player, sky_data)
local new_light = math.max(light_factor * light_multiplier, MINIMUM_LIGHT_LEVEL) local new_light = math.max(light_factor * light_multiplier, MINIMUM_LIGHT_LEVEL)
sky_data.day_night_ratio = new_light sky_data.day_night_ratio = new_light
end end
return
end end
-- No weather that affects the sky color, use default values
local day_color = mcl_weather.skycolor.get_sky_layer_color(0.15)
local dawn_color = mcl_weather.skycolor.get_sky_layer_color(0.27)
local night_color = mcl_weather.skycolor.get_sky_layer_color(0.1)
sky_data.sky = {
type = "regular",
sky_color = {
day_sky = day_color,
day_horizon = day_color,
dawn_sky = dawn_color,
dawn_horizon = dawn_color,
night_sky = night_color,
night_horizon = night_color,
},
clouds = true,
}
sky_data.sun = {visible = false, sunrise_visible = false}
sky_data.moon = {visible = false}
sky_data.stars = {visible = false}
end end
-- This can't be function dimension_handlers.end() due to lua syntax -- This can't be function dimension_handlers.end() due to lua syntax