Merge remote-tracking branch 'upstream/master'

flowers.lua

@@ -1,22 +1,26 @@
--- 5.x translation
-S = minetest.get_translator("bakedclay")
+
+-- translation support
+
+local S = minetest.get_translator("bakedclay")
+
+-- new flowers
 
 local flowers = {
-	{"delphinium", "Blue Delphinium",
+	{"delphinium", S("Blue Delphinium"),
 	{-0.15, -0.5, -0.15, 0.15, 0.3, 0.15}, {color_cyan = 1}},
 
-	{"thistle", "Thistle",
+	{"thistle", S("Thistle"),
 	{-0.15, -0.5, -0.15, 0.15, 0.2, 0.15}, {color_magenta = 1}},
 
-	{"lazarus", "Lazarus Bell",
+	{"lazarus", S("Lazarus Bell"),
 	{-0.15, -0.5, -0.15, 0.15, 0.2, 0.15}, {color_pink = 1}},
 
-	{"mannagrass", "Reed Mannagrass",
+	{"mannagrass", S("Reed Mannagrass"),
 	{-0.15, -0.5, -0.15, 0.15, 0.2, 0.15}, {color_dark_green = 1}}
 }
 
--- register some new flowers to fill in missing dye colours
--- flower registration (borrowed from default game)
+-- helper function
+
 local function add_simple_flower(name, desc, box, f_groups)
 
 	f_groups.snappy = 3
@@ -25,7 +29,7 @@ local function add_simple_flower(name, desc, box, f_groups)
 	f_groups.attached_node = 1
 
 	minetest.register_node("bakedclay:" .. name, {
-		description = S(desc),
+		description = desc,
 		drawtype = "plantlike",
 		waving = 1,
 		tiles = {"baked_clay_" .. name .. ".png"},
@@ -35,18 +39,20 @@ local function add_simple_flower(name, desc, box, f_groups)
 		paramtype = "light",
 		walkable = false,
 		buildable_to = true,
---		stack_max = 99,
 		groups = f_groups,
 		sounds = default.node_sound_leaves_defaults(),
 		selection_box = {type = "fixed", fixed = box}
 	})
 end
 
+-- register new flowers to fill in missing dye colours
+
 for _,item in pairs(flowers) do
 	add_simple_flower(unpack(item))
 end
 
 -- add new flowers to mapgen
+
 minetest.register_decoration({
 	deco_type = "simple",
 	place_on = {"default:dirt_with_grass"},
@@ -119,7 +125,8 @@ minetest.register_decoration({
 	num_spawn_by = 1
 })
 
--- flowerpot mod
+-- flowerpot mod support
+
 if minetest.get_modpath("flowerpot") then
 	flowerpot.register_node("bakedclay:delphinium")
 	flowerpot.register_node("bakedclay:thistle")

init.lua

@@ -1,46 +1,53 @@
--- 5.x translation
-S = minetest.get_translator("bakedclay")
+
+-- translation support
+
+local S = minetest.get_translator("bakedclay")
 
 -- list of clay colours
+
 local clay = {
-	{"natural", "Natural"},
-	{"white", "White"},
-	{"grey", "Grey"},
-	{"black", "Black"},
-	{"red", "Red"},
-	{"yellow", "Yellow"},
-	{"green", "Green"},
-	{"cyan", "Cyan"},
-	{"blue", "Blue"},
-	{"magenta", "Magenta"},
-	{"orange", "Orange"},
-	{"violet", "Violet"},
-	{"brown", "Brown"},
-	{"pink", "Pink"},
-	{"dark_grey", "Dark Grey"},
-	{"dark_green", "Dark Green"}
+	{"natural", S("Natural")},
+	{"white", S("White")},
+	{"grey", S("Grey")},
+	{"black", S("Black")},
+	{"red", S("Red")},
+	{"yellow", S("Yellow")},
+	{"green", S("Green")},
+	{"cyan", S("Cyan")},
+	{"blue", S("Blue")},
+	{"magenta", S("Magenta")},
+	{"orange", S("Orange")},
+	{"violet", S("Violet")},
+	{"brown", S("Brown")},
+	{"pink", S("Pink")},
+	{"dark_grey", S("Dark Grey")},
+	{"dark_green", S("Dark Green")}
 }
 
 -- check mod support
+
 local techcnc_mod = minetest.get_modpath("technic_cnc")
 local stairs_mod = minetest.get_modpath("stairs")
 local stairsplus_mod = minetest.get_modpath("moreblocks")
 		and minetest.global_exists("stairsplus")
 local stairsplus_compat = minetest.settings:get_bool("stairsplus_clay_compatibility") ~= false
 
-
 -- scroll through colours
+
 for _, clay in pairs(clay) do
 
 	-- register node
+
 	minetest.register_node("bakedclay:" .. clay[1], {
-		description = S(clay[2] .. " Baked Clay"),
+		description = clay[2] .. " " .. S("Baked Clay"),
 		tiles = {"baked_clay_" .. clay[1] ..".png"},
 		groups = {cracky = 3, bakedclay = 1},
-		sounds = default.node_sound_stone_defaults()
+		sounds = default.node_sound_stone_defaults(),
+		is_ground_content = false
 	})
 
 	-- register craft recipe
+
 	if clay[1] ~= "natural" then
 
 		minetest.register_craft({
@@ -54,11 +61,12 @@ for _, clay in pairs(clay) do
 	end
 
 	-- stairs plus
+
 	if stairsplus_mod then
 
 		stairsplus:register_all("bakedclay", "baked_clay_" .. clay[1],
 				"bakedclay:" .. clay[1], {
-			description = clay[2] .. " Baked Clay",
+			description = clay[2] .. " " .. S("Baked Clay"),
 			tiles = {"baked_clay_" .. clay[1] .. ".png"},
 			groups = {cracky = 3},
 			sounds = default.node_sound_stone_defaults()
@@ -77,29 +85,32 @@ for _, clay in pairs(clay) do
 		end
 
 	-- stairs redo
+
 	elseif stairs_mod and stairs.mod then
 
 		stairs.register_all("bakedclay_" .. clay[1], "bakedclay:" .. clay[1],
 			{cracky = 3},
 			{"baked_clay_" .. clay[1] .. ".png"},
-			clay[2] .. " Baked Clay",
+			clay[2] .. " " .. S("Baked Clay"),
 			default.node_sound_stone_defaults())
 
 	-- default stairs
+
 	elseif stairs_mod then
 
 		stairs.register_stair_and_slab("bakedclay_".. clay[1], "bakedclay:".. clay[1],
 			{cracky = 3},
 			{"baked_clay_" .. clay[1] .. ".png"},
-			clay[2] .. " Baked Clay Stair",
-			clay[2] .. " Baked Clay Slab",
+			clay[2] .. " " .. S("Baked Clay Stair"),
+			clay[2] .. " " .. S("Baked Clay Slab"),
 			default.node_sound_stone_defaults())
 	end
 
 	-- register bakedclay for use in technic_cnc mod after all mods loaded
+
 	if techcnc_mod then
 
-		core.register_on_mods_loaded(function()
+		minetest.register_on_mods_loaded(function()
 
 			technic_cnc.register_all("bakedclay:" .. clay[1],
 				{cracky = 3, not_in_creative_inventory = 1},
@@ -110,6 +121,7 @@ for _, clay in pairs(clay) do
 end
 
 -- Terracotta blocks
+
 for _, clay in pairs(clay) do
 
 	if clay[1] ~= "natural" then
@@ -117,7 +129,7 @@ for _, clay in pairs(clay) do
 		local texture = "baked_clay_terracotta_" .. clay[1] ..".png"
 
 		minetest.register_node("bakedclay:terracotta_" .. clay[1], {
-			description = S(clay[2] .. " Glazed Terracotta"),
+			description = clay[2] .. " " .. S("Glazed Terracotta"),
 			tiles = {
 				texture .. "",
 				texture .. "",
@@ -129,6 +141,7 @@ for _, clay in pairs(clay) do
 			paramtype2 = "facedir",
 			groups = {cracky = 3, terracotta = 1},
 			sounds = default.node_sound_stone_defaults(),
+			is_ground_content = false,
 			on_place = minetest.rotate_node
 		})
 
@@ -142,7 +155,8 @@ end
 
 minetest.register_alias("bakedclay:terracotta_light_blue", "bakedclay:terracotta_cyan")
 
--- cook clay block into white baked clay
+-- cook clay block into natural baked clay
+
 minetest.register_craft({
 	type = "cooking",
 	output = "bakedclay:natural",
@@ -150,6 +164,7 @@ minetest.register_craft({
 })
 
 -- 2x2 red baked clay makes 16x clay brick
+
 minetest.register_craft( {
 	output = "default:clay_brick 16",
 	recipe = {
@@ -159,6 +174,7 @@ minetest.register_craft( {
 })
 
 -- colored clay compatibility
+
 if minetest.settings:get_bool("colored_clay_compatibility") == true then
 
 	local cc = {
@@ -195,12 +211,15 @@ if minetest.settings:get_bool("colored_clay_compatibility") == true then
 end
 
 -- get mod path
+
 local path = minetest.get_modpath("bakedclay")
 
 -- add new flowers
+
 dofile(path .. "/flowers.lua")
 
 -- add lucky blocks if mod present
+
 if minetest.get_modpath("lucky_block") then
 	dofile(path .. "/lucky_block.lua")
 end

locale/bakedclay.es.tr

@@ -0,0 +1,25 @@
+# textdomain: bakedclay
+Blue Delphinium=Delfinio Azul
+Thistle=Cardo
+Lazarus Bell=Campana Lázaro
+Reed Mannagrass=Césped de caña
+Natural=Natural
+White=Blanco
+Grey=Gris
+Black=Negro
+Red=Rojo
+Yellow=Amarillo
+Green=Verde
+Cyan=Celeste
+Blue=Azul
+Magenta=Magenta
+Orange=Naranja
+Violet=Violeta
+Brown=Cáfe
+Pink=Rosa
+Dark Grey=Gris Oscuro
+Dark Green=Verde Oscuro
+Baked Clay=Barro Cocido
+Baked Clay Stair=Escalera de Barro Cocido
+Baked Clay Slab=Losa de Barro Cocido
+Glazed Terracotta=Terracota esmaltada.

locale/bakedclay.uk.tr

@@ -0,0 +1,27 @@
+# textdomain: bakedclay
+Adds the ability to bake clay into blocks and colour them with dye.=Додає можливість випалювати глину в блоки та фарбувати їх барвниками.
+Bake clay blocks and colour with dye, also has Terracotta designs.=Випалюйте глиняні блоки та фарбуйте їх барвниками, а також виготовляйте теракотові візерунки.
+Blue Delphinium=Синій дельфініум
+Thistle=Будяк
+Lazarus Bell=Дзвіночок Лазаря
+Reed Mannagrass=Лепешняк великий
+Natural=Натуральна
+White=Біла
+Grey=Сіра
+Black=Чорна
+Red=Червона
+Yellow=Жовта
+Green=Зелена
+Cyan=Блакитна
+Blue=Синя
+Magenta=Пурпурна
+Orange=Помаранчева
+Violet=Фіолетова
+Brown=Коричнева
+Pink=Рожева
+Dark Grey=Темно-сіра
+Dark Green=Темно-зелена
+Baked Clay=Випалена глина
+Baked Clay Stair=випалена глина (сходи)
+Baked Clay Slab=випалена глина (плита)
+Glazed Terracotta=Глазурована теракота

locale/template.txt

@@ -0,0 +1,25 @@
+# textdomain: bakedclay
+Blue Delphinium=
+Thistle=
+Lazarus Bell=
+Reed Mannagrass=
+Natural=
+White=
+Grey=
+Black=
+Red=
+Yellow=
+Green=
+Cyan=
+Blue=
+Magenta=
+Orange=
+Violet=
+Brown=
+Pink=
+Dark Grey=
+Dark Green=
+Baked Clay=
+Baked Clay Stair=
+Baked Clay Slab=
+Glazed Terracotta=

lucky_block.lua

@@ -1,64 +1,65 @@
+
+-- helpers
+
 local p = "bakedclay:"
+local p2 = "bakedclay:terracotta_"
+
+-- add lucky blocks
 
 lucky_block:add_blocks({
 	{"dro", {"bakedclay:"}, 10, true},
 	{"fal", {
-		p.."black", p.."blue", p.."brown", p.."cyan", p.."dark_green",
-		p.."dark_grey", p.."green", p.."grey", p.."magenta", p.."orange",
-		p.."pink", p.."red", p.."violet", p.."white", p.."yellow", p.."natural"
+		p .. "black", p .. "blue", p .. "brown", p .. "cyan", p .. "dark_green",
+		p .. "dark_grey", p .. "green", p .. "grey", p .. "magenta", p .. "orange",
+		p .. "pink", p .. "red", p .. "violet", p .. "white", p .. "yellow", p .. "natural"
 	}, 0},
 	{"fal", {
-		p.."black", p.."blue", p.."brown", p.."cyan", p.."dark_green",
-		p.."dark_grey", p.."green", p.."grey", p.."magenta", p.."orange",
-		p.."pink", p.."red", p.."violet", p.."white", p.."yellow", p.."natural"
+		p .. "black", p .. "blue", p .. "brown", p .. "cyan", p .. "dark_green",
+		p .. "dark_grey", p .. "green", p .. "grey", p .. "magenta", p .. "orange",
+		p .. "pink", p .. "red", p .. "violet", p .. "white", p .. "yellow", p .. "natural"
 	}, 0, true},
-	{"dro", {p.."delphinium"}, 5},
-	{"dro", {p.."lazarus"}, 5},
-	{"dro", {p.."mannagrass"}, 5},
-	{"dro", {p.."thistle"}, 6},
+	{"dro", {p .. "delphinium"}, 5},
+	{"dro", {p .. "lazarus"}, 5},
+	{"dro", {p .. "mannagrass"}, 5},
+	{"dro", {p .. "thistle"}, 6},
 	{"flo", 5, {
-		p.."natural", p.."black", p.."blue", p.."brown", p.."cyan",
-		p.."dark_green", p.."dark_grey", p.."green", p.."grey", p.."magenta",
-		p.."orange", p.."pink", p.."red", p.."violet", p.."white", p.."yellow"
+		p .. "natural", p .. "black", p .. "blue", p .. "brown", p .. "cyan",
+		p .. "dark_green", p .. "dark_grey", p .. "green", p .. "grey", p .. "magenta",
+		p .. "orange", p .. "pink", p .. "red", p .. "violet", p .. "white", p .. "yellow"
 	}, 2},
 	{"nod", "default:chest", 0, {
-		{name = p.."natural", max = 30},
-		{name = p.."black", max = 30},
-		{name = p.."blue", max = 30},
-		{name = p.."brown", max = 30},
-		{name = p.."cyan", max = 30},
-		{name = p.."dark_green", max = 30},
-		{name = p.."dark_grey", max = 30},
-		{name = p.."green", max = 30},
-		{name = p.."grey", max = 30},
-		{name = p.."magenta", max = 30},
-		{name = p.."orange", max = 30},
-		{name = p.."pink", max = 30},
-		{name = p.."red", max = 30},
-		{name = p.."violet", max = 30},
-		{name = p.."white", max = 30},
-		{name = p.."yellow", max = 30}
-	}}
-})
-
-p = "bakedclay:terracotta_"
-
-lucky_block:add_blocks({
+		{name = p .. "natural", 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}
+	}},
 	{"nod", "default:chest", 0, {
-		{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}
+		{name = p2 .. "black", max = 20},
+		{name = p2 .. "blue", max = 20},
+		{name = p2 .. "brown", max = 20},
+		{name = p2 .. "cyan", max = 20},
+		{name = p2 .. "dark_green", max = 20},
+		{name = p2 .. "dark_grey", max = 20},
+		{name = p2 .. "green", max = 20},
+		{name = p2 .. "grey", max = 20},
+		{name = p2 .. "magenta", max = 20},
+		{name = p2 .. "orange", max = 20},
+		{name = p2 .. "pink", max = 20},
+		{name = p2 .. "red", max = 20},
+		{name = p2 .. "violet", max = 20},
+		{name = p2 .. "white", max = 20},
+		{name = p2 .. "yellow", max = 20}
 	}}
 })

mod.conf

@@ -1,4 +1,5 @@
 name = bakedclay
+description = Bake clay blocks and colour with dye, also has Terracotta designs.
 depends = default
 optional_depends = stairs, moreblocks, lucky_block, flowerpot
-description = Adds the ability to bake clay into blocks and colour them with dye.
+min_minetest_version = 5.0