Merge pull request #68 from BPEssentials/colorize

UserR00T · web-flow · commit 27cfc41669ea · 2020-07-28T13:40:14.000+02:00
diff --git a/dist/localization.json b/dist/localization.json
@@ -113,7 +113,9 @@
     "pay_error_negative": "You cannot pay 0 or less.",
     "unbanned": "{0} was unbanned.",
     "user_not_found": "Could not find user by the username of {0}.",
-    "user_not_ban": "{0} is not banned."
+    "user_not_ban": "{0} is not banned.",
+    "pm>": "[PM] {0} > {1}",
+    "pm<": "[PM] {0} < {1}"
   },
   "BR": {
     "arrested": "Preso {0}.",
diff --git a/dist/settings.json b/dist/settings.json
@@ -10,7 +10,9 @@
   },
   "Announcements": [],
   "Messages": {
-    "DiscordLink": "http://discord.gg/WpdNCDw"
+    "DiscordLink": "http://discord.gg/WpdNCDw",
+    "InfoColor": "#179b43",
+    "ArgColor": "#178d9b"
   },
   "Levenshtein": {
     "GiveMode": "Automatic",
diff --git a/src/BPEssentials/BPEssentials.csproj b/src/BPEssentials/BPEssentials.csproj
@@ -368,7 +368,8 @@
     <Compile Include="Paths.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="FileChecker.cs" />
-    <Compile Include="Utils\CustomFormatter.cs" />
+    <Compile Include="Utils\Formatters\FormatterChat.cs" />
+    <Compile Include="Utils\Formatters\FormatterResponse.cs" />
     <Compile Include="Utils\LevenshteinDistance.cs" />
     <Compile Include="Utils\IO.cs" />
     <Compile Include="Utils\ChatUtils.cs" />
diff --git a/src/BPEssentials/Commands/Kits/Kit.cs b/src/BPEssentials/Commands/Kits/Kit.cs
@@ -60,9 +60,9 @@ public void Invoke(ShPlayer player, string kit)
                 player.AddCooldown(Core.Instance.KitHandler.Name, obj.Name, obj.Delay);
             }
             player.SendChatMessage(
-                player.T(Core.Instance.KitHandler.Name + "_received", obj.Name) +
-                (obj.Price > 0 ? player.T(Core.Instance.KitHandler.Name + "_received_Price", obj.Price.ToString()) : "") +
-                (obj.Delay > 0 ? player.T(Core.Instance.KitHandler.Name + "_received_Delay", obj.Delay.ToString()) : ""));
+                player.TC(Core.Instance.KitHandler.Name + "_received", obj.Name) +
+                (obj.Price > 0 ? player.TC(Core.Instance.KitHandler.Name + "_received_Price", obj.Price.ToString()) : "") +
+                (obj.Delay > 0 ? player.TC(Core.Instance.KitHandler.Name + "_received_Delay", obj.Delay.ToString()) : ""));
         }
     }
 }
diff --git a/src/BPEssentials/Commands/Warps/Warp.cs b/src/BPEssentials/Commands/Warps/Warp.cs
@@ -60,9 +60,9 @@ public void Invoke(ShPlayer player, string warp)
                 player.AddCooldown(Core.Instance.WarpHandler.Name, obj.Name, obj.Delay);
             }
             player.SendChatMessage(
-                player.T(Core.Instance.WarpHandler.Name + "_teleported", obj.Name) + 
-                (obj.Price > 0 ? player.T(Core.Instance.WarpHandler.Name + "_telported_Price", obj.Price.ToString()) : "") + 
-                (obj.Delay > 0 ? player.T(Core.Instance.WarpHandler.Name + "_telported_Delay", obj.Delay.ToString()) : ""));
+                player.TC(Core.Instance.WarpHandler.Name + "_teleported", obj.Name) + 
+                (obj.Price > 0 ? player.TC(Core.Instance.WarpHandler.Name + "_telported_Price", obj.Price.ToString()) : "") + 
+                (obj.Delay > 0 ? player.TC(Core.Instance.WarpHandler.Name + "_telported_Delay", obj.Delay.ToString()) : ""));
         }
     }
 }
diff --git a/src/BPEssentials/Configuration/Models/SettingsModel.cs b/src/BPEssentials/Configuration/Models/SettingsModel.cs
@@ -63,6 +63,11 @@ public class FunctionUI
     public class Messages
     {
         public string DiscordLink { get; set; }
+
+        public string InfoColor { get; set; } = "#179b43";
+
+        public string ArgColor { get; set; } = "#178d9b";
+
     }
 
     public class General
diff --git a/src/BPEssentials/ExtendedPlayer/ExtendedPlayer.cs b/src/BPEssentials/ExtendedPlayer/ExtendedPlayer.cs
@@ -30,8 +30,8 @@ public PlayerItem(ShPlayer player) : base(player)
 
         public void SendPmMessage(ShPlayer target, string message)
         {
-            Client.SendChatMessage($"[PM] {target.username.CleanerMessage()} > {message.CleanerMessage()}");
-            target.SendChatMessage($"[PM] {Client.username.CleanerMessage()} < {message.CleanerMessage()}");
+            Client.TS("pm>", target.username.CleanerMessage(), message.CleanerMessage());
+            target.TS("pm<", Client.username.CleanerMessage(), message.CleanerMessage());
         }
 
         public void SendSpyChatMessage(ShPlayer target, string command)
diff --git a/src/BPEssentials/ExtensionMethods/Player.cs b/src/BPEssentials/ExtensionMethods/Player.cs
@@ -1,4 +1,5 @@
 ﻿using BPEssentials.ExtendedPlayer;
+using BPEssentials.Utils.Formatter.Response;
 using BrokeProtocol.Entities;
 using BrokeProtocol.Utility;
 using BrokeProtocol.Utility.Networking;
@@ -12,24 +13,42 @@ public static PlayerItem GetExtendedPlayer(this ShPlayer player)
             return Core.Instance.PlayerHandler.GetSafe(player.ID);
         }
 
-        public static string T(this SvPlayer player, string node, params object[] formatting) { 
+        public static string TC(this SvPlayer player, string node, params object[] formatting)
+        {
+            var formatter = new CustomFormatter(Core.Instance.Settings.Messages.ArgColor, Core.Instance.Settings.Messages.InfoColor);
+            return $"<color={Core.Instance.Settings.Messages.InfoColor}>" +
+                (Core.Instance.I18n.Localize(formatter, player.language.code, node, formatting) ?? Core.Instance.I18n.Localize(formatter, "EN", node, formatting) ?? $"{node} [{string.Join(", ", formatting)}]")
+                + "</color>";
+        }
+
+        public static string TC(this ShPlayer player, string node, params object[] formatting)
+        {
+            return player.svPlayer.TC(node, formatting);
+        }
+
+        public static string T(this SvPlayer player, string node, params object[] formatting)
+        {
+
             return Core.Instance.I18n.Localize(player.language.code, node, formatting) ?? Core.Instance.I18n.Localize("EN", node, formatting) ?? $"{node} [{string.Join(", ", formatting)}]";
+
         }
 
         public static string T(this ShPlayer player, string node, params object[] formatting)
         {
             return player.svPlayer.T(node, formatting);
         }
 
+      
         public static void TS(this ShPlayer player, string node, params object[] formatting)
         {
-            player.SendChatMessage(player.T(node, formatting));
+            player.SendChatMessage(player.TC(node, formatting));
         }
 
         public static void SendChatMessage(this ShPlayer player, string message, bool useColors = false)
         {
             message = useColors ? message.ParseColorCodes() : message;
             player.svPlayer.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, message);
         }
+
     }
 }
diff --git a/src/BPEssentials/Utils/ChatUtils.cs b/src/BPEssentials/Utils/ChatUtils.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using BPEssentials.Enums;
 using BPEssentials.ExtensionMethods;
+using BPEssentials.Utils.Formatter.Chat;
 using BrokeProtocol.Collections;
 using BrokeProtocol.Entities;
 
@@ -18,7 +19,7 @@ public static void SendStaffChatMessage(ShPlayer player, string message)
                 {
                     continue;
                 }
-                currPlayer.SendChatMessage($"[STAFFCHAT] {player.username.CleanerMessage()}: {message}");
+                currPlayer.SendChatMessage(ChatUtils.FormatMessage(player, message, "staffformat"), false);
             }
         }
 
diff --git a/src/BPEssentials/Utils/Formatters/FormatterChat.cs b/src/BPEssentials/Utils/Formatters/FormatterChat.cs
@@ -4,7 +4,7 @@
 using BPEssentials.ExtensionMethods;
 
 
-namespace BPEssentials.Utils
+namespace BPEssentials.Utils.Formatter.Chat
 {
     public class CustomFormatter : IFormatProvider, ICustomFormatter
     {
diff --git a/src/BPEssentials/Utils/Formatters/FormatterResponse.cs b/src/BPEssentials/Utils/Formatters/FormatterResponse.cs
@@ -0,0 +1,51 @@
+﻿using BrokeProtocol.Utility;
+using System;
+using System.Globalization;
+using BPEssentials.ExtensionMethods;
+
+
+namespace BPEssentials.Utils.Formatter.Response
+{
+
+    public class CustomFormatter : IFormatProvider, ICustomFormatter
+    {
+        public string ArgColor { get; set; }
+
+        public string InfoColor { get; set; }
+
+        public CustomFormatter(string argColor, string infoColor)
+        {
+            ArgColor = argColor;
+            InfoColor = infoColor;
+        }
+
+        public object GetFormat(Type formatType)
+        {
+            if (formatType == typeof(ICustomFormatter))
+            {
+                return this;
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        public string Format(string format, object arg, IFormatProvider formatProvider)
+        {
+            if (arg == null)
+            {
+                return string.Empty;
+            }
+
+               
+                   var arg_IFormattable = arg as IFormattable;
+                   if (arg_IFormattable != null)
+                   {
+                       return $"</color><color={ArgColor}>" +(arg_IFormattable).ToString(format, CultureInfo.CurrentCulture) + $"</color><color={InfoColor}>";
+                   }
+               
+            return $"</color><color={ArgColor}>{arg.ToString()}</color><color={InfoColor}>";
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -60,9 +60,9 @@ public void Invoke(ShPlayer player, string kit)`
`60`	`60`	`player.AddCooldown(Core.Instance.KitHandler.Name, obj.Name, obj.Delay);`
`61`	`61`	`}`
`62`	`62`	`player.SendChatMessage(`
`63`		`- player.T(Core.Instance.KitHandler.Name + "_received", obj.Name) +`
`64`		`- (obj.Price > 0 ? player.T(Core.Instance.KitHandler.Name + "_received_Price", obj.Price.ToString()) : "") +`
`65`		`- (obj.Delay > 0 ? player.T(Core.Instance.KitHandler.Name + "_received_Delay", obj.Delay.ToString()) : ""));`
	`63`	`+ player.TC(Core.Instance.KitHandler.Name + "_received", obj.Name) +`
	`64`	`+ (obj.Price > 0 ? player.TC(Core.Instance.KitHandler.Name + "_received_Price", obj.Price.ToString()) : "") +`
	`65`	`+ (obj.Delay > 0 ? player.TC(Core.Instance.KitHandler.Name + "_received_Delay", obj.Delay.ToString()) : ""));`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,11 @@ public class FunctionUI`
`63`	`63`	`public class Messages`
`64`	`64`	`{`
`65`	`65`	`public string DiscordLink { get; set; }`
	`66`	`+`
	`67`	`+ public string InfoColor { get; set; } = "#179b43";`
	`68`	`+`
	`69`	`+ public string ArgColor { get; set; } = "#178d9b";`
	`70`	`+`
`66`	`71`	`}`
`67`	`72`
`68`	`73`	`public class General`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ public PlayerItem(ShPlayer player) : base(player)`
`30`	`30`
`31`	`31`	`public void SendPmMessage(ShPlayer target, string message)`
`32`	`32`	`{`
`33`		`- Client.SendChatMessage($"[PM] {target.username.CleanerMessage()} > {message.CleanerMessage()}");`
`34`		`- target.SendChatMessage($"[PM] {Client.username.CleanerMessage()} < {message.CleanerMessage()}");`
	`33`	`+ Client.TS("pm>", target.username.CleanerMessage(), message.CleanerMessage());`
	`34`	`+ target.TS("pm<", Client.username.CleanerMessage(), message.CleanerMessage());`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public void SendSpyChatMessage(ShPlayer target, string command)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using BPEssentials.ExtendedPlayer;`
	`2`	`+using BPEssentials.Utils.Formatter.Response;`
`2`	`3`	`using BrokeProtocol.Entities;`
`3`	`4`	`using BrokeProtocol.Utility;`
`4`	`5`	`using BrokeProtocol.Utility.Networking;`
`@@ -12,24 +13,42 @@ public static PlayerItem GetExtendedPlayer(this ShPlayer player)`
`12`	`13`	`return Core.Instance.PlayerHandler.GetSafe(player.ID);`
`13`	`14`	`}`
`14`	`15`
`15`		`- public static string T(this SvPlayer player, string node, params object[] formatting) {`
	`16`	`+ public static string TC(this SvPlayer player, string node, params object[] formatting)`
	`17`	`+ {`
	`18`	`+ var formatter = new CustomFormatter(Core.Instance.Settings.Messages.ArgColor, Core.Instance.Settings.Messages.InfoColor);`
	`19`	`+ return $"<color={Core.Instance.Settings.Messages.InfoColor}>" +`
	`20`	`+ (Core.Instance.I18n.Localize(formatter, player.language.code, node, formatting) ?? Core.Instance.I18n.Localize(formatter, "EN", node, formatting) ?? $"{node} [{string.Join(", ", formatting)}]")`
	`21`	`+ + "</color>";`
	`22`	`+ }`
	`23`	`+`
	`24`	`+ public static string TC(this ShPlayer player, string node, params object[] formatting)`
	`25`	`+ {`
	`26`	`+ return player.svPlayer.TC(node, formatting);`
	`27`	`+ }`
	`28`	`+`
	`29`	`+ public static string T(this SvPlayer player, string node, params object[] formatting)`
	`30`	`+ {`
	`31`	`+`
`16`	`32`	`return Core.Instance.I18n.Localize(player.language.code, node, formatting) ?? Core.Instance.I18n.Localize("EN", node, formatting) ?? $"{node} [{string.Join(", ", formatting)}]";`
	`33`	`+`
`17`	`34`	`}`
`18`	`35`
`19`	`36`	`public static string T(this ShPlayer player, string node, params object[] formatting)`
`20`	`37`	`{`
`21`	`38`	`return player.svPlayer.T(node, formatting);`
`22`	`39`	`}`
`23`	`40`
	`41`	`+`
`24`	`42`	`public static void TS(this ShPlayer player, string node, params object[] formatting)`
`25`	`43`	`{`
`26`		`- player.SendChatMessage(player.T(node, formatting));`
	`44`	`+ player.SendChatMessage(player.TC(node, formatting));`
`27`	`45`	`}`
`28`	`46`
`29`	`47`	`public static void SendChatMessage(this ShPlayer player, string message, bool useColors = false)`
`30`	`48`	`{`
`31`	`49`	`message = useColors ? message.ParseColorCodes() : message;`
`32`	`50`	`player.svPlayer.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, message);`
`33`	`51`	`}`
	`52`	`+`
`34`	`53`	`}`
`35`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using BPEssentials.Enums;`
`5`	`5`	`using BPEssentials.ExtensionMethods;`
	`6`	`+using BPEssentials.Utils.Formatter.Chat;`
`6`	`7`	`using BrokeProtocol.Collections;`
`7`	`8`	`using BrokeProtocol.Entities;`
`8`	`9`
`@@ -18,7 +19,7 @@ public static void SendStaffChatMessage(ShPlayer player, string message)`
`18`	`19`	`{`
`19`	`20`	`continue;`
`20`	`21`	`}`
`21`		`- currPlayer.SendChatMessage($"[STAFFCHAT] {player.username.CleanerMessage()}: {message}");`
	`22`	`+ currPlayer.SendChatMessage(ChatUtils.FormatMessage(player, message, "staffformat"), false);`
`22`	`23`	`}`
`23`	`24`	`}`
`24`	`25`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using BPEssentials.ExtensionMethods;`
`5`	`5`
`6`	`6`
`7`		`-namespace BPEssentials.Utils`
	`7`	`+namespace BPEssentials.Utils.Formatter.Chat`
`8`	`8`	`{`
`9`	`9`	`public class CustomFormatter : IFormatProvider, ICustomFormatter`
`10`	`10`	`{`