Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions MooSharp/Commands/Commands/Creative/CreateObjectCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,14 @@ public class CreateObjectCommandDefinition : ICommandDefinition

public string? TryCreateCommand(ParsingContext ctx, ArgumentBinder binder, out ICommand? command)
{
var args = ctx.GetRemainingText().Trim();

// Expected format: @create object "Name" or @create object Name
if (!args.StartsWith("object", StringComparison.OrdinalIgnoreCase))
if (!binder.ConsumePreposition(ctx, "object"))
{
command = null;
return "Usage: @create object \"Name\".";
}

var nameArg = args[6..].Trim().Trim('"', '\'');
var nameArg = ctx.GetRemainingText();

if (string.IsNullOrWhiteSpace(nameArg))
{
Expand Down
7 changes: 2 additions & 5 deletions MooSharp/Commands/Commands/Creative/DigCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,8 @@ public class DigCommandDefinition : ICommandDefinition

public string? TryCreateCommand(ParsingContext ctx, ArgumentBinder binder, out ICommand? command)
{
var args = ctx.GetRemainingText();

var name = args.StartsWith("to ", StringComparison.OrdinalIgnoreCase)
? args[3..].Trim()
: args.Trim();
binder.ConsumePreposition(ctx, "to");
var name = ctx.GetRemainingText();

if (string.IsNullOrWhiteSpace(name))
{
Expand Down
10 changes: 8 additions & 2 deletions MooSharp/Commands/Commands/Creative/EditVerbCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,15 @@ public class EditVerbCommandDefinition : ICommandDefinition

public string? TryCreateCommand(ParsingContext ctx, ArgumentBinder binder, out ICommand? command)
{
var args = ctx.GetRemainingText().Trim();
var arg = ctx.Pop();

var parts = args.Split(':');
if (arg is null)
{
command = null;
return "Usage: @edit object:verbname";
}

var parts = arg.Split(':');
if (parts.Length != 2)
{
command = null;
Expand Down
13 changes: 6 additions & 7 deletions MooSharp/Commands/Commands/Creative/RenameCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,25 @@ public class RenameCommandDefinition : ICommandDefinition

public string? TryCreateCommand(ParsingContext ctx, ArgumentBinder binder, out ICommand? command)
{
var args = ctx.GetRemainingText();
var trimmed = args.Trim();

if (string.IsNullOrWhiteSpace(trimmed))
if (ctx.IsFinished)
{
command = new RenameCommand
{
Player = ctx.Player,
Target = string.Empty,
NewName = string.Empty
};
return null;
}

var parts = trimmed.Split(' ', 2, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
var target = ctx.Pop() ?? string.Empty;
var newName = ctx.GetRemainingText();

command = new RenameCommand
{
Player = ctx.Player,
Target = parts.ElementAtOrDefault(0) ?? string.Empty,
NewName = parts.ElementAtOrDefault(1) ?? string.Empty
Target = target,
NewName = newName
};

return null;
Expand Down
Loading