Skip to content

Remove hardcoded brackets in prefix #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MineTheCube wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Remove hardcoded brackets in prefix #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e49339
Convert "&" to Minecraft colors
MineTheCube Feb 22, 2016
bb7b9bb
Add brackets in config.yml
MineTheCube Feb 22, 2016
52ff284
Remove hardcoded brackets in prefix
MineTheCube Feb 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ holdings: 10.00

maxholdings: -1

prefix: Fe
prefix: '&f[&6Fe&f]'

topsize: 5

Expand All @@ -21,4 +21,4 @@ type: sqlite

updatecheck: true

cacheaccounts: true
cacheaccounts: true
4 changes: 1 addition & 3 deletions src/org/melonbrew/fe/Fe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions src/org/melonbrew/fe/Phrase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -127,4 +127,4 @@ public void send(CommandSender sender, String... params) {
public void sendWithPrefix(CommandSender sender, String... params) {
sender.sendMessage(parseWithPrefix(params));
}
}
}