Merge pull request #136 from daffyyyy/main

1.6a

.gitignore

@@ -1,5 +1,4 @@
-
 .vs/
 bin/
 obj/
-.test/
+website/getskins.php

Commands.cs

@@ -8,50 +8,56 @@ namespace WeaponPaints
 	{
 		private void OnCommandRefresh(CCSPlayerController? player, CommandInfo command)
 		{
-			if (!Config.AdditionalSetting.CommandWpEnabled || !Config.AdditionalSetting.SkinEnabled || !g_bCommandsAllowed) return;
+			if (!Config.Additional.CommandWpEnabled || !Config.Additional.SkinEnabled || !g_bCommandsAllowed) return;
 			if (!Utility.IsPlayerValid(player)) return;
-			if (player == null || player.Index <= 0) return;
+
+			if (player == null || !player.IsValid || player.UserId == null || player.IsBot) return;
+
 			int playerIndex = (int)player!.Index;
 
 			PlayerInfo playerInfo = new PlayerInfo
 			{
 				UserId = player.UserId,
 				Index = (int)player.Index,
-				SteamId = player?.AuthorizedSteamID?.SteamId64,
+				SteamId = player?.AuthorizedSteamID?.SteamId64.ToString(),
 				Name = player?.PlayerName,
 				IpAddress = player?.IpAddress?.Split(":")[0]
 			};
 
-			if (player == null || player.UserId == null) return;
+			if (player == null || !player.IsValid || player.UserId == null || player.IsBot) return;
 
-			if (!commandsCooldown.TryGetValue((int)player.UserId, out DateTime cooldownEndTime) ||
-				DateTime.UtcNow >= (commandsCooldown.TryGetValue((int)player.UserId, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
+			try
 			{
-				commandsCooldown[(int)player.UserId] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
-				if (weaponSync != null)
-					Task.Run(async () => await weaponSync.GetWeaponPaintsFromDatabase(playerInfo));
-				if (Config.AdditionalSetting.KnifeEnabled)
+				if (!commandsCooldown.TryGetValue((int)player.UserId, out DateTime cooldownEndTime) ||
+	DateTime.UtcNow >= (commandsCooldown.TryGetValue((int)player.UserId, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
 				{
+					commandsCooldown[(int)player.UserId] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
 					if (weaponSync != null)
-						Task.Run(async () => await weaponSync.GetKnifeFromDatabase(playerInfo));
+						Task.Run(async () => await weaponSync.GetWeaponPaintsFromDatabase(playerInfo));
+					if (Config.Additional.KnifeEnabled)
+					{
+						if (weaponSync != null)
+							Task.Run(async () => await weaponSync.GetKnifeFromDatabase(playerInfo));
 
-					RefreshWeapons(player);
+						RefreshWeapons(player);
+					}
+					if (!string.IsNullOrEmpty(Localizer["wp_command_refresh_done"]))
+					{
+						player!.Print(Localizer["wp_command_refresh_done"]);
+					}
+					return;
 				}
-				if (!string.IsNullOrEmpty(Localizer["wp_command_refresh_done"]))
+				if (!string.IsNullOrEmpty(Localizer["wp_command_cooldown"]))
 				{
-					player!.Print(Localizer["wp_command_refresh_done"]);
+					player!.Print(Localizer["wp_command_cooldown"]);
 				}
-				return;
-			}
-			if (!string.IsNullOrEmpty(Localizer["wp_command_cooldown"]))
-			{
-				player!.Print(Localizer["wp_command_cooldown"]);
 			}
+			catch (Exception) { }
 		}
 
 		private void OnCommandWS(CCSPlayerController? player, CommandInfo command)
 		{
-            if (!Config.AdditionalSetting.SkinEnabled) return;
+			if (!Config.Additional.SkinEnabled) return;
 			if (!Utility.IsPlayerValid(player)) return;
 
 			if (!string.IsNullOrEmpty(Localizer["wp_info_website"]))
@@ -62,7 +68,7 @@ namespace WeaponPaints
 			{
 				player!.Print(Localizer["wp_info_refresh"]);
 			}
-			if (!Config.AdditionalSetting.KnifeEnabled) return;
+			if (!Config.Additional.KnifeEnabled) return;
 			if (!string.IsNullOrEmpty(Localizer["wp_info_knife"]))
 			{
 				player!.Print(Localizer["wp_info_knife"]);
@@ -71,19 +77,19 @@ namespace WeaponPaints
 
 		private void RegisterCommands()
 		{
-			AddCommand($"css_{Config.AdditionalSetting.CommandSkin}", "Skins info", (player, info) =>
+			AddCommand($"css_{Config.Additional.CommandSkin}", "Skins info", (player, info) =>
 			{
 				if (!Utility.IsPlayerValid(player)) return;
 				OnCommandWS(player, info);
 			});
-			AddCommand($"css_{Config.AdditionalSetting.CommandRefresh}", "Skins refresh", (player, info) =>
+			AddCommand($"css_{Config.Additional.CommandRefresh}", "Skins refresh", (player, info) =>
 			{
 				if (!Utility.IsPlayerValid(player) || !g_bCommandsAllowed) return;
 				OnCommandRefresh(player, info);
 			});
-			if (Config.AdditionalSetting.CommandKillEnabled)
+			if (Config.Additional.CommandKillEnabled)
 			{
-				AddCommand($"css_{Config.AdditionalSetting.CommandKill}", "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;
 
@@ -94,7 +100,7 @@ namespace WeaponPaints
 
 		private void SetupKnifeMenu()
 		{
-			if (!Config.AdditionalSetting.KnifeEnabled || !g_bCommandsAllowed) return;
+			if (!Config.Additional.KnifeEnabled || !g_bCommandsAllowed) return;
 
 			var knivesOnly = weaponList
 				.Where(pair => pair.Key.StartsWith("weapon_knife") || pair.Key.StartsWith("weapon_bayonet"))
@@ -115,7 +121,7 @@ namespace WeaponPaints
 							player!.Print(Localizer["wp_knife_menu_select", knifeName]);
 						}
 
-						if (!string.IsNullOrEmpty(Localizer["wp_knife_menu_kill"]) && Config.AdditionalSetting.CommandKillEnabled)
+						if (!string.IsNullOrEmpty(Localizer["wp_knife_menu_kill"]) && Config.Additional.CommandKillEnabled)
 						{
 							player!.Print(Localizer["wp_knife_menu_kill"]);
 						}
@@ -124,7 +130,7 @@ namespace WeaponPaints
 						{
 							UserId = player.UserId,
 							Index = (int)player.Index,
-							SteamId = player?.AuthorizedSteamID?.SteamId64,
+							SteamId = player?.AuthorizedSteamID?.SteamId64.ToString(),
 							Name = player?.PlayerName,
 							IpAddress = player?.IpAddress?.Split(":")[0]
 						};
@@ -145,7 +151,7 @@ namespace WeaponPaints
 			{
 				giveItemMenu.AddMenuOption(knifePair.Value, handleGive);
 			}
-			AddCommand($"css_{Config.AdditionalSetting.CommandKnife}", "Knife Menu", (player, info) =>
+			AddCommand($"css_{Config.Additional.CommandKnife}", "Knife Menu", (player, info) =>
 			{
 				if (!Utility.IsPlayerValid(player) || !g_bCommandsAllowed) return;
 
@@ -155,7 +161,7 @@ namespace WeaponPaints
 					DateTime.UtcNow >= (commandsCooldown.TryGetValue((int)player.UserId, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
 				{
 					commandsCooldown[(int)player.UserId] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
-					ChatMenus.OpenMenu(player, giveItemMenu);
+					MenuManager.OpenChatMenu(player, giveItemMenu);
 					return;
 				}
 				if (!string.IsNullOrEmpty(Localizer["wp_command_cooldown"]))
@@ -212,25 +218,25 @@ namespace WeaponPaints
 						if (firstSkin != null &&
 							firstSkin.TryGetValue("weapon_defindex", out var weaponDefIndexObj) &&
 							weaponDefIndexObj != null &&
-							ushort.TryParse(weaponDefIndexObj.ToString(), out var weaponDefIndex) &&
-                            ushort.TryParse(selectedPaintID, out var paintID))
+							int.TryParse(weaponDefIndexObj.ToString(), out var weaponDefIndex) &&
+							int.TryParse(selectedPaintID, out var paintID))
 						{
 							p!.Print(Localizer["wp_skin_menu_select", selectedSkin]);
 
-                            if (!gPlayerWeaponsInfo[playerIndex].TryGetValue(weaponDefIndex, out _))
-                            {
-                                gPlayerWeaponsInfo[playerIndex][weaponDefIndex] = new WeaponInfo();
-                            }
+							if (!gPlayerWeaponsInfo[playerIndex].ContainsKey(weaponDefIndex))
+							{
+								gPlayerWeaponsInfo[playerIndex][weaponDefIndex] = new WeaponInfo();
+							}
 
-                            gPlayerWeaponsInfo[playerIndex][weaponDefIndex].Paint = paintID;
-							gPlayerWeaponsInfo[playerIndex][weaponDefIndex].Wear = 0.00001f;
+							gPlayerWeaponsInfo[playerIndex][weaponDefIndex].Paint = paintID;
+							gPlayerWeaponsInfo[playerIndex][weaponDefIndex].Wear = 0.01f;
 							gPlayerWeaponsInfo[playerIndex][weaponDefIndex].Seed = 0;
 
 							PlayerInfo playerInfo = new PlayerInfo
 							{
 								UserId = player.UserId,
 								Index = (int)player.Index,
-								SteamId = player?.AuthorizedSteamID?.SteamId64,
+								SteamId = player?.AuthorizedSteamID?.SteamId64.ToString(),
 								Name = player?.PlayerName,
 								IpAddress = player?.IpAddress?.Split(":")[0]
 							};
@@ -238,7 +244,7 @@ namespace WeaponPaints
 							if (!Config.GlobalShare)
 							{
 								if (weaponSync != null)
-									Task.Run(async () => await weaponSync.SyncWeaponPaintToDatabase(playerInfo, weaponDefIndex));
+									Task.Run(async () => await weaponSync.SyncWeaponPaintsToDatabase(playerInfo));
 							}
 						}
 					};
@@ -262,7 +268,7 @@ namespace WeaponPaints
 					}
 
 					// Open the submenu for skin selection of the chosen weapon
-					ChatMenus.OpenMenu(player, skinSubMenu);
+					MenuManager.OpenChatMenu(player, skinSubMenu);
 				}
 			};
 
@@ -273,7 +279,7 @@ namespace WeaponPaints
 				weaponSelectionMenu.AddMenuOption(weaponName, handleWeaponSelection);
 			}
 			// Command to open the weapon selection menu for players
-			AddCommand($"css_{Config.AdditionalSetting.CommandSkinSelection}", "Skins selection menu", (player, info) =>
+			AddCommand($"css_{Config.Additional.CommandSkinSelection}", "Skins selection menu", (player, info) =>
 			{
 				if (!Utility.IsPlayerValid(player)) return;
 
@@ -283,7 +289,7 @@ namespace WeaponPaints
 					DateTime.UtcNow >= (commandsCooldown.TryGetValue((int)player.UserId, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
 				{
 					commandsCooldown[(int)player.UserId] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
-					ChatMenus.OpenMenu(player, weaponSelectionMenu);
+					MenuManager.OpenChatMenu(player, weaponSelectionMenu);
 					return;
 				}
 				if (!string.IsNullOrEmpty(Localizer["wp_command_cooldown"]))

Config.cs

@@ -3,13 +3,9 @@ using System.Text.Json.Serialization;
 
 namespace WeaponPaints
 {
-	public class AdditionalSetting
+	public class Additional
 	{
-        
-        [JsonPropertyName("UseMetamodAlwaysLegacyModel")]
-        public bool UseMetamodAlwaysLegacyModel { get; set; } = false;
-
-        [JsonPropertyName("SkinVisibilityFix")]
+		[JsonPropertyName("SkinVisibilityFix")]
 		public bool SkinVisibilityFix { get; set; } = true;
 
 		[JsonPropertyName("KnifeEnabled")]
@@ -18,13 +14,7 @@ namespace WeaponPaints
 		[JsonPropertyName("SkinEnabled")]
 		public bool SkinEnabled { get; set; } = true;
 
-        [JsonPropertyName("MusicKitEnabled")]
-        public bool MusicKitEnabled { get; set; } = true;
-
-        [JsonPropertyName("NameTagEnabled")]
-        public bool NameTagEnabled { get; set; } = true;
-
-        [JsonPropertyName("CommandWpEnabled")]
+		[JsonPropertyName("CommandWpEnabled")]
 		public bool CommandWpEnabled { get; set; } = true;
 
 		[JsonPropertyName("CommandKillEnabled")]
@@ -56,7 +46,7 @@ namespace WeaponPaints
 
 	public class WeaponPaintsConfig : BasePluginConfig
 	{
-		public override int Version { get; set; } = 5;
+		public override int Version { get; set; } = 4;
 
 		[JsonPropertyName("DatabaseHost")]
 		public string DatabaseHost { get; set; } = "";
@@ -85,8 +75,8 @@ namespace WeaponPaints
 		[JsonPropertyName("Website")]
 		public string Website { get; set; } = "example.com/skins";
 
-		[JsonPropertyName("AdditionalSetting")]
-		public AdditionalSetting AdditionalSetting { get; set; } = new AdditionalSetting();
+		[JsonPropertyName("Additional")]
+		public Additional Additional { get; set; } = new Additional();
 	}
 
 }

Database.cs

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

Events.cs

@@ -1,7 +1,5 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
-using CounterStrikeSharp.API.Modules.Entities;
-using System.Numerics;
 
 namespace WeaponPaints
 {
@@ -11,50 +9,52 @@ namespace WeaponPaints
 		{
 			CCSPlayerController? player = Utilities.GetPlayerFromSlot(playerSlot);
 
+			if (player == null || !player.IsValid || player.IsBot || player.IsHLTV || weaponSync == null || player.Connected == PlayerConnectedState.PlayerDisconnecting) return;
+
 			PlayerInfo playerInfo = new PlayerInfo
 			{
 				UserId = player.UserId,
 				Index = (int)player.Index,
-                SteamId = player.SteamID,
-				Name = player?.PlayerName,
-				IpAddress = player?.IpAddress?.Split(":")[0]
+				SteamId = player.SteamID.ToString(),
+				Name = player.PlayerName,
+				IpAddress = player.IpAddress?.Split(":")[0]
 			};
 
-            if (player == null || !player.IsValid || player.IsBot || player.IsHLTV || weaponSync == null) return;
-
-            Task.Run(async () =>
+			if (!gPlayerWeaponsInfo.ContainsKey((int)player.Index))
 			{
-				await weaponSync.GetPlayerDatabaseIndex(playerInfo);
-			});
-        }
+				_ = Task.Run(async () =>
+				{
+					if (Config.Additional.SkinEnabled)
+						await weaponSync.GetWeaponPaintsFromDatabase(playerInfo);
+
+					if (Config.Additional.KnifeEnabled)
+						await weaponSync.GetKnifeFromDatabase(playerInfo);
+				});
+			}
+		}
 
 		private void OnClientDisconnect(int playerSlot)
 		{
 			CCSPlayerController player = Utilities.GetPlayerFromSlot(playerSlot);
 
-			if (player == null || !player.IsValid || player.IsBot || player.IsHLTV || player.UserId == null) return;
+			if (player == null || !player.IsValid || player.IsBot || player.IsHLTV || player.UserId == null)
+				return;
 
-            g_playersDatabaseIndex.TryRemove((int)player.Index, out _);
-            if (Config.AdditionalSetting.KnifeEnabled)
+			if (Config.Additional.KnifeEnabled)
 				g_playersKnife.TryRemove((int)player.Index, out _);
-			if (Config.AdditionalSetting.SkinEnabled)
+
+			if (Config.Additional.SkinEnabled && gPlayerWeaponsInfo.TryGetValue((int)player.Index, out var innerDictionary))
 			{
-				if (gPlayerWeaponsInfo.TryRemove((int)player.Index, out var innerDictionary))
-				{
-					innerDictionary.Clear();
-				}
-			}
-            if (Config.AdditionalSetting.MusicKitEnabled)
-                g_playersMusicKit.TryRemove((int)player.Index, out _);
-            if (commandsCooldown.ContainsKey((int)player.UserId))
-			{
-				commandsCooldown.Remove((int)player.UserId);
+				innerDictionary.Clear();
+				gPlayerWeaponsInfo.TryRemove((int)player.Index, out _);
 			}
+
+			commandsCooldown.Remove((int)player.UserId);
 		}
 
 		private void OnEntityCreated(CEntityInstance entity)
 		{
-			if (!Config.AdditionalSetting.SkinEnabled) return;
+			if (!Config.Additional.SkinEnabled) return;
 			if (entity == null || !entity.IsValid || string.IsNullOrEmpty(entity.DesignerName)) return;
 			string designerName = entity.DesignerName;
 			if (!weaponList.ContainsKey(designerName)) return;
@@ -94,108 +94,123 @@ namespace WeaponPaints
 			if (player == null || !player.IsValid) return HookResult.Continue;
 
 			/*
-			if (Config.AdditionalSetting.SkinVisibilityFix)
+			if (Config.Additional.SkinVisibilityFix)
 				AddTimer(0.2f, () => RefreshSkins(player));
 			*/
 
 			return HookResult.Continue;
 		}
-            /*
-            private HookResult OnItemPickup(EventItemPickup @event, GameEventInfo info)
-            {
-                if (@event.Defindex == 42 || @event.Defindex == 59)
-                {
-                    CCSPlayerController? player = @event.Userid;
-                    if (player == null || !player.IsValid || !g_knifePickupCount.ContainsKey((int)player.Index) || player.IsBot || !g_playersKnife.ContainsKey((int)player.Index))
-                        return HookResult.Continue;
+
+		/*
+		private HookResult OnItemPickup(EventItemPickup @event, GameEventInfo info)
+		{
+			if (@event.Defindex == 42 || @event.Defindex == 59)
+			{
+				CCSPlayerController? player = @event.Userid;
+				if (player == null || !player.IsValid || !g_knifePickupCount.ContainsKey((int)player.Index) || player.IsBot || !g_playersKnife.ContainsKey((int)player.Index))
+					return HookResult.Continue;
 
 
-                    if (g_knifePickupCount[(int)player.Index] >= 2) return HookResult.Continue;
+				if (g_knifePickupCount[(int)player.Index] >= 2) return HookResult.Continue;
 
-                    if (g_playersKnife.ContainsKey((int)player.Index)
-                        &&
-                       g_playersKnife[(int)player.Index] != "weapon_knife")
-                    {
-                        g_knifePickupCount[(int)player.Index]++;
+				if (g_playersKnife.ContainsKey((int)player.Index)
+					&&
+				   g_playersKnife[(int)player.Index] != "weapon_knife")
+				{
+					g_knifePickupCount[(int)player.Index]++;
 
-                        RemovePlayerKnife(player, true);
+					RemovePlayerKnife(player, true);
 
-                        if (!PlayerHasKnife(player) && Config.AdditionalSetting.GiveKnifeAfterRemove)
-                            AddTimer(0.3f, () => GiveKnifeToPlayer(player));
-                    }
-                }
-                return HookResult.Continue;
-            }
-            */
+					if (!PlayerHasKnife(player) && Config.Additional.GiveKnifeAfterRemove)
+						AddTimer(0.3f, () => GiveKnifeToPlayer(player));
+				}
+			}
+			return HookResult.Continue;
+		}
+		*/
 
-            public HookResult OnPickup(CEntityIOOutput output, string name, CEntityInstance activator, CEntityInstance caller, CVariant value, float delay)
+		public HookResult OnPickup(CEntityIOOutput output, string name, CEntityInstance activator, CEntityInstance caller, CVariant value, float delay)
 		{
 			CCSPlayerController? player = Utilities.GetEntityFromIndex<CCSPlayerPawn>((int)activator.Index).OriginalController.Value;
 
-			if (player == null || player.IsBot || player.IsHLTV)
-				return HookResult.Continue;
-
-			if (player == null || !player.IsValid || player.SteamID.ToString() == "" ||
-				!g_knifePickupCount.ContainsKey((int)player.Index) || !g_playersKnife.ContainsKey((int)player.Index))
+			if (player == null || player.IsBot || player.IsHLTV ||
+				player.SteamID.ToString() == "" || !g_knifePickupCount.TryGetValue((int)player.Index, out var pickupCount) ||
+				!g_playersKnife.ContainsKey((int)player.Index))
+			{
 				return HookResult.Continue;
+			}
 
 			CBasePlayerWeapon weapon = new(caller.Handle);
 
 			if (weapon.AttributeManager.Item.ItemDefinitionIndex != 42 && weapon.AttributeManager.Item.ItemDefinitionIndex != 59)
+			{
 				return HookResult.Continue;
+			}
 
-			if (g_knifePickupCount[(int)player.Index] >= 2) return HookResult.Continue;
+			if (pickupCount >= 2)
+			{
+				return HookResult.Continue;
+			}
 
 			if (g_playersKnife[(int)player.Index] != "weapon_knife")
 			{
-				g_knifePickupCount[(int)player.Index]++;
+				pickupCount++;
+				g_knifePickupCount[(int)player.Index] = pickupCount;
 				player.RemoveItemByDesignerName(weapon.DesignerName);
-				if (Config.AdditionalSetting.GiveKnifeAfterRemove)
+				if (Config.Additional.GiveKnifeAfterRemove)
+				{
 					AddTimer(0.2f, () => GiveKnifeToPlayer(player));
+				}
 			}
 
 			return HookResult.Continue;
 		}
-        private void OnMapStart(string mapName)
-		{
-			if (!Config.AdditionalSetting.KnifeEnabled) return;
-            // TODO
-            // needed for now
-            AddTimer(2.0f, () =>
-			{
 
+		private void OnMapStart(string mapName)
+		{
+			if (!Config.Additional.KnifeEnabled && !Config.Additional.SkinEnabled) return;
+
+			if (_database != null)
+				weaponSync = new WeaponSynchronization(_database, Config, GlobalShareApi, GlobalShareServerId);
+
+			// TODO
+			// needed for now
+			AddTimer(2.0f, () =>
+			{
 				NativeAPI.IssueServerCommand("mp_t_default_melee \"\"");
 				NativeAPI.IssueServerCommand("mp_ct_default_melee \"\"");
 				NativeAPI.IssueServerCommand("mp_equipment_reset_rounds 0");
 
-                if (Config.GlobalShare)
+				if (Config.GlobalShare)
 					GlobalShareConnect();
-
-				weaponSync = new WeaponSynchronization(DatabaseConnectionString, Config, GlobalShareApi, GlobalShareServerId);
 			});
 
+			/*
 			g_hTimerCheckSkinsData = AddTimer(10.0f, () =>
 			{
 				List<CCSPlayerController> players = Utilities.GetPlayers();
-                HashSet<int> playerIndexes = new HashSet<int>(gPlayerWeaponsInfo.Keys);
-                foreach (CCSPlayerController player in players)
+
+				foreach (CCSPlayerController player in players)
 				{
 					if (player.IsBot || player.IsHLTV || player.SteamID.ToString() == "") continue;
-					//if (gPlayerWeaponsInfo.ContainsKey((int)player.Index)) continue;
-                    if (playerIndexes.Contains((int)player.Index)) continue;
+					if (gPlayerWeaponsInfo.ContainsKey((int)player.Index)) continue;
 
-                    PlayerInfo playerInfo = new PlayerInfo
+					PlayerInfo playerInfo = new PlayerInfo
 					{
 						UserId = player.UserId,
 						Index = (int)player.Index,
-                        SteamId = player?.SteamID,
+						SteamId = player?.SteamID.ToString(),
 						Name = player?.PlayerName,
 						IpAddress = player?.IpAddress?.Split(":")[0]
 					};
-                    if (weaponSync != null)
-                        _ = weaponSync.GetKnifeFromDatabase(playerInfo);
-                }
+
+					if (Config.Additional.SkinEnabled && weaponSync != null)
+						_ = weaponSync.GetWeaponPaintsFromDatabase(playerInfo);
+					if (Config.Additional.KnifeEnabled && weaponSync != null)
+						_ = weaponSync.GetKnifeFromDatabase(playerInfo);
+				}
 			}, CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE | CounterStrikeSharp.API.Modules.Timers.TimerFlags.REPEAT);
+			*/
 		}
 
 		private HookResult OnPlayerConnectFull(EventPlayerConnectFull @event, GameEventInfo info)
@@ -208,19 +223,22 @@ namespace WeaponPaints
 			{
 				UserId = player.UserId,
 				Index = (int)player.Index,
-				SteamId = player?.SteamID,
+				SteamId = player?.SteamID.ToString(),
 				Name = player?.PlayerName,
 				IpAddress = player?.IpAddress?.Split(":")[0]
 			};
 
-			if (!g_playersDatabaseIndex.ContainsKey((int)player!.Index))
+			if (!gPlayerWeaponsInfo.ContainsKey((int)player!.Index))
 			{
 				Console.WriteLine($"[WeaponPaints] Retrying to retrieve player {player.PlayerName} skins");
 				Task.Run(async () =>
 				{
-                    await weaponSync.GetPlayerDatabaseIndex(playerInfo);
-                });
-            }
+					if (Config.Additional.SkinEnabled)
+						await weaponSync.GetWeaponPaintsFromDatabase(playerInfo);
+					if (Config.Additional.KnifeEnabled)
+						await weaponSync.GetKnifeFromDatabase(playerInfo);
+				});
+			}
 
 			return HookResult.Continue;
 		}
@@ -228,24 +246,13 @@ namespace WeaponPaints
 		private HookResult OnPlayerSpawn(EventPlayerSpawn @event, GameEventInfo info)
 		{
 			CCSPlayerController? player = @event.Userid;
-			if (player == null || !player.IsValid)
+			if (player == null || !player.IsValid || !Config.Additional.KnifeEnabled || PlayerHasKnife(player))
 			{
 				return HookResult.Continue;
 			}
 
-			if (Config.AdditionalSetting.KnifeEnabled && !PlayerHasKnife(player))
-			{
-				g_knifePickupCount[(int)player.Index] = 0;
-				GiveKnifeToPlayer(player);
-				//AddTimer(0.1f, () => GiveKnifeToPlayer(player));
-			}
-
-			/*
-			if (Config.AdditionalSetting.SkinVisibilityFix)
-			{
-				AddTimer(0.3f, () => RefreshSkins(player));
-			}
-			*/
+			g_knifePickupCount[(int)player.Index] = 0;
+			GiveKnifeToPlayer(player);
 
 			return HookResult.Continue;
 		}
@@ -273,36 +280,51 @@ namespace WeaponPaints
 			{
 				try
 				{
-					if (player == null || !player.IsValid || !player.PawnIsAlive || player.IsBot || player.IsHLTV) continue;
+					if (player is null || !player.IsValid || !player.PawnIsAlive || player.IsBot || player.IsHLTV || player.Connected != PlayerConnectedState.PlayerConnected)
+						continue;
 
 					var viewModels = GetPlayerViewModels(player);
-
-					if (viewModels == null) continue;
+					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;
-					CBasePlayerWeapon weapon = viewModel.Value.Weapon.Value;
+					if (viewModel == null || viewModel.Value == null || viewModel.Value.Weapon == null || viewModel.Value.Weapon.Value == null)
+						continue;
 
-					if (weapon == null || !weapon.IsValid) continue;
+					var weapon = viewModel.Value.Weapon.Value;
+					if (weapon == null || !weapon.IsValid)
+						continue;
 
-					var isKnife = viewModel.Value.VMName.Contains("knife");
+					if (viewModel.Value.VMName.Contains("knife"))
+						continue;
 
-					if (!isKnife)
+					var sceneNode = viewModel.Value.CBodyComponent?.SceneNode;
+					if (sceneNode == null)
+						continue;
+
+					var skeleton = GetSkeletonInstance(sceneNode);
+					if (skeleton == null)
+						continue;
+
+					int[] knifePaintKits = { 1171, 1170, 1169, 1164, 1162, 1161, 1159, 1175, 1174, 1167, 1165, 1168, 1163, 1160, 1166, 1173 };
+					if (knifePaintKits.Contains(weapon.FallbackPaintKit))
 					{
-						if (
-							viewModel.Value.CBodyComponent != null
-							&& viewModel.Value.CBodyComponent.SceneNode != null
-							&& weapon.CBodyComponent!.SceneNode!.GetSkeletonInstance().ModelState.MeshGroupMask != 2
-                        )
-						{
-                            weapon.CBodyComponent!.SceneNode!.GetSkeletonInstance().ModelState.MeshGroupMask = 2;
-                        }
-
-						Utilities.SetStateChanged(viewModel.Value, "CBaseEntity", "m_CBodyComponent");
+						skeleton.ModelState.MeshGroupMask = 1;
 					}
+					else
+					{
+						if (skeleton.ModelState.MeshGroupMask != 2)
+						{
+							skeleton.ModelState.MeshGroupMask = 2;
+						}
+					}
+
+					Utilities.SetStateChanged(viewModel.Value, "CBaseEntity", "m_CBodyComponent");
 				}
 				catch (Exception)
-				{ }
+				{
+					// Handle exceptions silently
+				}
 			}
 		}
 
@@ -312,18 +334,16 @@ namespace WeaponPaints
 			RegisterListener<Listeners.OnClientPutInServer>(OnClientPutInServer);
 			RegisterListener<Listeners.OnClientDisconnect>(OnClientDisconnect);
 			RegisterListener<Listeners.OnMapStart>(OnMapStart);
+			RegisterListener<Listeners.OnTick>(OnTick);
 
-            if (!Config.AdditionalSetting.UseMetamodAlwaysLegacyModel)
-				RegisterListener<Listeners.OnTick>(OnTick);
-
-            RegisterEventHandler<EventPlayerConnectFull>(OnPlayerConnectFull);
+			//RegisterEventHandler<EventPlayerConnectFull>(OnPlayerConnectFull);
 			RegisterEventHandler<EventPlayerSpawn>(OnPlayerSpawn);
 			RegisterEventHandler<EventRoundStart>(OnRoundStart, HookMode.Pre);
 			RegisterEventHandler<EventRoundEnd>(OnRoundEnd);
-			RegisterEventHandler<EventItemPurchase>(OnEventItemPurchasePost);
+			//RegisterEventHandler<EventItemPurchase>(OnEventItemPurchasePost);
 			//RegisterEventHandler<EventItemPickup>(OnItemPickup);
 			HookEntityOutput("weapon_knife", "OnPlayerPickup", OnPickup, HookMode.Pre);
-        }
+		}
 
 
 		/* WORKAROUND FOR CLIENTS WITHOUT STEAMID ON AUTHORIZATION */
@@ -334,15 +354,15 @@ namespace WeaponPaints
 			if (player == null || !player.IsValid || !player.EntityIndex.HasValue || player.IsHLTV) return HookResult.Continue;
 
 			int playerIndex = (int)player.EntityIndex.Value.Value;
-			if (Config.AdditionalSetting.SkinEnabled && weaponSync != null)
+			if (Config.Additional.SkinEnabled && weaponSync != null)
 				_ = weaponSync.GetWeaponPaintsFromDatabase(playerIndex);
-			if (Config.AdditionalSetting.KnifeEnabled && weaponSync != null)
+			if (Config.Additional.KnifeEnabled && weaponSync != null)
 				_ = weaponSync.GetKnifeFromDatabase(playerIndex);
 
 			Task.Run(async () =>
 			{
-				if (Config.AdditionalSetting.SkinEnabled && weaponSync != null)
-				if (Config.AdditionalSetting.KnifeEnabled && weaponSync != null)
+				if (Config.Additional.SkinEnabled && weaponSync != null)
+				if (Config.Additional.KnifeEnabled && weaponSync != null)
 			});
 
 			return HookResult.Continue;

PlayerInfo.cs

@@ -4,8 +4,8 @@
 	{
 		public int Index { get; set; }
 		public int? UserId { get; set; }
-		public ulong? SteamId { get; set; }
+		public string? SteamId { get; set; }
 		public string? Name { get; set; }
 		public string? IpAddress { get; set; }
-    }
+	}
 }

README.md

@@ -23,7 +23,8 @@ Unfinished, unoptimized and not fully functional ugly demo weapon paints plugin
 ## CS2 Server
 - Have working CounterStrikeSharp (**with RUNTIME!**)
 - Download from Release and copy plugin to plugins
-- Setup `addons/counterstrikesharp/configs/`**`plugins/WeaponPaints/WeaponPaints.json`** set **`GlobalShare`** to **`true`** for global, or include database credentials
+- Run server with plugin, **it will generate config if installed correctly!**
+- Edit `addons/counterstrikesharp/configs/`**`plugins/WeaponPaints/WeaponPaints.json`** set **`GlobalShare`** to **`true`** for global, or include database credentials
 - In `addons/counterstrikesharp/configs/`**`core.json`** set **FollowCS2ServerGuidelines** to **`false`**
 
 ## Plugin Configuration
@@ -88,6 +89,7 @@ Disregard if the config is **`GlobalShare = true`**
 
 ## 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
@@ -100,6 +102,9 @@ Plugin is not loaded or configured with mysql credentials. Tables are auto-creat
 
 **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/)

Utility.cs

@@ -1,11 +1,11 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using Dapper;
-using MySqlConnector;
-using Newtonsoft.Json.Linq;
-using Newtonsoft.Json;
-using System.Reflection;
 using Microsoft.Extensions.Logging;
+using MySqlConnector;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System.Reflection;
 
 namespace WeaponPaints
 {
@@ -23,11 +23,13 @@ namespace WeaponPaints
 				Password = Config.DatabasePassword,
 				Database = Config.DatabaseName,
 				Port = (uint)Config.DatabasePort,
+				Pooling = true
 			};
 
 			return builder.ConnectionString;
 		}
-        internal static async void CheckDatabaseTables()
+
+		internal static async void CheckDatabaseTables()
 		{
 			try
 			{
@@ -36,22 +38,15 @@ namespace WeaponPaints
 
 				using var transaction = await connection.BeginTransactionAsync();
 
-                // Minimal version for MySQL 5.6.5
-                string[] sqlCommands = new string[]
-                {
-					"CREATE TABLE IF NOT EXISTS `wp_users` (`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 (`id`), UNIQUE KEY `unique_steamid` (`steamid`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;",
-					"CREATE TABLE IF NOT EXISTS `wp_users_items` (`user_id` INT 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, `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_knife` (`user_id` INT UNSIGNED NOT NULL, `knife` VARCHAR(32) DEFAULT NULL, PRIMARY KEY (`user_id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;",
-					"CREATE TABLE IF NOT EXISTS `wp_users_music` (`user_id` INT UNSIGNED NOT NULL, `music` SMALLINT UNSIGNED DEFAULT NULL, PRIMARY KEY (`user_id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;"
-				};
-                try
+				try
 				{
-                    foreach (string command in sqlCommands)
-                    {
-                        await connection.ExecuteAsync(command, transaction: transaction);
-                    }
+					string createTable1 = "CREATE TABLE IF NOT EXISTS `wp_player_skins` (`steamid` varchar(64) NOT NULL, `weapon_defindex` int(6) NOT NULL, `weapon_paint_id` int(6) NOT NULL, `weapon_wear` float NOT NULL DEFAULT 0.000001, `weapon_seed` int(16) NOT NULL DEFAULT 0) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci";
+					string createTable2 = "CREATE TABLE IF NOT EXISTS `wp_player_knife` (`steamid` varchar(64) NOT NULL, `knife` varchar(64) NOT NULL, UNIQUE (`steamid`)) ENGINE = InnoDB";
 
-                    await transaction.CommitAsync();
+					await connection.ExecuteAsync(createTable1, transaction: transaction);
+					await connection.ExecuteAsync(createTable2, transaction: transaction);
+
+					await transaction.CommitAsync();
 				}
 				catch (Exception)
 				{
@@ -71,15 +66,15 @@ namespace WeaponPaints
 		}
 		internal static void LoadSkinsFromFile(string filePath)
 		{
-			if (File.Exists(filePath))
+			try
 			{
 				string json = File.ReadAllText(filePath);
 				var deserializedSkins = JsonConvert.DeserializeObject<List<JObject>>(json);
 				WeaponPaints.skinsList = deserializedSkins ?? new List<JObject>();
 			}
-			else
+			catch (FileNotFoundException)
 			{
-				throw new FileNotFoundException("File not found.", filePath);
+				throw;
 			}
 		}
 
@@ -120,11 +115,11 @@ namespace WeaponPaints
 			{
 				try
 				{
-					HttpResponseMessage response = await client.GetAsync("https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/VERSION");
+					HttpResponseMessage response = await client.GetAsync("https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/VERSION").ConfigureAwait(false);
 
 					if (response.IsSuccessStatusCode)
 					{
-						string remoteVersion = await response.Content.ReadAsStringAsync();
+						string remoteVersion = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
 						remoteVersion = remoteVersion.Trim();
 
 						int comparisonResult = string.Compare(version, remoteVersion);
@@ -147,9 +142,13 @@ namespace WeaponPaints
 						logger.LogWarning("Failed to check version");
 					}
 				}
+				catch (HttpRequestException ex)
+				{
+					logger.LogError(ex, "Failed to connect to the version server.");
+				}
 				catch (Exception ex)
 				{
-					Console.WriteLine(ex);
+					logger.LogError(ex, "An error occurred while checking version.");
 				}
 			}
 		}

VERSION

@@ -1 +1 @@
-1.4b
+1.6a

WeaponAction.cs

@@ -19,14 +19,14 @@ namespace WeaponPaints
 
 			if (isKnife && !g_playersKnife.ContainsKey(playerIndex) || isKnife && g_playersKnife[playerIndex] == "weapon_knife") return;
 
-			ushort weaponDefIndex = weapon.AttributeManager.Item.ItemDefinitionIndex;
+			int weaponDefIndex = weapon.AttributeManager.Item.ItemDefinitionIndex;
 
 			if (isKnife)
 			{
 				weapon.AttributeManager.Item.EntityQuality = 3;
 			}
 
-			if (_config.AdditionalSetting.GiveRandomSkin &&
+			if (_config.Additional.GiveRandomSkin &&
 				 !gPlayerWeaponsInfo[playerIndex].ContainsKey(weaponDefIndex))
 			{
 				// Random skins
@@ -35,12 +35,23 @@ namespace WeaponPaints
 				weapon.AttributeManager.Item.ItemIDHigh = weapon.AttributeManager.Item.ItemIDLow >> 32;
 				weapon.FallbackPaintKit = GetRandomPaint(weaponDefIndex);
 				weapon.FallbackSeed = 0;
-				weapon.FallbackWear = 0.00001f;
+				weapon.FallbackWear = 0.000001f;
 				if (!isKnife && weapon.CBodyComponent != null && weapon.CBodyComponent.SceneNode != null)
 				{
-					if (weapon.CBodyComponent!.SceneNode!.GetSkeletonInstance().ModelState.MeshGroupMask != 2)
+					var skeleton = GetSkeletonInstance(weapon.CBodyComponent.SceneNode);
+
+					int[] array = { 1171, 1170, 1169, 1164, 1162, 1161, 1159, 1175, 1174, 1167, 1165, 1168, 1163, 1160, 1166, 1173 };
+					int fallbackPaintKit = weapon.FallbackPaintKit;
+					if (array.Contains(fallbackPaintKit))
 					{
-						weapon.CBodyComponent!.SceneNode!.GetSkeletonInstance().ModelState.MeshGroupMask = 2;
+						skeleton.ModelState.MeshGroupMask = 1;
+					}
+					else
+					{
+						if (skeleton.ModelState.MeshGroupMask != 2)
+						{
+							skeleton.ModelState.MeshGroupMask = 2;
+						}
 					}
 				}
 				return;
@@ -56,44 +67,59 @@ namespace WeaponPaints
 			weapon.FallbackSeed = weaponInfo.Seed;
 			weapon.FallbackWear = weaponInfo.Wear;
 
-            if (!isKnife && weapon.CBodyComponent != null && weapon.CBodyComponent.SceneNode != null)
+			if (!isKnife && weapon.CBodyComponent != null && weapon.CBodyComponent.SceneNode != null)
 			{
-                if (weapon.CBodyComponent!.SceneNode!.GetSkeletonInstance().ModelState.MeshGroupMask != 2)
+				var skeleton = GetSkeletonInstance(weapon.CBodyComponent.SceneNode);
+				int[] array = { 1171, 1170, 1169, 1164, 1162, 1161, 1159, 1175, 1174, 1167, 1165, 1168, 1163, 1160, 1166, 1173 };
+				int fallbackPaintKit = weapon.FallbackPaintKit;
+				if (array.Contains(fallbackPaintKit))
 				{
-                    weapon.CBodyComponent!.SceneNode!.GetSkeletonInstance().ModelState.MeshGroupMask = 2;
-                }
-            }
-            
-        }
+					skeleton.ModelState.MeshGroupMask = 1;
+				}
+				else
+				{
+					if (skeleton.ModelState.MeshGroupMask != 2)
+					{
+						skeleton.ModelState.MeshGroupMask = 2;
+					}
+				}
+			}
+		}
 
 		internal static void GiveKnifeToPlayer(CCSPlayerController? player)
 		{
-			if (!_config.AdditionalSetting.KnifeEnabled || player == null || !player.IsValid) return;
+			if (!_config.Additional.KnifeEnabled || player == null || !player.IsValid) return;
 
+			string knifeToGive;
 			if (g_playersKnife.TryGetValue((int)player.Index, out var knife))
 			{
-				player.GiveNamedItem(knife);
+				knifeToGive = knife;
 			}
-			else if (_config.AdditionalSetting.GiveRandomKnife)
+			else if (_config.Additional.GiveRandomKnife)
 			{
-				var knifeTypes = weaponList.Where(pair => pair.Key.StartsWith("weapon_knife") || pair.Key.StartsWith("weapon_bayonet")).ToDictionary(pair => pair.Key, pair => pair.Value);
+				var knifeTypes = weaponList.Where(pair => pair.Key.StartsWith("weapon_knife") || pair.Key.StartsWith("weapon_bayonet")).ToList();
+
+				if (knifeTypes.Count == 0)
+				{
+					Utility.Log("No valid knife types found.");
+					return;
+				}
 
 				Random random = new();
 				int index = random.Next(knifeTypes.Count);
-				var randomKnifeClass = knifeTypes.Keys.ElementAt(index);
-
-				player.GiveNamedItem(randomKnifeClass);
+				knifeToGive = knifeTypes[index].Key;
 			}
 			else
 			{
-				var defaultKnife = (CsTeam)player.TeamNum == CsTeam.Terrorist ? "weapon_knife_t" : "weapon_knife";
-				player.GiveNamedItem(defaultKnife);
+				knifeToGive = (CsTeam)player.TeamNum == CsTeam.Terrorist ? "weapon_knife_t" : "weapon_knife";
 			}
+
+			player.GiveNamedItem(knifeToGive);
 		}
 
 		internal static bool PlayerHasKnife(CCSPlayerController? player)
 		{
-			if (!_config.AdditionalSetting.KnifeEnabled) return false;
+			if (!_config.Additional.KnifeEnabled) return false;
 
 			if (player == null || !player.IsValid || player.PlayerPawn == null || !player.PlayerPawn.IsValid || !player.PawnIsAlive)
 			{
@@ -120,6 +146,7 @@ namespace WeaponPaints
 
 		internal void RefreshPlayerKnife(CCSPlayerController? player)
 		{
+			return;
 			if (player == null || !player.IsValid || player.PlayerPawn.Value == null || !player.PawnIsAlive) return;
 			if (player.PlayerPawn.Value.WeaponServices == null || player.PlayerPawn.Value.ItemServices == null) return;
 
@@ -175,7 +202,7 @@ namespace WeaponPaints
 				}
 			}
 		}
-        /*
+
 		internal void RefreshSkins(CCSPlayerController? player)
 		{
 			return;
@@ -185,68 +212,71 @@ namespace WeaponPaints
 			AddTimer(0.25f, () => NativeAPI.IssueClientCommand((int)player.Index - 1, "slot2"));
 			AddTimer(0.38f, () => NativeAPI.IssueClientCommand((int)player.Index - 1, "slot1"));
 		}
-		*/
-        internal void RefreshWeapons(CCSPlayerController? player)
+
+		internal void RefreshWeapons(CCSPlayerController? player)
 		{
-			if (player == null || !player.IsValid || player.PlayerPawn.Value == null || !player.PawnIsAlive) return;
-			if (player.PlayerPawn.Value.WeaponServices == null || player.PlayerPawn.Value.ItemServices == null) return;
+			if (player == null || !player.IsValid || player.PlayerPawn?.Value == null || !player.PawnIsAlive)
+				return;
+
+			if (player.PlayerPawn.Value.WeaponServices == null || player.PlayerPawn.Value.ItemServices == null)
+				return;
 
 			var weapons = player.PlayerPawn.Value.WeaponServices.MyWeapons;
-			if (weapons != null && weapons.Count > 0)
+			if (weapons == null || weapons.Count == 0)
+				return;
+
+			var itemServices = new CCSPlayer_ItemServices(player.PlayerPawn.Value.ItemServices.Handle);
+
+			foreach (var weapon in weapons)
 			{
-				CCSPlayer_ItemServices service = new(player.PlayerPawn.Value.ItemServices.Handle);
+				if (weapon == null || !weapon.IsValid || weapon.Value == null || !weapon.Value.IsValid || weapon.Index <= 0 || !weapon.Value.DesignerName.Contains("weapon_"))
+					continue;
 
-				foreach (var weapon in weapons)
+				try
 				{
-					if (weapon != null && weapon.IsValid && weapon.Value != null && weapon.Value.IsValid)
+					string? weaponByDefindex = null;
+
+					if (weapon.Value.DesignerName.Contains("knife") || weapon.Value.DesignerName.Contains("bayonet"))
 					{
-						if (weapon.Index <= 0 || !weapon.Value.DesignerName.Contains("weapon_")) continue;
-						//if (weapon.Value.AttributeManager.Item.ItemDefinitionIndex == 42 || weapon.Value.AttributeManager.Item.ItemDefinitionIndex == 59)
-						try
+						player.RemoveItemByDesignerName(weapon.Value.DesignerName, false);
+						GiveKnifeToPlayer(player);
+					}
+					else
+					{
+						if (weaponDefindex.TryGetValue(weapon.Value.AttributeManager.Item.ItemDefinitionIndex, out weaponByDefindex) && weaponByDefindex != null)
 						{
-							if (weapon.Value.DesignerName.Contains("knife") || weapon.Value.DesignerName.Contains("bayonet"))
+							int clip1 = weapon.Value.Clip1;
+							int reservedAmmo = weapon.Value.ReserveAmmo[0];
+
+							player.RemoveItemByDesignerName(weapon.Value.DesignerName, false);
+							var newWeapon = new CBasePlayerWeapon(player.GiveNamedItem(weaponByDefindex));
+
+							Server.NextFrame(() =>
 							{
-								player.RemoveItemByDesignerName(weapon.Value.DesignerName, true);
-								GiveKnifeToPlayer(player);
-							}
-							else
-							{
-								if (!WeaponDefindex.ContainsKey(weapon.Value.AttributeManager.Item.ItemDefinitionIndex)) continue;
-								int clip1, reservedAmmo;
-
-								clip1 = weapon.Value.Clip1;
-								reservedAmmo = weapon.Value.ReserveAmmo[0];
-
-								string weaponByDefindex = WeaponDefindex[weapon.Value.AttributeManager.Item.ItemDefinitionIndex];
-								player.RemoveItemByDesignerName(weapon.Value.DesignerName, true);
-								CBasePlayerWeapon newWeapon = new(player.GiveNamedItem(weaponByDefindex));
-
-								Server.NextFrame(() =>
+								try
 								{
-									if (newWeapon == null) return;
-									try
+									if (newWeapon != null)
 									{
 										newWeapon.Clip1 = clip1;
 										newWeapon.ReserveAmmo[0] = reservedAmmo;
 									}
-									catch (Exception)
-									{ }
-								});
-							}
+								}
+								catch (Exception ex)
+								{
+									Logger.LogWarning("Error setting weapon properties: " + ex.Message);
+								}
+							});
 						}
-						catch (Exception ex)
+						else
 						{
-							Logger.LogWarning("Refreshing weapons exception");
-							Console.WriteLine("[WeaponPaints] Refreshing weapons exception");
-							Console.WriteLine(ex.Message);
+							Logger.LogWarning("Unable to find weapon by defindex.");
 						}
 					}
 				}
-
-				/*
-				if (Config.AdditionalSetting.SkinVisibilityFix)
-					RefreshSkins(player);
-				*/
+				catch (Exception ex)
+				{
+					Logger.LogWarning("Refreshing weapons exception: " + ex.Message);
+				}
 			}
 		}
 
@@ -259,13 +289,11 @@ namespace WeaponPaints
 			if (weapons != null && weapons.Count > 0)
 			{
 				CCSPlayer_ItemServices service = new CCSPlayer_ItemServices(player.PlayerPawn.Value.ItemServices.Handle);
-				//var dropWeapon = VirtualFunction.CreateVoid<nint, nint>(service.Handle, GameData.GetOffset("CCSPlayer_ItemServices_DropActivePlayerWeapon"));
 
 				foreach (var weapon in weapons)
 				{
 					if (weapon != null && weapon.IsValid && weapon.Value != null && weapon.Value.IsValid)
 					{
-						//if (weapon.Value.AttributeManager.Item.ItemDefinitionIndex == 42 || weapon.Value.AttributeManager.Item.ItemDefinitionIndex == 59)
 						if (weapon.Value.DesignerName.Contains("knife") || weapon.Value.DesignerName.Contains("bayonet"))
 						{
 							if (!force)
@@ -297,28 +325,31 @@ namespace WeaponPaints
 		}
 		private static int GetRandomPaint(int defindex)
 		{
+			if (skinsList == null || skinsList.Count == 0)
+				return 0;
 
-			if (skinsList != null)
-			{
-				Random rnd = new Random();
-				// Filter weapons by the provided defindex
-				var filteredWeapons = skinsList.FindAll(w => w["weapon_defindex"]?.ToString() == defindex.ToString());
+			Random rnd = new Random();
+
+			// Filter weapons by the provided defindex
+			var filteredWeapons = skinsList.Where(w => w["weapon_defindex"]?.ToString() == defindex.ToString()).ToList();
+
+			if (filteredWeapons.Count == 0)
+				return 0;
+
+			var randomWeapon = filteredWeapons[rnd.Next(filteredWeapons.Count)];
+
+			if (int.TryParse(randomWeapon["paint"]?.ToString(), out int paintValue))
+				return paintValue;
 
-				if (filteredWeapons.Count > 0)
-				{
-					var randomWeapon = filteredWeapons[rnd.Next(filteredWeapons.Count)];
-					if (int.TryParse(randomWeapon["paint"]?.ToString(), out int paintValue))
-					{
-						return paintValue;
-					}
-					else
-					{
-						return 0;
-					}
-				}
-			}
 			return 0;
 		}
+
+		private static CSkeletonInstance GetSkeletonInstance(CGameSceneNode node)
+		{
+			Func<nint, nint> GetSkeletonInstance = VirtualFunction.Create<nint, nint>(node.Handle, 8);
+			return new CSkeletonInstance(GetSkeletonInstance(node.Handle));
+		}
+
 		private static unsafe CHandle<CBaseViewModel>[]? GetPlayerViewModels(CCSPlayerController player)
 		{
 			if (player.PlayerPawn.Value == null || player.PlayerPawn.Value.ViewModelServices == null) return null;
@@ -339,5 +370,6 @@ namespace WeaponPaints
 
 			return values;
 		}
+
 	}
 }

WeaponInfo.cs

@@ -2,12 +2,8 @@
 {
 	public class WeaponInfo
 	{
-		public ushort Paint { get; set; }
-		public ushort Seed { get; set; }
+		public int Paint { get; set; }
+		public int Seed { get; set; }
 		public float Wear { get; set; }
-        public string? NameTag { get; set; }
-        public ushort Quality { get; set; }
-        public uint StatTrack { get; set; }
-        public bool StatTrackEnabled { get; set; }
-    }
+	}
 }

WeaponPaints.cs

@@ -4,12 +4,13 @@ using CounterStrikeSharp.API.Core.Attributes;
 using CounterStrikeSharp.API.Modules.Cvars;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
+using MySqlConnector;
 using Newtonsoft.Json.Linq;
 using System.Collections.Concurrent;
 
 namespace WeaponPaints;
 
-[MinimumApiVersion(155)]
+[MinimumApiVersion(163)]
 public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 {
 	internal static readonly Dictionary<string, string> weaponList = new()
@@ -36,6 +37,7 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 		{"weapon_negev", "Negev"},
 		{"weapon_sawedoff", "Sawed-Off"},
 		{"weapon_tec9", "Tec-9"},
+		{"weapon_taser", "Zeus x27"},
 		{"weapon_hkp2000", "P2000"},
 		{"weapon_mp7", "MP7"},
 		{"weapon_mp9", "MP9"},
@@ -67,72 +69,15 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 		{ "weapon_knife_cord", "Paracord Knife" },
 		{ "weapon_knife_canis", "Survival Knife" },
 		{ "weapon_knife_outdoor", "Nomad Knife" },
-		{ "weapon_knife_skeleton", "Skeleton Knife" }
+		{ "weapon_knife_skeleton", "Skeleton Knife" },
+		{ "weapon_knife_kukri", "Kukri Knife" }
 	};
-    public static Dictionary<int, string> WeaponDefindex { get; } = new Dictionary<int, string>
-    {
-        { 1, "weapon_deagle" },
-        { 2, "weapon_elite" },
-        { 3, "weapon_fiveseven" },
-        { 4, "weapon_glock" },
-        { 7, "weapon_ak47" },
-        { 8, "weapon_aug" },
-        { 9, "weapon_awp" },
-        { 10, "weapon_famas" },
-        { 11, "weapon_g3sg1" },
-        { 13, "weapon_galilar" },
-        { 14, "weapon_m249" },
-        { 16, "weapon_m4a1" },
-        { 17, "weapon_mac10" },
-        { 19, "weapon_p90" },
-        { 23, "weapon_mp5sd" },
-        { 24, "weapon_ump45" },
-        { 25, "weapon_xm1014" },
-        { 26, "weapon_bizon" },
-        { 27, "weapon_mag7" },
-        { 28, "weapon_negev" },
-        { 29, "weapon_sawedoff" },
-        { 30, "weapon_tec9" },
-        { 32, "weapon_hkp2000" },
-        { 33, "weapon_mp7" },
-        { 34, "weapon_mp9" },
-        { 35, "weapon_nova" },
-        { 36, "weapon_p250" },
-        { 38, "weapon_scar20" },
-        { 39, "weapon_sg556" },
-        { 40, "weapon_ssg08" },
-        { 60, "weapon_m4a1_silencer" },
-        { 61, "weapon_usp_silencer" },
-        { 63, "weapon_cz75a" },
-        { 64, "weapon_revolver" },
-        { 500, "weapon_bayonet" },
-        { 503, "weapon_knife_css" },
-        { 505, "weapon_knife_flip" },
-        { 506, "weapon_knife_gut" },
-        { 507, "weapon_knife_karambit" },
-        { 508, "weapon_knife_m9_bayonet" },
-        { 509, "weapon_knife_tactical" },
-        { 512, "weapon_knife_falchion" },
-        { 514, "weapon_knife_survival_bowie" },
-        { 515, "weapon_knife_butterfly" },
-        { 516, "weapon_knife_push" },
-        { 517, "weapon_knife_cord" },
-        { 518, "weapon_knife_canis" },
-        { 519, "weapon_knife_ursus" },
-        { 520, "weapon_knife_gypsy_jackknife" },
-        { 521, "weapon_knife_outdoor" },
-        { 522, "weapon_knife_stiletto" },
-        { 523, "weapon_knife_widowmaker" },
-        { 525, "weapon_knife_skeleton" }
-    };
 
-    internal static WeaponPaintsConfig _config = new WeaponPaintsConfig();
+	internal static WeaponPaintsConfig _config = new WeaponPaintsConfig();
 	internal static IStringLocalizer? _localizer;
 	internal static Dictionary<int, int> g_knifePickupCount = new Dictionary<int, int>();
-    internal static ConcurrentDictionary<int, int> g_playersDatabaseIndex = new ConcurrentDictionary<int, int>();
-    internal static ConcurrentDictionary<int, string> g_playersKnife = new ConcurrentDictionary<int, string>();
-    internal static ConcurrentDictionary<int, int?> g_playersMusicKit = new ConcurrentDictionary<int, int?>();
-	internal static ConcurrentDictionary<int, ConcurrentDictionary<ushort, WeaponInfo>> gPlayerWeaponsInfo = new ConcurrentDictionary<int, ConcurrentDictionary<ushort, WeaponInfo>>();
+	internal static ConcurrentDictionary<int, string> g_playersKnife = new ConcurrentDictionary<int, string>();
+	internal static ConcurrentDictionary<int, ConcurrentDictionary<int, WeaponInfo>> gPlayerWeaponsInfo = new ConcurrentDictionary<int, ConcurrentDictionary<int, WeaponInfo>>();
 	internal static List<JObject> skinsList = new List<JObject>();
 	internal static WeaponSynchronization? weaponSync;
 	internal bool g_bCommandsAllowed = true;
@@ -140,13 +85,72 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 	internal Uri GlobalShareApi = new("https://weaponpaints.fun/api.php");
 	internal int GlobalShareServerId = 0;
 	internal static Dictionary<int, DateTime> commandsCooldown = new Dictionary<int, DateTime>();
-	private string DatabaseConnectionString = string.Empty;
-	private CounterStrikeSharp.API.Modules.Timers.Timer? g_hTimerCheckSkinsData = null;
-    public WeaponPaintsConfig Config { get; set; } = new();
+	internal static Database? _database;
+	//private CounterStrikeSharp.API.Modules.Timers.Timer? g_hTimerCheckSkinsData = null;
+	public static Dictionary<int, string> weaponDefindex { get; } = new Dictionary<int, string>
+	{
+		{ 1, "weapon_deagle" },
+		{ 2, "weapon_elite" },
+		{ 3, "weapon_fiveseven" },
+		{ 4, "weapon_glock" },
+		{ 7, "weapon_ak47" },
+		{ 8, "weapon_aug" },
+		{ 9, "weapon_awp" },
+		{ 10, "weapon_famas" },
+		{ 11, "weapon_g3sg1" },
+		{ 13, "weapon_galilar" },
+		{ 14, "weapon_m249" },
+		{ 16, "weapon_m4a1" },
+		{ 17, "weapon_mac10" },
+		{ 19, "weapon_p90" },
+		{ 23, "weapon_mp5sd" },
+		{ 24, "weapon_ump45" },
+		{ 25, "weapon_xm1014" },
+		{ 26, "weapon_bizon" },
+		{ 27, "weapon_mag7" },
+		{ 28, "weapon_negev" },
+		{ 29, "weapon_sawedoff" },
+		{ 30, "weapon_tec9" },
+		{ 31, "weapon_taser" },
+		{ 32, "weapon_hkp2000" },
+		{ 33, "weapon_mp7" },
+		{ 34, "weapon_mp9" },
+		{ 35, "weapon_nova" },
+		{ 36, "weapon_p250" },
+		{ 38, "weapon_scar20" },
+		{ 39, "weapon_sg556" },
+		{ 40, "weapon_ssg08" },
+		{ 60, "weapon_m4a1_silencer" },
+		{ 61, "weapon_usp_silencer" },
+		{ 63, "weapon_cz75a" },
+		{ 64, "weapon_revolver" },
+		{ 500, "weapon_bayonet" },
+		{ 503, "weapon_knife_css" },
+		{ 505, "weapon_knife_flip" },
+		{ 506, "weapon_knife_gut" },
+		{ 507, "weapon_knife_karambit" },
+		{ 508, "weapon_knife_m9_bayonet" },
+		{ 509, "weapon_knife_tactical" },
+		{ 512, "weapon_knife_falchion" },
+		{ 514, "weapon_knife_survival_bowie" },
+		{ 515, "weapon_knife_butterfly" },
+		{ 516, "weapon_knife_push" },
+		{ 517, "weapon_knife_cord" },
+		{ 518, "weapon_knife_canis" },
+		{ 519, "weapon_knife_ursus" },
+		{ 520, "weapon_knife_gypsy_jackknife" },
+		{ 521, "weapon_knife_outdoor" },
+		{ 522, "weapon_knife_stiletto" },
+		{ 523, "weapon_knife_widowmaker" },
+		{ 525, "weapon_knife_skeleton" },
+		{ 526, "weapon_knife_kukri" }
+	};
+
+	public WeaponPaintsConfig Config { get; set; } = new();
 	public override string ModuleAuthor => "Nereziel & daffyy";
 	public override string ModuleDescription => "Skin and knife selector, standalone and web-based";
 	public override string ModuleName => "WeaponPaints";
-	public override string ModuleVersion => "1.5.0";
+	public override string ModuleVersion => "1.6a";
 
 	public static WeaponPaintsConfig GetWeaponPaintsConfig()
 	{
@@ -155,46 +159,37 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 
 	public override void Load(bool hotReload)
 	{
-		if (!Config.GlobalShare)
-		{
-			DatabaseConnectionString = Utility.BuildDatabaseConnectionString();
-			Utility.TestDatabaseConnection();
-		}
-
-		if (hotReload)
+		if (hotReload && weaponSync != null)
 		{
 			OnMapStart(string.Empty);
 
-			List<CCSPlayerController> players = Utilities.GetPlayers();
-
-			foreach (CCSPlayerController player in players)
+			foreach (var player in Utilities.GetPlayers())
 			{
-				if (player == null || !player.IsValid || player.IsBot || player.IsHLTV || player.SteamID.ToString() == "") continue;
-				if (g_playersDatabaseIndex.ContainsKey((int)player.Index)) continue;
-                
-                PlayerInfo playerInfo = new PlayerInfo
+				if (weaponSync == null || player is null || !player.IsValid || !player.PawnIsAlive || player.IsBot || player.IsHLTV || player.Connected != PlayerConnectedState.PlayerConnected)
+					continue;
+
+				g_knifePickupCount[(int)player.Index] = 0;
+				gPlayerWeaponsInfo.TryRemove((int)player.Index, out _);
+				g_playersKnife.TryRemove((int)player.Index, out _);
+
+				PlayerInfo playerInfo = new PlayerInfo
 				{
 					UserId = player.UserId,
 					Index = (int)player.Index,
-					SteamId = player?.SteamID,
+					SteamId = player?.SteamID.ToString(),
 					Name = player?.PlayerName,
 					IpAddress = player?.IpAddress?.Split(":")[0]
 				};
-				if (weaponSync != null)
-				{
-                    _ = weaponSync!.GetPlayerDatabaseIndex(playerInfo);
-				}
-                g_knifePickupCount[(int)player!.Index] = 0;
-			}
-			/*
-			RegisterListeners();
-			RegisterCommands();
-			*/
-		}
 
-		if (Config.AdditionalSetting.KnifeEnabled)
+				if (Config.Additional.SkinEnabled)
+					_ = weaponSync.GetWeaponPaintsFromDatabase(playerInfo);
+				if (Config.Additional.KnifeEnabled)
+					_ = weaponSync.GetKnifeFromDatabase(playerInfo);
+			}
+		}
+		if (Config.Additional.KnifeEnabled)
 			SetupKnifeMenu();
-		if (Config.AdditionalSetting.SkinEnabled)
+		if (Config.Additional.SkinEnabled)
 			SetupSkinsMenu();
 
 		RegisterListeners();
@@ -209,37 +204,32 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 		{
 			if (config.DatabaseHost.Length < 1 || config.DatabaseName.Length < 1 || config.DatabaseUser.Length < 1)
 			{
-				// maybe more spam to get attention?
-                for (int i = 1; i <= 30; i++)
-                {
-                    Console.WriteLine("[WeaponPaints] You need to setup Database credentials in config!");
-                }
-                Logger.LogError("You need to setup Database credentials in config!");
-                throw new Exception("[WeaponPaints] You need to setup Database credentials in config!");
-            }
+				Logger.LogError("You need to setup Database credentials in config!");
+				throw new Exception("[WeaponPaints] You need to setup Database credentials in config!");
+			}
+			/*
+			DatabaseConnectionString = Utility.BuildDatabaseConnectionString();
+			Utility.TestDatabaseConnection();
+			*/
+
+			var builder = new MySqlConnectionStringBuilder
+			{
+				Server = config.DatabaseHost,
+				UserID = config.DatabaseUser,
+				Password = config.DatabasePassword,
+				Database = config.DatabaseName,
+				Port = (uint)config.DatabasePort,
+				Pooling = true
+			};
+
+			_database = new(builder.ConnectionString);
 		}
-		else
-		{
-            // maybe more spam to get attention?
-            for (int i = 1; i <= 30; i++)
-            {
-                Console.WriteLine("[WeaponPaints] GLOBAL SHARE IS NOT SUPPORTED NOW !!");
-            }
-            Logger.LogError("GLOBAL SHARE IS NOT SUPPORTED NOW !!");
-            throw new Exception("[WeaponPaints] GLOBAL SHARE IS NOT SUPPORTED NOW !!");
-        }
 
 		Config = config;
 		_config = config;
 		_localizer = Localizer;
 
-        /*
-         * GLOBAL SHARE IS NOT SUPPORTED NOW!
-         */
-        if (Config.GlobalShare)
-            Config.GlobalShare = false;
-
-        Utility.Config = config;
+		Utility.Config = config;
 		Utility.ShowAd(ModuleVersion);
 		Task.Run(async () => await Utility.CheckVersion(ModuleVersion, Logger));
 	}
@@ -273,7 +263,7 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 				Task<string> responseBodyTask = response.Content.ReadAsStringAsync();
 				responseBodyTask.Wait();
 				string responseBody = responseBodyTask.Result;
-				GlobalShareServerId = Int32.Parse(responseBody);
+				GlobalShareServerId = int.Parse(responseBody);
 			}
 			else
 			{

WeaponPaints.csproj

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

WeaponSynchronization.cs

@@ -1,7 +1,4 @@
-using CounterStrikeSharp.API.Core;
-using CounterStrikeSharp.API.Modules.Entities;
-using Dapper;
-using MySqlConnector;
+using Dapper;
 using Newtonsoft.Json.Linq;
 using System.Collections.Concurrent;
 
@@ -10,75 +7,32 @@ namespace WeaponPaints
 	internal class WeaponSynchronization
 	{
 		private readonly WeaponPaintsConfig _config;
-		private readonly string _databaseConnectionString;
+		private readonly Database _database;
 		private readonly Uri _globalShareApi;
 		private readonly int _globalShareServerId;
 
-		internal WeaponSynchronization(string databaseConnectionString, WeaponPaintsConfig config, Uri globalShareApi, int globalShareServerId)
+		internal WeaponSynchronization(Database database, WeaponPaintsConfig config, Uri globalShareApi, int globalShareServerId)
 		{
-			_databaseConnectionString = databaseConnectionString;
+			_database = database;
 			_config = config;
 			_globalShareApi = globalShareApi;
 			_globalShareServerId = globalShareServerId;
 		}
-		internal async Task GetPlayerDatabaseIndex(PlayerInfo player)
+
+		internal async Task GetKnifeFromDatabase(PlayerInfo player)
 		{
-            if (player.SteamId == null || player.Index == 0) return;
-
-            try
-			{
-				using (var connection = new MySqlConnection(_databaseConnectionString))
-				{
-					await connection.OpenAsync();
-
-					string query = "SELECT `id` FROM `wp_users` WHERE `steamid` = @steamid";
-					int? databaseIndex = await connection.QueryFirstOrDefaultAsync<int?>(query, new { steamid = player.SteamId });
-                    if (databaseIndex != null)
-                    {
-                        WeaponPaints.g_playersDatabaseIndex[player.Index] = (int)databaseIndex;
-                    }
-                    else
-                    {
-                        string insertQuery = "INSERT INTO `wp_users` (`steamid`) VALUES (@steamid)";
-                        await connection.ExecuteAsync(insertQuery, new { steamid = player.SteamId });
-                        Console.WriteLine("SQL Insert Query: " + insertQuery);
-                        databaseIndex = await connection.QueryFirstOrDefaultAsync<int?>(query, new { steamid = player.SteamId });
-                        WeaponPaints.g_playersDatabaseIndex[(int)player.Index] = (int)databaseIndex;
-                    }
-					await connection.CloseAsync();
-
-                    if (databaseIndex != null)
-                    {
-                        if (_config.AdditionalSetting.SkinEnabled)
-                            await GetWeaponPaintsFromDatabase(player);
-                        if (_config.AdditionalSetting.KnifeEnabled)
-                            await GetKnifeFromDatabase(player);
-                        if (_config.AdditionalSetting.MusicKitEnabled)
-                            await GetMusicKitFromDatabase(player);
-                    }
-                }
-
-            }
-			catch (Exception e)
-			{
-                Utility.Log("GetPlayerDatabaseIndex: " + e.Message);
-                return;
-            }
-        }
-        internal async Task GetKnifeFromDatabase(PlayerInfo player)
-		{
-			if (!_config.AdditionalSetting.KnifeEnabled) return;
+			if (!_config.Additional.KnifeEnabled) return;
 			if (player.SteamId == null || player.Index == 0) return;
 			try
 			{
 				if (_config.GlobalShare)
 				{
 					var values = new Dictionary<string, string>
-					{
-					   { "server_id", _globalShareServerId.ToString() },
-					   { "steamid", player.SteamId.ToString()! },
-					   { "knife", "1" }
-					};
+				{
+				   { "server_id", _globalShareServerId.ToString() },
+				   { "steamid", player.SteamId },
+				   { "knife", "1" }
+				};
 
 					UriBuilder builder = new UriBuilder(_globalShareApi);
 					builder.Query = string.Join("&", values.Select(p => $"{Uri.EscapeDataString(p.Key)}={Uri.EscapeDataString(p.Value)}"));
@@ -109,86 +63,44 @@ namespace WeaponPaints
 					return;
 				}
 
-                if (!WeaponPaints.g_playersDatabaseIndex.TryGetValue(player.Index, out _))
-                {
-                    return;
-                }
 
-                using (var connection = new MySqlConnection(_databaseConnectionString))
+				await using (var connection = await _database.GetConnectionAsync())
 				{
-					await connection.OpenAsync();
-					string query = "SELECT `knife` FROM `wp_users_knife` WHERE `user_id` = @userId";
-					string? PlayerKnife = await connection.QueryFirstOrDefaultAsync<string>(query, new { userId = WeaponPaints.g_playersDatabaseIndex[player.Index] });
-                    if (PlayerKnife != null)
+					string query = "SELECT `knife` FROM `wp_player_knife` WHERE `steamid` = @steamid";
+					string? playerKnife = await connection.QueryFirstOrDefaultAsync<string>(query, new { steamid = player.SteamId });
+
+					if (playerKnife != null)
 					{
-						WeaponPaints.g_playersKnife[player.Index] = PlayerKnife;
+						WeaponPaints.g_playersKnife[player.Index] = playerKnife;
 					}
-					else
-					{
-						return;
-					}
-					await connection.CloseAsync();
 				}
 			}
 			catch (Exception e)
 			{
-				Utility.Log("GetKnifeFromDatabase: " + e.Message);
+				Utility.Log(e.Message);
 				return;
 			}
 		}
-        internal async Task GetMusicKitFromDatabase(PlayerInfo player)
-        {
-            if (!_config.AdditionalSetting.MusicKitEnabled) return;
-            if (player.SteamId == null || player.Index == 0) return;
-            if (!WeaponPaints.g_playersDatabaseIndex.TryGetValue(player.Index, out _))
-            {
-                return;
-            }
-            try
-            {
-                using (var connection = new MySqlConnection(_databaseConnectionString))
-                {
-                    await connection.OpenAsync();
-                    string query = "SELECT `music` FROM `wp_users_music` WHERE `user_id` = @userId";
-                    int? PlayerMusitKit = await connection.QueryFirstOrDefaultAsync<int?>(query, new { userId = WeaponPaints.g_playersDatabaseIndex[player.Index] });
-                    if (PlayerMusitKit != null)
-                    {
-                        WeaponPaints.g_playersMusicKit[player.Index] = PlayerMusitKit;
-                    }
-                    else
-                    {
-                        return;
-                    }
-                    await connection.CloseAsync();
-                }
-            }
-            catch (Exception e)
-            {
-                Utility.Log("GetMusicKitFromDatabase: " + e.Message);
-                return;
-            }
-        }
 
-        internal async Task GetWeaponPaintsFromDatabase(PlayerInfo player)
+		internal async Task GetWeaponPaintsFromDatabase(PlayerInfo player)
 		{
-			if (!_config.AdditionalSetting.SkinEnabled) return;
+			if (!_config.Additional.SkinEnabled) return;
 			if (player.SteamId == null || player.Index == 0) return;
 
-            if (!WeaponPaints.gPlayerWeaponsInfo.TryGetValue(player.Index, out _))
-            {
-                WeaponPaints.gPlayerWeaponsInfo[player.Index] = new ConcurrentDictionary<ushort, WeaponInfo>();
-            }
-
-            try
+			if (!WeaponPaints.gPlayerWeaponsInfo.TryGetValue(player.Index, out _))
+			{
+				WeaponPaints.gPlayerWeaponsInfo[player.Index] = new ConcurrentDictionary<int, WeaponInfo>();
+			}
+			try
 			{
 				if (_config.GlobalShare)
 				{
 					var values = new Dictionary<string, string>
-					{
-					   { "server_id", _globalShareServerId.ToString() },
-					   { "steamid", player.SteamId.ToString()! },
-					   { "skins", "1" }
-					};
+				{
+				   { "server_id", _globalShareServerId.ToString() },
+				   { "steamid", player.SteamId },
+				   { "skins", "1" }
+				};
 					UriBuilder builder = new UriBuilder(_globalShareApi);
 					builder.Query = string.Join("&", values.Select(p => $"{Uri.EscapeDataString(p.Key)}={Uri.EscapeDataString(p.Value)}"));
 
@@ -206,20 +118,19 @@ namespace WeaponPaints
 							{
 								foreach (var weapon in jsonArray)
 								{
-                                    ushort? weaponDefIndex = weapon["weapon_defindex"]?.Value<ushort>();
-                                    ushort? weaponPaintId = weapon["weapon_paint_id"]?.Value<ushort>();
+									int? weaponDefIndex = weapon["weapon_defindex"]?.Value<int>();
+									int? weaponPaintId = weapon["weapon_paint_id"]?.Value<int>();
 									float? weaponWear = weapon["weapon_wear"]?.Value<float>();
-									ushort? weaponSeed = weapon["weapon_seed"]?.Value<ushort>();
+									int? weaponSeed = weapon["weapon_seed"]?.Value<int>();
 
-                                    if (weaponDefIndex != null && weaponPaintId != null && weaponWear != null && weaponSeed != null)
+									if (weaponDefIndex != null && weaponPaintId != null && weaponWear != null && weaponSeed != null)
 									{
 										WeaponInfo weaponInfo = new WeaponInfo
 										{
 											Paint = weaponPaintId.Value,
 											Seed = weaponSeed.Value,
-											Wear = weaponWear.Value,
-                                            NameTag = null
-                                        };
+											Wear = weaponWear.Value
+										};
 										WeaponPaints.gPlayerWeaponsInfo[player.Index][weaponDefIndex.Value] = weaponInfo;
 									}
 								}
@@ -233,99 +144,78 @@ namespace WeaponPaints
 					}
 				}
 
-                if (!WeaponPaints.g_playersDatabaseIndex.TryGetValue(player.Index, out _))
-                {
-                    return;
-                }
-
-                using (var connection = new MySqlConnection(_databaseConnectionString))
+				await using (var connection = await _database.GetConnectionAsync())
 				{
-					await connection.OpenAsync();
-                    string query = "SELECT `weapon`, `paint`, `wear`, `seed`, `nametag` FROM `wp_users_items` WHERE `user_id` = @userId";
-                    IEnumerable<dynamic> PlayerSkins = await connection.QueryAsync<dynamic>(query, new { userId = WeaponPaints.g_playersDatabaseIndex[player.Index] });
-                    if (PlayerSkins != null && PlayerSkins.Any())
+					string query = "SELECT * FROM `wp_player_skins` WHERE `steamid` = @steamid";
+					var playerSkins = await connection.QueryAsync(query, new { steamid = player.SteamId });
+
+					foreach (var row in playerSkins)
 					{
-                        PlayerSkins.ToList().ForEach(row =>
+						int weaponDefIndex = row.weapon_defindex ?? default;
+						int weaponPaintId = row.weapon_paint_id ?? default;
+						float weaponWear = row.weapon_wear ?? default;
+						int weaponSeed = row.weapon_seed ?? default;
+
+						WeaponInfo weaponInfo = new WeaponInfo
 						{
-                            ushort weaponDefIndex = row.weapon ?? default(ushort);
-                            ushort weaponPaintId = row.paint ?? default(ushort);
-                            float weaponWear = row.wear ?? default(float);
-                            ushort weaponSeed = row.seed ?? default(ushort);
-                            string weaponNameTag = row.nametag;
-
-                            WeaponInfo weaponInfo = new WeaponInfo
-							{
-								Paint = weaponPaintId,
-								Seed = weaponSeed,
-								Wear = weaponWear,
-                                NameTag = weaponNameTag
-                            };
-							WeaponPaints.gPlayerWeaponsInfo[player.Index][weaponDefIndex] = weaponInfo;
-						});
+							Paint = weaponPaintId,
+							Seed = weaponSeed,
+							Wear = weaponWear
+						};
+						WeaponPaints.gPlayerWeaponsInfo[player.Index][weaponDefIndex] = weaponInfo;
 					}
-					else
-					{
-						return;
-					}
-					await connection.CloseAsync();
 				}
 			}
 			catch (Exception e)
-			{
-				Utility.Log("GetWeaponPaintsFromDatabase: " + e.Message);
-				return;
-			}
-		}
-
-		internal async Task SyncKnifeToDatabase(PlayerInfo player, string knife)
-		{
-			if (!_config.AdditionalSetting.KnifeEnabled) return;
-            if(player == null || player.Index <= 0) return;
-            try
-			{
-                if (!WeaponPaints.g_playersDatabaseIndex.TryGetValue(player.Index, out _))
-                    return;
-
-                using var connection = new MySqlConnection(_databaseConnectionString);
-				await connection.OpenAsync();
-				string query = "INSERT INTO `wp_users_knife` (`user_id`, `knife`) VALUES(@userId, @newKnife) ON DUPLICATE KEY UPDATE `knife` = @newKnife";
-                await connection.ExecuteAsync(query, new { userId = WeaponPaints.g_playersDatabaseIndex[player.Index], newKnife = knife });
-				await connection.CloseAsync();
-			}
-			catch (Exception e)
 			{
 				Utility.Log(e.Message);
 				return;
 			}
 		}
-		internal async Task SyncWeaponPaintToDatabase(PlayerInfo player, ushort weaponDefIndex)
+
+		internal async Task SyncKnifeToDatabase(PlayerInfo player, string knife)
 		{
-            if (!_config.AdditionalSetting.SkinEnabled) return;
-            if (player == null || player.Index <= 0) return;
+			if (!_config.Additional.KnifeEnabled) return;
+			if (player.SteamId == null || player.Index == 0) return;
 
-            if (!WeaponPaints.g_playersDatabaseIndex.TryGetValue(player.Index, out var playerDatabaseIndex))
-                return;
-                
-            if (!WeaponPaints.gPlayerWeaponsInfo.TryGetValue(player.Index, out var playerSavedWeapons))
-                return;
-                
-			if (!playerSavedWeapons.TryGetValue(weaponDefIndex, out var weaponInfo))
-                return;
+			try
+			{
+				await using var connection = await _database.GetConnectionAsync();
+				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)
+			{
+				Utility.Log(e.Message);
+			}
+		}
+		internal async Task SyncWeaponPaintsToDatabase(PlayerInfo player)
+		{
+			if (player == null || player.Index <= 0 || player.SteamId == null) return;
 
-            using var connection = new MySqlConnection(_databaseConnectionString);
-            string querySql = @"
-			INSERT INTO `wp_users_items` 
-				(`user_id`, `weapon`, `paint`, `wear`, `seed`) 
-			VALUES 
-				(@userId, @weaponDefIndex, @paintId, @wear, @seed) 
-			ON DUPLICATE KEY UPDATE 
-				paint = @paintId,
-				wear = @wear,
-				seed = @seed";
-            var queryParams = new { weaponDefIndex, userId = playerDatabaseIndex, paintId = weaponInfo.Paint, wear = weaponInfo.Wear, seed = weaponInfo.Seed };
-            await connection.ExecuteAsync(querySql, queryParams);
-            await connection.CloseAsync();
-            
+			await using var connection = await _database.GetConnectionAsync();
+
+			if (!WeaponPaints.gPlayerWeaponsInfo.ContainsKey(player.Index))
+				return;
+
+			foreach (var weaponInfoPair in WeaponPaints.gPlayerWeaponsInfo[player.Index])
+			{
+				int weaponDefIndex = weaponInfoPair.Key;
+				WeaponInfo weaponInfo = weaponInfoPair.Value;
+
+				int paintId = weaponInfo.Paint;
+				float wear = weaponInfo.Wear;
+				int seed = weaponInfo.Seed;
+
+				string updateSql = "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";
+
+				var updateParams = new { steamid = player.SteamId, weaponDefIndex, paintId, wear, seed };
+				await connection.ExecuteAsync(updateSql, updateParams);
+			}
 		}
 	}
 }

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
-        }
-        return $result;
+		$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,71 +0,0 @@
-<?php
-// 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();
-
-    // Retrieve user's selected skins and knife
-    $querySelected = $db->select("SELECT `weapon`, `paint`, `wear`, `seed`, `nametag` FROM `wp_users_items` WHERE `user_id` = :user_id", ["user_id" => $userDbIndex]);
-    $selectedSkins = UtilsClass::getSelectedSkins($querySelected);
-    $selectedKnifeResult = $db->select("SELECT `knife` FROM `wp_users_knife` WHERE `user_id` = :user_id", ["user_id" => $userDbIndex]);
-
-    // 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_knife` (`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_items 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_items (`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,112 +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";
+        $skins = [];
+        $json = json_decode(file_get_contents(__DIR__ . "/../data/skins.json"), true);
 
-        if (file_exists($jsonFilePath) && is_readable($jsonFilePath)) {
-            $json = json_decode(file_get_contents($jsonFilePath), true);
-
-            foreach ($json as $skin) {
-                $skins[(int) $skin['weapon_defindex']][(int) $skin['paint']] = array(
-                    '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
+        foreach ($json as $skin) {
+            $skins[(int) $skin['weapon_defindex']][(int) $skin['paint']] = [
+                'weapon_name' => $skin['weapon_name'],
+                'paint_name' => $skin['paint_name'],
+                'image_url' => $skin['image'],
+            ];
         }
 
         return $skins;
     }
 
-    /**
-     * 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(
-                    'weapon_name' => $weapon['weapon_name'],
-                    'paint_name' => rtrim(explode("|", $weapon['paint_name'])[0]),
-                    'image_url' => $weapon['image_url'],
-                );
-            }
+            $knifes[$key] = [
+                'weapon_name' => $weapon['weapon_name'],
+                'paint_name' => rtrim(explode("|", $weapon['paint_name'])[0]),
+                'image_url' => $weapon['image_url'],
+            ];
+            $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",
+            ];
         }
 
-        // Add default knife
-        $knifes[0] = array(
-            '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;