Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Validate user inputs #39

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Validate user inputs #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0695489
type check for digiline messages
a-tour-ist Nov 30, 2024
6611c1b
add distance limit to player detector
a-tour-ist Nov 30, 2024
79eb319
tidy code according to suggestions
a-tour-ist Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions moremesecons_adjustable_player_detector/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
-- Detects players in a certain radius
-- The radius can be changes by right-click (by default 6)

local MAX_RADIUS = moremesecons.setting("adjustable_player_detector", "max_radius", 16, 0)

local function make_formspec(meta)
meta:set_string("formspec", "size[9,5]" ..
"field[0.3, 0;9,2;scanname;Comma-separated list of the names of players to scan for (empty for any):;${scanname}]"..
Expand Down Expand Up @@ -36,7 +38,7 @@ local object_detector_scan = function (pos)
local scanname = meta:get_string("scanname")
local scan_all = scanname == ""
local scan_names = scanname:split(',')
local radius = meta:get_int("radius")
local radius = math.min(meta:get_int("radius"), MAX_RADIUS)
if radius <= 0 then
radius = 6
end
Expand Down Expand Up @@ -76,11 +78,11 @@ local object_detector_digiline = {
make_formspec(meta)
end
end
if msg.scanname then
if type(msg.scanname) == "string" then
meta:set_string("scanname", msg.scanname)
make_formspec(meta)
end
if msg.command and msg.command == "get" then
if msg.command == "get" then
local found, name = object_detector_scan(pos)
if not found then
name = ""
Expand Down
10 changes: 5 additions & 5 deletions moremesecons_entity_detector/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
-- Detects entitys in a certain radius
-- The radius can be changes by right-click (by default 6)

local MAX_RADIUS = moremesecons.setting("entity_detector", "max_radius", 16, 0)

local function make_formspec(meta)
meta:set_string("formspec", "size[9,5]" ..
"field[0.3, 0;9,2;scanname;Comma-separated list of the names (itemstring) of entities to scan for (empty for any):;${scanname}]"..
Expand All @@ -26,8 +28,7 @@ local function object_detector_on_receive_fields(pos, _, fields, player)
meta:set_string("digiline_channel", fields.digiline_channel)
local r = tonumber(fields.radius)
if r then
local max_radius = moremesecons.setting("entity_detector", "max_radius", 16, 0)
meta:set_int("radius", math.min(r, max_radius))
meta:set_int("radius", math.min(r, MAX_RADIUS))
end
end

Expand All @@ -37,8 +38,7 @@ local object_detector_scan = function (pos)
local scanname = meta:get_string("scanname")
local scan_all = scanname == ""
local scan_names = scanname:split(',')
local max_radius = moremesecons.setting("entity_detector", "max_radius", 16, 0)
local radius = math.min(tonumber(meta:get("radius")) or 6, max_radius)
local radius = math.min(tonumber(meta:get("radius")) or 6, MAX_RADIUS)
for _,obj in pairs(minetest.get_objects_inside_radius(pos, radius)) do
local luaentity = obj:get_luaentity()
if luaentity then
Expand All @@ -62,7 +62,7 @@ local object_detector_digiline = {
action = function (pos, node, channel, msg)
local meta = minetest.get_meta(pos)
local active_channel = meta:get_string("digiline_channel")
if channel ~= active_channel then
if channel ~= active_channel or type(msg) ~= "string" then
return
end
meta:set_string("scanname", msg)
Expand Down
4 changes: 4 additions & 0 deletions settingtypes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
# Minimal interval authorized. Any lower will be set to it.
moremesecons_adjustable_blinky_plant.min_interval (Minimum Interval) float 0.5

[Adjustable Player Detector]

moremesecons_adjustable_player_detector.max_radius (Maximum adjustable player detector radius) float 16 0

[Craftable Commandblock]

# Space-separated list of authorized commands
Expand Down
Loading