diff --git a/LEGAL.md b/LEGAL.md index a181da398..fdd519f23 100644 --- a/LEGAL.md +++ b/LEGAL.md @@ -46,6 +46,12 @@ Armor trim models were created by Aeonix_Aeon Source: License: [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/) +The sheet 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: +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: diff --git a/mods/ITEMS/mcl_core/nodes_base.lua b/mods/ITEMS/mcl_core/nodes_base.lua index db2561082..8ef247e15 100644 --- a/mods/ITEMS/mcl_core/nodes_base.lua +++ b/mods/ITEMS/mcl_core/nodes_base.lua @@ -12,6 +12,18 @@ else ice_texture_alpha = minetest.features.use_texture_alpha_string_modes and "opaque" or false end +local world_aligned_grass = minetest.settings:get_bool("mcl_world_aligned_grass_texture", false) +local grass_block_top_texture +if world_aligned_grass then + grass_block_top_texture = { + name = "mcl_core_grass_block_top_sheet.png", + align_style = "world", + scale = 5 + } +else + grass_block_top_texture = "mcl_core_grass_block_top.png" +end + mcl_core.fortune_drop_ore = { discrete_uniform_distribution = true, min_count = 2, @@ -369,8 +381,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 = { + grass_block_top_texture, + { 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", diff --git a/settingtypes.txt b/settingtypes.txt index ac3399498..9f9fba99f 100644 --- a/settingtypes.txt +++ b/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 top texture of grass blocks should be world-aligned. If enabled, +# grass top texture will be a sheet of 5x5 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 a bigger texture. +mcl_world_aligned_grass_texture (World-aligned grass texture) 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 diff --git a/textures/mcl_core_grass_block_top_sheet.png b/textures/mcl_core_grass_block_top_sheet.png new file mode 100644 index 000000000..6544c3c3b Binary files /dev/null and b/textures/mcl_core_grass_block_top_sheet.png differ