From 85442e7ce553070149b9444b9418a3346ebc4eed Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 8 Dec 2017 13:38:38 +0100 Subject: [PATCH] Draw proper trapdoor side textures --- mods/ITEMS/mcl_doors/api_trapdoors.lua | 4 ++-- mods/ITEMS/mcl_doors/register.lua | 20 +++++++++--------- .../textures/doors_trapdoor_side.png | Bin 0 -> 191 bytes .../textures/doors_trapdoor_steel_side.png | Bin 0 -> 212 bytes .../mcl_doors_trapdoor_acacia_side.png | Bin 0 -> 171 bytes .../mcl_doors_trapdoor_birch_side.png | Bin 0 -> 242 bytes .../mcl_doors_trapdoor_dark_oak_side.png | Bin 0 -> 172 bytes .../mcl_doors_trapdoor_jungle_side.png | Bin 0 -> 245 bytes .../mcl_doors_trapdoor_spruce_side.png | Bin 0 -> 197 bytes tools/Conversion_Table.csv | 2 ++ 10 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 mods/ITEMS/mcl_doors/textures/doors_trapdoor_side.png create mode 100644 mods/ITEMS/mcl_doors/textures/doors_trapdoor_steel_side.png create mode 100644 mods/ITEMS/mcl_doors/textures/mcl_doors_trapdoor_acacia_side.png create mode 100644 mods/ITEMS/mcl_doors/textures/mcl_doors_trapdoor_birch_side.png create mode 100644 mods/ITEMS/mcl_doors/textures/mcl_doors_trapdoor_dark_oak_side.png create mode 100644 mods/ITEMS/mcl_doors/textures/mcl_doors_trapdoor_jungle_side.png create mode 100644 mods/ITEMS/mcl_doors/textures/mcl_doors_trapdoor_spruce_side.png diff --git a/mods/ITEMS/mcl_doors/api_trapdoors.lua b/mods/ITEMS/mcl_doors/api_trapdoors.lua index b1dc47900..aa3cfaffb 100644 --- a/mods/ITEMS/mcl_doors/api_trapdoors.lua +++ b/mods/ITEMS/mcl_doors/api_trapdoors.lua @@ -82,8 +82,8 @@ function mcl_doors:register_trapdoor(name, def) local tiles_closed = { tile_front, tile_front .. "^[transformFY", - tile_side .. "^[transform6", tile_side .. "^[transform6", - tile_side .. "^[transform6", tile_side .. "^[transform6", + tile_side, tile_side, + tile_side, tile_side, } local groups_closed = groups diff --git a/mods/ITEMS/mcl_doors/register.lua b/mods/ITEMS/mcl_doors/register.lua index 9d04d5d94..919de7436 100644 --- a/mods/ITEMS/mcl_doors/register.lua +++ b/mods/ITEMS/mcl_doors/register.lua @@ -204,12 +204,12 @@ minetest.register_craft({ --[[ Trapdoors ]] local woods = { -- id, desc, texture, craftitem - { "trapdoor", "Oak Trapdoor", "doors_trapdoor.png", "mcl_core:wood" }, - { "acacia_trapdoor", "Acacia Trapdoor", "mcl_doors_trapdoor_acacia.png", "mcl_core:acaciawood" }, - { "birch_trapdoor", "Birch Trapdoor", "mcl_doors_trapdoor_birch.png", "mcl_core:birchwood" }, - { "spruce_trapdoor", "Spruce Trapdoor", "mcl_doors_trapdoor_spruce.png", "mcl_core:sprucewood" }, - { "dark_oak_trapdoor", "Dark Oak Trapdoor", "mcl_doors_trapdoor_dark_oak.png", "mcl_core:darkwood" }, - { "jungle_trapdoor", "Jungle Trapdoor", "mcl_doors_trapdoor_jungle.png", "mcl_core:junglewood" }, + { "trapdoor", "Oak Trapdoor", "doors_trapdoor.png", "doors_trapdoor_side.png", "mcl_core:wood" }, + { "acacia_trapdoor", "Acacia Trapdoor", "mcl_doors_trapdoor_acacia.png", "mcl_doors_trapdoor_acacia_side.png", "mcl_core:acaciawood" }, + { "birch_trapdoor", "Birch Trapdoor", "mcl_doors_trapdoor_birch.png", "mcl_doors_trapdoor_birch_side.png", "mcl_core:birchwood" }, + { "spruce_trapdoor", "Spruce Trapdoor", "mcl_doors_trapdoor_spruce.png", "mcl_doors_trapdoor_spruce_side.png", "mcl_core:sprucewood" }, + { "dark_oak_trapdoor", "Dark Oak Trapdoor", "mcl_doors_trapdoor_dark_oak.png", "mcl_doors_trapdoor_dark_oak_side.png", "mcl_core:darkwood" }, + { "jungle_trapdoor", "Jungle Trapdoor", "mcl_doors_trapdoor_jungle.png", "mcl_doors_trapdoor_jungle_side.png", "mcl_core:junglewood" }, } for w=1, #woods do @@ -218,7 +218,7 @@ for w=1, #woods do _doc_items_longdesc = "Wooden trapdoors are horizontal barriers which can be opened and closed by hand or a redstone signal. They occupy the upper or lower part of a block, depending on how they have been placed. When open, they can be climbed like a ladder.", _doc_items_usagehelp = "To open or close the trapdoor, rightclick it or send a redstone signal to it.", tile_front = woods[w][3], - tile_side = woods[w][3], + tile_side = woods[w][4], wield_image = woods[w][3], groups = {handy=1,axey=1, mesecon_effector_on=1, material_wood=1}, _mcl_hardness = 3, @@ -229,8 +229,8 @@ for w=1, #woods do minetest.register_craft({ output = "mcl_doors:"..woods[w][1].." 2", recipe = { - {woods[w][4], woods[w][4], woods[w][4]}, - {woods[w][4], woods[w][4], woods[w][4]}, + {woods[w][5], woods[w][5], woods[w][5]}, + {woods[w][5], woods[w][5], woods[w][5]}, } }) @@ -245,7 +245,7 @@ mcl_doors:register_trapdoor("mcl_doors:iron_trapdoor", { description = "Iron Trapdoor", _doc_items_longdesc = "Iron trapdoors are horizontal barriers which can only be opened and closed by redstone signals, but not by hand. They occupy the upper or lower part of a block, depending on how they have been placed. When open, they can be climbed like a ladder.", tile_front = "doors_trapdoor_steel.png", - tile_side = "doors_trapdoor_steel.png", + tile_side = "doors_trapdoor_steel_side.png", wield_image = "doors_trapdoor_steel.png", groups = {pickaxey=1, mesecon_effector_on=1}, _mcl_hardness = 5, diff --git a/mods/ITEMS/mcl_doors/textures/doors_trapdoor_side.png b/mods/ITEMS/mcl_doors/textures/doors_trapdoor_side.png new file mode 100644 index 0000000000000000000000000000000000000000..97a5904c4703e2a4217a1bfb8b7c616656268c2c GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|Dm`5sLo7}w zuj%^u<2(bazI{!bq2v+Piib%CW=8VMragVyex8RvzCHm29z0D*|MBOsIx`S-N%ZhC z8|>S&f`Pev2ZMfBuG5}55_%V=h#r2+lrnkZ+%9jPW9=7xctn~4nca8~7(4(PRM4Z_ itoS+c6`P$gBSU~(?Dq3(PZk3m!QkoY=d#Wzp$P!8;zN7@ literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_doors/textures/doors_trapdoor_steel_side.png b/mods/ITEMS/mcl_doors/textures/doors_trapdoor_steel_side.png new file mode 100644 index 0000000000000000000000000000000000000000..109829f5b1bc4cebdf6457fac2bcf326704bd5f2 GIT binary patch literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|`aE46Lo80e zovg^!5+LGwUR?Y`bBCweEFUGc&n)7J^H?QgdpzydIq)P+I)1;o?cr$yg*H#-c_sHb zr$^7Ly8887M>4~+)PoQ2%q;iY>bv=)qd;56TE-d2J{B;9Jvs628+-DOCtPiDkiiD~5TYt)d6ly{--vnYctVjHO?GC-*xhhOht6Z((ly9e7xssc#R^WelFK KelF{r5}E)_Qd3v} literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_doors/textures/mcl_doors_trapdoor_acacia_side.png b/mods/ITEMS/mcl_doors/textures/mcl_doors_trapdoor_acacia_side.png new file mode 100644 index 0000000000000000000000000000000000000000..e63f839e2a0780adbb3ac0a949bfdd2cc1d99a10 GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|QaxQ9Lo7}w z=X^B$b>4xY=Fd0b*7N6&@}+O)_*i_{@{G-#2ws8IgoGczpIV1mPAiw+uN3)pYK`~@ z@6M#FIw~jnL;w7{YR&WBt}ZnpX@NkGltC7QS5RHMvgG~c)oD)Kd8Hl77#XgsYppt6 SR-Fm7kipZ{&t;ucLK6V#c0K|C literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_doors/textures/mcl_doors_trapdoor_birch_side.png b/mods/ITEMS/mcl_doors/textures/mcl_doors_trapdoor_birch_side.png new file mode 100644 index 0000000000000000000000000000000000000000..040eaaec61d99a76363d325f725452b8e2ea7909 GIT binary patch literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|)_A%&hG?9B zJ88GzAp-$c|L4LU9r+1T1=%G|swS?y6Amy;%Zc1q$)d7^h2_kKpXYKmJlk;ps6=Om z&YD%570$@Kc~X-Zp3T3&JIagkflYL_>b9p9HiCi-f}96eYZ=?iP3+h+zstj`_MD`{ z@u=-W?q>hqU p_Jn-}*P@p3|KzsUs;S?nKKXaw(b8w%1%d8n@O1TaS?83{1OUgET(tlI literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_doors/textures/mcl_doors_trapdoor_dark_oak_side.png b/mods/ITEMS/mcl_doors/textures/mcl_doors_trapdoor_dark_oak_side.png new file mode 100644 index 0000000000000000000000000000000000000000..d344c6352f5dd0827ebab4392c1b5ebaf9fcb698 GIT binary patch literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|(mY)pLp07O zZ!x`?lmG$(PaY>8;JsJ>iz#t~fq}t^j&3K5J9p*?9J{{${{FiEe2Lwi90yO%{w`-Y zDW7@M$AZ!VM?=Ad>*M#^SN@#U+2~@hDzP9VAu%DL;?pP7bxRoi1512r7;c2>yWMLM RpAWQ=!PC{xWt~$(69DkVKo9@` literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_doors/textures/mcl_doors_trapdoor_jungle_side.png b/mods/ITEMS/mcl_doors/textures/mcl_doors_trapdoor_jungle_side.png new file mode 100644 index 0000000000000000000000000000000000000000..cc7cbafacbf5409b5af4ddb34b4f827ded8af75c GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|)_b}*hFF}w zJK2%1$w0t${z9c750B*ORSf4JMB41h>ydD3a>zE=6~LjUcWmmhytK>zpZ%YCCS`Zz z{WTXETu#cIEPgK5uxCZ!wTw+Vzc~sjnATievFansLiPn&dpHDI`rT3^7tMLSBQEOG zqO_e+9Spzka%P*HD_t-6OKYa%|L~`-wmd3cUV;g0ezLRwm0EpFSSFS4*sR3fbEQ7c tDSU3T|dDVdww= literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_doors/textures/mcl_doors_trapdoor_spruce_side.png b/mods/ITEMS/mcl_doors/textures/mcl_doors_trapdoor_spruce_side.png new file mode 100644 index 0000000000000000000000000000000000000000..d05d717ca31356845f143adb6ecc2033133355f7 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~%K)DcS5pHW z8zb#t8*Nnu8Eb7h9eFW#6BQS8ZEtJ6Eak7arx|dMX?409+r!WzNeQ(zN?RA5o$er?swXQj)|7a&!d!?{I2E& oPwUmM=+=|FcmdKI;Vst0IHQYWB>pF literal 0 HcmV?d00001 diff --git a/tools/Conversion_Table.csv b/tools/Conversion_Table.csv index 359739548..0e5305a0b 100644 --- a/tools/Conversion_Table.csv +++ b/tools/Conversion_Table.csv @@ -292,7 +292,9 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted? /assets/minecraft/textures/blocks,door_wood_upper.png,/mods/ITEMS/mcl_doors/textures,mcl_doors_door_wood_upper.png,,,,,,, /assets/minecraft/textures/blocks,door_wood_upper.png,/mods/ITEMS/mcl_doors/textures,mcl_doors_door_wood_side_upper.png,,,,,,, /assets/minecraft/textures/blocks,trapdoor.png,/mods/ITEMS/mcl_doors/textures,doors_trapdoor.png,,,,,,, +/assets/minecraft/textures/blocks,trapdoor.png,/mods/ITEMS/mcl_doors/textures,doors_trapdoor_side.png,,,,,,, /assets/minecraft/textures/blocks,iron_trapdoor.png,/mods/ITEMS/mcl_doors/textures,doors_trapdoor_steel.png,,,,,,, +/assets/minecraft/textures/blocks,iron_trapdoor.png,/mods/ITEMS/mcl_doors/textures,doors_trapdoor_steel_side.png,,,,,,, /assets/minecraft/textures/items,door_acacia.png,/mods/ITEMS/mcl_doors/textures,mcl_doors_door_acacia.png,,,,,,, /assets/minecraft/textures/items,door_birch.png,/mods/ITEMS/mcl_doors/textures,mcl_doors_door_birch.png,,,,,,, /assets/minecraft/textures/items,door_dark_oak.png,/mods/ITEMS/mcl_doors/textures,mcl_doors_door_dark_oak.png,,,,,,,