diff options
Diffstat (limited to 'Essentials/src/net/ess3')
10 files changed, 26 insertions, 26 deletions
diff --git a/Essentials/src/net/ess3/MetaItemStack.java b/Essentials/src/net/ess3/MetaItemStack.java index 646f8a812..caebdbf75 100644 --- a/Essentials/src/net/ess3/MetaItemStack.java +++ b/Essentials/src/net/ess3/MetaItemStack.java @@ -499,7 +499,7 @@ public class MetaItemStack 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; } diff --git a/Essentials/src/net/ess3/bukkit/VersionCheck.java b/Essentials/src/net/ess3/bukkit/VersionCheck.java index f84b97efa..89aa0692d 100644 --- a/Essentials/src/net/ess3/bukkit/VersionCheck.java +++ b/Essentials/src/net/ess3/bukkit/VersionCheck.java @@ -32,8 +32,8 @@ public class VersionCheck final int versionNumber = Integer.parseInt(versionMatch.group(1)); if (versionNumber < BUKKIT_VERSION && versionNumber > 100) { - 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, _("§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))); return false; } } diff --git a/Essentials/src/net/ess3/commands/Commandbigtree.java b/Essentials/src/net/ess3/commands/Commandbigtree.java index e33cecc28..c1b2cb003 100644 --- a/Essentials/src/net/ess3/commands/Commandbigtree.java +++ b/Essentials/src/net/ess3/commands/Commandbigtree.java @@ -41,7 +41,7 @@ public class Commandbigtree extends EssentialsCommand final boolean success = user.getPlayer().getWorld().generateTree(safeLocation, bukkitTree); if (success) { - user.sendMessage(_(" §6Big tree spawned.")); + user.sendMessage(_("§6Big tree spawned.")); } else { diff --git a/Essentials/src/net/ess3/commands/Commandenchant.java b/Essentials/src/net/ess3/commands/Commandenchant.java index 7f5dfdb91..bdca65c83 100644 --- a/Essentials/src/net/ess3/commands/Commandenchant.java +++ b/Essentials/src/net/ess3/commands/Commandenchant.java @@ -37,7 +37,7 @@ public class Commandenchant extends EssentialsCommand //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; if (args.length > 1) @@ -78,11 +78,11 @@ public class Commandenchant extends EssentialsCommand final String enchantmentName = enchantment.getName().toLowerCase(Locale.ENGLISH); 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 { - 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); if (enchantment == null) { - throw new Exception(_(" §4Enchantment not found!")); + throw new Exception(_("§4Enchantment not found!")); } final String enchantmentName = enchantment.getName().toLowerCase(Locale.ENGLISH); 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; } diff --git a/Essentials/src/net/ess3/commands/Commandlist.java b/Essentials/src/net/ess3/commands/Commandlist.java index aa78d390f..39f7f82f3 100644 --- a/Essentials/src/net/ess3/commands/Commandlist.java +++ b/Essentials/src/net/ess3/commands/Commandlist.java @@ -35,16 +35,16 @@ public class Commandlist extends EssentialsCommand 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 { - 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 { - 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); @@ -98,12 +98,12 @@ public class Commandlist extends EssentialsCommand if (user.getData().isAfk()) { - groupString.append(_(" §7[AFK]§r")); + groupString.append(' ').append(_("§7[AFK]§r")); } if (hiddenPlayers.contains(user.getName())) { - groupString.append(_(" §7[HIDDEN]§r")); + groupString.append(' ').append(_("§7[HIDDEN]§r")); } groupString.append(user.getPlayer().getDisplayName()); groupString.append("§f"); @@ -145,12 +145,12 @@ public class Commandlist extends EssentialsCommand if (user.getData().isAfk()) { - onlineUsers.append(_(" §7[AFK]§r")); + onlineUsers.append(' ').append(_("§7[AFK]§r")); } if (hiddenPlayers.contains(user.getName())) { - onlineUsers.append(_(" §7[HIDDEN]§r")); + onlineUsers.append(' ').append(_("§7[HIDDEN]§r")); } onlineUsers.append(user.getPlayer().getDisplayName()); onlineUsers.append("§f"); diff --git a/Essentials/src/net/ess3/commands/Commandrecipe.java b/Essentials/src/net/ess3/commands/Commandrecipe.java index efe597a72..8011bd1cb 100644 --- a/Essentials/src/net/ess3/commands/Commandrecipe.java +++ b/Essentials/src/net/ess3/commands/Commandrecipe.java @@ -119,14 +119,14 @@ public class Commandrecipe extends EssentialsCommand 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(_("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(_("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[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[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[2][0]), colorMap.get(materials[2][1]), colorMap.get(materials[2][2]))); final StringBuilder s = new StringBuilder(); 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())); } diff --git a/Essentials/src/net/ess3/commands/Commandsuicide.java b/Essentials/src/net/ess3/commands/Commandsuicide.java index eb27a6ecb..8a99b854a 100644 --- a/Essentials/src/net/ess3/commands/Commandsuicide.java +++ b/Essentials/src/net/ess3/commands/Commandsuicide.java @@ -14,6 +14,6 @@ public class Commandsuicide extends EssentialsCommand ess.getPlugin().callSuicideEvent(player); user.getPlayer().damage(player.getHealth()); 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())); } } diff --git a/Essentials/src/net/ess3/commands/Commandthunder.java b/Essentials/src/net/ess3/commands/Commandthunder.java index e9e55d72b..7846de0da 100644 --- a/Essentials/src/net/ess3/commands/Commandthunder.java +++ b/Essentials/src/net/ess3/commands/Commandthunder.java @@ -28,7 +28,7 @@ public class Commandthunder extends EssentialsCommand else { 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"))); } } diff --git a/Essentials/src/net/ess3/commands/Commandtogglejail.java b/Essentials/src/net/ess3/commands/Commandtogglejail.java index 39bb7ca63..cb5617a5e 100644 --- a/Essentials/src/net/ess3/commands/Commandtogglejail.java +++ b/Essentials/src/net/ess3/commands/Commandtogglejail.java @@ -59,7 +59,7 @@ public class Commandtogglejail extends EssentialsCommand } player.queueSave(); 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; } diff --git a/Essentials/src/net/ess3/user/User.java b/Essentials/src/net/ess3/user/User.java index 23d34a9d9..e74a0b878 100644 --- a/Essentials/src/net/ess3/user/User.java +++ b/Essentials/src/net/ess3/user/User.java @@ -138,9 +138,9 @@ public class User extends UserBase implements IUser if (canAfford(value)) { setMoney(getMoney() - value); - reciever.setMoney(reciever.getMoney() + value); - sendMessage(_("§a{0} has been sent to {1}.", FormatUtil.displayCurrency(value, ess), reciever.getPlayer().getDisplayName())); - reciever.sendMessage(_("§a{0} has been received from {1}.", FormatUtil.displayCurrency(value, ess), getPlayer().getDisplayName())); + receiver.setMoney(receiver.getMoney() + value); + sendMessage(_("§a{0} has been sent to {1}.", FormatUtil.displayCurrency(value, ess), receiver.getPlayer().getDisplayName())); + receiver.sendMessage(_("§a{0} has been received from {1}.", FormatUtil.displayCurrency(value, ess), getPlayer().getDisplayName())); } else { |