Merge pull request #9 from VanessaE/master

Better wall button nodeboxes

15 files changed, 71 insertions, 20 deletions

diff --git a/mesecons_button/init.lua b/mesecons_button/init.lua
index aba1f5f..42f4de1 100644
--- a/mesecons_button/init.lua
+++ b/mesecons_button/init.lua
@@ -1,36 +1,56 @@
 -- WALL BUTTON
 minetest.register_node("mesecons_button:button_off", {
     drawtype = "nodebox",
-    tile_images = {"jeija_wall_button_off.png"},
+    tiles = {
+	"jeija_wall_button_sides.png",	
+	"jeija_wall_button_sides.png",
+	"jeija_wall_button_sides.png",
+	"jeija_wall_button_sides.png",
+	"jeija_wall_button_sides.png",
+	"jeija_wall_button_off.png"
+	},
     paramtype = "light",
     paramtype2 = "facedir",
     legacy_wallmounted = true,
     walkable = false,
     selection_box = {
         type = "fixed",
-	fixed = {-0.2, -0.15, 0.3, 0.2, 0.15, 0.5},
+	fixed = { -6/16, -6/16, 5/16, 6/16, 6/16, 8/16 }
     },
     node_box = {
-        type = "fixed",
-	fixed = {-0.2, -0.15, 0.3, 0.2, 0.15, 0.5},
+        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
+	}
     },
     groups = {dig_immediate=2},
     description = "Button",
 })
 minetest.register_node("mesecons_button:button_on", {
 	drawtype = "nodebox",
-	tile_images = {"jeija_wall_button_on.png"},
+	tiles = {
+		"jeija_wall_button_sides.png",
+		"jeija_wall_button_sides.png",
+		"jeija_wall_button_sides.png",
+		"jeija_wall_button_sides.png",
+		"jeija_wall_button_sides.png",
+		"jeija_wall_button_on.png"
+		},
 	paramtype = "light",
 	paramtype2 = "facedir",
 	legacy_wallmounted = true,
 	walkable = false,
     selection_box = {
         type = "fixed",
-	fixed = {-0.2, -0.15, 0.4, 0.2, 0.15, 0.5},
+	fixed = { -6/16, -6/16, 5/16, 6/16, 6/16, 8/16 }
     },
     node_box = {
         type = "fixed",
-	fixed = {-0.2, -0.15, 0.4, 0.2, 0.15, 0.5},
+	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 }
+	}
     },
 	groups = {dig_immediate=2, not_in_creative_inventory=1},
 	drop = 'mesecons_button:button_off',
diff --git a/mesecons_delayer/init.lua b/mesecons_delayer/init.lua
index 03d73c2..282147f 100644
--- a/mesecons_delayer/init.lua
+++ b/mesecons_delayer/init.lua
@@ -1,7 +1,10 @@
 minetest.register_node("mesecons_delayer:delayer_off_1", {
 	description = "Delayer",
 	drawtype = "nodebox",
-	tile_images = {"mesecons_delayer_off_1.png"},
+	tiles = {
+		"mesecons_delayer_off_1.png",
+		"mesecons_delayer_sides.png"
+		},
 	inventory_image = "mesecons_delayer_off_1.png",
 	wield_image = "mesecons_delayer_off_1.png",
 	walkable = false,
@@ -24,7 +27,10 @@ minetest.register_node("mesecons_delayer:delayer_off_1", {
 minetest.register_node("mesecons_delayer:delayer_off_2", {
 	description = "Delayer",
 	drawtype = "nodebox",
-	tile_images = {"mesecons_delayer_off_2.png"},
+	tiles = {
+		"mesecons_delayer_off_2.png",
+		"mesecons_delayer_sides.png"
+		},
 	inventory_image = "mesecons_delayer_off_2.png",
 	walkable = false,
 	selection_box = {
@@ -46,7 +52,10 @@ minetest.register_node("mesecons_delayer:delayer_off_2", {
 minetest.register_node("mesecons_delayer:delayer_off_3", {
 	description = "Delayer",
 	drawtype = "nodebox",
-	tile_images = {"mesecons_delayer_off_3.png"},
+	tiles = {
+		"mesecons_delayer_off_3.png",
+		"mesecons_delayer_sides.png"
+		},
 	inventory_image = "mesecons_delayer_off_3.png",
 	walkable = false,
 	selection_box = {
@@ -68,7 +77,10 @@ minetest.register_node("mesecons_delayer:delayer_off_3", {
 minetest.register_node("mesecons_delayer:delayer_off_4", {
 	description = "Delayer",
 	drawtype = "nodebox",
-	tile_images = {"mesecons_delayer_off_4.png"},
+	tiles = {
+		"mesecons_delayer_off_4.png",
+		"mesecons_delayer_sides.png"
+		},
 	inventory_image = "mesecons_delayer_off_4.png",
 	walkable = false,
 	selection_box = {
@@ -90,7 +102,10 @@ minetest.register_node("mesecons_delayer:delayer_off_4", {
 minetest.register_node("mesecons_delayer:delayer_on_1", {
 	description = "Delayer",
 	drawtype = "nodebox",
-	tile_images = {"mesecons_delayer_on_1.png"},
+	tiles = {
+		"mesecons_delayer_on_1.png",
+		"mesecons_delayer_sides.png"
+		},
 	inventory_image = "mesecons_delayer_on_1.png",
 	walkable = false,
 	selection_box = {
@@ -112,7 +127,10 @@ minetest.register_node("mesecons_delayer:delayer_on_1", {
 minetest.register_node("mesecons_delayer:delayer_on_2", {
 	description = "Delayer",
 	drawtype = "nodebox",
-	tile_images = {"mesecons_delayer_on_2.png"},
+	tiles = {
+		"mesecons_delayer_on_2.png",
+		"mesecons_delayer_sides.png"
+		},
 	inventory_image = "mesecons_delayer_on_2.png",
 	walkable = false,
 	selection_box = {
@@ -134,7 +152,10 @@ minetest.register_node("mesecons_delayer:delayer_on_2", {
 minetest.register_node("mesecons_delayer:delayer_on_3", {
 	description = "Delayer",
 	drawtype = "nodebox",
-	tile_images = {"mesecons_delayer_on_3.png"},
+	tiles = {
+		"mesecons_delayer_on_3.png",
+		"mesecons_delayer_sides.png"
+		},
 	inventory_image = "mesecons_delayer_on_3.png",
 	walkable = false,
 	selection_box = {
@@ -156,7 +177,10 @@ minetest.register_node("mesecons_delayer:delayer_on_3", {
 minetest.register_node("mesecons_delayer:delayer_on_4", {
 	description = "Delayer",
 	drawtype = "nodebox",
-	tile_images = {"mesecons_delayer_on_4.png"},
+	tiles = {
+		"mesecons_delayer_on_4.png",
+		"mesecons_delayer_sides.png"
+		},
 	inventory_image = "mesecons_delayer_on_4.png",
 	walkable = false,
 	selection_box = {
diff --git a/mesecons_delayer/textures/mesecons_delayer_off_1.png b/mesecons_delayer/textures/mesecons_delayer_off_1.png
index 7c58076..42344b2 100644
--- a/mesecons_delayer/textures/mesecons_delayer_off_1.png
+++ b/mesecons_delayer/textures/mesecons_delayer_off_1.png
diff --git a/mesecons_delayer/textures/mesecons_delayer_off_2.png b/mesecons_delayer/textures/mesecons_delayer_off_2.png
index 91f2b6b..e560a55 100644
--- a/mesecons_delayer/textures/mesecons_delayer_off_2.png
+++ b/mesecons_delayer/textures/mesecons_delayer_off_2.png
diff --git a/mesecons_delayer/textures/mesecons_delayer_off_3.png b/mesecons_delayer/textures/mesecons_delayer_off_3.png
index 6564bcf..01a7503 100644
--- a/mesecons_delayer/textures/mesecons_delayer_off_3.png
+++ b/mesecons_delayer/textures/mesecons_delayer_off_3.png
diff --git a/mesecons_delayer/textures/mesecons_delayer_off_4.png b/mesecons_delayer/textures/mesecons_delayer_off_4.png
index ef05d3c..deed284 100644
--- a/mesecons_delayer/textures/mesecons_delayer_off_4.png
+++ b/mesecons_delayer/textures/mesecons_delayer_off_4.png
diff --git a/mesecons_delayer/textures/mesecons_delayer_on_1.png b/mesecons_delayer/textures/mesecons_delayer_on_1.png
index 5804969..cb1b364 100644
--- a/mesecons_delayer/textures/mesecons_delayer_on_1.png
+++ b/mesecons_delayer/textures/mesecons_delayer_on_1.png
diff --git a/mesecons_delayer/textures/mesecons_delayer_on_2.png b/mesecons_delayer/textures/mesecons_delayer_on_2.png
index 02eb698..2174891 100644
--- a/mesecons_delayer/textures/mesecons_delayer_on_2.png
+++ b/mesecons_delayer/textures/mesecons_delayer_on_2.png
diff --git a/mesecons_delayer/textures/mesecons_delayer_on_3.png b/mesecons_delayer/textures/mesecons_delayer_on_3.png
index c0e8376..5602df0 100644
--- a/mesecons_delayer/textures/mesecons_delayer_on_3.png
+++ b/mesecons_delayer/textures/mesecons_delayer_on_3.png
diff --git a/mesecons_delayer/textures/mesecons_delayer_on_4.png b/mesecons_delayer/textures/mesecons_delayer_on_4.png
index 1e1273e..2a14de7 100644
--- a/mesecons_delayer/textures/mesecons_delayer_on_4.png
+++ b/mesecons_delayer/textures/mesecons_delayer_on_4.png
diff --git a/mesecons_delayer/textures/mesecons_delayer_sides.png b/mesecons_delayer/textures/mesecons_delayer_sides.png
new file mode 100644
index 0000000..3e21e53
--- /dev/null
+++ b/mesecons_delayer/textures/mesecons_delayer_sides.png
diff --git a/mesecons_pistons/init.lua b/mesecons_pistons/init.lua
index b3269bc..ccb5630 100644
--- a/mesecons_pistons/init.lua
+++ b/mesecons_pistons/init.lua
@@ -2,7 +2,7 @@
 --registration normal one:
 minetest.register_node("mesecons_pistons:piston_normal", {
 	description = "Piston",
-	tile_images = {"jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_side.png"},
+	tiles = {"jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_side.png"},
 	groups = {cracky=3},
 	paramtype2 = "facedir",
 	after_dig_node = function(pos, oldnode)
@@ -22,7 +22,7 @@ minetest.register_node("mesecons_pistons:piston_normal", {
 --registration sticky one:
 minetest.register_node("mesecons_pistons:piston_sticky", {
 	description = "Sticky Piston",
-	tile_images = {"jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_sticky_side.png"},
+	tiles = {"jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_sticky_side.png"},
 	groups = {cracky=3},
 	paramtype2 = "facedir",
 	after_dig_node = function(pos, oldnode)
@@ -58,7 +58,7 @@ minetest.register_craft({
 
 minetest.register_node("mesecons_pistons:piston_pusher_normal", {
 	drawtype = "nodebox",
-	tile_images = {"jeija_piston_pusher_normal.png"},
+	tiles = {"jeija_piston_pusher_normal.png"},
 	paramtype = "light",
 	paramtype2 = "facedir",
 	diggable = false,
@@ -83,7 +83,14 @@ mesecon:register_mvps_stopper("mesecons_pistons:piston_pusher_sticky")
 
 minetest.register_node("mesecons_pistons:piston_pusher_sticky", {
 	drawtype = "nodebox",
-	tile_images = {"jeija_piston_pusher_sticky.png"},
+	tiles = {
+		"jeija_piston_pusher_normal.png",
+		"jeija_piston_pusher_normal.png",
+		"jeija_piston_pusher_normal.png",
+		"jeija_piston_pusher_normal.png",
+		"jeija_piston_pusher_normal.png",
+		"jeija_piston_pusher_sticky.png"
+		},
 	paramtype = "light",
 	paramtype2 = "facedir",
 	diggable = false,
@@ -211,4 +218,4 @@ function mesecon:piston_get_direction(node)
 	else --node.param2 == 0
 		return {x=0, y=0, z=-1}
 	end
-end
\ No newline at end of file
+end
diff --git a/mesecons_textures/textures/jeija_wall_button_off.png b/mesecons_textures/textures/jeija_wall_button_off.png
index fadf3f3..0e3ff25 100644
--- a/mesecons_textures/textures/jeija_wall_button_off.png
+++ b/mesecons_textures/textures/jeija_wall_button_off.png
diff --git a/mesecons_textures/textures/jeija_wall_button_on.png b/mesecons_textures/textures/jeija_wall_button_on.png
index 5d5f822..1d97464 100644
--- a/mesecons_textures/textures/jeija_wall_button_on.png
+++ b/mesecons_textures/textures/jeija_wall_button_on.png
diff --git a/mesecons_textures/textures/jeija_wall_button_sides.png b/mesecons_textures/textures/jeija_wall_button_sides.png
new file mode 100644
index 0000000..9b79b57
--- /dev/null
+++ b/mesecons_textures/textures/jeija_wall_button_sides.png