diff --git a/homedecor/clocks.lua b/homedecor/clocks.lua index 9682a6ac..4e8beec3 100644 --- a/homedecor/clocks.lua +++ b/homedecor/clocks.lua @@ -82,7 +82,7 @@ homedecor.register("grandfather_clock", { tiles = { "default_glass.png", "homedecor_grandfather_clock_face.png", - "homedecor_generic_wood_luxury_brown1.png", + "homedecor_generic_wood_luxury.png", "homedecor_grandfather_clock_face_edge.png", "homedecor_generic_metal_brass.png" }, diff --git a/homedecor/doors_and_gates.lua b/homedecor/doors_and_gates.lua index eb9083cf..a8be796f 100644 --- a/homedecor/doors_and_gates.lua +++ b/homedecor/doors_and_gates.lua @@ -497,7 +497,7 @@ minetest.register_node("homedecor:japanese_wall_top", { drawtype = "mesh", mesh = "homedecor_wall_japanese_top.obj", tiles = { - "homedecor_generic_wood_luxury_brown2.png", + "homedecor_generic_wood_luxury.png", "homedecor_japanese_paper.png" }, paramtype = "light", @@ -513,7 +513,7 @@ minetest.register_node("homedecor:japanese_wall_middle", { drawtype = "mesh", mesh = "homedecor_wall_japanese_middle.obj", tiles = { - "homedecor_generic_wood_luxury_brown2.png", + "homedecor_generic_wood_luxury.png", "homedecor_japanese_paper.png" }, paramtype = "light", @@ -529,7 +529,7 @@ minetest.register_node("homedecor:japanese_wall_bottom", { drawtype = "mesh", mesh = "homedecor_wall_japanese_bottom.obj", tiles = { - "homedecor_generic_wood_luxury_brown2.png", + "homedecor_generic_wood_luxury.png", "homedecor_japanese_paper.png" }, paramtype = "light", @@ -565,7 +565,7 @@ homedecor.register("door_japanese_closed", { description = "Japanese-style door", inventory_image = "homedecor_door_japanese_inv.png", tiles = { - "homedecor_generic_wood_luxury_brown2.png", + "homedecor_generic_wood_luxury.png", "homedecor_japanese_paper.png" }, mesh = "homedecor_door_japanese_closed.obj", @@ -587,7 +587,7 @@ homedecor.register("door_japanese_closed", { minetest.register_node("homedecor:door_japanese_open", { tiles = { - "homedecor_generic_wood_luxury_brown2.png", + "homedecor_generic_wood_luxury.png", "homedecor_japanese_paper.png" }, drawtype = "mesh", diff --git a/homedecor/furniture_medieval.lua b/homedecor/furniture_medieval.lua index f465796c..fca8bc47 100644 --- a/homedecor/furniture_medieval.lua +++ b/homedecor/furniture_medieval.lua @@ -93,7 +93,7 @@ local wl_cbox = { homedecor.register("wall_lamp", { description = S("Wall Lamp"), mesh = "homedecor_wall_lamp.obj", - tiles = {"homedecor_generic_metal_black.png^[brighten", "homedecor_generic_wood_luxury_brown1.png", + tiles = {"homedecor_generic_metal_black.png^[brighten", "homedecor_generic_wood_luxury.png^[colorize:#000000:30", "homedecor_light.png", "homedecor_generic_metal_wrought_iron.png"}, use_texture_alpha = true, inventory_image = "homedecor_wall_lamp_inv.png", diff --git a/homedecor/misc-nodes.lua b/homedecor/misc-nodes.lua index 9383a030..e76fa5ce 100644 --- a/homedecor/misc-nodes.lua +++ b/homedecor/misc-nodes.lua @@ -268,7 +268,7 @@ homedecor.register("pool_table", { "homedecor_pool_table_baize.png", "homedecor_pool_table_pockets.png", "homedecor_pool_table_balls.png", - "homedecor_generic_wood_luxury_brown3.png" + "homedecor_generic_wood_luxury.png^[colorize:#000000:90" }, description = "Pool Table", inventory_image = "homedecor_pool_table_inv.png", @@ -425,9 +425,9 @@ local piano_cbox = { homedecor.register("piano", { mesh = "homedecor_piano.obj", tiles = { + "homedecor_generic_wood_luxury.png^[colorize:#000000:175", "homedecor_piano_keys.png", "homedecor_generic_metal_brass.png", - "homedecor_generic_wood_luxury_black.png" }, inventory_image = "homedecor_piano_inv.png", description = "Piano", diff --git a/homedecor/models/homedecor_piano.obj b/homedecor/models/homedecor_piano.obj index 77eff8ca..5441f0c8 100644 --- a/homedecor/models/homedecor_piano.obj +++ b/homedecor/models/homedecor_piano.obj @@ -1,6 +1,6 @@ # Blender v2.73 (sub 0) OBJ File: 'piano.blend' # www.blender.org -o keys_Cube.003 +o body_Cube.001 v -1.437500 0.062500 -0.062500 v 0.437500 0.062500 -0.062500 v -1.437500 0.187500 0.187500 @@ -10,27 +10,6 @@ v 0.437500 0.187500 0.187500 v -0.500000 0.187500 -0.062500 v -0.500000 0.062500 -0.062500 v -0.500000 0.187500 0.187500 -vt 0.031250 0.625000 -vt 0.031250 0.437500 -vt 0.968750 0.437500 -vt 0.968750 0.625000 -vt 0.968750 0.781250 -vt 0.031250 0.781250 -vt 0.031250 0.656250 -vt 0.968750 0.656250 -vt 0.031250 0.312500 -vt 0.968750 0.312500 -vt 0.031250 0.968750 -vt 0.968750 0.968750 -vn 0.000000 1.000000 0.000000 -vn 0.000000 0.000000 -1.000000 -g keys_Cube.003_None -s off -f 9/1/1 7/2/1 4/3/1 3/4/1 -f 7/5/2 5/6/2 2/7/2 8/8/2 -f 4/3/2 7/2/2 8/9/2 1/10/2 -f 6/11/1 5/6/1 7/5/1 9/12/1 -o pedals_Cube.002 v -0.609375 -0.437500 0.000000 v -0.609375 -0.437500 0.187500 v -0.484375 -0.437500 0.187500 @@ -55,41 +34,6 @@ v -0.359375 -0.460938 0.187500 v -0.656250 -0.437500 0.187500 v -0.656250 -0.437500 0.000000 v -0.406250 -0.437500 0.000000 -vt 0.187500 1.000000 -vt 0.187500 0.312500 -vt 0.250000 0.312500 -vt 0.250000 1.000000 -vt 0.437500 0.312500 -vt 0.250000 0.250000 -vt 0.437500 0.250000 -vt 0.437500 1.000000 -vt 0.500000 0.312500 -vt 0.500000 1.000000 -vt 0.000000 1.000000 -vt 0.000000 0.312500 -vn 1.000000 0.000000 0.000000 -vn 0.000000 0.000000 -1.000000 -vn -1.000000 0.000000 0.000000 -vn 0.000000 -1.000000 0.000000 -vn 0.000000 1.000000 0.000000 -g pedals_Cube.002_None_homedecor_tile_brass2.png -s off -f 10/13/3 11/14/3 29/15/3 28/16/3 -f 32/17/4 10/15/4 28/18/4 26/19/4 -f 31/20/5 32/17/5 26/21/5 23/22/5 -f 23/23/6 26/24/6 28/14/6 29/13/6 -f 12/16/7 13/15/7 14/17/7 15/20/7 -f 27/14/6 25/13/6 17/23/6 16/24/6 -f 11/17/7 10/20/7 32/16/7 31/15/7 -f 21/16/7 22/15/7 33/17/7 24/20/7 -f 20/23/6 19/24/6 18/14/6 30/13/6 -f 15/20/5 14/17/5 25/21/5 27/22/5 -f 24/20/5 33/17/5 19/21/5 20/22/5 -f 33/17/4 22/15/4 18/18/4 19/19/4 -f 22/13/3 21/14/3 30/15/3 18/16/3 -f 14/18/4 13/19/4 17/17/4 25/15/4 -f 13/13/3 12/14/3 16/15/3 17/16/3 -o body_Cube.001 v -1.500000 -0.500000 0.500000 v -1.500000 -0.500000 0.187500 v 0.500000 -0.500000 0.187500 @@ -168,6 +112,14 @@ v -0.500000 -0.375000 0.187500 v -0.500000 0.375000 0.187500 v -0.500000 0.500000 0.500000 v -0.500000 0.187500 0.156250 +vt 0.968750 0.781250 +vt 0.031250 0.781250 +vt 0.031250 0.656250 +vt 0.968750 0.656250 +vt 0.968750 0.437500 +vt 0.031250 0.437500 +vt 0.031250 0.312500 +vt 0.968750 0.312500 vt 1.000000 1.000000 vt 0.687500 1.000000 vt 0.687500 0.000000 @@ -271,63 +223,96 @@ vt 0.937500 0.093750 vt 0.937500 0.343750 vt 0.000000 0.343750 vt 0.000000 0.093750 +vt 0.031250 0.625000 +vt 0.968750 0.625000 +vt 0.031250 0.968750 +vt 0.968750 0.968750 +vt 0.187500 0.312500 +vt 0.250000 0.312500 +vt 0.437500 0.312500 +vt 0.437500 0.250000 +vt 0.437500 1.000000 +vt 0.500000 0.312500 +vt 0.500000 1.000000 +vt 0.000000 0.312500 +vn 0.000000 0.000000 -1.000000 vn -1.000000 0.000000 0.000000 vn 1.000000 0.000000 0.000000 -vn 0.000000 0.000000 -1.000000 vn 0.000000 -1.000000 0.000000 vn 0.000000 0.000000 1.000000 vn 0.000000 1.000000 0.000000 -g body_Cube.001_None_homedecor_piano_wood.png +g body_Cube.001_wood s off -f 38/25/8 39/26/8 35/27/8 34/28/8 -f 40/29/9 41/30/9 37/31/9 36/32/9 -f 101/33/10 109/34/10 96/35/10 39/36/10 -f 99/37/11 98/38/11 36/39/11 37/40/11 -f 68/41/12 66/42/12 62/43/12 65/44/12 -f 67/42/9 68/45/9 65/46/9 64/43/9 -f 52/47/10 53/48/10 50/49/10 49/50/10 -f 104/51/10 91/52/10 90/53/10 111/54/10 -f 51/55/8 52/56/8 49/57/8 48/58/8 -f 54/59/13 53/48/13 52/47/13 51/60/13 -f 59/61/10 60/33/10 56/62/10 55/63/10 -f 60/26/9 61/64/9 57/65/9 56/66/9 -f 61/30/13 60/33/13 59/61/13 58/67/13 -f 89/43/12 87/44/12 83/41/12 86/42/12 -f 73/68/10 74/69/10 70/70/10 69/71/10 -f 74/72/9 75/73/9 71/74/9 70/75/9 -f 75/76/13 74/69/13 73/68/13 72/77/13 -f 79/78/8 80/79/8 77/80/8 76/81/8 -f 80/82/10 81/83/10 78/84/10 77/85/10 -f 87/44/8 88/86/8 84/87/8 83/41/8 -f 82/88/13 81/83/13 80/82/13 79/89/13 -f 48/90/11 49/50/11 50/49/11 36/91/11 -f 44/92/10 67/87/10 64/86/10 63/93/10 -f 104/94/13 95/95/13 94/96/13 100/34/13 -f 58/78/8 59/79/8 55/80/8 45/81/8 -f 53/72/9 54/73/9 36/74/9 50/75/9 -f 66/87/8 44/41/8 63/44/8 62/86/8 -f 45/97/11 55/63/11 56/62/11 57/98/11 -f 43/46/9 89/43/9 86/42/9 85/45/9 -f 72/55/8 73/56/8 69/57/8 35/58/8 -f 88/86/10 43/93/10 85/92/10 84/87/10 -f 35/99/11 69/71/11 70/70/11 71/100/11 -f 81/26/9 82/64/9 42/65/9 78/66/9 -f 76/101/11 77/85/11 78/84/11 42/102/11 -f 91/103/9 92/104/9 47/105/9 90/106/9 -f 94/107/8 95/108/8 93/109/8 46/110/8 -f 110/30/13 101/33/13 39/36/13 38/25/13 -f 103/111/11 102/54/11 44/53/11 45/112/11 -f 94/113/10 82/114/10 79/115/10 96/116/10 -f 97/117/10 61/118/10 58/119/10 92/120/10 -f 107/34/10 57/35/10 54/25/10 108/30/10 -f 105/39/10 71/121/10 75/96/10 106/34/10 -f 110/31/12 38/28/12 34/25/12 99/30/12 -f 41/31/12 110/28/12 99/25/12 37/30/12 -f 48/122/10 105/38/10 106/35/10 51/123/10 -f 76/34/10 107/35/10 108/25/10 72/30/10 -f 42/124/11 43/125/11 102/126/11 103/127/11 -f 41/30/13 40/33/13 101/36/13 110/25/13 -f 91/52/13 104/51/13 100/35/13 92/123/13 -f 95/95/10 104/94/10 111/126/10 93/125/10 -f 34/37/11 35/38/11 98/39/11 99/40/11 -f 40/33/10 97/34/10 109/35/10 101/36/10 +f 7/1/1 5/2/1 2/3/1 8/4/1 +f 4/5/1 7/6/1 8/7/1 1/8/1 +f 38/9/2 39/10/2 35/11/2 34/12/2 +f 40/13/3 41/14/3 37/15/3 36/16/3 +f 101/17/1 109/18/1 96/19/1 39/20/1 +f 99/21/4 98/22/4 36/23/4 37/24/4 +f 68/25/5 66/26/5 62/27/5 65/28/5 +f 67/26/3 68/29/3 65/30/3 64/27/3 +f 52/31/1 53/32/1 50/33/1 49/34/1 +f 104/35/1 91/36/1 90/37/1 111/38/1 +f 51/39/2 52/40/2 49/41/2 48/42/2 +f 54/43/6 53/32/6 52/31/6 51/44/6 +f 59/45/1 60/17/1 56/46/1 55/47/1 +f 60/10/3 61/48/3 57/49/3 56/50/3 +f 61/14/6 60/17/6 59/45/6 58/51/6 +f 89/27/5 87/28/5 83/25/5 86/26/5 +f 73/52/1 74/53/1 70/54/1 69/55/1 +f 74/56/3 75/57/3 71/58/3 70/59/3 +f 75/60/6 74/53/6 73/52/6 72/61/6 +f 79/62/2 80/63/2 77/64/2 76/65/2 +f 80/66/1 81/67/1 78/68/1 77/69/1 +f 87/28/2 88/70/2 84/71/2 83/25/2 +f 82/72/6 81/67/6 80/66/6 79/73/6 +f 48/74/4 49/34/4 50/33/4 36/75/4 +f 44/76/1 67/71/1 64/70/1 63/77/1 +f 104/78/6 95/79/6 94/80/6 100/18/6 +f 58/62/2 59/63/2 55/64/2 45/65/2 +f 53/56/3 54/57/3 36/58/3 50/59/3 +f 66/71/2 44/25/2 63/28/2 62/70/2 +f 45/81/4 55/47/4 56/46/4 57/82/4 +f 43/30/3 89/27/3 86/26/3 85/29/3 +f 72/39/2 73/40/2 69/41/2 35/42/2 +f 88/70/1 43/77/1 85/76/1 84/71/1 +f 35/83/4 69/55/4 70/54/4 71/84/4 +f 81/10/3 82/48/3 42/49/3 78/50/3 +f 76/85/4 77/69/4 78/68/4 42/86/4 +f 91/87/3 92/88/3 47/89/3 90/90/3 +f 94/91/2 95/92/2 93/93/2 46/94/2 +f 110/14/6 101/17/6 39/20/6 38/9/6 +f 103/95/4 102/38/4 44/37/4 45/96/4 +f 94/97/1 82/98/1 79/99/1 96/100/1 +f 97/101/1 61/102/1 58/103/1 92/104/1 +f 107/18/1 57/19/1 54/9/1 108/14/1 +f 105/23/1 71/105/1 75/80/1 106/18/1 +f 110/15/5 38/12/5 34/9/5 99/14/5 +f 41/15/5 110/12/5 99/9/5 37/14/5 +f 48/106/1 105/22/1 106/19/1 51/107/1 +f 76/18/1 107/19/1 108/9/1 72/14/1 +f 42/108/4 43/109/4 102/110/4 103/111/4 +f 41/14/6 40/17/6 101/20/6 110/9/6 +f 91/36/6 104/35/6 100/19/6 92/107/6 +f 95/79/1 104/78/1 111/110/1 93/109/1 +f 34/21/4 35/22/4 98/23/4 99/24/4 +f 40/17/1 97/18/1 109/19/1 101/20/1 +g body_Cube.001_keyboard +f 9/112/6 7/6/6 4/5/6 3/113/6 +f 6/114/6 5/2/6 7/1/6 9/115/6 +g body_Cube.001_brass +f 10/43/3 11/116/3 29/117/3 28/44/3 +f 32/118/1 10/117/1 28/74/1 26/119/1 +f 31/120/2 32/118/2 26/121/2 23/122/2 +f 23/14/4 26/123/4 28/116/4 29/43/4 +f 12/44/6 13/117/6 14/118/6 15/120/6 +f 27/116/4 25/43/4 17/14/4 16/123/4 +f 11/118/6 10/120/6 32/44/6 31/117/6 +f 21/44/6 22/117/6 33/118/6 24/120/6 +f 20/14/4 19/123/4 18/116/4 30/43/4 +f 15/120/2 14/118/2 25/121/2 27/122/2 +f 24/120/2 33/118/2 19/121/2 20/122/2 +f 33/118/1 22/117/1 18/74/1 19/119/1 +f 22/43/3 21/116/3 30/117/3 18/44/3 +f 14/74/1 13/119/1 17/118/1 25/117/1 +f 13/43/3 12/116/3 16/117/3 17/44/3 diff --git a/homedecor/textures/homedecor_generic_wood_luxury_brown2.png b/homedecor/textures/homedecor_generic_wood_luxury.png similarity index 100% rename from homedecor/textures/homedecor_generic_wood_luxury_brown2.png rename to homedecor/textures/homedecor_generic_wood_luxury.png diff --git a/homedecor/textures/homedecor_generic_wood_luxury_black.png b/homedecor/textures/homedecor_generic_wood_luxury_black.png deleted file mode 100644 index 89492de7..00000000 Binary files a/homedecor/textures/homedecor_generic_wood_luxury_black.png and /dev/null differ diff --git a/homedecor/textures/homedecor_generic_wood_luxury_brown1.png b/homedecor/textures/homedecor_generic_wood_luxury_brown1.png deleted file mode 100644 index 95fc8d59..00000000 Binary files a/homedecor/textures/homedecor_generic_wood_luxury_brown1.png and /dev/null differ diff --git a/homedecor/textures/homedecor_generic_wood_luxury_brown3.png b/homedecor/textures/homedecor_generic_wood_luxury_brown3.png deleted file mode 100644 index 40306608..00000000 Binary files a/homedecor/textures/homedecor_generic_wood_luxury_brown3.png and /dev/null differ