Merge pull request 'Add glazed terracotta pillars' (#4117) from Potiron/MineClone2:master into master

Reviewed-on: MineClone2/MineClone2#4117
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>

mods/ITEMS/mcl_colorblocks/init.lua

@@ -4,27 +4,28 @@ local doc_mod = minetest.get_modpath("doc")
 local block = {}
 
 block.dyes = {
-	{"white",      S("White Terracotta"),      S("White Glazed Terracotta"),	S("White Concrete Powder"),		S("White Concrete"),		"white"},
-	{"grey",       S("Grey Terracotta"),       S("Grey Glazed Terracotta"),		S("Grey Concrete Powder"),		S("Grey Concrete"),		"dark_grey"},
-	{"silver",     S("Light Grey Terracotta"), S("Light Grey Glazed Terracotta"),	S("Light Grey Concrete Powder"),	S("Light Grey Concrete"),	"grey"},
-	{"black",      S("Black Terracotta"),      S("Black Glazed Terracotta"),	S("Black Concrete Powder"),		S("Black Concrete"),		"black"},
-	{"red",        S("Red Terracotta"),        S("Red Glazed Terracotta"),		S("Red Concrete Powder"),		S("Red Concrete"),		"red"},
-	{"yellow",     S("Yellow Terracotta"),     S("Yellow Glazed Terracotta"),	S("Yellow Concrete Powder"),		S("Yellow Concrete"),		"yellow"},
-	{"green",      S("Green Terracotta"),      S("Green Glazed Terracotta"),	S("Green Concrete Powder"),		S("Green Concrete"),		"dark_green"},
-	{"cyan",       S("Cyan Terracotta"),       S("Cyan Glazed Terracotta"),		S("Cyan Concrete Powder"),		S("Cyan Concrete"),		"cyan"},
-	{"blue",       S("Blue Terracotta"),       S("Blue Glazed Terracotta"),		S("Blue Concrete Powder"),		S("Blue Concrete"),		"blue"},
-	{"magenta",    S("Magenta Terracotta"),    S("Magenta Glazed Terracotta"),	S("Magenta Concrete Powder"),		S("Magenta Concrete"),		"magenta"},
-	{"orange",     S("Orange Terracotta"),     S("Orange Glazed Terracotta"),	S("Orange Concrete Powder"),		S("Orange Concrete"),		"orange"},
-	{"purple",     S("Purple Terracotta"),     S("Purple Glazed Terracotta"),	S("Purple Concrete Powder"),		S("Purple Concrete"),		"violet"},
-	{"brown",      S("Brown Terracotta"),      S("Brown Glazed Terracotta"),	S("Brown Concrete Powder"),		S("Brown Concrete"),		"brown"},
-	{"pink",       S("Pink Terracotta"),       S("Pink Glazed Terracotta"),		S("Pink Concrete Powder"),		S("Pink Concrete"),		"pink"},
-	{"lime",       S("Lime Terracotta"),       S("Lime Glazed Terracotta"),		S("Lime Concrete Powder"),		S("Lime Concrete"),		"green"},
-	{"light_blue", S("Light Blue Terracotta"), S("Light Blue Glazed Terracotta"),	S("Light Blue Concrete Powder"),	S("Light Blue Concrete"),	"lightblue"},
+	{"white",      S("White Terracotta"),      S("White Glazed Terracotta"),	S("White Glazed Terracotta Pillar"),	S("White Concrete Powder"),		S("White Concrete"),		"white"},
+	{"grey",       S("Grey Terracotta"),       S("Grey Glazed Terracotta"),		S("Grey Glazed Terracotta Pillar"),		S("Grey Concrete Powder"),		S("Grey Concrete"),		"dark_grey"},
+	{"silver",     S("Light Grey Terracotta"), S("Light Grey Glazed Terracotta"),	S("Light Grey Glazed Terracotta Pillar"),	S("Light Grey Concrete Powder"),	S("Light Grey Concrete"),	"grey"},
+	{"black",      S("Black Terracotta"),      S("Black Glazed Terracotta"),	S("Black Glazed Terracotta Pillar"),	S("Black Concrete Powder"),		S("Black Concrete"),		"black"},
+	{"red",        S("Red Terracotta"),        S("Red Glazed Terracotta"),		S("Red Glazed Terracotta Pillar"),		S("Red Concrete Powder"),		S("Red Concrete"),		"red"},
+	{"yellow",     S("Yellow Terracotta"),     S("Yellow Glazed Terracotta"),	S("Yellow Glazed Terracotta Pillar"),	S("Yellow Concrete Powder"),		S("Yellow Concrete"),		"yellow"},
+	{"green",      S("Green Terracotta"),      S("Green Glazed Terracotta"),	S("Green Glazed Terracotta Pillar"),	S("Green Concrete Powder"),		S("Green Concrete"),		"dark_green"},
+	{"cyan",       S("Cyan Terracotta"),       S("Cyan Glazed Terracotta"),		S("Cyan Glazed Terracotta Pillar"),		S("Cyan Concrete Powder"),		S("Cyan Concrete"),		"cyan"},
+	{"blue",       S("Blue Terracotta"),       S("Blue Glazed Terracotta"),		S("Blue Glazed Terracotta Pillar"),		S("Blue Concrete Powder"),		S("Blue Concrete"),		"blue"},
+	{"magenta",    S("Magenta Terracotta"),    S("Magenta Glazed Terracotta"),	S("Magenta Glazed Terracotta Pillar"),	S("Magenta Concrete Powder"),		S("Magenta Concrete"),		"magenta"},
+	{"orange",     S("Orange Terracotta"),     S("Orange Glazed Terracotta"),	S("Orange Glazed Terracotta Pillar"),	S("Orange Concrete Powder"),		S("Orange Concrete"),		"orange"},
+	{"purple",     S("Purple Terracotta"),     S("Purple Glazed Terracotta"),	S("Purple Glazed Terracotta Pillar"),	S("Purple Concrete Powder"),		S("Purple Concrete"),		"violet"},
+	{"brown",      S("Brown Terracotta"),      S("Brown Glazed Terracotta"),	S("Brown Glazed Terracotta Pillar"),	S("Brown Concrete Powder"),		S("Brown Concrete"),		"brown"},
+	{"pink",       S("Pink Terracotta"),       S("Pink Glazed Terracotta"),		S("Pink Glazed Terracotta Pillar"),		S("Pink Concrete Powder"),		S("Pink Concrete"),		"pink"},
+	{"lime",       S("Lime Terracotta"),       S("Lime Glazed Terracotta"),		S("Lime Glazed Terracotta Pillar"),		S("Lime Concrete Powder"),		S("Lime Concrete"),		"green"},
+	{"light_blue", S("Light Blue Terracotta"), S("Light Blue Glazed Terracotta"),	S("Light Blue Glazed Terracotta Pillar"),	S("Light Blue Concrete Powder"),	S("Light Blue Concrete"),	"lightblue"},
 }
 local canonical_color = "yellow"
 
 local hc_desc = S("Terracotta is a basic building material. It comes in many different colors.")
 local gt_desc = S("Glazed terracotta is a decorative block with a complex pattern. It can be rotated by placing it in different directions.")
+local gtp_desc = S("Glazed terracotta pillar is a decorative block with a complex pattern. It can be used with Glazed terracotta to make uneven patterns.")
 local cp_desc = S("Concrete powder is used for creating concrete, but it can also be used as decoration itself. It comes in different colors. Concrete powder turns into concrete of the same color when it comes in contact with water.")
 local c_desc = S("Concrete is a decorative block which comes in many different colors. It is notable for having a very strong and clean color.")
 local cp_tt = S("Turns into concrete on water contact")
@@ -57,8 +58,9 @@ for _, row in ipairs(block.dyes) do
 	local is_canonical = name == canonical_color
 	local sdesc_hc = row[2]
 	local sdesc_gt = row[3]
-	local sdesc_cp = row[4]
-	local sdesc_c = row[5]
+	local sdesc_gtp = row[4]
+	local sdesc_cp = row[5]
+	local sdesc_c = row[6]
 	local ldesc_hc, ldesc_gt, ldesc_cp, ldesc_c
 	local create_entry
 	local ename_hc, ename_gt, ename_cp, ename_c
@@ -66,16 +68,18 @@ for _, row in ipairs(block.dyes) do
 	if is_canonical then
 		ldesc_hc = hc_desc
 		ldesc_gt = gt_desc
+		ldesc_gtp = gtp_desc
 		ldesc_cp = cp_desc
 		ldesc_c = c_desc
 		ename_hc = S("Colored Terracotta")
 		ename_gt = S("Glazed Terracotta")
+		ename_gtp = S("Glazed Terracotta Pillar")
 		ename_cp = S("Concrete Powder")
 		ename_c = S("Concrete")
 	else
 		create_entry = false
 	end
-	local craft_color_group = row[6]
+	local craft_color_group = row[7]
 	-- Node Definition
 	minetest.register_node("mcl_colorblocks:hardened_clay_"..name, {
 		description = sdesc_hc,
@@ -162,6 +166,22 @@ for _, row in ipairs(block.dyes) do
 		_mcl_hardness = 1.4,
 		on_rotate = on_rotate,
 	})
+	minetest.register_node("mcl_colorblocks:glazed_terracotta_pillar_"..name, {
+		description = sdesc_gtp,
+		_doc_items_longdesc = ldesc_gtp,
+		_doc_items_create_entry = create_entry,
+		_doc_items_entry_name = ename_gtp,
+		tiles = {"mcl_colorblocks_glazed_terracotta_pillar_top_"..name..".png", "mcl_colorblocks_glazed_terracotta_pillar_top_"..name..".png", "mcl_colorblocks_glazed_terracotta_pillar_side_"..name..".png"},
+		groups = {handy=1,pickaxey=1, glazed_terracotta=1,building_block=1, material_stone=1},
+		paramtype2 = "facedir",
+		stack_max = 64,
+		is_ground_content = false,
+		sounds = mcl_sounds.node_sound_stone_defaults(),
+		_mcl_blast_resistance = 4.2,
+		_mcl_hardness = 1.4,
+		on_place = mcl_util.rotate_axis,
+		on_rotate = on_rotate,
+	})
 
 	if not is_canonical and doc_mod then
 		doc.add_entry_alias("nodes", "mcl_colorblocks:hardened_clay_"..canonical_color, "nodes", "mcl_colorblocks:hardened_clay_"..name)
@@ -196,6 +216,16 @@ for _, row in ipairs(block.dyes) do
 			recipe = "mcl_colorblocks:hardened_clay_"..name,
 			cooktime = 10,
 		})
+
+		minetest.register_craft({
+			output = "mcl_colorblocks:glazed_terracotta_pillar_"..name.." 2",
+			recipe = {
+				{"mcl_colorblocks:glazed_terracotta_"..name},
+				{"mcl_colorblocks:glazed_terracotta_"..name},
+			}
+		})
+
+		mcl_stonecutter.register_recipe("mcl_colorblocks:glazed_terracotta_"..name, "mcl_colorblocks:glazed_terracotta_pillar_"..name)
 	end
 end
 

mods/ITEMS/mcl_colorblocks/locale/mcl_colorblocks.fr.tr

@@ -1,76 +1,94 @@
 # textdomain: mcl_colorblocks
 White Terracotta=Terre cuite blanche
 White Glazed Terracotta=Terre cuite emaillée blanche
+White Glazed Terracotta Pillar=Pilier de terre cuite emaillée blanche
 White Concrete Powder=Béton en poudre blanc
 White Concrete=Béton blanc
 Grey Terracotta=Terre cuite grise
 Grey Glazed Terracotta=Terre cuite emaillée grise
+Grey Glazed Terracotta Pillar=Pilier de terre cuite emaillée grise
 Grey Concrete Powder=Béton en goudre gris
 Grey Concrete=Béton gris
 Light Grey Terracotta=Terre cuite gris clair
 Light Grey Glazed Terracotta=Terre cuite emaillée gris clair
+Light Grey Glazed Terracotta Pillar=Pilier de terre cuite emaillée gris clair
 Light Grey Concrete Powder=Béton en poudre gris clair
 Light Grey Concrete=Béton gris clair
 Black Terracotta=Terre cuite noir
 Black Glazed Terracotta=Terre cuite emaillée noir
+Black Glazed Terracotta Pillar=Pilier de terre cuite emaillée noir
 Black Concrete Powder=Béton en poudre noir
 Black Concrete=Béton noir
 Red Terracotta=Terre cuite rouge
 Red Glazed Terracotta=Terre cuite emaillée rouge
+Red Glazed Terracotta Pillar=Pilier de terre cuite emaillée rouge
 Red Concrete Powder=Béton en poudre rouge
 Red Concrete=Béton rouge
 Yellow Terracotta=Terre cuite jaune
 Yellow Glazed Terracotta=Terre cuite emaillée jaune
+Yellow Glazed Terracotta Pillar=Pilier de terre cuite emaillée jaune
 Yellow Concrete Powder=Béton en poudre jaune
 Yellow Concrete=Béton jaune
 Green Terracotta=Terre cuite verte
 Green Glazed Terracotta=Terre cuite emaillée verte
+Green Glazed Terracotta Pillar=Pilier de terre cuite emaillée verte
 Green Concrete Powder=Béton en poudre vert
 Green Concrete=Béton vert
 Cyan Terracotta=Terre cuite cyan
 Cyan Glazed Terracotta=Terre cuite emaillée cyan
+Cyan Glazed Terracotta Pillar=Pilier de terre cuite emaillée cyan
 Cyan Concrete Powder=Béton en poudre cyan
 Cyan Concrete=Béton cyan
 Blue Terracotta=Terre cuite bleue
 Blue Glazed Terracotta=Terre cuite emaillée bleue
+Blue Glazed Terracotta Pillar=Pilier de terre cuite emaillée bleue
 Blue Concrete Powder=Béton en poudre bleu
 Blue Concrete=Béton bleu
 Magenta Terracotta=Terre cuite magenta
 Magenta Glazed Terracotta=Terre cuite emaillée magenta
+Magenta Glazed Terracotta Pillar=Pilier de terre cuite emaillée magenta
 Magenta Concrete Powder=Béton en poudre magenta
 Magenta Concrete=Béton magenta
 Orange Terracotta=Terre cuite orange
 Orange Glazed Terracotta=Terre cuite emaillée orange
+Orange Glazed Terracotta Pillar=Pilier de terre cuite emaillée orange
 Orange Concrete Powder=Béton en poudre orange
 Orange Concrete=Béton orange
 Purple Terracotta=Terre cuite violette
 Purple Glazed Terracotta=Terre cuite emaillée violette
+Purple Glazed Terracotta Pillar=Pilier de terre cuite emaillée violette
 Purple Concrete Powder=Béton en poudre violet
 Purple Concrete=Béton violet
 Brown Terracotta=Terre cuite marron
 Brown Glazed Terracotta=Terre cuite emaillée marron
+Brown Glazed Terracotta Pillar=Pilier de terre cuite emaillée marron
 Brown Concrete Powder=Béton en poudre marron
 Brown Concrete=Béton marron
 Pink Terracotta=Terre cuite rose
 Pink Glazed Terracotta=Terre cuite emaillée rose
+Pink Glazed Terracotta Pillar=Pilier de terre cuite emaillée rose
 Pink Concrete Powder=Béton en poudre rose
 Pink Concrete=Béton rose
 Lime Terracotta=Terre cuite verte clair
 Lime Glazed Terracotta=Terre cuite emaillée verte clair
+Lime Glazed Terracotta Pillar=Pilier de terre cuite emaillée verte clair
 Lime Concrete Powder=Béton en poudre vert clair
 Lime Concrete=Béton vert clair
 Light Blue Terracotta=Terre cuite bleu clair
 Light Blue Glazed Terracotta=Terre cuite emaillée bleu clair
+Light Blue Glazed Terracotta Pillar=Pilier de terre cuite emaillée bleu clair
 Light Blue Concrete Powder=Béton en poudre bleu clair
 Light Blue Concrete=Béton bleu clair
 Terracotta is a basic building material. It comes in many different colors.=La terre cuite est un matériau de construction de base. Il est disponible dans de nombreuses couleurs différentes.
 Glazed terracotta is a decorative block with a complex pattern. It can be rotated by placing it in different directions.=La terre cuite émaillée est un bloc décoratif au motif complexe. Il peut être tourné en le plaçant dans différentes directions.
+Glazed terracotta pillar is a decorative block with a complex pattern. It can be used with Glazed terracotta to make uneven patterns.=Le pilier de terre cuite émaillée est un bloc décoratif au motif complexe. Il peut être utilisé avec la terre cuite émaillée pour réaliser des motifs impairs.
 Concrete powder is used for creating concrete, but it can also be used as decoration itself. It comes in different colors. Concrete powder turns into concrete of the same color when it comes in contact with water.=La poudre de béton est utilisée pour créer du béton, mais elle peut également être utilisée comme décoration elle-même. Il est disponible en différentes couleurs. La poudre de béton se transforme en béton de la même couleur au contact de l'eau.
 Concrete is a decorative block which comes in many different colors. It is notable for having a very strong and clean color.=Le béton est un bloc décoratif qui se décline en de nombreuses couleurs différentes. Il est remarquable pour avoir une couleur très forte et propre.
 Terracotta=Terre cuite
 Terracotta is a basic building material which comes in many different colors. This particular block is uncolored.=La terre cuite est un matériau de construction de base qui se décline en de nombreuses couleurs différentes. Ce bloc particulier n'est pas coloré.
 Colored Terracotta=Terre cuite colorée
 Glazed Terracotta=Terre cuite emaillée
+Glazed Terracotta Pillar=Pilier de terre cuite emaillée
 Concrete Powder=Béton en poudre
 Concrete=Béton
 Turns into concrete on water contact=Se transforme en béton au contact de l'eau

mods/ITEMS/mcl_colorblocks/locale/template.txt

@@ -1,76 +1,94 @@
 # textdomain: mcl_colorblocks
 White Terracotta=
 White Glazed Terracotta=
+White Glazed Terracotta Pillar=
 White Concrete Powder=
 White Concrete=
 Grey Terracotta=
 Grey Glazed Terracotta=
+Grey Glazed Terracotta Pillar=
 Grey Concrete Powder=
 Grey Concrete=
 Light Grey Terracotta=
 Light Grey Glazed Terracotta=
+Light Grey Glazed Terracotta Pillar=
 Light Grey Concrete Powder=
 Light Grey Concrete=
 Black Terracotta=
 Black Glazed Terracotta=
+Black Glazed Terracotta Pillar=
 Black Concrete Powder=
 Black Concrete=
 Red Terracotta=
 Red Glazed Terracotta=
+Red Glazed Terracotta Pillar=
 Red Concrete Powder=
 Red Concrete=
 Yellow Terracotta=
 Yellow Glazed Terracotta=
+Yellow Glazed Terracotta Pillar=
 Yellow Concrete Powder=
 Yellow Concrete=
 Green Terracotta=
 Green Glazed Terracotta=
+Green Glazed Terracotta Pillar=
 Green Concrete Powder=
 Green Concrete=
 Cyan Terracotta=
 Cyan Glazed Terracotta=
+Cyan Glazed Terracotta Pillar=
 Cyan Concrete Powder=
 Cyan Concrete=
 Blue Terracotta=
 Blue Glazed Terracotta=
+Blue Glazed Terracotta Pillar=
 Blue Concrete Powder=
 Blue Concrete=
 Magenta Terracotta=
 Magenta Glazed Terracotta=
+Magenta Glazed Terracotta Pillar=
 Magenta Concrete Powder=
 Magenta Concrete=
 Orange Terracotta=
 Orange Glazed Terracotta=
+Orange Glazed Terracotta Pillar=
 Orange Concrete Powder=
 Orange Concrete=
 Purple Terracotta=
 Purple Glazed Terracotta=
+Purple Glazed Terracotta Pillar=
 Purple Concrete Powder=
 Purple Concrete=
 Brown Terracotta=
 Brown Glazed Terracotta=
+Brown Glazed Terracotta Pillar=
 Brown Concrete Powder=
 Brown Concrete=
 Pink Terracotta=
 Pink Glazed Terracotta=
+Pink Glazed Terracotta Pillar=
 Pink Concrete Powder=
 Pink Concrete=
 Lime Terracotta=
 Lime Glazed Terracotta=
+Lime Glazed Terracotta Pillar=
 Lime Concrete Powder=
 Lime Concrete=
 Light Blue Terracotta=
 Light Blue Glazed Terracotta=
+Light Blue Glazed Terracotta Pillar=
 Light Blue Concrete Powder=
 Light Blue Concrete=
 Terracotta is a basic building material. It comes in many different colors.=
 Glazed terracotta is a decorative block with a complex pattern. It can be rotated by placing it in different directions.=
+Glazed terracotta pillar is a decorative block with a complex pattern. It can be used with Glazed terracotta to make uneven patterns.=
 Concrete powder is used for creating concrete, but it can also be used as decoration itself. It comes in different colors. Concrete powder turns into concrete of the same color when it comes in contact with water.=
 Concrete is a decorative block which comes in many different colors. It is notable for having a very strong and clean color.=
 Terracotta=
 Terracotta is a basic building material which comes in many different colors. This particular block is uncolored.=
 Colored Terracotta=
 Glazed Terracotta=
+Glazed Terracotta Pillar=
 Concrete Powder=
 Concrete=
 Turns into concrete on water contact=