PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

Merge pull request #266 from sirhamsteralot/master

Browse Source 
Add extra functionality to the command system to make dynamic commands remotely plausible
This commit is contained in:
John Gross
2019-01-01 22:43:18 -08:00
committed by GitHub
parent 34e5f4df49 c9adb2a212
commit 9f610d5ae8
2 changed files with 72 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
Torch/Commands/Command.cs
View File

@@ -15,10 +15,13 @@ namespace Torch.Commands
{
public class Command
{
public delegate void CommandAction(CommandContext context, object[] arguments);
public MyPromoteLevel MinimumPromoteLevel { get; }
public string Name { get; }
public string Description { get; }
public string HelpText { get; }
public CommandAction Action { get; }
public Type Module { get; }
public List<string> Path { get; } = new List<string>();
public ITorchPlugin Plugin { get; }
@@ -29,6 +32,28 @@ namespace Torch.Commands
private int? _requiredParamCount;
private static readonly Logger Log = LogManager.GetCurrentClassLogger();
public Command(string name, string description, CommandAction action, ITorchPlugin plugin, MyPromoteLevel? minimumPromoteLevel = null, string helpText = null, int requiredParamCount = 0)
{
HelpText = helpText;
Action = action;
Plugin = plugin;
MinimumPromoteLevel = minimumPromoteLevel ?? MyPromoteLevel.Admin;
var split = name.Split(' ');
Name = split.Last();
Description = description;
HelpText = helpText ?? description;
Path.AddRange(split);
var sb = new StringBuilder();
sb.Append($"!{string.Join(" ", Path)} ");
_requiredParamCount = requiredParamCount;
Log.Debug($"Params: ({_requiredParamCount} required)");
SyntaxHelp = sb.ToString();
}
public Command(ITorchPlugin plugin, MethodInfo commandMethod)
{
Plugin = plugin;
@@ -88,30 +113,47 @@ namespace Torch.Commands
{
try
{
var parameters = new object[_parameters.Length];
var invokeByAction = Action != null;
object[] parameters;
if (context.Args.Count < _requiredParamCount)
return false;
//Convert args from string
for (var i = 0; i < _parameters.Length && i < context.Args.Count; i++)
if (!invokeByAction)
{
if (context.Args[i].TryConvert(_parameters[i].ParameterType, out object obj))
parameters[i] = obj;
else
return false;
parameters = new object[_parameters.Length];
//Convert args from string
for (var i = 0; i < _parameters.Length && i < context.Args.Count; i++)
{
if (context.Args[i].TryConvert(_parameters[i].ParameterType, out object obj))
parameters[i] = obj;
else
return false;
}
//Fill remaining parameters with default values
for (var i = 0; i < parameters.Length; i++)
{
if (parameters[i] == null)
parameters[i] = _parameters[i].DefaultValue;
}
var moduleInstance = (CommandModule)Activator.CreateInstance(Module);
moduleInstance.Context = context;
_method.Invoke(moduleInstance, parameters);
return true;
} else
{
parameters = new object[context.Args.Count];
for (var i = 0; i < parameters.Length && i < context.Args.Count; i++)
{
parameters[i] = context.Args[i];
}
}
//Fill remaining parameters with default values
for (var i = 0; i < parameters.Length; i++)
{
if (parameters[i] == null)
parameters[i] = _parameters[i].DefaultValue;
}
var moduleInstance = (CommandModule)Activator.CreateInstance(Module);
moduleInstance.Context = context;
_method.Invoke(moduleInstance, parameters);
Action.Invoke(context, parameters);
return true;
}
catch (Exception e)

13
Torch/Commands/CommandTree.cs
View File

@@ -141,6 +141,19 @@ namespace Torch.Commands
}
}
public bool DeleteNode(CommandNode node)
{
if (node.Parent != null)
{
node.Parent.RemoveNode(node);
return true;
}
if (node.Command?.Path != null)
return _root.Remove(node.Command.Path.First());
return false;
}
private void DebugNode(CommandNode commandNode, StringBuilder sb, ref int indent)
{
sb.AppendLine(new string(' ', indent) + commandNode.Name);