diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua index d2dbf67d..0a40bc49 100644 --- a/homedecor/crafts.lua +++ b/homedecor/crafts.lua @@ -2504,7 +2504,7 @@ minetest.register_craft( { }) minetest.register_craft( { - output = "homedecor:wardrobe_bottom", + output = "homedecor:wardrobe", recipe = { { "homedecor:drawer_small", "homedecor:kitchen_cabinet" }, { "homedecor:drawer_small", "default:wood" }, @@ -2758,7 +2758,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "homedecor:deckchair_foot", + output = "homedecor:deckchair", recipe = { { "group:stick", "building_blocks:terrycloth_towel", "group:stick" }, { "group:stick", "building_blocks:terrycloth_towel", "group:stick" }, @@ -2801,7 +2801,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "homedecor:grandfather_clock_bottom", + output = "homedecor:grandfather_clock", recipe = { { "building_blocks:slab_hardwood","homedecor:analog_clock_wood","building_blocks:slab_hardwood" }, { "building_blocks:slab_hardwood","technic:brass_ingot","building_blocks:slab_hardwood" }, @@ -3076,7 +3076,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "homedecor:tool_cabinet_bottom", + output = "homedecor:tool_cabinet", recipe = { { "homedecor:motor", "default:axe_steel", "default:pick_steel" }, { "default:steel_ingot", "homedecor:drawer_small", "default:steel_ingot" }, diff --git a/homedecor/exterior.lua b/homedecor/exterior.lua index 8978864f..ac7d09f0 100644 --- a/homedecor/exterior.lua +++ b/homedecor/exterior.lua @@ -173,67 +173,24 @@ homedecor.register("bench_large_2_right", { selection_box = homedecor.nodebox.null, }) -homedecor.register("deckchair_head", { - tiles = { - "homedecor_deckchair_top_c1.png", - "homedecor_deckchair_sides.png", - "homedecor_deckchair_sides.png", - "homedecor_deckchair_sides.png^[transformFX", - "homedecor_deckchair_sides.png", - "homedecor_deckchair_front.png" - }, - groups = { snappy = 3, not_in_creative_inventory = 1 }, - node_box = { - type = "fixed", - fixed = { - {-0.375, -0.3125, -0.0625, 0.375, -0.25, 0}, -- NodeBox1 - {-0.375, -0.25, 0, 0.375, -0.1875, 0.0625}, -- NodeBox2 - {-0.375, -0.1875, 0.0625, 0.375, -0.125, 0.125}, -- NodeBox3 - {-0.375, -0.125, 0.125, 0.375, -0.0625, 0.1875}, -- NodeBox4 - {-0.375, -0.0625, 0.1875, 0.375, 0, 0.25}, -- NodeBox5 - {-0.375, 0, 0.25, 0.375, 0.0625, 0.3125}, -- NodeBox6 - {-0.375, 0.0625, 0.3125, 0.375, 0.125, 0.375}, -- NodeBox7 - {-0.375, 0.125, 0.375, 0.375, 0.1875, 0.4375}, -- NodeBox8 - {-0.375, 0.1875, 0.4375, 0.375, 0.25, 0.5}, -- NodeBox9 - {-0.375, -0.375, -0.5, 0.375, -0.3125, 0.0625}, -- NodeBox10 - {0.3125, -0.1875, -0.5, 0.4375, -0.1575, 0.0625}, -- NodeBox11 - {-0.4375, -0.1875, -0.5, -0.3125, -0.1575, 0.0625}, -- NodeBox12 - {0.3125, -0.5, 0, 0.375, -0.25, 0.0625}, -- NodeBox13 - {-0.375, -0.5, 0, -0.3125, -0.25, 0.0625}, -- NodeBox14 - } - }, - selection_box = homedecor.nodebox.null +local dc_cbox = { + type = "fixed", + fixed = { -0.5, -0.5, -0.5, 0.5, 0, 1 } +} + +homedecor.register("deckchair", { + mesh = "homedecor_deckchair.obj", + tiles = {"homedecor_deckchair.png"}, + description = "Deck Chair", + groups = { snappy = 3 }, + expand = { forward="air" }, + sounds = default.node_sound_wood_defaults(), + selection_box = dc_cbox, + collision_box = dc_cbox, }) -homedecor.register("deckchair_foot", { - tiles = { - "homedecor_deckchair_top_c2.png", - "homedecor_deckchair_sides.png", - "homedecor_deckchair_sides.png", - "homedecor_deckchair_sides.png^[transformFX", - "homedecor_deckchair_front.png" - }, - description = "Deck chair", - inventory_image = "homedecor_deckchair_inv.png", - groups = { snappy = 3 }, - node_box = { - type = "fixed", - fixed = { - {-0.375, -0.375, -0.5, 0.375, -0.3125, 0.5}, -- NodeBox1 - {0.3125, -0.5, -0.5, 0.375, -0.375, -0.4375}, -- NodeBox2 - {-0.375, -0.5, -0.5, -0.3125, -0.375, -0.4375}, -- NodeBox3 - {0.3125, -0.1875, 0.3, 0.4375, -0.1575, 0.5}, -- NodeBox4 - {-0.4375, -0.1875, 0.3, -0.3125, -0.1575, 0.5}, -- NodeBox5 - {-0.365, -0.3125, 0.32, -0.3225, -0.1875, 0.4375}, -- NodeBox6 - {0.3225, -0.3125, 0.32, 0.365, -0.1875, 0.4375}, -- NodeBox7 - } - }, - selection_box = { - type = "fixed", - fixed = { -0.45, -0.5, -0.5, 0.45, 0.35, 1.5 } - }, - expand = { forward="homedecor:deckchair_head" }, -}) +minetest.register_alias("homedecor:deckchair_foot", "homedecor:deckchair") +minetest.register_alias("homedecor:deckchair_head", "air") homedecor.register("doghouse", { mesh = "homedecor_doghouse.obj", diff --git a/homedecor/misc-nodes.lua b/homedecor/misc-nodes.lua index d1c44bdb..2879c419 100644 --- a/homedecor/misc-nodes.lua +++ b/homedecor/misc-nodes.lua @@ -407,6 +407,7 @@ homedecor.register("bottle_"..b, { mesh = "homedecor_bottle.obj", sunlight_propagates = true, groups = {snappy=3}, + sounds = default.node_sound_glass_defaults(), collision_box = bottle_cbox, selection_box = bottle_cbox }) @@ -420,6 +421,7 @@ homedecor.register("4_bottles_"..b, { mesh = "homedecor_4_bottles.obj", sunlight_propagates = true, groups = {snappy=3}, + sounds = default.node_sound_glass_defaults(), collision_box = fbottle_cbox, selection_box = fbottle_cbox }) @@ -433,6 +435,7 @@ homedecor.register("4_bottles_multi", { mesh = "homedecor_4_bottles_multi.obj", sunlight_propagates = true, groups = {snappy=3}, + sounds = default.node_sound_glass_defaults(), collision_box = fbottle_cbox, selection_box = fbottle_cbox }) diff --git a/homedecor/models/homedecor_deckchair.obj b/homedecor/models/homedecor_deckchair.obj new file mode 100644 index 00000000..5983ed37 --- /dev/null +++ b/homedecor/models/homedecor_deckchair.obj @@ -0,0 +1,368 @@ +# Blender v2.72 (sub 0) OBJ File: '' +# www.blender.org +mtllib deckchair.mtl +o Cube.001 +v -0.416005 0.232654 0.483276 +v -0.386301 0.232654 0.483276 +v -0.386301 -0.352386 0.586435 +v -0.416004 -0.352386 0.586435 +v -0.386301 0.239536 0.488095 +v -0.386301 0.247788 0.534898 +v -0.386301 0.242970 0.541780 +v -0.386301 -0.342071 0.644939 +v -0.386301 -0.348952 0.640120 +v -0.386301 -0.357205 0.593317 +v -0.416004 0.242970 0.541781 +v -0.416004 -0.342071 0.644939 +v -0.416005 0.247788 0.534899 +v -0.416004 0.239536 0.488095 +v -0.416004 -0.357205 0.593317 +v -0.416004 -0.348952 0.640120 +v -0.386300 0.570892 0.961787 +v -0.356596 0.570892 0.961787 +v -0.356602 -0.451333 -0.498102 +v -0.386305 -0.451333 -0.498102 +v -0.356596 0.569433 0.970061 +v -0.356596 0.530503 0.997320 +v -0.356596 0.522229 0.995861 +v -0.356602 -0.499997 -0.464028 +v -0.356602 -0.498538 -0.472302 +v -0.356601 -0.459607 -0.499561 +v -0.386300 0.522229 0.995861 +v -0.386305 -0.499997 -0.464028 +v -0.386299 0.530503 0.997321 +v -0.386299 0.569433 0.970061 +v -0.386305 -0.459607 -0.499561 +v -0.386305 -0.498538 -0.472302 +v -0.356601 -0.118875 -0.476087 +v -0.326898 -0.118875 -0.476087 +v -0.326893 -0.503263 0.958471 +v -0.356597 -0.503263 0.958471 +v -0.326898 -0.111599 -0.480287 +v -0.326898 -0.065693 -0.467987 +v -0.326898 -0.061492 -0.460711 +v -0.326893 -0.445880 0.973846 +v -0.326893 -0.453156 0.978046 +v -0.326893 -0.499062 0.965746 +v -0.356601 -0.061492 -0.460712 +v -0.356596 -0.445880 0.973846 +v -0.356601 -0.065693 -0.467987 +v -0.356601 -0.111599 -0.480287 +v -0.356596 -0.499062 0.965746 +v -0.356596 -0.453156 0.978047 +v -0.330756 -0.078125 -0.437450 +v 0.331279 -0.078125 -0.438202 +v -0.330736 -0.108997 -0.419627 +v 0.331299 -0.108997 -0.420378 +v -0.330776 -0.108997 -0.455274 +v 0.331259 -0.108997 -0.456025 +v -0.330736 -0.088416 -0.419627 +v 0.331299 -0.088416 -0.420378 +v -0.330776 -0.088416 -0.455274 +v 0.331259 -0.088416 -0.456025 +v -0.330756 -0.119287 -0.437450 +v 0.331279 -0.119287 -0.438202 +v 0.415686 0.232654 0.483274 +v 0.415686 -0.352386 0.586432 +v 0.385983 -0.352386 0.586432 +v 0.385983 0.232654 0.483274 +v 0.385983 -0.357205 0.593314 +v 0.385983 -0.348953 0.640117 +v 0.385983 -0.342071 0.644936 +v 0.385983 0.242970 0.541778 +v 0.385983 0.247788 0.534896 +v 0.385983 0.239536 0.488093 +v 0.415687 -0.342071 0.644936 +v 0.415686 0.242970 0.541778 +v 0.415687 -0.348953 0.640117 +v 0.415687 -0.357205 0.593314 +v 0.415686 0.239536 0.488092 +v 0.415687 0.247788 0.534896 +v 0.385985 0.570892 0.961784 +v 0.385980 -0.451333 -0.498105 +v 0.356276 -0.451333 -0.498105 +v 0.356281 0.570892 0.961785 +v 0.356276 -0.459607 -0.499564 +v 0.356276 -0.498538 -0.472304 +v 0.356276 -0.499997 -0.464031 +v 0.356282 0.522229 0.995859 +v 0.356281 0.530503 0.997318 +v 0.356281 0.569433 0.970058 +v 0.385980 -0.499997 -0.464031 +v 0.385985 0.522229 0.995859 +v 0.385980 -0.498538 -0.472304 +v 0.385980 -0.459607 -0.499564 +v 0.385985 0.569433 0.970058 +v 0.385985 0.530503 0.997318 +v 0.356276 -0.118875 -0.476089 +v 0.356281 -0.503263 0.958468 +v 0.326578 -0.503263 0.958468 +v 0.326573 -0.118875 -0.476089 +v 0.326578 -0.499062 0.965744 +v 0.326578 -0.453157 0.978044 +v 0.326578 -0.445880 0.973844 +v 0.326573 -0.061492 -0.460714 +v 0.326573 -0.065693 -0.467990 +v 0.326573 -0.111599 -0.480290 +v 0.356281 -0.445880 0.973844 +v 0.356276 -0.061492 -0.460714 +v 0.356282 -0.453157 0.978045 +v 0.356282 -0.499062 0.965744 +v 0.356276 -0.111599 -0.480290 +v 0.356276 -0.065693 -0.467990 +v 0.308757 0.516736 0.963905 +v 0.356377 0.501814 0.949297 +v -0.356630 0.501814 0.950105 +v 0.356357 0.512105 0.931473 +v -0.356650 0.512105 0.932282 +v 0.356357 0.532686 0.931473 +v -0.356650 0.532686 0.932282 +v 0.356377 0.542976 0.949297 +v -0.356630 0.542976 0.950105 +v 0.356398 0.532686 0.967120 +v -0.356610 0.532686 0.967929 +v 0.356398 0.512105 0.967120 +v -0.356610 0.512105 0.967929 +v 0.389743 -0.340796 0.610180 +v -0.390765 -0.340796 0.611065 +v 0.389723 -0.330506 0.592356 +v -0.390785 -0.330506 0.593241 +v 0.389723 -0.309925 0.592356 +v -0.390785 -0.309925 0.593241 +v 0.389743 -0.299634 0.610180 +v -0.390765 -0.299634 0.611065 +v 0.389763 -0.309925 0.628003 +v -0.390745 -0.309925 0.628889 +v 0.389763 -0.330506 0.628003 +v -0.390745 -0.330506 0.628889 +v -0.338775 0.107305 0.594305 +v -0.323825 -0.132414 0.256327 +v -0.327803 -0.224373 -0.081650 +v 0.338696 0.107305 0.593510 +v 0.323960 -0.132414 0.255548 +v 0.328153 -0.224373 -0.082415 +vt 0.501314 0.105626 +vt 0.994459 0.105626 +vt 0.994446 0.067908 +vt 0.501298 0.067908 +vt 0.934049 0.983658 +vt 0.934049 0.005141 +vt 0.501326 0.916652 +vt 0.994473 0.916652 +vt 0.994473 0.890861 +vt 0.501326 0.890861 +vt 0.701433 0.981716 +vt 0.701433 0.005749 +vt 0.501314 0.125534 +vt 0.994459 0.125534 +vt 0.501326 0.942443 +vt 0.994473 0.942443 +vt 0.501298 0.160070 +vt 0.994446 0.160070 +vt 0.972905 0.983658 +vt 0.965134 0.005141 +vt 0.501326 0.968233 +vt 0.994731 0.974990 +vt 0.732517 0.980991 +vt 0.732517 0.002474 +vt 0.501298 0.190791 +vt 0.994446 0.190791 +vt 0.987218 0.010678 +vt 0.501537 0.995149 +vt 0.994473 0.992114 +vt 0.758558 0.982038 +vt 0.758558 0.005428 +vt 0.501312 0.220591 +vt 0.994459 0.220591 +vt 0.000922 0.000433 +vt 0.000761 0.999494 +vt 0.499027 0.999328 +vt 0.499184 0.000519 +vt 0.000521 -0.000070 +vt 0.000980 0.999173 +vt 0.499331 0.999867 +vt 0.499556 0.000624 +vt 0.000118 0.001382 +vt 0.000444 1.000054 +vt 0.499283 0.999950 +vt 0.499090 0.000579 +vt 0.002692 -0.000992 +vt -0.000835 1.000097 +vt 0.499240 0.999342 +vt 0.498849 -0.000329 +vt 0.994473 0.684535 +vt 0.992047 0.627986 +vt 0.503752 0.627986 +vt 0.501326 0.684535 +vt 0.856339 0.005141 +vt 0.822269 0.006761 +vt 0.822269 0.982038 +vt 0.856339 0.983658 +vt 0.794078 0.385745 +vt 0.794078 0.326578 +vt 0.764223 0.326578 +vt 0.770765 0.385745 +vt 0.825254 0.352957 +vt 0.794170 0.352957 +vt 0.794170 0.414399 +vt 0.825254 0.414399 +vt 0.826392 0.385745 +vt 0.832934 0.326578 +vt 0.764315 0.352957 +vt 0.764315 0.414399 +vt 0.994473 0.736117 +vt 0.501326 0.736117 +vt 0.627020 0.003808 +vt 0.588823 0.004416 +vt 0.584609 0.980383 +vt 0.631235 0.981716 +vt 0.794078 0.444911 +vt 0.764223 0.444911 +vt 0.825254 0.293791 +vt 0.794170 0.293791 +vt 0.832934 0.444911 +vt 0.808391 0.388020 +vt 0.764315 0.293791 +vt 0.994473 0.787698 +vt 0.501326 0.787698 +vt 0.887423 0.005141 +vt 0.887423 0.983658 +vt 0.857476 0.385745 +vt 0.864018 0.326578 +vt 0.886194 0.352957 +vt 0.856339 0.352957 +vt 0.862881 0.414399 +vt 0.879652 0.414399 +vt 0.879560 0.385745 +vt 0.886102 0.326578 +vt 0.501326 0.839280 +vt 0.994473 0.839280 +vt 0.650992 0.982324 +vt 0.650992 0.003808 +vt 0.864018 0.444911 +vt 0.839476 0.388020 +vt 0.886194 0.293791 +vt 0.856339 0.293791 +vt 0.886102 0.444911 +vt 0.870560 0.388020 +vt 0.506659 0.008221 +vt 0.840796 0.416674 +vt 0.840796 0.475840 +vt 0.825254 0.478116 +vt 0.794170 0.475840 +vt 0.794170 0.535007 +vt 0.833025 0.535007 +vt 0.878423 0.475840 +vt 0.764315 0.475840 +vt 0.764315 0.535007 +vt 0.864110 0.535007 +vt 0.886194 0.535007 +vt 0.857568 0.478116 +vt 0.549072 0.015886 +vt 0.944980 0.015886 +vt 0.944985 0.117138 +vt 0.549074 0.117138 +vt 0.573594 0.007083 +vt 0.569379 0.983658 +vt 0.526655 0.980383 +vt 0.529640 0.004416 +vt 0.944983 0.220301 +vt 0.549072 0.220301 +vt 0.638748 0.009024 +vt 0.994473 0.323465 +vt 0.944982 0.323464 +vt 0.549070 0.323464 +vt 0.501326 0.323464 +vt 0.994473 0.426627 +vt 0.944983 0.426627 +vt 0.549070 0.426627 +vt 0.501326 0.426628 +vt 0.992047 0.534271 +vt 0.944984 0.527880 +vt 0.549074 0.527880 +vt 0.503751 0.534271 +usemtl None_NONE +s off +f 52/1 51/2 59/3 60/4 +f 58/5 57/6 49/6 50/5 +f 54/7 53/8 57/9 58/10 +f 50/11 49/12 55/12 56/11 +f 56/13 55/14 51/2 52/1 +f 60/5 59/6 53/6 54/5 +f 110/15 111/16 113/8 112/7 +f 112/11 113/12 115/12 114/11 +f 114/17 115/18 117/14 116/13 +f 116/19 117/20 119/6 118/5 +f 120/21 121/22 111/16 110/15 +f 118/23 119/24 121/12 120/11 +f 124/25 125/26 127/18 126/17 +f 122/19 123/27 125/20 124/19 +f 126/28 127/29 129/22 128/21 +f 128/30 129/31 131/24 130/23 +f 132/32 133/33 123/26 122/25 +f 130/22 131/27 133/27 132/19 +f 138/34 137/35 134/36 135/37 +f 139/38 138/39 135/40 136/41 +f 56/42 139/43 136/44 55/45 +f 137/46 114/47 115/48 134/49 +usemtl None +f 1/50 2/51 3/52 4/53 +f 7/54 11/55 12/56 8/57 +f 16/58 9/59 8/59 12/58 +f 2/58 1/59 14/60 5/61 +f 13/62 6/63 5/64 14/65 +f 11/66 7/67 6/59 13/58 +f 4/58 3/59 10/59 15/58 +f 15/63 10/68 9/69 16/64 +f 17/70 18/50 19/53 20/71 +f 23/72 27/73 28/74 24/75 +f 32/76 25/58 24/58 28/76 +f 30/76 21/61 18/61 17/77 +f 29/78 22/79 21/63 30/62 +f 27/80 23/66 22/66 29/76 +f 20/76 19/81 26/58 31/76 +f 31/79 26/82 25/68 32/63 +f 33/83 34/70 35/71 36/84 +f 39/85 43/54 44/57 40/86 +f 48/87 41/88 40/67 44/66 +f 46/66 37/67 34/67 33/66 +f 45/89 38/90 37/91 46/92 +f 43/93 39/94 38/88 45/87 +f 36/87 35/88 42/88 47/87 +f 47/90 42/62 41/65 48/91 +f 61/95 62/96 63/83 64/84 +f 68/97 67/98 71/72 72/75 +f 73/87 71/87 67/80 66/99 +f 75/100 61/66 64/80 70/80 +f 76/101 75/102 70/90 69/89 +f 72/93 76/93 69/99 68/103 +f 62/104 74/87 65/99 63/99 +f 74/102 73/78 66/62 65/90 +f 77/4 78/3 79/27 80/105 +f 84/5 83/6 87/85 88/86 +f 89/91 87/106 83/107 82/107 +f 91/106 77/65 80/107 86/107 +f 92/108 91/109 86/110 85/111 +f 88/92 92/92 85/112 84/112 +f 78/91 90/91 81/107 79/112 +f 90/109 89/113 82/114 81/110 +f 93/10 94/9 95/96 96/95 +f 100/11 99/12 103/98 104/97 +f 105/107 103/107 99/111 98/115 +f 107/107 93/108 96/111 102/111 +f 108/65 107/64 102/109 101/107 +f 104/112 108/112 101/115 100/116 +f 94/112 106/117 97/115 95/115 +f 106/64 105/69 98/113 97/109 +f 19/1 18/105 21/118 22/119 23/27 24/2 25/120 26/121 +f 83/122 84/74 85/123 86/124 80/124 79/105 81/125 82/122 +f 33/14 36/33 47/126 48/127 44/32 43/13 45/121 46/120 +f 99/74 100/122 101/73 102/72 96/128 95/75 97/75 98/74 +f 65/127 66/126 67/33 68/129 69/130 70/131 64/132 63/32 +f 35/12 34/11 37/11 38/97 39/75 40/128 41/98 42/12 +f 62/129 61/133 75/134 76/135 72/136 71/132 73/131 74/130 +f 32/11 28/11 27/12 29/12 30/31 17/31 20/30 31/30 +f 4/137 15/138 16/139 12/140 11/136 13/135 14/134 1/133 +f 89/56 90/30 78/30 77/31 91/31 92/55 88/55 87/56 +f 6/140 7/140 8/137 9/137 10/51 3/51 2/52 5/52 +f 108/124 104/124 103/125 105/125 106/73 94/73 93/74 107/74 diff --git a/homedecor/textures/homedecor_deckchair.png b/homedecor/textures/homedecor_deckchair.png new file mode 100644 index 00000000..a3f0ff3c Binary files /dev/null and b/homedecor/textures/homedecor_deckchair.png differ diff --git a/homedecor/textures/homedecor_deckchair_front.png b/homedecor/textures/homedecor_deckchair_front.png deleted file mode 100644 index 437ec1fd..00000000 Binary files a/homedecor/textures/homedecor_deckchair_front.png and /dev/null differ diff --git a/homedecor/textures/homedecor_deckchair_inv.png b/homedecor/textures/homedecor_deckchair_inv.png deleted file mode 100644 index 76fa1cc0..00000000 Binary files a/homedecor/textures/homedecor_deckchair_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_deckchair_sides.png b/homedecor/textures/homedecor_deckchair_sides.png deleted file mode 100644 index 8e002196..00000000 Binary files a/homedecor/textures/homedecor_deckchair_sides.png and /dev/null differ diff --git a/homedecor/textures/homedecor_deckchair_top_c1.png b/homedecor/textures/homedecor_deckchair_top_c1.png deleted file mode 100644 index 9ec1b269..00000000 Binary files a/homedecor/textures/homedecor_deckchair_top_c1.png and /dev/null differ diff --git a/homedecor/textures/homedecor_deckchair_top_c2.png b/homedecor/textures/homedecor_deckchair_top_c2.png deleted file mode 100644 index a103643b..00000000 Binary files a/homedecor/textures/homedecor_deckchair_top_c2.png and /dev/null differ