123

Some fixes

.github/workflows/build.yml

@@ -60,12 +60,10 @@ 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
+      run: zip -r "${{ env.PROJECT_NAME }}.zip" "${{ env.OUTPUT_PATH }}" gamedata/
-      with:
-        type: 'zip'
-        filename: '${{ env.PROJECT_NAME }}.zip'
-        path: ${{ env.OUTPUT_PATH }}
     - name: Clean files Website
       run: |
         rm -rf website/img/

Commands.cs

@@ -1,6 +1,8 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Commands;
 using CounterStrikeSharp.API.Modules.Menu;
+using Newtonsoft.Json.Linq;
+using System.Text;
 
 namespace WeaponPaints
 {
@@ -12,35 +14,52 @@ namespace WeaponPaints
 			if (!Utility.IsPlayerValid(player)) return;
 
 			if (player == null || !player.IsValid || player.UserId == null || player.IsBot) return;
-
+            PlayerInfo playerInfo = new (
-			int playerIndex = (int)player!.Index;
+                (int)player.Index,
-
+                player.Slot,
-			PlayerInfo playerInfo = new PlayerInfo
+                player.UserId,
-			{
+                player.SteamID.ToString(),
-				UserId = player.UserId,
+                player.PlayerName,
-				Index = (int)player.Index,
+                player.IpAddress?.Split(":")[0]
-				SteamId = player?.AuthorizedSteamID?.SteamId64.ToString(),
+            );
-				Name = player?.PlayerName,
-				IpAddress = player?.IpAddress?.Split(":")[0]
-			};
-
-			if (player == null || !player.IsValid || player.UserId == null || player.IsBot) return;
-
 			try
 			{
-				if (!commandsCooldown.TryGetValue((int)player.UserId, out DateTime cooldownEndTime) ||
+				if (player != null && !commandsCooldown.TryGetValue(player.Slot, out DateTime cooldownEndTime) ||
-	DateTime.UtcNow >= (commandsCooldown.TryGetValue((int)player.UserId, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
+	player != null && DateTime.UtcNow >= (commandsCooldown.TryGetValue(player.Slot, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
 				{
-					commandsCooldown[(int)player.UserId] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
+					commandsCooldown[player.Slot] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
-					if (weaponSync != null)
-						Task.Run(async () => await weaponSync.GetWeaponPaintsFromDatabase(playerInfo));
-					if (Config.Additional.KnifeEnabled)
-					{
-						if (weaponSync != null)
-							Task.Run(async () => await weaponSync.GetKnifeFromDatabase(playerInfo));
 
+					if (weaponSync != null)
+					{
+						var weaponTasks = new List<Task>();
+
+						weaponTasks.Add(Task.Run(async () =>
+						{
+							await weaponSync.GetWeaponPaintsFromDatabase(playerInfo);
+						}));
+
+						if (Config.Additional.GloveEnabled)
+						{
+							weaponTasks.Add(Task.Run(async () =>
+							{
+								await weaponSync.GetGloveFromDatabase(playerInfo);
+							}));
+						}
+
+						if (Config.Additional.KnifeEnabled)
+						{
+							weaponTasks.Add(Task.Run(async () =>
+							{
+								await weaponSync.GetKnifeFromDatabase(playerInfo);
+							}));
+						}
+
+						Task.WaitAll(weaponTasks.ToArray());
+
+						RefreshGloves(player);
 						RefreshWeapons(player);
 					}
+
 					if (!string.IsNullOrEmpty(Localizer["wp_command_refresh_done"]))
 					{
 						player!.Print(Localizer["wp_command_refresh_done"]);
@@ -68,11 +87,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()
@@ -84,7 +110,7 @@ namespace WeaponPaints
 			});
 			AddCommand($"css_{Config.Additional.CommandRefresh}", "Skins refresh", (player, info) =>
 			{
-				if (!Utility.IsPlayerValid(player) || !g_bCommandsAllowed) return;
+				if (!Utility.IsPlayerValid(player)) return;
 				OnCommandRefresh(player, info);
 			});
 			if (Config.Additional.CommandKillEnabled)
@@ -98,205 +124,372 @@ namespace WeaponPaints
 			}
 		}
 
-		private void SetupKnifeMenu()
+        private void SetupKnifeMenu()
-		{
+        {
-			if (!Config.Additional.KnifeEnabled || !g_bCommandsAllowed) return;
+            if (!Config.Additional.KnifeEnabled || !g_bCommandsAllowed) return;
 
-			var knivesOnly = weaponList
+            var knivesOnly = GetKnivesOnly();
-				.Where(pair => pair.Key.StartsWith("weapon_knife") || pair.Key.StartsWith("weapon_bayonet"))
+            var giveItemMenu = new ChatMenu(Localizer["wp_knife_menu_title"]);
-				.ToDictionary(pair => pair.Key, pair => pair.Value);
 
-			var giveItemMenu = new ChatMenu(Localizer["wp_knife_menu_title"]);
+            AddMenuOptions(giveItemMenu, knivesOnly);
-			var handleGive = (CCSPlayerController? player, ChatMenuOption option) =>
+            AddCommandToOpenKnifeMenu(giveItemMenu);
-			{
+        }
-				if (Utility.IsPlayerValid(player))
-				{
-					if (player == null) return;
-					var knifeName = option.Text;
-					var knifeKey = knivesOnly.FirstOrDefault(x => x.Value == knifeName).Key;
-					if (!string.IsNullOrEmpty(knifeKey))
-					{
-						if (!string.IsNullOrEmpty(Localizer["wp_knife_menu_select"]))
-						{
-							player!.Print(Localizer["wp_knife_menu_select", knifeName]);
-						}
 
-						if (!string.IsNullOrEmpty(Localizer["wp_knife_menu_kill"]) && Config.Additional.CommandKillEnabled)
+        private Dictionary<string, string> GetKnivesOnly()
-						{
+        {
-							player!.Print(Localizer["wp_knife_menu_kill"]);
+            return weaponList
-						}
+                .Where(pair => pair.Key.StartsWith("weapon_knife") || pair.Key.StartsWith("weapon_bayonet"))
+                .ToDictionary(pair => pair.Key, pair => pair.Value);
+        }
 
-						PlayerInfo playerInfo = new PlayerInfo
+        private void AddMenuOptions(ChatMenu giveItemMenu, Dictionary<string, string> knivesOnly)
-						{
+        {
-							UserId = player.UserId,
+            foreach (var knifePair in knivesOnly)
-							Index = (int)player.Index,
+            {
-							SteamId = player?.AuthorizedSteamID?.SteamId64.ToString(),
+                giveItemMenu.AddMenuOption(knifePair.Value, (player, option) => HandleGiveOption(player, option, knivesOnly));
-							Name = player?.PlayerName,
+            }
-							IpAddress = player?.IpAddress?.Split(":")[0]
+        }
-						};
 
-						g_playersKnife[(int)player!.Index] = knifeKey;
+        private void HandleGiveOption(CCSPlayerController player, ChatMenuOption option, Dictionary<string, string> knivesOnly)
+        {
+            if (!Utility.IsPlayerValid(player)) return;
 
-						if (player!.PawnIsAlive && g_bCommandsAllowed)
+            var knifeName = option.Text;
-						{
+            var knifeKey = knivesOnly.FirstOrDefault(x => x.Value == knifeName).Key;
-							RefreshWeapons(player);
-						}
 
-						if (weaponSync != null)
+            if (!string.IsNullOrEmpty(knifeKey))
-							Task.Run(async () => await weaponSync.SyncKnifeToDatabase(playerInfo, knifeKey));
+            {
-					}
+                PrintMessages(player, knifeName);
-				}
+                SetPlayerKnife(player, knifeKey);
-			};
+                SyncKnifeToDatabase(player, knifeKey);
-			foreach (var knifePair in knivesOnly)
+            }
-			{
+        }
-				giveItemMenu.AddMenuOption(knifePair.Value, handleGive);
-			}
-			AddCommand($"css_{Config.Additional.CommandKnife}", "Knife Menu", (player, info) =>
-			{
-				if (!Utility.IsPlayerValid(player) || !g_bCommandsAllowed) return;
 
-				if (player == null || player.UserId == null) return;
+        private void PrintMessages(CCSPlayerController player, string knifeName)
+        {
+            if (!string.IsNullOrEmpty(Localizer["wp_knife_menu_select"]))
+            {
+                player!.Print(Localizer["wp_knife_menu_select", knifeName]);
+            }
 
-				if (!commandsCooldown.TryGetValue((int)player.UserId, out DateTime cooldownEndTime) ||
+            if (!string.IsNullOrEmpty(Localizer["wp_knife_menu_kill"]) && Config.Additional.CommandKillEnabled)
-					DateTime.UtcNow >= (commandsCooldown.TryGetValue((int)player.UserId, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
+            {
-				{
+                player!.Print(Localizer["wp_knife_menu_kill"]);
-					commandsCooldown[(int)player.UserId] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
+            }
-					MenuManager.OpenChatMenu(player, giveItemMenu);
+        }
-					return;
-				}
-				if (!string.IsNullOrEmpty(Localizer["wp_command_cooldown"]))
-				{
-					player!.Print(Localizer["wp_command_cooldown"]);
-				}
-			});
-		}
 
-		private void SetupSkinsMenu()
+        private void SetPlayerKnife(CCSPlayerController player, string knifeKey)
-		{
+        {
-			var classNamesByWeapon = weaponList.ToDictionary(kvp => kvp.Value, kvp => kvp.Key);
+            g_playersKnife[player.Slot] = knifeKey;
-			var weaponSelectionMenu = new ChatMenu(Localizer["wp_skin_menu_weapon_title"]);
 
-			// Function to handle skin selection for a specific weapon
+            if (g_bCommandsAllowed && (LifeState_t)player.LifeState == LifeState_t.LIFE_ALIVE)
-			var handleWeaponSelection = (CCSPlayerController? player, ChatMenuOption option) =>
+                RefreshWeapons(player);
-			{
+        }
-				if (!Utility.IsPlayerValid(player)) return;
 
-				int playerIndex = (int)player!.Index;
+        private void SyncKnifeToDatabase(CCSPlayerController player, string knifeKey)
-				string selectedWeapon = option.Text;
+        {
-				if (classNamesByWeapon.TryGetValue(selectedWeapon, out string? selectedWeaponClassname))
+            if (weaponSync != null)
-				{
+                Task.Run(async () => await weaponSync.SyncKnifeToDatabase(GetPlayerInfo(player), knifeKey));
-					if (selectedWeaponClassname == null) return;
+        }
-					var skinsForSelectedWeapon = skinsList?.Where(skin =>
-					skin != null &&
-					skin.TryGetValue("weapon_name", out var weaponName) &&
-					weaponName?.ToString() == selectedWeaponClassname
-				)?.ToList();
 
-					var skinSubMenu = new ChatMenu(Localizer["wp_skin_menu_skin_title", selectedWeapon]);
+        private PlayerInfo GetPlayerInfo(CCSPlayerController player)
+        {
+            return new PlayerInfo
+            {
+                UserId = player.UserId,
+                Slot = player.Slot,
+                Index = (int)player.Index,
+                SteamId = player.SteamID.ToString(),
+                Name = player.PlayerName,
+                IpAddress = player.IpAddress?.Split(":")[0]
+            };
+        }
 
-					// Function to handle skin selection for the chosen weapon
+        private void AddCommandToOpenKnifeMenu(ChatMenu giveItemMenu)
-					var handleSkinSelection = (CCSPlayerController? p, ChatMenuOption opt) =>
+        {
-					{
+            AddCommand($"css_{Config.Additional.CommandKnife}", "Knife Menu", (player, info) =>
-						if (p == null || !p.IsValid || p.Index <= 0) return;
+            {
+                if (!Utility.IsPlayerValid(player) || !g_bCommandsAllowed) return;
 
-						playerIndex = (int)p.Index;
+                if (player == null || player.UserId == null) return;
 
-						if (p.AuthorizedSteamID == null) return;
+                if (IsCommandAllowed(player))
+                {
+                    commandsCooldown[player.Slot] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
+                    giveItemMenu.PostSelectAction = PostSelectAction.Close;
+                    MenuManager.OpenChatMenu(player, giveItemMenu);
+                    return;
+                }
+                if (!string.IsNullOrEmpty(Localizer["wp_command_cooldown"]))
+                {
+                    player!.Print(Localizer["wp_command_cooldown"]);
+                }
+            });
+        }
 
-						string steamId = p.AuthorizedSteamID.SteamId64.ToString();
+        private bool IsCommandAllowed(CCSPlayerController player)
-						var firstSkin = skinsList?.FirstOrDefault(skin =>
+        {
-						{
+            if (!commandsCooldown.TryGetValue(player.Slot, out DateTime cooldownEndTime))
-							if (skin != null && skin.TryGetValue("weapon_name", out var weaponName))
+            {
-							{
+                return true;
-								return weaponName?.ToString() == selectedWeaponClassname;
+            }
-							}
+            return DateTime.UtcNow >= cooldownEndTime;
-							return false;
+        }
-						});
-						string selectedSkin = opt.Text;
-						string selectedPaintID = selectedSkin.Split('(')[1].Trim(')').Trim();
 
-						if (firstSkin != null &&
+        private void SetupSkinsMenu()
-							firstSkin.TryGetValue("weapon_defindex", out var weaponDefIndexObj) &&
+        {
-							weaponDefIndexObj != null &&
+            var classNamesByWeapon = weaponList.ToDictionary(kvp => kvp.Value, kvp => kvp.Key);
-							int.TryParse(weaponDefIndexObj.ToString(), out var weaponDefIndex) &&
+            var weaponSelectionMenu = new ChatMenu(Localizer["wp_skin_menu_weapon_title"]);
-							int.TryParse(selectedPaintID, out var paintID))
-						{
-							p!.Print(Localizer["wp_skin_menu_select", selectedSkin]);
 
-							if (!gPlayerWeaponsInfo[playerIndex].ContainsKey(weaponDefIndex))
+            // Add weapon options to the weapon selection menu
-							{
+            foreach (var weaponClass in weaponList.Keys)
-								gPlayerWeaponsInfo[playerIndex][weaponDefIndex] = new WeaponInfo();
+            {
-							}
+                string weaponName = weaponList[weaponClass];
+                weaponSelectionMenu.AddMenuOption(weaponName, (player, option) => HandleWeaponSelection(player, option, classNamesByWeapon));
+            }
 
-							gPlayerWeaponsInfo[playerIndex][weaponDefIndex].Paint = paintID;
+            // Command to open the weapon selection menu for players
-							gPlayerWeaponsInfo[playerIndex][weaponDefIndex].Wear = 0.01f;
+            AddCommand($"css_{Config.Additional.CommandSkinSelection}", "Skins selection menu", (player, info) => OpenWeaponSelectionMenu(player, weaponSelectionMenu));
-							gPlayerWeaponsInfo[playerIndex][weaponDefIndex].Seed = 0;
+        }
 
-							PlayerInfo playerInfo = new PlayerInfo
+        private void HandleWeaponSelection(CCSPlayerController? player, ChatMenuOption option, Dictionary<string, string> classNamesByWeapon)
-							{
+        {
-								UserId = player.UserId,
+            if (!Utility.IsPlayerValid(player)) return;
-								Index = (int)player.Index,
-								SteamId = player?.AuthorizedSteamID?.SteamId64.ToString(),
-								Name = player?.PlayerName,
-								IpAddress = player?.IpAddress?.Split(":")[0]
-							};
 
-							if (!Config.GlobalShare)
+            string selectedWeapon = option.Text;
-							{
+            if (classNamesByWeapon.TryGetValue(selectedWeapon, out string? selectedWeaponClassname))
-								if (weaponSync != null)
+            {
-									Task.Run(async () => await weaponSync.SyncWeaponPaintsToDatabase(playerInfo));
+                if (selectedWeaponClassname == null) return;
-							}
+                var skinsForSelectedWeapon = skinsList?.Where(skin =>
-						}
+                skin != null &&
-					};
+                skin.TryGetValue("weapon_name", out var weaponName) &&
+                weaponName?.ToString() == selectedWeaponClassname
+            )?.ToList();
 
-					// Add skin options to the submenu for the selected weapon
+                var skinSubMenu = new ChatMenu(Localizer["wp_skin_menu_skin_title", selectedWeapon]);
-					if (skinsForSelectedWeapon != null)
+                skinSubMenu.PostSelectAction = PostSelectAction.Close;
-					{
-						foreach (var skin in skinsForSelectedWeapon.Where(s => s != null))
-						{
-							if (skin.TryGetValue("paint_name", out var paintNameObj) && skin.TryGetValue("paint", out var paintObj))
-							{
-								var paintName = paintNameObj?.ToString();
-								var paint = paintObj?.ToString();
 
-								if (!string.IsNullOrEmpty(paintName) && !string.IsNullOrEmpty(paint))
+                // Add skin options to the submenu for the selected weapon
-								{
+                if (skinsForSelectedWeapon != null)
-									skinSubMenu.AddMenuOption($"{paintName} ({paint})", handleSkinSelection);
+                {
-								}
+                    foreach (var skin in skinsForSelectedWeapon.Where(s => s != null))
-							}
+                    {
-						}
+                        if (skin.TryGetValue("paint_name", out var paintNameObj) && skin.TryGetValue("paint", out var paintObj))
-					}
+                        {
+                            var paintName = paintNameObj?.ToString();
+                            var paint = paintObj?.ToString();
 
-					// Open the submenu for skin selection of the chosen weapon
+                            if (!string.IsNullOrEmpty(paintName) && !string.IsNullOrEmpty(paint))
-					MenuManager.OpenChatMenu(player, skinSubMenu);
+                            {
-				}
+                                var optionText = new StringBuilder(paintName).Append(" (").Append(paint).Append(")").ToString();
-			};
+                                skinSubMenu.AddMenuOption(optionText, (p, opt) => HandleSkinSelection(p, opt, selectedWeaponClassname));
+                            }
+                        }
+                    }
+                }
+                if (player != null && Utility.IsPlayerValid(player))
+                    MenuManager.OpenChatMenu(player, skinSubMenu);
+            }
+        }
 
-			// Add weapon options to the weapon selection menu
+        private void HandleSkinSelection(CCSPlayerController p, ChatMenuOption opt, string selectedWeaponClassname)
-			foreach (var weaponClass in weaponList.Keys)
+        {
-			{
+            if (!Utility.IsPlayerValid(p)) return;
-				string weaponName = weaponList[weaponClass];
-				weaponSelectionMenu.AddMenuOption(weaponName, handleWeaponSelection);
-			}
-			// Command to open the weapon selection menu for players
-			AddCommand($"css_{Config.Additional.CommandSkinSelection}", "Skins selection menu", (player, info) =>
-			{
-				if (!Utility.IsPlayerValid(player)) return;
 
-				if (player == null || player.UserId == null) return;
+            string steamId = p.SteamID.ToString();
+            var firstSkin = skinsList?.Find(skin =>
+            {
+                if (skin != null && skin.TryGetValue("weapon_name", out var weaponName))
+                {
+                    return weaponName?.ToString() == selectedWeaponClassname;
+                }
+                return false;
+            });
 
-				if (!commandsCooldown.TryGetValue((int)player.UserId, out DateTime cooldownEndTime) ||
+            string selectedSkin = opt.Text;
-					DateTime.UtcNow >= (commandsCooldown.TryGetValue((int)player.UserId, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
+            string selectedPaintID = selectedSkin.Split('(')[1].Trim(')').Trim();
-				{
+
-					commandsCooldown[(int)player.UserId] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
+            if (firstSkin != null &&
-					MenuManager.OpenChatMenu(player, weaponSelectionMenu);
+                firstSkin.TryGetValue("weapon_defindex", out var weaponDefIndexObj) &&
-					return;
+                weaponDefIndexObj != null &&
-				}
+                int.TryParse(weaponDefIndexObj.ToString(), out var weaponDefIndex) &&
-				if (!string.IsNullOrEmpty(Localizer["wp_command_cooldown"]))
+                int.TryParse(selectedPaintID, out var paintID))
-				{
+            {
-					player!.Print(Localizer["wp_command_cooldown"]);
+                HandleSkinImage(p, weaponDefIndex, paintID);
-				}
+                p.Print(Localizer["wp_skin_menu_select", selectedSkin]);
-			});
+                UpdatePlayerWeaponInfo(p, weaponDefIndex, paintID);
-		}
+            }
+        }
+
+        private void HandleSkinImage(CCSPlayerController p, int weaponDefIndex, int paintID)
+        {
+            if (Config.Additional.ShowSkinImage && skinsList != null)
+            {
+                var foundSkin = skinsList.FirstOrDefault(skin =>
+                    ((int?)skin?["weapon_defindex"] ?? 0) == weaponDefIndex &&
+                    ((int?)skin?["paint"] ?? 0) == paintID &&
+                    skin?["image"] != null
+                );
+                string image = foundSkin?["image"]?.ToString() ?? "";
+                PlayerWeaponImage[p.Slot] = image;
+                AddTimer(2.0f, () => PlayerWeaponImage.Remove(p.Slot), CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);
+            }
+        }
+
+        private void UpdatePlayerWeaponInfo(CCSPlayerController p, int weaponDefIndex, int paintID)
+        {
+            if (!gPlayerWeaponsInfo[p.Slot].TryGetValue(weaponDefIndex, out WeaponInfo? value))
+            {
+                value = new WeaponInfo();
+                gPlayerWeaponsInfo[p.Slot][weaponDefIndex] = value;
+            }
+
+            value.Paint = paintID;
+            value.Wear = 0.00f;
+            value.Seed = 0;
+
+            if (g_bCommandsAllowed && (LifeState_t)p.LifeState == LifeState_t.LIFE_ALIVE)
+            {
+                RefreshWeapons(p);
+            }
+        }
+
+        private void OpenWeaponSelectionMenu(CCSPlayerController? player, ChatMenu weaponSelectionMenu)
+        {
+            if (!Utility.IsPlayerValid(player)) return;
+
+            if (player == null || player.UserId == null) return;
+
+            if (player != null && !commandsCooldown.TryGetValue(player.Slot, out DateTime cooldownEndTime) ||
+                player != null && DateTime.UtcNow >= (commandsCooldown.TryGetValue(player.Slot, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
+            {
+                commandsCooldown[player.Slot] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
+                MenuManager.OpenChatMenu(player, weaponSelectionMenu);
+                return;
+            }
+            if (!string.IsNullOrEmpty(Localizer["wp_command_cooldown"]))
+            {
+                player!.Print(Localizer["wp_command_cooldown"]);
+            }
+        }
+        private void SetupGlovesMenu()
+        {
+            var glovesSelectionMenu = new ChatMenu(Localizer["wp_glove_menu_title"]);
+            glovesSelectionMenu.PostSelectAction = PostSelectAction.Close;
+
+            var handleGloveSelection = (CCSPlayerController? player, ChatMenuOption option) =>
+            {
+                if (!Utility.IsPlayerValid(player) || player is null) return;
+
+                string selectedPaintName = option.Text;
+                var selectedGlove = glovesList.FirstOrDefault(g => g.ContainsKey("paint_name") && g["paint_name"]?.ToString() == selectedPaintName);
+                if (selectedGlove != null)
+                {
+                    HandleSelectedGlove(player, selectedGlove, selectedPaintName);
+                }
+            };
+
+            AddGloveOptionsToMenu(glovesSelectionMenu, handleGloveSelection);
+            AddCommandToOpenGloveSelectionMenu(glovesSelectionMenu);
+        }
+        
+void HandleSelectedGlove(CCSPlayerController? player, JObject selectedGlove, string selectedPaintName)
+        {
+            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(
+                    (int)player.Index,
+                    player.Slot,
+                    player.UserId,
+                    player.SteamID.ToString(),
+                    player.PlayerName,
+                    player.IpAddress?.Split(":")[0]
+                );
+
+                if (paint != 0)
+                {
+                    g_playersGlove[player.Slot] = (ushort)weaponDefindex;
+
+                    if (!gPlayerWeaponsInfo[player.Slot].TryGetValue(weaponDefindex, out _))
+                    {
+                        WeaponInfo weaponInfo = new();
+                        weaponInfo.Paint = paint;
+                        gPlayerWeaponsInfo[player.Slot][weaponDefindex] = weaponInfo;
+                    }
+                }
+                else
+                {
+                    g_playersGlove.TryRemove(player.Slot, out _);
+                }
+
+                if (!string.IsNullOrEmpty(Localizer["wp_glove_menu_select"]))
+                {
+                    player!.Print(Localizer["wp_glove_menu_select", selectedPaintName]);
+                }
+
+                if (weaponSync != null)
+                {
+                    Task.Run(async () =>
+                    {
+                        await weaponSync.SyncGloveToDatabase(playerInfo, weaponDefindex);
+
+                        if (!gPlayerWeaponsInfo[playerInfo.Slot].TryGetValue(weaponDefindex, out var weaponInfo))
+                        {
+                            weaponInfo = new WeaponInfo();
+                            gPlayerWeaponsInfo[playerInfo.Slot][weaponDefindex] = weaponInfo;
+                        }
+
+                        weaponInfo.Paint = paint;
+                        weaponInfo.Wear = 0.00f;
+                        weaponInfo.Seed = 0;
+
+                    });
+                }
+                RefreshGloves(player);
+            }
+        }
+
+        private void AddGloveOptionsToMenu(ChatMenu glovesSelectionMenu, Action<CCSPlayerController?, ChatMenuOption> handleGloveSelection)
+        {
+            foreach (var gloveObject in glovesList)
+            {
+                string paintName = gloveObject["paint_name"]?.ToString() ?? "";
+
+                if (paintName.Length > 0)
+                    glovesSelectionMenu.AddMenuOption(paintName, handleGloveSelection);
+            }
+        }
+
+        private void AddCommandToOpenGloveSelectionMenu(ChatMenu glovesSelectionMenu)
+        {
+            AddCommand($"css_{Config.Additional.CommandGlove}", "Gloves selection menu", (player, info) =>
+            {
+                if (!Utility.IsPlayerValid(player) || !g_bCommandsAllowed) return;
+
+                if (player == null || player.UserId == null) return;
+
+                if (player != null && !commandsCooldown.TryGetValue(player.Slot, out DateTime cooldownEndTime) ||
+                    player != null && DateTime.UtcNow >= (commandsCooldown.TryGetValue(player.Slot, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
+                {
+                    commandsCooldown[player.Slot] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
+                    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";
 
@@ -40,8 +46,12 @@ namespace WeaponPaints
 
 		[JsonPropertyName("GiveRandomSkin")]
 		public bool GiveRandomSkin { get; set; } = false;
+
 		[JsonPropertyName("GiveKnifeAfterRemove")]
 		public bool GiveKnifeAfterRemove { get; set; } = false;
+
+		[JsonPropertyName("ShowSkinImage")]
+		public bool ShowSkinImage { get; set; } = true;
 	}
 
 	public class WeaponPaintsConfig : BasePluginConfig
@@ -63,9 +73,6 @@ namespace WeaponPaints
 		[JsonPropertyName("DatabaseName")]
 		public string DatabaseName { get; set; } = "";
 
-		[JsonPropertyName("GlobalShare")]
-		public bool GlobalShare { get; set; } = false;
-
 		[JsonPropertyName("CmdRefreshCooldownSeconds")]
 		public int CmdRefreshCooldownSeconds { get; set; } = 60;
 
@@ -78,5 +85,4 @@ namespace WeaponPaints
 		[JsonPropertyName("Additional")]
 		public Additional Additional { get; set; } = new Additional();
 	}
-
+}
-}

Database.cs

@@ -0,0 +1,21 @@
+using MySqlConnector;
+
+namespace WeaponPaints
+{
+	public class Database
+	{
+		private readonly string _dbConnectionString;
+
+		public Database(string dbConnectionString)
+		{
+			_dbConnectionString = dbConnectionString;
+		}
+
+        public async Task<MySqlConnection> GetConnectionAsync()
+        {
+            var connection = new MySqlConnection(_dbConnectionString);
+            await connection.OpenAsync();
+            return connection;
+        }
+	}
+}

Events.cs

@@ -1,55 +1,95 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core.Attributes.Registration;
 
 namespace WeaponPaints
 {
 	public partial class WeaponPaints
 	{
-		private void OnClientPutInServer(int playerSlot)
+		[GameEventHandler]
+		public HookResult OnClientFullConnect(EventPlayerConnectFull @event, GameEventInfo info)
 		{
-			CCSPlayerController? player = Utilities.GetPlayerFromSlot(playerSlot);
+			CCSPlayerController? player = @event.Userid;
 
-			if (player == null || !player.IsValid || player.IsBot || player.IsHLTV || weaponSync == null || player.Connected == PlayerConnectedState.PlayerDisconnecting) return;
+			if (player is null || !player.IsValid || player.IsBot || player.IsHLTV || player.SteamID.ToString().Length != 17 ||
+				weaponSync == null || _database == null) return HookResult.Continue;
 
-			PlayerInfo playerInfo = new PlayerInfo
+            PlayerInfo playerInfo = new(
+                (int)player.Index,
+                player.Slot,
+                player.UserId,
+                player.SteamID.ToString(),
+                player.PlayerName,
+                player.IpAddress?.Split(":")[0]
+            );
+
+            try
 			{
-				UserId = player.UserId,
+				if (Config.Additional.SkinEnabled)
-				Index = (int)player.Index,
-				SteamId = player.SteamID.ToString(),
-				Name = player.PlayerName,
-				IpAddress = player.IpAddress?.Split(":")[0]
-			};
-
-			if (!gPlayerWeaponsInfo.ContainsKey((int)player.Index))
-			{
-				Task.Run(async () =>
 				{
-					if (Config.Additional.SkinEnabled)
+					Task.Run(() => weaponSync.GetWeaponPaintsFromDatabase(playerInfo));
-						await weaponSync.GetWeaponPaintsFromDatabase(playerInfo);
+				}
-					if (Config.Additional.KnifeEnabled)
+				if (Config.Additional.KnifeEnabled)
-						await weaponSync.GetKnifeFromDatabase(playerInfo);
-				});
-			}
-		}
-		private void OnClientDisconnect(int playerSlot)
-		{
-			CCSPlayerController player = Utilities.GetPlayerFromSlot(playerSlot);
-
-			if (player == null || !player.IsValid || player.IsBot || player.IsHLTV || player.UserId == null) return;
-
-			if (Config.Additional.KnifeEnabled)
-				g_playersKnife.TryRemove((int)player.Index, out _);
-			if (Config.Additional.SkinEnabled)
-			{
-				if (gPlayerWeaponsInfo.TryRemove((int)player.Index, out var innerDictionary))
 				{
-					innerDictionary.Clear();
+					Task.Run(() => weaponSync.GetKnifeFromDatabase(playerInfo));
+				}
+				if (Config.Additional.GloveEnabled)
+				{
+					Task.Run(() => weaponSync.GetGloveFromDatabase(playerInfo));
 				}
 			}
-			if (commandsCooldown.ContainsKey((int)player.UserId))
+			catch (Exception ex)
 			{
-				commandsCooldown.Remove((int)player.UserId);
+				Console.WriteLine($"An error occurred: {ex.Message}");
 			}
+
+			return HookResult.Continue;
+		}
+
+		[GameEventHandler]
+		public HookResult OnPlayerDisconnect(EventPlayerDisconnect @event, GameEventInfo info)
+		{
+			CCSPlayerController player = @event.Userid;
+
+			if (player is null || !player.IsValid || player.IsBot ||
+				player.IsHLTV || player.SteamID.ToString().Length != 17) return HookResult.Continue;
+
+            PlayerInfo playerInfo = new(
+                (int)player.Index,
+                player.Slot,
+                player.UserId,
+                player.SteamID.ToString(),
+                player.PlayerName,
+                player.IpAddress?.Split(":")[0]
+            );
+
+            if (weaponSync != null)
+			{
+				// Run weapon sync tasks asynchronously
+				Task.Run(async () =>
+				{
+					await weaponSync.SyncWeaponPaintsToDatabase(playerInfo);
+				});
+
+				// Remove player data
+				if (Config.Additional.SkinEnabled)
+				{
+					gPlayerWeaponsInfo.TryRemove(player.Slot, out _);
+				}
+				if (Config.Additional.KnifeEnabled)
+				{
+					g_playersKnife.TryRemove(player.Slot, out _);
+				}
+				if (Config.Additional.GloveEnabled)
+				{
+					g_playersGlove.TryRemove(player.Slot, out _);
+				}
+			}
+
+			// Remove player's command cooldown
+			commandsCooldown.Remove(player.Slot);
+
+			return HookResult.Continue;
 		}
 
 		private void OnEntityCreated(CEntityInstance entity)
@@ -74,7 +114,7 @@ namespace WeaponPaints
 					if (weapon.OwnerEntity.Value == null) return;
 					if (weapon.OwnerEntity.Index <= 0) return;
 					int weaponOwner = (int)weapon.OwnerEntity.Index;
-					var pawn = new CBasePlayerPawn(NativeAPI.GetEntityFromIndex(weaponOwner));
+					CBasePlayerPawn? pawn = Utilities.GetEntityFromIndex<CCSPlayerPawn>(weaponOwner);
 					if (!pawn.IsValid) return;
 
 					var playerIndex = (int)pawn.Controller.Index;
@@ -87,72 +127,38 @@ namespace WeaponPaints
 			});
 		}
 
-		private HookResult OnEventItemPurchasePost(EventItemPurchase @event, GameEventInfo info)
-		{
-			CCSPlayerController? player = @event.Userid;
-
-			if (player == null || !player.IsValid) return HookResult.Continue;
-
-			/*
-			if (Config.Additional.SkinVisibilityFix)
-				AddTimer(0.2f, () => RefreshSkins(player));
-			*/
-
-			return HookResult.Continue;
-		}
-
-		/*
-		private HookResult OnItemPickup(EventItemPickup @event, GameEventInfo info)
-		{
-			if (@event.Defindex == 42 || @event.Defindex == 59)
-			{
-				CCSPlayerController? player = @event.Userid;
-				if (player == null || !player.IsValid || !g_knifePickupCount.ContainsKey((int)player.Index) || player.IsBot || !g_playersKnife.ContainsKey((int)player.Index))
-					return HookResult.Continue;
-
-
-				if (g_knifePickupCount[(int)player.Index] >= 2) return HookResult.Continue;
-
-				if (g_playersKnife.ContainsKey((int)player.Index)
-					&&
-				   g_playersKnife[(int)player.Index] != "weapon_knife")
-				{
-					g_knifePickupCount[(int)player.Index]++;
-
-					RemovePlayerKnife(player, true);
-
-					if (!PlayerHasKnife(player) && Config.Additional.GiveKnifeAfterRemove)
-						AddTimer(0.3f, () => GiveKnifeToPlayer(player));
-				}
-			}
-			return HookResult.Continue;
-		}
-		*/
-
 		public HookResult OnPickup(CEntityIOOutput output, string name, CEntityInstance activator, CEntityInstance caller, CVariant value, float delay)
 		{
+			if (!Config.Additional.GiveKnifeAfterRemove)
+				return HookResult.Continue;
+
 			CCSPlayerController? player = Utilities.GetEntityFromIndex<CCSPlayerPawn>((int)activator.Index).OriginalController.Value;
 
-			if (player == null || player.IsBot || player.IsHLTV)
+			if (player == null || player.IsBot || player.IsHLTV ||
-				return HookResult.Continue;
+				player.SteamID.ToString().Length != 17 || !g_knifePickupCount.TryGetValue(player.Slot, out var pickupCount) ||
-
+				!g_playersKnife.ContainsKey(player.Slot))
-			if (player == null || !player.IsValid || player.SteamID.ToString() == "" ||
+			{
-				!g_knifePickupCount.ContainsKey((int)player.Index) || !g_playersKnife.ContainsKey((int)player.Index))
 				return HookResult.Continue;
+			}
 
 			CBasePlayerWeapon weapon = new(caller.Handle);
 
 			if (weapon.AttributeManager.Item.ItemDefinitionIndex != 42 && weapon.AttributeManager.Item.ItemDefinitionIndex != 59)
-				return HookResult.Continue;
-
-			if (g_knifePickupCount[(int)player.Index] >= 2) return HookResult.Continue;
-
-			if (g_playersKnife[(int)player.Index] != "weapon_knife")
 			{
-				g_knifePickupCount[(int)player.Index]++;
+				return HookResult.Continue;
-				player.RemoveItemByDesignerName(weapon.DesignerName);
+			}
-				if (Config.Additional.GiveKnifeAfterRemove)
+
-					AddTimer(0.2f, () => GiveKnifeToPlayer(player));
+			if (pickupCount >= 2)
+			{
+				return HookResult.Continue;
+			}
+
+			if (g_playersKnife[player.Slot] != "weapon_knife")
+			{
+				pickupCount++;
+				g_knifePickupCount[player.Slot] = pickupCount;
+
+				AddTimer(0.2f, () => RefreshWeapons(player));
 			}
 
 			return HookResult.Continue;
@@ -160,101 +166,37 @@ namespace WeaponPaints
 
 		private void OnMapStart(string mapName)
 		{
-			if (!Config.Additional.KnifeEnabled) return;
+			if (!Config.Additional.KnifeEnabled && !Config.Additional.SkinEnabled && !Config.Additional.GloveEnabled) return;
+
+			if (_database != null)
+				weaponSync = new WeaponSynchronization(_database, Config);
+
 			// TODO
 			// needed for now
 			AddTimer(2.0f, () =>
 			{
-
 				NativeAPI.IssueServerCommand("mp_t_default_melee \"\"");
 				NativeAPI.IssueServerCommand("mp_ct_default_melee \"\"");
 				NativeAPI.IssueServerCommand("mp_equipment_reset_rounds 0");
-
-				if (Config.GlobalShare)
-					GlobalShareConnect();
-
-				weaponSync = new WeaponSynchronization(DatabaseConnectionString, Config, GlobalShareApi, GlobalShareServerId);
 			});
-
-			/*
-			g_hTimerCheckSkinsData = AddTimer(10.0f, () =>
-			{
-				List<CCSPlayerController> players = Utilities.GetPlayers();
-
-				foreach (CCSPlayerController player in players)
-				{
-					if (player.IsBot || player.IsHLTV || player.SteamID.ToString() == "") continue;
-					if (gPlayerWeaponsInfo.ContainsKey((int)player.Index)) continue;
-
-					PlayerInfo playerInfo = new PlayerInfo
-					{
-						UserId = player.UserId,
-						Index = (int)player.Index,
-						SteamId = player?.SteamID.ToString(),
-						Name = player?.PlayerName,
-						IpAddress = player?.IpAddress?.Split(":")[0]
-					};
-
-					if (Config.Additional.SkinEnabled && weaponSync != null)
-						_ = weaponSync.GetWeaponPaintsFromDatabase(playerInfo);
-					if (Config.Additional.KnifeEnabled && weaponSync != null)
-						_ = weaponSync.GetKnifeFromDatabase(playerInfo);
-				}
-			}, CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE | CounterStrikeSharp.API.Modules.Timers.TimerFlags.REPEAT);
-			*/
-		}
-
-		private HookResult OnPlayerConnectFull(EventPlayerConnectFull @event, GameEventInfo info)
-		{
-			CCSPlayerController? player = @event.Userid;
-
-			if (player == null || !player.IsValid || player.IsBot || player.IsHLTV || weaponSync == null) return HookResult.Continue;
-
-			PlayerInfo playerInfo = new PlayerInfo
-			{
-				UserId = player.UserId,
-				Index = (int)player.Index,
-				SteamId = player?.SteamID.ToString(),
-				Name = player?.PlayerName,
-				IpAddress = player?.IpAddress?.Split(":")[0]
-			};
-
-			if (!gPlayerWeaponsInfo.ContainsKey((int)player!.Index))
-			{
-				Console.WriteLine($"[WeaponPaints] Retrying to retrieve player {player.PlayerName} skins");
-				Task.Run(async () =>
-				{
-					if (Config.Additional.SkinEnabled)
-						await weaponSync.GetWeaponPaintsFromDatabase(playerInfo);
-					if (Config.Additional.KnifeEnabled)
-						await weaponSync.GetKnifeFromDatabase(playerInfo);
-				});
-			}
-
-			return HookResult.Continue;
 		}
 
 		private HookResult OnPlayerSpawn(EventPlayerSpawn @event, GameEventInfo info)
 		{
 			CCSPlayerController? player = @event.Userid;
-			if (player == null || !player.IsValid)
+
-			{
+			if (player is null || !player.IsValid || !Config.Additional.KnifeEnabled && !Config.Additional.GloveEnabled)
 				return HookResult.Continue;
-			}
 
-			if (Config.Additional.KnifeEnabled && !PlayerHasKnife(player))
+			g_knifePickupCount[player.Slot] = 0;
-			{
+
-				g_knifePickupCount[(int)player.Index] = 0;
+			if (!PlayerHasKnife(player))
 				GiveKnifeToPlayer(player);
-				//AddTimer(0.1f, () => GiveKnifeToPlayer(player));
-			}
 
-			/*
+			Server.NextFrame(() =>
-			if (Config.Additional.SkinVisibilityFix)
 			{
-				AddTimer(0.3f, () => RefreshSkins(player));
+				RefreshGloves(player);
-			}
+			});
-			*/
 
 			return HookResult.Continue;
 		}
@@ -262,6 +204,7 @@ namespace WeaponPaints
 		private HookResult OnRoundEnd(EventRoundEnd @event, GameEventInfo info)
 		{
 			g_bCommandsAllowed = false;
+
 			return HookResult.Continue;
 		}
 
@@ -275,98 +218,92 @@ namespace WeaponPaints
 
 			return HookResult.Continue;
 		}
-
 		private void OnTick()
 		{
-			foreach (var player in Utilities.GetPlayers())
+			foreach (var player in Utilities.GetPlayers().Where(p =>
+							p is not null && p.IsValid &&
+							(LifeState_t)p.LifeState == LifeState_t.LIFE_ALIVE && p.SteamID.ToString().Length == 17
+							&& !p.IsBot && !p.IsHLTV && p.Connected == PlayerConnectedState.PlayerConnected && p.Team != CounterStrikeSharp.API.Modules.Utils.CsTeam.None
+							)
+				)
 			{
 				try
 				{
-					if (player == null || !player.IsValid || !player.PawnIsAlive || player.IsBot || player.IsHLTV || player.Connected == PlayerConnectedState.PlayerDisconnecting) continue;
+					if (Config.Additional.ShowSkinImage && PlayerWeaponImage.ContainsKey(player.Slot) && !string.IsNullOrEmpty(PlayerWeaponImage[player.Slot]))
+					{
+						player.PrintToCenterHtml("<img src='{PATH}'</img>".Replace("{PATH}", PlayerWeaponImage[player.Slot]));
+					}
+
+					if (player.PlayerPawn?.IsValid != true || player.PlayerPawn?.Value?.IsValid != true)
+						continue;
 
 					var viewModels = GetPlayerViewModels(player);
-
+					if (viewModels == null || viewModels.Length == 0)
-					if (viewModels == null) continue;
+						continue;
 
 					var viewModel = viewModels[0];
-					if (viewModel == null || viewModel.Value == null || viewModel.Value.Weapon == null || viewModel.Value.Weapon.Value == null) continue;
+					if (viewModel == null || viewModel.Value == null || viewModel.Value.Weapon == null || viewModel.Value.Weapon.Value == null)
-					CBasePlayerWeapon weapon = viewModel.Value.Weapon.Value;
+						continue;
 
-					if (weapon == null || !weapon.IsValid) continue;
+					var weapon = viewModel.Value.Weapon.Value;
+					if (weapon == null || !weapon.IsValid || weapon.FallbackPaintKit == 0)
+						continue;
 
-					var isKnife = viewModel.Value.VMName.Contains("knife");
+					if (viewModel.Value.VMName.Contains("knife"))
+						continue;
 
-					if (!isKnife)
+					var sceneNode = viewModel.Value.CBodyComponent?.SceneNode;
+					if (sceneNode == null)
+						continue;
+
+					var skeleton = GetSkeletonInstance(sceneNode);
+					if (skeleton == null)
+						continue;
+
+					bool skeletonChange = false;
+
+					int[] newPaints = { 1171, 1170, 1169, 1164, 1162, 1161, 1159, 1175, 1174, 1167, 1165, 1168, 1163, 1160, 1166, 1173 };
+					if (newPaints.Contains(weapon.FallbackPaintKit))
 					{
-						if (
+						if (skeleton.ModelState.MeshGroupMask != 1)
-							viewModel.Value.CBodyComponent != null
-							&& viewModel.Value.CBodyComponent.SceneNode != null
-						)
 						{
-							var skeleton = GetSkeletonInstance(viewModel.Value.CBodyComponent.SceneNode);
+							skeleton.ModelState.MeshGroupMask = 1;
-							int[] array = { 1171, 1170, 1169, 1164, 1162, 1161, 1159, 1175, 1174, 1167, 1165, 1168, 1163, 1160, 1166, 1173 };
+							skeletonChange = true;
-							int fallbackPaintKit = weapon.FallbackPaintKit;
-							if (array.Contains(fallbackPaintKit))
-							{
-								skeleton.ModelState.MeshGroupMask = 1;
-							}
-							else
-							{
-								if (skeleton.ModelState.MeshGroupMask != 2)
-								{
-									skeleton.ModelState.MeshGroupMask = 2;
-								}
-							}
-
 						}
-
-						Utilities.SetStateChanged(viewModel.Value, "CBaseEntity", "m_CBodyComponent");
 					}
+					else
+					{
+						if (skeleton.ModelState.MeshGroupMask != 2)
+						{
+							skeleton.ModelState.MeshGroupMask = 2;
+							skeletonChange = true;
+						}
+					}
+
+					if (skeletonChange)
+						Utilities.SetStateChanged(viewModel.Value, "CBaseEntity", "m_CBodyComponent");
 				}
 				catch (Exception)
-				{ }
+				{
+				}
 			}
 		}
 
 		private void RegisterListeners()
 		{
-			RegisterListener<Listeners.OnEntityCreated>(OnEntityCreated);
+			RegisterListener<Listeners.OnEntitySpawned>(OnEntityCreated);
-			RegisterListener<Listeners.OnClientPutInServer>(OnClientPutInServer);
+			//RegisterListener<Listeners.OnClientPutInServer>(OnClientPutInServer);
-			RegisterListener<Listeners.OnClientDisconnect>(OnClientDisconnect);
+			//RegisterListener<Listeners.OnClientDisconnect>(OnClientDisconnect);
 			RegisterListener<Listeners.OnMapStart>(OnMapStart);
 			RegisterListener<Listeners.OnTick>(OnTick);
 
-			//RegisterEventHandler<EventPlayerConnectFull>(OnPlayerConnectFull);
 			RegisterEventHandler<EventPlayerSpawn>(OnPlayerSpawn);
 			RegisterEventHandler<EventRoundStart>(OnRoundStart, HookMode.Pre);
 			RegisterEventHandler<EventRoundEnd>(OnRoundEnd);
-			//RegisterEventHandler<EventItemPurchase>(OnEventItemPurchasePost);
+
 			//RegisterEventHandler<EventItemPickup>(OnItemPickup);
-			HookEntityOutput("weapon_knife", "OnPlayerPickup", OnPickup, HookMode.Pre);
+
+			HookEntityOutput("weapon_knife", "OnPlayerPickup", OnPickup);
 		}
-
-
-		/* WORKAROUND FOR CLIENTS WITHOUT STEAMID ON AUTHORIZATION */
-		/*private HookResult OnPlayerConnectFull(EventPlayerConnectFull @event, GameEventInfo info)
-		{
-			CCSPlayerController? player = @event.Userid;
-
-			if (player == null || !player.IsValid || !player.EntityIndex.HasValue || player.IsHLTV) return HookResult.Continue;
-
-			int playerIndex = (int)player.EntityIndex.Value.Value;
-			if (Config.Additional.SkinEnabled && weaponSync != null)
-				_ = weaponSync.GetWeaponPaintsFromDatabase(playerIndex);
-			if (Config.Additional.KnifeEnabled && weaponSync != null)
-				_ = weaponSync.GetKnifeFromDatabase(playerIndex);
-
-			Task.Run(async () =>
-			{
-				if (Config.Additional.SkinEnabled && weaponSync != null)
-				if (Config.Additional.KnifeEnabled && weaponSync != null)
-			});
-
-			return HookResult.Continue;
-		}
-	*/
 	}
 }

PlayerExtensions.cs

@@ -5,11 +5,17 @@ namespace WeaponPaints;
 
 public static class PlayerExtensions
 {
-	public static void Print(this CCSPlayerController controller, string message)
+    public static void Print(this CCSPlayerController controller, string message)
-	{
+    {
-		if (WeaponPaints._localizer == null) return;
+        if (WeaponPaints._localizer == null)
-		StringBuilder _message = new(WeaponPaints._localizer["wp_prefix"]);
+        {
-		_message.Append(message);
+            controller.PrintToChat(message);
-		controller.PrintToChat(_message.ToString());
+        }
-	}
+        else
+        {
+            StringBuilder _message = new(WeaponPaints._localizer["wp_prefix"]);
+            _message.Append(message);
+            controller.PrintToChat(_message.ToString());
+        }
+    }
 }

PlayerInfo.cs

@@ -1,11 +1,24 @@
 namespace WeaponPaints
 {
-	public class PlayerInfo
+    public class PlayerInfo
-	{
+    {
-		public int Index { get; set; }
+        public int Index { get; set; }
-		public int? UserId { get; set; }
+        public int Slot { get; set; }
-		public string? SteamId { get; set; }
+        public int? UserId { get; set; }
-		public string? Name { get; set; }
+        public string? SteamId { get; set; }
-		public string? IpAddress { get; set; }
+        public string? Name { get; set; }
-	}
+        public string? IpAddress { get; set; }
-}
+
+        public PlayerInfo() { }
+
+        public PlayerInfo(int index, int slot, int? userId, string? steamId, string? name, string? ipAddress)
+        {
+            Index = index;
+            Slot = slot;
+            UserId = userId;
+            SteamId = steamId;
+            Name = name;
+            IpAddress = ipAddress;
+        }
+    }
+}

README.md

@@ -10,7 +10,7 @@ Unfinished, unoptimized and not fully functional ugly demo weapon paints plugin
 
 ## Features
 - Changes only paint, seed and wear on weapons and knives
-- MySQL based or global website, so you dont need MySQL/Website
+- MySQL based
 - Data syncs on player connect
 - Added command **`!wp`** to refresh skins ***(with cooldown in seconds can be configured)***
 - Added command **`!ws`** to show website
@@ -18,13 +18,11 @@ Unfinished, unoptimized and not fully functional ugly demo weapon paints plugin
 - Knife change is now limited to have these cvars empty **`mp_t_default_melee ""`** and **`mp_ct_default_melee ""`**
 - Translations support, submit a PR if you want to share your translation
 
-**GlobalShare** - global website accessible at [weaponpaints.fun](https://weaponpaints.fun/)
-
 ## CS2 Server
 - Have working CounterStrikeSharp (**with RUNTIME!**)
 - Download from Release and copy plugin to plugins
 - Run server with plugin, **it will generate config if installed correctly!**
-- Edit `addons/counterstrikesharp/configs/`**`plugins/WeaponPaints/WeaponPaints.json`** set **`GlobalShare`** to **`true`** for global, or include database credentials
+- Edit `addons/counterstrikesharp/configs/`**`plugins/WeaponPaints/WeaponPaints.json`** include database credentials
 - In `addons/counterstrikesharp/configs/`**`core.json`** set **FollowCS2ServerGuidelines** to **`false`**
 
 ## Plugin Configuration
@@ -32,12 +30,11 @@ Unfinished, unoptimized and not fully functional ugly demo weapon paints plugin
   <summary>Click to expand</summary>
 <code><pre>{
 	"Version": 4, // Don't touch
-	"DatabaseHost": "", // MySQL host (required if GlobalShare = false)
+	"DatabaseHost": "", // MySQL host
-	"DatabasePort": 3306, // MySQL port (required if GlobalShare = false)
+	"DatabasePort": 3306, // MySQL port
-	"DatabaseUser": "", // MySQL username (required if GlobalShare = false)
+	"DatabaseUser": "", // MySQL username
-	"DatabasePassword": "", // MySQL user password (required if GlobalShare = false)
+	"DatabasePassword": "", // MySQL user password
-	"DatabaseName": "", // MySQL database name (required if GlobalShare = false)
+	"DatabaseName": "", // MySQL database name
-	"GlobalShare": false, // Enable or disable GlobalShare, plugin can work without mysql credentials but with shared website at weaponpaints.fun
 	"CmdRefreshCooldownSeconds": 60, // Cooldown time in refreshing skins (!wp command)
 	"Prefix": "[WeaponPaints]", // Prefix every chat message
 	"Website": "example.com/skins", // Website used in WebsiteMessageCommand (!ws command)
@@ -74,7 +71,6 @@ Unfinished, unoptimized and not fully functional ugly demo weapon paints plugin
 </details>
     
 ## Web install
-Disregard if the config is **`GlobalShare = true`**
 - Requires PHP >= 7.4 ***(Tested on php ver **`8.2.3`** and nginx webserver)***
 - **Before using website, make sure the plugin is correctly loaded in cs2 server!** Mysql tables are created by plugin not by website.
 - Copy website to web server ***(Folder `img` not needed)***

SchemaString.cs

@@ -0,0 +1,25 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Modules.Memory;
+using System.Runtime.CompilerServices;
+using System.Text;
+
+namespace WeaponPaints;
+
+public class SchemaString<TSchemaClass> : NativeObject where TSchemaClass : NativeObject
+{
+	internal SchemaString(TSchemaClass instance, string member) : base(Schema.GetSchemaValue<nint>(instance.Handle, typeof(TSchemaClass).Name!, member))
+	{ }
+
+    internal unsafe void Set(string str)
+    {
+        var bytes = Encoding.UTF8.GetBytes(str);
+        var handle = Handle.ToInt64();
+
+        for (var i = 0; i < bytes.Length; i++)
+        {
+            Unsafe.Write((void*)(handle + i), bytes[i]);
+        }
+
+        Unsafe.Write((void*)(handle + bytes.Length), 0);
+    }
+}

Utility.cs

@@ -1,11 +1,11 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using Dapper;
-using MySqlConnector;
-using Newtonsoft.Json.Linq;
-using Newtonsoft.Json;
-using System.Reflection;
 using Microsoft.Extensions.Logging;
+using MySqlConnector;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System.Reflection;
 
 namespace WeaponPaints
 {
@@ -23,27 +23,56 @@ namespace WeaponPaints
 				Password = Config.DatabasePassword,
 				Database = Config.DatabaseName,
 				Port = (uint)Config.DatabasePort,
+				Pooling = true
 			};
 
 			return builder.ConnectionString;
 		}
 
-		internal static async void CheckDatabaseTables()
+		internal static async Task CheckDatabaseTables()
 		{
+			if (WeaponPaints._database is null) return;
+
 			try
 			{
-				using var connection = new MySqlConnection(BuildDatabaseConnectionString());
+				await using var connection = await WeaponPaints._database.GetConnectionAsync();
-				await connection.OpenAsync();
 
-				using var transaction = await connection.BeginTransactionAsync();
+				await using var transaction = await connection.BeginTransactionAsync();
 
 				try
 				{
-					string createTable1 = "CREATE TABLE IF NOT EXISTS `wp_player_skins` (`steamid` varchar(64) NOT NULL, `weapon_defindex` int(6) NOT NULL, `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";
+					string[] createTableQueries = new[]
-					string createTable2 = "CREATE TABLE IF NOT EXISTS `wp_player_knife` (`steamid` varchar(64) NOT NULL, `knife` varchar(64) NOT NULL, UNIQUE (`steamid`)) ENGINE = InnoDB";
+					{
-
+						@"CREATE TABLE IF NOT EXISTS `wp_player_skins` (
-					await connection.ExecuteAsync(createTable1, transaction: transaction);
+								`steamid` varchar(64) NOT NULL,
-					await connection.ExecuteAsync(createTable2, transaction: transaction);
+								`weapon_defindex` int(6) NOT NULL,
+								`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",
+						@"CREATE TABLE IF NOT EXISTS `wp_player_knife` (
+								`steamid` varchar(64) NOT NULL,
+								`knife` varchar(64) NOT NULL,
+								UNIQUE (`steamid`)
+							) ENGINE = InnoDB",
+						@"CREATE TABLE IF NOT EXISTS `wp_player_gloves` (
+							 `steamid` varchar(64) NOT NULL,
+							 `weapon_defindex` int(11) NOT NULL,
+							  UNIQUE (`steamid`)
+							) ENGINE=InnoDB"
+					};
+                    /*string[] createTableQueries = new[]
+                    {
+                        @"CREATE TABLE IF NOT EXISTS `wp_players` (`steamid` BIGINT UNSIGNED NOT NULL, `created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, `updated_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (`steamid`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;",
+                        @"CREATE TABLE IF NOT EXISTS `wp_players_skins` (`steamid` BIGINT UNSIGNED NOT NULL, `team` SMALLINT UNSIGNED NOT NULL, `weapon` SMALLINT UNSIGNED NOT NULL, `paint` SMALLINT UNSIGNED NOT NULL, `wear` FLOAT NOT NULL DEFAULT 0.00001, `seed` SMALLINT UNSIGNED NOT NULL DEFAULT 0, `nametag` VARCHAR(20) DEFAULT NULL, `stattrack` INT UNSIGNED NOT NULL DEFAULT 0, `stattrack_enabled` SMALLINT NOT NULL DEFAULT 0, PRIMARY KEY (`steamid`,`weapon`,`team`), FOREIGN KEY (`steamid`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;",
+                        @"CREATE TABLE IF NOT EXISTS `wp_players_knife` (`steamid` BIGINT UNSIGNED NOT NULL, `knife_t` SMALLINT UNSIGNED NOT NULL, `knife_ct` SMALLINT UNSIGNED NOT NULL, PRIMARY KEY (`steamid`), FOREIGN KEY (`steamid`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;",
+                        @"CREATE TABLE IF NOT EXISTS `wp_players_music` (`steamid` BIGINT UNSIGNED NOT NULL, `music` SMALLINT UNSIGNED DEFAULT NULL, PRIMARY KEY (`steamid`), FOREIGN KEY (`steamid`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;",
+                        @"CREATE TABLE IF NOT EXISTS `wp_players_gloves` (`steamid` BIGINT UNSIGNED NOT NULL, `glove_t` SMALLINT UNSIGNED NOT NULL, `glove_ct` SMALLINT UNSIGNED NOT NULL, PRIMARY KEY (`steamid`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;"
+                    };*/
+                    foreach (var query in createTableQueries)
+					{
+						await connection.ExecuteAsync(query, transaction: transaction);
+					}
 
 					await transaction.CommitAsync();
 				}
@@ -55,25 +84,43 @@ namespace WeaponPaints
 			}
 			catch (Exception ex)
 			{
-				throw new Exception("[WeaponPaints] Unknown mysql exception! " + ex.Message);
+				throw new Exception("[WeaponPaints] Unknown MySQL exception! " + ex.Message);
 			}
 		}
 
 		internal static bool IsPlayerValid(CCSPlayerController? player)
 		{
-			return (player != null && player.IsValid && !player.IsBot && !player.IsHLTV && player.AuthorizedSteamID != null);
+			if (player is null) return false;
+
+			return (player is not null && player.IsValid && !player.IsBot && !player.IsHLTV && player.UserId.HasValue
+				&& WeaponPaints.weaponSync != null && player.Connected == PlayerConnectedState.PlayerConnected && player.SteamID.ToString().Length == 17);
 		}
+
 		internal static void LoadSkinsFromFile(string filePath)
 		{
-			if (File.Exists(filePath))
+			try
 			{
 				string json = File.ReadAllText(filePath);
 				var deserializedSkins = JsonConvert.DeserializeObject<List<JObject>>(json);
 				WeaponPaints.skinsList = deserializedSkins ?? new List<JObject>();
 			}
-			else
+			catch (FileNotFoundException)
 			{
-				throw new FileNotFoundException("File not found.", filePath);
+				throw;
+			}
+		}
+
+		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;
 			}
 		}
 
@@ -114,11 +161,11 @@ namespace WeaponPaints
 			{
 				try
 				{
-					HttpResponseMessage response = await client.GetAsync("https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/VERSION");
+					HttpResponseMessage response = await client.GetAsync("https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/VERSION").ConfigureAwait(false);
 
 					if (response.IsSuccessStatusCode)
 					{
-						string remoteVersion = await response.Content.ReadAsStringAsync();
+						string remoteVersion = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
 						remoteVersion = remoteVersion.Trim();
 
 						int comparisonResult = string.Compare(version, remoteVersion);
@@ -141,9 +188,13 @@ namespace WeaponPaints
 						logger.LogWarning("Failed to check version");
 					}
 				}
+				catch (HttpRequestException ex)
+				{
+					logger.LogError(ex, "Failed to connect to the version server.");
+				}
 				catch (Exception ex)
 				{
-					Console.WriteLine(ex);
+					logger.LogError(ex, "An error occurred while checking version.");
 				}
 			}
 		}
@@ -163,6 +214,7 @@ namespace WeaponPaints
 			Console.WriteLine(" ");
 		}
 
+		/*(
 		internal static void TestDatabaseConnection()
 		{
 			try
@@ -181,5 +233,6 @@ namespace WeaponPaints
 			}
 			CheckDatabaseTables();
 		}
+		*/
 	}
 }

VERSION

@@ -1 +1 @@
-1.5a
+1.9b

WeaponAction.cs

@@ -1,6 +1,7 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Memory;
+using CounterStrikeSharp.API.Modules.Timers;
 using CounterStrikeSharp.API.Modules.Utils;
 using Microsoft.Extensions.Logging;
 using System.Runtime.InteropServices;
@@ -11,24 +12,22 @@ namespace WeaponPaints
 	{
 		internal static void ChangeWeaponAttributes(CBasePlayerWeapon? weapon, CCSPlayerController? player, bool isKnife = false)
 		{
-			if (player == null || weapon == null || !weapon.IsValid || !Utility.IsPlayerValid(player)) return;
+			if (player is null || weapon is null || !weapon.IsValid || !Utility.IsPlayerValid(player)) return;
+            if (!gPlayerWeaponsInfo.TryGetValue(player.Slot, out _)) return;
 
-			int playerIndex = (int)player.Index;
+			if (isKnife && !g_playersKnife.ContainsKey(player.Slot) || isKnife && g_playersKnife[player.Slot] == "weapon_knife") return;
-
-			if (!gPlayerWeaponsInfo.ContainsKey(playerIndex)) return;
-
-			if (isKnife && !g_playersKnife.ContainsKey(playerIndex) || isKnife && g_playersKnife[playerIndex] == "weapon_knife") return;
 
 			int weaponDefIndex = weapon.AttributeManager.Item.ItemDefinitionIndex;
 
-
 			if (isKnife)
 			{
 				weapon.AttributeManager.Item.EntityQuality = 3;
 			}
 
+			int fallbackPaintKit = weapon.FallbackPaintKit;
+
 			if (_config.Additional.GiveRandomSkin &&
-				 !gPlayerWeaponsInfo[playerIndex].ContainsKey(weaponDefIndex))
+				 !gPlayerWeaponsInfo[player.Slot].ContainsKey(weaponDefIndex))
 			{
 				// Random skins
 				weapon.AttributeManager.Item.ItemID = 16384;
@@ -37,13 +36,29 @@ namespace WeaponPaints
 				weapon.FallbackPaintKit = GetRandomPaint(weaponDefIndex);
 				weapon.FallbackSeed = 0;
 				weapon.FallbackWear = 0.000001f;
+
+				fallbackPaintKit = weapon.FallbackPaintKit;
+
+				if (fallbackPaintKit == 0)
+					return;
+
+				var foundSkin = skinsList.FirstOrDefault(skin =>
+					((int?)skin?["weapon_defindex"] ?? 0) == weaponDefIndex &&
+					((int?)skin?["paint"] ?? 0) == fallbackPaintKit &&
+					skin?["paint_name"] != null
+				);
+
+				string skinName = foundSkin?["paint_name"]?.ToString() ?? "";
+				if (!string.IsNullOrEmpty(skinName))
+					new SchemaString<CEconItemView>(weapon.AttributeManager.Item, "m_szCustomName").Set(skinName);
+
 				if (!isKnife && weapon.CBodyComponent != null && weapon.CBodyComponent.SceneNode != null)
 				{
 					var skeleton = GetSkeletonInstance(weapon.CBodyComponent.SceneNode);
 
-					int[] array = { 1171, 1170, 1169, 1164, 1162, 1161, 1159, 1175, 1174, 1167, 1165, 1168, 1163, 1160, 1166, 1173 };
+					int[] newPaints = { 1171, 1170, 1169, 1164, 1162, 1161, 1159, 1175, 1174, 1167, 1165, 1168, 1163, 1160, 1166, 1173 };
-					int fallbackPaintKit = weapon.FallbackPaintKit;
+
-					if (array.Contains(fallbackPaintKit))
+					if (newPaints.Contains(fallbackPaintKit))
 					{
 						skeleton.ModelState.MeshGroupMask = 1;
 					}
@@ -55,11 +70,22 @@ namespace WeaponPaints
 						}
 					}
 				}
+
+				var viewModels = GetPlayerViewModels(player);
+				if (viewModels == null || viewModels.Length == 0)
+					return;
+
+				var viewModel = viewModels[0];
+				if (viewModel == null || viewModel.Value == null || viewModel.Value.Weapon == null || viewModel.Value.Weapon.Value == null)
+					return;
+
+				Utilities.SetStateChanged(viewModel.Value, "CBaseEntity", "m_CBodyComponent");
+
 				return;
 			}
 
-			if (!gPlayerWeaponsInfo[playerIndex].ContainsKey(weaponDefIndex)) return;
+			if (!gPlayerWeaponsInfo[player.Slot].ContainsKey(weaponDefIndex)) return;
-			WeaponInfo weaponInfo = gPlayerWeaponsInfo[playerIndex][weaponDefIndex];
+			WeaponInfo weaponInfo = gPlayerWeaponsInfo[player.Slot][weaponDefIndex];
 			//Log($"Apply on {weapon.DesignerName}({weapon.AttributeManager.Item.ItemDefinitionIndex}) paint {gPlayerWeaponPaints[steamId.SteamId64][weapon.AttributeManager.Item.ItemDefinitionIndex]} seed {gPlayerWeaponSeed[steamId.SteamId64][weapon.AttributeManager.Item.ItemDefinitionIndex]} wear {gPlayerWeaponWear[steamId.SteamId64][weapon.AttributeManager.Item.ItemDefinitionIndex]}");
 			weapon.AttributeManager.Item.ItemID = 16384;
 			weapon.AttributeManager.Item.ItemIDLow = 16384 & 0xFFFFFFFF;
@@ -68,12 +94,26 @@ namespace WeaponPaints
 			weapon.FallbackSeed = weaponInfo.Seed;
 			weapon.FallbackWear = weaponInfo.Wear;
 
+			fallbackPaintKit = weapon.FallbackPaintKit;
+
+			if (fallbackPaintKit == 0)
+				return;
+
+			var foundSkin1 = skinsList.FirstOrDefault(skin =>
+			   ((int?)skin?["weapon_defindex"] ?? 0) == weaponDefIndex &&
+			   ((int?)skin?["paint"] ?? 0) == fallbackPaintKit &&
+			   skin?["paint_name"] != null
+		   );
+
+			var skinName1 = foundSkin1?["paint_name"]?.ToString() ?? "";
+			if (!string.IsNullOrEmpty(skinName1))
+				new SchemaString<CEconItemView>(weapon.AttributeManager.Item, "m_szCustomName").Set(skinName1);
+
 			if (!isKnife && weapon.CBodyComponent != null && weapon.CBodyComponent.SceneNode != null)
 			{
 				var skeleton = GetSkeletonInstance(weapon.CBodyComponent.SceneNode);
-				int[] array = { 1171, 1170, 1169, 1164, 1162, 1161, 1159, 1175, 1174, 1167, 1165, 1168, 1163, 1160, 1166, 1173 };
+				int[] newPaints = { 1171, 1170, 1169, 1164, 1162, 1161, 1159, 1175, 1174, 1167, 1165, 1168, 1163, 1160, 1166, 1173 };
-				int fallbackPaintKit = weapon.FallbackPaintKit;
+				if (newPaints.Contains(fallbackPaintKit))
-				if (array.Contains(fallbackPaintKit))
 				{
 					skeleton.ModelState.MeshGroupMask = 1;
 				}
@@ -85,38 +125,57 @@ namespace WeaponPaints
 					}
 				}
 			}
+
+			var viewModels1 = GetPlayerViewModels(player);
+			if (viewModels1 == null || viewModels1.Length == 0)
+				return;
+
+			var viewModel1 = viewModels1[0];
+			if (viewModel1 == null || viewModel1.Value == null || viewModel1.Value.Weapon == null || viewModel1.Value.Weapon.Value == null)
+				return;
+
+			Utilities.SetStateChanged(viewModel1.Value, "CBaseEntity", "m_CBodyComponent");
 		}
 
 		internal static void GiveKnifeToPlayer(CCSPlayerController? player)
 		{
 			if (!_config.Additional.KnifeEnabled || player == null || !player.IsValid) return;
 
-			if (g_playersKnife.TryGetValue((int)player.Index, out var knife))
+			WeaponPaints.Instance.AddTimer(1.0f, () =>
 			{
-				player.GiveNamedItem(knife);
+				string knifeToGive;
-			}
+				if (g_playersKnife.TryGetValue(player.Slot, out var knife))
-			else if (_config.Additional.GiveRandomKnife)
+				{
-			{
+					knifeToGive = knife;
-				var knifeTypes = weaponList.Where(pair => pair.Key.StartsWith("weapon_knife") || pair.Key.StartsWith("weapon_bayonet")).ToDictionary(pair => pair.Key, pair => pair.Value);
+				}
+				else if (_config.Additional.GiveRandomKnife)
+				{
+					var knifeTypes = weaponList.Where(pair => pair.Key.StartsWith("weapon_knife") || pair.Key.StartsWith("weapon_bayonet")).ToList();
 
-				Random random = new();
+					if (knifeTypes.Count == 0)
-				int index = random.Next(knifeTypes.Count);
+					{
-				var randomKnifeClass = knifeTypes.Keys.ElementAt(index);
+						Utility.Log("No valid knife types found.");
+						return;
+					}
 
-				player.GiveNamedItem(randomKnifeClass);
+					Random random = new();
-			}
+					int index = random.Next(knifeTypes.Count);
-			else
+					knifeToGive = knifeTypes[index].Key;
-			{
+				}
-				var defaultKnife = (CsTeam)player.TeamNum == CsTeam.Terrorist ? "weapon_knife_t" : "weapon_knife";
+				else
-				player.GiveNamedItem(defaultKnife);
+				{
-			}
+					knifeToGive = (CsTeam)player.TeamNum == CsTeam.Terrorist ? "weapon_knife_t" : "weapon_knife";
+				}
+
+				player.GiveNamedItem(knifeToGive);
+			});
 		}
 
 		internal static bool PlayerHasKnife(CCSPlayerController? player)
 		{
 			if (!_config.Additional.KnifeEnabled) return false;
 
-			if (player == null || !player.IsValid || player.PlayerPawn == null || !player.PlayerPawn.IsValid || !player.PawnIsAlive)
+			if (player == null || !player.IsValid || player.PlayerPawn == null || !player.PlayerPawn.IsValid)
 			{
 				return false;
 			}
@@ -139,205 +198,233 @@ namespace WeaponPaints
 			return false;
 		}
 
-		internal void RefreshPlayerKnife(CCSPlayerController? player)
-		{
-			if (player == null || !player.IsValid || player.PlayerPawn.Value == null || !player.PawnIsAlive) return;
-			if (player.PlayerPawn.Value.WeaponServices == null || player.PlayerPawn.Value.ItemServices == null) return;
-
-			var weapons = player.PlayerPawn.Value.WeaponServices.MyWeapons;
-			if (weapons != null && weapons.Count > 0)
-			{
-				CCSPlayer_ItemServices service = new(player.PlayerPawn.Value.ItemServices.Handle);
-				//var dropWeapon = VirtualFunction.CreateVoid<nint, nint>(service.Handle, GameData.GetOffset("CCSPlayer_ItemServices_DropActivePlayerWeapon"));
-
-				foreach (var weapon in weapons)
-				{
-					if (weapon != null && weapon.IsValid && weapon.Value != null && weapon.Value.IsValid)
-					{
-						//if (weapon.Value.AttributeManager.Item.ItemDefinitionIndex == 42 || weapon.Value.AttributeManager.Item.ItemDefinitionIndex == 59)
-						if (weapon.Value.DesignerName.Contains("knife") || weapon.Value.DesignerName.Contains("bayonet"))
-						{
-							if (weapon.Index <= 0) return;
-							int weaponEntityIndex = (int)weapon.Index;
-							NativeAPI.IssueClientCommand((int)player.Index - 1, "slot3");
-							AddTimer(0.22f, () =>
-							{
-								if (player.PlayerPawn.Value.WeaponServices.ActiveWeapon.Value!.DesignerName.Contains("knife")
-								||
-								player.PlayerPawn.Value.WeaponServices.ActiveWeapon.Value!.DesignerName.Contains("bayonet")
-								)
-								{
-									if (player.PawnIsAlive)
-									{
-										NativeAPI.IssueClientCommand((int)player.Index - 1, "slot3");
-										service.DropActivePlayerWeapon(weapon.Value);
-										GiveKnifeToPlayer(player);
-									}
-								}
-							});
-
-							Task.Delay(TimeSpan.FromSeconds(3.5)).ContinueWith(_ =>
-							{
-								try
-								{
-									CEntityInstance? knife = Utilities.GetEntityFromIndex<CEntityInstance>(weaponEntityIndex);
-
-									if (knife != null && knife.IsValid && knife.Handle != -1 && knife.Index > 0)
-									{
-										knife.Remove();
-									}
-								}
-								catch (Exception) { }
-							});
-
-							break;
-						}
-					}
-				}
-			}
-		}
-
-		internal void RefreshSkins(CCSPlayerController? player)
-		{
-			return;
-			if (!Utility.IsPlayerValid(player) || !player!.PawnIsAlive) return;
-
-			AddTimer(0.18f, () => NativeAPI.IssueClientCommand((int)player.Index - 1, "slot3"));
-			AddTimer(0.25f, () => NativeAPI.IssueClientCommand((int)player.Index - 1, "slot2"));
-			AddTimer(0.38f, () => NativeAPI.IssueClientCommand((int)player.Index - 1, "slot1"));
-		}
-
 		internal void RefreshWeapons(CCSPlayerController? player)
 		{
-			if (player == null || !player.IsValid || player.PlayerPawn.Value == null || !player.PawnIsAlive) return;
+			if (player == null || !player.IsValid || player.PlayerPawn?.Value == null || (LifeState_t)player.LifeState != LifeState_t.LIFE_ALIVE)
-			if (player.PlayerPawn.Value.WeaponServices == null || player.PlayerPawn.Value.ItemServices == null) return;
+				return;
+			if (player.PlayerPawn.Value.WeaponServices == null || player.PlayerPawn.Value.ItemServices == null)
+				return;
+
+			var weapons = player.PlayerPawn.Value.WeaponServices.MyWeapons;
+
+			if (weapons == null || weapons.Count == 0)
+				return;
+			if (player.Team == CsTeam.None || player.Team == CsTeam.Spectator)
+				return;
+
+			//Dictionary<string, (int, int)> weaponsWithAmmo = new Dictionary<string, (int, int)>();
+			Dictionary<string, List<(int, int)>> weaponsWithAmmo = new Dictionary<string, List<(int, int)>>();
+
+			// Iterate through each weapon
+			foreach (var weapon in weapons)
+			{
+				if (weapon == null || !weapon.IsValid || weapon.Value == null ||
+					!weapon.Value.IsValid || !weapon.Value.DesignerName.Contains("weapon_"))
+					continue;
+
+				CCSWeaponBaseGun gun = weapon.Value.As<CCSWeaponBaseGun>();
+
+				if (weapon.Value.Entity == null) continue;
+				if (weapon.Value.OwnerEntity == null) continue;
+				if (!weapon.Value.OwnerEntity.IsValid) continue;
+				if (gun == null) continue;
+				if (gun.Entity == null) continue;
+				if (!gun.IsValid) continue;
+				if (!gun.VisibleinPVS) continue;
+
+				try
+				{
+					string? weaponByDefindex = null;
+
+					CCSWeaponBaseVData? weaponData = weapon.Value.As<CCSWeaponBase>().VData;
+
+					if (weaponData == null) continue;
+
+					if (weaponData.GearSlot == gear_slot_t.GEAR_SLOT_RIFLE || weaponData.GearSlot == gear_slot_t.GEAR_SLOT_PISTOL)
+					{
+						if (!WeaponDefindex.TryGetValue(weapon.Value.AttributeManager.Item.ItemDefinitionIndex, out weaponByDefindex))
+							continue;
+
+						int clip1 = weapon.Value.Clip1;
+						int reservedAmmo = weapon.Value.ReserveAmmo[0];
+
+						if (!weaponsWithAmmo.ContainsKey(weaponByDefindex))
+						{
+							weaponsWithAmmo.Add(weaponByDefindex, new List<(int, int)>());
+						}
+
+						weaponsWithAmmo[weaponByDefindex].Add((clip1, reservedAmmo));
+					}
+
+					//player.RemoveItemByDesignerName(weapon.Value.DesignerName, false);
+				}
+				catch (Exception ex)
+				{
+					Logger.LogWarning(ex.Message);
+					continue;
+				}
+			}
+
+			for (int i = 1; i <= 3; i++)
+			{
+				player.ExecuteClientCommand($"slot {i}");
+				player.ExecuteClientCommand($"slot {i}");
+
+				AddTimer(0.1f, () =>
+				{
+					var weapon = player.PlayerPawn.Value.WeaponServices.ActiveWeapon.Value;
+					CCSWeaponBaseGun? gun = weapon?.As<CCSWeaponBaseGun>();
+
+					if (gun == null || gun.VData == null) return;
+
+					if (gun?.VData?.GearSlot == gear_slot_t.GEAR_SLOT_C4 || gun?.VData?.GearSlot == gear_slot_t.GEAR_SLOT_GRENADES) return;
+
+					player.DropActiveWeapon();
+
+					AddTimer(0.22f, () =>
+					{
+						if (gun != null && gun.IsValid && gun.State == CSWeaponState_t.WEAPON_NOT_CARRIED)
+						{
+							weapon?.Remove();
+						}
+					});
+				});
+			}
+
+			AddTimer(1.2f, () =>
+			{
+				GiveKnifeToPlayer(player);
+
+				foreach (var entry in weaponsWithAmmo)
+				{
+					foreach (var ammo in entry.Value)
+					{
+						var newWeapon = new CBasePlayerWeapon(player.GiveNamedItem(entry.Key));
+						Server.NextFrame(() =>
+						{
+							try
+							{
+								if (newWeapon != null)
+								{
+									newWeapon.Clip1 = ammo.Item1;
+									newWeapon.ReserveAmmo[0] = ammo.Item2;
+								}
+							}
+							catch (Exception ex)
+							{
+								Logger.LogWarning("Error setting weapon properties: " + ex.Message);
+							}
+						});
+					}
+				}
+			}, TimerFlags.STOP_ON_MAPCHANGE);
+		}
+
+		internal void RefreshKnife(CCSPlayerController? player)
+		{
+			if (player == null || !player.IsValid || player.PlayerPawn?.Value == null)
+				return;
+
+			if (player.PlayerPawn.Value.WeaponServices == null)
+				return;
 
 			var weapons = player.PlayerPawn.Value.WeaponServices.MyWeapons;
 			if (weapons != null && weapons.Count > 0)
 			{
-				CCSPlayer_ItemServices service = new(player.PlayerPawn.Value.ItemServices.Handle);
-
 				foreach (var weapon in weapons)
 				{
-					if (weapon != null && weapon.IsValid && weapon.Value != null && weapon.Value.IsValid)
+					if (weapon != null && weapon.IsValid && weapon.Value != null && weapon.Value.IsValid && weapon.Index > 0)
 					{
-						if (weapon.Index <= 0 || !weapon.Value.DesignerName.Contains("weapon_")) continue;
-						//if (weapon.Value.AttributeManager.Item.ItemDefinitionIndex == 42 || weapon.Value.AttributeManager.Item.ItemDefinitionIndex == 59)
 						try
 						{
-							if (weapon.Value.DesignerName.Contains("knife") || weapon.Value.DesignerName.Contains("bayonet"))
+							CCSWeaponBaseVData? weaponData = weapon.Value.As<CCSWeaponBase>().VData;
+
+							if (weapon.Value.DesignerName.Contains("knife") || weaponData?.GearSlot == gear_slot_t.GEAR_SLOT_KNIFE)
 							{
-								player.RemoveItemByDesignerName(weapon.Value.DesignerName, true);
+								player.ExecuteClientCommand("slot 3");
+
+								weapon.Value.Remove();
 								GiveKnifeToPlayer(player);
 							}
-							else
-							{
-								if (!weaponDefindex.ContainsKey(weapon.Value.AttributeManager.Item.ItemDefinitionIndex)) continue;
-								int clip1, reservedAmmo;
-
-								clip1 = weapon.Value.Clip1;
-								reservedAmmo = weapon.Value.ReserveAmmo[0];
-
-								string weaponByDefindex = weaponDefindex[weapon.Value.AttributeManager.Item.ItemDefinitionIndex];
-								player.RemoveItemByDesignerName(weapon.Value.DesignerName, true);
-								CBasePlayerWeapon newWeapon = new(player.GiveNamedItem(weaponByDefindex));
-
-								Server.NextFrame(() =>
-								{
-									if (newWeapon == null) return;
-									try
-									{
-										newWeapon.Clip1 = clip1;
-										newWeapon.ReserveAmmo[0] = reservedAmmo;
-									}
-									catch (Exception)
-									{ }
-								});
-							}
 						}
 						catch (Exception ex)
 						{
-							Logger.LogWarning("Refreshing weapons exception");
+							Logger.LogWarning($"Cannot remove knife: {ex.Message}");
-							Console.WriteLine("[WeaponPaints] Refreshing weapons exception");
-							Console.WriteLine(ex.Message);
 						}
 					}
 				}
-
-				/*
-				if (Config.Additional.SkinVisibilityFix)
-					RefreshSkins(player);
-				*/
 			}
 		}
 
-		internal void RemovePlayerKnife(CCSPlayerController? player, bool force = false)
+		private static void RefreshGloves(CCSPlayerController player)
 		{
-			if (player == null || !player.IsValid || player.PlayerPawn.Value == null || !player.PawnIsAlive) return;
+			if (!Utility.IsPlayerValid(player) || (LifeState_t)player.LifeState != LifeState_t.LIFE_ALIVE) return;
-			if (player.PlayerPawn.Value.WeaponServices == null || player.PlayerPawn.Value.ItemServices == null) return;
 
-			var weapons = player.PlayerPawn.Value.WeaponServices.MyWeapons;
+			CCSPlayerPawn? pawn = player.PlayerPawn.Value;
-			if (weapons != null && weapons.Count > 0)
+			if (pawn == null || !pawn.IsValid || pawn.LifeState != (byte)LifeState_t.LIFE_ALIVE)
+				return;
+
+			string model = pawn.CBodyComponent?.SceneNode?.GetSkeletonInstance()?.ModelState.ModelName ?? string.Empty;
+			if (!string.IsNullOrEmpty(model))
 			{
-				CCSPlayer_ItemServices service = new CCSPlayer_ItemServices(player.PlayerPawn.Value.ItemServices.Handle);
+				pawn.SetModel("characters/models/tm_jumpsuit/tm_jumpsuit_varianta.vmdl");
-				//var dropWeapon = VirtualFunction.CreateVoid<nint, nint>(service.Handle, GameData.GetOffset("CCSPlayer_ItemServices_DropActivePlayerWeapon"));
+				pawn.SetModel(model);
+			}
 
-				foreach (var weapon in weapons)
+			Instance.AddTimer(0.06f, () =>
+			{
+				try
 				{
-					if (weapon != null && weapon.IsValid && weapon.Value != null && weapon.Value.IsValid)
+					if (player == null || !player.IsValid)
+						return;
+
+					if (pawn == null || !pawn.IsValid || pawn.LifeState != (byte)LifeState_t.LIFE_ALIVE)
+						return;
+
+					if (g_playersGlove.TryGetValue(player.Slot, out var gloveInfo) && gloveInfo != 0)
 					{
-						//if (weapon.Value.AttributeManager.Item.ItemDefinitionIndex == 42 || weapon.Value.AttributeManager.Item.ItemDefinitionIndex == 59)
+						CCSPlayerPawn? pawn = player.PlayerPawn.Value;
-						if (weapon.Value.DesignerName.Contains("knife") || weapon.Value.DesignerName.Contains("bayonet"))
+						if (pawn == null || !pawn.IsValid || pawn.LifeState != (byte)LifeState_t.LIFE_ALIVE)
-						{
+							return;
-							if (!force)
-							{
-								if ((int)weapon.Index <= 0) return;
-								int weaponEntityIndex = (int)weapon.Index;
-								NativeAPI.IssueClientCommand((int)player.Index - 1, "slot3");
-								AddTimer(0.35f, () => service.DropActivePlayerWeapon(weapon.Value));
 
-								AddTimer(1.0f, () =>
+						WeaponInfo weaponInfo = gPlayerWeaponsInfo[player.Slot][gloveInfo];
-								{
-									CEntityInstance? knife = Utilities.GetEntityFromIndex<CEntityInstance>(weaponEntityIndex);
-									if (knife != null && knife.IsValid)
-									{
-										knife.Remove();
-									}
-								});
-							}
-							else
-							{
-								weapon.Value.Remove();
-							}
 
-							break;
+						CEconItemView item = pawn.EconGloves;
-						}
+						item.ItemDefinitionIndex = gloveInfo;
+						item.ItemIDLow = 16384 & 0xFFFFFFFF;
+						item.ItemIDHigh = 16384;
+
+						CAttributeList_SetOrAddAttributeValueByName.Invoke(item.NetworkedDynamicAttributes.Handle, "set item texture prefab", weaponInfo.Paint);
+						CAttributeList_SetOrAddAttributeValueByName.Invoke(item.NetworkedDynamicAttributes.Handle, "set item texture seed", weaponInfo.Seed);
+						CAttributeList_SetOrAddAttributeValueByName.Invoke(item.NetworkedDynamicAttributes.Handle, "set item texture wear", weaponInfo.Wear);
+
+						item.Initialized = true;
+
+						CBaseModelEntity_SetBodygroup.Invoke(pawn, "default_gloves", 1);
 					}
 				}
-			}
+				catch (Exception) { }
+			}, TimerFlags.STOP_ON_MAPCHANGE);
 		}
+
 		private static int GetRandomPaint(int defindex)
 		{
+			if (skinsList == null || skinsList.Count == 0)
+				return 0;
 
-			if (skinsList != null)
+			Random rnd = new Random();
-			{
+
-				Random rnd = new Random();
+			// Filter weapons by the provided defindex
-				// Filter weapons by the provided defindex
+			var filteredWeapons = skinsList.Where(w => w["weapon_defindex"]?.ToString() == defindex.ToString()).ToList();
-				var filteredWeapons = skinsList.FindAll(w => w["weapon_defindex"]?.ToString() == defindex.ToString());
+
+			if (filteredWeapons.Count == 0)
+				return 0;
+
+			var randomWeapon = filteredWeapons[rnd.Next(filteredWeapons.Count)];
+
+			if (int.TryParse(randomWeapon["paint"]?.ToString(), out int paintValue))
+				return paintValue;
 
-				if (filteredWeapons.Count > 0)
-				{
-					var randomWeapon = filteredWeapons[rnd.Next(filteredWeapons.Count)];
-					if (int.TryParse(randomWeapon["paint"]?.ToString(), out int paintValue))
-					{
-						return paintValue;
-					}
-					else
-					{
-						return 0;
-					}
-				}
-			}
 			return 0;
 		}
 
@@ -367,6 +454,5 @@ namespace WeaponPaints
 
 			return values;
 		}
-
 	}
 }

WeaponInfo.cs

@@ -1,9 +1,18 @@
 namespace WeaponPaints
 {
-	public class WeaponInfo
+    public class WeaponInfo
-	{
+    {
-		public int Paint { get; set; }
+        public int Paint { get; set; }
-		public int Seed { get; set; }
+        public int Seed { get; set; }
-		public float Wear { get; set; }
+        public float Wear { get; set; }
-	}
+
+        public WeaponInfo() : this(0, 0, 0f) { }
+
+        public WeaponInfo(int paint, int seed, float wear)
+        {
+            Paint = paint;
+            Seed = seed;
+            Wear = wear;
+        }
+    }
 }

WeaponPaints.cs

@@ -1,18 +1,21 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes;
-using CounterStrikeSharp.API.Modules.Cvars;
+using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
+using MySqlConnector;
 using Newtonsoft.Json.Linq;
 using System.Collections.Concurrent;
 
 namespace WeaponPaints;
 
-[MinimumApiVersion(144)]
+[MinimumApiVersion(168)]
 public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 {
-	internal static readonly Dictionary<string, string> weaponList = new()
+	internal static WeaponPaints Instance { get; private set; } = new();
+    internal static readonly int[] newPaints = { 1171, 1170, 1169, 1164, 1162, 1161, 1159, 1175, 1174, 1167, 1165, 1168, 1163, 1160, 1166, 1173 };
+    internal static readonly Dictionary<string, string> weaponList = new()
 	{
 		{"weapon_deagle", "Desert Eagle"},
 		{"weapon_elite", "Dual Berettas"},
@@ -76,17 +79,21 @@ 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<int, ushort> g_playersGlove = new ConcurrentDictionary<int, ushort>();
 	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;
+	public static bool g_bCommandsAllowed = true;
+	internal Dictionary<int, string> PlayerWeaponImage = new();
 
-	internal Uri GlobalShareApi = new("https://weaponpaints.fun/api.php");
-	internal int GlobalShareServerId = 0;
 	internal static Dictionary<int, DateTime> commandsCooldown = new Dictionary<int, DateTime>();
-	private string DatabaseConnectionString = string.Empty;
+	internal static Database? _database;
-	//private CounterStrikeSharp.API.Modules.Timers.Timer? g_hTimerCheckSkinsData = null;
+
-	public static Dictionary<int, string> weaponDefindex { get; } = new Dictionary<int, string>
+	internal static MemoryFunctionVoid<nint, string, float> CAttributeList_SetOrAddAttributeValueByName = new(GameData.GetSignature("CAttributeList_SetOrAddAttributeValueByName"));
+	internal static MemoryFunctionVoid<CBaseModelEntity, string, UInt64> CBaseModelEntity_SetBodygroup = new(GameData.GetSignature("CBaseModelEntity_SetBodygroup"));
+
+	public static Dictionary<int, string> WeaponDefindex { get; } = new Dictionary<int, string>
 	{
 		{ 1, "weapon_deagle" },
 		{ 2, "weapon_elite" },
@@ -144,12 +151,12 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 		{ 525, "weapon_knife_skeleton" },
 		{ 526, "weapon_knife_kukri" }
 	};
-
+    public static MemoryFunctionVoid<IntPtr, string, IntPtr, IntPtr, IntPtr, IntPtr, IntPtr, IntPtr> GiveNamedItem2 = new(@"\x55\x48\x89\xE5\x41\x57\x41\x56\x41\x55\x41\x54\x53\x48\x83\xEC\x18\x48\x89\x7D\xC8\x48\x85\xF6\x74");
-	public WeaponPaintsConfig Config { get; set; } = new();
+    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.5a";
+	public override string ModuleVersion => "1.9b";
 
 	public static WeaponPaintsConfig GetWeaponPaintsConfig()
 	{
@@ -158,68 +165,89 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 
 	public override void Load(bool hotReload)
 	{
-		if (!Config.GlobalShare)
+		Instance = this;
-		{
-			DatabaseConnectionString = Utility.BuildDatabaseConnectionString();
-			Utility.TestDatabaseConnection();
-		}
 
 		if (hotReload)
 		{
 			OnMapStart(string.Empty);
 
-			List<CCSPlayerController> players = Utilities.GetPlayers();
+			foreach (var player in Utilities.GetPlayers())
-
-			foreach (CCSPlayerController player in players)
 			{
-				if (player == null || !player.IsValid || player.IsBot || player.IsHLTV) continue;
+				if (weaponSync == null || player is null || !player.IsValid || player.SteamID.ToString().Length != 17 || !player.PawnIsAlive || player.IsBot ||
-				//if (gPlayerWeaponsInfo.ContainsKey((int)player.Index)) continue;
+					player.IsHLTV || player.Connected != PlayerConnectedState.PlayerConnected)
+					continue;
 
-				if (gPlayerWeaponsInfo.ContainsKey((int)player.Index))
+				g_knifePickupCount[(int)player.Slot] = 0;
-					gPlayerWeaponsInfo.TryRemove((int)player.Index, out _);
+				gPlayerWeaponsInfo.TryRemove((int)player.Slot, out _);
-				if (g_playersKnife.ContainsKey((int)player.Index))
+				g_playersKnife.TryRemove((int)player.Slot, out _);
-					g_playersKnife.TryRemove((int)player.Index, out _);
 
-				PlayerInfo playerInfo = new PlayerInfo
+                PlayerInfo playerInfo = new PlayerInfo(
+					(int)player.Slot,
+					player.Slot,
+					player.UserId,
+					player?.SteamID.ToString(),
+					player?.PlayerName,
+					player?.IpAddress?.Split(":")[0]);
+
+				if (Config.Additional.SkinEnabled)
 				{
-					UserId = player.UserId,
+					Task.Run(() => weaponSync.GetWeaponPaintsFromDatabase(playerInfo));
-					Index = (int)player.Index,
+				}
-					SteamId = player?.SteamID.ToString(),
+				if (Config.Additional.KnifeEnabled)
-					Name = player?.PlayerName,
+				{
-					IpAddress = player?.IpAddress?.Split(":")[0]
+					Task.Run(() => weaponSync.GetKnifeFromDatabase(playerInfo));
-				};
+				}
-
+				if (Config.Additional.GloveEnabled)
-				if (Config.Additional.SkinEnabled && weaponSync != null)
+				{
-					_ = weaponSync.GetWeaponPaintsFromDatabase(playerInfo);
+					Task.Run(() => weaponSync.GetGloveFromDatabase(playerInfo));
-				if (Config.Additional.KnifeEnabled && weaponSync != null)
+				}
-					_ = weaponSync.GetKnifeFromDatabase(playerInfo);
-
-				g_knifePickupCount[(int)player!.Index] = 0;
 			}
 		}
 
+		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 static void PlayerGiveNamedItem(CCSPlayerController player, string item)
+    {
+        if (!player.PlayerPawn.IsValid) return;
+        if (player.PlayerPawn.Value == null) return;
+        if (!player.PlayerPawn.Value.IsValid) return;
+        if (player.PlayerPawn.Value.ItemServices == null) return;
 
-	public void OnConfigParsed(WeaponPaintsConfig config)
+        GiveNamedItem2.Invoke(player.PlayerPawn.Value.ItemServices.Handle, item, 0, 0, 0, 0, 0, 0);
+    }
+    public void OnConfigParsed(WeaponPaintsConfig config)
 	{
-		if (!config.GlobalShare)
+		if (config.DatabaseHost.Length < 1 || config.DatabaseName.Length < 1 || config.DatabaseUser.Length < 1)
 		{
-			if (config.DatabaseHost.Length < 1 || config.DatabaseName.Length < 1 || config.DatabaseUser.Length < 1)
+			Logger.LogError("You need to setup Database credentials in config!");
-			{
+			throw new Exception("[WeaponPaints] You need to setup Database credentials in config!");
-				Logger.LogError("You need to setup Database credentials in config!");
-				throw new Exception("[WeaponPaints] You need to setup Database credentials in config!");
-			}
 		}
 
+		var builder = new MySqlConnectionStringBuilder
+		{
+			Server = config.DatabaseHost,
+			UserID = config.DatabaseUser,
+			Password = config.DatabasePassword,
+			Database = config.DatabaseName,
+			Port = (uint)config.DatabasePort,
+			Pooling = true
+		};
+
+		_database = new(builder.ConnectionString);
+
+		_ = Utility.CheckDatabaseTables();
+
 		Config = config;
 		_config = config;
 		_localizer = Localizer;
@@ -233,41 +261,4 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 	{
 		base.Unload(hotReload);
 	}
-
-	private void GlobalShareConnect()
-	{
-		if (!Config.GlobalShare) return;
-
-		var values = new Dictionary<string, string>
-			{
-			   { "server_address", $"{ConVar.Find("ip")!.StringValue}:{ConVar.Find("hostport")!.GetPrimitiveValue<int>().ToString()}" },
-			   { "server_hostname", ConVar.Find("hostname")!.StringValue }
-			};
-
-		using (var httpClient = new HttpClient())
-		{
-			httpClient.BaseAddress = GlobalShareApi;
-			var formContent = new FormUrlEncodedContent(values);
-
-			Task<HttpResponseMessage> responseTask = httpClient.PostAsync("", formContent);
-			responseTask.Wait();
-			HttpResponseMessage response = responseTask.Result;
-
-			if (response.IsSuccessStatusCode)
-			{
-				Task<string> responseBodyTask = response.Content.ReadAsStringAsync();
-				responseBodyTask.Wait();
-				string responseBody = responseBodyTask.Result;
-				GlobalShareServerId = int.Parse(responseBody);
-			}
-			else
-			{
-				Logger.LogError("Unable to retrieve serverid from GlobalShare!");
-				throw new Exception("[WeaponPaints] Unable to retrieve serverid from GlobalShare!");
-			}
-		}
-
-		Logger.LogInformation("GlobalShare ONLINE!");
-		Console.WriteLine("[WeaponPaints] GlobalShare ONLINE");
-	}
 }

WeaponPaints.csproj

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

WeaponSynchronization.cs

@@ -1,6 +1,4 @@
 using Dapper;
-using MySqlConnector;
-using Newtonsoft.Json.Linq;
 using System.Collections.Concurrent;
 
 namespace WeaponPaints
@@ -8,77 +6,26 @@ namespace WeaponPaints
 	internal class WeaponSynchronization
 	{
 		private readonly WeaponPaintsConfig _config;
-		private readonly string _databaseConnectionString;
+		private readonly Database _database;
-		private readonly Uri _globalShareApi;
-		private readonly int _globalShareServerId;
 
-		internal WeaponSynchronization(string databaseConnectionString, WeaponPaintsConfig config, Uri globalShareApi, int globalShareServerId)
+		internal WeaponSynchronization(Database database, WeaponPaintsConfig config)
 		{
-			_databaseConnectionString = databaseConnectionString;
+			_database = database;
 			_config = config;
-			_globalShareApi = globalShareApi;
-			_globalShareServerId = globalShareServerId;
 		}
 
 		internal async Task GetKnifeFromDatabase(PlayerInfo player)
 		{
 			if (!_config.Additional.KnifeEnabled) return;
-			if (player.SteamId == null || player.Index == 0) return;
 			try
 			{
-				if (_config.GlobalShare)
+				await using var connection = await _database.GetConnectionAsync();
+				string query = "SELECT `knife` FROM `wp_player_knife` WHERE `steamid` = @steamid";
+				string? playerKnife = await connection.QueryFirstOrDefaultAsync<string>(query, new { steamid = player.SteamId });
+
+				if (!string.IsNullOrEmpty(playerKnife))
 				{
-					var values = new Dictionary<string, string>
+					WeaponPaints.g_playersKnife[player.Slot] = playerKnife;
-				{
-				   { "server_id", _globalShareServerId.ToString() },
-				   { "steamid", player.SteamId },
-				   { "knife", "1" }
-				};
-
-					UriBuilder builder = new UriBuilder(_globalShareApi);
-					builder.Query = string.Join("&", values.Select(p => $"{Uri.EscapeDataString(p.Key)}={Uri.EscapeDataString(p.Value)}"));
-
-					using (var httpClient = new HttpClient())
-					{
-						httpClient.BaseAddress = _globalShareApi;
-						var formContent = new FormUrlEncodedContent(values);
-						HttpResponseMessage response = await httpClient.GetAsync(builder.Uri);
-
-						if (response.IsSuccessStatusCode)
-						{
-							string result = await response.Content.ReadAsStringAsync();
-							if (!string.IsNullOrEmpty(result))
-							{
-								WeaponPaints.g_playersKnife[player.Index] = result;
-							}
-							else
-							{
-								return;
-							}
-						}
-						else
-						{
-							return;
-						}
-					}
-					return;
-				}
-
-				using (var connection = new MySqlConnection(_databaseConnectionString))
-				{
-					await connection.OpenAsync();
-					string query = "SELECT `knife` FROM `wp_player_knife` WHERE `steamid` = @steamid";
-					string? PlayerKnife = await connection.QueryFirstOrDefaultAsync<string>(query, new { steamid = player.SteamId });
-
-					if (PlayerKnife != null)
-					{
-						WeaponPaints.g_playersKnife[player.Index] = PlayerKnife;
-					}
-					else
-					{
-						return;
-					}
-					await connection.CloseAsync();
 				}
 			}
 			catch (Exception e)
@@ -88,162 +35,146 @@ namespace WeaponPaints
 			}
 		}
 
+		internal async Task GetGloveFromDatabase(PlayerInfo player)
+		{
+			if (!_config.Additional.GloveEnabled) return;
+
+			try
+			{
+				// Ensure proper disposal of resources using "using" statement
+				await using var connection = await _database.GetConnectionAsync();
+
+				// Construct the SQL query with specific columns for better performance
+				string query = "SELECT `weapon_defindex` FROM `wp_player_gloves` WHERE `steamid` = @steamid";
+
+				// Execute the query and retrieve glove data
+				ushort? gloveData = await connection.QueryFirstOrDefaultAsync<ushort?>(query, new { steamid = player.SteamId });
+
+				// Check if glove data is retrieved successfully
+				if (gloveData != null)
+				{
+					// Update g_playersGlove dictionary with glove data
+					WeaponPaints.g_playersGlove[player.Slot] = gloveData.Value;
+				}
+			}
+			catch (Exception e)
+			{
+				// Log any exceptions occurred during database operation
+				Utility.Log("An error occurred while fetching glove data: " + e.Message);
+			}
+		}
+
 		internal async Task GetWeaponPaintsFromDatabase(PlayerInfo player)
 		{
-			if (!_config.Additional.SkinEnabled) return;
+			if (!_config.Additional.SkinEnabled || player == null || player.SteamId == null) return;
-			if (player.SteamId == null || player.Index == 0) return;
 
-			if (!WeaponPaints.gPlayerWeaponsInfo.TryGetValue(player.Index, out _))
-			{
-				WeaponPaints.gPlayerWeaponsInfo[player.Index] = new ConcurrentDictionary<int, WeaponInfo>();
-			}
 			try
 			{
-				if (_config.GlobalShare)
+				await using var connection = await _database.GetConnectionAsync();
-				{
+                string query = "SELECT `weapon_defindex`, `weapon_paint_id`, `weapon_wear`, `weapon_seed` FROM `wp_player_skins` WHERE `steamid` = @steamid";
-					var values = new Dictionary<string, string>
-				{
-				   { "server_id", _globalShareServerId.ToString() },
-				   { "steamid", player.SteamId },
-				   { "skins", "1" }
-				};
-					UriBuilder builder = new UriBuilder(_globalShareApi);
-					builder.Query = string.Join("&", values.Select(p => $"{Uri.EscapeDataString(p.Key)}={Uri.EscapeDataString(p.Value)}"));
 
-					using (var httpClient = new HttpClient())
+                var playerSkins = await connection.QueryAsync<dynamic>(query, new { steamid = player.SteamId });
+
+				if (playerSkins == null) return;
+
+				var weaponInfos = new ConcurrentDictionary<int, WeaponInfo>();
+
+				foreach (var row in playerSkins)
+				{
+					int weaponDefIndex = row?.weapon_defindex ?? 0;
+					int weaponPaintId = row?.weapon_paint_id ?? 0;
+					float weaponWear = row?.weapon_wear ?? 0f;
+					int weaponSeed = row?.weapon_seed ?? 0;
+
+					WeaponInfo weaponInfo = new WeaponInfo
 					{
-						httpClient.BaseAddress = _globalShareApi;
+						Paint = weaponPaintId,
-						var formContent = new FormUrlEncodedContent(values);
+						Seed = weaponSeed,
-						HttpResponseMessage response = await httpClient.GetAsync(builder.Uri);
+						Wear = weaponWear
+					};
 
-						if (response.IsSuccessStatusCode)
+					weaponInfos[weaponDefIndex] = weaponInfo;
-						{
-							string responseBody = await response.Content.ReadAsStringAsync();
-							JArray jsonArray = JArray.Parse(responseBody);
-							if (jsonArray != null && jsonArray.Count > 0)
-							{
-								foreach (var weapon in jsonArray)
-								{
-									int? weaponDefIndex = weapon["weapon_defindex"]?.Value<int>();
-									int? weaponPaintId = weapon["weapon_paint_id"]?.Value<int>();
-									float? weaponWear = weapon["weapon_wear"]?.Value<float>();
-									int? weaponSeed = weapon["weapon_seed"]?.Value<int>();
-
-									if (weaponDefIndex != null && weaponPaintId != null && weaponWear != null && weaponSeed != null)
-									{
-										WeaponInfo weaponInfo = new WeaponInfo
-										{
-											Paint = weaponPaintId.Value,
-											Seed = weaponSeed.Value,
-											Wear = weaponWear.Value
-										};
-										WeaponPaints.gPlayerWeaponsInfo[player.Index][weaponDefIndex.Value] = weaponInfo;
-									}
-								}
-							}
-							return;
-						}
-						else
-						{
-							return;
-						}
-					}
 				}
 
-				using (var connection = new MySqlConnection(_databaseConnectionString))
+				WeaponPaints.gPlayerWeaponsInfo[player.Slot] = weaponInfos;
-				{
-					await connection.OpenAsync();
-
-					string query = "SELECT * FROM `wp_player_skins` WHERE `steamid` = @steamid";
-					IEnumerable<dynamic> PlayerSkins = await connection.QueryAsync<dynamic>(query, new { steamid = player.SteamId });
-
-					if (PlayerSkins != null && PlayerSkins.AsList().Count > 0)
-					{
-						PlayerSkins.ToList().ForEach(row =>
-						{
-							int weaponDefIndex = row.weapon_defindex ?? default(int);
-							int weaponPaintId = row.weapon_paint_id ?? default(int);
-							float weaponWear = row.weapon_wear ?? default(float);
-							int weaponSeed = row.weapon_seed ?? default(int);
-
-							WeaponInfo weaponInfo = new WeaponInfo
-							{
-								Paint = weaponPaintId,
-								Seed = weaponSeed,
-								Wear = weaponWear
-							};
-							WeaponPaints.gPlayerWeaponsInfo[player.Index][weaponDefIndex] = weaponInfo;
-						});
-					}
-					else
-					{
-						return;
-					}
-					await connection.CloseAsync();
-				}
 			}
 			catch (Exception e)
 			{
-				Utility.Log(e.Message);
+				Utility.Log($"Database error occurred: {e.Message}");
-				return;
 			}
 		}
 
 		internal async Task SyncKnifeToDatabase(PlayerInfo player, string knife)
 		{
-			if (!_config.Additional.KnifeEnabled) return;
+			if (!_config.Additional.KnifeEnabled || player == null || string.IsNullOrEmpty(player.SteamId) || string.IsNullOrEmpty(knife)) return;
+
 			try
 			{
-				if (player.SteamId == null || player.Index == 0) return;
+				await using var connection = await _database.GetConnectionAsync();
-
-				using var connection = new MySqlConnection(_databaseConnectionString);
-				await connection.OpenAsync();
 				string query = "INSERT INTO `wp_player_knife` (`steamid`, `knife`) VALUES(@steamid, @newKnife) ON DUPLICATE KEY UPDATE `knife` = @newKnife";
 				await connection.ExecuteAsync(query, new { steamid = player.SteamId, newKnife = knife });
-				await connection.CloseAsync();
 			}
 			catch (Exception e)
 			{
-				Utility.Log(e.Message);
+				Utility.Log($"Error syncing knife to database: {e.Message}");
-				return;
 			}
 		}
+
+
+		internal async Task SyncGloveToDatabase(PlayerInfo player, int defindex)
+		{
+			if (!_config.Additional.GloveEnabled || player == null || string.IsNullOrEmpty(player.SteamId)) return;
+
+			try
+			{
+				await using var connection = await _database.GetConnectionAsync();
+				string query = "INSERT INTO `wp_player_gloves` (`steamid`, `weapon_defindex`) VALUES(@steamid, @weapon_defindex) ON DUPLICATE KEY UPDATE `weapon_defindex` = @weapon_defindex";
+				await connection.ExecuteAsync(query, new { steamid = player.SteamId, weapon_defindex = defindex });
+			}
+			catch (Exception e)
+			{
+				Utility.Log($"Error syncing glove to database: {e.Message}");
+			}
+		}
+
 		internal async Task SyncWeaponPaintsToDatabase(PlayerInfo player)
 		{
-			if (player == null || player.Index <= 0 || player.SteamId == null) return;
+			if (player == null || string.IsNullOrEmpty(player.SteamId) || !WeaponPaints.gPlayerWeaponsInfo.TryGetValue(player.Slot, out var weaponsInfo))
-
-			using var connection = new MySqlConnection(_databaseConnectionString);
-			await connection.OpenAsync();
-
-			if (!WeaponPaints.gPlayerWeaponsInfo.ContainsKey(player.Index))
 				return;
 
-			foreach (var weaponInfoPair in WeaponPaints.gPlayerWeaponsInfo[player.Index])
+			try
 			{
-				int weaponDefIndex = weaponInfoPair.Key;
+				await using var connection = await _database.GetConnectionAsync();
-				WeaponInfo weaponInfo = weaponInfoPair.Value;
 
-				int paintId = weaponInfo.Paint;
+                foreach (var weaponInfoPair in weaponsInfo)
-				float wear = weaponInfo.Wear;
+                {
-				int seed = weaponInfo.Seed;
+                    int weaponDefIndex = weaponInfoPair.Key;
+                    WeaponInfo weaponInfo = weaponInfoPair.Value;
 
-				string updateSql = "UPDATE `wp_player_skins` SET `weapon_paint_id` = @paintId, " +
+                    int paintId = weaponInfo.Paint;
-								   "`weapon_wear` = @wear, `weapon_seed` = @seed WHERE `steamid` = @steamid " +
+                    float wear = weaponInfo.Wear;
-								   "AND `weapon_defindex` = @weaponDefIndex";
+                    int seed = weaponInfo.Seed;
 
-				var updateParams = new { paintId, wear, seed, steamid = player.SteamId, weaponDefIndex };
+                    string query = "INSERT INTO `wp_player_skins` (`steamid`, `weapon_defindex`, `weapon_paint_id`, `weapon_wear`, `weapon_seed`) " +
-				int rowsAffected = await connection.ExecuteAsync(updateSql, updateParams);
+                                   "VALUES (@steamid, @weaponDefIndex, @paintId, @wear, @seed) " +
+                                   "ON DUPLICATE KEY UPDATE `weapon_paint_id` = @paintId, `weapon_wear` = @wear, `weapon_seed` = @seed";
 
-				if (rowsAffected == 0)
+                    var parameters = new DynamicParameters();
-				{
+                    parameters.Add("@steamid", player.SteamId);
-					string insertSql = "INSERT INTO `wp_player_skins` (`steamid`, `weapon_defindex`, " +
+                    parameters.Add("@weaponDefIndex", weaponDefIndex);
-									   "`weapon_paint_id`, `weapon_wear`, `weapon_seed`) " +
+                    parameters.Add("@paintId", paintId);
-									   "VALUES (@steamid, @weaponDefIndex, @paintId, @wear, @seed)";
+                    parameters.Add("@wear", wear);
+                    parameters.Add("@seed", seed);
 
-					await connection.ExecuteAsync(insertSql, updateParams);
+                    await connection.ExecuteAsync(query, parameters);
-				}
+                }
+
+            }
+            catch (Exception e)
+			{
+				Utility.Log($"Error syncing weapon paints to database: {e.Message}");
 			}
-			await connection.CloseAsync();
 		}
+
 	}
 }

gamedata/gloves.json

@@ -0,0 +1,16 @@
+{
+	"CAttributeList_SetOrAddAttributeValueByName": {
+		"signatures": {
+			"library": "server",
+			"windows": "\\x40\\x53\\x41\\x56\\x41\\x57\\x48\\x81\\xEC\\x90\\x00\\x00\\x00\\x0F\\x29\\x74\\x24\\x70",
+			"linux": "\\x55\\x48\\x89\\xE5\\x41\\x57\\x41\\x56\\x49\\x89\\xFE\\x41\\x55\\x41\\x54\\x49\\x89\\xF4\\x53\\x48\\x83\\xEC\\x78"
+		}
+	},
+	"CBaseModelEntity_SetBodygroup": {
+		"signatures": {
+			"library": "server",
+			"windows": "\\x48\\x89\\x5C\\x24\\x08\\x48\\x89\\x74\\x24\\x10\\x57\\x48\\x83\\xEC\\x20\\x41\\x8B\\xF8\\x48\\x8B\\xF2\\x48\\x8B\\xD9\\xE8\\x2A\\x2A\\x2A\\x2A",
+			"linux": "\\x55\\x48\\x89\\xE5\\x41\\x56\\x49\\x89\\xF6\\x41\\x55\\x41\\x89\\xD5\\x41\\x54\\x49\\x89\\xFC\\x48\\x83\\xEC\\x08"
+		}
+	}
+}

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": "{lime}Wybrane skiny będą ustawione dopiero po ponownym wejściu na serwer lub wpisaniu komendy {orange}!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} 作为您的皮肤"
 }

website/getskins.php

@@ -8,7 +8,7 @@ $weapons = array (
 "weapon_aug" => 8,
 "weapon_awp" => 9,
 "weapon_famas" => 10,
-"weapon_g3sg1" => 10,
+"weapon_g3sg1" => 11,
 "weapon_galilar" => 13,
 "weapon_m249" => 14,
 "weapon_m4a1" => 16,
@@ -53,7 +53,14 @@ $weapons = array (
 "weapon_knife_stiletto" => 522,
 "weapon_knife_widowmaker" => 523,
 "weapon_knife_skeleton" => 525);
-$json = json_decode(file_get_contents('skins.json')); 
+
+
+
+$
+
+$json = json_decode(file_get_contents('https://bymykel.github.io/CSGO-API/api/en/skins.json')); 
+
+die(var_dump($json));
 echo "<pre>";
 foreach($json as $skin)
 {