diff --git a/MinecraftClient/Commands/Inventory.cs b/MinecraftClient/Commands/Inventory.cs index 2f2bdd59..0340d837 100644 --- a/MinecraftClient/Commands/Inventory.cs +++ b/MinecraftClient/Commands/Inventory.cs @@ -45,6 +45,21 @@ namespace MinecraftClient.Commands } else return GetCmdDescTranslated(); } + else if (args[0].ToLower() == "creativedelete") + { + if (args.Length >= 2) + { + int slot = int.Parse(args[1]); + if (handler.GetGamemode() == 1) + { + if (handler.DoCreativeGive(slot, ItemType.Null, 0, null)) + return Translations.Get("cmd.inventory.creative_delete", slot); + else return Translations.Get("cmd.inventory.creative_fail"); + } + else return Translations.Get("cmd.inventory.need_creative"); + } + else return GetCmdDescTranslated(); + } else if (args[0].ToLower().StartsWith("p")) { // player inventory is always ID 0 @@ -177,7 +192,7 @@ namespace MinecraftClient.Commands private string GetAvailableActions() { - return Translations.Get("cmd.inventory.help.available") + ": list, close, click, drop."; + return Translations.Get("cmd.inventory.help.available") + ": list, close, click, drop, creativegive, creativedelete."; } private string GetBasicUsage() @@ -187,12 +202,7 @@ namespace MinecraftClient.Commands private string GetHelp() { - return Translations.Get("cmd.inventory.help.help", GetAvailableActions(), GetCreativeGiveHelp()); - } - - private string GetCreativeGiveHelp() - { - return Translations.Get("cmd.inventory.help.usage") + ": /inventory creativegive "; + return Translations.Get("cmd.inventory.help.help", GetAvailableActions()); } private string GetSubCommandHelp(string cmd) @@ -200,13 +210,17 @@ namespace MinecraftClient.Commands switch (cmd) { case "list": - return Translations.Get("cmd.inventory.help.list") + Translations.Get("cmd.inventory.help.usage") + ": /inventory > list"; + return Translations.Get("cmd.inventory.help.list") + ' ' + Translations.Get("cmd.inventory.help.usage") + ": /inventory > list"; case "close": - return Translations.Get("cmd.inventory.help.close") + Translations.Get("cmd.inventory.help.usage") + ": /inventory > close"; + return Translations.Get("cmd.inventory.help.close") + ' ' + Translations.Get("cmd.inventory.help.usage") + ": /inventory > close"; case "click": - return Translations.Get("cmd.inventory.help.click") + Translations.Get("cmd.inventory.help.usage") + ": /inventory > click [left|right|middle]. \nDefault is left click"; + return Translations.Get("cmd.inventory.help.click") + ' ' + Translations.Get("cmd.inventory.help.usage") + ": /inventory > click [left|right|middle]. \nDefault is left click"; case "drop": - return Translations.Get("cmd.inventory.help.drop") + Translations.Get("cmd.inventory.help.usage") + ": /inventory > drop [all]. \nAll means drop full stack"; + return Translations.Get("cmd.inventory.help.drop") + ' ' + Translations.Get("cmd.inventory.help.usage") + ": /inventory > drop [all]. \nAll means drop full stack"; + case "creativegive": + return Translations.Get("cmd.inventory.help.creativegive") + ' ' + Translations.Get("cmd.inventory.help.usage") + ": /inventory creativegive "; + case "creativedelete": + return Translations.Get("cmd.inventory.help.creativedelete") + ' ' + Translations.Get("cmd.inventory.help.usage") + ": /inventory creativedelete "; case "help": return GetHelp(); default: diff --git a/MinecraftClient/Resources/lang/en.ini b/MinecraftClient/Resources/lang/en.ini index 663e995b..7fb475c1 100644 --- a/MinecraftClient/Resources/lang/en.ini +++ b/MinecraftClient/Resources/lang/en.ini @@ -254,8 +254,9 @@ cmd.health.response=Health: {0}, Saturation: {1}, Level: {2}, TotalExperience: { # Inventory cmd.inventory.desc=Inventory command cmd.inventory.creative_done=Requested {0} x{1} in slot #{2} -cmd.inventory.creative_fail=Failed to request Creative Give -cmd.inventory.need_creative=You need Gamemode Creative +cmd.inventory.creative_delete=Requested to clear slot #{0} +cmd.inventory.creative_fail=Failed to request Creative action +cmd.inventory.need_creative=You must be in Creative gamemode cmd.inventory.container_not_found=Cannot find container, please retry with explicit ID cmd.inventory.close=Closing Inventoy #{0} cmd.inventory.close_fail=Failed to close Inventory #{0} @@ -274,12 +275,14 @@ cmd.inventory.drop_stack=Dropped whole item stack from slot #{0} # Inventory Help cmd.inventory.help.basic=Basic usage cmd.inventory.help.available=Available actions -cmd.inventory.help.help=\n{0} Use '/inventory help ' for action help.\nCreative mode give: {1}\n'player' and 'container' can be simplified to 'p' and 'c'.\nNote that parameters in '[]' are optional. +cmd.inventory.help.help={0}\nUse '/inventory help ' for action help.\n'player' and 'container' can be simplified to 'p' and 'c'.\nNote that parameters in '[]' are optional. cmd.inventory.help.usage=Usage cmd.inventory.help.list=List your inventory. cmd.inventory.help.close=Close an opened container. cmd.inventory.help.click=Click on an item. cmd.inventory.help.drop=Drop an item from inventory. +cmd.inventory.help.creativegive=Give item in creative mode. +cmd.inventory.help.creativedelete=Clear slot in creative mode. cmd.inventory.help.unknown=Unknown action. # List