diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua index e18bb168..bb361b4c 100644 --- a/homedecor/crafts.lua +++ b/homedecor/crafts.lua @@ -2982,6 +2982,21 @@ minetest.register_craft({ }, }) +local picture_dyes = { + {"dye:brown", "dye:green"}, -- the figure sitting by the tree, wielding a pick + {"dye:green", "dye:blue"} -- the "family photo" +} + +for i in ipairs(picture_dyes) do + minetest.register_craft({ + output = "homedecor:picture_frame"..i, + recipe = { + { picture_dyes[i][1], picture_dyes[i][2] }, + { "homedecor:blank_canvas", "group:stick" }, + }, + }) +end + if (minetest.get_modpath("technic") and minetest.get_modpath("dye") and minetest.get_modpath("bees")) then technic.register_separating_recipe({ input = {"bees:wax 1"}, output = {"homedecor:oil_extract 2","dye:yellow 1"} }) end diff --git a/homedecor/misc-nodes.lua b/homedecor/misc-nodes.lua index ee511809..881a3be2 100644 --- a/homedecor/misc-nodes.lua +++ b/homedecor/misc-nodes.lua @@ -1409,3 +1409,21 @@ homedecor.register("wine_rack", { sounds = default.node_sound_defaults(), }) +local pframe_cbox = { + type = "fixed", + fixed = { -0.18, -0.5, -0.08, 0.18, -0.08, 0.18 } +} +local n = { 1, 2 } + +for _, i in ipairs(n) do + homedecor.register("picture_frame"..i, { + description = S("Picture Frame"), + mesh = "homedecor_picture_frame.obj", + tiles = { "homedecor_picture_frame"..i..".png" }, + inventory_image = "homedecor_picture_frame"..i.."_inv.png", + wield_image = "homedecor_picture_frame"..i.."_inv.png", + groups = {snappy = 3}, + selection_box = pframe_cbox, + collision_box = pframe_cbox, + }) +end diff --git a/homedecor/models/homedecor_picture_frame.obj b/homedecor/models/homedecor_picture_frame.obj new file mode 100644 index 00000000..16c947f4 --- /dev/null +++ b/homedecor/models/homedecor_picture_frame.obj @@ -0,0 +1,214 @@ +# Blender v2.69 (sub 0) OBJ File: '' +# www.blender.org +mtllib picture_frame.mtl +o Cube.001 +v 0.019005 -0.122346 0.016035 +v 0.147926 -0.122153 0.017187 +v 0.147829 -0.123906 0.028259 +v 0.018908 -0.124099 0.027107 +v 0.019108 -0.192467 0.016285 +v 0.148029 -0.192273 0.017437 +v 0.019203 -0.225053 0.011126 +v 0.148124 -0.224859 0.012279 +v 0.019928 -0.474102 -0.028297 +v 0.148849 -0.473909 -0.027144 +v -0.017670 -0.122401 0.015707 +v -0.017766 -0.124154 0.026779 +v -0.017567 -0.192522 0.015957 +v -0.017472 -0.225108 0.010799 +v -0.016746 -0.474157 -0.028625 +v -0.143167 -0.122590 0.014585 +v -0.143264 -0.124343 0.025657 +v -0.143064 -0.192710 0.014835 +v -0.142969 -0.225296 0.009677 +v -0.142244 -0.474345 -0.029747 +v 0.024826 -0.504244 -0.024836 +v 0.024992 -0.501226 -0.043898 +v 0.173052 -0.501004 -0.042574 +v 0.172886 -0.504022 -0.023512 +v 0.023637 -0.096473 0.039712 +v 0.171698 -0.096251 0.041036 +v 0.171864 -0.093233 0.021974 +v 0.023803 -0.093455 0.020651 +v -0.167208 -0.176411 0.025396 +v -0.167440 -0.096760 0.038004 +v -0.167274 -0.093742 0.018942 +v -0.167042 -0.173393 0.006334 +v 0.172096 -0.172885 0.009366 +v 0.171930 -0.175902 0.028428 +v 0.023980 -0.214089 0.021094 +v 0.172041 -0.213867 0.022418 +v 0.172207 -0.210849 0.003356 +v 0.148946 -0.472156 -0.038216 +v 0.148220 -0.223106 0.001207 +v -0.142968 -0.190957 0.003763 +v -0.021430 -0.501295 -0.044313 +v -0.166085 -0.501512 -0.045606 +v -0.142147 -0.472592 -0.040819 +v -0.016650 -0.472404 -0.039697 +v -0.167097 -0.214375 0.019386 +v -0.166931 -0.211357 0.000324 +v 0.023869 -0.176124 0.027104 +v 0.148125 -0.190520 0.006365 +v -0.142873 -0.223543 -0.001396 +v -0.166251 -0.504530 -0.026544 +v -0.021596 -0.504313 -0.025251 +v -0.022785 -0.096543 0.039297 +v -0.022619 -0.093525 0.020236 +v -0.022442 -0.214158 0.020679 +v 0.020025 -0.472349 -0.039369 +v -0.022553 -0.176194 0.026689 +v -0.047003 -0.500891 0.133861 +v -0.047695 -0.500766 0.138376 +v 0.052470 -0.499932 0.135187 +v 0.051783 -0.499656 0.139192 +vt 0.070443 0.696601 +vt 0.121137 0.696118 +vt 0.144469 0.720728 +vt 0.146695 0.716626 +vt 0.140408 0.724016 +vt 0.143128 0.727780 +vt 0.122972 0.748091 +vt 0.071612 0.750988 +vt 0.501028 0.253839 +vt 0.522837 0.253232 +vt 0.529388 0.423064 +vt 0.506548 0.424680 +vt 0.040595 0.269658 +vt 0.028355 0.439142 +vt 0.000067 0.442481 +vt 0.021036 0.268355 +vt 0.905674 0.007987 +vt 0.996736 0.012999 +vt 0.995537 0.034792 +vt 0.904486 0.029930 +vt 0.961764 0.388832 +vt 0.967403 0.243855 +vt 0.999837 0.249856 +vt 0.995315 0.415980 +vt 0.904395 0.420712 +vt 0.996485 0.437760 +vt 0.905479 0.442646 +vt 0.157375 0.262492 +vt 0.165313 0.435096 +vt 0.860851 0.423072 +vt 0.562582 0.394542 +vt 0.846349 0.396610 +vt 0.961877 0.061966 +vt 0.882528 0.055376 +vt 0.521755 0.200904 +vt 0.522270 0.027621 +vt 0.557648 0.057296 +vt 0.554710 0.205743 +vt 0.569145 0.387814 +vt 0.846059 0.384392 +vt 0.955485 0.068450 +vt 0.881669 0.067419 +vt 0.565073 0.064709 +vt 0.566719 0.205207 +vt 0.861708 0.005427 +vt 0.860891 0.027277 +vt 0.861420 0.444879 +vt 0.128201 0.264137 +vt 0.123050 0.437187 +vt 0.882630 0.395251 +vt 0.845988 0.053843 +vt 0.881867 0.383239 +vt 0.955417 0.382327 +vt 0.845494 0.066074 +vt 0.528554 0.000067 +vt 0.529388 0.444878 +vt 0.500231 0.201850 +vt 0.043155 0.230351 +vt 0.025024 0.230175 +vt 0.967458 0.203577 +vt 0.999933 0.197561 +vt 0.156333 0.232969 +vt 0.555492 0.246597 +vt 0.567662 0.246132 +vt 0.127537 0.233243 +vt 0.491809 0.031758 +vt 0.028724 0.083762 +vt 0.009467 0.085838 +vt 0.147240 0.067539 +vt 0.110271 0.075377 +vt 0.955263 0.243660 +vt 0.467946 0.893178 +vt 0.467577 0.995908 +vt 0.302208 0.994898 +vt 0.301838 0.893750 +vt 0.468122 0.843905 +vt 0.301064 0.844501 +vt 0.467588 0.462894 +vt 0.299684 0.463685 +vt 0.955312 0.203773 +vt 0.501387 0.893529 +vt 0.501006 0.996327 +vt 0.501498 0.844361 +vt 0.501892 0.461957 +vt 0.673024 0.896263 +vt 0.673812 0.995711 +vt 0.674346 0.846529 +vt 0.674949 0.460933 +usemtl Material.003 +s off +f 56/1 54/2 57/3 58/4 +f 58/4 57/3 59/5 60/6 +f 54/2 35/7 59/5 57/3 +f 47/8 56/1 58/4 60/6 +f 35/7 47/8 60/6 59/5 +usemtl Material.002 +f 21/9 22/10 23/11 24/12 +f 25/13 26/14 27/15 28/16 +f 29/17 30/18 31/19 32/20 +f 2/21 1/22 28/23 27/24 +f 33/25 27/24 26/26 34/27 +f 35/28 21/9 24/12 36/29 +f 37/30 23/11 38/31 39/32 +f 32/20 31/19 16/33 40/34 +f 41/35 42/36 43/37 44/38 +f 39/32 38/31 10/39 8/40 +f 40/34 16/33 17/41 18/42 +f 44/38 43/37 20/43 15/44 +f 45/45 29/17 32/20 46/46 +f 37/30 33/25 34/27 36/47 +f 25/13 47/48 34/49 26/14 +f 27/24 33/25 48/50 2/21 +f 46/46 32/20 40/34 49/51 +f 2/21 48/50 6/52 3/53 +f 49/51 40/34 18/42 19/54 +f 47/48 35/28 36/29 34/49 +f 33/25 37/30 39/32 48/50 +f 48/50 39/32 8/40 6/52 +f 50/55 45/45 46/46 42/36 +f 23/11 37/30 36/47 24/56 +f 42/36 46/46 49/51 43/37 +f 43/37 49/51 19/54 20/43 +f 51/57 41/35 22/10 21/9 +f 52/58 25/13 28/16 53/59 +f 1/22 11/60 53/61 28/23 +f 54/62 51/57 21/9 35/28 +f 23/11 22/10 55/63 38/31 +f 38/31 55/63 9/64 10/39 +f 52/58 56/65 47/48 25/13 +f 22/10 41/35 44/38 55/63 +f 55/63 44/38 15/44 9/64 +f 50/66 42/36 41/35 51/57 +f 30/67 52/58 53/59 31/68 +f 31/19 53/61 11/60 16/33 +f 45/69 50/66 51/57 54/62 +f 30/67 29/70 56/65 52/58 +f 29/70 45/69 54/62 56/65 +usemtl Material.001 +f 1/22 2/21 3/53 4/71 +f 5/72 4/73 3/74 6/75 +f 7/76 5/72 6/75 8/77 +f 9/78 7/76 8/77 10/79 +f 11/60 1/22 4/71 12/80 +f 13/81 12/82 4/73 5/72 +f 14/83 13/81 5/72 7/76 +f 15/84 14/83 7/76 9/78 +f 16/33 11/60 12/80 17/41 +f 18/85 17/86 12/82 13/81 +f 19/87 18/85 13/81 14/83 +f 20/88 19/87 14/83 15/84 diff --git a/homedecor/textures/homedecor_picture_frame1.png b/homedecor/textures/homedecor_picture_frame1.png new file mode 100644 index 00000000..e07854c2 Binary files /dev/null and b/homedecor/textures/homedecor_picture_frame1.png differ diff --git a/homedecor/textures/homedecor_picture_frame1_inv.png b/homedecor/textures/homedecor_picture_frame1_inv.png new file mode 100644 index 00000000..c984196b Binary files /dev/null and b/homedecor/textures/homedecor_picture_frame1_inv.png differ diff --git a/homedecor/textures/homedecor_picture_frame2.png b/homedecor/textures/homedecor_picture_frame2.png new file mode 100644 index 00000000..6917fbdd Binary files /dev/null and b/homedecor/textures/homedecor_picture_frame2.png differ diff --git a/homedecor/textures/homedecor_picture_frame2_inv.png b/homedecor/textures/homedecor_picture_frame2_inv.png new file mode 100644 index 00000000..e6fae20f Binary files /dev/null and b/homedecor/textures/homedecor_picture_frame2_inv.png differ