update patch for release-2.3.1

advtrains @ e5060860

-Subproject commit 6202c1cb009d24342a8f59a5500178c41d746489
+Subproject commit e506086011ee24a30d3085c6933e8e38f2abd325

sync.patch

 diff -ruN advtrains/advtrains_luaautomation/chatcmds.lua patched/chatcmds.lua
---- advtrains/advtrains_luaautomation/chatcmds.lua	2021-10-12 19:04:17.221486017 +0200
-+++ patched/chatcmds.lua	2021-10-20 23:46:54.111016528 +0200
-@@ -4,6 +4,12 @@
- --position helper.
- --punching a node will result in that position being saved and inserted into a text field on the top of init form.
- local punchpos={}
+--- advtrains/advtrains_luaautomation/chatcmds.lua	2021-10-21 00:03:24.427178402 +0200
++++ patched/chatcmds.lua	2021-10-21 00:10:03.105604464 +0200
+@@ -1,6 +1,13 @@
+ --chatcmds.lua
+ --Registers commands to modify the init and step code for LuaAutomation
+ 
 +local http
 +
 +local function setup_http(_http)
 +	http = _http
 +end
 +table.insert(atlatc.setup_http, setup_http)
- 
- minetest.register_on_punchnode(function(pos, node, player, pointed_thing)
- 	local pname=player:get_player_name()
-@@ -22,6 +28,30 @@
- 		.."button[4,0;2,1;save;Save] button[6,0;2,1;del;Delete Env.] field[8.1,0.5;2,1;punchpos;Last punched position;"..pp.."]"
- 		.."textarea[0.2,1;10,10;code;Environment initialization code;"..minetest.formspec_escape(code).."]"
- 		.."label[0,9.8;"..err.."]"
++
+ local function get_init_form(env, pname)
+ 	local err = env.init_err or ""
+ 	local code = env.init_code or ""
+@@ -13,6 +20,31 @@
+ 		.."button[7.5,0.2;2.5,1;del;Delete Env.]"
+ 		.."textarea[0.3,1.5;"..atlatc.CODE_FORM_SIZE..";code;Environment initialization code;"..minetest.formspec_escape(code).."]"
+ 		.."label[0.0,9.7;"..err.."]"
++
 +	local msg = "Sync"
 +	if env.sync_err then
 +		msg = msg..", failed"
@@ -45,7 +47,7 @@ diff -ruN advtrains/advtrains_luaautomation/chatcmds.lua patched/chatcmds.lua
  	return form
  end
  
-@@ -62,6 +92,44 @@
+@@ -119,6 +151,44 @@
  		return
  	end
  	
@@ -90,7 +92,7 @@ diff -ruN advtrains/advtrains_luaautomation/chatcmds.lua patched/chatcmds.lua
  	envname=string.match(formname, "^atlatc_envsetup_(.+)$")
  	if not envname then return end
  	
-@@ -81,4 +149,7 @@
+@@ -138,4 +208,7 @@
  		env:run_initcode()
  		minetest.show_formspec(pname, formname, get_init_form(env, pname))
  	end
@@ -99,8 +101,8 @@ diff -ruN advtrains/advtrains_luaautomation/chatcmds.lua patched/chatcmds.lua
 +	end
  end)
 diff -ruN advtrains/advtrains_luaautomation/environment.lua patched/environment.lua
---- advtrains/advtrains_luaautomation/environment.lua	2021-10-12 19:04:17.221486017 +0200
-+++ patched/environment.lua	2021-10-20 23:46:54.111016528 +0200
+--- advtrains/advtrains_luaautomation/environment.lua	2021-10-21 00:03:24.427178402 +0200
++++ patched/environment.lua	2021-10-21 00:08:02.436078685 +0200
 @@ -1,6 +1,13 @@
  -------------
  -- lua sandboxed environment
@@ -118,18 +120,18 @@ diff -ruN advtrains/advtrains_luaautomation/environment.lua patched/environment.
 @@ -34,11 +41,12 @@
  		self.fdata={}
  		self.init_code=data.init_code or ""
- 		self.step_code=data.step_code or ""
+ 		self.subscribers=data.subscribers or {}
 +		self.sync_url=data.sync_url or ""
  	end,
  	save = function(self)
  		-- throw any function values out of the sdata table
  		self.sdata = atlatc.remove_invalid_data(self.sdata)
--		return {sdata = self.sdata, init_code=self.init_code, step_code=self.step_code}
-+		return {sdata = self.sdata, init_code=self.init_code, step_code=self.step_code, sync_url=self.sync_url}
+-		return {sdata = self.sdata, init_code=self.init_code, subscribers=self.subscribers}
++		return {sdata = self.sdata, init_code=self.init_code, subscribers=self.subscribers, sync_url=self.sync_url}
  	end,
  }
  
-@@ -326,6 +334,32 @@
+@@ -329,6 +337,32 @@
  		end
  	end
  end
@@ -160,10 +162,10 @@ diff -ruN advtrains/advtrains_luaautomation/environment.lua patched/environment.
 +	end
 +end
  
- --- class interface
- 
-@@ -356,7 +390,11 @@
- 		env:run_stepcode()
+ -- log to environment subscribers. severity can be "error", "warning" or "info" (used by internal print)
+ function env_proto:log(severity, ...)
+@@ -366,7 +400,11 @@
+ 		env:run_initcode()
  	end
  end
 -
@@ -176,9 +178,9 @@ diff -ruN advtrains/advtrains_luaautomation/environment.lua patched/environment.
  
  
 diff -ruN advtrains/advtrains_luaautomation/init.lua patched/init.lua
---- advtrains/advtrains_luaautomation/init.lua	2021-10-20 23:44:07.351635846 +0200
-+++ patched/init.lua	2021-10-20 23:49:32.240431167 +0200
-@@ -12,7 +12,7 @@
+--- advtrains/advtrains_luaautomation/init.lua	2021-10-21 00:03:24.427178402 +0200
++++ patched/init.lua	2021-10-21 00:03:47.687085998 +0200
+@@ -8,7 +8,7 @@
  --Privilege
  --Only trusted players should be enabled to build stuff which can break the server.
  
@@ -187,7 +189,7 @@ diff -ruN advtrains/advtrains_luaautomation/init.lua patched/init.lua
  
  minetest.register_privilege("atlatc", { description = "Player can place and modify LUA ATC components. Grant with care! Allows to execute bad LUA code.", give_to_singleplayer = false, default= false })
  
-@@ -23,9 +23,9 @@
+@@ -22,9 +22,9 @@
  	end
  end
  
@@ -199,7 +201,7 @@ diff -ruN advtrains/advtrains_luaautomation/init.lua patched/init.lua
  end
  dofile(mp.."/environment.lua")
  dofile(mp.."/interrupt.lua")
-@@ -99,6 +99,17 @@
+@@ -98,6 +98,17 @@
  	return save_tbl
  end
  
@@ -219,7 +221,7 @@ diff -ruN advtrains/advtrains_luaautomation/init.lua patched/init.lua
  local timer, step_int=0, 2
 diff -ruN advtrains/advtrains_luaautomation/operation_panel.lua patched/operation_panel.lua
 --- advtrains/advtrains_luaautomation/operation_panel.lua	2021-10-12 18:52:03.743798735 +0200
-+++ patched/operation_panel.lua	2021-10-20 23:46:54.111016528 +0200
++++ patched/operation_panel.lua	2021-10-21 00:03:47.687085998 +0200
 @@ -4,7 +4,7 @@
  end
  
@@ -231,7 +233,7 @@ diff -ruN advtrains/advtrains_luaautomation/operation_panel.lua patched/operatio
  	description = "LuaAutomation operation panel",
 diff -ruN advtrains/advtrains_luaautomation/pcnaming.lua patched/pcnaming.lua
 --- advtrains/advtrains_luaautomation/pcnaming.lua	2021-10-12 18:52:03.743798735 +0200
-+++ patched/pcnaming.lua	2021-10-20 23:46:54.111016528 +0200
++++ patched/pcnaming.lua	2021-10-21 00:03:47.687085998 +0200
 @@ -22,7 +22,7 @@
  	error("Invalid position supplied to " .. (func_name or "???")..": " .. dump(pos))
  end