Update all core mods

5 files changed, 68 insertions, 173 deletions

diff --git a/technic/machines/register/battery_box.lua b/technic/machines/register/battery_box.lua
index 82edca0..953f7af 100644
--- a/technic/machines/register/battery_box.lua
+++ b/technic/machines/register/battery_box.lua
@@ -151,7 +151,7 @@ function technic.register_battery_box(data)
 			..":technic_power_meter_fg.png]")
 
 		local infotext = S("@1 Battery Box: @2/@3", tier,
-				technic.prettynum(current_charge), technic.prettynum(max_charge))
+				technic.pretty_num(current_charge), technic.pretty_num(max_charge))
 		if eu_input == 0 then
 			infotext = S("%s Idle"):format(infotext)
 		end
@@ -159,7 +159,8 @@ function technic.register_battery_box(data)
 	end
 	
 	for i = 0, 8 do
-		local groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, technic_machine=1}
+		local groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2,
+				technic_machine=1, ["technic_"..ltier]=1}
 		if i ~= 0 then
 			groups.not_in_creative_inventory = 1
 		end
@@ -178,6 +179,7 @@ function technic.register_battery_box(data)
 				 "technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png",
 				 "technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png"},
 			groups = groups,
+			connect_sides = {"bottom"},
 			tube = data.tube and tube or nil,
 			paramtype2 = "facedir",
 			sounds = default.node_sound_wood_defaults(),
diff --git a/technic/machines/register/cables.lua b/technic/machines/register/cables.lua
index a1e7bc8..28984c0 100644
--- a/technic/machines/register/cables.lua
+++ b/technic/machines/register/cables.lua
@@ -1,177 +1,65 @@
 
 local S = technic.getter
 
-local cable_itstr_to_tier = {}
-
-function technic.register_cable(tier, size)
-	local ltier = string.lower(tier)
-
-	for x1 = 0, 1 do
-	for x2 = 0, 1 do
-	for y1 = 0, 1 do
-	for y2 = 0, 1 do
-	for z1 = 0, 1 do
-	for z2 = 0, 1 do
-		local id = technic.get_cable_id({x1, x2, y1, y2, z1, z2})
-
-		cable_itstr_to_tier["technic:"..ltier.."_cable"..id] = tier
-
-		local groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2}
-		if id ~= 0 then
-			groups.not_in_creative_inventory = 1
-		end
-
-		minetest.register_node("technic:"..ltier.."_cable"..id, {
-			description = S("%s Cable"):format(tier),
-			tiles = {"technic_"..ltier.."_cable.png"},
-			inventory_image = "technic_"..ltier.."_cable_wield.png",
-			wield_image = "technic_"..ltier.."_cable_wield.png",
-			groups = groups,
-			sounds = default.node_sound_wood_defaults(),
-			drop = "technic:"..ltier.."_cable0",
-			paramtype = "light",
-			sunlight_propagates = true,
-			drawtype = "nodebox",
-			node_box = {
-				type = "fixed",
-				fixed = technic.gen_cable_nodebox(x1, y1, z1, x2, y2, z2, size)
-			},
-			on_construct = function()
-				technic.networks = {}
-			end,
-			on_destruct = function()
-				technic.networks = {}
-			end,
-			after_place_node = function(pos)
-				local node = minetest.get_node(pos)
-				technic.update_cables(pos, technic.get_cable_tier(node.name))
-			end,
-			after_dig_node = function(pos, oldnode)
-				local tier = technic.get_cable_tier(oldnode.name)
-				technic.update_cables(pos, tier, true)
-			end
-		})
-	end
-	end
-	end
-	end
-	end
-	end
-end
-
-minetest.register_on_placenode(function(pos, node)
-	for tier, machine_list in pairs(technic.machines) do
-		if machine_list[node.name] ~= nil then
-			technic.update_cables(pos, tier, true)
-			technic.networks = {}
-		end
-	end
-end)
-
-
-minetest.register_on_dignode(function(pos, node)
-	for tier, machine_list in pairs(technic.machines) do
-		if machine_list[node.name] ~= nil then
-			technic.update_cables(pos, tier, true)
-			technic.networks = {}
-		end
-	end
-end)
-
-function technic.get_cable_id(links)
-	return (links[6] * 1) + (links[5] * 2)
-			+ (links[4] * 4)  + (links[3] * 8)
-			+ (links[2] * 16) + (links[1] * 32)
-end
-
-function technic.update_cables(pos, tier, no_set, secondrun)
-	local link_positions = {
-		{x=pos.x+1, y=pos.y,   z=pos.z},
-		{x=pos.x-1, y=pos.y,   z=pos.z},
-		{x=pos.x,   y=pos.y+1, z=pos.z},
-		{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}}
-
-	local links = {0, 0, 0, 0, 0, 0}
-
-	for i, link_pos in pairs(link_positions) do
-		local connect_type = technic.cables_should_connect(pos, link_pos, tier)
-		if connect_type then
-			links[i] = 1
-			-- Have cables next to us update theirselves,
-			-- but only once. (We don't want to update the entire
-			-- network or start an infinite loop of updates)
-			if not secondrun and connect_type == "cable" then
-				technic.update_cables(link_pos, tier, false, true)
-			end
-		end
-	end
-	-- We don't want to set ourselves if we have been removed or we are
-	-- updating a machine
-	if not no_set then
-		minetest.set_node(pos, {name="technic:"..string.lower(tier)
-				.."_cable"..technic.get_cable_id(links)})
-
-	end
-end
-
+local cable_tier = {}
 
 function technic.is_tier_cable(name, tier)
-	return cable_itstr_to_tier[name] and cable_itstr_to_tier[name] == tier
+	return cable_tier[name] == tier
 end
 
-
 function technic.get_cable_tier(name)
-	return cable_itstr_to_tier[name]
+	return cable_tier[name]
 end
 
-
-function technic.cables_should_connect(pos1, pos2, tier)
-	local name = minetest.get_node(pos2).name
-
-	if name == "technic:switching_station" then
-		return pos2.y == pos1.y + 1 and "machine" or false
-	elseif name == "technic:supply_converter" then
-		return math.abs(pos2.y - pos1.y) == 1 and "machine" or false
-	elseif technic.is_tier_cable(name, tier) then
-		return "cable"
-	elseif technic.machines[tier][name] then
-		return "machine"
-	end
-	return false
+local function clear_networks()
+	technic.networks = {}
 end
 
+function technic.register_cable(tier, size)
+	local ltier = string.lower(tier)
+	cable_tier["technic:"..ltier.."_cable"] = tier
+
+	local groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2}
+
+	local node_box = {
+		type = "connected",
+		fixed          = {-size, -size, -size, size,  size, size},
+		connect_top    = {-size, -size, -size, size,  0.5,  size}, -- y+
+		connect_bottom = {-size, -0.5,  -size, size,  size, size}, -- y-
+		connect_front  = {-size, -size, -0.5,  size,  size, size}, -- z-
+		connect_back   = {-size, -size,  size, size,  size, 0.5 }, -- z+
+		connect_left   = {-0.5,  -size, -size, size,  size, size}, -- x-
+		connect_right  = {-size, -size, -size, 0.5,   size, size}, -- x+
+	}
+
+	minetest.register_node("technic:"..ltier.."_cable", {
+		description = S("%s Cable"):format(tier),
+		tiles = {"technic_"..ltier.."_cable.png"},
+		inventory_image = "technic_"..ltier.."_cable_wield.png",
+		wield_image = "technic_"..ltier.."_cable_wield.png",
+		groups = groups,
+		sounds = default.node_sound_wood_defaults(),
+		drop = "technic:"..ltier.."_cable",
+		paramtype = "light",
+		sunlight_propagates = true,
+		drawtype = "nodebox",
+		node_box = node_box,
+		connects_to = {"technic:"..ltier.."_cable",
+			"group:technic_"..ltier, "group:technic_all_tiers"},
+		on_construct = clear_networks,
+		on_destruct = clear_networks,
+	})
+end
 
-function technic.gen_cable_nodebox(x1, y1, z1, x2, y2, z2, size)
-	-- Nodeboxes
-	local box_center = {-size, -size, -size, size,  size, size}
-	local box_y1 =     {-size, -size, -size, size,  0.5,  size} -- y+
-	local box_x1 =     {-size, -size, -size, 0.5,   size, size} -- x+
-	local box_z1 =     {-size, -size,  size, size,  size, 0.5}  -- z+
-	local box_z2 =     {-size, -size, -0.5,  size,  size, size} -- z-
-	local box_y2 =     {-size, -0.5,  -size, size,  size, size} -- y-
-	local box_x2 =     {-0.5,  -size, -size, size,  size, size} -- x-
 
-	local box = {box_center}
-	if x1 == 1 then
-		table.insert(box, box_x1)
-	end
-	if y1 == 1 then
-		table.insert(box, box_y1)
-	end
-	if z1 == 1 then
-		table.insert(box, box_z1)
-	end
-	if x2 == 1 then
-		table.insert(box, box_x2)
-	end
-	if y2 == 1 then
-		table.insert(box, box_y2)
-	end
-	if z2 == 1 then
-		table.insert(box, box_z2)
+local function clear_nets_if_machine(pos, node)
+	for tier, machine_list in pairs(technic.machines) do
+		if machine_list[node.name] ~= nil then
+			return clear_networks()
+		end
 	end
-	return box
 end
 
+minetest.register_on_placenode(clear_nets_if_machine)
+minetest.register_on_dignode(clear_nets_if_machine)
+
diff --git a/technic/machines/register/generator.lua b/technic/machines/register/generator.lua
index 31c1cef..2cdc336 100644
--- a/technic/machines/register/generator.lua
+++ b/technic/machines/register/generator.lua
@@ -18,14 +18,14 @@ function technic.register_generator(data)
 	local tier = data.tier
 	local ltier = string.lower(tier)
 
-	local groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, technic_machine=1}
-	local active_groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, technic_machine=1, not_in_creative_inventory=1}
+	local groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2,
+		technic_machine=1, ["technic_"..ltier]=1}
 	if data.tube then
 		groups.tubedevice = 1
 		groups.tubedevice_receiver = 1
-		active_groups.tubedevice = 1
-		active_groups.tubedevice_receiver = 1
 	end
+	local active_groups = {not_in_creative_inventory = 1}
+	for k, v in pairs(groups) do active_groups[k] = v end
 
 	local generator_formspec =
 		"invsize[8,9;]"..
@@ -93,6 +93,7 @@ function technic.register_generator(data)
 		         "technic_"..ltier.."_generator_side.png", "technic_"..ltier.."_generator_front.png"}, 
 		paramtype2 = "facedir",
 		groups = groups,
+		connect_sides = {"bottom", "back", "left", "right"},
 		legacy_facedir_simple = true,
 		sounds = default.node_sound_wood_defaults(),
 		tube = data.tube and tube or nil,
@@ -122,6 +123,7 @@ function technic.register_generator(data)
 		         "technic_"..ltier.."_generator_side.png", "technic_"..ltier.."_generator_front_active.png"},
 		paramtype2 = "facedir",
 		groups = active_groups,
+		connect_sides = {"bottom"},
 		legacy_facedir_simple = true,
 		sounds = default.node_sound_wood_defaults(),
 		tube = data.tube and tube or nil,
diff --git a/technic/machines/register/machine_base.lua b/technic/machines/register/machine_base.lua
index 0c46261..8cf851b 100644
--- a/technic/machines/register/machine_base.lua
+++ b/technic/machines/register/machine_base.lua
@@ -15,6 +15,8 @@ local tube = {
 	connect_sides = {left = 1, right = 1, back = 1, top = 1, bottom = 1},
 }
 
+local connect_default = {"bottom", "back", "left", "right"}
+
 local function round(v)
 	return math.floor(v + 0.5)
 end
@@ -27,15 +29,13 @@ function technic.register_base_machine(data)
 	local tier = data.tier
 	local ltier = string.lower(tier)
 
-	local groups = {cracky = 2, technic_machine = 1}
-	local active_groups = {cracky = 2, technic_machine = 1, not_in_creative_inventory = 1}
+	local groups = {cracky = 2, technic_machine = 1, ["technic_"..ltier] = 1}
 	if data.tube then
 		groups.tubedevice = 1
 		groups.tubedevice_receiver = 1
-		active_groups.tubedevice = 1
-		active_groups.tubedevice_receiver = 1
 	end
-
+	local active_groups = {not_in_creative_inventory = 1}
+	for k, v in pairs(groups) do active_groups[k] = v end
 
 	local formspec =
 		"invsize[8,9;]"..
@@ -145,6 +145,7 @@ function technic.register_base_machine(data)
 		paramtype2 = "facedir",
 		groups = groups,
 		tube = data.tube and tube or nil,
+		connect_sides = data.connect_sides or connect_default,
 		legacy_facedir_simple = true,
 		sounds = default.node_sound_wood_defaults(),
 		on_construct = function(pos)
@@ -179,6 +180,7 @@ function technic.register_base_machine(data)
 		paramtype2 = "facedir",
 		drop = "technic:"..ltier.."_"..machine_name,
 		groups = active_groups,
+		connect_sides = data.connect_sides or connect_default,
 		legacy_facedir_simple = true,
 		sounds = default.node_sound_wood_defaults(),
 		tube = data.tube and tube or nil,
diff --git a/technic/machines/register/solar_array.lua b/technic/machines/register/solar_array.lua
index 39f50d2..422bfcf 100644
--- a/technic/machines/register/solar_array.lua
+++ b/technic/machines/register/solar_array.lua
@@ -30,7 +30,7 @@ function technic.register_solar_array(data)
 			local charge_to_give = math.floor((light + pos.y) * data.power)
 			charge_to_give = math.max(charge_to_give, 0)
 			charge_to_give = math.min(charge_to_give, data.power * 50)
-			meta:set_string("infotext", S("@1 Active (@2 EU)", machine_name, technic.prettynum(charge_to_give)))
+			meta:set_string("infotext", S("@1 Active (@2 EU)", machine_name, technic.pretty_num(charge_to_give)))
 			meta:set_int(tier.."_EU_supply", charge_to_give)
 		else
 			meta:set_string("infotext", S("%s Idle"):format(machine_name))
@@ -42,7 +42,8 @@ function technic.register_solar_array(data)
 		tiles = {"technic_"..ltier.."_solar_array_top.png",  "technic_"..ltier.."_solar_array_bottom.png",
 			 "technic_"..ltier.."_solar_array_side.png", "technic_"..ltier.."_solar_array_side.png",
 			 "technic_"..ltier.."_solar_array_side.png", "technic_"..ltier.."_solar_array_side.png"},
-		groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, technic_machine=1},
+		groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, technic_machine=1, ["technic_"..ltier]=1},
+		connect_sides = {"bottom"},
 		sounds = default.node_sound_wood_defaults(),
 		description = S("Arrayed Solar %s Generator"):format(tier),
 		active = false,