minetest-mods/mesecons
1
0
Fork 2
mirror of https://github.com/minetest-mods/mesecons.git synced 2025-04-04 11:20:27 +02:00
Code Issues Releases Wiki Activity

improve settingtypes and get settings only on load

Browse Source
This commit is contained in:
DS-Minetest 2018-01-02 17:42:08 +01:00
parent 309056e2c8
commit b599d17ecd
5 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mesecons_blinkyplant/init.lua
View File

@ -1,11 +1,13 @@
-- The BLINKY_PLANT -- The BLINKY_PLANT
local blinky_plant_interval = mesecon.setting("blinky_plant_interval", 3)
local toggle_timer = function (pos) local toggle_timer = function (pos)
local timer = minetest.get_node_timer(pos) local timer = minetest.get_node_timer(pos)
if timer:is_started() then if timer:is_started() then
timer:stop() timer:stop()
else else
timer:start(mesecon.setting("blinky_plant_interval", 3)) timer:start(blinky_plant_interval)
end end
end end

15
mesecons_detector/init.lua
View File

@ -2,7 +2,10 @@ local GET_COMMAND = "GET"
-- Object detector -- Object detector
-- Detects players in a certain radius -- Detects players in a certain radius
-- The radius can be specified in mesecons/settings.lua -- The radius can be specified in settings
local detector_radius = mesecon.setting("detector_radius", 6)
local node_detector_distance_max = mesecon.setting("node_detector_distance_max", 10)
local function object_detector_make_formspec(pos) local function object_detector_make_formspec(pos)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
@ -25,7 +28,7 @@ end
-- returns true if player was found, false if not -- returns true if player was found, false if not
local function object_detector_scan(pos) local function object_detector_scan(pos)
local objs = minetest.get_objects_inside_radius(pos, mesecon.setting("detector_radius", 6)) local objs = minetest.get_objects_inside_radius(pos, detector_radius)
-- abort if no scan results were found -- abort if no scan results were found
if next(objs) == nil then return false end if next(objs) == nil then return false end
@ -142,7 +145,7 @@ local function node_detector_make_formspec(pos)
if meta:get_string("distance") == "" then meta:set_string("distance", "0") end if meta:get_string("distance") == "" then meta:set_string("distance", "0") end
meta:set_string("formspec", "size[9,2.5]" .. meta:set_string("formspec", "size[9,2.5]" ..
"field[0.3, 0;9,2;scanname;Name of node to scan for (empty for any):;${scanname}]".. "field[0.3, 0;9,2;scanname;Name of node to scan for (empty for any):;${scanname}]"..
"field[0.3,1.5;2.5,2;distance;Distance (0-"..mesecon.setting("node_detector_distance_max", 10).."):;${distance}]".. "field[0.3,1.5;2.5,2;distance;Distance (0-"..node_detector_distance_max.."):;${distance}]"..
"field[3,1.5;4,2;digiline_channel;Digiline Channel (optional):;${digiline_channel}]".. "field[3,1.5;4,2;digiline_channel;Digiline Channel (optional):;${digiline_channel}]"..
"button_exit[7,0.75;2,3;;Save]") "button_exit[7,0.75;2,3;;Save]")
end end
@ -167,9 +170,8 @@ local function node_detector_scan(pos)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local distance = meta:get_int("distance") local distance = meta:get_int("distance")
local distance_max = mesecon.setting("node_detector_distance_max", 10)
if distance < 0 then distance = 0 end if distance < 0 then distance = 0 end
if distance > distance_max then distance = distance_max end distance = math.min(distance, node_detector_distance_max)
local frontname = minetest.get_node( local frontname = minetest.get_node(
vector.subtract(pos, vector.multiply(minetest.facedir_to_dir(node.param2), distance + 1)) vector.subtract(pos, vector.multiply(minetest.facedir_to_dir(node.param2), distance + 1))
@ -187,9 +189,8 @@ local node_detector_digiline = {
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local distance = meta:get_int("distance") local distance = meta:get_int("distance")
local distance_max = mesecon.setting("node_detector_distance_max", 10)
if distance < 0 then distance = 0 end if distance < 0 then distance = 0 end
if distance > distance_max then distance = distance_max end distance = math.min(distance, node_detector_distance_max)
if channel ~= meta:get_string("digiline_channel") then return end if channel ~= meta:get_string("digiline_channel") then return end

18
mesecons_luacontroller/init.lua
View File

@ -35,6 +35,13 @@ local rules = {
d = {x = 0, y = 0, z = -1, name="D"}, d = {x = 0, y = 0, z = -1, name="D"},
} }
-- Settings:
local luacontroller_string_rep_max = mesecon.setting("luacontroller_string_rep_max", 64000)
local luacontroller_digiline_maxlen = mesecon.setting("luacontroller_digiline_maxlen", 50000)
local overheat_max = mesecon.setting("overheat_max", 20)
local luacontroller_maxevents = mesecon.setting("luacontroller_maxevents", 10000)
local luacontroller_memsize = mesecon.setting("luacontroller_memsize", 100000)
------------------ ------------------
-- Action stuff -- -- Action stuff --
@ -206,7 +213,7 @@ end
-- string.rep(str, n) with a high value for n can be used to DoS -- string.rep(str, n) with a high value for n can be used to DoS
-- the server. Therefore, limit max. length of generated string. -- the server. Therefore, limit max. length of generated string.
local function safe_string_rep(str, n) local function safe_string_rep(str, n)
if #str * n > mesecon.setting("luacontroller_string_rep_max", 64000) then if #str * n > luacontroller_string_rep_max then
debug.sethook() -- Clear hook debug.sethook() -- Clear hook
error("string.rep: string length overflow", 2) error("string.rep: string length overflow", 2)
end end
@ -284,7 +291,7 @@ local function get_digiline_send(pos)
-- Make sure serialized version of the data is not insanely long to -- Make sure serialized version of the data is not insanely long to
-- prevent DoS-like attacks -- prevent DoS-like attacks
local msg_ser = minetest.serialize(msg) local msg_ser = minetest.serialize(msg)
if #msg_ser > mesecon.setting("luacontroller_digiline_maxlen", 50000) then if #msg_ser > luacontroller_digiline_maxlen then
return false return false
end end
@ -316,7 +323,7 @@ local function create_environment(pos, mem, event)
event = event, event = event,
mem = mem, mem = mem,
heat = mesecon.get_heat(pos), heat = mesecon.get_heat(pos),
heat_max = mesecon.setting("overheat_max", 20), heat_max = overheat_max,
print = safe_print, print = safe_print,
interrupt = get_interrupt(pos), interrupt = get_interrupt(pos),
digiline_send = get_digiline_send(pos), digiline_send = get_digiline_send(pos),
@ -410,8 +417,7 @@ local function create_sandbox(code, env)
return function(...) return function(...)
-- Use instruction counter to stop execution -- Use instruction counter to stop execution
-- after luacontroller_maxevents -- after luacontroller_maxevents
local maxevents = mesecon.setting("luacontroller_maxevents", 10000) debug.sethook(timeout, "", luacontroller_maxevents)
debug.sethook(timeout, "", maxevents)
local ok, ret = pcall(f, ...) local ok, ret = pcall(f, ...)
debug.sethook() -- Clear hook debug.sethook() -- Clear hook
if not ok then error(ret, 0) end if not ok then error(ret, 0) end
@ -427,7 +433,7 @@ end
local function save_memory(pos, meta, mem) local function save_memory(pos, meta, mem)
local memstring = minetest.serialize(remove_functions(mem)) local memstring = minetest.serialize(remove_functions(mem))
local memsize_max = mesecon.setting("luacontroller_memsize", 100000) local memsize_max = luacontroller_memsize
if (#memstring <= memsize_max) then if (#memstring <= memsize_max) then
meta:set_string("lc_memory", memstring) meta:set_string("lc_memory", memstring)

4
mesecons_pressureplates/init.lua
View File

@ -1,3 +1,5 @@
local pplate_interval = mesecon.setting("pplate_interval", 0.1)
local pp_box_off = { local pp_box_off = {
type = "fixed", type = "fixed",
fixed = { -7/16, -8/16, -7/16, 7/16, -7/16, 7/16 }, fixed = { -7/16, -8/16, -7/16, 7/16, -7/16, 7/16 },
@ -54,7 +56,7 @@ function mesecon.register_pressure_plate(basename, description, textures_off, te
pressureplate_basename = basename, pressureplate_basename = basename,
on_timer = pp_on_timer, on_timer = pp_on_timer,
on_construct = function(pos) on_construct = function(pos)
minetest.get_node_timer(pos):start(mesecon.setting("pplate_interval", 0.1)) minetest.get_node_timer(pos):start(pplate_interval)
end, end,
},{ },{
mesecons = {receptor = { state = mesecon.state.off, rules = mesecon.rules.pplate }}, mesecons = {receptor = { state = mesecon.state.off, rules = mesecon.rules.pplate }},

18
settingtypes.txt
View File

@ -1,6 +1,6 @@
[mesecons] [mesecons]
mesecon.resumetime (Resume time) int 4 mesecon.resumetime (Actionqueue resume time) int 4
mesecon.overheat_max (Overheat max) int 20 mesecon.overheat_max (Overheat max) int 20
mesecon.cooldown_time (Cooldown time) float 2.0 mesecon.cooldown_time (Cooldown time) float 2.0
mesecon.cooldown_granularity (Cooldown granularity) float 0.5 mesecon.cooldown_granularity (Cooldown granularity) float 0.5
@ -8,21 +8,21 @@ mesecon.cooldown_granularity (Cooldown granularity) float 0.5
[mesecons_blinkyplant] [mesecons_blinkyplant]
mesecon.blinky_plant_interval (Plant interval) int 3 mesecon.blinky_plant_interval (Blinky Plant interval) int 3
[mesecons_detector] [mesecons_detector]
mesecon.detector_radius (Detector radius) int 6 mesecon.detector_radius (Object Detector radius) int 6
mesecon.node_detector_distance_max (Detector max distance) int 10 mesecon.node_detector_distance_max (Node Detector max distance) int 10
[mesecons_luacontroller] [mesecons_luacontroller]
mesecon.luacontroller_string_rep_max (Max) int 64000 mesecon.luacontroller_string_rep_max (string.rep result length limit) int 64000
mesecon.luacontroller_digiline_maxlen (Digiline max length) int 50000 mesecon.luacontroller_digiline_maxlen (Digiline message size limit) int 50000
mesecon.luacontroller_maxevents (Max events) int 10000 mesecon.luacontroller_maxevents (Max debug hook events per event) int 10000
mesecon.luacontroller_memsize (Memory size) int 100000 mesecon.luacontroller_memsize (Memory size in number of characters of serialized mem) int 100000
[mesecons_movestones] [mesecons_movestones]
@ -40,4 +40,4 @@ mesecon.piston_max_pull (Max pull) int 15
[mesecons_pressureplates] [mesecons_pressureplates]
mesecon.pplate_interval (Interval) float 0.1 mesecon.pplate_interval (Check Interval) float 0.1