From e6794dc2d8ea3e8e8d16ba0212c95e4cded7f7bd Mon Sep 17 00:00:00 2001 From: teknomunk Date: Thu, 13 Jun 2024 06:43:31 -0500 Subject: [PATCH] Remove empty else block, fix up mg_name and add mapgen check to water.lua --- mods/ENVIRONMENT/mcl_weather/skycolor.lua | 1 - mods/ENVIRONMENT/mcl_weather/skycolor/dimensions.lua | 2 +- mods/ENVIRONMENT/mcl_weather/skycolor/water.lua | 10 +++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mods/ENVIRONMENT/mcl_weather/skycolor.lua b/mods/ENVIRONMENT/mcl_weather/skycolor.lua index b4626b77b..1e6e3198b 100644 --- a/mods/ENVIRONMENT/mcl_weather/skycolor.lua +++ b/mods/ENVIRONMENT/mcl_weather/skycolor.lua @@ -5,7 +5,6 @@ local NIGHT_VISION_RATIO = 0.45 -- Module state local mods_loaded = false -local mg_name = minetest.get_mapgen_setting("mg_name") function mcl_weather.set_sky_box_clear(player, sky, fog) -- Make sure the player's head isn't in water before changing the skybox diff --git a/mods/ENVIRONMENT/mcl_weather/skycolor/dimensions.lua b/mods/ENVIRONMENT/mcl_weather/skycolor/dimensions.lua index 7f9c084c6..16ae0a1d2 100644 --- a/mods/ENVIRONMENT/mcl_weather/skycolor/dimensions.lua +++ b/mods/ENVIRONMENT/mcl_weather/skycolor/dimensions.lua @@ -1,6 +1,7 @@ local MINIMUM_LIGHT_LEVEL = 0.2 local VALID_SNOW_WEATHER_STATES = { snow = true, rain = true, thunder = true } local VALID_RAIN_WEATHER_STATES = { rain = true, thunder = true } +local mg_name = minetest.get_mapgen_setting("mg_name") local dimension_handlers = {} mcl_weather.skycolor.dimension_handlers = dimension_handlers @@ -35,7 +36,6 @@ function dimension_handlers.overworld(player, sky_data) if biome then biomesky = biome._mcl_skycolor biomefog = biome._mcl_fogcolor - else end end diff --git a/mods/ENVIRONMENT/mcl_weather/skycolor/water.lua b/mods/ENVIRONMENT/mcl_weather/skycolor/water.lua index fd6fc12e2..03b1115ce 100644 --- a/mods/ENVIRONMENT/mcl_weather/skycolor/water.lua +++ b/mods/ENVIRONMENT/mcl_weather/skycolor/water.lua @@ -1,5 +1,6 @@ local DEFAULT_WATER_COLOR = "#3F76E4" +local mg_name = minetest.get_mapgen_setting("mg_name") local function water_sky(player, sky_data) local water_color = DEFAULT_WATER_COLOR @@ -8,9 +9,12 @@ local function water_sky(player, sky_data) if minetest.get_item_group(checkname, "water") == 0 then return end local pos = player:get_pos() - local biome_index = minetest.get_biome_data(pos).biome - local biome_name = minetest.get_biome_name(biome_index) - local biome = minetest.registered_biomes[biome_name] + local biome = nil + if mg_name ~= "v6" and mg_name ~= "singlenode" then + local biome_index = minetest.get_biome_data(pos).biome + local biome_name = minetest.get_biome_name(biome_index) + biome = minetest.registered_biomes[biome_name] + end if biome then water_color = biome._mcl_waterfogcolor end if not biome then water_color = DEFAULT_WATER_COLOR end