Skip to content

Add suffixes for admin/all messages. #1

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
gdude2002 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add suffixes for admin/all messages. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b3a079
Add suffixes for admin/all messages.
gdude2002 May 9, 2014
9ee5d74
Actually, why are we forcing colour resets at all?
gdude2002 May 9, 2014
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
20 changes: 11 additions & 9 deletions config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
adminchat:
allprefix: "&a(&7ALL&a)"
allmasked: "&3ADMIN"

adminprefix: "&a(&7ADMINS&a)"
toadminprefix: "&a(&7TO ADMINS&a)"

allprefix: "&a(&7ALL&a)&f"
allmasked: "&3ADMIN&f"
allsuffix: "&f: "

adminprefix: "&a(&7ADMINS&a)&f"
toadminprefix: "&a(&7TO ADMINS&a)&f"
adminsuffix: "&f: "

usecustomconsolename: true
customconsolename: "&7[&6CONSOLE&7]"

listeninchat: true

rawprefixadmin: "@"
rawprefixall: "@@"

notifyonversion: true
16 changes: 8 additions & 8 deletions src/net/timroden/adminchat/AdminChat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,19 +143,19 @@ public void displayMessage(CommandSender sender, String message, String name, Co

if(type.equals(CommandType.AD)) {
if(sender.hasPermission("adminchat.view.admin")) {
sender.sendMessage(config.adminPrefix + " " + resetName + ": " + msg);
sender.sendMessage(config.adminPrefix + " " + resetName + config.adminSuffix + msg);
} else {
sender.sendMessage(config.toAdminPrefix + " " + resetName + ": " + msg);
sender.sendMessage(config.toAdminPrefix + " " + resetName + config.adminSuffix + msg);
}
if(putToConsole) {
ccs.sendMessage(config.adminPrefix + " " + resetName + ": " + msg);
ccs.sendMessage(config.adminPrefix + " " + resetName + config.adminSuffix + msg);
}
}

if(type.equals(CommandType.ALL)) {
sender.sendMessage(config.allPrefix + " " + resetName + ": " + msg);
sender.sendMessage(config.allPrefix + " " + resetName + config.allSuffix + msg);
if(putToConsole) {
ccs.sendMessage(config.allPrefix + " " + resetName + ": " + msg);
ccs.sendMessage(config.allPrefix + " " + resetName + config.allSuffix + msg);
}
}

Expand All @@ -165,15 +165,15 @@ public void displayMessage(CommandSender sender, String message, String name, Co

if(type.equals(CommandType.AD)) {
if(pl.hasPermission("adminchat.view.admin")) {
pl.sendMessage(config.adminPrefix + " " + resetName + ": " + msg);
pl.sendMessage(config.adminPrefix + " " + resetName + config.adminSuffix + msg);
}
}

if(type.equals(CommandType.ALL)) {
if(pl.hasPermission("adminchat.send.all")) {
pl.sendMessage(config.allPrefix + " " + resetName + ": " + msg);
pl.sendMessage(config.allPrefix + " " + resetName + config.allSuffix + msg);
} else {
pl.sendMessage(config.allPrefix + " " + config.allMasked + ": " + msg);
pl.sendMessage(config.allPrefix + " " + config.allMasked + config.allSuffix + msg);
}
}
}
Expand Down
12 changes: 7 additions & 5 deletions src/net/timroden/adminchat/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public class Config {
private static Configuration config;

public Boolean useCustomConsoleName, notifyVersion, chatListen;
public String consoleSenderName, allPrefix, adminPrefix, allMasked, toAdminPrefix, rawPrefixAdmin, rawPrefixAll;
public String consoleSenderName, allPrefix, adminPrefix, allMasked, toAdminPrefix, rawPrefixAdmin, rawPrefixAll, allSuffix, adminSuffix;
public char colorPrefix;

public Config(AdminChat plugin) {
Expand All @@ -32,11 +32,13 @@ public void getOpts() {
notifyVersion = config.getBoolean("adminchat.notifyonversion");
chatListen = config.getBoolean("adminchat.listeninchat");

allPrefix = ChatColor.translateAlternateColorCodes('&', config.getString("adminchat.allprefix")) + ChatColor.RESET;
allMasked = ChatColor.translateAlternateColorCodes('&', config.getString("adminchat.allmasked")) + ChatColor.RESET;
allPrefix = ChatColor.translateAlternateColorCodes('&', config.getString("adminchat.allprefix"));
allMasked = ChatColor.translateAlternateColorCodes('&', config.getString("adminchat.allmasked"));
allSuffix = ChatColor.translateAlternateColorCodes('&', config.getString("adminchat.allsuffix"));

adminPrefix = ChatColor.translateAlternateColorCodes('&', config.getString("adminchat.adminprefix")) + ChatColor.RESET;
toAdminPrefix = ChatColor.translateAlternateColorCodes('&', config.getString("adminchat.toadminprefix")) + ChatColor.RESET;
adminPrefix = ChatColor.translateAlternateColorCodes('&', config.getString("adminchat.adminprefix"));
toAdminPrefix = ChatColor.translateAlternateColorCodes('&', config.getString("adminchat.toadminprefix"));
adminSuffix = ChatColor.translateAlternateColorCodes('&', config.getString("adminchat.adminsuffix"));


colorPrefix = config.getString("adminchat.colorprefix").charAt(0);
Expand Down