vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify command register

Browse Source
This commit is contained in:
Evil Factory
2026-03-28 13:04:11 -03:00
parent 64818775cb
commit b8f1642d9d
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/ConsoleCommandsService.cs
+12 -10
View File
@@ -11,7 +11,7 @@ namespace Barotrauma.LuaCs;
internal class ConsoleCommandsService : IConsoleCommandsService internal class ConsoleCommandsService : IConsoleCommandsService
{ {
private readonly ConcurrentDictionary<string, DebugConsole.Command> _registeredCommands = new(); private readonly List<DebugConsole.Command> _registeredCommands = new();
public void Dispose() public void Dispose()
{ {
@@ -20,7 +20,7 @@ internal class ConsoleCommandsService : IConsoleCommandsService
return; return;
} }
foreach (var cmd in _registeredCommands.Values.ToImmutableArray()) foreach (var cmd in _registeredCommands.ToImmutableArray())
{ {
DebugConsole.Commands.Remove(cmd); DebugConsole.Commands.Remove(cmd);
} }
@@ -38,11 +38,14 @@ internal class ConsoleCommandsService : IConsoleCommandsService
public void RegisterCommand(string name, string help, Action<string[]> onExecute, Func<string[][]> getValidArgs = null, bool isCheat = false) public void RegisterCommand(string name, string help, Action<string[]> onExecute, Func<string[][]> getValidArgs = null, bool isCheat = false)
{ {
IService.CheckDisposed(this); IService.CheckDisposed(this);
var cmd = new DebugConsole.Command(name, help, onExecute, getValidArgs, isCheat);
if (!_registeredCommands.TryAdd(name, cmd)) if (DebugConsole.Commands.Any(cmd => cmd.Names.Contains(name)))
{ {
throw new ArgumentException($"A command with the name '{name}' is already registered."); LuaCsSetup.Instance.Logger.LogWarning($"Registering console command {name} more than once!");
} }
var cmd = new DebugConsole.Command(name, help, onExecute, getValidArgs, isCheat);
_registeredCommands.Add(cmd);
DebugConsole.Commands.Add(cmd); DebugConsole.Commands.Add(cmd);
} }
@@ -77,16 +80,15 @@ internal class ConsoleCommandsService : IConsoleCommandsService
public void RemoveCommand(string name) public void RemoveCommand(string name)
{ {
IService.CheckDisposed(this); IService.CheckDisposed(this);
if (_registeredCommands.TryRemove(name, out DebugConsole.Command cmd))
{ _registeredCommands.RemoveAll(cmd => cmd.Names.Contains(name));
DebugConsole.Commands.Remove(cmd); DebugConsole.Commands.RemoveAll(cmd => cmd.Names.Contains(name));
}
} }
public void RemoveRegisteredCommands() public void RemoveRegisteredCommands()
{ {
IService.CheckDisposed(this); IService.CheckDisposed(this);
foreach (var cmd in _registeredCommands.Values.ToImmutableArray()) foreach (var cmd in _registeredCommands.ToImmutableArray())
{ {
DebugConsole.Commands.Remove(cmd); DebugConsole.Commands.Remove(cmd);
} }