From d68ed483bce400c193f6532d07adacaf305645bc Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Mon, 24 Jul 2017 00:37:45 +0200 Subject: [PATCH] Add custom fence textures --- mods/ITEMS/mcl_fences/init.lua | 23 ++++++++++-------- .../textures/mcl_fences_fence_acacia.png | Bin 0 -> 197 bytes .../textures/mcl_fences_fence_big_oak.png | Bin 0 -> 189 bytes .../textures/mcl_fences_fence_birch.png | Bin 0 -> 205 bytes .../textures/mcl_fences_fence_gate_acacia.png | Bin 0 -> 192 bytes .../mcl_fences_fence_gate_big_oak.png | Bin 0 -> 189 bytes .../textures/mcl_fences_fence_gate_birch.png | Bin 0 -> 204 bytes .../textures/mcl_fences_fence_gate_jungle.png | Bin 0 -> 204 bytes .../textures/mcl_fences_fence_gate_mask.png | Bin 193 -> 112 bytes .../textures/mcl_fences_fence_gate_oak.png | Bin 0 -> 205 bytes .../textures/mcl_fences_fence_gate_spruce.png | Bin 0 -> 218 bytes .../textures/mcl_fences_fence_jungle.png | Bin 0 -> 205 bytes .../textures/mcl_fences_fence_mask.png | Bin 182 -> 111 bytes .../mcl_fences_fence_nether_brick.png | Bin 0 -> 183 bytes .../textures/mcl_fences_fence_oak.png | Bin 0 -> 206 bytes .../textures/mcl_fences_fence_spruce.png | Bin 0 -> 218 bytes tools/Texture_Conversion_Table.csv | 15 ++++++++++++ 17 files changed, 28 insertions(+), 10 deletions(-) create mode 100644 mods/ITEMS/mcl_fences/textures/mcl_fences_fence_acacia.png create mode 100644 mods/ITEMS/mcl_fences/textures/mcl_fences_fence_big_oak.png create mode 100644 mods/ITEMS/mcl_fences/textures/mcl_fences_fence_birch.png create mode 100644 mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_acacia.png create mode 100644 mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_big_oak.png create mode 100644 mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_birch.png create mode 100644 mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_jungle.png create mode 100644 mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_oak.png create mode 100644 mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_spruce.png create mode 100644 mods/ITEMS/mcl_fences/textures/mcl_fences_fence_jungle.png create mode 100644 mods/ITEMS/mcl_fences/textures/mcl_fences_fence_nether_brick.png create mode 100644 mods/ITEMS/mcl_fences/textures/mcl_fences_fence_oak.png create mode 100644 mods/ITEMS/mcl_fences/textures/mcl_fences_fence_spruce.png diff --git a/mods/ITEMS/mcl_fences/init.lua b/mods/ITEMS/mcl_fences/init.lua index e8ec01b788..a081f3eeb3 100644 --- a/mods/ITEMS/mcl_fences/init.lua +++ b/mods/ITEMS/mcl_fences/init.lua @@ -230,9 +230,12 @@ mcl_fences.register_fence_gate = function(id, fence_gate_name, texture, groups, return gate_id, open_gate_id end -mcl_fences.register_fence_and_fence_gate = function(id, fence_name, fence_gate_name, texture, groups, hardness, blast_resistance, connects_to, sounds, sound_open, sound_close, sound_gain_open, sound_gain_close) - local fence_id = mcl_fences.register_fence(id, fence_name, texture, groups, hardness, blast_resistance, connects_to, sounds) - local gate_id, open_gate_id = mcl_fences.register_fence_gate(id, fence_gate_name, texture, groups, hardness, blast_resistance, sounds, sound_open, sound_close, sound_gain_open, sound_gain_close) +mcl_fences.register_fence_and_fence_gate = function(id, fence_name, fence_gate_name, texture_fence, groups, hardness, blast_resistance, connects_to, sounds, sound_open, sound_close, sound_gain_open, sound_gain_close, texture_fence_gate) + if texture_fence_gate == nil then + texture_fence_gate = texture_fence + end + local fence_id = mcl_fences.register_fence(id, fence_name, texture_fence, groups, hardness, blast_resistance, connects_to, sounds) + local gate_id, open_gate_id = mcl_fences.register_fence_gate(id, fence_gate_name, texture_fence_gate, groups, hardness, blast_resistance, sounds, sound_open, sound_close, sound_gain_open, sound_gain_close) return fence_id, gate_id, open_gate_id end @@ -241,12 +244,12 @@ local wood_connect = {"group:fence_wood"} local wood_sounds = mcl_sounds.node_sound_wood_defaults() local woods = { - {"", "Oak Fence", "Oak Fence Gate", "default_wood.png", "mcl_core:wood"}, - {"spruce", "Spruce Fence", "Spruce Fence Gate", "mcl_core_planks_spruce.png", "mcl_core:sprucewood"}, - {"birch", "Birch Fence", "Birch Fence Gate", "mcl_core_planks_birch.png", "mcl_core:birchwood"}, - {"jungle", "Jungle Fence", "Jungle Fence Gate", "default_junglewood.png", "mcl_core:junglewood"}, - {"dark_oak", "Dark Oak Fence", "Dark Oak Fence Gate", "mcl_core_planks_big_oak.png", "mcl_core:darkwood"}, - {"acacia", "Acacia Fence", "Acacia Fence Gate", "default_acacia_wood.png", "mcl_core:acaciawood"}, + {"", "Oak Fence", "Oak Fence Gate", "mcl_fences_fence_oak.png", "mcl_fences_fence_gate_oak.png", "mcl_core:wood"}, + {"spruce", "Spruce Fence", "Spruce Fence Gate", "mcl_fences_fence_spruce.png", "mcl_fences_fence_gate_spruce.png", "mcl_core:sprucewood"}, + {"birch", "Birch Fence", "Birch Fence Gate", "mcl_fences_fence_birch.png", "mcl_fences_fence_gate_birch.png", "mcl_core:birchwood"}, + {"jungle", "Jungle Fence", "Jungle Fence Gate", "mcl_fences_fence_jungle.png", "mcl_fences_fence_gate_jungle.png", "mcl_core:junglewood"}, + {"dark_oak", "Dark Oak Fence", "Dark Oak Fence Gate", "mcl_fences_fence_big_oak.png", "mcl_fences_fence_gate_big_oak.png", "mcl_core:darkwood"}, + {"acacia", "Acacia Fence", "Acacia Fence Gate", "mcl_fences_fence_acacia.png", "mcl_fences_fence_gate_acacia.png", "mcl_core:acaciawood"}, } for w=1, #woods do @@ -279,7 +282,7 @@ end -- Nether Brick Fence (without fence gate!) -mcl_fences.register_fence("nether_brick_fence", "Nether Brick Fence", "mcl_nether_nether_brick.png", {pickaxey=1, deco_block=1, fence_nether_brick=1}, 2, 30, {"group:fence_nether_brick"}, mcl_sounds.node_sound_stone_defaults()) +mcl_fences.register_fence("nether_brick_fence", "Nether Brick Fence", "mcl_fences_fence_nether_brick.png", {pickaxey=1, deco_block=1, fence_nether_brick=1}, 2, 30, {"group:fence_nether_brick"}, mcl_sounds.node_sound_stone_defaults()) minetest.register_craft({ output = 'mcl_fences:nether_brick_fence 6', diff --git a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_acacia.png b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_acacia.png new file mode 100644 index 0000000000000000000000000000000000000000..85dae567fe1d843897e1ad54566061b30873fd0b GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VWotf^ov@~dYTVjik(X?pW zQYUTI#p&08vU#2^jv*C{GQLL{k1B|GH!}W8VE7Vua)15lf7(~)Wiv(0`5wl5E$ilN zNspKH2(&fP@^dn? z>RGfLD3$5y;uuoFDC>Ka@u-4`cO&Dk1conhC->K%{-=F)UN%$2obO@0*RpQTmh_k^ zJ8#0j+T|^koA%w@Dl~K76?UOZ-%oX1yR`l&*QDg>^VY9c`1ssp&U0>#`wvwfHobVq mrEuNuuE>O6CF_4EOjeKEB;2Jm!&wVxDTAl0pUXO@geCxIph^n> literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_birch.png b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_birch.png new file mode 100644 index 0000000000000000000000000000000000000000..96121e1281a75652850bc58d0198b8b2bc3b69c1 GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZon0HZsx4zv&G!(MPWaF_a`h|!`;C1 zSE$(`X~uL7rqFZjyM&*Z%X%$Zuk!Yh$Xl8F$EF8M+}~&DQB(6sAYu8l<}J6Mwrkae zJ>9jLJLCRNHBLd#t^6}`S30FL%v?2FYiUoud_A9pxWx^ov+_Xe89ZJ6T-G@yGywoA CcucYY literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_acacia.png b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_acacia.png new file mode 100644 index 0000000000000000000000000000000000000000..e18dc9cc2f5faaf81b88d140c544f6763b4b9850 GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VWZSgVM-j=wuG-zhJ+q7ug zQYY=5z4MKMvYDPPjv*C{qTcL`Ee1S$KCta#X;EmOPP(zWGe6H?AW(wvek+ zwp()Nusf$Gx8H_2r(d!EUt}+Mea*+9-VM(Msx=JslKzPAnbl@q%6yLbt4en9&&IBo zGhc79tIG*fzr=s_hScZczopr0QC7! ANB{r; literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_jungle.png b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_jungle.png new file mode 100644 index 0000000000000000000000000000000000000000..5ce39690c764480ebfdc89c2f3da486eb252c4fb GIT binary patch literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZjkVJ2&hl%Hb1e(8OLjEK z^RWsx*7lq7XCqKSk*AAeNCl&)_wlK%20Sw54?fh0H!*djCoy(^^X2{$e`xwtQ%1+# zc1!LYcIWiu_S-P$^eguNi|hrjulX3%yWzP&wT6LS(jW0Xv)ar{na?qQRmm>?+1T}R z=IbqXbva?`m-w&VkosJFyfX5yLUQ(v@1C#a#cL!4mTy^{544@Z)78&qol`;+0EiDv A^Z)<= literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_mask.png b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_mask.png index bea12a69a70f2a6ee49b25f1c5f30521b9f00198..eeefdf7045f4850be67c99787b7c91e3206d9e25 100644 GIT binary patch delta 94 zcmX@eSTI2%f{~elfkD+aR|!b51^9%x{s)4(y0_8qF91atOM?7@862M7NCR>tJY5_^ tDj1U={6E0JUc(x|!mM!f|Nn`C4BNKy<`-Vw6%16v;OXk;vd$@?2>{AxAcp_| delta 176 zcmXRo$T&fwo`a2nfkFQB|3o0gSRCZ;#IWw1%u67LEy>&61xN$IPv_nBK#H@#BeIx* zfm;}a85w5HkpK#^mw5WRvOi=LWaeT1{Q0&LP{`5K#WBR77|LvK%R;+gyc3|%9 z?Ku(S#>4Ev;=?1t)Ww@{P{5Ioc}Bg~#!g--eV*SD3Rcg SZD~N$7(8A5T-G@yGywoEPcljX diff --git a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_oak.png b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_oak.png new file mode 100644 index 0000000000000000000000000000000000000000..348c8b24f623216b923cd50691aebb48d708abeb GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZjdU}gSP)bb?^77&;%8@& zT=_!V(tG6@#?hknW z!TbKx9v1tCm!NUeTEC-U=c@EpNu4Fj6J&94S;@#Uf z|GWiScCf35zI9rYsJ>HyQ+vj>M3X=N?=>C2)_vc_=1WA^zyGYK7HYg_)#p5`9l{&u z|3rM|$46%ydfvS#HkWJjEOwW2`Lp%K{@w4}FFO3nUikc!wMdhel?X%8Kgo?Z^!6J7 PUBTe#>gTe~DWM4fBrQ=Y literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_jungle.png b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_jungle.png new file mode 100644 index 0000000000000000000000000000000000000000..dbc5684ac7486d750ab5162f1153e0b4a2d1eea3 GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZEeo-0j&tqK@{6_7%k!~H zb~Fe!)}EHMOBSf0*we)^q=He@d%I|J0FO;j|AU=v@@fvu7IU)~h5h*5pRjNZcLUE~ zp=O7q8PheGLeH`95`JPX>$PaT%G*aGZ)NTun;tB2f1ja8P0b^Lgyqkgx7>c(u2mQI zbk}C?jQcy)I0Zeo^3TX!>6FeebJc9Er9Jub^?VZI7B`sA$^)%u@O1TaS?83{1OUD= BNRa>l literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_mask.png b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_mask.png index 73edee2ba53417c6dce279dadc836e61ba911589..dfa9b34d9240437e387a0654652c078353446e53 100644 GIT binary patch delta 93 zcmdnSm_I=xoROJ|iF$%q)=Dp&-DJaFv&61xN$IPv_nBK#H@#BeIx* zfm;}a85w5HkpK#^mw5WRvOi=LWahSdy#44~ppcoTi(`nz>Eu8E|JyTjtyu3a?7-aH z+jAnujfdHT#fL|Psf#z^pn#$w58FL??!_AoB=#8a@GvmsoEMU8aGGWTG=jm?)z4*} HQ$iB}|F$gK diff --git a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_nether_brick.png b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_nether_brick.png new file mode 100644 index 0000000000000000000000000000000000000000..e924f8389ce99f7a7c6eca2a1fcec5f5347d33d6 GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?bwK6tVRnl;=w+{&nkQ0~M zduqx>pj5J_i(^OyqiA;{ud5;lbD)^Of2JsLhM5o4-`HQ?tg>^$7r$FCy!Bhey&f%j z?b#8!a~iMV<`?`${%-ZwTkm?>P4-DSQxj_Z`Q)lq*Y-%BxxW77vTY?j6YlQP-oV=M f`nG0!*kAkDr@Y3CE(sk2TF2n&>gTe~DWM4f(Ro8F literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_oak.png b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_oak.png new file mode 100644 index 0000000000000000000000000000000000000000..6c48e53e81a2e93df47b2ae8e9bf829bd71303a3 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZEevz1iT9aU5ESWV?q_F^ zIJ13nzKq8*Ppkdkk|IAOPy5v5 zzu?!B7@@L`8SfdNn5MC_E}0>_I#*LK^H5`^ULJ!=tT?CM!Yful`x!i4{an^LB{Ts5 DiYQD_ literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_spruce.png b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_spruce.png new file mode 100644 index 0000000000000000000000000000000000000000..2ee52abf64782535b635cc3a6f6655ff6a59cc41 GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa4)6(a4RQ)S4zxG& zw$}4;vNko)vC&t1+q=~ZsI1D<#WAFUk;ikZ=wSm9o8b4G1cUcmnbq3PTKmX7O@67H z>Tz7_Ou;GNtoA<)ziP8o8&h($AN<^Xgw2_4$qkP~^-rJ59_ka7eajGgL1K54vW!2_ O6%3xPelF{r5}E*GUr;vy literal 0 HcmV?d00001 diff --git a/tools/Texture_Conversion_Table.csv b/tools/Texture_Conversion_Table.csv index 401f0043c5..5a48235cb8 100644 --- a/tools/Texture_Conversion_Table.csv +++ b/tools/Texture_Conversion_Table.csv @@ -817,3 +817,18 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt /assets/minecraft/textures/blocks,melon_stem_connected.png,/mods/ITEMS/mcl_farming/textures,mcl_farming_melon_stem_connected.png,,,,,, /assets/minecraft/textures/blocks,pumpkin_stem_disconnected.png,/mods/ITEMS/mcl_farming/textures,mcl_farming_pumpkin_stem_disconnected.png,,,,,, /assets/minecraft/textures/blocks,melon_stem_disconnected.png,/mods/ITEMS/mcl_farming/textures,mcl_farming_melon_stem_disconnected.png,,,,,, +/assets/minecraft/textures/blocks,fence_acacia.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_acacia.png,,,,,, +/assets/minecraft/textures/blocks,fence_big_oak.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_big_oak.png,,,,,, +/assets/minecraft/textures/blocks,fence_birch.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_birch.png,,,,,, +/assets/minecraft/textures/blocks,fence_gate_acacia.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_gate_acacia.png,,,,,, +/assets/minecraft/textures/blocks,fence_gate_big_oak.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_gate_big_oak.png,,,,,, +/assets/minecraft/textures/blocks,fence_gate_birch.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_gate_birch.png,,,,,, +/assets/minecraft/textures/blocks,fence_gate_jungle.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_gate_jungle.png,,,,,, +/assets/minecraft/textures/blocks,fence_gate_mask.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_gate_mask.png,,,,,, +/assets/minecraft/textures/blocks,fence_gate_oak.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_gate_oak.png,,,,,, +/assets/minecraft/textures/blocks,fence_gate_spruce.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_gate_spruce.png,,,,,, +/assets/minecraft/textures/blocks,fence_jungle.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_jungle.png,,,,,, +/assets/minecraft/textures/blocks,fence_mask.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_mask.png,,,,,, +/assets/minecraft/textures/blocks,fence_nether_brick.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_nether_brick.png,,,,,, +/assets/minecraft/textures/blocks,fence_oak.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_oak.png,,,,,, +/assets/minecraft/textures/blocks,fence_spruce.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_spruce.png,,,,,,