From 35b2f3b6384a0cfe1046de73ddee43148f728991 Mon Sep 17 00:00:00 2001 From: FossFanatic Date: Wed, 21 Dec 2022 13:01:54 +0000 Subject: [PATCH 01/13] Make overworld biome specific (daytime) sky and fog colours possible --- mods/ENVIRONMENT/mcl_weather/skycolor.lua | 35 ++++++++++++++++------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/mods/ENVIRONMENT/mcl_weather/skycolor.lua b/mods/ENVIRONMENT/mcl_weather/skycolor.lua index 7bc3ad1fe..7b25fbe9a 100644 --- a/mods/ENVIRONMENT/mcl_weather/skycolor.lua +++ b/mods/ENVIRONMENT/mcl_weather/skycolor.lua @@ -3,19 +3,26 @@ local NIGHT_VISION_RATIO = 0.45 local water_color = "#0b4880" -function mcl_weather.set_sky_box_clear(player) - local pos = player:get_pos() - if minetest.get_item_group(minetest.get_node(vector.new(pos.x,pos.y+1.5,pos.z)).name, "water") ~= 0 then return end - player:set_sky({ - type = "regular", - sky_color = { - day_sky = "#92B9FF", - day_horizon = "#B4D0FF", +local mg_name = minetest.get_mapgen_setting("mg_name") + +function mcl_weather.set_sky_box_clear(player,sky,fog) + local sc = { + day_sky = "#0000FF", --Pure blue to make debugging this stuff easier. The biome's sky colours are supposed to overwrite this. + day_horizon = "#FF0000", --Pure red to make debugging this stuff easier. The biome's fog (horizon) colours are supposed to overwrite this. dawn_sky = "#B4BAFA", dawn_horizon = "#BAC1F0", night_sky = "#000000", night_horizon = "#4A6790", - }, + } + if sky then + sc.day_sky = sky + end + if fog then + sc.day_horizon = fog + end + player:set_sky({ + type = "regular", + sky_color = sc, clouds = true, }) end @@ -124,9 +131,17 @@ mcl_weather.skycolor = { }) end if dim == "overworld" then + local biomesky + local biomefog + if mg_name ~= "v6" and mg_name ~= "singlenode" then + local biome = minetest.get_biome_name(minetest.get_biome_data(player:get_pos()).biome) + biomesky = minetest.registered_biomes[biome]._mcl_skycolor + biomefog = minetest.registered_biomes[biome]._mcl_fogcolor + end + if (mcl_weather.state == "none") then -- Clear weather - mcl_weather.set_sky_box_clear(player) + mcl_weather.set_sky_box_clear(player,biomesky,biomefog) player:set_sun({visible = true, sunrise_visible = true}) player:set_moon({visible = true}) player:set_stars({visible = true}) From 91836f3a1d5eb279ed7c3c4110cfc851bc8538ad Mon Sep 17 00:00:00 2001 From: FossFanatic Date: Wed, 21 Dec 2022 13:04:46 +0000 Subject: [PATCH 02/13] Add sky and fog colour for each overworld biome --- mods/MAPGEN/mcl_biomes/init.lua | 196 +++++++++++++++++++++++++++++++- 1 file changed, 195 insertions(+), 1 deletion(-) diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua index e39371651..8ed602a36 100644 --- a/mods/MAPGEN/mcl_biomes/init.lua +++ b/mods/MAPGEN/mcl_biomes/init.lua @@ -42,6 +42,8 @@ local function register_classic_superflat_biome() heat_point = 50, _mcl_biome_type = "medium", _mcl_palette_index = 0, + _mcl_skycolor = "#78A7FF", + _mcl_fogcolor = "#C0D8FF" }) end @@ -146,6 +148,8 @@ local function register_biomes() heat_point = -5, _mcl_biome_type = "snowy", _mcl_palette_index = 2, + _mcl_skycolor = "#7FA1FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "IcePlainsSpikes_ocean", @@ -162,6 +166,8 @@ local function register_biomes() heat_point = -5, _mcl_biome_type = "snowy", _mcl_palette_index = 2, + _mcl_skycolor = "#7FA1FF", + _mcl_fogcolor = "#C0D8FF" }) -- Cold Taiga @@ -180,6 +186,8 @@ local function register_biomes() heat_point = 8, _mcl_biome_type = "snowy", _mcl_palette_index = 3, + _mcl_skycolor = "#839EFF", + _mcl_fogcolor = "#C0D8FF" }) -- A cold beach-like biome, implemented as low part of Cold Taiga @@ -200,6 +208,8 @@ local function register_biomes() heat_point = 8, _mcl_biome_type = "snowy", _mcl_palette_index = 3, + _mcl_skycolor = "#7FA1FF", + _mcl_fogcolor = "#C0D8FF" }) -- Water part of the beach. Added to prevent snow being on the ice. minetest.register_biome({ @@ -218,6 +228,8 @@ local function register_biomes() heat_point = 8, _mcl_biome_type = "snowy", _mcl_palette_index = 3, + _mcl_skycolor = "#7FA1FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "ColdTaiga_ocean", @@ -234,9 +246,11 @@ local function register_biomes() vertical_blend = 1, _mcl_biome_type = "snowy", _mcl_palette_index = 3, + _mcl_skycolor = "#7FA1FF", + _mcl_fogcolor = "#C0D8FF" }) - -- Mega Taiga + -- Mega Pine Taiga minetest.register_biome({ name = "MegaTaiga", node_top = "mcl_core:podzol", @@ -251,6 +265,8 @@ local function register_biomes() heat_point = 10, _mcl_biome_type = "cold", _mcl_palette_index = 4, + _mcl_skycolor = "#7CA3FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "MegaTaiga_ocean", @@ -266,6 +282,8 @@ local function register_biomes() heat_point = 10, _mcl_biome_type = "cold", _mcl_palette_index = 4, + _mcl_skycolor = "#7BA4FF", + _mcl_fogcolor = "#C0D8FF" }) -- Mega Spruce Taiga @@ -283,6 +301,8 @@ local function register_biomes() heat_point = 8, _mcl_biome_type = "cold", _mcl_palette_index = 5, + _mcl_skycolor = "#7DA3FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "MegaSpruceTaiga_ocean", @@ -298,6 +318,8 @@ local function register_biomes() heat_point = 8, _mcl_biome_type = "cold", _mcl_palette_index = 5, + _mcl_skycolor = "#7BA4FF", + _mcl_fogcolor = "#C0D8FF" }) -- Extreme Hills @@ -316,6 +338,8 @@ local function register_biomes() heat_point = 45, _mcl_biome_type = "cold", _mcl_palette_index = 6, + _mcl_skycolor = "#7DA2FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "ExtremeHills_beach", @@ -332,6 +356,8 @@ local function register_biomes() heat_point = 45, _mcl_biome_type = "cold", _mcl_palette_index = 6, + _mcl_skycolor = "#78A7FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "ExtremeHills_ocean", @@ -348,6 +374,8 @@ local function register_biomes() heat_point = 45, _mcl_biome_type = "cold", _mcl_palette_index = 6, + _mcl_skycolor = "#7BA4FF", + _mcl_fogcolor = "#C0D8FF" }) -- Extreme Hills M @@ -366,6 +394,8 @@ local function register_biomes() heat_point = 25, _mcl_biome_type = "cold", _mcl_palette_index = 7, + _mcl_skycolor = "#7DA2FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "ExtremeHillsM_ocean", @@ -381,6 +411,8 @@ local function register_biomes() heat_point = 25, _mcl_biome_type = "cold", _mcl_palette_index = 7, + _mcl_skycolor = "#7BA4FF", + _mcl_fogcolor = "#C0D8FF" }) -- Extreme Hills+ @@ -401,6 +433,8 @@ local function register_biomes() vertical_blend = 6, _mcl_biome_type = "cold", _mcl_palette_index = 8, + _mcl_skycolor = "#7DA2FF", + _mcl_fogcolor = "#C0D8FF" }) ---- Sub-biome for Extreme Hills+ for those snow forests minetest.register_biome({ @@ -419,6 +453,8 @@ local function register_biomes() heat_point = 25, _mcl_biome_type = "cold", _mcl_palette_index = 8, + _mcl_skycolor = "#7DA2FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "ExtremeHills+_ocean", @@ -434,6 +470,8 @@ local function register_biomes() heat_point = 25, _mcl_biome_type = "cold", _mcl_palette_index = 8, + _mcl_skycolor = "#7BA4FF", + _mcl_fogcolor = "#C0D8FF" }) -- Stone beach @@ -449,6 +487,8 @@ local function register_biomes() heat_point = 8, _mcl_biome_type = "cold", _mcl_palette_index = 9, + _mcl_skycolor = "#7DA2FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ @@ -464,6 +504,8 @@ local function register_biomes() heat_point = 8, _mcl_biome_type = "cold", _mcl_palette_index = 9, + _mcl_skycolor = "#7BA4FF", + _mcl_fogcolor = "#C0D8FF" }) -- Ice Plains @@ -485,6 +527,8 @@ local function register_biomes() heat_point = 8, _mcl_biome_type = "snowy", _mcl_palette_index = 10, + _mcl_skycolor = "#7FA1FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "IcePlains_ocean", @@ -500,6 +544,8 @@ local function register_biomes() heat_point = 8, _mcl_biome_type = "snowy", _mcl_palette_index = 10, + _mcl_skycolor = "#7FA1FF", + _mcl_fogcolor = "#C0D8FF" }) -- Plains @@ -517,6 +563,8 @@ local function register_biomes() heat_point = 58, _mcl_biome_type = "medium", _mcl_palette_index = 0, + _mcl_skycolor = "#78A7FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "Plains_beach", @@ -532,6 +580,8 @@ local function register_biomes() heat_point = 58, _mcl_biome_type = "medium", _mcl_palette_index = 0, + _mcl_skycolor = "#78A7FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "Plains_ocean", @@ -547,6 +597,8 @@ local function register_biomes() heat_point = 58, _mcl_biome_type = "medium", _mcl_palette_index = 0, + _mcl_skycolor = "#7BA4FF", + _mcl_fogcolor = "#C0D8FF" }) -- Sunflower Plains @@ -564,6 +616,8 @@ local function register_biomes() heat_point = 45, _mcl_biome_type = "medium", _mcl_palette_index = 11, + _mcl_skycolor = "#78A7FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "SunflowerPlains_ocean", @@ -579,6 +633,8 @@ local function register_biomes() heat_point = 45, _mcl_biome_type = "medium", _mcl_palette_index = 11, + _mcl_skycolor = "#7BA4FF", + _mcl_fogcolor = "#C0D8FF" }) -- Taiga @@ -596,6 +652,8 @@ local function register_biomes() heat_point = 22, _mcl_biome_type = "cold", _mcl_palette_index = 12, + _mcl_skycolor = "#7DA3FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "Taiga_beach", @@ -611,6 +669,8 @@ local function register_biomes() heat_point = 22, _mcl_biome_type = "cold", _mcl_palette_index = 12, + _mcl_skycolor = "#78A7FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "Taiga_ocean", @@ -626,6 +686,8 @@ local function register_biomes() heat_point = 22, _mcl_biome_type = "cold", _mcl_palette_index = 12, + _mcl_skycolor = "#7BA4FF", + _mcl_fogcolor = "#C0D8FF" }) -- Forest @@ -643,6 +705,8 @@ local function register_biomes() heat_point = 45, _mcl_biome_type = "medium", _mcl_palette_index = 13, + _mcl_skycolor = "#79A6FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "Forest_beach", @@ -658,6 +722,8 @@ local function register_biomes() heat_point = 45, _mcl_biome_type = "medium", _mcl_palette_index = 13, + _mcl_skycolor = "#78A7FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "Forest_ocean", @@ -673,6 +739,8 @@ local function register_biomes() heat_point = 45, _mcl_biome_type = "medium", _mcl_palette_index = 13, + _mcl_skycolor = "#7BA4FF", + _mcl_fogcolor = "#C0D8FF" }) -- Flower Forest @@ -690,6 +758,8 @@ local function register_biomes() heat_point = 32, _mcl_biome_type = "medium", _mcl_palette_index = 14, + _mcl_skycolor = "#79A6FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "FlowerForest_beach", @@ -705,6 +775,8 @@ local function register_biomes() heat_point = 32, _mcl_biome_type = "medium", _mcl_palette_index = 14, + _mcl_skycolor = "#78A7FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "FlowerForest_ocean", @@ -720,6 +792,8 @@ local function register_biomes() heat_point = 32, _mcl_biome_type = "medium", _mcl_palette_index = 14, + _mcl_skycolor = "#7BA4FF", + _mcl_fogcolor = "#C0D8FF" }) -- Birch Forest @@ -737,6 +811,8 @@ local function register_biomes() heat_point = 31, _mcl_biome_type = "medium", _mcl_palette_index = 15, + _mcl_skycolor = "#7AA5FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "BirchForest_ocean", @@ -752,6 +828,8 @@ local function register_biomes() heat_point = 31, _mcl_biome_type = "medium", _mcl_palette_index = 15, + _mcl_skycolor = "#7BA4FF", + _mcl_fogcolor = "#C0D8FF" }) -- Birch Forest M @@ -769,6 +847,8 @@ local function register_biomes() heat_point = 27, _mcl_biome_type = "medium", _mcl_palette_index = 16, + _mcl_skycolor = "#7AA5FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "BirchForestM_ocean", @@ -784,6 +864,8 @@ local function register_biomes() heat_point = 27, _mcl_biome_type = "medium", _mcl_palette_index = 16, + _mcl_skycolor = "#7BA4FF", + _mcl_fogcolor = "#C0D8FF" }) -- Desert @@ -802,6 +884,8 @@ local function register_biomes() heat_point = 94, _mcl_biome_type = "hot", _mcl_palette_index = 17, + _mcl_skycolor = "#6EB1FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "Desert_ocean", @@ -817,6 +901,8 @@ local function register_biomes() heat_point = 94, _mcl_biome_type = "hot", _mcl_palette_index = 17, + _mcl_skycolor = "#7BA4FF", + _mcl_fogcolor = "#C0D8FF" }) -- Roofed Forest @@ -834,6 +920,8 @@ local function register_biomes() heat_point = 27, _mcl_biome_type = "medium", _mcl_palette_index = 18, + _mcl_skycolor = "#79A6FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "RoofedForest_ocean", @@ -849,6 +937,8 @@ local function register_biomes() heat_point = 27, _mcl_biome_type = "medium", _mcl_palette_index = 18, + _mcl_skycolor = "#7BA4FF", + _mcl_fogcolor = "#C0D8FF" }) -- Mesa: Starts with a couple of sand-covered layers (the "sandlevel"), @@ -867,6 +957,8 @@ local function register_biomes() heat_point = 100, _mcl_biome_type = "hot", _mcl_palette_index = 19, + _mcl_skycolor = "#6EB1FF", + _mcl_fogcolor = "#C0D8FF" }) -- Helper biome for the red sand at the bottom of Mesas. minetest.register_biome({ @@ -884,6 +976,8 @@ local function register_biomes() heat_point = 100, _mcl_biome_type = "hot", _mcl_palette_index = 19, + _mcl_skycolor = "#6EB1FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "Mesa_ocean", @@ -900,6 +994,8 @@ local function register_biomes() heat_point = 100, _mcl_biome_type = "hot", _mcl_palette_index = 19, + _mcl_skycolor = "#7BA4FF", + _mcl_fogcolor = "#C0D8FF" }) -- Mesa Bryce: Variant of Mesa, but with perfect strata and a much smaller red sand desert @@ -917,6 +1013,8 @@ local function register_biomes() heat_point = 100, _mcl_biome_type = "hot", _mcl_palette_index = 20, + _mcl_skycolor = "#6EB1FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "MesaBryce_sandlevel", @@ -933,6 +1031,8 @@ local function register_biomes() heat_point = 100, _mcl_biome_type = "hot", _mcl_palette_index = 20, + _mcl_skycolor = "#6EB1FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "MesaBryce_ocean", @@ -949,6 +1049,8 @@ local function register_biomes() heat_point = 100, _mcl_biome_type = "hot", _mcl_palette_index = 20, + _mcl_skycolor = "#7BA4FF", + _mcl_fogcolor = "#C0D8FF" }) @@ -970,6 +1072,8 @@ local function register_biomes() vertical_blend = 0, -- we want a sharp transition _mcl_biome_type = "hot", _mcl_palette_index = 21, + _mcl_skycolor = "#6EB1FF", + _mcl_fogcolor = "#C0D8FF" }) -- The oak forest plateau of this biome. -- This is a plateau for grass blocks, dry shrubs, tall grass, coarse dirt and oaks. @@ -989,6 +1093,8 @@ local function register_biomes() heat_point = 60, _mcl_biome_type = "hot", _mcl_palette_index = 21, + _mcl_skycolor = "#6EB1FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "MesaPlateauF_sandlevel", @@ -1005,6 +1111,8 @@ local function register_biomes() heat_point = 60, _mcl_biome_type = "hot", _mcl_palette_index = 21, + _mcl_skycolor = "#6EB1FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "MesaPlateauF_ocean", @@ -1021,6 +1129,8 @@ local function register_biomes() heat_point = 60, _mcl_biome_type = "hot", _mcl_palette_index = 21, + _mcl_skycolor = "#7BA4FF", + _mcl_fogcolor = "#C0D8FF" }) -- Mesa Plateau FM @@ -1042,6 +1152,8 @@ local function register_biomes() vertical_blend = 5, _mcl_biome_type = "hot", _mcl_palette_index = 22, + _mcl_skycolor = "#6EB1FF", + _mcl_fogcolor = "#C0D8FF" }) -- Grass plateau minetest.register_biome({ @@ -1059,6 +1171,8 @@ local function register_biomes() heat_point = 60, _mcl_biome_type = "hot", _mcl_palette_index = 22, + _mcl_skycolor = "#6EB1FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "MesaPlateauFM_sandlevel", @@ -1077,6 +1191,8 @@ local function register_biomes() vertical_blend = 4, _mcl_biome_type = "hot", _mcl_palette_index = 22, + _mcl_skycolor = "#6EB1FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "MesaPlateauFM_ocean", @@ -1093,6 +1209,8 @@ local function register_biomes() heat_point = 60, _mcl_biome_type = "hot", _mcl_palette_index = 22, + _mcl_skycolor = "#7BA4FF", + _mcl_fogcolor = "#C0D8FF" }) @@ -1111,6 +1229,8 @@ local function register_biomes() heat_point = 79, _mcl_biome_type = "hot", _mcl_palette_index = 1, + _mcl_skycolor = "#6EB1FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "Savanna_beach", @@ -1126,6 +1246,8 @@ local function register_biomes() heat_point = 79, _mcl_biome_type = "hot", _mcl_palette_index = 1, + _mcl_skycolor = "#78A7FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "Savanna_ocean", @@ -1141,6 +1263,8 @@ local function register_biomes() heat_point = 79, _mcl_biome_type = "hot", _mcl_palette_index = 1, + _mcl_skycolor = "#7BA4FF", + _mcl_fogcolor = "#C0D8FF" }) -- Savanna M @@ -1160,6 +1284,8 @@ local function register_biomes() heat_point = 100, _mcl_biome_type = "hot", _mcl_palette_index = 23, + _mcl_skycolor = "#6EB1FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "SavannaM_ocean", @@ -1175,6 +1301,8 @@ local function register_biomes() heat_point = 100, _mcl_biome_type = "hot", _mcl_palette_index = 23, + _mcl_skycolor = "#7BA4FF", + _mcl_fogcolor = "#C0D8FF" }) -- Jungle @@ -1192,6 +1320,8 @@ local function register_biomes() heat_point = 81, _mcl_biome_type = "medium", _mcl_palette_index = 24, + _mcl_skycolor = "#77A8FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "Jungle_shore", @@ -1207,6 +1337,8 @@ local function register_biomes() heat_point = 81, _mcl_biome_type = "medium", _mcl_palette_index = 24, + _mcl_skycolor = "#77A8FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "Jungle_ocean", @@ -1223,6 +1355,8 @@ local function register_biomes() heat_point = 81, _mcl_biome_type = "medium", _mcl_palette_index = 24, + _mcl_skycolor = "#7BA4FF", + _mcl_fogcolor = "#C0D8FF" }) -- Jungle M @@ -1241,6 +1375,8 @@ local function register_biomes() heat_point = 81, _mcl_biome_type = "medium", _mcl_palette_index = 25, + _mcl_skycolor = "#77A8FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "JungleM_shore", @@ -1256,6 +1392,8 @@ local function register_biomes() heat_point = 81, _mcl_biome_type = "medium", _mcl_palette_index = 25, + _mcl_skycolor = "#77A8FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "JungleM_ocean", @@ -1272,6 +1410,8 @@ local function register_biomes() heat_point = 81, _mcl_biome_type = "medium", _mcl_palette_index = 25, + _mcl_skycolor = "#7BA4FF", + _mcl_fogcolor = "#C0D8FF" }) -- Jungle Edge @@ -1289,6 +1429,8 @@ local function register_biomes() heat_point = 76, _mcl_biome_type = "medium", _mcl_palette_index = 26, + _mcl_skycolor = "#77A8FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "JungleEdge_ocean", @@ -1304,6 +1446,8 @@ local function register_biomes() heat_point = 76, _mcl_biome_type = "medium", _mcl_palette_index = 26, + _mcl_skycolor = "#7BA4FF", + _mcl_fogcolor = "#C0D8FF" }) -- Jungle Edge M (very rare). @@ -1324,6 +1468,8 @@ local function register_biomes() heat_point = 79, _mcl_biome_type = "medium", _mcl_palette_index = 27, + _mcl_skycolor = "#77A8FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "JungleEdgeM_ocean", @@ -1339,6 +1485,8 @@ local function register_biomes() heat_point = 79, _mcl_biome_type = "medium", _mcl_palette_index = 27, + _mcl_skycolor = "#7BA4FF", + _mcl_fogcolor = "#C0D8FF" }) -- Mangrove swamp @@ -1357,6 +1505,8 @@ local function register_biomes() heat_point = 94, _mcl_biome_type = "hot", _mcl_palette_index = 27, + _mcl_skycolor = "#78A7FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "MangroveSwamp_shore", @@ -1372,6 +1522,8 @@ local function register_biomes() heat_point = 94, _mcl_biome_type = "hot", _mcl_palette_index = 27, + _mcl_skycolor = "#78A7FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "MangroveSwamp_ocean", @@ -1388,6 +1540,8 @@ local function register_biomes() heat_point = 94, _mcl_biome_type = "hot", _mcl_palette_index = 27, + _mcl_skycolor = "#7BA4FF", + _mcl_fogcolor = "#C0D8FF" }) -- Swampland minetest.register_biome({ @@ -1405,6 +1559,8 @@ local function register_biomes() heat_point = 50, _mcl_biome_type = "medium", _mcl_palette_index = 28, + _mcl_skycolor = "#78A7FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "Swampland_shore", @@ -1420,6 +1576,8 @@ local function register_biomes() heat_point = 50, _mcl_biome_type = "medium", _mcl_palette_index = 28, + _mcl_skycolor = "#78A7FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "Swampland_ocean", @@ -1436,6 +1594,8 @@ local function register_biomes() heat_point = 50, _mcl_biome_type = "medium", _mcl_palette_index = 28, + _mcl_skycolor = "#7BA4FF", + _mcl_fogcolor = "#C0D8FF" }) -- Mushroom Island / Mushroom Island Shore (rare) @@ -1456,6 +1616,8 @@ local function register_biomes() heat_point = 50, _mcl_biome_type = "medium", _mcl_palette_index = 29, + _mcl_skycolor = "#77A8FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ @@ -1472,6 +1634,8 @@ local function register_biomes() heat_point = 50, _mcl_biome_type = "medium", _mcl_palette_index = 29, + _mcl_skycolor = "#77A8FF", + _mcl_fogcolor = "#C0D8FF" }) minetest.register_biome({ name = "MushroomIsland_ocean", @@ -1487,6 +1651,8 @@ local function register_biomes() heat_point = 50, _mcl_biome_type = "medium", _mcl_palette_index = 29, + _mcl_skycolor = "#7BA4FF", + _mcl_fogcolor = "#C0D8FF" }) -- Add deep ocean and underground biomes automatically. @@ -1509,6 +1675,8 @@ local function register_biomes() vertical_blend = 5, _mcl_biome_type = minetest.registered_biomes[biome]._mcl_biome_type, _mcl_palette_index = minetest.registered_biomes[biome]._mcl_palette_index, + _mcl_skycolor = "#7BA4FF", + _mcl_fogcolor = "#C0D8FF" }) -- Underground biomes are used to identify the underground and to prevent nodes from the surface @@ -1521,6 +1689,8 @@ local function register_biomes() y_max = DEEP_OCEAN_MIN - 1, _mcl_biome_type = minetest.registered_biomes[biome]._mcl_biome_type, _mcl_palette_index = minetest.registered_biomes[biome]._mcl_palette_index, + _mcl_skycolor = minetest.registered_biomes[biome]._mcl_skycolor, + _mcl_fogcolor = minetest.registered_biomes[biome]._mcl_fogcolor, }) end @@ -1575,6 +1745,8 @@ local function register_dimension_biomes() humidity_point = 0, _mcl_biome_type = "hot", _mcl_palette_index = 17, +-- _mcl_skycolor = "#6EB1FF", +-- _mcl_fogcolor = "#330808" }) minetest.register_decoration({ @@ -1604,6 +1776,8 @@ local function register_dimension_biomes() humidity_point = 33, _mcl_biome_type = "hot", _mcl_palette_index = 17, +-- _mcl_skycolor = "#6EB1FF", +-- _mcl_fogcolor = "#1B4745" }) minetest.register_decoration({ deco_type = "simple", @@ -1653,6 +1827,8 @@ local function register_dimension_biomes() humidity_point = 47, _mcl_biome_type = "hot", _mcl_palette_index = 17, +-- _mcl_skycolor = "#6EB1FF", +-- _mcl_fogcolor = "#330303" }) minetest.register_decoration({ deco_type = "simple", @@ -1680,6 +1856,8 @@ local function register_dimension_biomes() humidity_point = 70, _mcl_biome_type = "hot", _mcl_palette_index = 17, +-- _mcl_skycolor = "#6EB1FF", +-- _mcl_fogcolor = "#1A051A" }) minetest.register_decoration({ deco_type = "simple", @@ -1707,6 +1885,8 @@ local function register_dimension_biomes() humidity_point = 80, _mcl_biome_type = "hot", _mcl_palette_index = 17, +-- _mcl_skycolor = "#6EB1FF", +-- _mcl_fogcolor = "#685F70" }) minetest.register_decoration({ @@ -1759,6 +1939,8 @@ local function register_dimension_biomes() vertical_blend = 16, _mcl_biome_type = "medium", _mcl_palette_index = 0, +-- _mcl_skycolor = "#000000", +-- _mcl_fogcolor = "#A080A0" }) minetest.register_biome({ name = "EndBarrens", @@ -1774,6 +1956,8 @@ local function register_dimension_biomes() vertical_blend = 16, _mcl_biome_type = "medium", _mcl_palette_index = 0, +-- _mcl_skycolor = "#000000", +-- _mcl_fogcolor = "#A080A0" }) minetest.register_biome({ name = "EndMidlands", @@ -1789,6 +1973,8 @@ local function register_dimension_biomes() vertical_blend = 16, _mcl_biome_type = "medium", _mcl_palette_index = 0, +-- _mcl_skycolor = "#000000", +-- _mcl_fogcolor = "#A080A0" }) minetest.register_biome({ name = "EndHighlands", @@ -1804,6 +1990,8 @@ local function register_dimension_biomes() vertical_blend = 16, _mcl_biome_type = "medium", _mcl_palette_index = 0, +-- _mcl_skycolor = "#000000", +-- _mcl_fogcolor = "#A080A0" }) minetest.register_biome({ name = "EndSmallIslands", @@ -1819,6 +2007,8 @@ local function register_dimension_biomes() vertical_blend = 16, _mcl_biome_type = "medium", _mcl_palette_index = 0, +-- _mcl_skycolor = "#000000", +-- _mcl_fogcolor = "#A080A0" }) minetest.register_biome({ @@ -1837,6 +2027,8 @@ local function register_dimension_biomes() min_pos = {x = -1250, y = mcl_vars.mg_end_min, z = -1250}, _mcl_biome_type = "medium", _mcl_palette_index = 0, +-- _mcl_skycolor = "#000000", +-- _mcl_fogcolor = "#A080A0" }) minetest.register_biome({ @@ -1853,6 +2045,8 @@ local function register_dimension_biomes() vertical_blend = 16, _mcl_biome_type = "medium", _mcl_palette_index = 0, +-- _mcl_skycolor = "#000000", +-- _mcl_fogcolor = "#A080A0" }) end From 1977dbf9a1dde56ade336875a8fcc22f8cf72790 Mon Sep 17 00:00:00 2001 From: FossFanatic Date: Wed, 21 Dec 2022 13:05:52 +0000 Subject: [PATCH 03/13] Remove excessive whitespace --- mods/ENVIRONMENT/mcl_weather/skycolor.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/mods/ENVIRONMENT/mcl_weather/skycolor.lua b/mods/ENVIRONMENT/mcl_weather/skycolor.lua index 7b25fbe9a..d0bc7bd91 100644 --- a/mods/ENVIRONMENT/mcl_weather/skycolor.lua +++ b/mods/ENVIRONMENT/mcl_weather/skycolor.lua @@ -138,7 +138,6 @@ mcl_weather.skycolor = { biomesky = minetest.registered_biomes[biome]._mcl_skycolor biomefog = minetest.registered_biomes[biome]._mcl_fogcolor end - if (mcl_weather.state == "none") then -- Clear weather mcl_weather.set_sky_box_clear(player,biomesky,biomefog) From 1c752019f04583307a81447eb91a67d362c10fd1 Mon Sep 17 00:00:00 2001 From: FossFanatic Date: Wed, 21 Dec 2022 13:08:23 +0000 Subject: [PATCH 04/13] Make the explanation shorter --- mods/ENVIRONMENT/mcl_weather/skycolor.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/ENVIRONMENT/mcl_weather/skycolor.lua b/mods/ENVIRONMENT/mcl_weather/skycolor.lua index d0bc7bd91..1b135f086 100644 --- a/mods/ENVIRONMENT/mcl_weather/skycolor.lua +++ b/mods/ENVIRONMENT/mcl_weather/skycolor.lua @@ -7,8 +7,8 @@ local mg_name = minetest.get_mapgen_setting("mg_name") function mcl_weather.set_sky_box_clear(player,sky,fog) local sc = { - day_sky = "#0000FF", --Pure blue to make debugging this stuff easier. The biome's sky colours are supposed to overwrite this. - day_horizon = "#FF0000", --Pure red to make debugging this stuff easier. The biome's fog (horizon) colours are supposed to overwrite this. + day_sky = "#0000FF", -- Pure blue to make debugging this stuff easier. Not visible during normal gameplay. + day_horizon = "#FF0000", -- Pure red to make debugging this stuff easier. Not visible during normal gameplay. dawn_sky = "#B4BAFA", dawn_horizon = "#BAC1F0", night_sky = "#000000", From 79b1db4b1a9ffda1a8f3263f463e1ba14bf06176 Mon Sep 17 00:00:00 2001 From: FossFanatic Date: Wed, 21 Dec 2022 14:04:47 +0000 Subject: [PATCH 05/13] Fix underwater fog colour regression --- mods/ENVIRONMENT/mcl_weather/skycolor.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mods/ENVIRONMENT/mcl_weather/skycolor.lua b/mods/ENVIRONMENT/mcl_weather/skycolor.lua index 1b135f086..be45e2a9b 100644 --- a/mods/ENVIRONMENT/mcl_weather/skycolor.lua +++ b/mods/ENVIRONMENT/mcl_weather/skycolor.lua @@ -6,6 +6,8 @@ local water_color = "#0b4880" local mg_name = minetest.get_mapgen_setting("mg_name") function mcl_weather.set_sky_box_clear(player,sky,fog) + local pos = player:get_pos() + if minetest.get_item_group(minetest.get_node(vector.new(pos.x,pos.y+1.5,pos.z)).name, "water") ~= 0 then return end local sc = { day_sky = "#0000FF", -- Pure blue to make debugging this stuff easier. Not visible during normal gameplay. day_horizon = "#FF0000", -- Pure red to make debugging this stuff easier. Not visible during normal gameplay. From afbb8e2288548c06b9749f396663676ea804a05c Mon Sep 17 00:00:00 2001 From: FossFanatic Date: Wed, 21 Dec 2022 15:57:33 +0000 Subject: [PATCH 06/13] Add locals for certain hex codes that occur too many times --- mods/MAPGEN/mcl_biomes/init.lua | 287 ++++++++++++++++---------------- 1 file changed, 148 insertions(+), 139 deletions(-) diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua index 8ed602a36..73b2e3fe2 100644 --- a/mods/MAPGEN/mcl_biomes/init.lua +++ b/mods/MAPGEN/mcl_biomes/init.lua @@ -42,8 +42,8 @@ local function register_classic_superflat_biome() heat_point = 50, _mcl_biome_type = "medium", _mcl_palette_index = 0, - _mcl_skycolor = "#78A7FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = beach_skycolor, + _mcl_fogcolor = overworld_fogcolor }) end @@ -130,6 +130,15 @@ local function register_biomes() "MangroveSwamp", } +local beach_skycolor = "#78A7FF" -- This is the case for all beach biomes except for the snowy ones! Those beaches will have their own colour instead of this one. +local ocean_skycolor = "#7BA4FF" -- This is the case for all ocean biomes except for non-deep frozen oceans! Those oceans will have their own colour instead of this one. +local overworld_fogcolor = "#C0D8FF" + +local nether_skycolor = "#6EB1FF" + +local end_fogcolor = "#A080A0" +local end_skycolor = "#000000" + -- Ice Plains Spikes (rare) minetest.register_biome({ name = "IcePlainsSpikes", @@ -149,7 +158,7 @@ local function register_biomes() _mcl_biome_type = "snowy", _mcl_palette_index = 2, _mcl_skycolor = "#7FA1FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "IcePlainsSpikes_ocean", @@ -167,7 +176,7 @@ local function register_biomes() _mcl_biome_type = "snowy", _mcl_palette_index = 2, _mcl_skycolor = "#7FA1FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) -- Cold Taiga @@ -187,7 +196,7 @@ local function register_biomes() _mcl_biome_type = "snowy", _mcl_palette_index = 3, _mcl_skycolor = "#839EFF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) -- A cold beach-like biome, implemented as low part of Cold Taiga @@ -209,7 +218,7 @@ local function register_biomes() _mcl_biome_type = "snowy", _mcl_palette_index = 3, _mcl_skycolor = "#7FA1FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) -- Water part of the beach. Added to prevent snow being on the ice. minetest.register_biome({ @@ -229,7 +238,7 @@ local function register_biomes() _mcl_biome_type = "snowy", _mcl_palette_index = 3, _mcl_skycolor = "#7FA1FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "ColdTaiga_ocean", @@ -247,7 +256,7 @@ local function register_biomes() _mcl_biome_type = "snowy", _mcl_palette_index = 3, _mcl_skycolor = "#7FA1FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) -- Mega Pine Taiga @@ -266,7 +275,7 @@ local function register_biomes() _mcl_biome_type = "cold", _mcl_palette_index = 4, _mcl_skycolor = "#7CA3FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "MegaTaiga_ocean", @@ -282,8 +291,8 @@ local function register_biomes() heat_point = 10, _mcl_biome_type = "cold", _mcl_palette_index = 4, - _mcl_skycolor = "#7BA4FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = ocean_skycolor, + _mcl_fogcolor = overworld_fogcolor }) -- Mega Spruce Taiga @@ -302,7 +311,7 @@ local function register_biomes() _mcl_biome_type = "cold", _mcl_palette_index = 5, _mcl_skycolor = "#7DA3FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "MegaSpruceTaiga_ocean", @@ -318,8 +327,8 @@ local function register_biomes() heat_point = 8, _mcl_biome_type = "cold", _mcl_palette_index = 5, - _mcl_skycolor = "#7BA4FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = ocean_skycolor, + _mcl_fogcolor = overworld_fogcolor }) -- Extreme Hills @@ -339,7 +348,7 @@ local function register_biomes() _mcl_biome_type = "cold", _mcl_palette_index = 6, _mcl_skycolor = "#7DA2FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "ExtremeHills_beach", @@ -356,8 +365,8 @@ local function register_biomes() heat_point = 45, _mcl_biome_type = "cold", _mcl_palette_index = 6, - _mcl_skycolor = "#78A7FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = beach_skycolor, + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "ExtremeHills_ocean", @@ -374,8 +383,8 @@ local function register_biomes() heat_point = 45, _mcl_biome_type = "cold", _mcl_palette_index = 6, - _mcl_skycolor = "#7BA4FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = ocean_skycolor, + _mcl_fogcolor = overworld_fogcolor }) -- Extreme Hills M @@ -395,7 +404,7 @@ local function register_biomes() _mcl_biome_type = "cold", _mcl_palette_index = 7, _mcl_skycolor = "#7DA2FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "ExtremeHillsM_ocean", @@ -411,8 +420,8 @@ local function register_biomes() heat_point = 25, _mcl_biome_type = "cold", _mcl_palette_index = 7, - _mcl_skycolor = "#7BA4FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = ocean_skycolor, + _mcl_fogcolor = overworld_fogcolor }) -- Extreme Hills+ @@ -434,7 +443,7 @@ local function register_biomes() _mcl_biome_type = "cold", _mcl_palette_index = 8, _mcl_skycolor = "#7DA2FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) ---- Sub-biome for Extreme Hills+ for those snow forests minetest.register_biome({ @@ -454,7 +463,7 @@ local function register_biomes() _mcl_biome_type = "cold", _mcl_palette_index = 8, _mcl_skycolor = "#7DA2FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "ExtremeHills+_ocean", @@ -470,8 +479,8 @@ local function register_biomes() heat_point = 25, _mcl_biome_type = "cold", _mcl_palette_index = 8, - _mcl_skycolor = "#7BA4FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = ocean_skycolor, + _mcl_fogcolor = overworld_fogcolor }) -- Stone beach @@ -488,7 +497,7 @@ local function register_biomes() _mcl_biome_type = "cold", _mcl_palette_index = 9, _mcl_skycolor = "#7DA2FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ @@ -504,8 +513,8 @@ local function register_biomes() heat_point = 8, _mcl_biome_type = "cold", _mcl_palette_index = 9, - _mcl_skycolor = "#7BA4FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = ocean_skycolor, + _mcl_fogcolor = overworld_fogcolor }) -- Ice Plains @@ -528,7 +537,7 @@ local function register_biomes() _mcl_biome_type = "snowy", _mcl_palette_index = 10, _mcl_skycolor = "#7FA1FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "IcePlains_ocean", @@ -545,7 +554,7 @@ local function register_biomes() _mcl_biome_type = "snowy", _mcl_palette_index = 10, _mcl_skycolor = "#7FA1FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) -- Plains @@ -564,7 +573,7 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_palette_index = 0, _mcl_skycolor = "#78A7FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "Plains_beach", @@ -580,8 +589,8 @@ local function register_biomes() heat_point = 58, _mcl_biome_type = "medium", _mcl_palette_index = 0, - _mcl_skycolor = "#78A7FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = beach_skycolor, + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "Plains_ocean", @@ -597,8 +606,8 @@ local function register_biomes() heat_point = 58, _mcl_biome_type = "medium", _mcl_palette_index = 0, - _mcl_skycolor = "#7BA4FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = ocean_skycolor, + _mcl_fogcolor = overworld_fogcolor }) -- Sunflower Plains @@ -617,7 +626,7 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_palette_index = 11, _mcl_skycolor = "#78A7FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "SunflowerPlains_ocean", @@ -633,8 +642,8 @@ local function register_biomes() heat_point = 45, _mcl_biome_type = "medium", _mcl_palette_index = 11, - _mcl_skycolor = "#7BA4FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = ocean_skycolor, + _mcl_fogcolor = overworld_fogcolor }) -- Taiga @@ -653,7 +662,7 @@ local function register_biomes() _mcl_biome_type = "cold", _mcl_palette_index = 12, _mcl_skycolor = "#7DA3FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "Taiga_beach", @@ -669,8 +678,8 @@ local function register_biomes() heat_point = 22, _mcl_biome_type = "cold", _mcl_palette_index = 12, - _mcl_skycolor = "#78A7FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = beach_skycolor, + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "Taiga_ocean", @@ -686,8 +695,8 @@ local function register_biomes() heat_point = 22, _mcl_biome_type = "cold", _mcl_palette_index = 12, - _mcl_skycolor = "#7BA4FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = ocean_skycolor, + _mcl_fogcolor = overworld_fogcolor }) -- Forest @@ -706,7 +715,7 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_palette_index = 13, _mcl_skycolor = "#79A6FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "Forest_beach", @@ -722,8 +731,8 @@ local function register_biomes() heat_point = 45, _mcl_biome_type = "medium", _mcl_palette_index = 13, - _mcl_skycolor = "#78A7FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = beach_skycolor, + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "Forest_ocean", @@ -739,8 +748,8 @@ local function register_biomes() heat_point = 45, _mcl_biome_type = "medium", _mcl_palette_index = 13, - _mcl_skycolor = "#7BA4FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = ocean_skycolor, + _mcl_fogcolor = overworld_fogcolor }) -- Flower Forest @@ -759,7 +768,7 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_palette_index = 14, _mcl_skycolor = "#79A6FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "FlowerForest_beach", @@ -775,8 +784,8 @@ local function register_biomes() heat_point = 32, _mcl_biome_type = "medium", _mcl_palette_index = 14, - _mcl_skycolor = "#78A7FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = beach_skycolor, + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "FlowerForest_ocean", @@ -792,8 +801,8 @@ local function register_biomes() heat_point = 32, _mcl_biome_type = "medium", _mcl_palette_index = 14, - _mcl_skycolor = "#7BA4FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = ocean_skycolor, + _mcl_fogcolor = overworld_fogcolor }) -- Birch Forest @@ -812,7 +821,7 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_palette_index = 15, _mcl_skycolor = "#7AA5FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "BirchForest_ocean", @@ -828,8 +837,8 @@ local function register_biomes() heat_point = 31, _mcl_biome_type = "medium", _mcl_palette_index = 15, - _mcl_skycolor = "#7BA4FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = ocean_skycolor, + _mcl_fogcolor = overworld_fogcolor }) -- Birch Forest M @@ -848,7 +857,7 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_palette_index = 16, _mcl_skycolor = "#7AA5FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "BirchForestM_ocean", @@ -864,8 +873,8 @@ local function register_biomes() heat_point = 27, _mcl_biome_type = "medium", _mcl_palette_index = 16, - _mcl_skycolor = "#7BA4FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = ocean_skycolor, + _mcl_fogcolor = overworld_fogcolor }) -- Desert @@ -885,7 +894,7 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_palette_index = 17, _mcl_skycolor = "#6EB1FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "Desert_ocean", @@ -901,8 +910,8 @@ local function register_biomes() heat_point = 94, _mcl_biome_type = "hot", _mcl_palette_index = 17, - _mcl_skycolor = "#7BA4FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = ocean_skycolor, + _mcl_fogcolor = overworld_fogcolor }) -- Roofed Forest @@ -921,7 +930,7 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_palette_index = 18, _mcl_skycolor = "#79A6FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "RoofedForest_ocean", @@ -937,8 +946,8 @@ local function register_biomes() heat_point = 27, _mcl_biome_type = "medium", _mcl_palette_index = 18, - _mcl_skycolor = "#7BA4FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = ocean_skycolor, + _mcl_fogcolor = overworld_fogcolor }) -- Mesa: Starts with a couple of sand-covered layers (the "sandlevel"), @@ -958,7 +967,7 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_palette_index = 19, _mcl_skycolor = "#6EB1FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) -- Helper biome for the red sand at the bottom of Mesas. minetest.register_biome({ @@ -977,7 +986,7 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_palette_index = 19, _mcl_skycolor = "#6EB1FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "Mesa_ocean", @@ -994,8 +1003,8 @@ local function register_biomes() heat_point = 100, _mcl_biome_type = "hot", _mcl_palette_index = 19, - _mcl_skycolor = "#7BA4FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = ocean_skycolor, + _mcl_fogcolor = overworld_fogcolor }) -- Mesa Bryce: Variant of Mesa, but with perfect strata and a much smaller red sand desert @@ -1014,7 +1023,7 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_palette_index = 20, _mcl_skycolor = "#6EB1FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "MesaBryce_sandlevel", @@ -1032,7 +1041,7 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_palette_index = 20, _mcl_skycolor = "#6EB1FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "MesaBryce_ocean", @@ -1049,8 +1058,8 @@ local function register_biomes() heat_point = 100, _mcl_biome_type = "hot", _mcl_palette_index = 20, - _mcl_skycolor = "#7BA4FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = ocean_skycolor, + _mcl_fogcolor = overworld_fogcolor }) @@ -1073,7 +1082,7 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_palette_index = 21, _mcl_skycolor = "#6EB1FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) -- The oak forest plateau of this biome. -- This is a plateau for grass blocks, dry shrubs, tall grass, coarse dirt and oaks. @@ -1094,7 +1103,7 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_palette_index = 21, _mcl_skycolor = "#6EB1FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "MesaPlateauF_sandlevel", @@ -1112,7 +1121,7 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_palette_index = 21, _mcl_skycolor = "#6EB1FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "MesaPlateauF_ocean", @@ -1129,8 +1138,8 @@ local function register_biomes() heat_point = 60, _mcl_biome_type = "hot", _mcl_palette_index = 21, - _mcl_skycolor = "#7BA4FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = ocean_skycolor, + _mcl_fogcolor = overworld_fogcolor }) -- Mesa Plateau FM @@ -1153,7 +1162,7 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_palette_index = 22, _mcl_skycolor = "#6EB1FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) -- Grass plateau minetest.register_biome({ @@ -1172,7 +1181,7 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_palette_index = 22, _mcl_skycolor = "#6EB1FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "MesaPlateauFM_sandlevel", @@ -1192,7 +1201,7 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_palette_index = 22, _mcl_skycolor = "#6EB1FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "MesaPlateauFM_ocean", @@ -1209,8 +1218,8 @@ local function register_biomes() heat_point = 60, _mcl_biome_type = "hot", _mcl_palette_index = 22, - _mcl_skycolor = "#7BA4FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = ocean_skycolor, + _mcl_fogcolor = overworld_fogcolor }) @@ -1230,7 +1239,7 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_palette_index = 1, _mcl_skycolor = "#6EB1FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "Savanna_beach", @@ -1246,8 +1255,8 @@ local function register_biomes() heat_point = 79, _mcl_biome_type = "hot", _mcl_palette_index = 1, - _mcl_skycolor = "#78A7FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = beach_skycolor, + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "Savanna_ocean", @@ -1263,8 +1272,8 @@ local function register_biomes() heat_point = 79, _mcl_biome_type = "hot", _mcl_palette_index = 1, - _mcl_skycolor = "#7BA4FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = ocean_skycolor, + _mcl_fogcolor = overworld_fogcolor }) -- Savanna M @@ -1285,7 +1294,7 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_palette_index = 23, _mcl_skycolor = "#6EB1FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "SavannaM_ocean", @@ -1301,8 +1310,8 @@ local function register_biomes() heat_point = 100, _mcl_biome_type = "hot", _mcl_palette_index = 23, - _mcl_skycolor = "#7BA4FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = ocean_skycolor, + _mcl_fogcolor = overworld_fogcolor }) -- Jungle @@ -1321,7 +1330,7 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_palette_index = 24, _mcl_skycolor = "#77A8FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "Jungle_shore", @@ -1338,7 +1347,7 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_palette_index = 24, _mcl_skycolor = "#77A8FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "Jungle_ocean", @@ -1355,8 +1364,8 @@ local function register_biomes() heat_point = 81, _mcl_biome_type = "medium", _mcl_palette_index = 24, - _mcl_skycolor = "#7BA4FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = ocean_skycolor, + _mcl_fogcolor = overworld_fogcolor }) -- Jungle M @@ -1376,7 +1385,7 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_palette_index = 25, _mcl_skycolor = "#77A8FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "JungleM_shore", @@ -1393,7 +1402,7 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_palette_index = 25, _mcl_skycolor = "#77A8FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "JungleM_ocean", @@ -1410,8 +1419,8 @@ local function register_biomes() heat_point = 81, _mcl_biome_type = "medium", _mcl_palette_index = 25, - _mcl_skycolor = "#7BA4FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = ocean_skycolor, + _mcl_fogcolor = overworld_fogcolor }) -- Jungle Edge @@ -1430,7 +1439,7 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_palette_index = 26, _mcl_skycolor = "#77A8FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "JungleEdge_ocean", @@ -1446,8 +1455,8 @@ local function register_biomes() heat_point = 76, _mcl_biome_type = "medium", _mcl_palette_index = 26, - _mcl_skycolor = "#7BA4FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = ocean_skycolor, + _mcl_fogcolor = overworld_fogcolor }) -- Jungle Edge M (very rare). @@ -1469,7 +1478,7 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_palette_index = 27, _mcl_skycolor = "#77A8FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "JungleEdgeM_ocean", @@ -1485,8 +1494,8 @@ local function register_biomes() heat_point = 79, _mcl_biome_type = "medium", _mcl_palette_index = 27, - _mcl_skycolor = "#7BA4FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = ocean_skycolor, + _mcl_fogcolor = overworld_fogcolor }) -- Mangrove swamp @@ -1506,7 +1515,7 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_palette_index = 27, _mcl_skycolor = "#78A7FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "MangroveSwamp_shore", @@ -1523,7 +1532,7 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_palette_index = 27, _mcl_skycolor = "#78A7FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "MangroveSwamp_ocean", @@ -1540,8 +1549,8 @@ local function register_biomes() heat_point = 94, _mcl_biome_type = "hot", _mcl_palette_index = 27, - _mcl_skycolor = "#7BA4FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = ocean_skycolor, + _mcl_fogcolor = overworld_fogcolor }) -- Swampland minetest.register_biome({ @@ -1560,7 +1569,7 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_palette_index = 28, _mcl_skycolor = "#78A7FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "Swampland_shore", @@ -1577,7 +1586,7 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_palette_index = 28, _mcl_skycolor = "#78A7FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "Swampland_ocean", @@ -1594,8 +1603,8 @@ local function register_biomes() heat_point = 50, _mcl_biome_type = "medium", _mcl_palette_index = 28, - _mcl_skycolor = "#7BA4FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = ocean_skycolor, + _mcl_fogcolor = overworld_fogcolor }) -- Mushroom Island / Mushroom Island Shore (rare) @@ -1617,7 +1626,7 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_palette_index = 29, _mcl_skycolor = "#77A8FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ @@ -1635,7 +1644,7 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_palette_index = 29, _mcl_skycolor = "#77A8FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_fogcolor = overworld_fogcolor }) minetest.register_biome({ name = "MushroomIsland_ocean", @@ -1651,8 +1660,8 @@ local function register_biomes() heat_point = 50, _mcl_biome_type = "medium", _mcl_palette_index = 29, - _mcl_skycolor = "#7BA4FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = ocean_skycolor, + _mcl_fogcolor = overworld_fogcolor }) -- Add deep ocean and underground biomes automatically. @@ -1675,8 +1684,8 @@ local function register_biomes() vertical_blend = 5, _mcl_biome_type = minetest.registered_biomes[biome]._mcl_biome_type, _mcl_palette_index = minetest.registered_biomes[biome]._mcl_palette_index, - _mcl_skycolor = "#7BA4FF", - _mcl_fogcolor = "#C0D8FF" + _mcl_skycolor = ocean_skycolor, + _mcl_fogcolor = overworld_fogcolor }) -- Underground biomes are used to identify the underground and to prevent nodes from the surface @@ -1745,7 +1754,7 @@ local function register_dimension_biomes() humidity_point = 0, _mcl_biome_type = "hot", _mcl_palette_index = 17, --- _mcl_skycolor = "#6EB1FF", +-- _mcl_skycolor = nether_skycolor, -- _mcl_fogcolor = "#330808" }) @@ -1776,7 +1785,7 @@ local function register_dimension_biomes() humidity_point = 33, _mcl_biome_type = "hot", _mcl_palette_index = 17, --- _mcl_skycolor = "#6EB1FF", +-- _mcl_skycolor = nether_skycolor, -- _mcl_fogcolor = "#1B4745" }) minetest.register_decoration({ @@ -1827,7 +1836,7 @@ local function register_dimension_biomes() humidity_point = 47, _mcl_biome_type = "hot", _mcl_palette_index = 17, --- _mcl_skycolor = "#6EB1FF", +-- _mcl_skycolor = nether_skycolor, -- _mcl_fogcolor = "#330303" }) minetest.register_decoration({ @@ -1856,7 +1865,7 @@ local function register_dimension_biomes() humidity_point = 70, _mcl_biome_type = "hot", _mcl_palette_index = 17, --- _mcl_skycolor = "#6EB1FF", +-- _mcl_skycolor = nether_skycolor, -- _mcl_fogcolor = "#1A051A" }) minetest.register_decoration({ @@ -1885,7 +1894,7 @@ local function register_dimension_biomes() humidity_point = 80, _mcl_biome_type = "hot", _mcl_palette_index = 17, --- _mcl_skycolor = "#6EB1FF", +-- _mcl_skycolor = nether_skycolor, -- _mcl_fogcolor = "#685F70" }) @@ -1939,8 +1948,8 @@ local function register_dimension_biomes() vertical_blend = 16, _mcl_biome_type = "medium", _mcl_palette_index = 0, --- _mcl_skycolor = "#000000", --- _mcl_fogcolor = "#A080A0" +-- _mcl_skycolor = end_skycolor, +-- _mcl_fogcolor = end_fogcolor }) minetest.register_biome({ name = "EndBarrens", @@ -1956,8 +1965,8 @@ local function register_dimension_biomes() vertical_blend = 16, _mcl_biome_type = "medium", _mcl_palette_index = 0, --- _mcl_skycolor = "#000000", --- _mcl_fogcolor = "#A080A0" +-- _mcl_skycolor = end_skycolor, +-- _mcl_fogcolor = end_fogcolor }) minetest.register_biome({ name = "EndMidlands", @@ -1973,8 +1982,8 @@ local function register_dimension_biomes() vertical_blend = 16, _mcl_biome_type = "medium", _mcl_palette_index = 0, --- _mcl_skycolor = "#000000", --- _mcl_fogcolor = "#A080A0" +-- _mcl_skycolor = end_skycolor, +-- _mcl_fogcolor = end_fogcolor }) minetest.register_biome({ name = "EndHighlands", @@ -1990,8 +1999,8 @@ local function register_dimension_biomes() vertical_blend = 16, _mcl_biome_type = "medium", _mcl_palette_index = 0, --- _mcl_skycolor = "#000000", --- _mcl_fogcolor = "#A080A0" +-- _mcl_skycolor = end_skycolor, +-- _mcl_fogcolor = end_fogcolor }) minetest.register_biome({ name = "EndSmallIslands", @@ -2007,8 +2016,8 @@ local function register_dimension_biomes() vertical_blend = 16, _mcl_biome_type = "medium", _mcl_palette_index = 0, --- _mcl_skycolor = "#000000", --- _mcl_fogcolor = "#A080A0" +-- _mcl_skycolor = end_skycolor, +-- _mcl_fogcolor = end_fogcolor }) minetest.register_biome({ @@ -2027,8 +2036,8 @@ local function register_dimension_biomes() min_pos = {x = -1250, y = mcl_vars.mg_end_min, z = -1250}, _mcl_biome_type = "medium", _mcl_palette_index = 0, --- _mcl_skycolor = "#000000", --- _mcl_fogcolor = "#A080A0" +-- _mcl_skycolor = end_skycolor, +-- _mcl_fogcolor = end_fogcolor }) minetest.register_biome({ @@ -2045,8 +2054,8 @@ local function register_dimension_biomes() vertical_blend = 16, _mcl_biome_type = "medium", _mcl_palette_index = 0, --- _mcl_skycolor = "#000000", --- _mcl_fogcolor = "#A080A0" +-- _mcl_skycolor = end_skycolor, +-- _mcl_fogcolor = end_fogcolor }) end From a50908e1eb1ee405789c8b74b81683a18b2132ab Mon Sep 17 00:00:00 2001 From: FossFanatic Date: Wed, 21 Dec 2022 16:00:04 +0000 Subject: [PATCH 07/13] Fix the flat biome having a beach sky colour --- mods/MAPGEN/mcl_biomes/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua index 73b2e3fe2..25e8f3e34 100644 --- a/mods/MAPGEN/mcl_biomes/init.lua +++ b/mods/MAPGEN/mcl_biomes/init.lua @@ -42,7 +42,7 @@ local function register_classic_superflat_biome() heat_point = 50, _mcl_biome_type = "medium", _mcl_palette_index = 0, - _mcl_skycolor = beach_skycolor, + _mcl_skycolor = "#78A7FF", _mcl_fogcolor = overworld_fogcolor }) end From 8d51e16b8e37a04e957ca8f6717bead8177f9d3c Mon Sep 17 00:00:00 2001 From: FossFanatic Date: Thu, 22 Dec 2022 12:34:14 +0000 Subject: [PATCH 08/13] Remove obsolete texture --- .../textures/mcl_blackstone_gilded_side.png | Bin 2199 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 mods/ITEMS/mcl_blackstone/textures/mcl_blackstone_gilded_side.png diff --git a/mods/ITEMS/mcl_blackstone/textures/mcl_blackstone_gilded_side.png b/mods/ITEMS/mcl_blackstone/textures/mcl_blackstone_gilded_side.png deleted file mode 100644 index 1b8b5dee02b58407e6e4557758a150b04a76ce28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2199 zcmV;I2x#|-P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1bb}p)fX{ z1@SFLXPo$R>{f){P`flgCJ@|YUq7$08!e5|w|6;2L@Ju&)aA-*VIjg9{Mr`r2)>NA ztVi)AxLAQ$gTjKR8d7qI_MkwGG7akMU8%yv;JOpMovVoZ97|rDx(WcuhxyQO0x+8K z3D{Ji<}vJUTWIOkrLR(g=0;fQ2*LZo zkAwscW%e8lGe;Iqtem5dA##jS;;d0wyaZv1B9cTUC!a#%6qBTsG-Y+_QNmcGiqWL1 zIYViN=#1SND{?Nb_!0`2Sfr$)C0Ed=hRQWosi|ts%{AYU{w+2!Ej4YqQwNoL=-gwM zp1Srtz_sB=7(C*Tk%o?ZqjpezqDF7X{TVens7=JeS|?wqVOZo6L9?9j#0-eJKtNn3 z0wA=TnAt=jxQX1v%qmL1X9v`XCpe8JVn8r-ay;n9?hCm;;$}Gf3ODx?a%MvJ|3J=6 z=nitT{=O1o3+ zh~ZbF%!i3Sc5AE(+-={zP)AHZ3NycSWU$>f_gqKi1Uz=%bhbd^n;TGmHb@#&f#&M> z?!x81kR~6PaG#0PO--{ouL6JbrqcE&UU;<_~Ggu8ko?MU8udTF7>EEBCyY= zmqMP2x_Ob*U&bs~uD#}6_20d*_n3xIRe{0{gBh8Qaewfn9SD(B@xYfIa_bBSQk?y5 zg2G+3H|m)-GL3blas$?R?D2}*K?$FLHV=eHxa0;DaY8!t?iQ$d-%jnC1&y51p0>6a z9Z0$ z@tBL6%*!Ez^X3D+p2+3m2Sx8r8Avqi=DqBhBEP27TS|5F%%yKu)N;(w;78OSSz46KZjHt7EFVceNU{zUI=0 z;%By6cZ3Bes7v8khI3`)sE<_8HjYz*wRn`*tO+R!&gGpXv-tLLIZL;DH6KMfk6VJf zTUCVC=$Bx_2!Uwb3-Pz$pPfE>kp$et<+@BlE;cw2-#dOj(I3*0%9%nZwqN78$xBfVg-h?QtBTM@42rpLo18?Q|Wl60=P zVC|V8@aCABwCfiJ2fzXf8m*T%795>_&(373z3xQlgfsCfwk1gUM0oR&@iAU-SDJ7a zxyWsC(5`mCUxZf&%)^79W5pXcHiLCJ$eYbj?@r!zmazj)uZfI*CK5 z@kbA?#oEP{o5c2HsyV6pC^}b83eL#j?qa4Vbz7Vve45rwy>cQ-)9VTryLZ<_T-D;1 z=FcUqHlR^;;O4F7e|{-$Jh^YfegFUf24YJ`L;(K){{a7>y{D4^000SaNLh0L04^f{ z04^f|c%?sf00007bV*G`2jv452qg>K2&Fp!00HYsL_t(I%cYVrXcJ)+$A4c4f({va zXDmTz&cRSZXrxU8QXEn`2|78Hq~^%vpx8x}4wX7cp^L>XU9@6KAq@zTA}9ujs>nGg z5~KlhLPcnL38j=+O5t-TcitsI1mE;M-uwRl_y4~q=KBKtPxt^@Nx%G;W@TKJT>(yf zI27%L)rDnGJ~|tb-N=0Iq?Pnbo26+OEM_O2S}+tNt>-*s{Wnfa;r2ioS7m%a;nU{^ zjTKA$P0r|SM83YWA$)GM_<%w%6!XYvm*SqtBcX2X6AZ;TdFl+CwH>E1rD0FY0~w4U>r+;Io?8js(*AbS!Cax*gkN9@)<+gmm2KficPb^yY<4nXwWWd?_P zorV!r1)!QKiI*?l@ch{~Pu=fcSA0)ld#mOdaow_<_x)oT(KC_Ym!|RP{atQ-e02mc zH#A1rG$Hm_6bl7*EB%Bcf7sV8i(;YR0F_O%Q$o`)JOy`@O_SY9g{gzQy!bRLn}*?- Z{2Q<6zv$(oy!rqD002ovPDHLkV1mr9G7A6z From 4c23601d039f14bd55b158211371e6fc26d4d890 Mon Sep 17 00:00:00 2001 From: FossFanatic Date: Thu, 22 Dec 2022 12:38:05 +0000 Subject: [PATCH 09/13] Remove useless amethyst texture This texture is a remnant of the PixelPerfection resource pack and nowhere in the code does this texture get used. --- .../mcl_amethyst_amethyst_cluster_block.png | Bin 7115 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 mods/ITEMS/mcl_amethyst/textures/mcl_amethyst_amethyst_cluster_block.png diff --git a/mods/ITEMS/mcl_amethyst/textures/mcl_amethyst_amethyst_cluster_block.png b/mods/ITEMS/mcl_amethyst/textures/mcl_amethyst_amethyst_cluster_block.png deleted file mode 100644 index 7ea932bf86a3ec528ef71591deb5a7187bbfa837..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7115 zcmeHLc~lcgw{K)z1{H7@Q3-(&6*}qe?2&-%L}eL>3d*3JbSE@qGifA%BCdlgf+C8b zs3hxNFU$3Di<4gbm7%KF34*&qbT>lIj004m1i!KxZ`p3tJg2(_gilWx2q=X!&kkM+K zg6jw=0O)RBoI8KplgXxUWux-HTJ=@J{pXId#nqL&@1U*wj&)wksJF^+A|%11UH5E0 z@^IO^sO?>MTGP!um(*@{J@Q(Z+>8te@1W-~f`ePNlDu>48yd{UyKk_6Hh-vBSMrvn zN8K%Kx-jp@(f*-Uw!HRN7pr$9WP6#eTs&mIB;i)v^k1jnt~_Q1_W>?aK>&*s+IFn~K(aND;<((VS@oHcC+txcfM>S>d`0+O5Z25`0*G1`%ojn5?o{fhphnv@^ zM@M?eOf!SbHKBR^#}8YUxG2Qy=RE`J<}dfnzdCw+%5YvW;(hSj11?Lyv!7isIkzz3 zkoIa@@)WPskc@-FDjmZL%GX-jSN{;7Y8`ose!Rse;`EGlYb{-_4BK#dR)2xwC8Ai{v zSU2&y&){|c9y>h&I`utcVf^NynLz(zmw)tL#hv>6Je0MmY}EAWw+jc*GoXR-`;=81 zqp09_t+z(+lNt@WwA?0Bn7%wE^N97by^}SQW80g~m^sC~I^SCCvck-|6k5Mv)A(;X z$BH+M3%pP<^${yf#7bk@rH(DToV{6Gvo)Y)o?bQUL6OT-d!?0sM1H-fQfkd4xGTdgUaoY# z{)BnyK>NKzzuy}3$Ne>)caN-b+t4n45fh(vVdl*&b%V+5l*^)2*PM-4PO&fU&V8h* zD7NRmda~hG)yNr#S;PH`7H8QWgnzY&%_%A)G%d+#<`Lr%l_YIzh*|Ne#xrS*%wa$8 z%C-wP`c7pz=7|+8rDof#>d5*{<6>L}#|~Qfk#RZdhE!({En}fd`uxXm2dpQmW$BC7#<=eUw~o$8tX# zyiT!yd#deH-(;x$2LE{cq9wa7w&q`I*?-~Uil!*w2cL!ymQB% z*`>-WmIC}KD|=f0Ie~W<<<{J&i;bOc9*=FbW-oh8@4Ra>t(L@C13p^VyHb7d?t|3D+L&T$}OWdZB2boHlj$yoU#`y}9o?A5SnYp{AXw+j>Yr zH?8;7(t|BfJnjMEEeF3GcV z+qv2)rY3j9Hs5^owDH%^U$~T1`6V1TUeJ%-kob}wmp$V|(v(vr{e{Gv;djacL#~Fb zez>2uha#_^Du^q2bT{#M#Ds%&k#E+NhmK1ua7J2Z?y7hw7yj@snk=-wVScLHkZZaF z9TVOm6Azl2Yg$h&I(g;rmF6r#(G5!{;mLqI^Y8i#8{Cd1x#yHc{V`5@gBJ`3S;@N& zEWEycWk$XSvVHL7E8#7noeUP0z3Xd5>oOJ3Io8^mq{Dp3A?`tst=+c)a z3A{`EN3Qk@+`l))bg}uOa{mm6gmv5*_M^|a686U*E&Q#m z$D5D3le#^}jt);~W<6XS+*w8XcxGzoeYUZ(Z61+0Qg- z2Yf%;BmQ%{df# zEzYhBJ(77CEAVBl`)b=}cM~dB`>o5U(R+_aWNr7p5`Ce>x#@LabMpDwMmE3p3-`C? z#XYxp`}A;d`Yz3u6>w%p*-7VL;)`k3;Wyeljw(+1hJ{=zPPx{0J*~LG?%~Ewqj~*Y z>x;`Gy|#43S58>?T9`WIe9~Ky>(N0!?Y_MIx8iEB`fN-4;ia3d45Z9FGq1?V)O2~< za6B*eZDC%as_Qn<@oeDJ?=>2UKcx`>MvNsyL1d86EWSjgprM#bjMH=qHJ~>~XPp|A zMBpSvjLQh6fcmWPER{lF0_t3r59FhE!@~&g7!4j6<13QHL`ZlT)!E6!QODOQ)C!zL zDLRE*spabgR0A(xspadt=~RjVLPiLvK|cNzHZ<3BprbuE(jqY z!lU=~*D2IKKE2*bZI6l)m4dEA)pVE!(G`l1JhY_8;t%mY>7f-xt8sb&u2n^9B)G?7 zTuIvW4XTz$YWv2F)Z+Rs!?@*`l&({BNABz6CG_#{_0h{HBNS?bhaTM*iAj2K>PU^; zfWahmT#hSnC8?#uH25PtNk~6T&`0^`-xwt5ORrO?d-*>?zt_tEHt5QCS4krEL51!D zs(!qDOeG;OzTqzliFphRV}J+~=73Bo4+F(g2nP{14oguS4PAfQrzd4?X^Jl$5G83ITO4 zp~O^C+7GWpgaQvFQN3(18)7k;3=RTucpM(DJ3j;C99*L%R7yQ74AGG8VPg`$r%Izh zNdc8mpfa4UR>};#`iaq}gDXi?zdHm}*wC+2sQGRh93@p6kxC^OQ1#ptJ*8n&Q5<`= z3xAeMVsJEoaZJDCdiIeSqt;@?rR&NDoCZjLqR9 zpcrN$AQKmJK$IcIK{3XWVr(9Z1H!KRA^qZHz#vzG zGC@oth4cpzg9mf}()3s&n4w>s2=qQZN4oxY^S;tJ>Q8hZpO0#hqyB!t7wQjzz(}=P zPT-o4Yt;Li{lDP)`1hO-|H-{CtlQg7rH0 zW$AMX)ZZ-)QU$nsI+-}qdoQa!75ZwCUddk1R)VDJe2V+5q7 zj|Bi=ASv|m7}z}6Y>3UslKO=RbKY4uCOeb`hrE&(%sX+?_;4rnnCRG!yh|!sy61wWCT54{)px#`d2T;pv;@d} XeQ2-0RGp;%&M5Tob Date: Thu, 22 Dec 2022 12:40:10 +0000 Subject: [PATCH 10/13] Remove dry grass top texture This is a remnant of Minetest Game and used to be for dry biomes before colour palettes were a thing in MineClone 2. --- .../ITEMS/mcl_core/textures/default_dry_grass.png | Bin 171 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 mods/ITEMS/mcl_core/textures/default_dry_grass.png diff --git a/mods/ITEMS/mcl_core/textures/default_dry_grass.png b/mods/ITEMS/mcl_core/textures/default_dry_grass.png deleted file mode 100644 index e610678a629d2b865eac6e1b443c9479e07d17d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 171 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRdCT0c(hNQXTpBNYzcmjMvT$95L(^9Q-OPwP8 zw3rt??_*$Ki1KuC45?sDPT&YgNJ`+lIOD*9e@?}=&f3Srv)fvGq)jBIZ7@wSh)G}F znQl?@l~ Date: Thu, 22 Dec 2022 12:40:36 +0000 Subject: [PATCH 11/13] Remove dry grass side texture The same reason as why the dry grass top texture got removed. --- .../mcl_core/textures/default_dry_grass_side.png | Bin 183 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 mods/ITEMS/mcl_core/textures/default_dry_grass_side.png diff --git a/mods/ITEMS/mcl_core/textures/default_dry_grass_side.png b/mods/ITEMS/mcl_core/textures/default_dry_grass_side.png deleted file mode 100644 index b12d06e7b7f09a73a9a68add444a8fe907b51243..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 183 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdqsCd_r6!BaGwIEW^CDGfEsh zY!nz67+yd2+{nPdz*Z9E7yKUt7&h-;vY&y0!OzphF{FZ#=ipYx1_Kd?gW@mu>o#1= z=zqIkcqg;3ZrAM{dGlnXORe3cH^c_Zy;bvj{q?r-=g4^#t3K+Rm>f76aq+6;2?nD^ gi8CBa=P)uXxF&a_T3|vA0|Nttr>mdKI;Vst0B(^%EC2ui From 522bbbbe26a6e1991016c46b021d6b1c309cd610 Mon Sep 17 00:00:00 2001 From: FossFanatic Date: Thu, 22 Dec 2022 12:47:44 +0000 Subject: [PATCH 12/13] Delete 'mods/ENTITIES/mobs_mc/textures/mobs_mc_enderman_block.png' --- .../mobs_mc/textures/mobs_mc_enderman_block.png | Bin 702 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 mods/ENTITIES/mobs_mc/textures/mobs_mc_enderman_block.png diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_enderman_block.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_enderman_block.png deleted file mode 100644 index 97d949d8a3750e4ca7fd2946a494db348f9f4956..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 702 zcmV;v0zv(WP)J*1FwbwYMtMre<4uqqXBM?2)tDDT4pmCcoKw8Y-5K36j|CG3i^I(!ZT}t#{ehmSX^5bPBxT;B%%jIPtxUMc>=?tj@ z8U%7oprIXskN_7U0Uya;Jb@ztHyvF`z(*$xII6G*Hv&)6oEd?OvJwP$%#}3Pr1%;& ziU=>-C2i!IIDH;`T+oX8#P-7+c;%=hKolfU2xx~xtZX@IhrtRmk>-?vaJx4IYm~4N zIY)ph$_$w3N{|McojZexJt(;gq!}CX&wI%bxhRJh?gHVvWZ>DJH+i5|UT_RYhy+PH kXm=8o92o`NM4lw{ACk@v?Z-kvR{#J207*qoM6N<$f=0O@NB{r; From 9eb86f011b2906d96acf530dd1c713e23d76123b Mon Sep 17 00:00:00 2001 From: FossFanatic Date: Sat, 24 Dec 2022 14:54:48 +0000 Subject: [PATCH 13/13] Make the code clearer to read --- mods/ENVIRONMENT/mcl_weather/skycolor.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/ENVIRONMENT/mcl_weather/skycolor.lua b/mods/ENVIRONMENT/mcl_weather/skycolor.lua index be45e2a9b..e8123b0d1 100644 --- a/mods/ENVIRONMENT/mcl_weather/skycolor.lua +++ b/mods/ENVIRONMENT/mcl_weather/skycolor.lua @@ -5,7 +5,7 @@ local water_color = "#0b4880" local mg_name = minetest.get_mapgen_setting("mg_name") -function mcl_weather.set_sky_box_clear(player,sky,fog) +function mcl_weather.set_sky_box_clear(player, sky, fog) local pos = player:get_pos() if minetest.get_item_group(minetest.get_node(vector.new(pos.x,pos.y+1.5,pos.z)).name, "water") ~= 0 then return end local sc = { @@ -31,7 +31,7 @@ end function mcl_weather.set_sky_color(player, def) local pos = player:get_pos() - if minetest.get_item_group(minetest.get_node(vector.new(pos.x,pos.y+1.5,pos.z)).name, "water") ~= 0 then return end + if minetest.get_item_group(minetest.get_node(vector.offset(pos, 0, 1.5, 0)).name, "water") ~= 0 then return end player:set_sky({ type = def.type, sky_color = def.sky_color,