Remove unused values (#407)

technic/machines/HV/quarry.lua

@@ -122,15 +122,6 @@ local function quarry_run(pos, node)
 			vector.new(0, quarry_dig_above_nodes, 0)),
 			pdir),
 			vector.multiply(qdir, -radius))
-		local endpos = vector.add(vector.add(vector.add(startpos,
-			vector.new(0, -quarry_dig_above_nodes-quarry_max_depth, 0)),
-			vector.multiply(pdir, diameter-1)),
-			vector.multiply(qdir, diameter-1))
-		local vm = VoxelManip()
-		local minpos, maxpos = vm:read_from_map(startpos, endpos)
-		local area = VoxelArea:new({MinEdge=minpos, MaxEdge=maxpos})
-		local data = vm:get_data()
-		local c_air = minetest.get_content_id("air")
 		local owner = meta:get_string("owner")
 		local nd = meta:get_int("dug")
 		while nd ~= diameter*diameter * (quarry_dig_above_nodes+1+quarry_max_depth) do

technic/machines/register/recipes.lua

@@ -51,7 +51,7 @@ local function register_recipe(typename, data)
 	end
 	
 	technic.recipes[typename].recipes[index] = recipe
-	if unified_inventory and technic.recipes[typename].output_size == 1 then
+	if have_ui and technic.recipes[typename].output_size == 1 then
 		unified_inventory.register_craft({
 			type = typename,
 			output = data.output,

technic/machines/switching_station.lua

@@ -91,48 +91,57 @@ minetest.register_node("technic:switching_station",{
 --------------------------------------------------
 -- Functions to traverse the electrical network
 --------------------------------------------------
+local function flatten(map)
+	local list = {}
+	for key, value in pairs(map) do
+		list[#list + 1] = value
+	end
+	return list
+end
 
 -- Add a wire node to the LV/MV/HV network
-local add_new_cable_node = function(nodes, pos, network_id)
-	technic.cables[minetest.hash_node_position(pos)] = network_id
-	-- Ignore if the node has already been added
-	for i = 1, #nodes do
-		if pos.x == nodes[i].x and
-		   pos.y == nodes[i].y and
-		   pos.z == nodes[i].z then
-			return false
-		end
+local function add_network_node(nodes, pos, network_id)
+	local node_id = minetest.hash_node_position(pos)
+	technic.cables[node_id] = network_id
+	if nodes[node_id] then
+		return false
 	end
-	table.insert(nodes, {x=pos.x, y=pos.y, z=pos.z, visited=1})
+	nodes[node_id] = pos
 	return true
 end
 
+local function add_cable_node(nodes, pos, network_id, queue)
+	if add_network_node(nodes, pos, network_id) then
+		queue[#queue + 1] = pos
+	end
+end
+
 -- Generic function to add found connected nodes to the right classification array
-local check_node_subp = function(PR_nodes, RE_nodes, BA_nodes, SP_nodes, all_nodes, pos, machines, tier, sw_pos, from_below, network_id)
+local check_node_subp = function(PR_nodes, RE_nodes, BA_nodes, SP_nodes, all_nodes, pos, machines, tier, sw_pos, from_below, network_id, queue)
 	technic.get_or_load_node(pos)
 	local meta = minetest.get_meta(pos)
 	local name = minetest.get_node(pos).name
 
 	if technic.is_tier_cable(name, tier) then
-		add_new_cable_node(all_nodes, pos,network_id)
+		add_cable_node(all_nodes, pos,network_id, queue)
 	elseif machines[name] then
 		--dprint(name.." is a "..machines[name])
 		meta:set_string(tier.."_network",minetest.pos_to_string(sw_pos))
 		if     machines[name] == technic.producer then
-			add_new_cable_node(PR_nodes, pos, network_id)
+			add_network_node(PR_nodes, pos, network_id)
 		elseif machines[name] == technic.receiver then
-			add_new_cable_node(RE_nodes, pos, network_id)
+			add_network_node(RE_nodes, pos, network_id)
 		elseif machines[name] == technic.producer_receiver then
-			add_new_cable_node(PR_nodes, pos, network_id)
-			add_new_cable_node(RE_nodes, pos, network_id)
+			add_network_node(PR_nodes, pos, network_id)
+			add_network_node(RE_nodes, pos, network_id)
 		elseif machines[name] == "SPECIAL" and
 				(pos.x ~= sw_pos.x or pos.y ~= sw_pos.y or pos.z ~= sw_pos.z) and
 				from_below then
 			-- Another switching station -> disable it
-			add_new_cable_node(SP_nodes, pos, network_id)
+			add_network_node(SP_nodes, pos, network_id)
 			meta:set_int("active", 0)
 		elseif machines[name] == technic.battery then
-			add_new_cable_node(BA_nodes, pos, network_id)
+			add_network_node(BA_nodes, pos, network_id)
 		end
 
 		meta:set_int(tier.."_EU_timeout", 2) -- Touch node
@@ -140,8 +149,7 @@ local check_node_subp = function(PR_nodes, RE_nodes, BA_nodes, SP_nodes, all_nod
 end
 
 -- Traverse a network given a list of machines and a cable type name
-local traverse_network = function(PR_nodes, RE_nodes, BA_nodes, SP_nodes, all_nodes, i, machines, tier, sw_pos, network_id)
-	local pos = all_nodes[i]
+local traverse_network = function(PR_nodes, RE_nodes, BA_nodes, SP_nodes, all_nodes, pos, machines, tier, sw_pos, network_id, queue)
 	local positions = {
 		{x=pos.x+1, y=pos.y,   z=pos.z},
 		{x=pos.x-1, y=pos.y,   z=pos.z},
@@ -149,9 +157,8 @@ local traverse_network = function(PR_nodes, RE_nodes, BA_nodes, SP_nodes, all_no
 		{x=pos.x,   y=pos.y-1, z=pos.z},
 		{x=pos.x,   y=pos.y,   z=pos.z+1},
 		{x=pos.x,   y=pos.y,   z=pos.z-1}}
-	--print("ON")
 	for i, cur_pos in pairs(positions) do
-		check_node_subp(PR_nodes, RE_nodes, BA_nodes, SP_nodes, all_nodes, cur_pos, machines, tier, sw_pos, i == 3, network_id)
+		check_node_subp(PR_nodes, RE_nodes, BA_nodes, SP_nodes, all_nodes, cur_pos, machines, tier, sw_pos, i == 3, network_id, queue)
 	end
 end
 
@@ -163,7 +170,8 @@ local touch_nodes = function(list, tier)
 end
 
 local get_network = function(sw_pos, pos1, tier)
-	local cached = technic.networks[minetest.hash_node_position(pos1)]
+	local network_id = minetest.hash_node_position(pos1)
+	local cached = technic.networks[network_id]
 	if cached and cached.tier == tier then
 		touch_nodes(cached.PR_nodes, tier)
 		touch_nodes(cached.BA_nodes, tier)
@@ -175,19 +183,28 @@ local get_network = function(sw_pos, pos1, tier)
 		end
 		return cached.PR_nodes, cached.BA_nodes, cached.RE_nodes
 	end
-	local i = 1
 	local PR_nodes = {}
 	local BA_nodes = {}
 	local RE_nodes = {}
 	local SP_nodes = {}
-	local all_nodes = {pos1}
-	repeat
-		traverse_network(PR_nodes, RE_nodes, BA_nodes, SP_nodes, all_nodes,
-				i, technic.machines[tier], tier, sw_pos, minetest.hash_node_position(pos1))
-		i = i + 1
-	until all_nodes[i] == nil
-	technic.networks[minetest.hash_node_position(pos1)] = {tier = tier, PR_nodes = PR_nodes,
-			RE_nodes = RE_nodes, BA_nodes = BA_nodes, SP_nodes = SP_nodes, all_nodes = all_nodes}
+	local all_nodes = {}
+	local queue = {}
+	add_cable_node(all_nodes, pos1, network_id, queue)
+	while next(queue) do
+		local to_visit = {}
+		for _, pos in ipairs(queue) do
+			traverse_network(PR_nodes, RE_nodes, BA_nodes, SP_nodes, all_nodes,
+					pos, technic.machines[tier], tier, sw_pos, network_id, to_visit)
+		end
+		queue = to_visit
+	end
+	PR_nodes = flatten(PR_nodes)
+	BA_nodes = flatten(BA_nodes)
+	RE_nodes = flatten(RE_nodes)
+	SP_nodes = flatten(SP_nodes)
+	all_nodes = flatten(all_nodes)
+	technic.networks[network_id] = {tier = tier, all_nodes = all_nodes, SP_nodes = SP_nodes,
+			PR_nodes = PR_nodes, RE_nodes = RE_nodes, BA_nodes = BA_nodes}
 	return PR_nodes, BA_nodes, RE_nodes
 end
 
@@ -242,8 +259,8 @@ minetest.register_abm({
 
 			local poshash = minetest.hash_node_position(pos)
 
-			if not technic.redundant_warn.poshash then
-				technic.redundant_warn.poshash = true
+			if not technic.redundant_warn[poshash] then
+				technic.redundant_warn[poshash] = true
 				print("[TECHNIC] Warning: redundant switching station found near "..minetest.pos_to_string(pos))
 			end
 			return

technic_chests/register.lua

@@ -137,38 +137,20 @@ local function sort_inventory(inv)
 			local m = st:get_metadata()
 			local k = string.format("%s %05d %s", n, w, m)
 			if not typecnt[k] then
-				typecnt[k] = {
-					name = n,
-					wear = w,
-					metadata = m,
-					stack_max = st:get_stack_max(),
-					count = 0,
-				}
+				typecnt[k] = {st}
 				table.insert(typekeys, k)
+			else
+				table.insert(typecnt[k], st)
 			end
-			typecnt[k].count = typecnt[k].count + st:get_count()
 		end
 	end
 	table.sort(typekeys)
-	local outlist = {}
+	inv:set_list("main", {})
 	for _, k in ipairs(typekeys) do
-		local tc = typecnt[k]
-		while tc.count > 0 do
-			local c = math.min(tc.count, tc.stack_max)
-			table.insert(outlist, ItemStack({
-				name = tc.name,
-				wear = tc.wear,
-				metadata = tc.metadata,
-				count = c,
-			}))
-			tc.count = tc.count - c
+		for _, item in ipairs(typecnt[k]) do
+			inv:add_item("main", item)
 		end
 	end
-	if #outlist > #inlist then return end
-	while #outlist < #inlist do
-		table.insert(outlist, ItemStack(nil))
-	end
-	inv:set_list("main", outlist)
 end
 
 local function get_receive_fields(name, data)
@@ -305,7 +287,7 @@ function technic.chests:definition(name, data)
 		on_receive_fields = get_receive_fields(name, data),
 		on_metadata_inventory_move = self.on_inv_move,
 		on_metadata_inventory_put = self.on_inv_put,
-		on_metadata_inventory_take = self.on_inv_take,		
+		on_metadata_inventory_take = self.on_inv_take,
 		on_blast = function(pos)
 			local drops = {}
 			default.get_inventory_drops(pos, "main", drops)