Merge pull request #161 from daffyyyy/main

1.8a

.github/workflows/build.yml

@@ -60,6 +60,8 @@ jobs:
           ${{ env.OUTPUT_PATH }}/Microsoft.Extensions.DependencyModel.dll \
     - name: Copy skins.json
       run: cp website/data/skins.json ${{ env.OUTPUT_PATH }}/skins.json
+    - name: Copy gloves.json
+      run: cp website/data/gloves.json ${{ env.OUTPUT_PATH }}/gloves.json
     - name: Zip
       uses: thedoctor0/zip-release@0.7.5
       with:

Commands.cs

@@ -32,8 +32,13 @@ namespace WeaponPaints
 	DateTime.UtcNow >= (commandsCooldown.TryGetValue((int)player.UserId, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
 				{
 					commandsCooldown[(int)player.UserId] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
+
 					if (weaponSync != null)
 						Task.Run(async () => await weaponSync.GetWeaponPaintsFromDatabase(playerInfo));
+
+					if (Config.Additional.GloveEnabled && weaponSync != null)
+						Task.Run(async () => await weaponSync.GetGloveFromDatabase(playerInfo));
+
 					if (Config.Additional.KnifeEnabled)
 					{
 						if (weaponSync != null)
@@ -68,11 +73,18 @@ namespace WeaponPaints
 			{
 				player!.Print(Localizer["wp_info_refresh"]);
 			}
-			if (!Config.Additional.KnifeEnabled) return;
+
-			if (!string.IsNullOrEmpty(Localizer["wp_info_knife"]))
+			if (Config.Additional.GloveEnabled)
-			{
+				if (!string.IsNullOrEmpty(Localizer["wp_info_glove"]))
-				player!.Print(Localizer["wp_info_knife"]);
+				{
-			}
+					player!.Print(Localizer["wp_info_glove"]);
+				}
+
+			if (Config.Additional.KnifeEnabled)
+				if (!string.IsNullOrEmpty(Localizer["wp_info_knife"]))
+				{
+					player!.Print(Localizer["wp_info_knife"]);
+				}
 		}
 
 		private void RegisterCommands()
@@ -107,7 +119,6 @@ namespace WeaponPaints
 				.ToDictionary(pair => pair.Key, pair => pair.Value);
 
 			var giveItemMenu = new ChatMenu(Localizer["wp_knife_menu_title"]);
-			giveItemMenu.PostSelectAction = PostSelectAction.Close;
 			var handleGive = (CCSPlayerController player, ChatMenuOption option) =>
 			{
 				if (!Utility.IsPlayerValid(player)) return;
@@ -138,7 +149,7 @@ namespace WeaponPaints
 					g_playersKnife[(int)player!.Index] = knifeKey;
 
 					if (g_bCommandsAllowed && (LifeState_t)player.LifeState == LifeState_t.LIFE_ALIVE)
-						RefreshKnife(player);
+						AddTimer(0.15f, () => RefreshWeapons(player), CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);
 
 					_ = weaponSync?.SyncKnifeToDatabase(playerInfo, knifeKey) ?? Task.CompletedTask;
 				}
@@ -157,6 +168,7 @@ namespace WeaponPaints
 					DateTime.UtcNow >= (commandsCooldown.TryGetValue((int)player.UserId, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
 				{
 					commandsCooldown[(int)player.UserId] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
+					giveItemMenu.PostSelectAction = PostSelectAction.Close;
 					MenuManager.OpenChatMenu(player, giveItemMenu);
 					return;
 				}
@@ -226,7 +238,7 @@ namespace WeaponPaints
 								);
 								string image = foundSkin?["image"]?.ToString() ?? "";
 								PlayerWeaponImage[p.Slot] = image;
-								AddTimer(2.0f, () => PlayerWeaponImage.Remove(p.Slot));
+								AddTimer(2.0f, () => PlayerWeaponImage.Remove(p.Slot), CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);
 							}
 
 							p.Print(Localizer["wp_skin_menu_select", selectedSkin]);
@@ -250,7 +262,8 @@ namespace WeaponPaints
 							};
 
 							if (g_bCommandsAllowed && (LifeState_t)p.LifeState == LifeState_t.LIFE_ALIVE)
-								RefreshWeapons(p);
+								AddTimer(0.15f, () => RefreshWeapons(p), CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);
+
 
 							if (!Config.GlobalShare)
 							{
@@ -309,5 +322,89 @@ namespace WeaponPaints
 						}
 					});
 		}
+
+		private void SetupGlovesMenu()
+		{
+			var glovesSelectionMenu = new ChatMenu(Localizer["wp_glove_menu_title"]);
+
+			var handleGloveSelection = (CCSPlayerController? player, ChatMenuOption option) =>
+			{
+				if (!Utility.IsPlayerValid(player)) return;
+
+				uint playerIndex = player!.Index;
+				string selectedPaintName = option.Text;
+
+				var selectedGlove = glovesList.FirstOrDefault(g => g.ContainsKey("paint_name") && g["paint_name"]?.ToString() == selectedPaintName);
+				if (selectedGlove != null)
+				{
+					if (
+						selectedGlove != null &&
+						selectedGlove.ContainsKey("weapon_defindex") &&
+						selectedGlove.ContainsKey("paint") &&
+						int.TryParse(selectedGlove["weapon_defindex"]?.ToString(), out int weaponDefindex) &&
+						int.TryParse(selectedGlove["paint"]?.ToString(), out int paint)
+					)
+					{
+						if (Config.Additional.ShowSkinImage)
+						{
+							string image = selectedGlove["image"]?.ToString() ?? "";
+							PlayerWeaponImage[player.Slot] = image;
+							AddTimer(2.0f, () => PlayerWeaponImage.Remove(player.Slot), CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);
+						}
+
+						PlayerInfo playerInfo = new PlayerInfo
+						{
+							UserId = player.UserId,
+							Index = (int)player.Index,
+							SteamId = player.SteamID.ToString(),
+							Name = player.PlayerName,
+							IpAddress = player.IpAddress?.Split(":")[0]
+						};
+
+						if (paint != 0)
+							g_playersGlove[playerIndex] = ((ushort)weaponDefindex, paint);
+						else
+							g_playersGlove.TryRemove(playerIndex, out _);
+
+						if (!string.IsNullOrEmpty(Localizer["wp_glove_menu_select"]))
+						{
+							player!.Print(Localizer["wp_glove_menu_select", selectedPaintName]);
+						}
+
+						_ = weaponSync?.SyncGloveToDatabase(playerInfo, (ushort)weaponDefindex, paint) ?? Task.CompletedTask;
+					}
+				};
+			};
+
+			// Add weapon options to the weapon selection menu
+			foreach (var gloveObject in glovesList)
+			{
+				string paintName = gloveObject["paint_name"]?.ToString() ?? "";
+
+				if (paintName.Length > 0)
+					glovesSelectionMenu.AddMenuOption(paintName, handleGloveSelection);
+			}
+
+			// Command to open the weapon selection menu for players
+			AddCommand($"css_{Config.Additional.CommandGlove}", "Gloves selection menu", (player, info) =>
+					{
+						if (!Utility.IsPlayerValid(player)) return;
+
+						if (player == null || player.UserId == null) return;
+
+						if (!commandsCooldown.TryGetValue((int)player.UserId, out DateTime cooldownEndTime) ||
+					DateTime.UtcNow >= (commandsCooldown.TryGetValue((int)player.UserId, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
+						{
+							commandsCooldown[(int)player.UserId] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
+							glovesSelectionMenu.PostSelectAction = PostSelectAction.Close;
+							MenuManager.OpenChatMenu(player, glovesSelectionMenu);
+							return;
+						}
+						if (!string.IsNullOrEmpty(Localizer["wp_command_cooldown"]))
+						{
+							player!.Print(Localizer["wp_command_cooldown"]);
+						}
+					});
+		}
 	}
 }

Config.cs

@@ -11,6 +11,9 @@ namespace WeaponPaints
 		[JsonPropertyName("KnifeEnabled")]
 		public bool KnifeEnabled { get; set; } = true;
 
+		[JsonPropertyName("GloveEnabled")]
+		public bool GloveEnabled { get; set; } = true;
+
 		[JsonPropertyName("SkinEnabled")]
 		public bool SkinEnabled { get; set; } = true;
 
@@ -23,6 +26,9 @@ namespace WeaponPaints
 		[JsonPropertyName("CommandKnife")]
 		public string CommandKnife { get; set; } = "knife";
 
+		[JsonPropertyName("CommandGlove")]
+		public string CommandGlove { get; set; } = "gloves";
+
 		[JsonPropertyName("CommandSkin")]
 		public string CommandSkin { get; set; } = "ws";
 

Events.cs

@@ -10,7 +10,7 @@ namespace WeaponPaints
 			CCSPlayerController? player = Utilities.GetPlayerFromSlot(playerSlot);
 
 			if (player is null || !player.IsValid || player.IsBot || player.IsHLTV || player.SteamID.ToString().Length != 17 ||
-				weaponSync == null || player.Connected == PlayerConnectedState.PlayerDisconnecting) return;
+				weaponSync == null) return;
 
 			PlayerInfo playerInfo = new PlayerInfo
 			{
@@ -21,17 +21,16 @@ namespace WeaponPaints
 				IpAddress = player.IpAddress?.Split(":")[0]
 			};
 
-			if (!gPlayerWeaponsInfo.ContainsKey((int)player.Index))
+			Task.Run(async () =>
 			{
-				_ = Task.Run(async () =>
+				if (Config.Additional.SkinEnabled)
-				{
+					await weaponSync.GetWeaponPaintsFromDatabase(playerInfo);
-					if (Config.Additional.SkinEnabled)
-						await weaponSync.GetWeaponPaintsFromDatabase(playerInfo);
 
-					if (Config.Additional.KnifeEnabled)
+				if (Config.Additional.KnifeEnabled)
-						await weaponSync.GetKnifeFromDatabase(playerInfo);
+					await weaponSync.GetKnifeFromDatabase(playerInfo);
-				});
+				if (Config.Additional.GloveEnabled)
-			}
+					await weaponSync.GetGloveFromDatabase(playerInfo);
+			});
 		}
 
 		private void OnClientDisconnect(int playerSlot)
@@ -42,6 +41,8 @@ namespace WeaponPaints
 
 			if (Config.Additional.KnifeEnabled)
 				g_playersKnife.TryRemove((int)player.Index, out _);
+			if (Config.Additional.GloveEnabled)
+				g_playersGlove.TryRemove(player.Index, out _);
 
 			if (Config.Additional.SkinEnabled && gPlayerWeaponsInfo.TryGetValue((int)player.Index, out var innerDictionary))
 			{
@@ -118,10 +119,9 @@ namespace WeaponPaints
 
 				if (Config.Additional.GiveKnifeAfterRemove)
 				{
-					AddTimer(0.37f, () =>
+					AddTimer(0.10f, () =>
 					{
-						player.RemoveItemByDesignerName(weapon.DesignerName, true);
+						RefreshWeapons(player);
-						GiveKnifeToPlayer(player);
 					});
 				}
 			}
@@ -131,7 +131,7 @@ namespace WeaponPaints
 
 		private void OnMapStart(string mapName)
 		{
-			if (!Config.Additional.KnifeEnabled && !Config.Additional.SkinEnabled) return;
+			if (!Config.Additional.KnifeEnabled && !Config.Additional.SkinEnabled && !Config.Additional.GloveEnabled) return;
 
 			if (_database != null)
 				weaponSync = new WeaponSynchronization(_database, Config, GlobalShareApi, GlobalShareServerId);
@@ -153,9 +153,27 @@ namespace WeaponPaints
 		{
 			CCSPlayerController? player = @event.Userid;
 
-			if (player is null || !player.IsValid || !Config.Additional.KnifeEnabled)
+			if (player is null || !player.IsValid || !Config.Additional.KnifeEnabled && !Config.Additional.GloveEnabled)
 				return HookResult.Continue;
 
+			if (g_playersGlove.TryGetValue(player.Index, out var gloveInfo) && gloveInfo.Paint != 0)
+			{
+				player.PlayerPawn!.Value!.EconGloves.ItemDefinitionIndex = gloveInfo.Definition;
+				player.PlayerPawn!.Value!.EconGloves.ItemIDLow = 16384 & 0xFFFFFFFF;
+				player.PlayerPawn!.Value!.EconGloves.ItemIDHigh = 16384 >> 32;
+				player.PlayerPawn!.Value!.EconGloves.EntityQuality = 3;
+				player.PlayerPawn!.Value!.EconGloves.EntityLevel = 1;
+
+				Server.NextFrame(() =>
+				{
+					player.PlayerPawn!.Value!.EconGloves.Initialized = true;
+					SetPlayerBody(player, "default_gloves", 1);
+					SetOrAddAttributeValueByName(player.PlayerPawn!.Value!.EconGloves.NetworkedDynamicAttributes, "set item texture prefab", gloveInfo.Paint);
+
+					Utilities.SetStateChanged(player.PlayerPawn.Value, "CCSPlayerPawn", "m_EconGloves");
+				});
+			}
+
 			g_knifePickupCount[(int)player.Index] = 0;
 			GiveKnifeToPlayer(player);
 

Utility.cs

@@ -49,12 +49,18 @@ namespace WeaponPaints
                         `weapon_paint_id` int(6) NOT NULL,
                         `weapon_wear` float NOT NULL DEFAULT 0.000001,
                         `weapon_seed` int(16) NOT NULL DEFAULT 0
-                    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci",
+                    ) ENGINE=InnoDB",
 				@"CREATE TABLE IF NOT EXISTS `wp_player_knife` (
                         `steamid` varchar(64) NOT NULL,
                         `knife` varchar(64) NOT NULL,
                         UNIQUE (`steamid`)
-                    ) ENGINE = InnoDB"
+                    ) ENGINE = InnoDB",
+				@"CREATE TABLE IF NOT EXISTS `wp_player_gloves` (
+					 `steamid` varchar(64) NOT NULL,
+					 `weapon_defindex` int(11) NOT NULL,
+					 `paint` int(11) NOT NULL,
+                      UNIQUE (`steamid`)
+					) ENGINE=InnoDB"
 			};
 
 					foreach (var query in createTableQueries)
@@ -98,6 +104,20 @@ namespace WeaponPaints
 			}
 		}
 
+		internal static void LoadGlovesFromFile(string filePath)
+		{
+			try
+			{
+				string json = File.ReadAllText(filePath);
+				var deserializedSkins = JsonConvert.DeserializeObject<List<JObject>>(json);
+				WeaponPaints.glovesList = deserializedSkins ?? new List<JObject>();
+			}
+			catch (FileNotFoundException)
+			{
+				throw;
+			}
+		}
+
 		internal static void Log(string message)
 		{
 			Console.BackgroundColor = ConsoleColor.DarkGray;

VERSION

@@ -1 +1 @@
-1.7a
+1.8a

WeaponAction.cs

@@ -268,8 +268,10 @@ namespace WeaponPaints
 				}
 
 				player.RemoveWeapons();
-				AddTimer(0.2f, () =>
+				AddTimer(0.35f, () =>
 				{
+					GiveKnifeToPlayer(player);
+
 					if (bomb)
 						player.GiveNamedItem("weapon_c4");
 
@@ -286,8 +288,6 @@ namespace WeaponPaints
 					if (healthshot)
 						player.GiveNamedItem("weapon_healtshot");
 
-					GiveKnifeToPlayer(player);
-
 					foreach (var entry in weaponsWithAmmo)
 					{
 						foreach (var ammo in entry.Value)
@@ -310,7 +310,7 @@ namespace WeaponPaints
 							});
 						}
 					}
-				});
+				}, CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);
 			}
 		}
 
@@ -375,6 +375,18 @@ namespace WeaponPaints
 			return new CSkeletonInstance(GetSkeletonInstance(node.Handle));
 		}
 
+		public void SetOrAddAttributeValueByName(CAttributeList attr, string name, float f)
+		{
+			var SetAttr = VirtualFunction.Create<IntPtr, string, float, int>("\\x55\\x48\\x89\\xE5\\x41\\x57\\x41\\x56\\x49\\x89\\xFE\\x41\\x55\\x41\\x54\\x49\\x89\\xF4\\x53\\x48\\x83\\xEC\\x78");
+			SetAttr(attr.Handle, name, f);
+		}
+
+		public void SetPlayerBody(CCSPlayerController player, string model, int i)
+		{
+			var SetBody = VirtualFunction.Create<IntPtr, string, int, int>("\\x55\\x48\\x89\\xE5\\x41\\x56\\x49\\x89\\xF6\\x41\\x55\\x41\\x89\\xD5\\x41\\x54\\x49\\x89\\xFC\\x48\\x83\\xEC\\x08");
+			SetBody(player.PlayerPawn.Value!.Handle, model, i);
+		}
+
 		private static unsafe CHandle<CBaseViewModel>[]? GetPlayerViewModels(CCSPlayerController player)
 		{
 			if (player.PlayerPawn.Value == null || player.PlayerPawn.Value.ViewModelServices == null) return null;

WeaponPaints.cs

@@ -10,7 +10,7 @@ using System.Collections.Concurrent;
 
 namespace WeaponPaints;
 
-[MinimumApiVersion(163)]
+[MinimumApiVersion(167)]
 public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 {
 	internal static readonly Dictionary<string, string> weaponList = new()
@@ -77,8 +77,10 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 	internal static IStringLocalizer? _localizer;
 	internal static Dictionary<int, int> g_knifePickupCount = new Dictionary<int, int>();
 	internal static ConcurrentDictionary<int, string> g_playersKnife = new ConcurrentDictionary<int, string>();
+	internal static ConcurrentDictionary<uint, (ushort Definition, int Paint)> g_playersGlove = new ConcurrentDictionary<uint, (ushort Definition, int Paint)>();
 	internal static ConcurrentDictionary<int, ConcurrentDictionary<int, WeaponInfo>> gPlayerWeaponsInfo = new ConcurrentDictionary<int, ConcurrentDictionary<int, WeaponInfo>>();
 	internal static List<JObject> skinsList = new List<JObject>();
+	internal static List<JObject> glovesList = new List<JObject>();
 	internal static WeaponSynchronization? weaponSync;
 	internal bool g_bCommandsAllowed = true;
 	internal Dictionary<int, string> PlayerWeaponImage = new();
@@ -88,7 +90,6 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 	internal static Dictionary<int, DateTime> commandsCooldown = new Dictionary<int, DateTime>();
 	internal static Database? _database;
 
-	//private CounterStrikeSharp.API.Modules.Timers.Timer? g_hTimerCheckSkinsData = null;
 	public static Dictionary<int, string> WeaponDefindex { get; } = new Dictionary<int, string>
 	{
 		{ 1, "weapon_deagle" },
@@ -150,9 +151,9 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 
 	public WeaponPaintsConfig Config { get; set; } = new();
 	public override string ModuleAuthor => "Nereziel & daffyy";
-	public override string ModuleDescription => "Skin and knife selector, standalone and web-based";
+	public override string ModuleDescription => "Skin, gloves and knife selector, standalone and web-based";
 	public override string ModuleName => "WeaponPaints";
-	public override string ModuleVersion => "1.7a";
+	public override string ModuleVersion => "1.8a";
 
 	public static WeaponPaintsConfig GetWeaponPaintsConfig()
 	{
@@ -188,17 +189,23 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 					_ = weaponSync.GetWeaponPaintsFromDatabase(playerInfo);
 				if (Config.Additional.KnifeEnabled)
 					_ = weaponSync.GetKnifeFromDatabase(playerInfo);
+				if (Config.Additional.GloveEnabled)
+					_ = weaponSync.GetGloveFromDatabase(playerInfo);
 			}
 		}
+
+		Utility.LoadSkinsFromFile(ModuleDirectory + "/skins.json");
+		Utility.LoadGlovesFromFile(ModuleDirectory + "/gloves.json");
+
 		if (Config.Additional.KnifeEnabled)
 			SetupKnifeMenu();
 		if (Config.Additional.SkinEnabled)
 			SetupSkinsMenu();
+		if (Config.Additional.GloveEnabled)
+			SetupGlovesMenu();
 
 		RegisterListeners();
 		RegisterCommands();
-
-		Utility.LoadSkinsFromFile(ModuleDirectory + "/skins.json");
 	}
 
 	public void OnConfigParsed(WeaponPaintsConfig config)
@@ -211,11 +218,6 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 				throw new Exception("[WeaponPaints] You need to setup Database credentials in config!");
 			}
 
-			/*
-			DatabaseConnectionString = Utility.BuildDatabaseConnectionString();
-			Utility.TestDatabaseConnection();
-			*/
-
 			var builder = new MySqlConnectionStringBuilder
 			{
 				Server = config.DatabaseHost,

WeaponPaints.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.167" />
+    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.168" />
     <PackageReference Include="Dapper" Version="2.1.28" />
     <PackageReference Include="MySqlConnector" Version="2.3.5" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

WeaponSynchronization.cs

@@ -63,15 +63,34 @@ namespace WeaponPaints
 					return;
 				}
 
-				await using (var connection = await _database.GetConnectionAsync())
+				await using var connection = await _database.GetConnectionAsync();
-				{
+				string query = "SELECT `knife` FROM `wp_player_knife` WHERE `steamid` = @steamid";
-					string query = "SELECT `knife` FROM `wp_player_knife` WHERE `steamid` = @steamid";
+				string? playerKnife = await connection.QueryFirstOrDefaultAsync<string>(query, new { steamid = player.SteamId });
-					string? playerKnife = await connection.QueryFirstOrDefaultAsync<string>(query, new { steamid = player.SteamId });
 
-					if (playerKnife != null)
+				if (!string.IsNullOrEmpty(playerKnife))
-					{
+				{
-						WeaponPaints.g_playersKnife[player.Index] = playerKnife;
+					WeaponPaints.g_playersKnife[player.Index] = playerKnife;
-					}
+				}
+			}
+			catch (Exception e)
+			{
+				Utility.Log(e.Message);
+				return;
+			}
+		}
+
+		internal async Task GetGloveFromDatabase(PlayerInfo player)
+		{
+			if (!_config.Additional.GloveEnabled) return;
+			try
+			{
+				await using var connection = await _database.GetConnectionAsync();
+				string query = "SELECT `weapon_defindex`, `paint` FROM `wp_player_gloves` WHERE `steamid` = @steamid";
+				var gloveData = await connection.QueryFirstOrDefaultAsync<(ushort Definition, int Paint)>(query, new { steamid = player.SteamId });
+
+				if (gloveData != default)
+				{
+					WeaponPaints.g_playersGlove[(uint)player.Index] = gloveData;
 				}
 			}
 			catch (Exception e)
@@ -84,7 +103,6 @@ namespace WeaponPaints
 		internal async Task GetWeaponPaintsFromDatabase(PlayerInfo player)
 		{
 			if (!_config.Additional.SkinEnabled) return;
-			if (player.SteamId == null || player.Index == 0) return;
 
 			if (!WeaponPaints.gPlayerWeaponsInfo.TryGetValue(player.Index, out _))
 			{
@@ -143,26 +161,25 @@ namespace WeaponPaints
 					}
 				}
 
-				await using (var connection = await _database.GetConnectionAsync())
+				await using var connection = await _database.GetConnectionAsync();
+				string query = "SELECT * FROM `wp_player_skins` WHERE `steamid` = @steamid";
+				var playerSkins = await connection.QueryAsync<dynamic>(query, new { steamid = player.SteamId });
+
+				foreach (var row in playerSkins)
 				{
-					string query = "SELECT * FROM `wp_player_skins` WHERE `steamid` = @steamid";
+					int? weaponDefIndex = row.weapon_defindex;
-					var playerSkins = await connection.QueryAsync(query, new { steamid = player.SteamId });
+					int? weaponPaintId = row.weapon_paint_id;
+					float? weaponWear = row.weapon_wear;
+					int? weaponSeed = row.weapon_seed;
 
-					foreach (var row in playerSkins)
+					WeaponInfo weaponInfo = new WeaponInfo
 					{
-						int weaponDefIndex = row.weapon_defindex ?? default;
+						Paint = weaponPaintId.HasValue ? weaponPaintId.Value : 0,
-						int weaponPaintId = row.weapon_paint_id ?? default;
+						Seed = weaponSeed.HasValue ? weaponSeed.Value : 0,
-						float weaponWear = row.weapon_wear ?? default;
+						Wear = weaponWear.HasValue ? weaponWear.Value : 0f
-						int weaponSeed = row.weapon_seed ?? default;
+					};
 
-						WeaponInfo weaponInfo = new WeaponInfo
+					WeaponPaints.gPlayerWeaponsInfo[player.Index][weaponDefIndex.GetValueOrDefault()] = weaponInfo;
-						{
-							Paint = weaponPaintId,
-							Seed = weaponSeed,
-							Wear = weaponWear
-						};
-						WeaponPaints.gPlayerWeaponsInfo[player.Index][weaponDefIndex] = weaponInfo;
-					}
 				}
 			}
 			catch (Exception e)
@@ -175,7 +192,6 @@ namespace WeaponPaints
 		internal async Task SyncKnifeToDatabase(PlayerInfo player, string knife)
 		{
 			if (!_config.Additional.KnifeEnabled) return;
-			if (player.SteamId == null || player.Index == 0) return;
 
 			try
 			{
@@ -189,6 +205,22 @@ namespace WeaponPaints
 			}
 		}
 
+		internal async Task SyncGloveToDatabase(PlayerInfo player, ushort defindex, int paint)
+		{
+			if (!_config.Additional.GloveEnabled) return;
+
+			try
+			{
+				await using var connection = await _database.GetConnectionAsync();
+				string query = "INSERT INTO `wp_player_gloves` (`steamid`, `weapon_defindex`, `paint`) VALUES(@steamid, @weapon_defindex, @paint) ON DUPLICATE KEY UPDATE `weapon_defindex` = @weapon_defindex, `paint` = @paint";
+				await connection.ExecuteAsync(query, new { steamid = player.SteamId, weapon_defindex = defindex, paint });
+			}
+			catch (Exception e)
+			{
+				Utility.Log(e.Message);
+			}
+		}
+
 		internal async Task SyncWeaponPaintsToDatabase(PlayerInfo player)
 		{
 			if (player == null || player.Index <= 0 || player.SteamId == null) return;

lang/en.json

@@ -3,11 +3,14 @@
 	"wp_info_website": "Visit {lime}{0}{default} where you can change skins",
 	"wp_info_refresh": "Type {lime}!wp{default} to synchronize chosen skins",
 	"wp_info_knife": "Type {lime}!knife{default} to open knife menu",
+	"wp_info_glove": "Type {lime}!gloves{default} to open gloves menu",
 	"wp_command_cooldown": "{lightred}You can't refresh weapon paints right now",
 	"wp_command_refresh_done": "{lime}Refreshing weapon paints",
 	"wp_knife_menu_select": "You have chosen {lime}{0}{default} as your knife",
-	"wp_knife_menu_kill": "To correctly apply skin for knife, you need to type {lime}!kill{default}",
+	"wp_knife_menu_kill": "",
 	"wp_knife_menu_title": "Knife Menu",
+	"wp_glove_menu_select": "You have chosen {lime}{0}{default} as your glove",
+	"wp_glove_menu_title": "Gloves Menu",
 	"wp_skin_menu_weapon_title": "Weapon Menu",
 	"wp_skin_menu_skin_title": "Select skin for {lime}{0}{default}",
 	"wp_skin_menu_select": "You have chosen {lime}{0}{default} as your skin"

lang/lv.json

@@ -1,14 +1,17 @@
 {
-	"wp_prefix": "{lightblue}[Ieroču Ādiņas] {default}",
+	"wp_prefix": "{lightblue}[WeaponPaints] {default}",
-	"wp_info_website": "Apmeklē {lime}{0}{default} kur tu vari nomainīt skinus",
+	"wp_info_website": "Apmeklējiet {lime}{0}{default}, kur varat mainīt ādas",
-	"wp_info_refresh": "Raksti {lime}!wp{default} lai sinhronizētu izvēlētos skinus",
+	"wp_info_refresh": "Ievadiet {lime}!wp{default}, lai sinhronizētu izvēlētās ādas",
-	"wp_info_knife": "Raksti {lime}!knife{default} lai atvērtu nažu izvēlni",
+	"wp_info_knife": "Ievadiet {lime}!knife{default}, lai atvērtu nazis izvēlni",
-	"wp_command_cooldown": "{lightred} Tu šobrīd nevari atjaunot ieroču skinus...",
+	"wp_info_glove": "Ievadiet {lime}!gloves{default}, lai atvērtu cimdi izvēlni",
-	"wp_command_refresh_done": "{lime}Izvēlētie skini tiek atjaunoti",
+	"wp_command_cooldown": "{lightred}Šobrīd jūs nevarat atjaunot ieroču ādas",
-	"wp_knife_menu_select": "Tu esi izvēlējies {lime}{0}{default} nazi",
+	"wp_command_refresh_done": "{lime}Atjauno ieroču ādas",
-	"wp_knife_menu_kill": "Lai pareizi atjaunotu naža skinu, ieraksti čatā {lime}!kill{default}",
+	"wp_knife_menu_select": "Jūs esat izvēlējies {lime}{0}{default} kā savu nazi",
-	"wp_knife_menu_title": "Nažu Izvēlne",
+	"wp_knife_menu_kill": "",
+	"wp_knife_menu_title": "Nazis Izvēlne",
+	"wp_glove_menu_select": "Jūs esat izvēlējies {lime}{0}{default} kā savus cimdus",
+	"wp_glove_menu_title": "Cimdu Izvēlne",
 	"wp_skin_menu_weapon_title": "Ieroču Izvēlne",
-	"wp_skin_menu_skin_title": "Izvēlies skinu ierocim: {lime}{0}{default}",
+	"wp_skin_menu_skin_title": "Izvēlieties ādu {lime}{0}{default}",
-	"wp_skin_menu_select": "Tu esi izvēlējies {lime}{0}{default} kā savu skinu"
+	"wp_skin_menu_select": "Jūs esat izvēlējies {lime}{0}{default} kā savu ādu"
-}
+}

lang/pl.json

@@ -1,14 +1,17 @@
 {
 	"wp_prefix": "{lightblue}[WeaponPaints] {default}",
-	"wp_info_website": "Odwiedź {lime}{0}{default} gdzie będziesz mógł ustawić skiny",
+	"wp_info_website": "Odwiedź {lime}{0}{default}, gdzie możesz zmieniać skórki",
-	"wp_info_refresh": "Wpisz {lime}!wp{default} aby zsynchronizować swoje skiny",
+	"wp_info_refresh": "Wpisz {lime}!wp{default}, aby zsynchronizować wybrane skórki",
-	"wp_info_knife": "Wpisz {lime}!knife{default} aby wy<EFBFBD>wietlić menu no<EFBFBD>y",
+	"wp_info_knife": "Wpisz {lime}!knife{default}, aby otworzyć menu noży",
-	"wp_command_cooldown": "{lightred}Odczekaj chwilę przed wykonaniem tej komendy...",
+	"wp_info_glove": "Wpisz {lime}!gloves{default}, aby otworzyć menu rękawiczek",
-	"wp_command_refresh_done": "{lime}Pomyslnie zsynchronizowano twoje skiny",
+	"wp_command_cooldown": "{lightred}Nie możesz teraz odświeżyć skórek broni",
+	"wp_command_refresh_done": "{lime}Odświeżanie skórek broni",
 	"wp_knife_menu_select": "Wybrałeś {lime}{0}{default} jako swój nóż",
-	"wp_knife_menu_kill": "Do prawidłowego zastosowania noża użyj {lime}!kill{default}",
+	"wp_knife_menu_kill": "",
-	"wp_knife_menu_title": "Menu noży",
+	"wp_knife_menu_title": "Menu Noży",
-	"wp_skin_menu_weapon_title": "Menu broni",
+	"wp_glove_menu_select": "Wybrałeś {lime}{0}{default} jako swoje rękawiczki",
-	"wp_skin_menu_skin_title": "Wybierz skin dla {lime}{0}{default}",
+	"wp_glove_menu_title": "Menu Rękawiczek",
-	"wp_skin_menu_select": "Wybrałeś {lime}{0}{default} jako swój skin"
+	"wp_skin_menu_weapon_title": "Menu Broni",
-}
+	"wp_skin_menu_skin_title": "Wybierz skórkę dla {lime}{0}{default}",
+	"wp_skin_menu_select": "Wybrałeś {lime}{0}{default} jako swoją skórkę"
+}

lang/pt-BR.json

@@ -1,14 +1,17 @@
 {
 	"wp_prefix": "{lightblue}[WeaponPaints] {default}",
-	"wp_info_website": "Visite {lime}{0}{default} para mudar suas skins e faca",
+	"wp_info_website": "Visite {lime}{0}{default}, onde você pode alterar skins",
-	"wp_info_refresh": "Digite {lime}!wp{default} para sincronizar as suas skins",
+	"wp_info_refresh": "Digite {lime}!wp{default} para sincronizar as skins selecionadas",
 	"wp_info_knife": "Digite {lime}!knife{default} para abrir o menu de facas",
-	"wp_command_cooldown": "{lightred}Você não pode atualizar as skins das armas agora",
+	"wp_info_glove": "Digite {lime}!gloves{default} para abrir o menu de luvas",
-	"wp_command_refresh_done": "{lime}Sincronizando as suas skins",
+	"wp_command_cooldown": "{lightred}Você não pode atualizar as skins de arma agora",
+	"wp_command_refresh_done": "{lime}Atualizando as skins de arma",
 	"wp_knife_menu_select": "Você escolheu {lime}{0}{default} como sua faca",
-	"wp_knife_menu_kill": "Para aplicar corretamente a skin da faca, você precisa digitar {lime}!kill{default}",
+	"wp_knife_menu_kill": "",
 	"wp_knife_menu_title": "Menu de Facas",
+	"wp_glove_menu_select": "Você escolheu {lime}{0}{default} como suas luvas",
+	"wp_glove_menu_title": "Menu de Luvas",
 	"wp_skin_menu_weapon_title": "Menu de Armas",
-	"wp_skin_menu_skin_title": "Selecionou a skin para {lime}{0}{default}",
+	"wp_skin_menu_skin_title": "Selecione uma skin para {lime}{0}{default}",
 	"wp_skin_menu_select": "Você escolheu {lime}{0}{default} como sua skin"
-}
+}

lang/pt-PT.json

@@ -1,14 +1,17 @@
 {
 	"wp_prefix": "{lightblue}[WeaponPaints] {default}",
-	"wp_info_website": "Visita {lime}{0}{default} onde podes mudar as tuas skins",
+	"wp_info_website": "Visite {lime}{0}{default}, onde pode alterar skins",
-	"wp_info_refresh": "Digita {lime}!wp{default} para sincronizar as tuas skins",
+	"wp_info_refresh": "Digite {lime}!wp{default} para sincronizar as skins selecionadas",
-	"wp_info_knife": "Digita {lime}!knife{default} para abrir o menu de facas",
+	"wp_info_knife": "Digite {lime}!knife{default} para abrir o menu de facas",
-	"wp_command_cooldown": "{lightred}Tu não podes sincronizar agora as tuas skins",
+	"wp_info_glove": "Digite {lime}!gloves{default} para abrir o menu de luvas",
-	"wp_command_refresh_done": "{lime}Sincronizando as tuas skins",
+	"wp_command_cooldown": "{lightred}Você não pode atualizar as skins de arma agora",
-	"wp_knife_menu_select": "Tu escolheste {lime}{0}{default} como a tua faca",
+	"wp_command_refresh_done": "{lime}Atualizando as skins de arma",
-	"wp_knife_menu_kill": "Para aplicar corretamente a skins para a tua faca, digita {lime}!kill{default}",
+	"wp_knife_menu_select": "Você escolheu {lime}{0}{default} como sua faca",
-	"wp_knife_menu_title": "Menu Facas",
+	"wp_knife_menu_kill": "",
+	"wp_knife_menu_title": "Menu de Facas",
+	"wp_glove_menu_select": "Você escolheu {lime}{0}{default} como suas luvas",
+	"wp_glove_menu_title": "Menu de Luvas",
 	"wp_skin_menu_weapon_title": "Menu de Armas",
-	"wp_skin_menu_skin_title": "Escolhe a skin para {lime}{0}{default}",
+	"wp_skin_menu_skin_title": "Selecione uma skin para {lime}{0}{default}",
-	"wp_skin_menu_select": "Tu escolheste {lime}{0}{default} como a tua skin"
+	"wp_skin_menu_select": "Você escolheu {lime}{0}{default} como sua skin"
-}
+}

lang/ru.json

@@ -1,14 +1,17 @@
 {
 	"wp_prefix": "{lightblue}[WeaponPaints] {default}",
-	"wp_info_website": "Посетите сайт {lime}{0},{default} чтобы выбрать скин",
+	"wp_info_website": "Посетите {lime}{0}{default}, где вы можете изменить скины",
-	"wp_info_refresh": "Наберите в чат {lime}!wp{default} для синхронизации выбранных скинов",
+	"wp_info_refresh": "Введите {lime}!wp{default}, чтобы синхронизировать выбранные скины",
-	"wp_info_knife": "Наберите в чат {lime}!knife,{default} чтобы выбрать нож",
+	"wp_info_knife": "Введите {lime}!knife{default}, чтобы открыть меню ножей",
-	"wp_command_cooldown": "{lightred}Вы не можете выбрать оружие прямо сейчас",
+	"wp_info_glove": "Введите {lime}!gloves{default}, чтобы открыть меню перчаток",
-	"wp_command_refresh_done": "{lime}Обновление скинов для оружия",
+	"wp_command_cooldown": "{lightred}Вы не можете обновить скины оружия сейчас",
-	"wp_knife_menu_select": "Вы выбрали {lime}{0}{default} скин для ножа",
+	"wp_command_refresh_done": "{lime}Обновление скинов оружия",
-	"wp_knife_menu_kill": "Чтобы правильно применить скин для ножа, набери в чат {lime}!kill{default}",
+	"wp_knife_menu_select": "Вы выбрали {lime}{0}{default} в качестве вашего ножа",
-	"wp_knife_menu_title": "Меню ножей",
+	"wp_knife_menu_kill": "",
-	"wp_skin_menu_weapon_title": "Меню оружия",
+	"wp_knife_menu_title": "Меню Ножей",
+	"wp_glove_menu_select": "Вы выбрали {lime}{0}{default} в качестве ваших перчаток",
+	"wp_glove_menu_title": "Меню Перчаток",
+	"wp_skin_menu_weapon_title": "Меню Оружия",
 	"wp_skin_menu_skin_title": "Выберите скин для {lime}{0}{default}",
-	"wp_skin_menu_select": "Вы выбрали {lime}{0}{default} скина для оружия"
+	"wp_skin_menu_select": "Вы выбрали {lime}{0}{default} в качестве вашего скина"
 }

lang/tr.json

@@ -1,14 +1,17 @@
 {
 	"wp_prefix": "{lightblue}[WeaponPaints] {default}",
-	"wp_info_website": "Görünümleri değiştirebileceğiniz {lime}{0}{default} adresini ziyaret edin",
+	"wp_info_website": "Ziyaret edin {lime}{0}{default}, burada skinleri değiştirebilirsiniz",
-	"wp_info_refresh": "Seçilen kaplamyı senkronize etmek için {lime}!wp{default} yazın",
+	"wp_info_refresh": "Senkronize edilen skinleri görmek için {lime}!wp{default} yazın",
 	"wp_info_knife": "Bıçak menüsünü açmak için {lime}!knife{default} yazın",
-	"wp_command_cooldown": "{lightred}Şu anda silah kaplamasını yenileyemezsiniz",
+	"wp_info_glove": "Eldiven menüsünü açmak için {lime}!gloves{default} yazın",
-	"wp_command_refresh_done": "{lime}Silah kaplaması yenileniyor",
+	"wp_command_cooldown": "{lightred}Şu anda silah skinlerini yenileyemezsiniz",
-	"wp_knife_menu_select": "Bıçağınız olarak {lime}{0}{default} seçtiniz",
+	"wp_command_refresh_done": "{lime}Silah skinleri yenileniyor",
-	"wp_knife_menu_kill": "Bıçak için doğru şekilde kaplama uygulamak için {lime}!kill{default} yazmanız gerekir",
+	"wp_knife_menu_select": "{lime}{0}{default} olarak bıçağınızı seçtiniz",
+	"wp_knife_menu_kill": "",
 	"wp_knife_menu_title": "Bıçak Menüsü",
+	"wp_glove_menu_select": "{lime}{0}{default} olarak eldiveninizi seçtiniz",
+	"wp_glove_menu_title": "Eldiven Menüsü",
 	"wp_skin_menu_weapon_title": "Silah Menüsü",
-	"wp_skin_menu_skin_title": "Select skin for {lime}{0}{default}",
+	"wp_skin_menu_skin_title": "{lime}{0}{default} için bir skin seçin",
-	"wp_skin_menu_select": "Teniniz olarak {lime}{0}{default} seçtiniz"
+	"wp_skin_menu_select": "{lime}{0}{default} olarak bir skin seçtiniz"
-}
+}

lang/ua.json

@@ -1,14 +1,17 @@
 {
 	"wp_prefix": "{lightblue}[WeaponPaints] {default}",
-	"wp_info_website": "Відвідайте веб-сайт {lime}{0},{default} щоб вибрати скин",
+	"wp_info_website": "Відвідайте {lime}{0}{default}, де ви можете змінити шкури",
-	"wp_info_refresh": "Напишіть у чат {lime}!wp{default} для синхронізації вибраних скинів",
+	"wp_info_refresh": "Введіть {lime}!wp{default}, щоб синхронізувати обрані шкури",
-	"wp_info_knife": "Напишіть у чат {lime}!knife,{default} щоб вибрати ніж",
+	"wp_info_knife": "Введіть {lime}!knife{default}, щоб відкрити меню ножів",
-	"wp_command_cooldown": "{lightred}Ви не можете вибрати зброю зараз",
+	"wp_info_glove": "Введіть {lime}!gloves{default}, щоб відкрити меню рукавичок",
-	"wp_command_refresh_done": "{lime}Оновлення скинів для зброї",
+	"wp_command_cooldown": "{lightred}Наразі ви не можете оновлювати шкіри зброї",
-	"wp_knife_menu_select": "Ви вибрали скин {lime}{0}{default} для ножа",
+	"wp_command_refresh_done": "{lime}Оновлення шкірок зброї",
-	"wp_knife_menu_kill": "Щоб правильно застосувати скин для ножа, напишіть у чат {lime}!kill{default}",
+	"wp_knife_menu_select": "Ви вибрали {lime}{0}{default} як ваш ніж",
-	"wp_knife_menu_title": "Меню ножів",
+	"wp_knife_menu_kill": "",
-	"wp_skin_menu_weapon_title": "Меню зброї",
+	"wp_knife_menu_title": "Меню Ножів",
-	"wp_skin_menu_skin_title": "Виберіть скин для {lime}{0}{default}",
+	"wp_glove_menu_select": "Ви вибрали {lime}{0}{default} як ваші рукавички",
-	"wp_skin_menu_select": "Ви вибрали скин {lime}{0}{default} для зброї"
+	"wp_glove_menu_title": "Меню Рукавичок",
+	"wp_skin_menu_weapon_title": "Меню Зброї",
+	"wp_skin_menu_skin_title": "Виберіть шкіру для {lime}{0}{default}",
+	"wp_skin_menu_select": "Ви вибрали {lime}{0}{default} як вашу шкіру"
 }

lang/zh-cn.json

@@ -1,14 +1,17 @@
 {
-	"wp_prefix": "{lightblue}[武器皮肤] {default}",
+	"wp_prefix": "{lightblue}[WeaponPaints] {default}",
-	"wp_info_website": "在线访问 {lime}{0}{default} 更改你的武器皮肤",
+	"wp_info_website": "访问 {lime}{0}{default}，您可以更改皮肤",
-	"wp_info_refresh": "输入 {lime}!wp{default} 进行在线皮肤同步",
+	"wp_info_refresh": "输入 {lime}!wp{default} 同步已选择的皮肤",
-	"wp_info_knife": "输入 {lime}!knife{default} 打开刀菜单",
+	"wp_info_knife": "输入 {lime}!knife{default} 打开刀具菜单",
-	"wp_command_cooldown": "{lightred}皮肤同步刷新冷却中",
+	"wp_info_glove": "输入 {lime}!gloves{default} 打开手套菜单",
-	"wp_command_refresh_done": "{lime}刷新武器皮肤中",
+	"wp_command_cooldown": "{lightred}您现在无法刷新武器皮肤",
-	"wp_knife_menu_select": "你选择了 {lime}{0}{default} 作为你的刀",
+	"wp_command_refresh_done": "{lime}刷新武器皮肤",
-	"wp_knife_menu_kill": "如需完全应用皮肤到刀上, 你需要输入 {lime}!kill{default} 自杀来进行刷新",
+	"wp_knife_menu_select": "您已选择 {lime}{0}{default} 作为您的刀具",
-	"wp_knife_menu_title": "刀菜单",
+	"wp_knife_menu_kill": "",
+	"wp_knife_menu_title": "刀具菜单",
+	"wp_glove_menu_select": "您已选择 {lime}{0}{default} 作为您的手套",
+	"wp_glove_menu_title": "手套菜单",
 	"wp_skin_menu_weapon_title": "武器菜单",
-	"wp_skin_menu_skin_title": "选择 {lime}{0}{default} 的皮肤",
+	"wp_skin_menu_skin_title": "为 {lime}{0}{default} 选择皮肤",
-	"wp_skin_menu_select": "你选择了 {lime}{0}{default} 作为你的皮肤"
+	"wp_skin_menu_select": "您已选择 {lime}{0}{default} 作为您的皮肤"
-}
+}