Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

autocrafter.lua

@@ -47,7 +47,7 @@ local function autocraft(inventory, craft)
 	end
 	-- consume material
 	for itemname, number in pairs(consumption) do
-		for _ = 1, number do -- We have to do that since remove_item does not work if count > stack_max
+		for i = 1, number do -- We have to do that since remove_item does not work if count > stack_max
 			inventory:remove_item("src", ItemStack(itemname))
 		end
 	end
@@ -67,13 +67,16 @@ local function run_autocrafter(pos, elapsed)
 	local inventory = meta:get_inventory()
 	local craft = get_craft(pos, inventory)
 	local output_item = craft.output.item
+	-- NALC: existence de limitgroup ?
+	local limitcraft = minetest.get_item_group(output_item:get_name(), "limitcraft") or 0
 	-- only use crafts that have an actual result
-	if output_item:is_empty() then
+	-- NALC: ou si l'item n'est pas dans le group limitcraft
+	if output_item:is_empty() or limitcraft > 0 then
 		meta:set_string("infotext", S("unconfigured Autocrafter: unknown recipe"))
 		return false
 	end
 
-	for _ = 1, math.floor(elapsed/craft_time) do
+	for step = 1, math.floor(elapsed/craft_time) do
 		local continue = autocraft(inventory, craft)
 		if not continue then return false end
 	end
@@ -106,6 +109,7 @@ local function after_recipe_change(pos, inventory)
 		inventory:set_stack("output", 1, "")
 		return
 	end
+	local recipe_changed = false
 	local recipe = inventory:get_list("recipe")
 
 	local hash = minetest.hash_node_position(pos)
@@ -388,27 +392,6 @@ minetest.register_node("pipeworks:autocrafter", {
 						end
 					end
 					after_recipe_change(pos,inv)
-				elseif msg == "get_recipe" then
-					local meta = minetest.get_meta(pos)
-					local inv = meta:get_inventory()
-					local recipe = {}
-					for y=0,2,1 do
-						local row = {}
-						for x=1,3,1 do
-							local slot = y*3+x
-							table.insert(row, inv:get_stack("recipe",slot):get_name())
-						end
-						table.insert(recipe, row)
-					end
-					local setchan = meta:get_string("channel")
-					local output = inv:get_stack("output", 1)
-					digiline:receptor_send(pos, digiline.rules.default, setchan, {
-						recipe = recipe,
-						result = {
-							name = output:get_name(),
-							count = output:get_count(),
-						}
-					  })
 				elseif msg == "off" then
 					update_meta(meta, false)
 					minetest.get_node_timer(pos):stop()

autoplace_tubes.lua

@@ -53,35 +53,34 @@ local function tube_autoroute(pos)
 	}
 	-- xm = 1, xp = 2, ym = 3, yp = 4, zm = 5, zp = 6
 
-	local adjlist = {} -- this will be used in item_transport
-
+	local positions = {}
+	local nodes = {}
 	for i, adj in ipairs(adjustments) do
-		local position = vector.add(pos, adj)
-		local node = minetest.get_node(position)
+		positions[i] = vector.add(pos, adj)
+		nodes[i] = minetest.get_node(positions[i])
+	end
 
+	for i, node in ipairs(nodes) do
 		local idef = minetest.registered_nodes[node.name]
 		-- handle the tubes themselves
 		if is_tube(node.name) then
 			active[i] = 1
-			table.insert(adjlist, adj)
 		-- handle new style connectors
 		elseif idef and idef.tube and idef.tube.connect_sides then
-			if idef.tube.connect_sides[nodeside(node, vector.multiply(adj, -1))] then
+			local dir = adjustments[i]
+			if idef.tube.connect_sides[nodeside(node, vector.multiply(dir, -1))] then
 				active[i] = 1
-				table.insert(adjlist, adj)
 			end
 		end
 	end
 
-	minetest.get_meta(pos):set_string("adjlist", minetest.serialize(adjlist))
-
 	-- all sides checked, now figure which tube to use.
 
 	local nodedef = minetest.registered_nodes[nctr.name]
 	local basename = nodedef.basename
 	if nodedef.style == "old" then
 		local nsurround = ""
-		for _, n in ipairs(active) do
+		for i, n in ipairs(active) do
 			nsurround = nsurround..n
 		end
 		nctr.name = basename.."_"..nsurround

common.lua

@@ -86,9 +86,10 @@ function pipeworks.table_contains(tbl, element)
 end
 
 function pipeworks.table_extend(tbl, tbl2)
-	local oldlength = #tbl
-	for i = 1,#tbl2 do
-		tbl[oldlength + i] = tbl2[i]
+	local index = #tbl + 1
+	for _, elt in ipairs(tbl2) do
+		tbl[index] = elt
+		index = index + 1
 	end
 end
 
@@ -114,7 +115,7 @@ local fs_helpers = {}
 pipeworks.fs_helpers = fs_helpers
 function fs_helpers.on_receive_fields(pos, fields)
 	local meta = minetest.get_meta(pos)
-	for field in pairs(fields) do
+	for field, value in pairs(fields) do
 		if pipeworks.string_startswith(field, "fs_helpers_cycling:") then
 			local l = field:split(":")
 			local new_value = tonumber(l[2])
@@ -223,7 +224,7 @@ function pipeworks.create_fake_player(def, is_dynamic)
 				return self._inventory:set_stack(def.wield_list,
 					self._wield_index, item)
 			end
-			self._wielded_item = ItemStack(item)
+			_wielded_item = ItemStack(item)
 		end,
 		get_wielded_item = function(self, item)
 			if self._inventory and def.wield_list then
@@ -242,18 +243,17 @@ function pipeworks.create_fake_player(def, is_dynamic)
 		set_bone_position = delay(),
 		hud_change = delay(),
 	}
+	local _trash
 	-- Getter & setter functions
 	p.get_inventory_formspec, p.set_inventory_formspec
 		= get_set_wrap("formspec", is_dynamic)
 	p.get_breath, p.set_breath = get_set_wrap("breath", is_dynamic)
 	p.get_hp, p.set_hp = get_set_wrap("hp", is_dynamic)
 	p.get_pos, p.set_pos = get_set_wrap("pos", is_dynamic)
+	_trash, p.move_to = get_set_wrap("pos", is_dynamic)
 	p.get_wield_index, p.set_wield_index = get_set_wrap("wield_index", true)
 	p.get_properties, p.set_properties = get_set_wrap("properties", false)
 
-	-- For players, move_to and get_pos do the same
-	p.move_to = p.get_pos
-
 	-- Backwards compatibilty
 	p.getpos = p.get_pos
 	p.setpos = p.set_pos

compat-chests.lua

@@ -65,7 +65,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 				local node = minetest.get_node(pos)
 
 				open_chests[pn] = nil
-				for _, v in pairs(open_chests) do
+				for k, v in pairs(open_chests) do
 					if v.pos.x == pos.x and v.pos.y == pos.y and v.pos.z == pos.z then
 						return true
 					end
@@ -77,8 +77,10 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 					pipeworks.after_place(pos)
 				end)
 				minetest.sound_play(sound, {gain = 0.3, pos = pos, max_hear_distance = 10})
-			elseif pipeworks.may_configure(pos, player) then
-				-- Pipeworks Switch
+			end
+
+			-- Pipeworks Switch
+			if pipeworks.may_configure(pos, player) and not fields.quit then
 				fs_helpers.on_receive_fields(pos, fields)
 				minetest.show_formspec(player:get_player_name(), "pipeworks:chest_formspec", get_chest_formspec(pos))
 			end
@@ -230,7 +232,7 @@ override.tiles = {
 }
 
 -- Add the extra groups
-for _,v in ipairs({override_protected, override, override_open, override_protected_open}) do
+for i,v in ipairs({override_protected, override, override_open, override_protected_open}) do
 	v.groups.tubedevice = 1
 	v.groups.tubedevice_receiver = 1
 end

compat-furnaces.lua

@@ -7,7 +7,7 @@ local DS = minetest.get_translator("default")
 
 local fs_helpers = pipeworks.fs_helpers
 
-local tube_entry = "^pipeworks_tube_connection_stony.png"
+tube_entry = "^pipeworks_tube_connection_stony.png"
 
 local function active_formspec(fuel_percent, item_percent, pos, meta)
 	local formspec =

devices.lua

@@ -10,7 +10,7 @@ function pipeworks.fix_after_rotation(pos, node, user, mode, new_param2)
 
 	if string.find(node.name, "spigot") then new_param2 = new_param2 % 4 end
 
-	local newnode = string.gsub(node.name, "_on", "_off")
+	newnode = string.gsub(node.name, "_on", "_off")
 	minetest.swap_node(pos, { name = newnode, param2 = new_param2 })
 	pipeworks.scan_for_pipe_objects(pos)
 
@@ -20,7 +20,7 @@ end
 function pipeworks.rotate_on_place(itemstack, placer, pointed_thing)
 
 	local playername = placer:get_player_name()
-	if not minetest.is_protected(pointed_thing.under, playername)
+	if not minetest.is_protected(pointed_thing.under, playername) 
 	   and not minetest.is_protected(pointed_thing.above, playername) then
 
 		local node = minetest.get_node(pointed_thing.under)
@@ -36,7 +36,9 @@ function pipeworks.rotate_on_place(itemstack, placer, pointed_thing)
 			local under = pointed_thing.under
 			local fdir = minetest.dir_to_facedir(placer:get_look_dir())
 			local undernode = minetest.get_node(under)
+			local abovenode = minetest.get_node(above)
 			local uname = undernode.name
+			local aname = abovenode.name
 			local isabove = (above.x == under.x) and (above.z == under.z) and (pitch > 0)
 			local pos1 = above
 
@@ -103,7 +105,6 @@ if minetest.get_modpath("mesecons") then
 	}
 end
 
---[[
 local pipes_devicelist = {
 	"pump",
 	"valve",
@@ -119,15 +120,14 @@ local pipes_devicelist = {
 	"storage_tank_9",
 	"storage_tank_10"
 }
---]]
 
 -- Now define the nodes.
 
 local states = { "on", "off" }
+local dgroups = ""
 
 for s in ipairs(states) do
 
-	local dgroups
 	if states[s] == "off" then
 		dgroups = {snappy=3, pipe=1}
 	else
@@ -187,11 +187,11 @@ for s in ipairs(states) do
 		paramtype = "light",
 		paramtype2 = "facedir",
 		selection_box = {
-			type = "fixed",
+	             	type = "fixed",
 			fixed = { -5/16, -4/16, -8/16, 5/16, 5/16, 8/16 }
 		},
 		collision_box = {
-			type = "fixed",
+	             	type = "fixed",
 			fixed = { -5/16, -4/16, -8/16, 5/16, 5/16, 8/16 }
 		},
 		groups = dgroups,
@@ -233,11 +233,11 @@ minetest.register_node(nodename_valve_loaded, {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	selection_box = {
-		type = "fixed",
+             	type = "fixed",
 		fixed = { -5/16, -4/16, -8/16, 5/16, 5/16, 8/16 }
 	},
 	collision_box = {
-		type = "fixed",
+             	type = "fixed",
 		fixed = { -5/16, -4/16, -8/16, 5/16, 5/16, 8/16 }
 	},
 	groups = {snappy=3, pipe=1, not_in_creative_inventory=1},
@@ -465,7 +465,7 @@ minetest.register_node(nodename_sensor_empty, {
 	end,
 	on_construct = function(pos)
 		if mesecon then
-			mesecon.receptor_off(pos, pipeworks.mesecons_rules)
+			mesecon.receptor_off(pos, rules) 
 		end
 	end,
 	selection_box = {
@@ -504,7 +504,7 @@ minetest.register_node(nodename_sensor_loaded, {
 	end,
 	on_construct = function(pos)
 		if mesecon then
-			mesecon.receptor_on(pos, pipeworks.mesecons_rules)
+			mesecon.receptor_on(pos, rules) 
 		end
 	end,
 	selection_box = {
@@ -626,7 +626,7 @@ minetest.register_node(nodename_fountain_empty, {
 	end,
 	on_construct = function(pos)
 		if mesecon then
-			mesecon.receptor_on(pos, pipeworks.mesecons_rules)
+			mesecon.receptor_on(pos, rules) 
 		end
 	end,
 	selection_box = {
@@ -661,7 +661,7 @@ minetest.register_node(nodename_fountain_loaded, {
 	end,
 	on_construct = function(pos)
 		if mesecon then
-			mesecon.receptor_on(pos, pipeworks.mesecons_rules)
+			mesecon.receptor_on(pos, rules) 
 		end
 	end,
 	selection_box = {

filter-injector.lua

@@ -1,6 +1,10 @@
 local S = minetest.get_translator("pipeworks")
 local fs_helpers = pipeworks.fs_helpers
 
+local function delay(x)
+	return (function() return x end)
+end
+
 local function set_filter_infotext(data, meta)
 	local infotext = S("@1 Filter-Injector", data.wise_desc)
 	if meta:get_int("slotseq_mode") == 2 then
@@ -322,8 +326,7 @@ local function punch_filter(data, filtpos, filtnode, msg)
 				end
 				local pos = vector.add(frompos, vector.multiply(dir, 1.4))
 				local start_pos = vector.add(frompos, dir)
-				pipeworks.tube_inject_item(pos, start_pos, dir, item,
-					fakePlayer:get_player_name())
+				local item1 = pipeworks.tube_inject_item(pos, start_pos, dir, item, fakePlayer:get_player_name())
 				return true -- only fire one item, please
 			end
 		end

flowing_logic.lua

@@ -60,8 +60,8 @@ pipeworks.check_for_inflows = function(pos,node)
 			end
 		end
 	end
-	if newnode then
-		minetest.add_node(pos,{name=newnode, param2 = node.param2})
+	if newnode then 
+		minetest.add_node(pos,{name=newnode, param2 = node.param2}) 
 		minetest.get_meta(pos):set_string("source",minetest.pos_to_string(source))
 	end
 end
@@ -75,15 +75,15 @@ pipeworks.check_sources = function(pos,node)
 		newnode = string.gsub(node.name,"loaded","empty")
 	end
 
-	if newnode then
-		minetest.add_node(pos,{name=newnode, param2 = node.param2})
+	if newnode then 
+		minetest.add_node(pos,{name=newnode, param2 = node.param2}) 
 		minetest.get_meta(pos):set_string("source","")
 	end
 end
 
 pipeworks.spigot_check = function(pos, node)
 	local belowname = minetest.get_node({x=pos.x,y=pos.y-1,z=pos.z}).name
-	if belowname and (belowname == "air" or belowname == "default:water_flowing" or belowname == "default:water_source") then
+	if belowname and (belowname == "air" or belowname == "default:water_flowing" or belowname == "default:water_source") then 
 		local spigotname = minetest.get_node(pos).name
 		local fdir=node.param2 % 4
 		local check = {
@@ -113,7 +113,7 @@ end
 
 pipeworks.fountainhead_check = function(pos, node)
 	local abovename = minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z}).name
-	if abovename and (abovename == "air" or abovename == "default:water_flowing" or abovename == "default:water_source") then
+	if abovename and (abovename == "air" or abovename == "default:water_flowing" or abovename == "default:water_source") then 
 		local fountainhead_name = minetest.get_node(pos).name
 		local near_node = minetest.get_node({x=pos.x,y=pos.y-1,z=pos.z})
 		if near_node and string.find(near_node.name, "_loaded") then

init.lua

@@ -6,6 +6,8 @@
 
 pipeworks = {}
 
+local DEBUG = false
+
 pipeworks.worldpath = minetest.get_worldpath()
 pipeworks.modpath = minetest.get_modpath("pipeworks")
 local S = minetest.get_translator("pipeworks")
@@ -69,8 +71,8 @@ function pipeworks.may_configure(pos, player)
 	local meta = minetest.get_meta(pos)
 	local owner = meta:get_string("owner")
 
-	if owner ~= "" and owner == name then -- wielders and filters
-		return true
+	if owner ~= "" then -- wielders and filters
+		return owner == name
 	end
 	return not minetest.is_protected(pos, name)
 end
@@ -148,4 +150,4 @@ end
 
 minetest.register_alias("pipeworks:pipe", "pipeworks:pipe_110000_empty")
 
-minetest.log("info", "Pipeworks loaded!")
+print("Pipeworks loaded!")

item_transport.lua

@@ -25,7 +25,7 @@ end
 -- both optional w/ sensible defaults and fallback to normal allow_* function
 -- XXX: possibly change insert_object to insert_item
 
-local default_adjlist={{x=0,y=0,z=1},{x=0,y=0,z=-1},{x=0,y=1,z=0},{x=0,y=-1,z=0},{x=1,y=0,z=0},{x=-1,y=0,z=0}}
+local adjlist={{x=0,y=0,z=1},{x=0,y=0,z=-1},{x=0,y=1,z=0},{x=0,y=-1,z=0},{x=1,y=0,z=0},{x=-1,y=0,z=0}}
 
 function pipeworks.notvel(tbl, vel)
 	local tbl2={}
@@ -42,7 +42,7 @@ minetest.register_globalstep(function(dtime)
 		return
 	end
 	tube_item_count = {}
-	for _, entity in pairs(luaentity.entities) do
+	for id, entity in pairs(luaentity.entities) do
 		if entity.name == "pipeworks:tubed_item" then
 			local h = minetest.hash_node_position(vector.round(entity._pos))
 			tube_item_count[h] = (tube_item_count[h] or 0) + 1
@@ -80,9 +80,6 @@ local function go_next_compat(pos, cnode, cmeta, cycledir, vel, stack, owner)
 	if minetest.registered_nodes[cnode.name] and minetest.registered_nodes[cnode.name].tube and minetest.registered_nodes[cnode.name].tube.can_go then
 		can_go = minetest.registered_nodes[cnode.name].tube.can_go(pos, cnode, vel, stack)
 	else
-		local adjlist_string = minetest.get_meta(pos):get_string("adjlist")
-		local adjlist = minetest.deserialize(adjlist_string) or default_adjlist -- backward compat: if not found, use old behavior: all directions
-
 		can_go = pipeworks.notvel(adjlist, vel)
 	end
 	-- can_go() is expected to return an array-like table of candidate offsets.
@@ -194,7 +191,6 @@ minetest.register_entity("pipeworks:tubed_item", {
 
 	from_data = function(self, itemstring)
 		local stack = ItemStack(itemstring)
-		--[[
 		local itemtable = stack:to_table()
 		local itemname = nil
 		if itemtable then
@@ -206,7 +202,6 @@ minetest.register_entity("pipeworks:tubed_item", {
 			item_texture = minetest.registered_items[itemname].inventory_image
 			item_type = minetest.registered_items[itemname].type
 		end
-		--]]
 		self.object:set_properties({
 			is_visible = true,
 			textures = {stack:get_name()}
@@ -393,7 +388,7 @@ if minetest.get_modpath("mesecons_mvps") then
 		for _, n in ipairs(moved_nodes) do
 			moved[minetest.hash_node_position(n.oldpos)] = vector.subtract(n.pos, n.oldpos)
 		end
-		for _, entity in pairs(luaentity.entities) do
+		for id, entity in pairs(luaentity.entities) do
 			if entity.name == "pipeworks:tubed_item" then
 				local pos = entity:get_pos()
 				local rpos = vector.round(pos)

legacy.lua

@@ -1,6 +1,6 @@
 local S = minetest.get_translator("pipeworks")
 
-if not minetest.get_modpath("auto_tree_tap") and
+if not minetest.get_modpath("auto_tree_tap") and 
   minetest.get_modpath("technic") then
 
 	minetest.register_abm({
@@ -38,10 +38,10 @@ if not minetest.get_modpath("auto_tree_tap") and
 		after_place_node = function (pos, placer)
 			pipeworks.scan_for_tube_objects(pos, placer)
 			local placer_pos = placer:get_pos()
-
+		
 			--correct for the player's height
 			if placer:is_player() then placer_pos.y = placer_pos.y + 1.5 end
-
+		
 			--correct for 6d facedir
 			if placer_pos then
 				local dir = {

locale/pipeworks.zh_CN.tr

@@ -1,110 +0,0 @@
-# textdomain: pipeworks
-# License: CC-by-SA 4.0
-# Author: pevernow <3450354617@qq.com>
-
-## digilines interfacing
-Channel=频道
-
-## init
-Allow splitting incoming stacks from tubes=允许从管道中拆分传入堆栈
-
-## autocrafter
-Unknown item=通道
-unconfigured Autocrafter: unknown recipe=未配置的自动工作台: 未知配方
-unconfigured Autocrafter=未配置的自动工作台
-'@1' Autocrafter (@2)=自动工作台 '@1' (@2)
-Save=保存
-paused '@1' Autocrafter=暂停的自动工作台
-Autocrafter=自动工作台
-
-## compat-furnaces
-Allow splitting incoming material (not fuel) stacks from tubes=允许从管子中分离进来的材料（不是燃料）堆
-
-## decorative tubes
-Airtight steelblock embedded tube=密封嵌入式铁块管道
-Airtight panel embedded tube=密封嵌入式片状管道
-
-## devices
-Pump/Intake Module=泵/进气模块
-Valve=阀门
-Decorative grating=Decorative grating
-Spigot outlet=龙头
-Airtight Pipe entry/exit=密闭管进/出
-Flow Sensor=流量传感器
-Flow sensor (on)=流量传感器（上）
-empty=空的
-@1% full=满的@1 %
-Expansion Tank (@1)=扩展水箱 (@1)
-Fluid Storage Tank (@1)=储液罐 (@1)
-Fountainhead=源泉
-Straight-only Pipe=直管
-## filter-injector
-(slot #@1 next)=(下一个插槽 : #@1)
-@1 Filter-Injector=@1取物器
-Sequence slots by Priority=优先顺序排列
-Sequence slots Randomly=随机排列时隙
-Sequence slots by Rotation=旋转顺序槽
-Exact match - off=完全匹配-关闭
-Exact match - on=完全匹配-开启
-Prefer item types:=偏好物品类型 :
-Itemwise=逐项
-Stackwise=堆叠方式
-Digiline=Digiline
-
-## legacy
-Auto-Tap=自动轴阀
-
-## pipes
-Pipe Segment=管道
-Pipe Segment (legacy)=管道（旧版）
-
-
-## routing tubes
-Pneumatic tube segment=普通管道
-Broken Tube=断管
-High Priority Tube Segment=高优先级管段
-Accelerating Pneumatic Tube Segment=加速管道
-Crossing Pneumatic Tube Segment=定向管道
-One way tube=单向管
-
-## signal tubes
-Detecting Pneumatic Tube Segment on=检测管道（运行中）
-Detecting Pneumatic Tube Segment=检测管道
-Digiline Detecting Pneumatic Tube Segment=Digiline检测管道
-Digiline Detecting Tube=Digiline检测管
-Conducting Pneumatic Tube Segment=传导管道
-Conducting Pneumatic Tube Segment on=传导管道（运行中）
-Digiline Conducting Pneumatic Tube Segment=Digiline传导式气动管道
-Mesecon and Digiline Conducting Pneumatic Tube Segment=Mesecon和Digiline传导管道
-Mesecon and Digiline Conducting Pneumatic Tube Segment on=Mesecon和Digiline传导管道（运行中）
-
-## sorting tubes
-Sorting Pneumatic Tube Segment=分类管道
-Sorting pneumatic tube=分类管道
-
-## teleport tube
-Receive=接收
-channels are public by default=频道默认为公开
-use <player>:<channel> for fully private channels=将<player>:<channel>用于完全私人的频道
-use <player>;<channel> for private receivers=使用<player>;<channel>作为私人接收器
-Teleporting Pneumatic Tube Segment=传送管道
-unconfigured Teleportation Tube=未配置的传送管道
-Sorry, channel '@1' is reserved for exclusive use by @2=抱歉，频道‘@1’保留供‘@2’专用
-Sorry, receiving from channel '@1' is reserved for @2=抱歉，从频道'@1'接收的内容已保留给'@2'
-Teleportation Tube @1 on '@2'=传送管'@1'在'@2'上
-
-## trashcan
-Trash Can=垃圾箱
-
-## tube registration
-Pneumatic tube segment (legacy)=普通管道（旧式）
-
-## vacuum tubes
-Vacuuming Pneumatic Tube Segment=拾取管道
-Adjustable Vacuuming Pneumatic Tube Segment=高级拾取管道
-Adjustable Vacuuming Pneumatic Tube Segment (@1m)=高级拾取管道(@1m)
-
-## wielder
-Node Breaker=方块破坏器
-Deployer=放置器
-Dispenser=投掷器

lua_tube.lua

@@ -13,10 +13,8 @@
 -- newport = merge_port_states(state1, state2): just does result = state1 or state2 for every port
 -- set_port(pos, rule, state): activates/deactivates the mesecons according to the port states
 -- set_port_states(pos, ports): Applies new port states to a Luacontroller at pos
--- run_inner(pos, code, event): runs code on the controller at pos and event
--- reset_formspec(pos, code, errmsg): installs new code and prints error messages, without resetting LCID
--- reset_meta(pos, code, errmsg): performs a software-reset, installs new code and prints error message
--- run(pos, event): a wrapper for run_inner which gets code & handles errors via reset_meta
+-- run(pos): runs the code in the controller at pos
+-- reset_meta(pos, code, errmsg): performs a software-reset, installs new code and prints error messages
 -- resetn(pos): performs a hardware reset, turns off all ports
 --
 -- The Sandbox
@@ -79,7 +77,7 @@ local function update_real_port_states(pos, rule_name, new_state)
 	if rule_name.x == nil then
 		for _, rname in ipairs(rule_name) do
 			local port = pos_to_side[rname.x + (2 * rname.y) + (3 * rname.z) + 4]
-			L[port] = (new_state == "on") and 1 or 0
+			L[port] = (newstate == "on") and 1 or 0
 		end
 	else
 		local port = pos_to_side[rule_name.x + (2 * rule_name.y) + (3 * rule_name.z) + 4]
@@ -170,7 +168,7 @@ local function set_port_states(pos, ports)
 		-- Solution / Workaround:
 		-- Remember which output was turned off and ignore next "off" event.
 		local meta = minetest.get_meta(pos)
-		local ign = minetest.deserialize(meta:get_string("ignore_offevents"), true) or {}
+		local ign = minetest.deserialize(meta:get_string("ignore_offevents")) or {}
 		if ports.red    and not vports.red    and not mesecon.is_powered(pos, rules.red)    then ign.red    = true end
 		if ports.blue   and not vports.blue   and not mesecon.is_powered(pos, rules.blue)   then ign.blue   = true end
 		if ports.yellow and not vports.yellow and not mesecon.is_powered(pos, rules.yellow) then ign.yellow = true end
@@ -216,7 +214,7 @@ end
 
 local function ignore_event(event, meta)
 	if event.type ~= "off" then return false end
-	local ignore_offevents = minetest.deserialize(meta:get_string("ignore_offevents"), true) or {}
+	local ignore_offevents = minetest.deserialize(meta:get_string("ignore_offevents")) or {}
 	if ignore_offevents[event.pin.name] then
 		ignore_offevents[event.pin.name] = nil
 		meta:set_string("ignore_offevents", minetest.serialize(ignore_offevents))
@@ -229,11 +227,7 @@ end
 -------------------------
 
 local function safe_print(param)
-	local string_meta = getmetatable("")
-	local sandbox = string_meta.__index
-	string_meta.__index = string -- Leave string sandbox temporarily
 	print(dump(param))
-	string_meta.__index = sandbox -- Restore string sandbox
 end
 
 local function safe_date()
@@ -273,7 +267,6 @@ local function remove_functions(x)
 	local seen = {}
 
 	local function rfuncs(x)
-		if x == nil then return end
 		if seen[x] then return end
 		seen[x] = true
 		if type(x) ~= "table" then return end
@@ -297,174 +290,49 @@ local function remove_functions(x)
 	return x
 end
 
--- The setting affects API so is not intended to be changeable at runtime
-local get_interrupt
-if mesecon.setting("luacontroller_lightweight_interrupts", false) then
-	-- use node timer
-	get_interrupt = function(pos, itbl, send_warning)
-		return (function(time, iid)
-			if type(time) ~= "number" then error("Delay must be a number") end
-			if iid ~= nil then send_warning("Interrupt IDs are disabled on this server") end
-			table.insert(itbl, function() minetest.get_node_timer(pos):start(time) end)
-		end)
-	end
-else
-	-- use global action queue
-	-- itbl: Flat table of functions to run after sandbox cleanup, used to prevent various security hazards
-	get_interrupt = function(pos, itbl, send_warning)
-		-- iid = interrupt id
-		local function interrupt(time, iid)
-			-- NOTE: This runs within string metatable sandbox, so don't *rely* on anything of the form (""):y
-			-- Hence the values get moved out. Should take less time than original, so totally compatible
-			if type(time) ~= "number" then error("Delay must be a number") end
-			table.insert(itbl, function ()
-				-- Outside string metatable sandbox, can safely run this now
-				local luac_id = minetest.get_meta(pos):get_int("luac_id")
-				-- Check if IID is dodgy, so you can't use interrupts to store an infinite amount of data.
-				-- Note that this is safe from alter-after-free because this code gets run after the sandbox has ended.
-				-- This runs outside of the timer and *shouldn't* harm perf. unless dodgy data is being sent in the first place
-				iid = remove_functions(iid)
-				local msg_ser = minetest.serialize(iid)
-				if #msg_ser <= mesecon.setting("luacontroller_interruptid_maxlen", 256) then
-					mesecon.queue:add_action(pos, "pipeworks:lc_tube_interrupt", {luac_id, iid}, time, iid, 1)
-				else
-					send_warning("An interrupt ID was too large!")
-				end
-			end)
-		end
-		return interrupt
-	end
-end
-
--- Given a message object passed to digiline_send, clean it up into a form
--- which is safe to transmit over the network and compute its "cost" (a very
--- rough estimate of its memory usage).
---
--- The cleaning comprises the following:
--- 1. Functions (and userdata, though user scripts ought not to get hold of
---    those in the first place) are removed, because they break the model of
---    Digilines as a network that carries basic data, and they could exfiltrate
---    references to mutable objects from one Luacontroller to another, allowing
---    inappropriate high-bandwidth, no-wires communication.
--- 2. Tables are duplicated because, being mutable, they could otherwise be
---    modified after the send is complete in order to change what data arrives
---    at the recipient, perhaps in violation of the previous cleaning rule or
---    in violation of the message size limit.
---
--- The cost indication is only approximate; it’s not a perfect measurement of
--- the number of bytes of memory used by the message object.
---
--- Parameters:
--- msg -- the message to clean
--- back_references -- for internal use only; do not provide
---
--- Returns:
--- 1. The cleaned object.
--- 2. The approximate cost of the object.
-local function clean_and_weigh_digiline_message(msg, back_references)
-	local t = type(msg)
-	if t == "string" then
-		-- Strings are immutable so can be passed by reference, and cost their
-		-- length plus the size of the Lua object header (24 bytes on a 64-bit
-		-- platform) plus one byte for the NUL terminator.
-		return msg, #msg + 25
-	elseif t == "number" then
-		-- Numbers are passed by value so need not be touched, and cost 8 bytes
-		-- as all numbers in Lua are doubles.
-		return msg, 8
-	elseif t == "boolean" then
-		-- Booleans are passed by value so need not be touched, and cost 1
-		-- byte.
-		return msg, 1
-	elseif t == "table" then
-		-- Tables are duplicated. Check if this table has been seen before
-		-- (self-referential or shared table); if so, reuse the cleaned value
-		-- of the previous occurrence, maintaining table topology and avoiding
-		-- infinite recursion, and charge zero bytes for this as the object has
-		-- already been counted.
-		back_references = back_references or {}
-		local bref = back_references[msg]
-		if bref then
-			return bref, 0
-		end
-		-- Construct a new table by cleaning all the keys and values and adding
-		-- up their costs, plus 8 bytes as a rough estimate of table overhead.
-		local cost = 8
-		local ret = {}
-		back_references[msg] = ret
-		for k, v in pairs(msg) do
-			local k_cost, v_cost
-			k, k_cost = clean_and_weigh_digiline_message(k, back_references)
-			v, v_cost = clean_and_weigh_digiline_message(v, back_references)
-			if k ~= nil and v ~= nil then
-				-- Only include an element if its key and value are of legal
-				-- types.
-				ret[k] = v
-			end
-			-- If we only counted the cost of a table element when we actually
-			-- used it, we would be vulnerable to the following attack:
-			-- 1. Construct a huge table (too large to pass the cost limit).
-			-- 2. Insert it somewhere in a table, with a function as a key.
-			-- 3. Insert it somewhere in another table, with a number as a key.
-			-- 4. The first occurrence doesn’t pay the cost because functions
-			--    are stripped and therefore the element is dropped.
-			-- 5. The second occurrence doesn’t pay the cost because it’s in
-			--    back_references.
-			-- By counting the costs regardless of whether the objects will be
-			-- included, we avoid this attack; it may overestimate the cost of
-			-- some messages, but only those that won’t be delivered intact
-			-- anyway because they contain illegal object types.
-			cost = cost + k_cost + v_cost
-		end
-		return ret, cost
-	else
-		return nil, 0
+local function get_interrupt(pos)
+	-- iid = interrupt id
+	local function interrupt(time, iid)
+		if type(time) ~= "number" then return end
+		local luac_id = minetest.get_meta(pos):get_int("luac_id")
+		mesecon.queue:add_action(pos, "pipeworks:lc_tube_interrupt", {luac_id, iid}, time, iid, 1)
 	end
+	return interrupt
 end
 
 
--- itbl: Flat table of functions to run after sandbox cleanup, used to prevent various security hazards
-local function get_digiline_send(pos, itbl, send_warning)
-	if not minetest.global_exists("digilines") then return end
-	local chan_maxlen = mesecon.setting("luacontroller_digiline_channel_maxlen", 256)
-	local maxlen = mesecon.setting("luacontroller_digiline_maxlen", 50000)
+local function get_digiline_send(pos)
+	if not digiline then return end
 	return function(channel, msg)
-		-- NOTE: This runs within string metatable sandbox, so don't *rely* on anything of the form (""):y
-		--        or via anything that could.
 		-- Make sure channel is string, number or boolean
-		if type(channel) == "string" then
-			if #channel > chan_maxlen then
-				send_warning("Channel string too long.")
-				return false
-			end
-		elseif (type(channel) ~= "string" and type(channel) ~= "number" and type(channel) ~= "boolean") then
-			send_warning("Channel must be string, number or boolean.")
+		if (type(channel) ~= "string" and type(channel) ~= "number" and type(channel) ~= "boolean") then
 			return false
 		end
 
-		local msg_cost
-		msg, msg_cost = clean_and_weigh_digiline_message(msg)
-		if msg == nil or msg_cost > maxlen then
-			send_warning("Message was too complex, or contained invalid data.")
+		-- It is technically possible to send functions over the wire since
+		-- the high performance impact of stripping those from the data has
+		-- been decided to not be worth the added realism.
+		-- Make sure serialized version of the data is not insanely long to
+		-- prevent DoS-like attacks
+		local msg_ser = minetest.serialize(msg)
+		if #msg_ser > mesecon.setting("luacontroller_digiline_maxlen", 50000) then
 			return false
 		end
 
-		table.insert(itbl, function ()
-			-- Runs outside of string metatable sandbox
-			local luac_id = minetest.get_meta(pos):get_int("luac_id")
-			mesecon.queue:add_action(pos, "pipeworks:lt_digiline_relay", {channel, luac_id, msg})
+		minetest.after(0, function()
+			digilines.receptor_send(pos, digiline_rules_luatube, channel, msg)
 		end)
 		return true
 	end
 end
 
+
 local safe_globals = {
-	-- Don't add pcall/xpcall unless willing to deal with the consequences (unless very careful, incredibly likely to allow killing server indirectly)
 	"assert", "error", "ipairs", "next", "pairs", "select",
 	"tonumber", "tostring", "type", "unpack", "_VERSION"
 }
 
-local function create_environment(pos, mem, event, itbl, send_warning)
+local function create_environment(pos, mem, event)
 	-- Make sure the tube hasn't broken.
 	local vports = minetest.registered_nodes[minetest.get_node(pos).name].virtual_portstates
 	if not vports then return {} end
@@ -484,8 +352,8 @@ local function create_environment(pos, mem, event, itbl, send_warning)
 		heat = mesecon.get_heat(pos),
 		heat_max = mesecon.setting("overheat_max", 20),
 		print = safe_print,
-		interrupt = get_interrupt(pos, itbl, send_warning),
-		digiline_send = get_digiline_send(pos, itbl, send_warning),
+		interrupt = get_interrupt(pos),
+		digiline_send = get_digiline_send(pos),
 		string = {
 			byte = string.byte,
 			char = string.char,
@@ -573,11 +441,10 @@ local function create_sandbox(code, env)
 		jit.off(f, true)
 	end
 
-	local maxevents = mesecon.setting("luacontroller_maxevents", 10000)
 	return function(...)
-		-- NOTE: This runs within string metatable sandbox, so the setting's been moved out for safety
 		-- Use instruction counter to stop execution
 		-- after luacontroller_maxevents
+		local maxevents = mesecon.setting("luacontroller_maxevents", 10000)
 		debug.sethook(timeout, "", maxevents)
 		local ok, ret = pcall(f, ...)
 		debug.sethook()  -- Clear hook
@@ -588,7 +455,7 @@ end
 
 
 local function load_memory(meta)
-	return minetest.deserialize(meta:get_string("lc_memory"), true) or {}
+	return minetest.deserialize(meta:get_string("lc_memory")) or {}
 end
 
 
@@ -598,7 +465,6 @@ local function save_memory(pos, meta, mem)
 
 	if (#memstring <= memsize_max) then
 		meta:set_string("lc_memory", memstring)
-		meta:mark_as_private("lc_memory")
 	else
 		print("Error: lua_tube memory overflow. "..memsize_max.." bytes available, "
 				..#memstring.." required. Controller overheats.")
@@ -606,42 +472,26 @@ local function save_memory(pos, meta, mem)
 	end
 end
 
--- Returns success (boolean), errmsg (string), retval(any, return value of the user supplied code)
--- run (as opposed to run_inner) is responsible for setting up meta according to this output
-local function run_inner(pos, code, event)
+
+local function run(pos, event)
 	local meta = minetest.get_meta(pos)
-	-- Note: These return success, presumably to avoid changing LC ID.
-	if overheat(pos) then return true, "", nil end
-	if ignore_event(event, meta) then return true, "", nil end
+	if overheat(pos) then return end
+	if ignore_event(event, meta) then return end
 
 	-- Load code & mem from meta
 	local mem  = load_memory(meta)
 	local code = meta:get_string("code")
 
-	-- 'Last warning' label.
-	local warning = ""
-	local function send_warning(str)
-		warning = "Warning: " .. str
-	end
-
 	-- Create environment
-	local itbl = {}
-	local env = create_environment(pos, mem, event, itbl, send_warning)
+	local env = create_environment(pos, mem, event)
 
 	-- Create the sandbox and execute code
 	local f, msg = create_sandbox(code, env)
-	if not f then return false, msg, nil end
-	-- Start string true sandboxing
-	local onetruestring = getmetatable("")
-	-- If a string sandbox is already up yet inconsistent, something is very wrong
-	assert(onetruestring.__index == string)
-	onetruestring.__index = env.string
-	local success, msg = pcall(f)
-	onetruestring.__index = string
-	-- End string true sandboxing
-	if not success then return false, msg, nil end
+	if not f then return false, msg end
+	local succ, msg = pcall(f)
+	if not succ then return false, msg end
 	if type(env.port) ~= "table" then
-		return false, "Ports set are invalid.", nil
+		return false, "Ports set are invalid."
 	end
 
 	-- Actually set the ports
@@ -650,81 +500,35 @@ local function run_inner(pos, code, event)
 	-- Save memory. This may burn the luacontroller if a memory overflow occurs.
 	save_memory(pos, meta, env.mem)
 
-	-- Execute deferred tasks
-	for _, v in ipairs(itbl) do
-		local failure = v()
-		if failure then
-			return false, failure, nil
-		end
-	end
-	return true, warning, msg
+	return succ, msg
 end
 
-local function reset_formspec(meta, code, errmsg)
-	meta:set_string("code", code)
-	meta:mark_as_private("code")
-	code = minetest.formspec_escape(code or "")
-	errmsg = minetest.formspec_escape(tostring(errmsg or ""))
-	meta:set_string("formspec", "size[12,10]"
-		.."background[-0.2,-0.25;12.4,10.75;jeija_luac_background.png]"
-		.."label[0.1,8.3;"..errmsg.."]"
-		.."textarea[0.2,0.2;12.2,9.5;code;;"..code.."]"
-		.."image_button[4.75,8.75;2.5,1;jeija_luac_runbutton.png;program;]"
-		.."image_button_exit[11.72,-0.25;0.425,0.4;jeija_close_window.png;exit;]"
-		)
-end
+mesecon.queue:add_function("pipeworks:lc_tube_interrupt", function (pos, luac_id, iid)
+	-- There is no lua_tube anymore / it has been reprogrammed / replaced / burnt
+	if (minetest.get_meta(pos):get_int("luac_id") ~= luac_id) then return end
+	if (minetest.registered_nodes[minetest.get_node(pos).name].is_burnt) then return end
+	run(pos, {type = "interrupt", iid = iid})
+end)
 
 local function reset_meta(pos, code, errmsg)
 	local meta = minetest.get_meta(pos)
-	reset_formspec(meta, code, errmsg)
+	meta:set_string("code", code)
+	code = minetest.formspec_escape(code or "")
+	errmsg = minetest.formspec_escape(tostring(errmsg or ""))
+	meta:set_string("formspec", "size[12,10]"..
+		"background[-0.2,-0.25;12.4,10.75;jeija_luac_background.png]"..
+		"textarea[0.2,0.2;12.2,9.5;code;;"..code.."]"..
+		"image_button[4.75,8.75;2.5,1;jeija_luac_runbutton.png;program;]"..
+		"image_button_exit[11.72,-0.25;0.425,0.4;jeija_close_window.png;exit;]"..
+		"label[0.1,9;"..errmsg.."]")
 	meta:set_int("luac_id", math.random(1, 65535))
 end
 
--- Wraps run_inner with LC-reset-on-error
-local function run(pos, event)
-	local meta = minetest.get_meta(pos)
-	local code = meta:get_string("code")
-	local ok, errmsg, retval = run_inner(pos, code, event)
-	if not ok then
-		reset_meta(pos, code, errmsg)
-	else
-		reset_formspec(meta, code, errmsg)
-	end
-	return ok, errmsg, retval
-end
-
 local function reset(pos)
 	set_port_states(pos, {red = false, blue = false, yellow = false,
 		green = false, black = false, white = false})
 end
 
-local function node_timer(pos)
-	if minetest.registered_nodes[minetest.get_node(pos).name].is_burnt then
-		return false
-	end
-	run(pos, {type="interrupt"})
-	return false
-end
-
------------------------
--- A.Queue callbacks --
------------------------
-
-mesecon.queue:add_function("pipeworks:lc_tube_interrupt", function (pos, luac_id, iid)
-	-- There is no lua_tube anymore / it has been reprogrammed / replaced / burnt
-	if (minetest.get_meta(pos):get_int("luac_id") ~= luac_id) then return end
-	if (minetest.registered_nodes[minetest.get_node(pos).name].is_burnt) then return end
-	run(pos, {type="interrupt", iid = iid})
-end)
-
-mesecon.queue:add_function("pipeworks:lt_digiline_relay", function (pos, channel, luac_id, msg)
-	if not digiline then return end
-	-- This check is only really necessary because in case of server crash, old actions can be thrown into the future
-	if (minetest.get_meta(pos):get_int("luac_id") ~= luac_id) then return end
-	if (minetest.registered_nodes[minetest.get_node(pos).name].is_burnt) then return end
-	-- The actual work
-	digiline:receptor_send(pos, digiline_rules_luatube, channel, msg)
-end)
 
 -----------------------
 -- Node Registration --
@@ -754,7 +558,6 @@ local digiline = {
 	receptor = {},
 	effector = {
 		action = function(pos, node, channel, msg)
-			msg = clean_and_weigh_digiline_message(msg)
 			run(pos, {type = "digiline", channel = channel, msg = msg})
 		end
 	},
@@ -762,18 +565,6 @@ local digiline = {
 		rules = pipeworks.digilines_rules
 	},
 }
-
-local function get_program(pos)
-	local meta = minetest.get_meta(pos)
-	return meta:get_string("code")
-end
-
-local function set_program(pos, code)
-	reset(pos)
-	reset_meta(pos, code)
-	return run(pos, {type="program"})
-end
-
 local function on_receive_fields(pos, form_name, fields, sender)
 	if not fields.program then
 		return
@@ -783,10 +574,12 @@ local function on_receive_fields(pos, form_name, fields, sender)
 		minetest.record_protection_violation(pos, name)
 		return
 	end
-	local ok, err = set_program(pos, fields.code)
-	if not ok then
-		-- it's not an error from the server perspective
-		minetest.log("action", "Lua controller programming error: " .. tostring(err))
+	reset(pos)
+	reset_meta(pos, fields.code)
+	local succ, err = run(pos, {type="program"})
+	if not succ then
+		print(err)
+		reset_meta(pos, fields.code, err)
 	end
 end
 
@@ -922,11 +715,7 @@ for white  = 0, 1 do
 		receptor = {
 			state = mesecon.state.on,
 			rules = output_rules[cid]
-		},
-		luacontroller = {
-			get_program = get_program,
-			set_program = set_program,
-		},
+		}
 	}
 
 	minetest.register_node(node_name, {
@@ -934,7 +723,6 @@ for white  = 0, 1 do
 		drawtype = "nodebox",
 		tiles = tiles,
 		paramtype = "light",
-		is_ground_content = false,
 		groups = groups,
 		drop = BASENAME.."000000",
 		sunlight_propagates = true,
@@ -961,7 +749,6 @@ for white  = 0, 1 do
 			pipeworks.after_dig(pos, node)
 		end,
 		is_luacontroller = true,
-		on_timer = node_timer,
 		tubelike = 1,
 		tube = {
 			connect_sides = {front = 1, back = 1, left = 1, right = 1, top = 1, bottom = 1},
@@ -969,13 +756,13 @@ for white  = 0, 1 do
 			can_go = function(pos, node, velocity, stack)
 				local src = {name = nil}
 				-- add color of the incoming tube explicitly; referring to rules, in case they change later
-				for _, rule in pairs(rules) do
+				for color, rule in pairs(rules) do
 					if (-velocity.x == rule.x and -velocity.y == rule.y and -velocity.z == rule.z) then
 						src.name = rule.name
 						break
 					end
 				end
-				local succ, _, msg = run(pos, {
+				local succ, msg = run(pos, {
 					type = "item",
 					pin = src,
 					itemstring = stack:to_string(),
@@ -993,7 +780,15 @@ for white  = 0, 1 do
 		on_blast = function(pos, intensity)
 			if not intensity or intensity > 1 + 3^0.5 then
 				minetest.remove_node(pos)
-				return
+				return {string.format("%s_%s", name, dropname)}
+			end
+			minetest.swap_node(pos, {name = "pipeworks:broken_tube_1"})
+			pipeworks.scan_for_tube_objects(pos)
+		end,
+		on_blast = function(pos, intensity)
+			if not intensity or intensity > 1 + 3^0.5 then
+				minetest.remove_node(pos)
+				return {string.format("%s_%s", name, dropname)}
 			end
 			minetest.swap_node(pos, {name = "pipeworks:broken_tube_1"})
 			pipeworks.scan_for_tube_objects(pos)
@@ -1041,7 +836,6 @@ minetest.register_node(BASENAME .. "_burnt", {
 	tiles = tiles_burnt,
 	is_burnt = true,
 	paramtype = "light",
-	is_ground_content = false,
 	groups = {snappy = 3, tube = 1, tubedevice = 1, not_in_creative_inventory=1},
 	drop = BASENAME.."000000",
 	sunlight_propagates = true,
@@ -1070,7 +864,7 @@ minetest.register_node(BASENAME .. "_burnt", {
 	on_blast = function(pos, intensity)
 		if not intensity or intensity > 1 + 3^0.5 then
 			minetest.remove_node(pos)
-			return
+			return {string.format("%s_%s", name, dropname)}
 		end
 		minetest.swap_node(pos, {name = "pipeworks:broken_tube_1"})
 		pipeworks.scan_for_tube_objects(pos)

luaentity.lua

@@ -9,16 +9,16 @@ local filename = minetest.get_worldpath().."/luaentities"
 local function read_file()
 	local f = io.open(filename, "r")
 	if f == nil then return {} end
-	local t = f:read("*all")
-	f:close()
+    	local t = f:read("*all")
+    	f:close()
 	if t == "" or t == nil then return {} end
 	return minetest.deserialize(t) or {}
 end
 
 local function write_file(tbl)
 	local f = io.open(filename, "w")
-	f:write(minetest.serialize(tbl))
-	f:close()
+    	f:write(minetest.serialize(tbl))
+    	f:close()
 end
 
 local function read_entities()
@@ -36,7 +36,7 @@ local function read_entities()
 		y=math.min(30927,y)
 		z=math.min(30927,z)
 
-		entity.start_pos.x = x
+		entity.start_pos.x = x                 
 		entity.start_pos.y = y
 		entity.start_pos.z = z
 
@@ -211,7 +211,7 @@ local entitydef_default = {
 		end
 	end,
 	get_velocity = function(self)
-		return vector.new(self._velocity)
+		return vector.new(self._velocity)	
 	end,
 	set_velocity = function(self, velocity)
 		self._velocity = vector.new(velocity)
@@ -289,7 +289,7 @@ function luaentity.add_entity(pos, name)
 		_acceleration = {x = 0, y = 0, z = 0},
 		_attached_entities = {},
 	}
-
+	
 	local prototype = luaentity.registered_entities[name]
 	setmetatable(entity, prototype) -- Default to prototype for other methods
 	luaentity.entities[index] = entity
@@ -318,20 +318,19 @@ end
 function luaentity.get_objects_inside_radius(pos, radius)
 	local objects = {}
 	local index = 1
-	for _, entity in pairs(luaentity.entities) do
+	for id, entity in pairs(luaentity.entities) do
 		if vector.distance(pos, entity:get_pos()) <= radius then
 			objects[index] = entity
 			index = index + 1
 		end
 	end
-	return objects
 end
 
 local move_entities_globalstep_part2 = function(dtime)
 	if not luaentity.entities then
 		luaentity.entities = read_entities()
 	end
-	for _, entity in pairs(luaentity.entities) do
+	for id, entity in pairs(luaentity.entities) do
 		local master = entity._attached_entities_master
 		local master_def = master and entity._attached_entities[master]
 		local master_entity = master_def and master_def.entity
@@ -341,8 +340,6 @@ local move_entities_globalstep_part2 = function(dtime)
 			entity._velocity = master_entity:get_velocity()
 			entity._acceleration = master_entity:get_acceleration()
 		else
-			entity._velocity = entity._velocity or vector.new(0,0,0)
-			entity._acceleration = entity._acceleration or vector.new(0,0,0)
 			entity._pos = vector.add(vector.add(
 				entity._pos,
 				vector.multiply(entity._velocity, dtime)),

pipes.lua

@@ -11,11 +11,11 @@ local new_flow_logic_register = pipeworks.flowables.register
 local polys = ""
 if pipeworks.enable_lowpoly then polys = "_lowpoly" end
 
---~ local vti = {4, 3, 2, 1, 6, 5}
+local vti = {4, 3, 2, 1, 6, 5}
 local cconnects = {{}, {1}, {1, 2}, {1, 3}, {1, 3, 5}, {1, 2, 3}, {1, 2, 3, 5}, {1, 2, 3, 4}, {1, 2, 3, 4, 5}, {1, 2, 3, 4, 5, 6}}
 for index, connects in ipairs(cconnects) do
 	local outsel = {}
-
+	
 	local jx = 0
 	local jy = 0
 	local jz = 0
@@ -30,13 +30,11 @@ for index, connects in ipairs(cconnects) do
 		table.insert(outsel, pipeworks.pipe_selectboxes[v])
 	end
 
-	--[[
 	if #connects == 1 then
 		local v = connects[1]
 		v = v-1 + 2*(v%2) -- Opposite side
 	end
-	--]]
-
+	
 	local pgroups = {snappy = 3, pipe = 1, not_in_creative_inventory = 1}
 	local pipedesc = S("Pipe Segment").." "..dump(connects)
 
@@ -44,11 +42,11 @@ for index, connects in ipairs(cconnects) do
 		pgroups = {snappy = 3, tube = 1}
 		pipedesc = S("Pipe Segment")
 	end
-
+	
 	local outimg_e = { "pipeworks_pipe_plain.png" }
 	local outimg_l = { "pipeworks_pipe_plain.png" }
 
-	if index == 3 then
+	if index == 3 then 
 		outimg_e = { "pipeworks_pipe_3_empty.png" }
 		outimg_l = { "pipeworks_pipe_3_loaded.png" }
 	end
@@ -90,7 +88,7 @@ for index, connects in ipairs(cconnects) do
 		check_for_horiz_pole = pipeworks.check_for_horiz_pipe,
 		pipenumber = index
 	})
-
+	
 	local pgroups = {snappy = 3, pipe = 1, not_in_creative_inventory = 1}
 
 	minetest.register_node("pipeworks:pipe_"..index.."_loaded", {
@@ -125,7 +123,7 @@ for index, connects in ipairs(cconnects) do
 		check_for_horiz_pole = pipeworks.check_for_horiz_pipe,
 		pipenumber = index
 	})
-
+	
 	local emptypipe = "pipeworks:pipe_"..index.."_empty"
 	local fullpipe = "pipeworks:pipe_"..index.."_loaded"
 	table.insert(pipes_empty_nodenames, emptypipe)
@@ -241,7 +239,7 @@ minetest.register_abm({
 	nodenames = {"pipeworks:spigot","pipeworks:spigot_pouring"},
 	interval = 1,
 	chance = 1,
-	action = function(pos, node, active_object_count, active_object_count_wider)
+	action = function(pos, node, active_object_count, active_object_count_wider) 
 		pipeworks.spigot_check(pos,node)
 	end
 })
@@ -250,7 +248,7 @@ minetest.register_abm({
 	nodenames = {"pipeworks:fountainhead","pipeworks:fountainhead_pouring"},
 	interval = 1,
 	chance = 1,
-	action = function(pos, node, active_object_count, active_object_count_wider)
+	action = function(pos, node, active_object_count, active_object_count_wider) 
 		pipeworks.fountainhead_check(pos,node)
 	end
 })

pressure_logic/abms.lua

@@ -29,7 +29,7 @@ end
 
 
 
---~ local formatvec = function(vec) local sep="," return "("..tostring(vec.x)..sep..tostring(vec.y)..sep..tostring(vec.z)..")" end
+local formatvec = function(vec) local sep="," return "("..tostring(vec.x)..sep..tostring(vec.y)..sep..tostring(vec.z)..")" end
 
 
 
@@ -39,7 +39,7 @@ end
 local check_for_liquids_v2 = function(pos, limit)
 	local coords = make_coords_offsets(pos, false)
 	local total = 0
-	for _, tpos in ipairs(coords) do
+	for index, tpos in ipairs(coords) do
 		if total >= limit then break end
 		local name = minetest.get_node(tpos).name
 		if name == "default:water_source" then
@@ -69,13 +69,11 @@ end
 
 
 -- logging is unreliable when something is crashing...
---[[
 local nilexplode = function(caller, label, value)
 	if value == nil then
 		error(caller..": "..label.." was nil")
 	end
 end
---]]
 
 
 
@@ -153,7 +151,7 @@ local get_neighbour_positions = function(pos, node)
 
 	-- then, check each possible neighbour to see if they can be reached from this node.
 	local connections = {}
-	for _, offset in ipairs(candidates) do
+	for index, offset in ipairs(candidates) do
 		local npos = vector.add(pos, offset)
 		local neighbour = minetest.get_node(npos)
 		local nodename = neighbour.name
@@ -187,12 +185,13 @@ flowlogic.balance_pressure = function(pos, node, currentpressure)
 	-- local dname = "flowlogic.balance_pressure()@"..formatvec(pos).." "
 	-- check the pressure of all nearby flowable nodes, and average it out.
 
+	-- pressure handles to average over
+	local connections = {}
 	-- unconditionally include self in nodes to average over.
 	-- result of averaging will be returned as new pressure for main flow logic callback
 	local totalv = currentpressure
 	local totalc = 1
 
-	-- pressure handles to average over
 	local connections = get_neighbour_positions(pos, node)
 
 	-- for each neighbour, add neighbour's pressure to the total to balance out
@@ -288,7 +287,7 @@ flowlogic.run_output = function(pos, node, currentpressure, oldpressure, outputd
 	local upper = outputdef.upper
 	local lower = outputdef.lower
 	local result = currentpressure
-	local threshold
+	local threshold = nil
 	if finitemode then threshold = lower else threshold = upper end
 	if currentpressure > threshold then
 		local takenpressure = outputdef.outputfn(pos, node, currentpressure, finitemode)
@@ -317,7 +316,7 @@ flowlogic.run_transition = function(node, currentpressure)
 		local nodename_prev = simplesetdef[1].nodename
 		local result_nodename = node.name
 
-		for _, element in ipairs(simplesetdef) do
+		for index, element in ipairs(simplesetdef) do
 			-- find the highest element that is below the current pressure.
 			local threshold = element.threshold
 			if threshold > currentpressure then
@@ -339,9 +338,7 @@ flowlogic.run_transition = function(node, currentpressure)
 	end
 
 	if not found then
-		pipeworks.logger("flowlogic.run_transition() BUG no transition " ..
-			"definitions found! node.name=" .. node.name ..
-			" currentpressure=" .. tostring(currentpressure))
+		pipeworks.logger("flowlogic.run_transition() BUG no transition definitions found! nodename="..nodename.." currentpressure="..tostring(currentpressure))
 	end
 
 	return result

pressure_logic/flowable_node_registry_install.lua

@@ -26,8 +26,8 @@ local insertbase = function(nodename)
 end
 
 local regwarning = function(kind, nodename)
-	--~ local tail = ""
-	--~ if pipeworks.toggles.pipe_mode ~= "pressure" then tail = " but pressure logic not enabled" end
+	local tail = ""
+	if pipeworks.toggles.pipe_mode ~= "pressure" then tail = " but pressure logic not enabled" end
 	--pipeworks.logger(kind.." flow logic registry requested for "..nodename..tail)
 end
 
@@ -106,7 +106,7 @@ register.directional_horizonal_rotate = function(nodename, doubleended)
 	end
 	local directionfn = function(node, direction)
 		local result = false
-		for _, endvec in ipairs(getends(node)) do
+		for index, endvec in ipairs(getends(node)) do
 			if vector.equals(direction, endvec) then result = true end
 		end
 		return result

teleport_tube.lua

@@ -23,7 +23,7 @@ end
 local function migrate_tube_db()
 		local tmp_db = {}
 		tp_tube_db.version = nil
-		for _, val in pairs(tp_tube_db) do
+		for key, val in pairs(tp_tube_db) do
 			if(val.channel ~= "") then -- skip unconfigured tubes
 				tmp_db[hash(val)] = val
 			end
@@ -193,7 +193,7 @@ pipeworks.register_tube("pipeworks:teleport_tube", {
 						minetest.chat_send_player(sender_name, S("Sorry, channel '@1' is reserved for exclusive use by @2",
 							new_channel, name))
 						return
-
+				
 					--channels starting with '[name];' can be used by other players, but cannot be received from
 					elseif mode == ";" and (fields.cr1 or (can_receive ~= 0 and not fields.cr0)) then
 						minetest.chat_send_player(sender_name, S("Sorry, receiving from channel '@1' is reserved for @2",
@@ -261,11 +261,3 @@ if minetest.get_modpath("mesecons_mvps") ~= nil then
 		end
 	end)
 end
-
--- Expose teleport tube database API for other mods
-pipeworks.tptube = {
-	hash = hash,
-	save_tube_db = save_tube_db,
-	get_db = function() return tp_tube_db or read_tube_db() end,
-	tp_tube_db_version = tp_tube_db_version
-}

trashcan.lua

@@ -1,7 +1,7 @@
 local S = minetest.get_translator("pipeworks")
 minetest.register_node("pipeworks:trashcan", {
-	description = S("Trash Can"),
-	drawtype = "normal",
+	description = S("Trash Can"), 
+	drawtype = "normal", 
 	tiles = {
 		"pipeworks_trashcan_bottom.png",
 		"pipeworks_trashcan_bottom.png",
@@ -9,15 +9,15 @@ minetest.register_node("pipeworks:trashcan", {
 		"pipeworks_trashcan_side.png",
 		"pipeworks_trashcan_side.png",
 		"pipeworks_trashcan_side.png",
-	},
-	groups = {snappy = 3, tubedevice = 1, tubedevice_receiver = 1},
+	}, 
+	groups = {snappy = 3, tubedevice = 1, tubedevice_receiver = 1}, 
 	tube = {
 		insert_object = function(pos, node, stack, direction)
 			return ItemStack("")
 		end,
 		connect_sides = {left = 1, right = 1, front = 1, back = 1, top = 1, bottom = 1},
 		priority = 1, -- Lower than anything else
-	},
+	}, 
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
 		meta:set_string("formspec",
@@ -33,7 +33,7 @@ minetest.register_node("pipeworks:trashcan", {
 				"listring[]")
 		meta:set_string("infotext", S("Trash Can"))
 		meta:get_inventory():set_size("trash", 1)
-	end,
+	end, 
 	after_place_node = pipeworks.after_place,
 	after_dig_node = pipeworks.after_dig,
 	on_metadata_inventory_put = function(pos, listname, index, stack, player)

wielder.lua

@@ -1,6 +1,10 @@
 local S = minetest.get_translator("pipeworks")
 local assumed_eye_pos = vector.new(0, 1.5, 0)
 
+local function vector_copy(v)
+	return { x = v.x, y = v.y, z = v.z }
+end
+
 local function delay(x)
 	return (function() return x end)
 end
@@ -349,7 +353,7 @@ if pipeworks.enable_node_breaker then
 							{pos=pointed_thing.under, gain=sound.gain})
 					end
 					wieldstack = virtplayer:get_wielded_item()
-				--~ else
+				else
 					--pipeworks.logger(dname.."couldn't dig node!")
 				end
 			end
@@ -374,7 +378,7 @@ if pipeworks.enable_node_breaker then
 	minetest.register_craft({
 		output = "pipeworks:nodebreaker_off",
 		recipe = {
-			{ "basic_materials:gear_steel", "basic_materials:gear_steel",   "basic_materials:gear_steel"    },
+			{ "pipeworks:gear", "pipeworks:gear",   "pipeworks:gear"    },
 			{ "default:stone", "mesecons:piston",   "default:stone" },
 			{ "group:wood",    "mesecons:mesecon",  "group:wood" },
 		}