Merge pull request #165 from daffyyyy/main

1.8d

.github/workflows/build.yml

@@ -60,12 +60,10 @@ jobs:
           ${{ env.OUTPUT_PATH }}/Microsoft.Extensions.DependencyModel.dll \
     - name: Copy skins.json
       run: cp website/data/skins.json ${{ env.OUTPUT_PATH }}/skins.json
+    - name: Copy gloves.json
+      run: cp website/data/gloves.json ${{ env.OUTPUT_PATH }}/gloves.json
     - name: Zip
-      uses: thedoctor0/zip-release@0.7.5
+      run: zip -r "${{ env.PROJECT_NAME }}.zip" "${{ env.OUTPUT_PATH }}" gamedata/
-      with:
-        type: 'zip'
-        filename: '${{ env.PROJECT_NAME }}.zip'
-        path: ${{ env.OUTPUT_PATH }}
     - name: Clean files Website
       run: |
         rm -rf website/img/

.gitignore

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

Commands.cs

@@ -1,4 +1,5 @@
-using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Commands;
 using CounterStrikeSharp.API.Modules.Menu;
 
@@ -8,47 +9,62 @@ 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.IsValid || player.UserId == null || player.Index <= 0 || player.IsBot) 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?.SteamID.ToString(),
 				Name = player?.PlayerName,
 				IpAddress = player?.IpAddress?.Split(":")[0]
 			};
 
-			if (!commandsCooldown.TryGetValue((int)player!.UserId, out DateTime cooldownEndTime) ||
+			if (player == null || !player.IsValid || player.UserId == null || player.IsBot) return;
-				DateTime.UtcNow >= (commandsCooldown.TryGetValue((int)player.UserId, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
-			{
-				commandsCooldown[(int)player.UserId] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
-				if (weaponSync != null)
-					Task.Run(async () => await weaponSync.GetWeaponPaintsFromDatabase(playerInfo));
-				if (Config.AdditionalSetting.KnifeEnabled)
-				{
-					if (weaponSync != null)
-						Task.Run(async () => await weaponSync.GetKnifeFromDatabase(playerInfo));
 
-					RefreshWeapons(player);
+			try
-				}
-				if (!string.IsNullOrEmpty(Localizer["wp_command_refresh_done"]))
-				{
-					player!.Print(Localizer["wp_command_refresh_done"]);
-				}
-				return;
-			}
-			if (!string.IsNullOrEmpty(Localizer["wp_command_cooldown"]))
 			{
-				player!.Print(Localizer["wp_command_cooldown"]);
+				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.GetWeaponPaintsFromDatabase(playerInfo));
+
+						if (Config.Additional.GloveEnabled)
+							Task.Run(async () => await weaponSync.GetGloveFromDatabase(playerInfo));
+
+						if (Config.Additional.KnifeEnabled)
+							Task.Run(async () => await weaponSync.GetKnifeFromDatabase(playerInfo));
+
+						RefreshWeapons(player);
+						RefreshGloves(player);
+					}
+
+					if (!string.IsNullOrEmpty(Localizer["wp_command_refresh_done"]))
+					{
+						player!.Print(Localizer["wp_command_refresh_done"]);
+					}
+					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"]))
@@ -59,28 +75,35 @@ namespace WeaponPaints
 			{
 				player!.Print(Localizer["wp_info_refresh"]);
 			}
-			if (!Config.AdditionalSetting.KnifeEnabled) return;
+
-			if (!string.IsNullOrEmpty(Localizer["wp_info_knife"]))
+			if (Config.Additional.GloveEnabled)
-			{
+				if (!string.IsNullOrEmpty(Localizer["wp_info_glove"]))
-				player!.Print(Localizer["wp_info_knife"]);
+				{
-			}
+					player!.Print(Localizer["wp_info_glove"]);
+				}
+
+			if (Config.Additional.KnifeEnabled)
+				if (!string.IsNullOrEmpty(Localizer["wp_info_knife"]))
+				{
+					player!.Print(Localizer["wp_info_knife"]);
+				}
 		}
 
 		private void RegisterCommands()
 		{
-			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;
+				if (!Utility.IsPlayerValid(player)) 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;
 
@@ -91,58 +114,55 @@ 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"))
 				.ToDictionary(pair => pair.Key, pair => pair.Value);
 
 			var giveItemMenu = new ChatMenu(Localizer["wp_knife_menu_title"]);
-			var handleGive = (CCSPlayerController? player, ChatMenuOption option) =>
+			var handleGive = (CCSPlayerController player, ChatMenuOption option) =>
 			{
-				if (Utility.IsPlayerValid(player))
+				if (!Utility.IsPlayerValid(player)) return;
+
+				var knifeName = option.Text;
+				var knifeKey = knivesOnly.FirstOrDefault(x => x.Value == knifeName).Key;
+				if (!string.IsNullOrEmpty(knifeKey))
 				{
-					if (player == null) return;
+					if (!string.IsNullOrEmpty(Localizer["wp_knife_menu_select"]))
-					var knifeName = option.Text;
-					var knifeKey = knivesOnly.FirstOrDefault(x => x.Value == knifeName).Key;
-					if (!string.IsNullOrEmpty(knifeKey))
 					{
-						if (!string.IsNullOrEmpty(Localizer["wp_knife_menu_select"]))
+						player!.Print(Localizer["wp_knife_menu_select", knifeName]);
-						{
-							player!.Print(Localizer["wp_knife_menu_select", knifeName]);
-						}
-
-						if (!string.IsNullOrEmpty(Localizer["wp_knife_menu_kill"]) && Config.AdditionalSetting.CommandKillEnabled)
-						{
-							player!.Print(Localizer["wp_knife_menu_kill"]);
-						}
-
-						PlayerInfo playerInfo = new PlayerInfo
-						{
-							UserId = player.UserId,
-							Index = (int)player.Index,
-							SteamId = player?.AuthorizedSteamID?.SteamId64,
-							Name = player?.PlayerName,
-							IpAddress = player?.IpAddress?.Split(":")[0]
-						};
-
-						g_playersKnife[(int)player!.Index] = knifeKey;
-
-						if (player!.PawnIsAlive && g_bCommandsAllowed)
-						{
-							RefreshWeapons(player);
-						}
-
-						if (weaponSync != null)
-							Task.Run(async () => await weaponSync.SyncKnifeToDatabase(playerInfo, knifeKey));
 					}
+
+					if (!string.IsNullOrEmpty(Localizer["wp_knife_menu_kill"]) && Config.Additional.CommandKillEnabled)
+					{
+						player!.Print(Localizer["wp_knife_menu_kill"]);
+					}
+
+					PlayerInfo playerInfo = new PlayerInfo
+					{
+						UserId = player.UserId,
+						Index = (int)player.Index,
+						SteamId = player.SteamID.ToString(),
+						Name = player.PlayerName,
+						IpAddress = player.IpAddress?.Split(":")[0]
+					};
+
+					g_playersKnife[(int)player!.Index] = knifeKey;
+
+
+					if (weaponSync != null)
+						Task.Run(async () => await weaponSync.SyncKnifeToDatabase(playerInfo, knifeKey));
+
+					if (g_bCommandsAllowed && (LifeState_t)player.LifeState == LifeState_t.LIFE_ALIVE)
+						AddTimer(0.2f, () => RefreshWeapons(player), CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);
 				}
 			};
 			foreach (var knifePair in knivesOnly)
 			{
 				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;
 
@@ -152,7 +172,8 @@ 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);
+					giveItemMenu.PostSelectAction = PostSelectAction.Close;
+					MenuManager.OpenChatMenu(player, giveItemMenu);
 					return;
 				}
 				if (!string.IsNullOrEmpty(Localizer["wp_command_cooldown"]))
@@ -166,6 +187,7 @@ namespace WeaponPaints
 		{
 			var classNamesByWeapon = weaponList.ToDictionary(kvp => kvp.Value, kvp => kvp.Key);
 			var weaponSelectionMenu = new ChatMenu(Localizer["wp_skin_menu_weapon_title"]);
+			weaponSelectionMenu.PostSelectAction = PostSelectAction.Close;
 
 			// Function to handle skin selection for a specific weapon
 			var handleWeaponSelection = (CCSPlayerController? player, ChatMenuOption option) =>
@@ -184,17 +206,16 @@ namespace WeaponPaints
 				)?.ToList();
 
 					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) =>
+					var handleSkinSelection = (CCSPlayerController p, ChatMenuOption opt) =>
 					{
-						if (p == null || !p.IsValid || p.Index <= 0) return;
+						if (!Utility.IsPlayerValid(p)) return;
 
 						playerIndex = (int)p.Index;
 
-						if (p.AuthorizedSteamID == null) return;
+						string steamId = p.SteamID.ToString();
-
-						string steamId = p.AuthorizedSteamID.SteamId64.ToString();
 						var firstSkin = skinsList?.FirstOrDefault(skin =>
 						{
 							if (skin != null && skin.TryGetValue("weapon_name", out var weaponName))
@@ -203,40 +224,50 @@ namespace WeaponPaints
 							}
 							return false;
 						});
+
 						string selectedSkin = opt.Text;
 						string selectedPaintID = selectedSkin.Split('(')[1].Trim(')').Trim();
 
 						if (firstSkin != null &&
 							firstSkin.TryGetValue("weapon_defindex", out var weaponDefIndexObj) &&
 							weaponDefIndexObj != null &&
-							ushort.TryParse(weaponDefIndexObj.ToString(), out var weaponDefIndex) &&
+							int.TryParse(weaponDefIndexObj.ToString(), out var weaponDefIndex) &&
-                            ushort.TryParse(selectedPaintID, out var paintID))
+							int.TryParse(selectedPaintID, out var paintID))
 						{
-							p!.Print(Localizer["wp_skin_menu_select", selectedSkin]);
+							if (Config.Additional.ShowSkinImage && skinsList != null)
+							{
+								var foundSkin = skinsList.FirstOrDefault(skin =>
+									((int?)skin?["weapon_defindex"] ?? 0) == weaponDefIndex &&
+									((int?)skin?["paint"] ?? 0) == paintID &&
+									skin?["image"] != null
+								);
+								string image = foundSkin?["image"]?.ToString() ?? "";
+								PlayerWeaponImage[p.Slot] = image;
+								AddTimer(2.0f, () => PlayerWeaponImage.Remove(p.Slot), CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);
+							}
 
-                            if (!gPlayerWeaponsInfo[playerIndex].TryGetValue(weaponDefIndex, out _))
+							p.Print(Localizer["wp_skin_menu_select", selectedSkin]);
-                            {
-                                gPlayerWeaponsInfo[playerIndex][weaponDefIndex] = new WeaponInfo();
-                            }
 
-                            gPlayerWeaponsInfo[playerIndex][weaponDefIndex].Paint = paintID;
+							if (!gPlayerWeaponsInfo[playerIndex].ContainsKey(weaponDefIndex))
-							gPlayerWeaponsInfo[playerIndex][weaponDefIndex].Wear = 0.00001f;
+							{
+								gPlayerWeaponsInfo[playerIndex][weaponDefIndex] = new WeaponInfo();
+							}
+
+							gPlayerWeaponsInfo[playerIndex][weaponDefIndex].Paint = paintID;
+							gPlayerWeaponsInfo[playerIndex][weaponDefIndex].Wear = 0.01f;
 							gPlayerWeaponsInfo[playerIndex][weaponDefIndex].Seed = 0;
 
 							PlayerInfo playerInfo = new PlayerInfo
 							{
-								UserId = player.UserId,
+								UserId = p.UserId,
-								Index = (int)player.Index,
+								Index = (int)p.Index,
-								SteamId = player?.AuthorizedSteamID?.SteamId64,
+								SteamId = p.SteamID.ToString(),
-								Name = player?.PlayerName,
+								Name = p.PlayerName,
-								IpAddress = player?.IpAddress?.Split(":")[0]
+								IpAddress = p.IpAddress?.Split(":")[0]
 							};
 
-							if (!Config.GlobalShare)
+							if (g_bCommandsAllowed && (LifeState_t)p.LifeState == LifeState_t.LIFE_ALIVE)
-							{
+								AddTimer(0.2f, () => RefreshWeapons(p), CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);
-								if (weaponSync != null)
-									Task.Run(async () => await weaponSync.SyncWeaponPaintToDatabase(playerInfo, weaponDefIndex));
-							}
 						}
 					};
 
@@ -259,7 +290,7 @@ namespace WeaponPaints
 					}
 
 					// Open the submenu for skin selection of the chosen weapon
-					ChatMenus.OpenMenu(player, skinSubMenu);
+					MenuManager.OpenChatMenu(player, skinSubMenu);
 				}
 			};
 
@@ -270,24 +301,127 @@ 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;
+
+						if (player == null || player.UserId == null) return;
+
+						if (!commandsCooldown.TryGetValue((int)player.UserId, out DateTime cooldownEndTime) ||
+					DateTime.UtcNow >= (commandsCooldown.TryGetValue((int)player.UserId, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
+						{
+							commandsCooldown[(int)player.UserId] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
+							MenuManager.OpenChatMenu(player, weaponSelectionMenu);
+							return;
+						}
+						if (!string.IsNullOrEmpty(Localizer["wp_command_cooldown"]))
+						{
+							player!.Print(Localizer["wp_command_cooldown"]);
+						}
+					});
+		}
+
+		private void SetupGlovesMenu()
+		{
+			var glovesSelectionMenu = new ChatMenu(Localizer["wp_glove_menu_title"]);
+			glovesSelectionMenu.PostSelectAction = PostSelectAction.Close;
+
+			var handleGloveSelection = (CCSPlayerController? player, ChatMenuOption option) =>
 			{
 				if (!Utility.IsPlayerValid(player)) return;
 
-				if (player == null || player.UserId == null) return;
+				uint playerIndex = player!.Index;
+				string selectedPaintName = option.Text;
 
-				if (!commandsCooldown.TryGetValue((int)player.UserId, out DateTime cooldownEndTime) ||
+				var selectedGlove = glovesList.FirstOrDefault(g => g.ContainsKey("paint_name") && g["paint_name"]?.ToString() == selectedPaintName);
+				if (selectedGlove != null)
+				{
+					if (
+						selectedGlove != null &&
+						selectedGlove.ContainsKey("weapon_defindex") &&
+						selectedGlove.ContainsKey("paint") &&
+						int.TryParse(selectedGlove["weapon_defindex"]?.ToString(), out int weaponDefindex) &&
+						int.TryParse(selectedGlove["paint"]?.ToString(), out int paint)
+					)
+					{
+						if (Config.Additional.ShowSkinImage)
+						{
+							string image = selectedGlove["image"]?.ToString() ?? "";
+							PlayerWeaponImage[player.Slot] = image;
+							AddTimer(2.0f, () => PlayerWeaponImage.Remove(player.Slot), CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);
+						}
+
+						PlayerInfo playerInfo = new PlayerInfo
+						{
+							UserId = player.UserId,
+							Index = (int)player.Index,
+							SteamId = player.SteamID.ToString(),
+							Name = player.PlayerName,
+							IpAddress = player.IpAddress?.Split(":")[0]
+						};
+
+						if (paint != 0)
+						{
+							g_playersGlove[playerIndex] = (ushort)weaponDefindex;
+
+							if (!gPlayerWeaponsInfo[(int)playerIndex].ContainsKey(weaponDefindex))
+							{
+								WeaponInfo weaponInfo = new();
+								weaponInfo.Paint = paint;
+								gPlayerWeaponsInfo[(int)playerIndex][weaponDefindex] = weaponInfo;
+							}
+						}
+						else
+						{
+							g_playersGlove.TryRemove(playerIndex, out _);
+						}
+
+						if (!string.IsNullOrEmpty(Localizer["wp_glove_menu_select"]))
+						{
+							player!.Print(Localizer["wp_glove_menu_select", selectedPaintName]);
+						}
+
+						Server.NextFrame(() =>
+						{
+							RefreshGloves(player);
+						});
+
+						if (weaponSync != null)
+						{
+							Task.Run(async () => await weaponSync.SyncGloveToDatabase(playerInfo, (ushort)weaponDefindex));
+						}
+					}
+				};
+			};
+
+			// Add weapon options to the weapon selection menu
+			foreach (var gloveObject in glovesList)
+			{
+				string paintName = gloveObject["paint_name"]?.ToString() ?? "";
+
+				if (paintName.Length > 0)
+					glovesSelectionMenu.AddMenuOption(paintName, handleGloveSelection);
+			}
+
+			// Command to open the weapon selection menu for players
+			AddCommand($"css_{Config.Additional.CommandGlove}", "Gloves selection menu", (player, info) =>
+					{
+						if (!Utility.IsPlayerValid(player) || !g_bCommandsAllowed) return;
+
+						if (player == null || player.UserId == null) return;
+
+						if (!commandsCooldown.TryGetValue((int)player.UserId, out DateTime cooldownEndTime) ||
 					DateTime.UtcNow >= (commandsCooldown.TryGetValue((int)player.UserId, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
-				{
+						{
-					commandsCooldown[(int)player.UserId] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
+							commandsCooldown[(int)player.UserId] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
-					ChatMenus.OpenMenu(player, weaponSelectionMenu);
+							MenuManager.OpenChatMenu(player, glovesSelectionMenu);
-					return;
+							return;
-				}
+						}
-				if (!string.IsNullOrEmpty(Localizer["wp_command_cooldown"]))
+						if (!string.IsNullOrEmpty(Localizer["wp_command_cooldown"]))
-				{
+						{
-					player!.Print(Localizer["wp_command_cooldown"]);
+							player!.Print(Localizer["wp_command_cooldown"]);
-				}
+						}
-			});
+					});
 		}
 	}
 }

Config.cs

@@ -3,28 +3,21 @@ using System.Text.Json.Serialization;
 
 namespace WeaponPaints
 {
-	public class AdditionalSetting
+	public class Additional
 	{
-        
+		[JsonPropertyName("SkinVisibilityFix")]
-        [JsonPropertyName("UseMetamodAlwaysLegacyModel")]
-        public bool UseMetamodAlwaysLegacyModel { get; set; } = false;
-
-        [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("MusicKitEnabled")]
+		[JsonPropertyName("CommandWpEnabled")]
-        public bool MusicKitEnabled { get; set; } = true;
-
-        [JsonPropertyName("NameTagEnabled")]
-        public bool NameTagEnabled { get; set; } = true;
-
-        [JsonPropertyName("CommandWpEnabled")]
 		public bool CommandWpEnabled { get; set; } = true;
 
 		[JsonPropertyName("CommandKillEnabled")]
@@ -33,6 +26,9 @@ namespace WeaponPaints
 		[JsonPropertyName("CommandKnife")]
 		public string CommandKnife { get; set; } = "knife";
 
+		[JsonPropertyName("CommandGlove")]
+		public string CommandGlove { get; set; } = "gloves";
+
 		[JsonPropertyName("CommandSkin")]
 		public string CommandSkin { get; set; } = "ws";
 
@@ -50,13 +46,17 @@ namespace WeaponPaints
 
 		[JsonPropertyName("GiveRandomSkin")]
 		public bool GiveRandomSkin { get; set; } = false;
+
 		[JsonPropertyName("GiveKnifeAfterRemove")]
 		public bool GiveKnifeAfterRemove { get; set; } = false;
+
+		[JsonPropertyName("ShowSkinImage")]
+		public bool ShowSkinImage { get; set; } = true;
 	}
 
 	public class WeaponPaintsConfig : BasePluginConfig
 	{
-		public override int Version { get; set; } = 5;
+		public override int Version { get; set; } = 4;
 
 		[JsonPropertyName("DatabaseHost")]
 		public string DatabaseHost { get; set; } = "";
@@ -85,8 +85,7 @@ namespace WeaponPaints
 		[JsonPropertyName("Website")]
 		public string Website { get; set; } = "example.com/skins";
 
-		[JsonPropertyName("AdditionalSetting")]
+		[JsonPropertyName("Additional")]
-		public AdditionalSetting AdditionalSetting { get; set; } = new AdditionalSetting();
+		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,60 +1,78 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
-using CounterStrikeSharp.API.Modules.Entities;
+using CounterStrikeSharp.API.Core.Attributes.Registration;
-using System.Numerics;
 
 namespace WeaponPaints
 {
 	public partial class WeaponPaints
 	{
-		private void OnClientPutInServer(int playerSlot)
+
+		[GameEventHandler]
+		public HookResult OnPlayerConnect(EventPlayerConnectFull @event, GameEventInfo info)
 		{
-			CCSPlayerController? player = Utilities.GetPlayerFromSlot(playerSlot);
+			CCSPlayerController? player = @event.Userid;
+
+			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,
 				Index = (int)player.Index,
-                SteamId = player.SteamID,
+				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 () =>
-
-            Task.Run(async () =>
 			{
-				await weaponSync.GetPlayerDatabaseIndex(playerInfo);
+				// Run skin, knife, and glove tasks asynchronously
+				var skinTask = Config.Additional.SkinEnabled ? weaponSync.GetWeaponPaintsFromDatabase(playerInfo) : Task.CompletedTask;
+				var knifeTask = Config.Additional.KnifeEnabled ? weaponSync.GetKnifeFromDatabase(playerInfo) : Task.CompletedTask;
+				var gloveTask = Config.Additional.GloveEnabled ? weaponSync.GetGloveFromDatabase(playerInfo) : Task.CompletedTask;
+
+				// Await all tasks to complete
+				await Task.WhenAll(skinTask, knifeTask, gloveTask);
 			});
-        }
 
-		private void OnClientDisconnect(int playerSlot)
+			return HookResult.Continue;
+		}
+
+		[GameEventHandler]
+		public HookResult OnPlayerDisconnect(EventPlayerDisconnect @event, GameEventInfo info)
 		{
-			CCSPlayerController player = Utilities.GetPlayerFromSlot(playerSlot);
+			CCSPlayerController player = @event.Userid;
 
-			if (player == null || !player.IsValid || player.IsBot || player.IsHLTV || player.UserId == null) return;
+			if (player is null || !player.IsValid || !player.UserId.HasValue || player.IsBot ||
+				player.IsHLTV || player.SteamID.ToString().Length != 17) return HookResult.Continue;
 
-            g_playersDatabaseIndex.TryRemove((int)player.Index, out _);
+			PlayerInfo playerInfo = new PlayerInfo
-            if (Config.AdditionalSetting.KnifeEnabled)
+			{
+				UserId = player.UserId,
+				Index = (int)player.Index,
+				SteamId = player.SteamID.ToString(),
+				Name = player.PlayerName,
+				IpAddress = player.IpAddress?.Split(":")[0]
+			};
+
+			if (weaponSync != null)
+				Task.Run(async () => await weaponSync.SyncWeaponPaintsToDatabase(playerInfo));
+
+			if (Config.Additional.SkinEnabled)
+				gPlayerWeaponsInfo.TryRemove((int)player.Index, out _);
+			if (Config.Additional.KnifeEnabled)
 				g_playersKnife.TryRemove((int)player.Index, out _);
-			if (Config.AdditionalSetting.SkinEnabled)
+			if (Config.Additional.GloveEnabled)
-			{
+				g_playersGlove.TryRemove(player.Index, out _);
-				if (gPlayerWeaponsInfo.TryRemove((int)player.Index, out var innerDictionary))
+
-				{
+			commandsCooldown.Remove((int)player.UserId);
-					innerDictionary.Clear();
+
-				}
+			return HookResult.Continue;
-			}
-            if (Config.AdditionalSetting.MusicKitEnabled)
-                g_playersMusicKit.TryRemove((int)player.Index, out _);
-            if (commandsCooldown.ContainsKey((int)player.UserId))
-			{
-				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;
@@ -74,7 +92,8 @@ namespace WeaponPaints
 					if (weapon.OwnerEntity.Value == null) return;
 					if (weapon.OwnerEntity.Index <= 0) return;
 					int weaponOwner = (int)weapon.OwnerEntity.Index;
-					var pawn = new CBasePlayerPawn(NativeAPI.GetEntityFromIndex(weaponOwner));
+					CBasePlayerPawn? pawn = Utilities.GetEntityFromIndex<CCSPlayerPawn>((int)weaponOwner);
+					//var pawn = new CBasePlayerPawn(NativeAPI.GetEntityFromIndex(weaponOwner));
 					if (!pawn.IsValid) return;
 
 					var playerIndex = (int)pawn.Controller.Index;
@@ -87,166 +106,82 @@ namespace WeaponPaints
 			});
 		}
 
-		private HookResult OnEventItemPurchasePost(EventItemPurchase @event, GameEventInfo info)
+		public HookResult OnPickup(CEntityIOOutput output, string name, CEntityInstance activator, CEntityInstance caller, CVariant value, float delay)
-		{
-			CCSPlayerController? player = @event.Userid;
-
-			if (player == null || !player.IsValid) return HookResult.Continue;
-
-			/*
-			if (Config.AdditionalSetting.SkinVisibilityFix)
-				AddTimer(0.2f, () => RefreshSkins(player));
-			*/
-
-			return HookResult.Continue;
-		}
-            /*
-            private HookResult OnItemPickup(EventItemPickup @event, GameEventInfo info)
-            {
-                if (@event.Defindex == 42 || @event.Defindex == 59)
-                {
-                    CCSPlayerController? player = @event.Userid;
-                    if (player == null || !player.IsValid || !g_knifePickupCount.ContainsKey((int)player.Index) || player.IsBot || !g_playersKnife.ContainsKey((int)player.Index))
-                        return HookResult.Continue;
-
-
-                    if (g_knifePickupCount[(int)player.Index] >= 2) return HookResult.Continue;
-
-                    if (g_playersKnife.ContainsKey((int)player.Index)
-                        &&
-                       g_playersKnife[(int)player.Index] != "weapon_knife")
-                    {
-                        g_knifePickupCount[(int)player.Index]++;
-
-                        RemovePlayerKnife(player, true);
-
-                        if (!PlayerHasKnife(player) && Config.AdditionalSetting.GiveKnifeAfterRemove)
-                            AddTimer(0.3f, () => GiveKnifeToPlayer(player));
-                    }
-                }
-                return HookResult.Continue;
-            }
-            */
-
-            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)
+			if (player == null || player.IsBot || player.IsHLTV ||
-				return HookResult.Continue;
+				player.SteamID.ToString().Length != 17 || !g_knifePickupCount.TryGetValue((int)player.Index, out var pickupCount) ||
-
+				!g_playersKnife.ContainsKey((int)player.Index))
-			if (player == null || !player.IsValid || player.SteamID.ToString() == "" ||
+			{
-				!g_knifePickupCount.ContainsKey((int)player.Index) || !g_playersKnife.ContainsKey((int)player.Index))
 				return HookResult.Continue;
+			}
 
 			CBasePlayerWeapon weapon = new(caller.Handle);
 
 			if (weapon.AttributeManager.Item.ItemDefinitionIndex != 42 && weapon.AttributeManager.Item.ItemDefinitionIndex != 59)
+			{
 				return HookResult.Continue;
+			}
 
-			if (g_knifePickupCount[(int)player.Index] >= 2) return HookResult.Continue;
+			if (pickupCount >= 2)
+			{
+				return HookResult.Continue;
+			}
 
 			if (g_playersKnife[(int)player.Index] != "weapon_knife")
 			{
-				g_knifePickupCount[(int)player.Index]++;
+				pickupCount++;
-				player.RemoveItemByDesignerName(weapon.DesignerName);
+				g_knifePickupCount[(int)player.Index] = pickupCount;
-				if (Config.AdditionalSetting.GiveKnifeAfterRemove)
+
-					AddTimer(0.2f, () => GiveKnifeToPlayer(player));
+				if (Config.Additional.GiveKnifeAfterRemove)
+				{
+					AddTimer(0.10f, () =>
+					{
+						RefreshWeapons(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 && !Config.Additional.GloveEnabled) 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)
-				{
-					if (player.IsBot || player.IsHLTV || player.SteamID.ToString() == "") continue;
-					//if (gPlayerWeaponsInfo.ContainsKey((int)player.Index)) continue;
-                    if (playerIndexes.Contains((int)player.Index)) continue;
-
-                    PlayerInfo playerInfo = new PlayerInfo
-					{
-						UserId = player.UserId,
-						Index = (int)player.Index,
-                        SteamId = player?.SteamID,
-						Name = player?.PlayerName,
-						IpAddress = player?.IpAddress?.Split(":")[0]
-					};
-                    if (weaponSync != null)
-                        _ = weaponSync.GetKnifeFromDatabase(playerInfo);
-                }
-			}, CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE | CounterStrikeSharp.API.Modules.Timers.TimerFlags.REPEAT);
-			*/
-		}
-
-		private HookResult OnPlayerConnectFull(EventPlayerConnectFull @event, GameEventInfo info)
-		{
-			CCSPlayerController? player = @event.Userid;
-
-			if (player == null || !player.IsValid || player.IsBot || player.IsHLTV || weaponSync == null) return HookResult.Continue;
-
-			PlayerInfo playerInfo = new PlayerInfo
-			{
-				UserId = player.UserId,
-				Index = (int)player.Index,
-				SteamId = player?.SteamID,
-				Name = player?.PlayerName,
-				IpAddress = player?.IpAddress?.Split(":")[0]
-			};
-
-			if (!g_playersDatabaseIndex.ContainsKey((int)player!.Index))
-			{
-				Console.WriteLine($"[WeaponPaints] Retrying to retrieve player {player.PlayerName} skins");
-				Task.Run(async () =>
-				{
-                    await weaponSync.GetPlayerDatabaseIndex(playerInfo);
-                });
-            }
-
-			return HookResult.Continue;
 		}
 
 		private HookResult OnPlayerSpawn(EventPlayerSpawn @event, GameEventInfo info)
 		{
 			CCSPlayerController? player = @event.Userid;
-			if (player == null || !player.IsValid)
+
-			{
+			if (player is null || !player.IsValid || player.PlayerPawn == null ||
+			!player.PlayerPawn.IsValid || player.IsHLTV
+			|| !Config.Additional.KnifeEnabled && !Config.Additional.GloveEnabled)
 				return HookResult.Continue;
-			}
 
-			if (Config.AdditionalSetting.KnifeEnabled && !PlayerHasKnife(player))
+			g_knifePickupCount[(int)player.Index] = 0;
-			{
+			GiveKnifeToPlayer(player);
-				g_knifePickupCount[(int)player.Index] = 0;
-				GiveKnifeToPlayer(player);
-				//AddTimer(0.1f, () => GiveKnifeToPlayer(player));
-			}
 
-			/*
+			Server.NextFrame(() =>
-			if (Config.AdditionalSetting.SkinVisibilityFix)
 			{
-				AddTimer(0.3f, () => RefreshSkins(player));
+				RefreshGloves(player);
-			}
+			});
-			*/
 
 			return HookResult.Continue;
 		}
@@ -267,87 +202,84 @@ namespace WeaponPaints
 
 			return HookResult.Continue;
 		}
-
 		private void OnTick()
 		{
-			foreach (var player in Utilities.GetPlayers())
+			foreach (var player in Utilities.GetPlayers().Where(p =>
+							p is not null && p.IsValid &&
+							(LifeState_t)p.LifeState == LifeState_t.LIFE_ALIVE && p.SteamID.ToString().Length == 17
+							&& !p.IsBot && !p.IsHLTV && p.Connected == PlayerConnectedState.PlayerConnected && p.Team != CounterStrikeSharp.API.Modules.Utils.CsTeam.None
+							)
+				)
 			{
 				try
 				{
-					if (player == null || !player.IsValid || !player.PawnIsAlive || player.IsBot || player.IsHLTV || player.Connected == PlayerConnectedState.PlayerDisconnecting) continue;
+					if (Config.Additional.ShowSkinImage && PlayerWeaponImage.ContainsKey(player.Slot) && !string.IsNullOrEmpty(PlayerWeaponImage[player.Slot]))
+					{
+						player.PrintToCenterHtml("<img src='{PATH}'</img>".Replace("{PATH}", PlayerWeaponImage[player.Slot]));
+					}
+
+					if (player.PlayerPawn?.IsValid != true || player.PlayerPawn?.Value?.IsValid != true)
+						continue;
 
 					var viewModels = GetPlayerViewModels(player);
-
+					if (viewModels == null || viewModels.Length == 0)
-					if (viewModels == null) continue;
+						continue;
 
 					var viewModel = viewModels[0];
-					if (viewModel == null || viewModel.Value == null || viewModel.Value.Weapon == null || viewModel.Value.Weapon.Value == null) continue;
+					if (viewModel == null || viewModel.Value == null || viewModel.Value.Weapon == null || viewModel.Value.Weapon.Value == null)
-					CBasePlayerWeapon weapon = viewModel.Value.Weapon.Value;
+						continue;
 
-					if (weapon == null || !weapon.IsValid) continue;
+					var weapon = viewModel.Value.Weapon.Value;
+					if (weapon == null || !weapon.IsValid || weapon.FallbackPaintKit == 0)
+						continue;
 
-					var isKnife = viewModel.Value.VMName.Contains("knife");
+					if (viewModel.Value.VMName.Contains("knife"))
+						continue;
 
-					if (!isKnife)
+					var sceneNode = viewModel.Value.CBodyComponent?.SceneNode;
+					if (sceneNode == null)
+						continue;
+
+					var skeleton = GetSkeletonInstance(sceneNode);
+					if (skeleton == null)
+						continue;
+
+					int[] newPaints = { 1171, 1170, 1169, 1164, 1162, 1161, 1159, 1175, 1174, 1167, 1165, 1168, 1163, 1160, 1166, 1173 };
+					if (newPaints.Contains(weapon.FallbackPaintKit))
 					{
-						if (
+						skeleton.ModelState.MeshGroupMask = 1;
-							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");
 					}
+					else
+					{
+						if (skeleton.ModelState.MeshGroupMask != 2)
+						{
+							skeleton.ModelState.MeshGroupMask = 2;
+						}
+					}
+
+					Utilities.SetStateChanged(viewModel.Value, "CBaseEntity", "m_CBodyComponent");
 				}
 				catch (Exception)
-				{ }
+				{
+				}
 			}
 		}
 
 		private void RegisterListeners()
 		{
 			RegisterListener<Listeners.OnEntityCreated>(OnEntityCreated);
-			RegisterListener<Listeners.OnClientPutInServer>(OnClientPutInServer);
+			//RegisterListener<Listeners.OnClientPutInServer>(OnClientPutInServer);
-			RegisterListener<Listeners.OnClientDisconnect>(OnClientDisconnect);
+			//RegisterListener<Listeners.OnClientDisconnect>(OnClientDisconnect);
 			RegisterListener<Listeners.OnMapStart>(OnMapStart);
+			RegisterListener<Listeners.OnTick>(OnTick);
 
-            if (!Config.AdditionalSetting.UseMetamodAlwaysLegacyModel)
-				RegisterListener<Listeners.OnTick>(OnTick);
-
-            RegisterEventHandler<EventPlayerConnectFull>(OnPlayerConnectFull);
 			RegisterEventHandler<EventPlayerSpawn>(OnPlayerSpawn);
 			RegisterEventHandler<EventRoundStart>(OnRoundStart, HookMode.Pre);
 			RegisterEventHandler<EventRoundEnd>(OnRoundEnd);
-			RegisterEventHandler<EventItemPurchase>(OnEventItemPurchasePost);
+
 			//RegisterEventHandler<EventItemPickup>(OnItemPickup);
-			HookEntityOutput("weapon_knife", "OnPlayerPickup", OnPickup, HookMode.Pre);
-        }
 
-
+			HookEntityOutput("weapon_knife", "OnPlayerPickup", OnPickup);
-		/* WORKAROUND FOR CLIENTS WITHOUT STEAMID ON AUTHORIZATION */
-		/*private HookResult OnPlayerConnectFull(EventPlayerConnectFull @event, GameEventInfo info)
-		{
-			CCSPlayerController? player = @event.Userid;
-
-			if (player == null || !player.IsValid || !player.EntityIndex.HasValue || player.IsHLTV) return HookResult.Continue;
-
-			int playerIndex = (int)player.EntityIndex.Value.Value;
-			if (Config.AdditionalSetting.SkinEnabled && weaponSync != null)
-				_ = weaponSync.GetWeaponPaintsFromDatabase(playerIndex);
-			if (Config.AdditionalSetting.KnifeEnabled && weaponSync != null)
-				_ = weaponSync.GetKnifeFromDatabase(playerIndex);
-
-			Task.Run(async () =>
-			{
-				if (Config.AdditionalSetting.SkinEnabled && weaponSync != null)
-				if (Config.AdditionalSetting.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

@@ -10,7 +10,7 @@ Unfinished, unoptimized and not fully functional ugly demo weapon paints plugin
 
 ## Features
 - Changes only paint, seed and wear on weapons and knives
-- MySQL(min. ver 5.6.5) based or global website, so you dont need MySQL/Website
+- MySQL based or global website, so you dont need MySQL/Website
 - Data syncs on player connect
 - Added command **`!wp`** to refresh skins ***(with cooldown in seconds can be configured)***
 - Added command **`!ws`** to show website
@@ -23,7 +23,7 @@ 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
-- Run server with plugin, it will generate config if installed correctly
+- 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`**
 
@@ -74,9 +74,8 @@ Unfinished, unoptimized and not fully functional ugly demo weapon paints plugin
 </details>
     
 ## Web install
-Ignore this section if you have in config **`GlobalShare = true`**
+Disregard if the config is **`GlobalShare = true`**
-- Minimum PHP version 5.5 (needs testing)
+- Requires PHP >= 7.4 ***(Tested on php ver **`8.2.3`** and nginx webserver)***
-- Minimum MySQL version 5.6.5
 - **Before using website, make sure the plugin is correctly loaded in cs2 server!** Mysql tables are created by plugin not by website.
 - Copy website to web server ***(Folder `img` not needed)***
 - Get [Steam API Key](https://steamcommunity.com/dev/apikey)
@@ -90,6 +89,7 @@ Ignore this section if you have in config **`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
@@ -102,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/)

SchemaString.cs

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

Utility.cs

@@ -1,11 +1,11 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using Dapper;
-using MySqlConnector;
-using Newtonsoft.Json.Linq;
-using Newtonsoft.Json;
-using System.Reflection;
 using Microsoft.Extensions.Logging;
+using MySqlConnector;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System.Reflection;
 
 namespace WeaponPaints
 {
@@ -23,35 +23,51 @@ namespace WeaponPaints
 				Password = Config.DatabasePassword,
 				Database = Config.DatabaseName,
 				Port = (uint)Config.DatabasePort,
+				Pooling = true
 			};
 
 			return builder.ConnectionString;
 		}
-        internal static async void CheckDatabaseTables()
+
+		internal static async Task CheckDatabaseTables()
 		{
+			if (WeaponPaints._database is null) return;
+
 			try
 			{
-				using var connection = new MySqlConnection(BuildDatabaseConnectionString());
+				await using var connection = await WeaponPaints._database.GetConnectionAsync();
-				await connection.OpenAsync();
 
-				using var transaction = await connection.BeginTransactionAsync();
+				await using var transaction = await connection.BeginTransactionAsync();
 
-                // Minimal version for MySQL 5.6.5
+				try
-                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
 				{
-                    foreach (string command in sqlCommands)
+					string[] createTableQueries = new[]
-                    {
+					{
-                        await connection.ExecuteAsync(command, transaction: transaction);
+				@"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"
+			};
 
-                    await transaction.CommitAsync();
+					foreach (var query in createTableQueries)
+					{
+						await connection.ExecuteAsync(query, transaction: transaction);
+					}
+
+					await transaction.CommitAsync();
 				}
 				catch (Exception)
 				{
@@ -61,25 +77,43 @@ namespace WeaponPaints
 			}
 			catch (Exception ex)
 			{
-				throw new Exception("[WeaponPaints] Unknown mysql exception! " + ex.Message);
+				throw new Exception("[WeaponPaints] Unknown MySQL exception! " + ex.Message);
 			}
 		}
 
 		internal static bool IsPlayerValid(CCSPlayerController? player)
 		{
-			return (player != null && player.IsValid && !player.IsBot && !player.IsHLTV && player.AuthorizedSteamID != null);
+			if (player is null) return false;
+
+			return (player is not null && player.IsValid && !player.IsBot && !player.IsHLTV
+				&& WeaponPaints.weaponSync != null && player.Connected == PlayerConnectedState.PlayerConnected && player.SteamID.ToString().Length == 17);
 		}
+
 		internal static void LoadSkinsFromFile(string filePath)
 		{
-			if (File.Exists(filePath))
+			try
 			{
 				string json = File.ReadAllText(filePath);
 				var deserializedSkins = JsonConvert.DeserializeObject<List<JObject>>(json);
 				WeaponPaints.skinsList = deserializedSkins ?? new List<JObject>();
 			}
-			else
+			catch (FileNotFoundException)
 			{
-				throw new FileNotFoundException("File not found.", filePath);
+				throw;
+			}
+		}
+
+		internal static void LoadGlovesFromFile(string filePath)
+		{
+			try
+			{
+				string json = File.ReadAllText(filePath);
+				var deserializedSkins = JsonConvert.DeserializeObject<List<JObject>>(json);
+				WeaponPaints.glovesList = deserializedSkins ?? new List<JObject>();
+			}
+			catch (FileNotFoundException)
+			{
+				throw;
 			}
 		}
 
@@ -120,11 +154,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 +181,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.");
 				}
 			}
 		}
@@ -169,6 +207,7 @@ namespace WeaponPaints
 			Console.WriteLine(" ");
 		}
 
+		/*(
 		internal static void TestDatabaseConnection()
 		{
 			try
@@ -187,5 +226,6 @@ namespace WeaponPaints
 			}
 			CheckDatabaseTables();
 		}
+		*/
 	}
 }

VERSION

@@ -1 +1 @@
-1.4b
+1.8d

WeaponAction.cs

@@ -1,6 +1,7 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Memory;
+using CounterStrikeSharp.API.Modules.Timers;
 using CounterStrikeSharp.API.Modules.Utils;
 using Microsoft.Extensions.Logging;
 using System.Runtime.InteropServices;
@@ -11,7 +12,7 @@ namespace WeaponPaints
 	{
 		internal static void ChangeWeaponAttributes(CBasePlayerWeapon? weapon, CCSPlayerController? player, bool isKnife = false)
 		{
-			if (player == null || weapon == null || !weapon.IsValid || !Utility.IsPlayerValid(player)) return;
+			if (player is null || weapon is null || !weapon.IsValid || !Utility.IsPlayerValid(player)) return;
 
 			int playerIndex = (int)player.Index;
 
@@ -19,14 +20,16 @@ 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 &&
+			int fallbackPaintKit = weapon.FallbackPaintKit;
+
+			if (_config.Additional.GiveRandomSkin &&
 				 !gPlayerWeaponsInfo[playerIndex].ContainsKey(weaponDefIndex))
 			{
 				// Random skins
@@ -35,14 +38,52 @@ 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;
+
+				fallbackPaintKit = weapon.FallbackPaintKit;
+
+				if (fallbackPaintKit == 0)
+					return;
+
+				var foundSkin = skinsList.FirstOrDefault(skin =>
+					((int?)skin?["weapon_defindex"] ?? 0) == weaponDefIndex &&
+					((int?)skin?["paint"] ?? 0) == fallbackPaintKit &&
+					skin?["paint_name"] != null
+				);
+
+				string skinName = foundSkin?["paint_name"]?.ToString() ?? "";
+				if (!string.IsNullOrEmpty(skinName))
+					new SchemaString<CEconItemView>(weapon.AttributeManager.Item, "m_szCustomName").Set(skinName);
+
 				if (!isKnife && weapon.CBodyComponent != null && weapon.CBodyComponent.SceneNode != null)
 				{
-					if (weapon.CBodyComponent!.SceneNode!.GetSkeletonInstance().ModelState.MeshGroupMask != 2)
+					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))
 					{
-						weapon.CBodyComponent!.SceneNode!.GetSkeletonInstance().ModelState.MeshGroupMask = 2;
+						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;
 			}
 
@@ -56,44 +97,83 @@ namespace WeaponPaints
 			weapon.FallbackSeed = weaponInfo.Seed;
 			weapon.FallbackWear = weaponInfo.Wear;
 
-            if (!isKnife && weapon.CBodyComponent != null && weapon.CBodyComponent.SceneNode != null)
+			fallbackPaintKit = weapon.FallbackPaintKit;
+
+			if (fallbackPaintKit == 0)
+				return;
+
+			var foundSkin1 = skinsList.FirstOrDefault(skin =>
+			   ((int?)skin?["weapon_defindex"] ?? 0) == weaponDefIndex &&
+			   ((int?)skin?["paint"] ?? 0) == fallbackPaintKit &&
+			   skin?["paint_name"] != null
+		   );
+
+			var skinName1 = foundSkin1?["paint_name"]?.ToString() ?? "";
+			if (!string.IsNullOrEmpty(skinName1))
+				new SchemaString<CEconItemView>(weapon.AttributeManager.Item, "m_szCustomName").Set(skinName1);
+
+			if (!isKnife && weapon.CBodyComponent != null && weapon.CBodyComponent.SceneNode != null)
 			{
-                if (weapon.CBodyComponent!.SceneNode!.GetSkeletonInstance().ModelState.MeshGroupMask != 2)
+				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))
 				{
-                    weapon.CBodyComponent!.SceneNode!.GetSkeletonInstance().ModelState.MeshGroupMask = 2;
+					skeleton.ModelState.MeshGroupMask = 1;
-                }
+				}
-            }
+				else
-            
+				{
-        }
+					if (skeleton.ModelState.MeshGroupMask != 2)
+					{
+						skeleton.ModelState.MeshGroupMask = 2;
+					}
+				}
+			}
+
+			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.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);
+				knifeToGive = knifeTypes[index].Key;
-
-				player.GiveNamedItem(randomKnifeClass);
 			}
 			else
 			{
-				var defaultKnife = (CsTeam)player.TeamNum == CsTeam.Terrorist ? "weapon_knife_t" : "weapon_knife";
+				knifeToGive = (CsTeam)player.TeamNum == CsTeam.Terrorist ? "weapon_knife_t" : "weapon_knife";
-				player.GiveNamedItem(defaultKnife);
 			}
+
+			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)
 			{
@@ -118,207 +198,237 @@ namespace WeaponPaints
 			return false;
 		}
 
-		internal void RefreshPlayerKnife(CCSPlayerController? player)
+		internal void RefreshWeapons(CCSPlayerController? player)
 		{
-			if (player == null || !player.IsValid || player.PlayerPawn.Value == null || !player.PawnIsAlive) return;
+			if (player == null || !player.IsValid || player.PlayerPawn?.Value == null || (LifeState_t)player.LifeState != LifeState_t.LIFE_ALIVE)
-			if (player.PlayerPawn.Value.WeaponServices == null || player.PlayerPawn.Value.ItemServices == null) return;
+				return;
+			if (player.PlayerPawn.Value.WeaponServices == null || player.PlayerPawn.Value.ItemServices == null)
+				return;
 
 			var weapons = player.PlayerPawn.Value.WeaponServices.MyWeapons;
-			if (weapons != null && weapons.Count > 0)
+
+			if (weapons == null || weapons.Count == 0)
+				return;
+			if (player.Team == CsTeam.None || player.Team == CsTeam.Spectator)
+				return;
+
+			//Dictionary<string, (int, int)> weaponsWithAmmo = new Dictionary<string, (int, int)>();
+			Dictionary<string, List<(int, int)>> weaponsWithAmmo = new Dictionary<string, List<(int, int)>>();
+			bool bomb = false;
+			bool defuser = player.PawnHasDefuser;
+			bool healthshot = false;
+
+			// Iterate through each weapon
+			foreach (var weapon in weapons)
 			{
-				CCSPlayer_ItemServices service = new(player.PlayerPawn.Value.ItemServices.Handle);
+				if (weapon == null || !weapon.IsValid || weapon.Value == null ||
-				//var dropWeapon = VirtualFunction.CreateVoid<nint, nint>(service.Handle, GameData.GetOffset("CCSPlayer_ItemServices_DropActivePlayerWeapon"));
+					!weapon.Value.IsValid || !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;
+
+					CCSWeaponBaseVData? weaponData = weapon.Value.As<CCSWeaponBase>().VData;
+
+					if (weaponData != null)
 					{
-						//if (weapon.Value.AttributeManager.Item.ItemDefinitionIndex == 42 || weapon.Value.AttributeManager.Item.ItemDefinitionIndex == 59)
+						if (weaponData.GearSlot == gear_slot_t.GEAR_SLOT_C4)
-						if (weapon.Value.DesignerName.Contains("knife") || weapon.Value.DesignerName.Contains("bayonet"))
+							bomb = true;
+
+						if (weaponData.Name.Equals("weapon_healtshot"))
+							healthshot = true;
+
+						if (weaponData.GearSlot == gear_slot_t.GEAR_SLOT_GRENADES || weaponData.GearSlot == gear_slot_t.GEAR_SLOT_UTILITY || weaponData.GearSlot == gear_slot_t.GEAR_SLOT_BOOSTS)
 						{
-							if (weapon.Index <= 0) return;
+							int clip1 = weapon.Value.Clip1;
-							int weaponEntityIndex = (int)weapon.Index;
+							int reservedAmmo = weapon.Value.ReserveAmmo[0];
-							NativeAPI.IssueClientCommand((int)player.Index - 1, "slot3");
-							AddTimer(0.22f, () =>
-							{
-								if (player.PlayerPawn.Value.WeaponServices.ActiveWeapon.Value!.DesignerName.Contains("knife")
-								||
-								player.PlayerPawn.Value.WeaponServices.ActiveWeapon.Value!.DesignerName.Contains("bayonet")
-								)
-								{
-									if (player.PawnIsAlive)
-									{
-										NativeAPI.IssueClientCommand((int)player.Index - 1, "slot3");
-										service.DropActivePlayerWeapon(weapon.Value);
-										GiveKnifeToPlayer(player);
-									}
-								}
-							});
 
-							Task.Delay(TimeSpan.FromSeconds(3.5)).ContinueWith(_ =>
+							weaponsWithAmmo.Add(weapon.Value.DesignerName, new List<(int, int)>() { (clip1, reservedAmmo) });
-							{
-								try
-								{
-									CEntityInstance? knife = Utilities.GetEntityFromIndex<CEntityInstance>(weaponEntityIndex);
-
-									if (knife != null && knife.IsValid && knife.Handle != -1 && knife.Index > 0)
-									{
-										knife.Remove();
-									}
-								}
-								catch (Exception) { }
-							});
-
-							break;
 						}
 					}
+
+					if (!weapon.Value.DesignerName.Contains("knife")
+						&&
+						!weapon.Value.DesignerName.Contains("bayonet")
+						&&
+						!weapon.Value.DesignerName.Contains("kukri")
+						&&
+						WeaponDefindex.TryGetValue(weapon.Value.AttributeManager.Item.ItemDefinitionIndex, out weaponByDefindex) && weaponByDefindex != null)
+					{
+						int clip1 = weapon.Value.Clip1;
+						int reservedAmmo = weapon.Value.ReserveAmmo[0];
+
+						if (!weaponsWithAmmo.ContainsKey(weaponByDefindex))
+						{
+							weaponsWithAmmo.Add(weaponByDefindex, new List<(int, int)>());
+						}
+
+						weaponsWithAmmo[weaponByDefindex].Add((clip1, reservedAmmo));
+					}
+				}
+				catch (Exception ex)
+				{
+					Logger.LogWarning(ex.Message);
+					continue;
 				}
 			}
-		}
-        /*
-		internal void RefreshSkins(CCSPlayerController? player)
-		{
-			return;
-			if (!Utility.IsPlayerValid(player) || !player!.PawnIsAlive) return;
 
-			AddTimer(0.18f, () => NativeAPI.IssueClientCommand((int)player.Index - 1, "slot3"));
+			player.RemoveWeapons();
-			AddTimer(0.25f, () => NativeAPI.IssueClientCommand((int)player.Index - 1, "slot2"));
+			AddTimer(0.3f, () =>
-			AddTimer(0.38f, () => NativeAPI.IssueClientCommand((int)player.Index - 1, "slot1"));
+			{
+				GiveKnifeToPlayer(player);
+
+				if (bomb)
+					player.GiveNamedItem("weapon_c4");
+
+				if (defuser)
+				{
+					var itemServ = player.PlayerPawn?.Value?.ItemServices;
+					if (itemServ != null)
+					{
+						var items = new CCSPlayer_ItemServices(itemServ.Handle);
+						items.HasDefuser = true;
+					}
+				}
+
+				if (healthshot)
+					player.GiveNamedItem("weapon_healtshot");
+
+				foreach (var entry in weaponsWithAmmo)
+				{
+					foreach (var ammo in entry.Value)
+					{
+						var newWeapon = new CBasePlayerWeapon(player.GiveNamedItem(entry.Key));
+						Server.NextFrame(() =>
+						{
+							try
+							{
+								if (newWeapon != null)
+								{
+									newWeapon.Clip1 = ammo.Item1;
+									newWeapon.ReserveAmmo[0] = ammo.Item2;
+								}
+							}
+							catch (Exception ex)
+							{
+								Logger.LogWarning("Error setting weapon properties: " + ex.Message);
+							}
+						});
+					}
+				}
+			}, TimerFlags.STOP_ON_MAPCHANGE);
 		}
-		*/
+
-        internal void RefreshWeapons(CCSPlayerController? player)
+		internal void RefreshKnife(CCSPlayerController? player)
 		{
-			if (player == null || !player.IsValid || player.PlayerPawn.Value == null || !player.PawnIsAlive) return;
+			if (player == null || !player.IsValid || player.PlayerPawn?.Value == null || (LifeState_t)player.LifeState != LifeState_t.LIFE_ALIVE)
-			if (player.PlayerPawn.Value.WeaponServices == null || player.PlayerPawn.Value.ItemServices == null) return;
+				return;
+
+			if (player.PlayerPawn.Value.WeaponServices == null || player.PlayerPawn.Value.ItemServices == null)
+				return;
 
 			var weapons = player.PlayerPawn.Value.WeaponServices.MyWeapons;
 			if (weapons != null && weapons.Count > 0)
 			{
-				CCSPlayer_ItemServices service = new(player.PlayerPawn.Value.ItemServices.Handle);
-
 				foreach (var weapon in weapons)
 				{
-					if (weapon != null && weapon.IsValid && weapon.Value != null && weapon.Value.IsValid)
+					if (weapon != null && weapon.IsValid && weapon.Value != null && weapon.Value.IsValid && weapon.Index > 0)
 					{
-						if (weapon.Index <= 0 || !weapon.Value.DesignerName.Contains("weapon_")) continue;
-						//if (weapon.Value.AttributeManager.Item.ItemDefinitionIndex == 42 || weapon.Value.AttributeManager.Item.ItemDefinitionIndex == 59)
 						try
 						{
-							if (weapon.Value.DesignerName.Contains("knife") || weapon.Value.DesignerName.Contains("bayonet"))
+							CCSWeaponBaseVData? weaponData = weapon.Value.As<CCSWeaponBase>().VData;
+
+							if (weapon.Value.DesignerName.Contains("knife") || weaponData?.GearSlot == gear_slot_t.GEAR_SLOT_KNIFE)
 							{
-								player.RemoveItemByDesignerName(weapon.Value.DesignerName, true);
+								RefreshWeapons(player);
-								GiveKnifeToPlayer(player);
+								break;
-							}
-							else
-							{
-								if (!WeaponDefindex.ContainsKey(weapon.Value.AttributeManager.Item.ItemDefinitionIndex)) continue;
-								int clip1, reservedAmmo;
-
-								clip1 = weapon.Value.Clip1;
-								reservedAmmo = weapon.Value.ReserveAmmo[0];
-
-								string weaponByDefindex = WeaponDefindex[weapon.Value.AttributeManager.Item.ItemDefinitionIndex];
-								player.RemoveItemByDesignerName(weapon.Value.DesignerName, true);
-								CBasePlayerWeapon newWeapon = new(player.GiveNamedItem(weaponByDefindex));
-
-								Server.NextFrame(() =>
-								{
-									if (newWeapon == null) return;
-									try
-									{
-										newWeapon.Clip1 = clip1;
-										newWeapon.ReserveAmmo[0] = reservedAmmo;
-									}
-									catch (Exception)
-									{ }
-								});
 							}
 						}
 						catch (Exception ex)
 						{
-							Logger.LogWarning("Refreshing weapons exception");
+							Logger.LogWarning($"Cannot remove knife: {ex.Message}");
-							Console.WriteLine("[WeaponPaints] Refreshing weapons exception");
-							Console.WriteLine(ex.Message);
 						}
 					}
 				}
-
-				/*
-				if (Config.AdditionalSetting.SkinVisibilityFix)
-					RefreshSkins(player);
-				*/
 			}
 		}
 
-		internal void RemovePlayerKnife(CCSPlayerController? player, bool force = false)
+		private static void RefreshGloves(CCSPlayerController player)
 		{
-			if (player == null || !player.IsValid || player.PlayerPawn.Value == null || !player.PawnIsAlive) return;
+			if (!Utility.IsPlayerValid(player) || (LifeState_t)player.LifeState != LifeState_t.LIFE_ALIVE) return;
-			if (player.PlayerPawn.Value.WeaponServices == null || player.PlayerPawn.Value.ItemServices == null) return;
 
-			var weapons = player.PlayerPawn.Value.WeaponServices.MyWeapons;
+			CCSPlayerPawn? pawn = player.PlayerPawn.Value;
-			if (weapons != null && weapons.Count > 0)
+			if (pawn == null || !pawn.IsValid || pawn.LifeState != (byte)LifeState_t.LIFE_ALIVE)
+				return;
+
+			string model = pawn.CBodyComponent?.SceneNode?.GetSkeletonInstance()?.ModelState.ModelName ?? string.Empty;
+			if (!string.IsNullOrEmpty(model))
 			{
-				CCSPlayer_ItemServices service = new CCSPlayer_ItemServices(player.PlayerPawn.Value.ItemServices.Handle);
+				pawn.SetModel("characters/models/tm_jumpsuit/tm_jumpsuit_varianta.vmdl");
-				//var dropWeapon = VirtualFunction.CreateVoid<nint, nint>(service.Handle, GameData.GetOffset("CCSPlayer_ItemServices_DropActivePlayerWeapon"));
+				pawn.SetModel(model);
+			}
 
-				foreach (var weapon in weapons)
+			Instance.AddTimer(0.06f, () =>
+			{
+				try
 				{
-					if (weapon != null && weapon.IsValid && weapon.Value != null && weapon.Value.IsValid)
+					if (!player.IsValid)
+						return;
+
+					if (g_playersGlove.TryGetValue(player.Index, out var gloveInfo) && gloveInfo != 0)
 					{
-						//if (weapon.Value.AttributeManager.Item.ItemDefinitionIndex == 42 || weapon.Value.AttributeManager.Item.ItemDefinitionIndex == 59)
+						CCSPlayerPawn? pawn = player.PlayerPawn.Value;
-						if (weapon.Value.DesignerName.Contains("knife") || weapon.Value.DesignerName.Contains("bayonet"))
+						if (pawn == null || !pawn.IsValid || pawn.LifeState != (byte)LifeState_t.LIFE_ALIVE)
-						{
+							return;
-							if (!force)
-							{
-								if ((int)weapon.Index <= 0) return;
-								int weaponEntityIndex = (int)weapon.Index;
-								NativeAPI.IssueClientCommand((int)player.Index - 1, "slot3");
-								AddTimer(0.35f, () => service.DropActivePlayerWeapon(weapon.Value));
 
-								AddTimer(1.0f, () =>
+						WeaponInfo weaponInfo = gPlayerWeaponsInfo[(int)player.Index][gloveInfo];
-								{
-									CEntityInstance? knife = Utilities.GetEntityFromIndex<CEntityInstance>(weaponEntityIndex);
-									if (knife != null && knife.IsValid)
-									{
-										knife.Remove();
-									}
-								});
-							}
-							else
-							{
-								weapon.Value.Remove();
-							}
 
-							break;
+						CEconItemView item = pawn.EconGloves;
-						}
+						item.ItemDefinitionIndex = gloveInfo;
+						item.ItemIDLow = 16384 & 0xFFFFFFFF;
+						item.ItemIDHigh = 16384;
+
+						CAttributeList_SetOrAddAttributeValueByName.Invoke(item.NetworkedDynamicAttributes.Handle, "set item texture prefab", weaponInfo.Paint);
+						CAttributeList_SetOrAddAttributeValueByName.Invoke(item.NetworkedDynamicAttributes.Handle, "set item texture seed", weaponInfo.Seed);
+						CAttributeList_SetOrAddAttributeValueByName.Invoke(item.NetworkedDynamicAttributes.Handle, "set item texture wear", weaponInfo.Wear);
+
+						item.Initialized = true;
+
+						CBaseModelEntity_SetBodygroup.Invoke(pawn, "default_gloves", 1);
 					}
 				}
-			}
+				catch (Exception) { }
+			}, TimerFlags.STOP_ON_MAPCHANGE);
 		}
+
 		private static int GetRandomPaint(int defindex)
 		{
+			if (skinsList == null || skinsList.Count == 0)
+				return 0;
 
-			if (skinsList != null)
+			Random rnd = new Random();
-			{
+
-				Random rnd = new Random();
+			// Filter weapons by the provided defindex
-				// Filter weapons by the provided defindex
+			var filteredWeapons = skinsList.Where(w => w["weapon_defindex"]?.ToString() == defindex.ToString()).ToList();
-				var filteredWeapons = skinsList.FindAll(w => w["weapon_defindex"]?.ToString() == defindex.ToString());
+
+			if (filteredWeapons.Count == 0)
+				return 0;
+
+			var randomWeapon = filteredWeapons[rnd.Next(filteredWeapons.Count)];
+
+			if (int.TryParse(randomWeapon["paint"]?.ToString(), out int paintValue))
+				return paintValue;
 
-				if (filteredWeapons.Count > 0)
-				{
-					var randomWeapon = filteredWeapons[rnd.Next(filteredWeapons.Count)];
-					if (int.TryParse(randomWeapon["paint"]?.ToString(), out int paintValue))
-					{
-						return paintValue;
-					}
-					else
-					{
-						return 0;
-					}
-				}
-			}
 			return 0;
 		}
+
+		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;

WeaponInfo.cs

@@ -2,12 +2,8 @@
 {
 	public class WeaponInfo
 	{
-		public ushort Paint { get; set; }
+		public int Paint { get; set; }
-		public ushort Seed { get; set; }
+		public int Seed { get; set; } = 0;
-		public float Wear { get; set; }
+		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; }
-    }
 }

WeaponPaints.cs

@@ -2,16 +2,19 @@ using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes;
 using CounterStrikeSharp.API.Modules.Cvars;
+using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
+using MySqlConnector;
 using Newtonsoft.Json.Linq;
 using System.Collections.Concurrent;
 
 namespace WeaponPaints;
 
-[MinimumApiVersion(155)]
+[MinimumApiVersion(168)]
 public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 {
+	internal static WeaponPaints Instance { get; private set; } = new();
 	internal static readonly Dictionary<string, string> weaponList = new()
 	{
 		{"weapon_deagle", "Desert Eagle"},
@@ -36,6 +39,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,86 +71,94 @@ 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, string> g_playersKnife = new ConcurrentDictionary<int, string>();
+	internal static ConcurrentDictionary<uint, ushort> g_playersGlove = new ConcurrentDictionary<uint, ushort>();
-    internal static ConcurrentDictionary<int, int?> g_playersMusicKit = new ConcurrentDictionary<int, int?>();
+	internal static ConcurrentDictionary<int, ConcurrentDictionary<int, WeaponInfo>> gPlayerWeaponsInfo = new ConcurrentDictionary<int, ConcurrentDictionary<int, WeaponInfo>>();
-	internal static ConcurrentDictionary<int, ConcurrentDictionary<ushort, WeaponInfo>> gPlayerWeaponsInfo = new ConcurrentDictionary<int, ConcurrentDictionary<ushort, WeaponInfo>>();
 	internal static List<JObject> skinsList = new List<JObject>();
+	internal static List<JObject> glovesList = new List<JObject>();
 	internal static WeaponSynchronization? weaponSync;
-	internal bool g_bCommandsAllowed = true;
+	public static bool g_bCommandsAllowed = true;
+	internal Dictionary<int, string> PlayerWeaponImage = new();
 
 	internal Uri GlobalShareApi = new("https://weaponpaints.fun/api.php");
 	internal int GlobalShareServerId = 0;
 	internal static Dictionary<int, DateTime> commandsCooldown = new Dictionary<int, DateTime>();
-	private string DatabaseConnectionString = string.Empty;
+	internal static Database? _database;
-	//private CounterStrikeSharp.API.Modules.Timers.Timer? g_hTimerCheckSkinsData = null;
+
-    public WeaponPaintsConfig Config { get; set; } = new();
+	internal static MemoryFunctionVoid<nint, string, float> CAttributeList_SetOrAddAttributeValueByName = new(GameData.GetSignature("CAttributeList_SetOrAddAttributeValueByName"));
+	internal static MemoryFunctionVoid<CBaseModelEntity, string, UInt64> CBaseModelEntity_SetBodygroup = new(GameData.GetSignature("CBaseModelEntity_SetBodygroup"));
+
+	public static Dictionary<int, string> WeaponDefindex { get; } = new Dictionary<int, string>
+	{
+		{ 1, "weapon_deagle" },
+		{ 2, "weapon_elite" },
+		{ 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 ModuleDescription => "Skin, gloves and knife selector, standalone and web-based";
 	public override string ModuleName => "WeaponPaints";
-	public override string ModuleVersion => "1.5.0";
+	public override string ModuleVersion => "1.8d";
 
 	public static WeaponPaintsConfig GetWeaponPaintsConfig()
 	{
@@ -155,52 +167,52 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 
 	public override void Load(bool hotReload)
 	{
-		if (!Config.GlobalShare)
+		Instance = this;
-		{
-			DatabaseConnectionString = Utility.BuildDatabaseConnectionString();
-			Utility.TestDatabaseConnection();
-		}
 
 		if (hotReload)
 		{
 			OnMapStart(string.Empty);
 
-			List<CCSPlayerController> players = Utilities.GetPlayers();
+			foreach (var player in Utilities.GetPlayers())
-
-			foreach (CCSPlayerController player in players)
 			{
-				if (player == null || !player.IsValid || player.IsBot || player.IsHLTV || player.SteamID.ToString() == "") continue;
+				if (weaponSync == null || player is null || !player.IsValid || player.SteamID.ToString().Length != 17 || !player.PawnIsAlive || player.IsBot ||
-				if (g_playersDatabaseIndex.ContainsKey((int)player.Index)) continue;
+					player.IsHLTV || player.Connected != PlayerConnectedState.PlayerConnected)
-                
+					continue;
-                PlayerInfo playerInfo = new PlayerInfo
+
+				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)
+
-				{
+				if (Config.Additional.SkinEnabled)
-                    _ = weaponSync!.GetPlayerDatabaseIndex(playerInfo);
+					_ = weaponSync.GetWeaponPaintsFromDatabase(playerInfo);
-				}
+				if (Config.Additional.KnifeEnabled)
-                g_knifePickupCount[(int)player!.Index] = 0;
+					_ = weaponSync.GetKnifeFromDatabase(playerInfo);
+				if (Config.Additional.GloveEnabled)
+					_ = weaponSync.GetGloveFromDatabase(playerInfo);
 			}
-			/*
-			RegisterListeners();
-			RegisterCommands();
-			*/
 		}
 
-		if (Config.AdditionalSetting.KnifeEnabled)
+		Utility.LoadSkinsFromFile(ModuleDirectory + "/skins.json");
+		Utility.LoadGlovesFromFile(ModuleDirectory + "/gloves.json");
+
+		if (Config.Additional.KnifeEnabled)
 			SetupKnifeMenu();
-		if (Config.AdditionalSetting.SkinEnabled)
+		if (Config.Additional.SkinEnabled)
 			SetupSkinsMenu();
+		if (Config.Additional.GloveEnabled)
+			SetupGlovesMenu();
 
 		RegisterListeners();
 		RegisterCommands();
-
-		Utility.LoadSkinsFromFile(ModuleDirectory + "/skins.json");
 	}
 
 	public void OnConfigParsed(WeaponPaintsConfig config)
@@ -209,37 +221,30 @@ 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?
+				Logger.LogError("You need to setup Database credentials in config!");
-                for (int i = 1; i <= 30; i++)
+				throw new Exception("[WeaponPaints] You need to setup Database credentials in config!");
-                {
+			}
-                    Console.WriteLine("[WeaponPaints] You need to setup Database credentials in config!");
+
-                }
+			var builder = new MySqlConnectionStringBuilder
-                Logger.LogError("You need to setup Database credentials in config!");
+			{
-                throw new Exception("[WeaponPaints] You need to setup Database credentials in config!");
+				Server = config.DatabaseHost,
-            }
+				UserID = config.DatabaseUser,
+				Password = config.DatabasePassword,
+				Database = config.DatabaseName,
+				Port = (uint)config.DatabasePort,
+				Pooling = true
+			};
+
+			_database = new(builder.ConnectionString);
+
+			_ = Utility.CheckDatabaseTables();
 		}
-		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;
 
-        /*
+		Utility.Config = config;
-         * GLOBAL SHARE IS NOT SUPPORTED NOW!
-         */
-        if (Config.GlobalShare)
-            Config.GlobalShare = false;
-
-        Utility.Config = config;
 		Utility.ShowAd(ModuleVersion);
 		Task.Run(async () => await Utility.CheckVersion(ModuleVersion, Logger));
 	}

WeaponPaints.csproj

@@ -9,9 +9,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.148" />
+    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.168" />
     <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 Dapper;
-using CounterStrikeSharp.API.Modules.Entities;
-using Dapper;
-using MySqlConnector;
 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;
+			if (!_config.Additional.KnifeEnabled) 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 (player.SteamId == null || player.Index == 0) return;
 			try
 			{
 				if (_config.GlobalShare)
 				{
 					var values = new Dictionary<string, string>
-					{
+				{
-					   { "server_id", _globalShareServerId.ToString() },
+				   { "server_id", _globalShareServerId.ToString() },
-					   { "steamid", player.SteamId.ToString()! },
+				   { "steamid", player.SteamId },
-					   { "knife", "1" }
+				   { "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,68 @@ namespace WeaponPaints
 					return;
 				}
 
-                if (!WeaponPaints.g_playersDatabaseIndex.TryGetValue(player.Index, out _))
+				await using var connection = await _database.GetConnectionAsync();
-                {
+				string query = "SELECT `knife` FROM `wp_player_knife` WHERE `steamid` = @steamid";
-                    return;
+				string? playerKnife = await connection.QueryFirstOrDefaultAsync<string>(query, new { steamid = player.SteamId });
-                }
 
-                using (var connection = new MySqlConnection(_databaseConnectionString))
+				if (!string.IsNullOrEmpty(playerKnife))
 				{
-					await connection.OpenAsync();
+					WeaponPaints.g_playersKnife[player.Index] = playerKnife;
-					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)
-					{
-						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 GetGloveFromDatabase(PlayerInfo player)
 		{
-			if (!_config.AdditionalSetting.SkinEnabled) return;
+			if (!_config.Additional.GloveEnabled) return;
-			if (player.SteamId == null || player.Index == 0) return;
+			try
+			{
+				// Ensure proper disposal of resources using "using" statement
+				await using var connection = await _database.GetConnectionAsync();
 
-            if (!WeaponPaints.gPlayerWeaponsInfo.TryGetValue(player.Index, out _))
+				// Construct the SQL query with specific columns for better performance
-            {
+				string query = "SELECT `weapon_defindex` FROM `wp_player_gloves` WHERE `steamid` = @steamid";
-                WeaponPaints.gPlayerWeaponsInfo[player.Index] = new ConcurrentDictionary<ushort, WeaponInfo>();
-            }
 
-            try
+				// 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[(uint)player.Index] = gloveData.Value;
+				}
+			}
+			catch (Exception e)
+			{
+				// Log any exceptions occurred during database operation
+				Utility.Log("An error occurred while fetching glove data: " + e.Message);
+			}
+		}
+
+		internal async Task GetWeaponPaintsFromDatabase(PlayerInfo player)
+		{
+			if (!_config.Additional.SkinEnabled) return;
+
+			if (!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() },
+				   { "server_id", _globalShareServerId.ToString() },
-					   { "steamid", player.SteamId.ToString()! },
+				   { "steamid", player.SteamId },
-					   { "skins", "1" }
+				   { "skins", "1" }
-					};
+				};
 					UriBuilder builder = new UriBuilder(_globalShareApi);
 					builder.Query = string.Join("&", values.Select(p => $"{Uri.EscapeDataString(p.Key)}={Uri.EscapeDataString(p.Value)}"));
 
@@ -206,20 +142,19 @@ namespace WeaponPaints
 							{
 								foreach (var weapon in jsonArray)
 								{
-                                    ushort? weaponDefIndex = weapon["weapon_defindex"]?.Value<ushort>();
+									int? weaponDefIndex = weapon["weapon_defindex"]?.Value<int>();
-                                    ushort? weaponPaintId = weapon["weapon_paint_id"]?.Value<ushort>();
+									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,
+											Wear = weaponWear.Value
-                                            NameTag = null
+										};
-                                        };
 										WeaponPaints.gPlayerWeaponsInfo[player.Index][weaponDefIndex.Value] = weaponInfo;
 									}
 								}
@@ -233,99 +168,93 @@ namespace WeaponPaints
 					}
 				}
 
-                if (!WeaponPaints.g_playersDatabaseIndex.TryGetValue(player.Index, out _))
+				await using var connection = await _database.GetConnectionAsync();
-                {
+				string query = "SELECT * FROM `wp_player_skins` WHERE `steamid` = @steamid";
-                    return;
+				var playerSkins = await connection.QueryAsync<dynamic>(query, new { steamid = player.SteamId });
-                }
 
-                using (var connection = new MySqlConnection(_databaseConnectionString))
+				foreach (var row in playerSkins)
 				{
-					await connection.OpenAsync();
+					int? weaponDefIndex = row.weapon_defindex;
-                    string query = "SELECT `weapon`, `paint`, `wear`, `seed`, `nametag` FROM `wp_users_items` WHERE `user_id` = @userId";
+					int? weaponPaintId = row.weapon_paint_id;
-                    IEnumerable<dynamic> PlayerSkins = await connection.QueryAsync<dynamic>(query, new { userId = WeaponPaints.g_playersDatabaseIndex[player.Index] });
+					float? weaponWear = row.weapon_wear;
-                    if (PlayerSkins != null && PlayerSkins.Any())
+					int? weaponSeed = row.weapon_seed;
-					{
-                        PlayerSkins.ToList().ForEach(row =>
-						{
-                            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
+					WeaponInfo weaponInfo = new WeaponInfo
-							{
-								Paint = weaponPaintId,
-								Seed = weaponSeed,
-								Wear = weaponWear,
-                                NameTag = weaponNameTag
-                            };
-							WeaponPaints.gPlayerWeaponsInfo[player.Index][weaponDefIndex] = weaponInfo;
-						});
-					}
-					else
 					{
-						return;
+						Paint = weaponPaintId.HasValue ? weaponPaintId.Value : 0,
-					}
+						Seed = weaponSeed.HasValue ? weaponSeed.Value : 0,
-					await connection.CloseAsync();
+						Wear = weaponWear.HasValue ? weaponWear.Value : 0f
+					};
+
+					WeaponPaints.gPlayerWeaponsInfo[player.Index][weaponDefIndex.GetValueOrDefault()] = weaponInfo;
 				}
 			}
 			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 (!_config.Additional.KnifeEnabled) return;
-            if (player == null || player.Index <= 0) return;
 
-            if (!WeaponPaints.g_playersDatabaseIndex.TryGetValue(player.Index, out var playerDatabaseIndex))
+			try
-                return;
+			{
-                
+				await using var connection = await _database.GetConnectionAsync();
-            if (!WeaponPaints.gPlayerWeaponsInfo.TryGetValue(player.Index, out var playerSavedWeapons))
+				string query = "INSERT INTO `wp_player_knife` (`steamid`, `knife`) VALUES(@steamid, @newKnife) ON DUPLICATE KEY UPDATE `knife` = @newKnife";
-                return;
+				await connection.ExecuteAsync(query, new { steamid = player.SteamId, newKnife = knife });
-                
+			}
-			if (!playerSavedWeapons.TryGetValue(weaponDefIndex, out var weaponInfo))
+			catch (Exception e)
-                return;
+			{
+				Utility.Log(e.Message);
+			}
+		}
 
-            using var connection = new MySqlConnection(_databaseConnectionString);
+		internal async Task SyncGloveToDatabase(PlayerInfo player, ushort defindex)
-            string querySql = @"
+		{
-			INSERT INTO `wp_users_items` 
+			if (!_config.Additional.GloveEnabled) return;
-				(`user_id`, `weapon`, `paint`, `wear`, `seed`) 
+
-			VALUES 
+			try
-				(@userId, @weaponDefIndex, @paintId, @wear, @seed) 
+			{
-			ON DUPLICATE KEY UPDATE 
+				await using var connection = await _database.GetConnectionAsync();
-				paint = @paintId,
+				string query = "INSERT INTO `wp_player_gloves` (`steamid`, `weapon_defindex`) VALUES(@steamid, @weapon_defindex) ON DUPLICATE KEY UPDATE `weapon_defindex` = @weapon_defindex";
-				wear = @wear,
+				await connection.ExecuteAsync(query, new { steamid = player.SteamId, weapon_defindex = defindex });
-				seed = @seed";
+			}
-            var queryParams = new { weaponDefIndex, userId = playerDatabaseIndex, paintId = weaponInfo.Paint, wear = weaponInfo.Wear, seed = weaponInfo.Seed };
+			catch (Exception e)
-            await connection.ExecuteAsync(querySql, queryParams);
+			{
-            await connection.CloseAsync();
+				Utility.Log(e.Message);
-            
+			}
+		}
+
+		internal async Task SyncWeaponPaintsToDatabase(PlayerInfo player)
+		{
+			if (player == null || player.Index <= 0 || player.SteamId == null) return;
+
+			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);
+			}
 		}
 	}
 }

gamedata/gloves.json

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

lang/en.json

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

lang/lv.json

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

lang/pl.json

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

lang/pt-BR.json

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

lang/pt-PT.json

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

lang/ru.json

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

lang/tr.json

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

lang/ua.json

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

lang/zh-cn.json

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

website/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, array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES utf8"));
-            $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");
         }
-        catch(PDOException $ex) {
+        catch(PDOException $ex)
-            // Display error message if connection fails
+        {
             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>");
         }
     }
-
+    public function select($query, $bindings = []) {
-    /**
-     * 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
         $STH = $this->PDO->prepare($query);
         $STH->execute($bindings);
-
-        // Fetch the results as associative arrays
         $result = $STH->fetchAll(PDO::FETCH_ASSOC);
-        if ($result === false) {
+		$result ??= false;
-            $result = array(); // Set $result to an empty array if no results found
+		return $result;
-        }
-        return $result;
     }
 
-    /**
+    public function query($query, $bindings = []){
-     * 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
         $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
 {
-    /**
+    public static function skinsFromJson(): array
-     * Retrieve skins data from the JSON file.
-     *
-     * @return array An associative array containing skin data.
-     */
-    public static function skinsFromJson()
     {
-        $skins = array();
+        $skins = [];
-        $jsonFilePath = __DIR__ . "/../data/skins.json";
+        $json = json_decode(file_get_contents(__DIR__ . "/../data/skins.json"), true);
 
-        if (file_exists($jsonFilePath) && is_readable($jsonFilePath)) {
+        foreach ($json as $skin) {
-            $json = json_decode(file_get_contents($jsonFilePath), true);
+            $skins[(int) $skin['weapon_defindex']][(int) $skin['paint']] = [
-
+                'weapon_name' => $skin['weapon_name'],
-            foreach ($json as $skin) {
+                'paint_name' => $skin['paint_name'],
-                $skins[(int) $skin['weapon_defindex']][(int) $skin['paint']] = array(
+                'image_url' => $skin['image'],
-                    '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 weapons data from the skin data array.
-     *
-     * @return array An associative array containing weapon data.
-     */
     public static function getWeaponsFromArray()
     {
-        $weapons = array();
+        $weapons = [];
-        $skinsData = self::skinsFromJson();
+        $temp = self::skinsFromJson();
 
-        foreach ($skinsData as $key => $value) {
+        foreach ($temp as $key => $value) {
-            $weapons[$key] = array(
+            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();
+        $knifes = [];
-        $weaponsData = self::getWeaponsFromArray();
+        $temp = self::getWeaponsFromArray();
 
-        $allowedKnifeKeys = array(
+        foreach ($temp as $key => $weapon) {
-            500, 503, 505, 506, 507, 508, 509, 512, 514, 515,
+            if (
-            516, 517, 518, 519, 520, 521, 522, 523, 525
+                !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) {
+            $knifes[$key] = [
-            if (in_array($key, $allowedKnifeKeys)) {
+                'weapon_name' => $weapon['weapon_name'],
-                $knifes[$key] = array(
+                'paint_name' => rtrim(explode("|", $weapon['paint_name'])[0]),
-                    'weapon_name' => $weapon['weapon_name'],
+                'image_url' => $weapon['image_url'],
-                    '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;
     }
 
-    /**
+    public static function getSelectedSkins(array $temp)
-     * 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)
     {
-        $selected = array();
+        $selected = [];
 
         foreach ($temp as $weapon) {
-            $selected[$weapon['weapon']] =  array(
+            $selected[$weapon['weapon_defindex']] =  [
-                'weapon_paint_id' => $weapon['paint'],
+                'weapon_paint_id' => $weapon['weapon_paint_id'],
-                'weapon_seed' => $weapon['seed'],
+                'weapon_seed' => $weapon['weapon_seed'],
-                'weapon_wear' => $weapon['wear'],
+                'weapon_wear' => $weapon['weapon_wear'],
-            );
+            ];
         }
 
         return $selected;

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