Provide feedback when trying to use old /os zones

Also remove deprecated os subcommands from appearing in the help list to avoid confusing with unnecessary info
ClassiCube · Jun 17, 2024 · d9eafea · d9eafea
1 parent 01fb28e
commit d9eafea
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 37 deletions.
diff --git a/MCGalaxy/Commands/Overseer.cs b/MCGalaxy/Commands/Overseer.cs
@@ -377,42 +377,6 @@ public static class Overseer {
             UseCommand(p, "SetSpawn", "");
         }
 
-        static string[] zoneHelp = new string[] {
-            "&T/os zone",
-            "&H  This was used for managing permissions in your map.",
-            "&H  It has now been replaced by the following &T/"+commandShortcut+" &Hcommands:",
-            "&T  Allow, Disallow, Ban, Unban"
-        };
-        static string[] zoneHelpBody = new string[] {
-            zoneHelp[1],
-            zoneHelp[2],
-            zoneHelp[3],
-        };
-        static void HandleZone(Player p, string raw) {
-
-            string[] args = raw.SplitExact(2);
-            string cmd = args[0];
-            string name = args[1];
-            p.Message("&W---");
-            p.Message("&T/{0} zone &Shas been replaced.", commandShortcut);
-            cmd = cmd.ToUpper();
-            if (cmd == "LIST") {
-                p.Message("To see a list of zones in a level, use &T/zonelist");
-            } else if (cmd == "ADD") {
-                p.Message("To allow someone to build, use &T/{0} allow [name]", commandShortcut);
-            } else if (Command.IsDeleteAction(cmd)) {
-                p.Message("To disallow someone from building, use &T/{0} disallow [name]", commandShortcut);
-            } else if (cmd == "BLOCK") {
-                p.Message("To disallow visiting, use &T/{0} ban [name]", commandShortcut);
-            } else if (cmd == "UNBLOCK") {
-                p.Message("To allow visiting, use &T/{0} unban [name]", commandShortcut);
-            } else if (cmd == "BLACKLIST") {
-                p.Message("To see who is disallowed from visiting, use &T/mapinfo");
-            } else {
-                p.MessageLines(zoneHelpBody);
-            }
-        }
-
         static string[] plotHelp = new string[] {
             "&T/os plot [args]",
             "&H  Plots are zones that can change permissions and environment." +
@@ -464,13 +428,53 @@ public static class Overseer {
                     new SubCommand("Texture",    HandleTexture,    textureHelp,    true, new string[] { "texturezip", "texturepack" }),
                     new SubCommand("Kick",       HandleKick,       kickHelp),
                     new SubCommand("KickAll",    HandleKickAll,    kickAllHelp),
-                    new SubCommand("Zone",       HandleZone,       zoneHelp),
 
                     new SubCommand("Resize",     HandleResize,     resizeHelp),
                     new SubCommand("Save",       (p, unused) => { UseCommand(p, "Save", ""); },     saveHelp),
                     new SubCommand("Delete",     HandleDelete,     deleteHelp, true, new string[] { "del", "remove" } ),
                     new SubCommand("Restore",    (p, arg   ) => { UseCommand(p, "Restore", arg); }, restoreHelp),
                 }
             );
+
+
+        static void HandleZone(Player p, string raw) {
+            string[] args = raw.SplitExact(2);
+            string cmd = args[0];
+            string name = args[1];
+            p.Message("&W---");
+            p.Message("&T/{0} zone &Shas been replaced.", commandShortcut);
+            cmd = cmd.ToUpper();
+            if (cmd == "LIST") {
+                p.Message("To see a list of zones in a level, use &T/zonelist");
+            } else if (cmd == "ADD") {
+                p.Message("To allow someone to build, use &T/{0} allow [name]", commandShortcut);
+            } else if (Command.IsDeleteAction(cmd)) {
+                p.Message("To disallow someone from building, use &T/{0} disallow [name]", commandShortcut);
+            } else if (cmd == "BLOCK") {
+                p.Message("To disallow visiting, use &T/{0} ban [name]", commandShortcut);
+            } else if (cmd == "UNBLOCK") {
+                p.Message("To allow visiting, use &T/{0} unban [name]", commandShortcut);
+            } else if (cmd == "BLACKLIST") {
+                p.Message("To see who is disallowed from visiting, use &T/mapinfo");
+            } else {
+                p.Message("&H  This was used for managing permissions in your map.");
+                p.Message("&H  It has now been replaced by the following &T/" + commandShortcut + " &Hcommands:");
+                p.Message("&T  Allow, Disallow, Ban, Unban");
+                p.Message("&H  To manage zoned areas in your map, use &T/" + commandShortcut + " plot");
+            }
+        }
+        static void HandleZones(Player p, string raw) {
+            p.Message("&W---");
+            p.Message("&T/{0} zones &Shas been renamed.", commandShortcut);
+            string args = raw.Length == 0 ? "" : raw + " ";
+            p.Message("Use &T/{0} {1} {2}&Sinstead.", commandShortcut, "plot", args);
+        }
+
+        internal static SubCommandGroup deprecatedSubCommandGroup = new SubCommandGroup(commandShortcut,
+                new List<SubCommand>() {
+                    new SubCommand("Zone",  HandleZone,  null),
+                    new SubCommand("Zones", HandleZones, null),
+                }
+            );
     }
 }
diff --git a/MCGalaxy/Commands/World/CmdOverseer.cs b/MCGalaxy/Commands/World/CmdOverseer.cs
@@ -32,6 +32,8 @@ public sealed partial class CmdOverseer : Command2 {
 
         public override void Use(Player p, string message, CommandData data) {
             if (message.Length == 0) { Help(p); return; }
+            if (Overseer.deprecatedSubCommandGroup.Use(p, message, false) != SubCommandGroup.UsageResult.NoneFound) return;
+
             Overseer.subCommandGroup.Use(p, message);
         }