From b008cdc5f6d6a021f9e74111d40e5abd8c6a6cb5 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sat, 18 May 2013 18:20:06 +0100 Subject: [Feature] Add hunger level to /whois --- .../earth2me/essentials/commands/Commandfeed.java | 25 ++++++++++++++++------ .../earth2me/essentials/commands/Commandwhois.java | 1 + Essentials/src/messages.properties | 1 + Essentials/src/messages_cs.properties | 1 + Essentials/src/messages_da.properties | 1 + Essentials/src/messages_de.properties | 1 + Essentials/src/messages_en.properties | 1 + Essentials/src/messages_es.properties | 1 + Essentials/src/messages_fi.properties | 1 + Essentials/src/messages_fr.properties | 7 +++--- Essentials/src/messages_it.properties | 1 + Essentials/src/messages_nl.properties | 1 + Essentials/src/messages_pl.properties | 1 + Essentials/src/messages_pt.properties | 1 + Essentials/src/messages_ro.properties | 1 + Essentials/src/messages_se.properties | 1 + Essentials/src/messages_zh.properties | 1 + Essentials/src/messages_zh_HK.properties | 1 + Essentials/src/messages_zh_TW.properties | 1 + 19 files changed, 40 insertions(+), 9 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandfeed.java b/Essentials/src/com/earth2me/essentials/commands/Commandfeed.java index 4b9f79452..73cce659e 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandfeed.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandfeed.java @@ -37,7 +37,14 @@ public class Commandfeed extends EssentialsCommand { user.healCooldown(); } - feedPlayer(user, user); + try + { + feedPlayer(user, user); + } + catch (QuietAbortException e) + { + //User does not need feeding. + } } @Override @@ -51,7 +58,7 @@ public class Commandfeed extends EssentialsCommand feedOtherPlayers(server, sender, args[0]); } - private void feedOtherPlayers(final Server server, final CommandSender sender, final String name) throws NotEnoughArgumentsException, QuietAbortException + private void feedOtherPlayers(final Server server, final CommandSender sender, final String name) throws NotEnoughArgumentsException { boolean skipHidden = sender instanceof Player && !ess.getUser(sender).isAuthorized("essentials.vanish.interact"); boolean foundUser = false; @@ -64,8 +71,14 @@ public class Commandfeed extends EssentialsCommand continue; } foundUser = true; - feedPlayer(sender, matchPlayer); - + try + { + feedPlayer(sender, matchPlayer); + } + catch (QuietAbortException e) + { + //User does not need feeding. + } } if (!foundUser) { @@ -83,8 +96,8 @@ public class Commandfeed extends EssentialsCommand { throw new QuietAbortException(); } - - player.setFoodLevel(flce.getFoodLevel()); + + player.setFoodLevel(flce.getFoodLevel() > 20 ? 20 : flce.getFoodLevel()); player.setSaturation(10); sender.sendMessage(sender.equals(player) ? _("feed") : _("feedOther", player.getDisplayName())); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java b/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java index 4a6903ae4..e95d14834 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java @@ -58,6 +58,7 @@ public class Commandwhois extends EssentialsCommand user.setDisplayNick(); sender.sendMessage(_("whoisNick", user.getDisplayName())); sender.sendMessage(_("whoisHealth", user.getHealth())); + sender.sendMessage(_("whoisHunger", user.getFoodLevel(), user.getSaturation())); sender.sendMessage(_("whoisExp", SetExpFix.getTotalExperience(user), user.getLevel())); sender.sendMessage(_("whoisLocation", user.getLocation().getWorld().getName(), user.getLocation().getBlockX(), user.getLocation().getBlockY(), user.getLocation().getBlockZ())); if (!ess.getSettings().isEcoDisabled()) diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties index 9eb1d3fa8..7f78033ab 100644 --- a/Essentials/src/messages.properties +++ b/Essentials/src/messages.properties @@ -539,3 +539,4 @@ year=year years=years youAreHealed=\u00a76You have been healed. youHaveNewMail=\u00a76You have\u00a7c {0} \u00a76messages! Type \u00a7c/mail read\u00a76 to view your mail. +whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation) diff --git a/Essentials/src/messages_cs.properties b/Essentials/src/messages_cs.properties index 75a9cd73c..94839e299 100644 --- a/Essentials/src/messages_cs.properties +++ b/Essentials/src/messages_cs.properties @@ -543,3 +543,4 @@ year=rok years=roky youAreHealed=\u00a77Byl jsi uzdraven. youHaveNewMail=\u00a7cMas {0} zprav!\u00a7f Napis \u00a77/mail read\u00a7f aby jsi si precetl sve zpravy. +whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation) diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties index 97d59727f..605d6b7d5 100644 --- a/Essentials/src/messages_da.properties +++ b/Essentials/src/messages_da.properties @@ -539,3 +539,4 @@ year=\u00e5r years=\u00e5r youAreHealed=\u00a77Du er blevet healed. Halleluja! youHaveNewMail=\u00a7cDu har {0} flaskeposter!\u00a7f Type \u00a77/mail read for at se din flaskepost. +whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation) diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties index 8dbb42ce5..69f80fcb1 100644 --- a/Essentials/src/messages_de.properties +++ b/Essentials/src/messages_de.properties @@ -539,3 +539,4 @@ year=Jahr years=Jahre youAreHealed=\u00a77Du wurdest geheilt. youHaveNewMail=\u00a7cDu hast {0} Nachrichten!\u00a7f Schreibe \u00a77/mail read\u00a7f um deine Nachrichten anzuzeigen. +whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation) diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties index 9eb1d3fa8..7f78033ab 100644 --- a/Essentials/src/messages_en.properties +++ b/Essentials/src/messages_en.properties @@ -539,3 +539,4 @@ year=year years=years youAreHealed=\u00a76You have been healed. youHaveNewMail=\u00a76You have\u00a7c {0} \u00a76messages! Type \u00a7c/mail read\u00a76 to view your mail. +whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation) diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties index 56a8c87c6..ebf960ce3 100644 --- a/Essentials/src/messages_es.properties +++ b/Essentials/src/messages_es.properties @@ -539,3 +539,4 @@ year=ano years=anos youAreHealed=\u00a77Has sido curado. youHaveNewMail=\u00a7cTienes {0} mensajes!\u00a7f Pon \u00a77/mail read\u00a7f para ver tus emails no leidos!. +whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation) diff --git a/Essentials/src/messages_fi.properties b/Essentials/src/messages_fi.properties index 5fc2870c3..ab964ab30 100644 --- a/Essentials/src/messages_fi.properties +++ b/Essentials/src/messages_fi.properties @@ -539,3 +539,4 @@ year=vuosi years=vuosia youAreHealed=\u00a77Sinut on parannettu. youHaveNewMail=\u00a7cSinulla on {0} viesti(\u00e4)!\u00a7f Kirjoita \u00a77/mail read\u00a7f lukeaksesi viestit. +whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation) diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties index 38ffbf6d2..0e9276ea7 100644 --- a/Essentials/src/messages_fr.properties +++ b/Essentials/src/messages_fr.properties @@ -34,7 +34,7 @@ bedSet=\u00a76Bed spawn set! bigTreeFailure=\u00a7c\u00c9chec de la g\u00e9n\u00e9ration du gros arbre. Essayez de nouveau sur de la terre ou de l'herbe. bigTreeSuccess=\u00a77Gros arbre cr\u00e9e. blockList=Essentials a relay\u00e9 les commandes suivantes \u00e0 un autre plugin : -bookAuthorSet=\u00a76L''auteur du livre a \u00e9t\u00e9 modifi\u00e9 à {0}. +bookAuthorSet=\u00a76L''auteur du livre a \u00e9t\u00e9 modifi\u00e9 \u00c3\u00a0 {0}. bookLocked=\u00a7cCe livre est maintenant sign\u00e9. bookTitleSet=\u00a76Le titre du livre est maintenant {0}. broadcast=[\u00a7cMessage\u00a7f]\u00a7a {0} @@ -495,7 +495,7 @@ userJailed=\u00a77Vous avez \u00e9t\u00e9 emprisonn\u00e9. userUnknown=\u00a74Attention : le joueur \u00a7c{0}\u00a74 n''est jamais venu sur ce serveur. userUsedPortal={0} a utilis\u00e9 un portail existant. userdataMoveBackError=\u00c9chec du d\u00e9placement de userdata/{0}.tmp vers userdata/{1} -userdataMoveError=\u00C9chec du d\u00e9placement de userdata/{0} vers userdata/{1}.tmp +userdataMoveError=\u00c9chec du d\u00e9placement de userdata/{0} vers userdata/{1}.tmp usingTempFolderForTesting=Utilise un fichier temporaire pour un test. vanished=\u00a7aVous \u00eates d\u00e9sormais invisible. versionMismatch=Versions diff\u00e9rentes ! Veuillez mettre {0} \u00e0 la m\u00eame version. @@ -538,4 +538,5 @@ worthSet=Valeur cr\u00e9\u00e9e. year=ann\u00e9e years=ann\u00e9es youAreHealed=\u00a77Vous avez \u00e9t\u00e9 soign\u00e9. -youHaveNewMail=\u00a7cVous avez {0} message(s) ! \u00a7fEntrez \u00a77/mail read\u00a7f pour voir votre courrier. \ No newline at end of file +youHaveNewMail=\u00a7cVous avez {0} message(s) ! \u00a7fEntrez \u00a77/mail read\u00a7f pour voir votre courrier. +whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation) diff --git a/Essentials/src/messages_it.properties b/Essentials/src/messages_it.properties index f08aa15b4..03624ba66 100644 --- a/Essentials/src/messages_it.properties +++ b/Essentials/src/messages_it.properties @@ -539,3 +539,4 @@ year=anno years=anni youAreHealed=\u00a77Sei stato curato. youHaveNewMail=\u00a7cHai {0} messaggi!\u00a7f digita \u00a77/mail read\u00a7f per consultare la tua mail. +whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation) diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties index 12ba8198c..eec193047 100644 --- a/Essentials/src/messages_nl.properties +++ b/Essentials/src/messages_nl.properties @@ -539,3 +539,4 @@ year=jaar years=jaren youAreHealed=\u00a77Je bent genezen. youHaveNewMail=\u00a7cJe hebt {0} berichten!\u00a7f Type \u00a77/mail read\u00a7f om je berichten te bekijken. +whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation) diff --git a/Essentials/src/messages_pl.properties b/Essentials/src/messages_pl.properties index dea7b4b37..c681e7203 100644 --- a/Essentials/src/messages_pl.properties +++ b/Essentials/src/messages_pl.properties @@ -539,3 +539,4 @@ year=rok years=lat youAreHealed=\u00a77Zostales uleczony. youHaveNewMail=\u00a77Masz\u00a7c {0} \u00a77wiadomosci! Wpisz \u00a7c/mail read\u00a77 aby je przeczytac. +whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation) diff --git a/Essentials/src/messages_pt.properties b/Essentials/src/messages_pt.properties index 8b49a0d11..a6442ea26 100644 --- a/Essentials/src/messages_pt.properties +++ b/Essentials/src/messages_pt.properties @@ -539,3 +539,4 @@ year=ano years=anos youAreHealed=\u00a76Voc\u00c3\u00aa foi curado. youHaveNewMail=\u00a76Voc\u00c3\u00aa tem\u00a7c {0} \u00a76mensagens! Digite \u00a7c/mail read\u00a76 para v\u00c3\u00aa-las. +whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation) diff --git a/Essentials/src/messages_ro.properties b/Essentials/src/messages_ro.properties index bc8cddbbb..7f226df3b 100644 --- a/Essentials/src/messages_ro.properties +++ b/Essentials/src/messages_ro.properties @@ -539,3 +539,4 @@ year=an years=ani youAreHealed=\u00a76Ai fost vindecat. youHaveNewMail=\u00a76Ai\u00a7c {0} \u00a76mesaje! scrie \u00a7c/mail read\u00a76 pentru a-ti vedea mesajele. +whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation) diff --git a/Essentials/src/messages_se.properties b/Essentials/src/messages_se.properties index e11d29fe0..75ae9767b 100644 --- a/Essentials/src/messages_se.properties +++ b/Essentials/src/messages_se.properties @@ -539,3 +539,4 @@ year=\u00e5r years=\u00e5r youAreHealed=\u00a77Du har blivit l\u00e4kt. youHaveNewMail=\u00a7cDu har {0} meddelanden!\u00a7f Skriv \u00a77/mail read\u00a7f f\u00f6r att l\u00e4sa dina meddelanden. +whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation) diff --git a/Essentials/src/messages_zh.properties b/Essentials/src/messages_zh.properties index fbda982e7..43158df54 100644 --- a/Essentials/src/messages_zh.properties +++ b/Essentials/src/messages_zh.properties @@ -540,3 +540,4 @@ year=\u5e74 years=\u5e74 youAreHealed=\u00a76\u4f60\u5df2\u88ab\u6cbb\u7597 youHaveNewMail=\u00a76\u4f60\u62e5\u6709 \u00a7c{0}\u00a76 \u6761\u6d88\u606f\uff01\u00a7r\u8f93\u5165 \u00a7c/mail read\u00a76 \u6765\u67e5\u770b +whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation) diff --git a/Essentials/src/messages_zh_HK.properties b/Essentials/src/messages_zh_HK.properties index fafb3b281..f8719d98b 100644 --- a/Essentials/src/messages_zh_HK.properties +++ b/Essentials/src/messages_zh_HK.properties @@ -541,3 +541,4 @@ year=\u5e74 years=\u5e74 youAreHealed=\u00a76\u4f60\u5df2\u88ab\u6cbb\u7642 youHaveNewMail=\u00a76\u4f60\u64c1\u6709 \u00a7c{0}\u00a76 \u689d\u6d88\u606f\uff01\u00a7r\u8f38\u5165 \u00a7c/mail read\u00a76 \u4f86\u67e5\u770b +whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation) diff --git a/Essentials/src/messages_zh_TW.properties b/Essentials/src/messages_zh_TW.properties index 73f95ba9d..0c2dd97bc 100644 --- a/Essentials/src/messages_zh_TW.properties +++ b/Essentials/src/messages_zh_TW.properties @@ -541,3 +541,4 @@ year=\u5e74 years=\u5e74 youAreHealed=\u00a76\u4f60\u5df2\u88ab\u6cbb\u7642 youHaveNewMail=\u00a76\u4f60\u64c1\u6709 \u00a7c{0}\u00a76 \u689d\u6d88\u606f\uff01\u00a7r\u8f38\u5165 \u00a7c/mail read\u00a76 \u4f86\u67e5\u770b +whoisHunger=\u00a76 - Hunger:\u00a7r {0}/20 (+{1} saturation) -- cgit v1.2.3