diff --git a/.gitignore b/.gitignore
index d5380c8..e69ff9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -189,3 +189,4 @@ GeneratedArtifacts/
_Pvt_Extensions/
ModelManifest.xml
/.vs/Uconomy/v15/Server/sqlite3
+/.vs
diff --git a/CommandBalance.cs b/CommandBalance.cs
index 6cf456f..49bd05b 100644
--- a/CommandBalance.cs
+++ b/CommandBalance.cs
@@ -1,4 +1,5 @@
using System.Collections.Generic;
+using fr34kyn01535.Uconomy.Utils;
using Rocket.API;
using Rocket.Unturned.Chat;
using Rocket.Unturned.Player;
@@ -23,6 +24,7 @@ public class CommandBalance : IRocketCommand
public void Execute(IRocketPlayer caller, params string[] command)
{
+ UnturnedPlayer player = (UnturnedPlayer)caller;
if (command.Length == 1)
{
if (caller.HasPermission("balance.check"))
@@ -31,32 +33,36 @@ public void Execute(IRocketPlayer caller, params string[] command)
if (target != null)
{
var balance = Uconomy.Instance.Database.GetBalance(target.Id);
- UnturnedChat.Say(caller,
+
+ ChatManagerUtils.SendMessageToPlayer(player,
Uconomy.Instance.Translate("command_balance_show_otherPlayer",
- Uconomy.Instance.Configuration.Instance.MoneySymbol, balance,
- Uconomy.Instance.Configuration.Instance.MoneyName),
- UnturnedChat.GetColorFromName(Uconomy.MessageColor, Color.green));
+ Uconomy.Instance.Configuration.Instance.MoneySymbol, balance,
+ Uconomy.Instance.Configuration.Instance.MoneyName));
+
}
else
{
- UnturnedChat.Say(caller, Uconomy.Instance.Translate("command_balance_error_player_not_found"),
- UnturnedChat.GetColorFromName(Uconomy.MessageColor, Color.green));
+ ChatManagerUtils.SendMessageToPlayer(player, Uconomy.Instance.Translate("command_balance_error_player_not_found"));
}
}
else
{
- UnturnedChat.Say(caller, Uconomy.Instance.Translate("command_balance_check_noPermissions"),
- UnturnedChat.GetColorFromName(Uconomy.MessageColor, Color.green));
+ ChatManagerUtils.SendMessageToPlayer(player, Uconomy.Instance.Translate("command_balance_check_noPermissions"));
}
}
else
{
var balance = Uconomy.Instance.Database.GetBalance(caller.Id);
- UnturnedChat.Say(caller,
+
+
+
+ ChatManagerUtils.SendMessageToPlayer(player, Uconomy.Instance.Translations.Instance.Translate("command_balance_show", Uconomy.Instance.Configuration.Instance.MoneySymbol, balance,
+ Uconomy.Instance.Configuration.Instance.MoneyName));
+
+ ChatManagerUtils.SendMessageToPlayer(player,
Uconomy.Instance.Translations.Instance.Translate("command_balance_show",
Uconomy.Instance.Configuration.Instance.MoneySymbol, balance,
- Uconomy.Instance.Configuration.Instance.MoneyName),
- UnturnedChat.GetColorFromName(Uconomy.MessageColor, Color.green));
+ Uconomy.Instance.Configuration.Instance.MoneyName));
}
}
}
diff --git a/CommandPay.cs b/CommandPay.cs
index 56fcf93..c37b0f0 100644
--- a/CommandPay.cs
+++ b/CommandPay.cs
@@ -1,8 +1,10 @@
using System.Collections.Generic;
+using fr34kyn01535.Uconomy.Utils;
using Rocket.API;
using Rocket.Unturned.Chat;
using Rocket.Unturned.Commands;
using Rocket.Unturned.Player;
+using SDG.Unturned;
using UnityEngine;
namespace fr34kyn01535.Uconomy
@@ -25,8 +27,10 @@ public void Execute(IRocketPlayer caller, params string[] command)
{
if (command.Length != 2)
{
- UnturnedChat.Say(caller, Uconomy.Instance.Translations.Instance.Translate("command_pay_invalid"),
- UnturnedChat.GetColorFromName(Uconomy.MessageColor, Color.green));
+
+ ChatManagerUtils.SendMessageToPlayer(caller, Uconomy.Instance.Translations.Instance.Translate("command_pay_invalid"));
+
+
return;
}
@@ -38,17 +42,15 @@ public void Execute(IRocketPlayer caller, params string[] command)
{
if (caller.Id == otherPlayer)
{
- UnturnedChat.Say(caller,
- Uconomy.Instance.Translations.Instance.Translate("command_pay_error_pay_self"),
- UnturnedChat.GetColorFromName(Uconomy.MessageColor, Color.green));
+ ChatManagerUtils.SendMessageToPlayer(caller,
+ Uconomy.Instance.Translations.Instance.Translate("command_pay_error_pay_self"));
return;
}
if (!decimal.TryParse(command[1], out var amount) || amount <= 0)
{
- UnturnedChat.Say(caller,
- Uconomy.Instance.Translations.Instance.Translate("command_pay_error_invalid_amount"),
- UnturnedChat.GetColorFromName(Uconomy.MessageColor, Color.green));
+ ChatManagerUtils.SendMessageToPlayer(caller,
+ Uconomy.Instance.Translations.Instance.Translate("command_pay_error_invalid_amount"));
return;
}
@@ -56,41 +58,37 @@ public void Execute(IRocketPlayer caller, params string[] command)
{
Uconomy.Instance.Database.IncreaseBalance(otherPlayer, amount);
if (otherPlayerOnline != null)
- UnturnedChat.Say(otherPlayerOnline,
- Uconomy.Instance.Translations.Instance.Translate("command_pay_console", amount,
- Uconomy.Instance.Configuration.Instance.MoneyName),
- UnturnedChat.GetColorFromName(Uconomy.MessageColor, Color.green));
+ ChatManagerUtils.SendMessageToPlayer(caller,
+ Uconomy.Instance.Translations.Instance.Translate("command_pay_console", amount,
+ Uconomy.Instance.Configuration.Instance.MoneyName));
+
}
else
{
var myBalance = Uconomy.Instance.Database.GetBalance(caller.Id);
if (myBalance - amount <= 0)
{
- UnturnedChat.Say(caller,
- Uconomy.Instance.Translations.Instance.Translate("command_pay_error_cant_afford"),
- UnturnedChat.GetColorFromName(Uconomy.MessageColor, Color.green));
+ ChatManagerUtils.SendMessageToPlayer(caller,
+ Uconomy.Instance.Translations.Instance.Translate("command_pay_error_cant_afford"));
}
else
{
Uconomy.Instance.Database.IncreaseBalance(caller.Id, -amount);
if (otherPlayerOnline != null)
- UnturnedChat.Say(caller,
+ ChatManagerUtils.SendMessageToPlayer(caller,
Uconomy.Instance.Translations.Instance.Translate("command_pay_private",
otherPlayerOnline.CharacterName, amount,
- Uconomy.Instance.Configuration.Instance.MoneyName),
- UnturnedChat.GetColorFromName(Uconomy.MessageColor, Color.green));
+ Uconomy.Instance.Configuration.Instance.MoneyName));
else
- UnturnedChat.Say(caller,
+ ChatManagerUtils.SendMessageToPlayer(caller,
Uconomy.Instance.Translations.Instance.Translate("command_pay_private", otherPlayer,
- amount, Uconomy.Instance.Configuration.Instance.MoneyName),
- UnturnedChat.GetColorFromName(Uconomy.MessageColor, Color.green));
+ amount, Uconomy.Instance.Configuration.Instance.MoneyName));
Uconomy.Instance.Database.IncreaseBalance(otherPlayer, amount);
if (otherPlayerOnline != null)
- UnturnedChat.Say(otherPlayerOnline.CSteamID,
+ ChatManagerUtils.SendMessageToPlayer(caller,
Uconomy.Instance.Translations.Instance.Translate("command_pay_other_private", amount,
- Uconomy.Instance.Configuration.Instance.MoneyName, caller.DisplayName),
- UnturnedChat.GetColorFromName(Uconomy.MessageColor, Color.green));
+ Uconomy.Instance.Configuration.Instance.MoneyName, caller.DisplayName));
Uconomy.Instance.HasBeenPayed((UnturnedPlayer) caller, otherPlayer, amount);
}
@@ -98,7 +96,7 @@ public void Execute(IRocketPlayer caller, params string[] command)
}
else
{
- UnturnedChat.Say(caller,
+ ChatManagerUtils.SendMessageToPlayer(caller,
Uconomy.Instance.Translations.Instance.Translate("command_pay_error_player_not_found"));
}
}
diff --git a/Uconomy.csproj b/Uconomy.csproj
index 41b2968..4ef9e15 100644
--- a/Uconomy.csproj
+++ b/Uconomy.csproj
@@ -9,7 +9,7 @@
Properties
fr34kyn01535.Uconomy
Uconomy
- v4.6.1
+ v4.8
512
12.0.0
2.0
@@ -40,14 +40,14 @@
lib\Assembly-CSharp.dll
False
-
- lib\Assembly-CSharp-firstpass.dll
- False
-
Libraries\BouncyCastle.Crypto.dll
False
+
+ False
+ lib\com.rlabrecque.steamworks.net.dll
+
Libraries\Google.Protobuf.dll
False
@@ -130,6 +130,7 @@
+
@@ -159,14 +160,20 @@
Always
-
+
+
+
+
+
+
+