diff --git a/mods/CORE/mcl_util/init.lua b/mods/CORE/mcl_util/init.lua index 3c755da22..0a4aea29a 100644 --- a/mods/CORE/mcl_util/init.lua +++ b/mods/CORE/mcl_util/init.lua @@ -1017,16 +1017,17 @@ function mcl_util.check_position_protection(position, player) return false end -local palette_indexes = {grass_palette_index = 0, foliage_palette_index = 0} +local palette_indexes = {grass_palette_index = 0, foliage_palette_index = 0, water_palette_index = 0} function mcl_util.get_palette_indexes_from_pos(pos) local biome_data = minetest.get_biome_data(pos) local biome = biome_data.biome local biome_name = minetest.get_biome_name(biome) local reg_biome = minetest.registered_biomes[biome_name] - if reg_biome and reg_biome._mcl_grass_palette_index and reg_biome._mcl_foliage_palette_index then + if reg_biome and reg_biome._mcl_grass_palette_index and reg_biome._mcl_foliage_palette_index and reg_biome._mcl_water_palette_index then local gpi = reg_biome._mcl_grass_palette_index local fpi = reg_biome._mcl_foliage_palette_index - local palette_indexes = {grass_palette_index = gpi, foliage_palette_index = fpi} + local wpi = reg_biome._mcl_water_palette_index + local palette_indexes = {grass_palette_index = gpi, foliage_palette_index = fpi, water_palette_index = wpi} return palette_indexes else return palette_indexes diff --git a/mods/ENVIRONMENT/mcl_weather/skycolor.lua b/mods/ENVIRONMENT/mcl_weather/skycolor.lua index d8ef50787..711f46caa 100644 --- a/mods/ENVIRONMENT/mcl_weather/skycolor.lua +++ b/mods/ENVIRONMENT/mcl_weather/skycolor.lua @@ -1,7 +1,7 @@ local mods_loaded = false local NIGHT_VISION_RATIO = 0.45 -local water_color = "#0b4880" +local water_color = "#3F76E4" local mg_name = minetest.get_mapgen_setting("mg_name") @@ -125,7 +125,14 @@ mcl_weather.skycolor = { local pos = player:get_pos() local dim = mcl_worlds.pos_to_dimension(pos) local has_weather = (mcl_worlds.has_weather(pos) and (mcl_weather.state == "snow" or mcl_weather.state =="rain" or mcl_weather.state == "thunder") and mcl_weather.has_snow(pos)) or ((mcl_weather.state =="rain" or mcl_weather.state == "thunder") and mcl_weather.has_rain(pos)) - if minetest.get_item_group(minetest.get_node(vector.new(pos.x,pos.y+1.5,pos.z)).name, "water") ~= 0 then + local checkname = minetest.get_node(vector.new(pos.x,pos.y+1.5,pos.z)).name + if minetest.get_item_group(checkname, "water") ~= 0 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 water_color = biome._mcl_waterfogcolor end + if not biome then water_color = "#3F76E4" end + if checkname == "mclx_core:river_water_source" or checkname == "mclx_core:river_water_flowing" then water_color = "#0084FF" end player:set_sky({ type = "regular", sky_color = { day_sky = water_color, diff --git a/mods/ITEMS/mcl_buckets/init.lua b/mods/ITEMS/mcl_buckets/init.lua index f7acddf4b..e08238448 100644 --- a/mods/ITEMS/mcl_buckets/init.lua +++ b/mods/ITEMS/mcl_buckets/init.lua @@ -61,9 +61,8 @@ local function sound_take(itemname, pos) end local function place_liquid(pos, itemstring) - local fullness = registered_nodes[itemstring].liquid_range sound_place(itemstring, pos) - add_node(pos, {name=itemstring, param2=fullness}) + set_node(pos, {name=itemstring}) end local function give_bucket(new_bucket, itemstack, user) diff --git a/mods/ITEMS/mcl_cauldrons/init.lua b/mods/ITEMS/mcl_cauldrons/init.lua index 6a8270794..44bbebc22 100644 --- a/mods/ITEMS/mcl_cauldrons/init.lua +++ b/mods/ITEMS/mcl_cauldrons/init.lua @@ -67,12 +67,12 @@ local function register_filled_cauldron(water_level, description, liquid) local water_tex if liquid == "river_water" then id = id .. "r" - water_tex = "default_river_water_source_animated.png^[verticalframe:16:0" + water_tex = "default_water_source_animated.png^[verticalframe:16:0^[multiply:#0084FF" elseif liquid == "lava" then id = id .. "_lava" water_tex = "default_lava_source_animated.png^[verticalframe:16:0" else - water_tex = "default_water_source_animated.png^[verticalframe:16:0" + water_tex = "default_water_source_animated.png^[verticalframe:16:0^[multiply:#3F76E4" end minetest.register_node(id, { description = description, diff --git a/mods/ITEMS/mcl_core/functions.lua b/mods/ITEMS/mcl_core/functions.lua index 54cdcd32f..b211fe008 100644 --- a/mods/ITEMS/mcl_core/functions.lua +++ b/mods/ITEMS/mcl_core/functions.lua @@ -812,6 +812,11 @@ function mcl_core.get_foliage_block_type(pos) return {name = minetest.get_node(pos).name, param2 = mcl_util.get_palette_indexes_from_pos(pos).foliage_palette_index} end +-- Return appropriate water block node for pos +function mcl_core.get_water_block_type(pos) + return {name = minetest.get_node(pos).name, param2 = mcl_util.get_palette_indexes_from_pos(pos).water_palette_index} +end + ------------------------------ -- Spread grass blocks and mycelium on neighbor dirt ------------------------------ diff --git a/mods/ITEMS/mcl_core/nodes_liquid.lua b/mods/ITEMS/mcl_core/nodes_liquid.lua index 972c3b973..e55664432 100644 --- a/mods/ITEMS/mcl_core/nodes_liquid.lua +++ b/mods/ITEMS/mcl_core/nodes_liquid.lua @@ -25,14 +25,15 @@ minetest.register_node("mcl_core:water_flowing", { { image="default_water_flowing_animated.png", backface_culling=false, - animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=4.0} + animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1.5} }, { image="default_water_flowing_animated.png", backface_culling=false, - animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=4.0} + animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1.5} }, }, + color = "#3F76E4", sounds = mcl_sounds.node_sound_water_defaults(), is_ground_content = false, use_texture_alpha = USE_TEXTURE_ALPHA, @@ -50,7 +51,7 @@ minetest.register_node("mcl_core:water_flowing", { liquid_viscosity = WATER_VISC, liquid_range = 7, waving = 3, - post_effect_color = {a=60, r=0x03, g=0x3C, b=0x5C}, + post_effect_color = {a=60, r=24.7, g=46.3, b=89.4}, groups = { water=3, liquid=3, puts_out_fire=1, not_in_creative_inventory=1, freezes=1, melt_around=1, dig_by_piston=1}, _mcl_blast_resistance = 100, -- Hardness intentionally set to infinite instead of 100 (Minecraft value) to avoid problems in creative mode @@ -70,20 +71,23 @@ S("• When water is directly below lava, the water turns into stone."), drawtype = "liquid", waving = 3, tiles = { - {name="default_water_source_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=5.0}} + {name="default_water_source_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}} }, special_tiles = { -- New-style water source material (mostly unused) { name="default_water_source_animated.png", - animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=5.0}, + animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}, backface_culling = false, } }, + color = "#3F76E4", sounds = mcl_sounds.node_sound_water_defaults(), is_ground_content = false, use_texture_alpha = USE_TEXTURE_ALPHA, paramtype = "light", + paramtype2 = "color", + palette = "mcl_core_palette_water.png", walkable = false, pointable = false, diggable = false, @@ -95,12 +99,21 @@ S("• When water is directly below lava, the water turns into stone."), liquid_alternative_source = "mcl_core:water_source", liquid_viscosity = WATER_VISC, liquid_range = 7, - post_effect_color = {a=60, r=0x03, g=0x3C, b=0x5C}, + post_effect_color = {a=60, r=24.7, g=46.3, b=89.4}, stack_max = 64, - groups = { water=3, liquid=3, puts_out_fire=1, freezes=1, not_in_creative_inventory=1, dig_by_piston=1}, + groups = { water=3, liquid=3, puts_out_fire=1, freezes=1, not_in_creative_inventory=1, dig_by_piston=1, water_palette=1}, _mcl_blast_resistance = 100, -- Hardness intentionally set to infinite instead of 100 (Minecraft value) to avoid problems in creative mode _mcl_hardness = -1, + on_construct = function(pos) + local node = minetest.get_node(pos) + if node.param2 == 0 then + local new_node = mcl_core.get_water_block_type(pos) + if new_node.param2 ~= 0 then + minetest.swap_node(pos, new_node) + end + end + end, }) minetest.register_node("mcl_core:lava_flowing", { @@ -245,3 +258,22 @@ if minetest.settings:get("mcl_node_particles") == "full" then end, }) end + +minetest.register_on_liquid_transformed(function(pos_list, node_list) + for _, fwpos in pairs(pos_list) do + local fwnode = minetest.get_node(fwpos) + if minetest.get_item_group(fwnode, "palette_index") ~= 1 then + local pos1, pos2 = vector.offset(fwpos, -1, -1, -1), vector.offset(fwpos, 1, 1, 1) + local water = minetest.find_nodes_in_area(pos1, pos2, {"group:water_palette"}) + for _, wpos in pairs(water) do + local wnode = minetest.get_node(wpos) + local water_palette_index = mcl_util.get_palette_indexes_from_pos(wpos).water_palette_index + if wnode.param2 ~= water_palette_index then + wnode.param2 = water_palette_index + minetest.set_node(wpos, wnode) + end + end + end + end +end +) diff --git a/mods/ITEMS/mcl_mangrove/init.lua b/mods/ITEMS/mcl_mangrove/init.lua index aba844d24..3e1cecba9 100644 --- a/mods/ITEMS/mcl_mangrove/init.lua +++ b/mods/ITEMS/mcl_mangrove/init.lua @@ -311,7 +311,7 @@ mcl_flowerpots.register_potted_flower("mcl_mangrove:propagule", { image = "mcl_mangrove_propagule.png", }) -local water_tex = "default_water_source_animated.png^[verticalframe:16:0" +local water_tex = "default_water_source_animated.png^[verticalframe:16:0^[multiply:#3F76E4" local wlroots = { description = S("water logged mangrove roots"), @@ -363,7 +363,7 @@ local rwlroots = table.copy(wlroots) -- FIXME luacheck complains that this is a repeated definition of water_tex. -- Maybe the tiles definition below should be replaced with the animated tile -- definition as per above? -water_tex = "default_river_water_source_animated.png^[verticalframe:16:0" +water_tex = "default_water_source_animated.png^[verticalframe:16:0^[multiply:#0084FF" rwlroots.tiles = { "("..water_tex..")^mcl_mangrove_roots_top.png", "("..water_tex..")^mcl_mangrove_roots_side.png", diff --git a/mods/ITEMS/mclx_core/init.lua b/mods/ITEMS/mclx_core/init.lua index 9c46442c5..eb2c8a902 100644 --- a/mods/ITEMS/mclx_core/init.lua +++ b/mods/ITEMS/mclx_core/init.lua @@ -6,6 +6,9 @@ local source = table.copy(minetest.registered_nodes["mcl_core:water_source"]) source.description = S("River Water Source") source.liquid_range = 2 source.waving = 3 +source.color = "#0084FF" +source.paramtype2 = nil +source.palette = nil source.liquid_alternative_flowing = "mclx_core:river_water_flowing" source.liquid_alternative_source = "mclx_core:river_water_source" source.liquid_renewable = false @@ -13,40 +16,17 @@ source._doc_items_longdesc = S("River water has the same properties as water, bu source._doc_items_entry_name = S("River Water") -- Auto-expose entry only in valleys mapgen source._doc_items_hidden = minetest.get_mapgen_setting("mg_name") ~= "valleys" -source.post_effect_color = {a=192, r=0x2c, g=0x88, b=0x8c} -source.tiles = { - {name="default_river_water_source_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=5.0}} -} -source.special_tiles = { - -- New-style water source material (mostly unused) - { - name="default_river_water_source_animated.png", - animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=5.0}, - backface_culling = false, - } -} +source.post_effect_color = {a=60, r=0, g=132, b=255} local flowing = table.copy(minetest.registered_nodes["mcl_core:water_flowing"]) flowing.description = S("Flowing River Water") flowing.liquid_range = 2 flowing.waving = 3 +flowing.color = "#0084FF" flowing.liquid_alternative_flowing = "mclx_core:river_water_flowing" flowing.liquid_alternative_source = "mclx_core:river_water_source" flowing.liquid_renewable = false -flowing.tiles = {"default_river_water_flowing_animated.png^[verticalframe:64:0"} -flowing.post_effect_color = {a=192, r=0x2c, g=0x88, b=0x8c} -flowing.special_tiles = { - { - image="default_river_water_flowing_animated.png", - backface_culling=false, - animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=4.0} - }, - { - image="default_river_water_flowing_animated.png", - backface_culling=false, - animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=4.0} - }, -} +flowing.post_effect_color = {a=60, r=0, g=132, b=255} minetest.register_node("mclx_core:river_water_source", source) minetest.register_node("mclx_core:river_water_flowing", flowing) diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua index 7d5bc31cf..30e3fac2d 100644 --- a/mods/MAPGEN/mcl_biomes/init.lua +++ b/mods/MAPGEN/mcl_biomes/init.lua @@ -7,6 +7,12 @@ local nether_skycolor = "#6EB1FF" -- The Nether biomes seemingly don't use the s 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 default_waterfogcolor = "#3F76E4" +local lukewarm_waterfogcolor = "#45ADF2" +local warm_waterfogcolor = "#43D5EE" +local cold_waterfogcolor = "#3D57D6" +local frozen_waterfogcolor = "#3938C9" + local mg_name = minetest.get_mapgen_setting("mg_name") local mg_seed = minetest.get_mapgen_setting("seed") @@ -52,6 +58,8 @@ local function register_classic_superflat_biome() _mcl_biome_type = "medium", _mcl_grass_palette_index = 0, _mcl_foliage_palette_index = 1, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = "#78A7FF", _mcl_fogcolor = overworld_fogcolor }) @@ -163,6 +171,8 @@ local function register_biomes() _mcl_biome_type = "snowy", _mcl_grass_palette_index = 2, _mcl_foliage_palette_index = 2, + _mcl_water_palette_index = 5, + _mcl_waterfogcolor = frozen_waterfogcolor, _mcl_skycolor = "#7FA1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -182,6 +192,8 @@ local function register_biomes() _mcl_biome_type = "snowy", _mcl_grass_palette_index = 2, _mcl_foliage_palette_index = 2, + _mcl_water_palette_index = 5, + _mcl_waterfogcolor = frozen_waterfogcolor, _mcl_skycolor = "#7FA1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -203,6 +215,8 @@ local function register_biomes() _mcl_biome_type = "snowy", _mcl_grass_palette_index = 3, _mcl_foliage_palette_index = 2, + _mcl_water_palette_index = 5, + _mcl_waterfogcolor = frozen_waterfogcolor, _mcl_skycolor = "#839EFF", _mcl_fogcolor = overworld_fogcolor }) @@ -226,6 +240,8 @@ local function register_biomes() _mcl_biome_type = "snowy", _mcl_grass_palette_index = 3, _mcl_foliage_palette_index = 16, + _mcl_water_palette_index = 5, + _mcl_waterfogcolor = frozen_waterfogcolor, _mcl_skycolor = "#7FA1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -247,6 +263,8 @@ local function register_biomes() _mcl_biome_type = "snowy", _mcl_grass_palette_index = 3, _mcl_foliage_palette_index = 16, + _mcl_water_palette_index = 5, + _mcl_waterfogcolor = frozen_waterfogcolor, _mcl_skycolor = "#7FA1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -266,6 +284,8 @@ local function register_biomes() _mcl_biome_type = "snowy", _mcl_grass_palette_index = 3, _mcl_foliage_palette_index = 2, + _mcl_water_palette_index = 5, + _mcl_waterfogcolor = frozen_waterfogcolor, _mcl_skycolor = "#7FA1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -286,6 +306,8 @@ local function register_biomes() _mcl_biome_type = "cold", _mcl_grass_palette_index = 4, _mcl_foliage_palette_index = 9, + _mcl_water_palette_index = 4, + _mcl_waterfogcolor = cold_waterfogcolor, _mcl_skycolor = "#7CA3FF", _mcl_fogcolor = overworld_fogcolor }) @@ -304,6 +326,8 @@ local function register_biomes() _mcl_biome_type = "cold", _mcl_grass_palette_index = 4, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 4, + _mcl_waterfogcolor = cold_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -324,6 +348,8 @@ local function register_biomes() _mcl_biome_type = "cold", _mcl_grass_palette_index = 5, _mcl_foliage_palette_index = 10, + _mcl_water_palette_index = 4, + _mcl_waterfogcolor = cold_waterfogcolor, _mcl_skycolor = "#7DA3FF", _mcl_fogcolor = overworld_fogcolor }) @@ -342,6 +368,8 @@ local function register_biomes() _mcl_biome_type = "cold", _mcl_grass_palette_index = 5, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 4, + _mcl_waterfogcolor = cold_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -363,6 +391,8 @@ local function register_biomes() _mcl_biome_type = "cold", _mcl_grass_palette_index = 6, _mcl_foliage_palette_index = 11, + _mcl_water_palette_index = 4, + _mcl_waterfogcolor = cold_waterfogcolor, _mcl_skycolor = "#7DA2FF", _mcl_fogcolor = overworld_fogcolor }) @@ -382,6 +412,8 @@ local function register_biomes() _mcl_biome_type = "cold", _mcl_grass_palette_index = 6, _mcl_foliage_palette_index = 1, + _mcl_water_palette_index = 4, + _mcl_waterfogcolor = cold_waterfogcolor, _mcl_skycolor = beach_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -401,6 +433,8 @@ local function register_biomes() _mcl_biome_type = "cold", _mcl_grass_palette_index = 6, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 4, + _mcl_waterfogcolor = cold_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -422,6 +456,8 @@ local function register_biomes() _mcl_biome_type = "cold", _mcl_grass_palette_index = 7, _mcl_foliage_palette_index = 11, + _mcl_water_palette_index = 4, + _mcl_waterfogcolor = cold_waterfogcolor, _mcl_skycolor = "#7DA2FF", _mcl_fogcolor = overworld_fogcolor }) @@ -440,6 +476,8 @@ local function register_biomes() _mcl_biome_type = "cold", _mcl_grass_palette_index = 7, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 4, + _mcl_waterfogcolor = cold_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -463,6 +501,8 @@ local function register_biomes() _mcl_biome_type = "cold", _mcl_grass_palette_index = 8, _mcl_foliage_palette_index = 11, + _mcl_water_palette_index = 4, + _mcl_waterfogcolor = cold_waterfogcolor, _mcl_skycolor = "#7DA2FF", _mcl_fogcolor = overworld_fogcolor }) @@ -484,6 +524,8 @@ local function register_biomes() _mcl_biome_type = "cold", _mcl_grass_palette_index = 8, _mcl_foliage_palette_index = 11, + _mcl_water_palette_index = 4, + _mcl_waterfogcolor = cold_waterfogcolor, _mcl_skycolor = "#7DA2FF", _mcl_fogcolor = overworld_fogcolor }) @@ -502,6 +544,8 @@ local function register_biomes() _mcl_biome_type = "cold", _mcl_grass_palette_index = 8, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 4, + _mcl_waterfogcolor = cold_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -520,6 +564,8 @@ local function register_biomes() _mcl_biome_type = "cold", _mcl_grass_palette_index = 9, _mcl_foliage_palette_index = 11, + _mcl_water_palette_index = 4, + _mcl_waterfogcolor = cold_waterfogcolor, _mcl_skycolor = "#7DA2FF", _mcl_fogcolor = overworld_fogcolor }) @@ -538,6 +584,8 @@ local function register_biomes() _mcl_biome_type = "cold", _mcl_grass_palette_index = 9, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 4, + _mcl_waterfogcolor = cold_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -562,6 +610,8 @@ local function register_biomes() _mcl_biome_type = "snowy", _mcl_grass_palette_index = 10, _mcl_foliage_palette_index = 2, + _mcl_water_palette_index = 5, + _mcl_waterfogcolor = frozen_waterfogcolor, _mcl_skycolor = "#7FA1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -580,6 +630,8 @@ local function register_biomes() _mcl_biome_type = "snowy", _mcl_grass_palette_index = 10, _mcl_foliage_palette_index = 2, + _mcl_water_palette_index = 5, + _mcl_waterfogcolor = frozen_waterfogcolor, _mcl_skycolor = "#7FA1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -600,6 +652,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 0, _mcl_foliage_palette_index = 1, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = "#78A7FF", _mcl_fogcolor = overworld_fogcolor }) @@ -618,6 +672,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 0, _mcl_foliage_palette_index = 1, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = beach_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -636,6 +692,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 0, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -656,6 +714,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 11, _mcl_foliage_palette_index = 1, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = "#78A7FF", _mcl_fogcolor = overworld_fogcolor }) @@ -674,6 +734,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 11, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -694,6 +756,8 @@ local function register_biomes() _mcl_biome_type = "cold", _mcl_grass_palette_index = 12, _mcl_foliage_palette_index = 10, + _mcl_water_palette_index = 4, + _mcl_waterfogcolor = cold_waterfogcolor, _mcl_skycolor = "#7DA3FF", _mcl_fogcolor = overworld_fogcolor }) @@ -712,6 +776,8 @@ local function register_biomes() _mcl_biome_type = "cold", _mcl_grass_palette_index = 12, _mcl_foliage_palette_index = 1, + _mcl_water_palette_index = 4, + _mcl_waterfogcolor = cold_waterfogcolor, _mcl_skycolor = beach_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -730,6 +796,8 @@ local function register_biomes() _mcl_biome_type = "cold", _mcl_grass_palette_index = 12, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 4, + _mcl_waterfogcolor = cold_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -750,6 +818,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 13, _mcl_foliage_palette_index = 7, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = "#79A6FF", _mcl_fogcolor = overworld_fogcolor }) @@ -768,6 +838,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 13, _mcl_foliage_palette_index = 1, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = beach_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -786,6 +858,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 13, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -806,6 +880,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 14, _mcl_foliage_palette_index = 7, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = "#79A6FF", _mcl_fogcolor = overworld_fogcolor }) @@ -824,6 +900,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 14, _mcl_foliage_palette_index = 1, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = beach_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -842,6 +920,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 14, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -862,6 +942,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 15, _mcl_foliage_palette_index = 8, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = "#7AA5FF", _mcl_fogcolor = overworld_fogcolor }) @@ -880,6 +962,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 15, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -900,6 +984,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 16, _mcl_foliage_palette_index = 8, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = "#7AA5FF", _mcl_fogcolor = overworld_fogcolor }) @@ -918,6 +1004,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 16, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -939,6 +1027,8 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_grass_palette_index = 17, _mcl_foliage_palette_index = 3, + _mcl_water_palette_index = 3, + _mcl_waterfogcolor = warm_waterfogcolor, _mcl_skycolor = "#6EB1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -957,6 +1047,8 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_grass_palette_index = 17, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 3, + _mcl_waterfogcolor = warm_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -977,6 +1069,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 18, _mcl_foliage_palette_index = 7, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = "#79A6FF", _mcl_fogcolor = overworld_fogcolor }) @@ -995,6 +1089,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 18, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1016,6 +1112,8 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_grass_palette_index = 19, _mcl_foliage_palette_index = 4, + _mcl_water_palette_index = 3, + _mcl_waterfogcolor = warm_waterfogcolor, _mcl_skycolor = "#6EB1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1036,6 +1134,8 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_grass_palette_index = 19, _mcl_foliage_palette_index = 4, + _mcl_water_palette_index = 3, + _mcl_waterfogcolor = warm_waterfogcolor, _mcl_skycolor = "#6EB1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1055,6 +1155,8 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_grass_palette_index = 19, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 3, + _mcl_waterfogcolor = warm_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1075,6 +1177,8 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_grass_palette_index = 20, _mcl_foliage_palette_index = 4, + _mcl_water_palette_index = 3, + _mcl_waterfogcolor = warm_waterfogcolor, _mcl_skycolor = "#6EB1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1094,6 +1198,8 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_grass_palette_index = 20, _mcl_foliage_palette_index = 4, + _mcl_water_palette_index = 3, + _mcl_waterfogcolor = warm_waterfogcolor, _mcl_skycolor = "#6EB1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1113,6 +1219,8 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_grass_palette_index = 20, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 3, + _mcl_waterfogcolor = warm_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1135,6 +1243,8 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_grass_palette_index = 21, _mcl_foliage_palette_index = 4, + _mcl_water_palette_index = 3, + _mcl_waterfogcolor = warm_waterfogcolor, _mcl_skycolor = "#6EB1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1157,6 +1267,8 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_grass_palette_index = 21, _mcl_foliage_palette_index = 4, + _mcl_water_palette_index = 3, + _mcl_waterfogcolor = warm_waterfogcolor, _mcl_skycolor = "#6EB1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1176,6 +1288,8 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_grass_palette_index = 21, _mcl_foliage_palette_index = 4, + _mcl_water_palette_index = 3, + _mcl_waterfogcolor = warm_waterfogcolor, _mcl_skycolor = "#6EB1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1195,6 +1309,8 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_grass_palette_index = 21, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 3, + _mcl_waterfogcolor = warm_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1219,6 +1335,8 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_grass_palette_index = 22, _mcl_foliage_palette_index = 4, + _mcl_water_palette_index = 3, + _mcl_waterfogcolor = warm_waterfogcolor, _mcl_skycolor = "#6EB1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1239,6 +1357,8 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_grass_palette_index = 22, _mcl_foliage_palette_index = 4, + _mcl_water_palette_index = 3, + _mcl_waterfogcolor = warm_waterfogcolor, _mcl_skycolor = "#6EB1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1260,6 +1380,8 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_grass_palette_index = 22, _mcl_foliage_palette_index = 4, + _mcl_water_palette_index = 3, + _mcl_waterfogcolor = warm_waterfogcolor, _mcl_skycolor = "#6EB1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1279,6 +1401,8 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_grass_palette_index = 22, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 3, + _mcl_waterfogcolor = warm_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1300,6 +1424,8 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_grass_palette_index = 1, _mcl_foliage_palette_index = 3, + _mcl_water_palette_index = 2, + _mcl_waterfogcolor = lukewarm_waterfogcolor, _mcl_skycolor = "#6EB1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1318,6 +1444,8 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_grass_palette_index = 1, _mcl_foliage_palette_index = 1, + _mcl_water_palette_index = 2, + _mcl_waterfogcolor = lukewarm_waterfogcolor, _mcl_skycolor = beach_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1336,6 +1464,8 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_grass_palette_index = 1, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 2, + _mcl_waterfogcolor = lukewarm_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1358,6 +1488,8 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_grass_palette_index = 23, _mcl_foliage_palette_index = 3, + _mcl_water_palette_index = 2, + _mcl_waterfogcolor = lukewarm_waterfogcolor, _mcl_skycolor = "#6EB1FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1376,6 +1508,8 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_grass_palette_index = 23, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 2, + _mcl_waterfogcolor = lukewarm_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1396,6 +1530,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 24, _mcl_foliage_palette_index = 12, + _mcl_water_palette_index = 2, + _mcl_waterfogcolor = lukewarm_waterfogcolor, _mcl_skycolor = "#77A8FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1414,6 +1550,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 24, _mcl_foliage_palette_index = 12, + _mcl_water_palette_index = 2, + _mcl_waterfogcolor = lukewarm_waterfogcolor, _mcl_skycolor = "#77A8FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1433,6 +1571,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 24, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 2, + _mcl_waterfogcolor = lukewarm_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1454,6 +1594,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 25, _mcl_foliage_palette_index = 12, + _mcl_water_palette_index = 2, + _mcl_waterfogcolor = lukewarm_waterfogcolor, _mcl_skycolor = "#77A8FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1472,6 +1614,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 25, _mcl_foliage_palette_index = 12, + _mcl_water_palette_index = 2, + _mcl_waterfogcolor = lukewarm_waterfogcolor, _mcl_skycolor = "#77A8FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1491,6 +1635,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 25, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 2, + _mcl_waterfogcolor = lukewarm_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1511,6 +1657,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 26, _mcl_foliage_palette_index = 13, + _mcl_water_palette_index = 2, + _mcl_waterfogcolor = lukewarm_waterfogcolor, _mcl_skycolor = "#77A8FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1529,6 +1677,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 26, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 2, + _mcl_waterfogcolor = lukewarm_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1552,6 +1702,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 27, _mcl_foliage_palette_index = 13, + _mcl_water_palette_index = 2, + _mcl_waterfogcolor = lukewarm_waterfogcolor, _mcl_skycolor = "#77A8FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1570,6 +1722,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 27, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 2, + _mcl_waterfogcolor = lukewarm_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1591,6 +1745,8 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_grass_palette_index = 27, _mcl_foliage_palette_index = 6, + _mcl_water_palette_index = 7, + _mcl_waterfogcolor = "#3A7A6A", _mcl_skycolor = "#78A7FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1609,6 +1765,8 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_grass_palette_index = 27, _mcl_foliage_palette_index = 6, + _mcl_water_palette_index = 7, + _mcl_waterfogcolor = "#3A7A6A", _mcl_skycolor = "#78A7FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1628,6 +1786,8 @@ local function register_biomes() _mcl_biome_type = "hot", _mcl_grass_palette_index = 27, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 7, + _mcl_waterfogcolor = "#3A7A6A", _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1648,6 +1808,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 28, _mcl_foliage_palette_index = 5, + _mcl_water_palette_index = 1, + _mcl_waterfogcolor = "#617B64", _mcl_skycolor = "#78A7FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1666,6 +1828,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 28, _mcl_foliage_palette_index = 5, + _mcl_water_palette_index = 1, + _mcl_waterfogcolor = "#617B64", _mcl_skycolor = "#78A7FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1685,6 +1849,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 28, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 1, + _mcl_waterfogcolor = "#617B64", _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1708,6 +1874,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 29, _mcl_foliage_palette_index = 17, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = "#77A8FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1727,6 +1895,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 29, _mcl_foliage_palette_index = 17, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = "#77A8FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1745,6 +1915,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 29, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1766,6 +1938,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 24, _mcl_foliage_palette_index = 12, + _mcl_water_palette_index = 2, + _mcl_waterfogcolor = lukewarm_waterfogcolor, _mcl_skycolor = "#77A8FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1784,6 +1958,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 24, _mcl_foliage_palette_index = 12, + _mcl_water_palette_index = 2, + _mcl_waterfogcolor = lukewarm_waterfogcolor, _mcl_skycolor = "#77A8FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1803,6 +1979,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 24, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 2, + _mcl_waterfogcolor = lukewarm_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1824,6 +2002,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 25, _mcl_foliage_palette_index = 12, + _mcl_water_palette_index = 2, + _mcl_waterfogcolor = lukewarm_waterfogcolor, _mcl_skycolor = "#77A8FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1842,6 +2022,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 25, _mcl_foliage_palette_index = 12, + _mcl_water_palette_index = 2, + _mcl_waterfogcolor = lukewarm_waterfogcolor, _mcl_skycolor = "#77A8FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1861,6 +2043,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 25, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 2, + _mcl_waterfogcolor = lukewarm_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1881,6 +2065,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 26, _mcl_foliage_palette_index = 13, + _mcl_water_palette_index = 2, + _mcl_waterfogcolor = lukewarm_waterfogcolor, _mcl_skycolor = "#77A8FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1899,6 +2085,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 26, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 2, + _mcl_waterfogcolor = lukewarm_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1922,6 +2110,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 27, _mcl_foliage_palette_index = 13, + _mcl_water_palette_index = 2, + _mcl_waterfogcolor = lukewarm_waterfogcolor, _mcl_skycolor = "#77A8FF", _mcl_fogcolor = overworld_fogcolor }) @@ -1940,6 +2130,8 @@ local function register_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 27, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 2, + _mcl_waterfogcolor = lukewarm_waterfogcolor, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1965,6 +2157,7 @@ local function register_biomes() _mcl_biome_type = minetest.registered_biomes[biome]._mcl_biome_type, _mcl_grass_palette_index = minetest.registered_biomes[biome]._mcl_grass_palette_index, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = minetest.registered_biomes[biome]._mcl_water_palette_index, _mcl_skycolor = ocean_skycolor, _mcl_fogcolor = overworld_fogcolor }) @@ -1980,6 +2173,7 @@ local function register_biomes() _mcl_biome_type = minetest.registered_biomes[biome]._mcl_biome_type, _mcl_grass_palette_index = minetest.registered_biomes[biome]._mcl_grass_palette_index, _mcl_foliage_palette_index = minetest.registered_biomes[biome]._mcl_foliage_palette_index, + _mcl_water_palette_index = minetest.registered_biomes[biome]._mcl_water_palette_index, _mcl_skycolor = minetest.registered_biomes[biome]._mcl_skycolor, _mcl_fogcolor = minetest.registered_biomes[biome]._mcl_fogcolor, }) @@ -2036,6 +2230,8 @@ local function register_dimension_biomes() _mcl_biome_type = "hot", _mcl_grass_palette_index = 17, _mcl_foliage_palette_index = 3, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = nether_skycolor, _mcl_fogcolor = "#330808" }) @@ -2068,6 +2264,8 @@ local function register_dimension_biomes() _mcl_biome_type = "hot", _mcl_grass_palette_index = 17, _mcl_foliage_palette_index = 3, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = nether_skycolor, _mcl_fogcolor = "#1B4745" }) @@ -2120,6 +2318,8 @@ local function register_dimension_biomes() _mcl_biome_type = "hot", _mcl_grass_palette_index = 17, _mcl_foliage_palette_index = 3, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = nether_skycolor, _mcl_fogcolor = "#330303" }) @@ -2150,6 +2350,8 @@ local function register_dimension_biomes() _mcl_biome_type = "hot", _mcl_grass_palette_index = 17, _mcl_foliage_palette_index = 3, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = nether_skycolor, _mcl_fogcolor = "#1A051A" }) @@ -2180,6 +2382,8 @@ local function register_dimension_biomes() _mcl_biome_type = "hot", _mcl_grass_palette_index = 17, _mcl_foliage_palette_index = 3, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = nether_skycolor, _mcl_fogcolor = "#685F70" }) @@ -2235,6 +2439,8 @@ local function register_dimension_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 0, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = end_skycolor, _mcl_fogcolor = end_fogcolor }) @@ -2253,6 +2459,8 @@ local function register_dimension_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 0, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = end_skycolor, _mcl_fogcolor = end_fogcolor }) @@ -2271,6 +2479,8 @@ local function register_dimension_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 0, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = end_skycolor, _mcl_fogcolor = end_fogcolor }) @@ -2289,6 +2499,8 @@ local function register_dimension_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 0, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = end_skycolor, _mcl_fogcolor = end_fogcolor }) @@ -2307,6 +2519,8 @@ local function register_dimension_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 0, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = end_skycolor, _mcl_fogcolor = end_fogcolor }) @@ -2328,6 +2542,8 @@ local function register_dimension_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 0, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = end_skycolor, _mcl_fogcolor = end_fogcolor }) @@ -2347,6 +2563,8 @@ local function register_dimension_biomes() _mcl_biome_type = "medium", _mcl_grass_palette_index = 0, _mcl_foliage_palette_index = 0, + _mcl_water_palette_index = 0, + _mcl_waterfogcolor = default_waterfogcolor, _mcl_skycolor = end_skycolor, _mcl_fogcolor = end_fogcolor }) diff --git a/mods/MAPGEN/mcl_mapgen_core/init.lua b/mods/MAPGEN/mcl_mapgen_core/init.lua index 158c269ff..34bec8a52 100644 --- a/mods/MAPGEN/mcl_mapgen_core/init.lua +++ b/mods/MAPGEN/mcl_mapgen_core/init.lua @@ -57,6 +57,7 @@ dofile(modpath.."/api.lua") dofile(modpath.."/ores.lua") local mg_name = minetest.get_mapgen_setting("mg_name") +local sea_level = tonumber(minetest.get_mapgen_setting("water_level")) local superflat = mg_name == "flat" and minetest.get_mapgen_setting("mcl_superflat_classic") == "true" -- Content IDs @@ -482,3 +483,31 @@ minetest.register_on_generated(function(minp, maxp, blockseed) -- Set correct pa end end ) + +minetest.register_lbm({ + label = "Fix water palette indexes", -- Set correct palette indexes of water in old mapblocks. + name = "mcl_mapgen_core:fix_water_palette_indexes", + nodenames = {"group:water_palette"}, + run_at_every_load = false, + action = function(pos, node) + local water_palette_index = mcl_util.get_palette_indexes_from_pos(pos).water_palette_index + if node.param2 ~= water_palette_index then + node.param2 = water_palette_index + minetest.set_node(pos, node) + end + end +}) + +minetest.register_on_generated(function(minp, maxp, blockseed) -- Set correct palette indexes of water in new mapblocks. + local pos1, pos2 = vector.offset(minp, -16, -16, -16), vector.offset(maxp, 16, 16, 16) + local water = minetest.find_nodes_in_area(pos1, pos2, {"group:water_palette"}) + for _, wpos in pairs(water) do + local wnode = minetest.get_node(wpos) + local water_palette_index = mcl_util.get_palette_indexes_from_pos(wpos).water_palette_index + if wnode.param2 ~= water_palette_index then + wnode.param2 = water_palette_index + minetest.set_node(wpos, wnode) + end + end +end +) diff --git a/mods/MAPGEN/mcl_villages/buildings.lua b/mods/MAPGEN/mcl_villages/buildings.lua index 92a53ddaf..1b8ce3cba 100644 --- a/mods/MAPGEN/mcl_villages/buildings.lua +++ b/mods/MAPGEN/mcl_villages/buildings.lua @@ -224,6 +224,14 @@ local function spawn_villagers(minp,maxp) end end +local function fix_village_water(minp,maxp) + local palettenodes = minetest.find_nodes_in_area(vector.offset(minp,-20,-20,-20),vector.offset(maxp,20,20,20), "group:water_palette") + for _, palettenodepos in pairs(palettenodes) do + local palettenode = minetest.get_node(palettenodepos) + minetest.set_node(palettenodepos, {name = palettenode.name}) + end +end + local function init_nodes(p1, p2, size, rotation, pr) construct_node(p1, p2, "mcl_itemframes:item_frame") construct_node(p1, p2, "mcl_furnaces:furnace") @@ -309,7 +317,7 @@ function settlements.place_schematics(settlement_info, pr) -- format schematic string local schematic = loadstring(schem_lua)() - + local is_belltower = building_all_info["name"] == "belltower" -- build foundation for the building an make room above @@ -327,6 +335,7 @@ function settlements.place_schematics(settlement_info, pr) else init_nodes(p1, p2, size, rotation, pr) spawn_villagers(p1,p2) + fix_village_water(p1,p2) end end, pr diff --git a/textures/default_river_water_flowing_animated.png b/textures/default_river_water_flowing_animated.png deleted file mode 100644 index 317d6e368..000000000 Binary files a/textures/default_river_water_flowing_animated.png and /dev/null differ diff --git a/textures/default_river_water_source_animated.png b/textures/default_river_water_source_animated.png deleted file mode 100644 index d8ad149a6..000000000 Binary files a/textures/default_river_water_source_animated.png and /dev/null differ diff --git a/textures/default_water_flowing_animated.png b/textures/default_water_flowing_animated.png index 4d5b5437e..bf1140668 100644 Binary files a/textures/default_water_flowing_animated.png and b/textures/default_water_flowing_animated.png differ diff --git a/textures/default_water_source_animated.png b/textures/default_water_source_animated.png index 5d4582244..e148da244 100644 Binary files a/textures/default_water_source_animated.png and b/textures/default_water_source_animated.png differ diff --git a/textures/mcl_core_palette_water.png b/textures/mcl_core_palette_water.png new file mode 100644 index 000000000..f8f767569 Binary files /dev/null and b/textures/mcl_core_palette_water.png differ diff --git a/textures/mcl_core_palette_water_alt.png b/textures/mcl_core_palette_water_alt.png new file mode 100644 index 000000000..91abb00d5 Binary files /dev/null and b/textures/mcl_core_palette_water_alt.png differ