Fixed warped wart using stripped stem side texture

mods/CORE/mcl_util/init.lua

@@ -1017,17 +1017,16 @@ function mcl_util.check_position_protection(position, player)
 	return false
 end
 
-local palette_indexes = {grass_palette_index = 0, foliage_palette_index = 0, water_palette_index = 0}
+local palette_indexes = {grass_palette_index = 0, foliage_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 and reg_biome._mcl_water_palette_index then
+	if reg_biome and reg_biome._mcl_grass_palette_index and reg_biome._mcl_foliage_palette_index then
 		local gpi = reg_biome._mcl_grass_palette_index
 		local fpi = reg_biome._mcl_foliage_palette_index
-		local wpi = reg_biome._mcl_water_palette_index
-		local palette_indexes = {grass_palette_index = gpi, foliage_palette_index = fpi, water_palette_index = wpi}
+		local palette_indexes = {grass_palette_index = gpi, foliage_palette_index = fpi}
 		return palette_indexes
 	else
 		return palette_indexes

mods/ENVIRONMENT/mcl_weather/rain.lua

@@ -226,7 +226,7 @@ if mcl_weather.allow_abm then
 				}
 				for a=1, #around do
 					local apos = vector.add(pos, around[a])
-					if mcl_weather.is_outdoor(apos) and mcl_weather.has_rain(apos) then
+					if mcl_weather.is_outdoor(apos) then
 						minetest.remove_node(pos)
 						minetest.sound_play("fire_extinguish_flame", {pos = pos, max_hear_distance = 8, gain = 0.1}, true)
 						return
@@ -244,7 +244,7 @@ if mcl_weather.allow_abm then
 		chance = 1,
 		action = function(pos, node, active_object_count, active_object_count_wider)
 			-- Rain is equivalent to a water bottle
-			if mcl_weather.rain.raining and mcl_weather.is_outdoor(pos) and mcl_weather.has_rain(pos) then
+			if mcl_weather.rain.raining and mcl_weather.is_outdoor(pos) then
 				if node.name == "mcl_cauldrons:cauldron" then
 					minetest.set_node(pos, {name="mcl_cauldrons:cauldron_1"})
 				elseif node.name == "mcl_cauldrons:cauldron_1" then
@@ -267,7 +267,7 @@ if mcl_weather.allow_abm then
 		interval = 22.0,
 		chance = 3,
 		action = function(pos, node, active_object_count, active_object_count_wider)
-			if mcl_weather.rain.raining and mcl_weather.is_outdoor(pos) and mcl_weather.has_rain(pos) then
+			if mcl_weather.rain.raining and mcl_weather.is_outdoor(pos) then
 				if node.name == "mcl_farming:soil" then
 					minetest.set_node(pos, {name="mcl_farming:soil_wet"})
 				end

mods/ENVIRONMENT/mcl_weather/skycolor.lua

@@ -1,7 +1,7 @@
 local mods_loaded = false
 local NIGHT_VISION_RATIO = 0.45
 
-local water_color = "#3F76E4"
+local water_color = "#0b4880"
 
 local mg_name = minetest.get_mapgen_setting("mg_name")
 
@@ -125,14 +125,7 @@ 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))
-			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
+			if minetest.get_item_group(minetest.get_node(vector.new(pos.x,pos.y+1.5,pos.z)).name, "water") ~= 0 then
 				player:set_sky({ type = "regular",
 					sky_color = {
 						day_sky = water_color,

mods/ITEMS/mcl_buckets/init.lua

@@ -61,8 +61,9 @@ local function sound_take(itemname, pos)
 end
 
 local function place_liquid(pos, itemstring)
+	local fullness = registered_nodes[itemstring].liquid_range
 	sound_place(itemstring, pos)
-	set_node(pos, {name=itemstring})
+	add_node(pos, {name=itemstring, param2=fullness})
 end
 
 local function give_bucket(new_bucket, itemstack, user)

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_water_source_animated.png^[verticalframe:16:0^[multiply:#0084FF"
+		water_tex = "default_river_water_source_animated.png^[verticalframe:16:0"
 	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^[multiply:#3F76E4"
+		water_tex = "default_water_source_animated.png^[verticalframe:16:0"
 	end
 	minetest.register_node(id, {
 		description = description,

mods/ITEMS/mcl_core/functions.lua

@@ -812,11 +812,6 @@ 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
 ------------------------------

mods/ITEMS/mcl_core/nodes_liquid.lua

@@ -25,15 +25,14 @@ 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=1.5}
+			animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=4.0}
 		},
 		{
 			image="default_water_flowing_animated.png",
 			backface_culling=false,
-			animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1.5}
+			animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=4.0}
 		},
 	},
-	color = "#3F76E4",
 	sounds = mcl_sounds.node_sound_water_defaults(),
 	is_ground_content = false,
 	use_texture_alpha = USE_TEXTURE_ALPHA,
@@ -51,7 +50,7 @@ minetest.register_node("mcl_core:water_flowing", {
 	liquid_viscosity = WATER_VISC,
 	liquid_range = 7,
 	waving = 3,
-	post_effect_color = {a=60, r=24.7, g=46.3, b=89.4},
+	post_effect_color = {a=60, r=0x03, g=0x3C, b=0x5C},
 	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
@@ -71,23 +70,20 @@ 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=3.0}}
+		{name="default_water_source_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=5.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=3.0},
+			animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=5.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,
@@ -99,21 +95,12 @@ 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=24.7, g=46.3, b=89.4},
+	post_effect_color = {a=60, r=0x03, g=0x3C, b=0x5C},
 	stack_max = 64,
-	groups = { water=3, liquid=3, puts_out_fire=1, freezes=1, not_in_creative_inventory=1, dig_by_piston=1, water_palette=1},
+	groups = { water=3, liquid=3, puts_out_fire=1, freezes=1, not_in_creative_inventory=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
 	_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", {
@@ -258,22 +245,3 @@ 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
-)

mods/ITEMS/mcl_crimson/init.lua

@@ -302,7 +302,7 @@ mcl_flowerpots.register_potted_flower("mcl_crimson:warped_roots", {
 
 minetest.register_node("mcl_crimson:warped_wart_block", {
 	description = S("Warped Wart Block"),
-	tiles = {"mcl_crimson_warped_stem_stripped_side.png"},
+	tiles = {"mcl_crimson_warped_wart_block.png"},
 	groups = {handy = 1, hoey = 7, swordy = 1, deco_block = 1, compostability = 85},
 	_mcl_hardness = 1,
 	sounds = mcl_sounds.node_sound_leaves_defaults({

mods/ITEMS/mcl_itemframes/item_frames_API.lua

@@ -124,7 +124,7 @@ local function update_map_texture (self, staticdata)
 		self.object:set_properties({ textures = { texture } })
 	end)
 	if result ~= nil and result == false then
-		minetest.log("error", "[mcl_itemframes] Error setting up Map Item.")
+		mintest.log("error", "[mcl_itemframes] Error setting up Map Item.")
 	end
 
 end

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^[multiply:#3F76E4"
+local water_tex = "default_water_source_animated.png^[verticalframe:16:0"
 
 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_water_source_animated.png^[verticalframe:16:0^[multiply:#0084FF"
+water_tex = "default_river_water_source_animated.png^[verticalframe:16:0"
 rwlroots.tiles = {
 	"("..water_tex..")^mcl_mangrove_roots_top.png",
 	"("..water_tex..")^mcl_mangrove_roots_side.png",

mods/ITEMS/mclx_core/init.lua

@@ -6,9 +6,6 @@ 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
@@ -16,17 +13,40 @@ 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=60, r=0, g=132, b=255}
+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,
+	}
+}
 
 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.post_effect_color = {a=60, r=0, g=132, b=255}
+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}
+	},
+}
 
 minetest.register_node("mclx_core:river_water_source", source)
 minetest.register_node("mclx_core:river_water_flowing", flowing)

mods/MAPGEN/mcl_biomes/init.lua

@@ -7,12 +7,6 @@ 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")
 
@@ -58,8 +52,6 @@ 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
 	})
@@ -171,8 +163,6 @@ 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
 	})
@@ -192,8 +182,6 @@ 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
 	})
@@ -215,8 +203,6 @@ 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
 	})
@@ -240,8 +226,6 @@ 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
 	})
@@ -263,8 +247,6 @@ 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
 	})
@@ -284,8 +266,6 @@ 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
 	})
@@ -306,8 +286,6 @@ 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
 	})
@@ -326,8 +304,6 @@ 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
 	})
@@ -348,8 +324,6 @@ 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
 	})
@@ -368,8 +342,6 @@ 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
 	})
@@ -391,8 +363,6 @@ 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
 	})
@@ -412,8 +382,6 @@ 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
 	})
@@ -433,8 +401,6 @@ 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
 	})
@@ -456,8 +422,6 @@ 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
 	})
@@ -476,8 +440,6 @@ 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
 	})
@@ -501,8 +463,6 @@ 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
 	})
@@ -524,8 +484,6 @@ 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
 	})
@@ -544,8 +502,6 @@ 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
 	})
@@ -564,8 +520,6 @@ 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
 	})
@@ -584,8 +538,6 @@ 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
 	})
@@ -610,8 +562,6 @@ 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
 	})
@@ -630,8 +580,6 @@ 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
 	})
@@ -652,8 +600,6 @@ 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
 	})
@@ -672,8 +618,6 @@ 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
 	})
@@ -692,8 +636,6 @@ 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
 	})
@@ -714,8 +656,6 @@ 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
 	})
@@ -734,8 +674,6 @@ 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
 	})
@@ -756,8 +694,6 @@ 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
 	})
@@ -776,8 +712,6 @@ 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
 	})
@@ -796,8 +730,6 @@ 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
 	})
@@ -818,8 +750,6 @@ 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
 	})
@@ -838,8 +768,6 @@ 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
 	})
@@ -858,8 +786,6 @@ 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
 	})
@@ -880,8 +806,6 @@ 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
 	})
@@ -900,8 +824,6 @@ 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
 	})
@@ -920,8 +842,6 @@ 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
 	})
@@ -942,8 +862,6 @@ 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
 	})
@@ -962,8 +880,6 @@ 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
 	})
@@ -984,8 +900,6 @@ 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
 	})
@@ -1004,8 +918,6 @@ 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
 	})
@@ -1027,8 +939,6 @@ 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
 	})
@@ -1047,8 +957,6 @@ 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
 	})
@@ -1069,8 +977,6 @@ 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
 	})
@@ -1089,8 +995,6 @@ 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
 	})
@@ -1112,8 +1016,6 @@ 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
 	})
@@ -1134,8 +1036,6 @@ 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
 	})
@@ -1155,8 +1055,6 @@ 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
 	})
@@ -1177,8 +1075,6 @@ 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
 	})
@@ -1198,8 +1094,6 @@ 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
 	})
@@ -1219,8 +1113,6 @@ 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
 	})
@@ -1243,8 +1135,6 @@ 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
 	})
@@ -1267,8 +1157,6 @@ 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
 	})
@@ -1288,8 +1176,6 @@ 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
 	})
@@ -1309,8 +1195,6 @@ 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
 	})
@@ -1335,8 +1219,6 @@ 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
 	})
@@ -1357,8 +1239,6 @@ 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
 	})
@@ -1380,8 +1260,6 @@ 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
 	})
@@ -1401,8 +1279,6 @@ 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
 	})
@@ -1424,8 +1300,6 @@ 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
 	})
@@ -1444,8 +1318,6 @@ 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
 	})
@@ -1464,8 +1336,6 @@ 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
 	})
@@ -1488,8 +1358,6 @@ 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
 	})
@@ -1508,8 +1376,6 @@ 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
 	})
@@ -1530,8 +1396,6 @@ 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
 	})
@@ -1550,8 +1414,6 @@ 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
 	})
@@ -1571,8 +1433,6 @@ 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
 	})
@@ -1594,8 +1454,6 @@ 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
 	})
@@ -1614,8 +1472,6 @@ 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
 	})
@@ -1635,8 +1491,6 @@ 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
 	})
@@ -1657,8 +1511,6 @@ 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
 	})
@@ -1677,8 +1529,6 @@ 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
 	})
@@ -1702,8 +1552,6 @@ 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
 	})
@@ -1722,8 +1570,6 @@ 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
 	})
@@ -1745,8 +1591,6 @@ 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
 	})
@@ -1765,8 +1609,6 @@ 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
 	})
@@ -1786,8 +1628,6 @@ 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
 	})
@@ -1808,8 +1648,6 @@ 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
 	})
@@ -1828,8 +1666,6 @@ 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
 	})
@@ -1849,8 +1685,6 @@ 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
 	})
@@ -1874,8 +1708,6 @@ 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
 	})
@@ -1895,8 +1727,6 @@ 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
 	})
@@ -1915,8 +1745,6 @@ 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
 	})
@@ -1938,8 +1766,6 @@ 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
 	})
@@ -1958,8 +1784,6 @@ 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
 	})
@@ -1979,8 +1803,6 @@ 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
 	})
@@ -2002,8 +1824,6 @@ 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
 	})
@@ -2022,8 +1842,6 @@ 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
 	})
@@ -2043,8 +1861,6 @@ 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
 	})
@@ -2065,8 +1881,6 @@ 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
 	})
@@ -2085,8 +1899,6 @@ 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
 	})
@@ -2110,8 +1922,6 @@ 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
 	})
@@ -2130,8 +1940,6 @@ 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
 	})
@@ -2157,7 +1965,6 @@ 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
 		})
@@ -2173,7 +1980,6 @@ 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,
 		})
@@ -2230,8 +2036,6 @@ 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"
 	})
@@ -2264,8 +2068,6 @@ 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"
 	})
@@ -2318,8 +2120,6 @@ 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"
 	})
@@ -2350,8 +2150,6 @@ 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"
 	})
@@ -2382,8 +2180,6 @@ 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"
 	})
@@ -2439,8 +2235,6 @@ 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
 	})
@@ -2459,8 +2253,6 @@ 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
 	})
@@ -2479,8 +2271,6 @@ 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
 	})
@@ -2499,8 +2289,6 @@ 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
 	})
@@ -2519,8 +2307,6 @@ 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
 	})
@@ -2542,8 +2328,6 @@ 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
 	})
@@ -2563,8 +2347,6 @@ 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
 	})

mods/MAPGEN/mcl_mapgen_core/init.lua

@@ -57,7 +57,6 @@ 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
@@ -483,31 +482,3 @@ 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
-)

mods/MAPGEN/mcl_villages/buildings.lua

@@ -224,14 +224,6 @@ 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")
@@ -335,7 +327,6 @@ 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