Merge master into brigadier-dev

This commit is contained in:
BruceChen 2022-10-29 11:44:54 +08:00
commit f2f88ac009
197 changed files with 102227 additions and 3487 deletions

View file

@ -7,7 +7,7 @@ namespace MinecraftClient.Commands
{
public override string CmdName { get { return "connect"; } }
public override string CmdUsage { get { return "connect <server> [account]"; } }
public override string CmdDesc { get { return "cmd.connect.desc"; } }
public override string CmdDesc { get { return Translations.cmd_connect_desc; } }
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
{
@ -22,7 +22,7 @@ namespace MinecraftClient.Commands
{
if (!Settings.Config.Main.Advanced.SetAccount(args[1]))
{
return Translations.Get("cmd.connect.unknown", args[1]);
return string.Format(Translations.cmd_connect_unknown, args[1]);
}
}
@ -31,7 +31,7 @@ namespace MinecraftClient.Commands
Program.Restart();
return "";
}
else return Translations.Get("cmd.connect.invalid_ip", args[0]);
else return string.Format(Translations.cmd_connect_invalid_ip, args[0]);
}
else return GetCmdDescTranslated();
}