From a6c10cb29cc4e8eee08939c985fba3f5fde737d3 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 17 Feb 2017 15:38:47 +0100 Subject: [PATCH] Add magenta, purple, yellow terracotta --- mods/ITEMS/mcl_colorblocks/init.lua | 32 ++++++++++++++++-- ..._colorblocks_glazed_terracotta_magenta.png | Bin 0 -> 589 bytes ...l_colorblocks_glazed_terracotta_purple.png | Bin 0 -> 800 bytes ...l_colorblocks_glazed_terracotta_yellow.png | Bin 0 -> 727 bytes 4 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 mods/ITEMS/mcl_colorblocks/textures/mcl_colorblocks_glazed_terracotta_magenta.png create mode 100644 mods/ITEMS/mcl_colorblocks/textures/mcl_colorblocks_glazed_terracotta_purple.png create mode 100644 mods/ITEMS/mcl_colorblocks/textures/mcl_colorblocks_glazed_terracotta_yellow.png diff --git a/mods/ITEMS/mcl_colorblocks/init.lua b/mods/ITEMS/mcl_colorblocks/init.lua index f423eb747..77531cffd 100644 --- a/mods/ITEMS/mcl_colorblocks/init.lua +++ b/mods/ITEMS/mcl_colorblocks/init.lua @@ -1,19 +1,20 @@ local init = os.clock() local block = {} + block.dyes = { {"white", "White", "white"}, {"grey", "Grey", "dark_grey"}, {"silver", "Light Grey", "grey"}, {"black", "Black", "black"}, {"red", "Red", "red"}, - {"yellow", "Yellow", "yellow"}, + {"yellow", "Yellow", "yellow", true}, {"green", "Green", "dark_green"}, {"cyan", "Cyan", "cyan"}, {"blue", "Blue", "blue"}, - {"magenta", "Magenta", "magenta"}, + {"magenta", "Magenta", "magenta", true}, {"orange", "Orange", "orange"}, - {"purple", "Purple", "violet"}, + {"purple", "Purple", "violet", true}, {"brown", "Brown", "brown"}, {"pink", "Pink", "pink"}, {"lime", "Lime", "green"}, @@ -40,6 +41,8 @@ for _, row in ipairs(block.dyes) do local name = row[1] local desc = row[2] local craft_color_group = row[3] + -- TODO: Remove when all 16 terracotta textures are available + local terracotta = row[4] -- Node Definition minetest.register_node("mcl_colorblocks:hardened_clay_"..name, { description = desc.." Hardened Clay", @@ -70,6 +73,20 @@ for _, row in ipairs(block.dyes) do sounds = mcl_sounds.node_sound_stone_defaults(), }) + if terracotta then + local tex = "mcl_colorblocks_glazed_terracotta_"..name..".png" + local texes = { tex, tex, tex.."^[transformR180", tex, tex.."^[transformR270", tex.."^[transformR90" } + minetest.register_node("mcl_colorblocks:glazed_terracotta_"..name, { + description = desc.." Glazed Terracotta", + tiles = texes, + groups = {cracky=3,glazed_terracotta=1,building_block=1}, + paramtype2 = "facedir", + stack_max = 64, + is_ground_content = false, + sounds = mcl_sounds.node_sound_stone_defaults(), + }) + end + -- Crafting recipes if craft_color_group then minetest.register_craft({ @@ -89,6 +106,15 @@ for _, row in ipairs(block.dyes) do 'mcl_core:sand', 'mcl_core:gravel', 'mcl_core:sand', } }) + + if terracotta then + minetest.register_craft({ + type = "cooking", + output = "mcl_colorblocks:glazed_terracotta_"..name, + recipe = "mcl_colorblocks:hardened_clay_"..name, + cooktime = 10, + }) + end end end diff --git a/mods/ITEMS/mcl_colorblocks/textures/mcl_colorblocks_glazed_terracotta_magenta.png b/mods/ITEMS/mcl_colorblocks/textures/mcl_colorblocks_glazed_terracotta_magenta.png new file mode 100644 index 0000000000000000000000000000000000000000..7b6abb1e633b922eabccde9c615453fe81d24b8c GIT binary patch literal 589 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvmUKs7M+SzC{oH>NSwWJ?9znhg z3{|QO3=Pc;3_t$^>6Z))r3MTPuM!v-tY$DUi04m=Kk5clD;MAs;(FX~@7;`Bry~x1 z*?M}V!Tim}D?cvXKUa6^$)E%O|Nr;ZXukkd$(ZEr?!x);=F&Gn4rhT!WHAE+w=f7Z zGR&GI0Tg5}@$_|Nf5;@rC&n;!{mcVEJ>s4&jv*T7V<#T$YBmsP``^(jlRWRhiA`Vj zbUkkhT+e#fuJPNRfQa=Am)m?hr*d)H+~7YyjQ(3R3LN6N%rG~|OS`pv!B#Da4vrFm ze~nGN&MHhot7M;C?{xTR)K;pb==@4?R_QLySeNFhW$&WbuI7pKiq!vkL^g>3vnA8t z@X)D-M`t`;e#Bk8_m`jPrKdUTb|$QxrhW9`m5($1o%uc3&+s}u)v1{O@JsbUy*Yc; zQ)BM2gcXIo*^qm!&f7kEcWyUp>$TF|R^^W`Y-8ikI-^xPXSGMd#4QT5Z2s8Qb|2gA zC(ri&@k{Hqr#D$m(>c#FDUs>Jo>G>>GUp3)X3jpvZriQbuezHfPV=0ti1?v|J0^`u z`WdHyG literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_colorblocks/textures/mcl_colorblocks_glazed_terracotta_purple.png b/mods/ITEMS/mcl_colorblocks/textures/mcl_colorblocks_glazed_terracotta_purple.png new file mode 100644 index 0000000000000000000000000000000000000000..b4e2347d92c3a55b273c3fca97efd9cc3bfca5cb GIT binary patch literal 800 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvVtU&J%W50 z7^+km7#f-x7=Hc-(k~epN(~qoUL`OvSj}Ky5YL|!f7A`A);Pc?#I@6CN1w^QMIjG# zbc`|-7o;oB&rn>Lskm^O*~xUp1zC!VvXmBODK0cJwMbK(pQ*U$|NsBbRk*W(+8L9) z-CYExZsOGeaySb-B8wRqxP?KOkzv*x37{Z*iKnkC`$Hx{J~4)=>t`MS>bdIa;uvCa z+BcYU(rp8t#XcP(b9epwpD(^(O77&DGRy)D{IhTFkeOku^mmudbjb%ZJ2=h%WxJ)a z{V^(4L_%UWhyxWU;C*J-=aR-%=}!*7AO0X!%&5V<{M2-*Ki}>i zkc;0lY1_SHuNI5W+qEtz+!lvVtU&J%W50 z7^+km7#f-x7=Hc-(k~epN(~qoUL`OvSj}Ky5YL|!f7A`A);qu_#P#0|+n*YGYH_k}{vq+f+ZS;eE73;n$V)AD5DUUCW)B>-PWik$?B%|G!(c zwkF`(eB*1gH80OlSyt}*|NsB%H8-XMjb%*oc6X7Oo!Ke}vL>4nJa0`PlBg3pY z5H=O_J>S@d}0h!*Uvlv)KlW=;uvCaI`{JJY0U~etO2teOs_g#xb^eD{ah9G ztld^NU#8uSVF>mzPl~m?tu3ssqxU`W%2cK&JRf=UJRFvuh~~O>{dkJf#G|dx=Fiu1 z`?GuT@hv)Bf8tBGZI7DR!x5Shl;p5V{rR;tVcq8jOP4{dMB%)6K}b(yNn3H1yK;R9yxm{$ZW zO6=XtEE?qWfFWa@lvwDKhNTh$_qhZ%8kpZwV7lRU^kc%sZLJ0u3gmzAJ_)X5xsDhet9tjFRe@{QXYRi> zN%DW5$u#x-oL(rtQE2HL2We4h*1vCCJG5LSYhE2!Y?ODHz zZ5I{4d;u6GswJ)wB`Jv|saDBFsX&Us$iUEC*T6{E&^*M@#LCFX%D_O|zz|5TxN*@C eMMG|WN@iLmZVfkEGkbv=7(8A5T-G@yGywo!`6EvN literal 0 HcmV?d00001