TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-07-24 06:23:59 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Chris Ward 2014-01-21 00:54:48 +11:00
parent 839bfe0c2e
commit 9ce1158aeb
22 changed files with 53 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

45
Essentials/src/com/earth2me/essentials/MetaItemStack.java
View file

@ -8,6 +8,8 @@ import com.earth2me.essentials.utils.FormatUtil;
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 @@ public class MetaItemStack
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);
}
}