space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Try optimize NetEntities console completion helper (#5217)

Browse Source 
* Try optimize `NetEntities` completion options

* Actually just remove it

* a
This commit is contained in:
Leon Friedrich
2024-06-08 22:44:21 +12:00
committed by GitHub
parent 7319f3a241
commit 850e9ab695
5 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASE-NOTES.md
View File

@@ -35,7 +35,7 @@ END TEMPLATE-->
### Breaking changes
*None yet*
* `NetEntity.Parse` and `TryParse` will now fail to parse empty strings.
### New features

6
Resources/Locale/en-US/commands.ftl
View File

@@ -382,9 +382,9 @@ cmd-tp-desc = Teleports a player to any location in the round.
cmd-tp-help = tp <x> <y> [<mapID>]
cmd-tpto-desc = Teleports the current player or the specified players/entities to the location of the first player/entity.
cmd-tpto-help = tpto <username|uid> [username|uid]...
cmd-tpto-destination-hint = destination (uid or username)
cmd-tpto-victim-hint = entity to teleport (uid or username)
cmd-tpto-help = tpto <username|uid> [username|NetEntity]...
cmd-tpto-destination-hint = destination (NetEntity or username)
cmd-tpto-victim-hint = entity to teleport (NetEntity or username)
cmd-tpto-parse-error = Cant resolve entity or player: {$str}
cmd-listplayers-desc = Lists all players currently connected.

7
Robust.Shared/Console/Commands/TeleportCommands.cs
View File

@@ -174,12 +174,7 @@ public sealed class TeleportToCommand : LocalizedCommands
var hint = args.Length == 1 ? "cmd-tpto-destination-hint" : "cmd-tpto-victim-hint";
hint = Loc.GetString(hint);
var opts = CompletionResult.FromHintOptions(users, hint);
if (last != string.Empty && !NetEntity.TryParse(last, out _))
return opts;
return CompletionResult.FromHintOptions(opts.Options.Concat(CompletionHelper.NetEntities(last, _entities)), hint);
return CompletionResult.FromHintOptions(users, hint);
}
}

44
Robust.Shared/Console/CompletionHelper.cs
View File

@@ -189,27 +189,45 @@ public static class CompletionHelper
return Components<MapComponent>(string.Empty, entManager);
}
public static IEnumerable<CompletionOption> NetEntities(string text, IEntityManager? entManager = null)
/// <summary>
/// Return all existing entities as possible completions. You should generally avoid using this unless you need to.
/// </summary>
public static IEnumerable<CompletionOption> NetEntities(string text, IEntityManager? entManager = null, int limit = 20)
{
return Components<MetaDataComponent>(text, entManager);
}
if (!NetEntity.TryParse(text, out _))
yield break;
public static IEnumerable<CompletionOption> Components<T>(string text, IEntityManager? entManager = null) where T : IComponent
{
IoCManager.Resolve(ref entManager);
var query = entManager.AllEntityQueryEnumerator<MetaDataComponent>();
var query = entManager.AllEntityQueryEnumerator<T, MetaDataComponent>();
while (query.MoveNext(out var uid, out _, out var metadata))
var i = 0;
while (i < limit && query.MoveNext(out var metadata))
{
if (!entManager.TryGetNetEntity(uid, out var netEntity, metadata: metadata))
continue;
var netString = netEntity.Value.ToString();
var netString = metadata.NetEntity.ToString();
if (!netString.StartsWith(text))
continue;
i++;
yield return new CompletionOption(netString, metadata.EntityName);
}
}
public static IEnumerable<CompletionOption> Components<T>(string text, IEntityManager? entManager = null, int limit = 20) where T : IComponent
{
if (!NetEntity.TryParse(text, out _))
yield break;
IoCManager.Resolve(ref entManager);
var query = entManager.AllEntityQueryEnumerator<T, MetaDataComponent>();
var i = 0;
while (i < limit && query.MoveNext(out _, out var metadata))
{
var netString = metadata.NetEntity.ToString();
if (!netString.StartsWith(text))
continue;
i++;
yield return new CompletionOption(netString, metadata.EntityName);
}
}

2
Robust.Shared/GameObjects/NetEntity.cs
View File

@@ -49,7 +49,7 @@ public readonly struct NetEntity : IEquatable<NetEntity>, IComparable<NetEntity>
public static NetEntity Parse(ReadOnlySpan<char> uid)
{
if (uid.Length == 0)
return default;
throw new FormatException($"An empty string is not a valid NetEntity");
if (uid[0] != 'c')
return new NetEntity(int.Parse(uid));