[Feature] Expand /ci to allow removing certain amounts, and breakdown on the items removed.

18 files changed, 185 insertions, 206 deletions

diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java b/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java
index d03a7a898..9764eee59 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java
@@ -3,7 +3,10 @@ package com.earth2me.essentials.commands;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.utils.NumberUtil;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Locale;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -16,144 +19,137 @@ public class Commandclearinventory extends EssentialsCommand
 	{
 		super("clearinventory");
 	}
+	static int BASE_AMOUNT = 100000;
+	static int EXTENDED_CAP = 8;
 
-	//TODO: Cleanup
 	@Override
 	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
 	{
-		if (args.length > 0 && user.isAuthorized("essentials.clearinventory.others"))
-		{
-			if (args[0].contentEquals("*") && user.isAuthorized("essentials.clearinventory.all"))
-			{
-				cleanInventoryAll(server, user, args);
-			}
-			else if (args[0].trim().length() < 2)
-			{
-				cleanInventorySelf(server, user, args);
-			}
-			else
-			{
-				cleanInventoryOthers(server, user, args);
-			}
-		}
-		else
-		{
-			cleanInventorySelf(server, user, args);
-		}
+		parseCommand(server, user, args, user.isAuthorized("essentials.clearinventory.others"), user.isAuthorized("essentials.clearinventory.all"));
 	}
 
 	@Override
 	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
 	{
-		if (args.length > 0)
+		parseCommand(server, sender, args, true, true);
+	}
+
+	private void parseCommand(Server server, CommandSender sender, String[] args, boolean allowOthers, boolean allowAll) throws Exception
+	{
+		List<Player> players = new ArrayList<Player>();
+		int offset = 0;
+
+		if (sender instanceof User)
 		{
-			if (args[0].contentEquals("*"))
-			{
-				cleanInventoryAll(server, sender, args);
-			}
-			else if (args[0].trim().length() < 2)
-			{
-				throw new Exception(_("playerNotFound"));
-			}
-			else
-			{
-				cleanInventoryOthers(server, sender, args);
-			}
+			players.add((Player)sender);
 		}
-		else
+
+		if (allowAll && args.length > 0 && args[0].contentEquals("*"))
 		{
-			throw new NotEnoughArgumentsException();
+			sender.sendMessage(_("inventoryClearingFromAll"));
+			offset = 1;
+			players = Arrays.asList(server.getOnlinePlayers());
+		}
+		else if (allowOthers && args.length > 0 && args[0].trim().length() > 2)
+		{
+			offset = 1;
+			players = server.matchPlayer(args[0].trim());
 		}
-	}
 
-	private void cleanInventoryAll(Server server, CommandSender sender, String[] args) throws Exception
-	{
-		if (args.length > 1)
+		if (players.size() < 1)
 		{
-			for (Player onlinePlayer : server.getOnlinePlayers())
-			{
-				clearInventory(onlinePlayer, args[1]);
-			}
-			sender.sendMessage(_("inventoryClearedAll"));
+			throw new PlayerNotFoundException();
 		}
-		else
+		for (Player player : players)
 		{
-			throw new NotEnoughArgumentsException();
+			clearHandler(sender, player, args, offset, players.size() < EXTENDED_CAP);		
 		}
 	}
 
-	private void cleanInventoryOthers(Server server, CommandSender sender, String[] args) throws Exception
+	protected void clearHandler(CommandSender sender, Player player, String[] args, int offset, boolean showExtended) throws Exception
 	{
-		List<Player> online = server.matchPlayer(args[0]);
+		short data = -1;
+		int type = -1;
+		int amount = -1;
 
-		if (!online.isEmpty())
+		if (args.length > (offset + 1) && NumberUtil.isInt(args[(offset + 1)]))
+		{
+			amount = Integer.parseInt(args[(offset + 1)]);
+		}
+		if (args.length > offset)
 		{
-			for (Player p : online)
+			if (args[offset].equalsIgnoreCase("**"))
+			{
+				type = -2;
+			}
+			else if (!args[offset].equalsIgnoreCase("*"))
 			{
-				if (args.length > 1)
+				final String[] split = args[offset].split(":");
+				final ItemStack item = ess.getItemDb().get(split[0]);
+				type = item.getTypeId();
+
+				if (split.length > 1 && NumberUtil.isInt(split[1]))
 				{
-					clearInventory(p, args[1]);
+					data = Short.parseShort(split[1]);
 				}
 				else
 				{
-					p.getInventory().clear();
+					data = item.getDurability();
 				}
-				sender.sendMessage(_("inventoryClearedOthers", p.getDisplayName()));
 			}
 		}
-		else
-		{
-			throw new Exception(_("playerNotFound"));
-		}
-	}
 
-	private void cleanInventorySelf(Server server, User user, String[] args) throws Exception
-	{
-		if (args.length > 0)
-		{
-			clearInventory(user, args[0]);
-		}
-		else
-		{
-			user.getInventory().clear();
-		}
-		user.sendMessage(_("inventoryCleared"));
-	}
-
-	private void clearInventory(Player player, String arg) throws Exception
-	{
-		if (arg.equalsIgnoreCase("*"))
+		if (type == -1) // type -1 represents wildcard or all items
 		{
+			if (showExtended)
+			{
+				sender.sendMessage(_("inventoryClearingAllItems", player.getDisplayName()));
+			}
 			player.getInventory().clear();
 		}
-		else if (arg.equalsIgnoreCase("**"))
+		else if (type == -2) // type -2 represents double wildcard or all items and armor
 		{
+			if (showExtended)
+			{
+				sender.sendMessage(_("inventoryClearingAllArmor", player.getDisplayName()));
+			}
 			player.getInventory().clear();
 			player.getInventory().setArmorContents(null);
 		}
 		else
 		{
-			final String[] split = arg.split(":");
-			final ItemStack item = ess.getItemDb().get(split[0]);
-			final int type = item.getTypeId();
-
-			if (split.length > 1 && NumberUtil.isInt(split[1]))
+			if (data == -1) // data -1 means that all subtypes will be cleared
 			{
-				player.getInventory().clear(type, Integer.parseInt(split[1]));
+				ItemStack stack = new ItemStack(type);
+				if (showExtended) {
+					sender.sendMessage(_("inventoryClearingAllStack", stack.getType().toString().toLowerCase(Locale.ENGLISH), player.getDisplayName()));
+				}
+				player.getInventory().clear(type, data);
 			}
-			else if (split.length > 1 && split[1].equalsIgnoreCase("*"))
+			else if (amount == -1) // amount -1 means all items will be cleared
 			{
-				player.getInventory().clear(type, -1);
+				ItemStack stack = new ItemStack(type, BASE_AMOUNT, data);
+				ItemStack removedStack = player.getInventory().removeItem(stack).get(0);
+				final int removedAmount = (BASE_AMOUNT - removedStack.getAmount());
+				if (removedAmount > 0 || showExtended)
+				{
+					sender.sendMessage(_("inventoryClearingStack", removedAmount, stack.getType().toString().toLowerCase(Locale.ENGLISH), player.getDisplayName()));
+				}
 			}
 			else
 			{
-				if (NumberUtil.isInt(split[0]))
+				ItemStack stack = new ItemStack(type, amount, data);
+				if (player.getInventory().containsAtLeast(stack, amount))
 				{
-					player.getInventory().clear(type, -1);
+					sender.sendMessage(_("inventoryClearingStack", amount, stack.getType().toString().toLowerCase(Locale.ENGLISH), player.getDisplayName()));
+					player.getInventory().removeItem(stack);
 				}
 				else
 				{
-					player.getInventory().clear(type, item.getDurability());
+					if (showExtended)
+					{
+						sender.sendMessage(_("inventoryClearFail", player.getDisplayName(), amount, stack.getType().toString().toLowerCase(Locale.ENGLISH)));
+					}
 				}
 			}
 		}
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index ef1e740a5..335035dd8 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -173,10 +173,6 @@ infoFileDoesNotExist=File info.txt does not exist. Creating one for you.
 infoPages=\u00a7e ---- \u00a76{2} \u00a7e--\u00a76 Page \u00a7c{0}\u00a76/\u00a7c{1} \u00a7e----
 infoUnknownChapter=Unknown chapter.
 insufficientFunds=\u00a74Insufficient funds available.
-invBigger=\u00a74The other users inventory is bigger than yours.
-invRestored=\u00a76Your inventory has been restored.
-invSee=\u00a76You see the inventory of\u00a7c {0}\u00a76.
-invSeeHelp=\u00a76Use /invsee to restore your inventory.
 invalidCharge=\u00a74Invalid charge.
 invalidFireworkFormat=\u00a76The option \u00a74{0} \u00a76is not a valid value for \u00a74{1}\u00a76.
 invalidHome=\u00a74Home\u00a7c {0} \u00a74doesn''t exist!
@@ -189,9 +185,6 @@ invalidServer=Invalid server!
 invalidSignLine=\u00a74Line\u00a7c {0} \u00a74on sign is invalid.
 invalidWarpName=\u00a74Invalid warp name!
 invalidWorld=\u00a74Invalid world.
-inventoryCleared=\u00a76Inventory cleared.
-inventoryClearedAll=\u00a76Cleared everyone's inventory.
-inventoryClearedOthers=\u00a76Inventory of \u00a7c{0}\u00a76 cleared.
 is=is
 itemCannotBeSold=\u00a74That item cannot be sold to the server.
 itemMustBeStacked=\u00a74Item must be traded in stacks. A quantity of 2s would be two stacks, etc.
@@ -543,3 +536,9 @@ youHaveNewMail=\u00a76You have\u00a7c {0} \u00a76messages! Type \u00a7c/mail rea
 whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation)
 kitDelay=\u00a7m{0}\u00a7r
 noKitGroup=\u00a74You do not have access to this kit.
+inventoryClearingFromAll=\u00a76Clearing the inventory of all users...
+inventoryClearingAllItems=\u00a76Cleared all inventory items from {0}\u00a76.
+inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\u00a76. 
+inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
+inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
+inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
diff --git a/Essentials/src/messages_cs.properties b/Essentials/src/messages_cs.properties
index a4312b9f1..e320df02c 100644
--- a/Essentials/src/messages_cs.properties
+++ b/Essentials/src/messages_cs.properties
@@ -176,10 +176,6 @@ infoFileDoesNotExist=Soubor info.txt neexistuje. Vytvarim novy.
 infoPages=\u00a7e ---- \u00a76{2} \u00a7e--\u00a76 Strana \u00a74{0}\u00a76/\u00a74{1} \u00a7e----
 infoUnknownChapter=Neznama kapitola.
 insufficientFunds=\u00a74Insufficient funds available.
-invBigger=Inventar druheho hrace je vetsi nez tvuj.
-invRestored=Tvuj inventar byl obnoven.
-invSee=Nyni mas inventar hrace {0}.
-invSeeHelp=Pouzij znovu /invsee aby jsi mel zpatky svuj inventar.
 invalidCharge=\u00a7cNeplatny poplatek.
 invalidFireworkFormat=\u00a76The option \u00a74{0} \u00a76is not a valid value for \u00a74{1}
 invalidHome=Domov {0} neexistuje.
@@ -192,9 +188,6 @@ invalidServer=Nespravny server!
 invalidSignLine=Radek {0} je chybne vyplnen.
 invalidWarpName=\u00a74Spatny nazev warpu
 invalidWorld=\u00a7cNespravny svet!
-inventoryCleared=\u00a77Inventar smazan.
-inventoryClearedAll=\u00a76Cleared everyone's inventory.
-inventoryClearedOthers=\u00a77Inventar hrace \u00a7c{0}\u00a77 vymazan.
 is=je
 itemCannotBeSold=Tento predmet nelze prodat serveru.
 itemMustBeStacked=Predmety musi byt vymeneny ve stacku.
@@ -547,3 +540,9 @@ whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation)
 kitDelay=\u00a7m{0}\u00a7r
 giveSpawnFailure=\u00a74Not enough space, \u00a7c{0} \u00a7c{1} \u00a74was lost.
 noKitGroup=\u00a74You do not have access to this kit.
+inventoryClearingFromAll=\u00a76Clearing the inventory of all users...
+inventoryClearingAllItems=\u00a76Cleared all inventory items from {0}\u00a76.
+inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\u00a76. 
+inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
+inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
+inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties
index c19bf956f..2d7f82514 100644
--- a/Essentials/src/messages_da.properties
+++ b/Essentials/src/messages_da.properties
@@ -172,10 +172,6 @@ infoFileDoesNotExist=Fil info.txt eksisterer ikke. Fixer liiige en for dig.
 infoPages=\u00a7e ---- \u00a76{2} \u00a7e--\u00a76 Side \u00a74{0}\u00a76/\u00a74{1} \u00a7e----
 infoUnknownChapter=Ukendt kapitel.
 insufficientFunds=\u00a74Insufficient funds available.
-invBigger=Den anden brugers inventory er st\u00f8rre end din.
-invRestored=Din inventory er blevet genoprettet.
-invSee=Du ser {0}''s inventory.
-invSeeHelp=Brug /invsee for at genoprette din inventory.
 invalidCharge=\u00a7cUgyldig opladning (korrekt oversat?).
 invalidFireworkFormat=\u00a76The option \u00a74{0} \u00a76is not a valid value for \u00a74{1}
 invalidHome=Home {0} doesn't exist
@@ -188,9 +184,6 @@ invalidServer=Ugyldig server!
 invalidSignLine=Linje {0} p\u00e5 skilt er ugyldig.
 invalidWarpName=\u00a74Invalid warp name
 invalidWorld=\u00a7cUgyldig verden.
-inventoryCleared=\u00a77Inventory ryddet.
-inventoryClearedAll=\u00a76Cleared everyone's inventory.
-inventoryClearedOthers=\u00a7c{0}\u00a77''s inventory ryddet.
 is=er
 itemCannotBeSold=Denne ting kan ikke s\u00e6lges til serveren.
 itemMustBeStacked=Tingen skal handles i stakke. En m\u00e6ngde af 2s ville v\u00e6re to stakke, osv.
@@ -543,3 +536,9 @@ whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation)
 kitDelay=\u00a7m{0}\u00a7r
 giveSpawnFailure=\u00a74Not enough space, \u00a7c{0} \u00a7c{1} \u00a74was lost.
 noKitGroup=\u00a74You do not have access to this kit.
+inventoryClearingFromAll=\u00a76Clearing the inventory of all users...
+inventoryClearingAllItems=\u00a76Cleared all inventory items from {0}\u00a76.
+inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\u00a76. 
+inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
+inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
+inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties
index eb13ac566..ee7c0cff5 100644
--- a/Essentials/src/messages_de.properties
+++ b/Essentials/src/messages_de.properties
@@ -172,10 +172,6 @@ infoFileDoesNotExist=Datei info.txt existiert nicht. Erzeuge eine neue Datei.
 infoPages=\u00a7e ---- \u00a76{2} \u00a7e--\u00a76 Seite \u00a74{0}\u00a76/\u00a74{1} \u00a7e----
 infoUnknownChapter=Unbekanntes Kapitel:
 insufficientFunds=\u00a74Insufficient funds available.
-invBigger=Das andere Inventar ist gr\u00f6sser als deins.
-invRestored=Dein Inventar wurde wieder hergestellt.
-invSee=Du siehst das Inventar von {0}.
-invSeeHelp=Benutze /invsee um dein Inventar wiederherzustellen.
 invalidCharge=\u00a7cUng\u00fcltige Verf\u00fcgung.
 invalidFireworkFormat=\u00a76The option \u00a74{0} \u00a76is not a valid value for \u00a74{1}
 invalidHome=Home {0} doesn't exist
@@ -188,9 +184,6 @@ invalidServer=Ung\u00fcltiger Server!
 invalidSignLine=Die Zeile {0} auf dem Schild ist falsch.
 invalidWarpName=\u00a74Invalid warp name
 invalidWorld=\u00a7cUng\u00fcltige Welt.
-inventoryCleared=\u00a77Inventar geleert.
-inventoryClearedAll=\u00a76Cleared everyone's inventory.
-inventoryClearedOthers=\u00a77Inventar von \u00a7c{0}\u00a77 geleert.
 is=ist
 itemCannotBeSold=Dieser Gegenstand kann nicht verkauft werden.
 itemMustBeStacked=Gegenstand muss als Stapel verkauft werden. Eine Anzahl von 2s verkauft 2 Stapel usw.
@@ -543,3 +536,9 @@ whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation)
 kitDelay=\u00a7m{0}\u00a7r
 giveSpawnFailure=\u00a74Not enough space, \u00a7c{0} \u00a7c{1} \u00a74was lost.
 noKitGroup=\u00a74You do not have access to this kit.
+inventoryClearingFromAll=\u00a76Clearing the inventory of all users...
+inventoryClearingAllItems=\u00a76Cleared all inventory items from {0}\u00a76.
+inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\u00a76. 
+inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
+inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
+inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties
index 0a878c587..95f284296 100644
--- a/Essentials/src/messages_en.properties
+++ b/Essentials/src/messages_en.properties
@@ -172,10 +172,6 @@ infoFileDoesNotExist=File info.txt does not exist. Creating one for you.
 infoPages=\u00a7e ---- \u00a76{2} \u00a7e--\u00a76 Page \u00a7c{0}\u00a76/\u00a7c{1} \u00a7e----
 infoUnknownChapter=Unknown chapter.
 insufficientFunds=\u00a74Insufficient funds available.
-invBigger=\u00a74The other users inventory is bigger than yours.
-invRestored=\u00a76Your inventory has been restored.
-invSee=\u00a76You see the inventory of\u00a7c {0}\u00a76.
-invSeeHelp=\u00a76Use /invsee to restore your inventory.
 invalidCharge=\u00a74Invalid charge.
 invalidFireworkFormat=\u00a76The option \u00a74{0} \u00a76is not a valid value for \u00a74{1}\u00a76.
 invalidHome=\u00a74Home\u00a7c {0} \u00a74doesn''t exist!
@@ -188,9 +184,6 @@ invalidServer=Invalid server!
 invalidSignLine=\u00a74Line\u00a7c {0} \u00a74on sign is invalid.
 invalidWarpName=\u00a74Invalid warp name!
 invalidWorld=\u00a74Invalid world.
-inventoryCleared=\u00a76Inventory cleared.
-inventoryClearedAll=\u00a76Cleared everyone's inventory.
-inventoryClearedOthers=\u00a76Inventory of \u00a7c{0}\u00a76 cleared.
 is=is
 itemCannotBeSold=\u00a74That item cannot be sold to the server.
 itemMustBeStacked=\u00a74Item must be traded in stacks. A quantity of 2s would be two stacks, etc.
@@ -543,3 +536,9 @@ whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation)
 kitDelay=\u00a7m{0}\u00a7r
 giveSpawnFailure=\u00a74Not enough space, \u00a7c{0} \u00a7c{1} \u00a74was lost.
 noKitGroup=\u00a74You do not have access to this kit.
+inventoryClearingFromAll=\u00a76Clearing the inventory of all users...
+inventoryClearingAllItems=\u00a76Cleared all inventory items from {0}\u00a76.
+inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\u00a76. 
+inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
+inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
+inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties
index 6775cee6f..7f5830e1a 100644
--- a/Essentials/src/messages_es.properties
+++ b/Essentials/src/messages_es.properties
@@ -172,10 +172,6 @@ infoFileDoesNotExist=El archivo info.txt no existe. Creando uno para ti.
 infoPages=\u00a7e ---- \u00a76{2} \u00a7e--\u00a76 Pagina \u00a74{0}\u00a76/\u00a74{1} \u00a7e----
 infoUnknownChapter=Seccion desconocida.
 insufficientFunds=\u00a74Insufficient funds available.
-invBigger=El inventario del otro usuario es mas grande que el tuyo.
-invRestored=Tu inventario ha sido recuperado.
-invSee=Estas viendo el inventario de {0}.
-invSeeHelp=Usa /invsee para recuperar tu inventario.
 invalidCharge=\u00a7cCargo invalido.
 invalidFireworkFormat=\u00a76The option \u00a74{0} \u00a76is not a valid value for \u00a74{1}
 invalidHome=El hogar {0} no existe.
@@ -188,9 +184,6 @@ invalidServer=Servidor invalido!
 invalidSignLine=Linea {0} en el signo es invalida.
 invalidWarpName=\u00a74Nombre de warp invalido
 invalidWorld=\u00a7cMundo invalido.
-inventoryCleared=\u00a77Inventario limpiado.
-inventoryClearedAll=\u00a76Cleared everyone's inventory.
-inventoryClearedOthers=\u00a77Inventario de \u00a7c{0}\u00a77 limpiado.
 is=es
 itemCannotBeSold=Ese objeto no puede ser vendido al servidor.
 itemMustBeStacked=El objeto tiene que ser intercambiado en pilas. Una cantidad de 2s seria de dos pilas, etc.
@@ -543,3 +536,9 @@ whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation)
 kitDelay=\u00a7m{0}\u00a7r
 giveSpawnFailure=\u00a74Not enough space, \u00a7c{0} \u00a7c{1} \u00a74was lost.
 noKitGroup=\u00a74You do not have access to this kit.
+inventoryClearingFromAll=\u00a76Clearing the inventory of all users...
+inventoryClearingAllItems=\u00a76Cleared all inventory items from {0}\u00a76.
+inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\u00a76. 
+inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
+inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
+inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
diff --git a/Essentials/src/messages_fi.properties b/Essentials/src/messages_fi.properties
index 628629f6e..57c5ded02 100644
--- a/Essentials/src/messages_fi.properties
+++ b/Essentials/src/messages_fi.properties
@@ -172,10 +172,6 @@ infoFileDoesNotExist=Tiedostoa info.txt ei ole olemassa. Luodaan.
 infoPages=\u00a7e ---- \u00a76{2} \u00a7e--\u00a76 Sivu \u00a74{0}\u00a76/\u00a74{1} \u00a7e----
 infoUnknownChapter=Tuntematon luku.
 insufficientFunds=\u00a74Insufficient funds available.
-invBigger=Toisen pelaajan reppu on isompi kuin sinun.
-invRestored=Sinun reppusi on palautettu.
-invSee=N\u00e4et pelaajan {0} repun.
-invSeeHelp=K\u00e4yt\u00e4 /invsee kun haluat palauttaa oman reppusi.
 invalidCharge=\u00a7cMit\u00e4t\u00f6n m\u00e4\u00e4r\u00e4ys.
 invalidFireworkFormat=\u00a76The option \u00a74{0} \u00a76is not a valid value for \u00a74{1}
 invalidHome=Kotia {0} ei ole olemassa
@@ -188,9 +184,6 @@ invalidServer=Kelvoton palvelin!
 invalidSignLine=Kyltin rivi {0} on viallinen.
 invalidWarpName=\u00a74Invalid warp name
 invalidWorld=\u00a7cKelvoton maailma.
-inventoryCleared=\u00a77Reppu tyhjennetty.
-inventoryClearedAll=\u00a76Cleared everyone's inventory.
-inventoryClearedOthers=\u00a77Pelaajan \u00a7c{0}\u00a77 reppu on tyhjennetty.
 is=on
 itemCannotBeSold=Tuota tavaraa ei voi myyd\u00e4 t\u00e4ll\u00e4 palvelimella.
 itemMustBeStacked=Tavara pit\u00e4\u00e4 vaihtaa pakattuina. M\u00e4\u00e4r\u00e4 2s olisi kaksi pakettia, jne.
@@ -543,3 +536,9 @@ whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation)
 kitDelay=\u00a7m{0}\u00a7r
 giveSpawnFailure=\u00a74Not enough space, \u00a7c{0} \u00a7c{1} \u00a74was lost.
 noKitGroup=\u00a74You do not have access to this kit.
+inventoryClearingFromAll=\u00a76Clearing the inventory of all users...
+inventoryClearingAllItems=\u00a76Cleared all inventory items from {0}\u00a76.
+inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\u00a76. 
+inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
+inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
+inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties
index 0aa17b3fa..35ef8fa2f 100644
--- a/Essentials/src/messages_fr.properties
+++ b/Essentials/src/messages_fr.properties
@@ -172,10 +172,6 @@ infoFileDoesNotExist=Le fichier info.txt n'existe pas. Le fichier est en cours d
 infoPages=\u00a7e ---- \u00a76{2} \u00a7e--\u00a76 Page \u00a74{0}\u00a76/\u00a74{1} \u00a7e----
 infoUnknownChapter=Chapitre inconnu.
 insufficientFunds=\u00a74Fonds insuffisants.
-invBigger=Les inventaires des autres joueurs sont plus gros que le v\u00f4tre.
-invRestored=Votre inventaire vous a \u00e9t\u00e9 rendu.
-invSee=Vous voyez l''inventaire de {0}.
-invSeeHelp=Utilisez /invsee pour revenir \u00e0 votre inventaire.
 invalidCharge=\u00a7cCharge invalide.
 invalidFireworkFormat=\u00a76L''option \u00a74{0} \u00a76n''est pas une valeur correcte pour \u00a74{1}
 invalidHome=La r\u00e9sidence {0} n''existe pas
@@ -188,9 +184,6 @@ invalidServer=\u00a74Serveur invalide.
 invalidSignLine=\u00a74La ligne {0} du panneau est invalide.
 invalidWarpName=\u00a74Nom de warp invalide.
 invalidWorld=\u00a7cMonde invalide.
-inventoryCleared=\u00a77Inventaire nettoy\u00e9.
-inventoryClearedAll=\u00a76Inventaires de tous les joueurs nettoy\u00e9s.
-inventoryClearedOthers=\u00a77L''inventaire de \u00a7c{0}\u00a77 a \u00e9t\u00e9 nettoy\u00e9.
 is=est
 itemCannotBeSold=Cet objet ne peut \u00eatre vendu au serveur.
 itemMustBeStacked=Cet objet doit \u00eatre vendu par 64. Une quantit\u00e9 de 2 serait deux fois 64.
@@ -543,3 +536,9 @@ whoisHunger=\u00a76 - Faim :\u00a7r {0}/20 (+{1} saturation)
 kitDelay=\u00a7m{0}\u00a7r
 giveSpawnFailure=\u00a74Not enough space, \u00a7c{0} \u00a7c{1} \u00a74was lost.
 noKitGroup=\u00a74You do not have access to this kit.
+inventoryClearingFromAll=\u00a76Clearing the inventory of all users...
+inventoryClearingAllItems=\u00a76Cleared all inventory items from {0}\u00a76.
+inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\u00a76. 
+inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
+inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
+inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
diff --git a/Essentials/src/messages_it.properties b/Essentials/src/messages_it.properties
index b91cc92f0..fad89e4ff 100644
--- a/Essentials/src/messages_it.properties
+++ b/Essentials/src/messages_it.properties
@@ -172,10 +172,6 @@ infoFileDoesNotExist=Il file info.txt non esiste. Creane uno per te.
 infoPages=\u00a7e ---- \u00a76{2} \u00a7e--\u00a76 Pagina \u00a74{0}\u00a76/\u00a74{1} \u00a7e----
 infoUnknownChapter=Capitolo sconosciuto.
 insufficientFunds=\u00a74Insufficient funds available.
-invBigger=L''inventario degli altri utenti e'' piu'' grande del tuo.
-invRestored=l tuo inventario e'' stato ripristinato.
-invSee=Stai guardando l''inventario di {0}.
-invSeeHelp=Digita /invsee per ripristinare il tuo inventario.
 invalidCharge=\u00a7cIIstruzione non corretta.
 invalidFireworkFormat=\u00a76The option \u00a74{0} \u00a76is not a valid value for \u00a74{1}
 invalidHome=La home {0} non esiste
@@ -188,9 +184,6 @@ invalidServer=Server non valido!
 invalidSignLine=Riga {0} non corretta.
 invalidWarpName=\u00a74Invalid warp name
 invalidWorld=\u00a7cMondo incorretto.
-inventoryCleared=\u00a77Inventario cancellato.
-inventoryClearedAll=\u00a76Cleared everyone's inventory.
-inventoryClearedOthers=\u00a77Inventario di \u00a7c{0}\u00a77 cancellato.
 is=e''
 itemCannotBeSold=L''oggetto non puo'' essere venduto.
 itemMustBeStacked=L''oggetto deve essere commerciato in pile. 2 quantita'' equivalgono a 2 pile, etc.
@@ -543,3 +536,9 @@ whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation)
 kitDelay=\u00a7m{0}\u00a7r
 giveSpawnFailure=\u00a74Not enough space, \u00a7c{0} \u00a7c{1} \u00a74was lost.
 noKitGroup=\u00a74You do not have access to this kit.
+inventoryClearingFromAll=\u00a76Clearing the inventory of all users...
+inventoryClearingAllItems=\u00a76Cleared all inventory items from {0}\u00a76.
+inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\u00a76. 
+inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
+inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
+inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties
index 599bb0924..b47c25f08 100644
--- a/Essentials/src/messages_nl.properties
+++ b/Essentials/src/messages_nl.properties
@@ -172,10 +172,6 @@ infoFileDoesNotExist=Bestand info.txt bestaat niet. Bezig met aanmaken.
 infoPages=\u00a7e ---- \u00a76{2} \u00a7e--\u00a76 Pagina \u00a74{0}\u00a76/\u00a74{1} \u00a7e----
 infoUnknownChapter=Onbekend hoofdstuk.
 insufficientFunds=\u00a74Saldo niet toereikend.
-invBigger=De inventaris van de andere speler is groter dan die van U.
-invRestored=Uw inventaris is hersteld.
-invSee=U kijkt naar de inventaris van {0}.
-invSeeHelp=Typ /invsee om je inventaris te herstellen.
 invalidCharge=\u00a7cOngeldige prijs.
 invalidFireworkFormat=\u00a76De optie \u00a74{0} \u00a76is geen correcte waarde voor \u00a74{1}
 invalidHome=Home {0} Bestaat niet.
@@ -188,9 +184,6 @@ invalidServer=Ongeldige server!
 invalidSignLine=Regel {0} op het bordje is ongeldig.
 invalidWarpName=\u00a74Ongeldige warp naam
 invalidWorld=\u00a7cOngeldige wereld.
-inventoryCleared=\u00a7Uw inventaris is leeggemaakt.
-inventoryClearedAll=\u00a76Iedereen zijn inventaris is leeggemaakt.
-inventoryClearedOthers=\u00a7De inventaris van \u00a7c{0}\u00a77 is leeggemaakt.
 is=is
 itemCannotBeSold=Dat voorwerp kan niet aan de server worden verkocht.
 itemMustBeStacked=Voorwerp moet geruild worden als stapel. Een hoeveelheid van 2 moet dus geruild worden als twee stapels, etc.
@@ -543,3 +536,9 @@ whoisHunger=\u00a76 - Honger:\u00a7r {0}/20 (+{1} Verzadiging)
 kitDelay=\u00a7m{0}\u00a7r
 giveSpawnFailure=\u00a74Niet genoeg ruimte, \u00a7c{0} \u00a7c{1} \u00a74is verloren gegaan.
 noKitGroup=\u00a74U heeft geen toestemming om deze kit te gebruiken.
+inventoryClearingFromAll=\u00a76Clearing the inventory of all users...
+inventoryClearingAllItems=\u00a76Cleared all inventory items from {0}\u00a76.
+inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\u00a76. 
+inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
+inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
+inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
diff --git a/Essentials/src/messages_pl.properties b/Essentials/src/messages_pl.properties
index dbdb9506b..80fa7ea34 100644
--- a/Essentials/src/messages_pl.properties
+++ b/Essentials/src/messages_pl.properties
@@ -172,10 +172,6 @@ infoFileDoesNotExist=Plik info.txt nie istnieje. Tworzenie tego pliku.
 infoPages=\u00a7e ---- \u00a77{2} \u00a7e--\u00a77 Strona \u00a7c{0}\u00a77/\u00a7c{1} \u00a7e----
 infoUnknownChapter=Nieznany rozdzial.
 insufficientFunds=\u00a74Nie posiadasz wystarczajacych srodkow.
-invBigger=\u00a74Ekwipunek innego gracza jest wiekszy niz Twoj.
-invRestored=\u00a77Twoj ekwipunek zostal przywrocony.
-invSee=\u00a77Widzisz ekwipunek\u00a7c {0}\u00a77.
-invSeeHelp=\u00a77Wpisz /invsee aby przywrocic swoj ekwipunek.
 invalidCharge=\u00a74Invalid charge.
 invalidFireworkFormat=\u00a77Opcja \u00a74{0} \u00a77nie jest poprawna wartoscia dla \u00a74{1}\u00a77.
 invalidHome=\u00a74Dom\u00a7c {0} \u00a74nie istnieje.
@@ -188,9 +184,6 @@ invalidServer=Niepoprawny serwer!
 invalidSignLine=\u00a74Linia\u00a7c {0} \u00a74na znaku jest bledna.
 invalidWarpName=\u00a74Niepoprawna nazwa warpa.
 invalidWorld=\u00a74Nieprawidlowy swiat.
-inventoryCleared=\u00a77Ekwipunek oprozniony.
-inventoryClearedAll=\u00a77Wszystkim wyczyszczono ekwipunek.
-inventoryClearedOthers=\u00a77Ekwipunek \u00a7c{0}\u00a77 oprozniony.
 is=jest
 itemCannotBeSold=\u00a7rNie mozesz sprzedac tego przedmiotu serwerowi.
 itemMustBeStacked=\u00a74Przedmiotem handluje sie w stackach. Wielkosc 2s to dwa stacki itd.
@@ -543,3 +536,9 @@ whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation)
 kitDelay=\u00a7m{0}\u00a7r
 giveSpawnFailure=\u00a74Not enough space, \u00a7c{0} \u00a7c{1} \u00a74was lost.
 noKitGroup=\u00a74You do not have access to this kit.
+inventoryClearingFromAll=\u00a76Clearing the inventory of all users...
+inventoryClearingAllItems=\u00a76Cleared all inventory items from {0}\u00a76.
+inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\u00a76. 
+inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
+inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
+inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
diff --git a/Essentials/src/messages_pt.properties b/Essentials/src/messages_pt.properties
index 25f67e68b..adf9a10d0 100644
--- a/Essentials/src/messages_pt.properties
+++ b/Essentials/src/messages_pt.properties
@@ -172,10 +172,6 @@ infoFileDoesNotExist=Arquivo info.txt nao existe. Criando um para voc\u00c3\u00a
 infoPages=\u00a7e ---- \u00a76{2} \u00a7e--\u00a76 P\u00c3\u00a1gina \u00a7c{0}\u00a76/\u00a7c{1} \u00a7e----
 infoUnknownChapter=Cap\u00c3\u00adtulo desconhecido.
 insufficientFunds=\u00a74Insufficient funds available.
-invBigger=\u00a74O invent\u00c3\u00a1rio do outro usu\u00c3\u00a1rio \u00c3\u00a9 maior que o seu.
-invRestored=\u00a76Seu invent\u00c3\u00a1rio foi restaurado.
-invSee=\u00a76Voc\u00c3\u00aa est\u00c3\u00a1 vendo o invent\u00c3\u00a1rio de\u00a7c {0}\u00a76.
-invSeeHelp=\u00a76Digite /invsee para restaurar seu invent\u00c3\u00a1rio.
 invalidCharge=\u00a74Argumento inv\u00c3\u00a1lido.
 invalidFireworkFormat=\u00a76A op\u00c3\u00a7ao \u00a74{0} \u00a76nao \u00c3\u00a9 um valor v\u00c3\u00a1lido para \u00a74{1}\u00a76.
 invalidHome=\u00a74Casa\u00a7c {0} \u00a74nao existe!
@@ -188,9 +184,6 @@ invalidServer=Servidor inv\u00c3\u00a1lido!
 invalidSignLine=\u00a74Linha\u00a7c {0} \u00a74na placa est\u00c3\u00a1 inv\u00c3\u00a1lida.
 invalidWarpName=\u00a74Nome de warp inv\u00c3\u00a1lido!
 invalidWorld=\u00a74Mundo inv\u00c3\u00a1lido.
-inventoryCleared=\u00a76Invent\u00c3\u00a1rio removido.
-inventoryClearedAll=\u00a76Invent\u00c3\u00a1rio de todos removidos.
-inventoryClearedOthers=\u00a76Invent\u00c3\u00a1rio de \u00a7c{0}\u00a76 removido.
 is=\u00c3\u00a9
 itemCannotBeSold=\u00a74Esse item nao pode ser vendido para o servidor.
 itemMustBeStacked=\u00a74O item deve ser trocado em packs. A quantidade de 2 deveria ser 2 packs, etc.
@@ -543,3 +536,9 @@ whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation)
 kitDelay=\u00a7m{0}\u00a7r
 giveSpawnFailure=\u00a74Not enough space, \u00a7c{0} \u00a7c{1} \u00a74was lost.
 noKitGroup=\u00a74You do not have access to this kit.
+inventoryClearingFromAll=\u00a76Clearing the inventory of all users...
+inventoryClearingAllItems=\u00a76Cleared all inventory items from {0}\u00a76.
+inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\u00a76. 
+inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
+inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
+inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
diff --git a/Essentials/src/messages_ro.properties b/Essentials/src/messages_ro.properties
index 8eb66690c..680f77748 100644
--- a/Essentials/src/messages_ro.properties
+++ b/Essentials/src/messages_ro.properties
@@ -172,10 +172,6 @@ infoFileDoesNotExist=Fisierul info.txt nu exista. Se creeaza unul pentru tine.
 infoPages=\u00a7e ---- \u00a76{2} \u00a7e--\u00a76 Pagina \u00a7c{0}\u00a76/\u00a7c{1} \u00a7e----
 infoUnknownChapter=Capitol necunoscut.
 insufficientFunds=\u00a74Insufficient funds available.
-invBigger=\u00a74Inventarul altor jucatori este mai mare decat al tau.
-invRestored=\u00a76Inventarul ti-a fost restaurat.
-invSee=\u00a76Te uiti in inventarul lui\u00a7c {0}\u00a76.
-invSeeHelp=\u00a76Folosestie /invsee pentru a-ti restaura inventarul.
 invalidCharge=\u00a74Incarcare invalida.
 invalidFireworkFormat=\u00a76Optiunea \u00a74{0} \u00a76nu este o valoare valida pentru \u00a74{1}\u00a76.
 invalidHome=\u00a74Casa\u00a7c {0} \u00a74nu exista!
@@ -188,9 +184,6 @@ invalidServer=Server invalid!
 invalidSignLine=\u00a74Linia\u00a7c {0} \u00a74de pe semn este invalida.
 invalidWarpName=\u00a74Numele teleportarei este invalida!
 invalidWorld=\u00a74Lume invalida.
-inventoryCleared=\u00a76Inventarul a fost curatat.
-inventoryClearedAll=\u00a76Inventarul tuturor a fost curatat.
-inventoryClearedOthers=\u00a76Inventarul lui \u00a7c{0}\u00a76 a fost curatat.
 is=este
 itemCannotBeSold=\u00a74Acest obiect nu poate fi vandut pe server.
 itemMustBeStacked=\u00a74Obiectul trebuie comercializat in stacuri. O cantitate de 2s ar trebuie sa fie 2 stacuri, s.a.m.d.
@@ -543,3 +536,9 @@ whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation)
 kitDelay=\u00a7m{0}\u00a7r
 giveSpawnFailure=\u00a74Not enough space, \u00a7c{0} \u00a7c{1} \u00a74was lost.
 noKitGroup=\u00a74You do not have access to this kit.
+inventoryClearingFromAll=\u00a76Clearing the inventory of all users...
+inventoryClearingAllItems=\u00a76Cleared all inventory items from {0}\u00a76.
+inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\u00a76. 
+inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
+inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
+inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
diff --git a/Essentials/src/messages_se.properties b/Essentials/src/messages_se.properties
index d38700c7b..7fa2eceb5 100644
--- a/Essentials/src/messages_se.properties
+++ b/Essentials/src/messages_se.properties
@@ -172,10 +172,6 @@ infoFileDoesNotExist=Filen info.txt finns inte. Skapar en f\u00f6r dig.
 infoPages=\u00a7e ---- \u00a76{2} \u00a7e--\u00a76 Sida \u00a74{0}\u00a76/\u00a74{1} \u00a7e----
 infoUnknownChapter=Ok\u00e4nt kapitel.
 insufficientFunds=\u00a74Insufficient funds available.
-invBigger=De andra anv\u00e4ndarnas f\u00f6rr\u00e5d \u00e4r st\u00f6rre \u00e4n ditt.
-invRestored=Ditt f\u00f6rr\u00e5d har blivit \u00e5terst\u00e4llt.
-invSee=Du ser nu {0}s f\u00f6rr\u00e5d.
-invSeeHelp=Anv\u00e4nd /invsee f\u00f6r att \u00e5terst\u00e4lla ditt f\u00f6rr\u00e5d.
 invalidCharge=\u00a7cOgiltig laddning.
 invalidFireworkFormat=\u00a76Alternativet \u00a74{0} \u00a76is \u00c3\u00a4r inte ett korrekt alternativ f\u00c3\u00b6r \u00a74{1}
 invalidHome=Hemmet {0} finns inte
@@ -188,9 +184,6 @@ invalidServer=Ogiltig server!
 invalidSignLine=Rad {0} p\u00e5 skylten \u00e4r ogiltig.
 invalidWarpName=\u00a74Ogiltigt warpnamn
 invalidWorld=\u00a7cOgiltig v\u00e4rld.
-inventoryCleared=\u00a77F\u00f6rr\u00e5d rensat.
-inventoryClearedAll=\u00a76Cleared everyone's inventory.
-inventoryClearedOthers=\u00a77F\u00f6rr\u00e5det av \u00a7c{0}\u00a77 \u00e4r rensat.
 is=\u00e4r
 itemCannotBeSold=Det objektet kan inte s\u00e4ljas till servern.
 itemMustBeStacked=Objektet m\u00e5ste k\u00f6pas i staplar. En m\u00e4ngd av 2s kommer bli 2 staplar, etc.
@@ -543,3 +536,9 @@ whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation)
 kitDelay=\u00a7m{0}\u00a7r
 giveSpawnFailure=\u00a74Not enough space, \u00a7c{0} \u00a7c{1} \u00a74was lost.
 noKitGroup=\u00a74You do not have access to this kit.
+inventoryClearingFromAll=\u00a76Clearing the inventory of all users...
+inventoryClearingAllItems=\u00a76Cleared all inventory items from {0}\u00a76.
+inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\u00a76. 
+inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
+inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
+inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
diff --git a/Essentials/src/messages_zh.properties b/Essentials/src/messages_zh.properties
index de0dae40d..231aebcd7 100644
--- a/Essentials/src/messages_zh.properties
+++ b/Essentials/src/messages_zh.properties
@@ -172,10 +172,6 @@ infoFileDoesNotExist=\u6587\u4ef6info.txt\u4e0d\u5b58\u5728,\u5c06\u521b\u5efa\u
 infoPages=\u00a7e----\u7b2c \u00a7c{0}\u00a7e \u9875/\u5171 \u00a7c{1}\u00a7e \u9875----
 infoUnknownChapter=\u672a\u77e5\u7ae0\u8282
 insufficientFunds=\u00a74\u53ef\u7528\u8d44\u91d1\u4e0d\u8db3.
-invBigger=\u00a74\u5176\u4ed6\u73a9\u5bb6\u7684\u80cc\u5305\u6bd4\u4f60\u7684\u66f4\u5927
-invRestored=\u00a76\u4f60\u7684\u80cc\u5305\u5df2\u88ab\u6062\u590d
-invSee=\u00a76\u4f60\u67e5\u770b\u4e86\u00a7c {0} \u00a76\u7684\u80cc\u5305
-invSeeHelp=\u00a76\u4f7f\u7528\u201c/invsee\u201d\u91cd\u65b0\u67e5\u770b\u81ea\u5df1\u7684\u80cc\u5305
 invalidCharge=\u00a74\u65e0\u6548\u7684\u4ef7\u683c
 invalidFireworkFormat=\u00a76\u8fd9\u4e2a\u9009\u9879 \u00a74{0} \u00a76\u5bf9 \u00a74{1}\u00a76 \u4e0d\u662f\u4e00\u4e2a\u6709\u6548\u7684\u503c \u00a76.
 invalidHome=\u00a74\u5bb6\u00a7c {0} \u00a74\u4e0d\u5b58\u5728!
@@ -189,9 +185,6 @@ invalidSignLine=\u00a74\u724c\u5b50\u4e0a\u7684\u7b2c \u00a7c{0} \u00a74\u884c\u
 invalidWarpName=\u00a74\u65e0\u6548\u7684\u4f20\u9001\u70b9\u540d\u79f0!
 invalidWorld=\u00a74\u65e0\u6548\u7684\u4e16\u754c
 invalidWorld=\u00a74\u65e0\u6548\u7684\u4e16\u754c\u540d.
-inventoryCleared=\u00a76\u5305\u88f9\u5df2\u6e05\u7a7a.
-inventoryClearedAll=\u00a76\u6240\u6709\u4eba\u7684\u5305\u88f9\u5df2\u6e05\u7a7a.
-inventoryClearedOthers=\u00a7c{0}\u00a76 \u7684\u80cc\u5305\u5df2\u88ab\u6e05\u7a7a
 is=\u662f
 itemCannotBeSold=\u00a74\u8be5\u7269\u54c1\u65e0\u6cd5\u5356\u7ed9\u670d\u52a1\u5668
 itemMustBeStacked=\u00a74\u7269\u54c1\u5fc5\u987b\u6210\u7ec4\u4ea4\u6613,2s\u7684\u6570\u91cf\u662f2\u7ec4,\u4ee5\u6b64\u7c7b\u63a8
@@ -544,3 +537,9 @@ whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation)
 kitDelay=\u00a7m{0}\u00a7r
 giveSpawnFailure=\u00a74Not enough space, \u00a7c{0} \u00a7c{1} \u00a74was lost.
 noKitGroup=\u00a74You do not have access to this kit.
+inventoryClearingFromAll=\u00a76Clearing the inventory of all users...
+inventoryClearingAllItems=\u00a76Cleared all inventory items from {0}\u00a76.
+inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\u00a76. 
+inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
+inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
+inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
diff --git a/Essentials/src/messages_zh_HK.properties b/Essentials/src/messages_zh_HK.properties
index 2f650eb5c..8c5a1c115 100644
--- a/Essentials/src/messages_zh_HK.properties
+++ b/Essentials/src/messages_zh_HK.properties
@@ -173,10 +173,6 @@ infoFileDoesNotExist=\u6587\u4ef6info.txt\u4e0d\u5b58\u5728,\u5c07\u5275\u5efa\u
 infoPages=\u00a7e----\u7b2c \u00a7c{0}\u00a7e \u9801/\u5171 \u00a7c{1}\u00a7e \u9801----
 infoUnknownChapter=\u672a\u77e5\u7ae0\u7bc0
 insufficientFunds=\u00a74\u53ef\u7528\u8cc7\u91d1\u4e0d\u8db3.
-invBigger=\u00a74\u5176\u4ed6\u73a9\u5bb6\u7684\u80cc\u5305\u6bd4\u4f60\u7684\u66f4\u5927
-invRestored=\u00a76\u4f60\u7684\u80cc\u5305\u5df2\u88ab\u6062\u5fa9
-invSee=\u00a76\u4f60\u67e5\u770b\u4e86\u00a7c {0} \u00a76\u7684\u80cc\u5305
-invSeeHelp=\u00a76\u4f7f\u7528\u300c/invsee\u300d\u91cd\u65b0\u67e5\u770b\u81ea\u5df1\u7684\u80cc\u5305
 invalidCharge=\u00a74\u7121\u6548\u7684\u50f9\u683c
 invalidFireworkFormat=\u00a76\u9019\u500b\u9078\u9805 \u00a74{0} \u00a76\u5c0d \u00a74{1}\u00a76 \u4e0d\u662f\u4e00\u500b\u6709\u6548\u7684\u503c \u00a76.
 invalidHome=\u00a74\u5bb6\u00a7c {0} \u00a74\u4e0d\u5b58\u5728!
@@ -190,9 +186,6 @@ invalidSignLine=\u00a74\u724c\u5b50\u4e0a\u7684\u7b2c \u00a7c{0} \u00a74\u884c\u
 invalidWarpName=\u00a74\u7121\u6548\u7684\u50b3\u9001\u9ede\u540d\u7a31!
 invalidWorld=\u00a74\u7121\u6548\u7684\u4e16\u754c
 invalidWorld=\u00a74\u7121\u6548\u7684\u4e16\u754c\u540d.
-inventoryCleared=\u00a76\u5305\u88f9\u5df2\u6e05\u7a7a.
-inventoryClearedAll=\u00a76\u6240\u6709\u4eba\u7684\u5305\u88f9\u5df2\u6e05\u7a7a.
-inventoryClearedOthers=\u00a7c{0}\u00a76\u7684\u5305\u88f9\u5df2\u6e05\u7a7a.
 is=\u662f
 itemCannotBeSold=\u00a74\u8a72\u7269\u54c1\u7121\u6cd5\u8ce3\u7d66\u670d\u52d9\u5668
 itemMustBeStacked=\u00a74\u7269\u54c1\u5fc5\u9808\u6210\u7d44\u4ea4\u6613,2s\u7684\u6578\u91cf\u662f2\u7d44,\u4ee5\u6b64\u985e\u63a8
@@ -545,3 +538,9 @@ whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation)
 kitDelay=\u00a7m{0}\u00a7r
 giveSpawnFailure=\u00a74Not enough space, \u00a7c{0} \u00a7c{1} \u00a74was lost.
 noKitGroup=\u00a74You do not have access to this kit.
+inventoryClearingFromAll=\u00a76Clearing the inventory of all users...
+inventoryClearingAllItems=\u00a76Cleared all inventory items from {0}\u00a76.
+inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\u00a76. 
+inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
+inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
+inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
diff --git a/Essentials/src/messages_zh_TW.properties b/Essentials/src/messages_zh_TW.properties
index d1eafacec..7b0be1004 100644
--- a/Essentials/src/messages_zh_TW.properties
+++ b/Essentials/src/messages_zh_TW.properties
@@ -173,10 +173,6 @@ infoFileDoesNotExist=\u6587\u4ef6info.txt\u4e0d\u5b58\u5728,\u5c07\u5275\u5efa\u
 infoPages=\u00a7e----\u7b2c \u00a7c{0}\u00a7e \u9801/\u5171 \u00a7c{1}\u00a7e \u9801----
 infoUnknownChapter=\u672a\u77e5\u7ae0\u7bc0
 insufficientFunds=\u00a74\u53ef\u7528\u8cc7\u91d1\u4e0d\u8db3.
-invBigger=\u00a74\u5176\u4ed6\u73a9\u5bb6\u7684\u80cc\u5305\u6bd4\u4f60\u7684\u66f4\u5927
-invRestored=\u00a76\u4f60\u7684\u80cc\u5305\u5df2\u88ab\u6062\u5fa9
-invSee=\u00a76\u4f60\u67e5\u770b\u4e86\u00a7c {0} \u00a76\u7684\u80cc\u5305
-invSeeHelp=\u00a76\u4f7f\u7528\u300c/invsee\u300d\u91cd\u65b0\u67e5\u770b\u81ea\u5df1\u7684\u80cc\u5305
 invalidCharge=\u00a74\u7121\u6548\u7684\u50f9\u683c
 invalidFireworkFormat=\u00a76\u9019\u500b\u9078\u9805 \u00a74{0} \u00a76\u5c0d \u00a74{1}\u00a76 \u4e0d\u662f\u4e00\u500b\u6709\u6548\u7684\u503c \u00a76.
 invalidHome=\u00a74\u5bb6\u00a7c {0} \u00a74\u4e0d\u5b58\u5728!
@@ -190,9 +186,6 @@ invalidSignLine=\u00a74\u724c\u5b50\u4e0a\u7684\u7b2c \u00a7c{0} \u00a74\u884c\u
 invalidWarpName=\u00a74\u7121\u6548\u7684\u50b3\u9001\u9ede\u540d\u7a31!
 invalidWorld=\u00a74\u7121\u6548\u7684\u4e16\u754c
 invalidWorld=\u00a74\u7121\u6548\u7684\u4e16\u754c\u540d.
-inventoryCleared=\u00a76\u5305\u88f9\u5df2\u6e05\u7a7a.
-inventoryClearedAll=\u00a76\u6240\u6709\u4eba\u7684\u5305\u88f9\u5df2\u6e05\u7a7a.
-inventoryClearedOthers=\u00a7c{0}\u00a76\u7684\u5305\u88f9\u5df2\u6e05\u7a7a.
 is=\u662f
 itemCannotBeSold=\u00a74\u8a72\u7269\u54c1\u7121\u6cd5\u8ce3\u7d66\u4f3a\u670d\u5668
 itemMustBeStacked=\u00a74\u7269\u54c1\u5fc5\u9808\u6210\u7d44\u4ea4\u6613,2s\u7684\u6578\u91cf\u662f2\u7d44,\u4ee5\u6b64\u985e\u63a8
@@ -545,3 +538,9 @@ whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation)
 kitDelay=\u00a7m{0}\u00a7r
 giveSpawnFailure=\u00a74Not enough space, \u00a7c{0} \u00a7c{1} \u00a74was lost.
 noKitGroup=\u00a74You do not have access to this kit.
+inventoryClearingFromAll=\u00a76Clearing the inventory of all users...
+inventoryClearingAllItems=\u00a76Cleared all inventory items from {0}\u00a76.
+inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\u00a76. 
+inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
+inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
+inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.