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 b1dc4790..aa3cfaff 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 9d04d5d9..919de743 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!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z)k44ofy`glX=O&z|iOE z;uvCa`t4*zu9g51*Yo1yADTNn)n@r9seNVP&rm R7#J8BJYD@<);T3K0RT->Q&<21 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!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z>w+RiKOP{zn` YU0rL{>9Xof1_lNOPgg&ebxsLQ0O@u<0ssI2 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!ia0y~yU=RRd4kiW$h6xih%orFL7>k44ofy`glX=O&z_7;C z#W6(V{M$*p1rHeru=+n2_UOn@kSfS7aZ)vL<(+VVVOmb)zDgFAB`hpwHvBx7v*Fo> z`$r`@Gj!Ih+N^L!=FO9u%R9!j1O$0vsJe}t*{XkWDw*$xLV8DUT$K?p7~uK zUbW{W9WGy)6m;9fG~v)4qvFs|@8^sR8SOqU-=p8h*!DSlos>}iTK3uNlx;|R6) vswZ`n#Ih&sE4UW5jQ=OMy;e>AKK04J`;L}A`!2}9z`)??>gTe~DWM4f$Cq5S 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!ia0y~yU=RRd4kiW$h6xih%orFL7>k44ofy`glX=O&z>wzY z;uxZFK6#7j#iRrf5P0%9@c{3=`d>_m8w?B#PIPoTS=_lZN8s4?_4oJJ{pU;U?&LUl za`tyQ!%6wfn?4ql7C0ITE?ghK-@fwatjk44ofy`glX=O&z_8xa z#WBR<^xeshd`$)duJacv1$lTRPp@J){~*$4PhO9NQ0m6}XpBAOQUm`SJ+32fVSo=6xOG--W=;$ab zE1Q~{GB7aY1$)OcFfdqox;TbNTt0hVQLMp$hvlN8@9AZc@9JY&gjx@u`WME)m@O1TaS?83{1OTd)H)H?+ literal 0 HcmV?d00001 diff --git a/tools/Conversion_Table.csv b/tools/Conversion_Table.csv index 35973954..0e5305a0 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,,,,,,,