From 9870b9d33725529b318aaab15c085b53b9a42fd5 Mon Sep 17 00:00:00 2001
From: Misterzym <sav@net-bit.ru>
Date: Thu, 11 Oct 2018 11:56:27 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?=
 =?UTF-8?q?=D0=B8=20=D0=A0=D0=9F-=D1=88=D0=BD=D0=BE=D1=81=D1=82=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/ru/upworld/chat/ChatListener.java |  7 ++++---
 src/ru/upworld/chat/CommandMsg.java   | 16 ++++++++++------
 src/ru/upworld/chat/UpWorldChat.java  |  2 +-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/ru/upworld/chat/ChatListener.java b/src/ru/upworld/chat/ChatListener.java
index 4531e61..a3e9f4b 100644
--- a/src/ru/upworld/chat/ChatListener.java
+++ b/src/ru/upworld/chat/ChatListener.java
@@ -9,13 +9,14 @@ import org.bukkit.event.player.AsyncPlayerChatEvent;
 
 public class ChatListener implements Listener {
 
-    private static final String format = "%chatPrefix" + ChatColor.DARK_GRAY + "%player: " + ChatColor.WHITE + "%message";
+    private static final String formatLocal = "%chatPrefix" + ChatColor.GREEN + "%player: " + ChatColor.WHITE + "%message";
+    private static final String formatGlobl = ChatColor.BOLD + "%chatPrefix" + ChatColor.GOLD + "%player: " + ChatColor.BLUE + "%message";
 
     @EventHandler
     public void AsyncPlayerChatEvent(AsyncPlayerChatEvent e) {
         String message = e.getMessage();
         Player player = e.getPlayer();
-        String formated = ChatUtil.translateColorCodes(format);
+        String formated = ChatUtil.translateColorCodes(formatLocal);
         Chat chat = message.startsWith("!") ? Chat.LOCAL : Chat.GLOBAL;
         if (chat == Chat.LOCAL) {
             Bukkit.getOnlinePlayers().stream().filter((p) -> (p.getLocation().distance(player.getLocation()) <= 100)).forEachOrdered((p) -> {
@@ -34,7 +35,7 @@ public class ChatListener implements Listener {
     }
 
     public enum Chat {
-        GLOBAL("§9[§6G§9]§f "), LOCAL("");
+        GLOBAL("§9[§4Кричит§9]§f "), LOCAL("");
 
         private final String prefix;
 
diff --git a/src/ru/upworld/chat/CommandMsg.java b/src/ru/upworld/chat/CommandMsg.java
index e25f40b..5b0b999 100644
--- a/src/ru/upworld/chat/CommandMsg.java
+++ b/src/ru/upworld/chat/CommandMsg.java
@@ -9,9 +9,12 @@ import org.bukkit.entity.Player;
 
 public class CommandMsg implements CommandExecutor {
 
-    private final String usage = ChatColor.RED + "/msg <игрок> <сообщение>";
-    private final String noMessage = ChatColor.RED + "Введите сообщение.";
-    private final String playerIsOffline = ChatColor.RED + "Введите ник игрока.";
+    private final String usage = ChatColor.RED + "/m <имя> <послание>";
+    private final String noMessage = ChatColor.RED + "Вы ничего не нашептали";
+    private final String playerIsOffline = ChatColor.RED + "Кажется он(а) не с нами.";
+
+    private final String formatPrivateSend = "&e[&8шепчете &f{NAME}&e] ";
+    public static final String formatPrivateMe = "&e[&f{NAME} &8шепчет&e] ";
 
     @Override
     public boolean onCommand(CommandSender sender, Command cmnd, String string, String[] args) {
@@ -32,14 +35,15 @@ public class CommandMsg implements CommandExecutor {
             sender.sendMessage(playerIsOffline);
             return true;
         }
-        sender.sendMessage("&e[&fВы &e-> &f" + args[0] + "&e] " + joiner(args));
-        Bukkit.getPlayer(args[0]).sendMessage("&e[&f" + sender.getName() + "&e -> &fВы&e] " + joiner(args));
+        sender.sendMessage(ChatUtil.translateColorCodes(formatPrivateSend.replace("{NAME}", args[0])) + joiner(args));
+        Bukkit.getPlayer(args[0]).sendMessage(ChatUtil.translateColorCodes(formatPrivateMe.replace("{NAME}", sender.getName())) + joiner(args));
+        UpWorldChat.log(ChatUtil.translateColorCodes(formatPrivateMe.replace("{NAME}", sender.getName())) + joiner(args));
         return true;
     }
 
     private String joiner(String[] args) {
         String message = "";
-        for (int i = 1;i < args.length;++i) {
+        for (int i = 1; i < args.length; ++i) {
             message = message + args[i] + " ";
         }
         return message;
diff --git a/src/ru/upworld/chat/UpWorldChat.java b/src/ru/upworld/chat/UpWorldChat.java
index c9cef4d..e5eb07f 100644
--- a/src/ru/upworld/chat/UpWorldChat.java
+++ b/src/ru/upworld/chat/UpWorldChat.java
@@ -17,7 +17,7 @@ public class UpWorldChat extends JavaPlugin {
         log("Disabled!");
     }
 
-    public void log(String msg) {
+    public static void log(String msg) {
         Bukkit.getServer().getConsoleSender().sendMessage("[§3Chat§9] §4" + msg);
     }