summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnowleo <schneeleo@gmail.com>2013-04-06 15:45:27 +0200
committersnowleo <schneeleo@gmail.com>2013-04-06 16:09:02 +0200
commit0387d18ce2009ce8bf8dfb659eebb300dd07e15e (patch)
treecce091dd311023ebf5359c426fef4a770230eb73
parent96342bc6ce75699a1881e550f855140d58f7529f (diff)
downloadEssentials-0387d18ce2009ce8bf8dfb659eebb300dd07e15e.tar
Essentials-0387d18ce2009ce8bf8dfb659eebb300dd07e15e.tar.gz
Essentials-0387d18ce2009ce8bf8dfb659eebb300dd07e15e.tar.lz
Essentials-0387d18ce2009ce8bf8dfb659eebb300dd07e15e.tar.xz
Essentials-0387d18ce2009ce8bf8dfb659eebb300dd07e15e.zip
Use correct translations with color
-rw-r--r--Essentials/src/net/ess3/Essentials.java2
-rw-r--r--Essentials/src/net/ess3/EssentialsTimer.java2
-rw-r--r--Essentials/src/net/ess3/ItemDb.java4
-rw-r--r--Essentials/src/net/ess3/Jails.java20
-rw-r--r--Essentials/src/net/ess3/Kits.java6
-rw-r--r--Essentials/src/net/ess3/MetaItemStack.java36
-rw-r--r--Essentials/src/net/ess3/SpawnMob.java12
-rw-r--r--Essentials/src/net/ess3/Teleport.java16
-rw-r--r--Essentials/src/net/ess3/Warps.java2
-rw-r--r--Essentials/src/net/ess3/api/NoLoanPermittedException.java2
-rw-r--r--Essentials/src/net/ess3/api/UserDoesNotExistException.java2
-rw-r--r--Essentials/src/net/ess3/backup/Backup.java4
-rw-r--r--Essentials/src/net/ess3/bukkit/VersionCheck.java6
-rw-r--r--Essentials/src/net/ess3/commands/Commandafk.java8
-rw-r--r--Essentials/src/net/ess3/commands/Commandback.java2
-rw-r--r--Essentials/src/net/ess3/commands/Commandbackup.java2
-rw-r--r--Essentials/src/net/ess3/commands/Commandbalance.java4
-rw-r--r--Essentials/src/net/ess3/commands/Commandbalancetop.java8
-rw-r--r--Essentials/src/net/ess3/commands/Commandban.java10
-rw-r--r--Essentials/src/net/ess3/commands/Commandbanip.java2
-rw-r--r--Essentials/src/net/ess3/commands/Commandbigtree.java4
-rw-r--r--Essentials/src/net/ess3/commands/Commandbook.java16
-rw-r--r--Essentials/src/net/ess3/commands/Commandbreak.java2
-rw-r--r--Essentials/src/net/ess3/commands/Commandbroadcast.java2
-rw-r--r--Essentials/src/net/ess3/commands/Commandburn.java2
-rw-r--r--Essentials/src/net/ess3/commands/Commandclearinventory.java14
-rw-r--r--Essentials/src/net/ess3/commands/Commandcompass.java2
-rw-r--r--Essentials/src/net/ess3/commands/Commanddelhome.java2
-rw-r--r--Essentials/src/net/ess3/commands/Commanddeljail.java2
-rw-r--r--Essentials/src/net/ess3/commands/Commanddelwarp.java2
-rw-r--r--Essentials/src/net/ess3/commands/Commanddepth.java6
-rw-r--r--Essentials/src/net/ess3/commands/Commandeco.java4
-rw-r--r--Essentials/src/net/ess3/commands/Commandenchant.java12
-rw-r--r--Essentials/src/net/ess3/commands/Commandessentials.java4
-rw-r--r--Essentials/src/net/ess3/commands/Commandexp.java8
-rw-r--r--Essentials/src/net/ess3/commands/Commandext.java4
-rw-r--r--Essentials/src/net/ess3/commands/Commandfeed.java6
-rw-r--r--Essentials/src/net/ess3/commands/Commandfirework.java14
-rw-r--r--Essentials/src/net/ess3/commands/Commandfly.java4
-rw-r--r--Essentials/src/net/ess3/commands/Commandgamemode.java4
-rw-r--r--Essentials/src/net/ess3/commands/Commandgc.java10
-rw-r--r--Essentials/src/net/ess3/commands/Commandgive.java4
-rw-r--r--Essentials/src/net/ess3/commands/Commandgod.java4
-rw-r--r--Essentials/src/net/ess3/commands/Commandhat.java10
-rw-r--r--Essentials/src/net/ess3/commands/Commandheal.java8
-rw-r--r--Essentials/src/net/ess3/commands/Commandhelpop.java2
-rw-r--r--Essentials/src/net/ess3/commands/Commandhome.java6
-rw-r--r--Essentials/src/net/ess3/commands/Commandignore.java4
-rw-r--r--Essentials/src/net/ess3/commands/Commandinvsee.java8
-rw-r--r--Essentials/src/net/ess3/commands/Commanditem.java6
-rw-r--r--Essentials/src/net/ess3/commands/Commanditemdb.java2
-rw-r--r--Essentials/src/net/ess3/commands/Commandjump.java2
-rw-r--r--Essentials/src/net/ess3/commands/Commandkick.java4
-rw-r--r--Essentials/src/net/ess3/commands/Commandkill.java2
-rw-r--r--Essentials/src/net/ess3/commands/Commandkillall.java2
-rw-r--r--Essentials/src/net/ess3/commands/Commandkit.java8
-rw-r--r--Essentials/src/net/ess3/commands/Commandlightning.java6
-rw-r--r--Essentials/src/net/ess3/commands/Commandlist.java18
-rw-r--r--Essentials/src/net/ess3/commands/Commandmail.java24
-rw-r--r--Essentials/src/net/ess3/commands/Commandme.java2
-rw-r--r--Essentials/src/net/ess3/commands/Commandmore.java4
-rw-r--r--Essentials/src/net/ess3/commands/Commandmsg.java14
-rw-r--r--Essentials/src/net/ess3/commands/Commandmute.java6
-rw-r--r--Essentials/src/net/ess3/commands/Commandnear.java6
-rw-r--r--Essentials/src/net/ess3/commands/Commandnick.java18
-rw-r--r--Essentials/src/net/ess3/commands/Commandpay.java2
-rw-r--r--Essentials/src/net/ess3/commands/Commandpowertool.java22
-rw-r--r--Essentials/src/net/ess3/commands/Commandpowertooltoggle.java4
-rw-r--r--Essentials/src/net/ess3/commands/Commandptime.java18
-rw-r--r--Essentials/src/net/ess3/commands/Commandr.java6
-rw-r--r--Essentials/src/net/ess3/commands/Commandrealname.java2
-rw-r--r--Essentials/src/net/ess3/commands/Commandrecipe.java20
-rw-r--r--Essentials/src/net/ess3/commands/Commandremove.java4
-rw-r--r--Essentials/src/net/ess3/commands/Commandrepair.java14
-rw-r--r--Essentials/src/net/ess3/commands/Commandseen.java16
-rw-r--r--Essentials/src/net/ess3/commands/Commandsell.java8
-rw-r--r--Essentials/src/net/ess3/commands/Commandsethome.java8
-rw-r--r--Essentials/src/net/ess3/commands/Commandsetjail.java2
-rw-r--r--Essentials/src/net/ess3/commands/Commandsetspawn.java2
-rw-r--r--Essentials/src/net/ess3/commands/Commandsetwarp.java6
-rw-r--r--Essentials/src/net/ess3/commands/Commandsetworth.java4
-rw-r--r--Essentials/src/net/ess3/commands/Commandspawn.java8
-rw-r--r--Essentials/src/net/ess3/commands/Commandspawner.java10
-rw-r--r--Essentials/src/net/ess3/commands/Commandspawnmob.java2
-rw-r--r--Essentials/src/net/ess3/commands/Commandspeed.java8
-rw-r--r--Essentials/src/net/ess3/commands/Commandsudo.java4
-rw-r--r--Essentials/src/net/ess3/commands/Commandsuicide.java4
-rw-r--r--Essentials/src/net/ess3/commands/Commandtempban.java6
-rw-r--r--Essentials/src/net/ess3/commands/Commandthunder.java4
-rw-r--r--Essentials/src/net/ess3/commands/Commandtime.java8
-rw-r--r--Essentials/src/net/ess3/commands/Commandtogglejail.java16
-rw-r--r--Essentials/src/net/ess3/commands/Commandtop.java2
-rw-r--r--Essentials/src/net/ess3/commands/Commandtp.java22
-rw-r--r--Essentials/src/net/ess3/commands/Commandtpa.java16
-rw-r--r--Essentials/src/net/ess3/commands/Commandtpaall.java8
-rw-r--r--Essentials/src/net/ess3/commands/Commandtpaccept.java14
-rw-r--r--Essentials/src/net/ess3/commands/Commandtpahere.java16
-rw-r--r--Essentials/src/net/ess3/commands/Commandtpall.java2
-rw-r--r--Essentials/src/net/ess3/commands/Commandtpdeny.java6
-rw-r--r--Essentials/src/net/ess3/commands/Commandtphere.java8
-rw-r--r--Essentials/src/net/ess3/commands/Commandtpo.java6
-rw-r--r--Essentials/src/net/ess3/commands/Commandtpohere.java8
-rw-r--r--Essentials/src/net/ess3/commands/Commandtppos.java6
-rw-r--r--Essentials/src/net/ess3/commands/Commandtree.java4
-rw-r--r--Essentials/src/net/ess3/commands/Commandunlimited.java4
-rw-r--r--Essentials/src/net/ess3/commands/Commandvanish.java2
-rw-r--r--Essentials/src/net/ess3/commands/Commandwarp.java12
-rw-r--r--Essentials/src/net/ess3/commands/Commandweather.java8
-rw-r--r--Essentials/src/net/ess3/commands/Commandwhois.java30
-rw-r--r--Essentials/src/net/ess3/commands/Commandworld.java6
-rw-r--r--Essentials/src/net/ess3/commands/Commandworth.java4
-rw-r--r--Essentials/src/net/ess3/commands/EssentialsCommand.java2
-rw-r--r--Essentials/src/net/ess3/commands/EssentialsCommandHandler.java18
-rw-r--r--Essentials/src/net/ess3/commands/WarpNotFoundException.java2
-rw-r--r--Essentials/src/net/ess3/economy/Trade.java16
-rw-r--r--Essentials/src/net/ess3/listener/EssentialsEntityListener.java2
-rw-r--r--Essentials/src/net/ess3/listener/EssentialsPlayerListener.java18
-rw-r--r--Essentials/src/net/ess3/settings/SpawnsHolder.java2
-rw-r--r--Essentials/src/net/ess3/user/PlayerNotFoundException.java2
-rw-r--r--Essentials/src/net/ess3/user/User.java26
-rw-r--r--Essentials/src/net/ess3/utils/DescParseTickFormat.java2
-rw-r--r--Essentials/src/net/ess3/utils/LocationUtil.java2
-rw-r--r--Essentials/src/net/ess3/utils/textreader/HelpInput.java16
-rw-r--r--Essentials/src/net/ess3/utils/textreader/TextPager.java12
-rw-r--r--Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java2
-rw-r--r--Essentials2Compat/src/com/earth2me/essentials/Settings.java6
-rw-r--r--EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java22
-rw-r--r--EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsConnect.java2
-rw-r--r--EssentialsChat/src/net/ess3/chat/EssentialsChat.java2
-rw-r--r--EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIP.java2
-rw-r--r--EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java2
-rw-r--r--EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java2
-rw-r--r--EssentialsSigns/src/net/ess3/signs/EssentialsSign.java12
-rw-r--r--EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java2
-rw-r--r--EssentialsSigns/src/net/ess3/signs/signs/SignBalance.java2
-rw-r--r--EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java12
-rw-r--r--EssentialsSigns/src/net/ess3/signs/signs/SignFeed.java2
-rw-r--r--EssentialsSigns/src/net/ess3/signs/signs/SignFree.java2
-rw-r--r--EssentialsSigns/src/net/ess3/signs/signs/SignGameMode.java4
-rw-r--r--EssentialsSigns/src/net/ess3/signs/signs/SignHeal.java2
-rw-r--r--EssentialsSigns/src/net/ess3/signs/signs/SignKit.java2
-rw-r--r--EssentialsSigns/src/net/ess3/signs/signs/SignMail.java4
-rw-r--r--EssentialsSigns/src/net/ess3/signs/signs/SignRepair.java2
-rw-r--r--EssentialsSigns/src/net/ess3/signs/signs/SignTrade.java24
-rw-r--r--EssentialsSigns/src/net/ess3/signs/signs/SignWeather.java4
-rw-r--r--EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java2
146 files changed, 536 insertions, 536 deletions
diff --git a/Essentials/src/net/ess3/Essentials.java b/Essentials/src/net/ess3/Essentials.java
index 0a7af6034..9177703c2 100644
--- a/Essentials/src/net/ess3/Essentials.java
+++ b/Essentials/src/net/ess3/Essentials.java
@@ -193,7 +193,7 @@ public class Essentials implements IEssentials
if (user.isVanished())
{
user.toggleVanished();
- p.sendMessage(_("A reload has forced you to become visible."));
+ p.sendMessage(_("§4A reload has forced you to become visible."));
}
}
i18n.onDisable();
diff --git a/Essentials/src/net/ess3/EssentialsTimer.java b/Essentials/src/net/ess3/EssentialsTimer.java
index 11138803a..5a8e341aa 100644
--- a/Essentials/src/net/ess3/EssentialsTimer.java
+++ b/Essentials/src/net/ess3/EssentialsTimer.java
@@ -66,7 +66,7 @@ public class EssentialsTimer implements Runnable
final List<String> mail = user.getMails();
if (mail != null && !mail.isEmpty())
{
- user.sendMessage(I18n._("You have {0} messages! Type /mail read to view your mail.", mail.size()));
+ user.sendMessage(I18n._("§6You have§c {0} §6messages! Type §c/mail read§6 to view your mail.", mail.size()));
}
}
}
diff --git a/Essentials/src/net/ess3/ItemDb.java b/Essentials/src/net/ess3/ItemDb.java
index ceb4f540c..ad43db312 100644
--- a/Essentials/src/net/ess3/ItemDb.java
+++ b/Essentials/src/net/ess3/ItemDb.java
@@ -145,14 +145,14 @@ public class ItemDb implements IItemDb
}
else
{
- throw new Exception(_("Unknown item name: {0}", id));
+ throw new Exception(_("§4Unknown item name: {0}.", id));
}
}
final Material mat = Material.getMaterial(itemid);
if (mat == null)
{
- throw new Exception(_("Unknown item id: {0}", itemid));
+ throw new Exception(_("§4Unknown item id:§r {0}§4.", itemid));
}
final ItemStack retval = new ItemStack(mat, mat.getMaxStackSize(), metaData);
return retval;
diff --git a/Essentials/src/net/ess3/Jails.java b/Essentials/src/net/ess3/Jails.java
index d8bfbf24e..fafe3be79 100644
--- a/Essentials/src/net/ess3/Jails.java
+++ b/Essentials/src/net/ess3/Jails.java
@@ -53,12 +53,12 @@ public class Jails extends AsyncStorageObjectHolder<net.ess3.settings.Jails> imp
{
if (getData().getJails() == null || jailName == null || !getData().getJails().containsKey(jailName.toLowerCase(Locale.ENGLISH)))
{
- throw new Exception(_("That jail does not exist."));
+ throw new Exception(_("§4That jail does not exist."));
}
Location loc = getData().getJails().get(jailName.toLowerCase(Locale.ENGLISH)).getStoredLocation();
if (loc == null || loc.getWorld() == null)
{
- throw new Exception(_("That jail does not exist."));
+ throw new Exception(_("§4That jail does not exist."));
}
return loc;
}
@@ -174,11 +174,11 @@ public class Jails extends AsyncStorageObjectHolder<net.ess3.settings.Jails> imp
{
if (ess.getSettings().isDebug())
{
- LOGGER.log(Level.INFO, _("Error occurred when trying to return player {0} to jail: {1}!", user.getName(), ex.getLocalizedMessage()), ex);
+ LOGGER.log(Level.INFO, _("§4Error occurred when trying to return player§c {0} §4to jail: {1}!", user.getName(), ex.getLocalizedMessage()), ex);
}
else
{
- LOGGER.log(Level.INFO, _("Error occurred when trying to return player {0} to jail: {1}!", user.getName(), ex.getLocalizedMessage()));
+ LOGGER.log(Level.INFO, _("§4Error occurred when trying to return player§c {0} §4to jail: {1}!", user.getName(), ex.getLocalizedMessage()));
}
}
}
@@ -200,14 +200,14 @@ public class Jails extends AsyncStorageObjectHolder<net.ess3.settings.Jails> imp
{
if (ess.getSettings().isDebug())
{
- LOGGER.log(Level.INFO, _("Error occurred when trying to return player {0} to jail: {1}!", user.getName(), ex.getLocalizedMessage()), ex);
+ LOGGER.log(Level.INFO, _("§4Error occurred when trying to return player§c {0} §4to jail: {1}!", user.getName(), ex.getLocalizedMessage()), ex);
}
else
{
- LOGGER.log(Level.INFO, _("Error occurred when trying to return player {0} to jail: {1}!", user.getName(), ex.getLocalizedMessage()));
+ LOGGER.log(Level.INFO, _("§4Error occurred when trying to return player§c {0} §4to jail: {1}!", user.getName(), ex.getLocalizedMessage()));
}
}
- user.sendMessage(_("You do the crime, you do the time."));
+ user.sendMessage(_("§4You do the crime, you do the time."));
}
@EventHandler(priority = EventPriority.HIGHEST)
@@ -227,14 +227,14 @@ public class Jails extends AsyncStorageObjectHolder<net.ess3.settings.Jails> imp
{
if (ess.getSettings().isDebug())
{
- LOGGER.log(Level.INFO, _("Error occurred when trying to return player {0} to jail: {1}!", user.getName(), ex.getLocalizedMessage()), ex);
+ LOGGER.log(Level.INFO, _("§4Error occurred when trying to return player§c {0} §4to jail: {1}!", user.getName(), ex.getLocalizedMessage()), ex);
}
else
{
- LOGGER.log(Level.INFO, _("Error occurred when trying to return player {0} to jail: {1}!", user.getName(), ex.getLocalizedMessage()));
+ LOGGER.log(Level.INFO, _("§4Error occurred when trying to return player§c {0} §4to jail: {1}!", user.getName(), ex.getLocalizedMessage()));
}
}
- user.sendMessage(_("You do the crime, you do the time."));
+ user.sendMessage(_("§4You do the crime, you do the time."));
}
}
}
diff --git a/Essentials/src/net/ess3/Kits.java b/Essentials/src/net/ess3/Kits.java
index 60dad63e0..6f6d3e2c6 100644
--- a/Essentials/src/net/ess3/Kits.java
+++ b/Essentials/src/net/ess3/Kits.java
@@ -27,12 +27,12 @@ public class Kits extends AsyncStorageObjectHolder<net.ess3.settings.Kits> imple
{
if (getData().getKits() == null || kitName == null || !getData().getKits().containsKey(kitName.toLowerCase(Locale.ENGLISH)))
{
- throw new Exception(_("That kit does not exist or is improperly defined."));
+ throw new Exception(_("§4That kit does not exist or is improperly defined."));
}
final Kit kit = getData().getKits().get(kitName.toLowerCase(Locale.ENGLISH));
if (kit == null)
{
- throw new Exception(_("That kit does not exist or is improperly defined."));
+ throw new Exception(_("§4That kit does not exist or is improperly defined."));
}
return kit;
}
@@ -98,7 +98,7 @@ public class Kits extends AsyncStorageObjectHolder<net.ess3.settings.Kits> imple
time.setTimeInMillis(lastTime);
time.add(Calendar.SECOND, (int)delay);
time.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
- user.sendMessage(_("You can't use that kit again for another {0}.", DateUtil.formatDateDiff(time.getTimeInMillis())));
+ user.sendMessage(_("§4You can''t use that kit again for another§c {0}§4.", DateUtil.formatDateDiff(time.getTimeInMillis())));
throw new NoChargeException();
}
}
diff --git a/Essentials/src/net/ess3/MetaItemStack.java b/Essentials/src/net/ess3/MetaItemStack.java
index 13ae31354..646f8a812 100644
--- a/Essentials/src/net/ess3/MetaItemStack.java
+++ b/Essentials/src/net/ess3/MetaItemStack.java
@@ -111,14 +111,14 @@ public class MetaItemStack
{
if (!hasMetaPermission(sender, "firework", true, true, ess))
{
- throw new Exception(_("You do not have permission to apply firework meta."));
+ throw new Exception(_("§4You do not have permission to apply firework meta."));
}
FireworkEffect effect = builder.build();
FireworkMeta fmeta = (FireworkMeta)stack.getItemMeta();
fmeta.addEffect(effect);
if (fmeta.getEffects().size() > 1 && !hasMetaPermission(sender, "firework-multiple", true, true, ess))
{
- throw new Exception(_("You cannot apply more than one charge to this firework."));
+ throw new Exception(_("§4You cannot apply more than one charge to this firework."));
}
stack.setItemMeta(fmeta);
}
@@ -161,7 +161,7 @@ public class MetaItemStack
}
else
{
- throw new Exception(_("You can only set the owner of player skulls (397:3)."));
+ throw new Exception(_("§4You can only set the owner of player skulls (397:3)."));
}
}
else if (split.length > 1 && split[0].equalsIgnoreCase("book") && stack.getType() == Material.WRITTEN_BOOK && hasMetaPermission(sender, "book", false, true, ess))
@@ -178,7 +178,7 @@ public class MetaItemStack
}
else
{
- throw new Exception(_("You do not have permission to create dynamic books."));
+ throw new Exception(_("§4You do not have permission to create dynamic books."));
}
}
@@ -229,7 +229,7 @@ public class MetaItemStack
}
else
{
- throw new Exception(_("Leather Color Syntax: color:<red>,<green>,<blue> eg: color:255,0,0."));
+ throw new Exception(_("§6Leather Color Syntax: color:<red>,<green>,<blue> eg: color:255,0,0."));
}
}
else
@@ -255,14 +255,14 @@ public class MetaItemStack
{
if (!hasMetaPermission(sender, "firework", true, true, ess))
{
- throw new Exception(_("You do not have permission to apply firework meta."));
+ throw new Exception(_("§4You do not have permission to apply firework meta."));
}
FireworkEffect effect = builder.build();
FireworkMeta fmeta = (FireworkMeta)stack.getItemMeta();
fmeta.addEffect(effect);
if (fmeta.getEffects().size() > 1 && !hasMetaPermission(sender, "firework-multiple", true, true, ess))
{
- throw new Exception(_("You cannot apply more than one charge to this firework."));
+ throw new Exception(_("§4You cannot apply more than one charge to this firework."));
}
stack.setItemMeta(fmeta);
builder = FireworkEffect.builder();
@@ -279,7 +279,7 @@ public class MetaItemStack
}
else
{
- throw new Exception(_("The option {0} is not a valid value for {1}.", split[1], split[0]));
+ throw new Exception(_("§6The option §4{0} §6is not a valid value for §4{1}§6.", split[1], split[0]));
}
}
builder.withColor(primaryColors);
@@ -294,7 +294,7 @@ public class MetaItemStack
}
else
{
- throw new Exception(_("The option {0} is not a valid value for {1}.", split[1], split[0]));
+ throw new Exception(_("§6The option §4{0} §6is not a valid value for §4{1}§6.", split[1], split[0]));
}
if (finalEffect != null)
{
@@ -313,7 +313,7 @@ public class MetaItemStack
}
else
{
- throw new Exception(_("The option {0} is not a valid value for {1}.", split[1], split[0]));
+ throw new Exception(_("§6The option §4{0} §6is not a valid value for §4{1}§6.", split[1], split[0]));
}
}
if (!fadeColors.isEmpty())
@@ -336,7 +336,7 @@ public class MetaItemStack
}
else
{
- throw new Exception(_("The option {0} is not a valid value for {1}.", split[1], split[0]));
+ throw new Exception(_("§6The option §4{0} §6is not a valid value for §4{1}§6.", split[1], split[0]));
}
}
}
@@ -365,12 +365,12 @@ public class MetaItemStack
}
else
{
- throw new Exception(_("You do not have permission to apply potion effect {0} to this potion.", pEffectType.getName().toLowerCase(Locale.ENGLISH)));
+ throw new Exception(_("§4You do not have permission to apply potion effect §c{0} §4to this potion.", pEffectType.getName().toLowerCase(Locale.ENGLISH)));
}
}
else
{
- throw new Exception(_("Invalid Potion.Meta", split[1]));
+ throw new Exception(_("§4Invalid potion meta: §c{0}§4.", split[1]));
}
}
else if (split[0].equalsIgnoreCase("power") || (allowShortName && split[0].equalsIgnoreCase("p")))
@@ -386,7 +386,7 @@ public class MetaItemStack
}
else
{
- throw new Exception(_("Invalid Potion.Meta", split[1]));
+ throw new Exception(_("§4Invalid potion meta: §c{0}§4.", split[1]));
}
}
else if (split[0].equalsIgnoreCase("duration") || (allowShortName && split[0].equalsIgnoreCase("d")))
@@ -398,7 +398,7 @@ public class MetaItemStack
}
else
{
- throw new Exception(_("Invalid Potion.Meta", split[1]));
+ throw new Exception(_("§4Invalid potion meta: §c{0}§4.", split[1]));
}
}
@@ -408,7 +408,7 @@ public class MetaItemStack
pEffect = pEffectType.createEffect(duration, power);
if (pmeta.getCustomEffects().size() > 1 && !hasMetaPermission(sender, "Potions: {0}..multiple", true, false, ess))
{
- throw new Exception(_("You cannot apply more than one effect to this potion."));
+ throw new Exception(_("§4You cannot apply more than one effect to this potion."));
}
pmeta.addCustomEffect(pEffect, true);
stack.setItemMeta(pmeta);
@@ -499,7 +499,7 @@ public class MetaItemStack
if (!hasMetaPermission(user, "enchantments." + enchantmentName, true, false))
{
- throw new Exception(_("You do not have the permission for {0}.", enchantmentName));
+ throw new Exception(_(" §4You do not have the permission for§c {0}§4.", enchantmentName));
}
return enchantment;
}
@@ -525,7 +525,7 @@ public class MetaItemStack
}
else
{
- throw new Exception(_("You do not have permission to apply {0} meta to this item.", metaPerm));
+ throw new Exception(_("§4You do not have permission to apply §c{0}§4 meta to this item.", metaPerm));
}
}
}
diff --git a/Essentials/src/net/ess3/SpawnMob.java b/Essentials/src/net/ess3/SpawnMob.java
index a0aa4fe1b..1f4eee3b0 100644
--- a/Essentials/src/net/ess3/SpawnMob.java
+++ b/Essentials/src/net/ess3/SpawnMob.java
@@ -90,7 +90,7 @@ public class SpawnMob
final Block block = LocationUtil.getTarget(user.getPlayer()).getBlock();
if (block == null)
{
- throw new Exception(_("Unable to spawn mob."));
+ throw new Exception(_("§4Unable to spawn mob."));
}
spawnmob(ess, server, user, user, block.getLocation(), parts, data, mobCount);
}
@@ -138,7 +138,7 @@ public class SpawnMob
}
catch (MobException e1)
{
- throw new Exception(_("Unable to spawn mob."), e1);
+ throw new Exception(_("§4Unable to spawn mob."), e1);
}
catch (NumberFormatException e2)
{
@@ -146,7 +146,7 @@ public class SpawnMob
}
catch (NullPointerException np)
{
- throw new Exception(_("That mob likes to be alone."), np);
+ throw new Exception(_("§4That mob likes to be alone."), np);
}
}
@@ -197,7 +197,7 @@ public class SpawnMob
if (!Permissions.SPAWNMOB.isAuthorized((User) sender, mob.getName()))
{
- throw new Exception(_("You don't have permission to spawn this mob."));
+ throw new Exception(_("§4You don't have permission to spawn this mob."));
}
}
@@ -213,7 +213,7 @@ public class SpawnMob
}
catch (Exception e)
{
- throw new Exception(_("Malformed size."), e);
+ throw new Exception(_("§4Malformed size."), e);
}
}
if (spawned instanceof Ageable && data.contains("baby"))
@@ -238,7 +238,7 @@ public class SpawnMob
}
catch (Exception e)
{
- throw new Exception(_("Malformed color."), e);
+ throw new Exception(_("§4Malformed color."), e);
}
}
if (spawned instanceof Tameable && data.contains("tamed") && target != null)
diff --git a/Essentials/src/net/ess3/Teleport.java b/Essentials/src/net/ess3/Teleport.java
index 5a5ab18d5..003279e7a 100644
--- a/Essentials/src/net/ess3/Teleport.java
+++ b/Essentials/src/net/ess3/Teleport.java
@@ -91,7 +91,7 @@ public class Teleport implements Runnable, ITeleport
try
{
cooldown(false);
- teleportUser.sendMessage(_("Teleportation commencing..."));
+ teleportUser.sendMessage(_("§6Teleportation commencing..."));
try
{
@@ -108,10 +108,10 @@ public class Teleport implements Runnable, ITeleport
}
catch (Exception ex)
{
- user.sendMessage(_("Cooldown: {0}", ex.getMessage()));
+ user.sendMessage(_("§4Cooldown: {0}", ex.getMessage()));
if (user != teleportUser)
{
- teleportUser.sendMessage(_("Cooldown: {0}", ex.getMessage()));
+ teleportUser.sendMessage(_("§4Cooldown: {0}", ex.getMessage()));
}
}
}
@@ -132,7 +132,7 @@ public class Teleport implements Runnable, ITeleport
}
catch (CooldownException ex)
{
- throw new Exception(_("Time before next teleport: {0}", ex.getMessage()));
+ throw new Exception(_("§6Time before next teleport:§c {0}", ex.getMessage()));
}
}
@@ -149,10 +149,10 @@ public class Teleport implements Runnable, ITeleport
ess.getPlugin().cancelTask(teleTimer);
if (notifyUser)
{
- user.sendMessage(_("Pending teleportation request cancelled."));
+ user.sendMessage(_("§4Pending teleportation request cancelled."));
if (teleportUser != user)
{
- teleportUser.sendMessage(_("Pending teleportation request cancelled."));
+ teleportUser.sendMessage(_("§4Pending teleportation request cancelled."));
}
}
}
@@ -288,7 +288,7 @@ public class Teleport implements Runnable, ITeleport
final Calendar c = new GregorianCalendar();
c.add(Calendar.SECOND, (int)delay);
c.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
- user.sendMessage(_("Teleportation will commence in {0}. Don't move.", DateUtil.formatDateDiff(c.getTimeInMillis())));
+ user.sendMessage(_("§6Teleportation will commence in§c {0}§6. Don''t move.", DateUtil.formatDateDiff(c.getTimeInMillis())));
}
@Override
@@ -304,7 +304,7 @@ public class Teleport implements Runnable, ITeleport
public void warp(String warp, Trade chargeFor, TeleportCause cause) throws Exception
{
final Location loc = ess.getWarps().getWarp(warp);
- user.sendMessage(_("Warping to {0}.", warp));
+ user.sendMessage(_("§6Warping to§c {0}§6.", warp));
teleport(new Target(loc), chargeFor, cause);
}
diff --git a/Essentials/src/net/ess3/Warps.java b/Essentials/src/net/ess3/Warps.java
index 9be134bde..bf098c31b 100644
--- a/Essentials/src/net/ess3/Warps.java
+++ b/Essentials/src/net/ess3/Warps.java
@@ -49,7 +49,7 @@ public class Warps extends StorageObjectMap<IWarp> implements IWarps
final IWarp warp = getObject(name);
if (warp == null)
{
- throw new WarpNotFoundException(_("That warp does not exist."));
+ throw new WarpNotFoundException(_("§4That warp does not exist."));
}
return warp.getData().getLocation().getStoredLocation();
}
diff --git a/Essentials/src/net/ess3/api/NoLoanPermittedException.java b/Essentials/src/net/ess3/api/NoLoanPermittedException.java
index 74622f024..ff9059a99 100644
--- a/Essentials/src/net/ess3/api/NoLoanPermittedException.java
+++ b/Essentials/src/net/ess3/api/NoLoanPermittedException.java
@@ -12,6 +12,6 @@ public class NoLoanPermittedException extends Exception
public NoLoanPermittedException()
{
- super(_("User is not allowed to have a negative balance."));
+ super(_("§4User is not allowed to have a negative balance."));
}
}
diff --git a/Essentials/src/net/ess3/api/UserDoesNotExistException.java b/Essentials/src/net/ess3/api/UserDoesNotExistException.java
index b2df53ae1..1503857ce 100644
--- a/Essentials/src/net/ess3/api/UserDoesNotExistException.java
+++ b/Essentials/src/net/ess3/api/UserDoesNotExistException.java
@@ -12,6 +12,6 @@ public class UserDoesNotExistException extends Exception
public UserDoesNotExistException(String name)
{
- super(_("The user {0} does not exist.", name));
+ super(_("§4The user§c {0} §4does not exist.", name));
}
}
diff --git a/Essentials/src/net/ess3/backup/Backup.java b/Essentials/src/net/ess3/backup/Backup.java
index e638782f4..a4df0ab7a 100644
--- a/Essentials/src/net/ess3/backup/Backup.java
+++ b/Essentials/src/net/ess3/backup/Backup.java
@@ -65,7 +65,7 @@ public class Backup implements Runnable, IBackup
return;
}*/
- ess.getLogger().log(Level.INFO, _("Backup started."));
+ ess.getLogger().log(Level.INFO, _("§6Backup started."));
if (!backupSettings.getCommandsBeforeBackup().isEmpty())
{
@@ -153,7 +153,7 @@ public class Backup implements Runnable, IBackup
}
active.set(false);
- ess.getLogger().log(Level.INFO, _("Backup finished."));
+ ess.getLogger().log(Level.INFO, _("§6Backup finished."));
}
}
}
diff --git a/Essentials/src/net/ess3/bukkit/VersionCheck.java b/Essentials/src/net/ess3/bukkit/VersionCheck.java
index ef5918a5c..f84b97efa 100644
--- a/Essentials/src/net/ess3/bukkit/VersionCheck.java
+++ b/Essentials/src/net/ess3/bukkit/VersionCheck.java
@@ -23,7 +23,7 @@ public class VersionCheck
{
if (p.getDescription().getName().startsWith("Essentials") && !p.getDescription().getVersion().equals(pluginVersion))
{
- p.getLogger().log(Level.WARNING, _("Version mismatch! Please update {0} to the same version.", p.getDescription().getName()));
+ p.getLogger().log(Level.WARNING, _("§4Version mismatch! Please update {0} to the same version.", p.getDescription().getName()));
}
}
final Matcher versionMatch = bukkitVersionPattern.matcher(plugin.getServer().getVersion());
@@ -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, _(" * ! * Bukkit version is not the recommended build for Essentials."));
- log.log(Level.SEVERE, _(" * ! * 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/Commandafk.java b/Essentials/src/net/ess3/commands/Commandafk.java
index 838143820..501ff735b 100644
--- a/Essentials/src/net/ess3/commands/Commandafk.java
+++ b/Essentials/src/net/ess3/commands/Commandafk.java
@@ -28,14 +28,14 @@ public class Commandafk extends EssentialsCommand
{
if (!user.toggleAfk())
{
- //user.sendMessage(_("You are no longer marked as away."));
- ess.broadcastMessage(user, _("{0} is no longer AFK.", user.getPlayer().getDisplayName()));
+ //user.sendMessage(_("§6You are no longer marked as away."));
+ ess.broadcastMessage(user, _("§5{0} §5is no longer AFK.", user.getPlayer().getDisplayName()));
user.updateActivity(false);
}
else
{
- //user.sendMessage(_("You are now marked as away."));
- ess.broadcastMessage(user, _("{0} is now AFK.", user.getPlayer().getDisplayName()));
+ //user.sendMessage(_("§6You are now marked as away."));
+ ess.broadcastMessage(user, _("§5{0} §5is now AFK.", user.getPlayer().getDisplayName()));
}
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandback.java b/Essentials/src/net/ess3/commands/Commandback.java
index 5e2ca1693..92755dd21 100644
--- a/Essentials/src/net/ess3/commands/Commandback.java
+++ b/Essentials/src/net/ess3/commands/Commandback.java
@@ -12,7 +12,7 @@ public class Commandback extends EssentialsCommand
{
final Trade charge = new Trade(commandName, ess);
charge.isAffordableFor(user);
- user.sendMessage(_("Returning to previous location."));
+ user.sendMessage(_("§6Returning to previous location."));
user.getTeleport().back(charge);
throw new NoChargeException();
}
diff --git a/Essentials/src/net/ess3/commands/Commandbackup.java b/Essentials/src/net/ess3/commands/Commandbackup.java
index a9ed21d0c..ed24eeaf9 100644
--- a/Essentials/src/net/ess3/commands/Commandbackup.java
+++ b/Essentials/src/net/ess3/commands/Commandbackup.java
@@ -12,6 +12,6 @@ public class Commandbackup extends EssentialsCommand
{
final IBackup backup = ess.getBackup();
backup.run();
- sender.sendMessage(_("Backup started."));
+ sender.sendMessage(_("§6Backup started."));
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandbalance.java b/Essentials/src/net/ess3/commands/Commandbalance.java
index b6fe486d2..6eebbebb4 100644
--- a/Essentials/src/net/ess3/commands/Commandbalance.java
+++ b/Essentials/src/net/ess3/commands/Commandbalance.java
@@ -16,13 +16,13 @@ public class Commandbalance extends EssentialsCommand
{
throw new NotEnoughArgumentsException();
}
- sender.sendMessage(_("Balance: {0}", FormatUtil.displayCurrency(ess.getUserMap().matchUser(args[0], true).getMoney(), ess)));
+ sender.sendMessage(_("§aBalance:§c {0}", FormatUtil.displayCurrency(ess.getUserMap().matchUser(args[0], true).getMoney(), ess)));
}
@Override
public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
{
final double bal = (args.length < 1 || !Permissions.BALANCE_OTHERS.isAuthorized(user) ? user : ess.getUserMap().matchUser(args[0], true)).getMoney();
- user.sendMessage(_("Balance: {0}", FormatUtil.displayCurrency(bal, ess)));
+ user.sendMessage(_("§aBalance:§c {0}", FormatUtil.displayCurrency(bal, ess)));
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandbalancetop.java b/Essentials/src/net/ess3/commands/Commandbalancetop.java
index b42f933f9..ea03cae99 100644
--- a/Essentials/src/net/ess3/commands/Commandbalancetop.java
+++ b/Essentials/src/net/ess3/commands/Commandbalancetop.java
@@ -77,7 +77,7 @@ public class Commandbalancetop extends EssentialsCommand
}
if (ess.getUserMap().getUniqueUsers() > MINUSERS)
{
- sender.sendMessage(_("Ordering balances of {0} users, please wait...", ess.getUserMap().getUniqueUsers()));
+ sender.sendMessage(_("§6Ordering balances of§c {0} §6users, please wait...", ess.getUserMap().getUniqueUsers()));
}
}
finally
@@ -90,7 +90,7 @@ public class Commandbalancetop extends EssentialsCommand
{
if (ess.getUserMap().getUniqueUsers() > MINUSERS)
{
- sender.sendMessage(_("Ordering balances of {0} users, please wait...", ess.getUserMap().getUniqueUsers()));
+ sender.sendMessage(_("§6Ordering balances of§c {0} §6users, please wait...", ess.getUserMap().getUniqueUsers()));
}
ess.getPlugin().runTaskAsynchronously(new Viewer(sender, page, force));
}
@@ -102,7 +102,7 @@ public class Commandbalancetop extends EssentialsCommand
final Calendar cal = Calendar.getInstance();
cal.setTimeInMillis(cacheage);
final DateFormat format = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
- sender.sendMessage(_("Top balances ({0})", format.format(cal.getTime())));
+ sender.sendMessage(_("§6Top balances ({0})", format.format(cal.getTime())));
new TextPager(cache).showPage(Integer.toString(page), "", "balancetop", sender);
}
@@ -155,7 +155,7 @@ public class Commandbalancetop extends EssentialsCommand
}
});
- cache.getLines().add(_("Server Total: {0}", FormatUtil.displayCurrency(totalMoney, ess)));
+ cache.getLines().add(_("§6Server Total:§c {0}", FormatUtil.displayCurrency(totalMoney, ess)));
int pos = 1;
for (Map.Entry<String, Double> entry : sortedEntries)
{
diff --git a/Essentials/src/net/ess3/commands/Commandban.java b/Essentials/src/net/ess3/commands/Commandban.java
index ceea27348..8a45a4c01 100644
--- a/Essentials/src/net/ess3/commands/Commandban.java
+++ b/Essentials/src/net/ess3/commands/Commandban.java
@@ -25,7 +25,7 @@ public class Commandban extends EssentialsCommand
{
if (isUser(sender) && Permissions.BAN_OFFLINE.isAuthorized(sender))
{
- sender.sendMessage(_("You can not ban that player."));
+ sender.sendMessage(_("§4You can not ban that player."));
return;
}
}
@@ -33,7 +33,7 @@ public class Commandban extends EssentialsCommand
{
if (isUser(sender) && Permissions.BAN_EXEMPT.isAuthorized(user))
{
- sender.sendMessage(_("You can not ban that player."));
+ sender.sendMessage(_("§4You can not ban that player."));
return;
}
}
@@ -45,12 +45,12 @@ public class Commandban extends EssentialsCommand
if (args.length > 1)
{
- banReason = _("Banned: {0}", FormatUtil.replaceFormat(getFinalArg(args, 1).replace("\\n", "\n").replace("|", "\n")), senderName);
+ banReason = _("§4Banned:n§r{0}", FormatUtil.replaceFormat(getFinalArg(args, 1).replace("\\n", "\n").replace("|", "\n")), senderName);
userData.getBan().setReason(banReason);
}
else
{
- banReason = _("Banned: {0}", _("The Ban Hammer has spoken!"), senderName);
+ banReason = _("§4Banned:n§r{0}", _("The Ban Hammer has spoken!"), senderName);
userData.getBan().setReason("");
}
@@ -62,7 +62,7 @@ public class Commandban extends EssentialsCommand
{
if (Permissions.BAN_NOTIFY.isAuthorized(player))
{
- player.sendMessage(_("Player {0} banned {1} for {2}.", senderName, user.getName(), banReason));
+ player.sendMessage(_("§6Player§c {0} §6banned {1} §6for {2}.", senderName, user.getName(), banReason));
}
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandbanip.java b/Essentials/src/net/ess3/commands/Commandbanip.java
index 161ceb13d..b26f69ccb 100644
--- a/Essentials/src/net/ess3/commands/Commandbanip.java
+++ b/Essentials/src/net/ess3/commands/Commandbanip.java
@@ -34,7 +34,7 @@ public class Commandbanip extends EssentialsCommand
final String ipAddress = player.getData().getIpAddress();
if (ipAddress.length() == 0)
{
- throw new Exception(_("Player not found."));
+ throw new Exception(_("§4Player not found."));
}
ess.getServer().banIP(ipAddress);
sender.sendMessage(_("Banned IP address"));
diff --git a/Essentials/src/net/ess3/commands/Commandbigtree.java b/Essentials/src/net/ess3/commands/Commandbigtree.java
index e4d8bd280..e33cecc28 100644
--- a/Essentials/src/net/ess3/commands/Commandbigtree.java
+++ b/Essentials/src/net/ess3/commands/Commandbigtree.java
@@ -41,11 +41,11 @@ public class Commandbigtree extends EssentialsCommand
final boolean success = user.getPlayer().getWorld().generateTree(safeLocation, bukkitTree);
if (success)
{
- user.sendMessage(_("Big tree spawned."));
+ user.sendMessage(_(" §6Big tree spawned."));
}
else
{
- throw new Exception(_("Big tree generation failure. Try again on grass or dirt."));
+ throw new Exception(_("§4Big tree generation failure. Try again on grass or dirt."));
}
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandbook.java b/Essentials/src/net/ess3/commands/Commandbook.java
index 4c7b42f92..f041127c8 100644
--- a/Essentials/src/net/ess3/commands/Commandbook.java
+++ b/Essentials/src/net/ess3/commands/Commandbook.java
@@ -30,11 +30,11 @@ public class Commandbook extends EssentialsCommand
{
bmeta.setAuthor(args[1]);
item.setItemMeta(bmeta);
- user.sendMessage(_("Author of the book set to {0}.", getFinalArg(args, 1)));
+ user.sendMessage(_("§6Author of the book set to {0}.", getFinalArg(args, 1)));
}
else
{
- throw new Exception(_("You cannot change the author of this book."));
+ throw new Exception(_("§4You cannot change the author of this book."));
}
}
else if (args.length > 1 && args[0].equalsIgnoreCase("title"))
@@ -43,11 +43,11 @@ public class Commandbook extends EssentialsCommand
{
bmeta.setTitle(args[1]);
item.setItemMeta(bmeta);
- user.sendMessage(_("Title of the book set to {0}.", getFinalArg(args, 1)));
+ user.sendMessage(_("§6Title of the book set to {0}.", getFinalArg(args, 1)));
}
else
{
- throw new Exception(_("You cannot change the title of this book."));
+ throw new Exception(_("§4You cannot change the title of this book."));
}
}
else
@@ -57,11 +57,11 @@ public class Commandbook extends EssentialsCommand
ItemStack newItem = new ItemStack(Material.BOOK_AND_QUILL, item.getAmount());
newItem.setItemMeta(bmeta);
user.getPlayer().setItemInHand(newItem);
- user.sendMessage(_("You may now edit the contents of this book."));
+ user.sendMessage(_("§eYou may now edit the contents of this book."));
}
else
{
- throw new Exception(_("You cannot unlock this book."));
+ throw new Exception(_("§4You cannot unlock this book."));
}
}
}
@@ -75,11 +75,11 @@ public class Commandbook extends EssentialsCommand
ItemStack newItem = new ItemStack(Material.WRITTEN_BOOK, item.getAmount());
newItem.setItemMeta(bmeta);
player.setItemInHand(newItem);
- user.sendMessage(_("This book is now locked."));
+ user.sendMessage(_("§6This book is now locked."));
}
else
{
- throw new Exception(_("You are not holding a writable book."));
+ throw new Exception(_("§4You are not holding a writable book."));
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandbreak.java b/Essentials/src/net/ess3/commands/Commandbreak.java
index c2e14567a..f8a9a2e08 100644
--- a/Essentials/src/net/ess3/commands/Commandbreak.java
+++ b/Essentials/src/net/ess3/commands/Commandbreak.java
@@ -25,7 +25,7 @@ public class Commandbreak extends EssentialsCommand
}
if (block.getType() == Material.BEDROCK && !Permissions.BREAK_BEDROCK.isAuthorized(user))
{
- throw new Exception(_("You are not allowed to destroy bedrock."));
+ throw new Exception(_("§4You are not allowed to destroy bedrock."));
}
//final List<ItemStack> list = (List<ItemStack>)block.getDrops();
//final BlockBreakEvent event = new BlockBreakEvent(block, user.getBase(), list);
diff --git a/Essentials/src/net/ess3/commands/Commandbroadcast.java b/Essentials/src/net/ess3/commands/Commandbroadcast.java
index 84057bae5..52854ce87 100644
--- a/Essentials/src/net/ess3/commands/Commandbroadcast.java
+++ b/Essentials/src/net/ess3/commands/Commandbroadcast.java
@@ -14,6 +14,6 @@ public class Commandbroadcast extends EssentialsCommand
{
throw new NotEnoughArgumentsException();
}
- ess.broadcastMessage(null, _("[Broadcast] {0}", FormatUtil.replaceFormat(getFinalArg(args, 0))));
+ ess.broadcastMessage(null, _("§r§6[§4Broadcast§6]§a {0}", FormatUtil.replaceFormat(getFinalArg(args, 0))));
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandburn.java b/Essentials/src/net/ess3/commands/Commandburn.java
index 446ef2e14..9b4ad42b0 100644
--- a/Essentials/src/net/ess3/commands/Commandburn.java
+++ b/Essentials/src/net/ess3/commands/Commandburn.java
@@ -20,7 +20,7 @@ public class Commandburn extends EssentialsCommand
{
final Player player = p.getPlayer();
player.setFireTicks(Integer.parseInt(args[1]) * 20);
- sender.sendMessage(_("You set {0} on fire for {1} seconds.", player.getDisplayName(), Integer.parseInt(args[1])));
+ sender.sendMessage(_("§6You set§c {0} §6on fire for§c {1} seconds§6.", player.getDisplayName(), Integer.parseInt(args[1])));
}
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandclearinventory.java b/Essentials/src/net/ess3/commands/Commandclearinventory.java
index 5e267d6a7..35e2a1119 100644
--- a/Essentials/src/net/ess3/commands/Commandclearinventory.java
+++ b/Essentials/src/net/ess3/commands/Commandclearinventory.java
@@ -20,17 +20,17 @@ public class Commandclearinventory extends EssentialsCommand
{
final Player player = p.getPlayer();
player.getInventory().clear();
- user.sendMessage(_("Inventory of {0} cleared.", player.getDisplayName()));
+ user.sendMessage(_("§6Inventory of §c{0}§6 cleared.", player.getDisplayName()));
}
else
{
- throw new Exception(_("Player not found."));
+ throw new Exception(_("§4Player not found."));
}
}
else
{
user.getPlayer().getInventory().clear();
- user.sendMessage(_("Inventory cleared."));
+ user.sendMessage(_("§6Inventory cleared."));
}
}
@@ -51,11 +51,11 @@ public class Commandclearinventory extends EssentialsCommand
for (Player p : online)
{
p.getInventory().clear();
- sender.sendMessage(_("Inventory of {0} cleared.", p.getDisplayName()));
+ sender.sendMessage(_("§6Inventory of §c{0}§6 cleared.", p.getDisplayName()));
}
return;
}
- throw new Exception(_("Player not found."));
+ throw new Exception(_("§4Player not found."));
}
else
{
@@ -63,11 +63,11 @@ public class Commandclearinventory extends EssentialsCommand
if (u != null)
{
u.getInventory().clear();
- sender.sendMessage(_("Inventory of {0} cleared.", u.getDisplayName()));
+ sender.sendMessage(_("§6Inventory of §c{0}§6 cleared.", u.getDisplayName()));
}
else
{
- throw new Exception(_("Player not found."));
+ throw new Exception(_("§4Player not found."));
}
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandcompass.java b/Essentials/src/net/ess3/commands/Commandcompass.java
index 237fea045..c4bdd177d 100644
--- a/Essentials/src/net/ess3/commands/Commandcompass.java
+++ b/Essentials/src/net/ess3/commands/Commandcompass.java
@@ -47,6 +47,6 @@ public class Commandcompass extends EssentialsCommand
{
dir = "N";
}
- user.sendMessage(_("Bearing: {0} ({1} degrees).", dir, bearing));
+ user.sendMessage(_("§6Bearing: {0} ({1} degrees).", dir, bearing));
}
}
diff --git a/Essentials/src/net/ess3/commands/Commanddelhome.java b/Essentials/src/net/ess3/commands/Commanddelhome.java
index 695fc09e5..a134d47d3 100644
--- a/Essentials/src/net/ess3/commands/Commanddelhome.java
+++ b/Essentials/src/net/ess3/commands/Commanddelhome.java
@@ -54,6 +54,6 @@ public class Commanddelhome extends EssentialsCommand
}
user.getData().removeHome(name.toLowerCase(Locale.ENGLISH));
user.queueSave();
- sender.sendMessage(_("Home {0} has been removed.", name));
+ sender.sendMessage(_("§6Home§c {0} §6has been removed.", name));
}
}
diff --git a/Essentials/src/net/ess3/commands/Commanddeljail.java b/Essentials/src/net/ess3/commands/Commanddeljail.java
index 5290ab7c5..0f533d8c4 100644
--- a/Essentials/src/net/ess3/commands/Commanddeljail.java
+++ b/Essentials/src/net/ess3/commands/Commanddeljail.java
@@ -14,6 +14,6 @@ public class Commanddeljail extends EssentialsCommand
throw new NotEnoughArgumentsException();
}
ess.getJails().removeJail(args[0]);
- sender.sendMessage(_("Jail {0} has been removed.", args[0]));
+ sender.sendMessage(_("§6Jail§c {0} §6has been removed.", args[0]));
}
}
diff --git a/Essentials/src/net/ess3/commands/Commanddelwarp.java b/Essentials/src/net/ess3/commands/Commanddelwarp.java
index 824cc60c7..b181bb6f6 100644
--- a/Essentials/src/net/ess3/commands/Commanddelwarp.java
+++ b/Essentials/src/net/ess3/commands/Commanddelwarp.java
@@ -14,6 +14,6 @@ public class Commanddelwarp extends EssentialsCommand
throw new NotEnoughArgumentsException();
}
ess.getWarps().removeWarp(args[0]);
- sender.sendMessage(_("Warp {0} has been removed.", args[0]));
+ sender.sendMessage(_("§6Warp§c {0} §6has been removed.", args[0]));
}
}
diff --git a/Essentials/src/net/ess3/commands/Commanddepth.java b/Essentials/src/net/ess3/commands/Commanddepth.java
index 852ccc2a6..41b87b827 100644
--- a/Essentials/src/net/ess3/commands/Commanddepth.java
+++ b/Essentials/src/net/ess3/commands/Commanddepth.java
@@ -12,15 +12,15 @@ public class Commanddepth extends EssentialsCommand
final int depth = user.getPlayer().getLocation().getBlockY() - 63;
if (depth > 0)
{
- user.sendMessage(_("You are {0} block(s) above sea level.", depth));
+ user.sendMessage(_("§6You are§c {0} §6block(s) above sea level.", depth));
}
else if (depth < 0)
{
- user.sendMessage(_("You are {0} block(s) below sea level.", (-depth)));
+ user.sendMessage(_("§6You are§c {0} §6block(s) below sea level.", (-depth)));
}
else
{
- user.sendMessage(_("You are at sea level."));
+ user.sendMessage(_("§6You are at sea level."));
}
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandeco.java b/Essentials/src/net/ess3/commands/Commandeco.java
index 0c9fe4dc0..0ebf4c04f 100644
--- a/Essentials/src/net/ess3/commands/Commandeco.java
+++ b/Essentials/src/net/ess3/commands/Commandeco.java
@@ -78,7 +78,7 @@ public class Commandeco extends EssentialsCommand
case TAKE:
if (!player.canAfford(amount, false))
{
- throw new Exception(_("You do not have sufficient funds."));
+ throw new Exception(_("§4You do not have sufficient funds."));
}
player.takeMoney(amount);
break;
@@ -106,7 +106,7 @@ public class Commandeco extends EssentialsCommand
case TAKE:
if (!player.canAfford(amount, false))
{
- throw new Exception(_("You do not have sufficient funds."));
+ throw new Exception(_("§4You do not have sufficient funds."));
}
player.takeMoney(amount, sender);
break;
diff --git a/Essentials/src/net/ess3/commands/Commandenchant.java b/Essentials/src/net/ess3/commands/Commandenchant.java
index 16c67f311..7f5dfdb91 100644
--- a/Essentials/src/net/ess3/commands/Commandenchant.java
+++ b/Essentials/src/net/ess3/commands/Commandenchant.java
@@ -23,7 +23,7 @@ public class Commandenchant extends EssentialsCommand
final ItemStack stack = user.getPlayer().getItemInHand();
if (stack == null)
{
- throw new Exception(_("You have nothing in your hand."));
+ throw new Exception(_("§4You have nothing in your hand."));
}
if (args.length == 0)
{
@@ -37,7 +37,7 @@ public class Commandenchant extends EssentialsCommand
//enchantmentslist.add(enchantmentName);
}
}
- throw new NotEnoughArgumentsException(_("Enchantments: {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(_("The enchantment {0} has 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(_("The enchantment {0} has 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(_("Enchantment 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(_("You do not have the permission for {0}.", 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/Commandessentials.java b/Essentials/src/net/ess3/commands/Commandessentials.java
index 7c27d0cba..05da2dcf0 100644
--- a/Essentials/src/net/ess3/commands/Commandessentials.java
+++ b/Essentials/src/net/ess3/commands/Commandessentials.java
@@ -30,7 +30,7 @@ public class Commandessentials extends EssentialsCommand
{
sender.sendMessage("Essentials " + ess.getPlugin().getVersion());
sender.sendMessage("/<command> <reload/debug>");
- sender.sendMessage(_("Essentials relayed the following commands to another plugin:"));
+ sender.sendMessage(_("§6Essentials relayed the following commands to another plugin:"));
final StringBuilder disabledCommands = new StringBuilder();
for (Map.Entry<String, String> entry : ess.getCommandHandler().disabledCommands().entrySet())
{
@@ -52,6 +52,6 @@ public class Commandessentials extends EssentialsCommand
private void run_reload(final CommandSender sender, final String[] args) throws Exception
{
ess.onReload();
- sender.sendMessage(_("Essentials Reloaded {0}", ess.getPlugin().getVersion()));
+ sender.sendMessage(_("§6Essentials Reloaded§c {0}", ess.getPlugin().getVersion()));
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandexp.java b/Essentials/src/net/ess3/commands/Commandexp.java
index c8277fcca..d73e9f2bc 100644
--- a/Essentials/src/net/ess3/commands/Commandexp.java
+++ b/Essentials/src/net/ess3/commands/Commandexp.java
@@ -94,7 +94,7 @@ public class Commandexp extends EssentialsCommand
}
if (!foundUser)
{
- throw new NotEnoughArgumentsException(_("Player not found."));
+ throw new NotEnoughArgumentsException(_("§4Player not found."));
}
}
@@ -108,7 +108,7 @@ public class Commandexp extends EssentialsCommand
}
if (!foundUser)
{
- throw new NotEnoughArgumentsException(_("Player not found."));
+ throw new NotEnoughArgumentsException(_("§4Player not found."));
}
}
@@ -118,7 +118,7 @@ public class Commandexp extends EssentialsCommand
final int expLeft = (int)Util.roundDouble(
((((3.5 * target.getPlayer().getLevel()) + 6.7) - (totalExp - ((1.75 * (target.getPlayer().getLevel() * target.getPlayer().getLevel())) + (5.00 * target.getPlayer().getLevel())))) + 1));
sender.sendMessage(
- _("{0} has {1} exp (level {2}) and needs {3} more exp to level up.", target.getPlayer().getDisplayName(), SetExpFix.getTotalExperience(target.getPlayer()), target.getPlayer().getLevel(), expLeft));
+ _("§c{0} §6has§c {1} §6exp (level§c {2}§6) and needs§c {3} §6more exp to level up.", target.getPlayer().getDisplayName(), SetExpFix.getTotalExperience(target.getPlayer()), target.getPlayer().getLevel(), expLeft));
}
private void setExp(final CommandSender sender, final IUser target, final String strAmount, final boolean give)
@@ -133,6 +133,6 @@ public class Commandexp extends EssentialsCommand
amount = (long)Integer.MAX_VALUE;
}
SetExpFix.setTotalExperience(target.getPlayer(), amount.intValue());
- sender.sendMessage(_("{0} now has {1} exp.", target.getPlayer().getDisplayName(), amount));
+ sender.sendMessage(_("§c{0} §6now has§c {1} §6exp.", target.getPlayer().getDisplayName(), amount));
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandext.java b/Essentials/src/net/ess3/commands/Commandext.java
index aa9a90b49..68c1e5a25 100644
--- a/Essentials/src/net/ess3/commands/Commandext.java
+++ b/Essentials/src/net/ess3/commands/Commandext.java
@@ -25,7 +25,7 @@ public class Commandext extends EssentialsCommand
if (args.length < 1)
{
user.getPlayer().setFireTicks(0);
- user.sendMessage(_("You extinguished yourself."));
+ user.sendMessage(_("§6You extinguished yourself."));
return;
}
@@ -38,7 +38,7 @@ public class Commandext extends EssentialsCommand
{
final Player player = matchPlayer.getPlayer();
player.setFireTicks(0);
- sender.sendMessage(_("You extinguished {0}.", player.getDisplayName()));
+ sender.sendMessage(_("§6You extinguished {0}§6.", player.getDisplayName()));
}
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandfeed.java b/Essentials/src/net/ess3/commands/Commandfeed.java
index e2943e9b5..4814ae5f3 100644
--- a/Essentials/src/net/ess3/commands/Commandfeed.java
+++ b/Essentials/src/net/ess3/commands/Commandfeed.java
@@ -22,7 +22,7 @@ public class Commandfeed extends EssentialsCommand
final Player player = user.getPlayer();
player.setFoodLevel(20);
player.setSaturation(10);
- user.sendMessage(_("Your appetite was sated."));
+ user.sendMessage(_("§6Your appetite was sated."));
}
}
@@ -31,7 +31,7 @@ public class Commandfeed extends EssentialsCommand
final Set<IUser> users = ess.getUserMap().matchUsersExcludingHidden(name, getPlayerOrNull(sender));
if (users.isEmpty())
{
- sender.sendMessage(_("Player not found."));
+ sender.sendMessage(_("§4Player not found."));
return;
}
for (IUser player : users)
@@ -39,7 +39,7 @@ public class Commandfeed extends EssentialsCommand
final Player realPlayer = player.getPlayer();
realPlayer.setFoodLevel(20);
realPlayer.setSaturation(10);
- sender.sendMessage(_("Satisfied {0}.", realPlayer.getDisplayName()));
+ sender.sendMessage(_("§6Satisfied {0}§6.", realPlayer.getDisplayName()));
}
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandfirework.java b/Essentials/src/net/ess3/commands/Commandfirework.java
index aa1e60880..c822a3c67 100644
--- a/Essentials/src/net/ess3/commands/Commandfirework.java
+++ b/Essentials/src/net/ess3/commands/Commandfirework.java
@@ -52,7 +52,7 @@ public class Commandfirework extends EssentialsCommand
FireworkMeta fmeta = (FireworkMeta)stack.getItemMeta();
fmeta.clearEffects();
stack.setItemMeta(fmeta);
- user.sendMessage(_("Removed all effects from held stack."));
+ user.sendMessage(_("§6Removed all effects from held stack."));
}
else if (args.length > 1 && (args[0].equalsIgnoreCase("power") || (args[0].equalsIgnoreCase("p"))))
{
@@ -64,7 +64,7 @@ public class Commandfirework extends EssentialsCommand
}
catch (NumberFormatException e)
{
- throw new Exception(_("The option {0} is not a valid value for {1}.", args[1], args[0]));
+ throw new Exception(_("§6The option §4{0} §6is not a valid value for §4{1}§6.", args[1], args[0]));
}
stack.setItemMeta(fmeta);
}
@@ -118,7 +118,7 @@ public class Commandfirework extends EssentialsCommand
}
catch (Exception e)
{
- user.sendMessage(_("Firework parameters: color:<color> [fade:<color>] [shape:<shape>] [effect:<effect>]nTo use multiple colors/effects, separate values with commas: red,blue,pinknShapes: star, ball, large, creeper, burst Effects: trail, twinkle."));
+ user.sendMessage(_("§6Firework parameters:§c color:<color> [fade:<color>] [shape:<shape>] [effect:<effect>]n§6To use multiple colors/effects, separate values with commas: §cred,blue,pinkn§6Shapes:§c star, ball, large, creeper, burst §6Effects:§c trail, twinkle."));
throw e;
}
}
@@ -129,15 +129,15 @@ public class Commandfirework extends EssentialsCommand
FireworkEffect effect = mStack.getFireworkBuilder().build();
if (fmeta.getEffects().size() > 0 && !Permissions.FIREWORK_MULTIPLE.isAuthorized(user))
{
- throw new Exception(_("You cannot apply more than one charge to this firework."));
+ throw new Exception(_("§4You cannot apply more than one charge to this firework."));
}
fmeta.addEffect(effect);
stack.setItemMeta(fmeta);
}
else
{
- user.sendMessage(_("Firework parameters: color:<color> [fade:<color>] [shape:<shape>] [effect:<effect>]nTo use multiple colors/effects, separate values with commas: red,blue,pinknShapes: star, ball, large, creeper, burst Effects: trail, twinkle."));
- throw new Exception(_("Invalid firework charge parameters inserted, must set a color first."));
+ user.sendMessage(_("§6Firework parameters:§c color:<color> [fade:<color>] [shape:<shape>] [effect:<effect>]n§6To use multiple colors/effects, separate values with commas: §cred,blue,pinkn§6Shapes:§c star, ball, large, creeper, burst §6Effects:§c trail, twinkle."));
+ throw new Exception(_("§4Invalid firework charge parameters inserted, must set a color first."));
}
}
}
@@ -148,7 +148,7 @@ public class Commandfirework extends EssentialsCommand
}
else
{
- throw new Exception(_("You must be holding a firework to add effects."));
+ throw new Exception(_("§4You must be holding a firework to add effects."));
}
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandfly.java b/Essentials/src/net/ess3/commands/Commandfly.java
index f0b2e8240..56e1721e0 100644
--- a/Essentials/src/net/ess3/commands/Commandfly.java
+++ b/Essentials/src/net/ess3/commands/Commandfly.java
@@ -31,7 +31,7 @@ public class Commandfly extends EssentialsToggleCommand
{
if (value)
{
- sender.sendMessage(_("Set fly mode {0} for {1}.", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName()));
+ sender.sendMessage(_("§6Set fly mode§c {0} §6for {1}§6.", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName()));
}
else
{
@@ -42,7 +42,7 @@ public class Commandfly extends EssentialsToggleCommand
@Override
protected void informPlayer(final IUser player)
{
- final String message = _("Set fly mode {0} for {1}.", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName());
+ final String message = _("§6Set fly mode§c {0} §6for {1}§6.", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName());
player.sendMessage(message);
}
diff --git a/Essentials/src/net/ess3/commands/Commandgamemode.java b/Essentials/src/net/ess3/commands/Commandgamemode.java
index 3a1134d96..bcaeb4986 100644
--- a/Essentials/src/net/ess3/commands/Commandgamemode.java
+++ b/Essentials/src/net/ess3/commands/Commandgamemode.java
@@ -30,7 +30,7 @@ public class Commandgamemode extends EssentialsSettingsCommand
{
if (value)
{
- sender.sendMessage(_("Set game mode {0} for {1}.", getValue(player).toString().toLowerCase(Locale.ENGLISH), player.getPlayer().getDisplayName()));
+ sender.sendMessage(_("§6Set game mode§c {0} §6for {1}§6.", getValue(player).toString().toLowerCase(Locale.ENGLISH), player.getPlayer().getDisplayName()));
}
else
{
@@ -41,7 +41,7 @@ public class Commandgamemode extends EssentialsSettingsCommand
@Override
protected void informPlayer(final IUser player)
{
- final String message = _("Set game mode {0} for {1}.", getValue(player).toString().toLowerCase(Locale.ENGLISH), player.getPlayer().getDisplayName());
+ final String message = _("§6Set game mode§c {0} §6for {1}§6.", getValue(player).toString().toLowerCase(Locale.ENGLISH), player.getPlayer().getDisplayName());
player.sendMessage(message);
}
diff --git a/Essentials/src/net/ess3/commands/Commandgc.java b/Essentials/src/net/ess3/commands/Commandgc.java
index d0ec3a8c4..710ee2216 100644
--- a/Essentials/src/net/ess3/commands/Commandgc.java
+++ b/Essentials/src/net/ess3/commands/Commandgc.java
@@ -28,11 +28,11 @@ public class Commandgc extends EssentialsCommand
color = ChatColor.RED;
}
final Runtime runtime = Runtime.getRuntime();
- sender.sendMessage(_("Uptime: {0}", DateUtil.formatDateDiff(ManagementFactory.getRuntimeMXBean().getStartTime())));
- sender.sendMessage(_("Current TPS ", "" + color + tps));
- sender.sendMessage(_("Maximum memory: {0} MB", (runtime.maxMemory() / 1024 / 1024)));
- sender.sendMessage(_("Allocated memory: {0} MB", (runtime.totalMemory() / 1024 / 1024)));
- sender.sendMessage(_("Free memory: {0} MB", (runtime.freeMemory() / 1024 / 1024)));
+ sender.sendMessage(_("§6Uptime:§c {0}", DateUtil.formatDateDiff(ManagementFactory.getRuntimeMXBean().getStartTime())));
+ sender.sendMessage(_("§6Current TPS = {0}", "" + color + tps));
+ sender.sendMessage(_("§6Maximum memory:§c {0} MB.", (runtime.maxMemory() / 1024 / 1024)));
+ sender.sendMessage(_("§6Allocated memory:§c {0} MB.", (runtime.totalMemory() / 1024 / 1024)));
+ sender.sendMessage(_("§6Free memory:§c {0} MB.", (runtime.freeMemory() / 1024 / 1024)));
sender.sendMessage(_("gcquene", (ess.getStorageQueue().getQueueSize())));
for (World w : server.getWorlds())
diff --git a/Essentials/src/net/ess3/commands/Commandgive.java b/Essentials/src/net/ess3/commands/Commandgive.java
index cfdcc7d1a..763428744 100644
--- a/Essentials/src/net/ess3/commands/Commandgive.java
+++ b/Essentials/src/net/ess3/commands/Commandgive.java
@@ -30,7 +30,7 @@ public class Commandgive extends EssentialsCommand
final String itemname = stack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "");
if (!Permissions.GIVE.isAuthorized(sender, stack))
{
- throw new Exception(_("You are not allowed to spawn the item {0}.", itemname));
+ throw new Exception(_("§4You are not allowed to spawn the item§c {0}§4.", itemname));
}
if (args.length > 3 && Util.isInt(args[2]) && Util.isInt(args[3]))
@@ -75,7 +75,7 @@ public class Commandgive extends EssentialsCommand
if (stack.getTypeId() == 0)
{
- throw new Exception(_("You are not allowed to spawn the item {0}.", "Air"));
+ throw new Exception(_("§4You are not allowed to spawn the item§c {0}§4.", "Air"));
}
giveTo.giveItems(stack, false);
diff --git a/Essentials/src/net/ess3/commands/Commandgod.java b/Essentials/src/net/ess3/commands/Commandgod.java
index 82e687e13..76027835f 100644
--- a/Essentials/src/net/ess3/commands/Commandgod.java
+++ b/Essentials/src/net/ess3/commands/Commandgod.java
@@ -26,7 +26,7 @@ public class Commandgod extends EssentialsToggleCommand
{
if (value)
{
- sender.sendMessage(_("God mode {0}.", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName()));
+ sender.sendMessage(_("§6God mode§c {0}§6.", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName()));
}
else
{
@@ -37,7 +37,7 @@ public class Commandgod extends EssentialsToggleCommand
@Override
protected void informPlayer(final IUser player)
{
- final String message = _("God mode {0}.", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName());
+ final String message = _("§6God mode§c {0}§6.", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName());
player.sendMessage(message);
}
diff --git a/Essentials/src/net/ess3/commands/Commandhat.java b/Essentials/src/net/ess3/commands/Commandhat.java
index cc8cf23a3..a096103f0 100644
--- a/Essentials/src/net/ess3/commands/Commandhat.java
+++ b/Essentials/src/net/ess3/commands/Commandhat.java
@@ -20,14 +20,14 @@ public class Commandhat extends EssentialsCommand
final ItemStack head = inv.getHelmet();
if (head == null || head.getType() == Material.AIR)
{
- user.sendMessage(_("You are not wearing a hat."));
+ user.sendMessage(_("§4You are not wearing a hat."));
}
else
{
final ItemStack air = new ItemStack(Material.AIR);
inv.setHelmet(air);
InventoryWorkaround.addItems(user.getPlayer().getInventory(), head);
- user.sendMessage(_("Your hat has been removed."));
+ user.sendMessage(_("§6Your hat has been removed."));
}
}
else
@@ -44,16 +44,16 @@ public class Commandhat extends EssentialsCommand
inv.remove(hand);
inv.setHelmet(hand);
inv.setItemInHand(head);
- user.sendMessage(_("Enjoy your new hat!"));
+ user.sendMessage(_("§6Enjoy your new hat!"));
}
else
{
- user.sendMessage(_("You cannot use this item as a hat!"));
+ user.sendMessage(_("§4You cannot use this item as a hat!"));
}
}
else
{
- user.sendMessage(_("You must have something to wear in your hand."));
+ user.sendMessage(_("§4You must have something to wear in your hand."));
}
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandheal.java b/Essentials/src/net/ess3/commands/Commandheal.java
index 577c81cf9..2704aed0e 100644
--- a/Essentials/src/net/ess3/commands/Commandheal.java
+++ b/Essentials/src/net/ess3/commands/Commandheal.java
@@ -30,7 +30,7 @@ public class Commandheal extends EssentialsCommand
player.setHealth(player.getMaxHealth());
player.setFireTicks(0);
player.setFoodLevel(20);
- user.sendMessage(_("You have been healed."));
+ user.sendMessage(_("§6You have been healed."));
for (PotionEffect effect : player.getActivePotionEffects())
{
player.removePotionEffect(effect.getType());
@@ -53,7 +53,7 @@ public class Commandheal extends EssentialsCommand
final Set<IUser> users = ess.getUserMap().matchUsersExcludingHidden(name, getPlayerOrNull(sender));
if (users.isEmpty())
{
- sender.sendMessage(_("Player not found."));
+ sender.sendMessage(_("§4Player not found."));
return;
}
for (IUser p : users)
@@ -62,8 +62,8 @@ public class Commandheal extends EssentialsCommand
player.setHealth(20);
player.setFoodLevel(20);
player.setFireTicks(0);
- player.sendMessage(_("You have been healed."));
- sender.sendMessage(_("Healed {0}.", player.getDisplayName()));
+ player.sendMessage(_("§6You have been healed."));
+ sender.sendMessage(_("§6Healed§c {0}§6.", player.getDisplayName()));
}
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandhelpop.java b/Essentials/src/net/ess3/commands/Commandhelpop.java
index a8d2044d4..c1a9ca7a8 100644
--- a/Essentials/src/net/ess3/commands/Commandhelpop.java
+++ b/Essentials/src/net/ess3/commands/Commandhelpop.java
@@ -17,7 +17,7 @@ public class Commandhelpop extends EssentialsCommand
{
throw new NotEnoughArgumentsException();
}
- final String message = _("[HelpOp] {0}: {1}", user.getPlayer().getDisplayName(), FormatUtil.stripFormat(getFinalArg(args, 0)));
+ final String message = _("§4[HelpOp]§r §6{0}:§r {1}", user.getPlayer().getDisplayName(), FormatUtil.stripFormat(getFinalArg(args, 0)));
logger.log(Level.INFO, message);
for (Player player : server.getOnlinePlayers())
{
diff --git a/Essentials/src/net/ess3/commands/Commandhome.java b/Essentials/src/net/ess3/commands/Commandhome.java
index aefdada5f..aa57fa3e0 100644
--- a/Essentials/src/net/ess3/commands/Commandhome.java
+++ b/Essentials/src/net/ess3/commands/Commandhome.java
@@ -74,7 +74,7 @@ public class Commandhome extends EssentialsCommand
}
else if (homes.isEmpty())
{
- throw new Exception(player == user ? _("You have not set a home.") : _("Player has not set a home."));
+ throw new Exception(player == user ? _("§4You have not set a home.") : _("§6Player has not set a home."));
}
else if (homes.size() == 1 && player.equals(user))
{
@@ -86,7 +86,7 @@ public class Commandhome extends EssentialsCommand
{
homes.add("bed");
}
- user.sendMessage(_("Homes: {0}", Util.joinList(homes)));
+ user.sendMessage(_("§6Homes:§r {0}", Util.joinList(homes)));
}
}
throw new NoChargeException();
@@ -102,7 +102,7 @@ public class Commandhome extends EssentialsCommand
if (user.getPlayer().getWorld() != loc.getWorld() && ess.getSettings().getData().getGeneral().isWorldHomePermissions() && !Permissions.WORLD.isAuthorized(
user, loc.getWorld().getName()))
{
- throw new Exception(_("You do not have the {0} permission.", "essentials.world." + loc.getWorld().getName()));
+ throw new Exception(_("§4You do not have the §c{0}§4 permission.", "essentials.world." + loc.getWorld().getName()));
}
user.getTeleport().home(loc, charge);
}
diff --git a/Essentials/src/net/ess3/commands/Commandignore.java b/Essentials/src/net/ess3/commands/Commandignore.java
index c0a4421fc..efc89c64b 100644
--- a/Essentials/src/net/ess3/commands/Commandignore.java
+++ b/Essentials/src/net/ess3/commands/Commandignore.java
@@ -35,12 +35,12 @@ public class Commandignore extends EssentialsCommand
if (user.isIgnoringPlayer(player))
{
user.setIgnoredPlayer(player, false);
- user.sendMessage(_("You are not ignoring player {0} anymore.", player.getName()));
+ user.sendMessage(_("§6You are not ignoring player§c {0} §6anymore.", player.getName()));
}
else
{
user.setIgnoredPlayer(player, true);
- user.sendMessage(_("You ignore player {0} from now on.", player.getName()));
+ user.sendMessage(_("§6You ignore player§c {0} §6from now on.", player.getName()));
}
user.queueSave();
}
diff --git a/Essentials/src/net/ess3/commands/Commandinvsee.java b/Essentials/src/net/ess3/commands/Commandinvsee.java
index 24f3b0700..617b219c2 100644
--- a/Essentials/src/net/ess3/commands/Commandinvsee.java
+++ b/Essentials/src/net/ess3/commands/Commandinvsee.java
@@ -27,7 +27,7 @@ public class Commandinvsee extends EssentialsCommand
invUser.getPlayer().getInventory().setContents(user.getData().getInventory().getBukkitInventory());
user.getData().setInventory(null);
user.queueSave();
- user.sendMessage(_("Your inventory has been restored."));
+ user.sendMessage(_("§6Your inventory has been restored."));
throw new NoChargeException();
}
if (user.getData().getInventory() == null)
@@ -43,11 +43,11 @@ public class Commandinvsee extends EssentialsCommand
}
if (invUserStack.length > userStackLength)
{
- throw new Exception(_("The other users inventory is bigger than yours."));
+ throw new Exception(_("§4The other users inventory is bigger than yours."));
}
user.getPlayer().getInventory().setContents(invUserStack);
- user.sendMessage(_("You see the inventory of {0}.", invUser.getPlayer().getDisplayName()));
- user.sendMessage(_("Use /invsee to restore your inventory."));
+ user.sendMessage(_("§6You see the inventory of§c {0}§6.", invUser.getPlayer().getDisplayName()));
+ user.sendMessage(_("§6Use /invsee to restore your inventory."));
throw new NoChargeException();
}
}
diff --git a/Essentials/src/net/ess3/commands/Commanditem.java b/Essentials/src/net/ess3/commands/Commanditem.java
index 8b38b66c3..4c531bd77 100644
--- a/Essentials/src/net/ess3/commands/Commanditem.java
+++ b/Essentials/src/net/ess3/commands/Commanditem.java
@@ -32,7 +32,7 @@ public class Commanditem extends EssentialsCommand
final String itemname = stack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "");
if (!Permissions.ITEMSPAWN.isAuthorized(user, stack))
{
- throw new Exception(_("You are not allowed to spawn the item {0}.", itemname));
+ throw new Exception(_("§4You are not allowed to spawn the item§c {0}§4.", itemname));
}
if (args.length > 1 && Integer.parseInt(args[1]) > 0)
@@ -72,12 +72,12 @@ public class Commanditem extends EssentialsCommand
if (stack.getTypeId() == 0)
{
- throw new Exception(_("You are not allowed to spawn the item {0}.", "Air"));
+ throw new Exception(_("§4You are not allowed to spawn the item§c {0}§4.", "Air"));
}
user.giveItems(stack, false);
final String displayName = stack.getType().toString().toLowerCase(Locale.ENGLISH).replace('_', ' ');
- user.sendMessage(_("Giving {0} of {1}", stack.getAmount(), displayName));
+ user.sendMessage(_("§6Giving§c {0} §6of§c {1}", stack.getAmount(), displayName));
}
}
diff --git a/Essentials/src/net/ess3/commands/Commanditemdb.java b/Essentials/src/net/ess3/commands/Commanditemdb.java
index 658d7b85d..6cb9885f1 100644
--- a/Essentials/src/net/ess3/commands/Commanditemdb.java
+++ b/Essentials/src/net/ess3/commands/Commanditemdb.java
@@ -37,7 +37,7 @@ public class Commanditemdb extends EssentialsCommand
final int durability = ((maxuses + 1) - itemStack.getDurability());
if (maxuses != 0)
{
- sender.sendMessage(_("This tool has {0} uses left.", Integer.toString(durability)));
+ sender.sendMessage(_("§6This tool has §c{0}§6 uses left", Integer.toString(durability)));
}
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandjump.java b/Essentials/src/net/ess3/commands/Commandjump.java
index f5007796c..3686cd2e4 100644
--- a/Essentials/src/net/ess3/commands/Commandjump.java
+++ b/Essentials/src/net/ess3/commands/Commandjump.java
@@ -25,7 +25,7 @@ public class Commandjump extends EssentialsCommand
}
catch (NullPointerException ex)
{
- throw new Exception(_("That would hurt your computer's brain."), ex);
+ throw new Exception(_("§4That would hurt your computer's brain."), ex);
}
final Trade charge = new Trade(commandName, ess);
diff --git a/Essentials/src/net/ess3/commands/Commandkick.java b/Essentials/src/net/ess3/commands/Commandkick.java
index 0e79f2450..01975ef4f 100644
--- a/Essentials/src/net/ess3/commands/Commandkick.java
+++ b/Essentials/src/net/ess3/commands/Commandkick.java
@@ -22,7 +22,7 @@ public class Commandkick extends EssentialsCommand
final IUser user = ess.getUserMap().matchUserExcludingHidden(args[0], getPlayerOrNull(sender));
if (Permissions.KICK_EXEMPT.isAuthorized(user))
{
- throw new Exception(_("You can not kick that person."));
+ throw new Exception(_("§4You can not kick that person."));
}
String kickReason = args.length > 1 ? getFinalArg(args, 1) : _("Kicked from server.");
kickReason = FormatUtil.replaceFormat(kickReason.replace("\\n", "\n").replace("|", "\n"));
@@ -33,7 +33,7 @@ public class Commandkick extends EssentialsCommand
{
if (Permissions.KICK_NOTIFY.isAuthorized(onlinePlayer))
{
- onlinePlayer.sendMessage(_("Player {0} kicked {1} for {2}.", senderName, user.getName(), kickReason));
+ onlinePlayer.sendMessage(_("§6Player§c {0} §6kicked {1} for {2}.", senderName, user.getName(), kickReason));
}
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandkill.java b/Essentials/src/net/ess3/commands/Commandkill.java
index df54becad..b3b255f02 100644
--- a/Essentials/src/net/ess3/commands/Commandkill.java
+++ b/Essentials/src/net/ess3/commands/Commandkill.java
@@ -31,7 +31,7 @@ public class Commandkill extends EssentialsCommand
}
player.damage(Short.MAX_VALUE);
- sender.sendMessage(_("Killed {0}.", player.getDisplayName()));
+ sender.sendMessage(_("§6Killed§c {0}§6.", player.getDisplayName()));
}
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandkillall.java b/Essentials/src/net/ess3/commands/Commandkillall.java
index 6cc1f4468..d9e62c97b 100644
--- a/Essentials/src/net/ess3/commands/Commandkillall.java
+++ b/Essentials/src/net/ess3/commands/Commandkillall.java
@@ -149,6 +149,6 @@ public class Commandkillall extends EssentialsCommand
}
}
}
- sender.sendMessage(_("Killed {0}.", numKills));
+ sender.sendMessage(_("§6Killed§c {0}§6.", numKills));
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandkit.java b/Essentials/src/net/ess3/commands/Commandkit.java
index d71285029..2f4947329 100644
--- a/Essentials/src/net/ess3/commands/Commandkit.java
+++ b/Essentials/src/net/ess3/commands/Commandkit.java
@@ -20,7 +20,7 @@ public class Commandkit extends EssentialsCommand
Collection<String> kitList = ess.getKits().getList();
if (kitList.isEmpty())
{
- user.sendMessage(_("There are no kits available yet."));
+ user.sendMessage(_("§6There are no kits available yet."));
}
else
{
@@ -31,7 +31,7 @@ public class Commandkit extends EssentialsCommand
kitList.remove(kitName);
}
}
- user.sendMessage(_("Kits: {0}", Util.joinList(kitList)));
+ user.sendMessage(_("§6Kits:§r {0}", Util.joinList(kitList)));
}
throw new NoChargeException();
}
@@ -42,7 +42,7 @@ public class Commandkit extends EssentialsCommand
if (!Permissions.KITS.isAuthorized(user, kitName))
{
- throw new Exception(_("You need the {0} permission to use that kit.", "essentials.kit." + kitName));
+ throw new Exception(_("§4You need the §c{0}§4 permission to use that kit.", "essentials.kit." + kitName));
}
//TODO: Check kit delay
@@ -55,7 +55,7 @@ public class Commandkit extends EssentialsCommand
//TODO: Merge kit changes from 2.9
charge.charge(user);
- user.sendMessage(_("Giving kit {0}.", kitName));
+ user.sendMessage(_("§6Giving kit§c {0}§6.", kitName));
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandlightning.java b/Essentials/src/net/ess3/commands/Commandlightning.java
index 228d8b2ea..af7f79662 100644
--- a/Essentials/src/net/ess3/commands/Commandlightning.java
+++ b/Essentials/src/net/ess3/commands/Commandlightning.java
@@ -29,7 +29,7 @@ public class Commandlightning extends EssentialsCommand
if (ess.getUserMap().matchUsersExcludingHidden(args[0], getPlayerOrNull(sender)).isEmpty())
{
- throw new Exception(_("Player not found."));
+ throw new Exception(_("§4Player not found."));
}
int power = 5;
@@ -47,7 +47,7 @@ public class Commandlightning extends EssentialsCommand
for (IUser matchPlayer : ess.getUserMap().matchUsersExcludingHidden(args[0], getPlayerOrNull(sender)))
{
final Player player = matchPlayer.getPlayer();
- sender.sendMessage(_("Smiting {0}", player.getDisplayName()));
+ sender.sendMessage(_("§6Smiting§c {0}", player.getDisplayName()));
final LightningStrike strike = player.getWorld().strikeLightningEffect(player.getLocation());
if (!matchPlayer.isGodModeEnabled())
{
@@ -56,7 +56,7 @@ public class Commandlightning extends EssentialsCommand
final ISettings settings = ess.getSettings();
if (settings.getData().getCommands().getLightning().isWarnPlayer())
{
- matchPlayer.sendMessage(_("Thou hast been smitten!"));
+ matchPlayer.sendMessage(_("§6Thou hast been smitten!"));
}
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandlist.java b/Essentials/src/net/ess3/commands/Commandlist.java
index 4843f6595..aa78d390f 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 = _("There are {0}/{1} out of maximum {2} 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 = _("There are {0} out of maximum {1} 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 = _("There are {0} out of maximum {1} 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);
@@ -81,7 +81,7 @@ public class Commandlist extends EssentialsCommand
for (String group : groups)
{
final StringBuilder groupString = new StringBuilder();
- groupString.append(_("{0}: ", FormatUtil.replaceFormat(group)));
+ groupString.append(_("{0}§r: ", FormatUtil.replaceFormat(group)));
final List<IUser> users = sort.get(group);
Collections.sort(users);
boolean first = true;
@@ -98,12 +98,12 @@ public class Commandlist extends EssentialsCommand
if (user.getData().isAfk())
{
- groupString.append(" ").append(_("[AFK]"));
+ groupString.append(_(" §7[AFK]§r"));
}
if (hiddenPlayers.contains(user.getName()))
{
- groupString.append(" ").append(_("[HIDDEN]"));
+ groupString.append(_(" §7[HIDDEN]§r"));
}
groupString.append(user.getPlayer().getDisplayName());
groupString.append("§f");
@@ -130,7 +130,7 @@ public class Commandlist extends EssentialsCommand
Collections.sort(users);
final StringBuilder onlineUsers = new StringBuilder();
- onlineUsers.append(_("Connected players "));
+ onlineUsers.append(_("§6Connected players§r"));
boolean first = true;
for (IUser user : users)
{
@@ -145,12 +145,12 @@ public class Commandlist extends EssentialsCommand
if (user.getData().isAfk())
{
- onlineUsers.append(" ").append(_("[AFK]"));
+ onlineUsers.append(_(" §7[AFK]§r"));
}
if (hiddenPlayers.contains(user.getName()))
{
- onlineUsers.append(" ").append(_("[HIDDEN]"));
+ onlineUsers.append(_(" §7[HIDDEN]§r"));
}
onlineUsers.append(user.getPlayer().getDisplayName());
onlineUsers.append("§f");
diff --git a/Essentials/src/net/ess3/commands/Commandmail.java b/Essentials/src/net/ess3/commands/Commandmail.java
index ea0ae43d9..e6df9beb6 100644
--- a/Essentials/src/net/ess3/commands/Commandmail.java
+++ b/Essentials/src/net/ess3/commands/Commandmail.java
@@ -20,51 +20,51 @@ public class Commandmail extends EssentialsCommand
final List<String> mail = user.getData().getMails();
if (mail == null || mail.isEmpty())
{
- user.sendMessage(_("You do not have any mail."));
+ user.sendMessage(_("§6You do not have any mail."));
throw new NoChargeException();
}
for (String messages : mail)
{
user.sendMessage(messages);
}
- user.sendMessage(_("To mark your mail as read, type /mail clear."));
+ user.sendMessage(_("§6To mark your mail as read, type§c /mail clear."));
return;
}
if (args.length >= 3 && "send".equalsIgnoreCase(args[0]))
{
if (!Permissions.MAIL_SEND.isAuthorized(user))
{
- throw new Exception(_("You do not have the {0} permission.", "essentials.mail.send"));
+ throw new Exception(_("§4You do not have the §c{0}§4 permission.", "essentials.mail.send"));
}
IUser u = ess.getUserMap().matchUser(args[1], true);
if (u == null)
{
- throw new Exception(_("Player {0} was never on this server.", args[1]));
+ throw new Exception(_("§4Player§c {0} §4was never on this server.", args[1]));
}
if (!u.isIgnoringPlayer(user))
{
final String mail = Util.sanitizeString(FormatUtil.stripFormat(getFinalArg(args, 2)));
u.addMail(user.getName() + ": " + mail);
}
- user.sendMessage(_("Mail sent!"));
+ user.sendMessage(_("§6Mail sent!"));
return;
}
if (args.length > 1 && "sendall".equalsIgnoreCase(args[0]))
{
if (!Permissions.MAIL_SENDALL.isAuthorized(user))
{
- throw new Exception(_("You do not have the {0} permission.", "essentials.mail.sendall"));
+ throw new Exception(_("§4You do not have the §c{0}§4 permission.", "essentials.mail.sendall"));
}
ess.getPlugin().runTaskAsynchronously(new SendAll(user.getName() + ": " + FormatUtil.stripColor(getFinalArg(args, 1))));
- user.sendMessage(_("Mail sent!"));
+ user.sendMessage(_("§6Mail sent!"));
return;
}
if (args.length >= 1 && "clear".equalsIgnoreCase(args[0]))
{
user.getData().clearMails();
user.queueSave();
- user.sendMessage(_("Mail Cleared!"));
+ user.sendMessage(_("§6Mail Cleared!"));
return;
}
throw new NotEnoughArgumentsException();
@@ -75,17 +75,17 @@ public class Commandmail extends EssentialsCommand
{
if (args.length >= 1 && "read".equalsIgnoreCase(args[0]))
{
- throw new Exception(_("Only in-game players can use {0}.", commandName + " read"));
+ throw new Exception(_("§4Only in-game players can use {0}.", commandName + " read"));
}
else if (args.length >= 1 && "clear".equalsIgnoreCase(args[0]))
{
- throw new Exception(_("Only in-game players can use {0}.", commandName + " clear"));
+ throw new Exception(_("§4Only in-game players can use {0}.", commandName + " clear"));
}
else if (args.length >= 3 && "send".equalsIgnoreCase(args[0]))
{
IUser u = ess.getUserMap().matchUser(args[1], true);
u.addMail("Server: " + getFinalArg(args, 2));
- sender.sendMessage(_("Mail sent!"));
+ sender.sendMessage(_("§6Mail sent!"));
return;
}
else if (args.length >= 1 && "sendall".equalsIgnoreCase(args[0]))
@@ -97,7 +97,7 @@ public class Commandmail extends EssentialsCommand
//allow sending from console without "send" argument, since it's the only thing the console can do
IUser u = ess.getUserMap().matchUser(args[0], true);
u.addMail("Server: " + getFinalArg(args, 1));
- sender.sendMessage(_("Mail sent!"));
+ sender.sendMessage(_("§6Mail sent!"));
return;
}
throw new NotEnoughArgumentsException();
diff --git a/Essentials/src/net/ess3/commands/Commandme.java b/Essentials/src/net/ess3/commands/Commandme.java
index 73a50865c..7df9b9b11 100644
--- a/Essentials/src/net/ess3/commands/Commandme.java
+++ b/Essentials/src/net/ess3/commands/Commandme.java
@@ -13,7 +13,7 @@ public class Commandme extends EssentialsCommand
{
if (user.getData().isMuted())
{
- throw new Exception(_("Your voice has been silenced!"));
+ throw new Exception(_("§6Your voice has been silenced!"));
}
if (args.length < 1)
diff --git a/Essentials/src/net/ess3/commands/Commandmore.java b/Essentials/src/net/ess3/commands/Commandmore.java
index b03d18534..6a612cd26 100644
--- a/Essentials/src/net/ess3/commands/Commandmore.java
+++ b/Essentials/src/net/ess3/commands/Commandmore.java
@@ -34,7 +34,7 @@ public class Commandmore extends EssentialsCommand
{
if (stacks.length == 1)
{
- throw new Exception(_("You are not allowed to spawn the item {0}.", "Air"));
+ throw new Exception(_("§4You are not allowed to spawn the item§c {0}§4.", "Air"));
}
else
{
@@ -64,7 +64,7 @@ public class Commandmore extends EssentialsCommand
{
if (stacks.length == 1)
{
- throw new Exception(_("You are not allowed to spawn the item {0}.", itemname));
+ throw new Exception(_("§4You are not allowed to spawn the item§c {0}§4.", itemname));
}
else
{
diff --git a/Essentials/src/net/ess3/commands/Commandmsg.java b/Essentials/src/net/ess3/commands/Commandmsg.java
index 766abf241..ee8f81769 100644
--- a/Essentials/src/net/ess3/commands/Commandmsg.java
+++ b/Essentials/src/net/ess3/commands/Commandmsg.java
@@ -27,7 +27,7 @@ public class Commandmsg extends EssentialsCommand
final IUser user = getUser(sender);
if (user.getData().isMuted())
{
- throw new Exception(_("Your voice has been silenced!"));
+ throw new Exception(_("§6Your voice has been silenced!"));
}
if (Permissions.MSG_COLOR.isAuthorized(user))
{
@@ -50,9 +50,9 @@ public class Commandmsg extends EssentialsCommand
if (args[0].equalsIgnoreCase(Console.NAME))
{
- sender.sendMessage(_("[{0} -> {1}] {2}", translatedMe, Console.NAME, message));
+ sender.sendMessage(_("§6[{0}§6 -> {1}§6] §r{2}", translatedMe, Console.NAME, message));
CommandSender cs = server.getConsoleSender();
- cs.sendMessage(_("[{0} -> {1}] {2}", senderName, translatedMe, message));
+ cs.sendMessage(_("§6[{0}§6 -> {1}§6] §r{2}", senderName, translatedMe, message));
replyTo.setReplyTo(cs);
Console.getConsoleReplyTo().setReplyTo(sender);
return;
@@ -63,7 +63,7 @@ public class Commandmsg extends EssentialsCommand
if (matchedPlayers.isEmpty())
{
- throw new Exception(_("Player not found."));
+ throw new Exception(_("§4Player not found."));
}
final Player player = getPlayerOrNull(sender);
@@ -80,19 +80,19 @@ public class Commandmsg extends EssentialsCommand
}
if (i == matchedPlayers.size())
{
- throw new Exception(_("Player not found."));
+ throw new Exception(_("§4Player not found."));
}
}
for (IUser matchedPlayer : matchedPlayers)
{
final Player realPlayer = matchedPlayer.getPlayer();
- sender.sendMessage(_("[{0} -> {1}] {2}", translatedMe, realPlayer.getDisplayName(), message));
+ sender.sendMessage(_("§6[{0}§6 -> {1}§6] §r{2}", translatedMe, realPlayer.getDisplayName(), message));
if (isUser(sender) && (matchedPlayer.isIgnoringPlayer(getUser(sender)) || !player.canSee(realPlayer)))
{
continue;
}
- matchedPlayer.sendMessage(_("[{0} -> {1}] {2}", senderName, translatedMe, message));
+ matchedPlayer.sendMessage(_("§6[{0}§6 -> {1}§6] §r{2}", senderName, translatedMe, message));
replyTo.setReplyTo(matchedPlayer);
matchedPlayer.setReplyTo(sender);
}
diff --git a/Essentials/src/net/ess3/commands/Commandmute.java b/Essentials/src/net/ess3/commands/Commandmute.java
index 3ac4171ea..1d8af2590 100644
--- a/Essentials/src/net/ess3/commands/Commandmute.java
+++ b/Essentials/src/net/ess3/commands/Commandmute.java
@@ -21,7 +21,7 @@ public class Commandmute extends EssentialsCommand
final IUser player = ess.getUserMap().matchUser(args[0], true);
if (!player.getData().isMuted() && Permissions.MUTE_EXEMPT.isAuthorized(player))
{
- throw new Exception(_("You may not mute that player."));
+ throw new Exception(_("§4You may not mute that player."));
}
long muteTimestamp = 0;
@@ -38,10 +38,10 @@ public class Commandmute extends EssentialsCommand
player.setTimestamp(TimestampType.MUTE, muteTimestamp);
final boolean muted = player.getData().isMuted();
sender.sendMessage(
- muted ? (muteTimestamp > 0 ? _("Player {0} muted for {1}.", player.getPlayer().getDisplayName(), DateUtil.formatDateDiff(muteTimestamp)) : _(
+ muted ? (muteTimestamp > 0 ? _("§6Player {0} §6muted for {1}.", player.getPlayer().getDisplayName(), DateUtil.formatDateDiff(muteTimestamp)) : _(
"mutedPlayer", player.getPlayer().getDisplayName())) : _(
"unmutedPlayer", player.getPlayer().getDisplayName()));
player.sendMessage(
- muted ? (muteTimestamp > 0 ? _("You have been muted for {0}.", DateUtil.formatDateDiff(muteTimestamp)) : _("You have been muted.")) : _("You have been unmuted."));
+ muted ? (muteTimestamp > 0 ? _("§6You have been muted for§c {0}.", DateUtil.formatDateDiff(muteTimestamp)) : _("§6You have been muted!")) : _("§6You have been unmuted."));
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandnear.java b/Essentials/src/net/ess3/commands/Commandnear.java
index 3daf5ce22..6ae97f46e 100644
--- a/Essentials/src/net/ess3/commands/Commandnear.java
+++ b/Essentials/src/net/ess3/commands/Commandnear.java
@@ -47,11 +47,11 @@ public class Commandnear extends EssentialsCommand
}
if (otherUser == null || Permissions.NEAR_OTHERS.isAuthorized(user))
{
- user.sendMessage(_("Players nearby: {0}", getLocal(otherUser == null ? user : otherUser, radius)));
+ user.sendMessage(_("§6Players nearby:§r {0}", getLocal(otherUser == null ? user : otherUser, radius)));
}
else
{
- user.sendMessage(_("You do not have access to that command."));
+ user.sendMessage(_("§4You do not have access to that command."));
}
}
@@ -74,7 +74,7 @@ public class Commandnear extends EssentialsCommand
{
}
}
- sender.sendMessage(_("Players nearby: {0}", getLocal(otherUser, radius)));
+ sender.sendMessage(_("§6Players nearby:§r {0}", getLocal(otherUser, radius)));
}
private String getLocal(final IUser user, final long radius)
diff --git a/Essentials/src/net/ess3/commands/Commandnick.java b/Essentials/src/net/ess3/commands/Commandnick.java
index 796798827..eb3a625f9 100644
--- a/Essentials/src/net/ess3/commands/Commandnick.java
+++ b/Essentials/src/net/ess3/commands/Commandnick.java
@@ -23,16 +23,16 @@ public class Commandnick extends EssentialsCommand
final ISettings settings = ess.getSettings();
if (!settings.getData().getChat().getChangeDisplayname())
{
- throw new Exception(_("You have to enable change-displayname in Essentials config."));
+ throw new Exception(_("§4You have to enable change-displayname in Essentials config."));
}
if (args.length > 1)
{
if (!Permissions.NICK_OTHERS.isAuthorized(user))
{
- throw new Exception(_("You do not have permission to change the nickname of others!"));
+ throw new Exception(_("§4You do not have permission to change the nickname of others!"));
}
setNickname(ess.getUserMap().matchUserExcludingHidden(args[0], user.getPlayer()), formatNickname(user, args[1]));
- user.sendMessage(_("Nickname changed."));
+ user.sendMessage(_("§6Nickname changed."));
return;
}
setNickname(user, formatNickname(user, args[0]));
@@ -48,7 +48,7 @@ public class Commandnick extends EssentialsCommand
final ISettings settings = ess.getSettings();
if (!settings.getData().getChat().getChangeDisplayname())
{
- throw new Exception(_("You have to enable change-displayname in Essentials config."));
+ throw new Exception(_("§4You have to enable change-displayname in Essentials config."));
}
if ((args[0].equalsIgnoreCase("*") || args[0].equalsIgnoreCase("all")) && args[1].equalsIgnoreCase("off"))
{
@@ -58,7 +58,7 @@ public class Commandnick extends EssentialsCommand
{
setNickname(ess.getUserMap().matchUser(args[0], false), formatNickname(null, args[1]));
}
- sender.sendMessage(_("Nickname changed."));
+ sender.sendMessage(_("§6Nickname changed."));
}
private String formatNickname(final IUser user, final String nick)
@@ -91,7 +91,7 @@ public class Commandnick extends EssentialsCommand
{
if (!nick.matches("^[a-zA-Z_0-9\u00a7]+$"))
{
- throw new Exception(_("Nicknames must be alphanumeric."));
+ throw new Exception(_("§4Nicknames must be alphanumeric."));
}
final String stripNick = FormatUtil.stripFormat(nick);
if (ess.getSettings().getData().getChat().getMaxNickLength() > 0 && stripNick.length() > ess.getSettings().getData().getChat().getMaxNickLength())
@@ -102,7 +102,7 @@ public class Commandnick extends EssentialsCommand
{
target.getData().setNickname(null);
target.updateDisplayName();
- target.sendMessage(_("You no longer have a nickname."));
+ target.sendMessage(_("§6You no longer have a nickname."));
}
else
{
@@ -117,13 +117,13 @@ public class Commandnick extends EssentialsCommand
final String nk = nick.toLowerCase(Locale.ENGLISH);
if (nk.equals(dn) || nk.equals(n))
{
- throw new Exception(_("That name is already in use."));
+ throw new Exception(_("§4That name is already in use."));
}
}
target.getData().setNickname(nick);
target.updateDisplayName();
- target.sendMessage(_("Your nickname is now {0}.", target.getPlayer().getDisplayName() + "§7."));
+ target.sendMessage(_("§6Your nickname is now §c{0}", target.getPlayer().getDisplayName() + "§7."));
}
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandpay.java b/Essentials/src/net/ess3/commands/Commandpay.java
index 29d6400ac..7743890c4 100644
--- a/Essentials/src/net/ess3/commands/Commandpay.java
+++ b/Essentials/src/net/ess3/commands/Commandpay.java
@@ -34,7 +34,7 @@ public class Commandpay extends EssentialsCommand
if (!foundUser)
{
- throw new NoSuchFieldException(_("Player not found."));
+ throw new NoSuchFieldException(_("§4Player not found."));
}
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandpowertool.java b/Essentials/src/net/ess3/commands/Commandpowertool.java
index 0b3945083..5f6f5ec41 100644
--- a/Essentials/src/net/ess3/commands/Commandpowertool.java
+++ b/Essentials/src/net/ess3/commands/Commandpowertool.java
@@ -24,14 +24,14 @@ public class Commandpowertool extends EssentialsCommand
{
userData.clearAllPowertools();
user.queueSave();
- user.sendMessage(_("All powertool commands have been cleared."));
+ user.sendMessage(_("§6All powertool commands have been cleared."));
return;
}
final ItemStack itemStack = user.getPlayer().getItemInHand();
if (itemStack == null || itemStack.getType() == Material.AIR)
{
- throw new Exception(_("Command can't be attached to air."));
+ throw new Exception(_("§4Command can't be attached to air."));
}
final String itemName = itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replaceAll("_", " ");
@@ -42,11 +42,11 @@ public class Commandpowertool extends EssentialsCommand
{
if (powertools == null || powertools.isEmpty())
{
- throw new Exception(_("Item {0} has no commands assigned.", itemName));
+ throw new Exception(_("§4Item §c{0} §4has no commands assigned.", itemName));
}
else
{
- user.sendMessage(_("Item {1} has the following commands: {0}.", Util.joinList(powertools), itemName));
+ user.sendMessage(_("§6Item §c{1} §6has the following commands: §c{0}§6.", Util.joinList(powertools), itemName));
}
throw new NoChargeException();
}
@@ -55,12 +55,12 @@ public class Commandpowertool extends EssentialsCommand
command = command.substring(2);
if (!powertools.contains(command))
{
- throw new Exception(_("Command {0} has not been assigned to {1}.", command, itemName));
+ throw new Exception(_("§4Command §c{0}§4 has not been assigned to {1}.", command, itemName));
}
powertools = new ArrayList<String>(powertools);
powertools.remove(command);
- user.sendMessage(_("Command {0} removed from {1}.", command, itemName));
+ user.sendMessage(_("§6Command §c{0}§6 removed from {1}.", command, itemName));
}
else
{
@@ -68,12 +68,12 @@ public class Commandpowertool extends EssentialsCommand
{
if (!Permissions.POWERTOOL_APPEND.isAuthorized(user))
{
- throw new Exception(_("You do not have the {0} permission.", "essentials.powertool.append"));
+ throw new Exception(_("§4You do not have the §c{0}§4 permission.", "essentials.powertool.append"));
}
command = command.substring(2);
if (powertools.contains(command))
{
- throw new Exception(_("Command {0} is already assigned to {1}.", command, itemName));
+ throw new Exception(_("§4Command §c{0}§4 is already assigned to {1}.", command, itemName));
}
powertools = new ArrayList<String>(powertools);
}
@@ -83,19 +83,19 @@ public class Commandpowertool extends EssentialsCommand
}
powertools.add(command);
- user.sendMessage(_("{0} command assigned to {1}.", Util.joinList(powertools), itemName));
+ user.sendMessage(_("§c{0}§6 command assigned to {1}.", Util.joinList(powertools), itemName));
}
}
else
{
powertools = new ArrayList<String>();
- user.sendMessage(_("All commands removed from {0}.", itemName));
+ user.sendMessage(_("§6All commands removed from {0}.", itemName));
}
if (!userData.isPowerToolsEnabled())
{
userData.setPowerToolsEnabled(true);
- user.sendMessage(_("All of your power tools have been enabled."));
+ user.sendMessage(_("§6All of your power tools have been enabled."));
}
userData.setPowertool(itemStack.getType(), powertools);
user.queueSave();
diff --git a/Essentials/src/net/ess3/commands/Commandpowertooltoggle.java b/Essentials/src/net/ess3/commands/Commandpowertooltoggle.java
index 182bf017f..ac831f021 100644
--- a/Essentials/src/net/ess3/commands/Commandpowertooltoggle.java
+++ b/Essentials/src/net/ess3/commands/Commandpowertooltoggle.java
@@ -13,12 +13,12 @@ public class Commandpowertooltoggle extends EssentialsCommand
final UserData userData = user.getData();
if (!userData.hasPowerTools())
{
- user.sendMessage(_("You have no power tools assigned."));
+ user.sendMessage(_("§6You have no power tools assigned."));
return;
}
userData.setPowerToolsEnabled(!userData.isPowerToolsEnabled());
user.queueSave();
user.sendMessage(
- userData.isPowerToolsEnabled() ? _("All of your power tools have been enabled.") : _("All of your power tools have been disabled."));
+ userData.isPowerToolsEnabled() ? _("§6All of your power tools have been enabled.") : _("§6All of your power tools have been disabled."));
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandptime.java b/Essentials/src/net/ess3/commands/Commandptime.java
index 3a8357788..e4301164d 100644
--- a/Essentials/src/net/ess3/commands/Commandptime.java
+++ b/Essentials/src/net/ess3/commands/Commandptime.java
@@ -43,7 +43,7 @@ public class Commandptime extends EssentialsCommand
IUser user = isUser(sender) ? getUser(sender) : null;
if (user != null && (!users.contains(user) || users.size() > 1) && !Permissions.PTIME_OTHERS.isAuthorized(user))
{
- user.sendMessage(_("You are not authorized to set other players' time."));
+ user.sendMessage(_("§4You are not authorized to set other players' time."));
return;
}
@@ -88,25 +88,25 @@ public class Commandptime extends EssentialsCommand
{
if (users.size() > 1)
{
- sender.sendMessage(_("These players have their own time:"));
+ sender.sendMessage(_("§6These players have their own time:§r"));
}
for (IUser user : users)
{
if (user.getPlayer().getPlayerTimeOffset() == 0)
{
- sender.sendMessage(_("{0}'s time is normal and matches the server.", user.getName()));
+ sender.sendMessage(_("§c{0}§6''s time is normal and matches the server.", user.getName()));
}
else
{
String time = DescParseTickFormat.format(user.getPlayer().getPlayerTime());
if (!user.getPlayer().isPlayerTimeRelative())
{
- sender.sendMessage(_("{0}'s time is fixed to {1}.", user.getName(), time));
+ sender.sendMessage(_("§c{0}§6''s time is fixed to§c {1}§6.", user.getName(), time));
}
else
{
- sender.sendMessage(_("{0}'s time is {1}.", user.getName(), time));
+ sender.sendMessage(_("§c{0}§6''s time is§c {1}§6.", user.getName(), time));
}
}
}
@@ -158,18 +158,18 @@ public class Commandptime extends EssentialsCommand
// Inform the sender of the change
if (ticks == null)
{
- sender.sendMessage(_("Player time has been reset for: {0}", msg.toString()));
+ sender.sendMessage(_("§6Player time has been reset for: §c{0}", msg.toString()));
}
else
{
String time = DescParseTickFormat.format(ticks);
if (!relative)
{
- sender.sendMessage(_("Player time is fixed to {0} for: {1}.", time, msg.toString()));
+ sender.sendMessage(_("§6Player time is fixed to §c{0}§6 for: §c{1}.", time, msg.toString()));
}
else
{
- sender.sendMessage(_("Player time is set to {0} for: {1}.", time, msg.toString()));
+ sender.sendMessage(_("§6Player time is set to §c{0}§6 for: §c{1}.", time, msg.toString()));
}
}
}
@@ -221,7 +221,7 @@ public class Commandptime extends EssentialsCommand
// We failed to understand the world target...
else
{
- throw new Exception(_("Player not found."));
+ throw new Exception(_("§4Player not found."));
}
return users;
diff --git a/Essentials/src/net/ess3/commands/Commandr.java b/Essentials/src/net/ess3/commands/Commandr.java
index b10679000..8d38544f1 100644
--- a/Essentials/src/net/ess3/commands/Commandr.java
+++ b/Essentials/src/net/ess3/commands/Commandr.java
@@ -47,11 +47,11 @@ public class Commandr extends EssentialsCommand
final CommandSender target = replyTo.getReplyTo();
if (target == null || (isUser(target) && !getUser(target).isOnline()))
{
- throw new Exception(_("You have nobody to whom you can reply."));
+ throw new Exception(_("§4You have nobody to whom you can reply."));
}
final String targetName = isUser(target) ? getPlayer(target).getDisplayName() : Console.NAME;
- sender.sendMessage(_("[{0} -> {1}] {2}", _("me"), targetName, message));
+ sender.sendMessage(_("§6[{0}§6 -> {1}§6] §r{2}", _("me"), targetName, message));
if (isUser(target))
{
if (isUser(sender) && getUser(target).isIgnoringPlayer(getUser(sender)))
@@ -59,7 +59,7 @@ public class Commandr extends EssentialsCommand
return;
}
}
- target.sendMessage(_("[{0} -> {1}] {2}", senderName, _("me"), message));
+ target.sendMessage(_("§6[{0}§6 -> {1}§6] §r{2}", senderName, _("me"), message));
replyTo.setReplyTo(target);
if (target != sender)
{
diff --git a/Essentials/src/net/ess3/commands/Commandrealname.java b/Essentials/src/net/ess3/commands/Commandrealname.java
index c47264d27..15548aa33 100644
--- a/Essentials/src/net/ess3/commands/Commandrealname.java
+++ b/Essentials/src/net/ess3/commands/Commandrealname.java
@@ -39,7 +39,7 @@ public class Commandrealname extends EssentialsCommand
}
if (!foundUser)
{
- throw new NoSuchFieldException(_("Player not found."));
+ throw new NoSuchFieldException(_("§4Player not found."));
}
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandrecipe.java b/Essentials/src/net/ess3/commands/Commandrecipe.java
index d7c42564e..efe597a72 100644
--- a/Essentials/src/net/ess3/commands/Commandrecipe.java
+++ b/Essentials/src/net/ess3/commands/Commandrecipe.java
@@ -41,7 +41,7 @@ public class Commandrecipe extends EssentialsCommand
final List<Recipe> recipesOfType = ess.getServer().getRecipesFor(itemType);
if (recipesOfType.size() < 1)
{
- throw new Exception(_("No recipes exist for {0}.", getMaterialName(itemType)));
+ throw new Exception(_("No recipes exist for {0}", getMaterialName(itemType)));
}
if (recipeNo < 0 || recipeNo >= recipesOfType.size())
@@ -50,7 +50,7 @@ public class Commandrecipe extends EssentialsCommand
}
final Recipe selectedRecipe = recipesOfType.get(recipeNo);
- sender.sendMessage(_("Recipe for {0} ({1} of {2})", getMaterialName(itemType), recipeNo + 1, recipesOfType.size()));
+ sender.sendMessage(_("§6Recipe for §c{0}§6 ({1} of {2})", getMaterialName(itemType), recipeNo + 1, recipesOfType.size()));
if (selectedRecipe instanceof FurnaceRecipe)
{
@@ -67,13 +67,13 @@ public class Commandrecipe extends EssentialsCommand
if (recipesOfType.size() > 1 && args.length == 1)
{
- sender.sendMessage(_("Type /{0} {1} <number> to see other recipes for {2}.", commandLabel, args[0], getMaterialName(itemType)));
+ sender.sendMessage(_("§6Type /{0} §c{1}§6 <number> to see other recipes for §c{2}§6.", commandLabel, args[0], getMaterialName(itemType)));
}
}
public void furnaceRecipe(final CommandSender sender, final FurnaceRecipe recipe)
{
- sender.sendMessage(_("Smelt {0}", getMaterialName(recipe.getInput())));
+ sender.sendMessage(_("§6Smelt §c{0}", getMaterialName(recipe.getInput())));
}
public void shapedRecipe(final CommandSender sender, final ShapedRecipe recipe)
@@ -119,16 +119,16 @@ public class Commandrecipe extends EssentialsCommand
materials[j][k] = item == null ? null : item.getType();
}
}
- sender.sendMessage(_("\u00a7{0}X | \u00a7{1}X | \u00a7{2}X", colorMap.get(materials[0][0]), colorMap.get(materials[0][1]), colorMap.get(materials[0][2])));
- sender.sendMessage(_("\u00a7{0}X | \u00a7{1}X | \u00a7{2}X", colorMap.get(materials[1][0]), colorMap.get(materials[1][1]), colorMap.get(materials[1][2])));
- sender.sendMessage(_("\u00a7{0}X | \u00a7{1}X | \u00a7{2}X", colorMap.get(materials[2][0]), colorMap.get(materials[2][1]), colorMap.get(materials[2][2])));
+ 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])));
final StringBuilder s = new StringBuilder();
for (Material items : colorMap.keySet().toArray(new Material[colorMap.size()]))
{
- s.append(_("\u00a7{0}X is {1}", colorMap.get(items), getMaterialName(items)));
+ s.append(_(" u00a7{0}X §6is §c{1}", colorMap.get(items), getMaterialName(items)));
}
- sender.sendMessage(_("Where: {0}", s.toString()));
+ sender.sendMessage(_("§6Where: {0}", s.toString()));
}
}
@@ -157,7 +157,7 @@ public class Commandrecipe extends EssentialsCommand
}
s.append(" ");
}
- sender.sendMessage(_("Combine {0}", s.toString()));
+ sender.sendMessage(_("§6Combine §c{0}", s.toString()));
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandremove.java b/Essentials/src/net/ess3/commands/Commandremove.java
index 885f353ea..d666e01e4 100644
--- a/Essentials/src/net/ess3/commands/Commandremove.java
+++ b/Essentials/src/net/ess3/commands/Commandremove.java
@@ -68,7 +68,7 @@ public class Commandremove extends EssentialsCommand
if (world == null)
{
- throw new Exception(_("Invalid world."));
+ throw new Exception(_("§4Invalid world."));
}
final ToRemove toRemove;
try
@@ -149,6 +149,6 @@ public class Commandremove extends EssentialsCommand
}
}
- sender.sendMessage(_("Removed {0} entities.", removed));
+ sender.sendMessage(_("§6Removed§c {0} §6entities.", removed));
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandrepair.java b/Essentials/src/net/ess3/commands/Commandrepair.java
index 381ba1134..5b336d221 100644
--- a/Essentials/src/net/ess3/commands/Commandrepair.java
+++ b/Essentials/src/net/ess3/commands/Commandrepair.java
@@ -28,12 +28,12 @@ public class Commandrepair extends EssentialsCommand
final ItemStack item = user.getPlayer().getItemInHand();
if (item == null)
{
- throw new Exception(_("This item cannot be repaired."));
+ throw new Exception(_("§4This item cannot be repaired."));
}
if (!item.getEnchantments().isEmpty() && !Permissions.REPAIR_ENCHANTED.isAuthorized(user))
{
- throw new Exception(_("You are not allowed to repair enchanted items."));
+ throw new Exception(_("§4You are not allowed to repair enchanted items."));
}
final String itemName = item.getType().toString().toLowerCase(Locale.ENGLISH);
@@ -45,7 +45,7 @@ public class Commandrepair extends EssentialsCommand
charge.charge(user);
- user.sendMessage(_("You have successfully repaired your: {0}.", itemName.replace('_', ' ')));
+ user.sendMessage(_("§6You have successfully repaired your: §c{0}.", itemName.replace('_', ' ')));
}
else if (args[0].equalsIgnoreCase("all") && Permissions.REPAIR_ALL.isAuthorized(user))
{
@@ -61,11 +61,11 @@ public class Commandrepair extends EssentialsCommand
if (repaired.isEmpty())
{
- throw new Exception(_("There were no items that needing repairing."));
+ throw new Exception(_("§4There were no items that needing repairing."));
}
else
{
- user.sendMessage(_("You have successfully repaired your: {0}.", Util.joinList(repaired)));
+ user.sendMessage(_("§6You have successfully repaired your: §c{0}.", Util.joinList(repaired)));
}
charge.charge(user);
@@ -81,12 +81,12 @@ public class Commandrepair extends EssentialsCommand
final Material material = Material.getMaterial(item.getTypeId());
if (material.isBlock() || material.getMaxDurability() < 1)
{
- throw new Exception(_("This item cannot be repaired."));
+ throw new Exception(_("§4This item cannot be repaired."));
}
if (item.getDurability() == 0)
{
- throw new Exception(_("This item does not need repairing."));
+ throw new Exception(_("§4This item does not need repairing."));
}
item.setDurability((short)0);
diff --git a/Essentials/src/net/ess3/commands/Commandseen.java b/Essentials/src/net/ess3/commands/Commandseen.java
index c72d03f68..294a3de66 100644
--- a/Essentials/src/net/ess3/commands/Commandseen.java
+++ b/Essentials/src/net/ess3/commands/Commandseen.java
@@ -33,31 +33,31 @@ public class Commandseen extends EssentialsCommand
{
final IUser u = ess.getUserMap().matchUserExcludingHidden(args[0], getPlayerOrNull(sender));
u.setDisplayNick();
- sender.sendMessage(_("Player {0} is online since {1}.", u.getPlayer().getDisplayName(), DateUtil.formatDateDiff(u.getTimestamp(TimestampType.LOGIN))));
+ sender.sendMessage(_("§6Player§c {0} §6is §aonline§6 since {1}.", u.getPlayer().getDisplayName(), DateUtil.formatDateDiff(u.getTimestamp(TimestampType.LOGIN))));
if(u.getData().isAfk())
{
- sender.sendMessage(_(" - AFK: {0}", _("true")));
+ sender.sendMessage(_("§6 - AFK:§r {0}", _("§atrue§r")));
}
if(u.getData().isJailed())
{
- sender.sendMessage(_(" - Jail: {0}", u.getTimestamp(TimestampType.JAIL) > 0
+ sender.sendMessage(_("§6 - Jail:§r {0}", u.getTimestamp(TimestampType.JAIL) > 0
? DateUtil.formatDateDiff(u.getTimestamp(TimestampType.JAIL))
- : _("true")));
+ : _("§atrue§r")));
}
if(u.getData().isMuted())
{
- sender.sendMessage(_(" - Muted: {0}", u.getTimestamp(TimestampType.MUTE) > 0
+ sender.sendMessage(_("§6 - Muted:§r {0}", u.getTimestamp(TimestampType.MUTE) > 0
? DateUtil.formatDateDiff(u.getTimestamp(TimestampType.MUTE))
- : _("true")));
+ : _("§atrue§r")));
}
}
catch (PlayerNotFoundException e)
{
final IUser u = ess.getUserMap().matchUser(args[0], true);
- sender.sendMessage(_("Player {0} is offline since {1}.", u.getName(), DateUtil.formatDateDiff(u.getTimestamp(TimestampType.LOGOUT))));
+ sender.sendMessage(_("§6Player§c {0} §6is §4offline§6 since {1}.", u.getName(), DateUtil.formatDateDiff(u.getTimestamp(TimestampType.LOGOUT))));
if (u.isBanned())
{
- sender.sendMessage(_(" - Banned: {0}", show ? u.getData().getBan().getReason() : _("true")));
+ sender.sendMessage(_("§6 - Banned:§r {0}", show ? u.getData().getBan().getReason() : _("§atrue§r")));
}
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandsell.java b/Essentials/src/net/ess3/commands/Commandsell.java
index cf3332ec5..36e1893d1 100644
--- a/Essentials/src/net/ess3/commands/Commandsell.java
+++ b/Essentials/src/net/ess3/commands/Commandsell.java
@@ -88,7 +88,7 @@ public class Commandsell extends EssentialsCommand
if (Double.isNaN(worth))
{
- throw new Exception(_("That item cannot be sold to the server."));
+ throw new Exception(_("§4That item cannot be sold to the server."));
}
@@ -127,9 +127,9 @@ public class Commandsell extends EssentialsCommand
{
if (!isBulkSell)
{
- user.sendMessage(_("You do not have enough of that item to sell."));
- user.sendMessage(_("If you meant to sell all of your items of that type, use /sell itemname."));
- throw new Exception(_("/sell itemname -1 will sell all but one item, etc."));
+ user.sendMessage(_("§4You do not have enough of that item to sell."));
+ user.sendMessage(_("§6If you meant to sell all of your items of that type, use /sell itemname."));
+ throw new Exception(_("§6/sell itemname -1 will sell all but one item, etc."));
}
else
{
diff --git a/Essentials/src/net/ess3/commands/Commandsethome.java b/Essentials/src/net/ess3/commands/Commandsethome.java
index 4f9f95db5..2141ac248 100644
--- a/Essentials/src/net/ess3/commands/Commandsethome.java
+++ b/Essentials/src/net/ess3/commands/Commandsethome.java
@@ -38,13 +38,13 @@ public class Commandsethome extends EssentialsCommand
}
else
{
- throw new Exception(_("You cannot set more than {0} homes.", ess.getRanks().getHomeLimit(user)));
+ throw new Exception(_("§4You cannot set more than§c {0} §4homes.", ess.getRanks().getHomeLimit(user)));
}
}
else
{
- throw new Exception(_("You cannot set more than {0} homes.", 1));
+ throw new Exception(_("§4You cannot set more than§c {0} §4homes.", 1));
}
}
else
@@ -54,7 +54,7 @@ public class Commandsethome extends EssentialsCommand
IUser usersHome = ess.getUserMap().getUser(ess.getServer().getPlayer(args[0]));
if (usersHome == null)
{
- throw new NoSuchFieldException(_("Player not found."));
+ throw new NoSuchFieldException(_("§4Player not found."));
}
String name = args[1].toLowerCase(Locale.ENGLISH);
if (!Permissions.SETHOME_MULTIPLE.isAuthorized(user))
@@ -63,7 +63,7 @@ public class Commandsethome extends EssentialsCommand
}
if ("bed".equals(name.toLowerCase(Locale.ENGLISH)))
{
- throw new NoSuchFieldException(_("Invalid home name!"));
+ throw new NoSuchFieldException(_("§4Invalid home name!"));
}
usersHome.getData().addHome(name, user.getPlayer().getLocation());
diff --git a/Essentials/src/net/ess3/commands/Commandsetjail.java b/Essentials/src/net/ess3/commands/Commandsetjail.java
index d48421f7e..fd71c7915 100644
--- a/Essentials/src/net/ess3/commands/Commandsetjail.java
+++ b/Essentials/src/net/ess3/commands/Commandsetjail.java
@@ -15,7 +15,7 @@ public class Commandsetjail extends EssentialsCommand
throw new NotEnoughArgumentsException();
}
ess.getJails().setJail(args[0], user.getPlayer().getLocation());
- user.sendMessage(_("Jail {0} has been set.", Util.sanitizeString(args[0])));
+ user.sendMessage(_("§6Jail§c {0} §6has been set.", Util.sanitizeString(args[0])));
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandsetspawn.java b/Essentials/src/net/ess3/commands/Commandsetspawn.java
index 79b515677..6a5b2b2b9 100644
--- a/Essentials/src/net/ess3/commands/Commandsetspawn.java
+++ b/Essentials/src/net/ess3/commands/Commandsetspawn.java
@@ -11,6 +11,6 @@ public class Commandsetspawn extends EssentialsCommand
{
final String group = args.length > 0 ? getFinalArg(args, 0) : "default";
ess.getSpawns().setSpawn(user.getPlayer().getLocation(), group);
- user.sendMessage(_("Spawn location set for group {0}.", group));
+ user.sendMessage(_("§6Spawn location set for group§c {0}§6.", group));
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandsetwarp.java b/Essentials/src/net/ess3/commands/Commandsetwarp.java
index 68d178381..6843d3dd4 100644
--- a/Essentials/src/net/ess3/commands/Commandsetwarp.java
+++ b/Essentials/src/net/ess3/commands/Commandsetwarp.java
@@ -20,7 +20,7 @@ public class Commandsetwarp extends EssentialsCommand
if (Util.isInt(args[0]))
{
- throw new NoSuchFieldException(_("Invalid warp name!"));
+ throw new NoSuchFieldException(_("§4Invalid warp name!"));
}
final Location loc = user.getPlayer().getLocation();
@@ -42,9 +42,9 @@ public class Commandsetwarp extends EssentialsCommand
}
else
{
- throw new Exception(_("You cannot overwrite that warp."));
+ throw new Exception(_("§4You cannot overwrite that warp."));
}
- user.sendMessage(_("Warp {0} set.", args[0]));
+ user.sendMessage(_("§6Warp§c {0} §6set.", args[0]));
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandsetworth.java b/Essentials/src/net/ess3/commands/Commandsetworth.java
index b3c9499e0..35ea04d61 100644
--- a/Essentials/src/net/ess3/commands/Commandsetworth.java
+++ b/Essentials/src/net/ess3/commands/Commandsetworth.java
@@ -31,7 +31,7 @@ public class Commandsetworth extends EssentialsCommand
}
ess.getWorth().setPrice(stack, Double.parseDouble(price));
- user.sendMessage(_("Worth value set."));
+ user.sendMessage(_("§6Worth value set"));
}
@Override
@@ -44,6 +44,6 @@ public class Commandsetworth extends EssentialsCommand
final ItemStack stack = ess.getItemDb().get(args[0]);
ess.getWorth().setPrice(stack, Double.parseDouble(args[1]));
- sender.sendMessage(_("Worth value set."));
+ sender.sendMessage(_("§6Worth value set"));
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandspawn.java b/Essentials/src/net/ess3/commands/Commandspawn.java
index ca9e2c70e..71874db86 100644
--- a/Essentials/src/net/ess3/commands/Commandspawn.java
+++ b/Essentials/src/net/ess3/commands/Commandspawn.java
@@ -22,8 +22,8 @@ public class Commandspawn extends EssentialsCommand
respawn(otherUser, null);
if (!otherUser.equals(user))
{
- otherUser.sendMessage(_("{0} teleported you to {1}.", user.getPlayer().getDisplayName(), "spawn"));
- user.sendMessage(_("Teleporting..."));
+ otherUser.sendMessage(_("§c{0}§6 teleported you to {1}§6.", user.getPlayer().getDisplayName(), "spawn"));
+ user.sendMessage(_("§6Teleporting..."));
}
}
else
@@ -41,8 +41,8 @@ public class Commandspawn extends EssentialsCommand
}
final IUser user = ess.getUserMap().matchUser(args[0], false);
respawn(user, null);
- user.sendMessage(_("{0} teleported you to {1}.", user.getPlayer().getDisplayName(), "spawn"));
- sender.sendMessage(_("Teleporting..."));
+ user.sendMessage(_("§c{0}§6 teleported you to {1}§6.", user.getPlayer().getDisplayName(), "spawn"));
+ sender.sendMessage(_("§6Teleporting..."));
}
private void respawn(final IUser user, final Trade charge) throws Exception
diff --git a/Essentials/src/net/ess3/commands/Commandspawner.java b/Essentials/src/net/ess3/commands/Commandspawner.java
index 11bff5d97..4875b9aae 100644
--- a/Essentials/src/net/ess3/commands/Commandspawner.java
+++ b/Essentials/src/net/ess3/commands/Commandspawner.java
@@ -21,13 +21,13 @@ public class Commandspawner extends EssentialsCommand
{
if (args.length < 1 || args[0].length() < 2)
{
- throw new NotEnoughArgumentsException(_("Mobs: {0}", Util.joinList(LivingEntities.getLivingEntityList())));
+ throw new NotEnoughArgumentsException(_("§6Mobs:§r {0}", Util.joinList(LivingEntities.getLivingEntityList())));
}
final Location target = LocationUtil.getTarget(user.getPlayer());
if (target == null || target.getBlock().getType() != Material.MOB_SPAWNER)
{
- throw new Exception(_("Target block must be a mob spawner."));
+ throw new Exception(_("§4Target block must be a mob spawner."));
}
try
@@ -43,7 +43,7 @@ public class Commandspawner extends EssentialsCommand
}
if (!Permissions.SPAWNER.isAuthorized(user, mob.getName()))
{
- throw new Exception(_("Unable to spawn mob."));
+ throw new Exception(_("§4Unable to spawn mob."));
}
int delay = 0;
if(args.length > 1 && Util.isInt(args[1]))
@@ -58,11 +58,11 @@ public class Commandspawner extends EssentialsCommand
spawner.setDelay(delay);
charge.charge(user);
- user.sendMessage(_("Changed spawner type to {0}.", mob.getName()));
+ user.sendMessage(_("§6Changed spawner type to§c {0}", mob.getName()));
}
catch (Exception ex)
{
- throw new Exception(_("Error while changing mob spawner."), ex);
+ throw new Exception(_("§4Error while changing mob spawner."), ex);
}
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandspawnmob.java b/Essentials/src/net/ess3/commands/Commandspawnmob.java
index 441e4573f..4688e6e3d 100644
--- a/Essentials/src/net/ess3/commands/Commandspawnmob.java
+++ b/Essentials/src/net/ess3/commands/Commandspawnmob.java
@@ -16,7 +16,7 @@ public class Commandspawnmob extends EssentialsCommand
if (args.length < 1)
{
final String mobList = SpawnMob.mobList(user);
- throw new NotEnoughArgumentsException(_("Mobs: {0}", mobList));
+ throw new NotEnoughArgumentsException(_("§6Mobs:§r {0}", mobList));
}
List<String> mobParts = SpawnMob.mobParts(args[0]);
diff --git a/Essentials/src/net/ess3/commands/Commandspeed.java b/Essentials/src/net/ess3/commands/Commandspeed.java
index df66fcc24..852aded8b 100644
--- a/Essentials/src/net/ess3/commands/Commandspeed.java
+++ b/Essentials/src/net/ess3/commands/Commandspeed.java
@@ -61,12 +61,12 @@ public class Commandspeed extends EssentialsCommand
//if (isFly)
//{
user.getPlayer().setFlySpeed((float)getRealMoveSpeed(speed, isFly, isBypass));
- user.sendMessage(_("Set {0} speed to {1} for {2}.", _("flying"), speed, user.getPlayer().getDisplayName()));
+ user.sendMessage(_("§6Set {0} speed to§c {1} §6for {2}§6.", _("flying"), speed, user.getPlayer().getDisplayName()));
//}
//else
//{
// user.setWalkSpeed(getRealMoveSpeed(speed, isFly, isBypass));
- // user.sendMessage(_("Set {0} speed to {1} for {2}.", _("walking"), speed, user.getDisplayName()));
+ // user.sendMessage(_("§6Set {0} speed to§c {1} §6for {2}§6.", _("walking"), speed, user.getDisplayName()));
//}
}
@@ -77,12 +77,12 @@ public class Commandspeed extends EssentialsCommand
if (isFly)
{
matchPlayer.setFlySpeed((float)getRealMoveSpeed(speed, isFly, isBypass));
- sender.sendMessage(_("Set {0} speed to {1} for {2}.", _("flying"), speed, matchPlayer.getDisplayName()));
+ sender.sendMessage(_("§6Set {0} speed to§c {1} §6for {2}§6.", _("flying"), speed, matchPlayer.getDisplayName()));
}
//else
// {
// matchPlayer.setWalkSpeed(getRealMoveSpeed(speed, isFly, isBypass));
- // sender.sendMessage(_("Set {0} speed to {1} for {2}.", _("walking"), speed, matchPlayer.getDisplayName()));
+ // sender.sendMessage(_("§6Set {0} speed to§c {1} §6for {2}§6.", _("walking"), speed, matchPlayer.getDisplayName()));
// }
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandsudo.java b/Essentials/src/net/ess3/commands/Commandsudo.java
index 04803c543..0f770fbed 100644
--- a/Essentials/src/net/ess3/commands/Commandsudo.java
+++ b/Essentials/src/net/ess3/commands/Commandsudo.java
@@ -29,11 +29,11 @@ public class Commandsudo extends EssentialsCommand
if (Permissions.SUDO_EXEMPT.isAuthorized(user))
{
- throw new Exception(_("You cannot sudo this user."));
+ throw new Exception(_("§4You cannot sudo this user."));
}
final Player player = user.getPlayer();
- sender.sendMessage(_("Forcing {0} to run: /{1} {2}", player.getDisplayName(), command, getFinalArg(arguments, 0)));
+ sender.sendMessage(_("§6Forcing§c {0} §6to run:§r /{1} {2}", player.getDisplayName(), command, getFinalArg(arguments, 0)));
final Server server = ess.getServer();
server.dispatchCommand(user, command);
diff --git a/Essentials/src/net/ess3/commands/Commandsuicide.java b/Essentials/src/net/ess3/commands/Commandsuicide.java
index 42ba57fe6..eb27a6ecb 100644
--- a/Essentials/src/net/ess3/commands/Commandsuicide.java
+++ b/Essentials/src/net/ess3/commands/Commandsuicide.java
@@ -13,7 +13,7 @@ public class Commandsuicide extends EssentialsCommand
final Player player = user.getPlayer();
ess.getPlugin().callSuicideEvent(player);
user.getPlayer().damage(player.getHealth());
- user.sendMessage(_("Goodbye cruel world..."));
- ess.broadcastMessage(user, _("{0} took their own life.", player.getDisplayName()));
+ user.sendMessage(_("§6Goodbye cruel world..."));
+ ess.broadcastMessage(user, _(" §6{0} §6took their own life.", player.getDisplayName()));
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandtempban.java b/Essentials/src/net/ess3/commands/Commandtempban.java
index 049a164b8..d022063d9 100644
--- a/Essentials/src/net/ess3/commands/Commandtempban.java
+++ b/Essentials/src/net/ess3/commands/Commandtempban.java
@@ -27,7 +27,7 @@ public class Commandtempban extends EssentialsCommand
{
if (Permissions.TEMPBAN_OFFLINE.isAuthorized(sender))
{
- sender.sendMessage(_("You may not tempban that player."));
+ sender.sendMessage(_("§4You may not tempban that player."));
return;
}
}
@@ -35,7 +35,7 @@ public class Commandtempban extends EssentialsCommand
{
if (Permissions.TEMPBAN_EXEMPT.isAuthorized(user) && sender instanceof Player)
{
- sender.sendMessage(_("You may not tempban that player."));
+ sender.sendMessage(_("§4You may not tempban that player."));
return;
}
}
@@ -65,7 +65,7 @@ public class Commandtempban extends EssentialsCommand
final IUser player = ess.getUserMap().getUser(onlinePlayer);
if (Permissions.BAN_NOTIFY.isAuthorized(player))
{
- onlinePlayer.sendMessage(_("Player {0} banned {1} for {2}.", senderName, user.getName(), banReason));
+ onlinePlayer.sendMessage(_("§6Player§c {0} §6banned {1} §6for {2}.", senderName, user.getName(), banReason));
}
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandthunder.java b/Essentials/src/net/ess3/commands/Commandthunder.java
index e39481f81..e9e55d72b 100644
--- a/Essentials/src/net/ess3/commands/Commandthunder.java
+++ b/Essentials/src/net/ess3/commands/Commandthunder.java
@@ -22,13 +22,13 @@ public class Commandthunder extends EssentialsCommand
world.setThundering(setThunder ? true : false);
world.setThunderDuration(Integer.parseInt(args[1]) * 20);
- user.sendMessage(_("You {0} thunder in your world for {1} seconds.", (setThunder ? _("enabled") : _("disabled")), Integer.parseInt(args[1])));
+ user.sendMessage(_("§6You§c {0} §6thunder in your world for§c {1} §6seconds.", (setThunder ? _("enabled") : _("disabled")), Integer.parseInt(args[1])));
}
else
{
world.setThundering(setThunder ? true : false);
- user.sendMessage(_("You {0} thunder 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/Commandtime.java b/Essentials/src/net/ess3/commands/Commandtime.java
index c8f3911c4..28f970a9e 100644
--- a/Essentials/src/net/ess3/commands/Commandtime.java
+++ b/Essentials/src/net/ess3/commands/Commandtime.java
@@ -45,7 +45,7 @@ public class Commandtime extends EssentialsCommand
if (!Permissions.TIME_SET.isAuthorized(sender))
{
- sender.sendMessage(_("You are not authorized to set the time."));
+ sender.sendMessage(_("§4You are not authorized to set the time."));
return;
}
@@ -77,7 +77,7 @@ public class Commandtime extends EssentialsCommand
for (World world : worlds)
{
- sender.sendMessage(_("The current time in {0} is {1}.", world.getName(), DescParseTickFormat.format(world.getTime())));
+ sender.sendMessage(_("§6The current time in§c {0} §6is §c{1}§6.", world.getName(), DescParseTickFormat.format(world.getTime())));
}
}
@@ -120,7 +120,7 @@ public class Commandtime extends EssentialsCommand
output.append(world.getName());
}
- sender.sendMessage(_("The time was set to {0} in: {1}.", DescParseTickFormat.format(ticks), output.toString()));
+ sender.sendMessage(_("§6The time was set to§c {0} §6in: §c{1}§6.", DescParseTickFormat.format(ticks), output.toString()));
}
/**
@@ -159,7 +159,7 @@ public class Commandtime extends EssentialsCommand
// We failed to understand the world target...
else
{
- throw new Exception(_("Invalid world."));
+ throw new Exception(_("§4Invalid world."));
}
return worlds;
diff --git a/Essentials/src/net/ess3/commands/Commandtogglejail.java b/Essentials/src/net/ess3/commands/Commandtogglejail.java
index d52bd3acb..39bb7ca63 100644
--- a/Essentials/src/net/ess3/commands/Commandtogglejail.java
+++ b/Essentials/src/net/ess3/commands/Commandtogglejail.java
@@ -26,7 +26,7 @@ public class Commandtogglejail extends EssentialsCommand
{
if (Permissions.TOGGLEJAIL_OFFLINE.isAuthorized(sender))
{
- sender.sendMessage(_("You may not jail that person!"));
+ sender.sendMessage(_("§4You may not jail that person!"));
return;
}
}
@@ -34,7 +34,7 @@ public class Commandtogglejail extends EssentialsCommand
{
if (Permissions.JAIL_EXEMPT.isAuthorized(player))
{
- sender.sendMessage(_("You may not jail that person!"));
+ sender.sendMessage(_("§4You may not jail that person!"));
return;
}
}
@@ -48,7 +48,7 @@ public class Commandtogglejail extends EssentialsCommand
ess.getJails().getJail(args[1]);
}
player.getData().setJailed(true);
- player.sendMessage(_("You have been jailed!"));
+ player.sendMessage(_("§6You have been jailed!"));
player.getData().setJail(args[1]);
long timeDiff = 0;
if (args.length > 2)
@@ -59,13 +59,13 @@ public class Commandtogglejail extends EssentialsCommand
}
player.queueSave();
sender.sendMessage(
- (timeDiff > 0 ? _("Player {0} jailed for {1}.", player.getName(), DateUtil.formatDateDiff(timeDiff)) : _("Player {0} jailed.", player.getName())));
+ (timeDiff > 0 ? _(" §6Player§c {0} §6jailed for {1}.", player.getName(), DateUtil.formatDateDiff(timeDiff)) : _("§6Player§c {0} §6jailed.", player.getName())));
return;
}
if (args.length >= 2 && player.getData().isJailed() && !args[1].equalsIgnoreCase(player.getData().getJail()))
{
- sender.sendMessage(_("Person is already in jail: {0}", player.getData().getJail()));
+ sender.sendMessage(_("§4Person is already in jail:§c {0}", player.getData().getJail()));
return;
}
@@ -75,7 +75,7 @@ public class Commandtogglejail extends EssentialsCommand
final long timeDiff = DateUtil.parseDateDiff(time, true);
player.setTimestamp(TimestampType.JAIL, timeDiff);
player.queueSave();
- sender.sendMessage(_("Jail time extend to: {0}", DateUtil.formatDateDiff(timeDiff)));
+ sender.sendMessage(_("§6Jail time extend to: {0}", DateUtil.formatDateDiff(timeDiff)));
return;
}
@@ -87,14 +87,14 @@ public class Commandtogglejail extends EssentialsCommand
}
player.getData().setJailed(false);
player.setTimestamp(TimestampType.JAIL, 0);
- player.sendMessage(_("You have been released!"));
+ player.sendMessage(_("§6You have been released!"));
player.getData().setJail(null);
if (player.isOnline())
{
player.getTeleport().back();
}
player.queueSave();
- sender.sendMessage(_("Player {0} unjailed.", player.getName()));
+ sender.sendMessage(_("§6Player §c{0}§6 unjailed.", player.getName()));
}
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandtop.java b/Essentials/src/net/ess3/commands/Commandtop.java
index 5bb14a1f0..65a51dd03 100644
--- a/Essentials/src/net/ess3/commands/Commandtop.java
+++ b/Essentials/src/net/ess3/commands/Commandtop.java
@@ -21,6 +21,6 @@ public class Commandtop extends EssentialsCommand
user.getTeleport().teleport(
new Location(player.getWorld(), topX, topY + 1, topZ, playerLocation.getYaw(), playerLocation.getPitch()), new Trade(commandName, ess),
TeleportCause.COMMAND);
- user.sendMessage(_("Teleporting to top."));
+ user.sendMessage(_("§6Teleporting to top."));
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandtp.java b/Essentials/src/net/ess3/commands/Commandtp.java
index 547bd3d42..ae040ab89 100644
--- a/Essentials/src/net/ess3/commands/Commandtp.java
+++ b/Essentials/src/net/ess3/commands/Commandtp.java
@@ -25,19 +25,19 @@ public class Commandtp extends EssentialsCommand
final IUser player = ess.getUserMap().matchUserExcludingHidden(args[0], user.getPlayer());
if (!player.getData().isTeleportEnabled())
{
- throw new Exception(_("{0} has teleportation disabled.", player.getPlayer().getDisplayName()));
+ throw new Exception(_("§c{0} §4has teleportation disabled.", player.getPlayer().getDisplayName()));
}
if (settings.getData().getGeneral().isPerGroupTeleport() && !Permissions.PERGROUPTELEPORT.isAuthorized(
user, ess.getRanks().getMainGroup(player)))
{
- throw new Exception(_("You do not have the {0} permission.", "essentials.teleport.groups." + ess.getRanks().getMainGroup(player)));
+ throw new Exception(_("§4You do not have the §c{0}§4 permission.", "essentials.teleport.groups." + ess.getRanks().getMainGroup(player)));
}
if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions() && !Permissions.WORLD.isAuthorized(
user, player.getPlayer().getWorld().getName()))
{
- throw new Exception(_("You do not have the {0} permission.", "essentials.world." + player.getPlayer().getWorld().getName()));
+ throw new Exception(_("§4You do not have the §c{0}§4 permission.", "essentials.world." + player.getPlayer().getWorld().getName()));
}
- user.sendMessage(_("Teleporting..."));
+ user.sendMessage(_("§6Teleporting..."));
final Trade charge = new Trade(commandName, ess);
charge.isAffordableFor(user);
user.getTeleport().teleport(player.getPlayer(), charge, TeleportCause.COMMAND);
@@ -48,7 +48,7 @@ public class Commandtp extends EssentialsCommand
{
throw new Exception(_("needTpohere"));
}
- user.sendMessage(_("Teleporting..."));
+ user.sendMessage(_("§6Teleporting..."));
final IUser target = ess.getUserMap().matchUserExcludingHidden(args[0], user.getPlayer());
@@ -56,19 +56,19 @@ public class Commandtp extends EssentialsCommand
if (!target.getData().isTeleportEnabled())
{
- throw new Exception(_("{0} has teleportation disabled.", target.getPlayer().getDisplayName()));
+ throw new Exception(_("§c{0} §4has teleportation disabled.", target.getPlayer().getDisplayName()));
}
if (!toPlayer.getData().isTeleportEnabled())
{
- throw new Exception(_("{0} has teleportation disabled.", toPlayer.getPlayer().getDisplayName()));
+ throw new Exception(_("§c{0} §4has teleportation disabled.", toPlayer.getPlayer().getDisplayName()));
}
if (target.getPlayer().getWorld() != toPlayer.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions() && !Permissions.WORLD.isAuthorized(
user, toPlayer.getPlayer().getWorld().getName()))
{
- throw new Exception(_("You do not have the {0} permission.", "essentials.world." + toPlayer.getPlayer().getWorld().getName()));
+ throw new Exception(_("§4You do not have the §c{0}§4 permission.", "essentials.world." + toPlayer.getPlayer().getWorld().getName()));
}
target.getTeleport().now(toPlayer.getPlayer(), false, TeleportCause.COMMAND);
- target.sendMessage(_("{0} teleported you to {1}.", user.getPlayer().getDisplayName(), toPlayer.getPlayer().getDisplayName()));
+ target.sendMessage(_("§c{0}§6 teleported you to {1}§6.", user.getPlayer().getDisplayName(), toPlayer.getPlayer().getDisplayName()));
break;
}
}
@@ -81,10 +81,10 @@ public class Commandtp extends EssentialsCommand
throw new NotEnoughArgumentsException();
}
- sender.sendMessage(_("Teleporting..."));
+ sender.sendMessage(_("§6Teleporting..."));
final IUser target = ess.getUserMap().getUser(args[0]);
final IUser toPlayer = ess.getUserMap().getUser(args[1]);
target.getTeleport().now(toPlayer.getPlayer(), false, TeleportCause.COMMAND);
- target.sendMessage(_("{0} teleported you to {1}.", Console.NAME, toPlayer.getPlayer().getDisplayName()));
+ target.sendMessage(_("§c{0}§6 teleported you to {1}§6.", Console.NAME, toPlayer.getPlayer().getDisplayName()));
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandtpa.java b/Essentials/src/net/ess3/commands/Commandtpa.java
index 7339c8a9c..b108299ee 100644
--- a/Essentials/src/net/ess3/commands/Commandtpa.java
+++ b/Essentials/src/net/ess3/commands/Commandtpa.java
@@ -20,32 +20,32 @@ public class Commandtpa extends EssentialsCommand
IUser player = ess.getUserMap().matchUserExcludingHidden(args[0], user.getPlayer());
if (!player.getData().isTeleportEnabled())
{
- throw new Exception(_("{0} has teleportation disabled.", player.getPlayer().getDisplayName()));
+ throw new Exception(_("§c{0} §4has teleportation disabled.", player.getPlayer().getDisplayName()));
}
ISettings settings = ess.getSettings();
if (settings.getData().getGeneral().isPerGroupTeleport() && !Permissions.PERGROUPTELEPORT.isAuthorized(
user, ess.getRanks().getMainGroup(player)))
{
- throw new Exception(_("You do not have the {0} permission.", "essentials.teleport.groups." + ess.getRanks().getMainGroup(player)));
+ throw new Exception(_("§4You do not have the §c{0}§4 permission.", "essentials.teleport.groups." + ess.getRanks().getMainGroup(player)));
}
if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && ess.getSettings().getData().getGeneral().isWorldTeleportPermissions() && !Permissions.WORLD.isAuthorized(
user, user.getPlayer().getWorld().getName()))
{
- throw new Exception(_("You do not have the {0} permission.", "essentials.world." + player.getPlayer().getWorld().getName()));
+ throw new Exception(_("§4You do not have the §c{0}§4 permission.", "essentials.world." + player.getPlayer().getWorld().getName()));
}
if (!player.isIgnoringPlayer(user))
{
player.requestTeleport(user, false);
- player.sendMessage(_("{0} has requested to teleport to you.", user.getPlayer().getDisplayName()));
- player.sendMessage(_("To teleport, type /tpaccept."));
- player.sendMessage(_("To deny this request, type /tpdeny."));
+ player.sendMessage(_("§c{0}§6 has requested to teleport to you.", user.getPlayer().getDisplayName()));
+ player.sendMessage(_("§6To teleport, type §c/tpaccept§6."));
+ player.sendMessage(_("§6To deny this request, type §c/tpdeny§6."));
int tpaAcceptCancellation = 0;
tpaAcceptCancellation = settings.getData().getCommands().getTeleport().getRequestTimeout();
if (tpaAcceptCancellation != 0)
{
- player.sendMessage(_("This request will timeout after {0} seconds.", tpaAcceptCancellation));
+ player.sendMessage(_("§6This request will timeout after§c {0} seconds§6.", tpaAcceptCancellation));
}
}
- user.sendMessage(_("Request sent to {0}.", player.getPlayer().getDisplayName()));
+ user.sendMessage(_("§6Request sent to§c {0}§6.", player.getPlayer().getDisplayName()));
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandtpaall.java b/Essentials/src/net/ess3/commands/Commandtpaall.java
index f8b286b7e..d70f68f03 100644
--- a/Essentials/src/net/ess3/commands/Commandtpaall.java
+++ b/Essentials/src/net/ess3/commands/Commandtpaall.java
@@ -29,7 +29,7 @@ public class Commandtpaall extends EssentialsCommand
private void teleportAAllPlayers(final CommandSender sender, final IUser user)
{
- sender.sendMessage(_("Teleporting request sent to all players..."));
+ sender.sendMessage(_("§6Teleporting request sent to all players..."));
for (Player onlinePlayer : server.getOnlinePlayers())
{
@@ -52,13 +52,13 @@ public class Commandtpaall extends EssentialsCommand
try
{
player.requestTeleport(user, true);
- player.sendMessage(_("{0} has requested that you teleport to them.", user.getPlayer().getDisplayName()));
- player.sendMessage(_("To teleport, type /tpaccept."));
+ player.sendMessage(_("§c{0}§6 has requested that you teleport to them.", user.getPlayer().getDisplayName()));
+ player.sendMessage(_("§6To teleport, type §c/tpaccept§6."));
int tpaAcceptCancellation = 0;
tpaAcceptCancellation = settings.getData().getCommands().getTeleport().getRequestTimeout();
if (tpaAcceptCancellation != 0)
{
- player.sendMessage(_("This request will timeout after {0} seconds.", tpaAcceptCancellation));
+ player.sendMessage(_("§6This request will timeout after§c {0} seconds§6.", tpaAcceptCancellation));
}
}
catch (Exception ex)
diff --git a/Essentials/src/net/ess3/commands/Commandtpaccept.java b/Essentials/src/net/ess3/commands/Commandtpaccept.java
index e54c6653d..9dc6ede85 100644
--- a/Essentials/src/net/ess3/commands/Commandtpaccept.java
+++ b/Essentials/src/net/ess3/commands/Commandtpaccept.java
@@ -16,19 +16,19 @@ public class Commandtpaccept extends EssentialsCommand
{
if (user.getTeleportRequester() == null)
{
- throw new Exception(_("You do not have a pending request."));
+ throw new Exception(_("§4You do not have a pending request."));
}
final IUser target = user.getTeleportRequester();
if (target == null || !target.isOnline() || (user.isTpRequestHere() && !Permissions.TPAHERE.isAuthorized(
target)) || (!user.isTpRequestHere() && !Permissions.TPA.isAuthorized(target) && !Permissions.TPAALL.isAuthorized(target)))
{
- throw new Exception(_("You do not have a pending request."));
+ throw new Exception(_("§4You do not have a pending request."));
}
if (args.length > 0 && !target.getName().contains(args[0]))
{
- throw new Exception(_("You do not have a pending request."));
+ throw new Exception(_("§4You do not have a pending request."));
}
@@ -38,12 +38,12 @@ public class Commandtpaccept extends EssentialsCommand
if (tpaAcceptCancellation != 0 && (System.currentTimeMillis() - user.getTeleportRequestTime()) / 1000 > tpaAcceptCancellation)
{
user.requestTeleport(null, false);
- throw new Exception(_("Teleport request has timed out."));
+ throw new Exception(_("§4Teleport request has timed out."));
}
final Trade charge = new Trade(commandName, ess);
- user.sendMessage(_("Teleport request accepted."));
- target.sendMessage(_("{0} accepted your teleport request.", user.getPlayer().getDisplayName()));
+ user.sendMessage(_("§6Teleport request accepted."));
+ target.sendMessage(_("§c{0} §6accepted your teleport request.", user.getPlayer().getDisplayName()));
try
{
@@ -58,7 +58,7 @@ public class Commandtpaccept extends EssentialsCommand
}
catch (ChargeException ex)
{
- user.sendMessage(_("Pending teleportation request cancelled."));
+ user.sendMessage(_("§4Pending teleportation request cancelled."));
//ess.showError(target, ex, commandLabel); TODO: equivalent to ess.showError() could not be found?
}
user.requestTeleport(null, false);
diff --git a/Essentials/src/net/ess3/commands/Commandtpahere.java b/Essentials/src/net/ess3/commands/Commandtpahere.java
index 8d368b68d..554ff8620 100644
--- a/Essentials/src/net/ess3/commands/Commandtpahere.java
+++ b/Essentials/src/net/ess3/commands/Commandtpahere.java
@@ -20,32 +20,32 @@ public class Commandtpahere extends EssentialsCommand
final IUser player = ess.getUserMap().matchUserExcludingHidden(args[0], user.getPlayer());
if (!player.getData().isTeleportEnabled())
{
- throw new Exception(_("{0} has teleportation disabled.", player.getPlayer().getDisplayName()));
+ throw new Exception(_("§c{0} §4has teleportation disabled.", player.getPlayer().getDisplayName()));
}
ISettings settings = ess.getSettings();
if (settings.getData().getGeneral().isPerGroupTeleport() && !Permissions.PERGROUPTELEPORT.isAuthorized(
user, ess.getRanks().getMainGroup(player)))
{
- throw new Exception(_("You do not have the {0} permission.", "essentials.teleport.groups." + ess.getRanks().getMainGroup(player)));
+ throw new Exception(_("§4You do not have the §c{0}§4 permission.", "essentials.teleport.groups." + ess.getRanks().getMainGroup(player)));
}
if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions() && !Permissions.WORLD.isAuthorized(
user, user.getPlayer().getWorld().getName()))
{
- throw new Exception(_("You do not have the {0} permission.", "essentials.world." + user.getPlayer().getWorld().getName()));
+ throw new Exception(_("§4You do not have the §c{0}§4 permission.", "essentials.world." + user.getPlayer().getWorld().getName()));
}
player.requestTeleport(user, true);
- player.sendMessage(_("{0} has requested that you teleport to them.", user.getPlayer().getDisplayName()));
- player.sendMessage(_("To teleport, type /tpaccept."));
- player.sendMessage(_("To deny this request, type /tpdeny."));
+ player.sendMessage(_("§c{0}§6 has requested that you teleport to them.", user.getPlayer().getDisplayName()));
+ player.sendMessage(_("§6To teleport, type §c/tpaccept§6."));
+ player.sendMessage(_("§6To deny this request, type §c/tpdeny§6."));
int tpaAcceptCancellation = 0;
{
tpaAcceptCancellation = settings.getData().getCommands().getTeleport().getRequestTimeout();
}
if (tpaAcceptCancellation != 0)
{
- player.sendMessage(_("This request will timeout after {0} seconds.", tpaAcceptCancellation));
+ player.sendMessage(_("§6This request will timeout after§c {0} seconds§6.", tpaAcceptCancellation));
}
- user.sendMessage(_("Request sent to {0}.", player.getPlayer().getDisplayName()));
+ user.sendMessage(_("§6Request sent to§c {0}§6.", player.getPlayer().getDisplayName()));
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandtpall.java b/Essentials/src/net/ess3/commands/Commandtpall.java
index da5ae1d82..f4ddad8d3 100644
--- a/Essentials/src/net/ess3/commands/Commandtpall.java
+++ b/Essentials/src/net/ess3/commands/Commandtpall.java
@@ -30,7 +30,7 @@ public class Commandtpall extends EssentialsCommand
private void teleportAllPlayers(CommandSender sender, IUser user)
{
- sender.sendMessage(_("Teleporting all players..."));
+ sender.sendMessage(_("§6Teleporting all players..."));
for (Player onlinePlayer : server.getOnlinePlayers())
{
final IUser player = ess.getUserMap().getUser(onlinePlayer);
diff --git a/Essentials/src/net/ess3/commands/Commandtpdeny.java b/Essentials/src/net/ess3/commands/Commandtpdeny.java
index 2379de44c..114beb526 100644
--- a/Essentials/src/net/ess3/commands/Commandtpdeny.java
+++ b/Essentials/src/net/ess3/commands/Commandtpdeny.java
@@ -12,11 +12,11 @@ public class Commandtpdeny extends EssentialsCommand
final IUser player = user.getTeleportRequester();
if (player == null)
{
- throw new Exception(_("You do not have a pending request."));
+ throw new Exception(_("§4You do not have a pending request."));
}
- user.sendMessage(_("Teleport request denied."));
- player.sendMessage(_("{0} denied your teleport request.", user.getPlayer().getDisplayName()));
+ user.sendMessage(_("§6Teleport request denied."));
+ player.sendMessage(_("§c{0} §6denied your teleport request.", user.getPlayer().getDisplayName()));
user.requestTeleport(null, false);
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandtphere.java b/Essentials/src/net/ess3/commands/Commandtphere.java
index b1c1f8528..857a21e5c 100644
--- a/Essentials/src/net/ess3/commands/Commandtphere.java
+++ b/Essentials/src/net/ess3/commands/Commandtphere.java
@@ -16,18 +16,18 @@ public class Commandtphere extends EssentialsCommand
final IUser player = ess.getUserMap().matchUserExcludingHidden(args[0], user.getPlayer());
if (!player.getData().isTeleportEnabled())
{
- throw new Exception(_("{0} has teleportation disabled.", player.getPlayer().getDisplayName()));
+ throw new Exception(_("§c{0} §4has teleportation disabled.", player.getPlayer().getDisplayName()));
}
ISettings settings = ess.getSettings();
if (settings.getData().getGeneral().isPerGroupTeleport() && !Permissions.PERGROUPTELEPORT.isAuthorized(
user, ess.getRanks().getMainGroup(player)))
{
- throw new Exception(_("You do not have the {0} permission.", "essentials.teleport.groups." + ess.getRanks().getMainGroup(player)));
+ throw new Exception(_("§4You do not have the §c{0}§4 permission.", "essentials.teleport.groups." + ess.getRanks().getMainGroup(player)));
}
user.getTeleport().teleportToMe(player, new Trade(commandName, ess), TeleportCause.COMMAND);
- user.sendMessage(_("Teleporting..."));
- player.sendMessage(_("Teleporting..."));
+ user.sendMessage(_("§6Teleporting..."));
+ player.sendMessage(_("§6Teleporting..."));
throw new NoChargeException();
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandtpo.java b/Essentials/src/net/ess3/commands/Commandtpo.java
index 5a0adb443..fd4e4f470 100644
--- a/Essentials/src/net/ess3/commands/Commandtpo.java
+++ b/Essentials/src/net/ess3/commands/Commandtpo.java
@@ -24,17 +24,17 @@ public class Commandtpo extends EssentialsCommand
if (settings.getData().getGeneral().isPerGroupTeleport() && !Permissions.PERGROUPTELEPORT.isAuthorized(
user, ess.getRanks().getMainGroup(player)))
{
- throw new Exception(_("You do not have the {0} permission.", "essentials.teleport.groups." + ess.getRanks().getMainGroup(player)));
+ throw new Exception(_("§4You do not have the §c{0}§4 permission.", "essentials.teleport.groups." + ess.getRanks().getMainGroup(player)));
}
// Verify permission
if (user.getPlayer().canSee(player.getPlayer()) || Permissions.TELEPORT_HIDDEN.isAuthorized(user))
{
user.getTeleport().now(player.getPlayer(), false, TeleportCause.COMMAND);
- user.sendMessage(_("Teleporting..."));
+ user.sendMessage(_("§6Teleporting..."));
}
else
{
- throw new NoSuchFieldException(_("Player not found."));
+ throw new NoSuchFieldException(_("§4Player not found."));
}
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandtpohere.java b/Essentials/src/net/ess3/commands/Commandtpohere.java
index e3e72e923..df459ca4e 100644
--- a/Essentials/src/net/ess3/commands/Commandtpohere.java
+++ b/Essentials/src/net/ess3/commands/Commandtpohere.java
@@ -25,12 +25,12 @@ public class Commandtpohere extends EssentialsCommand
if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions() && !Permissions.WORLD.isAuthorized(
player, user.getPlayer().getWorld().getName()))
{
- throw new Exception(_("You do not have the {0} permission.", "essentials.world." + user.getPlayer().getWorld().getName()));
+ throw new Exception(_("§4You do not have the §c{0}§4 permission.", "essentials.world." + user.getPlayer().getWorld().getName()));
}
if (settings.getData().getGeneral().isPerGroupTeleport() && !Permissions.PERGROUPTELEPORT.isAuthorized(
user, ess.getRanks().getMainGroup(player)))
{
- throw new Exception(_("You do not have the {0} permission.", "essentials.teleport.groups." + ess.getRanks().getMainGroup(player)));
+ throw new Exception(_("§4You do not have the §c{0}§4 permission.", "essentials.teleport.groups." + ess.getRanks().getMainGroup(player)));
}
@@ -38,11 +38,11 @@ public class Commandtpohere extends EssentialsCommand
if (user.getPlayer().canSee(player.getPlayer()) || Permissions.TELEPORT_HIDDEN.isAuthorized(user))
{
player.getTeleport().now(user.getPlayer(), false, TeleportCause.COMMAND);
- user.sendMessage(_("Teleporting..."));
+ user.sendMessage(_("§6Teleporting..."));
}
else
{
- throw new NoSuchFieldException(_("Player not found."));
+ throw new NoSuchFieldException(_("§4Player not found."));
}
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandtppos.java b/Essentials/src/net/ess3/commands/Commandtppos.java
index df056e7c4..6a69a14a6 100644
--- a/Essentials/src/net/ess3/commands/Commandtppos.java
+++ b/Essentials/src/net/ess3/commands/Commandtppos.java
@@ -37,7 +37,7 @@ public class Commandtppos extends EssentialsCommand
}
final Trade charge = new Trade(commandName, ess);
charge.isAffordableFor(user);
- user.sendMessage(_("Teleporting..."));
+ user.sendMessage(_("§6Teleporting..."));
user.getTeleport().teleport(location, charge, TeleportCause.COMMAND);
throw new NoChargeException();
}
@@ -68,8 +68,8 @@ public class Commandtppos extends EssentialsCommand
{
throw new NotEnoughArgumentsException(_("tpposTooFar"));
}
- sender.sendMessage(_("Teleporting..."));
- user.sendMessage(_("Teleporting..."));
+ sender.sendMessage(_("§6Teleporting..."));
+ user.sendMessage(_("§6Teleporting..."));
user.getTeleport().teleport(location, null, TeleportCause.COMMAND);
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandtree.java b/Essentials/src/net/ess3/commands/Commandtree.java
index 7a7a00ca6..5eddbe4c2 100644
--- a/Essentials/src/net/ess3/commands/Commandtree.java
+++ b/Essentials/src/net/ess3/commands/Commandtree.java
@@ -59,11 +59,11 @@ public class Commandtree extends EssentialsCommand
final boolean success = user.getPlayer().getWorld().generateTree(safeLocation, tree);
if (success)
{
- user.sendMessage(_("Tree spawned."));
+ user.sendMessage(_("§6Tree spawned."));
}
else
{
- user.sendMessage(_("Tree generation failure. Try again on grass or dirt."));
+ user.sendMessage(_("§4Tree generation failure. Try again on grass or dirt."));
}
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandunlimited.java b/Essentials/src/net/ess3/commands/Commandunlimited.java
index d6ee9b02c..4d8e0a7a1 100644
--- a/Essentials/src/net/ess3/commands/Commandunlimited.java
+++ b/Essentials/src/net/ess3/commands/Commandunlimited.java
@@ -52,7 +52,7 @@ public class Commandunlimited extends EssentialsCommand
private String getList(final IUser target)
{
final StringBuilder output = new StringBuilder();
- output.append(_("Unlimited items:")).append(" ");
+ output.append(_("§6Unlimited items:§r")).append(" ");
boolean first = true;
final Set<Material> items = target.getData().getUnlimited();
if (items.isEmpty())
@@ -81,7 +81,7 @@ public class Commandunlimited extends EssentialsCommand
final String itemname = stack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "");
if (!Permissions.UNLIMITED.isAuthorized(user, stack))
{
- throw new Exception(_("No permission for unlimited item {0}.", itemname));
+ throw new Exception(_("§4No permission for unlimited item {0}.", itemname));
}
String message = "disableUnlimited";
diff --git a/Essentials/src/net/ess3/commands/Commandvanish.java b/Essentials/src/net/ess3/commands/Commandvanish.java
index 7b9279e41..76a4b3168 100644
--- a/Essentials/src/net/ess3/commands/Commandvanish.java
+++ b/Essentials/src/net/ess3/commands/Commandvanish.java
@@ -36,7 +36,7 @@ public class Commandvanish extends EssentialsToggleCommand
@Override
protected void informPlayer(final IUser player)
{
- player.sendMessage(getValue(player) ? _("You are now completely invisible to normal users, and hidden from in-game commands.") : _("You are once again visible."));
+ player.sendMessage(getValue(player) ? _("§6You are now completely invisible to normal users, and hidden from in-game commands.") : _("§6You are once again visible."));
}
@Override
diff --git a/Essentials/src/net/ess3/commands/Commandwarp.java b/Essentials/src/net/ess3/commands/Commandwarp.java
index 1d9f64f86..dee96fe94 100644
--- a/Essentials/src/net/ess3/commands/Commandwarp.java
+++ b/Essentials/src/net/ess3/commands/Commandwarp.java
@@ -25,7 +25,7 @@ public class Commandwarp extends EssentialsCommand
{
if (!Permissions.WARP_LIST.isAuthorized(user))
{
- throw new Exception(_("You do not have Permission to list warps."));
+ throw new Exception(_("§4You do not have Permission to list warps."));
}
warpList(user, args);
throw new NoChargeException();
@@ -62,7 +62,7 @@ public class Commandwarp extends EssentialsCommand
IUser otherUser = ess.getUserMap().matchUser(args[1], false);
if (otherUser == null)
{
- throw new Exception(_("Player not found."));
+ throw new Exception(_("§4Player not found."));
}
otherUser.getTeleport().warp(args[0], null, TeleportCause.COMMAND);
throw new NoChargeException();
@@ -75,7 +75,7 @@ public class Commandwarp extends EssentialsCommand
final IWarps warps = ess.getWarps();
if (warps.isEmpty())
{
- throw new Exception(_("No warps defined."));
+ throw new Exception(_("§6No warps defined."));
}
final List<String> warpNameList = new ArrayList<String>(warps.getList());
@@ -102,12 +102,12 @@ public class Commandwarp extends EssentialsCommand
if (warpNameList.size() > WARPS_PER_PAGE)
{
- sender.sendMessage(_("There are {0} warps. Showing page {1} of {2}.", warpNameList.size(), page, (int)Math.ceil(warpNameList.size() / (double)WARPS_PER_PAGE)));
+ sender.sendMessage(_("§6There are§c {0} §6warps. Showing page {1} of {2}.", warpNameList.size(), page, (int)Math.ceil(warpNameList.size() / (double)WARPS_PER_PAGE)));
sender.sendMessage(warpList);
}
else
{
- sender.sendMessage(_("Warps: {0}", warpList));
+ sender.sendMessage(_("§6Warps:§r {0}", warpList));
}
}
@@ -123,6 +123,6 @@ public class Commandwarp extends EssentialsCommand
user.getTeleport().warp(name, charge, TeleportCause.COMMAND);
return;
}
- throw new Exception(_("You do not have Permission to use that warp."));
+ throw new Exception(_("§4You do not have Permission to use that warp."));
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandweather.java b/Essentials/src/net/ess3/commands/Commandweather.java
index 252771740..dd222ee17 100644
--- a/Essentials/src/net/ess3/commands/Commandweather.java
+++ b/Essentials/src/net/ess3/commands/Commandweather.java
@@ -25,13 +25,13 @@ public class Commandweather extends EssentialsCommand
world.setStorm(isStorm ? true : false);
world.setWeatherDuration(Integer.parseInt(args[1]) * 20);
user.sendMessage(
- isStorm ? _("You set the weather to storm in {0} for {1} seconds.", world.getName(), args[1]) : _("You set the weather to sun in {0} for {1} seconds.", world.getName(), args[1]));
+ isStorm ? _("§6You set the weather to §cstorm§6 in§c {0} §6for {1} seconds.", world.getName(), args[1]) : _("§6You set the weather to §csun§6 in§c {0} §6for {1} seconds.", world.getName(), args[1]));
}
else
{
world.setStorm(isStorm ? true : false);
user.sendMessage(
- isStorm ? _("You set the weather to storm in {0}.", world.getName()) : _("You set the weather to sun in {0}.", world.getName()));
+ isStorm ? _("§6You set the weather to §cstorm§6 in§c {0}§6.", world.getName()) : _("§6You set the weather to §csun§6 in§c {0}§6.", world.getName()));
}
}
@@ -55,13 +55,13 @@ public class Commandweather extends EssentialsCommand
world.setStorm(isStorm ? true : false);
world.setWeatherDuration(Integer.parseInt(args[2]) * 20);
sender.sendMessage(
- isStorm ? _("You set the weather to storm in {0} for {1} seconds.", world.getName(), args[2]) : _("You set the weather to sun in {0} for {1} seconds.", world.getName(), args[2]));
+ isStorm ? _("§6You set the weather to §cstorm§6 in§c {0} §6for {1} seconds.", world.getName(), args[2]) : _("§6You set the weather to §csun§6 in§c {0} §6for {1} seconds.", world.getName(), args[2]));
}
else
{
world.setStorm(isStorm ? true : false);
sender.sendMessage(
- isStorm ? _("You set the weather to storm in {0}.", world.getName()) : _("You set the weather to sun in {0}.", world.getName()));
+ isStorm ? _("§6You set the weather to §cstorm§6 in§c {0}§6.", world.getName()) : _("§6You set the weather to §csun§6 in§c {0}§6.", world.getName()));
}
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandwhois.java b/Essentials/src/net/ess3/commands/Commandwhois.java
index 2f9df924a..650fd8024 100644
--- a/Essentials/src/net/ess3/commands/Commandwhois.java
+++ b/Essentials/src/net/ess3/commands/Commandwhois.java
@@ -55,38 +55,38 @@ public class Commandwhois extends EssentialsCommand
}
final Player player = user.getPlayer();
foundPlayer = true;
- sender.sendMessage(_(" ", user.getName()));
- sender.sendMessage(_("{0} is {1}", player.getDisplayName(), user.getName()));
- sender.sendMessage(_(" - Health: {0}/20", player.getHealth()));
- sender.sendMessage(_(" - Exp: {0} (Level {1})", SetExpFix.getTotalExperience(player), player.getLevel()));
+ sender.sendMessage(_("§6 ====== WhoIs:§c {0} §6======", user.getName()));
+ sender.sendMessage(_("whoisIs", player.getDisplayName(), user.getName()));
+ sender.sendMessage(_("§6 - Health:§r {0}/20", player.getHealth()));
+ sender.sendMessage(_("§6 - Exp:§r {0} (Level {1})", SetExpFix.getTotalExperience(player), player.getLevel()));
sender.sendMessage(
_(
"whoisLocation", player.getLocation().getWorld().getName(), player.getLocation().getBlockX(), player.getLocation().getBlockY(),
player.getLocation().getBlockZ()));
- sender.sendMessage(_(" - Money: {0}", FormatUtil.displayCurrency(user.getMoney(), ess)));
- sender.sendMessage(_(" - IP Address: {0}", player.getAddress().getAddress().toString()));
+ sender.sendMessage(_("§6 - Money:§r {0}", FormatUtil.displayCurrency(user.getMoney(), ess)));
+ sender.sendMessage(_("§6 - IP Address:§r {0}", player.getAddress().getAddress().toString()));
final String location = userData.getGeolocation();
if (location != null && Permissions.GEOIP_SHOW.isAuthorized(sender))
{
- sender.sendMessage(_(" - Location: {0}", location));
+ sender.sendMessage(_("§6 - Location:§r {0}", location));
}
- sender.sendMessage(_(" - Gamemode: {0}", _(player.getGameMode().toString().toLowerCase(Locale.ENGLISH))));
- sender.sendMessage(_(" - God mode: {0}", (user.isGodModeEnabled() ? _("true") : _("false"))));
- sender.sendMessage(_("whoisOP", (user.isOp() ? _("true") : _("false"))));
- sender.sendMessage(_(" - Fly mode: {0} ({1})", player.getAllowFlight() ? _("true") : _("false"), player.isFlying() ? _("flying") : _("not flying")));
- sender.sendMessage(_(" - AFK: {0}", (userData.isAfk() ? _("true") : _("false"))));
+ sender.sendMessage(_("§6 - Gamemode:§r {0}", _(player.getGameMode().toString().toLowerCase(Locale.ENGLISH))));
+ sender.sendMessage(_("§6 - God mode:§r {0}", (user.isGodModeEnabled() ? _("§atrue§r") : _("§4false§r"))));
+ sender.sendMessage(_("whoisOP", (user.isOp() ? _("§atrue§r") : _("§4false§r"))));
+ sender.sendMessage(_("§6 - Fly mode:§r {0} ({1})", player.getAllowFlight() ? _("§atrue§r") : _("§4false§r"), player.isFlying() ? _("flying") : _("not flying")));
+ sender.sendMessage(_("§6 - AFK:§r {0}", (userData.isAfk() ? _("§atrue§r") : _("§4false§r"))));
sender.sendMessage(
_(
"whoisJail", (userData.isJailed() ? user.getTimestamp(UserData.TimestampType.JAIL) > 0 ? DateUtil.formatDateDiff(
- user.getTimestamp(UserData.TimestampType.JAIL)) : _("true") : _("false"))));
+ user.getTimestamp(UserData.TimestampType.JAIL)) : _("§atrue§r") : _("§4false§r"))));
sender.sendMessage(
_(
"whoisMute", (userData.isMuted() ? user.getTimestamp(UserData.TimestampType.MUTE) > 0 ? DateUtil.formatDateDiff(
- user.getTimestamp(UserData.TimestampType.MUTE)) : _("true") : _("false"))));
+ user.getTimestamp(UserData.TimestampType.MUTE)) : _("§atrue§r") : _("§4false§r"))));
if (!foundPlayer)
{
- throw new NoSuchFieldException(_("Player not found."));
+ throw new NoSuchFieldException(_("§4Player not found."));
}
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandworld.java b/Essentials/src/net/ess3/commands/Commandworld.java
index 6458240bd..e12b490e7 100644
--- a/Essentials/src/net/ess3/commands/Commandworld.java
+++ b/Essentials/src/net/ess3/commands/Commandworld.java
@@ -43,9 +43,9 @@ public class Commandworld extends EssentialsCommand
world = ess.getWorld(getFinalArg(args, 0));
if (world == null)
{
- user.sendMessage(_("Invalid world."));
- user.sendMessage(_("Possible worlds are the numbers 0 through {0}.", server.getWorlds().size() - 1));
- user.sendMessage(_("You can also type the name of a specific world."));
+ user.sendMessage(_("§4Invalid world."));
+ user.sendMessage(_("§6Possible worlds are the numbers 0 through {0}.", server.getWorlds().size() - 1));
+ user.sendMessage(_("§6You can also type the name of a specific world."));
throw new NoChargeException();
}
}
diff --git a/Essentials/src/net/ess3/commands/Commandworth.java b/Essentials/src/net/ess3/commands/Commandworth.java
index 9c9c2afac..e7f99a6de 100644
--- a/Essentials/src/net/ess3/commands/Commandworth.java
+++ b/Essentials/src/net/ess3/commands/Commandworth.java
@@ -38,7 +38,7 @@ public class Commandworth extends EssentialsCommand
final double worth = ess.getWorth().getPrice(iStack);
if (Double.isNaN(worth))
{
- throw new Exception(_("That item cannot be sold to the server."));
+ throw new Exception(_("§4That item cannot be sold to the server."));
}
user.sendMessage(
@@ -76,7 +76,7 @@ public class Commandworth extends EssentialsCommand
final double worth = ess.getWorth().getPrice(iStack);
if (Double.isNaN(worth))
{
- throw new Exception(_("That item cannot be sold to the server."));
+ throw new Exception(_("§4That item cannot be sold to the server."));
}
sender.sendMessage(
diff --git a/Essentials/src/net/ess3/commands/EssentialsCommand.java b/Essentials/src/net/ess3/commands/EssentialsCommand.java
index 1d4a8c877..d12d7b391 100644
--- a/Essentials/src/net/ess3/commands/EssentialsCommand.java
+++ b/Essentials/src/net/ess3/commands/EssentialsCommand.java
@@ -53,7 +53,7 @@ public abstract class EssentialsCommand extends AbstractSuperpermsPermission imp
protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
{
- throw new Exception(_("Only in-game players can use {0}.", commandName));
+ throw new Exception(_("§4Only in-game players can use {0}.", commandName));
}
@Override
diff --git a/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java b/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java
index f2bb367c8..f56ef2168 100644
--- a/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java
+++ b/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java
@@ -105,8 +105,8 @@ public class EssentialsCommandHandler implements ICommandHandler, TabExecutor
}
catch (Exception ex)
{
- sender.sendMessage(_("Command {0} is improperly loaded.", commandName));
- LOGGER.log(Level.SEVERE, _("Command {0} is improperly loaded.", commandName), ex);
+ sender.sendMessage(_("§4Command {0} is improperly loaded.", commandName));
+ LOGGER.log(Level.SEVERE, _("§4Command {0} is improperly loaded.", commandName), ex);
return true;
}
}
@@ -114,8 +114,8 @@ public class EssentialsCommandHandler implements ICommandHandler, TabExecutor
// Check authorization
if (sender != null && !cmd.isAuthorized(sender))
{
- LOGGER.log(Level.WARNING, _("{0} was denied access to command.", sender.getName()));
- sender.sendMessage(_("You do not have access to that command."));
+ LOGGER.log(Level.WARNING, _("§c{0} §4was denied access to command.", sender.getName()));
+ sender.sendMessage(_("§4You do not have access to that command."));
return true;
}
@@ -236,8 +236,8 @@ public class EssentialsCommandHandler implements ICommandHandler, TabExecutor
}
catch (Exception ex)
{
- sender.sendMessage(_("Command {0} is improperly loaded.", commandName));
- LOGGER.log(Level.SEVERE, _("Command {0} is improperly loaded.", commandName), ex);
+ sender.sendMessage(_("§4Command {0} is improperly loaded.", commandName));
+ LOGGER.log(Level.SEVERE, _("§4Command {0} is improperly loaded.", commandName), ex);
return null;
}
}
@@ -245,8 +245,8 @@ public class EssentialsCommandHandler implements ICommandHandler, TabExecutor
// Check authorization
if (sender != null && !cmd.isAuthorized(sender))
{
- LOGGER.log(Level.WARNING, _("{0} was denied access to command.", sender.getName()));
- sender.sendMessage(_("You do not have access to that command."));
+ LOGGER.log(Level.WARNING, _("§c{0} §4was denied access to command.", sender.getName()));
+ sender.sendMessage(_("§4You do not have access to that command."));
return null;
}
@@ -287,7 +287,7 @@ public class EssentialsCommandHandler implements ICommandHandler, TabExecutor
@Override
public void showCommandError(final CommandSender sender, final String commandLabel, final Throwable exception)
{
- sender.sendMessage(_("Error: {0}", exception.getMessage()));
+ sender.sendMessage(_("§cError:§4 {0}", exception.getMessage()));
if (ess.getSettings().isDebug())
{
LOGGER.log(Level.WARNING, _("Error calling command /{0}", commandLabel), exception);
diff --git a/Essentials/src/net/ess3/commands/WarpNotFoundException.java b/Essentials/src/net/ess3/commands/WarpNotFoundException.java
index 21971542e..d2580dc12 100644
--- a/Essentials/src/net/ess3/commands/WarpNotFoundException.java
+++ b/Essentials/src/net/ess3/commands/WarpNotFoundException.java
@@ -9,7 +9,7 @@ public class WarpNotFoundException extends Exception
public WarpNotFoundException()
{
- super(_("That warp does not exist."));
+ super(_("§4That warp does not exist."));
}
public WarpNotFoundException(String message)
diff --git a/Essentials/src/net/ess3/economy/Trade.java b/Essentials/src/net/ess3/economy/Trade.java
index 741d80eeb..5d9d84bd9 100644
--- a/Essentials/src/net/ess3/economy/Trade.java
+++ b/Essentials/src/net/ess3/economy/Trade.java
@@ -68,24 +68,24 @@ public class Trade
{
if (getMoney() != null && getMoney() > 0 && !Permissions.ECO_LOAN.isAuthorized(user) && !user.canAfford(getMoney()))
{
- throw new ChargeException(_("You do not have sufficient funds."));
+ throw new ChargeException(_("§4You do not have sufficient funds."));
}
if (getItemStack() != null && !user.getPlayer().getInventory().containsAtLeast(itemStack, itemStack.getAmount()))
{
throw new ChargeException(
- _("You do not have {0}x {1}.", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")));
+ _("§4You do not have {0}x {1}.", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")));
}
if (command != null && !command.isEmpty() && 0 < getCommandCost(user) && !Permissions.ECO_LOAN.isAuthorized(user))
{
- throw new ChargeException(_("You do not have sufficient funds."));
+ throw new ChargeException(_("§4You do not have sufficient funds."));
}
if (exp != null && exp > 0 && user.getPlayer().getTotalExperience() < exp)
{
- throw new ChargeException(_("You do not have enough experience."));
+ throw new ChargeException(_("§4You do not have enough experience."));
}
}
@@ -146,7 +146,7 @@ public class Trade
{
if (!user.canAfford(getMoney()) && getMoney() > 0)
{
- throw new ChargeException(_("You do not have sufficient funds."));
+ throw new ChargeException(_("§4You do not have sufficient funds."));
}
user.takeMoney(getMoney());
}
@@ -155,7 +155,7 @@ public class Trade
if (!user.getPlayer().getInventory().containsAtLeast(itemStack, itemStack.getAmount()))
{
throw new ChargeException(
- _("You do not have {0}x {1}.", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")));
+ _("§4You do not have {0}x {1}.", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")));
}
user.getPlayer().getInventory().removeItem(getItemStack());
user.getPlayer().updateInventory();
@@ -167,7 +167,7 @@ public class Trade
final double cost = settings.getData().getEconomy().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command);
if (!user.canAfford(cost) && cost > 0)
{
- throw new ChargeException(_("You do not have sufficient funds."));
+ throw new ChargeException(_("§4You do not have sufficient funds."));
}
user.takeMoney(cost);
}
@@ -176,7 +176,7 @@ public class Trade
final int experience = user.getPlayer().getTotalExperience();
if (experience < getExperience() && getExperience() > 0)
{
- throw new ChargeException(_("You do not have enough experience."));
+ throw new ChargeException(_("§4You do not have enough experience."));
}
user.getPlayer().setTotalExperience(experience - getExperience());
}
diff --git a/Essentials/src/net/ess3/listener/EssentialsEntityListener.java b/Essentials/src/net/ess3/listener/EssentialsEntityListener.java
index 17adee614..e6208839e 100644
--- a/Essentials/src/net/ess3/listener/EssentialsEntityListener.java
+++ b/Essentials/src/net/ess3/listener/EssentialsEntityListener.java
@@ -127,7 +127,7 @@ public class EssentialsEntityListener implements Listener
if (Permissions.BACK_ONDEATH.isAuthorized(user) && !settings.getData().getCommands().isDisabled("back"))
{
user.setLastLocation();
- user.sendMessage(_("Use the /back command to return to your death point."));
+ user.sendMessage(_("§6Use the /back command to return to your death point."));
}
if (!settings.getData().getGeneral().isDeathMessages())
{
diff --git a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java
index 0931ce96d..3a009d650 100644
--- a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java
+++ b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java
@@ -71,7 +71,7 @@ public class EssentialsPlayerListener implements Listener
if (user.getData().isMuted())
{
event.setCancelled(true);
- user.sendMessage(_("You have been muted!"));
+ user.sendMessage(_("§6You have been muted!"));
LOGGER.info(_("{0} tried to speak, but is muted.", user.getName()));
}
final Iterator<Player> it = event.getRecipients().iterator();
@@ -157,7 +157,7 @@ public class EssentialsPlayerListener implements Listener
{
user.getData().clearAllPowertools();
user.queueSave();
- user.sendMessage(_("All powertool commands have been cleared."));
+ user.sendMessage(_("§6All powertool commands have been cleared."));
}
}
@@ -243,11 +243,11 @@ public class EssentialsPlayerListener implements Listener
final List<String> mail = user.getData().getMails();
if (mail == null || mail.isEmpty())
{
- user.sendMessage(_("You have no new mail."));
+ user.sendMessage(_("§6You have no new mail."));
}
else
{
- user.sendMessage(_("You have {0} messages! Type /mail read to view your mail.", mail.size()));
+ user.sendMessage(_("§6You have§c {0} §6messages! Type §c/mail read§6 to view your mail.", mail.size()));
}
}*/
}
@@ -319,7 +319,7 @@ public class EssentialsPlayerListener implements Listener
final List<String> mail = user.getMails();
if (mail.isEmpty())
{
- final String msg = _("You have no new mail.");
+ final String msg = _("§6You have no new mail.");
if (!msg.isEmpty())
{
user.sendMessage(msg);
@@ -327,7 +327,7 @@ public class EssentialsPlayerListener implements Listener
}
else
{
- user.sendMessage(_("You have {0} messages! Type /mail read to view your mail.", mail.size()));
+ user.sendMessage(_("§6You have§c {0} §6messages! Type §c/mail read§6 to view your mail.", mail.size()));
}
}
if(Permissions.FLY_SAFELOGIN.isAuthorized(user))
@@ -346,7 +346,7 @@ public class EssentialsPlayerListener implements Listener
{
user.getPlayer().setAllowFlight(true);
user.getPlayer().setFlying(true);
- user.sendMessage(_("Set fly mode {0} for {1}.", _("enabled"), user.getPlayer().getDisplayName()));
+ user.sendMessage(_("§6Set fly mode§c {0} §6for {1}§6.", _("enabled"), user.getPlayer().getDisplayName()));
}
}
}
@@ -489,7 +489,7 @@ public class EssentialsPlayerListener implements Listener
{
if (user.getData().isGodmode())
{
- user.sendMessage(_("Warning! God mode in this world disabled."));
+ user.sendMessage(_("§4Warning! God mode in this world disabled."));
}
}
if (settings.getData().getCommands().getTeleport().isCancelRequestsOnWorldChange())
@@ -504,7 +504,7 @@ public class EssentialsPlayerListener implements Listener
{
user.getData().clearAllPowertools();
user.queueSave();
- user.sendMessage(_("All powertool commands have been cleared."));
+ user.sendMessage(_("§6All powertool commands have been cleared."));
}
}
diff --git a/Essentials/src/net/ess3/settings/SpawnsHolder.java b/Essentials/src/net/ess3/settings/SpawnsHolder.java
index 1550785c3..666c808fa 100644
--- a/Essentials/src/net/ess3/settings/SpawnsHolder.java
+++ b/Essentials/src/net/ess3/settings/SpawnsHolder.java
@@ -262,7 +262,7 @@ public class SpawnsHolder extends AsyncStorageObjectHolder<Spawns>
}
catch (Exception ex)
{
- Bukkit.getLogger().log(Level.WARNING, _("Failed to teleport new player!"), ex);
+ Bukkit.getLogger().log(Level.WARNING, _("§4Failed to teleport new player!"), ex);
}
}
}
diff --git a/Essentials/src/net/ess3/user/PlayerNotFoundException.java b/Essentials/src/net/ess3/user/PlayerNotFoundException.java
index e3e67e6e7..a61757d95 100644
--- a/Essentials/src/net/ess3/user/PlayerNotFoundException.java
+++ b/Essentials/src/net/ess3/user/PlayerNotFoundException.java
@@ -10,6 +10,6 @@ public class PlayerNotFoundException extends Exception
public PlayerNotFoundException()
{
- super(_("Player not found."));
+ super(_("§4Player not found."));
}
}
diff --git a/Essentials/src/net/ess3/user/User.java b/Essentials/src/net/ess3/user/User.java
index dc2cbeac6..23d34a9d9 100644
--- a/Essentials/src/net/ess3/user/User.java
+++ b/Essentials/src/net/ess3/user/User.java
@@ -120,10 +120,10 @@ public class User extends UserBase implements IUser
return;
}
setMoney(getMoney() + value);
- sendMessage(_("{0} has been added to your account.", FormatUtil.displayCurrency(value, ess)));
+ sendMessage(_("§a{0} has been added to your account.", FormatUtil.displayCurrency(value, ess)));
if (initiator != null)
{
- initiator.sendMessage(_("{0} added to {1} account. New balance: {2}", FormatUtil.displayCurrency(value, ess), this.getPlayer().getDisplayName()));
+ initiator.sendMessage(_("§a{0} added to {1}§a account. New balance: {2}", FormatUtil.displayCurrency(value, ess), this.getPlayer().getDisplayName()));
}
queueSave();
}
@@ -138,13 +138,13 @@ public class User extends UserBase implements IUser
if (canAfford(value))
{
setMoney(getMoney() - value);
- receiver.setMoney(receiver.getMoney() + value);
- sendMessage(_("{0} has been sent to {1}.", FormatUtil.displayCurrency(value, ess), receiver.getPlayer().getDisplayName()));
- receiver.sendMessage(_("{0} has been received from {1}.", FormatUtil.displayCurrency(value, ess), getPlayer().getDisplayName()));
+ 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()));
}
else
{
- throw new Exception(_("You do not have sufficient funds."));
+ throw new Exception(_("§4You do not have sufficient funds."));
}
}
@@ -162,10 +162,10 @@ public class User extends UserBase implements IUser
return;
}
setMoney(getMoney() - value);
- sendMessage(_("{0} has been taken from your account.", FormatUtil.displayCurrency(value, ess)));
+ sendMessage(_("§a{0} has been taken from your account.", FormatUtil.displayCurrency(value, ess)));
if (initiator != null)
{
- initiator.sendMessage(_("{0} taken from {1} account. New balance: {2}", FormatUtil.displayCurrency(value, ess), this.getPlayer().getDisplayName()));
+ initiator.sendMessage(_("§a{0} taken from {1}§a account. New balance: {2}.", FormatUtil.displayCurrency(value, ess), this.getPlayer().getDisplayName()));
}
}
@@ -328,7 +328,7 @@ public class User extends UserBase implements IUser
setTimestamp(UserData.TimestampType.JAIL, 0);
getData().setJailed(false);
- sendMessage(_("You have been released."));
+ sendMessage(_("§6You have been released."));
getData().setJail(null);
queueSave();
@@ -351,7 +351,7 @@ public class User extends UserBase implements IUser
if (getTimestamp(UserData.TimestampType.MUTE) > 0 && getTimestamp(UserData.TimestampType.MUTE) < currentTime && getData().isMuted())
{
setTimestamp(UserData.TimestampType.MUTE, 0);
- sendMessage(_("You can now talk again."));
+ sendMessage(_("§6You can now talk again."));
getData().setMuted(false);
queueSave();
return true;
@@ -382,7 +382,7 @@ public class User extends UserBase implements IUser
queueSave();
if (broadcast)
{
- ess.broadcastMessage(this, _("{0} is no longer AFK.", getPlayer().getDisplayName()));
+ ess.broadcastMessage(this, _("§5{0} §5is no longer AFK.", getPlayer().getDisplayName()));
}
}
lastActivity = System.currentTimeMillis();
@@ -406,7 +406,7 @@ public class User extends UserBase implements IUser
{
if (Permissions.KICK_NOTIFY.isAuthorized(player))
{
- player.sendMessage(_("Player {0} kicked {1} for {2}.", Console.NAME, getName(), kickReason));
+ player.sendMessage(_("§6Player§c {0} §6kicked {1} for {2}.", Console.NAME, getName(), kickReason));
}
}
}
@@ -415,7 +415,7 @@ public class User extends UserBase implements IUser
if (!getData().isAfk() && autoafk > 0 && lastActivity + autoafk * 1000 < System.currentTimeMillis() && Permissions.AFK_AUTO.isAuthorized(this))
{
setAfk(true);
- ess.broadcastMessage(this, _("{0} is now AFK.", getPlayer().getDisplayName()));
+ ess.broadcastMessage(this, _("§5{0} §5is now AFK.", getPlayer().getDisplayName()));
}
}
diff --git a/Essentials/src/net/ess3/utils/DescParseTickFormat.java b/Essentials/src/net/ess3/utils/DescParseTickFormat.java
index e8b37fc42..66912bb03 100644
--- a/Essentials/src/net/ess3/utils/DescParseTickFormat.java
+++ b/Essentials/src/net/ess3/utils/DescParseTickFormat.java
@@ -228,7 +228,7 @@ public final class DescParseTickFormat
// --------------------------------------------
public static String format(final long ticks)
{
- return _("{0} or {1} or {2}", format24(ticks), format12(ticks), formatTicks(ticks));
+ return _("§c{0}§6 or §c{1}§6 or §c{2}§6.", format24(ticks), format12(ticks), formatTicks(ticks));
}
public static String formatTicks(final long ticks)
diff --git a/Essentials/src/net/ess3/utils/LocationUtil.java b/Essentials/src/net/ess3/utils/LocationUtil.java
index 65b08a127..8455f4864 100644
--- a/Essentials/src/net/ess3/utils/LocationUtil.java
+++ b/Essentials/src/net/ess3/utils/LocationUtil.java
@@ -173,7 +173,7 @@ public class LocationUtil
y = world.getHighestBlockYAt(x, z);
if (x - 48 > loc.getBlockX())
{
- throw new Exception(_("Hole in floor!"));
+ throw new Exception(_("§4Hole in floor!"));
}
}
}
diff --git a/Essentials/src/net/ess3/utils/textreader/HelpInput.java b/Essentials/src/net/ess3/utils/textreader/HelpInput.java
index b3e4f9887..8044a5807 100644
--- a/Essentials/src/net/ess3/utils/textreader/HelpInput.java
+++ b/Essentials/src/net/ess3/utils/textreader/HelpInput.java
@@ -32,7 +32,7 @@ public class HelpInput implements IText
String pluginNameLow = "";
if (!match.equalsIgnoreCase(""))
{
- lines.add(_("Commands matching \"{0}\":", match));
+ lines.add(_("§6Commands matching \"§c{0}§6\":", match));
}
for (Plugin p : ess.getServer().getPluginManager().getPlugins())
@@ -48,7 +48,7 @@ public class HelpInput implements IText
{
lines.clear();
newLines.clear();
- lines.add(_("Commands from {0}:", p.getDescription().getName()));
+ lines.add(_("§6Commands from {0}:", p.getDescription().getName()));
}
for (Map.Entry<String, Map<String, Object>> k : cmds.entrySet())
@@ -67,7 +67,7 @@ public class HelpInput implements IText
final String node = "essentials." + k.getKey();
if (!settings.getData().getCommands().isDisabled(k.getKey()) && user.hasPermission(node))
{
- pluginLines.add(_("/{0}: {1}", k.getKey(), k.getValue().get(DESCRIPTION)));
+ pluginLines.add(_("§6/{0}§r: {1}", k.getKey(), k.getValue().get(DESCRIPTION)));
}
}
else
@@ -86,7 +86,7 @@ public class HelpInput implements IText
}
if (Permissions.HELP.isAuthorized(user, pluginNameLow))
{
- pluginLines.add(_("/{0}: {1}", k.getKey(), value.get(DESCRIPTION)));
+ pluginLines.add(_("§6/{0}§r: {1}", k.getKey(), value.get(DESCRIPTION)));
}
else if (permissions instanceof List && !((List<Object>)permissions).isEmpty())
{
@@ -101,21 +101,21 @@ public class HelpInput implements IText
}
if (enabled)
{
- pluginLines.add(_("/{0}: {1}", k.getKey(), value.get(DESCRIPTION)));
+ pluginLines.add(_("§6/{0}§r: {1}", k.getKey(), value.get(DESCRIPTION)));
}
}
else if (permissions instanceof String && !"".equals(permissions))
{
if (user.hasPermission(permissions.toString()))
{
- pluginLines.add(_("/{0}: {1}", k.getKey(), value.get(DESCRIPTION)));
+ pluginLines.add(_("§6/{0}§r: {1}", k.getKey(), value.get(DESCRIPTION)));
}
}
else
{
if (!settings.getData().getCommands().getHelp().isHidePermissionlessCommands())
{
- pluginLines.add(_("/{0}: {1}", k.getKey(), value.get(DESCRIPTION)));
+ pluginLines.add(_("§6/{0}§r: {1}", k.getKey(), value.get(DESCRIPTION)));
}
}
}
@@ -135,7 +135,7 @@ public class HelpInput implements IText
}
if (match.equalsIgnoreCase(""))
{
- lines.add(_("{0}: Plugin Help: /help {1}", pluginName, pluginNameLow));
+ lines.add(_("§4{0}§r: Plugin Help: /help {1}", pluginName, pluginNameLow));
}
}
}
diff --git a/Essentials/src/net/ess3/utils/textreader/TextPager.java b/Essentials/src/net/ess3/utils/textreader/TextPager.java
index 53d32f68a..eea8f30e7 100644
--- a/Essentials/src/net/ess3/utils/textreader/TextPager.java
+++ b/Essentials/src/net/ess3/utils/textreader/TextPager.java
@@ -66,7 +66,7 @@ public class TextPager
{
content.append(I18n.capitalCase(commandName));
}
- sender.sendMessage(_(" ---- {2} -- Page {0}/{1} ----", page, pages, content));
+ sender.sendMessage(_("§e ---- §6{2} §e--§6 Page §c{0}§6/§c{1} §e----", page, pages, content));
}
for (int i = start; i < lines.size() && i < start + (onePage ? 20 : 9); i++)
{
@@ -74,7 +74,7 @@ public class TextPager
}
if (!onePage && page < pages)
{
- sender.sendMessage(_("Type /{0} {1} to read the next page.", commandName, page + 1));
+ sender.sendMessage(_("§6Type§c /{0} {1} §6to read the next page.", commandName, page + 1));
}
return;
}
@@ -133,7 +133,7 @@ public class TextPager
if (!onePage)
{
- sender.sendMessage(_(" ---- {2} -- Page {0}/{1} ----", page, pages, I18n.capitalCase(commandName)));
+ sender.sendMessage(_("§e ---- §6{2} §e--§6 Page §c{0}§6/§c{1} §e----", page, pages, I18n.capitalCase(commandName)));
}
for (int i = start; i < end && i < start + (onePage ? 20 : 9); i++)
{
@@ -141,7 +141,7 @@ public class TextPager
}
if (!onePage && page < pages)
{
- sender.sendMessage(_("Type /{0} {1} to read the next page.", commandName, page + 1));
+ sender.sendMessage(_("§6Type§c /{0} {1} §6to read the next page.", commandName, page + 1));
}
return;
}
@@ -185,7 +185,7 @@ public class TextPager
final int pages = (chapterend - chapterstart) / 9 + ((chapterend - chapterstart) % 9 > 0 ? 1 : 0);
if (!onePage)
{
- sender.sendMessage(_("Chapter {0}, page {1} of {2}:", pageStr, page, pages));
+ sender.sendMessage(_("§6Chapter {0}, page §c{1}§6 of §c{2}§6:", pageStr, page, pages));
}
for (int i = start; i < chapterend && i < start + (onePage ? 20 : 9); i++)
{
@@ -193,7 +193,7 @@ public class TextPager
}
if (!onePage && page < pages)
{
- sender.sendMessage(_("Type /{0} {1} to read the next page.", commandName, pageStr + " " + (page + 1)));
+ sender.sendMessage(_("§6Type§c /{0} {1} §6to read the next page.", commandName, pageStr + " " + (page + 1)));
}
}
}
diff --git a/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java b/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java
index ea43127d8..96a7eb124 100644
--- a/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java
+++ b/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java
@@ -175,7 +175,7 @@ public class EssentialsConf extends YamlConfiguration
istr = resourceClass.getResourceAsStream(templateName);
if (istr == null)
{
- LOGGER.log(Level.SEVERE, _("Could not find template {0}", templateName));
+ LOGGER.log(Level.SEVERE, _("§4Could not find template {0}", templateName));
return;
}
ostr = new FileOutputStream(configFile);
diff --git a/Essentials2Compat/src/com/earth2me/essentials/Settings.java b/Essentials2Compat/src/com/earth2me/essentials/Settings.java
index f8062e886..cda4a91c5 100644
--- a/Essentials2Compat/src/com/earth2me/essentials/Settings.java
+++ b/Essentials2Compat/src/com/earth2me/essentials/Settings.java
@@ -446,7 +446,7 @@ public final class Settings implements ISettings
}
catch (Exception ex)
{
- logger.log(Level.SEVERE, _("Unknown item {0} in {1} list.", itemName, "item-spawn-blacklist"));
+ logger.log(Level.SEVERE, _("§4Unknown item {0} in {1} list.", itemName, "item-spawn-blacklist"));
}
}
return epItemSpwn;
@@ -483,7 +483,7 @@ public final class Settings implements ISettings
}
catch (Exception ex)
{
- logger.log(Level.SEVERE, _("Unknown item {0} in {1} list.", signName, "enabledSigns"));
+ logger.log(Level.SEVERE, _("§4Unknown item {0} in {1} list.", signName, "enabledSigns"));
continue;
}
signsEnabled = true;
@@ -579,7 +579,7 @@ public final class Settings implements ISettings
}
catch (Exception ex)
{
- logger.log(Level.SEVERE, _("Unknown item {0} in {1} list.", itemName, configName));
+ logger.log(Level.SEVERE, _("§4Unknown item {0} in {1} list.", itemName, configName));
}
}
return list;
diff --git a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java
index 313b13e1d..ef7d1c33d 100644
--- a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java
+++ b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java
@@ -47,7 +47,7 @@ public class EssentialsAntiBuildListener implements Listener
{
if (antib.getSettings().getData().isWarnOnBuildDisallow())
{
- user.sendMessage(_("You are not permitted to place {0} here.", type.toString()));
+ user.sendMessage(_("§4You are not permitted to place§c {0} §4here.", type.toString()));
}
event.setCancelled(true);
return;
@@ -57,7 +57,7 @@ public class EssentialsAntiBuildListener implements Listener
{
if (antib.getSettings().getData().isWarnOnBuildDisallow())
{
- user.sendMessage(_("You are not permitted to place {0} here.", type.toString()));
+ user.sendMessage(_("§4You are not permitted to place§c {0} §4here.", type.toString()));
}
event.setCancelled(true);
return;
@@ -81,7 +81,7 @@ public class EssentialsAntiBuildListener implements Listener
{
if (antib.getSettings().getData().isWarnOnBuildDisallow())
{
- user.sendMessage(_("You are not permitted to break {0} blocks here.", type.toString()));
+ user.sendMessage(_("§4You are not permitted to break§c {0} §4blocks here.", type.toString()));
}
event.setCancelled(true);
return;
@@ -91,7 +91,7 @@ public class EssentialsAntiBuildListener implements Listener
{
if (antib.getSettings().getData().isWarnOnBuildDisallow())
{
- user.sendMessage(_("You are not permitted to break {0} blocks here.", type.toString()));
+ user.sendMessage(_("§4You are not permitted to break§c {0} §4blocks here.", type.toString()));
}
event.setCancelled(true);
return;
@@ -119,7 +119,7 @@ public class EssentialsAntiBuildListener implements Listener
{
if (warn)
{
- user.sendMessage(_("You are not permitted to break {0} blocks here.", Material.PAINTING.toString()));
+ user.sendMessage(_("§4You are not permitted to break§c {0} §4blocks here.", Material.PAINTING.toString()));
}
event.setCancelled(true);
}
@@ -127,7 +127,7 @@ public class EssentialsAntiBuildListener implements Listener
{
if (warn)
{
- user.sendMessage(_("You are not permitted to break {0} blocks here.", Material.ITEM_FRAME.toString()));
+ user.sendMessage(_("§4You are not permitted to break§c {0} §4blocks here.", Material.ITEM_FRAME.toString()));
}
event.setCancelled(true);
}
@@ -173,7 +173,7 @@ public class EssentialsAntiBuildListener implements Listener
{
if (antib.getSettings().getData().isWarnOnBuildDisallow())
{
- user.sendMessage(_("You are not permitted to use {0}.", item.getType().toString()));
+ user.sendMessage(_("§4You are not permitted to use§c {0}§4.", item.getType().toString()));
}
event.setCancelled(true);
return;
@@ -191,7 +191,7 @@ public class EssentialsAntiBuildListener implements Listener
event.setCancelled(true);
if (antib.getSettings().getData().isWarnOnBuildDisallow())
{
- user.sendMessage(_("You are not permitted to use {0}.", item.getType().toString()));
+ user.sendMessage(_("§4You are not permitted to use§c {0}§4.", item.getType().toString()));
}
return;
}
@@ -200,7 +200,7 @@ public class EssentialsAntiBuildListener implements Listener
event.setCancelled(true);
if (antib.getSettings().getData().isWarnOnBuildDisallow())
{
- user.sendMessage(_("You are not permitted to interact with {0}.", event.getClickedBlock().getType().toString()));
+ user.sendMessage(_("§4You are not permitted to interact with§c {0}§4.", event.getClickedBlock().getType().toString()));
}
}
}
@@ -223,7 +223,7 @@ public class EssentialsAntiBuildListener implements Listener
event.setCancelled(true);
if (antib.getSettings().getData().isWarnOnBuildDisallow())
{
- user.sendMessage(_("You are not permitted to create {0}.", item.getType().toString()));
+ user.sendMessage(_("§4You are not permitted to create§c {0}§4.", item.getType().toString()));
}
}
}
@@ -265,7 +265,7 @@ public class EssentialsAntiBuildListener implements Listener
user.getPlayer().updateInventory();
if (antib.getSettings().getData().isWarnOnBuildDisallow())
{
- user.sendMessage(_("You are not permitted to drop {0}.", item.getType().toString()));
+ user.sendMessage(_("§4You are not permitted to drop§c {0}§4.", item.getType().toString()));
}
}
}
diff --git a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsConnect.java b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsConnect.java
index 99e83976d..b76152916 100644
--- a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsConnect.java
+++ b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsConnect.java
@@ -20,7 +20,7 @@ public class EssentialsConnect
{
if (!essProtect.getDescription().getVersion().equals(essPlugin.getDescription().getVersion()))
{
- LOGGER.log(Level.WARNING, _("Version mismatch! Please update all Essentials jars to the same version."));
+ LOGGER.log(Level.WARNING, _("§4Version mismatch! Please update all Essentials jars to the same version."));
}
ess = ((BukkitPlugin)essPlugin).getEssentials();
antib = (IAntiBuild)essProtect;
diff --git a/EssentialsChat/src/net/ess3/chat/EssentialsChat.java b/EssentialsChat/src/net/ess3/chat/EssentialsChat.java
index 1a4e1cc64..c80694d22 100644
--- a/EssentialsChat/src/net/ess3/chat/EssentialsChat.java
+++ b/EssentialsChat/src/net/ess3/chat/EssentialsChat.java
@@ -28,7 +28,7 @@ public class EssentialsChat extends JavaPlugin
final IEssentials ess = (IEssentials)plugin.getEssentials();
if (!this.getDescription().getVersion().equals(plugin.getDescription().getVersion()))
{
- LOGGER.log(Level.WARNING, _("Version mismatch! Please update all Essentials jars to the same version."));
+ LOGGER.log(Level.WARNING, _("§4Version mismatch! Please update all Essentials jars to the same version."));
}
if (!plugin.isEnabled())
{
diff --git a/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIP.java b/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIP.java
index fc0854870..ee5363c27 100644
--- a/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIP.java
+++ b/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIP.java
@@ -18,7 +18,7 @@ public class EssentialsGeoIP extends JavaPlugin
final IEssentials ess = (IEssentials)plugin.getEssentials();
if (!this.getDescription().getVersion().equals(plugin.getDescription().getVersion()))
{
- getLogger().log(Level.WARNING, _("Version mismatch! Please update all Essentials jars to the same version."));
+ getLogger().log(Level.WARNING, _("§4Version mismatch! Please update all Essentials jars to the same version."));
}
if (!plugin.isEnabled())
{
diff --git a/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java b/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java
index 857b170a0..4936ad0ab 100644
--- a/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java
+++ b/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java
@@ -94,7 +94,7 @@ public class EssentialsGeoIPPlayerListener implements Listener, IReload
}
if (Permissions.GEOIP_SHOW.isAuthorized(player))
{
- player.sendMessage(_("Player {0} comes from {1}.", player.getDisplayName(), builder.toString()));
+ player.sendMessage(_("§6Player §c{0} §6comes from §c{1}§6.", player.getDisplayName(), builder.toString()));
}
}
}
diff --git a/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java b/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java
index 358d881bb..8002a469e 100644
--- a/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java
+++ b/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java
@@ -18,7 +18,7 @@ public class EssentialsConnect
{
if (!essProtect.getDescription().getVersion().equals(essPlugin.getDescription().getVersion()))
{
- LOGGER.log(Level.WARNING, _("Version mismatch! Please update all Essentials jars to the same version."));
+ LOGGER.log(Level.WARNING, _("§4Version mismatch! Please update all Essentials jars to the same version."));
}
ess = ((BukkitPlugin)essPlugin).getEssentials();
protect = (IProtect)essProtect;
diff --git a/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java b/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java
index 67215b913..e1dd99367 100644
--- a/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java
+++ b/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java
@@ -39,7 +39,7 @@ public class EssentialsSign
// they won't change it to §1[Signname]
return true;
}
- sign.setLine(0, _("[{0}]", this.signName));
+ sign.setLine(0, _("§4[{0}]", this.signName));
try
{
final boolean ret = onSignCreate(sign, user, getUsername(user), ess);
@@ -63,7 +63,7 @@ public class EssentialsSign
public String getSuccessName()
{
- return _("[{0}]", this.signName);
+ return _("§1[{0}]", this.signName);
}
public String getTemplateName()
@@ -297,7 +297,7 @@ public class EssentialsSign
getIntegerPositive(sign.getLine(amountIndex)), item.getType().getMaxStackSize() * player.getPlayer().getInventory().getSize());
if (item.getTypeId() == 0 || amount < 1)
{
- throw new SignException(_("Quantities must be greater than 0."));
+ throw new SignException(_("§4Quantities must be greater than 0."));
}
item.setAmount(amount);
return new Trade(item, ess);
@@ -319,7 +319,7 @@ public class EssentialsSign
final int quantity = getInteger(line);
if (quantity < 1)
{
- throw new SignException(_("Quantities must be greater than 0."));
+ throw new SignException(_("§4Quantities must be greater than 0."));
}
return quantity;
}
@@ -363,7 +363,7 @@ public class EssentialsSign
final double quantity = getDouble(line);
if (Math.round(quantity * 100.0) < 1.0)
{
- throw new SignException(_("Quantities must be greater than 0."));
+ throw new SignException(_("§4Quantities must be greater than 0."));
}
return quantity;
}
@@ -399,7 +399,7 @@ public class EssentialsSign
final String[] split = line.split("[ :]+", 2);
if (split.length != 2)
{
- throw new SignException(_("Invalid charge."));
+ throw new SignException(_("§4Invalid charge."));
}
final int quantity = getIntegerPositive(split[0]);
diff --git a/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java b/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java
index ab8c5092b..1143aa022 100644
--- a/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java
+++ b/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java
@@ -26,7 +26,7 @@ public class EssentialsSignsPlugin extends JavaPlugin implements ISignsPlugin
final IEssentials ess = (IEssentials)plugin.getEssentials();
if (!this.getDescription().getVersion().equals(plugin.getDescription().getVersion()))
{
- LOGGER.log(Level.WARNING, _("Version mismatch! Please update all Essentials jars to the same version."));
+ LOGGER.log(Level.WARNING, _("§4Version mismatch! Please update all Essentials jars to the same version."));
}
if (!plugin.isEnabled())
{
diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignBalance.java b/EssentialsSigns/src/net/ess3/signs/signs/SignBalance.java
index 91d0c705e..f51cc939c 100644
--- a/EssentialsSigns/src/net/ess3/signs/signs/SignBalance.java
+++ b/EssentialsSigns/src/net/ess3/signs/signs/SignBalance.java
@@ -17,7 +17,7 @@ public class SignBalance extends EssentialsSign
@Override
protected boolean onSignInteract(final ISign sign, final IUser player, final String username, final IEssentials ess) throws SignException
{
- player.sendMessage(_("Balance: {0}", FormatUtil.displayCurrency(player.getMoney(), ess)));
+ player.sendMessage(_("§aBalance:§c {0}", FormatUtil.displayCurrency(player.getMoney(), ess)));
return true;
}
}
diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java b/EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java
index 5b169551c..1eb7f0660 100644
--- a/EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java
+++ b/EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java
@@ -26,12 +26,12 @@ public class SignEnchant extends EssentialsSign
final String[] enchantLevel = sign.getLine(2).split(":");
if (enchantLevel.length != 2)
{
- throw new SignException(_("Line {0} on sign is invalid.", 3));
+ throw new SignException(_("§4Line§c {0} §4on sign is invalid.", 3));
}
final Enchantment enchantment = Enchantments.getByName(enchantLevel[0]);
if (enchantment == null)
{
- throw new SignException(_("Enchantment not found!"));
+ throw new SignException(_(" §4Enchantment not found!"));
}
int level;
try
@@ -71,12 +71,12 @@ public class SignEnchant extends EssentialsSign
final String[] enchantLevel = sign.getLine(2).split(":");
if (enchantLevel.length != 2)
{
- throw new SignException(_("Line {0} on sign is invalid.", 3));
+ throw new SignException(_("§4Line§c {0} §4on sign is invalid.", 3));
}
final Enchantment enchantment = Enchantments.getByName(enchantLevel[0]);
if (enchantment == null)
{
- throw new SignException(_("Enchantment not found!"));
+ throw new SignException(_(" §4Enchantment not found!"));
}
int level;
try
@@ -92,11 +92,11 @@ public class SignEnchant extends EssentialsSign
if (playerHand == null || playerHand.getAmount() != 1 || (playerHand.containsEnchantment(enchantment) && playerHand.getEnchantmentLevel(
enchantment) == level))
{
- throw new SignException(_("You do not have {0}x {1}.", 1, sign.getLine(1)));
+ throw new SignException(_("§4You do not have {0}x {1}.", 1, sign.getLine(1)));
}
if (search != null && playerHand.getType() != search.getType())
{
- throw new SignException(_("You do not have {0}x {1}.", 1, search.getType().toString().toLowerCase(Locale.ENGLISH).replace('_', ' ')));
+ throw new SignException(_("§4You do not have {0}x {1}.", 1, search.getType().toString().toLowerCase(Locale.ENGLISH).replace('_', ' ')));
}
final ItemStack toEnchant = playerHand;
diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignFeed.java b/EssentialsSigns/src/net/ess3/signs/signs/SignFeed.java
index 733d67159..f659d9bf2 100644
--- a/EssentialsSigns/src/net/ess3/signs/signs/SignFeed.java
+++ b/EssentialsSigns/src/net/ess3/signs/signs/SignFeed.java
@@ -28,7 +28,7 @@ public class SignFeed extends EssentialsSign
final Trade charge = getTrade(sign, 1, ess);
charge.isAffordableFor(player);
player.getPlayer().setFoodLevel(20);
- player.sendMessage(_("Your appetite was sated."));
+ player.sendMessage(_("§6Your appetite was sated."));
charge.charge(player);
return true;
}
diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignFree.java b/EssentialsSigns/src/net/ess3/signs/signs/SignFree.java
index f9d552e02..18c384f74 100644
--- a/EssentialsSigns/src/net/ess3/signs/signs/SignFree.java
+++ b/EssentialsSigns/src/net/ess3/signs/signs/SignFree.java
@@ -30,7 +30,7 @@ public class SignFree extends EssentialsSign
final ItemStack item = getItemStack(sign.getLine(1), 1, ess);
if (item.getType() == Material.AIR)
{
- throw new SignException(_("You are not allowed to spawn the item {0}.", "Air"));
+ throw new SignException(_("§4You are not allowed to spawn the item§c {0}§4.", "Air"));
}
item.setAmount(item.getType().getMaxStackSize());
diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignGameMode.java b/EssentialsSigns/src/net/ess3/signs/signs/SignGameMode.java
index 84f1d0177..9dccf810a 100644
--- a/EssentialsSigns/src/net/ess3/signs/signs/SignGameMode.java
+++ b/EssentialsSigns/src/net/ess3/signs/signs/SignGameMode.java
@@ -39,13 +39,13 @@ public class SignGameMode extends EssentialsSign
if (mode.isEmpty())
{
- throw new SignException(_("Line {0} on sign is invalid.", 2));
+ throw new SignException(_("§4Line§c {0} §4on sign is invalid.", 2));
}
charge.isAffordableFor(player);
//TODO: this needs to be fixed
player.getPlayer().setGameMode(player.getPlayer().getGameMode() == GameMode.SURVIVAL ? GameMode.CREATIVE : GameMode.SURVIVAL);
- player.sendMessage(_("Set game mode {0} for {1}.", _(player.getPlayer().getGameMode().toString().toLowerCase(Locale.ENGLISH)), player.getPlayer().getDisplayName()));
+ player.sendMessage(_("§6Set game mode§c {0} §6for {1}§6.", _(player.getPlayer().getGameMode().toString().toLowerCase(Locale.ENGLISH)), player.getPlayer().getDisplayName()));
charge.charge(player);
return true;
}
diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignHeal.java b/EssentialsSigns/src/net/ess3/signs/signs/SignHeal.java
index 54685eefc..02ec90d5d 100644
--- a/EssentialsSigns/src/net/ess3/signs/signs/SignHeal.java
+++ b/EssentialsSigns/src/net/ess3/signs/signs/SignHeal.java
@@ -30,7 +30,7 @@ public class SignHeal extends EssentialsSign
player.getPlayer().setHealth(20);
player.getPlayer().setFoodLevel(20);
player.getPlayer().setFireTicks(0);
- player.sendMessage(_("You have been healed."));
+ player.sendMessage(_("§6You have been healed."));
charge.charge(player);
return true;
}
diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignKit.java b/EssentialsSigns/src/net/ess3/signs/signs/SignKit.java
index 75cbe6372..4cee8ab41 100644
--- a/EssentialsSigns/src/net/ess3/signs/signs/SignKit.java
+++ b/EssentialsSigns/src/net/ess3/signs/signs/SignKit.java
@@ -74,7 +74,7 @@ public class SignKit extends EssentialsSign
}
else
{
- throw new SignException(_("You need the {0} permission to use that kit.", "essentials.kits." + kitName));
+ throw new SignException(_("§4You need the §c{0}§4 permission to use that kit.", "essentials.kits." + kitName));
}
}
}
diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignMail.java b/EssentialsSigns/src/net/ess3/signs/signs/SignMail.java
index a5f5845ff..e7f9feb5d 100644
--- a/EssentialsSigns/src/net/ess3/signs/signs/SignMail.java
+++ b/EssentialsSigns/src/net/ess3/signs/signs/SignMail.java
@@ -20,14 +20,14 @@ public class SignMail extends EssentialsSign
final List<String> mail = player.getData().getMails();
if (mail == null || mail.isEmpty())
{
- player.sendMessage(_("You have no new mail."));
+ player.sendMessage(_("§6You have no new mail."));
return false;
}
for (String s : mail)
{
player.sendMessage(s);
}
- player.sendMessage(_("To mark your mail as read, type /mail clear."));
+ player.sendMessage(_("§6To mark your mail as read, type§c /mail clear."));
return true;
}
}
diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignRepair.java b/EssentialsSigns/src/net/ess3/signs/signs/SignRepair.java
index 046a92dbc..7c69c6372 100644
--- a/EssentialsSigns/src/net/ess3/signs/signs/SignRepair.java
+++ b/EssentialsSigns/src/net/ess3/signs/signs/SignRepair.java
@@ -26,7 +26,7 @@ public class SignRepair extends EssentialsSign
}
else if (!repairTarget.equalsIgnoreCase("all") && !repairTarget.equalsIgnoreCase("hand"))
{
- throw new SignException(_("Line {0} on sign is invalid.", 2));
+ throw new SignException(_("§4Line§c {0} §4on sign is invalid.", 2));
}
validateTrade(sign, 2, ess);
return true;
diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignTrade.java b/EssentialsSigns/src/net/ess3/signs/signs/SignTrade.java
index 83178d30a..0450e8d93 100644
--- a/EssentialsSigns/src/net/ess3/signs/signs/SignTrade.java
+++ b/EssentialsSigns/src/net/ess3/signs/signs/SignTrade.java
@@ -49,7 +49,7 @@ public class SignTrade extends EssentialsSign
{
if (store == null)
{
- throw new SignException(_("There is nothing to collect from this trade sign."), e);
+ throw new SignException(_("§4There is nothing to collect from this trade sign."), e);
}
}
Trade.log("Sign", "Trade", "OwnerInteract", username, store, username, stored, sign.getBlock().getLocation(), ess);
@@ -157,7 +157,7 @@ public class SignTrade extends EssentialsSign
amount -= amount % money;
if (amount < 0.01 || money < 0.01)
{
- throw new SignException(_("Quantities must be greater than 0."));
+ throw new SignException(_("§4Quantities must be greater than 0."));
}
sign.setLine(index, FormatUtil.shortCurrency(money, ess) + ":" + FormatUtil.shortCurrency(amount, ess).substring(1));
return;
@@ -170,11 +170,11 @@ public class SignTrade extends EssentialsSign
if (amount < 1)
{
- throw new SignException(_("Quantities must be greater than 0."));
+ throw new SignException(_("§4Quantities must be greater than 0."));
}
if (!(split[1].equalsIgnoreCase("exp") || split[1].equalsIgnoreCase("xp")) && getItemStack(split[1], amount, ess).getTypeId() == 0)
{
- throw new SignException(_("Quantities must be greater than 0."));
+ throw new SignException(_("§4Quantities must be greater than 0."));
}
String newline = amount + " " + split[1] + ":0";
if ((newline + amount).length() > 15)
@@ -192,16 +192,16 @@ public class SignTrade extends EssentialsSign
amount -= amount % stackamount;
if (amount < 1 || stackamount < 1)
{
- throw new SignException(_("Quantities must be greater than 0."));
+ throw new SignException(_("§4Quantities must be greater than 0."));
}
if (!(split[1].equalsIgnoreCase("exp") || split[1].equalsIgnoreCase("xp")) && getItemStack(split[1], stackamount, ess).getTypeId() == 0)
{
- throw new SignException(_("Quantities must be greater than 0."));
+ throw new SignException(_("§4Quantities must be greater than 0."));
}
sign.setLine(index, stackamount + " " + split[1] + ":" + amount);
return;
}
- throw new SignException(_("Line {0} on sign is invalid.", index + 1));
+ throw new SignException(_("§4Line§c {0} §4on sign is invalid.", index + 1));
}
protected final Trade getTrade(final ISign sign, final int index, final boolean fullAmount, final boolean notEmpty, final IEssentials ess) throws SignException
@@ -226,7 +226,7 @@ public class SignTrade extends EssentialsSign
}
catch (SignException e)
{
- throw new SignException(_("The trade sign has nothing available for you."), e);
+ throw new SignException(_("§4The trade sign has nothing available for you."), e);
}
}
@@ -239,7 +239,7 @@ public class SignTrade extends EssentialsSign
amount -= amount % stackamount;
if (notEmpty && (amount < 1 || stackamount < 1))
{
- throw new SignException(_("The trade sign has nothing available for you."));
+ throw new SignException(_("§4The trade sign has nothing available for you."));
}
return new Trade(fullAmount ? amount : stackamount, ess);
}
@@ -251,13 +251,13 @@ public class SignTrade extends EssentialsSign
amount -= amount % stackamount;
if (notEmpty && (amount < 1 || stackamount < 1 || item.getTypeId() == 0))
{
- throw new SignException(_("The trade sign has nothing available for you."));
+ throw new SignException(_("§4The trade sign has nothing available for you."));
}
item.setAmount(fullAmount ? amount : stackamount);
return new Trade(item, ess);
}
}
- throw new SignException(_("Line {0} on sign is invalid.", index + 1));
+ throw new SignException(_("§4Line§c {0} §4on sign is invalid.", index + 1));
}
protected final void subtractAmount(final ISign sign, final int index, final Trade trade, final IEssentials ess) throws SignException
@@ -354,6 +354,6 @@ public class SignTrade extends EssentialsSign
return;
}
}
- throw new SignException(_("Line {0} on sign is invalid.", index + 1));
+ throw new SignException(_("§4Line§c {0} §4on sign is invalid.", index + 1));
}
}
diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignWeather.java b/EssentialsSigns/src/net/ess3/signs/signs/SignWeather.java
index 42dad9443..7471c66a1 100644
--- a/EssentialsSigns/src/net/ess3/signs/signs/SignWeather.java
+++ b/EssentialsSigns/src/net/ess3/signs/signs/SignWeather.java
@@ -31,7 +31,7 @@ public class SignWeather extends EssentialsSign
sign.setLine(1, "§2Storm");
return true;
}
- throw new SignException(_("/weather only supports sun/storm."));
+ throw new SignException(_("§4/weather only supports sun/storm."));
}
@Override
@@ -53,6 +53,6 @@ public class SignWeather extends EssentialsSign
charge.charge(player);
return true;
}
- throw new SignException(_("/weather only supports sun/storm."));
+ throw new SignException(_("§4/weather only supports sun/storm."));
}
}
diff --git a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java
index f66efa546..e89d142da 100644
--- a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java
+++ b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java
@@ -40,7 +40,7 @@ public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP
ess = plugin.getEssentials();
if (!this.getDescription().getVersion().equals(plugin.getDescription().getVersion()))
{
- LOGGER.log(Level.WARNING, _("Version mismatch! Please update all Essentials jars to the same version."));
+ LOGGER.log(Level.WARNING, _("§4Version mismatch! Please update all Essentials jars to the same version."));
}
if (!plugin.isEnabled())
{