Merge remote-tracking branch 'upstream/master'

README.md

@@ -2,11 +2,13 @@ Baked Clay
 
 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.
+Cooking baked clay turns it into glazed terracotta blocks.
 
 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
 - 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
@@ -17,7 +19,7 @@ Changelog:
 - 0.2 - Any colour of baked clay can be re-dyed into another colour
 - 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.

depends.txt

@@ -3,3 +3,4 @@ stairs
 moreblocks?
 lucky_block?
 technic_cnc?
+flowerpot?

init.lua

@@ -17,7 +17,7 @@ local clay = {
 	{"brown", "Brown"},
 	{"pink", "Pink"},
 	{"dark_grey", "Dark Grey"},
-	{"dark_green", "Dark Green"},
+	{"dark_green", "Dark Green"}
 }
 
 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
 
-	-- node definition
+	-- node
 
 	minetest.register_node("bakedclay:" .. clay[1], {
 		description = clay[2] .. " 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()
 	})
 
-	-- craft from dye and any baked clay
+	-- craft recipe
+
 	if clay[1] ~= "natural" then
+
 		minetest.register_craft({
 			output = "bakedclay:" .. clay[1] .. " 8",
 			recipe = {
 				{"group:bakedclay", "group:bakedclay", "group:bakedclay"},
 				{"group:bakedclay", "dye:" .. clay[1], "group:bakedclay"},
 				{"group:bakedclay", "group:bakedclay", "group:bakedclay"}
-			},
+			}
 		})
 	end
 
-	-- register stairsplus stairs if found
+	-- stairs plus
 	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",
 			tiles = {"baked_clay_" .. clay[1] .. ".png"},
 			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
 
 		stairs.register_all("bakedclay_" .. clay[1], "bakedclay:" .. clay[1],
@@ -71,7 +79,7 @@ for _, clay in pairs(clay) do
 			clay[2] .. " Baked Clay",
 			default.node_sound_stone_defaults())
 
-	-- register stair and slab using default stairs
+	-- default stairs
 	elseif stairs_mod then
 
 		stairs.register_stair_and_slab("bakedclay_".. clay[1], "bakedclay:".. clay[1],
@@ -92,6 +100,39 @@ for _, clay in pairs(clay) do
 	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
+
+minetest.register_alias("bakedclay:terracotta_light_blue", "bakedclay:terracotta_cyan")
+
 -- cook clay block into white baked clay
 
 minetest.register_craft({
@@ -141,10 +182,17 @@ local function add_simple_flower(name, desc, box, f_groups)
 end
 
 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
@@ -167,7 +215,7 @@ minetest.register_decoration({
 	},
 	y_min = 10,
 	y_max = 90,
-	decoration = "bakedclay:delphinium",
+	decoration = "bakedclay:delphinium"
 })
 
 minetest.register_decoration({
@@ -184,7 +232,7 @@ minetest.register_decoration({
 	},
 	y_min = 15,
 	y_max = 90,
-	decoration = "bakedclay:thistle",
+	decoration = "bakedclay:thistle"
 })
 
 minetest.register_decoration({
@@ -203,7 +251,7 @@ minetest.register_decoration({
 	y_max = 90,
 	decoration = "bakedclay:lazarus",
 	spawn_by = "default:jungletree",
-	num_spawn_by = 1,
+	num_spawn_by = 1
 })
 
 minetest.register_decoration({
@@ -222,13 +270,15 @@ minetest.register_decoration({
 	y_max = 15,
 	decoration = "bakedclay:mannagrass",
 	spawn_by = "group:water",
-	num_spawn_by = 1,
+	num_spawn_by = 1
 })
 
--- add lucky blocks
+-- 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",
@@ -260,12 +310,35 @@ lucky_block:add_blocks({
 		{name = p.."red", max = 30},
 		{name = p.."violet", 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.."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 = {
@@ -302,4 +375,14 @@ end
 
 end
 
+
+-- flowerpot mod
+
+if minetest.get_modpath("flowerpot") then
+	flowerpot.register_node("bakedclay:delphinium")
+	flowerpot.register_node("bakedclay:thistle")
+	flowerpot.register_node("bakedclay:lazarus")
+	flowerpot.register_node("bakedclay:mannagrass")
+end
+
 minetest.log("action", "[MOD] Baked Clay loaded.")

license.txt

@@ -19,3 +19,8 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 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
 THE SOFTWARE.
+
+
+Textures by Amara2_MK (Creative Commons)
+https://www.curseforge.com/minecraft/texture-packs/glazed-terracotta-revamp
+  baked_clay_terracotta*.png

mod.conf

@@ -1 +1,4 @@
-name = bakedclay
+name = bakedclay
+depends = default
+optional_depends = stairs, moreblocks, lucky_block, technic_cnc, flowerpot
+description = Adds the ability to bake clay into blocks and colour them with dye.