diff --git a/Essentials/pom.xml b/Essentials/pom.xml index 7bb17d3d4..f531dd4a2 100644 --- a/Essentials/pom.xml +++ b/Essentials/pom.xml @@ -47,7 +47,7 @@ maven-compiler-plugin 2.3.2 - true + false diff --git a/Essentials/src/com/earth2me/essentials/Kit.java b/Essentials/src/com/earth2me/essentials/Kit.java index b3259e5a7..cb65f8a15 100644 --- a/Essentials/src/com/earth2me/essentials/Kit.java +++ b/Essentials/src/com/earth2me/essentials/Kit.java @@ -146,7 +146,12 @@ public class Kit { } } + @Deprecated public List getItems(final User user) throws Exception { + return getItems(); + } + + public List getItems() throws Exception { if (kit == null) { throw new Exception(tl("kitNotFound")); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandshowkit.java b/Essentials/src/com/earth2me/essentials/commands/Commandshowkit.java new file mode 100644 index 000000000..60716075d --- /dev/null +++ b/Essentials/src/com/earth2me/essentials/commands/Commandshowkit.java @@ -0,0 +1,32 @@ +package com.earth2me.essentials.commands; + +import com.earth2me.essentials.Kit; +import com.earth2me.essentials.User; +import org.bukkit.Server; + +import java.util.Locale; + +import static com.earth2me.essentials.I18n.tl; + +public class Commandshowkit extends EssentialsCommand { + + public Commandshowkit() { + super("showkit"); + } + + @Override + public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { + if (args.length != 1) { + throw new NotEnoughArgumentsException(); + } + + final String[] kits = args[0].toLowerCase(Locale.ENGLISH).split(","); + for (final String kitName : kits) { + Kit kit = new Kit(kitName, ess); + user.sendMessage(tl("kitContains", kitName)); + for (String s : kit.getItems()) { + user.sendMessage(tl("kitItem", s)); + } + } + } +} diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties index 3508ae396..51fb9f3cc 100644 --- a/Essentials/src/messages.properties +++ b/Essentials/src/messages.properties @@ -558,4 +558,6 @@ 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 and delay \u00a7c{2} -spectator=spectator \ No newline at end of file +spectator=spectator +kitContains=\u00a76Kit \u00a7c{0} \u00a76contains: +kitItem=\u00a76- \u00a7f{0} \ No newline at end of file diff --git a/Essentials/src/messages_cs.properties b/Essentials/src/messages_cs.properties index 7eda67fa7..6af9d4a72 100644 --- a/Essentials/src/messages_cs.properties +++ b/Essentials/src/messages_cs.properties @@ -558,4 +558,6 @@ 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} createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} -spectator=spectator \ No newline at end of file +spectator=spectator +kitContains=\u00a76Kit \u00a7c{0} \u00a76contains: +kitItem=\u00a76- \u00a7f{0} \ No newline at end of file diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties index cedf8743f..c0b3f427d 100644 --- a/Essentials/src/messages_da.properties +++ b/Essentials/src/messages_da.properties @@ -558,4 +558,6 @@ 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} createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} -spectator=spectator \ No newline at end of file +spectator=spectator +kitContains=\u00a76Kit \u00a7c{0} \u00a76contains: +kitItem=\u00a76- \u00a7f{0} \ No newline at end of file diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties index 341e64e47..0200b2a2f 100644 --- a/Essentials/src/messages_de.properties +++ b/Essentials/src/messages_de.properties @@ -558,4 +558,6 @@ 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} createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} -spectator=spectator \ No newline at end of file +spectator=spectator +kitContains=\u00a76Kit \u00a7c{0} \u00a76contains: +kitItem=\u00a76- \u00a7f{0} \ No newline at end of file diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties index 5ed96e68e..b16a2dfb9 100644 --- a/Essentials/src/messages_en.properties +++ b/Essentials/src/messages_en.properties @@ -557,4 +557,6 @@ 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} createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} -spectator=spectator \ No newline at end of file +spectator=spectator +kitContains=\u00a76Kit \u00a7c{0} \u00a76contains: +kitItem=\u00a76- \u00a7f{0} \ No newline at end of file diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties index 0d66b254d..cc3f2befa 100644 --- a/Essentials/src/messages_es.properties +++ b/Essentials/src/messages_es.properties @@ -558,4 +558,6 @@ 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} createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} -spectator=spectator \ No newline at end of file +spectator=spectator +kitContains=\u00a76Kit \u00a7c{0} \u00a76contains: +kitItem=\u00a76- \u00a7f{0} \ No newline at end of file diff --git a/Essentials/src/messages_et.properties b/Essentials/src/messages_et.properties index 3a04d2d55..e94c04a7c 100644 --- a/Essentials/src/messages_et.properties +++ b/Essentials/src/messages_et.properties @@ -558,4 +558,6 @@ 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} createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} -spectator=spectator \ No newline at end of file +spectator=spectator +kitContains=\u00a76Kit \u00a7c{0} \u00a76contains: +kitItem=\u00a76- \u00a7f{0} \ No newline at end of file diff --git a/Essentials/src/messages_fi.properties b/Essentials/src/messages_fi.properties index 0a317b9b7..7ec9f2cc3 100644 --- a/Essentials/src/messages_fi.properties +++ b/Essentials/src/messages_fi.properties @@ -558,4 +558,6 @@ 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} createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} -spectator=spectator \ No newline at end of file +spectator=spectator +kitContains=\u00a76Kit \u00a7c{0} \u00a76contains: +kitItem=\u00a76- \u00a7f{0} \ No newline at end of file diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties index 24574723b..083adac74 100644 --- a/Essentials/src/messages_fr.properties +++ b/Essentials/src/messages_fr.properties @@ -558,4 +558,6 @@ 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} createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} -spectator=spectator \ No newline at end of file +spectator=spectator +kitContains=\u00a76Kit \u00a7c{0} \u00a76contains: +kitItem=\u00a76- \u00a7f{0} \ No newline at end of file diff --git a/Essentials/src/messages_hu.properties b/Essentials/src/messages_hu.properties index 0d3222116..24a9787d9 100644 --- a/Essentials/src/messages_hu.properties +++ b/Essentials/src/messages_hu.properties @@ -558,4 +558,6 @@ 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} createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} -spectator=spectator \ No newline at end of file +spectator=spectator +kitContains=\u00a76Kit \u00a7c{0} \u00a76contains: +kitItem=\u00a76- \u00a7f{0} \ No newline at end of file diff --git a/Essentials/src/messages_it.properties b/Essentials/src/messages_it.properties index ffe7aa249..838899c5b 100644 --- a/Essentials/src/messages_it.properties +++ b/Essentials/src/messages_it.properties @@ -558,4 +558,6 @@ 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} createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} -spectator=spectator \ No newline at end of file +spectator=spectator +kitContains=\u00a76Kit \u00a7c{0} \u00a76contains: +kitItem=\u00a76- \u00a7f{0} \ No newline at end of file diff --git a/Essentials/src/messages_ko.properties b/Essentials/src/messages_ko.properties index 63e5db367..382ca0a8d 100644 --- a/Essentials/src/messages_ko.properties +++ b/Essentials/src/messages_ko.properties @@ -558,4 +558,6 @@ 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} createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} -spectator=spectator \ No newline at end of file +spectator=spectator +kitContains=\u00a76Kit \u00a7c{0} \u00a76contains: +kitItem=\u00a76- \u00a7f{0} \ No newline at end of file diff --git a/Essentials/src/messages_lt.properties b/Essentials/src/messages_lt.properties index 6177df874..269ed3a58 100644 --- a/Essentials/src/messages_lt.properties +++ b/Essentials/src/messages_lt.properties @@ -558,4 +558,6 @@ 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} createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} -spectator=spectator \ No newline at end of file +spectator=spectator +kitContains=\u00a76Kit \u00a7c{0} \u00a76contains: +kitItem=\u00a76- \u00a7f{0} \ No newline at end of file diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties index f745d35c6..81d04a1d8 100644 --- a/Essentials/src/messages_nl.properties +++ b/Essentials/src/messages_nl.properties @@ -558,4 +558,6 @@ 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} createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} -spectator=spectator \ No newline at end of file +spectator=spectator +kitContains=\u00a76Kit \u00a7c{0} \u00a76contains: +kitItem=\u00a76- \u00a7f{0} \ No newline at end of file diff --git a/Essentials/src/messages_pl.properties b/Essentials/src/messages_pl.properties index 0239a5d9d..c0cf46aef 100644 --- a/Essentials/src/messages_pl.properties +++ b/Essentials/src/messages_pl.properties @@ -558,4 +558,6 @@ 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} createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} -spectator=spectator \ No newline at end of file +spectator=spectator +kitContains=\u00a76Kit \u00a7c{0} \u00a76contains: +kitItem=\u00a76- \u00a7f{0} \ No newline at end of file diff --git a/Essentials/src/messages_pt.properties b/Essentials/src/messages_pt.properties index e2ac20863..94802b0a5 100644 --- a/Essentials/src/messages_pt.properties +++ b/Essentials/src/messages_pt.properties @@ -558,4 +558,6 @@ 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} createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} -spectator=spectator \ No newline at end of file +spectator=spectator +kitContains=\u00a76Kit \u00a7c{0} \u00a76contains: +kitItem=\u00a76- \u00a7f{0} \ No newline at end of file diff --git a/Essentials/src/messages_pt_BR.properties b/Essentials/src/messages_pt_BR.properties index 701075c14..ca992496b 100644 --- a/Essentials/src/messages_pt_BR.properties +++ b/Essentials/src/messages_pt_BR.properties @@ -558,4 +558,6 @@ 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} createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} -spectator=spectator \ No newline at end of file +spectator=spectator +kitContains=\u00a76Kit \u00a7c{0} \u00a76contains: +kitItem=\u00a76- \u00a7f{0} \ No newline at end of file diff --git a/Essentials/src/messages_ro.properties b/Essentials/src/messages_ro.properties index fc803b210..5965842f7 100644 --- a/Essentials/src/messages_ro.properties +++ b/Essentials/src/messages_ro.properties @@ -558,4 +558,6 @@ 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} createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} -spectator=spectator \ No newline at end of file +spectator=spectator +kitContains=\u00a76Kit \u00a7c{0} \u00a76contains: +kitItem=\u00a76- \u00a7f{0} \ No newline at end of file diff --git a/Essentials/src/messages_ru.properties b/Essentials/src/messages_ru.properties index 1f9ca1ad3..0995dcc25 100644 --- a/Essentials/src/messages_ru.properties +++ b/Essentials/src/messages_ru.properties @@ -558,4 +558,6 @@ 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} createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} -spectator=spectator \ No newline at end of file +spectator=spectator +kitContains=\u00a76Kit \u00a7c{0} \u00a76contains: +kitItem=\u00a76- \u00a7f{0} \ No newline at end of file diff --git a/Essentials/src/messages_sv.properties b/Essentials/src/messages_sv.properties index a27859f89..782540702 100644 --- a/Essentials/src/messages_sv.properties +++ b/Essentials/src/messages_sv.properties @@ -558,4 +558,6 @@ 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} createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} -spectator=spectator \ No newline at end of file +spectator=spectator +kitContains=\u00a76Kit \u00a7c{0} \u00a76contains: +kitItem=\u00a76- \u00a7f{0} \ No newline at end of file diff --git a/Essentials/src/messages_tr.properties b/Essentials/src/messages_tr.properties index e380d3733..6f3563ad2 100644 --- a/Essentials/src/messages_tr.properties +++ b/Essentials/src/messages_tr.properties @@ -558,4 +558,6 @@ 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} createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} -spectator=spectator \ No newline at end of file +spectator=spectator +kitContains=\u00a76Kit \u00a7c{0} \u00a76contains: +kitItem=\u00a76- \u00a7f{0} \ No newline at end of file diff --git a/Essentials/src/messages_zh.properties b/Essentials/src/messages_zh.properties index c034b28ad..a988b236a 100644 --- a/Essentials/src/messages_zh.properties +++ b/Essentials/src/messages_zh.properties @@ -558,4 +558,6 @@ 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} createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} -spectator=spectator \ No newline at end of file +spectator=spectator +kitContains=\u00a76Kit \u00a7c{0} \u00a76contains: +kitItem=\u00a76- \u00a7f{0} \ No newline at end of file diff --git a/Essentials/src/messages_zh_HK.properties b/Essentials/src/messages_zh_HK.properties index ecd6cf952..86c0646f1 100644 --- a/Essentials/src/messages_zh_HK.properties +++ b/Essentials/src/messages_zh_HK.properties @@ -558,4 +558,6 @@ 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} createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} -spectator=spectator \ No newline at end of file +spectator=spectator +kitContains=\u00a76Kit \u00a7c{0} \u00a76contains: +kitItem=\u00a76- \u00a7f{0} \ No newline at end of file diff --git a/Essentials/src/messages_zh_TW.properties b/Essentials/src/messages_zh_TW.properties index 3310e90dc..c765e7f0b 100644 --- a/Essentials/src/messages_zh_TW.properties +++ b/Essentials/src/messages_zh_TW.properties @@ -558,4 +558,6 @@ 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} createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2} -spectator=spectator \ No newline at end of file +spectator=spectator +kitContains=\u00a76Kit \u00a7c{0} \u00a76contains: +kitItem=\u00a76- \u00a7f{0} \ No newline at end of file diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml index c147c7428..967822870 100644 --- a/Essentials/src/plugin.yml +++ b/Essentials/src/plugin.yml @@ -342,6 +342,10 @@ commands: description: Set the sell value of an item. usage: / [itemname|id] aliases: [esetworth] + showkit: + description: Show contents of a kit. + usage: / + aliases: [kitpreview,preview,kitshow] skull: description: Set the owner of a player skull usage: / [owner]