fix: Implement IAliasable in RouteCommand instead of RouteMoonCommand

Computerdores · Apr 16, 2024 · c5a8c3b · c5a8c3b
1 parent 588dd85
commit c5a8c3b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/AdvancedTerminalAPI/AdvancedTerminalAPI/Vanillin/Commands/EjectCommand.cs b/AdvancedTerminalAPI/AdvancedTerminalAPI/Vanillin/Commands/EjectCommand.cs
@@ -14,7 +14,7 @@ public class EjectCommand : ICommand, IPredictable {
     /// <summary>
     /// For the vanilla implementation see: <see cref="Terminal.RunTerminalEvents"/>.
     /// </summary>
-    public CommandResult Execute(string input, ITerminal terminal) { // TODO test
+    public CommandResult Execute(string input, ITerminal terminal) {
         Terminal vT = terminal.GetDriver().VanillaTerminal;
 
         if (!_awaitingConfirmation) {

diff --git a/AdvancedTerminalAPI/AdvancedTerminalAPI/Vanillin/Commands/RouteCommand.cs b/AdvancedTerminalAPI/AdvancedTerminalAPI/Vanillin/Commands/RouteCommand.cs
@@ -1,9 +1,10 @@
-using System.Linq;
+using System.Collections.Generic;
+using System.Linq;
 using HarmonyLib;
 
 namespace Computerdores.AdvancedTerminalAPI.Vanillin.Commands; 
 
-public class RouteCommand : ICommand, IPredictable {
+public class RouteCommand : ICommand, IPredictable, IAliasable {
     private RouteMoonCommand _command;
 
     private bool _awaitingConfirmation;
@@ -28,6 +29,11 @@ public string PredictInput(string partialInput)
 
         return _command?.Execute(words.Skip(1).Join(delimiter: " "), terminal) ?? CommandResult.IGNORE_INPUT;
     }
+
+    public IEnumerable<ICommand> GetAll(ITerminal term) {
+        return from noun in Util.FindKeyword(term, "route").compatibleNouns
+            select new RouteMoonCommand(noun.noun.word, _vT);
+    }
 
     public ICommand CloneStateless() => new RouteCommand(_vT);
 }
diff --git a/AdvancedTerminalAPI/AdvancedTerminalAPI/Vanillin/Commands/RouteMoonCommand.cs b/AdvancedTerminalAPI/AdvancedTerminalAPI/Vanillin/Commands/RouteMoonCommand.cs
@@ -1,17 +1,14 @@
-using System.Collections.Generic;
-using System.Linq;
+namespace Computerdores.AdvancedTerminalAPI.Vanillin.Commands; 
 
-namespace Computerdores.AdvancedTerminalAPI.Vanillin.Commands; 
-
-public class RouteMoonCommand : ICommand, IAliasable, IPredictable {
+public class RouteMoonCommand : ICommand, IPredictable {
     private readonly string _moonName;
 
     private bool _awaitingConfirmation;
     private CompatibleNoun _moon;
 
     private readonly Terminal _vT;
 
-    private RouteMoonCommand(string moonName, Terminal vT) {
+    public RouteMoonCommand(string moonName, Terminal vT) {
         _vT = vT;
         _moonName = moonName;
     }
@@ -49,11 +46,6 @@ public class RouteMoonCommand : ICommand, IAliasable, IPredictable {
     }
 
     public ICommand CloneStateless() => new RouteMoonCommand(_moonName, _vT);
-
-    public IEnumerable<ICommand> GetAll(ITerminal term) {
-        return from noun in Util.FindKeyword(term, "route").compatibleNouns
-            select new RouteMoonCommand(noun.noun.word, _vT);
-    }
 
     public static RouteMoonCommand FromPlayerInput(Terminal term, string input) {
         return new RouteMoonCommand(Util.FindKeyword(term, "route").