mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2025-06-29 10:31:38 +00:00
Future Java versions may not support _ as identifier.
This commit is contained in:
parent
0b5718f7ff
commit
5724c0c8df
176 changed files with 1032 additions and 1028 deletions
|
@ -1,7 +1,7 @@
|
|||
package com.earth2me.essentials.commands;
|
||||
|
||||
import com.earth2me.essentials.CommandSource;
|
||||
import static com.earth2me.essentials.I18n._;
|
||||
import static com.earth2me.essentials.I18n.tl;
|
||||
import com.earth2me.essentials.Kit;
|
||||
import com.earth2me.essentials.Trade;
|
||||
import com.earth2me.essentials.User;
|
||||
|
@ -25,7 +25,7 @@ public class Commandkit extends EssentialsCommand
|
|||
if (args.length < 1)
|
||||
{
|
||||
final String kitList = Kit.listKits(ess, user);
|
||||
user.sendMessage(kitList.length() > 0 ? _("kits", kitList) : _("noKits"));
|
||||
user.sendMessage(kitList.length() > 0 ? tl("kits", kitList) : tl("noKits"));
|
||||
throw new NoChargeException();
|
||||
}
|
||||
else if (args.length > 1 && user.isAuthorized("essentials.kit.others"))
|
||||
|
@ -47,7 +47,7 @@ public class Commandkit extends EssentialsCommand
|
|||
if (args.length < 2)
|
||||
{
|
||||
final String kitList = Kit.listKits(ess, null);
|
||||
sender.sendMessage(kitList.length() > 0 ? _("kits", kitList) : _("noKits"));
|
||||
sender.sendMessage(kitList.length() > 0 ? tl("kits", kitList) : tl("noKits"));
|
||||
throw new NoChargeException();
|
||||
}
|
||||
else
|
||||
|
@ -59,8 +59,8 @@ public class Commandkit extends EssentialsCommand
|
|||
final List<String> items = Kit.getItems(ess, userTo, kitName, kit);
|
||||
Kit.expandItems(ess, userTo, items);
|
||||
|
||||
sender.sendMessage(_("kitGiveTo", kitName, userTo.getDisplayName()));
|
||||
userTo.sendMessage(_("kitReceive", kitName));
|
||||
sender.sendMessage(tl("kitGiveTo", kitName, userTo.getDisplayName()));
|
||||
userTo.sendMessage(tl("kitReceive", kitName));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -68,14 +68,14 @@ public class Commandkit extends EssentialsCommand
|
|||
{
|
||||
if (kitName.isEmpty())
|
||||
{
|
||||
throw new Exception(_("kitError2"));
|
||||
throw new Exception(tl("kitError2"));
|
||||
}
|
||||
|
||||
final Map<String, Object> kit = ess.getSettings().getKit(kitName);
|
||||
|
||||
if (!userFrom.isAuthorized("essentials.kits." + kitName))
|
||||
{
|
||||
throw new Exception(_("noKitPermission", "essentials.kits." + kitName));
|
||||
throw new Exception(tl("noKitPermission", "essentials.kits." + kitName));
|
||||
}
|
||||
|
||||
final List<String> items = Kit.getItems(ess, userTo, kitName, kit);
|
||||
|
@ -87,7 +87,7 @@ public class Commandkit extends EssentialsCommand
|
|||
Kit.expandItems(ess, userTo, items);
|
||||
|
||||
charge.charge(userFrom);
|
||||
userFrom.sendMessage(_("kitGiveTo", kitName, userTo.getDisplayName()));
|
||||
userTo.sendMessage(_("kitReceive", kitName));
|
||||
userFrom.sendMessage(tl("kitGiveTo", kitName, userTo.getDisplayName()));
|
||||
userTo.sendMessage(tl("kitReceive", kitName));
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue