Merge branch 'wall_lantern' of github.com:kilbith/homedecor_modpack

homedecor/lighting.lua

@@ -267,21 +267,21 @@ homedecor.register("oil_lamp", {
 	sounds = default.node_sound_wood_defaults(),
 })
 
-homedecor.register("wall_lantern", {
+local wl_cbox = {
-	description = S("Wall lantern"),
-	drawtype = "plantlike",
-	tiles = { 'homedecor_wall_lantern.png' },
-	inventory_image = 'homedecor_wall_lantern.png',
-	sunlight_propagates = true,
-	selection_box = {
 	type = "fixed",
-		fixed = {
+	fixed = { -0.25, -0.5, -0.25, 0.25, 0.45, 0.25 },
-			{ -0.3, -0.5, -0.3, 0.3, 0.5, 0.3 },
 }
-	},
+
+homedecor.register("wall_lantern", {
+	description = S("Wall Lantern"),
+	mesh = "homedecor_wall_lantern.obj",
+	tiles = {"homedecor_wall_lantern.png"},
+	inventory_image = "homedecor_wall_lantern_inv.png",
+	wield_image = "homedecor_wall_lantern_inv.png",
 	groups = {snappy=3},
-	light_source = LIGHT_MAX-4,
+	light_source = 11,
-	sounds = default.node_sound_wood_defaults(),
+	selection_box = wl_cbox,
+	collision_box = wl_cbox,
 })
 
 homedecor.register("lattice_lantern_large", {

homedecor/models/homedecor_wall_lantern.obj

@@ -0,0 +1,419 @@
+# Blender v2.69 (sub 0) OBJ File: 'wall_lantern.blend'
+# www.blender.org
+mtllib wall_lantern.mtl
+o Cylinder
+v 0.000027 0.249001 -0.240326
+v 0.000027 0.222662 -0.240326
+v 0.208213 0.249001 -0.120130
+v 0.208213 0.222662 -0.120130
+v 0.208213 0.249001 0.120264
+v 0.208213 0.222662 0.120264
+v 0.000027 0.249001 0.240460
+v 0.000027 0.222662 0.240460
+v -0.208160 0.249001 0.120263
+v -0.208160 0.222662 0.120263
+v -0.208160 0.249001 -0.120130
+v -0.208160 0.222662 -0.120130
+v 0.000027 0.450268 -0.023624
+v 0.020543 0.450268 -0.011778
+v 0.020543 0.450268 0.011912
+v 0.000027 0.450268 0.023757
+v -0.020490 0.450268 0.011912
+v -0.020490 0.450268 -0.011778
+v -0.046448 0.382417 -0.026765
+v -0.105707 0.314565 -0.060978
+v 0.000027 0.314565 -0.122023
+v 0.000027 0.382417 -0.053597
+v -0.046448 0.382417 0.026899
+v -0.105707 0.314565 0.061112
+v 0.000027 0.382417 0.053731
+v 0.000027 0.314565 0.122157
+v 0.046501 0.382417 0.026899
+v 0.105760 0.314565 0.061112
+v 0.046501 0.382417 -0.026765
+v 0.105760 0.314565 -0.060978
+v 0.000027 -0.051212 -0.199676
+v 0.000027 0.000049 -0.199676
+v 0.173009 -0.051212 -0.099805
+v 0.173009 0.000049 -0.099805
+v 0.173009 -0.051212 0.099938
+v 0.173009 0.000049 0.099938
+v 0.000027 -0.051212 0.199810
+v 0.000027 0.000049 0.199810
+v -0.172956 -0.051212 0.099938
+v -0.172956 0.000049 0.099938
+v -0.172956 -0.051212 -0.099805
+v -0.172956 0.000049 -0.099805
+v -0.136643 0.000049 -0.078839
+v -0.136643 0.000049 0.078973
+v 0.000027 0.000049 0.157879
+v 0.136696 0.000049 0.078973
+v 0.136696 0.000049 -0.078839
+v 0.000027 0.000049 -0.157746
+v -0.070961 -0.049741 -0.040918
+v -0.070961 -0.049741 0.041052
+v 0.000027 -0.049741 0.082037
+v 0.071015 -0.049741 0.041052
+v 0.071015 -0.049741 -0.040918
+v 0.000027 -0.049741 -0.081903
+v 0.000027 -0.496263 -0.216256
+v 0.000027 -0.458016 -0.216256
+v 0.187368 -0.496263 -0.108095
+v 0.187368 -0.458016 -0.108095
+v 0.187368 -0.496263 0.108229
+v 0.187368 -0.458016 0.108229
+v 0.000027 -0.496263 0.216390
+v 0.000027 -0.458016 0.216390
+v -0.187315 -0.496263 0.108228
+v -0.187315 -0.458016 0.108228
+v -0.187315 -0.496263 -0.108095
+v -0.187315 -0.458016 -0.108095
+v 0.000027 -0.413993 -0.081903
+v 0.071015 -0.413993 -0.040918
+v 0.071015 -0.413993 0.041052
+v 0.000027 -0.413993 0.082037
+v -0.070961 -0.413993 0.041052
+v -0.070961 -0.413993 -0.040918
+v -0.136643 0.223914 -0.078839
+v -0.136643 0.223914 0.078973
+v 0.000027 0.223914 0.157879
+v 0.136696 0.223914 0.078973
+v 0.136696 0.223914 -0.078839
+v 0.000027 0.223914 -0.157746
+vt 0.726272 0.908090
+vt 0.726272 0.873728
+vt 0.437365 0.873728
+vt 0.437365 0.908090
+vt 0.980817 0.582819
+vt 0.946456 0.582819
+vt 0.946456 0.871726
+vt 0.980817 0.871726
+vt 0.435363 0.908090
+vt 0.435363 0.873728
+vt 0.146456 0.873728
+vt 0.146456 0.908090
+vt 0.980817 0.291910
+vt 0.946456 0.291910
+vt 0.946456 0.580817
+vt 0.980817 0.580817
+vt 0.726272 0.944454
+vt 0.726272 0.910092
+vt 0.437365 0.910092
+vt 0.437365 0.944454
+vt 0.801001 0.926772
+vt 0.801001 0.891410
+vt 0.836364 0.873728
+vt 0.871726 0.891410
+vt 0.871726 0.926772
+vt 0.836364 0.944454
+vt 0.144454 0.871726
+vt 0.144454 0.728274
+vt 0.073728 0.728274
+vt 0.073728 0.871726
+vt 0.582819 0.362635
+vt 0.726272 0.362635
+vt 0.726272 0.291910
+vt 0.582819 0.291910
+vt 0.071726 0.871726
+vt 0.071726 0.728274
+vt 0.001001 0.728274
+vt 0.001001 0.871726
+vt 0.582819 0.726272
+vt 0.726272 0.726272
+vt 0.726272 0.655546
+vt 0.582819 0.655546
+vt 0.726272 0.364637
+vt 0.655546 0.364637
+vt 0.655546 0.653544
+vt 0.726272 0.653544
+vt 0.001001 0.944454
+vt 0.144454 0.944454
+vt 0.144454 0.873728
+vt 0.001001 0.873728
+vt 0.798999 1.017181
+vt 0.798999 0.873728
+vt 0.728274 0.873728
+vt 0.728274 1.017181
+vt 0.437365 0.618682
+vt 0.509091 0.582819
+vt 0.580817 0.618682
+vt 0.580817 0.690409
+vt 0.509091 0.726272
+vt 0.437365 0.690409
+vt 0.435363 0.944454
+vt 0.435363 0.910092
+vt 0.146456 0.910092
+vt 0.146456 0.944454
+vt 0.798999 0.291910
+vt 0.728274 0.291910
+vt 0.728274 0.580817
+vt 0.798999 0.580817
+vt 0.435363 0.726272
+vt 0.435363 0.655546
+vt 0.146456 0.655546
+vt 0.146456 0.726272
+vt 0.798999 0.001001
+vt 0.728274 0.001001
+vt 0.728274 0.289908
+vt 0.798999 0.289908
+vt 0.435363 0.798999
+vt 0.435363 0.728274
+vt 0.146456 0.728274
+vt 0.146456 0.798999
+vt 0.798999 0.582819
+vt 0.728274 0.582819
+vt 0.728274 0.871726
+vt 0.798999 0.871726
+vt 0.437108 0.293800
+vt 0.293655 0.293800
+vt 0.293655 0.437253
+vt 0.437108 0.437253
+vt 0.289908 0.437655
+vt 0.146456 0.437655
+vt 0.146456 0.581108
+vt 0.289908 0.581108
+vt 0.432308 0.439110
+vt 0.288855 0.439110
+vt 0.288855 0.582562
+vt 0.432308 0.582562
+vt 0.146054 0.439110
+vt 0.002601 0.439110
+vt 0.002601 0.582562
+vt 0.146054 0.582562
+vt 0.511400 0.219281
+vt 0.511400 0.074828
+vt 0.583126 0.002601
+vt 0.654853 0.074828
+vt 0.654853 0.219281
+vt 0.583126 0.291508
+vt 0.435363 0.146456
+vt 0.291910 0.146456
+vt 0.291910 0.289908
+vt 0.435363 0.289908
+vt 0.435363 0.001001
+vt 0.291910 0.001001
+vt 0.291910 0.144454
+vt 0.435363 0.144454
+vt 0.726272 0.962635
+vt 0.726272 0.946456
+vt 0.437365 0.946456
+vt 0.437365 0.962635
+vt 0.001001 0.950500
+vt 0.009091 0.946456
+vt 0.017181 0.950500
+vt 0.017181 0.958590
+vt 0.009091 0.962635
+vt 0.001001 0.958590
+vt 0.962635 0.001001
+vt 0.946456 0.001001
+vt 0.946456 0.289908
+vt 0.962635 0.289908
+vt 0.435363 0.962635
+vt 0.435363 0.946456
+vt 0.146456 0.946456
+vt 0.146456 0.962635
+vt 0.980817 0.001001
+vt 0.964637 0.001001
+vt 0.964637 0.289908
+vt 0.980817 0.289908
+vt 0.726272 0.980817
+vt 0.726272 0.964637
+vt 0.437365 0.964637
+vt 0.437365 0.980817
+vt 0.998999 0.582819
+vt 0.982819 0.582819
+vt 0.982819 0.871726
+vt 0.998999 0.871726
+vt 0.435363 0.508090
+vt 0.435363 0.437365
+vt 0.146456 0.437365
+vt 0.146456 0.508090
+vt 0.908090 0.582819
+vt 0.873728 0.582819
+vt 0.873728 0.871726
+vt 0.908090 0.871726
+vt 0.580817 0.362635
+vt 0.580817 0.291910
+vt 0.291910 0.291910
+vt 0.291910 0.362635
+vt 0.908090 0.291910
+vt 0.873728 0.291910
+vt 0.873728 0.580817
+vt 0.908090 0.580817
+vt 0.580817 0.435363
+vt 0.580817 0.364637
+vt 0.291910 0.364637
+vt 0.291910 0.435363
+vt 0.908090 0.001001
+vt 0.873728 0.001001
+vt 0.873728 0.289908
+vt 0.908090 0.289908
+vt 0.435363 0.580817
+vt 0.435363 0.510092
+vt 0.146456 0.510092
+vt 0.146456 0.580817
+vt 0.944454 0.582819
+vt 0.910092 0.582819
+vt 0.910092 0.871726
+vt 0.944454 0.871726
+vt 0.435363 0.653544
+vt 0.435363 0.582819
+vt 0.146456 0.582819
+vt 0.146456 0.653544
+vt 0.944454 0.291910
+vt 0.910092 0.291910
+vt 0.910092 0.580817
+vt 0.944454 0.580817
+vt 0.726272 0.289908
+vt 0.726272 0.219183
+vt 0.437365 0.219183
+vt 0.437365 0.289908
+vt 0.944454 0.001001
+vt 0.910092 0.001001
+vt 0.910092 0.289908
+vt 0.944454 0.289908
+vt 0.437365 0.217181
+vt 0.726272 0.217181
+vt 0.726272 0.146456
+vt 0.437365 0.146456
+vt 0.653544 0.653544
+vt 0.653544 0.364637
+vt 0.582819 0.364637
+vt 0.582819 0.653544
+vt 0.437365 0.144454
+vt 0.726272 0.144454
+vt 0.726272 0.073728
+vt 0.437365 0.073728
+vt 0.144454 0.726272
+vt 0.144454 0.437365
+vt 0.073728 0.437365
+vt 0.073728 0.726272
+vt 0.437365 0.071726
+vt 0.726272 0.071726
+vt 0.726272 0.001001
+vt 0.437365 0.001001
+vt 0.071726 0.726272
+vt 0.071726 0.437365
+vt 0.001001 0.437365
+vt 0.001001 0.726272
+vt 0.437365 0.473228
+vt 0.509091 0.437365
+vt 0.580817 0.473228
+vt 0.580817 0.544954
+vt 0.509091 0.580817
+vt 0.437365 0.544954
+vt 0.908090 0.944454
+vt 0.908090 0.873728
+vt 0.891910 0.873728
+vt 0.891910 0.944454
+vt 0.889908 0.944454
+vt 0.889908 0.873728
+vt 0.873728 0.873728
+vt 0.873728 0.944454
+vt 0.944454 0.944454
+vt 0.944454 0.873728
+vt 0.928274 0.873728
+vt 0.928274 0.944454
+vt 0.926272 0.944454
+vt 0.926272 0.873728
+vt 0.910092 0.873728
+vt 0.910092 0.944454
+vt 0.073728 0.980817
+vt 0.144454 0.980817
+vt 0.144454 0.964637
+vt 0.073728 0.964637
+vt 0.073728 0.962635
+vt 0.144454 0.962635
+vt 0.144454 0.946456
+vt 0.073728 0.946456
+vt 0.290050 0.071502
+vt 0.290050 0.000777
+vt 0.001142 0.000777
+vt 0.001142 0.071502
+vt 0.071219 0.072041
+vt 0.000494 0.072041
+vt 0.000494 0.360948
+vt 0.071219 0.360948
+vt 0.289555 0.071500
+vt 0.289555 0.000775
+vt 0.000648 0.000775
+vt 0.000648 0.071500
+vt 0.071219 0.072182
+vt 0.000494 0.072182
+vt 0.000494 0.361089
+vt 0.071219 0.361089
+vt 0.289465 0.071500
+vt 0.289465 0.000775
+vt 0.000557 0.000775
+vt 0.000557 0.071500
+vt 0.071219 0.072038
+vt 0.000494 0.072038
+vt 0.000494 0.360945
+vt 0.071219 0.360945
+usemtl (null)
+s off
+f 68/1 67/2 54/3 53/4
+f 69/5 68/6 53/7 52/8
+f 70/9 69/10 52/11 51/12
+f 71/13 70/14 51/15 50/16
+f 72/17 71/18 50/19 49/20
+f 53/21 54/22 49/23 50/24 51/25 52/26
+f 55/27 56/28 58/29 57/30
+f 57/31 58/32 60/33 59/34
+f 59/35 60/36 62/37 61/38
+f 61/39 62/40 64/41 63/42
+f 56/43 66/44 72/45 67/46
+f 65/47 66/48 56/49 55/50
+f 63/51 64/52 66/53 65/54
+f 55/55 57/56 59/57 61/58 63/59 65/60
+f 67/61 72/62 49/63 54/64
+f 66/65 64/66 71/67 72/68
+f 64/69 62/70 70/71 71/72
+f 62/73 60/74 69/75 70/76
+f 60/77 58/78 68/79 69/80
+f 58/81 56/82 67/83 68/84
+f 1/85 2/86 4/87 3/88
+f 3/89 4/90 6/91 5/92
+f 5/93 6/94 8/95 7/96
+f 7/97 8/98 10/99 9/100
+f 4/101 2/102 12/103 10/104 8/105 6/106
+f 11/107 12/108 2/109 1/110
+f 9/111 10/112 12/113 11/114
+f 19/115 22/116 13/117 18/118
+f 13/119 14/120 15/121 16/122 17/123 18/124
+f 23/125 19/126 18/127 17/128
+f 25/129 23/130 17/131 16/132
+f 27/133 25/134 16/135 15/136
+f 29/137 27/138 15/139 14/140
+f 22/141 29/142 14/143 13/144
+f 11/145 1/146 21/147 20/148
+f 20/149 21/150 22/151 19/152
+f 9/153 11/154 20/155 24/156
+f 24/157 20/158 19/159 23/160
+f 7/161 9/162 24/163 26/164
+f 26/165 24/166 23/167 25/168
+f 5/169 7/170 26/171 28/172
+f 28/173 26/174 25/175 27/176
+f 3/177 5/178 28/179 30/180
+f 30/181 28/182 27/183 29/184
+f 1/185 3/186 30/187 21/188
+f 21/189 30/190 29/191 22/192
+f 31/193 32/194 34/195 33/196
+f 33/197 34/198 36/199 35/200
+f 35/201 36/202 38/203 37/204
+f 37/205 38/206 40/207 39/208
+f 41/209 42/210 32/211 31/212
+f 39/213 40/214 42/215 41/216
+f 31/217 33/218 35/219 37/220 39/221 41/222
+f 34/223 32/224 48/225 47/226
+f 36/227 34/228 47/229 46/230
+f 38/231 36/232 46/233 45/234
+f 40/235 38/236 45/237 44/238
+f 42/239 40/240 44/241 43/242
+f 32/243 42/244 43/245 48/246
+f 47/247 48/248 78/249 77/250
+f 46/251 47/252 77/253 76/254
+f 45/255 46/256 76/257 75/258
+f 44/259 45/260 75/261 74/262
+f 43/263 44/264 74/265 73/266
+f 48/267 43/268 73/269 78/270