diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua index 5f9dd12b..fa2a3ede 100644 --- a/homedecor/crafts.lua +++ b/homedecor/crafts.lua @@ -3039,6 +3039,15 @@ minetest.register_craft({ }, }) +minetest.register_craft({ + output = "homedecor:ceiling_lantern 2", + recipe = { + { "default:iron_lump", "default:iron_lump", "default:iron_lump" }, + { "default:iron_lump", "homedecor:lattice_lantern_large", "default:iron_lump" }, + { "", "default:iron_lump", "" }, + }, +}) + minetest.register_craft({ output = "homedecor:desk_globe", recipe = { diff --git a/homedecor/lighting.lua b/homedecor/lighting.lua index 0690ef29..1a211ed2 100644 --- a/homedecor/lighting.lua +++ b/homedecor/lighting.lua @@ -246,6 +246,23 @@ homedecor.register("hanging_lantern", { collision_box = hl_cbox }) +local cl_cbox = { + type = "fixed", + fixed = { -0.35, -0.45, -0.35, 0.35, 0.5, 0.35 } +} + +homedecor.register("ceiling_lantern", { + drawtype = "mesh", + mesh = "homedecor_ceiling_lantern.obj", + tiles = { "homedecor_ceiling_lantern.png" }, + inventory_image = "homedecor_ceiling_lantern_inv.png", + description = "Ceiling Lantern", + groups = {snappy=3}, + light_source = 11, + selection_box = cl_cbox, + collision_box = cl_cbox, +}) + homedecor.register("lattice_lantern_large", { description = S("Lattice lantern (large)"), tiles = { 'homedecor_lattice_lantern_large.png' }, diff --git a/homedecor/models/homedecor_ceiling_lantern.obj b/homedecor/models/homedecor_ceiling_lantern.obj new file mode 100644 index 00000000..b32d9938 --- /dev/null +++ b/homedecor/models/homedecor_ceiling_lantern.obj @@ -0,0 +1,515 @@ +# Blender v2.69 (sub 0) OBJ File: '' +# www.blender.org +mtllib homedecor_ceiling_lantern.mtl +o lantern_Cube.011_Cube.012 +v 0.131532 -0.238520 -0.166750 +v 0.178449 0.183954 -0.213668 +v -0.178611 0.183954 -0.213668 +v -0.131694 -0.238520 -0.166750 +v 0.170300 -0.238520 -0.127983 +v 0.170300 -0.238520 0.135243 +v 0.217217 0.183954 0.182161 +v 0.217217 0.183954 -0.174900 +v -0.131694 -0.238520 0.174011 +v -0.178611 0.183954 0.220929 +v 0.178449 0.183954 0.220929 +v 0.131532 -0.238520 0.174011 +v -0.170462 -0.238520 0.135243 +v -0.170462 -0.238520 -0.127983 +v -0.217379 0.183954 -0.174900 +v -0.217379 0.183954 0.182161 +v -0.034963 0.451324 0.034678 +v -0.034963 0.451324 -0.035086 +v -0.060689 0.404833 -0.060813 +v -0.060689 0.404833 0.060404 +v 0.034801 0.451324 -0.035086 +v 0.060527 0.404833 -0.060813 +v 0.034801 0.451324 0.034678 +v 0.060527 0.404833 0.060404 +v -0.042454 0.390820 0.042169 +v 0.042293 0.390820 0.042169 +v 0.009255 0.461054 0.009132 +v -0.009417 0.461054 0.009132 +v -0.066860 0.357539 0.066575 +v 0.066698 0.357539 0.066575 +v 0.042293 0.390820 -0.042578 +v -0.042454 0.390820 -0.042578 +v -0.121725 0.333015 0.125275 +v 0.121564 0.333015 0.125275 +v 0.066698 0.357539 -0.066983 +v -0.066860 0.357539 -0.066983 +v 0.223082 0.236764 -0.219532 +v -0.223244 0.236764 -0.219532 +v -0.340709 0.267604 -0.336998 +v 0.340547 0.267604 -0.336998 +v 0.121564 0.333015 -0.118014 +v -0.121725 0.333015 -0.118014 +v 0.164435 -0.291329 -0.160885 +v -0.164597 -0.291329 -0.160885 +v -0.223244 0.236763 0.226793 +v -0.340709 0.267604 0.344259 +v 0.223082 0.236763 0.226793 +v 0.340547 0.267604 0.344259 +v 0.164435 -0.291330 0.168146 +v -0.164597 -0.291330 0.168146 +v -0.234314 -0.335598 0.237863 +v 0.234152 -0.335598 0.237863 +v -0.088326 -0.441351 0.091876 +v 0.088164 -0.441351 0.091876 +v 0.234152 -0.335598 -0.230603 +v -0.234314 -0.335598 -0.230603 +v -0.088326 -0.441351 -0.084615 +v 0.088164 -0.441351 -0.084615 +v 0.009255 0.499976 0.009132 +v -0.009417 0.499976 0.009132 +v 0.009255 0.461054 -0.009541 +v -0.009417 0.461054 -0.009541 +v 0.009255 0.499976 -0.009541 +v -0.009417 0.499976 -0.009541 +v 0.038749 -0.271168 -0.046637 +v 0.050186 -0.271168 -0.035199 +v 0.067481 0.279432 -0.051878 +v 0.055428 0.279432 -0.063932 +v -0.055590 0.279432 -0.063932 +v -0.067643 0.279432 -0.051878 +v -0.067643 0.279432 0.059139 +v -0.055590 0.279432 0.071193 +v 0.055428 0.279432 0.071193 +v 0.067481 0.279432 0.059139 +v -0.050348 -0.271168 -0.035199 +v -0.038910 -0.271168 -0.046637 +v -0.038910 -0.271168 0.053898 +v -0.050348 -0.271168 0.042460 +v 0.050186 -0.271168 0.042460 +v 0.038749 -0.271168 0.053898 +vt 0.307758 0.019821 +vt 0.018424 0.019821 +vt 0.018424 0.309155 +vt 0.307758 0.309155 +vt 0.015794 0.018770 +vt 0.307177 0.018770 +vt 0.307177 0.308104 +vt 0.015794 0.308104 +vt 0.307758 0.309625 +vt 0.018424 0.309625 +vt 0.018424 0.018242 +vt 0.307758 0.018242 +vt 0.304547 0.018770 +vt 0.015212 0.018770 +vt 0.015212 0.308104 +vt 0.304547 0.308104 +vt 0.943443 0.498999 +vt 0.943443 0.445445 +vt 0.917668 0.445445 +vt 0.917668 0.498999 +vt 0.915666 0.498999 +vt 0.915666 0.445445 +vt 0.889890 0.445445 +vt 0.889890 0.498999 +vt 0.887888 0.554555 +vt 0.887888 0.501001 +vt 0.862112 0.501001 +vt 0.862112 0.554555 +vt 0.860110 0.554555 +vt 0.860110 0.501001 +vt 0.834334 0.501001 +vt 0.834334 0.554555 +vt 0.860110 0.387888 +vt 0.860110 0.334334 +vt 0.848223 0.334334 +vt 0.848223 0.387888 +vt 0.915666 0.778779 +vt 0.889890 0.778779 +vt 0.889890 0.804555 +vt 0.915666 0.804555 +vt 0.943443 0.554555 +vt 0.943443 0.501001 +vt 0.917668 0.501001 +vt 0.917668 0.554555 +vt 0.846221 0.387888 +vt 0.846221 0.334334 +vt 0.834334 0.334334 +vt 0.834334 0.387888 +vt 0.887888 0.387888 +vt 0.887888 0.334334 +vt 0.876001 0.334334 +vt 0.876001 0.387888 +vt 0.873999 0.387888 +vt 0.873999 0.334334 +vt 0.862112 0.334334 +vt 0.862112 0.387888 +vt 0.887888 0.332332 +vt 0.887888 0.223223 +vt 0.834334 0.223223 +vt 0.834334 0.332332 +vt 0.915666 0.554555 +vt 0.915666 0.501001 +vt 0.889890 0.501001 +vt 0.889890 0.554555 +vt 0.943443 0.387888 +vt 0.943443 0.334334 +vt 0.917668 0.334334 +vt 0.917668 0.387888 +vt 0.915666 0.387888 +vt 0.915666 0.334334 +vt 0.889890 0.334334 +vt 0.889890 0.387888 +vt 0.445445 0.221221 +vt 0.665666 0.221221 +vt 0.665666 0.112112 +vt 0.445445 0.112112 +vt 0.887888 0.221221 +vt 0.887888 0.112112 +vt 0.834334 0.112112 +vt 0.834334 0.221221 +vt 0.834334 0.054555 +vt 0.943443 0.054555 +vt 0.943443 0.001001 +vt 0.834334 0.001001 +vt 0.943443 0.943443 +vt 0.943443 0.834334 +vt 0.889890 0.834334 +vt 0.889890 0.943443 +vt 0.887888 0.889890 +vt 0.667668 0.889890 +vt 0.667668 0.915666 +vt 0.887888 0.915666 +vt 0.776777 0.665666 +vt 0.776777 0.445445 +vt 0.667668 0.445445 +vt 0.667668 0.665666 +vt 0.445445 0.110110 +vt 0.665666 0.110110 +vt 0.665666 0.001001 +vt 0.445445 0.001001 +vt 0.776777 0.443443 +vt 0.776777 0.223223 +vt 0.667668 0.223223 +vt 0.667668 0.443443 +vt 0.445445 0.832332 +vt 0.665666 0.832332 +vt 0.665666 0.778779 +vt 0.445445 0.778779 +vt 0.832332 0.665666 +vt 0.832332 0.445445 +vt 0.778779 0.445445 +vt 0.778779 0.665666 +vt 0.887888 0.943443 +vt 0.887888 0.917668 +vt 0.667668 0.917668 +vt 0.667668 0.943443 +vt 0.889890 0.112112 +vt 0.889890 0.332332 +vt 0.915666 0.332332 +vt 0.915666 0.112112 +vt 0.445445 0.776777 +vt 0.665666 0.776777 +vt 0.665666 0.667668 +vt 0.445445 0.667668 +vt 0.832332 0.443443 +vt 0.832332 0.223223 +vt 0.778779 0.223223 +vt 0.778779 0.443443 +vt 0.223223 0.832332 +vt 0.443443 0.832332 +vt 0.443443 0.778779 +vt 0.223223 0.778779 +vt 0.832332 0.221221 +vt 0.832332 0.001001 +vt 0.778779 0.001001 +vt 0.778779 0.221221 +vt 0.776777 0.667668 +vt 0.667668 0.667668 +vt 0.667668 0.776777 +vt 0.776777 0.776777 +vt 0.223223 0.776777 +vt 0.443443 0.776777 +vt 0.443443 0.667668 +vt 0.223223 0.667668 +vt 0.776777 0.221221 +vt 0.776777 0.001001 +vt 0.667668 0.001001 +vt 0.667668 0.221221 +vt 0.001001 0.776777 +vt 0.221221 0.776777 +vt 0.221221 0.667668 +vt 0.001001 0.667668 +vt 0.860110 0.445445 +vt 0.848223 0.445445 +vt 0.848223 0.471221 +vt 0.860110 0.471221 +vt 0.915666 0.806557 +vt 0.889890 0.806557 +vt 0.889890 0.832332 +vt 0.915666 0.832332 +vt 0.887888 0.473223 +vt 0.862112 0.473223 +vt 0.862112 0.498999 +vt 0.887888 0.498999 +vt 0.860110 0.473223 +vt 0.834334 0.473223 +vt 0.834334 0.498999 +vt 0.860110 0.498999 +vt 0.929555 0.778779 +vt 0.917668 0.778779 +vt 0.917668 0.790666 +vt 0.929555 0.790666 +vt 0.846221 0.445445 +vt 0.834334 0.445445 +vt 0.834334 0.471221 +vt 0.846221 0.471221 +vt 0.887888 0.445445 +vt 0.876001 0.445445 +vt 0.876001 0.471221 +vt 0.887888 0.471221 +vt 0.873999 0.445445 +vt 0.862112 0.445445 +vt 0.862112 0.471221 +vt 0.873999 0.471221 +vt 0.665221 0.223001 +vt 0.445001 0.223001 +vt 0.445001 0.443221 +vt 0.665221 0.443221 +vt 0.665443 0.227223 +vt 0.445223 0.227223 +vt 0.445223 0.447443 +vt 0.665443 0.447443 +vt 0.663221 0.445223 +vt 0.443001 0.445223 +vt 0.443001 0.665443 +vt 0.663221 0.665443 +vt 0.667443 0.447001 +vt 0.447223 0.447001 +vt 0.447223 0.667221 +vt 0.667443 0.667221 +vt 0.943443 0.332332 +vt 0.943443 0.112112 +vt 0.917668 0.112112 +vt 0.917668 0.332332 +vt 0.667668 0.971221 +vt 0.887888 0.971221 +vt 0.887888 0.945445 +vt 0.667668 0.945445 +vt 0.971221 0.887888 +vt 0.971221 0.667668 +vt 0.945445 0.667668 +vt 0.945445 0.887888 +vt 0.001001 0.832332 +vt 0.221221 0.832332 +vt 0.221221 0.778779 +vt 0.001001 0.778779 +vt 0.971221 0.445445 +vt 0.945445 0.445445 +vt 0.945445 0.665666 +vt 0.971221 0.665666 +vt 0.445445 0.971221 +vt 0.665666 0.971221 +vt 0.665666 0.945445 +vt 0.445445 0.945445 +vt 0.971221 0.443443 +vt 0.971221 0.223223 +vt 0.945445 0.223223 +vt 0.945445 0.443443 +vt 0.667668 0.832332 +vt 0.887888 0.832332 +vt 0.887888 0.778779 +vt 0.667668 0.778779 +vt 0.971221 0.221221 +vt 0.971221 0.001001 +vt 0.945445 0.001001 +vt 0.945445 0.221221 +vt 0.223223 0.971221 +vt 0.443443 0.971221 +vt 0.443443 0.945445 +vt 0.223223 0.945445 +vt 0.998999 0.887888 +vt 0.998999 0.667668 +vt 0.973223 0.667668 +vt 0.973223 0.887888 +vt 0.667668 0.887888 +vt 0.887888 0.887888 +vt 0.887888 0.834334 +vt 0.667668 0.834334 +vt 0.998999 0.665666 +vt 0.998999 0.445445 +vt 0.973223 0.445445 +vt 0.973223 0.665666 +vt 0.001001 0.971221 +vt 0.221221 0.971221 +vt 0.221221 0.945445 +vt 0.001001 0.945445 +vt 0.998999 0.223223 +vt 0.973223 0.223223 +vt 0.973223 0.443443 +vt 0.998999 0.443443 +vt 0.667668 0.998999 +vt 0.887888 0.998999 +vt 0.887888 0.973223 +vt 0.667668 0.973223 +vt 0.985110 0.112112 +vt 0.973223 0.112112 +vt 0.973223 0.221221 +vt 0.985110 0.221221 +vt 0.943443 0.110110 +vt 0.943443 0.084334 +vt 0.834334 0.084334 +vt 0.834334 0.110110 +vt 0.915666 0.776777 +vt 0.915666 0.667668 +vt 0.889890 0.667668 +vt 0.889890 0.776777 +vt 0.943443 0.082332 +vt 0.943443 0.056557 +vt 0.834334 0.056557 +vt 0.834334 0.082332 +vt 0.943443 0.667668 +vt 0.917668 0.667668 +vt 0.917668 0.776777 +vt 0.943443 0.776777 +vt 0.887888 0.667668 +vt 0.778779 0.667668 +vt 0.778779 0.776777 +vt 0.887888 0.776777 +vt 0.665666 0.834334 +vt 0.556557 0.834334 +vt 0.556557 0.943443 +vt 0.665666 0.943443 +vt 0.554555 0.834334 +vt 0.445445 0.834334 +vt 0.445445 0.943443 +vt 0.554555 0.943443 +vt 0.443443 0.834334 +vt 0.334334 0.834334 +vt 0.334334 0.943443 +vt 0.443443 0.943443 +vt 0.556557 0.985110 +vt 0.665666 0.985110 +vt 0.665666 0.973223 +vt 0.556557 0.973223 +vt 0.985110 0.001001 +vt 0.973223 0.001001 +vt 0.973223 0.110110 +vt 0.985110 0.110110 +vt 0.554555 0.985110 +vt 0.554555 0.973223 +vt 0.445445 0.973223 +vt 0.445445 0.985110 +vt 0.332332 0.834334 +vt 0.223223 0.834334 +vt 0.223223 0.943443 +vt 0.332332 0.943443 +vt 0.221221 0.834334 +vt 0.112112 0.834334 +vt 0.112112 0.943443 +vt 0.221221 0.943443 +vt 0.110110 0.834334 +vt 0.001001 0.834334 +vt 0.001001 0.943443 +vt 0.110110 0.943443 +vt 0.943443 0.556557 +vt 0.834334 0.556557 +vt 0.834334 0.665666 +vt 0.943443 0.665666 +vt 0.943443 0.394667 +vt 0.943443 0.438666 +vt 0.938666 0.443443 +vt 0.894667 0.443443 +vt 0.889890 0.438666 +vt 0.889890 0.394667 +vt 0.894667 0.389890 +vt 0.938666 0.389890 +vt 0.887888 0.437351 +vt 0.881795 0.443443 +vt 0.840427 0.443443 +vt 0.834334 0.437351 +vt 0.834334 0.395983 +vt 0.840427 0.389890 +vt 0.881795 0.389890 +vt 0.887888 0.395983 +usemtl None.001 +s off +f 1/1 2/2 3/3 4/4 +f 5/5 6/6 7/7 8/8 +f 9/9 10/10 11/11 12/12 +f 13/13 14/14 15/15 16/16 +s 1 +f 17/17 18/18 19/19 20/20 +f 18/21 21/22 22/23 19/24 +f 21/25 23/26 24/27 22/28 +f 23/29 17/30 20/31 24/32 +f 24/33 20/34 25/35 26/36 +f 17/37 23/38 27/39 28/40 +f 26/41 25/42 29/43 30/44 +f 22/45 24/46 26/47 31/48 +f 19/49 22/50 31/51 32/52 +f 20/53 19/54 32/55 25/56 +f 30/57 29/58 33/59 34/60 +f 31/61 26/62 30/63 35/64 +f 32/65 31/66 35/67 36/68 +f 25/69 32/70 36/71 29/72 +f 37/73 38/74 39/75 40/76 +f 35/77 30/78 34/79 41/80 +f 36/81 35/82 41/83 42/84 +f 29/85 36/86 42/87 33/88 +f 4/89 1/90 43/91 44/92 +f 38/93 45/94 46/95 39/96 +f 45/97 47/98 48/99 46/100 +f 47/101 37/102 40/103 48/104 +f 49/105 50/106 51/107 52/108 +f 38/109 37/110 2/111 3/112 +f 38/113 3/114 4/115 44/116 +f 1/117 2/118 37/119 43/120 +f 52/121 51/122 53/123 54/124 +f 43/125 49/126 52/127 55/128 +f 44/129 43/130 55/131 56/132 +f 50/133 44/134 56/135 51/136 +f 53/137 57/138 58/139 54/140 +f 55/141 52/142 54/143 58/144 +f 56/145 55/146 58/147 57/148 +f 51/149 56/150 57/151 53/152 +f 28/153 27/154 59/155 60/156 +f 23/157 21/158 61/159 27/160 +f 21/161 18/162 62/163 61/164 +f 18/165 17/166 28/167 62/168 +f 59/169 63/170 64/171 60/172 +f 27/173 61/174 63/175 59/176 +f 61/177 62/178 64/179 63/180 +f 62/181 28/182 60/183 64/184 +f 39/185 46/186 33/187 42/188 +f 48/189 40/190 41/191 34/192 +f 40/193 39/194 42/195 41/196 +f 46/197 48/198 34/199 33/200 +f 43/201 37/202 8/203 5/204 +f 47/205 49/206 6/207 7/208 +f 49/209 43/210 5/211 6/212 +f 37/213 47/214 7/215 8/216 +f 44/217 14/218 15/219 38/220 +f 50/221 45/222 16/223 13/224 +f 44/225 50/226 13/227 14/228 +f 45/229 38/230 15/231 16/232 +f 45/233 50/234 9/235 10/236 +f 49/237 47/238 11/239 12/240 +f 50/241 49/242 12/243 9/244 +f 47/245 45/246 10/247 11/248 +f 7/249 6/250 12/251 11/252 +f 13/253 16/254 10/255 9/256 +f 3/257 15/258 14/259 4/260 +f 2/261 1/262 5/263 8/264 +f 5/265 1/266 65/267 66/268 +f 2/269 8/270 67/271 68/272 +f 3/273 69/274 70/275 15/276 +f 10/277 16/278 71/279 72/280 +f 7/281 11/282 73/283 74/284 +f 11/285 10/286 72/287 73/288 +f 16/289 15/290 70/291 71/292 +f 8/293 7/294 74/295 67/296 +f 3/297 2/298 68/299 69/300 +f 14/301 75/302 76/303 4/304 +f 13/305 9/306 77/307 78/308 +f 12/309 6/310 79/311 80/312 +f 9/313 12/314 80/315 77/316 +f 14/317 13/318 78/319 75/320 +f 6/321 5/322 66/323 79/324 +f 1/325 4/326 76/327 65/328 +f 67/329 74/330 73/331 72/332 71/333 70/334 69/335 68/336 +f 66/337 65/338 76/339 75/340 78/341 77/342 80/343 79/344 diff --git a/homedecor/textures/homedecor_ceiling_lantern.png b/homedecor/textures/homedecor_ceiling_lantern.png new file mode 100644 index 00000000..77a00923 Binary files /dev/null and b/homedecor/textures/homedecor_ceiling_lantern.png differ diff --git a/homedecor/textures/homedecor_ceiling_lantern_inv.png b/homedecor/textures/homedecor_ceiling_lantern_inv.png new file mode 100644 index 00000000..14e01720 Binary files /dev/null and b/homedecor/textures/homedecor_ceiling_lantern_inv.png differ