Drop support for loading obsolete text/ircbancmd.txt - it was obsolet…

…e even in MCForge
ClassiCube · Apr 11, 2021 · 7e7e69e · 7e7e69e
1 parent f0d9f81
commit 7e7e69e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 17 deletions.
diff --git a/MCGalaxy/Chat/EmotesHandler.cs b/MCGalaxy/Chat/EmotesHandler.cs
@@ -6,6 +6,7 @@ namespace MCGalaxy {
 
     public static class EmotesHandler {
 
+        /// <summary> Mapping of emote keywords to unicode characters </summary>
         public static readonly Dictionary<string, char> Keywords = new Dictionary<string, char> {
             { "darksmile", '☺' },
             { "smile", '☻' },

diff --git a/MCGalaxy/Commands/Information/CmdHelp.cs b/MCGalaxy/Commands/Information/CmdHelp.cs
@@ -99,7 +99,7 @@ public sealed class CmdHelp : Command2 {
 
         static string FormatEmote(char emote) {
             List<string> keywords = new List<string>();
-            foreach (KeyValuePair<string, char> kvp in EmotesHandler.Keywords) {
+            foreach (var kvp in EmotesHandler.Keywords) {
                 if (kvp.Value == emote) keywords.Add("(&S" + kvp.Key + ")");
             }
             return "&f" + emote + " &S- " + keywords.Join();

diff --git a/MCGalaxy/Network/IRCPlugin/IRCBot.cs b/MCGalaxy/Network/IRCPlugin/IRCBot.cs
@@ -156,22 +156,14 @@ public sealed class IRCBot {
         void LoadBannedCommands() {
             SetDefaultBannedCommands();
 
-            if (File.Exists("text/ircbancmd.txt")) { // Backwards compatibility
-                using (StreamWriter w = new StreamWriter("text/irccmdblacklist.txt")) {
-                    w.WriteLine("#Here you can put commands that cannot be used from the IRC bot.");
-                    w.WriteLine("#Lines starting with \"#\" are ignored.");
-                    foreach (string line in File.ReadAllLines("text/ircbancmd.txt"))
-                        w.WriteLine(line);
-                }
-                File.Delete("text/ircbancmd.txt");
-            } else {
-                if (!File.Exists("text/irccmdblacklist.txt"))
-                    File.WriteAllLines("text/irccmdblacklist.txt", new string[] {
-                                           "#Here you can put commands that cannot be used from the IRC bot.",
-                                           "#Lines starting with \"#\" are ignored." });
-                foreach (string line in File.ReadAllLines("text/irccmdblacklist.txt")) {
-                    if (!line.IsCommentLine()) BannedCommands.Add(line);
-                }
+            if (!File.Exists("text/irccmdblacklist.txt")) {
+                File.WriteAllLines("text/irccmdblacklist.txt", new string[] {
+                                       "#Here you can put commands that cannot be used from the IRC bot.",
+                                       "#Lines starting with \"#\" are ignored." });
+            }
+
+            foreach (string line in File.ReadAllLines("text/irccmdblacklist.txt")) {
+                if (!line.IsCommentLine()) BannedCommands.Add(line);
             }
         }
     }