Merge pull request #14 from VanessaE/master

Nodebox-based wall levers, take 2.
- This time it works -
Thanks, VanessaE

13 files changed, 85 insertions, 55 deletions

diff --git a/mesecons_button/init.lua b/mesecons_button/init.lua
index 42f4de1..bda118f 100644
--- a/mesecons_button/init.lua
+++ b/mesecons_button/init.lua
@@ -20,8 +20,8 @@ minetest.register_node("mesecons_button:button_off", {
     node_box = {
         type = "fixed",	
 	fixed = {
-		{ -6/16, -6/16, 7/16, 6/16, 6/16, 8/16 },	-- the thin plate behind the button
-		{ -4/16, -2/16, 5/16, 4/16, 2/16, 7/16 }	-- the button itself
+		{ -6/16, -6/16, 6/16, 6/16, 6/16, 8/16 },	-- the thin plate behind the button
+		{ -4/16, -2/16, 4/16, 4/16, 2/16, 6/16 }	-- the button itself
 	}
     },
     groups = {dig_immediate=2},
@@ -48,8 +48,8 @@ minetest.register_node("mesecons_button:button_on", {
     node_box = {
         type = "fixed",
 	fixed = {
-		{ -6/16, -6/16, 7/16, 6/16, 6/16, 8/16 },
-		{ -4/16, -2/16, 13/32, 4/16, 2/16, 7/16 }
+		{ -6/16, -6/16,  6/16, 6/16, 6/16, 8/16 },
+		{ -4/16, -2/16, 11/32, 4/16, 2/16, 6/16 }
 	}
     },
 	groups = {dig_immediate=2, not_in_creative_inventory=1},
diff --git a/mesecons_delayer/init.lua b/mesecons_delayer/init.lua
index 282147f..0c78c42 100644
--- a/mesecons_delayer/init.lua
+++ b/mesecons_delayer/init.lua
@@ -10,11 +10,11 @@ minetest.register_node("mesecons_delayer:delayer_off_1", {
 	walkable = false,
 	selection_box = {
 		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5},
+		fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
 	},
 	node_box = {
 		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5},
+		fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
 	},
 	groups = {bendy=2,snappy=1,dig_immediate=2},
 	paramtype = "light",
@@ -35,11 +35,11 @@ minetest.register_node("mesecons_delayer:delayer_off_2", {
 	walkable = false,
 	selection_box = {
 		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5},
+		fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
 	},
 	node_box = {
 		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5},
+		fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
 	},
 	groups = {bendy=2,snappy=1,dig_immediate=2,not_in_creative_inventory=1},
 	paramtype = "light",
@@ -60,11 +60,11 @@ minetest.register_node("mesecons_delayer:delayer_off_3", {
 	walkable = false,
 	selection_box = {
 		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5},
+		fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
 	},
 	node_box = {
 		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5},
+		fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
 	},
 	groups = {bendy=2,snappy=1,dig_immediate=2,not_in_creative_inventory=1},
 	paramtype = "light",
@@ -85,11 +85,11 @@ minetest.register_node("mesecons_delayer:delayer_off_4", {
 	walkable = false,
 	selection_box = {
 		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5},
+		fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
 	},
 	node_box = {
 		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5},
+		fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
 	},
 	groups = {bendy=2,snappy=1,dig_immediate=2,not_in_creative_inventory=1},
 	paramtype = "light",
@@ -110,11 +110,11 @@ minetest.register_node("mesecons_delayer:delayer_on_1", {
 	walkable = false,
 	selection_box = {
 		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5},
+		fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
 	},
 	node_box = {
 		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5},
+		fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
 	},
 	groups = {bendy=2,snappy=1,dig_immediate=2,not_in_creative_inventory=1},
 	paramtype = "light",
@@ -135,11 +135,11 @@ minetest.register_node("mesecons_delayer:delayer_on_2", {
 	walkable = false,
 	selection_box = {
 		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5},
+		fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
 	},
 	node_box = {
 		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5},
+		fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
 	},
 	groups = {bendy=2,snappy=1,dig_immediate=2,not_in_creative_inventory=1},
 	paramtype = "light",
@@ -160,11 +160,11 @@ minetest.register_node("mesecons_delayer:delayer_on_3", {
 	walkable = false,
 	selection_box = {
 		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5},
+		fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
 	},
 	node_box = {
 		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5},
+		fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
 	},
 	groups = {bendy=2,snappy=1,dig_immediate=2,not_in_creative_inventory=1},
 	paramtype = "light",
@@ -185,11 +185,11 @@ minetest.register_node("mesecons_delayer:delayer_on_4", {
 	walkable = false,
 	selection_box = {
 		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5},
+		fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
 	},
 	node_box = {
 		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5},
+		fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
 	},
 	groups = {bendy=2,snappy=1,dig_immediate=2,not_in_creative_inventory=1},
 	paramtype = "light",
diff --git a/mesecons_pressureplates/init.lua b/mesecons_pressureplates/init.lua
index 8a47b22..89b917d 100644
--- a/mesecons_pressureplates/init.lua
+++ b/mesecons_pressureplates/init.lua
@@ -10,11 +10,11 @@ minetest.register_node("mesecons_pressureplates:pressure_plate_wood_off", {
 	walkable = true,
 	selection_box = {
 		type = "fixed",
-		fixed = {-0.45, -0.5, -0.45, 0.45, -0.45, 0.45},
+		fixed = { -7/16, -8/16, -7/16, 7/16, -7/16, 7/16 },
 	},
 	node_box = {
 		type = "fixed",
-		fixed = {-0.45, -0.5, -0.45, 0.45, -0.45, 0.45},
+		fixed = { -7/16, -8/16, -7/16, 7/16, -7/16, 7/16 },
 	},
 	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3},
     	description="Wood Pressure Plate",
@@ -28,11 +28,11 @@ minetest.register_node("mesecons_pressureplates:pressure_plate_wood_on", {
 	walkable = true,
 	selection_box = {
 		type = "fixed",
-		fixed = {-0.45, -0.5, -0.45, 0.45, -0.48, 0.45},
+		fixed = { -7/16, -8/16, -7/16, 7/16, -7/16, 7/16 },
 	},
 	node_box = {
 		type = "fixed",
-		fixed = {-0.45, -0.5, -0.45, 0.45, -0.48, 0.45},
+		fixed = { -7/16, -8/16, -7/16, 7/16, -7/16, 7/16 },
 	},
 	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
 	drop='"mesecons_pressureplates:pressure_plate_wood_off" 1',
@@ -92,11 +92,11 @@ minetest.register_node("mesecons_pressureplates:pressure_plate_stone_off", {
 	walkable = true,
 	selection_box = {
 		type = "fixed",
-		fixed = {-0.45, -0.5, -0.45, 0.45, -0.45, 0.45},
+		fixed = { -7/16, -8/16, -7/16, 7/16, -7/16, 7/16 },
 	},
 	node_box = {
 		type = "fixed",
-		fixed = {-0.45, -0.5, -0.45, 0.45, -0.45, 0.45},
+		fixed = { -7/16, -8/16, -7/16, 7/16, -7/16, 7/16 },
 	},
 	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3},
     	description="Stone Pressure Plate",
@@ -110,11 +110,11 @@ minetest.register_node("mesecons_pressureplates:pressure_plate_stone_on", {
 	walkable = true,
 	selection_box = {
 		type = "fixed",
-		fixed = {-0.45, -0.5, -0.45, 0.45, -0.48, 0.45},
+		fixed = { -7/16, -8/16, -7/16, 7/16, -7/16, 7/16 },
 	},
 	node_box = {
 		type = "fixed",
-		fixed = {-0.45, -0.5, -0.45, 0.45, -0.48, 0.45},
+		fixed = { -7/16, -8/16, -7/16, 7/16, -7/16, 7/16 },
 	},
 	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
 	drop='"mesecons_pressureplates:pressure_plate_stone_off" 1',
diff --git a/mesecons_solarpanel/init.lua b/mesecons_solarpanel/init.lua
index bea4b61..842fc54 100644
--- a/mesecons_solarpanel/init.lua
+++ b/mesecons_solarpanel/init.lua
@@ -10,15 +10,15 @@ minetest.register_node("mesecons_solarpanel:solar_panel", {
 	is_ground_content = true,
 	node_box = {
 		type = "wallmounted",
-		wall_bottom = {-0.4375, -0.5, -0.4375, 0.4375, -0.45, 0.4375},
-		wall_top = {-0.4375, 0.45, -0.4375, 0.4375, 0.5, 0.4375},
-		wall_side = {-0.5, -0.4375, -0.4375, -0.45, 0.4375, 0.4375},
+		wall_bottom = { -7/16, -8/16, -7/16,  7/16, -7/16, 7/16 },
+		wall_top    = { -7/16,  7/16, -7/16,  7/16,  8/16, 7/16 },
+		wall_side   = { -8/16, -7/16, -7/16, -7/16,  7/16, 7/16 },
 	},
 	selection_box = {
 		type = "wallmounted",
-		wall_bottom = {-0.4375, -0.5, -0.4375, 0.4375, -0.45, 0.4375},
-		wall_top = {-0.4375, 0.45, -0.4375, 0.4375, 0.5, 0.4375},
-		wall_side = {-0.5, -0.4375, -0.4375, -0.45, 0.4375, 0.4375},
+		wall_bottom = { -7/16, -8/16, -7/16,  7/16, -7/16, 7/16 },
+		wall_top    = { -7/16,  7/16, -7/16,  7/16,  8/16, 7/16 },
+		wall_side   = { -8/16, -7/16, -7/16, -7/16,  7/16, 7/16 },
 	},
 	furnace_burntime = 5,
 	groups = {dig_immediate=3},
diff --git a/mesecons_temperest/init.lua b/mesecons_temperest/init.lua
index bacc5f9..a0ec5c0 100644
--- a/mesecons_temperest/init.lua
+++ b/mesecons_temperest/init.lua
@@ -109,11 +109,11 @@ minetest.register_node("mesecons_temperest:mesecon_plug", {
 	walkable = false,
 	selection_box = {
 		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.45, 0.5},
+		fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
 	},
 	node_box = {
 		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.45, 0.5},
+		fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
 	},
 	description = "Plug",
 	after_place_node = plug_off,
@@ -143,11 +143,11 @@ minetest.register_node("mesecons_temperest:mesecon_socket_off", {
 	walkable = false,
 	selection_box = {
 		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.45, 0.5},
+		fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
 	},
 	node_box = {
 		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.45, 0.5},
+		fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
 	},
 })
 
@@ -160,11 +160,11 @@ minetest.register_node("mesecons_temperest:mesecon_socket_on", {
 	walkable = false,
 	selection_box = {
 		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.45, 0.5},
+		fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
 	},
 	node_box = {
 		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.45, 0.5},
+		fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
 	},
 	drop='"mesecons_temperest:mesecon_socket_off" 1',
 	after_dig_node = function(pos)
@@ -195,11 +195,11 @@ if ENABLE_TEMPEREST then
 		walkable = false,
 		selection_box = {
 			type = "fixed",
-			fixed = {-0.5, -0.5, -0.5, 0.5, -0.45, 0.5},
+		fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
 		},
 		node_box = {
 			type = "fixed",
-			fixed = {-0.5, -0.5, -0.5, 0.5, -0.45, 0.5},
+		fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
 		},
 		drop='"mesecons_temperest:mesecon_inverter_on" 1',
 	})
@@ -216,11 +216,11 @@ if ENABLE_TEMPEREST then
 		walkable = false,
 		selection_box = {
 			type = "fixed",
-			fixed = {-0.5, -0.5, -0.5, 0.5, -0.45, 0.5},
+		fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
 		},
 		node_box = {
 			type = "fixed",
-			fixed = {-0.5, -0.5, -0.5, 0.5, -0.45, 0.5},
+		fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
 		},
 		after_place_node = function(pos)
 			mesecon:receptor_on(pos)
@@ -241,4 +241,4 @@ if ENABLE_TEMPEREST then
 			{'"mesecons:mesecon_off"', '"default:steel_ingot"', '"mesecons:mesecon_off"'},
 		}
 	})
-end
\ No newline at end of file
+end
diff --git a/mesecons_textures/textures/jeija_wall_lever_back.png b/mesecons_textures/textures/jeija_wall_lever_back.png
new file mode 100644
index 0000000..9047e70
--- /dev/null
+++ b/mesecons_textures/textures/jeija_wall_lever_back.png
diff --git a/mesecons_textures/textures/jeija_wall_lever_bottom.png b/mesecons_textures/textures/jeija_wall_lever_bottom.png
new file mode 100644
index 0000000..041da96
--- /dev/null
+++ b/mesecons_textures/textures/jeija_wall_lever_bottom.png
diff --git a/mesecons_textures/textures/jeija_wall_lever_off.png b/mesecons_textures/textures/jeija_wall_lever_off.png
index b6b632d..474f8c1 100644
--- a/mesecons_textures/textures/jeija_wall_lever_off.png
+++ b/mesecons_textures/textures/jeija_wall_lever_off.png
diff --git a/mesecons_textures/textures/jeija_wall_lever_on.png b/mesecons_textures/textures/jeija_wall_lever_on.png
index 959f1b4..01cbc24 100644
--- a/mesecons_textures/textures/jeija_wall_lever_on.png
+++ b/mesecons_textures/textures/jeija_wall_lever_on.png
diff --git a/mesecons_textures/textures/jeija_wall_lever_sides.png b/mesecons_textures/textures/jeija_wall_lever_sides.png
new file mode 100644
index 0000000..5864f26
--- /dev/null
+++ b/mesecons_textures/textures/jeija_wall_lever_sides.png
diff --git a/mesecons_textures/textures/jeija_wall_lever_tb.png b/mesecons_textures/textures/jeija_wall_lever_tb.png
new file mode 100644
index 0000000..50348d3
--- /dev/null
+++ b/mesecons_textures/textures/jeija_wall_lever_tb.png
diff --git a/mesecons_textures/textures/jeija_wall_lever_top.png b/mesecons_textures/textures/jeija_wall_lever_top.png
new file mode 100644
index 0000000..31161ec
--- /dev/null
+++ b/mesecons_textures/textures/jeija_wall_lever_top.png
diff --git a/mesecons_walllever/init.lua b/mesecons_walllever/init.lua
index 144c734..7dd8828 100644
--- a/mesecons_walllever/init.lua
+++ b/mesecons_walllever/init.lua
@@ -1,29 +1,59 @@
 -- WALL LEVER
 minetest.register_node("mesecons_walllever:wall_lever_off", {
-	drawtype = "signlike",
-	tile_images = {"jeija_wall_lever_off.png"},
+	drawtype = "nodebox",
+	tile_images = {
+		"jeija_wall_lever_tb.png",
+		"jeija_wall_lever_bottom.png",
+		"jeija_wall_lever_sides.png",
+		"jeija_wall_lever_sides.png",
+		"jeija_wall_lever_back.png",
+		"jeija_wall_lever_off.png",
+	},
 	inventory_image = "jeija_wall_lever_off.png",
 	wield_image = "jeija_wall_lever_off.png",
 	paramtype = "light",
-	paramtype2 = "wallmounted",
-	legacy_wallmounted = true,
+	paramtype2 = "facedir",
 	walkable = false,
 	selection_box = {
-		type = "wallmounted",
+		type = "fixed",
+		fixed = { -8/16, -8/16, 3/16, 8/16, 8/16, 8/16 },
+	},
+	node_box = {
+		type = "fixed",
+		fixed = {{ -6/16, -6/16, 6/16, 6/16,  6/16, 8/16 },	-- the base "slab"
+			 { -5/16, -3/16, 5/16, 5/16,  3/16, 6/16 },	-- the lighted ring area
+			 { -4/16, -2/16, 4/16, 4/16,  2/16, 5/16 },	-- the raised bit that the lever "sits" on
+			 { -2/16, -1/16, 3/16, 2/16,  1/16, 4/16 },	-- the lever "hinge"
+			 { -1/16, -8/16, 4/16, 1/16,  0,    6/16 }}	-- the lever itself.
 	},
 	groups = {dig_immediate=2},
 	description="Lever",
 })
 minetest.register_node("mesecons_walllever:wall_lever_on", {
-	drawtype = "signlike",
-	tile_images = {"jeija_wall_lever_on.png"},
+	drawtype = "nodebox",
+	tile_images = {
+		"jeija_wall_lever_top.png",
+		"jeija_wall_lever_tb.png",
+		"jeija_wall_lever_sides.png",
+		"jeija_wall_lever_sides.png",
+		"jeija_wall_lever_back.png",
+		"jeija_wall_lever_on.png",
+	},
 	inventory_image = "jeija_wall_lever_on.png",
 	paramtype = "light",
-	paramtype2 = "wallmounted",
-	legacy_wallmounted = true,
+	paramtype2 = "facedir",
 	walkable = false,
 	selection_box = {
-		type = "wallmounted",
+		type = "fixed",
+		fixed = { -8/16, -8/16, 3/16, 8/16, 8/16, 8/16 },
+	},
+	node_box = {
+		type = "fixed",
+		fixed = {{ -6/16, -6/16,  6/16, 6/16, 6/16,  8/16 },	-- the base "slab"
+			 { -5/16, -3/16,  5/16, 5/16, 3/16,  6/16 },	-- the lighted ring area
+			 { -4/16, -2/16,  4/16, 4/16, 2/16,  5/16 },	-- the raised bit that the lever "sits" on
+			 { -2/16, -1/16,  3/16, 2/16, 1/16,  4/16 },	-- the lever "hinge"
+			 { -1/16,  0,     4/16, 1/16, 8/16,  6/16 }}	-- the lever itself.
 	},
 	groups = {dig_immediate=2,not_in_creative_inventory=1},
 	drop = '"mesecons_walllever:wall_lever_off" 1',