Merge remote-tracking branch 'upstream/master'

README.md

@@ -8,7 +8,7 @@ https://forum.minetest.net/viewtopic.php?id=8890
 
 Changelog:
 
-- 1.0 - Re-Added glazed terracotta blocks when you cook baked clay in furnace (thanks Amara2_MK), added support for sofar's flowerpot mod
+- 1.0 - Re-Added glazed terracotta blocks when you cook baked clay in furnace (thanks Amara2_MK), added support for sofar's flowerpot mod, missing glazed textures re-coloured by firefox.
 - 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.7 - Added support for stairsplus so that stairs are registered properly

flowers.lua

@@ -0,0 +1,117 @@
+local flowers = {
+	{"delphinium", "Blue Delphinium",
+	{-0.15, -0.5, -0.15, 0.15, 0.3, 0.15}, {color_cyan = 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}}
+}
+
+-- 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
+	f_groups.flower = 1
+	f_groups.flora = 1
+	f_groups.attached_node = 1
+
+	minetest.register_node("bakedclay:" .. name, {
+		description = desc,
+		drawtype = "plantlike",
+		waving = 1,
+		tiles = {"baked_clay_" .. name .. ".png"},
+		inventory_image = "baked_clay_" .. name .. ".png",
+		wield_image = "baked_clay_" .. name .. ".png",
+		sunlight_propagates = true,
+		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
+
+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"},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = 0.004,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 7133,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 10,
+	y_max = 90,
+	decoration = "bakedclay:delphinium"
+})
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {"default:dirt_with_grass", "default:dirt_with_dry_grass"},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = 0.004,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 7134,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 15,
+	y_max = 90,
+	decoration = "bakedclay:thistle"
+})
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {"default:dirt_with_grass", "default:dirt_with_rainforest_litter"},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = 0.01,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 7135,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 1,
+	y_max = 90,
+	decoration = "bakedclay:lazarus",
+	spawn_by = "default:jungletree",
+	num_spawn_by = 1
+})
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {"default:dirt_with_grass", "default:sand"},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = 0.009,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 7136,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 1,
+	y_max = 15,
+	decoration = "bakedclay:mannagrass",
+	spawn_by = "group:water",
+	num_spawn_by = 1
+})

init.lua

@@ -23,12 +23,11 @@ local clay = {
 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")
+		and minetest.global_exists("stairsplus")
 
 for _, clay in pairs(clay) do
 
 	-- node
-
 	minetest.register_node("bakedclay:" .. clay[1], {
 		description = clay[2] .. " Baked Clay",
 		tiles = {"baked_clay_" .. clay[1] ..".png"},
@@ -37,7 +36,6 @@ for _, clay in pairs(clay) do
 	})
 
 	-- craft recipe
-
 	if clay[1] ~= "natural" then
 
 		minetest.register_craft({
@@ -100,7 +98,7 @@ for _, clay in pairs(clay) do
 	end
 end
 
--- Terracotta blocks (textures by D3monPixel, thanks for use :)
+-- Terracotta blocks
 for _, clay in pairs(clay) do
 
 	if clay[1] ~= "natural" then
@@ -134,250 +132,58 @@ end
 minetest.register_alias("bakedclay:terracotta_light_blue", "bakedclay:terracotta_cyan")
 
 -- cook clay block into white baked clay
-
 minetest.register_craft({
 	type = "cooking",
 	output = "bakedclay:natural",
-	recipe = "default:clay",
+	recipe = "default:clay"
 })
 
--- 2x2 red bakedclay makes 16x clay brick
+-- 2x2 red baked clay makes 16x clay brick
 minetest.register_craft( {
 	output = "default:clay_brick 16",
 	recipe = {
 		{"bakedclay:red", "bakedclay:red"},
-		{"bakedclay:red", "bakedclay:red"},
+		{"bakedclay:red", "bakedclay:red"}
 	}
 })
 
--- 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
-	f_groups.flower = 1
-	f_groups.flora = 1
-	f_groups.attached_node = 1
-
-	minetest.register_node("bakedclay:" .. name, {
-		description = desc,
-		drawtype = "plantlike",
-		waving = 1,
-		tiles = {"baked_clay_" .. name .. ".png"},
-		inventory_image = "baked_clay_" .. name .. ".png",
-		wield_image = "baked_clay_" .. name .. ".png",
-		sunlight_propagates = true,
-		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
-
-local flowers = {
-	{"delphinium", "Blue Delphinium",
-	{-0.15, -0.5, -0.15, 0.15, 0.3, 0.15}, {color_cyan = 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
-	add_simple_flower(unpack(item))
-end
-
--- mapgen for new flowers
-
-minetest.register_decoration({
-	deco_type = "simple",
-	place_on = {"default:dirt_with_grass"},
-	sidelen = 16,
-	noise_params = {
-		offset = 0,
-		scale = 0.004,
-		spread = {x = 100, y = 100, z = 100},
-		seed = 7133,
-		octaves = 3,
-		persist = 0.6
-	},
-	y_min = 10,
-	y_max = 90,
-	decoration = "bakedclay:delphinium"
-})
-
-minetest.register_decoration({
-	deco_type = "simple",
-	place_on = {"default:dirt_with_grass", "default:dirt_with_dry_grass"},
-	sidelen = 16,
-	noise_params = {
-		offset = 0,
-		scale = 0.004,
-		spread = {x = 100, y = 100, z = 100},
-		seed = 7134,
-		octaves = 3,
-		persist = 0.6
-	},
-	y_min = 15,
-	y_max = 90,
-	decoration = "bakedclay:thistle"
-})
-
-minetest.register_decoration({
-	deco_type = "simple",
-	place_on = {"default:dirt_with_grass", "default:dirt_with_rainforest_litter"},
-	sidelen = 16,
-	noise_params = {
-		offset = 0,
-		scale = 0.01,
-		spread = {x = 100, y = 100, z = 100},
-		seed = 7135,
-		octaves = 3,
-		persist = 0.6
-	},
-	y_min = 1,
-	y_max = 90,
-	decoration = "bakedclay:lazarus",
-	spawn_by = "default:jungletree",
-	num_spawn_by = 1
-})
-
-minetest.register_decoration({
-	deco_type = "simple",
-	place_on = {"default:dirt_with_grass", "default:sand"},
-	sidelen = 16,
-	noise_params = {
-		offset = 0,
-		scale = 0.009,
-		spread = {x = 100, y = 100, z = 100},
-		seed = 7136,
-		octaves = 3,
-		persist = 0.6
-	},
-	y_min = 1,
-	y_max = 15,
-	decoration = "bakedclay:mannagrass",
-	spawn_by = "group:water",
-	num_spawn_by = 1
-})
-
--- lucky blocks
-
-if minetest.get_modpath("lucky_block") then
-
-local p = "bakedclay:"
-
-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"}, 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"}, 0, true},
-	{"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"}, 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({
-	{"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}
-	}}
-})
-end
-
 -- colored clay compatibility
-
 if minetest.settings:get_bool("colored_clay_compatibility") == true then
 
-local cc = {
+	local cc = {
-	{"black", "black"},
+		{"black", "black"},
-	{"blue", "blue"},
+		{"blue", "blue"},
-	{"bright", "natural"},
+		{"bright", "natural"},
-	{"brown", "brown"},
+		{"brown", "brown"},
-	{"cyan", "cyan"},
+		{"cyan", "cyan"},
-	{"dark_green", "dark_green"},
+		{"dark_green", "dark_green"},
-	{"dark_grey", "dark_grey"},
+		{"dark_grey", "dark_grey"},
-	{"green", "green"},
+		{"green", "green"},
-	{"grey", "grey"},
+		{"grey", "grey"},
-	{"hardened", "natural"},
+		{"hardened", "natural"},
-	{"magenta", "magenta"},
+		{"magenta", "magenta"},
-	{"orange", "orange"},
+		{"orange", "orange"},
-	{"pink", "pink"},
+		{"pink", "pink"},
-	{"red", "red"},
+		{"red", "red"},
-	{"violet", "violet"},
+		{"violet", "violet"},
-	{"white", "white"},
+		{"white", "white"},
-	{"yellow", "yellow"}
+		{"yellow", "yellow"}
-}
+	}
 
-for n = 1, #cc do
+	for n = 1, #cc do
 
-	local nod1 = "colored_clay:" .. cc[n][1]
+		local nod1 = "colored_clay:" .. cc[n][1]
-	local nod2 = "bakedclay:" .. cc[n][2]
+		local nod2 = "bakedclay:" .. cc[n][2]
 
-	minetest.register_alias(nod1, nod2)
+		minetest.register_alias(nod1, nod2)
 
-	if stairsplus_mod then
+		if stairsplus_mod then
-		stairsplus:register_alias_all("colored_clay", cc[n][1], "bakedclay", cc[n][2])
+			stairsplus:register_alias_all("colored_clay", cc[n][1], "bakedclay", cc[n][2])
+		end
 	end
 end
 
-end
-
-
 -- flowerpot mod
-
 if minetest.get_modpath("flowerpot") then
 	flowerpot.register_node("bakedclay:delphinium")
 	flowerpot.register_node("bakedclay:thistle")
@@ -385,4 +191,15 @@ if minetest.get_modpath("flowerpot") then
 	flowerpot.register_node("bakedclay:mannagrass")
 end
 
-minetest.log("action", "[MOD] Baked Clay loaded.")
+-- 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
+
+print ("[MOD] Baked Clay loaded")

license.txt

@@ -24,3 +24,5 @@ THE SOFTWARE.
 Textures by Amara2_MK (Creative Commons)
 https://www.curseforge.com/minecraft/texture-packs/glazed-terracotta-revamp
   baked_clay_terracotta*.png
+
+Missing gray, light gray, black and green textures re-coloured by Firefox.

lucky_block.lua

@@ -0,0 +1,64 @@
+local p = "bakedclay:"
+
+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"
+	}, 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"
+	}, 0, true},
+	{"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"
+	}, 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({
+	{"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}
+	}}
+})