diff --git a/MineverseChat/config.yml b/MineverseChat/config.yml index c31b28d..aaf52e8 100644 --- a/MineverseChat/config.yml +++ b/MineverseChat/config.yml @@ -103,13 +103,12 @@ vanishsupport: true # {playerto} : player receivings name # {playerfrom} : player sendings name -# use Default for the basic formatting -tellformatto: Default -tellformatfrom: Default -tellformatspy: Default -replyformatto: Default -replyformatfrom: Default -replyformatspy: Default +tellformatto: 'You message {playerto}:&7' +tellformatfrom: '{playerfrom} messages you:&7' +tellformatspy: '{playerfrom} messages {playerto}:&7' +replyformatto: 'You reply to {playerto}:&7' +replyformatfrom: '{playerfrom} replies to you:&7' +replyformatspy: '{playerfrom} replied to {playerto}:&7' # {host} : party hosts name # {player} : player name diff --git a/MineverseChat/defaultconfig.yml b/MineverseChat/defaultconfig.yml index c31b28d..aaf52e8 100644 --- a/MineverseChat/defaultconfig.yml +++ b/MineverseChat/defaultconfig.yml @@ -103,13 +103,12 @@ vanishsupport: true # {playerto} : player receivings name # {playerfrom} : player sendings name -# use Default for the basic formatting -tellformatto: Default -tellformatfrom: Default -tellformatspy: Default -replyformatto: Default -replyformatfrom: Default -replyformatspy: Default +tellformatto: 'You message {playerto}:&7' +tellformatfrom: '{playerfrom} messages you:&7' +tellformatspy: '{playerfrom} messages {playerto}:&7' +replyformatto: 'You reply to {playerto}:&7' +replyformatfrom: '{playerfrom} replies to you:&7' +replyformatspy: '{playerfrom} replied to {playerto}:&7' # {host} : party hosts name # {player} : player name diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/message/Message.java b/MineverseChat/mineverse/Aust1n46/chat/command/message/Message.java index bfcb49c..2ceebe6 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/message/Message.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/message/Message.java @@ -49,7 +49,6 @@ public class Message extends MineverseCommand { String send = ""; String echo = ""; String spy = ""; - String tellColor = plugin.getConfig().getString("tellcolor", "gray"); for(int r = 1; r < args.length; r++) { msg += " " + args[r]; } @@ -62,24 +61,9 @@ public class Message extends MineverseCommand { if(mcp.getPlayer().hasPermission("venturechat.format")) { msg = Format.FormatString(msg); } - if(plugin.getConfig().getString("tellformatfrom").equalsIgnoreCase("Default")) { - send = "{playerfrom} messages you:" + ChatColor.valueOf(tellColor.toUpperCase()) + msg; - } - else { - send = Format.FormatStringAll(plugin.getConfig().getString("tellformatfrom")) + msg; - } - if(plugin.getConfig().getString("tellformatto").equalsIgnoreCase("Default")) { - echo = "You message {playerto}:" + ChatColor.valueOf(tellColor.toUpperCase()) + msg; - } - else { - echo = Format.FormatStringAll(plugin.getConfig().getString("tellformatto")) + msg; - } - if(plugin.getConfig().getString("tellformatspy").equalsIgnoreCase("Default")) { - spy = "{playerfrom} messages {playerto}:" + ChatColor.valueOf(tellColor.toUpperCase()) + msg; - } - else { - spy = Format.FormatStringAll(plugin.getConfig().getString("tellformatspy")) + msg; - } + send = Format.FormatStringAll(plugin.getConfig().getString("tellformatfrom")) + msg; + echo = Format.FormatStringAll(plugin.getConfig().getString("tellformatto")) + msg; + spy = Format.FormatStringAll(plugin.getConfig().getString("tellformatspy")) + msg; try { out.writeUTF("Message"); out.writeUTF("Send"); diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/message/Reply.java b/MineverseChat/mineverse/Aust1n46/chat/command/message/Reply.java index c9d1c7f..f9dbf75 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/message/Reply.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/message/Reply.java @@ -40,28 +40,12 @@ public class Reply extends MineverseCommand { String send = ""; String echo = ""; String spy = ""; - String tellColor = plugin.getConfig().getString("tellcolor", "gray"); for(int r = 0; r < args.length; r++) { msg += " " + args[r]; } - if(plugin.getConfig().getString("tellformatfrom").equalsIgnoreCase("Default")) { - send = "{playerfrom} replies to you:" + ChatColor.valueOf(tellColor.toUpperCase()) + msg; - } - else { - send = Format.FormatStringAll(plugin.getConfig().getString("tellformatfrom")) + msg; - } - if(plugin.getConfig().getString("tellformatto").equalsIgnoreCase("Default")) { - echo = "You reply to {playerto}:" + ChatColor.valueOf(tellColor.toUpperCase()) + msg; - } - else { - echo = Format.FormatStringAll(plugin.getConfig().getString("tellformatto")) + msg; - } - if(plugin.getConfig().getString("tellformatspy").equalsIgnoreCase("Default")) { - spy = "{playerfrom} replied to {playerto}:" + ChatColor.valueOf(tellColor.toUpperCase()) + msg; - } - else { - spy = Format.FormatStringAll(plugin.getConfig().getString("tellformatspy")) + msg; - } + send = Format.FormatStringAll(plugin.getConfig().getString("replyformatfrom")) + msg; + echo = Format.FormatStringAll(plugin.getConfig().getString("replyformatto")) + msg; + spy = Format.FormatStringAll(plugin.getConfig().getString("replyformatspy")) + msg; try { out.writeUTF("Message"); out.writeUTF("Send");