From 4b5dd0f2c9ed530e97a783aedb3de73425d24516 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Fri, 22 Jan 2021 20:29:08 -0500
Subject: rename TrainerCommand to ConsoleCommand to match the rest of the code

---
 .../Framework/Commands/ConsoleCommand.cs           | 115 +++++++++++++++++++++
 .../Framework/Commands/IConsoleCommand.cs          |  40 +++++++
 .../Framework/Commands/ITrainerCommand.cs          |  40 -------
 .../Commands/Other/ApplySaveFixCommand.cs          |   2 +-
 .../Framework/Commands/Other/DebugCommand.cs       |   2 +-
 .../Commands/Other/ShowDataFilesCommand.cs         |   2 +-
 .../Commands/Other/ShowGameFilesCommand.cs         |   2 +-
 .../Framework/Commands/Other/TestInputCommand.cs   |   2 +-
 .../Framework/Commands/Player/AddCommand.cs        |   2 +-
 .../Commands/Player/ListItemTypesCommand.cs        |   2 +-
 .../Framework/Commands/Player/ListItemsCommand.cs  |   2 +-
 .../Framework/Commands/Player/SetColorCommand.cs   |   2 +-
 .../Framework/Commands/Player/SetHealthCommand.cs  |   2 +-
 .../Commands/Player/SetImmunityCommand.cs          |   2 +-
 .../Commands/Player/SetMaxHealthCommand.cs         |   2 +-
 .../Commands/Player/SetMaxStaminaCommand.cs        |   2 +-
 .../Framework/Commands/Player/SetMoneyCommand.cs   |   2 +-
 .../Framework/Commands/Player/SetNameCommand.cs    |   2 +-
 .../Framework/Commands/Player/SetStaminaCommand.cs |   2 +-
 .../Framework/Commands/Player/SetStyleCommand.cs   |   2 +-
 .../Framework/Commands/TrainerCommand.cs           | 115 ---------------------
 .../Framework/Commands/World/ClearCommand.cs       |   2 +-
 .../Commands/World/DownMineLevelCommand.cs         |   2 +-
 .../Framework/Commands/World/FreezeTimeCommand.cs  |   2 +-
 .../Framework/Commands/World/SetDayCommand.cs      |   2 +-
 .../Commands/World/SetMineLevelCommand.cs          |   2 +-
 .../Framework/Commands/World/SetSeasonCommand.cs   |   2 +-
 .../Framework/Commands/World/SetTimeCommand.cs     |   2 +-
 .../Framework/Commands/World/SetYearCommand.cs     |   2 +-
 29 files changed, 180 insertions(+), 180 deletions(-)
 create mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ConsoleCommand.cs
 create mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/IConsoleCommand.cs
 delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ITrainerCommand.cs
 delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/TrainerCommand.cs

(limited to 'src/SMAPI.Mods.ConsoleCommands/Framework/Commands')

diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ConsoleCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ConsoleCommand.cs
new file mode 100644
index 00000000..01cab92e
--- /dev/null
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ConsoleCommand.cs
@@ -0,0 +1,115 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands
+{
+    /// <summary>The base implementation for a console command.</summary>
+    internal abstract class ConsoleCommand : IConsoleCommand
+    {
+        /*********
+        ** Accessors
+        *********/
+        /// <summary>The command name the user must type.</summary>
+        public string Name { get; }
+
+        /// <summary>The command description.</summary>
+        public string Description { get; }
+
+        /// <summary>Whether the command may need to perform logic when the player presses a button. This value shouldn't change.</summary>
+        public bool MayNeedInput { get; }
+
+        /// <summary>Whether the command may need to perform logic when the game updates. This value shouldn't change.</summary>
+        public bool MayNeedUpdate { get; }
+
+
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Handle the command.</summary>
+        /// <param name="monitor">Writes messages to the console and log file.</param>
+        /// <param name="command">The command name.</param>
+        /// <param name="args">The command arguments.</param>
+        public abstract void Handle(IMonitor monitor, string command, ArgumentParser args);
+
+        /// <summary>Perform any logic needed on update tick.</summary>
+        /// <param name="monitor">Writes messages to the console and log file.</param>
+        public virtual void OnUpdated(IMonitor monitor) { }
+
+        /// <summary>Perform any logic when input is received.</summary>
+        /// <param name="monitor">Writes messages to the console and log file.</param>
+        /// <param name="button">The button that was pressed.</param>
+        public virtual void OnButtonPressed(IMonitor monitor, SButton button) { }
+
+
+        /*********
+        ** Protected methods
+        *********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="name">The command name the user must type.</param>
+        /// <param name="description">The command description.</param>
+        /// <param name="mayNeedInput">Whether the command may need to perform logic when the player presses a button.</param>
+        /// <param name="mayNeedUpdate">Whether the command may need to perform logic when the game updates.</param>
+        protected ConsoleCommand(string name, string description, bool mayNeedInput = false, bool mayNeedUpdate = false)
+        {
+            this.Name = name;
+            this.Description = description;
+            this.MayNeedInput = mayNeedInput;
+            this.MayNeedUpdate = mayNeedUpdate;
+        }
+
+        /// <summary>Log an error indicating incorrect usage.</summary>
+        /// <param name="monitor">Writes messages to the console and log file.</param>
+        /// <param name="error">A sentence explaining the problem.</param>
+        protected void LogUsageError(IMonitor monitor, string error)
+        {
+            monitor.Log($"{error} Type 'help {this.Name}' for usage.", LogLevel.Error);
+        }
+
+        /// <summary>Log an error indicating a value must be an integer.</summary>
+        /// <param name="monitor">Writes messages to the console and log file.</param>
+        protected void LogArgumentNotInt(IMonitor monitor)
+        {
+            this.LogUsageError(monitor, "The value must be a whole number.");
+        }
+
+        /// <summary>Get an ASCII table to show tabular data in the console.</summary>
+        /// <typeparam name="T">The data type.</typeparam>
+        /// <param name="data">The data to display.</param>
+        /// <param name="header">The table header.</param>
+        /// <param name="getRow">Returns a set of fields for a data value.</param>
+        protected string GetTableString<T>(IEnumerable<T> data, string[] header, Func<T, string[]> getRow)
+        {
+            // get table data
+            int[] widths = header.Select(p => p.Length).ToArray();
+            string[][] rows = data
+                .Select(item =>
+                {
+                    string[] fields = getRow(item);
+                    if (fields.Length != widths.Length)
+                        throw new InvalidOperationException($"Expected {widths.Length} columns, but found {fields.Length}: {string.Join(", ", fields)}");
+
+                    for (int i = 0; i < fields.Length; i++)
+                        widths[i] = Math.Max(widths[i], fields[i].Length);
+
+                    return fields;
+                })
+                .ToArray();
+
+            // render fields
+            List<string[]> lines = new List<string[]>(rows.Length + 2)
+            {
+                header,
+                header.Select((value, i) => "".PadRight(widths[i], '-')).ToArray()
+            };
+            lines.AddRange(rows);
+
+            return string.Join(
+                Environment.NewLine,
+                lines.Select(line => string.Join(" | ",
+                    line.Select((field, i) => field.PadLeft(widths[i], ' '))
+                ))
+            );
+        }
+    }
+}
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/IConsoleCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/IConsoleCommand.cs
new file mode 100644
index 00000000..9c82bbd3
--- /dev/null
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/IConsoleCommand.cs
@@ -0,0 +1,40 @@
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands
+{
+    /// <summary>A console command to register.</summary>
+    internal interface IConsoleCommand
+    {
+        /*********
+        ** Accessors
+        *********/
+        /// <summary>The command name the user must type.</summary>
+        string Name { get; }
+
+        /// <summary>The command description.</summary>
+        string Description { get; }
+
+        /// <summary>Whether the command may need to perform logic when the game updates. This value shouldn't change.</summary>
+        bool MayNeedUpdate { get; }
+
+        /// <summary>Whether the command may need to perform logic when the player presses a button. This value shouldn't change.</summary>
+        bool MayNeedInput { get; }
+
+
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Handle the command.</summary>
+        /// <param name="monitor">Writes messages to the console and log file.</param>
+        /// <param name="command">The command name.</param>
+        /// <param name="args">The command arguments.</param>
+        void Handle(IMonitor monitor, string command, ArgumentParser args);
+
+        /// <summary>Perform any logic needed on update tick.</summary>
+        /// <param name="monitor">Writes messages to the console and log file.</param>
+        void OnUpdated(IMonitor monitor);
+
+        /// <summary>Perform any logic when input is received.</summary>
+        /// <param name="monitor">Writes messages to the console and log file.</param>
+        /// <param name="button">The button that was pressed.</param>
+        void OnButtonPressed(IMonitor monitor, SButton button);
+    }
+}
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ITrainerCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ITrainerCommand.cs
deleted file mode 100644
index d4d36e5d..00000000
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ITrainerCommand.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands
-{
-    /// <summary>A console command to register.</summary>
-    internal interface ITrainerCommand
-    {
-        /*********
-        ** Accessors
-        *********/
-        /// <summary>The command name the user must type.</summary>
-        string Name { get; }
-
-        /// <summary>The command description.</summary>
-        string Description { get; }
-
-        /// <summary>Whether the command may need to perform logic when the game updates. This value shouldn't change.</summary>
-        bool MayNeedUpdate { get; }
-
-        /// <summary>Whether the command may need to perform logic when the player presses a button. This value shouldn't change.</summary>
-        bool MayNeedInput { get; }
-
-
-        /*********
-        ** Public methods
-        *********/
-        /// <summary>Handle the command.</summary>
-        /// <param name="monitor">Writes messages to the console and log file.</param>
-        /// <param name="command">The command name.</param>
-        /// <param name="args">The command arguments.</param>
-        void Handle(IMonitor monitor, string command, ArgumentParser args);
-
-        /// <summary>Perform any logic needed on update tick.</summary>
-        /// <param name="monitor">Writes messages to the console and log file.</param>
-        void OnUpdated(IMonitor monitor);
-
-        /// <summary>Perform any logic when input is received.</summary>
-        /// <param name="monitor">Writes messages to the console and log file.</param>
-        /// <param name="button">The button that was pressed.</param>
-        void OnButtonPressed(IMonitor monitor, SButton button);
-    }
-}
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ApplySaveFixCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ApplySaveFixCommand.cs
index 8f59342e..957b0e75 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ApplySaveFixCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ApplySaveFixCommand.cs
@@ -5,7 +5,7 @@ using StardewValley;
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Other
 {
     /// <summary>A command which runs one of the game's save migrations.</summary>
-    internal class ApplySaveFixCommand : TrainerCommand
+    internal class ApplySaveFixCommand : ConsoleCommand
     {
         /*********
         ** Public methods
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/DebugCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/DebugCommand.cs
index e4010111..1955c14e 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/DebugCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/DebugCommand.cs
@@ -3,7 +3,7 @@
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Other
 {
     /// <summary>A command which sends a debug command to the game.</summary>
-    internal class DebugCommand : TrainerCommand
+    internal class DebugCommand : ConsoleCommand
     {
         /*********
         ** Public methods
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowDataFilesCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowDataFilesCommand.cs
index 54d27185..27f6ce53 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowDataFilesCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowDataFilesCommand.cs
@@ -3,7 +3,7 @@
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Other
 {
     /// <summary>A command which shows the data files.</summary>
-    internal class ShowDataFilesCommand : TrainerCommand
+    internal class ShowDataFilesCommand : ConsoleCommand
     {
         /*********
         ** Public methods
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowGameFilesCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowGameFilesCommand.cs
index 0257892f..71093184 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowGameFilesCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowGameFilesCommand.cs
@@ -3,7 +3,7 @@
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Other
 {
     /// <summary>A command which shows the game files.</summary>
-    internal class ShowGameFilesCommand : TrainerCommand
+    internal class ShowGameFilesCommand : ConsoleCommand
     {
         /*********
         ** Public methods
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/TestInputCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/TestInputCommand.cs
index 11aa10c3..46583dc3 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/TestInputCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/TestInputCommand.cs
@@ -3,7 +3,7 @@ using System;
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Other
 {
     /// <summary>A command which logs the keys being pressed for 30 seconds once enabled.</summary>
-    internal class TestInputCommand : TrainerCommand
+    internal class TestInputCommand : ConsoleCommand
     {
         /*********
         ** Fields
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/AddCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/AddCommand.cs
index 6cb2b624..0e8f7517 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/AddCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/AddCommand.cs
@@ -7,7 +7,7 @@ using Object = StardewValley.Object;
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which adds an item to the player inventory.</summary>
-    internal class AddCommand : TrainerCommand
+    internal class AddCommand : ConsoleCommand
     {
         /*********
         ** Fields
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemTypesCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemTypesCommand.cs
index a835455e..1f12e5f9 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemTypesCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemTypesCommand.cs
@@ -4,7 +4,7 @@ using StardewModdingAPI.Mods.ConsoleCommands.Framework.ItemData;
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which list item types.</summary>
-    internal class ListItemTypesCommand : TrainerCommand
+    internal class ListItemTypesCommand : ConsoleCommand
     {
         /*********
         ** Fields
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemsCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemsCommand.cs
index 4232ce16..67569298 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemsCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemsCommand.cs
@@ -6,7 +6,7 @@ using StardewModdingAPI.Mods.ConsoleCommands.Framework.ItemData;
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which list items available to spawn.</summary>
-    internal class ListItemsCommand : TrainerCommand
+    internal class ListItemsCommand : ConsoleCommand
     {
         /*********
         ** Fields
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetColorCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetColorCommand.cs
index f0815ef6..7b7cbf83 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetColorCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetColorCommand.cs
@@ -4,7 +4,7 @@ using StardewValley;
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which edits the color of a player feature.</summary>
-    internal class SetColorCommand : TrainerCommand
+    internal class SetColorCommand : ConsoleCommand
     {
         /*********
         ** Public methods
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetHealthCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetHealthCommand.cs
index 41a5b2af..f27b336f 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetHealthCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetHealthCommand.cs
@@ -4,7 +4,7 @@ using StardewValley;
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which edits the player's current health.</summary>
-    internal class SetHealthCommand : TrainerCommand
+    internal class SetHealthCommand : ConsoleCommand
     {
         /*********
         ** Public methods
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetImmunityCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetImmunityCommand.cs
index 9c66c4fe..df90adf2 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetImmunityCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetImmunityCommand.cs
@@ -4,7 +4,7 @@ using StardewValley;
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which edits the player's current immunity.</summary>
-    internal class SetImmunityCommand : TrainerCommand
+    internal class SetImmunityCommand : ConsoleCommand
     {
         /*********
         ** Public methods
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxHealthCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxHealthCommand.cs
index f4ae0694..a5f7f444 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxHealthCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxHealthCommand.cs
@@ -4,7 +4,7 @@ using StardewValley;
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which edits the player's maximum health.</summary>
-    internal class SetMaxHealthCommand : TrainerCommand
+    internal class SetMaxHealthCommand : ConsoleCommand
     {
         /*********
         ** Public methods
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxStaminaCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxStaminaCommand.cs
index 5bce5ea3..e3c2f011 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxStaminaCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxStaminaCommand.cs
@@ -4,7 +4,7 @@ using StardewValley;
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which edits the player's maximum stamina.</summary>
-    internal class SetMaxStaminaCommand : TrainerCommand
+    internal class SetMaxStaminaCommand : ConsoleCommand
     {
         /*********
         ** Public methods
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMoneyCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMoneyCommand.cs
index e015f01a..787ce920 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMoneyCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMoneyCommand.cs
@@ -4,7 +4,7 @@ using StardewValley;
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which edits the player's current money.</summary>
-    internal class SetMoneyCommand : TrainerCommand
+    internal class SetMoneyCommand : ConsoleCommand
     {
         /*********
         ** Public methods
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetNameCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetNameCommand.cs
index e8cb0584..4911ad1c 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetNameCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetNameCommand.cs
@@ -3,7 +3,7 @@ using StardewValley;
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which edits the player's name.</summary>
-    internal class SetNameCommand : TrainerCommand
+    internal class SetNameCommand : ConsoleCommand
     {
         /*********
         ** Public methods
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStaminaCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStaminaCommand.cs
index a8adafce..c78378ef 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStaminaCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStaminaCommand.cs
@@ -4,7 +4,7 @@ using StardewValley;
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which edits the player's current stamina.</summary>
-    internal class SetStaminaCommand : TrainerCommand
+    internal class SetStaminaCommand : ConsoleCommand
     {
         /*********
         ** Public methods
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStyleCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStyleCommand.cs
index 31f4107d..98f6c330 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStyleCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStyleCommand.cs
@@ -3,7 +3,7 @@ using StardewValley;
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which edits a player style.</summary>
-    internal class SetStyleCommand : TrainerCommand
+    internal class SetStyleCommand : ConsoleCommand
     {
         /*********
         ** Public methods
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/TrainerCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/TrainerCommand.cs
deleted file mode 100644
index 98daa906..00000000
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/TrainerCommand.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands
-{
-    /// <summary>The base implementation for a trainer command.</summary>
-    internal abstract class TrainerCommand : ITrainerCommand
-    {
-        /*********
-        ** Accessors
-        *********/
-        /// <summary>The command name the user must type.</summary>
-        public string Name { get; }
-
-        /// <summary>The command description.</summary>
-        public string Description { get; }
-
-        /// <summary>Whether the command may need to perform logic when the player presses a button. This value shouldn't change.</summary>
-        public bool MayNeedInput { get; }
-
-        /// <summary>Whether the command may need to perform logic when the game updates. This value shouldn't change.</summary>
-        public bool MayNeedUpdate { get; }
-
-
-        /*********
-        ** Public methods
-        *********/
-        /// <summary>Handle the command.</summary>
-        /// <param name="monitor">Writes messages to the console and log file.</param>
-        /// <param name="command">The command name.</param>
-        /// <param name="args">The command arguments.</param>
-        public abstract void Handle(IMonitor monitor, string command, ArgumentParser args);
-
-        /// <summary>Perform any logic needed on update tick.</summary>
-        /// <param name="monitor">Writes messages to the console and log file.</param>
-        public virtual void OnUpdated(IMonitor monitor) { }
-
-        /// <summary>Perform any logic when input is received.</summary>
-        /// <param name="monitor">Writes messages to the console and log file.</param>
-        /// <param name="button">The button that was pressed.</param>
-        public virtual void OnButtonPressed(IMonitor monitor, SButton button) { }
-
-
-        /*********
-        ** Protected methods
-        *********/
-        /// <summary>Construct an instance.</summary>
-        /// <param name="name">The command name the user must type.</param>
-        /// <param name="description">The command description.</param>
-        /// <param name="mayNeedInput">Whether the command may need to perform logic when the player presses a button.</param>
-        /// <param name="mayNeedUpdate">Whether the command may need to perform logic when the game updates.</param>
-        protected TrainerCommand(string name, string description, bool mayNeedInput = false, bool mayNeedUpdate = false)
-        {
-            this.Name = name;
-            this.Description = description;
-            this.MayNeedInput = mayNeedInput;
-            this.MayNeedUpdate = mayNeedUpdate;
-        }
-
-        /// <summary>Log an error indicating incorrect usage.</summary>
-        /// <param name="monitor">Writes messages to the console and log file.</param>
-        /// <param name="error">A sentence explaining the problem.</param>
-        protected void LogUsageError(IMonitor monitor, string error)
-        {
-            monitor.Log($"{error} Type 'help {this.Name}' for usage.", LogLevel.Error);
-        }
-
-        /// <summary>Log an error indicating a value must be an integer.</summary>
-        /// <param name="monitor">Writes messages to the console and log file.</param>
-        protected void LogArgumentNotInt(IMonitor monitor)
-        {
-            this.LogUsageError(monitor, "The value must be a whole number.");
-        }
-
-        /// <summary>Get an ASCII table to show tabular data in the console.</summary>
-        /// <typeparam name="T">The data type.</typeparam>
-        /// <param name="data">The data to display.</param>
-        /// <param name="header">The table header.</param>
-        /// <param name="getRow">Returns a set of fields for a data value.</param>
-        protected string GetTableString<T>(IEnumerable<T> data, string[] header, Func<T, string[]> getRow)
-        {
-            // get table data
-            int[] widths = header.Select(p => p.Length).ToArray();
-            string[][] rows = data
-                .Select(item =>
-                {
-                    string[] fields = getRow(item);
-                    if (fields.Length != widths.Length)
-                        throw new InvalidOperationException($"Expected {widths.Length} columns, but found {fields.Length}: {string.Join(", ", fields)}");
-
-                    for (int i = 0; i < fields.Length; i++)
-                        widths[i] = Math.Max(widths[i], fields[i].Length);
-
-                    return fields;
-                })
-                .ToArray();
-
-            // render fields
-            List<string[]> lines = new List<string[]>(rows.Length + 2)
-            {
-                header,
-                header.Select((value, i) => "".PadRight(widths[i], '-')).ToArray()
-            };
-            lines.AddRange(rows);
-
-            return string.Join(
-                Environment.NewLine,
-                lines.Select(line => string.Join(" | ",
-                    line.Select((field, i) => field.PadLeft(widths[i], ' '))
-                ))
-            );
-        }
-    }
-}
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/ClearCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/ClearCommand.cs
index 29052be3..4b0e45a0 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/ClearCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/ClearCommand.cs
@@ -10,7 +10,7 @@ using SObject = StardewValley.Object;
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
 {
     /// <summary>A command which clears in-game objects.</summary>
-    internal class ClearCommand : TrainerCommand
+    internal class ClearCommand : ConsoleCommand
     {
         /*********
         ** Fields
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/DownMineLevelCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/DownMineLevelCommand.cs
index 2cec0fd3..0aa9c9c3 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/DownMineLevelCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/DownMineLevelCommand.cs
@@ -4,7 +4,7 @@ using StardewValley.Locations;
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
 {
     /// <summary>A command which moves the player to the next mine level.</summary>
-    internal class DownMineLevelCommand : TrainerCommand
+    internal class DownMineLevelCommand : ConsoleCommand
     {
         /*********
         ** Public methods
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/FreezeTimeCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/FreezeTimeCommand.cs
index 736a93a0..16faa2fe 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/FreezeTimeCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/FreezeTimeCommand.cs
@@ -4,7 +4,7 @@ using StardewValley;
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
 {
     /// <summary>A command which freezes the current time.</summary>
-    internal class FreezeTimeCommand : TrainerCommand
+    internal class FreezeTimeCommand : ConsoleCommand
     {
         /*********
         ** Fields
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetDayCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetDayCommand.cs
index 23c266ea..4028b3dc 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetDayCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetDayCommand.cs
@@ -5,7 +5,7 @@ using StardewValley;
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
 {
     /// <summary>A command which sets the current day.</summary>
-    internal class SetDayCommand : TrainerCommand
+    internal class SetDayCommand : ConsoleCommand
     {
         /*********
         ** Public methods
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetMineLevelCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetMineLevelCommand.cs
index b4f6d5b3..40f4b19f 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetMineLevelCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetMineLevelCommand.cs
@@ -4,7 +4,7 @@ using StardewValley;
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
 {
     /// <summary>A command which moves the player to the given mine level.</summary>
-    internal class SetMineLevelCommand : TrainerCommand
+    internal class SetMineLevelCommand : ConsoleCommand
     {
         /*********
         ** Public methods
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetSeasonCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetSeasonCommand.cs
index 676369fe..a4cb35bb 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetSeasonCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetSeasonCommand.cs
@@ -5,7 +5,7 @@ using StardewValley;
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
 {
     /// <summary>A command which sets the current season.</summary>
-    internal class SetSeasonCommand : TrainerCommand
+    internal class SetSeasonCommand : ConsoleCommand
     {
         /*********
         ** Fields
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetTimeCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetTimeCommand.cs
index 9eae6741..6782e38a 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetTimeCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetTimeCommand.cs
@@ -5,7 +5,7 @@ using StardewValley;
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
 {
     /// <summary>A command which sets the current time.</summary>
-    internal class SetTimeCommand : TrainerCommand
+    internal class SetTimeCommand : ConsoleCommand
     {
         /*********
         ** Public methods
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetYearCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetYearCommand.cs
index 648830c1..95401962 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetYearCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetYearCommand.cs
@@ -5,7 +5,7 @@ using StardewValley;
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
 {
     /// <summary>A command which sets the current year.</summary>
-    internal class SetYearCommand : TrainerCommand
+    internal class SetYearCommand : ConsoleCommand
     {
         /*********
         ** Public methods
-- 
cgit