Merge remote-tracking branch 'upstream/master'

flowers.lua

@@ -1,9 +1,5 @@
-
 -- translation support
-
+local S = minetest.get_translator("bakedclay")
-local S = core.get_translator("bakedclay")
-
--- new flowers
 
 local flowers = {
 	{"delphinium", S("Blue Delphinium"),
@@ -19,8 +15,8 @@ local flowers = {
 	{-0.15, -0.5, -0.15, 0.15, 0.2, 0.15}, {color_dark_green = 1}}
 }
 
--- helper function
+-- register some new flowers to fill in missing dye colours
-
+-- flower registration (borrowed from default game)
 local function add_simple_flower(name, desc, box, f_groups)
 
 	f_groups.snappy = 3
@@ -28,7 +24,7 @@ local function add_simple_flower(name, desc, box, f_groups)
 	f_groups.flora = 1
 	f_groups.attached_node = 1
 
-	core.register_node("bakedclay:" .. name, {
+	minetest.register_node("bakedclay:" .. name, {
 		description = desc,
 		drawtype = "plantlike",
 		waving = 1,
@@ -45,15 +41,12 @@ local function add_simple_flower(name, desc, box, f_groups)
 	})
 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({
-core.register_decoration({
 	deco_type = "simple",
 	place_on = {"default:dirt_with_grass"},
 	sidelen = 16,
@@ -65,11 +58,12 @@ core.register_decoration({
 		octaves = 3,
 		persist = 0.6
 	},
-	y_min = 10, y_max = 90,
+	y_min = 10,
+	y_max = 90,
 	decoration = "bakedclay:delphinium"
 })
 
-core.register_decoration({
+minetest.register_decoration({
 	deco_type = "simple",
 	place_on = {"default:dirt_with_grass", "default:dirt_with_dry_grass"},
 	sidelen = 16,
@@ -81,11 +75,12 @@ core.register_decoration({
 		octaves = 3,
 		persist = 0.6
 	},
-	y_min = 15, y_max = 90,
+	y_min = 15,
+	y_max = 90,
 	decoration = "bakedclay:thistle"
 })
 
-core.register_decoration({
+minetest.register_decoration({
 	deco_type = "simple",
 	place_on = {"default:dirt_with_grass", "default:dirt_with_rainforest_litter"},
 	sidelen = 16,
@@ -97,12 +92,14 @@ core.register_decoration({
 		octaves = 3,
 		persist = 0.6
 	},
-	y_min = 1, y_max = 90,
+	y_min = 1,
+	y_max = 90,
 	decoration = "bakedclay:lazarus",
-	spawn_by = "default:jungletree", num_spawn_by = 1
+	spawn_by = "default:jungletree",
+	num_spawn_by = 1
 })
 
-core.register_decoration({
+minetest.register_decoration({
 	deco_type = "simple",
 	place_on = {"default:dirt_with_grass", "default:sand"},
 	sidelen = 16,
@@ -114,14 +111,15 @@ core.register_decoration({
 		octaves = 3,
 		persist = 0.6
 	},
-	y_min = 1, y_max = 15,
+	y_min = 1,
+	y_max = 15,
 	decoration = "bakedclay:mannagrass",
-	spawn_by = "group:water", num_spawn_by = 1
+	spawn_by = "group:water",
+	num_spawn_by = 1
 })
 
--- flowerpot mod support
+-- flowerpot mod
-
+if minetest.get_modpath("flowerpot") then
-if core.get_modpath("flowerpot") then
 	flowerpot.register_node("bakedclay:delphinium")
 	flowerpot.register_node("bakedclay:thistle")
 	flowerpot.register_node("bakedclay:lazarus")

init.lua

@@ -1,7 +1,7 @@
 
 -- translation support
 
-local S = core.get_translator("bakedclay")
+local S = minetest.get_translator("bakedclay")
 
 -- list of clay colours
 
@@ -26,10 +26,12 @@ local clay = {
 
 -- check mod support
 
-local techcnc_mod = core.get_modpath("technic_cnc")
+local techcnc_mod = minetest.get_modpath("technic_cnc")
-local stairs_mod = core.get_modpath("stairs")
+local stairs_mod = minetest.get_modpath("stairs")
-local stairsplus_mod = core.get_modpath("moreblocks") and core.global_exists("stairsplus")
+local stairsplus_mod = minetest.get_modpath("moreblocks")
-local stairsplus_compat = core.settings:get_bool("stairsplus_clay_compatibility") ~= false
+		and minetest.global_exists("stairsplus")
+local stairsplus_compat = minetest.settings:get_bool("stairsplus_clay_compatibility") ~= false
+
 
 -- scroll through colours
 
@@ -37,19 +39,18 @@ for _, clay in pairs(clay) do
 
 	-- register node
 
-	core.register_node("bakedclay:" .. clay[1], {
+	minetest.register_node("bakedclay:" .. clay[1], {
 		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
 
-		core.register_craft({
+		minetest.register_craft({
 			output = "bakedclay:" .. clay[1] .. " 8",
 			recipe = {
 				{"group:bakedclay", "group:bakedclay", "group:bakedclay"},
@@ -76,10 +77,10 @@ for _, clay in pairs(clay) do
 			stairsplus:register_alias_all("bakedclay", clay[1],
 					"bakedclay", "baked_clay_" .. clay[1])
 
-			core.register_alias("stairs:slab_bakedclay_".. clay[1],
+			minetest.register_alias("stairs:slab_bakedclay_".. clay[1],
 					"bakedclay:slab_baked_clay_" .. clay[1])
 
-			core.register_alias("stairs:stair_bakedclay_".. clay[1],
+			minetest.register_alias("stairs:stair_bakedclay_".. clay[1],
 					"bakedclay:stair_baked_clay_" .. clay[1])
 		end
 
@@ -109,7 +110,7 @@ for _, clay in pairs(clay) do
 
 	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},
@@ -127,7 +128,7 @@ for _, clay in pairs(clay) do
 
 		local texture = "baked_clay_terracotta_" .. clay[1] ..".png"
 
-		core.register_node("bakedclay:terracotta_" .. clay[1], {
+		minetest.register_node("bakedclay:terracotta_" .. clay[1], {
 			description = clay[2] .. " " .. S("Glazed Terracotta"),
 			tiles = {
 				texture .. "",
@@ -140,11 +141,10 @@ 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
-			on_place = core.rotate_node
 		})
 
-		core.register_craft({
+		minetest.register_craft({
 			type = "cooking",
 			output = "bakedclay:terracotta_" .. clay[1],
 			recipe = "bakedclay:" .. clay[1]
@@ -152,39 +152,19 @@ for _, clay in pairs(clay) do
 	end
 end
 
-core.register_alias("bakedclay:terracotta_light_blue", "bakedclay:terracotta_cyan")
+minetest.register_alias("bakedclay:terracotta_light_blue", "bakedclay:terracotta_cyan")
 
 -- cook clay block into natural baked clay
 
-core.register_craft({
+minetest.register_craft({
 	type = "cooking",
 	output = "bakedclay:natural",
 	recipe = "default:clay"
 })
 
--- register a few extra dye colour options
-
-core.register_craft({ output = "dye:green 4", recipe = {{"default:cactus"}} })
-core.register_craft({ output = "dye:brown 4", recipe = {{"default:dry_shrub"}} })
-
--- only add light grey recipe if unifieddye mod isnt present (conflict)
-
-if not core.get_modpath("unifieddyes") then
-
-	core.register_craft( {
-		output = "dye:dark_grey 3",
-		recipe = {{"dye:black", "dye:black", "dye:white"}}
-	})
-
-	core.register_craft( {
-		output = "dye:grey 3",
-		recipe = {{"dye:black", "dye:white", "dye:white"}}
-	})
-end
-
 -- 2x2 red baked clay makes 16x clay brick
 
-core.register_craft( {
+minetest.register_craft( {
 	output = "default:clay_brick 16",
 	recipe = {
 		{"bakedclay:red", "bakedclay:red"},
@@ -194,7 +174,7 @@ core.register_craft( {
 
 -- colored clay compatibility
 
-if core.settings:get_bool("colored_clay_compatibility") == true then
+if minetest.settings:get_bool("colored_clay_compatibility") == true then
 
 	local cc = {
 		{"black", "black"},
@@ -221,7 +201,7 @@ if core.settings:get_bool("colored_clay_compatibility") == true then
 		local nod1 = "colored_clay:" .. cc[n][1]
 		local nod2 = "bakedclay:" .. cc[n][2]
 
-		core.register_alias(nod1, nod2)
+		minetest.register_alias(nod1, nod2)
 
 		if stairsplus_mod then
 			stairsplus:register_alias_all("colored_clay", cc[n][1], "bakedclay", cc[n][2])
@@ -231,7 +211,7 @@ end
 
 -- get mod path
 
-local path = core.get_modpath("bakedclay")
+local path = minetest.get_modpath("bakedclay")
 
 -- add new flowers
 
@@ -239,7 +219,7 @@ dofile(path .. "/flowers.lua")
 
 -- add lucky blocks if mod present
 
-if core.get_modpath("lucky_block") then
+if minetest.get_modpath("lucky_block") then
 	dofile(path .. "/lucky_block.lua")
 end
 

locale/bakedclay.hu.tr

@@ -1,25 +0,0 @@
-# textdomain: bakedclay
-Blue Delphinium=Kék szarkaláb
-Thistle=Bogáncs
-Lazarus Bell=Kockásliliom
-Reed Mannagrass=Vízi harmatkása
-Natural=Természetes
-White=Fehér
-Grey=Szürke
-Black=Fekete
-Red=Piros
-Yellow=Sárga
-Green=Zöld
-Cyan=Cián
-Blue=Kék
-Magenta=Bíbor
-Orange=Narancssárga
-Violet=Lila
-Brown=Barna
-Pink=Rózsaszín
-Dark Grey=Sötétszürke
-Dark Green=Sötétzöld
-Baked Clay=égetett agyag
-Baked Clay Stair=égetett agyag lépcső
-Baked Clay Slab=égetett agyag lap
-Glazed Terracotta=zománcmázas terrakotta

locale/bakedclay.uk.tr

@@ -1,27 +0,0 @@
-# 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=Глазурована теракота

lucky_block.lua

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