diff --git a/mods/doors/init.lua b/mods/doors/init.lua index 0b187af2..be6260dc 100644 --- a/mods/doors/init.lua +++ b/mods/doors/init.lua @@ -505,22 +505,6 @@ doors.register("door_obsidian_glass", { } }) -doors.register("door_bar", { - tiles = {{name = "doors_door_bar.png", backface_culling = true}}, - description = "Steel Bar Door", - inventory_image = "doors_item_bar.png", - protected = true, - groups = {cracky = 1, level = 2}, - sounds = default.node_sound_metal_defaults(), - sound_open = "doors_steel_door_open", - sound_close = "doors_steel_door_close", - recipe = { - {"xpanes:bar_flat", "xpanes:bar_flat"}, - {"xpanes:bar_flat", "default:steel_ingot"}, - {"xpanes:bar_flat", "xpanes:bar_flat"}, - }, -}) - -- Capture mods using the old API as best as possible. function doors.register_door(name, def) if def.only_placer_can_open then @@ -716,18 +700,6 @@ doors.register_trapdoor("doors:trapdoor_steel", { groups = {cracky = 1, level = 2, door = 1}, }) -doors.register_trapdoor("doors:trapdoor_bar", { - description = "Steel Bar Trapdoor", - inventory_image = "doors_trapdoor_bar.png", - wield_image = "doors_trapdoor_bar.png", - tile_front = "doors_trapdoor_bar.png", - tile_side = "doors_trapdoor_bar_side.png", - sounds = default.node_sound_metal_defaults(), - sound_open = "doors_steel_door_open", - sound_close = "doors_steel_door_close", - groups = {cracky = 1, level = 2, door = 1}, -}) - minetest.register_craft({ output = "doors:trapdoor 2", recipe = { @@ -745,14 +717,6 @@ minetest.register_craft({ } }) -minetest.register_craft({ - output = 'doors:trapdoor_bar', - recipe = { - {"xpanes:bar_flat", "default:steel_ingot"}, - {"xpanes:bar_flat", "xpanes:bar_flat"}, - } -}) - ----fence gate---- function doors.register_fencegate(name, def) diff --git a/mods/doors/textures/doors_door_bar.png b/mods/doors/textures/doors_door_bar.png deleted file mode 100644 index 435af148..00000000 Binary files a/mods/doors/textures/doors_door_bar.png and /dev/null differ diff --git a/mods/doors/textures/doors_item_bar.png b/mods/doors/textures/doors_item_bar.png deleted file mode 100644 index d1ddaddd..00000000 Binary files a/mods/doors/textures/doors_item_bar.png and /dev/null differ diff --git a/mods/doors/textures/doors_trapdoor_bar.png b/mods/doors/textures/doors_trapdoor_bar.png deleted file mode 100644 index de4b4946..00000000 Binary files a/mods/doors/textures/doors_trapdoor_bar.png and /dev/null differ diff --git a/mods/xpanes/init.lua b/mods/xpanes/init.lua index 653c8cd9..ef7497e9 100644 --- a/mods/xpanes/init.lua +++ b/mods/xpanes/init.lua @@ -148,7 +148,7 @@ function xpanes.register_pane(name, def) end xpanes.register_pane("pane", { - description = "Glass Pane", + description = S("Glass Pane"), textures = {"default_glass.png","xpanes_pane_half.png","xpanes_edge.png"}, inventory_image = "default_glass.png", wield_image = "default_glass.png", @@ -161,7 +161,7 @@ xpanes.register_pane("pane", { }) xpanes.register_pane("obsidian_pane", { - description = "Obsidian Glass Pane", + description = S("Obsidian Glass Pane"), textures = {"default_obsidian_glass.png","xpanes_pane_half.png","xpanes_edge_obsidian.png"}, inventory_image = "default_obsidian_glass.png", wield_image = "default_obsidian_glass.png", @@ -174,7 +174,7 @@ xpanes.register_pane("obsidian_pane", { }) xpanes.register_pane("bar", { - description = "Steel Bars", + description = S("Steel Bars"), textures = {"xpanes_bar.png","xpanes_bar.png","xpanes_bar_top.png"}, inventory_image = "xpanes_bar.png", wield_image = "xpanes_bar.png", @@ -197,3 +197,41 @@ minetest.register_lbm({ end end }) + +-- Register steel bar doors and trapdoors + +doors.register("door_steel_bar", { + tiles = {{name = "doors_door_steel_bar.png", backface_culling = true}}, + description = S("Steel Bar Door"), + inventory_image = "doors_item_steel_bar.png", + protected = true, + groups = {cracky = 1, level = 2}, + sounds = default.node_sound_metal_defaults(), + sound_open = "doors_steel_door_open", + sound_close = "doors_steel_door_close", + recipe = { + {"xpanes:bar_flat", "xpanes:bar_flat"}, + {"xpanes:bar_flat", "xpanes:bar_flat"}, + {"xpanes:bar_flat", "xpanes:bar_flat"}, + }, +}) + +doors.register_trapdoor("doors:trapdoor_steel_bar", { + description = S("Steel Bar Trapdoor"), + inventory_image = "doors_trapdoor_steel_bar.png", + wield_image = "doors_trapdoor_steel_bar.png", + tile_front = "doors_trapdoor_steel_bar.png", + tile_side = "doors_trapdoor_steel_bar_side.png", + sounds = default.node_sound_metal_defaults(), + sound_open = "doors_steel_door_open", + sound_close = "doors_steel_door_close", + groups = {cracky = 1, level = 2, door = 1}, +}) + +minetest.register_craft({ + output = "doors:trapdoor_steel_bar", + recipe = { + {"xpanes:bar_flat", "xpanes:bar_flat"}, + {"xpanes:bar_flat", "xpanes:bar_flat"}, + } +}) diff --git a/mods/xpanes/textures/doors_door_steel_bar.png b/mods/xpanes/textures/doors_door_steel_bar.png new file mode 100644 index 00000000..81965ca1 Binary files /dev/null and b/mods/xpanes/textures/doors_door_steel_bar.png differ diff --git a/mods/xpanes/textures/doors_item_steel_bar.png b/mods/xpanes/textures/doors_item_steel_bar.png new file mode 100644 index 00000000..005f6665 Binary files /dev/null and b/mods/xpanes/textures/doors_item_steel_bar.png differ diff --git a/mods/xpanes/textures/doors_trapdoor_steel_bar.png b/mods/xpanes/textures/doors_trapdoor_steel_bar.png new file mode 100644 index 00000000..5137283c Binary files /dev/null and b/mods/xpanes/textures/doors_trapdoor_steel_bar.png differ diff --git a/mods/doors/textures/doors_trapdoor_bar_side.png b/mods/xpanes/textures/doors_trapdoor_steel_bar_side.png similarity index 100% rename from mods/doors/textures/doors_trapdoor_bar_side.png rename to mods/xpanes/textures/doors_trapdoor_steel_bar_side.png