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,8 +7,8 @@ namespace MinecraftClient.Commands
class SetRnd : Command
{
public override string CmdName { get { return "setrnd"; } }
public override string CmdUsage { get { return Translations.Get("cmd.setrnd.format"); } }
public override string CmdDesc { get { return "cmd.setrnd.desc"; } }
public override string CmdUsage { get { return Translations.cmd_setrnd_format; } }
public override string CmdDesc { get { return Translations.cmd_setrnd_desc; } }
private static readonly Random rand = new();
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
@ -37,7 +37,7 @@ namespace MinecraftClient.Commands
}
catch (Exception)
{
return Translations.Get("cmd.setrndnum.format");
return Translations.cmd_setrndnum_format;
}
// switch the values if they were entered in the wrong way
@ -49,7 +49,7 @@ namespace MinecraftClient.Commands
{
return string.Format("Set %{0}% to {1}.", args[0], Settings.Config.AppVar.GetVar(args[0])); //Success
}
else return Translations.Get("cmd.setrndnum.format");
else return Translations.cmd_setrndnum_format;
}
else
{
@ -64,7 +64,7 @@ namespace MinecraftClient.Commands
{
return string.Format("Set %{0}% to {1}.", args[0], Settings.Config.AppVar.GetVar(args[0])); //Success
}
else return Translations.Get("cmd.setrndstr.format");
else return Translations.cmd_setrndstr_format;
}
}
else return GetCmdDescTranslated();