Merge pull request #48 from RocketModFix/fix/commands-rework

Changed commands field to a dictionary, our problems are over.
RocketModFix · Mar 31, 2024 · 15202a4 · 15202a4
2 parents c169def + bfe7d6d
commit 15202a4
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/Rocket/Rocket.Core/Commands/RocketCommandManager.cs b/Rocket/Rocket.Core/Commands/RocketCommandManager.cs
@@ -17,23 +17,24 @@ namespace Rocket.Core.Commands
 {
     public class RocketCommandManager : MonoBehaviour
     {
-        private readonly List<RegisteredRocketCommand> commands = new List<RegisteredRocketCommand>();
+        private readonly Dictionary<string, RegisteredRocketCommand> commands = new();
         internal List<RocketCommandCooldown> cooldown = new List<RocketCommandCooldown>();
-        public ReadOnlyCollection<RegisteredRocketCommand> Commands { get; internal set; }
+        public IReadOnlyDictionary<string, RegisteredRocketCommand> Commands { get; internal set; }
         private XMLFileAsset<RocketCommands> commandMappings;
 
         public delegate void ExecuteCommand(IRocketPlayer player, IRocketCommand command, ref bool cancel);
         public event ExecuteCommand OnExecuteCommand;
 
         internal void Reload()
         {
+
             commandMappings.Load();
             checkCommandMappings();
         }
 
         private void Awake()
         {
-            Commands = commands.AsReadOnly();
+            Commands = commands;
             commandMappings = new XMLFileAsset<RocketCommands>(Environment.CommandsFile);
             checkCommandMappings();
             R.Plugins.OnPluginsLoaded += Plugins_OnPluginsLoaded;
@@ -80,9 +81,9 @@ private IRocketCommand GetCommand(IRocketCommand command)
 
         public IRocketCommand GetCommand(string command)
         {
-            IRocketCommand foundCommand = commands.Where(c => c.Name.ToLower() == command.ToLower()).FirstOrDefault();
-            if(foundCommand == null) commands.Where(c => c.Aliases.Select(a => a.ToLower()).Contains(command.ToLower())).FirstOrDefault();
-            return foundCommand;
+            if (!commands.ContainsKey(command.ToLower()))
+                return null;
+            return commands[command.ToLower()];
         }
 
         private static string getCommandIdentity(IRocketCommand command,string name)
@@ -157,14 +158,20 @@ public void Register(IRocketCommand command, string alias, CommandPriority prior
 
             foreach(CommandMapping mapping in commandMappings.Instance.CommandMappings.Where(m => m.Class == className && m.Enabled))
             {
-                commands.Add(new RegisteredRocketCommand(mapping.Name.ToLower(), command));
+                commands.Add(mapping.Name.ToLower(), new RegisteredRocketCommand(mapping.Name.ToLower(), command));
                 Logging.Logger.Log("[registered] /" + mapping.Name.ToLower() + " (" + mapping.Class + ")", ConsoleColor.Green);
             }
         }
 
         public void DeregisterFromAssembly(Assembly assembly)
         {
-            commands.RemoveAll(rc => getCommandType(rc.Command).Assembly == assembly);
+            List<string> toRemove = new();
+            foreach (var pair in commands)
+            {
+                if (getCommandType(pair.Value.Command).Assembly == assembly)
+                    toRemove.Add(pair.Key);
+            }
+            toRemove.ForEach((string str) => commands.Remove(str));
         }
 
         public double GetCooldown(IRocketPlayer player, IRocketCommand command)