From 3e4933978dac6da35fb8b4d74e103955b27d3e47 Mon Sep 17 00:00:00 2001 From: MineTheCube Date: Tue, 23 Feb 2016 00:03:11 +0100 Subject: [PATCH 1/3] Convert "&" to Minecraft colors --- src/org/melonbrew/fe/Phrase.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/melonbrew/fe/Phrase.java b/src/org/melonbrew/fe/Phrase.java index 8de9137..3d80072 100644 --- a/src/org/melonbrew/fe/Phrase.java +++ b/src/org/melonbrew/fe/Phrase.java @@ -117,7 +117,7 @@ public String parseWithoutSpaces(String... params) { } private String parseWithPrefix(String... params) { - return plugin.getMessagePrefix().replace("$1", plugin.getConfig().getString("prefix")) + parse(params); + return plugin.getMessagePrefix().replace("$1", ChatColor.translateAlternateColorCodes('&', plugin.getConfig().getString("prefix"))) + parse(params); } public void send(CommandSender sender, String... params) { @@ -127,4 +127,4 @@ public void send(CommandSender sender, String... params) { public void sendWithPrefix(CommandSender sender, String... params) { sender.sendMessage(parseWithPrefix(params)); } -} \ No newline at end of file +} From bb7b9bb56174c02d50ad980a0a07af880cbd36b4 Mon Sep 17 00:00:00 2001 From: MineTheCube Date: Tue, 23 Feb 2016 00:04:54 +0100 Subject: [PATCH 2/3] Add brackets in config.yml --- config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.yml b/config.yml index d81fd4d..8e0fab0 100644 --- a/config.yml +++ b/config.yml @@ -2,7 +2,7 @@ holdings: 10.00 maxholdings: -1 -prefix: Fe +prefix: '&f[&6Fe&f]' topsize: 5 @@ -21,4 +21,4 @@ type: sqlite updatecheck: true -cacheaccounts: true \ No newline at end of file +cacheaccounts: true From 52ff2844fbc937217159eac15d35221ba30e1b2f Mon Sep 17 00:00:00 2001 From: MineTheCube Date: Tue, 23 Feb 2016 00:07:57 +0100 Subject: [PATCH 3/3] Remove hardcoded brackets in prefix --- src/org/melonbrew/fe/Fe.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/org/melonbrew/fe/Fe.java b/src/org/melonbrew/fe/Fe.java index 48858c7..32e5252 100644 --- a/src/org/melonbrew/fe/Fe.java +++ b/src/org/melonbrew/fe/Fe.java @@ -281,9 +281,7 @@ public Account getShortenedAccount(String name) { } public String getMessagePrefix() { - String third = Phrase.TERTIARY_COLOR.parse(); - - return third + "[" + Phrase.PRIMARY_COLOR.parse() + "$1" + third + "] " + Phrase.SECONDARY_COLOR.parse(); + return Phrase.PRIMARY_COLOR.parse() + "$1" + Phrase.SECONDARY_COLOR.parse(); } public String getEqualMessage(String inBetween, int length) {