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 e8ec01b78..a081f3eeb 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 zcmV;$06PDPP) z3kcugB*DzOy8_6yPd5dmKHaNxp`oF|jz9tcVn`HLZREf300000NkvXXu0mjf!kQ*|idxzSIX2()Y@U*3z%V3X)@&p0BGQ@#i$0=L-nm r;UwXL=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 zcmV;u07CzXP) rlRBt|B@X=jac(-0-ts@N$sh~>B*zc;pD9a?w4-kT0000b%7a!Eu%RCoauOUIRkFbo`b;P8AGf&z$VVgZZx zO$+p2!k3jb0YSSyq};9a?w4-kT0000KA_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 zcmV;;05boHP)BN;=gK=2f+{)`0CN5r UvDhxZFaQ7m07*qoM6N<$f+Q_bDgXcg 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!ia0y~yU=RRd7G?$phPQVgfdoVYd_r8yLhPF3T)VUUVy*P@ ze5{fk4T6oerzP!@Wnf?^_H=O!sbCcK-Y(i4z+)5C|6pgEyqW{E#oX*gVLyKNCoEjU z-N5r#sM#TD#&iv)&~xm&grAtpdM#S7^7fI)TbcXErUy&h-)HDiQ}ak5VfnM>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 zcmV-j0HXi40dJ5PR{;Y6001RDZ6W{w00vM@R7L;)|Nnk|?OX5A00001bW%=J06^y0 zW&i*H7fD1xRCobn;Qzn?13)$t0|O9Yh#(LEVATT*$xKo|00000NkvXXu0mjfRYe?Z 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 zcmV;o07(CdP)_5}9B)O3E zPTJ^8FN7CL;-u?Ih*i0k4KcIm4{}dNe>=6^Nj{TIWXyb3GxN!+s@A+2%-65UrnYp9 lklnf~umynY+bM@u{Xbph4Kt$B62<@k002ovPDHLkV1m(kLn{CP 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 zcmV;<05SiGP)sKaDK2TkfoU#o03=-(2`-`3IsgCw07*qo IM6N<$f{G|iPyhe` 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 zcmV<0044v4P)p zOgm#$N<=p+Q9m+EJ1$H@J2fyYJTE5gjkQVu004SPL_t(|0SrmC6~izTJX7zpUuugc z@E;&_se?)%(*7ev9}WRd;~G4{;N2QXn91ER+@Vt9%_NKsE<>ej1jujp40A0`+ UyMiMePXGV_07*qoM6N<$f@5D$Hvj+t literal 0 HcmV?d00001 diff --git a/tools/Texture_Conversion_Table.csv b/tools/Texture_Conversion_Table.csv index 401f0043c..5a48235cb 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,,,,,,