From f6a3fe21288d3ab632c4de2d843637084bc2ce95 Mon Sep 17 00:00:00 2001 From: FossFanatic Date: Fri, 20 Jan 2023 15:41:44 +0000 Subject: [PATCH 1/4] Make Nether & End use biome sky- or fog colours --- mods/ENVIRONMENT/mcl_weather/skycolor.lua | 51 ++++++++++++++++------- 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/mods/ENVIRONMENT/mcl_weather/skycolor.lua b/mods/ENVIRONMENT/mcl_weather/skycolor.lua index 3163b0a9d..ed3a1a8ce 100644 --- a/mods/ENVIRONMENT/mcl_weather/skycolor.lua +++ b/mods/ENVIRONMENT/mcl_weather/skycolor.lua @@ -210,9 +210,23 @@ mcl_weather.skycolor = { end end elseif dim == "end" then + local biomesky = "#000000" + local biomefog = "#A080A0" + if mg_name ~= "v6" and mg_name ~= "singlenode" then + local biome_index = minetest.get_biome_data(player:get_pos()).biome + local biome_name = minetest.get_biome_name(biome_index) + local biome = minetest.registered_biomes[biome_name] + if biome then + --minetest.log("action", string.format("Biome found for number: %s in biome: %s", tostring(biome_index), biome_name)) + biomesky = biome._mcl_skycolor + biomefog = biome._mcl_fogcolor -- The End biomes seemingly don't use the fog colour, despite having this value according to the wiki. The sky colour is seemingly used for both sky and fog? + else + --minetest.log("action", string.format("No biome for number: %s in biome: %s", tostring(biome_index), biome_name)) + end + end local t = "mcl_playerplus_end_sky.png" player:set_sky({ type = "skybox", - base_color = "#000000", + base_color = biomesky, textures = {t,t,t,t,t,t}, clouds = false, }) @@ -221,24 +235,29 @@ mcl_weather.skycolor = { player:set_stars({visible = false}) mcl_weather.skycolor.override_day_night_ratio(player, 0.5) elseif dim == "nether" then - local nether_sky = { - Nether = "#300808", - BasaltDelta = "#685F70", - SoulsandValley = "#1B4745", - CrimsonForest = "#330303", - WarpedForest = "#1A051A" - } - local biometint = nether_sky[minetest.get_biome_name(minetest.get_biome_data(player:get_pos()).biome)] - + local biomesky = "#6EB1FF" + local biomefog = "#330808" + if mg_name ~= "v6" and mg_name ~= "singlenode" then + local biome_index = minetest.get_biome_data(player:get_pos()).biome + local biome_name = minetest.get_biome_name(biome_index) + local biome = minetest.registered_biomes[biome_name] + if biome then + --minetest.log("action", string.format("Biome found for number: %s in biome: %s", tostring(biome_index), biome_name)) + biomesky = biome._mcl_skycolor -- The Nether biomes seemingly don't use the sky colour, despite having this value according to the wiki. The fog colour is used for both sky and fog. + biomefog = biome._mcl_fogcolor + else + --minetest.log("action", string.format("No biome for number: %s in biome: %s", tostring(biome_index), biome_name)) + end + end mcl_weather.set_sky_color(player, { type = "regular", sky_color = { - day_sky = "#300808", - day_horizon = biometint, - dawn_sky = "#300808", - dawn_horizon = biometint, - night_sky = "#300808", - night_horizon = biometint, + day_sky = biomefog, + day_horizon = biomefog, + dawn_sky = biomefog, + dawn_horizon = biomefog, + night_sky = biomefog, + night_horizon = biomefog, }, clouds = false, }) From a1ad84370c62233a15d86d2e408543eb59f50f42 Mon Sep 17 00:00:00 2001 From: FossFanatic Date: Fri, 20 Jan 2023 15:44:03 +0000 Subject: [PATCH 2/4] Move locals upward & uncomment some things Some locals relating to the biome sky colours and fog colours have been moved upward since there otherwise were some issues. The sky colours and fog colours of the Nether & End biomes have also been uncommented. --- mods/MAPGEN/mcl_biomes/init.lua | 66 ++++++++++++++++----------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua index c692e2bff..9682ecaed 100644 --- a/mods/MAPGEN/mcl_biomes/init.lua +++ b/mods/MAPGEN/mcl_biomes/init.lua @@ -1,3 +1,12 @@ +local overworld_fogcolor = "#C0D8FF" +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 nether_skycolor = "#6EB1FF" -- The Nether biomes seemingly don't use the sky colour, despite having this value according to the wiki. The fog colour is used for both sky and fog. + +local end_skycolor = "#000000" +local end_fogcolor = "#A080A0" -- The End biomes seemingly don't use the fog colour, despite having this value according to the wiki. The sky colour is used for both sky and fog. + local mg_name = minetest.get_mapgen_setting("mg_name") local mg_seed = minetest.get_mapgen_setting("seed") @@ -134,15 +143,6 @@ local function register_biomes() "BambooJungleEdgeM", } -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", @@ -1940,8 +1940,8 @@ local function register_dimension_biomes() humidity_point = 0, _mcl_biome_type = "hot", _mcl_palette_index = 17, --- _mcl_skycolor = nether_skycolor, --- _mcl_fogcolor = "#330808" + _mcl_skycolor = nether_skycolor, + _mcl_fogcolor = "#330808" }) minetest.register_decoration({ @@ -1971,8 +1971,8 @@ local function register_dimension_biomes() humidity_point = 33, _mcl_biome_type = "hot", _mcl_palette_index = 17, --- _mcl_skycolor = nether_skycolor, --- _mcl_fogcolor = "#1B4745" + _mcl_skycolor = nether_skycolor, + _mcl_fogcolor = "#1B4745" }) minetest.register_decoration({ deco_type = "simple", @@ -2022,8 +2022,8 @@ local function register_dimension_biomes() humidity_point = 47, _mcl_biome_type = "hot", _mcl_palette_index = 17, --- _mcl_skycolor = nether_skycolor, --- _mcl_fogcolor = "#330303" + _mcl_skycolor = nether_skycolor, + _mcl_fogcolor = "#330303" }) minetest.register_decoration({ deco_type = "simple", @@ -2051,8 +2051,8 @@ local function register_dimension_biomes() humidity_point = 70, _mcl_biome_type = "hot", _mcl_palette_index = 17, --- _mcl_skycolor = nether_skycolor, --- _mcl_fogcolor = "#1A051A" + _mcl_skycolor = nether_skycolor, + _mcl_fogcolor = "#1A051A" }) minetest.register_decoration({ deco_type = "simple", @@ -2080,8 +2080,8 @@ local function register_dimension_biomes() humidity_point = 80, _mcl_biome_type = "hot", _mcl_palette_index = 17, --- _mcl_skycolor = nether_skycolor, --- _mcl_fogcolor = "#685F70" + _mcl_skycolor = nether_skycolor, + _mcl_fogcolor = "#685F70" }) minetest.register_decoration({ @@ -2134,8 +2134,8 @@ local function register_dimension_biomes() vertical_blend = 16, _mcl_biome_type = "medium", _mcl_palette_index = 0, --- _mcl_skycolor = end_skycolor, --- _mcl_fogcolor = end_fogcolor + _mcl_skycolor = end_skycolor, + _mcl_fogcolor = end_fogcolor }) minetest.register_biome({ name = "EndBarrens", @@ -2151,8 +2151,8 @@ local function register_dimension_biomes() vertical_blend = 16, _mcl_biome_type = "medium", _mcl_palette_index = 0, --- _mcl_skycolor = end_skycolor, --- _mcl_fogcolor = end_fogcolor + _mcl_skycolor = end_skycolor, + _mcl_fogcolor = end_fogcolor }) minetest.register_biome({ name = "EndMidlands", @@ -2168,8 +2168,8 @@ local function register_dimension_biomes() vertical_blend = 16, _mcl_biome_type = "medium", _mcl_palette_index = 0, --- _mcl_skycolor = end_skycolor, --- _mcl_fogcolor = end_fogcolor + _mcl_skycolor = end_skycolor, + _mcl_fogcolor = end_fogcolor }) minetest.register_biome({ name = "EndHighlands", @@ -2185,8 +2185,8 @@ local function register_dimension_biomes() vertical_blend = 16, _mcl_biome_type = "medium", _mcl_palette_index = 0, --- _mcl_skycolor = end_skycolor, --- _mcl_fogcolor = end_fogcolor + _mcl_skycolor = end_skycolor, + _mcl_fogcolor = end_fogcolor }) minetest.register_biome({ name = "EndSmallIslands", @@ -2202,8 +2202,8 @@ local function register_dimension_biomes() vertical_blend = 16, _mcl_biome_type = "medium", _mcl_palette_index = 0, --- _mcl_skycolor = end_skycolor, --- _mcl_fogcolor = end_fogcolor + _mcl_skycolor = end_skycolor, + _mcl_fogcolor = end_fogcolor }) minetest.register_biome({ @@ -2222,8 +2222,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 = end_skycolor, --- _mcl_fogcolor = end_fogcolor + _mcl_skycolor = end_skycolor, + _mcl_fogcolor = end_fogcolor }) minetest.register_biome({ @@ -2240,8 +2240,8 @@ local function register_dimension_biomes() vertical_blend = 16, _mcl_biome_type = "medium", _mcl_palette_index = 0, --- _mcl_skycolor = end_skycolor, --- _mcl_fogcolor = end_fogcolor + _mcl_skycolor = end_skycolor, + _mcl_fogcolor = end_fogcolor }) end From 7712c45c4efb94fddcacb3fc7009cd12b6ef75ee Mon Sep 17 00:00:00 2001 From: FossFanatic Date: Tue, 24 Jan 2023 07:21:48 +0000 Subject: [PATCH 3/4] Fix conflict --- mods/MAPGEN/mcl_biomes/init.lua | 290 ++++++++++++++++---------------- 1 file changed, 145 insertions(+), 145 deletions(-) diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua index 9682ecaed..8813278a0 100644 --- a/mods/MAPGEN/mcl_biomes/init.lua +++ b/mods/MAPGEN/mcl_biomes/init.lua @@ -1,12 +1,3 @@ -local overworld_fogcolor = "#C0D8FF" -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 nether_skycolor = "#6EB1FF" -- The Nether biomes seemingly don't use the sky colour, despite having this value according to the wiki. The fog colour is used for both sky and fog. - -local end_skycolor = "#000000" -local end_fogcolor = "#A080A0" -- The End biomes seemingly don't use the fog colour, despite having this value according to the wiki. The sky colour is used for both sky and fog. - local mg_name = minetest.get_mapgen_setting("mg_name") local mg_seed = minetest.get_mapgen_setting("seed") @@ -50,7 +41,7 @@ local function register_classic_superflat_biome() humidity_point = 50, heat_point = 50, _mcl_biome_type = "medium", - _mcl_palette_index = 0, + _mcl_grass_palette_index = 0, _mcl_skycolor = "#78A7FF", _mcl_fogcolor = overworld_fogcolor }) @@ -143,6 +134,15 @@ local function register_biomes() "BambooJungleEdgeM", } +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", @@ -160,7 +160,7 @@ local function register_biomes() humidity_point = 24, heat_point = -5, _mcl_biome_type = "snowy", - _mcl_palette_index = 2, + _mcl_grass_palette_index = 2, _mcl_skycolor = "#7FA1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -178,7 +178,7 @@ local function register_biomes() humidity_point = 24, heat_point = -5, _mcl_biome_type = "snowy", - _mcl_palette_index = 2, + _mcl_grass_palette_index = 2, _mcl_skycolor = "#7FA1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -198,7 +198,7 @@ local function register_biomes() humidity_point = 58, heat_point = 8, _mcl_biome_type = "snowy", - _mcl_palette_index = 3, + _mcl_grass_palette_index = 3, _mcl_skycolor = "#839EFF", _mcl_fogcolor = overworld_fogcolor }) @@ -220,7 +220,7 @@ local function register_biomes() humidity_point = 58, heat_point = 8, _mcl_biome_type = "snowy", - _mcl_palette_index = 3, + _mcl_grass_palette_index = 3, _mcl_skycolor = "#7FA1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -240,7 +240,7 @@ local function register_biomes() humidity_point = 58, heat_point = 8, _mcl_biome_type = "snowy", - _mcl_palette_index = 3, + _mcl_grass_palette_index = 3, _mcl_skycolor = "#7FA1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -258,7 +258,7 @@ local function register_biomes() heat_point = 8, vertical_blend = 1, _mcl_biome_type = "snowy", - _mcl_palette_index = 3, + _mcl_grass_palette_index = 3, _mcl_skycolor = "#7FA1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -277,7 +277,7 @@ local function register_biomes() humidity_point = 76, heat_point = 10, _mcl_biome_type = "cold", - _mcl_palette_index = 4, + _mcl_grass_palette_index = 4, _mcl_skycolor = "#7CA3FF", _mcl_fogcolor = overworld_fogcolor }) @@ -294,7 +294,7 @@ local function register_biomes() humidity_point = 76, heat_point = 10, _mcl_biome_type = "cold", - _mcl_palette_index = 4, + _mcl_grass_palette_index = 4, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -313,7 +313,7 @@ local function register_biomes() humidity_point = 100, heat_point = 8, _mcl_biome_type = "cold", - _mcl_palette_index = 5, + _mcl_grass_palette_index = 5, _mcl_skycolor = "#7DA3FF", _mcl_fogcolor = overworld_fogcolor }) @@ -330,7 +330,7 @@ local function register_biomes() humidity_point = 100, heat_point = 8, _mcl_biome_type = "cold", - _mcl_palette_index = 5, + _mcl_grass_palette_index = 5, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -350,7 +350,7 @@ local function register_biomes() humidity_point = 10, heat_point = 45, _mcl_biome_type = "cold", - _mcl_palette_index = 6, + _mcl_grass_palette_index = 6, _mcl_skycolor = "#7DA2FF", _mcl_fogcolor = overworld_fogcolor }) @@ -368,7 +368,7 @@ local function register_biomes() humidity_point = 10, heat_point = 45, _mcl_biome_type = "cold", - _mcl_palette_index = 6, + _mcl_grass_palette_index = 6, _mcl_skycolor = beach_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -386,7 +386,7 @@ local function register_biomes() humidity_point = 10, heat_point = 45, _mcl_biome_type = "cold", - _mcl_palette_index = 6, + _mcl_grass_palette_index = 6, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -406,7 +406,7 @@ local function register_biomes() humidity_point = 0, heat_point = 25, _mcl_biome_type = "cold", - _mcl_palette_index = 7, + _mcl_grass_palette_index = 7, _mcl_skycolor = "#7DA2FF", _mcl_fogcolor = overworld_fogcolor }) @@ -423,7 +423,7 @@ local function register_biomes() humidity_point = 0, heat_point = 25, _mcl_biome_type = "cold", - _mcl_palette_index = 7, + _mcl_grass_palette_index = 7, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -445,7 +445,7 @@ local function register_biomes() heat_point = 25, vertical_blend = 6, _mcl_biome_type = "cold", - _mcl_palette_index = 8, + _mcl_grass_palette_index = 8, _mcl_skycolor = "#7DA2FF", _mcl_fogcolor = overworld_fogcolor }) @@ -465,7 +465,7 @@ local function register_biomes() humidity_point = 24, heat_point = 25, _mcl_biome_type = "cold", - _mcl_palette_index = 8, + _mcl_grass_palette_index = 8, _mcl_skycolor = "#7DA2FF", _mcl_fogcolor = overworld_fogcolor }) @@ -482,7 +482,7 @@ local function register_biomes() humidity_point = 24, heat_point = 25, _mcl_biome_type = "cold", - _mcl_palette_index = 8, + _mcl_grass_palette_index = 8, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -499,7 +499,7 @@ local function register_biomes() humidity_point = 0, heat_point = 8, _mcl_biome_type = "cold", - _mcl_palette_index = 9, + _mcl_grass_palette_index = 9, _mcl_skycolor = "#7DA2FF", _mcl_fogcolor = overworld_fogcolor }) @@ -516,7 +516,7 @@ local function register_biomes() humidity_point = 0, heat_point = 8, _mcl_biome_type = "cold", - _mcl_palette_index = 9, + _mcl_grass_palette_index = 9, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -539,7 +539,7 @@ local function register_biomes() humidity_point = 24, heat_point = 8, _mcl_biome_type = "snowy", - _mcl_palette_index = 10, + _mcl_grass_palette_index = 10, _mcl_skycolor = "#7FA1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -556,7 +556,7 @@ local function register_biomes() humidity_point = 24, heat_point = 8, _mcl_biome_type = "snowy", - _mcl_palette_index = 10, + _mcl_grass_palette_index = 10, _mcl_skycolor = "#7FA1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -575,7 +575,7 @@ local function register_biomes() humidity_point = 39, heat_point = 58, _mcl_biome_type = "medium", - _mcl_palette_index = 0, + _mcl_grass_palette_index = 0, _mcl_skycolor = "#78A7FF", _mcl_fogcolor = overworld_fogcolor }) @@ -592,7 +592,7 @@ local function register_biomes() humidity_point = 39, heat_point = 58, _mcl_biome_type = "medium", - _mcl_palette_index = 0, + _mcl_grass_palette_index = 0, _mcl_skycolor = beach_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -609,7 +609,7 @@ local function register_biomes() humidity_point = 39, heat_point = 58, _mcl_biome_type = "medium", - _mcl_palette_index = 0, + _mcl_grass_palette_index = 0, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -628,7 +628,7 @@ local function register_biomes() humidity_point = 28, heat_point = 45, _mcl_biome_type = "medium", - _mcl_palette_index = 11, + _mcl_grass_palette_index = 11, _mcl_skycolor = "#78A7FF", _mcl_fogcolor = overworld_fogcolor }) @@ -645,7 +645,7 @@ local function register_biomes() humidity_point = 28, heat_point = 45, _mcl_biome_type = "medium", - _mcl_palette_index = 11, + _mcl_grass_palette_index = 11, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -664,7 +664,7 @@ local function register_biomes() humidity_point = 58, heat_point = 22, _mcl_biome_type = "cold", - _mcl_palette_index = 12, + _mcl_grass_palette_index = 12, _mcl_skycolor = "#7DA3FF", _mcl_fogcolor = overworld_fogcolor }) @@ -681,7 +681,7 @@ local function register_biomes() humidity_point = 58, heat_point = 22, _mcl_biome_type = "cold", - _mcl_palette_index = 12, + _mcl_grass_palette_index = 12, _mcl_skycolor = beach_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -698,7 +698,7 @@ local function register_biomes() humidity_point = 58, heat_point = 22, _mcl_biome_type = "cold", - _mcl_palette_index = 12, + _mcl_grass_palette_index = 12, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -717,7 +717,7 @@ local function register_biomes() humidity_point = 61, heat_point = 45, _mcl_biome_type = "medium", - _mcl_palette_index = 13, + _mcl_grass_palette_index = 13, _mcl_skycolor = "#79A6FF", _mcl_fogcolor = overworld_fogcolor }) @@ -734,7 +734,7 @@ local function register_biomes() humidity_point = 61, heat_point = 45, _mcl_biome_type = "medium", - _mcl_palette_index = 13, + _mcl_grass_palette_index = 13, _mcl_skycolor = beach_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -751,7 +751,7 @@ local function register_biomes() humidity_point = 61, heat_point = 45, _mcl_biome_type = "medium", - _mcl_palette_index = 13, + _mcl_grass_palette_index = 13, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -770,7 +770,7 @@ local function register_biomes() humidity_point = 44, heat_point = 32, _mcl_biome_type = "medium", - _mcl_palette_index = 14, + _mcl_grass_palette_index = 14, _mcl_skycolor = "#79A6FF", _mcl_fogcolor = overworld_fogcolor }) @@ -787,7 +787,7 @@ local function register_biomes() humidity_point = 44, heat_point = 32, _mcl_biome_type = "medium", - _mcl_palette_index = 14, + _mcl_grass_palette_index = 14, _mcl_skycolor = beach_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -804,7 +804,7 @@ local function register_biomes() humidity_point = 44, heat_point = 32, _mcl_biome_type = "medium", - _mcl_palette_index = 14, + _mcl_grass_palette_index = 14, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -823,7 +823,7 @@ local function register_biomes() humidity_point = 78, heat_point = 31, _mcl_biome_type = "medium", - _mcl_palette_index = 15, + _mcl_grass_palette_index = 15, _mcl_skycolor = "#7AA5FF", _mcl_fogcolor = overworld_fogcolor }) @@ -840,7 +840,7 @@ local function register_biomes() humidity_point = 78, heat_point = 31, _mcl_biome_type = "medium", - _mcl_palette_index = 15, + _mcl_grass_palette_index = 15, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -859,7 +859,7 @@ local function register_biomes() humidity_point = 77, heat_point = 27, _mcl_biome_type = "medium", - _mcl_palette_index = 16, + _mcl_grass_palette_index = 16, _mcl_skycolor = "#7AA5FF", _mcl_fogcolor = overworld_fogcolor }) @@ -876,7 +876,7 @@ local function register_biomes() humidity_point = 77, heat_point = 27, _mcl_biome_type = "medium", - _mcl_palette_index = 16, + _mcl_grass_palette_index = 16, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -896,7 +896,7 @@ local function register_biomes() humidity_point = 26, heat_point = 94, _mcl_biome_type = "hot", - _mcl_palette_index = 17, + _mcl_grass_palette_index = 17, _mcl_skycolor = "#6EB1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -913,7 +913,7 @@ local function register_biomes() humidity_point = 26, heat_point = 94, _mcl_biome_type = "hot", - _mcl_palette_index = 17, + _mcl_grass_palette_index = 17, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -932,7 +932,7 @@ local function register_biomes() humidity_point = 94, heat_point = 27, _mcl_biome_type = "medium", - _mcl_palette_index = 18, + _mcl_grass_palette_index = 18, _mcl_skycolor = "#79A6FF", _mcl_fogcolor = overworld_fogcolor }) @@ -949,7 +949,7 @@ local function register_biomes() humidity_point = 94, heat_point = 27, _mcl_biome_type = "medium", - _mcl_palette_index = 18, + _mcl_grass_palette_index = 18, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -969,7 +969,7 @@ local function register_biomes() humidity_point = 0, heat_point = 100, _mcl_biome_type = "hot", - _mcl_palette_index = 19, + _mcl_grass_palette_index = 19, _mcl_skycolor = "#6EB1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -988,7 +988,7 @@ local function register_biomes() humidity_point = 0, heat_point = 100, _mcl_biome_type = "hot", - _mcl_palette_index = 19, + _mcl_grass_palette_index = 19, _mcl_skycolor = "#6EB1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1006,7 +1006,7 @@ local function register_biomes() humidity_point = 0, heat_point = 100, _mcl_biome_type = "hot", - _mcl_palette_index = 19, + _mcl_grass_palette_index = 19, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1025,7 +1025,7 @@ local function register_biomes() humidity_point = -5, heat_point = 100, _mcl_biome_type = "hot", - _mcl_palette_index = 20, + _mcl_grass_palette_index = 20, _mcl_skycolor = "#6EB1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1043,7 +1043,7 @@ local function register_biomes() humidity_point = -5, heat_point = 100, _mcl_biome_type = "hot", - _mcl_palette_index = 20, + _mcl_grass_palette_index = 20, _mcl_skycolor = "#6EB1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1061,7 +1061,7 @@ local function register_biomes() humidity_point = -5, heat_point = 100, _mcl_biome_type = "hot", - _mcl_palette_index = 20, + _mcl_grass_palette_index = 20, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1082,7 +1082,7 @@ local function register_biomes() heat_point = 60, vertical_blend = 0, -- we want a sharp transition _mcl_biome_type = "hot", - _mcl_palette_index = 21, + _mcl_grass_palette_index = 21, _mcl_skycolor = "#6EB1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1103,7 +1103,7 @@ local function register_biomes() humidity_point = 0, heat_point = 60, _mcl_biome_type = "hot", - _mcl_palette_index = 21, + _mcl_grass_palette_index = 21, _mcl_skycolor = "#6EB1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1121,7 +1121,7 @@ local function register_biomes() humidity_point = 0, heat_point = 60, _mcl_biome_type = "hot", - _mcl_palette_index = 21, + _mcl_grass_palette_index = 21, _mcl_skycolor = "#6EB1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1139,7 +1139,7 @@ local function register_biomes() humidity_point = 0, heat_point = 60, _mcl_biome_type = "hot", - _mcl_palette_index = 21, + _mcl_grass_palette_index = 21, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1162,7 +1162,7 @@ local function register_biomes() heat_point = 60, vertical_blend = 5, _mcl_biome_type = "hot", - _mcl_palette_index = 22, + _mcl_grass_palette_index = 22, _mcl_skycolor = "#6EB1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1181,7 +1181,7 @@ local function register_biomes() humidity_point = -5, heat_point = 60, _mcl_biome_type = "hot", - _mcl_palette_index = 22, + _mcl_grass_palette_index = 22, _mcl_skycolor = "#6EB1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1201,7 +1201,7 @@ local function register_biomes() heat_point = 60, vertical_blend = 4, _mcl_biome_type = "hot", - _mcl_palette_index = 22, + _mcl_grass_palette_index = 22, _mcl_skycolor = "#6EB1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1219,7 +1219,7 @@ local function register_biomes() humidity_point = -5, heat_point = 60, _mcl_biome_type = "hot", - _mcl_palette_index = 22, + _mcl_grass_palette_index = 22, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1239,7 +1239,7 @@ local function register_biomes() humidity_point = 36, heat_point = 79, _mcl_biome_type = "hot", - _mcl_palette_index = 1, + _mcl_grass_palette_index = 1, _mcl_skycolor = "#6EB1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1256,7 +1256,7 @@ local function register_biomes() humidity_point = 36, heat_point = 79, _mcl_biome_type = "hot", - _mcl_palette_index = 1, + _mcl_grass_palette_index = 1, _mcl_skycolor = beach_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1273,7 +1273,7 @@ local function register_biomes() humidity_point = 36, heat_point = 79, _mcl_biome_type = "hot", - _mcl_palette_index = 1, + _mcl_grass_palette_index = 1, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1294,7 +1294,7 @@ local function register_biomes() humidity_point = 48, heat_point = 100, _mcl_biome_type = "hot", - _mcl_palette_index = 23, + _mcl_grass_palette_index = 23, _mcl_skycolor = "#6EB1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1311,7 +1311,7 @@ local function register_biomes() humidity_point = 48, heat_point = 100, _mcl_biome_type = "hot", - _mcl_palette_index = 23, + _mcl_grass_palette_index = 23, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1330,7 +1330,7 @@ local function register_biomes() humidity_point = 88, heat_point = 81, _mcl_biome_type = "medium", - _mcl_palette_index = 24, + _mcl_grass_palette_index = 24, _mcl_skycolor = "#77A8FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1347,7 +1347,7 @@ local function register_biomes() humidity_point = 88, heat_point = 81, _mcl_biome_type = "medium", - _mcl_palette_index = 24, + _mcl_grass_palette_index = 24, _mcl_skycolor = "#77A8FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1365,7 +1365,7 @@ local function register_biomes() humidity_point = 88, heat_point = 81, _mcl_biome_type = "medium", - _mcl_palette_index = 24, + _mcl_grass_palette_index = 24, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1385,7 +1385,7 @@ local function register_biomes() humidity_point = 92, heat_point = 81, _mcl_biome_type = "medium", - _mcl_palette_index = 25, + _mcl_grass_palette_index = 25, _mcl_skycolor = "#77A8FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1402,7 +1402,7 @@ local function register_biomes() humidity_point = 92, heat_point = 81, _mcl_biome_type = "medium", - _mcl_palette_index = 25, + _mcl_grass_palette_index = 25, _mcl_skycolor = "#77A8FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1420,7 +1420,7 @@ local function register_biomes() humidity_point = 92, heat_point = 81, _mcl_biome_type = "medium", - _mcl_palette_index = 25, + _mcl_grass_palette_index = 25, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1439,7 +1439,7 @@ local function register_biomes() humidity_point = 88, heat_point = 76, _mcl_biome_type = "medium", - _mcl_palette_index = 26, + _mcl_grass_palette_index = 26, _mcl_skycolor = "#77A8FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1456,7 +1456,7 @@ local function register_biomes() humidity_point = 88, heat_point = 76, _mcl_biome_type = "medium", - _mcl_palette_index = 26, + _mcl_grass_palette_index = 26, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1478,7 +1478,7 @@ local function register_biomes() humidity_point = 90, heat_point = 79, _mcl_biome_type = "medium", - _mcl_palette_index = 27, + _mcl_grass_palette_index = 27, _mcl_skycolor = "#77A8FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1495,7 +1495,7 @@ local function register_biomes() humidity_point = 90, heat_point = 79, _mcl_biome_type = "medium", - _mcl_palette_index = 27, + _mcl_grass_palette_index = 27, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1515,7 +1515,7 @@ local function register_biomes() humidity_point = 95, heat_point = 94, _mcl_biome_type = "hot", - _mcl_palette_index = 27, + _mcl_grass_palette_index = 27, _mcl_skycolor = "#78A7FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1532,7 +1532,7 @@ local function register_biomes() humidity_point = 95, heat_point = 94, _mcl_biome_type = "hot", - _mcl_palette_index = 27, + _mcl_grass_palette_index = 27, _mcl_skycolor = "#78A7FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1550,7 +1550,7 @@ local function register_biomes() humidity_point = 95, heat_point = 94, _mcl_biome_type = "hot", - _mcl_palette_index = 27, + _mcl_grass_palette_index = 27, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1569,7 +1569,7 @@ local function register_biomes() humidity_point = 90, heat_point = 50, _mcl_biome_type = "medium", - _mcl_palette_index = 28, + _mcl_grass_palette_index = 28, _mcl_skycolor = "#78A7FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1586,7 +1586,7 @@ local function register_biomes() humidity_point = 90, heat_point = 50, _mcl_biome_type = "medium", - _mcl_palette_index = 28, + _mcl_grass_palette_index = 28, _mcl_skycolor = "#78A7FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1604,7 +1604,7 @@ local function register_biomes() humidity_point = 90, heat_point = 50, _mcl_biome_type = "medium", - _mcl_palette_index = 28, + _mcl_grass_palette_index = 28, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1626,7 +1626,7 @@ local function register_biomes() humidity_point = 106, heat_point = 50, _mcl_biome_type = "medium", - _mcl_palette_index = 29, + _mcl_grass_palette_index = 29, _mcl_skycolor = "#77A8FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1644,7 +1644,7 @@ local function register_biomes() humidity_point = 106, heat_point = 50, _mcl_biome_type = "medium", - _mcl_palette_index = 29, + _mcl_grass_palette_index = 29, _mcl_skycolor = "#77A8FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1661,7 +1661,7 @@ local function register_biomes() humidity_point = 106, heat_point = 50, _mcl_biome_type = "medium", - _mcl_palette_index = 29, + _mcl_grass_palette_index = 29, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1681,7 +1681,7 @@ local function register_biomes() humidity_point = 90, heat_point = 95, _mcl_biome_type = "medium", - _mcl_palette_index = 24, + _mcl_grass_palette_index = 24, _mcl_skycolor = "#77A8FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1698,7 +1698,7 @@ local function register_biomes() humidity_point = 90, heat_point = 95, _mcl_biome_type = "medium", - _mcl_palette_index = 24, + _mcl_grass_palette_index = 24, _mcl_skycolor = "#77A8FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1716,7 +1716,7 @@ local function register_biomes() humidity_point = 95, heat_point = 90, _mcl_biome_type = "medium", - _mcl_palette_index = 24, + _mcl_grass_palette_index = 24, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1736,7 +1736,7 @@ local function register_biomes() humidity_point = 95, heat_point = 95, _mcl_biome_type = "medium", - _mcl_palette_index = 25, + _mcl_grass_palette_index = 25, _mcl_skycolor = "#77A8FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1753,7 +1753,7 @@ local function register_biomes() humidity_point = 95, heat_point = 90, _mcl_biome_type = "medium", - _mcl_palette_index = 25, + _mcl_grass_palette_index = 25, _mcl_skycolor = "#77A8FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1771,7 +1771,7 @@ local function register_biomes() humidity_point = 95, heat_point = 95, _mcl_biome_type = "medium", - _mcl_palette_index = 25, + _mcl_grass_palette_index = 25, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1790,7 +1790,7 @@ local function register_biomes() humidity_point = 92, heat_point = 90, _mcl_biome_type = "medium", - _mcl_palette_index = 26, + _mcl_grass_palette_index = 26, _mcl_skycolor = "#77A8FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1807,7 +1807,7 @@ local function register_biomes() humidity_point = 95, heat_point = 88, _mcl_biome_type = "medium", - _mcl_palette_index = 26, + _mcl_grass_palette_index = 26, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1829,7 +1829,7 @@ local function register_biomes() humidity_point = 95, heat_point = 95, _mcl_biome_type = "medium", - _mcl_palette_index = 27, + _mcl_grass_palette_index = 27, _mcl_skycolor = "#77A8FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1846,7 +1846,7 @@ local function register_biomes() humidity_point = 97, heat_point = 90, _mcl_biome_type = "medium", - _mcl_palette_index = 27, + _mcl_grass_palette_index = 27, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1870,7 +1870,7 @@ local function register_biomes() depth_riverbed = 2, vertical_blend = 5, _mcl_biome_type = minetest.registered_biomes[biome]._mcl_biome_type, - _mcl_palette_index = minetest.registered_biomes[biome]._mcl_palette_index, + _mcl_grass_palette_index = minetest.registered_biomes[biome]._mcl_grass_palette_index, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1884,7 +1884,7 @@ local function register_biomes() y_min = mcl_vars.mg_overworld_min, 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_grass_palette_index = minetest.registered_biomes[biome]._mcl_grass_palette_index, _mcl_skycolor = minetest.registered_biomes[biome]._mcl_skycolor, _mcl_fogcolor = minetest.registered_biomes[biome]._mcl_fogcolor, }) @@ -1939,9 +1939,9 @@ local function register_dimension_biomes() heat_point = 100, humidity_point = 0, _mcl_biome_type = "hot", - _mcl_palette_index = 17, - _mcl_skycolor = nether_skycolor, - _mcl_fogcolor = "#330808" + _mcl_grass_palette_index = 17, +-- _mcl_skycolor = nether_skycolor, +-- _mcl_fogcolor = "#330808" }) minetest.register_decoration({ @@ -1970,9 +1970,9 @@ local function register_dimension_biomes() heat_point = 77, humidity_point = 33, _mcl_biome_type = "hot", - _mcl_palette_index = 17, - _mcl_skycolor = nether_skycolor, - _mcl_fogcolor = "#1B4745" + _mcl_grass_palette_index = 17, +-- _mcl_skycolor = nether_skycolor, +-- _mcl_fogcolor = "#1B4745" }) minetest.register_decoration({ deco_type = "simple", @@ -2021,9 +2021,9 @@ local function register_dimension_biomes() heat_point = 60, humidity_point = 47, _mcl_biome_type = "hot", - _mcl_palette_index = 17, - _mcl_skycolor = nether_skycolor, - _mcl_fogcolor = "#330303" + _mcl_grass_palette_index = 17, +-- _mcl_skycolor = nether_skycolor, +-- _mcl_fogcolor = "#330303" }) minetest.register_decoration({ deco_type = "simple", @@ -2050,9 +2050,9 @@ local function register_dimension_biomes() heat_point = 37, humidity_point = 70, _mcl_biome_type = "hot", - _mcl_palette_index = 17, - _mcl_skycolor = nether_skycolor, - _mcl_fogcolor = "#1A051A" + _mcl_grass_palette_index = 17, +-- _mcl_skycolor = nether_skycolor, +-- _mcl_fogcolor = "#1A051A" }) minetest.register_decoration({ deco_type = "simple", @@ -2079,9 +2079,9 @@ local function register_dimension_biomes() heat_point = 27, humidity_point = 80, _mcl_biome_type = "hot", - _mcl_palette_index = 17, - _mcl_skycolor = nether_skycolor, - _mcl_fogcolor = "#685F70" + _mcl_grass_palette_index = 17, +-- _mcl_skycolor = nether_skycolor, +-- _mcl_fogcolor = "#685F70" }) minetest.register_decoration({ @@ -2133,9 +2133,9 @@ local function register_dimension_biomes() humidity_point = 1000, vertical_blend = 16, _mcl_biome_type = "medium", - _mcl_palette_index = 0, - _mcl_skycolor = end_skycolor, - _mcl_fogcolor = end_fogcolor + _mcl_grass_palette_index = 0, +-- _mcl_skycolor = end_skycolor, +-- _mcl_fogcolor = end_fogcolor }) minetest.register_biome({ name = "EndBarrens", @@ -2150,9 +2150,9 @@ local function register_dimension_biomes() humidity_point = 1000, vertical_blend = 16, _mcl_biome_type = "medium", - _mcl_palette_index = 0, - _mcl_skycolor = end_skycolor, - _mcl_fogcolor = end_fogcolor + _mcl_grass_palette_index = 0, +-- _mcl_skycolor = end_skycolor, +-- _mcl_fogcolor = end_fogcolor }) minetest.register_biome({ name = "EndMidlands", @@ -2167,9 +2167,9 @@ local function register_dimension_biomes() humidity_point = 1000, vertical_blend = 16, _mcl_biome_type = "medium", - _mcl_palette_index = 0, - _mcl_skycolor = end_skycolor, - _mcl_fogcolor = end_fogcolor + _mcl_grass_palette_index = 0, +-- _mcl_skycolor = end_skycolor, +-- _mcl_fogcolor = end_fogcolor }) minetest.register_biome({ name = "EndHighlands", @@ -2184,9 +2184,9 @@ local function register_dimension_biomes() humidity_point = 1000, vertical_blend = 16, _mcl_biome_type = "medium", - _mcl_palette_index = 0, - _mcl_skycolor = end_skycolor, - _mcl_fogcolor = end_fogcolor + _mcl_grass_palette_index = 0, +-- _mcl_skycolor = end_skycolor, +-- _mcl_fogcolor = end_fogcolor }) minetest.register_biome({ name = "EndSmallIslands", @@ -2201,9 +2201,9 @@ local function register_dimension_biomes() humidity_point = 1000, vertical_blend = 16, _mcl_biome_type = "medium", - _mcl_palette_index = 0, - _mcl_skycolor = end_skycolor, - _mcl_fogcolor = end_fogcolor + _mcl_grass_palette_index = 0, +-- _mcl_skycolor = end_skycolor, +-- _mcl_fogcolor = end_fogcolor }) minetest.register_biome({ @@ -2221,9 +2221,9 @@ local function register_dimension_biomes() max_pos = {x = 1250, y = mcl_vars.mg_end_min + 512, z = 1250}, min_pos = {x = -1250, y = mcl_vars.mg_end_min, z = -1250}, _mcl_biome_type = "medium", - _mcl_palette_index = 0, - _mcl_skycolor = end_skycolor, - _mcl_fogcolor = end_fogcolor + _mcl_grass_palette_index = 0, +-- _mcl_skycolor = end_skycolor, +-- _mcl_fogcolor = end_fogcolor }) minetest.register_biome({ @@ -2239,9 +2239,9 @@ local function register_dimension_biomes() humidity_point = 50, vertical_blend = 16, _mcl_biome_type = "medium", - _mcl_palette_index = 0, - _mcl_skycolor = end_skycolor, - _mcl_fogcolor = end_fogcolor + _mcl_grass_palette_index = 0, +-- _mcl_skycolor = end_skycolor, +-- _mcl_fogcolor = end_fogcolor }) end @@ -3050,7 +3050,7 @@ local function register_grass_decoration(grasstype, offset, scale, biomes) persist = 0.6 } for b = 1, #biomes do - local param2 = minetest.registered_biomes[biomes[b]]._mcl_palette_index + local param2 = minetest.registered_biomes[biomes[b]]._mcl_grass_palette_index minetest.register_decoration({ deco_type = "simple", place_on = place_on, @@ -4395,7 +4395,7 @@ local function register_decorations() local function register_doubletall_grass(offset, scale, biomes) for b = 1, #biomes do - local param2 = minetest.registered_biomes[biomes[b]]._mcl_palette_index + local param2 = minetest.registered_biomes[biomes[b]]._mcl_grass_palette_index minetest.register_decoration({ deco_type = "schematic", schematic = { @@ -4430,7 +4430,7 @@ local function register_decorations() -- Large ferns local function register_double_fern(offset, scale, biomes) for b = 1, #biomes do - local param2 = minetest.registered_biomes[biomes[b]]._mcl_palette_index + local param2 = minetest.registered_biomes[biomes[b]]._mcl_grass_palette_index minetest.register_decoration({ deco_type = "schematic", schematic = { @@ -5034,7 +5034,7 @@ local function register_decorations() size = {x = 1, y = 2, z = 1}, data = { {name = "mcl_core:dirt_with_grass", force_place = true, }, - {name = "mcl_flowers:tallgrass", param2 = minetest.registered_biomes["IcePlains"]._mcl_palette_index}, + {name = "mcl_flowers:tallgrass", param2 = minetest.registered_biomes["IcePlains"]._mcl_grass_palette_index}, }, }, }) @@ -5057,7 +5057,7 @@ local function register_decorations() size = {x = 1, y = 2, z = 1}, data = { {name = "mcl_core:dirt_with_grass", force_place = true, }, - {name = "mcl_flowers:tallgrass", param2 = minetest.registered_biomes["ExtremeHills+_snowtop"]._mcl_palette_index}, + {name = "mcl_flowers:tallgrass", param2 = minetest.registered_biomes["ExtremeHills+_snowtop"]._mcl_grass_palette_index}, }, }, }) From f3bed9f5995de07123803b24eebb2b8deddff13b Mon Sep 17 00:00:00 2001 From: FossFanatic Date: Tue, 24 Jan 2023 07:27:36 +0000 Subject: [PATCH 4/4] Move locals upward & uncomment some things (again) --- mods/MAPGEN/mcl_biomes/init.lua | 66 ++++++++++++++++----------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua index 8813278a0..fc2864fcf 100644 --- a/mods/MAPGEN/mcl_biomes/init.lua +++ b/mods/MAPGEN/mcl_biomes/init.lua @@ -1,3 +1,12 @@ +local overworld_fogcolor = "#C0D8FF" +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 nether_skycolor = "#6EB1FF" -- The Nether biomes seemingly don't use the sky colour, despite having this value according to the wiki. The fog colour is used for both sky and fog. + +local end_skycolor = "#000000" +local end_fogcolor = "#A080A0" -- The End biomes seemingly don't use the fog colour, despite having this value according to the wiki. The sky colour is used for both sky and fog. + local mg_name = minetest.get_mapgen_setting("mg_name") local mg_seed = minetest.get_mapgen_setting("seed") @@ -134,15 +143,6 @@ local function register_biomes() "BambooJungleEdgeM", } -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", @@ -1940,8 +1940,8 @@ local function register_dimension_biomes() humidity_point = 0, _mcl_biome_type = "hot", _mcl_grass_palette_index = 17, --- _mcl_skycolor = nether_skycolor, --- _mcl_fogcolor = "#330808" + _mcl_skycolor = nether_skycolor, + _mcl_fogcolor = "#330808" }) minetest.register_decoration({ @@ -1971,8 +1971,8 @@ local function register_dimension_biomes() humidity_point = 33, _mcl_biome_type = "hot", _mcl_grass_palette_index = 17, --- _mcl_skycolor = nether_skycolor, --- _mcl_fogcolor = "#1B4745" + _mcl_skycolor = nether_skycolor, + _mcl_fogcolor = "#1B4745" }) minetest.register_decoration({ deco_type = "simple", @@ -2022,8 +2022,8 @@ local function register_dimension_biomes() humidity_point = 47, _mcl_biome_type = "hot", _mcl_grass_palette_index = 17, --- _mcl_skycolor = nether_skycolor, --- _mcl_fogcolor = "#330303" + _mcl_skycolor = nether_skycolor, + _mcl_fogcolor = "#330303" }) minetest.register_decoration({ deco_type = "simple", @@ -2051,8 +2051,8 @@ local function register_dimension_biomes() humidity_point = 70, _mcl_biome_type = "hot", _mcl_grass_palette_index = 17, --- _mcl_skycolor = nether_skycolor, --- _mcl_fogcolor = "#1A051A" + _mcl_skycolor = nether_skycolor, + _mcl_fogcolor = "#1A051A" }) minetest.register_decoration({ deco_type = "simple", @@ -2080,8 +2080,8 @@ local function register_dimension_biomes() humidity_point = 80, _mcl_biome_type = "hot", _mcl_grass_palette_index = 17, --- _mcl_skycolor = nether_skycolor, --- _mcl_fogcolor = "#685F70" + _mcl_skycolor = nether_skycolor, + _mcl_fogcolor = "#685F70" }) minetest.register_decoration({ @@ -2134,8 +2134,8 @@ local function register_dimension_biomes() vertical_blend = 16, _mcl_biome_type = "medium", _mcl_grass_palette_index = 0, --- _mcl_skycolor = end_skycolor, --- _mcl_fogcolor = end_fogcolor + _mcl_skycolor = end_skycolor, + _mcl_fogcolor = end_fogcolor }) minetest.register_biome({ name = "EndBarrens", @@ -2151,8 +2151,8 @@ local function register_dimension_biomes() vertical_blend = 16, _mcl_biome_type = "medium", _mcl_grass_palette_index = 0, --- _mcl_skycolor = end_skycolor, --- _mcl_fogcolor = end_fogcolor + _mcl_skycolor = end_skycolor, + _mcl_fogcolor = end_fogcolor }) minetest.register_biome({ name = "EndMidlands", @@ -2168,8 +2168,8 @@ local function register_dimension_biomes() vertical_blend = 16, _mcl_biome_type = "medium", _mcl_grass_palette_index = 0, --- _mcl_skycolor = end_skycolor, --- _mcl_fogcolor = end_fogcolor + _mcl_skycolor = end_skycolor, + _mcl_fogcolor = end_fogcolor }) minetest.register_biome({ name = "EndHighlands", @@ -2185,8 +2185,8 @@ local function register_dimension_biomes() vertical_blend = 16, _mcl_biome_type = "medium", _mcl_grass_palette_index = 0, --- _mcl_skycolor = end_skycolor, --- _mcl_fogcolor = end_fogcolor + _mcl_skycolor = end_skycolor, + _mcl_fogcolor = end_fogcolor }) minetest.register_biome({ name = "EndSmallIslands", @@ -2202,8 +2202,8 @@ local function register_dimension_biomes() vertical_blend = 16, _mcl_biome_type = "medium", _mcl_grass_palette_index = 0, --- _mcl_skycolor = end_skycolor, --- _mcl_fogcolor = end_fogcolor + _mcl_skycolor = end_skycolor, + _mcl_fogcolor = end_fogcolor }) minetest.register_biome({ @@ -2222,8 +2222,8 @@ local function register_dimension_biomes() min_pos = {x = -1250, y = mcl_vars.mg_end_min, z = -1250}, _mcl_biome_type = "medium", _mcl_grass_palette_index = 0, --- _mcl_skycolor = end_skycolor, --- _mcl_fogcolor = end_fogcolor + _mcl_skycolor = end_skycolor, + _mcl_fogcolor = end_fogcolor }) minetest.register_biome({ @@ -2240,8 +2240,8 @@ local function register_dimension_biomes() vertical_blend = 16, _mcl_biome_type = "medium", _mcl_grass_palette_index = 0, --- _mcl_skycolor = end_skycolor, --- _mcl_fogcolor = end_fogcolor + _mcl_skycolor = end_skycolor, + _mcl_fogcolor = end_fogcolor }) end