diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua index f23bae10..d2dbf67d 100644 --- a/homedecor/crafts.lua +++ b/homedecor/crafts.lua @@ -3048,6 +3048,15 @@ minetest.register_craft({ }, }) +minetest.register_craft({ + output = "homedecor:wall_lamp 2", + recipe = { + { "", "homedecor:lattice_lantern_large", "" }, + { "default:iron_lump", "group:stick", "" }, + { "default:iron_lump", "group:stick", "" }, + }, +}) + minetest.register_craft({ output = "homedecor:desk_globe", recipe = { diff --git a/homedecor/furniture_medieval.lua b/homedecor/furniture_medieval.lua index cfbe1c77..9b8c8197 100644 --- a/homedecor/furniture_medieval.lua +++ b/homedecor/furniture_medieval.lua @@ -86,6 +86,22 @@ homedecor.register("torch_wall", { groups = {cracky=2}, }) +local wl_cbox = { + type = "fixed", + fixed = { -0.2, -0.5, 0, 0.2, 0.5, 0.5 }, +} + +homedecor.register("wall_lamp", { + description = S("Wall Lamp"), + mesh = "homedecor_wall_lamp.obj", + tiles = {"homedecor_wall_lamp.png"}, + inventory_image = "homedecor_wall_lamp_inv.png", + groups = {snappy=3}, + light_source = 11, + selection_box = wl_cbox, + collision_box = wl_cbox +}) + minetest.register_alias("3dforniture:bars", "homedecor:bars") minetest.register_alias("3dforniture:L_binding_bars", "homedecor:L_binding_bars") minetest.register_alias("3dforniture:chains", "homedecor:chains") diff --git a/homedecor/models/homedecor_wall_lamp.obj b/homedecor/models/homedecor_wall_lamp.obj new file mode 100644 index 00000000..ff0d88e8 --- /dev/null +++ b/homedecor/models/homedecor_wall_lamp.obj @@ -0,0 +1,506 @@ +# Blender v2.69 (sub 0) OBJ File: '' +# www.blender.org +mtllib homedecor_wall_lamp.mtl +o Cube_Lamp +v -0.109953 0.342520 0.050939 +v -0.109953 0.342519 0.270846 +v -0.039583 0.388416 0.200476 +v -0.039583 0.388416 0.121310 +v 0.109953 0.342520 0.050940 +v 0.039583 0.388416 0.121310 +v 0.109953 0.342519 0.270847 +v 0.039583 0.388416 0.200476 +v -0.109953 0.034634 0.093125 +v -0.109953 0.034634 0.228661 +v -0.079662 0.050537 0.215785 +v -0.079662 0.050537 0.106001 +v 0.029987 -0.176861 0.210871 +v -0.029987 -0.176861 0.210871 +v -0.029987 -0.176861 0.443450 +v 0.029986 -0.176861 0.443450 +v -0.029987 -0.261678 0.210871 +v -0.029987 -0.261678 0.443450 +v 0.029987 -0.261678 0.210871 +v 0.029986 -0.261678 0.443450 +v -0.128673 -0.037299 0.443450 +v 0.128672 -0.037299 0.443450 +v -0.128673 -0.401240 0.443450 +v 0.128672 -0.401240 0.443451 +v -0.128673 -0.037299 0.499994 +v 0.128672 -0.037299 0.499995 +v -0.128673 -0.401240 0.499994 +v 0.128672 -0.401240 0.499995 +v -0.109953 0.308310 0.093125 +v -0.109953 0.308310 0.228661 +v -0.109953 -0.017933 0.050939 +v -0.079662 0.292408 0.215785 +v -0.079662 0.292408 0.106001 +v 0.079659 0.050537 0.106001 +v 0.079659 0.292408 0.106001 +v 0.079659 0.292408 0.215785 +v 0.079659 0.050537 0.215785 +v 0.109951 0.308310 0.228661 +v 0.109951 0.308310 0.093125 +v 0.109951 0.034634 0.093125 +v 0.109951 0.034634 0.228661 +v 0.067767 0.034634 0.050941 +v -0.067769 0.034634 0.050940 +v -0.054893 0.050537 0.081232 +v 0.054891 0.050537 0.081232 +v -0.067769 0.308310 0.050940 +v -0.054893 0.292408 0.081232 +v 0.067767 0.308310 0.050941 +v 0.054891 0.292408 0.081232 +v 0.054891 0.050537 0.240553 +v 0.054891 0.292408 0.240553 +v -0.054893 0.292408 0.240553 +v -0.054893 0.050537 0.240553 +v -0.067769 0.308310 0.270845 +v 0.067767 0.308310 0.270845 +v 0.067767 0.034634 0.270845 +v -0.067769 0.034634 0.270844 +v 0.109952 -0.017933 0.270845 +v -0.109954 -0.017933 0.270844 +v 0.109953 -0.017933 0.050941 +v -0.045897 -0.265189 0.240388 +v -0.045897 -0.173396 0.240388 +v -0.091793 -0.173396 0.160893 +v -0.091793 -0.265189 0.160893 +v -0.045897 -0.173396 0.081397 +v -0.045897 -0.265189 0.081397 +v 0.045897 -0.173396 0.081398 +v 0.045897 -0.265189 0.081398 +v 0.091793 -0.173396 0.160893 +v 0.091793 -0.265189 0.160893 +v 0.045897 -0.265189 0.240389 +v 0.045897 -0.173396 0.240389 +v 0.046179 -0.048431 0.207072 +v 0.046179 -0.048431 0.114713 +v -0.046181 -0.048431 0.114712 +v -0.046181 -0.048431 0.207072 +v 0.000000 -0.417543 0.199446 +v 0.000000 -0.048534 0.199446 +v -0.027261 -0.048534 0.188153 +v -0.027261 -0.417543 0.188153 +v -0.038553 -0.048534 0.160893 +v -0.038553 -0.417543 0.160893 +v -0.027261 -0.048534 0.133632 +v -0.027261 -0.417543 0.133632 +v 0.000000 -0.048534 0.122340 +v 0.000000 -0.417543 0.122340 +v 0.027261 -0.048534 0.133632 +v 0.027261 -0.417543 0.133632 +v 0.038553 -0.048534 0.160893 +v 0.038553 -0.417543 0.160893 +v 0.027261 -0.417543 0.188153 +v 0.027261 -0.048534 0.188154 +v 0.000000 -0.490977 0.160893 +v -0.091794 -0.383579 0.447287 +v -0.091793 -0.383579 0.425256 +v -0.072714 -0.372564 0.425256 +v -0.072714 -0.372564 0.447287 +v -0.091794 -0.108200 0.447287 +v -0.091793 -0.108200 0.425256 +v -0.072714 -0.097185 0.425256 +v -0.072714 -0.097185 0.447287 +v 0.091793 -0.064139 0.447287 +v 0.091793 -0.064139 0.425257 +v 0.072714 -0.075155 0.425257 +v 0.072714 -0.075155 0.447287 +v 0.091793 -0.339519 0.447287 +v 0.091793 -0.339519 0.425257 +v 0.072714 -0.350534 0.425257 +v 0.072714 -0.350534 0.447287 +v -0.110873 -0.097185 0.447287 +v -0.110873 -0.097185 0.425256 +v 0.072714 -0.097185 0.425257 +v 0.072714 -0.097185 0.447287 +v -0.072714 -0.075155 0.425256 +v -0.072714 -0.075155 0.447287 +v -0.110873 -0.075155 0.447287 +v -0.110873 -0.075155 0.425256 +v 0.091793 -0.108200 0.425257 +v 0.091793 -0.108200 0.447287 +v -0.091793 -0.064139 0.425256 +v -0.091794 -0.064139 0.447287 +v 0.110872 -0.097185 0.425257 +v 0.110872 -0.097185 0.447287 +v 0.110872 -0.075155 0.447287 +v 0.110872 -0.075155 0.425257 +v -0.110873 -0.372564 0.447287 +v -0.110873 -0.372564 0.425256 +v 0.072714 -0.372564 0.425257 +v 0.072714 -0.372564 0.447287 +v -0.072714 -0.350534 0.425256 +v -0.072714 -0.350534 0.447287 +v -0.110873 -0.350534 0.447287 +v -0.110873 -0.350534 0.425256 +v 0.091793 -0.383579 0.425257 +v 0.091793 -0.383579 0.447287 +v -0.091793 -0.339519 0.425256 +v -0.091794 -0.339519 0.447287 +v 0.110872 -0.372564 0.425257 +v 0.110872 -0.372564 0.447288 +v 0.110872 -0.350534 0.447288 +v 0.110872 -0.350534 0.425257 +v 0.000000 0.498568 0.160893 +vt 0.731468 0.552151 +vt 0.731468 0.847665 +vt 0.636904 0.753100 +vt 0.636904 0.646716 +vt 0.435955 0.552151 +vt 0.530519 0.646716 +vt 0.435955 0.847665 +vt 0.530519 0.753100 +vt 0.764539 0.019533 +vt 0.980914 0.019533 +vt 0.933408 0.064226 +vt 0.810023 0.064226 +vt 0.501251 0.366042 +vt 0.501251 0.322512 +vt 0.670058 0.322512 +vt 0.670058 0.366042 +vt 0.501251 0.260951 +vt 0.670058 0.260951 +vt 0.501251 0.427602 +vt 0.670058 0.427603 +vt 0.501251 0.471132 +vt 0.670058 0.471132 +vt 0.184057 0.301527 +vt 0.244719 0.301527 +vt 0.344538 0.442691 +vt 0.084239 0.442691 +vt 0.244719 0.215736 +vt 0.344538 0.074572 +vt 0.184057 0.215736 +vt 0.084238 0.074572 +vt 0.344538 0.499884 +vt 0.084239 0.499885 +vt 0.401731 0.074572 +vt 0.401731 0.442690 +vt 0.027045 0.442691 +vt 0.027045 0.074573 +vt 0.084238 0.017379 +vt 0.344537 0.017378 +vt 0.740546 0.533749 +vt 0.426525 0.533750 +vt 0.486764 0.484899 +vt 0.680307 0.484899 +vt 0.426524 0.019030 +vt 0.486764 0.094096 +vt 0.980914 0.456437 +vt 0.933407 0.411744 +vt 0.764539 0.456437 +vt 0.810023 0.411744 +vt 0.768080 0.492394 +vt 0.977751 0.492393 +vt 0.977751 0.954331 +vt 0.768080 0.954331 +vt 0.764491 0.456437 +vt 0.809979 0.411744 +vt 0.933364 0.411744 +vt 0.980865 0.456437 +vt 0.933364 0.064226 +vt 0.980865 0.019533 +vt 0.764490 0.019532 +vt 0.809979 0.064225 +vt 0.764291 0.019533 +vt 0.980665 0.019533 +vt 0.933184 0.064226 +vt 0.809799 0.064226 +vt 0.426526 0.533750 +vt 0.486765 0.484899 +vt 0.680307 0.484897 +vt 0.740547 0.533747 +vt 0.980665 0.456437 +vt 0.933184 0.411744 +vt 0.764291 0.456437 +vt 0.809799 0.411744 +vt 0.764359 0.456437 +vt 0.809860 0.411744 +vt 0.933245 0.411744 +vt 0.980733 0.456437 +vt 0.933245 0.064225 +vt 0.980733 0.019532 +vt 0.764358 0.019532 +vt 0.809860 0.064225 +vt 0.740546 0.019030 +vt 0.680306 0.094096 +vt 0.740544 0.019030 +vt 0.680307 0.094096 +vt 0.740546 0.533750 +vt 0.426524 0.533750 +vt 0.680308 0.484899 +vt 0.426525 0.019031 +vt 0.740545 0.019030 +vt 0.680308 0.094096 +vt 0.486765 0.094096 +vt 0.740541 0.019030 +vt 0.680304 0.094096 +vt 0.486762 0.094098 +vt 0.426524 0.019033 +vt 0.426526 0.533749 +vt 0.740548 0.533750 +vt 0.571092 0.983144 +vt 0.571092 0.930254 +vt 0.623982 0.930254 +vt 0.623982 0.983144 +vt 0.623631 0.871004 +vt 0.623631 0.923894 +vt 0.570741 0.923894 +vt 0.570741 0.871004 +vt 0.517851 0.923894 +vt 0.517851 0.871004 +vt 0.464961 0.923894 +vt 0.464961 0.871004 +vt 0.518203 0.983144 +vt 0.518203 0.930254 +vt 0.465313 0.983144 +vt 0.465313 0.930254 +vt 0.523461 0.109163 +vt 0.562026 0.147728 +vt 0.562026 0.203581 +vt 0.523461 0.242146 +vt 0.656445 0.242146 +vt 0.617880 0.203581 +vt 0.656446 0.109163 +vt 0.617880 0.147728 +vt 0.314034 0.517433 +vt 0.314032 0.989912 +vt 0.276251 0.989912 +vt 0.276252 0.517433 +vt 0.238470 0.989912 +vt 0.238471 0.517433 +vt 0.200688 0.989912 +vt 0.200689 0.517433 +vt 0.162907 0.989913 +vt 0.162907 0.517432 +vt 0.125126 0.989912 +vt 0.125125 0.517432 +vt 0.087344 0.989912 +vt 0.087343 0.517433 +vt 0.049562 0.517433 +vt 0.049563 0.989913 +vt 0.011782 0.989913 +vt 0.011780 0.517433 +vt 0.443683 0.902365 +vt 0.443683 0.950025 +vt 0.386153 0.926195 +vt 0.409982 0.868665 +vt 0.362323 0.868665 +vt 0.328623 0.902365 +vt 0.328623 0.950025 +vt 0.362323 0.983725 +vt 0.409982 0.983725 +vt 0.919562 0.338531 +vt 0.899973 0.338531 +vt 0.899973 0.318943 +vt 0.919562 0.318943 +vt 0.851311 0.337174 +vt 0.870900 0.337174 +vt 0.870900 0.356762 +vt 0.851311 0.356763 +vt 0.891476 0.395939 +vt 0.871887 0.395939 +vt 0.871887 0.376350 +vt 0.891476 0.376350 +vt 0.850326 0.395939 +vt 0.830737 0.395939 +vt 0.830736 0.376350 +vt 0.850325 0.376350 +vt 0.851311 0.317584 +vt 0.870900 0.317585 +vt 0.871886 0.356761 +vt 0.891475 0.356761 +vt 0.870900 0.376351 +vt 0.851312 0.376351 +vt 0.851311 0.297995 +vt 0.870901 0.297996 +vt 0.871886 0.337172 +vt 0.891475 0.337172 +vt 0.870901 0.395938 +vt 0.851313 0.395939 +vt 0.851312 0.278406 +vt 0.870901 0.278406 +vt 0.871886 0.317583 +vt 0.891475 0.317583 +vt 0.891475 0.297994 +vt 0.871886 0.297994 +vt 0.871887 0.278406 +vt 0.891475 0.278406 +vt 0.919562 0.358120 +vt 0.899973 0.358120 +vt 0.830736 0.356761 +vt 0.850324 0.356761 +vt 0.899973 0.299354 +vt 0.919562 0.299354 +vt 0.919563 0.377709 +vt 0.899974 0.377709 +vt 0.830735 0.337173 +vt 0.850324 0.337172 +vt 0.899973 0.279765 +vt 0.919562 0.279765 +vt 0.919563 0.397298 +vt 0.899974 0.397298 +vt 0.830735 0.317584 +vt 0.850324 0.317584 +vt 0.850324 0.297995 +vt 0.830735 0.297995 +vt 0.830735 0.278406 +vt 0.850324 0.278406 +vt 0.638622 0.865041 +vt 0.748599 0.865041 +vt 0.693610 0.920030 +vt 0.638622 0.975019 +vt 0.748599 0.975019 +vt 0.423279 0.604113 +vt 0.423261 0.657003 +vt 0.377448 0.683432 +vt 0.331654 0.656971 +vt 0.331672 0.604082 +vt 0.377485 0.577652 +vt 0.332019 0.724467 +vt 0.377823 0.698022 +vt 0.423627 0.724467 +vt 0.423626 0.777357 +vt 0.377823 0.803802 +vt 0.332019 0.777357 +vt 0.838006 0.229942 +vt 0.857595 0.229942 +vt 0.867390 0.246907 +vt 0.857595 0.263871 +vt 0.838006 0.263871 +vt 0.828212 0.246907 +vt 0.835549 0.204692 +vt 0.825755 0.187728 +vt 0.835549 0.170764 +vt 0.855138 0.170764 +vt 0.864932 0.187728 +vt 0.855138 0.204692 +vt 0.894531 0.262544 +vt 0.884737 0.245580 +vt 0.894531 0.228615 +vt 0.914120 0.228615 +vt 0.923914 0.245580 +vt 0.914120 0.262544 +vt 0.896170 0.168617 +vt 0.915759 0.168617 +vt 0.925553 0.185582 +vt 0.915758 0.202546 +vt 0.896170 0.202546 +vt 0.886375 0.185582 +usemtl Lamp +s off +f 1/1 2/2 3/3 4/4 +f 5/5 1/1 4/4 6/6 +f 7/7 5/5 6/6 8/8 +f 2/2 7/7 8/8 3/3 +f 9/9 10/10 11/11 12/12 +f 13/13 14/14 15/15 16/16 +f 14/14 17/17 18/18 15/15 +f 19/19 13/13 16/16 20/20 +f 17/21 19/19 20/20 18/22 +f 16/23 15/24 21/25 22/26 +f 15/24 18/27 23/28 21/25 +f 20/29 16/23 22/26 24/30 +f 18/27 20/29 24/30 23/28 +f 22/26 21/25 25/31 26/32 +f 21/25 23/28 27/33 25/34 +f 24/30 22/26 26/35 28/36 +f 23/28 24/30 28/37 27/38 +f 2/39 1/40 29/41 30/42 +f 1/40 31/43 9/44 29/41 +f 30/45 32/46 11/11 10/10 +f 29/47 9/9 12/12 33/48 +f 30/45 29/47 33/48 32/46 +f 12/49 11/50 32/51 33/52 +f 34/50 35/51 36/52 37/49 +f 38/53 36/54 35/55 39/56 +f 39/56 35/55 34/57 40/58 +f 38/53 41/59 37/60 36/54 +f 42/61 43/62 44/63 45/64 +f 40/58 34/57 37/60 41/59 +f 7/65 38/66 39/67 5/68 +f 46/69 47/70 44/63 43/62 +f 48/71 42/61 45/64 49/72 +f 46/69 48/71 49/72 47/70 +f 45/49 44/50 47/51 49/52 +f 50/50 51/51 52/52 53/49 +f 54/73 52/74 51/75 55/76 +f 55/76 51/75 50/77 56/78 +f 54/73 57/79 53/80 52/74 +f 58/81 56/82 57/44 59/43 +f 56/78 50/77 53/80 57/79 +f 31/43 59/83 10/84 9/44 +f 2/39 30/42 10/84 59/83 +f 1/85 5/86 48/66 46/87 +f 60/88 31/89 43/90 42/91 +f 60/92 40/93 41/94 58/95 +f 7/65 58/95 41/94 38/66 +f 5/68 39/67 40/93 60/92 +f 5/86 60/88 42/91 48/66 +f 1/85 46/87 43/90 31/89 +f 2/96 59/43 57/44 54/41 +f 7/97 55/42 56/82 58/81 +f 2/96 54/41 55/42 7/97 +f 61/98 62/99 63/100 64/101 +f 64/102 63/103 65/104 66/105 +f 66/105 65/104 67/106 68/107 +f 68/107 67/106 69/108 70/109 +f 71/110 72/111 62/99 61/98 +f 70/112 69/113 72/111 71/110 +f 58/114 73/115 74/116 60/117 +f 31/118 60/117 74/116 75/119 +f 59/120 31/118 75/119 76/121 +f 59/120 76/121 73/115 58/114 +f 77/122 78/123 79/124 80/125 +f 80/125 79/124 81/126 82/127 +f 82/127 81/126 83/128 84/129 +f 84/129 83/128 85/130 86/131 +f 86/131 85/130 87/132 88/133 +f 88/133 87/132 89/134 90/135 +f 91/136 92/137 78/138 77/139 +f 90/135 89/134 92/137 91/136 +f 73/115 76/121 75/119 74/116 +f 91/140 77/141 93/142 +f 90/143 91/140 93/142 +f 88/144 90/143 93/142 +f 86/145 88/144 93/142 +f 84/146 86/145 93/142 +f 82/147 84/146 93/142 +f 80/148 82/147 93/142 +f 77/141 80/148 93/142 +f 94/149 95/150 96/151 97/152 +f 98/153 99/154 100/155 101/156 +f 102/157 103/158 104/159 105/160 +f 106/161 107/162 108/163 109/164 +f 110/165 111/166 99/154 98/153 +f 105/160 104/159 112/167 113/168 +f 101/156 100/155 114/169 115/170 +f 116/171 117/172 111/166 110/165 +f 113/168 112/167 118/173 119/174 +f 115/170 114/169 120/175 121/176 +f 121/177 120/178 117/172 116/171 +f 119/174 118/173 122/179 123/180 +f 124/181 125/182 103/183 102/184 +f 123/180 122/179 125/182 124/181 +f 126/185 127/186 95/150 94/149 +f 109/164 108/163 128/187 129/188 +f 97/152 96/151 130/189 131/190 +f 132/191 133/192 127/186 126/185 +f 129/188 128/187 134/193 135/194 +f 131/190 130/189 136/195 137/196 +f 137/197 136/198 133/192 132/191 +f 135/194 134/193 138/199 139/200 +f 140/201 141/202 107/203 106/204 +f 139/200 138/199 141/202 140/201 +f 4/205 3/206 142/207 +f 6/208 4/205 142/207 +f 8/209 6/208 142/207 +f 3/206 8/209 142/207 +f 61/210 64/211 66/212 68/213 70/214 71/215 +f 69/216 67/217 65/218 63/219 62/220 72/221 +f 127/222 133/223 136/224 130/225 96/226 95/227 +f 122/228 118/229 112/230 104/231 103/232 125/233 +f 138/234 134/235 128/236 108/237 107/238 141/239 +f 111/240 117/241 120/242 114/243 100/244 99/245 diff --git a/homedecor/textures/homedecor_wall_lamp.png b/homedecor/textures/homedecor_wall_lamp.png new file mode 100644 index 00000000..e38caba8 Binary files /dev/null and b/homedecor/textures/homedecor_wall_lamp.png differ diff --git a/homedecor/textures/homedecor_wall_lamp_inv.png b/homedecor/textures/homedecor_wall_lamp_inv.png new file mode 100644 index 00000000..6f1a4518 Binary files /dev/null and b/homedecor/textures/homedecor_wall_lamp_inv.png differ