From ca0243e831050291a9378091f93fefaff55362d7 Mon Sep 17 00:00:00 2001
From: Dmitry Rendov <dmitry_rendov@epam.com>
Date: Thu, 14 May 2020 10:47:22 +0300
Subject: [PATCH] Remove redundant coloring from messages

---
 src/me/EtienneDx/RealEstate/Config.java        | 18 +++++++++---------
 src/me/EtienneDx/RealEstate/RECommand.java     | 13 +++++--------
 .../RealEstate/SendPlayerMessageTask.java      | 11 +++--------
 3 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/src/me/EtienneDx/RealEstate/Config.java b/src/me/EtienneDx/RealEstate/Config.java
index 055a6b4..3e4494c 100644
--- a/src/me/EtienneDx/RealEstate/Config.java
+++ b/src/me/EtienneDx/RealEstate/Config.java
@@ -197,29 +197,29 @@ public class Config extends AnnotationConfig
         return message;
     }
     //sends a color-coded message to a player
-    public static void sendMessage(Player player, ChatColor color, Messages messageID, String... args) {
-        sendMessage(player, color, messageID, 0, args);
+    public static void sendMessage(Player player, Messages messageID, String... args) {
+        sendMessage(player, messageID, 0, args);
     }
 
     //sends a color-coded message to a player
-    public static void sendMessage(Player player, ChatColor color, Messages messageID, long delayInTicks, String... args) {
+    public static void sendMessage(Player player, Messages messageID, long delayInTicks, String... args) {
         String message = RealEstate.instance.config.getMessage(messageID, args);
-        sendMessage(player, color, message, delayInTicks);
+        sendMessage(player, message, delayInTicks);
     }
 
     //sends a color-coded message to a player
-    public static void sendMessage(Player player, ChatColor color, String message) {
+    public static void sendMessage(Player player, String message) {
         if (message == null || message.length() == 0) return;
 
         if (player == null) {
-            RealEstate.instance.log.info(color + message);
+            RealEstate.instance.log.info(message);
         } else {
-            player.sendMessage(RealEstate.instance.config.chatPrefix + color + message);
+            player.sendMessage(RealEstate.instance.config.chatPrefix + message);
         }
     }
 
-    public static void sendMessage(Player player, ChatColor color, String message, long delayInTicks) {
-        SendPlayerMessageTask task = new SendPlayerMessageTask(player, color, message);
+    public static void sendMessage(Player player, String message, long delayInTicks) {
+        SendPlayerMessageTask task = new SendPlayerMessageTask(player, message);
 
         if (delayInTicks > 0) {
             RealEstate.instance.getServer().getScheduler().runTaskLater(RealEstate.instance, task, delayInTicks);
diff --git a/src/me/EtienneDx/RealEstate/RECommand.java b/src/me/EtienneDx/RealEstate/RECommand.java
index eecce8a..dcbf846 100644
--- a/src/me/EtienneDx/RealEstate/RECommand.java
+++ b/src/me/EtienneDx/RealEstate/RECommand.java
@@ -1,9 +1,6 @@
 package me.EtienneDx.RealEstate;
 
-import java.awt.*;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
 import java.util.UUID;
 
 import org.bukkit.Bukkit;
@@ -51,7 +48,7 @@ public class RECommand extends BaseCommand
 		}
 		else
 		{
-			Config.sendMessage(player, ChatColor.RED, Messages.NoTransactionFound);
+			Config.sendMessage(player, Messages.NoTransactionFound);
 		}
 
 	}
@@ -68,7 +65,7 @@ public class RECommand extends BaseCommand
 		}
 		if(page <= 0)
 		{
-			Config.sendMessage(player, ChatColor.RED, Messages.PageMustBePositive);
+			Config.sendMessage(player, Messages.PageMustBePositive);
 			return;
 		}
 		int count = 0;
@@ -144,7 +141,7 @@ public class RECommand extends BaseCommand
 			}
 			else
 			{
-				Config.sendMessage(player, ChatColor.RED, Messages.PageNotExists);
+				Config.sendMessage(player, Messages.PageNotExists);
 			}
 		}
 	}
@@ -167,7 +164,7 @@ public class RECommand extends BaseCommand
 		}
 		if(newStatus == null)
 		{
-			Config.sendMessage(player, ChatColor.AQUA, Messages.RenewRentCurrently, cr.autoRenew ? "enabled" : "disabled", claimType);
+			Config.sendMessage(player, Messages.RenewRentCurrently, cr.autoRenew ? "enabled" : "disabled", claimType);
 		}
 		else if(!newStatus.equalsIgnoreCase("enable") && !newStatus.equalsIgnoreCase("disable"))
 		{
@@ -177,7 +174,7 @@ public class RECommand extends BaseCommand
 		{
 			cr.autoRenew = newStatus.equalsIgnoreCase("enable");
 			RealEstate.transactionsStore.saveData();
-			Config.sendMessage(player, ChatColor.AQUA, Messages.RenewRentNow, cr.autoRenew ? "enabled" : "disabled", claimType);
+			Config.sendMessage(player, Messages.RenewRentNow, cr.autoRenew ? "enabled" : "disabled", claimType);
 		}
 		else
 		{
diff --git a/src/me/EtienneDx/RealEstate/SendPlayerMessageTask.java b/src/me/EtienneDx/RealEstate/SendPlayerMessageTask.java
index 21ccedc..d124d51 100644
--- a/src/me/EtienneDx/RealEstate/SendPlayerMessageTask.java
+++ b/src/me/EtienneDx/RealEstate/SendPlayerMessageTask.java
@@ -1,21 +1,16 @@
 package me.EtienneDx.RealEstate;
 
-import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
-import java.util.logging.Logger;
-
 class SendPlayerMessageTask implements Runnable
 {
 	private Player player;
-	private ChatColor color;
 	private String message;
 
 
-	public SendPlayerMessageTask(Player player, ChatColor color, String message)
+	public SendPlayerMessageTask(Player player, String message)
 	{
 		this.player = player;
-		this.color = color;
 		this.message = message;
 	}
 
@@ -24,9 +19,9 @@ class SendPlayerMessageTask implements Runnable
 	{
 		if(player == null)
 		{
-			RealEstate.instance.log.info(color + message);
+			RealEstate.instance.log.info(message);
 		    return;
 		}
-		Config.sendMessage(this.player, this.color, this.message);
+		Config.sendMessage(this.player, this.message);
 	}
 }