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 e8ec01b7..a081f3ee 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!ia0y~yU=RRd7G?$phPQVgfdqsCd_r7jrn@aI4cgw8*y3X} zE!wu!Nn3Ss`ZWdyhCELf$B+s}8Q-IfM-@c88ySBkFnozSxxfDOKkcjYvY8_0d=KNj zmUVNsq{md*c@zHCE^n#awD0Ctp_%)xunS%KeyZczrS(U-CM8dww|=$4$LA(Vvo5i_ySjMc!i9(W9GDoAJVe5BpX~p@z`(%Z>FVdQ&MBb@0K%V7 Ay8r+H literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_big_oak.png b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_big_oak.png new file mode 100644 index 0000000000000000000000000000000000000000..de8648e8e632fcc6a2394ea10ea688f909229ba0 GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdu#id_r6!z3o%NJn|9(ZB4ZN zoXo6x7AhWMll$vW|I@xYFPkZ1&i63hYgspE zOL|O|oj2iM?edn&P5W+c6`Hy43cJvy@25JhU0Q#XYf|#`dFxjze0**)=Q%gW{f8gTe~DWM4fXP`<8 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!ia0y~yU=RRd7G?$phPQVgfdoVYd_r7j*T$`C%h=eTR~h9q zsW`efFC^Q?;mE#&w;321ialK%Ln;_Wy|;@t2k_Vg^*`9zCa>neY%w=`QP_{){Rs=# za5wP$6>4@!nlW92DfArsF5xHUvR;eUtGsb^lvFX7Q_xBlk)YLo@NLc=?dCTpm z?OJtVPj_wR&bYr*jZ@HbEB}n#l}_mlGgr;lTH2E@U(Y8YZgGR@tULn)1B0ilpUXO@ GgeCwgcucYY 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!ia0y~yU=RRd7G?$phPQVgfdqsCd_r7Xe2liYB`z%unwjo4 zE!wu!NqcASd}9U%hD=Wv$B+s}QEzs}76YC=AJ}%Wv?w%aKHyAW_-|=R%5%0O*L;(1 z8MsZ$kYq~R*fo>!6^wEo;&=1_lNOPgg&ebxsLQ013rK#sB~S literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_big_oak.png b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_big_oak.png new file mode 100644 index 0000000000000000000000000000000000000000..f7c0eccd33833249ef0763e19e095fe5fff45ea6 GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdu#id_r7pO|>Ck6(FB2O2`kP1do@8eTj4R~bAAAG10Z({05Ph#x;=F9yh{?PQP zri_le?Uvj*?9S=Q?YCjh=~wLk7ugG5U-L1jcf)gmY7GOuq(9<&X0@4@GM{7qs*+v& zv$5;t%-37&>T<%=FY#Z!A@#ZVcxB{Yh2-oT-#uT;i`Pg9EZ?#?pMima!PC{xWt~$( F69Dx2Pe=d& 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!ia0y~yU=RRd7G?$phPQVgfdoVYd_r7ft@OIH{F>uj%R=mu z9S!n)tb&cT{igic$iTo*NsQg!e7V2GADTYZ zl+kgw-I6Yd!|`Zg?(Gtzn>-^hbQptTyvf=5x$nRkDkJ zHg>(7`Fe|8T~3(#CH|{7q&^oPuZ;Ywkeq$vyXR|p@frz%KA_1e|H^0yKVKCm$` XJa(55(l2aF16l9s>gTe~DWM4fE>AK_ 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!ia0y~yU=RRd7G?$phPQVgfdoVYd_r6!-OMKz1l7d*6o$F@ z*%>5xTRWL(-dz2zi-Ccm*we)^q=HfO^g-Tc1D@80?YkV9p5&cjQVD!-dWvD{>g`Ow z`vabT@V@`__@d)GpL}h3TDp0S^qa$He~CUYmz+^x?z=s!iTTlj12>QU6rPc`v4*7~ zDP?AOf=I}gAbpm5aaxiAchfT}-mZ;jESi7txbi=qpUmIX#TG1Y`|*;2fq}u()z4*} HQ$iB}-6m3E literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_spruce.png b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_spruce.png new file mode 100644 index 0000000000000000000000000000000000000000..5c8a0bb579fc1591ff7557e7a7cbc5c6f5844705 GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdr%jd_r7Z%(at4y^?*b!(B|g zt@Q%!jeMM}O$~Hx^ws8wKILFwV5stRaSW+o6ghre@UQ_7%YkHep2PO6D;bV%Phym- zc=z_rKW~AS9qj6%Z=Kd8s_#_b)ShuI(d5tndril$b>DZf`4Z9f??3CQg&OZ!^*PUK zhw#SvKM|k#@zL3ao_8;b&E?uWi`}JM{%n1*fA{Ew`Vx zYt@B4-L;uJl 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=xoROJT*gqfKI5<3(G7!s~B^PKbvvS(mmVDNPHb6Mw<&;$TgMI3AZ delta 165 zcmd1b#yCNuo`a2nfkFQB|3n4`2FBtbcPEB*=VV?oFfgzsdAqwXfWc4a-SrF%44efX zk;M!Q+`=Ht$S`Y;1Oo#Ddx@v7EBix6L1u2N$J>v-Wnf@1^K@|xu{fRl=l_3uX08?M z-Gv>PdwY9M#JKS=d$9QMh%j~WCL9z{G~{8sC(pfjqk+U810Eg*hMe<4k_}GNEI@X8 My85}Sb4q9e0ROfu+W-In 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!ia0y~yU=RRd7G?$phPQVgfdu#id_r8UjEz;5G+gZMLjnWj z#HIG0nsSkWfg#z`#WAFUQM9{}*Hw{&IZ#aCKU0)A!^{WjZ|pB`R@ph>i{Gsm-uf-# zUXPZ%_Us7VIgQtF^9%kWf46$;t#>``Ci|qEsR=dyd~(&QYkMTmTwi~3*|w6N33qpC kZ(wbBeOt3V?5}<7Q(ogmmxPWnFfcH9y85}Sb4q9e0MU6vD*ylh 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!ia0y~yU=RRd7G?$phPQVgfdoVYd_r6c!(3|OeI^zJMY@^$ z*%>5xTRWL(`UFq-!N9;!;_2cTQo$(WYs%CdAi}-v^8q{t7+ z(>^u%FZi`2MyRY~#(TymrfKY~OJ>Nf&ehb*Jk*$}m&c$IE6%C6@QM`!0|SGntDnm{ Hr-UW|iYQD_ 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!ia0y~yU=RRd7G?$phPQVgfdr%jd_r8qT}+aFtdm2%T+Fot z?Tx&x^?aPHO$~Hx^wr+>ZuMedV5stRaSW+o_Lddn{#h@WEXvj~OTL8r)eJ^ysWg5AWltTZ8tU{~c5|!QlN?X0^7n);@Ai zlV9qldK}j}Q*g>RtNjndui7lt#*`fG2S0ZoVRL3%a>L_L{nMwihx$Zi-!jBrkl5X% TEaT6>z`)??>gTe~DWM4fV_#4= literal 0 HcmV?d00001 diff --git a/tools/Texture_Conversion_Table.csv b/tools/Texture_Conversion_Table.csv index 401f0043..5a48235c 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,,,,,,