TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2024-06-28 00:41:01 +00:00
Code Issues Projects Releases Wiki Activity

General cleanup.

Browse source 
Add optional TL param for tempban/mute time in notify message
This commit is contained in:
KHobbits 2013-08-11 21:34:26 +01:00
parent 7401608cc5
commit 8b11b870b1
26 changed files with 23 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Essentials/src/com/earth2me/essentials/commands/Commandburn.java
View file

@ -21,10 +21,9 @@ public class Commandburn extends EssentialsCommand
throw new NotEnoughArgumentsException();
}
//TODO: TL this
if (args[0].trim().length() < 2)
{
throw new NotEnoughArgumentsException("You need to specify a player to burn.");
throw new NotEnoughArgumentsException();
}
User user = getPlayer(server, sender, args, 0);

10
Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java
View file

@ -50,10 +50,12 @@ public class Commanddelhome extends EssentialsCommand
{
name = expandedArg[0];
}
if (name.equalsIgnoreCase("bed")) { throw new Exception(_("invalidHomeName")); }
if (name.equalsIgnoreCase("bed"))
{
throw new Exception(_("invalidHomeName"));
}
user.delHome(name.toLowerCase(Locale.ENGLISH));
sender.sendMessage(_("deleteHome", name));
}

1
Essentials/src/com/earth2me/essentials/commands/Commanddeljail.java
View file

@ -19,6 +19,7 @@ public class Commanddeljail extends EssentialsCommand
{
throw new NotEnoughArgumentsException();
}
ess.getJails().removeJail(args[0]);
sender.sendMessage(_("deleteJail", args[0]));
}

1
Essentials/src/com/earth2me/essentials/commands/Commanddelwarp.java
View file

@ -19,6 +19,7 @@ public class Commanddelwarp extends EssentialsCommand
{
throw new NotEnoughArgumentsException();
}
ess.getWarps().removeWarp(args[0]);
sender.sendMessage(_("deleteWarp", args[0]));
}

8
Essentials/src/com/earth2me/essentials/commands/Commandmute.java
View file

@ -42,19 +42,21 @@ public class Commandmute extends EssentialsCommand
}
player.setMuteTimeout(muteTimestamp);
final boolean muted = player.getMuted();
String muteTime = DateUtil.formatDateDiff(muteTimestamp);
if (muted)
{
if (muteTimestamp > 0)
{
sender.sendMessage(_("mutedPlayerFor", player.getDisplayName(), DateUtil.formatDateDiff(muteTimestamp)));
player.sendMessage(_("playerMutedFor", DateUtil.formatDateDiff(muteTimestamp)));
sender.sendMessage(_("mutedPlayerFor", player.getDisplayName(), muteTime));
player.sendMessage(_("playerMutedFor", muteTime));
}
else
{
sender.sendMessage(_("mutedPlayer", player.getDisplayName()));
player.sendMessage(_("playerMuted"));
}
ess.broadcastMessage("essentials.mute.notify", _("muteNotify", sender.getName(), player.getName()));
ess.broadcastMessage("essentials.mute.notify", _("muteNotify", sender.getName(), player.getName(), muteTime));
}
else
{

9
Essentials/src/com/earth2me/essentials/commands/Commandnear.java
View file

@ -64,14 +64,11 @@ public class Commandnear extends EssentialsCommand
radius = maxRadius;
}
if (otherUser == null || user.isAuthorized("essentials.near.others"))
if (otherUser == null || !user.isAuthorized("essentials.near.others"))
{
user.sendMessage(_("nearbyPlayers", getLocal(server, otherUser == null ? user : otherUser, radius)));
}
else
{
throw new NotEnoughArgumentsException(_("noPerm", "essentials.near.others"));
otherUser = user;
}
user.sendMessage(_("nearbyPlayers", getLocal(server, otherUser, radius)));
}
@Override

12
Essentials/src/com/earth2me/essentials/commands/Commandnick.java
View file

@ -27,17 +27,15 @@ public class Commandnick extends EssentialsCommand
{
throw new Exception(_("nickDisplayName"));
}
if (args.length > 1)
if (args.length > 1 && user.isAuthorized("essentials.nick.others"))
{
if (!user.isAuthorized("essentials.nick.others"))
{
throw new Exception(_("nickOthersPermission"));
}
setNickname(server, getPlayer(server, user, args, 0), formatNickname(user, args[1]));
user.sendMessage(_("nickChanged"));
return;
}
setNickname(server, user, formatNickname(user, args[0]));
else
{
setNickname(server, user, formatNickname(user, args[0]));
}
}
@Override

2
Essentials/src/com/earth2me/essentials/commands/Commandtempban.java
View file

@ -60,6 +60,6 @@ public class Commandtempban extends EssentialsCommand
user.setBanned(true);
user.kickPlayer(banReason);
ess.broadcastMessage("essentials.ban.notify", _("playerBanned", senderName, user.getName(), banReason));
ess.broadcastMessage("essentials.ban.notify", _("playerBanned", senderName, user.getName(), banReason, DateUtil.formatDateDiff(banTimestamp)));
}
}

1
Essentials/src/messages.properties
View file

@ -261,7 +261,6 @@ nickDisplayName=\u00a74You have to enable change-displayname in Essentials confi
nickInUse=\u00a74That name is already in use.
nickNamesAlpha=\u00a74Nicknames must be alphanumeric.
nickNoMore=\u00a76You no longer have a nickname.
nickOthersPermission=\u00a74You do not have permission to change the nickname of others\!
nickSet=\u00a76Your nickname is now \u00a7c{0}
nickTooLong=\u00a74That nickname is too long.
noAccessCommand=\u00a74You do not have access to that command.

1
Essentials/src/messages_cs.properties
View file

@ -266,7 +266,6 @@ nickDisplayName=\u00a77Musis nejdrive povolit change-displayname v Essentials co
nickInUse=\u00a7cTento nick jiz nekdo ma.
nickNamesAlpha=\u00a7cNick musi byt alfanumericky.
nickNoMore=\u00a77Uz nemas zadny nick.
nickOthersPermission=\u00a7cNemas opravneni menit ostatnim nick.
nickSet=\u00a77Nyni mas nickname\: \u00a7c{0}
nickTooLong=\u00a74Tvuj nick je priliz dlouhy.
noAccessCommand=\u00a7cNemas povoleni na tento prikaz.

1
Essentials/src/messages_da.properties
View file

@ -261,7 +261,6 @@ nickDisplayName=\u00a77Du bliver n\u00c3\u00b8dt til at aktivere change-displayn
nickInUse=\u00a7cDet nickname er allerede i brug. Pr\u00c3\u00b8v Jens eller Harald. Det er gode navne.
nickNamesAlpha=\u00a7cNicknames skal v\u00e6re alfanumeriske.
nickNoMore=\u00a7Du har ikke l\u00e6ngere et nickname.
nickOthersPermission=\u00a7cDu har ikke tilladelse til at \u00e6ndre en andens nickname.
nickSet=\u00a77Dit nickname er nu \u00a7c{0}
nickTooLong=\u00a74That nickname is too long.
noAccessCommand=\u00a7cDu har ikke adgang til denne kommando.

1
Essentials/src/messages_de.properties
View file

@ -261,7 +261,6 @@ nickDisplayName=\u00a74Du musst change-displayname in der Essentials-Konfigurati
nickInUse=\u00a74Dieser Name wird bereits verwendet.
nickNamesAlpha=\u00a74Nicknamen d\u00fcrfen nur alphanumerische Zeichen enthalten.
nickNoMore=\u00a76Du hast keinen Spitznamen mehr.
nickOthersPermission=\u00a74Du hast keine Rechte um den Spitznamen von anderen zu \u00e4ndern.
nickSet=\u00a76Dein Spitzname ist nun \u00a7c{0}
nickTooLong=\u00a74Dieser Spitzname ist zu lang.
noAccessCommand=\u00a74Du hast keinen Zugriff auf diesen Befehl.

1
Essentials/src/messages_en.properties
View file

@ -261,7 +261,6 @@ nickDisplayName=\u00a74You have to enable change-displayname in Essentials confi
nickInUse=\u00a74That name is already in use.
nickNamesAlpha=\u00a74Nicknames must be alphanumeric.
nickNoMore=\u00a76You no longer have a nickname.
nickOthersPermission=\u00a74You do not have permission to change the nickname of others\!
nickSet=\u00a76Your nickname is now \u00a7c{0}
nickTooLong=\u00a74That nickname is too long.
noAccessCommand=\u00a74You do not have access to that command.

1
Essentials/src/messages_es.properties
View file

@ -261,7 +261,6 @@ nickDisplayName=\u00a77Tienes que habilitar cambio de nombre de usuario en la co
nickInUse=\u00a7cEse nombre ya esta en uso.
nickNamesAlpha=\u00a7cLos nombres tienen que ser alfanumericos.
nickNoMore=\u00a77Ya no tienes un nombre de usuario.
nickOthersPermission=\u00a7cNo tienes permiso para cambiar el nombre de usuario de otros.
nickSet=\u00a77Tu nombre es ahora \u00a7c{0} .
nickTooLong=\u00a74That nickname is too long.
noAccessCommand=\u00a7cNo tienes acceso a ese comando.

1
Essentials/src/messages_fi.properties
View file

@ -261,7 +261,6 @@ nickDisplayName=\u00a77Sinun tulee ottaa k\u00e4ytt\u00f6\u00f6n change-displayn
nickInUse=\u00a7cSe nimi on jo k\u00e4yt\u00f6ss\u00e4.
nickNamesAlpha=\u00a7cLempinimen pit\u00e4\u00e4 olla aakkosista.
nickNoMore=\u00a77Sinulla ei ole en\u00e4\u00e4 lempinime\u00e4.
nickOthersPermission=\u00a7cSinulla ei ole oikeutta vaihtaa muiden lempinimi\u00e4
nickSet=\u00a77Lempinimesi on nyt \u00a7c{0}
nickTooLong=\u00a74That nickname is too long.
noAccessCommand=\u00a7cSinulla ei ole oikeutta tuohon komentoon.

1
Essentials/src/messages_fr.properties
View file

@ -261,7 +261,6 @@ nickDisplayName=\u00a77Vous devez activer change-displayname dans la configurati
nickInUse=\u00a7cCe nom est d\u00e9j\u00e0 utilis\u00e9.
nickNamesAlpha=\u00a7cLes surnoms doivent \u00eatre alphanum\u00e9riques.
nickNoMore=\u00a7 Vous n''avez plus de surnom.
nickOthersPermission=\u00a7cVous n''avez pas la permission de changer le surnom des autres.
nickSet=\u00a77Votre surnom est maintenant \u00a7c{0}.
nickTooLong=\u00a74Ce surnom est trop long.
noAccessCommand=\u00a7cVous n''avez pas acc\u00e8s \u00e0 cette commande.

1
Essentials/src/messages_it.properties
View file

@ -261,7 +261,6 @@ nickDisplayName=\u00a77Devi abilitare change-displayname nel config di Essential
nickInUse=\u00a7cNickname gia'' in uso.
nickNamesAlpha=\u00a7cI Nickname devono essere alfanumerici.
nickNoMore=\u00a77Non disponi piu'' di un nickname.
nickOthersPermission=\u00a7cNon hai il permesso di cambiare il nickname degli altri
nickSet=\u00a77Il tuo nickname e'' ora \u00a7c{0}
nickTooLong=\u00a74That nickname is too long.
noAccessCommand=\u00a7cNon hai accesso a questo comando.

1
Essentials/src/messages_nl.properties
View file

@ -261,7 +261,6 @@ nickDisplayName=\u00a77U moet ''change-displayname'' inschakelen in de Essential
nickInUse=\u00a7cDie naam is al in gebruik.
nickNamesAlpha=\u00a7cBijnamen moeten alfanumeriek zijn.
nickNoMore=\u00a7U heeft geen bijnaam meer.
nickOthersPermission=\u00a7cU herft geen toestemming om de bijnaam van anderen te veranderen.
nickSet=\u00a77Uw bijnaam is nu \u00a7c{0}
nickTooLong=\u00a74Die bijnaam is te lang.
noAccessCommand=\u00a7cU heeft geen toegang tot dat commando.

1
Essentials/src/messages_pl.properties
View file

@ -261,7 +261,6 @@ nickDisplayName=\u00a74Musisz wlaczyc change-displayname w configu Essential.
nickInUse=\u00a74Ten pseudonim jest juz w uzyciu.
nickNamesAlpha=\u00a74Pseudonimy musza byc alfanumeryczne.
nickNoMore=\u00a77Nie masz juz pseudonimu.
nickOthersPermission=\u00a7cNie masz uprawnienia do zmiany pseudonimu innym.
nickSet=\u00a77Twoj pseudonim od teraz to \u00a7c{0}
nickTooLong=\u00a74That nickname is too long.
noAccessCommand=\u00a74Nie masz dostepu do tej komendy.

1
Essentials/src/messages_pt.properties
View file

@ -261,7 +261,6 @@ nickDisplayName=\u00a74Voc\u00c3\u00aa precisa ativar o change-displayname na co
nickInUse=\u00a74Esse nome j\u00c3\u00a1 est\u00c3\u00a1 em uso.
nickNamesAlpha=\u00a74Nicks devem ser alfanum\u00c3\u00a9ricos.
nickNoMore=\u00a76Voc\u00c3\u00aa nao tem mais um nick.
nickOthersPermission=\u00a74Voc\u00c3\u00aa nao tem permissao para alterar o nick dos outros\!
nickSet=\u00a76Seu nick agora \u00c3\u00a9 \u00a7c{0}
nickTooLong=\u00a74That nickname is too long.
noAccessCommand=\u00a74Voc\u00c3\u00aa nao tem acesso a esse comando.

1
Essentials/src/messages_ro.properties
View file

@ -261,7 +261,6 @@ nickDisplayName=\u00a74Trebuie sa activezi schimbarea numelui din configuratie.
nickInUse=\u00a74Acest nume este deja in uz.
nickNamesAlpha=\u00a74Numele trebuie sa fie alfanumeric.
nickNoMore=\u00a76Nu mai ai nume.
nickOthersPermission=\u00a74Nu ai permisiunea sa schimbi numele altor jucatori\!
nickSet=\u00a76Numele tau este acum \u00a7c{0}
nickTooLong=\u00a74That nickname is too long.
noAccessCommand=\u00a74Nu ai acces la aceasta comanda.

1
Essentials/src/messages_ru.properties
View file

@ -261,7 +261,6 @@ nickDisplayName=\u00a74\u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0432\
nickInUse=\u00a74\u042d\u0442\u043e \u0438\u043c\u044f \u0443\u0436\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f.
nickNamesAlpha=\u00a74\u0418\u0433\u0440\u043e\u0432\u043e\u0435 \u0438\u043c\u044f \u0434\u043e\u043b\u0436\u043d\u043e \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u0431\u0443\u043a\u0432\u044b.
nickNoMore=\u00a76\u0418\u0433\u0440\u043e\u0432\u043e\u0435 \u0438\u043c\u044f \u0442\u0435\u043f\u0435\u0440\u044c \u0441\u0442\u0430\u043d\u0434\u0440\u0430\u0442\u043d\u043e\u0435.
nickOthersPermission=\u00a74\u0412\u044b \u043d\u0435 \u0438\u043c\u0435\u0435\u0442\u0435 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u044f \u043c\u0435\u043d\u044f\u0442\u044c \u0438\u0433\u0440\u043e\u0432\u043e\u0435 \u0438\u043c\u044f \u0443 \u0434\u0440\u0443\u0433\u0438\u0445\!
nickSet=\u00a76\u0412\u0430\u0448\u0435 \u0438\u0433\u0440\u043e\u0432\u043e\u0435 \u0438\u043c\u044f \u0442\u0435\u043f\u0435\u0440\u044c \u00a7c{0}
nickTooLong=\u00a74That nickname is too long.
noAccessCommand=\u00a74\u0423 \u0432\u0430\u0441 \u043d\u0435\u0442 \u0434\u043e\u0441\u0442\u0443\u043f\u0430 \u043a \u044d\u0442\u043e\u0439 \u043a\u043e\u043c\u0430\u043d\u0434\u0435.

1
Essentials/src/messages_sv.properties
View file

@ -261,7 +261,6 @@ nickDisplayName=\u00a77Du m\u00e5ste aktivera change-displayname i Essentials-ko
nickInUse=\u00a7cDet namnet anv\u00e4nds redan.
nickNamesAlpha=\u00a7cSmeknamn m\u00e5ste vara alfanumeriska.
nickNoMore=\u00a77Du har inte ett smeknamn l\u00e4ngre
nickOthersPermission=\u00a7cDu har inte tillst\u00e5nd att \u00e4ndra andras smeknamn
nickSet=\u00a77Ditt smeknamn \u00e4r nu \u00a7c{0}
nickTooLong=\u00a74Det d\u00e4r aliaset \u00e4r f\u00f6r l\u00e5ngt.
noAccessCommand=\u00a7cDu har inte tillg\u00e5ng till det kommandot.

1
Essentials/src/messages_zh.properties
View file

@ -261,7 +261,6 @@ nickDisplayName=\u00a74\u4f60\u9700\u8981\u6fc0\u6d3bchange-displayname.\u8be5\u
nickInUse=\u00a74\u90a3\u4e2a\u6635\u79f0\u5df2\u88ab\u4f7f\u7528
nickNamesAlpha=\u00a74\u6635\u79f0\u5fc5\u987b\u4e3a\u5b57\u6bcd\u6216\u6570\u5b57.
nickNoMore=\u00a76\u4f60\u4e0d\u518d\u62e5\u6709\u4e00\u4e2a\u6635\u79f0
nickOthersPermission=\u00a74\u4f60\u6ca1\u6709\u66f4\u6539\u522b\u4eba\u6635\u79f0\u7684\u6743\u9650
nickSet=\u00a76\u4f60\u7684\u6635\u79f0\u73b0\u5728\u662f \u00a74{0}
nickTooLong=\u00a74That nickname is too long.
noAccessCommand=\u00a74\u4f60\u6ca1\u6709\u4f7f\u7528\u8be5\u547d\u4ee4\u7684\u6743\u9650

1
Essentials/src/messages_zh_HK.properties
View file

@ -261,7 +261,6 @@ nickDisplayName=\u00a74\u4f60\u9700\u8981\u6fc0\u6d3bchange-displayname.\u8a72\u
nickInUse=\u00a74\u90a3\u500b\u66b1\u7a31\u5df2\u88ab\u4f7f\u7528
nickNamesAlpha=\u00a74\u66b1\u7a31\u5fc5\u9808\u70ba\u5b57\u6bcd\u6216\u6578\u5b57.
nickNoMore=\u00a76\u4f60\u4e0d\u518d\u64c1\u6709\u4e00\u500b\u66b1\u7a31
nickOthersPermission=\u00a74\u4f60\u6c92\u6709\u66f4\u6539\u5225\u4eba\u66b1\u7a31\u7684\u6b0a\u9650
nickSet=\u00a76\u4f60\u7684\u66b1\u7a31\u73fe\u5728\u662f \u00a74{0}
nickTooLong=\u00a74That nickname is too long.
noAccessCommand=\u00a74\u4f60\u6c92\u6709\u4f7f\u7528\u8a72\u547d\u4ee4\u7684\u6b0a\u9650

1
Essentials/src/messages_zh_TW.properties
View file

@ -261,7 +261,6 @@ nickDisplayName=\u00a74\u4f60\u9700\u8981\u6fc0\u6d3bchange-displayname.\u8a72\u
nickInUse=\u00a74\u90a3\u500b\u66b1\u7a31\u5df2\u88ab\u4f7f\u7528
nickNamesAlpha=\u00a74\u66b1\u7a31\u5fc5\u9808\u70ba\u5b57\u6bcd\u6216\u6578\u5b57.
nickNoMore=\u00a76\u4f60\u4e0d\u518d\u64c1\u6709\u4e00\u500b\u66b1\u7a31
nickOthersPermission=\u00a74\u4f60\u6c92\u6709\u66f4\u6539\u5225\u4eba\u66b1\u7a31\u7684\u8a31\u53ef\u6b0a
nickSet=\u00a76\u4f60\u7684\u66b1\u7a31\u73fe\u5728\u662f \u00a74{0}
nickTooLong=\u00a74That nickname is too long.
noAccessCommand=\u00a74\u4f60\u6c92\u6709\u4f7f\u7528\u8a72\u547d\u4ee4\u7684\u8a31\u53ef\u6b0a