Add support for vanilla JSON metadata syntax (/give, /i, /kit, etc.)

Author: chrisgward

Essentials/src/com/earth2me/essentials/MetaItemStack.java

@@ -8,6 +8,8 @@
 import com.earth2me.essentials.utils.NumberUtil;
 import java.util.*;
 import java.util.regex.Pattern;
+
+import com.google.common.base.Joiner;
 import net.ess3.api.IEssentials;
 import org.bukkit.Color;
 import org.bukkit.DyeColor;
@@ -36,7 +38,7 @@ public class MetaItemStack
 		}
 	}
 	private final transient Pattern splitPattern = Pattern.compile("[:+',;.]");
-	private final ItemStack stack;
+	private ItemStack stack;
 	private FireworkEffect.Builder builder = FireworkEffect.builder();
 	private PotionEffectType pEffectType;
 	private PotionEffect pEffect;
@@ -95,25 +97,42 @@ private void resetPotionMeta()
 
 	public void parseStringMeta(final CommandSource sender, final boolean allowUnsafe, String[] string, int fromArg, final IEssentials ess) throws Exception
 	{
-
-		for (int i = fromArg; i < string.length; i++)
+		if (string[fromArg].startsWith("{"))
 		{
-			addStringMeta(sender, allowUnsafe, string[i], ess);
+			try
+			{
+				stack = ess.getServer().getUnsafe().modifyItemStack(stack, Joiner.on(' ').join(Arrays.asList(string).subList(fromArg, string.length)));
+			}
+			catch (NoSuchMethodError nsme)
+			{
+				throw new Exception(_("noMetaJson"), nsme);
+			}
+			catch (Throwable throwable)
+			{
+				throw new Exception(throwable.getMessage(), throwable);
+			}
 		}
-		if (validFirework)
+		else
 		{
-			if (!hasMetaPermission(sender, "firework", true, true, ess))
+			for (int i = fromArg; i < string.length; i++)
 			{
-				throw new Exception(_("noMetaFirework"));
+				addStringMeta(sender, allowUnsafe, string[i], ess);
 			}
-			FireworkEffect effect = builder.build();
-			FireworkMeta fmeta = (FireworkMeta)stack.getItemMeta();
-			fmeta.addEffect(effect);
-			if (fmeta.getEffects().size() > 1 && !hasMetaPermission(sender, "firework-multiple", true, true, ess))
+			if (validFirework)
 			{
-				throw new Exception(_("multipleCharges"));
+				if (!hasMetaPermission(sender, "firework", true, true, ess))
+				{
+					throw new Exception(_("noMetaFirework"));
+				}
+				FireworkEffect effect = builder.build();
+				FireworkMeta fmeta = (FireworkMeta)stack.getItemMeta();
+				fmeta.addEffect(effect);
+				if (fmeta.getEffects().size() > 1 && !hasMetaPermission(sender, "firework-multiple", true, true, ess))
+				{
+					throw new Exception(_("multipleCharges"));
+				}
+				stack.setItemMeta(fmeta);
 			}
-			stack.setItemMeta(fmeta);
 		}
 	}
 

Essentials/src/messages.properties

@@ -533,3 +533,4 @@ mayNotJailOffline=\u00a74You may not jail offline players.
 muteExemptOffline=\u00a74You may not mute offline players.
 ignoreExempt=\u00a74You can not ignore that player.
 unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
+noMetaJson=JSON Metadata is not supported in this version of Bukkit

Essentials/src/messages_cs.properties

@@ -533,4 +533,5 @@ mayNotJailOffline=\u00a7Nemuzes uveznit hrace, kteri nejsou pripojeni.
 muteExemptOffline=\u00a7Nemuzes umlcet hrace, kteri nejsou pripojeni.
 ignoreExempt=\u00a74Nemuzes ignorovat tohoto hrace.
 unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
+noMetaJson=JSON Metadata is not supported in this version of Bukkit
 

Essentials/src/messages_da.properties

@@ -533,4 +533,5 @@ mayNotJailOffline=\u00a74Du kan ikke s\u00e6tte offline spillere i f\u00e6ngsel.
 muteExemptOffline=\u00a74Du kan ikke g\u00f8re offline spillere tavse.
 ignoreExempt=\u00a74Du kan ikke ignorere den spiller.
 unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
+noMetaJson=JSON Metadata is not supported in this version of Bukkit
 

Essentials/src/messages_de.properties

@@ -533,4 +533,5 @@ mayNotJailOffline=\u00a74Du darfst abgemeldete Spieler nicht einsperren.
 muteExemptOffline=\u00a74Du darfst abgemeldete Spieler nicht stummschalten.
 ignoreExempt=\u00a74Du kannst diesen Spieler nicht ignorieren.
 unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
+noMetaJson=JSON Metadata is not supported in this version of Bukkit
 

Essentials/src/messages_en.properties

@@ -533,4 +533,5 @@ mayNotJailOffline=\u00a74You may not jail offline players.
 muteExemptOffline=\u00a74You may not mute offline players.
 ignoreExempt=\u00a74You may not ignore that player.
 unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
+noMetaJson=JSON Metadata is not supported in this version of Bukkit
 

Essentials/src/messages_es.properties

@@ -533,4 +533,5 @@ mayNotJailOffline=\u00a74No puedes encarcelar a jugadores que no est\u00e1n cone
 muteExemptOffline=\u00a74No puedes silenciar a jugadores que no est\u00e1n conectados.
 ignoreExempt=\u00a74No puedes ignorar a este jugador.
 unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
+noMetaJson=JSON Metadata is not supported in this version of Bukkit
 

Essentials/src/messages_fi.properties

@@ -533,4 +533,5 @@ mayNotJailOffline=\u00a74You may not jail offline players.
 muteExemptOffline=\u00a74You may not mute offline players.
 ignoreExempt=\u00a74You can not ignore that player.
 unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
+noMetaJson=JSON Metadata is not supported in this version of Bukkit
 

Essentials/src/messages_fr.properties

@@ -533,4 +533,5 @@ mayNotJailOffline=\u00a74Vous ne pouvez pas emprisonner les joueurs d\u00e9conne
 muteExemptOffline=\u00a74Vous ne pouvez pas rendre muets les joueurs d\u00e9connect\u00e9s.
 ignoreExempt=\u00a74Vous ne pouvez pas ignorer ce joueur.
 unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
+noMetaJson=JSON Metadata is not supported in this version of Bukkit
 

Essentials/src/messages_hu.properties

@@ -533,4 +533,5 @@ mayNotJailOffline=\u00a74Nem b\u00f6rt\u00f6n\u00f6zhetsz be Offline j\u00e1t\u0
 muteExemptOffline=\u00a74Nem n\u00e9m\u00edthatsz le Offline j\u00e1t\u00e9kost.
 ignoreExempt=\u00a74Nem hagyhatod figyelmen k\u00edv\u0171l ezt a j\u00e1t\u00e9kost.
 unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
+noMetaJson=JSON Metadata is not supported in this version of Bukkit