Told VS to do a Code Cleanup.

StarsiegeBot/BotSettings.cs

@@ -1,14 +1,13 @@
-using System;
+using DSharpPlus.CommandsNext;
-using System.IO;
-using System.Threading.Tasks;
-using DSharpPlus.CommandsNext;
 using DSharpPlus.CommandsNext.Attributes;
 using DSharpPlus.Entities;
-using System.Text.RegularExpressions;
-using System.Collections.Generic;
 using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.IO;
 using System.Text;
-using DSharpPlus;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 
 namespace StarsiegeBot
 {

StarsiegeBot/EventTriggers.cs

@@ -1,20 +1,13 @@
 #pragma warning disable IDE0060 // Remove unused parameter
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using DSharpPlus;
 using DSharpPlus.CommandsNext;
 using DSharpPlus.Entities;
 using DSharpPlus.EventArgs;
-using DSharpPlus.Interactivity;
-using DSharpPlus.Interactivity.Enums;
-using DSharpPlus.Interactivity.Extensions;
-using DSharpPlus.VoiceNext;
 using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace StarsiegeBot
 {

StarsiegeBot/ExperiemntalCommands.cs

@@ -1,23 +1,15 @@
-using System;
+using DSharpPlus.CommandsNext;
-using System.Diagnostics;
-using System.IO;
-using System.Threading.Tasks;
-using DSharpPlus.CommandsNext;
 using DSharpPlus.CommandsNext.Attributes;
 using DSharpPlus.Entities;
-using DSharpPlus.VoiceNext;
-using System.Text.RegularExpressions;
-using System.Linq;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-using System.Text;
-using DSharpPlus;
-using DSharpPlus.CommandsNext.Exceptions;
-using DSharpPlus.EventArgs;
-using DSharpPlus.VoiceNext.Codec;
-using Microsoft.Extensions.Logging;
-using DSharpPlus.Interactivity;
 using DSharpPlus.Interactivity.Extensions;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 
 namespace StarsiegeBot
 {
@@ -25,11 +17,11 @@ namespace StarsiegeBot
     [Hidden]
 
     [Description("Experimental commands. May break the bot.")]
-    class StarsiegeCommands : BaseCommandModule
+    class ExperiemntalCommands : BaseCommandModule
     {
         private readonly List<Questions> QuizQuestions;
         private readonly Random rnd = new Random();
-        public StarsiegeCommands()
+        public ExperiemntalCommands()
         {
             // Load all the Quick Chat texts and sound wav file info.
             var json = "";

StarsiegeBot/GameCommands.cs

@@ -1,16 +1,16 @@
 #pragma warning disable IDE0060 // Remove unused parameter
-using System;
-using System.Threading.Tasks;
 using DSharpPlus.CommandsNext;
 using DSharpPlus.CommandsNext.Attributes;
 using DSharpPlus.Entities;
-using System.Text.RegularExpressions;
+using System;
-using System.Linq;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 
 namespace StarsiegeBot
 {
-    class Commands : BaseCommandModule
+    class GameCommands : BaseCommandModule
     {
         // Master insult list.
         private readonly string[] InsultMaster = {
@@ -22,7 +22,7 @@ namespace StarsiegeBot
         };
         private List<string> InsultCopy;
 
-        public Commands()
+        public GameCommands()
         {
             // Let the console know we've loaded basic commands.
             Console.WriteLine("Basic Commands Loaded");

StarsiegeBot/Phoenix/GroupManagement.cs

@@ -1,25 +1,12 @@
 #pragma warning disable IDE0060 // Remove unused parameter
-using System;
+using DSharpPlus;
-using System.Diagnostics;
-using System.IO;
-using System.Threading.Tasks;
 using DSharpPlus.CommandsNext;
 using DSharpPlus.CommandsNext.Attributes;
 using DSharpPlus.Entities;
-using DSharpPlus.VoiceNext;
+using System;
-using System.Text.RegularExpressions;
-using System.Linq;
 using System.Collections.Generic;
-using Newtonsoft.Json;
+using System.Text.RegularExpressions;
-using System.Text;
+using System.Threading.Tasks;
-using DSharpPlus;
-using DSharpPlus.CommandsNext.Exceptions;
-using DSharpPlus.EventArgs;
-using DSharpPlus.VoiceNext.Codec;
-using Microsoft.Extensions.Logging;
-using DSharpPlus.Interactivity;
-using DSharpPlus.Interactivity.Extensions;
-using System.Threading;
 
 namespace StarsiegeBot
 {

StarsiegeBot/Phoenix/GroupRoleManagement.cs

@@ -1,25 +1,11 @@
 #pragma warning disable IDE0060 // Remove unused parameter
-using System;
+using DSharpPlus;
-using System.Diagnostics;
-using System.IO;
-using System.Threading.Tasks;
 using DSharpPlus.CommandsNext;
 using DSharpPlus.CommandsNext.Attributes;
 using DSharpPlus.Entities;
-using DSharpPlus.VoiceNext;
+using System;
 using System.Text.RegularExpressions;
-using System.Linq;
+using System.Threading.Tasks;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-using System.Text;
-using DSharpPlus;
-using DSharpPlus.CommandsNext.Exceptions;
-using DSharpPlus.EventArgs;
-using DSharpPlus.VoiceNext.Codec;
-using Microsoft.Extensions.Logging;
-using DSharpPlus.Interactivity;
-using DSharpPlus.Interactivity.Extensions;
-using System.Threading;
 
 namespace StarsiegeBot
 {

StarsiegeBot/Phoenix/LevelManagement.cs

@@ -1,25 +1,10 @@
 #pragma warning disable IDE0060 // Remove unused parameter
-using System;
+using DSharpPlus;
-using System.Diagnostics;
-using System.IO;
-using System.Threading.Tasks;
 using DSharpPlus.CommandsNext;
 using DSharpPlus.CommandsNext.Attributes;
-using DSharpPlus.Entities;
+using System;
-using DSharpPlus.VoiceNext;
 using System.Text.RegularExpressions;
-using System.Linq;
+using System.Threading.Tasks;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-using System.Text;
-using DSharpPlus;
-using DSharpPlus.CommandsNext.Exceptions;
-using DSharpPlus.EventArgs;
-using DSharpPlus.VoiceNext.Codec;
-using Microsoft.Extensions.Logging;
-using DSharpPlus.Interactivity;
-using DSharpPlus.Interactivity.Extensions;
-using System.Threading;
 
 namespace StarsiegeBot
 {

StarsiegeBot/Phoenix/LevelRoleManagement.cs

@@ -1,25 +1,11 @@
 #pragma warning disable IDE0060 // Remove unused parameter
-using System;
+using DSharpPlus;
-using System.Diagnostics;
-using System.IO;
-using System.Threading.Tasks;
 using DSharpPlus.CommandsNext;
 using DSharpPlus.CommandsNext.Attributes;
 using DSharpPlus.Entities;
-using DSharpPlus.VoiceNext;
+using System;
 using System.Text.RegularExpressions;
-using System.Linq;
+using System.Threading.Tasks;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-using System.Text;
-using DSharpPlus;
-using DSharpPlus.CommandsNext.Exceptions;
-using DSharpPlus.EventArgs;
-using DSharpPlus.VoiceNext.Codec;
-using Microsoft.Extensions.Logging;
-using DSharpPlus.Interactivity;
-using DSharpPlus.Interactivity.Extensions;
-using System.Threading;
 
 namespace StarsiegeBot
 {

StarsiegeBot/Phoenix/RoleManagement.cs

@@ -1,25 +1,11 @@
 #pragma warning disable IDE0060 // Remove unused parameter
-using System;
+using DSharpPlus;
-using System.Diagnostics;
-using System.IO;
-using System.Threading.Tasks;
 using DSharpPlus.CommandsNext;
 using DSharpPlus.CommandsNext.Attributes;
 using DSharpPlus.Entities;
-using DSharpPlus.VoiceNext;
+using System;
 using System.Text.RegularExpressions;
-using System.Linq;
+using System.Threading.Tasks;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-using System.Text;
-using DSharpPlus;
-using DSharpPlus.CommandsNext.Exceptions;
-using DSharpPlus.EventArgs;
-using DSharpPlus.VoiceNext.Codec;
-using Microsoft.Extensions.Logging;
-using DSharpPlus.Interactivity;
-using DSharpPlus.Interactivity.Extensions;
-using System.Threading;
 
 namespace StarsiegeBot
 {

StarsiegeBot/PrefixManagement.cs

@@ -1,24 +1,11 @@
-using System;
+using DSharpPlus;
-using System.Diagnostics;
-using System.IO;
-using System.Threading.Tasks;
 using DSharpPlus.CommandsNext;
 using DSharpPlus.CommandsNext.Attributes;
 using DSharpPlus.Entities;
-using DSharpPlus.VoiceNext;
+using System;
-using System.Text.RegularExpressions;
 using System.Linq;
-using System.Collections.Generic;
+using System.Text.RegularExpressions;
-using Newtonsoft.Json;
+using System.Threading.Tasks;
-using System.Text;
-using DSharpPlus;
-using DSharpPlus.CommandsNext.Exceptions;
-using DSharpPlus.EventArgs;
-using DSharpPlus.VoiceNext.Codec;
-using Microsoft.Extensions.Logging;
-using DSharpPlus.Interactivity;
-using DSharpPlus.Interactivity.Extensions;
-using System.Threading;
 
 namespace StarsiegeBot
 {

StarsiegeBot/Program.cs

@@ -1,19 +1,16 @@
-using System;
+using DSharpPlus;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using DSharpPlus;
 using DSharpPlus.CommandsNext;
 using DSharpPlus.Entities;
-using DSharpPlus.EventArgs;
 using DSharpPlus.Interactivity;
 using DSharpPlus.Interactivity.Enums;
 using DSharpPlus.Interactivity.Extensions;
 using DSharpPlus.VoiceNext;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace StarsiegeBot
 {
@@ -122,16 +119,16 @@ namespace StarsiegeBot
 
             // up next, let's register our commands
             this.Commands.RegisterCommands<BotSettings>(); // Main Folder. Test Items.
-            this.Commands.RegisterCommands<Commands>();
+            this.Commands.RegisterCommands<ExperiemntalCommands>(); // Experimental commands file.
+            this.Commands.RegisterCommands<GameCommands>();
             this.Commands.RegisterCommands<GroupManagement>(); // Main Folder. Test Items.
             this.Commands.RegisterCommands<GroupRoleManagement>(); // Main Folder. Test Items.
             this.Commands.RegisterCommands<LevelManagement>(); // Main Folder. Test Items.
             this.Commands.RegisterCommands<LevelRoleManagement>(); // Main Folder. Test Items.
+            this.Commands.RegisterCommands<NotFacts>(); // Raven Folder.
             this.Commands.RegisterCommands<PrefixManagement>();
             this.Commands.RegisterCommands<RoleManagement>(); // Main Folder. Test Items.
-            this.Commands.RegisterCommands<SnappleFacts>();
+            this.Commands.RegisterCommands<SnappleFacts>(); // Raven folder.
-            this.Commands.RegisterCommands<NotFacts>();
-            this.Commands.RegisterCommands<StarsiegeCommands>();
             this.Commands.RegisterCommands<WelcomeMessage>(); // Main Folder. Test Items.
 
             // All these commands are in the STARSIEGE folder.

StarsiegeBot/Raven/NotFacts.cs

@@ -1,17 +1,17 @@
-using System;
+using DSharpPlus.CommandsNext;
+using DSharpPlus.CommandsNext.Attributes;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
-using DSharpPlus.CommandsNext;
-using DSharpPlus.CommandsNext.Attributes;
-using Newtonsoft.Json;
 
 
 namespace StarsiegeBot
 {
     class NotFacts : BaseCommandModule
     {
-        private List<string> notfacts;
+        private readonly List<string> notfacts;
 
         public NotFacts()
         {

StarsiegeBot/Raven/SnappleFacts.cs

@@ -1,17 +1,17 @@
-using System;
+using DSharpPlus.CommandsNext;
+using DSharpPlus.CommandsNext.Attributes;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
-using DSharpPlus.CommandsNext;
-using DSharpPlus.CommandsNext.Attributes;
-using Newtonsoft.Json;
 
 
 namespace StarsiegeBot
 {
     class SnappleFacts : BaseCommandModule
     {
-        private List<string> facts;
+        private readonly List<string> facts;
 
         public SnappleFacts()
         {

StarsiegeBot/Starsiege/DeathMessages.cs

@@ -1,21 +1,15 @@
-using System;
+using DSharpPlus;
-using System.Diagnostics;
-using System.IO;
-using System.Threading.Tasks;
 using DSharpPlus.CommandsNext;
 using DSharpPlus.CommandsNext.Attributes;
 using DSharpPlus.Entities;
-using DSharpPlus.VoiceNext;
-using System.Text.RegularExpressions;
-using System.Linq;
-using System.Collections.Generic;
 using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 using System.Text;
-using DSharpPlus;
+using System.Text.RegularExpressions;
-using DSharpPlus.CommandsNext.Exceptions;
+using System.Threading.Tasks;
-using DSharpPlus.EventArgs;
-using DSharpPlus.VoiceNext.Codec;
-using Microsoft.Extensions.Logging;
 
 namespace StarsiegeBot
 {

StarsiegeBot/Starsiege/Functions.cs

@@ -1,21 +1,15 @@
-using System;
+using DSharpPlus;
-using System.Diagnostics;
-using System.IO;
-using System.Threading.Tasks;
 using DSharpPlus.CommandsNext;
 using DSharpPlus.CommandsNext.Attributes;
 using DSharpPlus.Entities;
-using DSharpPlus.VoiceNext;
-using System.Text.RegularExpressions;
-using System.Linq;
-using System.Collections.Generic;
 using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 using System.Text;
-using DSharpPlus;
+using System.Text.RegularExpressions;
-using DSharpPlus.CommandsNext.Exceptions;
+using System.Threading.Tasks;
-using DSharpPlus.EventArgs;
-using DSharpPlus.VoiceNext.Codec;
-using Microsoft.Extensions.Logging;
 
 namespace StarsiegeBot
 {

StarsiegeBot/Starsiege/GameInfo.cs

@@ -1,22 +1,12 @@
-using System;
+using DSharpPlus.CommandsNext;
-using System.Diagnostics;
-using System.IO;
-using System.Threading.Tasks;
-using DSharpPlus.CommandsNext;
 using DSharpPlus.CommandsNext.Attributes;
 using DSharpPlus.Entities;
-using DSharpPlus.VoiceNext;
-using System.Text.RegularExpressions;
-using System.Linq;
-using System.Collections.Generic;
 using Newtonsoft.Json;
-using System.Text;
+using System;
-using DSharpPlus;
+using System.Collections.Generic;
-using DSharpPlus.CommandsNext.Exceptions;
-using DSharpPlus.EventArgs;
-using DSharpPlus.VoiceNext.Codec;
-using Microsoft.Extensions.Logging;
 using System.Net;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 
 namespace StarsiegeBot
 {

StarsiegeBot/Starsiege/QuickchatHandler.cs

@@ -1,21 +1,15 @@
-using System;
+using DSharpPlus;
-using System.Diagnostics;
-using System.IO;
-using System.Threading.Tasks;
 using DSharpPlus.CommandsNext;
 using DSharpPlus.CommandsNext.Attributes;
 using DSharpPlus.Entities;
-using DSharpPlus.VoiceNext;
-using System.Text.RegularExpressions;
-using System.Linq;
-using System.Collections.Generic;
 using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 using System.Text;
-using DSharpPlus;
+using System.Text.RegularExpressions;
-using DSharpPlus.CommandsNext.Exceptions;
+using System.Threading.Tasks;
-using DSharpPlus.EventArgs;
-using DSharpPlus.VoiceNext.Codec;
-using Microsoft.Extensions.Logging;
 
 namespace StarsiegeBot
 {

StarsiegeBot/WelcomeMessage.cs

@@ -1,25 +1,11 @@
 #pragma warning disable IDE0060 // Remove unused parameter
-using System;
+using DSharpPlus;
-using System.Diagnostics;
-using System.IO;
-using System.Threading.Tasks;
 using DSharpPlus.CommandsNext;
 using DSharpPlus.CommandsNext.Attributes;
 using DSharpPlus.Entities;
-using DSharpPlus.VoiceNext;
+using System;
 using System.Text.RegularExpressions;
-using System.Linq;
+using System.Threading.Tasks;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-using System.Text;
-using DSharpPlus;
-using DSharpPlus.CommandsNext.Exceptions;
-using DSharpPlus.EventArgs;
-using DSharpPlus.VoiceNext.Codec;
-using Microsoft.Extensions.Logging;
-using DSharpPlus.Interactivity;
-using DSharpPlus.Interactivity.Extensions;
-using System.Threading;
 
 namespace StarsiegeBot
 {