tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Console Unify API Changes (#3059)

Browse Source 
* Remove unused IChatCommand.

* Lots of refactoring into a shared context.

* Removed ICommonSession from server concmd Execute.

* Added argStr parameter to concmd execute.

* The execute function of client concmds now returns void, use the new shell.RemoteExecuteCommand function to forward commands.

* Finally move shells and commands into shared.

* Console commands can now be registered directly without a class in a shared context.

* Engine API Changes.

* Repair rebase damage.

* Update Submodule.
This commit is contained in:
Acruid
2021-02-01 16:49:43 -08:00
committed by GitHub
parent 80ad2ef5b7
commit 8b5d66050a
119 changed files with 820 additions and 796 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Server/Commands/FindEntitiesWithComponents.cs
View File

@@ -3,8 +3,8 @@ using System;
using System.Collections.Generic;
using Content.Server.Administration;
using Content.Shared.Administration;
using Robust.Server.Interfaces.Console;
using Robust.Server.Interfaces.Player;
using Robust.Shared.Console;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
@@ -12,17 +12,17 @@ using Robust.Shared.IoC;
namespace Content.Server.Commands
{
[AdminCommand(AdminFlags.Mapping)]
public class FindEntitiesWithComponents : IClientCommand
public class FindEntitiesWithComponents : IConsoleCommand
{
public string Command => "findentitieswithcomponents";
public string Description => "Finds entities with all of the specified components.";
public string Help => $"{Command} <componentName1> <componentName2>...";
public void Execute(IConsoleShell shell, IPlayerSession? player, string[] args)
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
if (args.Length == 0)
{
shell.SendText(player, $"Invalid amount of arguments: {args.Length}.\n{Help}");
shell.WriteLine($"Invalid amount of arguments: {args.Length}.\n{Help}");
return;
}
@@ -43,7 +43,7 @@ namespace Content.Server.Commands
if (invalidArgs.Count > 0)
{
shell.SendText(player, $"No component found for component names: {string.Join(", ", invalidArgs)}");
shell.WriteLine($"No component found for component names: {string.Join(", ", invalidArgs)}");
return;
}
@@ -63,11 +63,11 @@ namespace Content.Server.Commands
if (entityIds.Count == 0)
{
shell.SendText(player, $"No entities found with components {string.Join(", ", args)}.");
shell.WriteLine($"No entities found with components {string.Join(", ", args)}.");
return;
}
shell.SendText(player, $"{entityIds.Count} entities found:\n{string.Join("\n", entityIds)}");
shell.WriteLine($"{entityIds.Count} entities found:\n{string.Join("\n", entityIds)}");
}
}
}