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 000000000..97a5904c4 Binary files /dev/null and b/mods/ITEMS/mcl_doors/textures/doors_trapdoor_side.png differ 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 000000000..109829f5b Binary files /dev/null and b/mods/ITEMS/mcl_doors/textures/doors_trapdoor_steel_side.png differ 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 000000000..e63f839e2 Binary files /dev/null and b/mods/ITEMS/mcl_doors/textures/mcl_doors_trapdoor_acacia_side.png differ 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 000000000..040eaaec6 Binary files /dev/null and b/mods/ITEMS/mcl_doors/textures/mcl_doors_trapdoor_birch_side.png differ 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 000000000..d344c6352 Binary files /dev/null and b/mods/ITEMS/mcl_doors/textures/mcl_doors_trapdoor_dark_oak_side.png differ 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 000000000..cc7cbafac Binary files /dev/null and b/mods/ITEMS/mcl_doors/textures/mcl_doors_trapdoor_jungle_side.png differ 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 000000000..d05d717ca Binary files /dev/null and b/mods/ITEMS/mcl_doors/textures/mcl_doors_trapdoor_spruce_side.png differ 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,,,,,,,