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!ia0y~yU{C;I7G?$phQ^Te;|vT8Ea{HEjtmSN`?>!lvVtU& zJ%W507^+km7#f-x7=Hd|U}$*Bz))(y!0;-8fx&791A}<}r1+z53=9l%0X`wF$Nl!+ z&A4?s;?S3^r&k)x-)y|{#QKHHZN8mTxj1cZ@Sh(>|1BB?4sl#&m>cA! z-CDk2tCmCuM~T3{#wK286(*rovQMseI(#&0D^*f-ex*38beCqVOY_vSchPHC^F(?@ z>i;|<8^r(FlId@F=v2d_GoCI#;x69%%g^-E)0}lX6IM>sKKk&=$C>`l{2uIQc%7c= zRLp<)rTU=WoW1I)G51))io)J($h}tQZ6Ccmx0|)~TIp`9^2ZmpvGHe}(W;%Z+9P4& z7KK?hf9z_zkL~u8XM6wnrS;m=o2;hkoM)Mo$n;@PDa&D*^94FHXP;uX?bhp8-OUlF zdCpcu{7}Ljlg6a|P0vLdelfSLbrgK_)AlC=1A}UbYeY#(Vo9o1a#3nxNh*VpfuXss zfswAEd5EEjm64H^fq}Mxp_PHbiW?UVQ8eV{r(~v8;?{7pHM5t2fq}u()z4*}Q$iB} D@FU@6 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!ia0y~yU{C;I4rT@h2A3sW#~2tGSkfJR9T^xl_H+M9WCckk zdj$D1FjT2BFf=qXF#P<_z|ioLfuYoZf#FpG1B2BJ1_tr`N%2SB7#J9g1AIbUJB@bq zne1B>@<2z&C_`~Uy5jr{#f6!Q3#XZ#OjlfxrMM_dX;GHqLL*a)G{yOuii`gL|NmTt zJDY)lficP3-9=#PCSDx|1_sUokH}&M25w;xW@MN(M}mQYfxX1j*OmPtlOUfM!_@UN z4=^w=UiEZw46!)v8_YTBwgJy#pAM0^yZ-&p7hf^P@oC(q?m%qPNj@Hv0oCVJ;?-ukkJpVL3` zyHAsLiQbV}E;0K+k6mMbv|8bklhvk=wHL7cdtmsGp|kyB%LHaEE%`?$<0LF+eH5*T z5cO<4YImdKuC2W44zq`z4;1Ge;%|dq%>EFKYtJt{_&cvCuIqN-%Yd3> zm!j`ERi$OtQdw;o0gCagVm{CRa~^UQ+^p_kVKVpdjvX4VXJj}QO!mUm4S`$*tc#E#tsHli3$qCwzSKb<*Z7i{qKn4+t+@%wke&XyF>V%t`FXi@#+> zf*U>w8|gp(`$%o^_upwO`K|2#R`Ji{($P5F?C^g3C> z)L>qIYP!^)Z+8#K#qXK4?cT9hi$&+{S{D@Vyk775;TfxQ?B)O1zFZ}J-A6?_d2i5$ zef4_#bt_%Ytk>*6nD@ACo1}bGvGs){-9?SI*Zwd*IxJ|qsw$<4fq_A_#5JNMC9x#c zD!C{%u_Tqj$iUEC*T6{E&^*M@#LCFX%D_O|z|hLTV8xA#hA0|x^HVa@DsgML*_zqQ Qz`(%Z>FVdQ&MBb@0FX>OU;qFB literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_colorblocks/textures/mcl_colorblocks_glazed_terracotta_yellow.png b/mods/ITEMS/mcl_colorblocks/textures/mcl_colorblocks_glazed_terracotta_yellow.png new file mode 100644 index 0000000000000000000000000000000000000000..ff5a02f3ed1ffa4f47ed0797aaa33366f6d2d23f GIT binary patch literal 727 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2tGSkfJR9T^xl_H+M9WCckk zdj$D1FjT2BFf=qXF#P<_z|ioLfuYoZf#FpG1B2BJ1_tr`N%2SB7#JA51AIbU|J|_t zc|!No2GRd-=KlY%{oN|w`wOHtHia!I^ZC3@^}`z8M@tlbT}l6ODf!p6+?ly<|34r3 zcQ5|`yH#sz0yV>$x^17ni6yNkr^%vL!D1_sUokH}&M z25w;xW@MN(M}mQYfxX1j*OmPtlOUfM!_@UN4=^w=mUy~2hFF}=y?lFGvjPumz$^#T ztBx0L{rqn~S4BN*x0TJ8X?J57g1yX>Vl8iL3#;qseNVhHmFWr3N8UUShovW?xvpJ5 zo}x7IXzR22^R?Xm>|T6)iw@VH_|k3LqbBxngk}UKIjmBDel1N{_qoB6C$a_%QFb1W zdUlwWaT=>t`Tt6E3%`4CS5afo#jnrv1GX^lVqh+KAGYY!E}_^%+gmd8E~ZRfrYdtn zJwrnHfZ03d6#4>Znz!&m~e4htHFf= z`5(Mbf-7nY1(-VZ8d=0I?0YJ7woT5yQDAQ9G1WuT4vXH*F6LOhcB68$+!aQyBSy!n z-u-4(;M(<>`)^H>{GVqsO?^M77m9BbS~|x;T2z|#@7or+ci)d6cC{;C9oekko4s&S zTjHz}=T+wE^8C=Ub6>b5Z{{Pm$+A|z!VUgp-8t}L!R^1w@3n<){Acv}QjvC&-JxAf z{vWep)A4qD*6(85Ma3^)U|?WSEpd$~Nl7e8wMs5ZO)N=eFfuSS*EKNGH8c+~G_f)= tvNABxHZZg@Fj#Tpq9KZg-29Zxv`X9>ZnkFjGB7YOc)I$ztaD0e0svn5BToPT literal 0 HcmV?d00001