sbrl-github/Minetest-WorldEditAdditions
1
0
Fork 0
mirror of https://github.com/sbrl/Minetest-WorldEditAdditions.git synced 2024-11-22 23:42:59 +00:00
Code Issues Releases Wiki Activity

switched run_command to wea core notify

Browse source
This commit is contained in:
VorTechnix 2024-10-16 15:15:47 -07:00
parent c352446226
commit ecafb69486
No known key found for this signature in database
GPG key ID: 091E91A69545D5BA
1 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
worldeditadditions_core/core/run_command.lua
View file

@ -7,8 +7,6 @@ local safe_region = dofile(weac.modpath.."/core/safe_region.lua")
local human_size = weac.format.human_size local human_size = weac.format.human_size
local safe_function = weac.safe_function local safe_function = weac.safe_function
-- TODO: Reimplement worldedit.player_notify(player_name, msg_text)
--- Actually runs the command in question. [HIDDEN] --- Actually runs the command in question. [HIDDEN]
-- Unfortunately needed to keep the codebase clena because Lua sucks. -- Unfortunately needed to keep the codebase clena because Lua sucks.
-- @internal -- @internal
@ -23,18 +21,15 @@ local function run_command_stage2(player_name, func, parse_result, tbl_event)
if not success_safefn then return false end if not success_safefn then return false end
if #retvals ~= 2 then if #retvals ~= 2 then
worldedit.player_notify(player_name, "[//"..tostring(tbl_event.cmdname).."] The main execution function for this chat command returned "..tostring(#retvals).." arguments instead of the expected 2 (success, message), so it is unclear whether it succeeded or not. This is a bug!") weac.notify.error(player_name, "[//"..tostring(tbl_event.cmdname).."] The main execution function for this chat command returned "..tostring(#retvals).." arguments instead of the expected 2 (success, message), so it is unclear whether it succeeded or not. This is a bug!")
end end
local success, result_message = retvals[1], retvals[2] local success, result_message = retvals[1], retvals[2]
print("DEBUG:run_command_stage2 SUCCESS", success, "RESULT_MESSAGE", result_message) print("DEBUG:run_command_stage2 SUCCESS", success, "RESULT_MESSAGE", result_message)
if not success then if not success then
result_message = "[//"..tostring(tbl_event.cmdname).."] "..result_message weac.notify.error(player_name, "[//"..tostring(tbl_event.cmdname).."] "..result_message)
end elseif result_message then
weac.notify.ok(player_name, result_message)
if result_message then
-- TODO: If we were unsuccessful, then colour the message red
worldedit.player_notify(player_name, result_message)
end end
tbl_event.success = success tbl_event.success = success
tbl_event.result = result_message tbl_event.result = result_message
@ -99,16 +94,16 @@ end
-- @param paramtext string The unparsed argument string to pass to the command when executing it. -- @param paramtext string The unparsed argument string to pass to the command when executing it.
local function run_command(cmdname, options, player_name, paramtext) local function run_command(cmdname, options, player_name, paramtext)
if options.require_pos > 0 and not worldedit.pos1[player_name] and not weac.pos.get1(player_name) then if options.require_pos > 0 and not worldedit.pos1[player_name] and not weac.pos.get1(player_name) then
worldedit.player_notify(player_name, "Error: pos1 must be selected to use this command.") weac.notify.error(player_name, "Error: pos1 must be selected to use this command.")
return false return false
end end
if options.require_pos > 1 and not worldedit.pos2[player_name] and not weac.pos.get2(player_name) then if options.require_pos > 1 and not worldedit.pos2[player_name] and not weac.pos.get2(player_name) then
worldedit.player_notify(player_name, "Error: Both pos1 and pos2 must be selected (together making a region) to use this command.") weac.notify.error(player_name, "Error: Both pos1 and pos2 must be selected (together making a region) to use this command.")
return false return false
end end
local pos_count = weac.pos.count(player_name) local pos_count = weac.pos.count(player_name)
if options.require_pos > 2 and pos_count < options.require_pos then if options.require_pos > 2 and pos_count < options.require_pos then
worldedit.player_notify(player_name, "Error: At least "..options.require_pos.."positions must be defined to use this command, but you only have "..pos_count.." defined (try using the multiwand).") weac.notify.error(player_name, "Error: At least "..options.require_pos.."positions must be defined to use this command, but you only have "..pos_count.." defined (try using the multiwand).")
return false return false
end end
@ -128,13 +123,13 @@ local function run_command(cmdname, options, player_name, paramtext)
if not success_safefn then return false end -- error already sent to the player above if not success_safefn then return false end -- error already sent to the player above
if #parse_result == 0 then if #parse_result == 0 then
worldedit.player_notify(player_name, "[//"..tostring(cmdname).."] No return values at all were returned by the parsing function - not even a success boolean. This is a bug - please report it :D") weac.notify.error(player_name, "[//"..tostring(cmdname).."] No return values at all were returned by the parsing function - not even a success boolean. This is a bug - please report it :D")
return false return false
end end
local success = table.remove(parse_result, 1) local success = table.remove(parse_result, 1)
if not success then if not success then
worldedit.player_notify(player_name, "[//"..tostring(cmdname).."] "..(tostring(parse_result[1]) or "Invalid usage (no further error message was provided by the command. This is probably a bug.)")) weac.notify.error(player_name, "[//"..tostring(cmdname).."] "..(tostring(parse_result[1]) or "Invalid usage (no further error message was provided by the command. This is probably a bug.)"))
return false return false
end end
@ -149,7 +144,7 @@ local function run_command(cmdname, options, player_name, paramtext)
if not success_xpcall_nn then return false end if not success_xpcall_nn then return false end
if #retvals_nn == 0 then if #retvals_nn == 0 then
worldedit.player_notify(player_name, "[//"..tostring(cmdname).."] Error: The nodes_needed function didn't return any values. This is a bug!") weac.notify.error(player_name, "[//"..tostring(cmdname).."] Error: The nodes_needed function didn't return any values. This is a bug!")
return false return false
end end
local potential_changes = retvals_nn[1] local potential_changes = retvals_nn[1]
@ -158,7 +153,7 @@ local function run_command(cmdname, options, player_name, paramtext)
weac:emit("post-nodesneeded", tbl_event) weac:emit("post-nodesneeded", tbl_event)
if type(potential_changes) ~= "number" then if type(potential_changes) ~= "number" then
worldedit.player_notify(player_name, "Error: The command '"..cmdname.."' returned a "..type(potential_changes).." instead of a number when asked how many nodes might be changed. Abort. This is a bug.") weac.notify.error(player_name, "Error: The command '"..cmdname.."' returned a "..type(potential_changes).." instead of a number when asked how many nodes might be changed. Abort. This is a bug.")
return return
end end
@ -167,9 +162,9 @@ local function run_command(cmdname, options, player_name, paramtext)
limit = weac.safe_region_limits[player_name] limit = weac.safe_region_limits[player_name]
end end
if type(potential_changes) == "string" then if type(potential_changes) == "string" then
worldedit.player_notify(player_name, "/"..cmdname.." "..paramtext.." "..potential_changes..". Type //y to continue, or //n to cancel (in this specific situation, your configured limit via the //saferegion command does not apply).") weac.notify.warn(player_name, "/"..cmdname.." "..paramtext.." "..potential_changes..". Type //y to continue, or //n to cancel (in this specific situation, your configured limit via the //saferegion command does not apply).")
elseif potential_changes > limit then elseif potential_changes > limit then
worldedit.player_notify(player_name, "/"..cmdname.." "..paramtext.." may affect up to "..human_size(potential_changes).." nodes. Type //y to continue, or //n to cancel (see the //saferegion command to control when this message appears).") weac.notify.warn(player_name, "/"..cmdname.." "..paramtext.." may affect up to "..human_size(potential_changes).." nodes. Type //y to continue, or //n to cancel (see the //saferegion command to control when this message appears).")
safe_region(player_name, cmdname, function() safe_region(player_name, cmdname, function()
run_command_stage2(player_name, options.func, parse_result, tbl_event) run_command_stage2(player_name, options.func, parse_result, tbl_event)
end) end)