minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-15 11:04:29 +02:00
Code Issues Releases Wiki Activity

Fixing spacing again, and updating keys.pot

Browse Source
This commit is contained in:
snowleo
2013-04-06 16:23:20 +02:00
parent 0387d18ce2
commit 4d8543bb3a
13 changed files with 3304 additions and 3280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3264
Essentials/po/en.po
View File

File diff suppressed because it is too large Load Diff

3264
Essentials/po/keys.pot
View File

File diff suppressed because it is too large Load Diff

2
Essentials/src/net/ess3/MetaItemStack.java
View File

@@ -499,7 +499,7 @@ public class MetaItemStack
if (!hasMetaPermission(user, "enchantments." + enchantmentName, true, false)) if (!hasMetaPermission(user, "enchantments." + enchantmentName, true, false))
{ {
throw new Exception(_(" §4You do not have the permission for§c {0}§4.", enchantmentName)); throw new Exception(_("§4You do not have the permission for§c {0}§4.", enchantmentName));
} }
return enchantment; return enchantment;
} }

4
Essentials/src/net/ess3/bukkit/VersionCheck.java
View File

@@ -32,8 +32,8 @@ public class VersionCheck
final int versionNumber = Integer.parseInt(versionMatch.group(1)); final int versionNumber = Integer.parseInt(versionMatch.group(1));
if (versionNumber < BUKKIT_VERSION && versionNumber > 100) if (versionNumber < BUKKIT_VERSION && versionNumber > 100)
{ {
log.log(Level.SEVERE, _(" §4* ! * Bukkit version is not the recommended build for Essentials.")); log.log(Level.SEVERE, _("§4* ! * Bukkit version is not the recommended build for Essentials."));
log.log(Level.SEVERE, _(" §6* ! * You need atleast build {0} of CraftBukkit, download it from http://dl.bukkit.org/downloads/craftbukkit/", Integer.toString(BUKKIT_VERSION))); log.log(Level.SEVERE, _("§6* ! * You need atleast build {0} of CraftBukkit, download it from http://dl.bukkit.org/downloads/craftbukkit/", Integer.toString(BUKKIT_VERSION)));
return false; return false;
} }
} }

2
Essentials/src/net/ess3/commands/Commandbigtree.java
View File

@@ -41,7 +41,7 @@ public class Commandbigtree extends EssentialsCommand
final boolean success = user.getPlayer().getWorld().generateTree(safeLocation, bukkitTree); final boolean success = user.getPlayer().getWorld().generateTree(safeLocation, bukkitTree);
if (success) if (success)
{ {
user.sendMessage(_(" §6Big tree spawned.")); user.sendMessage(_("§6Big tree spawned."));
} }
else else
{ {

10
Essentials/src/net/ess3/commands/Commandenchant.java
View File

@@ -37,7 +37,7 @@ public class Commandenchant extends EssentialsCommand
//enchantmentslist.add(enchantmentName); //enchantmentslist.add(enchantmentName);
} }
} }
throw new NotEnoughArgumentsException(_(" §6Enchantments:§r {0}", Util.joinList(enchantmentslist.toArray()))); throw new NotEnoughArgumentsException(_("§6Enchantments:§r {0}", Util.joinList(enchantmentslist.toArray())));
} }
int level = -1; int level = -1;
if (args.length > 1) if (args.length > 1)
@@ -78,11 +78,11 @@ public class Commandenchant extends EssentialsCommand
final String enchantmentName = enchantment.getName().toLowerCase(Locale.ENGLISH); final String enchantmentName = enchantment.getName().toLowerCase(Locale.ENGLISH);
if (level == 0) if (level == 0)
{ {
user.sendMessage(_(" §6The enchantment§c {0} §6has been removed from your item in hand.", enchantmentName.replace('_', ' '))); user.sendMessage(_("§6The enchantment§c {0} §6has been removed from your item in hand.", enchantmentName.replace('_', ' ')));
} }
else else
{ {
user.sendMessage(_(" §6The enchantment§c {0} §6has been applied to your item in hand.", enchantmentName.replace('_', ' '))); user.sendMessage(_("§6The enchantment§c {0} §6has been applied to your item in hand.", enchantmentName.replace('_', ' ')));
} }
} }
@@ -92,12 +92,12 @@ public class Commandenchant extends EssentialsCommand
final Enchantment enchantment = Enchantments.getByName(name); final Enchantment enchantment = Enchantments.getByName(name);
if (enchantment == null) if (enchantment == null)
{ {
throw new Exception(_(" §4Enchantment not found!")); throw new Exception(_("§4Enchantment not found!"));
} }
final String enchantmentName = enchantment.getName().toLowerCase(Locale.ENGLISH); final String enchantmentName = enchantment.getName().toLowerCase(Locale.ENGLISH);
if (user != null && !Permissions.ENCHANT.isAuthorized(user, enchantmentName)) if (user != null && !Permissions.ENCHANT.isAuthorized(user, enchantmentName))
{ {
throw new Exception(_(" §4You do not have the permission for§c {0}§4.", enchantmentName)); throw new Exception(_("§4You do not have the permission for§c {0}§4.", enchantmentName));
} }
return enchantment; return enchantment;
} }

14
Essentials/src/net/ess3/commands/Commandlist.java
View File

@@ -35,16 +35,16 @@ public class Commandlist extends EssentialsCommand
if (showhidden && playerHidden > 0) if (showhidden && playerHidden > 0)
{ {
online = _(" §6There are §c{0}§6/{1}§6 out of maximum §c{2}§6 players online.", server.getOnlinePlayers().length - playerHidden, playerHidden, server.getMaxPlayers()); online = _("§6There are §c{0}§6/{1}§6 out of maximum §c{2}§6 players online.", server.getOnlinePlayers().length - playerHidden, playerHidden, server.getMaxPlayers());
} }
else else
{ {
online = _(" §6There are §c{0}§6 out of maximum §c{1}§6 players online.", server.getOnlinePlayers().length - playerHidden, server.getMaxPlayers()); online = _("§6There are §c{0}§6 out of maximum §c{1}§6 players online.", server.getOnlinePlayers().length - playerHidden, server.getMaxPlayers());
} }
} }
else else
{ {
online = _(" §6There are §c{0}§6 out of maximum §c{1}§6 players online.", server.getOnlinePlayers().length, server.getMaxPlayers()); online = _("§6There are §c{0}§6 out of maximum §c{1}§6 players online.", server.getOnlinePlayers().length, server.getMaxPlayers());
} }
sender.sendMessage(online); sender.sendMessage(online);
@@ -98,12 +98,12 @@ public class Commandlist extends EssentialsCommand
if (user.getData().isAfk()) if (user.getData().isAfk())
{ {
groupString.append(_(" §7[AFK]§r")); groupString.append(' ').append(_("§7[AFK]§r"));
} }
if (hiddenPlayers.contains(user.getName())) if (hiddenPlayers.contains(user.getName()))
{ {
groupString.append(_(" §7[HIDDEN]§r")); groupString.append(' ').append(_("§7[HIDDEN]§r"));
} }
groupString.append(user.getPlayer().getDisplayName()); groupString.append(user.getPlayer().getDisplayName());
groupString.append("§f"); groupString.append("§f");
@@ -145,12 +145,12 @@ public class Commandlist extends EssentialsCommand
if (user.getData().isAfk()) if (user.getData().isAfk())
{ {
onlineUsers.append(_(" §7[AFK]§r")); onlineUsers.append(' ').append(_("§7[AFK]§r"));
} }
if (hiddenPlayers.contains(user.getName())) if (hiddenPlayers.contains(user.getName()))
{ {
onlineUsers.append(_(" §7[HIDDEN]§r")); onlineUsers.append(' ').append(_("§7[HIDDEN]§r"));
} }
onlineUsers.append(user.getPlayer().getDisplayName()); onlineUsers.append(user.getPlayer().getDisplayName());
onlineUsers.append("§f"); onlineUsers.append("§f");

8
Essentials/src/net/ess3/commands/Commandrecipe.java
View File

@@ -119,14 +119,14 @@ public class Commandrecipe extends EssentialsCommand
materials[j][k] = item == null ? null : item.getType(); materials[j][k] = item == null ? null : item.getType();
} }
} }
sender.sendMessage(_("u00a7{0}X §6| u00a7{1}X §6| u00a7{2}X", colorMap.get(materials[0][0]), colorMap.get(materials[0][1]), colorMap.get(materials[0][2]))); sender.sendMessage(_("§{0}X §6| §{1}X §6| §{2}X", colorMap.get(materials[0][0]), colorMap.get(materials[0][1]), colorMap.get(materials[0][2])));
sender.sendMessage(_("u00a7{0}X §6| u00a7{1}X §6| u00a7{2}X", colorMap.get(materials[1][0]), colorMap.get(materials[1][1]), colorMap.get(materials[1][2]))); sender.sendMessage(_("§{0}X §6| §{1}X §6| §{2}X", colorMap.get(materials[1][0]), colorMap.get(materials[1][1]), colorMap.get(materials[1][2])));
sender.sendMessage(_("u00a7{0}X §6| u00a7{1}X §6| u00a7{2}X", colorMap.get(materials[2][0]), colorMap.get(materials[2][1]), colorMap.get(materials[2][2]))); sender.sendMessage(_("§{0}X §6| §{1}X §6| §{2}X", colorMap.get(materials[2][0]), colorMap.get(materials[2][1]), colorMap.get(materials[2][2])));
final StringBuilder s = new StringBuilder(); final StringBuilder s = new StringBuilder();
for (Material items : colorMap.keySet().toArray(new Material[colorMap.size()])) for (Material items : colorMap.keySet().toArray(new Material[colorMap.size()]))
{ {
s.append(_(" u00a7{0}X §6is §c{1}", colorMap.get(items), getMaterialName(items))); s.append(_("§{0}X §6is §c{1}", colorMap.get(items), getMaterialName(items)));
} }
sender.sendMessage(_("§6Where: {0}", s.toString())); sender.sendMessage(_("§6Where: {0}", s.toString()));
} }

2
Essentials/src/net/ess3/commands/Commandsuicide.java
View File

@@ -14,6 +14,6 @@ public class Commandsuicide extends EssentialsCommand
ess.getPlugin().callSuicideEvent(player); ess.getPlugin().callSuicideEvent(player);
user.getPlayer().damage(player.getHealth()); user.getPlayer().damage(player.getHealth());
user.sendMessage(_("§6Goodbye cruel world...")); user.sendMessage(_("§6Goodbye cruel world..."));
ess.broadcastMessage(user, _(" §6{0} §6took their own life.", player.getDisplayName())); ess.broadcastMessage(user, _("§6{0} §6took their own life.", player.getDisplayName()));
} }
} }

2
Essentials/src/net/ess3/commands/Commandthunder.java
View File

@@ -28,7 +28,7 @@ public class Commandthunder extends EssentialsCommand
else else
{ {
world.setThundering(setThunder ? true : false); world.setThundering(setThunder ? true : false);
user.sendMessage(_(" §6You§c {0} §6thunder in your world.", setThunder ? _("enabled") : _("disabled"))); user.sendMessage(_("§6You§c {0} §6thunder in your world.", setThunder ? _("enabled") : _("disabled")));
} }
} }

2
Essentials/src/net/ess3/commands/Commandtogglejail.java
View File

@@ -59,7 +59,7 @@ public class Commandtogglejail extends EssentialsCommand
} }
player.queueSave(); player.queueSave();
sender.sendMessage( sender.sendMessage(
(timeDiff > 0 ? _(" §6Player§c {0} §6jailed for {1}.", player.getName(), DateUtil.formatDateDiff(timeDiff)) : _("§6Player§c {0} §6jailed.", player.getName()))); (timeDiff > 0 ? _("§6Player§c {0} §6jailed for {1}.", player.getName(), DateUtil.formatDateDiff(timeDiff)) : _("§6Player§c {0} §6jailed.", player.getName())));
return; return;
} }

6
Essentials/src/net/ess3/user/User.java
View File

@@ -138,9 +138,9 @@ public class User extends UserBase implements IUser
if (canAfford(value)) if (canAfford(value))
{ {
setMoney(getMoney() - value); setMoney(getMoney() - value);
reciever.setMoney(reciever.getMoney() + value); receiver.setMoney(receiver.getMoney() + value);
sendMessage(_("§a{0} has been sent to {1}.", FormatUtil.displayCurrency(value, ess), reciever.getPlayer().getDisplayName())); sendMessage(_("§a{0} has been sent to {1}.", FormatUtil.displayCurrency(value, ess), receiver.getPlayer().getDisplayName()));
reciever.sendMessage(_("§a{0} has been received from {1}.", FormatUtil.displayCurrency(value, ess), getPlayer().getDisplayName())); receiver.sendMessage(_("§a{0} has been received from {1}.", FormatUtil.displayCurrency(value, ess), getPlayer().getDisplayName()));
} }
else else
{ {

4
EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java
View File

@@ -31,7 +31,7 @@ public class SignEnchant extends EssentialsSign
final Enchantment enchantment = Enchantments.getByName(enchantLevel[0]); final Enchantment enchantment = Enchantments.getByName(enchantLevel[0]);
if (enchantment == null) if (enchantment == null)
{ {
throw new SignException(_(" §4Enchantment not found!")); throw new SignException(_("§4Enchantment not found!"));
} }
int level; int level;
try try
@@ -76,7 +76,7 @@ public class SignEnchant extends EssentialsSign
final Enchantment enchantment = Enchantments.getByName(enchantLevel[0]); final Enchantment enchantment = Enchantments.getByName(enchantLevel[0]);
if (enchantment == null) if (enchantment == null)
{ {
throw new SignException(_(" §4Enchantment not found!")); throw new SignException(_("§4Enchantment not found!"));
} }
int level; int level;
try try