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

@ -8,7 +8,7 @@ namespace MinecraftClient.Commands
{
public override string CmdName { get { return "changeslot"; } }
public override string CmdUsage { get { return "changeslot <1-9>"; } }
public override string CmdDesc { get { return "cmd.changeSlot.desc"; } }
public override string CmdDesc { get { return Translations.cmd_changeSlot_desc; } }
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
{
@ -17,7 +17,7 @@ namespace MinecraftClient.Commands
public override string Run(McClient handler, string command, Dictionary<string, object>? localVars)
{
if (!handler.GetInventoryEnabled())
return Translations.Get("extra.inventory_required");
return Translations.extra_inventory_required;
if (HasArg(command))
{
@ -28,17 +28,17 @@ namespace MinecraftClient.Commands
}
catch (FormatException)
{
return Translations.Get("cmd.changeSlot.nan");
return Translations.cmd_changeSlot_nan;
}
if (slot >= 1 && slot <= 9)
{
if (handler.ChangeSlot(slot -= 1))
{
return Translations.Get("cmd.changeSlot.changed", (slot += 1));
return string.Format(Translations.cmd_changeSlot_changed, (slot += 1));
}
else
{
return Translations.Get("cmd.changeSlot.fail");
return Translations.cmd_changeSlot_fail;
}
}
}