From f043ddc311391ee0d404bde319ac06833f5e6738 Mon Sep 17 00:00:00 2001 From: TumeniNodes Date: Thu, 19 Sep 2019 18:28:34 -0400 Subject: [PATCH] switch to xpanes and rebase --- mods/doors/init.lua | 36 -------------- mods/doors/textures/doors_door_bar.png | Bin 605 -> 0 bytes mods/doors/textures/doors_item_bar.png | Bin 354 -> 0 bytes mods/doors/textures/doors_trapdoor_bar.png | Bin 261 -> 0 bytes mods/xpanes/init.lua | 44 ++++++++++++++++-- mods/xpanes/textures/doors_door_steel_bar.png | Bin 0 -> 520 bytes mods/xpanes/textures/doors_item_steel_bar.png | Bin 0 -> 293 bytes .../textures/doors_trapdoor_steel_bar.png | Bin 0 -> 243 bytes .../doors_trapdoor_steel_bar_side.png} | Bin 9 files changed, 41 insertions(+), 39 deletions(-) delete mode 100644 mods/doors/textures/doors_door_bar.png delete mode 100644 mods/doors/textures/doors_item_bar.png delete mode 100644 mods/doors/textures/doors_trapdoor_bar.png create mode 100644 mods/xpanes/textures/doors_door_steel_bar.png create mode 100644 mods/xpanes/textures/doors_item_steel_bar.png create mode 100644 mods/xpanes/textures/doors_trapdoor_steel_bar.png rename mods/{doors/textures/doors_trapdoor_bar_side.png => xpanes/textures/doors_trapdoor_steel_bar_side.png} (100%) 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 435af148df7b0401acfa6cfa4cb23e28f80258cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 605 zcmV-j0;2tiP)Ou#^hu00015P)t-s0000cCMGd4F!>k00DGTPE!Ct=GbNc0004EOGiWqhTfHW z0004eNklP10QtgBc!CG1KwocWzWO2!x@rkCp!wObf#kzR|h*8>Z z-YD}F`g!xhK}v5gZ(2~LZ1)PzFbi) z^mS!_%poMEFE4oeFGzWQfKP}kNSlU+zP^4^Qc`kqa#~tidU|?hW@c7aR(5uFZfa!?aF=@EE#o=nh5-A6*hDkiS31@k2POvSS w&3q+i)=qYvO9CtSCRr7K&q=#Eb8|YwlrJVabEZ`40nKOdboFyt=akR{0Ivv9M*si- 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 0000000000000000000000000000000000000000..81965ca1cb198ff3227a2eb03cd8938ae02048c1 GIT binary patch literal 520 zcmV+j0{8uiP)uBDZUFnj6jWR+GV%%w6 z6lok<)Khs~0Eg*a-ZE{O@=ac(?6ntzW^W@j5Lr-8jElOP4htg}gFEEqZ`^9Nm^qLZ zOHZq@?zCPXX{o$dIoOG^LmVpBo%TvX{8$|^%muMXsO;2l1}xFrPRD9D98pTH`)yyl zZbjnex0p*>m~x}!lGjte0WiBX^_$XJ!Q5}zA{6(|{1&Y8K21l!s1v}a-l$4a5oSc@H zmY$xTnVFfDm6e^HotvARmzS5HpI=Z=P*_-4R8&-4TwGdOT2@w8US3{PQ&V4G-`?Kd z+1c6E)z#hI-P6<4+uPgU-#=l(gozU;PM$n@%9JTnr%s(UYu2)5%U*oiwGe0@V@Z%- zFoVOh8)-mJx~Gd{h=io=!JA?S4MZ3YD4ML|+;yY;-+y^o{qke?tF(f*>pQIvv~A5< z`io<(TcOCLq?bB8ldi>{ShaL@fNsv2R=?FVIQJfVp_rn*c>0CRo;;_ZH+xzgH+>e` ll=WI^&c62ZFKa)3XBJ$<62NEoEEi}cgQu&X%Q~loCIIsbb*umY literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5137283c4939c5a238e40fa28ffd513b257000cc GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHVEbxddW?ya($&)89Sg_##|NmzS z&V>P0FqQ=Q1v5B2yO9RsBze2LaDKeG^bL^X=jq}Y!V#TZz{$zW$y>^s%8^jcaEPHy zLD@pKrICjth2uekLyHvq2C4KFQWK^yd$0yfIw-m3W~1y)hmv9iu?ANeivwAwthKmI cPidcGEU}dKs#|i#4rnrir>mdKI;Vst0Aejg&Hw-a literal 0 HcmV?d00001 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