Add meshes for water turbine and and wall lever instead of nodeboxes

Adjust textures and inventory images to it

5 files changed, 426 insertions, 24 deletions

diff --git a/mesecons_hydroturbine/init.lua b/mesecons_hydroturbine/init.lua
index 36bd498..2eb1a64 100644
--- a/mesecons_hydroturbine/init.lua
+++ b/mesecons_hydroturbine/init.lua
@@ -4,24 +4,17 @@
 -- (does not work with other liquids)
 
 minetest.register_node("mesecons_hydroturbine:hydro_turbine_off", {
-	drawtype = "nodebox",
+	drawtype = "mesh",
+	mesh = "jeija_hydro_turbine.obj",
 	tiles = {"jeija_hydro_turbine_off.png"},
+	inventory_image = "jeija_hydro_turbine_inv.png",
+	wield_scale = {x=0.75, y=0.75, z=0.75},
 	groups = {dig_immediate=2},
     	description="Water Turbine",
 	paramtype = "light",
 	selection_box = {
 		type = "fixed",
-		fixed = {{-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
-			{-0.15, 0.5, -0.15, 0.15, 1.45, 0.15},
-			{-0.45, 1.15, -0.1, 0.45, 1.45, 0.1},
-			{-0.1, 1.15, -0.45, 0.1, 1.45, 0.45}},
-	},
-	node_box = {
-		type = "fixed",
-		fixed = {{-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
-			{-0.15, 0.5, -0.15, 0.15, 1.45, 0.15},
-			{-0.45, 1.15, -0.1, 0.45, 1.45, 0.1},
-			{-0.1, 1.15, -0.45, 0.1, 1.45, 0.45}},
+		fixed = { -0.5, -0.5, -0.5, 0.5, 1.5, 0.5 },
 	},
 	sounds = default.node_sound_stone_defaults(),
 	mesecons = {receptor = {
@@ -30,25 +23,18 @@ minetest.register_node("mesecons_hydroturbine:hydro_turbine_off", {
 })
 
 minetest.register_node("mesecons_hydroturbine:hydro_turbine_on", {
-	drawtype = "nodebox",
+	drawtype = "mesh",
+	mesh = "jeija_hydro_turbine.obj",
+	wield_scale = {x=0.75, y=0.75, z=0.75},
 	tiles = {"jeija_hydro_turbine_on.png"},
+	inventory_image = "jeija_hydro_turbine_inv.png",
 	drop = "mesecons_hydroturbine:hydro_turbine_off 1",
 	groups = {dig_immediate=2,not_in_creative_inventory=1},
 	description="Water Turbine",
 	paramtype = "light",
 	selection_box = {
 		type = "fixed",
-		fixed = {{-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
-			{-0.15, 0.5, -0.15, 0.15, 1.45, 0.15},
-			{-0.5, 1.15, -0.1, 0.5, 1.45, 0.1},
-			{-0.1, 1.15, -0.5, 0.1, 1.45, 0.5}},
-	},
-	node_box = {
-		type = "fixed",
-		fixed = {{-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
-			{-0.15, 0.5, -0.15, 0.15, 1.45, 0.15},
-			{-0.5, 1.15, -0.1, 0.5, 1.45, 0.1},
-			{-0.1, 1.15, -0.5, 0.1, 1.45, 0.5}},
+		fixed = { -0.5, -0.5, -0.5, 0.5, 1.5, 0.5 },
 	},
 	sounds = default.node_sound_stone_defaults(),
 	mesecons = {receptor = {
diff --git a/mesecons_hydroturbine/models/jeija_hydro_turbine.obj b/mesecons_hydroturbine/models/jeija_hydro_turbine.obj
new file mode 100644
index 0000000..8a1384d
--- /dev/null
+++ b/mesecons_hydroturbine/models/jeija_hydro_turbine.obj
@@ -0,0 +1,416 @@
+# Blender v2.69 (sub 0) OBJ File: 'mesecons-water-turbine.blend'
+# www.blender.org
+o Cylinder.002_Cylinder.003
+v 0.000000 0.500000 -0.150000
+v 0.000000 0.562500 -0.150000
+v 0.106066 0.500000 -0.106066
+v 0.106066 0.562500 -0.106066
+v 0.150000 0.500000 0.000000
+v 0.150000 0.562500 0.000000
+v 0.106066 0.500000 0.106066
+v 0.106066 0.562500 0.106066
+v -0.000000 0.500000 0.150000
+v -0.000000 0.562500 0.150000
+v -0.106066 0.500000 0.106066
+v -0.106066 0.562500 0.106066
+v -0.150000 0.500000 -0.000000
+v -0.150000 0.562500 -0.000000
+v -0.106066 0.500000 -0.106066
+v -0.106066 0.562500 -0.106066
+v 0.097545 0.625000 -0.490393
+v -0.097545 0.625000 -0.490393
+v -0.277785 0.625000 -0.415735
+v -0.415735 0.625000 -0.277785
+v -0.490393 0.625000 -0.097545
+v -0.490393 0.625000 0.097545
+v -0.415735 0.625000 0.277785
+v -0.277785 0.625000 0.415735
+v -0.097545 0.625000 0.490393
+v 0.097545 0.625000 0.490393
+v 0.277785 0.625000 0.415735
+v 0.415735 0.625000 0.277785
+v 0.490393 0.625000 0.097545
+v 0.490393 0.625000 -0.097545
+v 0.415735 0.625000 -0.277785
+v 0.277785 0.625000 -0.415735
+v 0.097545 0.656250 -0.490393
+v -0.097545 0.656250 -0.490393
+v -0.277785 0.656250 -0.415735
+v -0.415735 0.656250 -0.277785
+v -0.490393 0.656250 -0.097545
+v -0.490393 0.656250 0.097545
+v -0.415735 0.656250 0.277785
+v -0.277785 0.656250 0.415735
+v -0.097545 0.656250 0.490393
+v 0.097545 0.656250 0.490393
+v 0.277785 0.656250 0.415735
+v 0.415735 0.656250 0.277785
+v 0.490393 0.656250 0.097545
+v 0.490393 0.656250 -0.097545
+v 0.415735 0.656250 -0.277785
+v 0.277785 0.656250 -0.415735
+v 0.116233 0.634645 -0.436100
+v 0.116233 1.482640 -0.436100
+v 0.299524 0.634645 -0.186124
+v 0.299524 1.482640 -0.186124
+v 0.343405 0.634645 0.080186
+v 0.343405 1.482640 0.080186
+v 0.186124 0.634645 0.299524
+v 0.186124 1.482640 0.299524
+v -0.080186 0.634645 0.343405
+v -0.080186 1.482640 0.343405
+v -0.299524 0.634645 0.186124
+v -0.299524 1.482640 0.186124
+v -0.343405 0.634645 -0.080186
+v -0.343405 1.482640 -0.080186
+v -0.186124 0.634645 -0.299524
+v -0.186124 1.482640 -0.299524
+v 0.080186 0.634645 -0.343405
+v 0.080186 1.482640 -0.343405
+v 0.390559 1.482640 -0.226180
+v 0.390559 0.634645 -0.226180
+v 0.436100 1.482640 0.116233
+v 0.436100 0.634645 0.116233
+v 0.226180 1.482640 0.390559
+v 0.226180 0.634645 0.390559
+v -0.116233 1.482640 0.436100
+v -0.116233 0.634645 0.436100
+v -0.390559 1.482640 0.226180
+v -0.390559 0.634645 0.226180
+v -0.436100 1.482640 -0.116233
+v -0.436100 0.634645 -0.116233
+v -0.226180 1.482640 -0.390559
+v -0.226180 0.634645 -0.390559
+v 0.108975 0.634645 -0.430778
+v 0.292266 0.634645 -0.180802
+v 0.292266 1.482640 -0.180802
+v 0.108975 1.482640 -0.430778
+v 0.381664 0.634645 -0.227549
+v 0.334509 0.634645 0.078817
+v 0.334509 1.482640 0.078817
+v 0.381664 1.482640 -0.227549
+v 0.430778 0.634645 0.108975
+v 0.180802 0.634645 0.292266
+v 0.180802 1.482640 0.292266
+v 0.430778 1.482640 0.108975
+v 0.227549 0.634645 0.381664
+v -0.078817 0.634645 0.334509
+v -0.078817 1.482640 0.334509
+v 0.227549 1.482640 0.381664
+v -0.108975 0.634645 0.430778
+v -0.292266 0.634645 0.180802
+v -0.292266 1.482640 0.180802
+v -0.108975 1.482640 0.430778
+v -0.381664 0.634645 0.227549
+v -0.334509 0.634645 -0.078817
+v -0.334509 1.482640 -0.078817
+v -0.381664 1.482640 0.227549
+v -0.227549 0.634645 -0.381663
+v 0.078817 0.634645 -0.334509
+v 0.078817 1.482640 -0.334509
+v -0.227549 1.482640 -0.381663
+v -0.430779 0.634645 -0.108975
+v -0.180802 0.634645 -0.292266
+v -0.180802 1.482640 -0.292266
+v -0.430779 1.482640 -0.108975
+v 0.097545 1.500000 -0.490393
+v -0.097545 1.500000 -0.490393
+v -0.277785 1.500000 -0.415735
+v -0.415735 1.500000 -0.277785
+v -0.490393 1.500000 -0.097545
+v -0.490393 1.500000 0.097545
+v -0.415735 1.500000 0.277785
+v -0.277785 1.500000 0.415735
+v -0.097545 1.500000 0.490393
+v 0.097545 1.500000 0.490393
+v 0.277785 1.500000 0.415735
+v 0.415735 1.500000 0.277785
+v 0.490393 1.500000 0.097545
+v 0.490393 1.500000 -0.097545
+v 0.415735 1.500000 -0.277785
+v 0.277785 1.500000 -0.415735
+v 0.097545 1.468750 -0.490393
+v -0.097545 1.468750 -0.490393
+v -0.277785 1.468750 -0.415735
+v -0.415735 1.468750 -0.277785
+v -0.490393 1.468750 -0.097545
+v -0.490393 1.468750 0.097545
+v -0.415735 1.468750 0.277785
+v -0.277785 1.468750 0.415735
+v -0.097545 1.468750 0.490393
+v 0.097545 1.468750 0.490393
+v 0.277785 1.468750 0.415735
+v 0.415735 1.468750 0.277785
+v 0.490393 1.468750 0.097545
+v 0.490393 1.468750 -0.097545
+v 0.415735 1.468750 -0.277785
+v 0.277785 1.468750 -0.415735
+v 0.025624 0.559630 -0.061863
+v 0.025624 1.481372 -0.061863
+v 0.061863 0.559630 -0.025624
+v 0.061863 1.481372 -0.025624
+v 0.061863 0.559630 0.025624
+v 0.061863 1.481372 0.025624
+v 0.025624 0.559630 0.061863
+v 0.025624 1.481372 0.061863
+v -0.025624 0.559630 0.061863
+v -0.025624 1.481372 0.061863
+v -0.061863 0.559630 0.025624
+v -0.061863 1.481372 0.025624
+v -0.061863 0.559630 -0.025624
+v -0.061863 1.481372 -0.025624
+v -0.025624 0.559630 -0.061863
+v -0.025624 1.481372 -0.061863
+v 0.500000 -0.500000 -0.500000
+v 0.500000 -0.500000 0.500000
+v -0.500000 -0.500000 0.500000
+v -0.500000 -0.500000 -0.500000
+v 0.500000 0.500000 -0.500000
+v 0.500000 0.500000 0.500000
+v -0.500000 0.500000 0.500000
+v -0.500000 0.500000 -0.500000
+vt 0.416667 0.625000
+vt 0.416667 0.645833
+vt 0.395833 0.645833
+vt 0.395833 0.625000
+vt 0.375000 0.645833
+vt 0.375000 0.625000
+vt 0.291667 0.625000
+vt 0.291667 0.645833
+vt 0.312500 0.645833
+vt 0.312500 0.625000
+vt 0.333333 0.645833
+vt 0.333333 0.625000
+vt 0.354167 0.645833
+vt 0.354167 0.625000
+vt 0.708333 0.645833
+vt 0.729167 0.625000
+vt 0.750000 0.625000
+vt 0.770833 0.645833
+vt 0.770833 0.666667
+vt 0.750000 0.687500
+vt 0.729167 0.687500
+vt 0.708333 0.666667
+vt 0.437500 0.625000
+vt 0.437500 0.645833
+vt 0.458333 0.625000
+vt 0.458333 0.645833
+vt 0.656250 0.953125
+vt 0.593750 0.980469
+vt 0.531250 0.980469
+vt 0.468750 0.953125
+vt 0.421875 0.906250
+vt 0.394531 0.843750
+vt 0.394531 0.781250
+vt 0.421875 0.718750
+vt 0.468750 0.671875
+vt 0.531250 0.644531
+vt 0.593750 0.644531
+vt 0.656250 0.671875
+vt 0.703125 0.718750
+vt 0.730469 0.781250
+vt 0.730469 0.843750
+vt 0.703125 0.906250
+vt 0.019531 0.843750
+vt 0.019531 0.781250
+vt 0.046875 0.718750
+vt 0.093750 0.671875
+vt 0.156250 0.644531
+vt 0.218750 0.644531
+vt 0.281250 0.671875
+vt 0.328125 0.718750
+vt 0.355469 0.781250
+vt 0.355469 0.843750
+vt 0.328125 0.906250
+vt 0.281250 0.953125
+vt 0.218750 0.980469
+vt 0.156250 0.980469
+vt 0.093750 0.953125
+vt 0.046875 0.906250
+vt 0.187500 0.041667
+vt 0.104167 0.041667
+vt 0.104167 0.020833
+vt 0.187500 0.020833
+vt 0.270833 0.041667
+vt 0.270833 0.020833
+vt 0.354167 0.041667
+vt 0.354167 0.020833
+vt 0.437500 0.041667
+vt 0.437500 0.020833
+vt 0.520833 0.041667
+vt 0.520833 0.020833
+vt 0.354167 0.104167
+vt 0.270833 0.104167
+vt 0.270833 0.083333
+vt 0.354167 0.083333
+vt 0.604167 0.041667
+vt 0.604167 0.020833
+vt 0.687500 0.041667
+vt 0.687500 0.020833
+vt 0.437500 0.104167
+vt 0.437500 0.083333
+vt 0.104167 0.104167
+vt 0.020833 0.104167
+vt 0.020833 0.083333
+vt 0.104167 0.083333
+vt 0.520833 0.104167
+vt 0.520833 0.083333
+vt 0.187500 0.104167
+vt 0.187500 0.083333
+vt 0.604167 0.104167
+vt 0.604167 0.083333
+vt 0.687500 0.104167
+vt 0.687500 0.083333
+vt 0.020833 0.041667
+vt 0.020833 0.020833
+vt 0.979167 0.020833
+vt 0.979167 0.270833
+vt 0.895833 0.270833
+vt 0.895833 0.020833
+vt 0.875000 0.020833
+vt 0.875000 0.270833
+vt 0.791667 0.270833
+vt 0.791667 0.020833
+vt 0.687500 0.208333
+vt 0.687500 0.229167
+vt 0.604167 0.229167
+vt 0.604167 0.208333
+vt 0.104167 0.145833
+vt 0.104167 0.166667
+vt 0.020833 0.166667
+vt 0.020833 0.145833
+vt 0.187500 0.145833
+vt 0.187500 0.166667
+vt 0.270833 0.145833
+vt 0.270833 0.166667
+vt 0.354167 0.145833
+vt 0.354167 0.166667
+vt 0.187500 0.208333
+vt 0.187500 0.229167
+vt 0.104167 0.229167
+vt 0.104167 0.208333
+vt 0.437500 0.145833
+vt 0.437500 0.166667
+vt 0.520833 0.145833
+vt 0.520833 0.166667
+vt 0.270833 0.208333
+vt 0.270833 0.229167
+vt 0.604167 0.145833
+vt 0.604167 0.166667
+vt 0.354167 0.208333
+vt 0.354167 0.229167
+vt 0.687500 0.145833
+vt 0.687500 0.166667
+vt 0.437500 0.208333
+vt 0.437500 0.229167
+vt 0.020833 0.229167
+vt 0.020833 0.208333
+vt 0.520833 0.208333
+vt 0.520833 0.229167
+vt 0.854167 0.645833
+vt 0.854167 0.979167
+vt 0.812500 0.979167
+vt 0.812500 0.645833
+vt 0.979167 0.312500
+vt 0.979167 0.645833
+vt 0.937500 0.645833
+vt 0.937500 0.312500
+vt 0.895833 0.645833
+vt 0.895833 0.312500
+vt 0.854167 0.312500
+vt 0.812500 0.312500
+vt 0.979167 0.979167
+vt 0.937500 0.979167
+vt 0.895833 0.979167
+vt 0.020833 0.604167
+vt 0.020833 0.270833
+vt 0.354167 0.270833
+vt 0.354167 0.604167
+vt 0.729167 0.270833
+vt 0.729167 0.604167
+vt 0.395833 0.604167
+vt 0.395833 0.270833
+s off
+f 1/1 2/2 4/3 3/4
+f 3/4 4/3 6/5 5/6
+f 5/7 6/8 8/9 7/10
+f 7/10 8/9 10/11 9/12
+f 9/12 10/11 12/13 11/14
+f 11/14 12/13 14/5 13/6
+f 4/15 2/16 16/17 14/18 12/19 10/20 8/21 6/22
+f 15/23 16/24 2/2 1/1
+f 13/25 14/26 16/24 15/23
+f 130/27 129/28 144/29 143/30 142/31 141/32 140/33 139/34 138/35 137/36 136/37 135/38 134/39 133/40 132/41 131/42
+f 18/43 17/44 32/45 31/46 30/47 29/48 28/49 27/50 26/51 25/52 24/53 23/54 22/55 21/56 20/57 19/58
+f 27/59 28/60 44/61 43/62
+f 26/63 27/59 43/62 42/64
+f 25/65 26/63 42/64 41/66
+f 24/67 25/65 41/66 40/68
+f 23/69 24/67 40/68 39/70
+f 17/71 18/72 34/73 33/74
+f 22/75 23/69 39/70 38/76
+f 21/77 22/75 38/76 37/78
+f 32/79 17/71 33/74 48/80
+f 20/81 21/82 37/83 36/84
+f 31/85 32/79 48/80 47/86
+f 19/87 20/81 36/84 35/88
+f 30/89 31/85 47/86 46/90
+f 18/72 19/87 35/88 34/73
+f 29/91 30/89 46/90 45/92
+f 28/60 29/93 45/94 44/61
+f 49/95 50/96 52/97 51/98
+f 68/98 67/95 54/96 53/97
+f 70/95 69/96 56/97 55/98
+f 72/96 71/97 58/98 57/95
+f 74/95 73/96 60/97 59/98
+f 76/95 75/96 62/97 61/98
+f 80/96 79/97 66/98 65/95
+f 78/95 77/96 64/97 63/98
+f 81/99 82/100 83/101 84/102
+f 85/100 86/101 87/102 88/99
+f 89/101 90/102 91/99 92/100
+f 93/102 94/99 95/100 96/101
+f 97/102 98/99 99/100 100/101
+f 101/99 102/100 103/101 104/102
+f 105/102 106/99 107/100 108/101
+f 109/101 110/102 111/99 112/100
+f 75/100 76/99 101/98 104/97
+f 71/100 72/99 93/98 96/97
+f 67/98 68/97 85/100 88/99
+f 79/98 80/97 105/100 108/99
+f 77/100 78/99 109/98 112/97
+f 73/100 74/99 97/98 100/97
+f 69/98 70/97 89/100 92/99
+f 50/98 49/97 81/100 84/99
+f 33/51 34/52 35/53 36/54 37/55 38/56 39/57 40/58 41/43 42/44 43/45 44/46 45/47 46/48 47/49 48/50
+f 123/103 139/104 140/105 124/106
+f 122/107 138/108 139/109 123/110
+f 121/111 137/112 138/108 122/107
+f 120/113 136/114 137/112 121/111
+f 119/115 135/116 136/114 120/113
+f 113/117 129/118 130/119 114/120
+f 118/121 134/122 135/116 119/115
+f 117/123 133/124 134/122 118/121
+f 128/125 144/126 129/118 113/117
+f 116/127 132/128 133/124 117/123
+f 127/129 143/130 144/126 128/125
+f 115/131 131/132 132/128 116/127
+f 126/133 142/134 143/130 127/129
+f 114/120 130/119 131/135 115/136
+f 125/137 141/138 142/134 126/133
+f 124/106 140/105 141/138 125/137
+f 145/139 146/140 148/141 147/142
+f 147/143 148/144 150/145 149/146
+f 149/146 150/145 152/147 151/148
+f 151/148 152/147 154/139 153/149
+f 153/149 154/139 156/142 155/150
+f 155/144 156/151 158/152 157/145
+f 159/147 160/153 146/140 145/139
+f 157/145 158/152 160/153 159/147
+f 161/154 162/155 163/156 164/157
+f 165/155 168/156 167/157 166/154
+f 161/158 165/159 166/160 162/161
+f 162/158 166/159 167/160 163/161
+f 163/158 167/159 168/160 164/161
+f 165/160 161/161 164/158 168/159
+f 113/40 114/41 115/42 116/27 117/28 118/29 119/30 120/31 121/32 122/33 123/34 124/35 125/36 126/37 127/38 128/39
diff --git a/mesecons_hydroturbine/textures/jeija_hydro_turbine_inv.png b/mesecons_hydroturbine/textures/jeija_hydro_turbine_inv.png
new file mode 100644
index 0000000..4cc9f20
--- /dev/null
+++ b/mesecons_hydroturbine/textures/jeija_hydro_turbine_inv.png
diff --git a/mesecons_hydroturbine/textures/jeija_hydro_turbine_off.png b/mesecons_hydroturbine/textures/jeija_hydro_turbine_off.png
index 5ca1a12..52863ab 100644
--- a/mesecons_hydroturbine/textures/jeija_hydro_turbine_off.png
+++ b/mesecons_hydroturbine/textures/jeija_hydro_turbine_off.png
diff --git a/mesecons_hydroturbine/textures/jeija_hydro_turbine_on.png b/mesecons_hydroturbine/textures/jeija_hydro_turbine_on.png
index 28eb0c9..64e7a4f 100644
--- a/mesecons_hydroturbine/textures/jeija_hydro_turbine_on.png
+++ b/mesecons_hydroturbine/textures/jeija_hydro_turbine_on.png