Merge remote-tracking branch 'upstream/master'

extension of d2954c52, using the same compatibility check for now, though it would be good to bump the minimum minetest version to 5.4 at some point

fixes #11

.github/workflows/luacheck.yml

@@ -0,0 +1,13 @@
+name: luacheck
+on: [push, pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: apt
+      run: sudo apt-get install -y luarocks
+    - name: luacheck install
+      run: luarocks install --local luacheck
+    - name: luacheck run
+      run: $HOME/.luarocks/bin/luacheck ./

.gitlab-ci.yml

@@ -1,8 +0,0 @@
-stages:
-  - test
-
-luacheck:
- stage: test
- image: pipelinecomponents/luacheck:latest
- script:
-  - luacheck .

README

@@ -1,7 +1,7 @@
 This mod uses nodeboxes to supply a complete set of 3D pipes and tubes, 
 along devices that work with them.
 
-See https://gitlab.com/VanessaE/pipeworks/wikis/ for detailed information about usage of this mod.
+See https://github.com/mt-mods/pipeworks/wiki/ for detailed information about usage of this mod.
 
 Unlike the previous version of this mod, these pipes are rounded, and when 
 placed, they'll automatically join together as needed.  Pipes can go vertically 

autocrafter.lua

@@ -67,8 +67,11 @@ 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
@@ -190,8 +193,9 @@ local function update_meta(meta, enabled)
 			"listring[context;dst]" ..
 			"listring[current_player;main]"
 	if minetest.get_modpath("digilines") then
-		fs = fs.."field[1,3.5;4,1;channel;"..S("Channel")..";${channel}]"
+		fs = fs.."field[0.3,3.5;4.5,1;channel;"..S("Channel")..";${channel}]"..
-		fs = fs.."button_exit[5,3.2;2,1;save;"..S("Save").."]"
+			"button[4.5,3.2;1.5,1;set_channel;"..S("Set").."]"..
+			"button_exit[6,3.2;2,1;close;"..S("Close").."]"
 	end
 	meta:set_string("formspec",fs)
 
@@ -276,7 +280,9 @@ minetest.register_node("pipeworks:autocrafter", {
 		update_meta(meta, false)
 	end,
 	on_receive_fields = function(pos, formname, fields, sender)
-		if not pipeworks.may_configure(pos, sender) then return end
+		if (fields.quit and not fields.key_enter_field) or not pipeworks.may_configure(pos, sender) then
+			return
+		end
 		local meta = minetest.get_meta(pos)
 		if fields.on then
 			update_meta(meta, false)
@@ -285,8 +291,9 @@ minetest.register_node("pipeworks:autocrafter", {
 			if update_meta(meta, true) then
 				start_crafter(pos)
 			end
-		elseif fields.save then
+		end
-			meta:set_string("channel",fields.channel)
+		if fields.channel then
+			meta:set_string("channel", fields.channel)
 		end
 	end,
 	can_dig = function(pos, player)

compat-furnaces.lua

@@ -189,8 +189,25 @@ local function furnace_node_timer(pos, elapsed)
 					fuel_totaltime = 0
 					src_time = 0
 				else
-					-- Take fuel from fuel list
+					-- prevent blocking of fuel inventory (for automatization mods)
-					inv:set_stack("fuel", 1, afterfuel.items[1])
+					local is_fuel = minetest.get_craft_result({method = "fuel", width = 1, items = {afterfuel.items[1]:to_string()}})
+					if is_fuel.time == 0 then
+						table.insert(fuel.replacements, afterfuel.items[1])
+						inv:set_stack("fuel", 1, "")
+					else
+						-- Take fuel from fuel list
+						inv:set_stack("fuel", 1, afterfuel.items[1])
+					end
+					-- Put replacements in dst list or drop them on the furnace.
+					local replacements = fuel.replacements
+					if replacements[1] then
+						local leftover = inv:add_item("dst", replacements[1])
+						if not leftover:is_empty() then
+							local above = vector.new(pos.x, pos.y + 1, pos.z)
+							local drop_pos = minetest.find_node_near(above, 1, {"air"}) or above
+							minetest.item_drop(replacements[1], nil, drop_pos)
+						end
+					end
 					update = true
 					fuel_totaltime = fuel.time + (fuel_time - fuel_totaltime)
 					src_time = src_time + elapsed

devices.lua

@@ -1,6 +1,8 @@
 local S = minetest.get_translator("pipeworks")
 local new_flow_logic_register = pipeworks.flowables.register
 
+local texture_alpha_mode = minetest.features.use_texture_alpha_string_modes
+
 local polys = ""
 if pipeworks.enable_lowpoly then polys = "_lowpoly" end
 
@@ -28,7 +30,9 @@ function pipeworks.rotate_on_place(itemstack, placer, pointed_thing)
 		if (not placer:get_player_control().sneak)
 		  and minetest.registered_nodes[node.name]
 		  and minetest.registered_nodes[node.name].on_rightclick then
-			minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, placer, itemstack)
+			minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under,
+				node, placer, itemstack, pointed_thing)
+
 		else
 
 			local pitch = placer:get_look_pitch()
@@ -140,6 +144,7 @@ for s in ipairs(states) do
 		drawtype = "mesh",
 		mesh = "pipeworks_pump"..polys..".obj",
 		tiles = { "pipeworks_pump_"..states[s]..".png" },
+		use_texture_alpha = texture_alpha_mode and "clip" or true,
 		paramtype = "light",
 		paramtype2 = "facedir",
 		groups = dgroups,
@@ -284,6 +289,7 @@ minetest.register_node("pipeworks:grating", {
 		"pipeworks_grating_sides.png",
 		"pipeworks_grating_sides.png"
 	},
+	use_texture_alpha = texture_alpha_mode and "clip" or true,
 	drawtype = "nodebox",
 	node_box = {
 		type = "fixed",
@@ -355,6 +361,7 @@ minetest.register_node(nodename_spigot_loaded, {
 		},
 		{ name = "pipeworks_spigot.png" }
 	},
+	use_texture_alpha = texture_alpha_mode and "blend" or true,
 	sunlight_propagates = true,
 	paramtype = "light",
 	paramtype2 = "facedir",

init.lua

@@ -151,7 +151,7 @@ minetest.register_alias("pipeworks:pipe", "pipeworks:pipe_110000_empty")
 
 -- Unified Inventory categories integration
 
-if unified_inventory and unified_inventory.registered_categories then
+if minetest.global_exists("unified_inventory") and unified_inventory.registered_categories then
 	if not unified_inventory.registered_categories["automation"] then
 		unified_inventory.register_category("automation", {
 			symbol = "pipeworks:lua_tube000000",

item_transport.lua

@@ -1,5 +1,5 @@
 local luaentity = pipeworks.luaentity
-local enable_max_limit = minetest.settings:get("pipeworks_enable_items_per_tube_limit")
+local enable_max_limit = minetest.settings:get_bool("pipeworks_enable_items_per_tube_limit")
 local max_tube_limit = tonumber(minetest.settings:get("pipeworks_max_items_per_tube")) or 30
 if enable_max_limit == nil then enable_max_limit = true end
 

lua_tube.lua

@@ -666,6 +666,7 @@ local function reset_formspec(meta, code, errmsg)
 	code = minetest.formspec_escape(code or "")
 	errmsg = minetest.formspec_escape(tostring(errmsg or ""))
 	meta:set_string("formspec", "size[12,10]"
+		.."style_type[label,textarea;font=mono]"
 		.."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.."]"

routing_tubes.lua

@@ -163,11 +163,15 @@ if pipeworks.enable_crossing_tube then
 	})
 end
 
+local texture_alpha_mode = minetest.features.use_texture_alpha_string_modes
+	and "clip" or true
+
 if pipeworks.enable_one_way_tube then
 	minetest.register_node("pipeworks:one_way_tube", {
 		description = S("One way tube"),
 		tiles = {"pipeworks_one_way_tube_top.png", "pipeworks_one_way_tube_top.png", "pipeworks_one_way_tube_output.png",
 			"pipeworks_one_way_tube_input.png", "pipeworks_one_way_tube_side.png", "pipeworks_one_way_tube_top.png"},
+		use_texture_alpha = texture_alpha_mode,
 		paramtype2 = "facedir",
 		drawtype = "nodebox",
 		paramtype = "light",

sorting_tubes.lua

@@ -110,9 +110,22 @@ if pipeworks.enable_mese_tube then
 					update_formspec(pos)
 					meta:set_string("infotext", S("Sorting pneumatic tube"))
 				end,
+				after_place_node = function(pos, placer, itemstack, pointed_thing)
+					if placer and placer:is_player() and placer:get_player_control().aux1 then
+						local meta = minetest.get_meta(pos)
+						for i = 1, 6 do
+							meta:set_int("l"..tostring(i).."s", 0)
+						end
+						update_formspec(pos)
+					end
+					return pipeworks.after_place(pos, placer, itemstack, pointed_thing)
+				end,
 				on_punch = update_formspec,
 				on_receive_fields = function(pos, formname, fields, sender)
-					if not pipeworks.may_configure(pos, sender) then return end
+					if (fields.quit and not fields.key_enter_field)
+							or not pipeworks.may_configure(pos, sender) then
+						return
+					end
 					fs_helpers.on_receive_fields(pos, fields)
 					update_formspec(pos)
 				end,

teleport_tube.lua

@@ -4,6 +4,9 @@ local filename=minetest.get_worldpath() .. "/teleport_tubes"
 local tp_tube_db = nil -- nil forces a read
 local tp_tube_db_version = 2.0
 
+-- cached rceiver list: hash(pos) => {receivers}
+local cache = {}
+
 local function hash(pos)
 	return string.format("%.30g", minetest.hash_node_position(pos))
 end
@@ -18,6 +21,8 @@ local function save_tube_db()
 	else
 		error(err)
 	end
+	-- reset tp-tube cache
+	cache = {}
 end
 
 local function migrate_tube_db()
@@ -101,6 +106,12 @@ local function read_node_with_vm(pos)
 end
 
 local function get_receivers(pos, channel)
+	local hash = minetest.hash_node_position(pos)
+	if cache[hash] then
+		-- re-use cached result
+		return cache[hash]
+	end
+
 	local tubes = tp_tube_db or read_tube_db()
 	local receivers = {}
 	local dirty = false
@@ -121,6 +132,8 @@ local function get_receivers(pos, channel)
 	if dirty then
 		save_tube_db()
 	end
+	-- cache the result for next time
+	cache[hash] = receivers
 	return receivers
 end
 
@@ -274,5 +287,7 @@ pipeworks.tptube = {
 	hash = hash,
 	save_tube_db = save_tube_db,
 	get_db = function() return tp_tube_db or read_tube_db() end,
+	set_tube = set_tube,
+	update_meta = update_meta,
 	tp_tube_db_version = tp_tube_db_version
 }