123

.github/FUNDING.yml

@@ -1,14 +0,0 @@
-# These are supported funding model platforms
-
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
-ko_fi: nereziel # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
-polar: # Replace with a single Polar username
-custom: ['https://steamcommunity.com/tradeoffer/new/?partner=41515647&token=gW2W-nXE'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/build.yml

@@ -62,10 +62,6 @@ jobs:
       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: Copy agents.json
-      run: cp website/data/agents.json ${{ env.OUTPUT_PATH }}/agents.json
-    - name: Copy music.json
-      run: cp website/data/music.json ${{ env.OUTPUT_PATH }}/music.json
     - name: Zip
       run: zip -r "${{ env.PROJECT_NAME }}.zip" "${{ env.OUTPUT_PATH }}" gamedata/
     - name: Clean files Website

.gitignore

@@ -2,4 +2,3 @@
 bin/
 obj/
 website/getskins.php
-.idea/

Commands.cs

@@ -1,9 +1,8 @@
-using System.Collections.Concurrent;
-using CounterStrikeSharp.API;
-using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Commands;
 using CounterStrikeSharp.API.Modules.Menu;
 using Newtonsoft.Json.Linq;
+using System.Text;
 
 namespace WeaponPaints
 {
@@ -11,38 +10,54 @@ namespace WeaponPaints
 	{
 		private void OnCommandRefresh(CCSPlayerController? player, CommandInfo command)
 		{
-			if (Config.Additional.CommandsRefresh.Count == 0 || !Config.Additional.SkinEnabled || !g_bCommandsAllowed) return;
+			if (!Config.Additional.CommandWpEnabled || !Config.Additional.SkinEnabled || !g_bCommandsAllowed) return;
 			if (!Utility.IsPlayerValid(player)) return;
 
 			if (player == null || !player.IsValid || player.UserId == null || player.IsBot) return;
-
-			PlayerInfo playerInfo = new PlayerInfo
-			{
-				UserId = player.UserId,
-				Slot = player.Slot,
-				Index = (int)player.Index,
-				SteamId = player.SteamID,
-				Name = player?.PlayerName,
-				IpAddress = player?.IpAddress?.Split(":")[0]
-			};
-
+            PlayerInfo playerInfo = new (
+                (int)player.Index,
+                player.Slot,
+                player.UserId,
+                player.SteamID.ToString(),
+                player.PlayerName,
+                player.IpAddress?.Split(":")[0]
+            );
 			try
 			{
-				if (player != null && !commandsCooldown.TryGetValue(player.Slot, out var cooldownEndTime) ||
+				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);
 
 					if (weaponSync != null)
 					{
-						_ = Task.Run(async () => await weaponSync.GetPlayerData(playerInfo));
+						var weaponTasks = new List<Task>();
 
-						GivePlayerGloves(player);
-						GivePlayerAgent(player);
-						GivePlayerMusicKit(player);
+						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);
-						AddTimer(0.1f, () => GivePlayerPin(player));
-						AddTimer(0.15f, () => GivePlayerPin(player));
 					}
 
 					if (!string.IsNullOrEmpty(Localizer["wp_command_refresh_done"]))
@@ -79,19 +94,7 @@ namespace WeaponPaints
 					player!.Print(Localizer["wp_info_glove"]);
 				}
 
-			if (Config.Additional.AgentEnabled)
-				if (!string.IsNullOrEmpty(Localizer["wp_info_agent"]))
-				{
-					player!.Print(Localizer["wp_info_agent"]);
-				}
-
-			if (Config.Additional.MusicEnabled)
-				if (!string.IsNullOrEmpty(Localizer["wp_info_music"]))
-				{
-					player!.Print(Localizer["wp_info_music"]);
-				}
-
-			if (!Config.Additional.KnifeEnabled) return;
+			if (Config.Additional.KnifeEnabled)
 				if (!string.IsNullOrEmpty(Localizer["wp_info_knife"]))
 				{
 					player!.Print(Localizer["wp_info_knife"]);
@@ -100,106 +103,121 @@ namespace WeaponPaints
 
 		private void RegisterCommands()
 		{
-			Config.Additional.CommandsInfo.ForEach(c =>
-			{
-				AddCommand($"css_{c}", "Skins info", (player, info) =>
+			AddCommand($"css_{Config.Additional.CommandSkin}", "Skins info", (player, info) =>
 			{
 				if (!Utility.IsPlayerValid(player)) return;
 				OnCommandWS(player, info);
 			});
-			});
-			
-			Config.Additional.CommandsRefresh.ForEach(c =>
-			{
-				AddCommand($"css_{c}", "Skins refresh", (player, info) =>
+			AddCommand($"css_{Config.Additional.CommandRefresh}", "Skins refresh", (player, info) =>
 			{
 				if (!Utility.IsPlayerValid(player)) return;
 				OnCommandRefresh(player, info);
 			});
-			});			
-			
-			Config.Additional.CommandsKill.ForEach(c =>
+			if (Config.Additional.CommandKillEnabled)
 			{
-				AddCommand($"css_{c}", "kill yourself", (player, info) =>
+				AddCommand($"css_{Config.Additional.CommandKill}", "kill yourself", (player, info) =>
 				{
 					if (player == null || !Utility.IsPlayerValid(player) || player.PlayerPawn.Value == null || !player!.PlayerPawn.IsValid) return;
 
 					player.PlayerPawn.Value.CommitSuicide(true, false);
 				});
-			});
+			}
 		}
 
         private void SetupKnifeMenu()
         {
             if (!Config.Additional.KnifeEnabled || !g_bCommandsAllowed) return;
 
-			var knivesOnly = WeaponList
+            var knivesOnly = GetKnivesOnly();
+            var giveItemMenu = new ChatMenu(Localizer["wp_knife_menu_title"]);
+
+            AddMenuOptions(giveItemMenu, knivesOnly);
+            AddCommandToOpenKnifeMenu(giveItemMenu);
+        }
+
+        private Dictionary<string, string> GetKnivesOnly()
+        {
+            return weaponList
                 .Where(pair => pair.Key.StartsWith("weapon_knife") || pair.Key.StartsWith("weapon_bayonet"))
                 .ToDictionary(pair => pair.Key, pair => pair.Value);
+        }
 
-			BaseMenu giveItemMenu = Config.Additional.UseHtmlMenu ? new CenterHtmlMenu(Localizer["wp_knife_menu_title"], Instance) : new ChatMenu(Localizer["wp_knife_menu_title"]);
+        private void AddMenuOptions(ChatMenu giveItemMenu, Dictionary<string, string> knivesOnly)
+        {
+            foreach (var knifePair in knivesOnly)
+            {
+                giveItemMenu.AddMenuOption(knifePair.Value, (player, option) => HandleGiveOption(player, option, knivesOnly));
+            }
+        }
 
-			var handleGive = (CCSPlayerController player, ChatMenuOption option) =>
+        private void HandleGiveOption(CCSPlayerController player, ChatMenuOption option, Dictionary<string, string> knivesOnly)
         {
             if (!Utility.IsPlayerValid(player)) return;
 
             var knifeName = option.Text;
             var knifeKey = knivesOnly.FirstOrDefault(x => x.Value == knifeName).Key;
-				if (string.IsNullOrEmpty(knifeKey)) return;
+
+            if (!string.IsNullOrEmpty(knifeKey))
+            {
+                PrintMessages(player, knifeName);
+                SetPlayerKnife(player, knifeKey);
+                SyncKnifeToDatabase(player, knifeKey);
+            }
+        }
+
+        private void PrintMessages(CCSPlayerController player, string knifeName)
+        {
             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.CommandsKill.Count > 0)
+            if (!string.IsNullOrEmpty(Localizer["wp_knife_menu_kill"]) && Config.Additional.CommandKillEnabled)
             {
                 player!.Print(Localizer["wp_knife_menu_kill"]);
             }
+        }
 
-				PlayerInfo playerInfo = new PlayerInfo
+        private void SetPlayerKnife(CCSPlayerController player, string knifeKey)
+        {
+            g_playersKnife[player.Slot] = knifeKey;
+
+            if (g_bCommandsAllowed && (LifeState_t)player.LifeState == LifeState_t.LIFE_ALIVE)
+                RefreshWeapons(player);
+        }
+
+        private void SyncKnifeToDatabase(CCSPlayerController player, string knifeKey)
+        {
+            if (weaponSync != null)
+                Task.Run(async () => await weaponSync.SyncKnifeToDatabase(GetPlayerInfo(player), knifeKey));
+        }
+
+        private PlayerInfo GetPlayerInfo(CCSPlayerController player)
+        {
+            return new PlayerInfo
             {
                 UserId = player.UserId,
                 Slot = player.Slot,
                 Index = (int)player.Index,
-					SteamId = player.SteamID,
+                SteamId = player.SteamID.ToString(),
                 Name = player.PlayerName,
                 IpAddress = player.IpAddress?.Split(":")[0]
             };
-				
-				var knife = WeaponDefindex
-					.FirstOrDefault(entry => entry.Value.Equals(knifeKey, StringComparison.OrdinalIgnoreCase))
-					.Key;
-
-				g_playersKnife[player.Slot] = (ushort)knife;
-
-				if (g_bCommandsAllowed && (LifeState_t)player.LifeState == LifeState_t.LIFE_ALIVE)
-					RefreshWeapons(player);
-
-				if (weaponSync == null) return;
-				
-				_ = Task.Run(async () => await weaponSync.SyncKnifeToDatabase(playerInfo, (ushort)knife));
-			};
-			
-			foreach (var knifePair in knivesOnly)
-			{
-				giveItemMenu.AddMenuOption(knifePair.Value, handleGive);
         }
 
-			Config.Additional.CommandsKnife.ForEach(c =>
+        private void AddCommandToOpenKnifeMenu(ChatMenu giveItemMenu)
         {
-				AddCommand($"css_{c}", "Knife Menu", (player, info) =>
+            AddCommand($"css_{Config.Additional.CommandKnife}", "Knife Menu", (player, info) =>
             {
                 if (!Utility.IsPlayerValid(player) || !g_bCommandsAllowed) return;
 
                 if (player == null || player.UserId == null) return;
 
-					if (!commandsCooldown.TryGetValue(player.Slot, out var cooldownEndTime) ||
-					    DateTime.UtcNow >= (commandsCooldown.TryGetValue(player.Slot, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
+                if (IsCommandAllowed(player))
                 {
                     commandsCooldown[player.Slot] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
                     giveItemMenu.PostSelectAction = PostSelectAction.Close;
-						giveItemMenu.Open(player);
-						//MenuManager.open(player, giveItemMenu);
+                    MenuManager.OpenChatMenu(player, giveItemMenu);
                     return;
                 }
                 if (!string.IsNullOrEmpty(Localizer["wp_command_cooldown"]))
@@ -207,200 +225,206 @@ namespace WeaponPaints
                     player!.Print(Localizer["wp_command_cooldown"]);
                 }
             });
-			});
+        }
+
+        private bool IsCommandAllowed(CCSPlayerController player)
+        {
+            if (!commandsCooldown.TryGetValue(player.Slot, out DateTime cooldownEndTime))
+            {
+                return true;
+            }
+            return DateTime.UtcNow >= cooldownEndTime;
         }
 
         private void SetupSkinsMenu()
         {
-			var classNamesByWeapon = WeaponList.ToDictionary(kvp => kvp.Value, kvp => kvp.Key);
-			BaseMenu weaponSelectionMenu = Config.Additional.UseHtmlMenu ? new CenterHtmlMenu(Localizer["wp_skin_menu_weapon_title"], Instance) : new ChatMenu(Localizer["wp_skin_menu_weapon_title"]);
+            var classNamesByWeapon = weaponList.ToDictionary(kvp => kvp.Value, kvp => kvp.Key);
+            var weaponSelectionMenu = new ChatMenu(Localizer["wp_skin_menu_weapon_title"]);
 
-			// Function to handle skin selection for a specific weapon
-			var handleWeaponSelection = (CCSPlayerController? player, ChatMenuOption option) =>
+            // Add weapon options to the weapon selection menu
+            foreach (var weaponClass in weaponList.Keys)
+            {
+                string weaponName = weaponList[weaponClass];
+                weaponSelectionMenu.AddMenuOption(weaponName, (player, option) => HandleWeaponSelection(player, option, classNamesByWeapon));
+            }
+
+            // Command to open the weapon selection menu for players
+            AddCommand($"css_{Config.Additional.CommandSkinSelection}", "Skins selection menu", (player, info) => OpenWeaponSelectionMenu(player, weaponSelectionMenu));
+        }
+
+        private void HandleWeaponSelection(CCSPlayerController? player, ChatMenuOption option, Dictionary<string, string> classNamesByWeapon)
         {
             if (!Utility.IsPlayerValid(player)) return;
 
-				var selectedWeapon = option.Text;
-				if (!classNamesByWeapon.TryGetValue(selectedWeapon, out var selectedWeaponClassname)) return;
+            string selectedWeapon = option.Text;
+            if (classNamesByWeapon.TryGetValue(selectedWeapon, out string? selectedWeaponClassname))
+            {
+                if (selectedWeaponClassname == null) return;
                 var skinsForSelectedWeapon = skinsList?.Where(skin =>
+                skin != null &&
                 skin.TryGetValue("weapon_name", out var weaponName) &&
                 weaponName?.ToString() == selectedWeaponClassname
             )?.ToList();
 
-				BaseMenu skinSubMenu = Config.Additional.UseHtmlMenu ? new CenterHtmlMenu(Localizer["wp_skin_menu_skin_title"], Instance) : new ChatMenu(Localizer["wp_skin_menu_skin_title"]);
+                var skinSubMenu = new ChatMenu(Localizer["wp_skin_menu_skin_title", selectedWeapon]);
+                skinSubMenu.PostSelectAction = PostSelectAction.Close;
 
-				// Function to handle skin selection for the chosen weapon
-				var handleSkinSelection = (CCSPlayerController p, ChatMenuOption opt) =>
+                // Add skin options to the submenu for the selected weapon
+                if (skinsForSelectedWeapon != null)
+                {
+                    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))
+                            {
+                                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);
+            }
+        }
+
+        private void HandleSkinSelection(CCSPlayerController p, ChatMenuOption opt, string selectedWeaponClassname)
         {
             if (!Utility.IsPlayerValid(p)) return;
 
-					var steamId = p.SteamID.ToString();
-					var firstSkin = skinsList?.FirstOrDefault(skin =>
+            string steamId = p.SteamID.ToString();
+            var firstSkin = skinsList?.Find(skin =>
             {
-						if (skin.TryGetValue("weapon_name", out var weaponName))
+                if (skin != null && skin.TryGetValue("weapon_name", out var weaponName))
                 {
                     return weaponName?.ToString() == selectedWeaponClassname;
                 }
                 return false;
             });
 
-					var selectedSkin = opt.Text;
-					var selectedPaintId = selectedSkin[(selectedSkin.LastIndexOf('(') + 1)..].Trim(')');
+            string selectedSkin = opt.Text;
+            string selectedPaintID = selectedSkin.Split('(')[1].Trim(')').Trim();
 
-					if (firstSkin == null ||
-					    !firstSkin.TryGetValue("weapon_defindex", out var weaponDefIndexObj) ||
-					    !ushort.TryParse(weaponDefIndexObj.ToString(), out var weaponDefIndex) ||
-					    !ushort.TryParse(selectedPaintId, out var paintId)) return;
+            if (firstSkin != null &&
+                firstSkin.TryGetValue("weapon_defindex", out var weaponDefIndexObj) &&
+                weaponDefIndexObj != null &&
+                int.TryParse(weaponDefIndexObj.ToString(), out var weaponDefIndex) &&
+                int.TryParse(selectedPaintID, out var paintID))
+            {
+                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 &&
+                    ((int?)skin?["paint"] ?? 0) == paintID &&
                     skin?["image"] != null
                 );
-							var image = foundSkin?["image"]?.ToString() ?? "";
+                string image = foundSkin?["image"]?.ToString() ?? "";
                 PlayerWeaponImage[p.Slot] = image;
                 AddTimer(2.0f, () => PlayerWeaponImage.Remove(p.Slot), CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);
             }
+        }
 
-						p.Print(Localizer["wp_skin_menu_select", selectedSkin]);
-
-						if (!gPlayerWeaponsInfo[p.Slot].TryGetValue(weaponDefIndex, out var value))
+        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.01f;
+            value.Paint = paintID;
+            value.Wear = 0.00f;
             value.Seed = 0;
 
-						PlayerInfo playerInfo = new PlayerInfo
+            if (g_bCommandsAllowed && (LifeState_t)p.LifeState == LifeState_t.LIFE_ALIVE)
             {
-							UserId = p.UserId,
-							Slot = p.Slot,
-							Index = (int)p.Index,
-							SteamId = p.SteamID,
-							Name = p.PlayerName,
-							IpAddress = p.IpAddress?.Split(":")[0]
-						};
+                RefreshWeapons(p);
+            }
+        }
 
-						if (!g_bCommandsAllowed || (LifeState_t)p.LifeState != LifeState_t.LIFE_ALIVE ||
-						    weaponSync == null) return;
-						RefreshWeapons(player);
-
-						try
-						{
-							_ = Task.Run(async () => await weaponSync.SyncWeaponPaintsToDatabase(playerInfo));
-						}
-						catch (Exception ex)
-						{
-							Utility.Log($"Error syncing weapon paints: {ex.Message}");
-						}
-					}
-				};
-
-				// Add skin options to the submenu for the selected weapon
-				if (skinsForSelectedWeapon != null)
-				{
-					foreach (var skin in skinsForSelectedWeapon)
-					{
-						if (!skin.TryGetValue("paint_name", out var paintNameObj) ||
-						    !skin.TryGetValue("paint", out var paintObj)) continue;
-						var paintName = paintNameObj?.ToString();
-						var paint = paintObj?.ToString();
-
-						if (!string.IsNullOrEmpty(paintName) && !string.IsNullOrEmpty(paint))
-						{
-							skinSubMenu.AddMenuOption($"{paintName} ({paint})", handleSkinSelection);
-						}
-					}
-				}
-				if (player != null && Utility.IsPlayerValid(player))
-					skinSubMenu.Open(player);
-			};
-
-			// Add weapon options to the weapon selection menu
-			foreach (var weaponName in WeaponList.Keys.Select(weaponClass => WeaponList[weaponClass]))
-			{
-				weaponSelectionMenu.AddMenuOption(weaponName, handleWeaponSelection);
-			}
-			// Command to open the weapon selection menu for players
-			Config.Additional.CommandsSkinSelection.ForEach(c =>
-			{
-				AddCommand($"css_{c}", "Skins selection menu", (player, info) =>
+        private void OpenWeaponSelectionMenu(CCSPlayerController? player, ChatMenu weaponSelectionMenu)
         {
             if (!Utility.IsPlayerValid(player)) return;
 
             if (player == null || player.UserId == null) return;
 
-					if (!commandsCooldown.TryGetValue(player.Slot, out var cooldownEndTime) ||
-					    DateTime.UtcNow >= (commandsCooldown.TryGetValue(player.Slot, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
+            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);
-						weaponSelectionMenu.Open(player);
+                MenuManager.OpenChatMenu(player, weaponSelectionMenu);
                 return;
             }
             if (!string.IsNullOrEmpty(Localizer["wp_command_cooldown"]))
             {
                 player!.Print(Localizer["wp_command_cooldown"]);
             }
-				});
-			});
         }
-
         private void SetupGlovesMenu()
         {
-			BaseMenu glovesSelectionMenu = new ChatMenu(Localizer["wp_glove_menu_title"]);
+            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;
 
-				var selectedPaintName = option.Text;
-
+                string selectedPaintName = option.Text;
                 var selectedGlove = glovesList.FirstOrDefault(g => g.ContainsKey("paint_name") && g["paint_name"]?.ToString() == selectedPaintName);
-				var image = selectedGlove?["image"]?.ToString() ?? "";
-				if (selectedGlove == null ||
-				    !selectedGlove.ContainsKey("weapon_defindex") ||
-				    !selectedGlove.ContainsKey("paint") ||
-				    !int.TryParse(selectedGlove["weapon_defindex"]?.ToString(), out var weaponDefindex) ||
-				    !int.TryParse(selectedGlove["paint"]?.ToString(), out var paint)) return;
+                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 PlayerInfo
-				{
-					UserId = player.UserId,
-					Slot = player.Slot,
-					Index = (int)player.Index,
-					SteamId = player.SteamID,
-					Name = player.PlayerName,
-					IpAddress = player.IpAddress?.Split(":")[0]
-				};
+                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.TryGetValue(player.Slot, out var value))
+                    if (!gPlayerWeaponsInfo[player.Slot].TryGetValue(weaponDefindex, out _))
                     {
-                        value = new ConcurrentDictionary<ushort, WeaponInfo>();
-                        
-                        gPlayerWeaponsInfo[player.Slot] = value;
-					}
-
-					if (!value.ContainsKey((ushort)weaponDefindex))
-					{
-						WeaponInfo weaponInfo = new()
-						{
-							Paint = (ushort)paint
-						};
-                        value[(ushort)weaponDefindex] = weaponInfo;
+                        WeaponInfo weaponInfo = new();
+                        weaponInfo.Paint = paint;
+                        gPlayerWeaponsInfo[player.Slot][weaponDefindex] = weaponInfo;
                     }
                 }
                 else
@@ -413,281 +437,52 @@ namespace WeaponPaints
                     player!.Print(Localizer["wp_glove_menu_select", selectedPaintName]);
                 }
 
-				if (weaponSync == null) return;
-				
-				_ = Task.Run(async () =>
+                if (weaponSync != null)
+                {
+                    Task.Run(async () =>
                     {
                         await weaponSync.SyncGloveToDatabase(playerInfo, weaponDefindex);
 
-					if (!gPlayerWeaponsInfo[playerInfo.Slot].TryGetValue((ushort)weaponDefindex, out var value))
+                        if (!gPlayerWeaponsInfo[playerInfo.Slot].TryGetValue(weaponDefindex, out var weaponInfo))
                         {
-						value = new WeaponInfo();
-						gPlayerWeaponsInfo[playerInfo.Slot][(ushort)weaponDefindex] = value;
+                            weaponInfo = new WeaponInfo();
+                            gPlayerWeaponsInfo[playerInfo.Slot][weaponDefindex] = weaponInfo;
                         }
 
-					value.Paint = (ushort)paint;
-					value.Wear = 0.00f;
-					value.Seed = 0;
+                        weaponInfo.Paint = paint;
+                        weaponInfo.Wear = 0.00f;
+                        weaponInfo.Seed = 0;
 
-					await weaponSync.SyncWeaponPaintsToDatabase(playerInfo);
-				});
-				
-				AddTimer(0.1f, () => GivePlayerGloves(player));
-				AddTimer(0.15f, () => GivePlayerGloves(player));
-			};
-
-			// Add weapon options to the weapon selection menu
-			foreach (var paintName in glovesList.Select(gloveObject => gloveObject["paint_name"]?.ToString() ?? "").Where(paintName => paintName.Length > 0))
-			{
-				glovesSelectionMenu.AddMenuOption(paintName, handleGloveSelection);
-			}
-
-			// Command to open the weapon selection menu for players
-			Config.Additional.CommandsGlove.ForEach(c =>
-			{
-				AddCommand($"css_{c}", "Gloves selection menu", (player, info) =>
-				{
-					if (!Utility.IsPlayerValid(player) || !g_bCommandsAllowed) return;
-
-					if (player == null || player.UserId == null) return;
-
-					if (!commandsCooldown.TryGetValue(player.Slot, out var cooldownEndTime) ||
-					    DateTime.UtcNow >= (commandsCooldown.TryGetValue(player.Slot, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
-					{
-						commandsCooldown[player.Slot] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
-						glovesSelectionMenu.Open(player);
-						return;
-					}
-					if (!string.IsNullOrEmpty(Localizer["wp_command_cooldown"]))
-					{
-						player!.Print(Localizer["wp_command_cooldown"]);
-					}
-				});
                     });
                 }
-
-		private void SetupAgentsMenu()
-		{
-			var handleAgentSelection = (CCSPlayerController? player, ChatMenuOption option) =>
-			{
-				if (!Utility.IsPlayerValid(player) || player is null) return;
-
-				var selectedPaintName = option.Text;
-				var selectedAgent = agentsList.FirstOrDefault(g =>
-					g.ContainsKey("agent_name") &&
-					g["agent_name"] != null && g["agent_name"]!.ToString().Contains(selectedPaintName) == true &&
-					g["team"] != null && (int)(g["team"]!) == player.TeamNum);
-
-				if (selectedAgent == null) return;
-
-				if (
-					selectedAgent.ContainsKey("model")
-				)
-				{
-					PlayerInfo playerInfo = new PlayerInfo
-					{
-						UserId = player.UserId,
-						Slot = player.Slot,
-						Index = (int)player.Index,
-						SteamId = player.SteamID,
-						Name = player.PlayerName,
-						IpAddress = player.IpAddress?.Split(":")[0]
-					};
-
-					if (Config.Additional.ShowSkinImage)
-					{
-						var image = selectedAgent["image"]?.ToString() ?? "";
-						PlayerWeaponImage[player.Slot] = image;
-						AddTimer(2.0f, () => PlayerWeaponImage.Remove(player.Slot), CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);
+                RefreshGloves(player);
+            }
         }
 
-					if (!string.IsNullOrEmpty(Localizer["wp_agent_menu_select"]))
+        private void AddGloveOptionsToMenu(ChatMenu glovesSelectionMenu, Action<CCSPlayerController?, ChatMenuOption> handleGloveSelection)
         {
-						player!.Print(Localizer["wp_agent_menu_select", selectedAgent?["agent_name"] ?? selectedPaintName]);
-					}
-
-					if (player.TeamNum == 3)
+            foreach (var gloveObject in glovesList)
             {
-						g_playersAgent.AddOrUpdate(player.Slot,
-						key => (selectedAgent["model"]!.ToString().Equals("null") ? null : selectedAgent["model"]!.ToString(), null),
-						(key, oldValue) => (selectedAgent["model"]!.ToString().Equals("null") ? null : selectedAgent["model"]!.ToString(), oldValue.T));
-					}
-					else
-					{
-						g_playersAgent.AddOrUpdate(player.Slot,
-							key => (null, selectedAgent["model"]!.ToString().Equals("null") ? null : selectedAgent["model"]!.ToString()),
-							(key, oldValue) => (oldValue.CT, selectedAgent["model"]!.ToString().Equals("null") ? null : selectedAgent["model"]!.ToString())
-						);
-					}
-
-					if (weaponSync != null)
-					{
-						_ = Task.Run(async () =>
-						{
-							await weaponSync.SyncAgentToDatabase(playerInfo);
-							GivePlayerAgent(player);
-						});
-					}
-				};
-			};
-
-			// Command to open the weapon selection menu for players
-			Config.Additional.CommandsAgent.ForEach(c =>
-			{
-				AddCommand($"css_{c}", "Agents selection menu", (player, info) =>
-				{
-					if (!Utility.IsPlayerValid(player) || !g_bCommandsAllowed) return;
-
-					if (player == null || player.UserId == null) return;
-
-					if (!commandsCooldown.TryGetValue(player.Slot, out DateTime cooldownEndTime) ||
-					    DateTime.UtcNow >= (commandsCooldown.TryGetValue(player.Slot, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
-					{
-						BaseMenu agentsSelectionMenu = Config.Additional.UseHtmlMenu ? new CenterHtmlMenu(Localizer["wp_agent_menu_title"], Instance) : new ChatMenu(Localizer["wp_agent_menu_title"]);
-
-						var filteredAgents = agentsList.Where(agentObject =>
-						{
-							if (agentObject["team"]?.Value<int>() is { } teamNum)
-							{
-								return teamNum == player.TeamNum;
-							}
-							else
-							{
-								return false;
-							}
-						});
-
-						// Add weapon options to the weapon selection menu
-
-						foreach (var agentObject in filteredAgents)
-						{
-							var paintName = agentObject["agent_name"]?.ToString() ?? "";
+                string paintName = gloveObject["paint_name"]?.ToString() ?? "";
 
                 if (paintName.Length > 0)
-								agentsSelectionMenu.AddMenuOption(paintName, handleAgentSelection);
-						}
-
-						commandsCooldown[player.Slot] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
-						agentsSelectionMenu.Open(player);
-						return;
-					}
-					if (!string.IsNullOrEmpty(Localizer["wp_command_cooldown"]))
-					{
-						player!.Print(Localizer["wp_command_cooldown"]);
-					}
-				});
-			});
-		}
-
-		private void SetupMusicMenu()
-		{
-			BaseMenu musicSelectionMenu = Config.Additional.UseHtmlMenu ? new CenterHtmlMenu(Localizer["wp_music_menu_title"], Instance) : new ChatMenu(Localizer["wp_music_menu_title"]);
-
-			var handleMusicSelection = (CCSPlayerController? player, ChatMenuOption option) =>
-			{
-				if (!Utility.IsPlayerValid(player) || player is null) return;
-
-				var selectedPaintName = option.Text;
-
-				var selectedMusic = musicList.FirstOrDefault(g => g.ContainsKey("name") && g["name"]?.ToString().Contains(selectedPaintName) == true);
-				if (selectedMusic != null)
-				{
-					if (!selectedMusic.ContainsKey("id") ||
-					    !selectedMusic.ContainsKey("name") ||
-					    !int.TryParse(selectedMusic["id"]?.ToString(), out var paint)) return;
-					var image = selectedMusic["image"]?.ToString() ?? "";
-					if (Config.Additional.ShowSkinImage)
-					{
-						PlayerWeaponImage[player.Slot] = image;
-						AddTimer(2.0f, () => PlayerWeaponImage.Remove(player.Slot), CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);
-					}
-
-					PlayerInfo playerInfo = new PlayerInfo
-					{
-						UserId = player.UserId,
-						Slot = player.Slot,
-						Index = (int)player.Index,
-						SteamId = player.SteamID,
-						Name = player.PlayerName,
-						IpAddress = player.IpAddress?.Split(":")[0]
-					};
-
-					if (paint != 0)
-					{
-						g_playersMusic[player.Slot] = (ushort)paint;
-					}
-					else
-					{
-						g_playersMusic[player.Slot] = 0;
-					}
-
-					if (!string.IsNullOrEmpty(Localizer["wp_music_menu_select"]))
-					{
-						player!.Print(Localizer["wp_music_menu_select", selectedMusic["name"] ?? selectedPaintName]);
-					}
-
-					if (weaponSync != null)
-					{
-						_ = Task.Run(async () =>
-						{
-							await weaponSync.SyncMusicToDatabase(playerInfo, (ushort)paint);
-						});
-					}
-
-					//RefreshGloves(player);
-				}
-				else
-				{
-					PlayerInfo playerInfo = new PlayerInfo
-					{
-						UserId = player.UserId,
-						Slot = player.Slot,
-						Index = (int)player.Index,
-						SteamId = player.SteamID,
-						Name = player.PlayerName,
-						IpAddress = player.IpAddress?.Split(":")[0]
-					};
-
-					g_playersMusic[player.Slot] = 0;
-
-					if (!string.IsNullOrEmpty(Localizer["wp_music_menu_select"]))
-					{
-						player!.Print(Localizer["wp_music_menu_select", Localizer["None"]]);
-					}
-
-					if (weaponSync != null)
-					{
-						_ = Task.Run(async () =>
-						{
-							await weaponSync.SyncMusicToDatabase(playerInfo, 0);
-						});
+                    glovesSelectionMenu.AddMenuOption(paintName, handleGloveSelection);
             }
         }
 
-				GivePlayerMusicKit(player);
-			};
-
-			musicSelectionMenu.AddMenuOption(Localizer["None"], handleMusicSelection);
-			// Add weapon options to the weapon selection menu
-			foreach (var paintName in musicList.Select(musicObject => musicObject["name"]?.ToString() ?? "").Where(paintName => paintName.Length > 0))
+        private void AddCommandToOpenGloveSelectionMenu(ChatMenu glovesSelectionMenu)
         {
-				musicSelectionMenu.AddMenuOption(paintName, handleMusicSelection);
-			}
-
-			Config.Additional.CommandsMusic.ForEach(c =>
-			{
-				// Command to open the weapon selection menu for players
-				AddCommand($"css_{c}", "Music selection menu", (player, info) =>
+            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 (!commandsCooldown.TryGetValue(player.Slot, out var cooldownEndTime) ||
-					    DateTime.UtcNow >= (commandsCooldown.TryGetValue(player.Slot, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
+                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);
-						musicSelectionMenu.Open(player);
+                    MenuManager.OpenChatMenu(player, glovesSelectionMenu);
                     return;
                 }
                 if (!string.IsNullOrEmpty(Localizer["wp_command_cooldown"]))
@@ -695,7 +490,6 @@ namespace WeaponPaints
                     player!.Print(Localizer["wp_command_cooldown"]);
                 }
             });
-			});
         }
 	}
 }

Config.cs

@@ -3,8 +3,61 @@ using System.Text.Json.Serialization;
 
 namespace WeaponPaints
 {
-	public class DatabaseCredentials
+	public class Additional
 	{
+		[JsonPropertyName("SkinVisibilityFix")]
+		public bool SkinVisibilityFix { get; set; } = true;
+
+		[JsonPropertyName("KnifeEnabled")]
+		public bool KnifeEnabled { get; set; } = true;
+
+		[JsonPropertyName("GloveEnabled")]
+		public bool GloveEnabled { get; set; } = true;
+
+		[JsonPropertyName("SkinEnabled")]
+		public bool SkinEnabled { get; set; } = true;
+
+		[JsonPropertyName("CommandWpEnabled")]
+		public bool CommandWpEnabled { get; set; } = true;
+
+		[JsonPropertyName("CommandKillEnabled")]
+		public bool CommandKillEnabled { get; set; } = true;
+
+		[JsonPropertyName("CommandKnife")]
+		public string CommandKnife { get; set; } = "knife";
+
+		[JsonPropertyName("CommandGlove")]
+		public string CommandGlove { get; set; } = "gloves";
+
+		[JsonPropertyName("CommandSkin")]
+		public string CommandSkin { get; set; } = "ws";
+
+		[JsonPropertyName("CommandSkinSelection")]
+		public string CommandSkinSelection { get; set; } = "skins";
+
+		[JsonPropertyName("CommandRefresh")]
+		public string CommandRefresh { get; set; } = "wp";
+
+		[JsonPropertyName("CommandKill")]
+		public string CommandKill { get; set; } = "kill";
+
+		[JsonPropertyName("GiveRandomKnife")]
+		public bool GiveRandomKnife { get; set; } = false;
+
+		[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
+	{
+		public override int Version { get; set; } = 4;
+
 		[JsonPropertyName("DatabaseHost")]
 		public string DatabaseHost { get; set; } = "";
 
@@ -19,77 +72,6 @@ namespace WeaponPaints
 
 		[JsonPropertyName("DatabaseName")]
 		public string DatabaseName { get; set; } = "";
-	}
-
-	public class Additional
-	{
-		[JsonPropertyName("KnifeEnabled")]
-		public bool KnifeEnabled { get; set; } = true;
-
-		[JsonPropertyName("GloveEnabled")]
-		public bool GloveEnabled { get; set; } = true;
-
-		[JsonPropertyName("MusicEnabled")]
-		public bool MusicEnabled { get; set; } = true;
-
-		[JsonPropertyName("AgentEnabled")]
-		public bool AgentEnabled { get; set; } = true;
-
-		[JsonPropertyName("SkinEnabled")]
-		public bool SkinEnabled { get; set; } = true;
-
-        [JsonPropertyName("NameTagEnabled")]
-        public bool NameTagEnabled { get; set; } = true;
-
-		[JsonPropertyName("PinEnabled")]
-		public bool PinEnabled { get; set; } = true;
-
-		[JsonPropertyName("CommandsKnife")]
-		public List<string> CommandsKnife { get; set; } = ["knife", "knives"];
-
-		[JsonPropertyName("CommandsMusic")]
-		public List<string> CommandsMusic { get; set; } = ["music", "musickits", "mkit"];
-
-		[JsonPropertyName("CommandsGlove")]
-		public List<string> CommandsGlove { get; set; } = ["gloves", "glove"];
-
-		[JsonPropertyName("CommandsAgent")]
-		public List<string> CommandsAgent { get; set; } = ["agents", "agent"];
-
-		[JsonPropertyName("CommandsInfo")]
-		public List<string> CommandsInfo { get; set; } = ["ws", "skininfo"];
-
-		[JsonPropertyName("CommandsSkinSelection")]
-		public List<string> CommandsSkinSelection { get; set; } = ["skins", "skin"];
-
-		[JsonPropertyName("CommandsRefresh")]
-		public List<string> CommandsRefresh { get; set; } = ["wp", "refreshskins"];
-
-		[JsonPropertyName("CommandsKill")]
-		public List<string> CommandsKill { get; set; } = ["kill", "suicide"];
-
-		[JsonPropertyName("GiveRandomKnife")]
-		public bool GiveRandomKnife { get; set; } = false;
-
-		[JsonPropertyName("GiveRandomSkin")]
-		public bool GiveRandomSkin { get; set; } = false;
-
-		[JsonPropertyName("ShowSkinImage")]
-		public bool ShowSkinImage { get; set; } = true;
-		
-		[JsonPropertyName("UseHtmlMenu")]
-		public bool UseHtmlMenu { get; set; } = true;
-		
-		[JsonPropertyName("ExpireOlderThan")]
-		public int ExpireOlderThan { get; set; } = 90;
-	}
-
-	public class WeaponPaintsConfig : BasePluginConfig
-	{
-		public override int Version { get; set; } = 7;
-		
-		[JsonPropertyName("DatabaseCredentials")]
-		public DatabaseCredentials DatabaseCredentials { get; set; } = new();
 
 		[JsonPropertyName("CmdRefreshCooldownSeconds")]
 		public int CmdRefreshCooldownSeconds { get; set; } = 60;
@@ -101,6 +83,6 @@ namespace WeaponPaints
 		public string Website { get; set; } = "example.com/skins";
 
 		[JsonPropertyName("Additional")]
-		public Additional Additional { get; set; } = new();
+		public Additional Additional { get; set; } = new Additional();
 	}
 }

Database.cs

@@ -1,23 +1,21 @@
-using Microsoft.Extensions.Logging;
-using MySqlConnector;
+using MySqlConnector;
 
 namespace WeaponPaints
 {
-	public class Database(string dbConnectionString)
+	public class Database
 	{
+		private readonly string _dbConnectionString;
+
+		public Database(string dbConnectionString)
+		{
+			_dbConnectionString = dbConnectionString;
+		}
+
         public async Task<MySqlConnection> GetConnectionAsync()
         {
-			try
-			{
-				var connection = new MySqlConnection(dbConnectionString);
+            var connection = new MySqlConnection(_dbConnectionString);
             await connection.OpenAsync();
             return connection;
         }
-			catch (Exception ex)
-			{
-				WeaponPaints.Instance.Logger.LogError($"Unable to connect to database: {ex.Message}");
-				throw;
-			}
-		}
 	}
 }

Events.cs

@@ -1,10 +1,6 @@
-using CounterStrikeSharp.API;
+using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes.Registration;
-using CounterStrikeSharp.API.Modules.Entities;
-using CounterStrikeSharp.API.Modules.Memory;
-using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
-using System.Runtime.InteropServices;
 
 namespace WeaponPaints
 {
@@ -15,48 +11,36 @@ namespace WeaponPaints
 		{
 			CCSPlayerController? player = @event.Userid;
 
-			if (player is null || !player.IsValid || player.IsBot ||
+			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
-			{
-				UserId = player.UserId,
-				Slot = player.Slot,
-				Index = (int)player.Index,
-				SteamId = player.SteamID,
-				Name = player.PlayerName,
-				IpAddress = player.IpAddress?.Split(":")[0]
-			};
+            PlayerInfo playerInfo = new(
+                (int)player.Index,
+                player.Slot,
+                player.UserId,
+                player.SteamID.ToString(),
+                player.PlayerName,
+                player.IpAddress?.Split(":")[0]
+            );
 
             try
 			{
-				_ = Task.Run(async () => await weaponSync.GetPlayerDatabaseIndex(playerInfo));
-				/*
 				if (Config.Additional.SkinEnabled)
 				{
-					_ = Task.Run(async () => await weaponSync.GetWeaponPaintsFromDatabase(playerInfo));
+					Task.Run(() => weaponSync.GetWeaponPaintsFromDatabase(playerInfo));
 				}
 				if (Config.Additional.KnifeEnabled)
 				{
-					_ = Task.Run(async () => await weaponSync.GetKnifeFromDatabase(playerInfo));
+					Task.Run(() => weaponSync.GetKnifeFromDatabase(playerInfo));
 				}
 				if (Config.Additional.GloveEnabled)
 				{
-					_ = Task.Run(async () => await weaponSync.GetGloveFromDatabase(playerInfo));
+					Task.Run(() => weaponSync.GetGloveFromDatabase(playerInfo));
 				}
-				if (Config.Additional.AgentEnabled)
+			}
+			catch (Exception ex)
 			{
-					_ = Task.Run(async () => await weaponSync.GetAgentFromDatabase(playerInfo));
-				}
-				if (Config.Additional.MusicEnabled)
-				{
-					_ = Task.Run(async () => await weaponSync.GetMusicFromDatabase(playerInfo));
-				}
-				*/
-			}
-			catch (Exception)
-            {
-                return HookResult.Continue;
+				Console.WriteLine($"An error occurred: {ex.Message}");
 			}
 
 			return HookResult.Continue;
@@ -65,12 +49,29 @@ namespace WeaponPaints
 		[GameEventHandler]
 		public HookResult OnPlayerDisconnect(EventPlayerDisconnect @event, GameEventInfo info)
 		{
-			CCSPlayerController? player = @event.Userid;
+			CCSPlayerController player = @event.Userid;
 
-			if (player is null || !player.IsValid || player.IsBot) return HookResult.Continue;
+			if (player is null || !player.IsValid || player.IsBot ||
+				player.IsHLTV || player.SteamID.ToString().Length != 17) return HookResult.Continue;
 
-            g_playersDatabaseIndex.TryRemove(player.Slot, out _);
+            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 _);
@@ -83,53 +84,119 @@ namespace WeaponPaints
 				{
 					g_playersGlove.TryRemove(player.Slot, out _);
 				}
-			if (Config.Additional.AgentEnabled)
-			{
-				g_playersAgent.TryRemove(player.Slot, out _);
-			}
-			if (Config.Additional.MusicEnabled)
-			{
-				g_playersMusic.TryRemove(player.Slot, out _);
-			}
-			if (Config.Additional.PinEnabled)
-			{
-				g_playersPin.TryRemove(player.Slot, out _);
 			}
 
+			// Remove player's command cooldown
 			commandsCooldown.Remove(player.Slot);
 
 			return HookResult.Continue;
 		}
 
+		private void OnEntityCreated(CEntityInstance entity)
+		{
+			if (!Config.Additional.SkinEnabled) return;
+			if (entity == null || !entity.IsValid || string.IsNullOrEmpty(entity.DesignerName)) return;
+			string designerName = entity.DesignerName;
+			if (!weaponList.ContainsKey(designerName)) return;
+			bool isKnife = false;
+			var weapon = new CBasePlayerWeapon(entity.Handle);
+
+			if (designerName.Contains("knife") || designerName.Contains("bayonet"))
+			{
+				isKnife = true;
+			}
+
+			Server.NextFrame(() =>
+			{
+				try
+				{
+					if (!weapon.IsValid) return;
+					if (weapon.OwnerEntity.Value == null) return;
+					if (weapon.OwnerEntity.Index <= 0) return;
+					int weaponOwner = (int)weapon.OwnerEntity.Index;
+					CBasePlayerPawn? pawn = Utilities.GetEntityFromIndex<CCSPlayerPawn>(weaponOwner);
+					if (!pawn.IsValid) return;
+
+					var playerIndex = (int)pawn.Controller.Index;
+					var player = Utilities.GetPlayerFromIndex(playerIndex);
+					if (!Utility.IsPlayerValid(player)) return;
+
+					ChangeWeaponAttributes(weapon, player, isKnife);
+				}
+				catch (Exception) { }
+			});
+		}
+
+		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 ||
+				player.SteamID.ToString().Length != 17 || !g_knifePickupCount.TryGetValue(player.Slot, out var pickupCount) ||
+				!g_playersKnife.ContainsKey(player.Slot))
+			{
+				return HookResult.Continue;
+			}
+
+			CBasePlayerWeapon weapon = new(caller.Handle);
+
+			if (weapon.AttributeManager.Item.ItemDefinitionIndex != 42 && weapon.AttributeManager.Item.ItemDefinitionIndex != 59)
+			{
+				return HookResult.Continue;
+			}
+
+			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;
+		}
+
 		private void OnMapStart(string mapName)
 		{
-			if (Config.Additional is { KnifeEnabled: false, SkinEnabled: false, GloveEnabled: false }) return;
+			if (!Config.Additional.KnifeEnabled && !Config.Additional.SkinEnabled && !Config.Additional.GloveEnabled) return;
 
 			if (_database != null)
 				weaponSync = new WeaponSynchronization(_database, Config);
 
-			if (weaponSync != null)
-				Task.Run(async () => await weaponSync.PurgeExpiredUsers());
+			// 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");
+			});
 		}
 
 		private HookResult OnPlayerSpawn(EventPlayerSpawn @event, GameEventInfo info)
 		{
 			CCSPlayerController? player = @event.Userid;
 
-			if (player is null || !player.IsValid || Config.Additional is { KnifeEnabled: false, GloveEnabled: false })
-				return HookResult.Continue;
-
-			CCSPlayerPawn? pawn = player.PlayerPawn.Value;
-
-			if (pawn == null || !pawn.IsValid)
+			if (player is null || !player.IsValid || !Config.Additional.KnifeEnabled && !Config.Additional.GloveEnabled)
 				return HookResult.Continue;
 
 			g_knifePickupCount[player.Slot] = 0;
 
-			GivePlayerMusicKit(player);
-			GivePlayerAgent(player);
-			GivePlayerGloves(player);
-			GivePlayerPin(player);
+			if (!PlayerHasKnife(player))
+				GiveKnifeToPlayer(player);
+
+			Server.NextFrame(() =>
+			{
+				RefreshGloves(player);
+			});
 
 			return HookResult.Continue;
 		}
@@ -143,120 +210,100 @@ namespace WeaponPaints
 
 		private HookResult OnRoundStart(EventRoundStart @event, GameEventInfo info)
 		{
+			NativeAPI.IssueServerCommand("mp_t_default_melee \"\"");
+			NativeAPI.IssueServerCommand("mp_ct_default_melee \"\"");
+			NativeAPI.IssueServerCommand("mp_equipment_reset_rounds 0");
+
 			g_bCommandsAllowed = true;
+
 			return HookResult.Continue;
 		}
-
-		public HookResult OnGiveNamedItemPost(DynamicHook hook)
+		private void OnTick()
+		{
+			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
 				{
-				var itemServices = hook.GetParam<CCSPlayer_ItemServices>(0);
-				var weapon = hook.GetReturn<CBasePlayerWeapon>();
-				if (!weapon.DesignerName.Contains("weapon"))
-					return HookResult.Continue;
-
-				var player = GetPlayerFromItemServices(itemServices);
-				if (player != null)
-					GivePlayerWeaponSkin(player, weapon);
-			}
-			catch { }
-
-			return HookResult.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]));
 					}
 
-		public void OnEntityCreated(CEntityInstance entity)
+					if (player.PlayerPawn?.IsValid != true || player.PlayerPawn?.Value?.IsValid != true)
+						continue;
+
+					var viewModels = GetPlayerViewModels(player);
+					if (viewModels == null || viewModels.Length == 0)
+						continue;
+
+					var viewModel = viewModels[0];
+					if (viewModel == null || viewModel.Value == null || viewModel.Value.Weapon == null || viewModel.Value.Weapon.Value == null)
+						continue;
+
+					var weapon = viewModel.Value.Weapon.Value;
+					if (weapon == null || !weapon.IsValid || weapon.FallbackPaintKit == 0)
+						continue;
+
+					if (viewModel.Value.VMName.Contains("knife"))
+						continue;
+
+					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))
 					{
-			var designerName = entity.DesignerName;
-
-			if (designerName.Contains("weapon"))
+						if (skeleton.ModelState.MeshGroupMask != 1)
 						{
-				Server.NextFrame(() =>
-				{
-					var weapon = new CBasePlayerWeapon(entity.Handle);
-					if (!weapon.IsValid) return;
-
-					try
-					{
-						SteamID? _steamid = null;
-
-						if (weapon.OriginalOwnerXuidLow > 0)
-							_steamid = new(weapon.OriginalOwnerXuidLow);
-
-						CCSPlayerController? player = null;
-
-						if (_steamid != null && _steamid.IsValid())
-						{
-							player = Utilities.GetPlayers().FirstOrDefault(p => p.IsValid && p.SteamID == _steamid.SteamId64);
-
-							if (player == null)
-								player = Utilities.GetPlayerFromSteamId(weapon.OriginalOwnerXuidLow);
+							skeleton.ModelState.MeshGroupMask = 1;
+							skeletonChange = true;
+						}
 					}
 					else
 					{
-							CCSWeaponBaseGun gun = weapon.As<CCSWeaponBaseGun>();
-							player = Utilities.GetPlayerFromIndex((int)weapon.OwnerEntity.Index) ?? Utilities.GetPlayerFromIndex((int)gun.OwnerEntity.Value!.Index);
+						if (skeleton.ModelState.MeshGroupMask != 2)
+						{
+							skeleton.ModelState.MeshGroupMask = 2;
+							skeletonChange = true;
+						}
 					}
 
-						if (string.IsNullOrEmpty(player?.PlayerName)) return;
-						if (!Utility.IsPlayerValid(player)) return;
-
-						GivePlayerWeaponSkin(player, weapon);
+					if (skeletonChange)
+						Utilities.SetStateChanged(viewModel.Value, "CBaseEntity", "m_CBodyComponent");
 				}
 				catch (Exception)
 				{
-						return;
-					}
-				});
 				}
 			}
-
-		private void OnTick()
-		{
-			if (!Config.Additional.ShowSkinImage) return;
-
-			foreach (var player in Utilities.GetPlayers().Where(p =>
-							p is { IsValid: true, PlayerPawn.IsValid: true } &&
-							(LifeState_t)p.LifeState == LifeState_t.LIFE_ALIVE
-							&& !p.IsBot && p is {  Connected: PlayerConnectedState.PlayerConnected }
-							)
-				)
-			{
-				if (PlayerWeaponImage.TryGetValue(player.Slot, out var value) && !string.IsNullOrEmpty(value))
-				{
-					player.PrintToCenterHtml("<img src='{PATH}'</img>".Replace("{PATH}", value));
-				}
-			}
-		}
-		
-		[GameEventHandler]
-		public HookResult OnItemPickup(EventItemPickup @event, GameEventInfo _)
-		{
-			if (!IsWindows) return HookResult.Continue;
-			
-			var player = @event.Userid;
-			if (player != null && player is { IsValid: true, Connected: PlayerConnectedState.PlayerConnected, PawnIsAlive: true, PlayerPawn.IsValid: true })
-			{
-				GiveOnItemPickup(player);
-			}
-
-			return HookResult.Continue;
 		}
 
 		private void RegisterListeners()
 		{
+			RegisterListener<Listeners.OnEntitySpawned>(OnEntityCreated);
+			//RegisterListener<Listeners.OnClientPutInServer>(OnClientPutInServer);
+			//RegisterListener<Listeners.OnClientDisconnect>(OnClientDisconnect);
 			RegisterListener<Listeners.OnMapStart>(OnMapStart);
-
-			RegisterEventHandler<EventPlayerSpawn>(OnPlayerSpawn);
-			RegisterEventHandler<EventRoundStart>(OnRoundStart);
-			RegisterEventHandler<EventRoundEnd>(OnRoundEnd);
-			RegisterListener<Listeners.OnEntityCreated>(OnEntityCreated);
-
-			if (Config.Additional.ShowSkinImage)
 			RegisterListener<Listeners.OnTick>(OnTick);
 
-			if (!IsWindows)
-				VirtualFunctions.GiveNamedItemFunc.Hook(OnGiveNamedItemPost, HookMode.Post);
+			RegisterEventHandler<EventPlayerSpawn>(OnPlayerSpawn);
+			RegisterEventHandler<EventRoundStart>(OnRoundStart, HookMode.Pre);
+			RegisterEventHandler<EventRoundEnd>(OnRoundEnd);
+
+			//RegisterEventHandler<EventItemPickup>(OnItemPickup);
+
+			HookEntityOutput("weapon_knife", "OnPlayerPickup", OnPickup);
 		}
 	}
 }

PlayerExtensions.cs

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

PlayerInfo.cs

@@ -3,10 +3,22 @@
     public class PlayerInfo
     {
         public int Index { get; set; }
-		public int Slot { get; init; }
+        public int Slot { get; set; }
         public int? UserId { get; set; }
-        public ulong? SteamId { get; init; }
+        public string? SteamId { 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

@@ -9,14 +9,13 @@ Unfinished, unoptimized and not fully functional ugly demo weapon paints plugin
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/E1E2G0P2O) or [![Donate on Steam](https://github.com/Nereziel/cs2-WeaponPaints/assets/32937653/a0d53822-4ca7-4caf-83b4-e1a9b5f8c94e)](https://steamcommunity.com/tradeoffer/new/?partner=41515647&token=gW2W-nXE)
 
 ## Features
-- Changes only paint, seed and wear on weapons, knives, gloves and agents
+- Changes only paint, seed and wear on weapons and knives
 - 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
 - Added command **`!knife`** to show menu with knives
-- Added command **`!gloves`** to show menu with gloves
-- Added command **`!agents`** to show menu with agents
+- 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
 
 ## CS2 Server
@@ -53,6 +52,7 @@ Unfinished, unoptimized and not fully functional ugly demo weapon paints plugin
 	"SkinMenuTitle": "Select skin for {WEAPON}" // Menu title (!skins menu, after weapon select)
 },
 "Additional": {
+	"SkinVisibilityFix": true, // Enable or disable fix for skin visibility
 	"KnifeEnabled": true, // Enable or disable knife feature
 	"SkinEnabled": true, // Enable or disable skin feature
 	"CommandWpEnabled": true, // Enable or disable refreshing command
@@ -83,6 +83,11 @@ Unfinished, unoptimized and not fully functional ugly demo weapon paints plugin
 - Steam login/logout
 - Change knife, paint, seed and wear
 
+## Known issues
+- Issue on Windows servers, no knives are given.
+- You can't change knife if it's equpied in cs2 inventory
+- Can cause incompatibility with plugins/maps which manipulates weapons and knives
+
 ## Troubleshooting
 <details>
 **Skins are not changing:**
@@ -91,6 +96,11 @@ Set FollowCSGOGuidelines to false in cssharp’s core.jcon config
 **Database error table does not exists:**
 Plugin is not loaded or configured with mysql credentials. Tables are auto-created by plugin.
 
+**Knives are disappearing:**
+Set in config GiveKnifeAfterRemove to true 
+
+**Knives are not changing for players:**
+You can't change knife if you have your own equipped
 </details>
 
 ### Use this plugin at your own risk! Using this may lead to GSLT ban or something else Valve come with. [Valve Server guidelines](https://blog.counter-strike.net/index.php/server_guidelines/)

SchemaString.cs

@@ -13,12 +13,13 @@ public class SchemaString<TSchemaClass> : NativeObject where TSchemaClass : Nati
     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.ToInt64() + i), bytes[i]);
+            Unsafe.Write((void*)(handle + i), bytes[i]);
         }
 
-		Unsafe.Write((void*)(Handle.ToInt64() + bytes.Length), 0);
+        Unsafe.Write((void*)(handle + bytes.Length), 0);
     }
 }

Utility.cs

@@ -1,9 +1,11 @@
-using CounterStrikeSharp.API.Core;
-using CounterStrikeSharp.API.Core.Translations;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Utils;
 using Dapper;
 using Microsoft.Extensions.Logging;
+using MySqlConnector;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using System.Reflection;
 
 namespace WeaponPaints
 {
@@ -11,6 +13,22 @@ namespace WeaponPaints
 	{
 		internal static WeaponPaintsConfig? Config { get; set; }
 
+		internal static string BuildDatabaseConnectionString()
+		{
+			if (Config == null) return string.Empty;
+			var builder = new MySqlConnectionStringBuilder
+			{
+				Server = Config.DatabaseHost,
+				UserID = Config.DatabaseUser,
+				Password = Config.DatabasePassword,
+				Database = Config.DatabaseName,
+				Port = (uint)Config.DatabasePort,
+				Pooling = true
+			};
+
+			return builder.ConnectionString;
+		}
+
 		internal static async Task CheckDatabaseTables()
 		{
 			if (WeaponPaints._database is null) return;
@@ -23,17 +41,34 @@ namespace WeaponPaints
 
 				try
 				{
-                    var createTableQueries = new[]
+					string[] createTableQueries = new[]
 					{
-                        "CREATE TABLE IF NOT EXISTS `wp_users` (`id` INT UNSIGNED NOT NULL AUTO_INCREMENT, `steamid` BIGINT UNSIGNED NOT NULL, `last_online` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (`id`), UNIQUE KEY `unique_steamid` (`steamid`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;",
-                        "CREATE TABLE IF NOT EXISTS `wp_users_skins` (`user_id` INT UNSIGNED NOT NULL, `weapon` SMALLINT UNSIGNED NOT NULL, `paint` SMALLINT UNSIGNED NOT NULL, `wear` FLOAT NOT NULL DEFAULT 0.001, `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, `quality` SMALLINT UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`user_id`,`weapon`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;",
-                        "CREATE TABLE IF NOT EXISTS `wp_users_knives` (`user_id` INT UNSIGNED NOT NULL, `knife` SMALLINT UNSIGNED NOT NULL, PRIMARY KEY (`user_id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;",
-                        "CREATE TABLE IF NOT EXISTS `wp_users_gloves` (`user_id` INT UNSIGNED NOT NULL, `weapon_defindex` SMALLINT UNSIGNED DEFAULT NULL, PRIMARY KEY (`user_id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;",
-                        "CREATE TABLE IF NOT EXISTS `wp_users_musics` (`user_id` INT UNSIGNED NOT NULL, `music` SMALLINT UNSIGNED DEFAULT NULL, PRIMARY KEY (`user_id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;",
-                        "CREATE TABLE IF NOT EXISTS `wp_users_agents` (`user_id` INT UNSIGNED NOT NULL,`agent_ct` varchar(64) DEFAULT NULL,`agent_t` varchar(64) DEFAULT NULL, PRIMARY KEY (`user_id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;",
-                        "CREATE TABLE IF NOT EXISTS `wp_users_pins` (`user_id` INT UNSIGNED NOT NULL, `pin` SMALLINT UNSIGNED DEFAULT NULL, PRIMARY KEY (`user_id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;",
+						@"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",
+						@"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);
@@ -55,64 +90,37 @@ namespace WeaponPaints
 
 		internal static bool IsPlayerValid(CCSPlayerController? player)
 		{
-			if (player is null || WeaponPaints.weaponSync is null) return false;
+			if (player is null) return false;
 
-			return player is { IsValid: true, IsBot: false, IsHLTV: false, UserId: not null };
+			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, ILogger logger)
-		{
-			var json = File.ReadAllText(filePath);
-			try
-			{
-				var deserializedSkins = JsonConvert.DeserializeObject<List<JObject>>(json);
-				WeaponPaints.skinsList = deserializedSkins ?? [];
-			}
-			catch (FileNotFoundException)
-			{
-				logger?.LogError("Not found \"skins.json\" file");
-			}
-		}
-
-		internal static void LoadGlovesFromFile(string filePath, ILogger logger)
+		internal static void LoadSkinsFromFile(string filePath)
 		{
 			try
 			{
-				var json = File.ReadAllText(filePath);
+				string json = File.ReadAllText(filePath);
 				var deserializedSkins = JsonConvert.DeserializeObject<List<JObject>>(json);
-				WeaponPaints.glovesList = deserializedSkins ?? [];
+				WeaponPaints.skinsList = deserializedSkins ?? new List<JObject>();
 			}
 			catch (FileNotFoundException)
 			{
-				logger?.LogError("Not found \"gloves.json\" file");
+				throw;
 			}
 		}
 
-		internal static void LoadAgentsFromFile(string filePath, ILogger logger)
+		internal static void LoadGlovesFromFile(string filePath)
 		{
 			try
 			{
-				var json = File.ReadAllText(filePath);
+				string json = File.ReadAllText(filePath);
 				var deserializedSkins = JsonConvert.DeserializeObject<List<JObject>>(json);
-				WeaponPaints.agentsList = deserializedSkins ?? [];
+				WeaponPaints.glovesList = deserializedSkins ?? new List<JObject>();
 			}
 			catch (FileNotFoundException)
 			{
-				logger?.LogError("Not found \"agents.json\" file");
-			}
-		}
-
-		internal static void LoadMusicFromFile(string filePath, ILogger logger)
-		{
-			try
-			{
-				var json = File.ReadAllText(filePath);
-				var deserializedSkins = JsonConvert.DeserializeObject<List<JObject>>(json);
-				WeaponPaints.musicList = deserializedSkins ?? [];
-			}
-			catch (FileNotFoundException)
-			{
-				logger?.LogError("Not found \"music.json\" file");
+				throw;
 			}
 		}
 
@@ -126,35 +134,53 @@ namespace WeaponPaints
 
 		internal static string ReplaceTags(string message)
 		{
-			return message.ReplaceColorTags();
+			if (message.Contains('{'))
+			{
+				string modifiedValue = message;
+				if (Config != null)
+				{
+					modifiedValue = modifiedValue.Replace("{WEBSITE}", Config.Website);
+				}
+				foreach (FieldInfo field in typeof(ChatColors).GetFields())
+				{
+					string pattern = $"{{{field.Name}}}";
+					if (message.Contains(pattern, StringComparison.OrdinalIgnoreCase))
+					{
+						modifiedValue = modifiedValue.Replace(pattern, field.GetValue(null)!.ToString(), StringComparison.OrdinalIgnoreCase);
+					}
+				}
+				return modifiedValue;
+			}
+
+			return message;
 		}
 
 		internal static async Task CheckVersion(string version, ILogger logger)
 		{
-			using HttpClient client = new();
-
+			using (HttpClient client = new HttpClient())
+			{
 				try
 				{
-				var response = await client.GetAsync("https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/VERSION").ConfigureAwait(false);
+					HttpResponseMessage response = await client.GetAsync("https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/VERSION").ConfigureAwait(false);
 
 					if (response.IsSuccessStatusCode)
 					{
-					var remoteVersion = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+						string remoteVersion = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
 						remoteVersion = remoteVersion.Trim();
 
-					var comparisonResult = string.CompareOrdinal(version, remoteVersion);
+						int comparisonResult = string.Compare(version, remoteVersion);
 
-					switch (comparisonResult)
+						if (comparisonResult < 0)
 						{
-						case < 0:
 							logger.LogWarning("Plugin is outdated! Check https://github.com/Nereziel/cs2-WeaponPaints");
-							break;
-						case > 0:
+						}
+						else if (comparisonResult > 0)
+						{
 							logger.LogInformation("Probably dev version detected");
-							break;
-						default:
+						}
+						else
+						{
 							logger.LogInformation("Plugin is up to date");
-							break;
 						}
 					}
 					else
@@ -171,6 +197,7 @@ namespace WeaponPaints
 					logger.LogError(ex, "An error occurred while checking version.");
 				}
 			}
+		}
 
 		internal static void ShowAd(string moduleVersion)
 		{
@@ -186,5 +213,26 @@ namespace WeaponPaints
 			Console.WriteLine("			>> GitHub: https://github.com/Nereziel/cs2-WeaponPaints");
 			Console.WriteLine(" ");
 		}
+
+		/*(
+		internal static void TestDatabaseConnection()
+		{
+			try
+			{
+				using var connection = new MySqlConnection(BuildDatabaseConnectionString());
+				connection.Open();
+
+				if (connection.State != System.Data.ConnectionState.Open)
+				{
+					throw new Exception("[WeaponPaints] Unable connect to database!");
+				}
+			}
+			catch (Exception ex)
+			{
+				throw new Exception("[WeaponPaints] Unknown mysql exception! " + ex.Message);
+			}
+			CheckDatabaseTables();
+		}
+		*/
 	}
 }

VERSION

@@ -1 +1 @@
-2.5a
+1.9b

WeaponAction.cs

@@ -1,88 +1,91 @@
-using System.Diagnostics;
-using System.Reflection.Metadata.Ecma335;
-using System.Runtime.InteropServices;
-using CounterStrikeSharp.API;
+using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
-using CounterStrikeSharp.API.Modules.Entities.Constants;
 using CounterStrikeSharp.API.Modules.Memory;
 using CounterStrikeSharp.API.Modules.Timers;
 using CounterStrikeSharp.API.Modules.Utils;
 using Microsoft.Extensions.Logging;
+using System.Runtime.InteropServices;
 
-namespace WeaponPaints;
-
-public partial class WeaponPaints
+namespace WeaponPaints
 {
-    private void GivePlayerWeaponSkin(CCSPlayerController player, CBasePlayerWeapon weapon)
+	public partial class WeaponPaints
 	{
-        if (!Config.Additional.SkinEnabled) return;
+		internal static void ChangeWeaponAttributes(CBasePlayerWeapon? weapon, CCSPlayerController? player, bool isKnife = false)
+		{
+			if (player is null || weapon is null || !weapon.IsValid || !Utility.IsPlayerValid(player)) return;
             if (!gPlayerWeaponsInfo.TryGetValue(player.Slot, out _)) return;
 
-        var isKnife = weapon.DesignerName.Contains("knife") || weapon.DesignerName.Contains("bayonet");
+			if (isKnife && !g_playersKnife.ContainsKey(player.Slot) || isKnife && g_playersKnife[player.Slot] == "weapon_knife") return;
 
-        if ((isKnife && !g_playersKnife.ContainsKey(player.Slot)) ||
-            (isKnife && g_playersKnife[player.Slot] < 500)) return;
-
-        int[] newPaints =
-            [1171, 1170, 1169, 1164, 1162, 1161, 1159, 1175, 1174, 1167, 1165, 1168, 1163, 1160, 1166, 1173];
+			int weaponDefIndex = weapon.AttributeManager.Item.ItemDefinitionIndex;
 
 			if (isKnife)
 			{
-            //var newDefIndex = WeaponDefindex.FirstOrDefault(x => x.Value == g_playersKnife[player.Slot]);
-            //if (newDefIndex.Key == 0) return;
-
-            if (weapon.AttributeManager.Item.ItemDefinitionIndex != g_playersKnife[player.Slot])
-                SubclassChange(weapon, (ushort)g_playersKnife[player.Slot]);
-
-            weapon.AttributeManager.Item.ItemDefinitionIndex = (ushort)g_playersKnife[player.Slot];
 				weapon.AttributeManager.Item.EntityQuality = 3;
 			}
 
-        UpdatePlayerEconItemId(weapon.AttributeManager.Item);
-
-        int weaponDefIndex = weapon.AttributeManager.Item.ItemDefinitionIndex;
-        var fallbackPaintKit = 0;
-
-        weapon.AttributeManager.Item.AccountID = (uint)player.SteamID;
+			int fallbackPaintKit = weapon.FallbackPaintKit;
 
 			if (_config.Additional.GiveRandomSkin &&
-            !gPlayerWeaponsInfo[player.Slot].ContainsKey((ushort)weaponDefIndex))
+				 !gPlayerWeaponsInfo[player.Slot].ContainsKey(weaponDefIndex))
 			{
 				// Random skins
+				weapon.AttributeManager.Item.ItemID = 16384;
+				weapon.AttributeManager.Item.ItemIDLow = 16384 & 0xFFFFFFFF;
+				weapon.AttributeManager.Item.ItemIDHigh = weapon.AttributeManager.Item.ItemIDLow >> 32;
 				weapon.FallbackPaintKit = GetRandomPaint(weaponDefIndex);
 				weapon.FallbackSeed = 0;
-            weapon.FallbackWear = 0.01f;
-
-            weapon.AttributeManager.Item.NetworkedDynamicAttributes.Attributes.RemoveAll();
-            CAttributeListSetOrAddAttributeValueByName.Invoke(
-                weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle, "set item texture prefab",
-                GetRandomPaint(weaponDefIndex));
-            CAttributeListSetOrAddAttributeValueByName.Invoke(
-                weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle, "set item texture seed", 0);
-            CAttributeListSetOrAddAttributeValueByName.Invoke(
-                weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle, "set item texture wear", 0.01f);
-
-            weapon.AttributeManager.Item.AttributeList.Attributes.RemoveAll();
-            CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.AttributeList.Handle,
-                "set item texture prefab", GetRandomPaint(weaponDefIndex));
-            CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.AttributeList.Handle,
-                "set item texture seed", 0);
-            CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.AttributeList.Handle,
-                "set item texture wear", 0.01f);
+				weapon.FallbackWear = 0.000001f;
 
 				fallbackPaintKit = weapon.FallbackPaintKit;
 
 				if (fallbackPaintKit == 0)
 					return;
 
-            if (isKnife) return;
-            UpdatePlayerWeaponMeshGroupMask(player, weapon, !newPaints.Contains(fallbackPaintKit));
+				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[] newPaints = { 1171, 1170, 1169, 1164, 1162, 1161, 1159, 1175, 1174, 1167, 1165, 1168, 1163, 1160, 1166, 1173 };
+
+					if (newPaints.Contains(fallbackPaintKit))
+					{
+						skeleton.ModelState.MeshGroupMask = 1;
+					}
+					else
+					{
+						if (skeleton.ModelState.MeshGroupMask != 2)
+						{
+							skeleton.ModelState.MeshGroupMask = 2;
+						}
+					}
+				}
+
+				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[player.Slot].TryGetValue((ushort)weaponDefIndex, out var value) || value.Paint == 0) return;
-
-        var weaponInfo = value;
+			if (!gPlayerWeaponsInfo[player.Slot].ContainsKey(weaponDefIndex)) return;
+			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;
@@ -90,192 +93,278 @@ public partial class WeaponPaints
 			weapon.FallbackPaintKit = weaponInfo.Paint;
 			weapon.FallbackSeed = weaponInfo.Seed;
 			weapon.FallbackWear = weaponInfo.Wear;
-        CAttributeListSetOrAddAttributeValueByName.Invoke(
-            weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle, "set item texture prefab",
-            weapon.FallbackPaintKit);
 
 			fallbackPaintKit = weapon.FallbackPaintKit;
 
 			if (fallbackPaintKit == 0)
 				return;
 
-        if (isKnife) return;
-        UpdatePlayerWeaponMeshGroupMask(player, weapon, !newPaints.Contains(fallbackPaintKit));
+			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[] newPaints = { 1171, 1170, 1169, 1164, 1162, 1161, 1159, 1175, 1174, 1167, 1165, 1168, 1163, 1160, 1166, 1173 };
+				if (newPaints.Contains(fallbackPaintKit))
+				{
+					skeleton.ModelState.MeshGroupMask = 1;
+				}
+				else
+				{
+					if (skeleton.ModelState.MeshGroupMask != 2)
+					{
+						skeleton.ModelState.MeshGroupMask = 2;
+					}
+				}
 			}
 
-    private static void GiveKnifeToPlayer(CCSPlayerController? player)
+			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 (PlayerHasKnife(player)) return;
+			WeaponPaints.Instance.AddTimer(1.0f, () =>
+			{
+				string knifeToGive;
+				if (g_playersKnife.TryGetValue(player.Slot, out var knife))
+				{
+					knifeToGive = knife;
+				}
+				else if (_config.Additional.GiveRandomKnife)
+				{
+					var knifeTypes = weaponList.Where(pair => pair.Key.StartsWith("weapon_knife") || pair.Key.StartsWith("weapon_bayonet")).ToList();
 
-        //string knifeToGive = (CsTeam)player.TeamNum == CsTeam.Terrorist ? "weapon_knife_t" : "weapon_knife";
-        player.GiveNamedItem(CsItem.Knife);
+					if (knifeTypes.Count == 0)
+					{
+						Utility.Log("No valid knife types found.");
+						return;
 					}
 
-    private static bool PlayerHasKnife(CCSPlayerController? player)
+					Random random = new();
+					int index = random.Next(knifeTypes.Count);
+					knifeToGive = knifeTypes[index].Key;
+				}
+				else
+				{
+					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.IsValid) return false;
+			if (player == null || !player.IsValid || player.PlayerPawn == null || !player.PlayerPawn.IsValid)
+			{
+				return false;
+			}
 
-        if (player.PlayerPawn.Value == null || player.PlayerPawn.Value.WeaponServices == null ||
-            player.PlayerPawn.Value.ItemServices == null)
+			if (player.PlayerPawn?.Value == null || player.PlayerPawn?.Value.WeaponServices == null || player.PlayerPawn?.Value.ItemServices == null)
 				return false;
 
 			var weapons = player.PlayerPawn.Value.WeaponServices?.MyWeapons;
 			if (weapons == null) return false;
 			foreach (var weapon in weapons)
 			{
-            if (!weapon.IsValid || weapon.Value == null || !weapon.Value.IsValid) continue;
+				if (weapon != null && weapon.IsValid && weapon.Value != null && weapon.Value.IsValid)
+				{
 					if (weapon.Value.DesignerName.Contains("knife") || weapon.Value.DesignerName.Contains("bayonet"))
+					{
 						return true;
 					}
-
+				}
+			}
 			return false;
 		}
 
-    private void RefreshWeapons(CCSPlayerController? player)
+		internal void RefreshWeapons(CCSPlayerController? player)
 		{
-        if (!g_bCommandsAllowed) return;
-        if (player == null || !player.IsValid || player.PlayerPawn?.Value == null ||
-            (LifeState_t)player.LifeState != LifeState_t.LIFE_ALIVE)
+			if (player == null || !player.IsValid || player.PlayerPawn?.Value == null || (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;
 
-        if (weapons.Count == 0)
+			if (weapons == null || weapons.Count == 0)
 				return;
-        if (player.Team is CsTeam.None or CsTeam.Spectator)
+			if (player.Team == CsTeam.None || player.Team == CsTeam.Spectator)
 				return;
 
-        int playerTeam = player.TeamNum;
-
-        Dictionary<string, List<(int, int)>> weaponsWithAmmo = [];
+			//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.IsValid || weapon.Value == null ||
+				if (weapon == null || !weapon.IsValid || weapon.Value == null ||
 					!weapon.Value.IsValid || !weapon.Value.DesignerName.Contains("weapon_"))
 					continue;
 
-            var gun = weapon.Value.As<CCSWeaponBaseGun>();
+				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
 				{
-                var weaponData = weapon.Value.As<CCSWeaponBase>().VData;
+					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 (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 var weaponByDefindex))
+						if (!WeaponDefindex.TryGetValue(weapon.Value.AttributeManager.Item.ItemDefinitionIndex, out weaponByDefindex))
 							continue;
 
-                    var clip1 = weapon.Value.Clip1;
-                    var reservedAmmo = weapon.Value.ReserveAmmo[0];
+						int clip1 = weapon.Value.Clip1;
+						int reservedAmmo = weapon.Value.ReserveAmmo[0];
 
-                    if (!weaponsWithAmmo.TryGetValue(weaponByDefindex, out var value))
+						if (!weaponsWithAmmo.ContainsKey(weaponByDefindex))
 						{
-                        value = [];
-                        weaponsWithAmmo.Add(weaponByDefindex, value);
+							weaponsWithAmmo.Add(weaponByDefindex, new List<(int, int)>());
 						}
 
-                    value.Add((clip1, reservedAmmo));
-
-                    if (gun.VData == null) return;
-
-                    weapon.Value.Remove();
+						weaponsWithAmmo[weaponByDefindex].Add((clip1, reservedAmmo));
 					}
+
+					//player.RemoveItemByDesignerName(weapon.Value.DesignerName, false);
 				}
 				catch (Exception ex)
 				{
 					Logger.LogWarning(ex.Message);
+					continue;
 				}
 			}
 
-        try
+			for (int i = 1; i <= 3; i++)
 			{
-            player.ExecuteClientCommand("slot 3");
-            player.ExecuteClientCommand("slot 3");
+				player.ExecuteClientCommand($"slot {i}");
+				player.ExecuteClientCommand($"slot {i}");
 
-            var weapon = player.PlayerPawn.Value.WeaponServices.ActiveWeapon;
-            if (!weapon.IsValid || weapon.Value == null) return;
-            var weaponData = weapon.Value.As<CCSWeaponBase>().VData;
-
-            if (weapon.Value.DesignerName.Contains("knife") || weaponData?.GearSlot == gear_slot_t.GEAR_SLOT_KNIFE)
+				AddTimer(0.1f, () =>
 				{
-                CCSWeaponBaseGun gun;
+					var weapon = player.PlayerPawn.Value.WeaponServices.ActiveWeapon.Value;
+					CCSWeaponBaseGun? gun = weapon?.As<CCSWeaponBaseGun>();
 
-                AddTimer(0.3f, () =>
-                {
-                    if (player.TeamNum != playerTeam) return;
+					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.ExecuteClientCommand("slot 3");
-                    gun = weapon.Value.As<CCSWeaponBaseGun>();
 					player.DropActiveWeapon();
 
-                    AddTimer(0.7f, () =>
+					AddTimer(0.22f, () =>
 					{
-                        if (player.TeamNum != playerTeam) return;
-
-                        if (!gun.IsValid || gun.State != CSWeaponState_t.WEAPON_NOT_CARRIED) return;
-
-                        gun.Remove();
+						if (gun != null && gun.IsValid && gun.State == CSWeaponState_t.WEAPON_NOT_CARRIED)
+						{
+							weapon?.Remove();
+						}
 					});
+				});
+			}
 
+			AddTimer(1.2f, () =>
+			{
 				GiveKnifeToPlayer(player);
-                });
-            }
-        }
-        catch (Exception ex)
-        {
-            Logger.LogWarning($"Cannot remove knife: {ex.Message}");
-        }
-
-        AddTimer(0.6f, () =>
-        {
-            if (!g_bCommandsAllowed) return;
 
 				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);
 		}
 
-    private void GivePlayerGloves(CCSPlayerController player)
+		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)
+			{
+				foreach (var weapon in weapons)
+				{
+					if (weapon != null && weapon.IsValid && weapon.Value != null && weapon.Value.IsValid && weapon.Index > 0)
+					{
+						try
+						{
+							CCSWeaponBaseVData? weaponData = weapon.Value.As<CCSWeaponBase>().VData;
+
+							if (weapon.Value.DesignerName.Contains("knife") || weaponData?.GearSlot == gear_slot_t.GEAR_SLOT_KNIFE)
+							{
+								player.ExecuteClientCommand("slot 3");
+
+								weapon.Value.Remove();
+								GiveKnifeToPlayer(player);
+							}
+						}
+						catch (Exception ex)
+						{
+							Logger.LogWarning($"Cannot remove knife: {ex.Message}");
+						}
+					}
+				}
+			}
+		}
+
+		private static void RefreshGloves(CCSPlayerController player)
 		{
 			if (!Utility.IsPlayerValid(player) || (LifeState_t)player.LifeState != LifeState_t.LIFE_ALIVE) return;
 
-        var pawn = player.PlayerPawn.Value;
-        if (pawn == null || !pawn.IsValid)
+			CCSPlayerPawn? pawn = player.PlayerPawn.Value;
+			if (pawn == null || !pawn.IsValid || pawn.LifeState != (byte)LifeState_t.LIFE_ALIVE)
 				return;
 
-        var model = pawn.CBodyComponent?.SceneNode?.GetSkeletonInstance()?.ModelState.ModelName ?? string.Empty;
+			string model = pawn.CBodyComponent?.SceneNode?.GetSkeletonInstance()?.ModelState.ModelName ?? string.Empty;
 			if (!string.IsNullOrEmpty(model))
 			{
 				pawn.SetModel("characters/models/tm_jumpsuit/tm_jumpsuit_varianta.vmdl");
@@ -284,46 +373,46 @@ public partial class WeaponPaints
 
 			Instance.AddTimer(0.06f, () =>
 			{
-            var item = pawn.EconGloves;
 				try
 				{
-                if (!player.IsValid)
+					if (player == null || !player.IsValid)
 						return;
 
-                if (!player.PawnIsAlive)
+					if (pawn == null || !pawn.IsValid || pawn.LifeState != (byte)LifeState_t.LIFE_ALIVE)
 						return;
 
-                if (!g_playersGlove.TryGetValue(player.Slot, out var gloveInfo) || gloveInfo == 0) return;
+					if (g_playersGlove.TryGetValue(player.Slot, out var gloveInfo) && gloveInfo != 0)
+					{
+						CCSPlayerPawn? pawn = player.PlayerPawn.Value;
+						if (pawn == null || !pawn.IsValid || pawn.LifeState != (byte)LifeState_t.LIFE_ALIVE)
+							return;
 
-                var weaponInfo = gPlayerWeaponsInfo[player.Slot][gloveInfo];
+						WeaponInfo weaponInfo = gPlayerWeaponsInfo[player.Slot][gloveInfo];
 
+						CEconItemView item = pawn.EconGloves;
 						item.ItemDefinitionIndex = gloveInfo;
 						item.ItemIDLow = 16384 & 0xFFFFFFFF;
 						item.ItemIDHigh = 16384;
 
-                CAttributeListSetOrAddAttributeValueByName.Invoke(item.NetworkedDynamicAttributes.Handle,
-                    "set item texture prefab", weaponInfo.Paint);
-                CAttributeListSetOrAddAttributeValueByName.Invoke(item.NetworkedDynamicAttributes.Handle,
-                    "set item texture seed", weaponInfo.Seed);
-                CAttributeListSetOrAddAttributeValueByName.Invoke(item.NetworkedDynamicAttributes.Handle,
-                    "set item texture wear", weaponInfo.Wear);
+						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;
 
-                SetBodygroup(pawn.Handle, "default_gloves", 1);
+						CBaseModelEntity_SetBodygroup.Invoke(pawn, "default_gloves", 1);
 					}
-            catch (Exception)
-            {
 				}
+				catch (Exception) { }
 			}, TimerFlags.STOP_ON_MAPCHANGE);
 		}
 
 		private static int GetRandomPaint(int defindex)
 		{
-        if (skinsList.Count == 0)
+			if (skinsList == null || skinsList.Count == 0)
 				return 0;
 
-        var rnd = new Random();
+			Random rnd = new Random();
 
 			// Filter weapons by the provided defindex
 			var filteredWeapons = skinsList.Where(w => w["weapon_defindex"]?.ToString() == defindex.ToString()).ToList();
@@ -333,137 +422,37 @@ public partial class WeaponPaints
 
 			var randomWeapon = filteredWeapons[rnd.Next(filteredWeapons.Count)];
 
-        return int.TryParse(randomWeapon["paint"]?.ToString(), out var paintValue) ? paintValue : 0;
+			if (int.TryParse(randomWeapon["paint"]?.ToString(), out int paintValue))
+				return paintValue;
+
+			return 0;
 		}
 
-    private static void SubclassChange(CBasePlayerWeapon weapon, ushort itemD)
+		private static CSkeletonInstance GetSkeletonInstance(CGameSceneNode node)
 		{
-        var subclassChangeFunc = VirtualFunction.Create<nint, string, int>(
-            GameData.GetSignature("ChangeSubclass")
-        );
-
-        subclassChangeFunc(weapon.Handle, itemD.ToString());
+			Func<nint, nint> GetSkeletonInstance = VirtualFunction.Create<nint, nint>(node.Handle, 8);
+			return new CSkeletonInstance(GetSkeletonInstance(node.Handle));
 		}
 
-    private static void UpdateWeaponMeshGroupMask(CBaseEntity weapon, bool isLegacy = false)
-    {
-        if (weapon.CBodyComponent?.SceneNode == null) return;
-        var skeleton = weapon.CBodyComponent.SceneNode.GetSkeletonInstance();
-        var value = (ulong)(isLegacy ? 2 : 1);
-
-        if (skeleton.ModelState.MeshGroupMask != value) skeleton.ModelState.MeshGroupMask = value;
-    }
-
-    private static void UpdatePlayerWeaponMeshGroupMask(CCSPlayerController player, CBasePlayerWeapon weapon,
-        bool isLegacy)
-    {
-        UpdateWeaponMeshGroupMask(weapon, isLegacy);
-
-        var viewModel = GetPlayerViewModel(player);
-        if (viewModel == null || viewModel.Weapon.Value == null ||
-            viewModel.Weapon.Value.Index != weapon.Index) return;
-        UpdateWeaponMeshGroupMask(viewModel, isLegacy);
-        Utilities.SetStateChanged(viewModel, "CBaseEntity", "m_CBodyComponent");
-    }
-
-    private static void GivePlayerAgent(CCSPlayerController player)
-    {
-        if (!g_playersAgent.TryGetValue(player.Slot, out var value)) return;
-
-        var model = player.TeamNum == 3 ? value.CT : value.T;
-        if (string.IsNullOrEmpty(model)) return;
-
-        if (player.PlayerPawn.Value == null)
-            return;
-
-        try
-        {
-            Server.NextFrame(() =>
-            {
-                player.PlayerPawn.Value.SetModel(
-                    $"characters/models/{model}.vmdl"
-                );
-            });
-        }
-        catch (Exception)
-        {
-        }
-    }
-
-    private static void GivePlayerMusicKit(CCSPlayerController player)
-    {
-        if (!g_playersMusic.TryGetValue(player.Slot, out var value)) return;
-        if (player.InventoryServices == null) return;
-
-        player.InventoryServices.MusicID = value;
-        Utilities.SetStateChanged(player, "CCSPlayerController", "m_pInventoryServices");
-        player.MusicKitID = value;
-        Utilities.SetStateChanged(player, "CCSPlayerController", "m_iMusicKitID");
-    }
-
-    private static void GivePlayerPin(CCSPlayerController player)
-    {
-        if (!g_playersPin.TryGetValue(player.Slot, out var value)) return;
-        if (player.InventoryServices == null) return;
-
-        for (var index = 0; index < player.InventoryServices.Rank.Length; index++)
-        {
-            player.InventoryServices.Rank[index] = index == 5 ? (MedalRank_t)value : MedalRank_t.MEDAL_RANK_NONE;
-            Utilities.SetStateChanged(player, "CCSPlayerController", "m_pInventoryServices");
-        }
-    }
-
-    private void GiveOnItemPickup(CCSPlayerController player)
-    {
-        var pawn = player.PlayerPawn.Value;
-        if (pawn == null) return;
-
-        var myWeapons = pawn.WeaponServices?.MyWeapons;
-        if (myWeapons == null) return;
-        foreach (var handle in myWeapons)
-        {
-            var weapon = handle.Value;
-            if (weapon != null && weapon.DesignerName.Contains("knife")) GivePlayerWeaponSkin(player, weapon);
-        }
-    }
-
-    private void UpdatePlayerEconItemId(CEconItemView econItemView)
-    {
-        var itemId = _nextItemId++;
-        econItemView.ItemID = itemId;
-
-        econItemView.ItemIDLow = (uint)itemId & 0xFFFFFFFF;
-        econItemView.ItemIDHigh = (uint)itemId >> 32;
-    }
-
-    private static CCSPlayerController? GetPlayerFromItemServices(CCSPlayer_ItemServices itemServices)
-    {
-        var pawn = itemServices.Pawn.Value;
-        if (!pawn.IsValid || !pawn.Controller.IsValid || pawn.Controller.Value == null) return null;
-        var player = new CCSPlayerController(pawn.Controller.Value.Handle);
-        return !Utility.IsPlayerValid(player) ? null : player;
-    }
-
-    private static CBaseViewModel? GetPlayerViewModel(CCSPlayerController player)
+		private static unsafe CHandle<CBaseViewModel>[]? GetPlayerViewModels(CCSPlayerController player)
 		{
 			if (player.PlayerPawn.Value == null || player.PlayerPawn.Value.ViewModelServices == null) return null;
-        CCSPlayer_ViewModelServices viewModelServices = new(player.PlayerPawn.Value.ViewModelServices!.Handle);
-        var ptr = viewModelServices.Handle + Schema.GetSchemaOffset("CCSPlayer_ViewModelServices", "m_hViewModel");
-        var references = MemoryMarshal.CreateSpan(ref ptr, 3);
-        var viewModel =
-            (CHandle<CBaseViewModel>)Activator.CreateInstance(typeof(CHandle<CBaseViewModel>), references[0])!;
-        return viewModel.Value == null ? null : viewModel.Value;
+			CCSPlayer_ViewModelServices viewModelServices = new CCSPlayer_ViewModelServices(player.PlayerPawn.Value.ViewModelServices!.Handle);
+			return GetFixedArray<CHandle<CBaseViewModel>>(viewModelServices.Handle, "CCSPlayer_ViewModelServices", "m_hViewModel", 3);
 		}
 
-    public static T[] GetFixedArray<T>(nint pointer, string @class, string member, int length)
-        where T : CHandle<CBaseViewModel>
+		public static unsafe T[] GetFixedArray<T>(nint pointer, string @class, string member, int length) where T : CHandle<CBaseViewModel>
 		{
-        var ptr = pointer + Schema.GetSchemaOffset(@class, member);
-        var references = MemoryMarshal.CreateSpan(ref ptr, length);
-        var values = new T[length];
+			nint ptr = pointer + Schema.GetSchemaOffset(@class, member);
+			Span<nint> references = MemoryMarshal.CreateSpan<nint>(ref ptr, length);
+			T[] values = new T[length];
 
-        for (var i = 0; i < length; i++) values[i] = (T)Activator.CreateInstance(typeof(T), references[i])!;
+			for (int i = 0; i < length; i++)
+			{
+				values[i] = (T)Activator.CreateInstance(typeof(T), references[i])!;
+			}
 
 			return values;
 		}
+	}
 }

WeaponInfo.cs

@@ -2,12 +2,17 @@
 {
     public class WeaponInfo
     {
-		public ushort Paint { get; set; }
-		public ushort Seed { get; set; } = 0;
-		public float Wear { get; set; } = 0f;
-        public string? NameTag { get; set; }
-        public ushort Quality { get; set; }
-        public uint StatTrack { get; set; }
-        public bool StatTrackEnabled { get; set; }
+        public int Paint { get; set; }
+        public int Seed { 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

@@ -7,17 +7,15 @@ using Microsoft.Extensions.Logging;
 using MySqlConnector;
 using Newtonsoft.Json.Linq;
 using System.Collections.Concurrent;
-using System.Runtime.InteropServices;
-using CounterStrikeSharp.API.Modules.Entities.Constants;
 
 namespace WeaponPaints;
 
-[MinimumApiVersion(238)]
+[MinimumApiVersion(168)]
 public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 {
 	internal static WeaponPaints Instance { get; private set; } = new();
-
-	private static readonly Dictionary<string, string> WeaponList = 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"},
@@ -77,36 +75,25 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 		{ "weapon_knife_kukri", "Kukri Knife" }
 	};
 
-	private static WeaponPaintsConfig _config = new();
+	internal static WeaponPaintsConfig _config = new WeaponPaintsConfig();
 	internal static IStringLocalizer? _localizer;
-	private static Dictionary<int, int> g_knifePickupCount = new();
-	internal static ConcurrentDictionary<int, ushort> g_playersKnife = new();
-	internal static ConcurrentDictionary<int, ushort> g_playersGlove = new();
-	internal static ConcurrentDictionary<int, ushort> g_playersMusic = new();
-	internal static ConcurrentDictionary<int, ushort> g_playersPin = new();
-	internal static ConcurrentDictionary<int, (string? CT, string? T)> g_playersAgent = new();
-	internal static ConcurrentDictionary<int, ConcurrentDictionary<ushort, WeaponInfo>> gPlayerWeaponsInfo = new();
-    internal static ConcurrentDictionary<int, int> g_playersDatabaseIndex = new();
-
-    internal static List<JObject> skinsList = [];
-	internal static List<JObject> glovesList = [];
-	internal static List<JObject> agentsList = [];
-	internal static List<JObject> musicList = [];
+	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;
-	private static bool g_bCommandsAllowed = true;
-	private Dictionary<int, string> PlayerWeaponImage = new();
+	public static bool g_bCommandsAllowed = true;
+	internal Dictionary<int, string> PlayerWeaponImage = new();
 
-	private static Dictionary<int, DateTime> commandsCooldown = new();
+	internal static Dictionary<int, DateTime> commandsCooldown = new Dictionary<int, DateTime>();
 	internal static Database? _database;
 
-	private static readonly MemoryFunctionVoid<nint, string, float> CAttributeListSetOrAddAttributeValueByName = new(GameData.GetSignature("CAttributeList_SetOrAddAttributeValueByName"));
+	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"));
 
-	private static readonly MemoryFunctionWithReturn<nint, string, int, int> SetBodygroupFunc = new(
-		GameData.GetSignature("CBaseModelEntity_SetBodygroup"));
-
-	private static readonly Func<nint, string, int, int> SetBodygroup = SetBodygroupFunc.Invoke;
-
-	private static Dictionary<int, string> WeaponDefindex { get; } = new Dictionary<int, string>
+	public static Dictionary<int, string> WeaponDefindex { get; } = new Dictionary<int, string>
 	{
 		{ 1, "weapon_deagle" },
 		{ 2, "weapon_elite" },
@@ -164,15 +151,17 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 		{ 525, "weapon_knife_skeleton" },
 		{ 526, "weapon_knife_kukri" }
 	};
-	private const ulong MinimumCustomItemId = 65578;
-	private ulong _nextItemId = MinimumCustomItemId;
-	public static readonly bool IsWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
-
+    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 override string ModuleAuthor => "Nereziel & daffyy";
-	public override string ModuleDescription => "Skin, gloves, agents 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 => "2.5a";
+	public override string ModuleVersion => "1.9b";
+
+	public static WeaponPaintsConfig GetWeaponPaintsConfig()
+	{
+		return _config;
+	}
 
 	public override void Load(bool hotReload)
 	{
@@ -182,39 +171,41 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 		{
 			OnMapStart(string.Empty);
 
-			foreach (var player in Enumerable
-				         .OfType<CCSPlayerController>(Utilities.GetPlayers().TakeWhile(player => weaponSync != null))
-				         .Where(player => player.IsValid &&
-					         !string.IsNullOrEmpty(player.IpAddress) && player is
-						         { IsBot: false, Connected: PlayerConnectedState.PlayerConnected }))
+			foreach (var player in Utilities.GetPlayers())
 			{
-				g_knifePickupCount[player.Slot] = 0;
-				gPlayerWeaponsInfo.TryRemove(player.Slot, out _);
-				g_playersKnife.TryRemove(player.Slot, out _);
-				g_playersGlove.TryRemove(player.Slot, out _);
-				g_playersAgent.TryRemove(player.Slot, out _);
+				if (weaponSync == null || player is null || !player.IsValid || player.SteamID.ToString().Length != 17 || !player.PawnIsAlive || player.IsBot ||
+					player.IsHLTV || player.Connected != PlayerConnectedState.PlayerConnected)
+					continue;
 
-				PlayerInfo? playerInfo = new PlayerInfo
-				{
-					UserId = player.UserId,
-					Slot = player.Slot,
-					Index = (int)player.Index,
-					SteamId = player?.SteamID,
-					Name = player?.PlayerName,
-					IpAddress = player?.IpAddress?.Split(":")[0]
-				};
+				g_knifePickupCount[(int)player.Slot] = 0;
+				gPlayerWeaponsInfo.TryRemove((int)player.Slot, out _);
+				g_playersKnife.TryRemove((int)player.Slot, out _);
 
-				_ = Task.Run(async () =>
+                PlayerInfo playerInfo = new PlayerInfo(
+					(int)player.Slot,
+					player.Slot,
+					player.UserId,
+					player?.SteamID.ToString(),
+					player?.PlayerName,
+					player?.IpAddress?.Split(":")[0]);
+
+				if (Config.Additional.SkinEnabled)
 				{
-					if (weaponSync != null) await weaponSync.GetPlayerDatabaseIndex(playerInfo);
-				});
+					Task.Run(() => weaponSync.GetWeaponPaintsFromDatabase(playerInfo));
+				}
+				if (Config.Additional.KnifeEnabled)
+				{
+					Task.Run(() => weaponSync.GetKnifeFromDatabase(playerInfo));
+				}
+				if (Config.Additional.GloveEnabled)
+				{
+					Task.Run(() => weaponSync.GetGloveFromDatabase(playerInfo));
+				}
 			}
 		}
 
-		Utility.LoadSkinsFromFile(ModuleDirectory + "/skins.json", Logger);
-		Utility.LoadGlovesFromFile(ModuleDirectory + "/gloves.json", Logger);
-		Utility.LoadAgentsFromFile(ModuleDirectory + "/agents.json", Logger);
-		Utility.LoadMusicFromFile(ModuleDirectory + "/music.json", Logger);
+		Utility.LoadSkinsFromFile(ModuleDirectory + "/skins.json");
+		Utility.LoadGlovesFromFile(ModuleDirectory + "/gloves.json");
 
 		if (Config.Additional.KnifeEnabled)
 			SetupKnifeMenu();
@@ -222,43 +213,38 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 			SetupSkinsMenu();
 		if (Config.Additional.GloveEnabled)
 			SetupGlovesMenu();
-		if (Config.Additional.AgentEnabled)
-			SetupAgentsMenu();
-		if (Config.Additional.MusicEnabled)
-			SetupMusicMenu();
 
 		RegisterListeners();
 		RegisterCommands();
 	}
+    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;
 
+        GiveNamedItem2.Invoke(player.PlayerPawn.Value.ItemServices.Handle, item, 0, 0, 0, 0, 0, 0);
+    }
     public void OnConfigParsed(WeaponPaintsConfig config)
 	{
-		if (config.DatabaseCredentials.DatabaseHost.Length < 1 || config.DatabaseCredentials.DatabaseName.Length < 1 || config.DatabaseCredentials.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 \"configs/plugins/WeaponPaints/WeaponPaints.json\"!");
-			Unload(false);
-			return;
-		}
-
-		if (!File.Exists(Path.GetDirectoryName(Path.GetDirectoryName(ModuleDirectory)) + "/gamedata/weaponpaints.json"))
-		{
-			Logger.LogError("You need to upload \"weaponpaints.json\" to \"gamedata directory\"!");
-			Unload(false);
-			return;
+			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.DatabaseCredentials.DatabaseHost,
-			UserID = config.DatabaseCredentials.DatabaseUser,
-			Password = config.DatabaseCredentials.DatabasePassword,
-			Database = config.DatabaseCredentials.DatabaseName,
-			Port = (uint)config.DatabaseCredentials.DatabasePort,
-			Pooling = true,
-			MaximumPoolSize = 640,
+			Server = config.DatabaseHost,
+			UserID = config.DatabaseUser,
+			Password = config.DatabasePassword,
+			Database = config.DatabaseName,
+			Port = (uint)config.DatabasePort,
+			Pooling = true
 		};
 
-		_database = new Database(builder.ConnectionString);
+		_database = new(builder.ConnectionString);
 
 		_ = Utility.CheckDatabaseTables();
 

WeaponPaints.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@@ -9,17 +9,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.233" />
-    <PackageReference Include="Dapper" Version="2.1.35" />
-    <PackageReference Include="MySqlConnector" Version="2.3.7" />
+    <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" />
   </ItemGroup>
 
   <ItemGroup>
     <None Update="lang\**\*.*" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
-  
-  <ItemGroup>
-    <None Update="gamedata\*.*" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
 </Project>

WeaponSynchronization.cs

@@ -1,11 +1,10 @@
+using Dapper;
 using System.Collections.Concurrent;
-using Dapper;
-using MySqlConnector;
 
-namespace WeaponPaints;
-
-internal class WeaponSynchronization
+namespace WeaponPaints
 {
+	internal class WeaponSynchronization
+	{
 		private readonly WeaponPaintsConfig _config;
 		private readonly Database _database;
 
@@ -15,162 +14,83 @@ internal class WeaponSynchronization
 			_config = config;
 		}
 
-    internal async Task GetPlayerDatabaseIndex(PlayerInfo playerInfo)
+		internal async Task GetKnifeFromDatabase(PlayerInfo player)
 		{
-        if (playerInfo.SteamId == null) return;
-        Console.WriteLine("test");
+			if (!_config.Additional.KnifeEnabled) return;
 			try
 			{
 				await using var connection = await _database.GetConnectionAsync();
-            var query = "SELECT `id` FROM `wp_users` WHERE `steamid` = @steamid";
-            var databaseIndex =
-                await connection.QueryFirstOrDefaultAsync<int?>(query, new { steamid = playerInfo.SteamId });
+				string query = "SELECT `knife` FROM `wp_player_knife` WHERE `steamid` = @steamid";
+				string? playerKnife = await connection.QueryFirstOrDefaultAsync<string>(query, new { steamid = player.SteamId });
 
-            if (databaseIndex != null)
+				if (!string.IsNullOrEmpty(playerKnife))
 				{
-                WeaponPaints.g_playersDatabaseIndex[playerInfo.Slot] = (int)databaseIndex;
-                query = "UPDATE `wp_users` SET `last_online` = @lastUpdate WHERE `id` = @databaseIndex";
-                await connection.ExecuteAsync(query, new
-                {
-                    lastUpdate = DateTime.Now,
-                    databaseIndex
-                });
+					WeaponPaints.g_playersKnife[player.Slot] = playerKnife;
 				}
-            else
-            {
-                Console.WriteLine("test");
-                const string insertQuery = "INSERT INTO `wp_users` (`steamid`) VALUES (@steamid)";
-                await connection.ExecuteAsync(insertQuery, new { steamid = playerInfo.SteamId });
-                Console.WriteLine("SQL Insert Query: " + insertQuery);
-                databaseIndex =
-                    await connection.QueryFirstOrDefaultAsync<int?>(query, new { steamid = playerInfo.SteamId });
-                WeaponPaints.g_playersDatabaseIndex[playerInfo.Slot] = (int)databaseIndex;
 			}
-
-            await GetPlayerData(playerInfo);
-        }
-        catch (Exception ex)
+			catch (Exception e)
 			{
-            Utility.Log($"An error occurred in GetPlayerDatabaseIndex: {ex.Message}");
+				Utility.Log(e.Message);
+				return;
 			}
 		}
 
-    internal async Task GetPlayerData(PlayerInfo? player)
+		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 || player == null || player.SteamId == null) return;
+
 			try
 			{
 				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";
 
-            if (_config.Additional.KnifeEnabled)
-                GetKnifeFromDatabase(player, connection);
-            if (_config.Additional.GloveEnabled)
-                GetGloveFromDatabase(player, connection);
-            if (_config.Additional.AgentEnabled)
-                GetAgentFromDatabase(player, connection);
-            if (_config.Additional.MusicEnabled)
-                GetMusicFromDatabase(player, connection);
-            if (_config.Additional.SkinEnabled)
-                GetWeaponPaintsFromDatabase(player, connection);
-            if (_config.Additional.PinEnabled)
-                GetPinFromDatabase(player, connection);
-        }
-        catch (Exception ex)
-        {
-            // Log the exception or handle it appropriately
-            Console.WriteLine($"An error occurred: {ex.Message}");
-        }
-    }
+                var playerSkins = await connection.QueryAsync<dynamic>(query, new { steamid = player.SteamId });
 
-    private void GetKnifeFromDatabase(PlayerInfo? player, MySqlConnection connection)
-    {
-        try
-        {
-            if (!_config.Additional.KnifeEnabled || string.IsNullOrEmpty(player?.SteamId.ToString()))
-                return;
+				if (playerSkins == null) return;
 
-            const string query = "SELECT `knife` FROM `wp_users_knives` WHERE `user_id` = @userId";
-            var playerKnife = connection.QueryFirstOrDefault<int>(query,
-                new { userId = WeaponPaints.g_playersDatabaseIndex[player.Slot] });
-
-            WeaponPaints.g_playersKnife[player.Slot] = (ushort)playerKnife;
-        }
-        catch (Exception ex)
-        {
-            Utility.Log($"An error occurred in GetKnifeFromDatabase: {ex.Message}");
-        }
-    }
-
-    private void GetGloveFromDatabase(PlayerInfo? player, MySqlConnection connection)
-    {
-        try
-        {
-            if (!_config.Additional.GloveEnabled || string.IsNullOrEmpty(player?.SteamId.ToString()))
-                return;
-
-            const string query = "SELECT `weapon_defindex` FROM `wp_users_gloves` WHERE `user_id` = @userId";
-            var gloveData = connection.QueryFirstOrDefault<ushort?>(query, new { userId = WeaponPaints.g_playersDatabaseIndex[player.Slot] });
-
-            if (gloveData != null) WeaponPaints.g_playersGlove[player.Slot] = gloveData.Value;
-        }
-        catch (Exception ex)
-        {
-            Utility.Log($"An error occurred in GetGloveFromDatabase: {ex.Message}");
-        }
-    }
-
-    private void GetAgentFromDatabase(PlayerInfo? player, MySqlConnection connection)
-    {
-        try
-        {
-            if (!_config.Additional.AgentEnabled || string.IsNullOrEmpty(player?.SteamId.ToString()))
-                return;
-
-            const string query = "SELECT `agent_ct`, `agent_t` FROM `wp_users_agents` WHERE `user_id` = @userId";
-            var agentData = connection.QueryFirstOrDefault<(string, string)>(query, new { userId = WeaponPaints.g_playersDatabaseIndex[player.Slot] });
-
-            if (agentData == default) return;
-            var agentCT = agentData.Item1;
-            var agentT = agentData.Item2;
-
-            if (!string.IsNullOrEmpty(agentCT) || !string.IsNullOrEmpty(agentT))
-                WeaponPaints.g_playersAgent[player.Slot] = (
-                    agentCT,
-                    agentT
-                );
-        }
-        catch (Exception ex)
-        {
-            Utility.Log($"An error occurred in GetAgentFromDatabase: {ex.Message}");
-        }
-    }
-
-    private void GetWeaponPaintsFromDatabase(PlayerInfo? player, MySqlConnection connection)
-    {
-        try
-        {
-            if (!_config.Additional.SkinEnabled || player == null || string.IsNullOrEmpty(player.SteamId.ToString()))
-                return;
-
-            var weaponInfos = new ConcurrentDictionary<ushort, WeaponInfo>();
-
-
-            const string query = "SELECT `weapon`, `paint`, `wear`, `seed`, `nametag` FROM `wp_users_skins` WHERE `user_id` = @userId";
-            var playerSkins = connection.Query<dynamic>(query, new { userId = WeaponPaints.g_playersDatabaseIndex[player.Slot] });
+				var weaponInfos = new ConcurrentDictionary<int, WeaponInfo>();
 
 				foreach (var row in playerSkins)
 				{
-                ushort weaponDefIndex = (ushort)(row.weapon ?? 0);
-                ushort weaponPaintId = (ushort)(row.paint ?? 0);
-                float weaponWear = row.wear ?? 0f;
-                ushort weaponSeed = (ushort)(row.seed ?? 0);
-                string weaponNameTag = row.nametag ?? string.Empty;
+					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;
 
-                var weaponInfo = new WeaponInfo
+					WeaponInfo weaponInfo = new WeaponInfo
 					{
 						Paint = weaponPaintId,
 						Seed = weaponSeed,
-                    Wear = weaponWear,
-                    NameTag = weaponNameTag
+						Wear = weaponWear
 					};
 
 					weaponInfos[weaponDefIndex] = weaponInfo;
@@ -178,110 +98,21 @@ internal class WeaponSynchronization
 
 				WeaponPaints.gPlayerWeaponsInfo[player.Slot] = weaponInfos;
 			}
-        catch (Exception ex)
+			catch (Exception e)
 			{
-            Utility.Log($"An error occurred in GetWeaponPaintsFromDatabase: {ex.Message}");
+				Utility.Log($"Database error occurred: {e.Message}");
 			}
 		}
 
-    private void GetMusicFromDatabase(PlayerInfo? player, MySqlConnection connection)
+		internal async Task SyncKnifeToDatabase(PlayerInfo player, string knife)
 		{
-        try
-        {
-            if (!_config.Additional.MusicEnabled || string.IsNullOrEmpty(player?.SteamId.ToString()))
-                return;
-
-            const string query = "SELECT `music` FROM `wp_users_musics` WHERE `user_id` = @userId";
-            var musicData = connection.QueryFirstOrDefault<ushort?>(query, new { userId = WeaponPaints.g_playersDatabaseIndex[player.Slot] });
-
-            if (musicData != null) WeaponPaints.g_playersMusic[player.Slot] = musicData.Value;
-        }
-        catch (Exception ex)
-        {
-            Utility.Log($"An error occurred in GetMusicFromDatabase: {ex.Message}");
-        }
-    }
-
-    private void GetPinFromDatabase(PlayerInfo? player, MySqlConnection connection)
-    {
-        try
-        {
-            if (!_config.Additional.PinEnabled || string.IsNullOrEmpty(player?.SteamId.ToString()))
-                return;
-
-            const string query = "SELECT `pin` FROM `wp_users_pins` WHERE `user_id` = @userId";
-            var pinData = connection.QueryFirstOrDefault<ushort?>(query, new { userId = WeaponPaints.g_playersDatabaseIndex[player.Slot] });
-
-            if (pinData != null) WeaponPaints.g_playersPin[player.Slot] = pinData.Value;
-        }
-        catch (Exception ex)
-        {
-            Utility.Log($"An error occurred in GetPinFromDatabase: {ex.Message}");
-        }
-    }
-
-    internal async Task PurgeExpiredUsers()
-    {
-        try
-        {
-            await using var connection = await _database.GetConnectionAsync();
-            await using var transaction = await connection.BeginTransactionAsync();
-            
-            var userIds = await connection.QueryAsync<int>(
-                $"SELECT id FROM wp_users WHERE last_online < NOW() - INTERVAL {_config.Additional.ExpireOlderThan} DAY",
-                transaction: transaction
-            );
-
-            var ids = string.Join(",", userIds);
-
-            string query;
-
-            if (userIds.AsList().Count > 0)
-            {
-                // Step 2: Delete related records in other tables using the retrieved IDs
-                query = $"DELETE FROM wp_users_agents WHERE user_id IN ({ids})";
-                await connection.ExecuteAsync(query, transaction: transaction);
-
-                query = $"DELETE FROM wp_users_gloves WHERE user_id IN ({ids})";
-                await connection.ExecuteAsync(query, transaction: transaction);
-
-                query = $"DELETE FROM wp_users_skins WHERE user_id IN ({ids})";
-                await connection.ExecuteAsync(query, transaction: transaction);
-                
-                query = $"DELETE FROM wp_users_knives WHERE user_id IN ({ids})";
-                await connection.ExecuteAsync(query, transaction: transaction);
-                
-                query = $"DELETE FROM wp_users_musics WHERE user_id IN ({ids})";
-                await connection.ExecuteAsync(query, transaction: transaction);
-
-                query = $"DELETE FROM wp_users_pins WHERE user_id IN ({ids})";
-                await connection.ExecuteAsync(query, transaction: transaction);
-
-                // Step 3: Delete users from wp_users
-                query = $"DELETE FROM wp_users WHERE id IN ({ids})";
-                await connection.ExecuteAsync(query, transaction: transaction);
-
-                // Commit transaction
-                await transaction.CommitAsync();
-            }
-        }
-        catch (Exception ex)
-        {
-            Utility.Log($"An error occurred in GetMusicFromDatabase: {ex.Message}");
-        }
-    }
-
-    internal async Task SyncKnifeToDatabase(PlayerInfo player, ushort knife)
-    {
-        if (!_config.Additional.KnifeEnabled || string.IsNullOrEmpty(player.SteamId.ToString())) return;
-
-        const string query =
-            "INSERT INTO `wp_users_knives` (`user_id`, `knife`) VALUES(@userId, @newKnife) ON DUPLICATE KEY UPDATE `knife` = @newKnife";
+			if (!_config.Additional.KnifeEnabled || player == null || string.IsNullOrEmpty(player.SteamId) || string.IsNullOrEmpty(knife)) return;
 
 			try
 			{
 				await using var connection = await _database.GetConnectionAsync();
-            await connection.ExecuteAsync(query, new { userId = WeaponPaints.g_playersDatabaseIndex[player.Slot], newKnife = knife });
+				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 });
 			}
 			catch (Exception e)
 			{
@@ -289,16 +120,16 @@ internal class WeaponSynchronization
 			}
 		}
 
+
 		internal async Task SyncGloveToDatabase(PlayerInfo player, int defindex)
 		{
-        if (!_config.Additional.GloveEnabled || string.IsNullOrEmpty(player.SteamId.ToString())) return;
+			if (!_config.Additional.GloveEnabled || player == null || string.IsNullOrEmpty(player.SteamId)) return;
 
 			try
 			{
 				await using var connection = await _database.GetConnectionAsync();
-            const string query =
-                "INSERT INTO `wp_users_gloves` (`user_id`, `weapon_defindex`) VALUES(@userId, @weapon_defindex) ON DUPLICATE KEY UPDATE `weapon_defindex` = @weapon_defindex";
-            await connection.ExecuteAsync(query, new { userId = WeaponPaints.g_playersDatabaseIndex[player.Slot], weapon_defindex = defindex });
+				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)
 			{
@@ -306,75 +137,38 @@ internal class WeaponSynchronization
 			}
 		}
 
-    internal async Task SyncAgentToDatabase(PlayerInfo player)
-    {
-        if (!_config.Additional.AgentEnabled || string.IsNullOrEmpty(player.SteamId.ToString())) return;
-
-        const string query = """
-                             					INSERT INTO `wp_users_agents` (`user_id`, `agent_ct`, `agent_t`)
-                             					VALUES(@userId, @agent_ct, @agent_t)
-                             					ON DUPLICATE KEY UPDATE
-                             						`agent_ct` = @agent_ct,
-                             						`agent_t` = @agent_t
-                             """;
-        try
-        {
-            await using var connection = await _database.GetConnectionAsync();
-
-            await connection.ExecuteAsync(query,
-                new
-                {
-                    userId = WeaponPaints.g_playersDatabaseIndex[player.Slot], agent_ct = WeaponPaints.g_playersAgent[player.Slot].CT,
-                    agent_t = WeaponPaints.g_playersAgent[player.Slot].T
-                });
-        }
-        catch (Exception e)
-        {
-            Utility.Log($"Error syncing agents to database: {e.Message}");
-        }
-    }
-
 		internal async Task SyncWeaponPaintsToDatabase(PlayerInfo player)
 		{
-        if (string.IsNullOrEmpty(player.SteamId.ToString()) ||
-            !WeaponPaints.gPlayerWeaponsInfo.TryGetValue(player.Slot, out var weaponsInfo))
+			if (player == null || string.IsNullOrEmpty(player.SteamId) || !WeaponPaints.gPlayerWeaponsInfo.TryGetValue(player.Slot, out var weaponsInfo))
 				return;
 
 			try
 			{
 				await using var connection = await _database.GetConnectionAsync();
 
-            foreach (var (weaponDefIndex, weaponInfo) in weaponsInfo)
+                foreach (var weaponInfoPair in weaponsInfo)
                 {
-                var paintId = weaponInfo.Paint;
-                var wear = weaponInfo.Wear;
-                var seed = weaponInfo.Seed;
+                    int weaponDefIndex = weaponInfoPair.Key;
+                    WeaponInfo weaponInfo = weaponInfoPair.Value;
 
-                const string queryCheckExistence =
-                    "SELECT COUNT(*) FROM `wp_users_skins` WHERE `user_id` = @userId AND `weapon` = @weaponDefIndex";
+                    int paintId = weaponInfo.Paint;
+                    float wear = weaponInfo.Wear;
+                    int seed = weaponInfo.Seed;
 
-                var existingRecordCount = await connection.ExecuteScalarAsync<int>(queryCheckExistence,
-                    new { userId = WeaponPaints.g_playersDatabaseIndex[player.Slot], weaponDefIndex });
+                    string query = "INSERT INTO `wp_player_skins` (`steamid`, `weapon_defindex`, `weapon_paint_id`, `weapon_wear`, `weapon_seed`) " +
+                                   "VALUES (@steamid, @weaponDefIndex, @paintId, @wear, @seed) " +
+                                   "ON DUPLICATE KEY UPDATE `weapon_paint_id` = @paintId, `weapon_wear` = @wear, `weapon_seed` = @seed";
 
-                string query;
-                object parameters;
-
-                if (existingRecordCount > 0)
-                {
-                    query =
-                        "UPDATE `wp_users_skins` SET `paint` = @paintId, `wear` = @wear, `seed` = @seed WHERE `user_id` = @userId AND `weapon` = @weaponDefIndex";
-                    parameters = new { userId = WeaponPaints.g_playersDatabaseIndex[player.Slot], weaponDefIndex, paintId, wear, seed };
-                }
-                else
-                {
-                    query =
-                        "INSERT INTO `wp_users_skins` (`user_id`, `weapon`, `paint`, `wear`, `seed`) " +
-                        "VALUES (@userId, @weaponDefIndex, @paintId, @wear, @seed)";
-                    parameters = new { userId = WeaponPaints.g_playersDatabaseIndex[player.Slot], weaponDefIndex, paintId, wear, seed };
-                }
+                    var parameters = new DynamicParameters();
+                    parameters.Add("@steamid", player.SteamId);
+                    parameters.Add("@weaponDefIndex", weaponDefIndex);
+                    parameters.Add("@paintId", paintId);
+                    parameters.Add("@wear", wear);
+                    parameters.Add("@seed", seed);
 
                     await connection.ExecuteAsync(query, parameters);
                 }
+
             }
             catch (Exception e)
 			{
@@ -382,20 +176,5 @@ internal class WeaponSynchronization
 			}
 		}
 
-    internal async Task SyncMusicToDatabase(PlayerInfo player, ushort music)
-    {
-        if (!_config.Additional.MusicEnabled || string.IsNullOrEmpty(player.SteamId.ToString())) return;
-
-        try
-        {
-            await using var connection = await _database.GetConnectionAsync();
-            const string query =
-                "INSERT INTO `wp_users_musics` (`user_id`, `music`) VALUES(@userId, @newMusic) ON DUPLICATE KEY UPDATE `music` = @newMusic";
-            await connection.ExecuteAsync(query, new { userId = WeaponPaints.g_playersDatabaseIndex[player.Slot], newMusic = music });
-        }
-        catch (Exception e)
-        {
-            Utility.Log($"Error syncing music kit to database: {e.Message}");
-        }
 	}
 }

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"
+		}
+	}
+}

gamedata/weaponpaints.json

@@ -1,23 +0,0 @@
-{
-	"ChangeSubclass": {
-		"signatures": {
-			"library": "server",
-			"windows": "40 57 48 83 EC 20 48 8B F9 41 B0 01",
-			"linux": "55 48 89 E5 41 57 41 56 49 89 FE 41 55 41 54 45 31 E4 53 48 81 EC 98 00 00 00"
-		}
-	},
-	"CAttributeList_SetOrAddAttributeValueByName": {
-		"signatures": {
-			"library": "server",
-			"windows": "40 53 41 56 41 57 48 81 EC 90 00 00 00 0F 29 74 24 70",
-			"linux": "55 48 89 E5 41 57 41 56 49 89 FE 41 55 41 54 49 89 F4 53 48 83 EC 78"
-		}
-	},
-	"CBaseModelEntity_SetBodygroup": {
-		"signatures": {
-			"library": "server",
-			"windows": "48 89 5C 24 08 48 89 74 24 10 57 48 83 EC 20 41 8B F8 48 8B F2 48 8B D9 E8 ? ? ? ?",
-			"linux": "55 48 89 E5 41 56 49 89 F6 41 55 41 89 D5 41 54 49 89 FC 48 83 EC 08"
-		}
-	}
-}

lang/en.json

@@ -4,8 +4,6 @@
 	"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_info_agent": "Type {lime}!agents{default} to open agents menu",
-	"wp_info_music": "Type {lime}!music{default} to open music 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",
@@ -13,13 +11,7 @@
 	"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_agent_menu_select": "You have chosen {lime}{0}{default} as your agent",
-	"wp_agent_menu_title": "Agents Menu",
-	"wp_music_menu_title": "Music Menu",
-	"wp_music_menu_select": "You have chosen {lime}{0}{default} as your music kit",
 	"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",
-
-	"None": "None"
+	"wp_skin_menu_select": "You have chosen {lime}{0}{default} as your skin"
 }

lang/lv.json

@@ -1,25 +1,17 @@
 {
 	"wp_prefix": "{lightblue}[WeaponPaints] {default}",
-	"wp_info_website": "Apmeklē {lime}{0}{default}, kur varat mainīt ādas",
+	"wp_info_website": "Apmeklējiet {lime}{0}{default}, kur varat mainīt ādas",
 	"wp_info_refresh": "Ievadiet {lime}!wp{default}, lai sinhronizētu izvēlētās ādas",
 	"wp_info_knife": "Ievadiet {lime}!knife{default}, lai atvērtu nazis izvēlni",
 	"wp_info_glove": "Ievadiet {lime}!gloves{default}, lai atvērtu cimdi izvēlni",
-	"wp_info_agent": "Ievadiet {lime}!agents{default}, lai atvērtu aģentu izvēlni",
-	"wp_info_music": "Ievadiet {lime}!music{default}, lai atvērtu mūzikas izvēlni",
-	"wp_command_cooldown": "{lightred}Šobrīd nevarat atsvaidzināt ieroča krāsas",
-	"wp_command_refresh_done": "{lime}Atsvaidzinot ieroča krāsas",
+	"wp_command_cooldown": "{lightred}Šobrīd jūs nevarat atjaunot ieroču ādas",
+	"wp_command_refresh_done": "{lime}Atjauno ieroču ādas",
 	"wp_knife_menu_select": "Jūs esat izvēlējies {lime}{0}{default} kā savu nazi",
 	"wp_knife_menu_kill": "",
-	"wp_knife_menu_title": "Nazi Izvēlne",
-	"wp_glove_menu_select": "Jūs esat izvēlējies {lime}{0}{default} kā savu cimdu",
+	"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_agent_menu_select": "Jūs esat izvēlējies {lime}{0}{default} kā savu aģentu",
-	"wp_agent_menu_title": "Aģentu Izvēlne",
-	"wp_music_menu_title": "Mūzikas Izvēlne",
-	"wp_music_menu_select": "Jūs esat izvēlējies {lime}{0}{default} kā savu mūzikas komplektu",
 	"wp_skin_menu_weapon_title": "Ieroču Izvēlne",
-	"wp_skin_menu_skin_title": "Izvēlieties ādu priekš {lime}{0}{default}",
-	"wp_skin_menu_select": "Jūs esat izvēlējies {lime}{0}{default} kā savu ādu",
-
-	"None": "Nav"
+	"wp_skin_menu_skin_title": "Izvēlieties ādu {lime}{0}{default}",
+	"wp_skin_menu_select": "Jūs esat izvēlējies {lime}{0}{default} kā savu ādu"
 }

lang/pl.json

@@ -3,23 +3,15 @@
 	"wp_info_website": "Odwiedź {lime}{0}{default}, gdzie możesz zmieniać skórki",
 	"wp_info_refresh": "Wpisz {lime}!wp{default}, aby zsynchronizować wybrane skórki",
 	"wp_info_knife": "Wpisz {lime}!knife{default}, aby otworzyć menu noży",
-	"wp_info_glove": "Wpisz {lime}!gloves{default}, aby otworzyć menu rękawic",
-	"wp_info_agent": "Wpisz {lime}!agents{default}, aby otworzyć menu agentów",
-	"wp_info_music": "Wpisz {lime}!music{default}, aby otworzyć menu muzyczne",
-	"wp_command_cooldown": "{lightred}Nie możesz teraz odświeżyć kolorów broni",
-	"wp_command_refresh_done": "{lime}Odświeżanie kolorów broni",
+	"wp_info_glove": "Wpisz {lime}!gloves{default}, aby otworzyć menu rękawiczek",
+	"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": "",
+	"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_glove_menu_select": "Wybrałeś {lime}{0}{default} jako swoją rękawiczkę",
+	"wp_glove_menu_select": "Wybrałeś {lime}{0}{default} jako swoje rękawiczki",
 	"wp_glove_menu_title": "Menu Rękawiczek",
-	"wp_agent_menu_select": "Wybrałeś {lime}{0}{default} jako swojego agenta",
-	"wp_agent_menu_title": "Menu Agentów",
-	"wp_music_menu_title": "Menu Muzyczne",
-	"wp_music_menu_select": "Wybrałeś {lime}{0}{default} jako swój zestaw muzyczny",
 	"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ę",
-
-	"None": "Brak"
+	"wp_skin_menu_select": "Wybrałeś {lime}{0}{default} jako swoją skórkę"
 }

lang/pt-BR.json

@@ -1,25 +1,17 @@
 {
 	"wp_prefix": "{lightblue}[WeaponPaints] {default}",
-	"wp_info_website": "Visite {lime}{0}{default}, onde você pode alterar as skins",
-	"wp_info_refresh": "Digite {lime}!wp{default} para sincronizar as skins escolhidas",
+	"wp_info_website": "Visite {lime}{0}{default}, onde você pode alterar 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_info_glove": "Digite {lime}!gloves{default} para abrir o menu de luvas",
-	"wp_info_agent": "Digite {lime}!agents{default} para abrir o menu de agentes",
-	"wp_info_music": "Digite {lime}!music{default} para abrir o menu de música",
-	"wp_command_cooldown": "{lightred}Você não pode atualizar as skins de armas agora",
-	"wp_command_refresh_done": "{lime}Atualizando as skins de armas",
+	"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": "",
 	"wp_knife_menu_title": "Menu de Facas",
-	"wp_glove_menu_select": "Você escolheu {lime}{0}{default} como sua luva",
+	"wp_glove_menu_select": "Você escolheu {lime}{0}{default} como suas luvas",
 	"wp_glove_menu_title": "Menu de Luvas",
-	"wp_agent_menu_select": "Você escolheu {lime}{0}{default} como seu agente",
-	"wp_agent_menu_title": "Menu de Agentes",
-	"wp_music_menu_title": "Menu de Música",
-	"wp_music_menu_select": "Você escolheu {lime}{0}{default} como seu kit de música",
 	"wp_skin_menu_weapon_title": "Menu de Armas",
-	"wp_skin_menu_skin_title": "Selecione a skin para {lime}{0}{default}",
-	"wp_skin_menu_select": "Você escolheu {lime}{0}{default} como sua skin",
-
-	"None": "Nenhum"
+	"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,25 +1,17 @@
 {
 	"wp_prefix": "{lightblue}[WeaponPaints] {default}",
-	"wp_info_website": "Visite {lime}{0}{default}, onde pode alterar as skins",
-	"wp_info_refresh": "Digite {lime}!wp{default} para sincronizar as skins escolhidas",
+	"wp_info_website": "Visite {lime}{0}{default}, onde pode alterar 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_info_glove": "Digite {lime}!gloves{default} para abrir o menu de luvas",
-	"wp_info_agent": "Digite {lime}!agents{default} para abrir o menu de agentes",
-	"wp_info_music": "Digite {lime}!music{default} para abrir o menu de música",
-	"wp_command_cooldown": "{lightred}Não pode atualizar as skins de armas de momento",
-	"wp_command_refresh_done": "{lime}Atualizando as skins de armas",
-	"wp_knife_menu_select": "Escolheu {lime}{0}{default} como a sua faca",
+	"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": "",
 	"wp_knife_menu_title": "Menu de Facas",
-	"wp_glove_menu_select": "Escolheu {lime}{0}{default} como a sua luva",
+	"wp_glove_menu_select": "Você escolheu {lime}{0}{default} como suas luvas",
 	"wp_glove_menu_title": "Menu de Luvas",
-	"wp_agent_menu_select": "Escolheu {lime}{0}{default} como o seu agente",
-	"wp_agent_menu_title": "Menu de Agentes",
-	"wp_music_menu_title": "Menu de Música",
-	"wp_music_menu_select": "Escolheu {lime}{0}{default} como o seu kit de música",
 	"wp_skin_menu_weapon_title": "Menu de Armas",
-	"wp_skin_menu_skin_title": "Selecione a skin para {lime}{0}{default}",
-	"wp_skin_menu_select": "Escolheu {lime}{0}{default} como a sua skin",
-
-	"None": "Nenhum"
+	"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/ru.json

@@ -4,22 +4,14 @@
 	"wp_info_refresh": "Введите {lime}!wp{default}, чтобы синхронизировать выбранные скины",
 	"wp_info_knife": "Введите {lime}!knife{default}, чтобы открыть меню ножей",
 	"wp_info_glove": "Введите {lime}!gloves{default}, чтобы открыть меню перчаток",
-	"wp_info_agent": "Введите {lime}!agents{default}, чтобы открыть меню агентов",
-	"wp_info_music": "Введите {lime}!music{default}, чтобы открыть меню музыки",
-	"wp_command_cooldown": "{lightred}Вы не можете обновить раскраску оружия сейчас",
-	"wp_command_refresh_done": "{lime}Обновление раскраски оружия",
+	"wp_command_cooldown": "{lightred}Вы не можете обновить скины оружия сейчас",
+	"wp_command_refresh_done": "{lime}Обновление скинов оружия",
 	"wp_knife_menu_select": "Вы выбрали {lime}{0}{default} в качестве вашего ножа",
 	"wp_knife_menu_kill": "",
 	"wp_knife_menu_title": "Меню Ножей",
 	"wp_glove_menu_select": "Вы выбрали {lime}{0}{default} в качестве ваших перчаток",
 	"wp_glove_menu_title": "Меню Перчаток",
-	"wp_agent_menu_select": "Вы выбрали {lime}{0}{default} в качестве вашего агента",
-	"wp_agent_menu_title": "Меню Агентов",
-	"wp_music_menu_title": "Меню Музыки",
-	"wp_music_menu_select": "Вы выбрали {lime}{0}{default} в качестве вашего музыкального набора",
 	"wp_skin_menu_weapon_title": "Меню Оружия",
 	"wp_skin_menu_skin_title": "Выберите скин для {lime}{0}{default}",
-	"wp_skin_menu_select": "Вы выбрали {lime}{0}{default} в качестве вашего скина",
-
-	"None": "Нет"
+	"wp_skin_menu_select": "Вы выбрали {lime}{0}{default} в качестве вашего скина"
 }

lang/tr.json

@@ -1,25 +1,17 @@
 {
 	"wp_prefix": "{lightblue}[WeaponPaints] {default}",
-	"wp_info_website": "Ziyaret edin {lime}{0}{default}, nerede derileri değiştirebilirsiniz",
-	"wp_info_refresh": "Senkronize etmek için {lime}!wp{default} yazın seçilen deriler",
+	"wp_info_website": "Ziyaret edin {lime}{0}{default}, burada skinleri değiştirebilirsiniz",
+	"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_info_glove": "Handskar menüsünü açmak için {lime}!gloves{default} yazın",
-	"wp_info_agent": "Ajan menüsünü açmak için {lime}!agents{default} yazın",
-	"wp_info_music": "Müzik menüsünü açmak için {lime}!music{default} yazın",
-	"wp_command_cooldown": "{lightred}Şu anda silah boyalarını yenileyemezsiniz",
-	"wp_command_refresh_done": "{lime}Silah boyaları yenileniyor",
+	"wp_info_glove": "Eldiven menüsünü açmak için {lime}!gloves{default} yazın",
+	"wp_command_cooldown": "{lightred}Şu anda silah skinlerini yenileyemezsiniz",
+	"wp_command_refresh_done": "{lime}Silah skinleri yenileniyor",
 	"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_agent_menu_select": "{lime}{0}{default} olarak ajanınızı seçtiniz",
-	"wp_agent_menu_title": "Ajanlar Menüsü",
-	"wp_music_menu_title": "Müzik Menüsü",
-	"wp_music_menu_select": "{lime}{0}{default} olarak müzik setinizi seçtiniz",
 	"wp_skin_menu_weapon_title": "Silah Menüsü",
-	"wp_skin_menu_skin_title": "{lime}{0}{default} için cilt seçin",
-	"wp_skin_menu_select": "{lime}{0}{default} olarak cildinizi seçtiniz",
-
-	"None": "Hiçbiri"
+	"wp_skin_menu_skin_title": "{lime}{0}{default} için bir skin seçin",
+	"wp_skin_menu_select": "{lime}{0}{default} olarak bir skin seçtiniz"
 }

lang/ua.json

@@ -4,22 +4,14 @@
 	"wp_info_refresh": "Введіть {lime}!wp{default}, щоб синхронізувати обрані шкури",
 	"wp_info_knife": "Введіть {lime}!knife{default}, щоб відкрити меню ножів",
 	"wp_info_glove": "Введіть {lime}!gloves{default}, щоб відкрити меню рукавичок",
-	"wp_info_agent": "Введіть {lime}!agents{default}, щоб відкрити меню агентів",
-	"wp_info_music": "Введіть {lime}!music{default}, щоб відкрити меню музики",
-	"wp_command_cooldown": "{lightred}Ви не можете оновити фарби зброї зараз",
-	"wp_command_refresh_done": "{lime}Оновлення фарби зброї",
-	"wp_knife_menu_select": "Ви обрали {lime}{0}{default} як свій ніж",
+	"wp_command_cooldown": "{lightred}Наразі ви не можете оновлювати шкіри зброї",
+	"wp_command_refresh_done": "{lime}Оновлення шкірок зброї",
+	"wp_knife_menu_select": "Ви вибрали {lime}{0}{default} як ваш ніж",
 	"wp_knife_menu_kill": "",
 	"wp_knife_menu_title": "Меню Ножів",
-	"wp_glove_menu_select": "Ви обрали {lime}{0}{default} як свої рукавички",
+	"wp_glove_menu_select": "Ви вибрали {lime}{0}{default} як ваші рукавички",
 	"wp_glove_menu_title": "Меню Рукавичок",
-	"wp_agent_menu_select": "Ви обрали {lime}{0}{default} як свого агента",
-	"wp_agent_menu_title": "Меню Агентів",
-	"wp_music_menu_title": "Меню Музики",
-	"wp_music_menu_select": "Ви обрали {lime}{0}{default} як свій набір музики",
 	"wp_skin_menu_weapon_title": "Меню Зброї",
 	"wp_skin_menu_skin_title": "Виберіть шкіру для {lime}{0}{default}",
-	"wp_skin_menu_select": "Ви обрали {lime}{0}{default} як свою шкіру",
-
-	"None": "Немає"
+	"wp_skin_menu_select": "Ви вибрали {lime}{0}{default} як вашу шкіру"
 }

lang/zh-cn.json

@@ -1,25 +1,17 @@
 {
 	"wp_prefix": "{lightblue}[WeaponPaints] {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_glove": "输入 {lime}!gloves{default} 打开手套菜单",
-	"wp_info_agent": "输入 {lime}!agents{default} 打开代理菜单",
-	"wp_info_music": "输入 {lime}!music{default} 打开音乐菜单",
-	"wp_command_cooldown": "{lightred}您现在无法刷新武器涂装",
-	"wp_command_refresh_done": "{lime}正在刷新武器涂装",
-	"wp_knife_menu_select": "您选择了 {lime}{0}{default} 作为您的刀具",
+	"wp_command_cooldown": "{lightred}您现在无法刷新武器皮肤",
+	"wp_command_refresh_done": "{lime}刷新武器皮肤",
+	"wp_knife_menu_select": "您已选择 {lime}{0}{default} 作为您的刀具",
 	"wp_knife_menu_kill": "",
 	"wp_knife_menu_title": "刀具菜单",
-	"wp_glove_menu_select": "您选择了 {lime}{0}{default} 作为您的手套",
+	"wp_glove_menu_select": "您已选择 {lime}{0}{default} 作为您的手套",
 	"wp_glove_menu_title": "手套菜单",
-	"wp_agent_menu_select": "您选择了 {lime}{0}{default} 作为您的代理",
-	"wp_agent_menu_title": "代理菜单",
-	"wp_music_menu_title": "音乐菜单",
-	"wp_music_menu_select": "您选择了 {lime}{0}{default} 作为您的音乐包",
 	"wp_skin_menu_weapon_title": "武器菜单",
-	"wp_skin_menu_skin_title": "选择 {lime}{0}{default} 的皮肤",
-	"wp_skin_menu_select": "您选择了 {lime}{0}{default} 作为您的皮肤",
-
-	"None": "无"
+	"wp_skin_menu_skin_title": "为 {lime}{0}{default} 选择皮肤",
+	"wp_skin_menu_select": "您已选择 {lime}{0}{default} 作为您的皮肤"
 }

website/class/database.php

@@ -1,66 +1,29 @@
 <?php
-/**
- * Class DataBase
- * 
- * This class handles database operations using PDO.
- */
 class DataBase {
-    /**
-     * @var PDO The PDO instance for database connection.
-     */
+	
     private $PDO;
 
-    /**
-     * Constructor method to initialize the database connection.
-     */
     public function __construct() {
         try {
-            // Establish a connection to the database using PDO
-            $this->PDO = new PDO(
-                "mysql:host=".DB_HOST.";port=".DB_PORT.";dbname=".DB_NAME, 
-                DB_USER, 
-                DB_PASS
-            );
-            // Set the connection to use utf8 encoding
-            $this->PDO->exec("SET NAMES utf8");
+            $this->PDO = new PDO("mysql:host=".DB_HOST."; port=".DB_PORT."; dbname=".DB_NAME, DB_USER, DB_PASS, array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES utf8"));
         }
-        catch(PDOException $ex) {
-            // Display error message if connection fails
+        catch(PDOException $ex)
+        {
             echo "<div style='display: flex; flex-direction: column;align-items: center;justify-content: center;text-align: center;'><h2>Problem with database!</h2>";
             die("<pre style='padding: 10px;text-wrap: balance; border: 2px solid #ed6bd3;background: #252525; color: #ed6bd3; width: 50%;'>" . $ex . "</pre>");
         }
     }
-
-    /**
-     * Perform a SELECT query on the database.
-     *
-     * @param string $query The SQL query to execute.
-     * @param array $bindings An associative array of parameters and their values.
-     * @return array|false Returns an array of rows as associative arrays or false if no results are found.
-     */
-    public function select($query, $bindings = array()) {
-        // Prepare and execute the SQL query
+    public function select($query, $bindings = []) {
         $STH = $this->PDO->prepare($query);
         $STH->execute($bindings);
-
-        // Fetch the results as associative arrays
         $result = $STH->fetchAll(PDO::FETCH_ASSOC);
-        if ($result === false) {
-            $result = array(); // Set $result to an empty array if no results found
-        }
+		$result ??= false;
 		return $result;
     }
 
-    /**
-     * Perform a non-query SQL statement on the database.
-     *
-     * @param string $query The SQL query to execute.
-     * @param array $bindings An associative array of parameters and their values.
-     * @return bool Returns true on success or false on failure.
-     */
-    public function query($query, $bindings = array()) {
-        // Prepare and execute the SQL query
+    public function query($query, $bindings = []){
         $STH = $this->PDO->prepare($query);
         return $STH->execute($bindings);
     }
+
 }

website/class/header.php

@@ -1,78 +0,0 @@
-<?php
-ini_set('display_errors', 1);
-ini_set('display_startup_errors', 1);
-error_reporting(E_ALL);
-
-// Set security headers to enhance security
-// header("X-Frame-Options: SAMEORIGIN");
-// header("X-XSS-Protection: 1; mode=block");
-// header("X-Content-Type-Options: nosniff");
-// header("Referrer-Policy: no-referrer-when-downgrade");
-// header("Content-Security-Policy: default-src 'self'; script-src 'self' 'unsafe-inline' https://cdn.jsdelivr.net https://code.jquery.com; style-src 'self' 'unsafe-inline' https://cdn.jsdelivr.net; img-src 'self' data: https://cdn.jsdelivr.net https://steamcommunity-a.akamaihd.net https://raw.githubusercontent.com;");
-
-
-// Include necessary classes and files
-require 'class/config.php';
-require 'class/database.php';
-require 'steamauth/steamauth.php';
-require 'class/utils.php';
-
-// Create a database instance
-$db = new DataBase();
-
-// Check if the user is logged in
-if (isset($_SESSION['steamid'])) {
-    // Insert or update user's Steam ID in the database
-    $steamid = $_SESSION['steamid'];
-    $db->query("INSERT INTO `wp_users` (`steamid`) VALUES ('{$steamid}') ON DUPLICATE KEY UPDATE `updated_at` = CURRENT_TIMESTAMP");
-
-    // Get user's database index
-    $userInfoQuery = $db->select("SELECT `id` FROM `wp_users` WHERE `steamid` = :steamid", ["steamid" => $steamid]);
-    $_SESSION['userDbIndex'] = $userDbIndex = (int)$userInfoQuery[0]['id'];
-
-    // Get weapons and skins information
-    $weapons = UtilsClass::getWeaponsFromArray();
-    $skins = UtilsClass::skinsFromJson();
-    $gloves = UtilsClass::glovesFromJson();
-
-    // Retrieve user's selected skins and knife
-    $querySelected = $db->select("SELECT `weapon`, `paint`, `wear`, `seed`, `nametag` FROM `wp_users_skins` WHERE `user_id` = :user_id", ["user_id" => $userDbIndex]);
-    $selectedSkins = UtilsClass::getSelectedSkins($querySelected);
-    $selectedKnifeResult = $db->select("SELECT `knife` FROM `wp_users_knives` WHERE `user_id` = :user_id", ["user_id" => $userDbIndex]);
-    $selectedGlovesResult = $db->select("SELECT `weapon_defindex` FROM `wp_users_gloves` WHERE `user_id` = :user_id", ["user_id" => $userDbIndex]);
-    $selectedGloves = !empty($selectedGlovesResult) ? $selectedGlovesResult[0] : $gloves[0][0];
-
-    // Determine user's selected knife or set default knife
-    if (!empty($selectedKnifeResult)) {
-        $selectedKnife = $selectedKnifeResult[0]['knife'];
-    } else {
-        $selectedKnife = "weapon_knife";
-    }
-    $knifes = UtilsClass::getKnifeTypes();
-
-    // Handle form submission
-    if (isset($_POST['forma'])) {
-        $ex = explode("-", $_POST['forma']);
-
-        // Handle knife selection
-        if ($ex[0] == "knife") {
-            $db->query("INSERT INTO `wp_users_knives` (`user_id`, `knife`) VALUES(:user_id, :knife) ON DUPLICATE KEY UPDATE `knife` = :knife", ["user_id" => $userDbIndex, "knife" => $knifes[$ex[1]]['weapon_name']]);
-        } else {
-            // Handle skin selection
-            if (array_key_exists($ex[1], $skins[$ex[0]]) && isset($_POST['wear']) && $_POST['wear'] >= 0.00 && $_POST['wear'] <= 1.00 && isset($_POST['seed'])) {
-                $wear = floatval($_POST['wear']); // wear
-                $seed = intval($_POST['seed']); // seed
-
-                // Check if the skin is already selected and update or insert accordingly
-                if (array_key_exists($ex[0], $selectedSkins)) {
-                    $db->query("UPDATE wp_users_skins SET paint = :weapon_paint_id, wear = :weapon_wear, seed = :weapon_seed WHERE user_id = :user_id AND weapon = :weapon_defindex", ["user_id" => $userDbIndex, "weapon_defindex" => $ex[0], "weapon_paint_id" => $ex[1], "weapon_wear" => $wear, "weapon_seed" => $seed]);
-                } else {
-                    $db->query("INSERT INTO wp_users_skins (`user_id`, `weapon`, `paint`, `wear`, `seed`) VALUES (:user_id, :weapon_defindex, :weapon_paint_id, :weapon_wear, :weapon_seed)", ["user_id" => $userDbIndex, "weapon_defindex" => $ex[0], "weapon_paint_id" => $ex[1], "weapon_wear" => $wear, "weapon_seed" => $seed]);
-                }
-            }
-        }
-        // Redirect to the same page after form submission
-        header("Location: {$_SERVER['PHP_SELF']}");
-    }
-}
-?>

website/class/utils.php

@@ -1,158 +1,99 @@
 <?php
-/**
- * Class UtilsClass
- *
- * Provides utility methods for handling skin and weapon data.
- */
 class UtilsClass
 {
-    /**
-     * Retrieve skins data from the JSON file.
-     *
-     * @return array An associative array containing skin data.
-     */
-    public static function skinsFromJson()
+    public static function skinsFromJson(): array
     {
-        $skins = array();
-        $jsonFilePath = __DIR__ . "/../data/skins.json";
-
-        if (file_exists($jsonFilePath) && is_readable($jsonFilePath)) {
-            $json = json_decode(file_get_contents($jsonFilePath), true);
+        $skins = [];
+        $json = json_decode(file_get_contents(__DIR__ . "/../data/skins.json"), true);
 
         foreach ($json as $skin) {
-                $skins[(int) $skin['weapon_defindex']][(int) $skin['paint']] = array(
+            $skins[(int) $skin['weapon_defindex']][(int) $skin['paint']] = [
                 'weapon_name' => $skin['weapon_name'],
                 'paint_name' => $skin['paint_name'],
                 'image_url' => $skin['image'],
-                );
-            }
-        } else {
-            // Handle file not found or unreadable error
-            // You can throw an exception or log an error message
+            ];
         }
 
         return $skins;
     }
-    /**
-     * Retrieve music data from the JSON file.
-     *
-     * @return array An associative array containing music data.
-     */
-    public static function musicFromJson()
-    {
-        $music = array();
-        $jsonFilePath = __DIR__ . "/../data/music.json";
 
-        if (file_exists($jsonFilePath) && is_readable($jsonFilePath)) {
-            $json = json_decode(file_get_contents($jsonFilePath), true);
-
-            foreach ($json as $track) {
-                $music[$track['id']] = array(
-                    'name' => $track['name'],
-                    'image' => $track['image'],
-                );
-            }
-        } else {
-            // Handle file not found or unreadable error
-            // You can throw an exception or log an error message
-        }
-
-        return $music;
-    }
-    public static function glovesFromJson()
-    {
-        $gloves = array();
-        $jsonFilePath = __DIR__ . "/../data/gloves.json";
-
-        if (file_exists($jsonFilePath) && is_readable($jsonFilePath)) {
-            $json = json_decode(file_get_contents($jsonFilePath), true);
-
-            foreach ($json as $glove) {
-                $gloves[$glove['weapon_defindex']][$glove['paint']] = array(
-                    'paint_name' => $glove['paint_name'],
-                    'image_url' => $glove['image'],
-                );
-            }
-        } else {
-            // Handle file not found or unreadable error
-            // You can throw an exception or log an error message
-        }
-
-        return $gloves;
-    }
-    /**
-     * Retrieve weapons data from the skin data array.
-     *
-     * @return array An associative array containing weapon data.
-     */
     public static function getWeaponsFromArray()
     {
-        $weapons = array();
-        $skinsData = self::skinsFromJson();
+        $weapons = [];
+        $temp = self::skinsFromJson();
 
-        foreach ($skinsData as $key => $value) {
-            $weapons[$key] = array(
+        foreach ($temp as $key => $value) {
+            if (key_exists($key, $weapons))
+                continue;
+
+            $weapons[$key] = [
                 'weapon_name' => $value[0]['weapon_name'],
                 'paint_name' => $value[0]['paint_name'],
                 'image_url' => $value[0]['image_url'],
-            );
+            ];
         }
 
         return $weapons;
     }
 
-    /**
-     * Retrieve knife types from the weapon data array.
-     *
-     * @return array An associative array containing knife types data.
-     */
     public static function getKnifeTypes()
     {
-        $knifes = array();
-        $weaponsData = self::getWeaponsFromArray();
+        $knifes = [];
+        $temp = self::getWeaponsFromArray();
 
-        $allowedKnifeKeys = array(
-            500, 503, 505, 506, 507, 508, 509, 512, 514, 515,
-            516, 517, 518, 519, 520, 521, 522, 523, 525
-        );
+        foreach ($temp as $key => $weapon) {
+            if (
+                !in_array($key, [
+                    500,
+                    503,
+                    505,
+                    506,
+                    507,
+                    508,
+                    509,
+                    512,
+                    514,
+                    515,
+                    516,
+                    517,
+                    518,
+                    519,
+                    520,
+                    521,
+                    522,
+                    523,
+                    525,
+                    526
+                ])
+            )
+                continue;
 
-        foreach ($weaponsData as $key => $weapon) {
-            if (in_array($key, $allowedKnifeKeys)) {
-                $knifes[$key] = array(
+            $knifes[$key] = [
                 'weapon_name' => $weapon['weapon_name'],
                 'paint_name' => rtrim(explode("|", $weapon['paint_name'])[0]),
                 'image_url' => $weapon['image_url'],
-                );
-            }
-        }
-
-        // Add default knife
-        $knifes[0] = array(
+            ];
+            $knifes[0] = [
                 'weapon_name' => "weapon_knife",
                 'paint_name' => "Default knife",
                 'image_url' => "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/weapon_knife.png",
-        );
+            ];
+        }
 
         ksort($knifes);
         return $knifes;
     }
 
-    /**
-     * Retrieve selected skins data from the database result.
-     *
-     * @param array $temp An array containing the selected skins data.
-     * @return array An associative array containing selected skins data.
-     */
-    public static function getSelectedSkins($temp)
+    public static function getSelectedSkins(array $temp)
     {
-        $selected = array();
+        $selected = [];
 
         foreach ($temp as $weapon) {
-            $selected[$weapon['weapon']] =  array(
-                'weapon_paint_id' => $weapon['paint'],
-                'weapon_seed' => $weapon['seed'],
-                'weapon_wear' => $weapon['wear'],
-            );
+            $selected[$weapon['weapon_defindex']] =  [
+                'weapon_paint_id' => $weapon['weapon_paint_id'],
+                'weapon_seed' => $weapon['weapon_seed'],
+                'weapon_wear' => $weapon['weapon_wear'],
+            ];
         }
 
         return $selected;

website/data/agents.json

@@ -1,386 +0,0 @@
-[
-	{
-		"team": 2,
-		"image": "",
-		"model": "null",
-		"agent_name": "Agent | Default"
-	},
-	{
-		"team": 3,
-		"image": "",
-		"model": "null",
-		"agent_name": "Agent | Default"
-	},
-	{
-		"team": 3,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4619.png",
-		"model": "ctm_st6/ctm_st6_variantj",
-		"agent_name": "'Blueberries' Buckshot | NSWC SEAL"
-	},
-	{
-		"team": 3,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4680.png",
-		"model": "ctm_st6/ctm_st6_variantl",
-		"agent_name": "'Two Times' McCoy | TACP Cavalry"
-	},
-	{
-		"team": 3,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4711.png",
-		"model": "ctm_swat/ctm_swat_variante",
-		"agent_name": "Cmdr. Mae 'Dead Cold' Jamison | SWAT"
-	},
-	{
-		"team": 3,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4712.png",
-		"model": "ctm_swat/ctm_swat_variantf",
-		"agent_name": "1st Lieutenant Farlow | SWAT"
-	},
-	{
-		"team": 3,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4713.png",
-		"model": "ctm_swat/ctm_swat_variantg",
-		"agent_name": "John 'Van Healen' Kask | SWAT"
-	},
-	{
-		"team": 3,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4714.png",
-		"model": "ctm_swat/ctm_swat_varianth",
-		"agent_name": "Bio-Haz Specialist | SWAT"
-	},
-	{
-		"team": 3,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4715.png",
-		"model": "ctm_swat/ctm_swat_varianti",
-		"agent_name": "Sergeant Bombson | SWAT"
-	},
-	{
-		"team": 3,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4716.png",
-		"model": "ctm_swat/ctm_swat_variantj",
-		"agent_name": "Chem-Haz Specialist | SWAT"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4718.png",
-		"model": "tm_balkan/tm_balkan_variantk",
-		"agent_name": "Rezan the Redshirt | Sabre"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4726.png",
-		"model": "tm_professional/tm_professional_varf",
-		"agent_name": "Sir Bloody Miami Darryl | The Professionals"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4727.png",
-		"model": "tm_professional/tm_professional_varg",
-		"agent_name": "Safecracker Voltzmann | The Professionals"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4728.png",
-		"model": "tm_professional/tm_professional_varh",
-		"agent_name": "Little Kev | The Professionals"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4730.png",
-		"model": "tm_professional/tm_professional_varj",
-		"agent_name": "Getaway Sally | The Professionals"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4732.png",
-		"model": "tm_professional/tm_professional_vari",
-		"agent_name": "Number K | The Professionals"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4733.png",
-		"model": "tm_professional/tm_professional_varf1",
-		"agent_name": "Sir Bloody Silent Darryl | The Professionals"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4734.png",
-		"model": "tm_professional/tm_professional_varf2",
-		"agent_name": "Sir Bloody Skullhead Darryl | The Professionals"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4735.png",
-		"model": "tm_professional/tm_professional_varf3",
-		"agent_name": "Sir Bloody Darryl Royale | The Professionals"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4736.png",
-		"model": "tm_professional/tm_professional_varf4",
-		"agent_name": "Sir Bloody Loudmouth Darryl | The Professionals"
-	},
-	{
-		"team": 3,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4749.png",
-		"model": "ctm_gendarmerie/ctm_gendarmerie_varianta",
-		"agent_name": "Sous-Lieutenant Medic | Gendarmerie Nationale"
-	},
-	{
-		"team": 3,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4750.png",
-		"model": "ctm_gendarmerie/ctm_gendarmerie_variantb",
-		"agent_name": "Chem-Haz Capitaine | Gendarmerie Nationale"
-	},
-	{
-		"team": 3,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4751.png",
-		"model": "ctm_gendarmerie/ctm_gendarmerie_variantc",
-		"agent_name": "Chef d'Escadron Rouchard | Gendarmerie Nationale"
-	},
-	{
-		"team": 3,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4752.png",
-		"model": "ctm_gendarmerie/ctm_gendarmerie_variantd",
-		"agent_name": "Aspirant | Gendarmerie Nationale"
-	},
-	{
-		"team": 3,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4753.png",
-		"model": "ctm_gendarmerie/ctm_gendarmerie_variante",
-		"agent_name": "Officer Jacques Beltram | Gendarmerie Nationale"
-	},
-	{
-		"team": 3,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4756.png",
-		"model": "ctm_swat/ctm_swat_variantk",
-		"agent_name": "Lieutenant 'Tree Hugger' Farlow | SWAT"
-	},
-	{
-		"team": 3,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4757.png",
-		"model": "ctm_diver/ctm_diver_varianta",
-		"agent_name": "Cmdr. Davida 'Goggles' Fernandez | SEAL Frogman"
-	},
-	{
-		"team": 3,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4771.png",
-		"model": "ctm_diver/ctm_diver_variantb",
-		"agent_name": "Cmdr. Frank 'Wet Sox' Baroud | SEAL Frogman"
-	},
-	{
-		"team": 3,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4772.png",
-		"model": "ctm_diver/ctm_diver_variantc",
-		"agent_name": "Lieutenant Rex Krikey | SEAL Frogman"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4773.png",
-		"model": "tm_jungle_raider/tm_jungle_raider_varianta",
-		"agent_name": "Elite Trapper Solman | Guerrilla Warfare"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4774.png",
-		"model": "tm_jungle_raider/tm_jungle_raider_variantb",
-		"agent_name": "Crasswater The Forgotten | Guerrilla Warfare"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4775.png",
-		"model": "tm_jungle_raider/tm_jungle_raider_variantc",
-		"agent_name": "Arno The Overgrown | Guerrilla Warfare"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4776.png",
-		"model": "tm_jungle_raider/tm_jungle_raider_variantd",
-		"agent_name": "Col. Mangos Dabisi | Guerrilla Warfare"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4777.png",
-		"model": "tm_jungle_raider/tm_jungle_raider_variante",
-		"agent_name": "Vypa Sista of the Revolution | Guerrilla Warfare"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4778.png",
-		"model": "tm_jungle_raider/tm_jungle_raider_variantf",
-		"agent_name": "Trapper Aggressor | Guerrilla Warfare"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4780.png",
-		"model": "tm_jungle_raider/tm_jungle_raider_variantb2",
-		"agent_name": "'Medium Rare' Crasswater | Guerrilla Warfare"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4781.png",
-		"model": "tm_jungle_raider/tm_jungle_raider_variantf2",
-		"agent_name": "Trapper | Guerrilla Warfare"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-5105.png",
-		"model": "tm_leet/tm_leet_variantg",
-		"agent_name": "Ground Rebel  | Elite Crew"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-5106.png",
-		"model": "tm_leet/tm_leet_varianth",
-		"agent_name": "Osiris | Elite Crew"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-5107.png",
-		"model": "tm_leet/tm_leet_varianti",
-		"agent_name": "Prof. Shahmat | Elite Crew"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-5108.png",
-		"model": "tm_leet/tm_leet_variantf",
-		"agent_name": "The Elite Mr. Muhlik | Elite Crew"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-5109.png",
-		"model": "tm_leet/tm_leet_variantj",
-		"agent_name": "Jungle Rebel | Elite Crew"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-5205.png",
-		"model": "tm_phoenix/tm_phoenix_varianth",
-		"agent_name": "Soldier | Phoenix"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-5206.png",
-		"model": "tm_phoenix/tm_phoenix_variantf",
-		"agent_name": "Enforcer | Phoenix"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-5207.png",
-		"model": "tm_phoenix/tm_phoenix_variantg",
-		"agent_name": "Slingshot | Phoenix"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-5208.png",
-		"model": "tm_phoenix/tm_phoenix_varianti",
-		"agent_name": "Street Soldier | Phoenix"
-	},
-	{
-		"team": 3,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-5305.png",
-		"model": "ctm_fbi/ctm_fbi_variantf",
-		"agent_name": "Operator | FBI SWAT"
-	},
-	{
-		"team": 3,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-5306.png",
-		"model": "ctm_fbi/ctm_fbi_variantg",
-		"agent_name": "Markus Delrow | FBI HRT"
-	},
-	{
-		"team": 3,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-5307.png",
-		"model": "ctm_fbi/ctm_fbi_varianth",
-		"agent_name": "Michael Syfers  | FBI Sniper"
-	},
-	{
-		"team": 3,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-5308.png",
-		"model": "ctm_fbi/ctm_fbi_variantb",
-		"agent_name": "Special Agent Ava | FBI"
-	},
-	{
-		"team": 3,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-5400.png",
-		"model": "ctm_st6/ctm_st6_variantk",
-		"agent_name": "3rd Commando Company | KSK"
-	},
-	{
-		"team": 3,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-5401.png",
-		"model": "ctm_st6/ctm_st6_variante",
-		"agent_name": "Seal Team 6 Soldier | NSWC SEAL"
-	},
-	{
-		"team": 3,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-5402.png",
-		"model": "ctm_st6/ctm_st6_variantg",
-		"agent_name": "Buckshot | NSWC SEAL"
-	},
-	{
-		"team": 3,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-5403.png",
-		"model": "ctm_st6/ctm_st6_variantm",
-		"agent_name": "'Two Times' McCoy | USAF TACP"
-	},
-	{
-		"team": 3,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-5404.png",
-		"model": "ctm_st6/ctm_st6_varianti",
-		"agent_name": "Lt. Commander Ricksaw | NSWC SEAL"
-	},
-	{
-		"team": 3,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-5405.png",
-		"model": "ctm_st6/ctm_st6_variantn",
-		"agent_name": "Primeiro Tenente | Brazilian 1st Battalion"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-5500.png",
-		"model": "tm_balkan/tm_balkan_variantf",
-		"agent_name": "Dragomir | Sabre"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-5501.png",
-		"model": "tm_balkan/tm_balkan_varianti",
-		"agent_name": "Maximus | Sabre"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-5502.png",
-		"model": "tm_balkan/tm_balkan_variantg",
-		"agent_name": "Rezan The Ready | Sabre"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-5503.png",
-		"model": "tm_balkan/tm_balkan_variantj",
-		"agent_name": "Blackwolf | Sabre"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-5504.png",
-		"model": "tm_balkan/tm_balkan_varianth",
-		"agent_name": "'The Doctor' Romanov | Sabre"
-	},
-	{
-		"team": 2,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-5505.png",
-		"model": "tm_balkan/tm_balkan_variantl",
-		"agent_name": "Dragomir | Sabre Footsoldier"
-	},
-	{
-		"team": 3,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-5601.png",
-		"model": "ctm_sas/ctm_sas_variantf",
-		"agent_name": "B Squadron Officer | SAS"
-	},
-	{
-		"team": 3,
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-5602.png",
-		"model": "ctm_sas/ctm_sas_variantg",
-		"agent_name": "D Squadron Officer | NZSAS"
-	}
-]

website/data/music.json

@@ -1,367 +0,0 @@
-[
-	{
-		"id": "3",
-		"name": "Music Kit | Daniel Sadowski, Crimson Assault",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-3.png"
-	},
-	{
-		"id": "4",
-		"name": "Music Kit | Noisia, Sharpened",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-4.png"
-	},
-	{
-		"id": "5",
-		"name": "Music Kit | Robert Allaire, Insurgency",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-5.png"
-	},
-	{
-		"id": "6",
-		"name": "Music Kit | Sean Murray, A*D*8",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-6.png"
-	},
-	{
-		"id": "7",
-		"name": "Music Kit | Feed Me, High Noon",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-7.png"
-	},
-	{
-		"id": "8",
-		"name": "Music Kit | Dren, Death's Head Demolition",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-8.png"
-	},
-	{
-		"id": "9",
-		"name": "Music Kit | Austin Wintory, Desert Fire",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-9.png"
-	},
-	{
-		"id": "10",
-		"name": "Music Kit | Sasha, LNOE",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-10.png"
-	},
-	{
-		"id": "11",
-		"name": "Music Kit | Skog, Metal",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-11.png"
-	},
-	{
-		"id": "12",
-		"name": "Music Kit | Midnight Riders, All I Want for Christmas",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-12.png"
-	},
-	{
-		"id": "13",
-		"name": "Music Kit | Matt Lange, IsoRhythm",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-13.png"
-	},
-	{
-		"id": "14",
-		"name": "Music Kit | Mateo Messina, For No Mankind",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-14.png"
-	},
-	{
-		"id": "15",
-		"name": "Music Kit | Various Artists, Hotline Miami",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-15.png"
-	},
-	{
-		"id": "16",
-		"name": "Music Kit | Daniel Sadowski, Total Domination",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-16.png"
-	},
-	{
-		"id": "17",
-		"name": "Music Kit | Damjan Mravunac, The Talos Principle",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-17.png"
-	},
-	{
-		"id": "18",
-		"name": "Music Kit | Proxy, Battlepack",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-18.png"
-	},
-	{
-		"id": "19",
-		"name": "Music Kit | Ki:Theory, MOLOTOV",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-19.png"
-	},
-	{
-		"id": "20",
-		"name": "Music Kit | Troels Folmann, Uber Blasto Phone",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-20.png"
-	},
-	{
-		"id": "21",
-		"name": "Music Kit | Kelly Bailey, Hazardous Environments",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-21.png"
-	},
-	{
-		"id": "22",
-		"name": "Music Kit | Skog, II-Headshot",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-22.png"
-	},
-	{
-		"id": "23",
-		"name": "Music Kit | Daniel Sadowski, The 8-Bit Kit",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-23.png"
-	},
-	{
-		"id": "24",
-		"name": "Music Kit | AWOLNATION, I Am",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-24.png"
-	},
-	{
-		"id": "25",
-		"name": "Music Kit | Mord Fustang, Diamonds",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-25.png"
-	},
-	{
-		"id": "26",
-		"name": "Music Kit | Michael Bross, Invasion!",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-26.png"
-	},
-	{
-		"id": "27",
-		"name": "Music Kit | Ian Hultquist, Lion's Mouth",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-27.png"
-	},
-	{
-		"id": "28",
-		"name": "Music Kit | New Beat Fund, Sponge Fingerz",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-28.png"
-	},
-	{
-		"id": "29",
-		"name": "Music Kit | Beartooth, Disgusting",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-29.png"
-	},
-	{
-		"id": "30",
-		"name": "Music Kit | Lennie Moore, Java Havana Funkaloo",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-30.png"
-	},
-	{
-		"id": "31",
-		"name": "Music Kit | Darude, Moments CS:GO",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-31.png"
-	},
-	{
-		"id": "32",
-		"name": "Music Kit | Beartooth, Aggressive",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-32.png"
-	},
-	{
-		"id": "33",
-		"name": "Music Kit | Blitz Kids, The Good Youth",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-33.png"
-	},
-	{
-		"id": "34",
-		"name": "Music Kit | Hundredth, FREE",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-34.png"
-	},
-	{
-		"id": "35",
-		"name": "Music Kit | Neck Deep, Life's Not Out To Get You",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-35.png"
-	},
-	{
-		"id": "36",
-		"name": "Music Kit | Roam, Backbone",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-36.png"
-	},
-	{
-		"id": "37",
-		"name": "Music Kit | Twin Atlantic, GLA",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-37.png"
-	},
-	{
-		"id": "38",
-		"name": "Music Kit | Skog, III-Arena",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-38.png"
-	},
-	{
-		"id": "39",
-		"name": "Music Kit | The Verkkars, EZ4ENCE",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-39.png"
-	},
-	{
-		"id": "40",
-		"name": "Halo, The Master Chief Collection",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-40.png"
-	},
-	{
-		"id": "41",
-		"name": "Music Kit | Scarlxrd: King, Scar",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-41.png"
-	},
-	{
-		"id": "42",
-		"name": "Half-Life: Alyx, Anti-Citizen",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-42.png"
-	},
-	{
-		"id": "43",
-		"name": "Music Kit | Austin Wintory, Bachram",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-43.png"
-	},
-	{
-		"id": "44",
-		"name": "Music Kit | Dren, Gunman Taco Truck",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-44.png"
-	},
-	{
-		"id": "45",
-		"name": "Music Kit | Daniel Sadowski, Eye of the Dragon",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-45.png"
-	},
-	{
-		"id": "46",
-		"name": "Music Kit | Tree Adams and Ben Bromfield, M.U.D.D. FORCE",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-46.png"
-	},
-	{
-		"id": "47",
-		"name": "Music Kit | Tim Huling, Neo Noir",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-47.png"
-	},
-	{
-		"id": "48",
-		"name": "Music Kit | Sam Marshall, Bodacious",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-48.png"
-	},
-	{
-		"id": "49",
-		"name": "Music Kit | Matt Levine, Drifter",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-49.png"
-	},
-	{
-		"id": "50",
-		"name": "Music Kit | Amon Tobin, All for Dust",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-50.png"
-	},
-	{
-		"id": "51",
-		"name": "Darren Korb, Hades Music Kit",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-51.png"
-	},
-	{
-		"id": "52",
-		"name": "Music Kit | Neck Deep, The Lowlife Pack",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-52.png"
-	},
-	{
-		"id": "53",
-		"name": "Music Kit | Scarlxrd, CHAIN$AW.LXADXUT.",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-53.png"
-	},
-	{
-		"id": "54",
-		"name": "Music Kit | Austin Wintory, Mocha Petal",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-54.png"
-	},
-	{
-		"id": "55",
-		"name": "Music Kit | Chipzel, ~Yellow Magic~",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-55.png"
-	},
-	{
-		"id": "56",
-		"name": "Music Kit | Freaky DNA, Vici",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-56.png"
-	},
-	{
-		"id": "57",
-		"name": "Music Kit | Jesse Harlin, Astro Bellum",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-57.png"
-	},
-	{
-		"id": "58",
-		"name": "Music Kit | Laura Shigihara: Work Hard, Play Hard",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-58.png"
-	},
-	{
-		"id": "59",
-		"name": "Music Kit | Sarah Schachner, KOLIBRI",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-59.png"
-	},
-	{
-		"id": "60",
-		"name": "Music Kit | bbno$, u mad!",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-60.png"
-	},
-	{
-		"id": "61",
-		"name": "Music Kit | The Verkkars & n0thing, Flashbang Dance",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-61.png"
-	},
-	{
-		"id": "62",
-		"name": "Music Kit | 3kliksphilip, Heading for the Source",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-62.png"
-	},
-	{
-		"id": "63",
-		"name": "Music Kit | Humanity's Last Breath, Void",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-63.png"
-	},
-	{
-		"id": "64",
-		"name": "Music Kit | Juelz, Shooters",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-64.png"
-	},
-	{
-		"id": "65",
-		"name": "Music Kit | Knock2, dashstar*",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-65.png"
-	},
-	{
-		"id": "66",
-		"name": "Music Kit | Meechy Darko, Gothic Luxury",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-66.png"
-	},
-	{
-		"id": "67",
-		"name": "Music Kit | Sullivan King, Lock Me Up",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-67.png"
-	},
-	{
-		"id": "68",
-		"name": "Music Kit | Perfect World, 花脸 Hua Lian (Painted Face)",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-68.png"
-	},
-	{
-		"id": "69",
-		"name": "Music Kit | Denzel Curry, ULTIMATE",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-69.png"
-	},
-	{
-		"id": "71",
-		"name": "Music Kit | DRYDEN, Feel The Power",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-71.png"
-	},
-	{
-		"id": "72",
-		"name": "Music Kit | ISOxo, inhuman",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-72.png"
-	},
-	{
-		"id": "73",
-		"name": "Music Kit | KILL SCRIPT, All Night",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-73.png"
-	},
-	{
-		"id": "74",
-		"name": "Music Kit | Knock2, Make U SWEAT!",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-74.png"
-	},
-	{
-		"id": "75",
-		"name": "Music Kit | Rad Cat, Reason",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-75.png"
-	},
-	{
-		"id": "76",
-		"name": "Music Kit | TWERL, Ekko & Sidetrack, Under Bright Lights",
-		"image": "https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-76.png"
-	}
-]

website/db-sqlite.sql

@@ -1,54 +0,0 @@
-PRAGMA foreign_keys = ON;
-
-CREATE TABLE IF NOT EXISTS `wp_players` (
-                                            `user_id` INTEGER PRIMARY KEY AUTOINCREMENT,
-                                            `steamid` INTEGER NOT NULL,
-                                            `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                                            `updated_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                                            UNIQUE(`steamid`)
-    );
-
-CREATE TABLE IF NOT EXISTS `wp_player_skins` (
-                                                 `user_id` INTEGER NOT NULL,
-                                                 `team` INTEGER NOT NULL,
-                                                 `weapon_defindex` INTEGER NOT NULL,
-                                                 `paint` INTEGER NOT NULL,
-                                                 `wear` REAL NOT NULL DEFAULT 0.001,
-                                                 `seed` INTEGER NOT NULL DEFAULT 0,
-                                                 `nametag` TEXT DEFAULT NULL,
-                                                 `stattrack` INTEGER NOT NULL DEFAULT 0,
-                                                 `stattrack_enabled` INTEGER NOT NULL DEFAULT 0,
-                                                 `quality` INTEGER NOT NULL DEFAULT 0,
-                                                 PRIMARY KEY (`user_id`,`team`,`weapon_defindex`),
-    FOREIGN KEY (`user_id`) REFERENCES `wp_players`(`user_id`) ON DELETE CASCADE
-    );
-
-CREATE TABLE IF NOT EXISTS `wp_players_knife` (
-                                                  `user_id` INTEGER NOT NULL,
-                                                  `knife` TEXT DEFAULT NULL,
-                                                  PRIMARY KEY (`user_id`),
-    FOREIGN KEY (`user_id`) REFERENCES `wp_players`(`user_id`) ON DELETE CASCADE
-    );
-
-CREATE TABLE IF NOT EXISTS `wp_players_gloves` (
-                                                   `user_id` INTEGER NOT NULL,
-                                                   `weapon_defindex` INTEGER DEFAULT NULL,
-                                                   `team` INTEGER DEFAULT NULL,
-                                                   PRIMARY KEY (`user_id`,`team`),
-    FOREIGN KEY (`user_id`) REFERENCES `wp_players`(`user_id`) ON DELETE CASCADE
-    );
-
-CREATE TABLE IF NOT EXISTS `wp_players_music` (
-                                                  `user_id` INTEGER NOT NULL,
-                                                  `music` INTEGER DEFAULT NULL,
-                                                  PRIMARY KEY (`user_id`),
-    FOREIGN KEY (`user_id`) REFERENCES `wp_players`(`user_id`) ON DELETE CASCADE
-    );
-
-CREATE TABLE IF NOT EXISTS `wp_players_agents` (
-                                                   `user_id` INTEGER NOT NULL,
-                                                   `agent_ct` TEXT DEFAULT NULL,
-                                                   `agent_t` TEXT DEFAULT NULL,
-                                                   PRIMARY KEY (`user_id`),
-    FOREIGN KEY (`user_id`) REFERENCES `wp_players`(`user_id`) ON DELETE CASCADE
-    );

website/db.sql

@@ -1,53 +0,0 @@
-CREATE TABLE IF NOT EXISTS `wp_players` (
-    `user_id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
-    `steamid` BIGINT UNSIGNED NOT NULL,
-    `created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    `updated_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    PRIMARY KEY (`user_id`),
-    UNIQUE KEY `unique_steamid` (`steamid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-
-CREATE TABLE IF NOT EXISTS `wp_player_skins` (
-    `user_id` INT UNSIGNED NOT NULL,
-    `team` SMALLINT UNSIGNED NOT NULL,
-    `weapon_defindex` SMALLINT UNSIGNED NOT NULL,
-    `paint` SMALLINT UNSIGNED NOT NULL,
-    `wear` FLOAT NOT NULL DEFAULT 0.001,
-    `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,
-    `quality` SMALLINT UNSIGNED NOT NULL DEFAULT 0,
-    PRIMARY KEY (`user_id`,`team`,`weapon_defindex`),
-    FOREIGN KEY (`user_id`) REFERENCES `wp_players`(`user_id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-
-CREATE TABLE IF NOT EXISTS `wp_players_knife` (
-    `user_id` INT UNSIGNED NOT NULL,
-    `knife` VARCHAR(32) DEFAULT NULL,
-    PRIMARY KEY (`user_id`),
-    FOREIGN KEY (`user_id`) REFERENCES `wp_players`(`user_id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-
-CREATE TABLE IF NOT EXISTS `wp_players_gloves` (
-    `user_id` INT UNSIGNED NOT NULL,
-    `weapon_defindex` SMALLINT UNSIGNED DEFAULT NULL,
-    `team` SMALLINT UNSIGNED DEFAULT NULL,
-    PRIMARY KEY (`user_id`,`team`),
-    FOREIGN KEY (`user_id`) REFERENCES `wp_players`(`user_id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-
-CREATE TABLE IF NOT EXISTS `wp_players_music` (
-    `user_id` INT UNSIGNED NOT NULL,
-    `music` SMALLINT UNSIGNED DEFAULT NULL,
-    PRIMARY KEY (`user_id`),
-    FOREIGN KEY (`user_id`) REFERENCES `wp_players`(`user_id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-
-CREATE TABLE IF NOT EXISTS `wp_players_agents` (
-    `user_id` INT UNSIGNED NOT NULL,
-    `agent_ct` varchar(64) DEFAULT NULL,
-    `agent_t` varchar(64) DEFAULT NULL,
-    PRIMARY KEY (`user_id`),
-    FOREIGN KEY (`user_id`) REFERENCES `wp_players`(`user_id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

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)
 {