Bug fix

MinecraftClient/ChatBots/AutoCraft.cs

@@ -319,6 +319,7 @@ namespace MinecraftClient.ChatBots
                 .Then(l => l.Literal("stop")
                     .Executes(r => OnCommandStop(r.Source)))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => OnCommandHelp(r.Source, string.Empty))
                     .Redirect(McClient.dispatcher.GetRoot().GetChild("help").GetChild(CommandName)))
             );
         }

MinecraftClient/ChatBots/AutoDig.cs

@@ -141,6 +141,7 @@ namespace MinecraftClient.ChatBots
                 .Then(l => l.Literal("stop")
                     .Executes(r => OnCommandStop(r.Source)))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => OnCommandHelp(r.Source, string.Empty))
                     .Redirect(McClient.dispatcher.GetRoot().GetChild("help").GetChild(CommandName)))
             );
 

MinecraftClient/ChatBots/AutoDrop.cs

@@ -87,6 +87,7 @@ namespace MinecraftClient.ChatBots
                     .Then(l => l.Literal("everything")
                         .Executes(r => OnCommandMode(r.Source, DropMode.everything))))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => OnCommandHelp(r.Source, string.Empty))
                     .Redirect(McClient.dispatcher.GetRoot().GetChild("help").GetChild(CommandName)))
             );
         }

MinecraftClient/ChatBots/AutoFishing.cs

@@ -211,6 +211,7 @@ namespace MinecraftClient.ChatBots
                     .Then(l => l.Literal("clear")
                         .Executes(r => OnCommandStatusClear(r.Source))))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => OnCommandHelp(r.Source, string.Empty))
                     .Redirect(McClient.dispatcher.GetRoot().GetChild("help").GetChild(CommandName)))
             );
         }

MinecraftClient/ChatBots/DiscordBridge.cs

@@ -92,6 +92,7 @@ namespace MinecraftClient.ChatBots
                         .Executes(r => OnCommandDirection(r.Source, BridgeDirection.Discord)))
                 )
                 .Then(l => l.Literal("_help")
+                    .Executes(r => OnCommandHelp(r.Source, string.Empty))
                     .Redirect(McClient.dispatcher.GetRoot().GetChild("help").GetChild(CommandName)))
             );
 

MinecraftClient/ChatBots/Farmer.cs

@@ -105,6 +105,7 @@ namespace MinecraftClient.ChatBots
                         .Then(l => l.Argument("OtherArgs", Arguments.GreedyString())
                             .Executes(r => OnCommandStart(r.Source, MccArguments.GetFarmerCropType(r, "CropType"), Arguments.GetString(r, "OtherArgs"))))))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => OnCommandHelp(r.Source, string.Empty))
                     .Redirect(McClient.dispatcher.GetRoot().GetChild("help").GetChild(CommandName)))
             );
         }

MinecraftClient/ChatBots/FollowPlayer.cs

@@ -77,6 +77,7 @@ namespace MinecraftClient.ChatBots
                 .Then(l => l.Literal("stop")
                     .Executes(r => OnCommandStop(r.Source)))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => OnCommandHelp(r.Source, string.Empty))
                     .Redirect(McClient.dispatcher.GetRoot().GetChild("help").GetChild(CommandName)))
             );
         }

MinecraftClient/ChatBots/Mailer.cs

@@ -5,6 +5,7 @@ using System.IO;
 using System.Linq;
 using Brigadier.NET;
 using Brigadier.NET.Builder;
+using MinecraftClient.CommandHandler;
 using MinecraftClient.CommandHandler.Patch;
 using MinecraftClient.Scripting;
 using Tomlet.Attributes;
@@ -259,7 +260,7 @@ namespace MinecraftClient.ChatBots
 
             McClient.dispatcher.Register(l => l.Literal("help")
                 .Then(l => l.Literal(CommandName)
-                    .Executes(r => OnCommandHelp(string.Empty)))
+                    .Executes(r => OnCommandHelp(r.Source, string.Empty)))
             );
 
             McClient.dispatcher.Register(l => l.Literal(CommandName)
@@ -274,6 +275,7 @@ namespace MinecraftClient.ChatBots
                     .Then(l => l.Argument("username", Arguments.String())
                         .Executes(r => OnCommandRemoveIgnored(Arguments.GetString(r, "username")))))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => OnCommandHelp(r.Source, string.Empty))
                     .Redirect(McClient.dispatcher.GetRoot().GetChild("help").GetChild(CommandName)))
             );
         }
@@ -284,16 +286,15 @@ namespace MinecraftClient.ChatBots
             McClient.dispatcher.GetRoot().GetChild("help").RemoveChild(CommandName);
         }
 
-        private int OnCommandHelp(string cmd)
+        private int OnCommandHelp(CmdResult r, string? cmd)
         {
-            LogToConsole(cmd switch
+            return r.SetAndReturn(cmd switch
             {
 #pragma warning disable format // @formatter:off
                 _           =>   Translations.bot_mailer_cmd_help + ": /mailer <getmails|addignored|getignored|removeignored>"
                                    + '\n' + McClient.dispatcher.GetAllUsageString(CommandName, false),
 #pragma warning restore format // @formatter:on
             });
-            return 1;
         }
 
         private int OnCommandGetMails()

MinecraftClient/ChatBots/Map.cs

@@ -94,6 +94,7 @@ namespace MinecraftClient.ChatBots
                     .Then(l => l.Argument("MapID", MccArguments.MapBotMapId())
                         .Executes(r => OnCommandRender(r.Source, Arguments.GetInteger(r, "MapID")))))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => OnCommandHelp(r.Source, string.Empty))
                     .Redirect(McClient.dispatcher.GetRoot().GetChild("help").GetChild(CommandName)))
             );
         }

MinecraftClient/ChatBots/ReplayCapture.cs

@@ -58,6 +58,7 @@ namespace MinecraftClient.ChatBots
                 .Then(l => l.Literal("stop")
                     .Executes(r => OnCommandStop(r.Source)))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => OnCommandHelp(r.Source, string.Empty))
                     .Redirect(McClient.dispatcher.GetRoot().GetChild("help").GetChild(CommandName)))
             );
         }

MinecraftClient/ChatBots/TelegramBridge.cs

@@ -91,6 +91,7 @@ namespace MinecraftClient.ChatBots
                     .Then(l => l.Literal("telegram")
                         .Executes(r => OnCommandDirection(r.Source, BridgeDirection.Telegram))))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => OnCommandHelp(r.Source, string.Empty))
                     .Redirect(McClient.dispatcher.GetRoot().GetChild("help").GetChild(CommandName)))
             );
 

MinecraftClient/Commands/Animation.cs

@@ -29,6 +29,7 @@ namespace MinecraftClient.Commands
                 .Then(l => l.Literal("offhand")
                     .Executes(r => DoAnimation(r.Source, mainhand: false)))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => GetUsage(r.Source, string.Empty))
                     .Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
             );
         }

MinecraftClient/Commands/Bed.cs

@@ -37,6 +37,7 @@ namespace MinecraftClient.Commands
                     .Then(l => l.Argument("Radius", Arguments.Double())
                         .Executes(r => DoSleepBedWithRadius(r.Source, Arguments.GetDouble(r, "Radius")))))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => GetUsage(r.Source, string.Empty))
                     .Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
             );
         }

MinecraftClient/Commands/BlockInfo.cs

@@ -32,6 +32,7 @@ namespace MinecraftClient.Commands
                     .Then(l => l.Literal("-s")
                         .Executes(r => LogBlockInfo(r.Source, MccArguments.GetLocation(r, "Location"), true))))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => GetUsage(r.Source, string.Empty))
                     .Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
             );
         }

MinecraftClient/Commands/Bots.cs

@@ -33,6 +33,7 @@ namespace MinecraftClient.Commands
                     .Then(l => l.Argument("BotName", MccArguments.BotName())
                         .Executes(r => DoUnloadBot(r.Source, Arguments.GetString(r, "BotName")))))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => GetUsage(r.Source, string.Empty))
                     .Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
             );
         }

MinecraftClient/Commands/ChangeSlot.cs

@@ -23,6 +23,7 @@ namespace MinecraftClient.Commands
                 .Then(l => l.Argument("Slot", MccArguments.HotbarSlot())
                     .Executes(r => DoChangeSlot(r.Source, Arguments.GetInteger(r, "Slot"))))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => GetUsage(r.Source, string.Empty))
                     .Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
             );
         }

MinecraftClient/Commands/Chunk.cs

@@ -53,6 +53,7 @@ namespace MinecraftClient.Commands
                     .Then(l => l.Argument("Chunk", MccArguments.Tuple())
                         .Executes(r => DebugDelete(r.Source, markedChunkPos: MccArguments.GetTuple(r, "Chunk")))))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => GetUsage(r.Source, string.Empty))
                     .Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
             );
         }

MinecraftClient/Commands/Connect.cs

@@ -25,6 +25,7 @@ namespace MinecraftClient.Commands
                     .Then(l => l.Argument("AccountNick", MccArguments.AccountNick())
                         .Executes(r => DoConnect(r.Source, Arguments.GetString(r, "ServerNick"), Arguments.GetString(r, "AccountNick")))))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => GetUsage(r.Source, string.Empty))
                     .Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
             );
         }

MinecraftClient/Commands/Debug.cs

@@ -25,6 +25,7 @@ namespace MinecraftClient.Commands
                 .Then(l => l.Literal("off")
                     .Executes(r => SetDebugMode(r.Source, false, false)))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => GetUsage(r.Source, string.Empty))
                     .Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
             );
         }

MinecraftClient/Commands/Dig.cs

@@ -26,6 +26,7 @@ namespace MinecraftClient.Commands
                 .Then(l => l.Argument("Location", MccArguments.Location())
                     .Executes(r => DigAt(r.Source, MccArguments.GetLocation(r, "Location"))))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => GetUsage(r.Source, string.Empty))
                     .Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
             );
         }

MinecraftClient/Commands/DropItem.cs

@@ -26,6 +26,7 @@ namespace MinecraftClient.Commands
                 .Then(l => l.Argument("ItemType", MccArguments.ItemType())
                     .Executes(r => DoDropItem(r.Source, MccArguments.GetItemType(r, "ItemType"))))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => GetUsage(r.Source, string.Empty))
                     .Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
             );
         }

MinecraftClient/Commands/Enchant.cs

@@ -34,6 +34,7 @@ namespace MinecraftClient.Commands
                 .Then(l => l.Literal("bottom")
                     .Executes(r => DoEnchant(r.Source, slotId: 2)))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => GetUsage(r.Source, string.Empty))
                     .Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
             );
         }

MinecraftClient/Commands/Entitycmd.cs

@@ -72,6 +72,7 @@ namespace MinecraftClient.Commands
                     .Then(l => l.Literal("list")
                         .Executes(r => OperateWithType(r.Source, near: false, MccArguments.GetEntityType(r, "EntityType"), ActionType.List))))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => GetUsage(r.Source, string.Empty))
                     .Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
             );
         }

MinecraftClient/Commands/Exit.cs

@@ -23,6 +23,7 @@ namespace MinecraftClient.Commands
                 .Then(l => l.Argument("ExitCode", Arguments.Integer())
                     .Executes(r => DoExit(r.Source, Arguments.GetInteger(r, "ExitCode"))))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => GetUsage(r.Source, string.Empty))
                     .Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
             );
 

MinecraftClient/Commands/Health.cs

@@ -21,6 +21,7 @@ namespace MinecraftClient.Commands
             dispatcher.Register(l => l.Literal(CmdName)
                 .Executes(r => LogHealth(r.Source))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => GetUsage(r.Source, string.Empty))
                     .Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
             );
         }

MinecraftClient/Commands/Inventory.cs

@@ -102,6 +102,7 @@ namespace MinecraftClient.Commands
                             .Then(l => l.Literal("all")
                                 .Executes(r => DoDropAction(r.Source, inventoryId: null, Arguments.GetInteger(r, "Slot"), WindowActionType.DropItemStack))))))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => GetUsage(r.Source, string.Empty))
                     .Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
             );
         }

MinecraftClient/Commands/List.cs

@@ -22,6 +22,7 @@ namespace MinecraftClient.Commands
             dispatcher.Register(l => l.Literal(CmdName)
                 .Executes(r => DoListPlayers(r.Source))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => GetUsage(r.Source, string.Empty))
                     .Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
             );
         }

MinecraftClient/Commands/Look.cs

@@ -47,6 +47,7 @@ namespace MinecraftClient.Commands
                 .Then(l => l.Argument("Location", MccArguments.Location())
                     .Executes(r => LookAtLocation(r.Source, MccArguments.GetLocation(r, "Location"))))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => GetUsage(r.Source, string.Empty))
                     .Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
             );
         }

MinecraftClient/Commands/Move.cs

@@ -79,6 +79,7 @@ namespace MinecraftClient.Commands
                     .Then(l => l.Literal("-f")
                         .Executes(r => MoveToLocation(r.Source, MccArguments.GetLocation(r, "location"), true))))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => GetUsage(r.Source, string.Empty))
                     .Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
             );
         }

MinecraftClient/Commands/Reco.cs

@@ -24,6 +24,7 @@ namespace MinecraftClient.Commands
                 .Then(l => l.Argument("AccountNick", MccArguments.AccountNick())
                     .Executes(r => DoReconnect(r.Source, Arguments.GetString(r, "AccountNick"))))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => GetUsage(r.Source, string.Empty))
                     .Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
             );
         }

MinecraftClient/Commands/Reload.cs

@@ -21,6 +21,7 @@ namespace MinecraftClient.Commands
             dispatcher.Register(l => l.Literal(CmdName)
                 .Executes(r => DoReload(r.Source))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => GetUsage(r.Source, string.Empty))
                     .Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
             );
         }

MinecraftClient/Commands/Respawn.cs

@@ -21,6 +21,7 @@ namespace MinecraftClient.Commands
             dispatcher.Register(l => l.Literal(CmdName)
                 .Executes(r => DoRespawn(r.Source))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => GetUsage(r.Source, string.Empty))
                     .Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
             );
         }

MinecraftClient/Commands/Script.cs

@@ -23,6 +23,7 @@ namespace MinecraftClient.Commands
                 .Then(l => l.Argument("Script", Arguments.GreedyString())
                     .Executes(r => DoExecuteScript(r.Source, Arguments.GetString(r, "Script"), null)))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => GetUsage(r.Source, string.Empty))
                     .Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
             );
         }

MinecraftClient/Commands/Set.cs

@@ -22,6 +22,7 @@ namespace MinecraftClient.Commands
                 .Then(l => l.Argument("Expression", Arguments.GreedyString())
                     .Executes(r => DoSetVar(r.Source, Arguments.GetString(r, "Expression"))))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => GetUsage(r.Source, string.Empty))
                     .Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
             );
         }

MinecraftClient/Commands/Sneak.cs

@@ -22,6 +22,7 @@ namespace MinecraftClient.Commands
             dispatcher.Register(l => l.Literal(CmdName)
                 .Executes(r => DoSneak(r.Source))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => GetUsage(r.Source, string.Empty))
                     .Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
             );
         }

MinecraftClient/Commands/Tps.cs

@@ -22,6 +22,7 @@ namespace MinecraftClient.Commands
             dispatcher.Register(l => l.Literal(CmdName)
                 .Executes(r => DoLogTps(r.Source))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => GetUsage(r.Source, string.Empty))
                     .Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
             );
         }

MinecraftClient/Commands/Upgrade.cs

@@ -37,6 +37,7 @@ namespace MinecraftClient.Commands
                 .Then(l => l.Literal("cancel")
                     .Executes(r => CancelDownloadUpdate(r.Source)))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => GetUsage(r.Source, string.Empty))
                     .Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
             );
         }

MinecraftClient/Commands/UseItem.cs

@@ -22,6 +22,7 @@ namespace MinecraftClient.Commands
             dispatcher.Register(l => l.Literal(CmdName)
                 .Executes(r => DoUseItem(r.Source))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => GetUsage(r.Source, string.Empty))
                     .Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
             );
         }

MinecraftClient/Commands/Useblock.cs

@@ -24,6 +24,7 @@ namespace MinecraftClient.Commands
                 .Then(l => l.Argument("Location", MccArguments.Location())
                     .Executes(r => UseBlockAtLocation(r.Source, MccArguments.GetLocation(r, "Location"))))
                 .Then(l => l.Literal("_help")
+                    .Executes(r => GetUsage(r.Source, string.Empty))
                     .Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
             );
         }