Make sand and dirt world-aligned

LEGAL.md

@@ -46,6 +46,12 @@ Armor trim models were created by Aeonix_Aeon
 Source: <https://www.curseforge.com/minecraft/texture-packs/ozocraft-remix>
 License: [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/)
 
+The world texture for grass block top was made out of grass block top variations
+from the PixelPerfection Legacy texture pack, which were made by
+[Nova_Wostra](https://www.curseforge.com/members/nova_wostra)
+Source: <https://www.curseforge.com/minecraft/texture-packs/pixel-perfection-legacy>
+License: [CC BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)
+
 The main menu images are released under: [CC0](https://creativecommons.org/publicdomain/zero/1.0/)
 
 All other files, unless mentioned otherwise, fall under:

mods/CORE/mcl_util/init.lua

@@ -1099,3 +1099,23 @@ function mcl_util.is_it_christmas()
 		return false
 	end
 end
+
+-- Get tile (texture) for a block that supports world-alignment
+local world_aligned = minetest.settings:get_bool("mcl_world_aligned_textures", false)
+function mcl_util.get_texture(name, scale)
+	local nscale
+	if scale == nil then
+		nscale = 5
+	else
+		nscale = scale
+	end
+	if world_aligned then
+		return {
+			name = name.."_world.png",
+			align_style = "world",
+			scale = nscale
+		}
+	else
+		return name..".png"
+	end
+end

mods/ITEMS/mcl_core/nodes_base.lua

@@ -12,6 +12,8 @@ else
 	ice_texture_alpha = minetest.features.use_texture_alpha_string_modes and "opaque" or false
 end
 
+local get_texture = mcl_util.get_texture
+
 mcl_core.fortune_drop_ore = {
 	discrete_uniform_distribution = true,
 	min_count = 2,
@@ -24,7 +26,7 @@ minetest.register_node("mcl_core:stone", {
 	description = S("Stone"),
 	_doc_items_longdesc = S("One of the most common blocks in the world, almost the entire underground consists of stone. It sometimes contains ores. Stone may be created when water meets lava."),
 	_doc_items_hidden = false,
-	tiles = {"default_stone.png"},
+	tiles = {get_texture("default_stone")},
 	is_ground_content = true,
 	stack_max = 64,
 	groups = {pickaxey=1, stone=1, building_block=1, material_stone=1},
@@ -234,7 +236,7 @@ minetest.register_node("mcl_core:stone_with_diamond", {
 minetest.register_node("mcl_core:stonebrick", {
 	description = S("Stone Bricks"),
 	_doc_items_longdesc = doc.sub.items.temp.build,
-	tiles = {"default_stone_brick.png"},
+	tiles = {get_texture("default_stone_brick")},
 	stack_max = 64,
 	groups = {pickaxey=1, stone=1, stonebrick=1, building_block=1, material_stone=1},
 	sounds = mcl_sounds.node_sound_stone_defaults(),
@@ -294,7 +296,7 @@ minetest.register_node("mcl_core:stone_smooth", {
 minetest.register_node("mcl_core:granite", {
 	description = S("Granite"),
 	_doc_items_longdesc = S("Granite is an igneous rock."),
-	tiles = {"mcl_core_granite.png"},
+	tiles = {get_texture("mcl_core_granite", 3)},
 	is_ground_content = true,
 	stack_max = 64,
 	groups = {pickaxey=1, stone=1, building_block=1, material_stone=1},
@@ -318,7 +320,7 @@ minetest.register_node("mcl_core:granite_smooth", {
 minetest.register_node("mcl_core:andesite", {
 	description = S("Andesite"),
 	_doc_items_longdesc = S("Andesite is an igneous rock."),
-	tiles = {"mcl_core_andesite.png"},
+	tiles = {get_texture("mcl_core_andesite", 3)},
 	is_ground_content = true,
 	stack_max = 64,
 	groups = {pickaxey=1, stone=1, building_block=1, material_stone=1},
@@ -342,7 +344,7 @@ minetest.register_node("mcl_core:andesite_smooth", {
 minetest.register_node("mcl_core:diorite", {
 	description = S("Diorite"),
 	_doc_items_longdesc = S("Diorite is an igneous rock."),
-	tiles = {"mcl_core_diorite.png"},
+	tiles = {get_texture("mcl_core_diorite", 3)},
 	is_ground_content = true,
 	stack_max = 64,
 	groups = {pickaxey=1, stone=1, building_block=1, material_stone=1},
@@ -369,8 +371,16 @@ minetest.register_node("mcl_core:dirt_with_grass", {
 	_doc_items_longdesc = S("A grass block is dirt with a grass cover. Grass blocks are resourceful blocks which allow the growth of all sorts of plants. They can be turned into farmland with a hoe and turned into grass paths with a shovel. In light, the grass slowly spreads onto dirt nearby. Under an opaque block or a liquid, a grass block may turn back to dirt."),
 	_doc_items_hidden = false,
 	paramtype2 = "color",
-	tiles = {"mcl_core_grass_block_top.png", { name="default_dirt.png", color="white" }, { name="default_dirt.png^mcl_dirt_grass_shadow.png", color="white" }},
-	overlay_tiles = {"mcl_core_grass_block_top.png", "blank.png", {name="mcl_core_grass_block_side_overlay.png", tileable_vertical=false}},
+	tiles = {
+		get_texture("mcl_core_grass_block_top"),
+		{ name="default_dirt.png", color="white" },
+		{ name="default_dirt.png^mcl_dirt_grass_shadow.png", color="white" }
+	},
+	overlay_tiles = {
+		"blank.png",
+		"blank.png",
+		{name="mcl_core_grass_block_side_overlay.png", tileable_vertical=false}
+	},
 	palette = "mcl_core_palette_grass.png",
 	palette_index = 0,
 	color = "#7CBD6B",
@@ -507,7 +517,7 @@ minetest.register_node("mcl_core:dirt", {
 	description = S("Dirt"),
 	_doc_items_longdesc = S("Dirt acts as a soil for a few plants. When in light, this block may grow a grass or mycelium cover if such blocks are nearby."),
 	_doc_items_hidden = false,
-	tiles = {"default_dirt.png"},
+	tiles = {get_texture("default_dirt")},
 	is_ground_content = true,
 	stack_max = 64,
 	groups = {handy=1,shovely=1, dirt=1,soil=1, soil_sapling=2, soil_sugarcane=1, cultivatable=2, enderman_takable=1, building_block=1, path_creation_possible=1},
@@ -570,7 +580,7 @@ minetest.register_node("mcl_core:sand", {
 	description = S("Sand"),
 	_doc_items_longdesc = S("Sand is found in large quantities at beaches and deserts."),
 	_doc_items_hidden = false,
-	tiles = {"default_sand.png"},
+	tiles = {get_texture("default_sand")},
 	is_ground_content = true,
 	stack_max = 64,
 	groups = {handy=1,shovely=1, falling_node=1, sand=1, soil_sugarcane=1, enderman_takable=1, building_block=1, material_sand=1},
@@ -634,7 +644,7 @@ minetest.register_node("mcl_core:sandstonesmooth2", {
 minetest.register_node("mcl_core:redsand", {
 	description = S("Red Sand"),
 	_doc_items_longdesc = S("Red sand is found in large quantities in mesa biomes."),
-	tiles = {"mcl_core_red_sand.png"},
+	tiles = {get_texture("mcl_core_red_sand")},
 	is_ground_content = true,
 	stack_max = 64,
 	groups = {handy=1,shovely=1, falling_node=1, sand=1, soil_sugarcane=1, enderman_takable=1, building_block=1, material_sand=1},
@@ -712,7 +722,7 @@ minetest.register_node("mcl_core:brick_block", {
 	-- Original name: “Bricks”
 	description = S("Brick Block"),
 	_doc_items_longdesc = S("Brick blocks are a good building material for building solid houses and can take quite a punch."),
-	tiles = {"default_brick.png"},
+	tiles = {get_texture("default_brick")},
 	is_ground_content = false,
 	stack_max = 64,
 	groups = {pickaxey=1, building_block=1, material_stone=1},

mods/ITEMS/mcl_ocean/kelp.lua

@@ -603,7 +603,15 @@ function kelp.register_kelp_surface(surface, surface_deftemplate, surface_docs)
 	sounds.place = kelp.leaf_sounds.place
 
 	surface_deftemplate.tiles = surface_deftemplate.tiles or def_tiles
-	surface_deftemplate.inventory_image = surface_deftemplate.inventory_image or "("..def_tiles[1]..")^mcl_ocean_kelp_item.png"
+	
+	local texturename
+	if type(def_tiles[1]) == "string" then
+		texturename = def_tiles[1]
+	else
+		texturename = def_tiles[1].name
+	end
+	
+	surface_deftemplate.inventory_image = surface_deftemplate.inventory_image or "("..texturename..")^mcl_ocean_kelp_item.png"
 	surface_deftemplate.sounds = surface_deftemplate.sound or sounds
 	local falling_node = mt_get_item_group(nodename, "falling_node")
 	surface_deftemplate.node_dig_prediction = surface_deftemplate.node_dig_prediction or nodename

settingtypes.txt

@@ -256,6 +256,13 @@ mcl_buckets_use_select_box (Buckets use select box) bool false
 # See also: https://github.com/minetest/minetest/issues/95
 mcl_translucent_ice (Translucent ice) bool false
 
+# Whether the textures should be world-aligned for variations. If enabled,
+# some textures will be using sheets of 5x5 varied tiles with pre-defined
+# "random" displacement and rotation, spanning across 5 blocks.
+#
+# This might put some load on the GPU by making it work with bigger textures.
+mcl_world_aligned_textures (World-aligned textures) bool false
+
 # Whether to generate fallen logs in some biomes.
 # They might not always look pretty and have strange overhangs.
 mcl_generate_fallen_logs (Generate fallen logs) bool false