Merge remote-tracking branch 'upstream/master'

This commit is contained in:
bri cassa 2021-07-05 22:07:21 +02:00
commit 762100db46
19 changed files with 121 additions and 24 deletions

View File

@ -2,11 +2,13 @@ Baked Clay
This mod lets the player bake clay into hardened blocks and colour them with This mod lets the player bake clay into hardened blocks and colour them with
dye (8x baked clay and 1x dye in centre), stairs and slabs are also available. dye (8x baked clay and 1x dye in centre), stairs and slabs are also available.
Cooking baked clay turns it into glazed terracotta blocks.
https://forum.minetest.net/viewtopic.php?id=8890 https://forum.minetest.net/viewtopic.php?id=8890
Changelog: Changelog:
- 1.0 - Added glazed terracotta blocks when you cook baked clay in furnace (thanks D3monPixel)
- 0.9 - Baked clay now works in the technic cnc machine - 0.9 - Baked clay now works in the technic cnc machine
- 0.8 - Cooking clay block in furnace gives natural baked clay which you can dye - 0.8 - Cooking clay block in furnace gives natural baked clay which you can dye
- 0.7 - Added support for stairsplus so that stairs are registered properly - 0.7 - Added support for stairsplus so that stairs are registered properly
@ -17,7 +19,7 @@ Changelog:
- 0.2 - Any colour of baked clay can be re-dyed into another colour - 0.2 - Any colour of baked clay can be re-dyed into another colour
- 0.1 - Initial Release - 0.1 - Initial Release
Lucky Blocks: 9 Lucky Blocks: 10
Note: Under settings you will find 'colored_clay_compatibility' switch that when enabled will register aliases for the older colored clay mod and it's stairplus stairs. Note: Under settings you will find 'colored_clay_compatibility' switch that when enabled will register aliases for the older colored clay mod and it's stairplus stairs.

137
init.lua
View File

@ -17,7 +17,7 @@ local clay = {
{"brown", "Brown"}, {"brown", "Brown"},
{"pink", "Pink"}, {"pink", "Pink"},
{"dark_grey", "Dark Grey"}, {"dark_grey", "Dark Grey"},
{"dark_green", "Dark Green"}, {"dark_green", "Dark Green"}
} }
local techcnc_mod = minetest.get_modpath("technic_cnc") local techcnc_mod = minetest.get_modpath("technic_cnc")
@ -27,42 +27,50 @@ local stairsplus_mod = minetest.get_modpath("moreblocks")
for _, clay in pairs(clay) do for _, clay in pairs(clay) do
-- node definition -- node
minetest.register_node("bakedclay:" .. clay[1], { minetest.register_node("bakedclay:" .. clay[1], {
description = clay[2] .. " Baked Clay", description = clay[2] .. " Baked Clay",
tiles = {"baked_clay_" .. clay[1] ..".png"}, tiles = {"baked_clay_" .. clay[1] ..".png"},
groups = {cracky = 3, bakedclay = 1}, groups = {cracky = 3, bakedclay = 1},
sounds = default.node_sound_stone_defaults(), sounds = default.node_sound_stone_defaults()
}) })
-- craft from dye and any baked clay -- craft recipe
if clay[1] ~= "natural" then if clay[1] ~= "natural" then
minetest.register_craft({ minetest.register_craft({
output = "bakedclay:" .. clay[1] .. " 8", output = "bakedclay:" .. clay[1] .. " 8",
recipe = { recipe = {
{"group:bakedclay", "group:bakedclay", "group:bakedclay"}, {"group:bakedclay", "group:bakedclay", "group:bakedclay"},
{"group:bakedclay", "dye:" .. clay[1], "group:bakedclay"}, {"group:bakedclay", "dye:" .. clay[1], "group:bakedclay"},
{"group:bakedclay", "group:bakedclay", "group:bakedclay"} {"group:bakedclay", "group:bakedclay", "group:bakedclay"}
}, }
}) })
end end
-- register stairsplus stairs if found -- stairs plus
if stairsplus_mod then if stairsplus_mod then
stairsplus:register_all("bakedclay", "baked_clay_" .. clay[1], "bakedclay:" .. clay[1], { stairsplus:register_all("bakedclay", "baked_clay_" .. clay[1],
"bakedclay:" .. clay[1], {
description = clay[2] .. " Baked Clay", description = clay[2] .. " Baked Clay",
tiles = {"baked_clay_" .. clay[1] .. ".png"}, tiles = {"baked_clay_" .. clay[1] .. ".png"},
groups = {cracky = 3}, groups = {cracky = 3},
sounds = default.node_sound_stone_defaults(), sounds = default.node_sound_stone_defaults()
}) })
stairsplus:register_alias_all("bakedclay", clay[1], "bakedclay", "baked_clay_" .. clay[1]) stairsplus:register_alias_all("bakedclay", clay[1],
minetest.register_alias("stairs:slab_bakedclay_".. clay[1], "bakedclay:slab_baked_clay_" .. clay[1]) "bakedclay", "baked_clay_" .. clay[1])
minetest.register_alias("stairs:stair_bakedclay_".. clay[1], "bakedclay:stair_baked_clay_" .. clay[1])
-- register all stair types for stairs redo minetest.register_alias("stairs:slab_bakedclay_".. clay[1],
"bakedclay:slab_baked_clay_" .. clay[1])
minetest.register_alias("stairs:stair_bakedclay_".. clay[1],
"bakedclay:stair_baked_clay_" .. clay[1])
-- stairs redo
elseif stairs_mod and stairs.mod then elseif stairs_mod and stairs.mod then
stairs.register_all("bakedclay_" .. clay[1], "bakedclay:" .. clay[1], stairs.register_all("bakedclay_" .. clay[1], "bakedclay:" .. clay[1],
@ -71,7 +79,7 @@ for _, clay in pairs(clay) do
clay[2] .. " Baked Clay", clay[2] .. " Baked Clay",
default.node_sound_stone_defaults()) default.node_sound_stone_defaults())
-- register stair and slab using default stairs -- default stairs
elseif stairs_mod then elseif stairs_mod then
stairs.register_stair_and_slab("bakedclay_".. clay[1], "bakedclay:".. clay[1], stairs.register_stair_and_slab("bakedclay_".. clay[1], "bakedclay:".. clay[1],
@ -92,6 +100,56 @@ for _, clay in pairs(clay) do
end end
end end
-- Terracotta blocks (textures by D3monPixel, thanks for use :)
for _, clay in pairs(clay) do
if clay[1] ~= "natural" then
local texture = "baked_clay_terracotta_" .. clay[1] ..".png"
minetest.register_node("bakedclay:terracotta_" .. clay[1], {
description = clay[2] .. " Glazed Terracotta",
tiles = {
texture .. "",
texture .. "",
texture .. "^[transformR180",
texture .. "",
texture .. "^[transformR270",
texture .. "^[transformR90",
},
paramtype2 = "facedir",
groups = {cracky = 3, terracotta = 1},
sounds = default.node_sound_stone_defaults(),
on_place = minetest.rotate_node
})
minetest.register_craft({
type = "cooking",
output = "bakedclay:terracotta_" .. clay[1],
recipe = "bakedclay:" .. clay[1]
})
end
end
-- special light blue glazed terracotta block
local texture = "baked_clay_terracotta_light_blue.png"
minetest.register_node("bakedclay:terracotta_light_blue", {
description = "Light Blue Glazed Terracotta",
tiles = {
texture .. "",
texture .. "",
texture .. "^[transformR180",
texture .. "",
texture .. "^[transformR270",
texture .. "^[transformR90",
},
paramtype2 = "facedir",
groups = {cracky = 3, terracotta = 1},
sounds = default.node_sound_stone_defaults(),
on_place = minetest.rotate_node
})
-- cook clay block into white baked clay -- cook clay block into white baked clay
minetest.register_craft({ minetest.register_craft({
@ -141,10 +199,17 @@ local function add_simple_flower(name, desc, box, f_groups)
end end
local flowers = { local flowers = {
{"delphinium", "Blue Delphinium", {-0.15, -0.5, -0.15, 0.15, 0.3, 0.15}, {color_cyan = 1}}, {"delphinium", "Blue Delphinium",
{"thistle", "Thistle", {-0.15, -0.5, -0.15, 0.15, 0.2, 0.15}, {color_magenta = 1}}, {-0.15, -0.5, -0.15, 0.15, 0.3, 0.15}, {color_cyan = 1}},
{"lazarus", "Lazarus Bell", {-0.15, -0.5, -0.15, 0.15, 0.2, 0.15}, {color_pink = 1}},
{"mannagrass", "Reed Mannagrass", {-0.15, -0.5, -0.15, 0.15, 0.2, 0.15}, {color_dark_green = 1}}, {"thistle", "Thistle",
{-0.15, -0.5, -0.15, 0.15, 0.2, 0.15}, {color_magenta = 1}},
{"lazarus", "Lazarus Bell",
{-0.15, -0.5, -0.15, 0.15, 0.2, 0.15}, {color_pink = 1}},
{"mannagrass", "Reed Mannagrass",
{-0.15, -0.5, -0.15, 0.15, 0.2, 0.15}, {color_dark_green = 1}}
} }
for _,item in pairs(flowers) do for _,item in pairs(flowers) do
@ -167,7 +232,7 @@ minetest.register_decoration({
}, },
y_min = 10, y_min = 10,
y_max = 90, y_max = 90,
decoration = "bakedclay:delphinium", decoration = "bakedclay:delphinium"
}) })
minetest.register_decoration({ minetest.register_decoration({
@ -184,7 +249,7 @@ minetest.register_decoration({
}, },
y_min = 15, y_min = 15,
y_max = 90, y_max = 90,
decoration = "bakedclay:thistle", decoration = "bakedclay:thistle"
}) })
minetest.register_decoration({ minetest.register_decoration({
@ -203,7 +268,7 @@ minetest.register_decoration({
y_max = 90, y_max = 90,
decoration = "bakedclay:lazarus", decoration = "bakedclay:lazarus",
spawn_by = "default:jungletree", spawn_by = "default:jungletree",
num_spawn_by = 1, num_spawn_by = 1
}) })
minetest.register_decoration({ minetest.register_decoration({
@ -222,13 +287,15 @@ minetest.register_decoration({
y_max = 15, y_max = 15,
decoration = "bakedclay:mannagrass", decoration = "bakedclay:mannagrass",
spawn_by = "group:water", spawn_by = "group:water",
num_spawn_by = 1, num_spawn_by = 1
}) })
-- add lucky blocks -- lucky blocks
if minetest.get_modpath("lucky_block") then if minetest.get_modpath("lucky_block") then
local p = "bakedclay:" local p = "bakedclay:"
lucky_block:add_blocks({ lucky_block:add_blocks({
{"dro", {"bakedclay:"}, 10, true}, {"dro", {"bakedclay:"}, 10, true},
{"fal", {p.."black", p.."blue", p.."brown", p.."cyan", p.."dark_green", {"fal", {p.."black", p.."blue", p.."brown", p.."cyan", p.."dark_green",
@ -260,12 +327,36 @@ lucky_block:add_blocks({
{name = p.."red", max = 30}, {name = p.."red", max = 30},
{name = p.."violet", max = 30}, {name = p.."violet", max = 30},
{name = p.."white", max = 30}, {name = p.."white", max = 30},
{name = p.."yellow", max = 30}, {name = p.."yellow", max = 30}
}}, }},
}) })
p = "bakedclay:terracotta_"
lucky_block:add_blocks({
{"nod", "default:chest", 0, {
{name = p.."light_blue", max = 20},
{name = p.."black", max = 20},
{name = p.."blue", max = 20},
{name = p.."brown", max = 20},
{name = p.."cyan", max = 20},
{name = p.."dark_green", max = 20},
{name = p.."dark_grey", max = 20},
{name = p.."green", max = 20},
{name = p.."grey", max = 20},
{name = p.."magenta", max = 20},
{name = p.."orange", max = 20},
{name = p.."pink", max = 20},
{name = p.."red", max = 20},
{name = p.."violet", max = 20},
{name = p.."white", max = 20},
{name = p.."yellow", max = 20}
}}
})
end end
-- colored clay compatibility -- colored clay compatibility
if minetest.settings:get_bool("colored_clay_compatibility") == true then if minetest.settings:get_bool("colored_clay_compatibility") == true then
local cc = { local cc = {

View File

@ -19,3 +19,7 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
Textures by D3monPixel (https://mcpedl.com/better-glazed-terracotta-pack)
baked_clay_terracotta*.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 328 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 257 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 718 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 661 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 714 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 328 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 575 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 659 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 589 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 275 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 606 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 409 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 292 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 619 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 512 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 676 B