Revert "Update mesecons from upstream."

This reverts commit 263c11c.

mods/mesecons/mesecons_delayer/init.lua

@@ -27,21 +27,32 @@ local delaytime = { 0.1, 0.3, 0.5, 1.0 }
 
 for i = 1, 4 do
 
+local boxes = {
+	 { -6/16, -8/16, -6/16, 6/16, -7/16, 6/16 },		-- the main slab
+
+	 { -2/16, -7/16, -4/16, 2/16, -26/64, -3/16 },		-- the jeweled "on" indicator
+	 { -3/16, -7/16, -3/16, 3/16, -26/64, -2/16 },
+	 { -4/16, -7/16, -2/16, 4/16, -26/64, 2/16 },
+	 { -3/16, -7/16,  2/16, 3/16, -26/64, 3/16 },
+	 { -2/16, -7/16,  3/16, 2/16, -26/64, 4/16 },
+
+	 { -6/16, -7/16, -6/16, -4/16, -27/64, -4/16 },		-- the timer indicator
+	 { -8/16, -8/16, -1/16, -6/16, -7/16, 1/16 },		-- the two wire stubs
+	 { 6/16, -8/16, -1/16, 8/16, -7/16, 1/16 }
+}
+
 -- Delayer definition defaults
 local def = {
 	drawtype = "nodebox",
 	use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "opaque" or nil,
 	walkable = true,
 	selection_box = {
 		type = "fixed",
-		fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
+		fixed = { -8/16, -8/16, -8/16, 8/16, -6/16, 8/16 },
 	},
 	node_box = {
 		type = "fixed",
-		fixed = {
-			{ -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 }, -- bottom slab
-			{ -6/16, -7/16, -6/16, 6/16, -6/16, 6/16 }
-		},
+		fixed = boxes
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
@@ -63,17 +74,16 @@ end
 
 local off_state = {
 	description = S("Delayer"),
-	inventory_image = "jeija_gate_off.png^jeija_delayer.png",
-	wield_image = "jeija_gate_off.png^jeija_delayer.png",
 	tiles = {
-		"jeija_microcontroller_bottom.png^jeija_gate_output_off.png^jeija_gate_off.png^"..
-			"jeija_delayer.png^mesecons_delayer_"..tostring(i)..".png",
-		"jeija_microcontroller_bottom.png^jeija_gate_output_off.png",
-		"jeija_gate_side.png^jeija_gate_side_output_off.png",
-		"jeija_gate_side.png",
-		"jeija_gate_side.png",
-		"jeija_gate_side.png",
+		"mesecons_delayer_off_"..tostring(i)..".png",
+		"mesecons_delayer_bottom.png",
+		"mesecons_delayer_ends_off.png",
+		"mesecons_delayer_ends_off.png",
+		"mesecons_delayer_sides_off.png",
+		"mesecons_delayer_sides_off.png"
 	},
+	inventory_image = "mesecons_delayer_off_1.png",
+	wield_image = "mesecons_delayer_off_1.png",
 	groups = off_groups,
 	on_punch = function(pos, node, puncher)
 		if minetest.is_protected(pos, puncher and puncher:get_player_name() or "") then
@@ -107,16 +117,13 @@ minetest.register_node("mesecons_delayer:delayer_off_"..tostring(i), off_state)
 -- Activated delayer definition defaults
 local on_state = {
 	description = S("You hacker you"),
-	inventory_image = "jeija_gate_on.png^jeija_delayer.png",
-	wield_image = "jeija_gate_on.png^jeija_delayer.png",
 	tiles = {
-		"jeija_microcontroller_bottom.png^jeija_gate_output_on.png^jeija_gate_on.png^"..
-			"jeija_delayer.png^mesecons_delayer_"..tostring(i)..".png",
-		"jeija_microcontroller_bottom.png^jeija_gate_output_on.png",
-		"jeija_gate_side.png^jeija_gate_side_output_on.png",
-		"jeija_gate_side.png",
-		"jeija_gate_side.png",
-		"jeija_gate_side.png",
+		"mesecons_delayer_on_"..tostring(i)..".png",
+		"mesecons_delayer_bottom.png",
+		"mesecons_delayer_ends_on.png",
+		"mesecons_delayer_ends_on.png",
+		"mesecons_delayer_sides_on.png",
+		"mesecons_delayer_sides_on.png"
 	},
 	groups = {bendy = 2, snappy = 1, dig_immediate = 2, not_in_creative_inventory = 1},
 	on_punch = function(pos, node, puncher)

mods/mesecons/mesecons_pistons/init.lua

@@ -270,9 +270,9 @@ minetest.register_node("mesecons_pistons:piston_normal_off", {
 	description = S("Piston"),
 	tiles = {
 		"mesecons_piston_top.png",
-		"mesecons_piston_top.png^[transform2",
-		"mesecons_piston_top.png^[transform3",
-		"mesecons_piston_top.png^[transform1",
+		"mesecons_piston_bottom.png",
+		"mesecons_piston_left.png",
+		"mesecons_piston_right.png",
 		"mesecons_piston_back.png",
 		"mesecons_piston_pusher_front.png"
 	},
@@ -296,9 +296,9 @@ minetest.register_node("mesecons_pistons:piston_normal_on", {
 	drawtype = "nodebox",
 	tiles = {
 		"mesecons_piston_top.png",
-		"mesecons_piston_top.png^[transform2",
-		"mesecons_piston_top.png^[transform3",
-		"mesecons_piston_top.png^[transform1",
+		"mesecons_piston_bottom.png",
+		"mesecons_piston_left.png",
+		"mesecons_piston_right.png",
 		"mesecons_piston_back.png",
 		"mesecons_piston_on_front.png"
 	},
@@ -325,9 +325,9 @@ minetest.register_node("mesecons_pistons:piston_pusher_normal", {
 	drawtype = "nodebox",
 	tiles = {
 		"mesecons_piston_pusher_top.png",
-		"mesecons_piston_pusher_top.png^[transform2",
-		"mesecons_piston_pusher_top.png^[transform3",
-		"mesecons_piston_pusher_top.png^[transform1",
+		"mesecons_piston_pusher_bottom.png",
+		"mesecons_piston_pusher_left.png",
+		"mesecons_piston_pusher_right.png",
 		"mesecons_piston_pusher_back.png",
 		"mesecons_piston_pusher_front.png"
 	},
@@ -349,9 +349,9 @@ minetest.register_node("mesecons_pistons:piston_sticky_off", {
 	description = S("Sticky Piston"),
 	tiles = {
 		"mesecons_piston_top.png",
-		"mesecons_piston_top.png^[transform2",
-		"mesecons_piston_top.png^[transform3",
-		"mesecons_piston_top.png^[transform1",
+		"mesecons_piston_bottom.png",
+		"mesecons_piston_left.png",
+		"mesecons_piston_right.png",
 		"mesecons_piston_back.png",
 		"mesecons_piston_pusher_front_sticky.png"
 	},
@@ -375,9 +375,9 @@ minetest.register_node("mesecons_pistons:piston_sticky_on", {
 	drawtype = "nodebox",
 	tiles = {
 		"mesecons_piston_top.png",
-		"mesecons_piston_top.png^[transform2",
-		"mesecons_piston_top.png^[transform3",
-		"mesecons_piston_top.png^[transform1",
+		"mesecons_piston_bottom.png",
+		"mesecons_piston_left.png",
+		"mesecons_piston_right.png",
 		"mesecons_piston_back.png",
 		"mesecons_piston_on_front.png"
 	},
@@ -404,9 +404,9 @@ minetest.register_node("mesecons_pistons:piston_pusher_sticky", {
 	drawtype = "nodebox",
 	tiles = {
 		"mesecons_piston_pusher_top.png",
-		"mesecons_piston_pusher_top.png^[transform2",
-		"mesecons_piston_pusher_top.png^[transform3",
-		"mesecons_piston_pusher_top.png^[transform1",
+		"mesecons_piston_pusher_bottom.png",
+		"mesecons_piston_pusher_left.png",
+		"mesecons_piston_pusher_right.png",
 		"mesecons_piston_pusher_back.png",
 		"mesecons_piston_pusher_front_sticky.png"
 	},

mods/mesecons/mesecons_torch/init.lua

@@ -56,8 +56,8 @@ local torch_selectionbox =
 }
 
 minetest.register_node("mesecons_torch:mesecon_torch_off", {
-	drawtype = "plantlike",
-	tiles = {"jeija_torches_off.png"},
+	drawtype = "torchlike",
+	tiles = {"jeija_torches_off.png", "jeija_torches_off_ceiling.png", "jeija_torches_off_side.png"},
 	inventory_image = "jeija_torches_off.png",
 	paramtype = "light",
 	is_ground_content = false,
@@ -75,8 +75,8 @@ minetest.register_node("mesecons_torch:mesecon_torch_off", {
 })
 
 minetest.register_node("mesecons_torch:mesecon_torch_on", {
-	drawtype = "plantlike",
-	tiles = {"jeija_torches_on.png"},
+	drawtype = "torchlike",
+	tiles = {"jeija_torches_on.png", "jeija_torches_on_ceiling.png", "jeija_torches_on_side.png"},
 	inventory_image = "jeija_torches_on.png",
 	wield_image = "jeija_torches_on.png",
 	paramtype = "light",