Version MFF.

computer/computers.lua

@@ -1,6 +1,3 @@
-
-local S = homedecor_i18n.gettext
-
 -- Amiga 500 lookalike
 computer.register("computer:shefriendSOO", {
 	description = "SheFriendSOO",
@@ -32,7 +29,6 @@ minetest.register_node("computer:vanio", {
 	on_rightclick = function(pos, node, clicker, itemstack)
 		node.name = "computer:vanio_off"
 		minetest.set_node(pos, node)
-		return itemstack
 	end
 })
 
@@ -52,7 +48,6 @@ minetest.register_node("computer:vanio_off", {
 	on_rightclick = function(pos, node, clicker, itemstack)
 		node.name = "computer:vanio"
 		minetest.set_node(pos, node)
-		return itemstack
 	end
 })
 
@@ -153,19 +148,6 @@ computer.register("computer:admiral128", {
 	})
 })
 
--- XBox lookalike
-computer.register("computer:hueg_box", {
-	description = "HUEG Box",
-	tiles_off = { },
-	node_box = computer.pixelnodebox(16, {
-		-- X   Y   Z   W   H   L
-		{  0,  0,  7, 16,  6, 9 },   -- Console
-		{  2,  0,  1, 11,  3, 6 },   -- Controller
-		{  2,  0,  0,  2,  3, 1 },
-		{ 11,  0,  0,  2,  3, 1 },
-	})
-})
-
 -- Generic Flat Screen LCD (16x9) with keyboard
 local mo_sbox = {
 	type = "fixed",
@@ -173,7 +155,7 @@ local mo_sbox = {
 }
 
 minetest.register_node("computer:monitor", {
-	description = S("Monitor and keyboard"),
+	description = "Monitor and keyboard",
 	inventory_image = "computer_monitor_inv.png",
 	drawtype = "mesh",
 	mesh = "computer_monitor.obj",
@@ -186,11 +168,11 @@ minetest.register_node("computer:monitor", {
 	on_rightclick = function(pos, node, clicker, itemstack)
 		node.name = "computer:monitor_on"
 		minetest.set_node(pos, node)
-		return itemstack
 	end
 })
 
 minetest.register_node("computer:monitor_on", {
+	description = "Monitor and keyboard",
 	drawtype = "mesh",
 	mesh = "computer_monitor.obj",
 	tiles = {"monitor_display.png^[transformFX", "monitor_plastic.png", "computer_black.png", "monitor_plastic.png"},
@@ -204,7 +186,6 @@ minetest.register_node("computer:monitor_on", {
 	on_rightclick = function(pos, node, clicker, itemstack)
 		node.name = "computer:monitor"
 		minetest.set_node(pos, node)
-		return itemstack
 	end
 })
 
@@ -215,7 +196,7 @@ minetest.register_alias("computer:monitor_desktop", "computer:monitor")
 
 --WIFI Router (linksys look-a-like)
 minetest.register_node("computer:router", {
-	description = S("WIFI Router"),
+	description = "WIFI Router",
 	inventory_image = "computer_router_inv.png",
 	tiles = {"computer_router_t.png","computer_router_bt.png","computer_router_l.png","computer_router_r.png","computer_router_b.png",
 			{name="computer_router_f_animated.png", animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=1.0}},}, --"computer_router_f.png"},
@@ -243,7 +224,7 @@ local pct_cbox = {
 
 --Modern PC Tower
 minetest.register_node("computer:tower", {
-	description = S("Computer Tower"),
+	description = "Computer Tower",
 	inventory_image = "computer_tower_inv.png",
 	drawtype = "mesh",
 	mesh = "computer_tower.obj",
@@ -260,7 +241,7 @@ minetest.register_alias("computer:tower_on", "computer:tower")
 
 -- Printer/scaner combo
 minetest.register_node("computer:printer", {
-	description = S("Printer-Scanner Combo"),
+	description = "Printer Scaner Combo",
 	inventory_image = "computer_printer_inv.png",
 	tiles = {"computer_printer_t.png","computer_printer_bt.png","computer_printer_l.png",
 			"computer_printer_r.png","computer_printer_b.png","computer_printer_f.png"},
@@ -288,7 +269,7 @@ minetest.register_node("computer:printer", {
 --Rack Server
 minetest.register_node("computer:server", {
 	drawtype = "nodebox",
-	description = S("Rack Server"),
+	description = "Rack Server",
 	tiles = {
 		'computer_server_t.png',
 		'computer_server_bt.png',
@@ -313,14 +294,12 @@ minetest.register_node("computer:server", {
 	on_rightclick = function(pos, node, clicker, itemstack)
 		node.name = "computer:server_on"
 		minetest.set_node(pos, node)
-		return itemstack
 	end,
 	on_place = function(itemstack, placer, pointed_thing)
 		local pos = pointed_thing.above
 		if minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name ~= "air" then
-			minetest.chat_send_player( placer:get_player_name(),
-					S("Not enough vertical space to place a server!" ))
-			return itemstack
+			minetest.chat_send_player( placer:get_player_name(), "Not enough vertical space to place a server!" )
+			return
 		end
 		return minetest.item_place(itemstack, placer, pointed_thing)
 	end
@@ -328,11 +307,12 @@ minetest.register_node("computer:server", {
 
 minetest.register_node("computer:server_on", {
 	drawtype = "nodebox",
+	description = "Rack Server",
 	tiles = {
 		'computer_server_t.png',
 		'computer_server_bt.png',
-		'computer_server_l.png',
 		'computer_server_r.png',
+		'computer_server_l.png',
 		'computer_server_bt.png',
 		'computer_server_f_on.png',
 	},
@@ -353,6 +333,5 @@ minetest.register_node("computer:server_on", {
 	on_rightclick = function(pos, node, clicker, itemstack)
 		node.name = "computer:server"
 		minetest.set_node(pos, node)
-		return itemstack
 	end
 })

computer/depends.txt

@@ -1,2 +1,3 @@
 default
-homedecor_i18n
+intllib?
+

computer/init.lua

@@ -2,18 +2,19 @@ computer = {}
 screwdriver = screwdriver or {}
 
 computer.register = function (name, def)
+	local nodename = name
 	if (name:sub(1, 1) == ":") then name = name:sub(2) end
 	local modname, basename = name:match("^([^:]+):(.*)")
 	local TEXPFX = modname.."_"..basename.."_"
 	local ONSTATE = modname..":"..basename
 	local OFFSTATE = modname..":"..basename.."_off"
-	local cdef = table.copy(def)
+	local def = def
 	minetest.register_node(ONSTATE, {
 		drawtype = "nodebox",
 		paramtype = "light",
 		paramtype2 = "facedir",
-		description = cdef.description,
-		inventory_image = cdef.inventory_image,
+		description = def.description,
+		inventory_image = def.inventory_image,
 		groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2},
 		tiles = {
 			TEXPFX.."tp.png",
@@ -23,15 +24,14 @@ computer.register = function (name, def)
 			TEXPFX.."bk.png",
 			TEXPFX.."ft.png"
 		},
-		node_box = cdef.node_box,
-		selection_box = cdef.node_box,
+		node_box = def.node_box,
+		selection_box = def.node_box,
 		on_rightclick = function (pos, node, clicker, itemstack)
-			if cdef.on_turn_off and cdef.on_turn_off(pos, node, clicker, itemstack) then
-				return itemstack
+			if (def.on_turn_off) then
+				if (def.on_turn_off(pos, node, clicker, itemstack)) then return end
 			end
 			node.name = OFFSTATE
 			minetest.set_node(pos, node)
-			return itemstack
 		end
 	})
 	minetest.register_node(OFFSTATE, {
@@ -40,32 +40,34 @@ computer.register = function (name, def)
 		paramtype2 = "facedir",
 		groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, not_in_creative_inventory=1},
 		tiles = {
-			(TEXPFX.."tp"..(cdef.tiles_off.top    and "_off" or "")..".png"),
-			(TEXPFX.."bt"..(cdef.tiles_off.bottom and "_off" or "")..".png"),
-			(TEXPFX.."rt"..(cdef.tiles_off.right  and "_off" or "")..".png"),
-			(TEXPFX.."lt"..(cdef.tiles_off.left   and "_off" or "")..".png"),
-			(TEXPFX.."bk"..(cdef.tiles_off.back   and "_off" or "")..".png"),
-			(TEXPFX.."ft"..(cdef.tiles_off.front  and "_off" or "")..".png")
+			(TEXPFX.."tp"..(def.tiles_off.top    and "_off" or "")..".png"),
+			(TEXPFX.."bt"..(def.tiles_off.bottom and "_off" or "")..".png"),
+			(TEXPFX.."rt"..(def.tiles_off.right  and "_off" or "")..".png"),
+			(TEXPFX.."lt"..(def.tiles_off.left   and "_off" or "")..".png"),
+			(TEXPFX.."bk"..(def.tiles_off.back   and "_off" or "")..".png"),
+			(TEXPFX.."ft"..(def.tiles_off.front  and "_off" or "")..".png")
 		},
-		node_box = cdef.node_box_off or cdef.node_box,
-		selection_box = cdef.node_box_off or cdef.node_box,
+		node_box = def.node_box_off or def.node_box,
+		selection_box = def.node_box_off or def.node_box,
 		on_rightclick = function (pos, node, clicker, itemstack)
-			if cdef.on_turn_on and cdef.on_turn_on(pos, node, clicker, itemstack) then
-				return itemstack
+			if (def.on_turn_on) then
+				if (def.on_turn_on(pos, node, clicker, itemstack)) then return end
 			end
 			node.name = ONSTATE
 			minetest.set_node(pos, node)
-			return itemstack
 		end,
 		drop = ONSTATE
 	})
 end
 
 computer.register_handheld = function (name, def)
+	local nodename = name
 	if (name:sub(1, 1) == ":") then name = name:sub(2) end
 	local modname, basename = name:match("^([^:]+):(.*)")
 	local TEXPFX = modname.."_"..basename.."_inv"
 	local ONSTATE = modname..":"..basename
+	local OFFSTATE = modname..":"..basename.."_off"
+	local on_use = def.on_use
 	minetest.register_craftitem(ONSTATE, {
 		description = def.description,
 		inventory_image = TEXPFX..".png",
@@ -75,7 +77,8 @@ end
 
 computer.pixelnodebox = function (size, boxes)
 	local fixed = { }
-	for _, box in ipairs(boxes) do
+	local i, box
+	for i, box in ipairs(boxes) do
 		local x, y, z, w, h, l = unpack(box)
 		fixed[#fixed + 1] = {
 			(x / size) - 0.5,

computer/miscitems.lua

@@ -4,7 +4,8 @@
 
 -- This file defines some items in order to not have to depend on other mods.
 
-local S = homedecor_i18n.gettext
+-- Boilerplate to support localized strings if intllib mod is installed.
+local S = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end
 
 if (not minetest.get_modpath("homedecor")) then
 

computer/tetris.lua

@@ -1,6 +1,3 @@
-
-local S = homedecor_i18n.gettext
-
 local shapes = {
    {  { x = {0, 1, 0, 1}, y = {0, 0, 1, 1} } },
 
@@ -38,7 +35,7 @@ local buttons = "button[3,4.5;0.6,0.6;left;<]"
 	.."button[4.2,5.3;0.6,0.6;drop;V]"
 	.."button[4.8,4.5;0.6,0.6;rotateright;R]"
 	.."button[5.4,4.5;0.6,0.6;right;>]"
-	.."button[3.5,3;2,2;new;"..minetest.formspec_escape(S("New Game")).."]"
+	.."button[3.5,3;2,2;new;New Game]"
 
 local formsize = "size[5.9,5.7]"
 local boardx, boardy = 0, 0
@@ -74,7 +71,7 @@ local function step(pos, fields)
 	local meta = minetest.get_meta(pos)
 	local t = minetest.deserialize(meta:get_string("tetris"))
 
-	local function new_game(p)
+	local function new_game(pos)
 		local nex = math.random(7)
 
 		t = {
@@ -87,7 +84,7 @@ local function step(pos, fields)
 			x=4, y=0, rot=1
 		}
 
-		local timer = minetest.get_node_timer(p)
+		local timer = minetest.get_node_timer(pos)
 		timer:set(0.3, 0)
 	end
 
@@ -244,7 +241,7 @@ local function step(pos, fields)
 end
 
 minetest.register_node("computer:tetris_arcade", {
-	description=S("Tetris Arcade"),
+	description="Tetris Arcade",
 	drawtype = "mesh",
 	mesh = "tetris_arcade.obj",
 	tiles = {"tetris_arcade.png"},
@@ -262,8 +259,7 @@ minetest.register_node("computer:tetris_arcade", {
 	},
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
-		meta:set_string("formspec", formsize
-			.."button[2,2.5;2,2;new;"..minetest.formspec_escape(S("New Game")).."]"
+		meta:set_string("formspec", formsize.."button[2,2.5;2,2;new;New Game]"
 			..default.gui_bg..default.gui_bg_img..default.gui_slots)
 	end,
 	on_timer = function(pos)
@@ -274,14 +270,9 @@ minetest.register_node("computer:tetris_arcade", {
 	end,
 	on_place = function(itemstack, placer, pointed_thing)
 		local pos = pointed_thing.above
-		if minetest.is_protected(pos, placer:get_player_name()) or
-			minetest.is_protected({x=pos.x, y=pos.y+1, z=pos.z}, placer:get_player_name()) then
-			return itemstack
-		end
 		if minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name ~= "air" then
-			minetest.chat_send_player(placer:get_player_name(), S("No room for place the Arcade!"))
-			return itemstack
-		end
+			minetest.chat_send_player(placer:get_player_name(), "No room for place the Arcade!")
+		return end
 		local dir = placer:get_look_dir()
 		local node = {name="computer:tetris_arcade", param1=0, param2 = minetest.dir_to_facedir(dir)}
 		minetest.set_node(pos, node)