From a0900ec36325aa7ef60bf15d91b5c974b3407f79 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Mon, 17 Jul 2017 12:38:58 +0200 Subject: [PATCH] Add green, red, grey, light gray glazed terracotta --- mods/ITEMS/mcl_colorblocks/init.lua | 70 ++++++++---------- ...cl_colorblocks_glazed_terracotta_green.png | Bin 0 -> 487 bytes ...mcl_colorblocks_glazed_terracotta_grey.png | Bin 0 -> 433 bytes .../mcl_colorblocks_glazed_terracotta_red.png | Bin 0 -> 388 bytes ...l_colorblocks_glazed_terracotta_silver.png | Bin 0 -> 410 bytes 5 files changed, 32 insertions(+), 38 deletions(-) create mode 100644 mods/ITEMS/mcl_colorblocks/textures/mcl_colorblocks_glazed_terracotta_green.png create mode 100644 mods/ITEMS/mcl_colorblocks/textures/mcl_colorblocks_glazed_terracotta_grey.png create mode 100644 mods/ITEMS/mcl_colorblocks/textures/mcl_colorblocks_glazed_terracotta_red.png create mode 100644 mods/ITEMS/mcl_colorblocks/textures/mcl_colorblocks_glazed_terracotta_silver.png diff --git a/mods/ITEMS/mcl_colorblocks/init.lua b/mods/ITEMS/mcl_colorblocks/init.lua index bb7fecd7a..1d7e5e263 100644 --- a/mods/ITEMS/mcl_colorblocks/init.lua +++ b/mods/ITEMS/mcl_colorblocks/init.lua @@ -3,22 +3,22 @@ local init = os.clock() local block = {} block.dyes = { - {"white", "White", "white", true}, + {"white", "White", "white"}, {"grey", "Grey", "dark_grey"}, {"silver", "Light Grey", "grey"}, - {"black", "Black", "black", true}, + {"black", "Black", "black"}, {"red", "Red", "red"}, - {"yellow", "Yellow", "yellow", true}, + {"yellow", "Yellow", "yellow"}, {"green", "Green", "dark_green"}, - {"cyan", "Cyan", "cyan", true}, - {"blue", "Blue", "blue", true}, - {"magenta", "Magenta", "magenta", true}, - {"orange", "Orange", "orange", true}, - {"purple", "Purple", "violet", true}, - {"brown", "Brown", "brown", true}, - {"pink", "Pink", "pink", true}, - {"lime", "Lime", "green", true}, - {"light_blue", "Light Blue", "lightblue", true}, + {"cyan", "Cyan", "cyan"}, + {"blue", "Blue", "blue"}, + {"magenta", "Magenta", "magenta"}, + {"orange", "Orange", "orange"}, + {"purple", "Purple", "violet"}, + {"brown", "Brown", "brown"}, + {"pink", "Pink", "pink"}, + {"lime", "Lime", "green"}, + {"light_blue", "Light Blue", "lightblue"}, } local hc_desc = "Terracotta is a basic building material. It comes in many different colors." @@ -49,8 +49,6 @@ 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.." Terracotta", @@ -90,22 +88,20 @@ for _, row in ipairs(block.dyes) do _mcl_hardness = 1.8, }) - 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", - _doc_items_longdesc = gt_desc, - tiles = texes, - 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 = 7, - _mcl_hardness = 1.4, - }) - end + 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", + _doc_items_longdesc = gt_desc, + tiles = texes, + 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 = 7, + _mcl_hardness = 1.4, + }) -- Crafting recipes if craft_color_group then @@ -127,14 +123,12 @@ for _, row in ipairs(block.dyes) do } }) - if terracotta then - minetest.register_craft({ - type = "cooking", - output = "mcl_colorblocks:glazed_terracotta_"..name, - recipe = "mcl_colorblocks:hardened_clay_"..name, - cooktime = 10, - }) - end + minetest.register_craft({ + type = "cooking", + output = "mcl_colorblocks:glazed_terracotta_"..name, + recipe = "mcl_colorblocks:hardened_clay_"..name, + cooktime = 10, + }) end end diff --git a/mods/ITEMS/mcl_colorblocks/textures/mcl_colorblocks_glazed_terracotta_green.png b/mods/ITEMS/mcl_colorblocks/textures/mcl_colorblocks_glazed_terracotta_green.png new file mode 100644 index 0000000000000000000000000000000000000000..67bdfeb58d92510b04146262784e1fcae3223838 GIT binary patch literal 487 zcmV|_IShuxL2O=oNCn^A7@b>GMT-unSSWlvtNv(+>6)S3BY6c^MvdOrhr@K2Q7 zISwBHW~$ij@@bg_x1f|Ne49^sb1$+5MZuwNlE@08dG`5U=wk7|Fv4yAh&i1Qv0Qzp zxq3JXd_^YD&X%$vHRw4kmqx1sv6K_R55EA{TIn9^>y>|8k1)=Cfk zi3g7twe#<+2t6g{0rA{kUkX=pRGxjkz5VUN3*jT+hU3V|-N{}ZQHtFNla%l$`x+4z z9J#X1C=$CsKkd~WeiIQQU+-5Z5t}ctpia2ipTDtjqlK!f?Y0R&Y8!QdL7rPDM>nm6eq}Kt+)z&O-nI0YXVcK~#7F zRn39N6hR!u@n>rBdci*H-P9Ix3m_~6#2r6w4=@-2LM{TZTmeUiL%0AJ*hn-WL;!aH zS-AhGXKs`l;Q9E@3_w;Lc~|>aZx0#?T9S+4U-t?A2EiAb0~}LeOIw5x%HbU#sGb9? zLm-v{fNdGSY5VW^IUEF4m*FwokIhQbGD8Db+ORsJV+J2B>=xJAH5cG@Udk#9ZGCm_Vn3 z(o%OgxwQQY)Lw}m$?)WYP&y^Oo~=_r_?z^Ke)8Zp>05c?m$UGqaq0 ziZPxWXy+uuD9A~MUk(Q3q@T^&*;Aqia`OH{HjcPW&rYV9p&(YV^00000NkvXXu0mjfl^L@j literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_colorblocks/textures/mcl_colorblocks_glazed_terracotta_red.png b/mods/ITEMS/mcl_colorblocks/textures/mcl_colorblocks_glazed_terracotta_red.png new file mode 100644 index 0000000000000000000000000000000000000000..fd59d815cb6c53c13fc8013cef4d4e02ad6cb790 GIT binary patch literal 388 zcmV-~0ek+5P)d6V<=zrNP?gr9 z#LXFs1C9`qiuvgB1mj&2u0<_B5O-qy12iW8#yivLW*@hlgNo-uR_^ zhei%vFeVp2qs3JEnv%5mgq5b3`2n5Y`>uu$Oh4tWufcd>iKbUkR{Whc6cz}q_SkP|}n0bt%mnC%o0000i_@&97#k$RCobx%n7c;APj`zF)-Qcbjke>`;0MxKJ||jA^Fn)5J_32u!wN+ zRsz@nv9|+OkPJx9{f<3=$h6?(AZptL*g)yT!2^B+Ev-OR;l_yrFMDFb0uW>X8954) z@!0o$+qM8BCoZCLHwb6JWS^dv)UuOVbOhRsfMDp|D zbq(=l}o! literal 0 HcmV?d00001