aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-27 11:35:22 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'aperx' of https://github.com/PHIDIAS0303/ExpCluster into aperx

Browse Source
This commit is contained in:
phidias
2025-01-16 14:07:00 +09:00
parent f9405b930d cff86b07f2
commit be2ae106f5
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
exp_commands/module/commands/sudo.lua
View File

@@ -11,7 +11,7 @@ local Commands = require("modules/exp_commands")
Commands.new("_sudo", { "exp-commands_sudo.description" }) Commands.new("_sudo", { "exp-commands_sudo.description" })
:argument("player", { "exp-commands_sudo.arg-player" }, Commands.types.player) :argument("player", { "exp-commands_sudo.arg-player" }, Commands.types.player)
:argument("command", { "exp-commands_sudo.arg-command" }, Commands.types.key_of(Commands.registered_commands)) :argument("command", { "exp-commands_sudo.arg-command" }, Commands.types.key_of(Commands.registered_commands))
:argument("arguments", { "exp-commands_sudo.arg-arguments" }, Commands.types.string) :optional("arguments", { "exp-commands_sudo.arg-arguments" }, Commands.types.string)
:enable_auto_concatenation() :enable_auto_concatenation()
:add_flags{ "system_only" } :add_flags{ "system_only" }
:register(function(_player, player, command, parameter) :register(function(_player, player, command, parameter)

14
exp_util/module/module_exports.lua
View File

@@ -172,18 +172,20 @@ end
--- @param input string The user input string which should be matched to an option --- @param input string The user input string which should be matched to an option
--- @param use_key boolean? When true the keys will be searched, when false the values will be searched --- @param use_key boolean? When true the keys will be searched, when false the values will be searched
--- @param rtn_key boolean? When true the selected key will be returned, when false the selected value will be returned --- @param rtn_key boolean? When true the selected key will be returned, when false the selected value will be returned
--- @param use_pattern boolean? When true the input will be treated as a lua pattern string
--- @return any # The selected key or value which first matches the input text --- @return any # The selected key or value which first matches the input text
function ExpUtil.auto_complete(options, input, use_key, rtn_key) function ExpUtil.auto_complete(options, input, use_key, rtn_key, use_pattern)
input = input:lower() input = input:lower()
local plain = use_pattern ~= true
if use_key then if use_key then
for k, v in pairs(options) do for k, v in pairs(options) do
if k:lower():find(input) then if k:lower():find(input, nil, plain) then
if rtn_key then return k else return v end if rtn_key then return k else return v end
end end
end end
else else
for k, v in pairs(options) do for k, v in pairs(options) do
if v:lower():find(input) then if v:lower():find(input, nil, plain) then
if rtn_key then return k else return v end if rtn_key then return k else return v end
end end
end end
@@ -572,7 +574,8 @@ end
--- @param player PlayerIdentification? --- @param player PlayerIdentification?
--- @return string --- @return string
function ExpUtil.format_player_name(player) function ExpUtil.format_player_name(player)
local valid_player = type(player) == "userdata" and player or game.get_player(player --[[@as string|number]]) --[[@as LuaPlayer?]] local player_type = type(player)
local valid_player = player_type == "userdata" and player or (player_type == "string" or player_type == "number") and assert(game.get_player(player))
local player_name = valid_player and valid_player.name or "<Server>" local player_name = valid_player and valid_player.name or "<Server>"
local player_chat_colour = valid_player and valid_player.chat_color or ExpUtil.color.white local player_chat_colour = valid_player and valid_player.chat_color or ExpUtil.color.white
return ExpUtil.format_rich_text_color(player_name, player_chat_colour) return ExpUtil.format_rich_text_color(player_name, player_chat_colour)
@@ -582,7 +585,8 @@ end
--- @param player PlayerIdentification? --- @param player PlayerIdentification?
--- @return LocalisedString --- @return LocalisedString
function ExpUtil.format_player_name_locale(player) function ExpUtil.format_player_name_locale(player)
local valid_player = type(player) == "userdata" and player or game.get_player(player --[[@as string|number]]) --[[@as LuaPlayer?]] local player_type = type(player)
local valid_player = player_type == "userdata" and player or (player_type == "string" or player_type == "number") and assert(game.get_player(player))
local player_name = valid_player and valid_player.name or "<Server>" local player_name = valid_player and valid_player.name or "<Server>"
local player_chat_colour = valid_player and valid_player.chat_color or ExpUtil.color.white local player_chat_colour = valid_player and valid_player.chat_color or ExpUtil.color.white
return ExpUtil.format_rich_text_color_locale(player_name, player_chat_colour) return ExpUtil.format_rich_text_color_locale(player_name, player_chat_colour)