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 bb7fecd7..1d7e5e26 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 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I7G?$phQ^Te;|vT81_3@Hu4(ng7p`4Deg0za z@<`V(MbBuJoT*AhvsJ2AsKwQYrFDoWHj4QtsfA={lrB*9ic!w}v3V{717ne=i(^Oy zV`!gYhp?kaoBR#&%`dy>imH^ItZ>Sj+?;$-=?52Q%+Bb{O5@hOmfP-}IaC~cbLG;j zAKs)e7q#D=y3sd1`}OR=ypN^#kN>~-o6#ZFKW^RTtHz(N%>0=mB7ViP%AUF6ga4E} zmVELIX{&C${ggSAW&46DS~au%D~t6vvAP~ym^bMJ*P_aAKjU5`ecW$wDED87xT>8$H*J%m=?hDp>29l;Hck;f$iJWAdelqfPpRqB^(%B<#Jt@8V&j__ zi!0Z>`2TjY_ls}+{C*9Gt?Dzzk9XqYxx$M==GE@q`}gf3?uW_`+8&=cdG}%I#sQ;D{6qDJx>8ys(ZU_6fS7qyj1(o98hpP+D*59zeZ^zB~`!^OYZe6wN?KV#P zEa_I2HKozdYM;E)Q`>gC&2q^k_nyu#W-|YZd{iF3ju1NDGG_w6(WS?Q^MyV(^Q=q! uG_gZ3`Q+?<@7pEMa3%W)xux0tWZu*I_Tt$*Em;Nz1_n=8KbLh*2~7YzquoXT literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_colorblocks/textures/mcl_colorblocks_glazed_terracotta_grey.png b/mods/ITEMS/mcl_colorblocks/textures/mcl_colorblocks_glazed_terracotta_grey.png new file mode 100644 index 0000000000000000000000000000000000000000..55418fb5c4195024fef543b34cca05275a350d31 GIT binary patch literal 433 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I7G?$phQ^Te;|vT8S^+*GuI~OpW|p=yXU?2E zcW!h}p|P1|U{qW}QF%&PwO3H6vzMQ%Z@|>4Q*9kwC#s!uW?*1+@^o8LUy19KJNe;BQ-GD~-g#?-9e&LI()EN(Ht?N}>b3lp#cFwHf|M#b z9X1$mo>S9hI8Qp`xyoUU6P|7Hd~8pa%s+eUX7D2RqEG*v%=&itUf`ZLQN}YtBqzJx mp1tYz-T#b51@HYoNH5cDGCP0q`V|HS1_n=8KbLh*2~7Z%8M7b& 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 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I7G?$phQ^Te;|vT8asfUeu6+s$GnJG!=&4-{ z3pnTPvO-&BhrW8Zy!>e=tFsep!e%kdWnf@b^mK6ysbEZMV0LquUwme=pMVQv%|F)q zsEhguYI+;@b5FchJ!z@(>@%&GIC3)9uGy<|Br50K?O$pM3S#^6>MMU6MJccR$5<5m zxO0J#L4RyRRTJ|k$&!!#4S%E+_#V&UJgj`jOKQEqXVxv+4VxswL_J-$HJskOXYaj` zmjA3D_Wa(uxQn4=73)W@8593k@TBcb$lq2Fz1TRdSMvPQ0ws%_i+cikgj=586LJWc zdTrs6vyxrReFBrZe!lp`@;Fv#ovW_BKzY(1W)pRXDF?U=Hn+TBc)8|o(k8{v2JP($ zx%Yl7t!{VYi#1Raw_kiTLbCMblMF85kHCJYD@<);T3K0RXf>q*MR^ literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_colorblocks/textures/mcl_colorblocks_glazed_terracotta_silver.png b/mods/ITEMS/mcl_colorblocks/textures/mcl_colorblocks_glazed_terracotta_silver.png new file mode 100644 index 0000000000000000000000000000000000000000..e74f8ec90e7b016d056f12b342917d04b5078108 GIT binary patch literal 410 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2tGECYN(TxZUldFH~U@XY+H zH*Ow0b|RsuTx`x9u>}j<{euF+qr_LN@C^wsZE2f0abk3Cab$L(=**e%g=Hd>Cf$E{ z{WSvvql~AEV@L&K?itQ?hZT5Q9vT|ld{uJtFaPfz!$!NW{UVA#FEa>uMlRXVQSdR0 z=?25b?aW~lcs$Pi?Xzt-vE{)Ng{<2wHymCbImlecth?4B^x?5iX8r1#Nfxd+QQ-!|=NzdB)Jw8aA}=81DcUE3b) zs$o_awwT7MTJ)gBcL5jkdGYuqQLavNm}S`dOoQe+axlLZ+I#<3vXX-UZ-A9R6SI#~ zUZcyW&ksv^Kk_Pl%35$mV1d1?S>ejkc^aY)!9@=q7F%lE{Pfi|6GUH`vc?=Z#lV{L{g} Pz`)??>gTe~DWM4fAgZY7 literal 0 HcmV?d00001