diff --git a/Essentials/src/com/earth2me/essentials/EssentialsConf.java b/Essentials/src/com/earth2me/essentials/EssentialsConf.java index 02408163f..9ca9c1689 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsConf.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsConf.java @@ -381,7 +381,7 @@ public class EssentialsConf extends YamlConfiguration { } return stack; /* - * , + * , * (byte)getInt(path + ".data", 0) */ } diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java index a8a1973de..6f60ccb1d 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java @@ -254,7 +254,7 @@ public class EssentialsPlayerListener implements Listener { if (!ess.getSettings().isCommandDisabled("mail") && user.isAuthorized("essentials.mail")) { final List mail = user.getMails(); if (mail.isEmpty()) { - if(ess.getSettings().isNotifyNoNewMail()) { + if (ess.getSettings().isNotifyNoNewMail()) { user.sendMessage(tl("noNewMail")); // Only notify if they want us to. } } else { diff --git a/Essentials/src/com/earth2me/essentials/ISettings.java b/Essentials/src/com/earth2me/essentials/ISettings.java index 2632d3b19..4b1d97263 100644 --- a/Essentials/src/com/earth2me/essentials/ISettings.java +++ b/Essentials/src/com/earth2me/essentials/ISettings.java @@ -52,6 +52,8 @@ public interface ISettings extends IConf { ConfigurationSection getKits(); + void addKit(String name, List lines, long delay); + String getLocale(); String getNewbieSpawn(); diff --git a/Essentials/src/com/earth2me/essentials/ItemDb.java b/Essentials/src/com/earth2me/essentials/ItemDb.java index baa98f9c1..0429126b8 100644 --- a/Essentials/src/com/earth2me/essentials/ItemDb.java +++ b/Essentials/src/com/earth2me/essentials/ItemDb.java @@ -4,8 +4,14 @@ import com.earth2me.essentials.utils.NumberUtil; import com.earth2me.essentials.utils.StringUtil; import net.ess3.api.IEssentials; import org.bukkit.Bukkit; +import org.bukkit.Color; +import org.bukkit.FireworkEffect; import org.bukkit.Material; +import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.*; +import org.bukkit.potion.Potion; +import org.bukkit.potion.PotionEffect; import java.util.*; import java.util.regex.Matcher; @@ -199,6 +205,126 @@ public class ItemDb implements IConf, net.ess3.api.IItemDb { return name; } + @Override + public String serialize(ItemStack is) { + String mat = is.getType().name(); + if (is.getData().getData() != 0) { + mat = mat + ":" + is.getData().getData(); + } + int quantity = is.getAmount(); + StringBuilder sb = new StringBuilder(); // Add space AFTER you add something. We can trim at end. + sb.append(mat).append(" ").append(quantity).append(" "); + + // ItemMeta applies to anything. + if (is.hasItemMeta()) { + ItemMeta meta = is.getItemMeta(); + if (meta.hasDisplayName()) { + sb.append("name:").append(meta.getDisplayName().replaceAll(" ", "_")).append(" "); + } + + if (meta.hasLore()) { + sb.append("lore:"); + boolean first = true; + for (String s : meta.getLore()) { + // Add | before the line if it's not the first one. Easy but weird way + // to do this since we need each line separated by | + if (!first) { + sb.append("|"); + } + first = false; + sb.append(s.replaceAll(" ", "_")); + } + sb.append(" "); + } + + if (meta.hasEnchants()) { + for (Enchantment e : meta.getEnchants().keySet()) { + sb.append(e.getName().toLowerCase()).append(":").append(meta.getEnchantLevel(e)).append(" "); + } + } + } + + switch (is.getType()) { + case WRITTEN_BOOK: + // Everything from http://wiki.ess3.net/wiki/Item_Meta#Books in that order. + // Interesting as I didn't see a way to do pages or chapters. + BookMeta bookMeta = (BookMeta) is.getItemMeta(); + if (bookMeta.hasTitle()) { + sb.append("title:").append(bookMeta.getTitle()).append(" "); + } + if (bookMeta.hasAuthor()) { + sb.append("author:").append(bookMeta.getAuthor()).append(" "); + } + // Only other thing it could have is lore but that's done up there ^^^ + break; + case ENCHANTED_BOOK: + EnchantmentStorageMeta enchantmentStorageMeta = (EnchantmentStorageMeta) is.getItemMeta(); + for (Enchantment e : enchantmentStorageMeta.getStoredEnchants().keySet()) { + sb.append(e.getName().toLowerCase()).append(":").append(enchantmentStorageMeta.getStoredEnchantLevel(e)).append(" "); + } + break; + case FIREWORK: + // Everything from http://wiki.ess3.net/wiki/Item_Meta#Fireworks in that order. + FireworkMeta fireworkMeta = (FireworkMeta) is.getItemMeta(); + if (fireworkMeta.hasEffects()) { + for (FireworkEffect effect : fireworkMeta.getEffects()) { + if (effect.getColors() != null && !effect.getColors().isEmpty()) { + sb.append("color:"); + boolean first = true; + for (Color c : effect.getColors()) { + if (!first) { + sb.append(","); // same thing as above. + } + sb.append(c.toString()); + first = false; + } + sb.append(" "); + } + + sb.append("shape: ").append(effect.getType().name()).append(" "); + if (effect.getFadeColors() != null && !effect.getFadeColors().isEmpty()) { + sb.append("fade:"); + boolean first = true; + for (Color c : effect.getFadeColors()) { + if (!first) { + sb.append(","); // same thing as above. + } + sb.append(c.toString()); + first = false; + } + sb.append(" "); + } + } + sb.append("power: ").append(fireworkMeta.getPower()).append(" "); + } + break; + case POTION: + Potion potion = Potion.fromItemStack(is); + for (PotionEffect e : potion.getEffects()) { + // long but needs to be effect:speed power:2 duration:120 in that order. + sb.append("effect:").append(e.getType().getName().toLowerCase()).append(" ").append("power:").append(e.getAmplifier()).append(" ").append("duration:").append(e.getDuration() / 20).append(" "); + } + break; + case SKULL_ITEM: + // item stack with meta + SkullMeta skullMeta = (SkullMeta) is.getItemMeta(); + if (skullMeta != null && skullMeta.hasOwner()) { + sb.append("player:").append(skullMeta.getOwner()).append(" "); + } + break; + case LEATHER_HELMET: + case LEATHER_CHESTPLATE: + case LEATHER_LEGGINGS: + case LEATHER_BOOTS: + LeatherArmorMeta leatherArmorMeta = (LeatherArmorMeta) is.getItemMeta(); + int rgb = leatherArmorMeta.getColor().asRGB(); + sb.append("color:").append(rgb).append(" "); + break; + } + + return sb.toString().trim().replaceAll("ยง", "&"); + } + static class ItemData { final private int itemNo; diff --git a/Essentials/src/com/earth2me/essentials/Kit.java b/Essentials/src/com/earth2me/essentials/Kit.java index 904abc502..b3259e5a7 100644 --- a/Essentials/src/com/earth2me/essentials/Kit.java +++ b/Essentials/src/com/earth2me/essentials/Kit.java @@ -189,7 +189,7 @@ public class Kit { continue; } - if(kitItem.startsWith("/")) { + if (kitItem.startsWith("/")) { String command = kitItem.substring(1); String name = user.getName(); command = command.replace("{player}", name); diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java index 43e473473..a111de471 100644 --- a/Essentials/src/com/earth2me/essentials/Settings.java +++ b/Essentials/src/com/earth2me/essentials/Settings.java @@ -308,6 +308,15 @@ public class Settings implements net.ess3.api.ISettings { return null; } + @Override + public void addKit(String name, List lines, long delay) { + // Will overwrite but w/e + config.set("kits." + name + ".delay", delay); + config.set("kits." + name + ".items", lines); + kits = _getKits(); + config.save(); + } + private ChatColor operatorColor = null; @Override diff --git a/Essentials/src/com/earth2me/essentials/UserMap.java b/Essentials/src/com/earth2me/essentials/UserMap.java index 1d2870d4b..0aa2efb7f 100644 --- a/Essentials/src/com/earth2me/essentials/UserMap.java +++ b/Essentials/src/com/earth2me/essentials/UserMap.java @@ -1,7 +1,6 @@ package com.earth2me.essentials; import com.earth2me.essentials.utils.StringUtil; -import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; diff --git a/Essentials/src/com/earth2me/essentials/api/IItemDb.java b/Essentials/src/com/earth2me/essentials/api/IItemDb.java index 12aab0223..b5755bcd3 100644 --- a/Essentials/src/com/earth2me/essentials/api/IItemDb.java +++ b/Essentials/src/com/earth2me/essentials/api/IItemDb.java @@ -16,4 +16,6 @@ public interface IItemDb { public String name(ItemStack item); List getMatching(User user, String[] args) throws Exception; + + public String serialize(ItemStack is); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandcreatekit.java b/Essentials/src/com/earth2me/essentials/commands/Commandcreatekit.java new file mode 100644 index 000000000..072d65831 --- /dev/null +++ b/Essentials/src/com/earth2me/essentials/commands/Commandcreatekit.java @@ -0,0 +1,41 @@ +package com.earth2me.essentials.commands; + +import com.earth2me.essentials.User; +import org.bukkit.Material; +import org.bukkit.Server; +import org.bukkit.inventory.ItemStack; + +import java.util.ArrayList; +import java.util.List; + +import static com.earth2me.essentials.I18n.tl; + +public class Commandcreatekit extends EssentialsCommand { + + public Commandcreatekit() { + super("createkit"); + } + + // /createkit + @Override + public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { + if (args.length != 2) { + throw new NotEnoughArgumentsException(); + } + + // Command handler will auto fail if this fails. + long delay = Long.valueOf(args[1]); + String kitname = args[0]; + ItemStack[] items = user.getBase().getInventory().getContents(); + List list = new ArrayList(); + for (ItemStack is : items) { + if (is != null && is.getType() != null && is.getType() != Material.AIR) { + String serialized = ess.getItemDb().serialize(is); + list.add(serialized); + } + } + + ess.getSettings().addKit(kitname, list, delay); + user.sendMessage(tl("createdKit", kitname, list.size(), delay)); + } +} diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java b/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java index 90c245720..0b6b58637 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java @@ -65,7 +65,7 @@ public class Commandgamemode extends EssentialsCommand { throw new NotEnoughArgumentsException(tl("gameModeInvalid")); } - if(sender.isPlayer() && canChangeToMode(sender.getPlayer(), gameMode)) { + if (sender.isPlayer() && canChangeToMode(sender.getPlayer(), gameMode)) { sender.sendMessage(tl("cantGamemode", gameMode.name())); return; } diff --git a/Essentials/src/com/earth2me/essentials/utils/LocationUtil.java b/Essentials/src/com/earth2me/essentials/utils/LocationUtil.java index 2366fa4e9..c578c6cf9 100644 --- a/Essentials/src/com/earth2me/essentials/utils/LocationUtil.java +++ b/Essentials/src/com/earth2me/essentials/utils/LocationUtil.java @@ -170,11 +170,11 @@ public class LocationUtil { } } Collections.sort(pos, new Comparator() { - @Override - public int compare(Vector3D a, Vector3D b) { - return (a.x * a.x + a.y * a.y + a.z * a.z) - (b.x * b.x + b.y * b.y + b.z * b.z); - } - }); + @Override + public int compare(Vector3D a, Vector3D b) { + return (a.x * a.x + a.y * a.y + a.z * a.z) - (b.x * b.x + b.y * b.y + b.z * b.z); + } + }); VOLUME = pos.toArray(new Vector3D[0]); } diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties index 304642cc8..3508ae396 100644 --- a/Essentials/src/messages.properties +++ b/Essentials/src/messages.properties @@ -557,4 +557,5 @@ playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1} cantGamemode=\u00a74You do not have permission to change to gamemode {0} createKit=\u00a74/createkit -createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries. \ No newline at end of file +createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} +spectator=spectator \ No newline at end of file diff --git a/Essentials/src/messages_cs.properties b/Essentials/src/messages_cs.properties index 068709289..7eda67fa7 100644 --- a/Essentials/src/messages_cs.properties +++ b/Essentials/src/messages_cs.properties @@ -556,4 +556,6 @@ mailMessage={0} whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0} playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76. mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1} -cantGamemode=\u00a74You do not have permission to change to gamemode {0} \ No newline at end of file +cantGamemode=\u00a74You do not have permission to change to gamemode {0} +createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} +spectator=spectator \ No newline at end of file diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties index 73953e325..cedf8743f 100644 --- a/Essentials/src/messages_da.properties +++ b/Essentials/src/messages_da.properties @@ -556,4 +556,6 @@ mailMessage={0} whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0} playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76. mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1} -cantGamemode=\u00a74You do not have permission to change to gamemode {0} \ No newline at end of file +cantGamemode=\u00a74You do not have permission to change to gamemode {0} +createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} +spectator=spectator \ No newline at end of file diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties index ae31f7052..341e64e47 100644 --- a/Essentials/src/messages_de.properties +++ b/Essentials/src/messages_de.properties @@ -556,4 +556,6 @@ mailMessage={0} whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0} playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76. mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1} -cantGamemode=\u00a74You do not have permission to change to gamemode {0} \ No newline at end of file +cantGamemode=\u00a74You do not have permission to change to gamemode {0} +createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} +spectator=spectator \ No newline at end of file diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties index ae7166c3b..5ed96e68e 100644 --- a/Essentials/src/messages_en.properties +++ b/Essentials/src/messages_en.properties @@ -555,4 +555,6 @@ mailMessage={0} whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0} playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76. mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1} -cantGamemode=\u00a74You do not have permission to change to gamemode {0} \ No newline at end of file +cantGamemode=\u00a74You do not have permission to change to gamemode {0} +createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} +spectator=spectator \ No newline at end of file diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties index 98b0051f5..0d66b254d 100644 --- a/Essentials/src/messages_es.properties +++ b/Essentials/src/messages_es.properties @@ -556,4 +556,6 @@ mailMessage={0} whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0} playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76. mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1} -cantGamemode=\u00a74You do not have permission to change to gamemode {0} \ No newline at end of file +cantGamemode=\u00a74You do not have permission to change to gamemode {0} +createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} +spectator=spectator \ No newline at end of file diff --git a/Essentials/src/messages_et.properties b/Essentials/src/messages_et.properties index da010045b..3a04d2d55 100644 --- a/Essentials/src/messages_et.properties +++ b/Essentials/src/messages_et.properties @@ -556,4 +556,6 @@ mailMessage={0} whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0} playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76. mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1} -cantGamemode=\u00a74You do not have permission to change to gamemode {0} \ No newline at end of file +cantGamemode=\u00a74You do not have permission to change to gamemode {0} +createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} +spectator=spectator \ No newline at end of file diff --git a/Essentials/src/messages_fi.properties b/Essentials/src/messages_fi.properties index f52d7835c..0a317b9b7 100644 --- a/Essentials/src/messages_fi.properties +++ b/Essentials/src/messages_fi.properties @@ -556,4 +556,6 @@ mailMessage={0} whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0} playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76. mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1} -cantGamemode=\u00a74You do not have permission to change to gamemode {0} \ No newline at end of file +cantGamemode=\u00a74You do not have permission to change to gamemode {0} +createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} +spectator=spectator \ No newline at end of file diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties index 74affff77..24574723b 100644 --- a/Essentials/src/messages_fr.properties +++ b/Essentials/src/messages_fr.properties @@ -556,4 +556,6 @@ mailMessage={0} whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0} playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76. mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1} -cantGamemode=\u00a74You do not have permission to change to gamemode {0} \ No newline at end of file +cantGamemode=\u00a74You do not have permission to change to gamemode {0} +createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} +spectator=spectator \ No newline at end of file diff --git a/Essentials/src/messages_hu.properties b/Essentials/src/messages_hu.properties index b3bc11ace..0d3222116 100644 --- a/Essentials/src/messages_hu.properties +++ b/Essentials/src/messages_hu.properties @@ -556,4 +556,6 @@ mailMessage={0} whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0} playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76. mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1} -cantGamemode=\u00a74You do not have permission to change to gamemode {0} \ No newline at end of file +cantGamemode=\u00a74You do not have permission to change to gamemode {0} +createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} +spectator=spectator \ No newline at end of file diff --git a/Essentials/src/messages_it.properties b/Essentials/src/messages_it.properties index 7b467655c..ffe7aa249 100644 --- a/Essentials/src/messages_it.properties +++ b/Essentials/src/messages_it.properties @@ -556,4 +556,6 @@ mailMessage={0} whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0} playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76. mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1} -cantGamemode=\u00a74You do not have permission to change to gamemode {0} \ No newline at end of file +cantGamemode=\u00a74You do not have permission to change to gamemode {0} +createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} +spectator=spectator \ No newline at end of file diff --git a/Essentials/src/messages_ko.properties b/Essentials/src/messages_ko.properties index 9856488a0..63e5db367 100644 --- a/Essentials/src/messages_ko.properties +++ b/Essentials/src/messages_ko.properties @@ -556,4 +556,6 @@ mailMessage={0} whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0} playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76. mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1} -cantGamemode=\u00a74You do not have permission to change to gamemode {0} \ No newline at end of file +cantGamemode=\u00a74You do not have permission to change to gamemode {0} +createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} +spectator=spectator \ No newline at end of file diff --git a/Essentials/src/messages_lt.properties b/Essentials/src/messages_lt.properties index 7ac534ceb..6177df874 100644 --- a/Essentials/src/messages_lt.properties +++ b/Essentials/src/messages_lt.properties @@ -556,4 +556,6 @@ mailMessage={0} whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0} playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76. mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1} -cantGamemode=\u00a74You do not have permission to change to gamemode {0} \ No newline at end of file +cantGamemode=\u00a74You do not have permission to change to gamemode {0} +createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} +spectator=spectator \ No newline at end of file diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties index 8b19b91b2..f745d35c6 100644 --- a/Essentials/src/messages_nl.properties +++ b/Essentials/src/messages_nl.properties @@ -556,4 +556,6 @@ mailMessage={0} whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0} playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76. mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1} -cantGamemode=\u00a74You do not have permission to change to gamemode {0} \ No newline at end of file +cantGamemode=\u00a74You do not have permission to change to gamemode {0} +createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} +spectator=spectator \ No newline at end of file diff --git a/Essentials/src/messages_pl.properties b/Essentials/src/messages_pl.properties index 889c776c6..0239a5d9d 100644 --- a/Essentials/src/messages_pl.properties +++ b/Essentials/src/messages_pl.properties @@ -556,4 +556,6 @@ mailMessage={0} whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0} playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76. mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1} -cantGamemode=\u00a74You do not have permission to change to gamemode {0} \ No newline at end of file +cantGamemode=\u00a74You do not have permission to change to gamemode {0} +createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} +spectator=spectator \ No newline at end of file diff --git a/Essentials/src/messages_pt.properties b/Essentials/src/messages_pt.properties index 057be1b51..e2ac20863 100644 --- a/Essentials/src/messages_pt.properties +++ b/Essentials/src/messages_pt.properties @@ -556,4 +556,6 @@ mailMessage={0} whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0} playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76. mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1} -cantGamemode=\u00a74You do not have permission to change to gamemode {0} \ No newline at end of file +cantGamemode=\u00a74You do not have permission to change to gamemode {0} +createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} +spectator=spectator \ No newline at end of file diff --git a/Essentials/src/messages_pt_BR.properties b/Essentials/src/messages_pt_BR.properties index 65de6ea67..701075c14 100644 --- a/Essentials/src/messages_pt_BR.properties +++ b/Essentials/src/messages_pt_BR.properties @@ -556,4 +556,6 @@ mailMessage={0} whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0} playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76. mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1} -cantGamemode=\u00a74You do not have permission to change to gamemode {0} \ No newline at end of file +cantGamemode=\u00a74You do not have permission to change to gamemode {0} +createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} +spectator=spectator \ No newline at end of file diff --git a/Essentials/src/messages_ro.properties b/Essentials/src/messages_ro.properties index efdf6c96c..fc803b210 100644 --- a/Essentials/src/messages_ro.properties +++ b/Essentials/src/messages_ro.properties @@ -556,4 +556,6 @@ mailMessage={0} whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0} playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76. mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1} -cantGamemode=\u00a74You do not have permission to change to gamemode {0} \ No newline at end of file +cantGamemode=\u00a74You do not have permission to change to gamemode {0} +createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} +spectator=spectator \ No newline at end of file diff --git a/Essentials/src/messages_ru.properties b/Essentials/src/messages_ru.properties index f1dd5b180..1f9ca1ad3 100644 --- a/Essentials/src/messages_ru.properties +++ b/Essentials/src/messages_ru.properties @@ -556,4 +556,6 @@ mailMessage={0} whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0} playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76. mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1} -cantGamemode=\u00a74You do not have permission to change to gamemode {0} \ No newline at end of file +cantGamemode=\u00a74You do not have permission to change to gamemode {0} +createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} +spectator=spectator \ No newline at end of file diff --git a/Essentials/src/messages_sv.properties b/Essentials/src/messages_sv.properties index 66702217f..a27859f89 100644 --- a/Essentials/src/messages_sv.properties +++ b/Essentials/src/messages_sv.properties @@ -556,4 +556,6 @@ mailMessage={0} whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0} playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76. mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1} -cantGamemode=\u00a74You do not have permission to change to gamemode {0} \ No newline at end of file +cantGamemode=\u00a74You do not have permission to change to gamemode {0} +createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} +spectator=spectator \ No newline at end of file diff --git a/Essentials/src/messages_tr.properties b/Essentials/src/messages_tr.properties index 29e709da1..e380d3733 100644 --- a/Essentials/src/messages_tr.properties +++ b/Essentials/src/messages_tr.properties @@ -556,4 +556,6 @@ mailMessage={0} whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0} playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76. mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1} -cantGamemode=\u00a74You do not have permission to change to gamemode {0} \ No newline at end of file +cantGamemode=\u00a74You do not have permission to change to gamemode {0} +createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} +spectator=spectator \ No newline at end of file diff --git a/Essentials/src/messages_zh.properties b/Essentials/src/messages_zh.properties index 7b1bdb03f..c034b28ad 100644 --- a/Essentials/src/messages_zh.properties +++ b/Essentials/src/messages_zh.properties @@ -556,4 +556,6 @@ mailMessage={0} whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0} playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76. mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1} -cantGamemode=\u00a74You do not have permission to change to gamemode {0} \ No newline at end of file +cantGamemode=\u00a74You do not have permission to change to gamemode {0} +createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} +spectator=spectator \ No newline at end of file diff --git a/Essentials/src/messages_zh_HK.properties b/Essentials/src/messages_zh_HK.properties index 39eb0d9ac..ecd6cf952 100644 --- a/Essentials/src/messages_zh_HK.properties +++ b/Essentials/src/messages_zh_HK.properties @@ -556,4 +556,6 @@ mailMessage={0} whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0} playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76. mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1} -cantGamemode=\u00a74You do not have permission to change to gamemode {0} \ No newline at end of file +cantGamemode=\u00a74You do not have permission to change to gamemode {0} +createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} +spectator=spectator \ No newline at end of file diff --git a/Essentials/src/messages_zh_TW.properties b/Essentials/src/messages_zh_TW.properties index bd916c326..3310e90dc 100644 --- a/Essentials/src/messages_zh_TW.properties +++ b/Essentials/src/messages_zh_TW.properties @@ -556,4 +556,6 @@ mailMessage={0} whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0} playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76. mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1} -cantGamemode=\u00a74You do not have permission to change to gamemode {0} \ No newline at end of file +cantGamemode=\u00a74You do not have permission to change to gamemode {0} +createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} +spectator=spectator \ No newline at end of file diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml index 04bb2f674..5c84fa7e5 100644 --- a/Essentials/src/plugin.yml +++ b/Essentials/src/plugin.yml @@ -71,6 +71,10 @@ commands: description: Describes your current bearing. usage: / aliases: [ecompass,direction,edirection] + createkit: + description: Create a kit in game! + usage: / + aliases: [kitcreate,createk,kc,ck] customtext: description: Allows you to create custom text commands. usage: / - Define in bukkit.yml @@ -132,8 +136,8 @@ commands: aliases: [efirework] gamemode: description: Change player gamemode. - usage: / [player] - aliases: [adventure,eadventure,adventuremode,eadventuremode,creative,eecreative,creativemode,ecreativemode,egamemode,gm,egm,gma,egma,gmc,egmc,gms,egms,gmt,egmt,survival,esurvival,survivalmode,esurvivalmode,gmsp,sp,egmsp,spec] + usage: / [player] + aliases: [adventure,eadventure,adventuremode,eadventuremode,creative,eecreative,creativemode,ecreativemode,egamemode,gm,egm,gma,egma,gmc,egmc,gms,egms,gmt,egmt,survival,esurvival,survivalmode,esurvivalmode,gmsp,sp,egmsp,spec,spectator] gc: description: Reports memory, uptime and tick info. usage: / [all]