Merge pull request #121 from daffyyyy/main

1.4b

Commands.cs

@@ -22,9 +22,12 @@ namespace WeaponPaints
 				IpAddress = player?.IpAddress?.Split(":")[0]
 			};
 
-			if (playerIndex != 0 && DateTime.UtcNow >= commandCooldown[playerIndex].AddSeconds(Config.CmdRefreshCooldownSeconds))
+			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))
 			{
-				commandCooldown[playerIndex] = DateTime.UtcNow;
+				commandsCooldown[(int)player.UserId] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
 				if (weaponSync != null)
 					Task.Run(async () => await weaponSync.GetWeaponPaintsFromDatabase(playerInfo));
 				if (Config.Additional.KnifeEnabled)
@@ -145,11 +148,13 @@ namespace WeaponPaints
 			AddCommand($"css_{Config.Additional.CommandKnife}", "Knife Menu", (player, info) =>
 			{
 				if (!Utility.IsPlayerValid(player) || !g_bCommandsAllowed) return;
-				int playerIndex = (int)player!.Index;
 
-				if (commandCooldown != null && DateTime.UtcNow >= commandCooldown[playerIndex].AddSeconds(Config.CmdRefreshCooldownSeconds))
+				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))
 				{
-					commandCooldown[playerIndex] = DateTime.UtcNow;
+					commandsCooldown[(int)player.UserId] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
 					ChatMenus.OpenMenu(player, giveItemMenu);
 					return;
 				}
@@ -210,7 +215,7 @@ namespace WeaponPaints
 							int.TryParse(weaponDefIndexObj.ToString(), out var weaponDefIndex) &&
 							int.TryParse(selectedPaintID, out var paintID))
 						{
-							p!.Print(Localizer["f", selectedSkin]);
+							p!.Print(Localizer["wp_skin_menu_select", selectedSkin]);
 
 							if (!gPlayerWeaponsInfo[playerIndex].ContainsKey(weaponDefIndex))
 							{
@@ -271,11 +276,13 @@ namespace WeaponPaints
 			AddCommand($"css_{Config.Additional.CommandSkinSelection}", "Skins selection menu", (player, info) =>
 			{
 				if (!Utility.IsPlayerValid(player)) return;
-				int playerIndex = (int)player!.Index;
 
-				if (commandCooldown != null && DateTime.UtcNow >= commandCooldown[playerIndex].AddSeconds(Config.CmdRefreshCooldownSeconds) && playerIndex > 0 && playerIndex < commandCooldown.Length)
+				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))
 				{
-					commandCooldown[playerIndex] = DateTime.UtcNow;
+					commandsCooldown[(int)player.UserId] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
 					ChatMenus.OpenMenu(player, weaponSelectionMenu);
 					return;
 				}

Events.cs

@@ -1,22 +1,19 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
-using CounterStrikeSharp.API.Modules.Entities;
 
 namespace WeaponPaints
 {
 	public partial class WeaponPaints
 	{
-		private void OnClientAuthorized(int playerSlot, SteamID steamID)
+		private void OnClientPutInServer(int playerSlot)
 		{
-			int playerIndex = playerSlot + 1;
+			CCSPlayerController? player = Utilities.GetPlayerFromSlot(playerSlot);
-
-			CCSPlayerController? player = Utilities.GetPlayerFromIndex(playerIndex);
 
 			PlayerInfo playerInfo = new PlayerInfo
 			{
 				UserId = player.UserId,
 				Index = (int)player.Index,
-				SteamId = player?.AuthorizedSteamID?.SteamId64.ToString(),
+				SteamId = player.SteamID.ToString(),
 				Name = player?.PlayerName,
 				IpAddress = player?.IpAddress?.Split(":")[0]
 			};
@@ -37,18 +34,28 @@ namespace WeaponPaints
 		{
 			CCSPlayerController player = Utilities.GetPlayerFromSlot(playerSlot);
 
-			if (player == null || !player.IsValid || player.IsBot || player.IsHLTV) return;
+			if (player == null || !player.IsValid || player.IsBot || player.IsHLTV || player.UserId == null) return;
 
 			if (Config.Additional.KnifeEnabled)
-				g_playersKnife.Remove((int)player.Index);
+				g_playersKnife.TryRemove((int)player.Index, out _);
 			if (Config.Additional.SkinEnabled)
-				gPlayerWeaponsInfo.Remove((int)player.Index);
+			{
+				if (gPlayerWeaponsInfo.TryRemove((int)player.Index, out var innerDictionary))
+				{
+					innerDictionary.Clear();
+				}
+			}
+			if (commandsCooldown.ContainsKey((int)player.UserId))
+			{
+				commandsCooldown.Remove((int)player.UserId);
+			}
 		}
 
 		private void OnEntityCreated(CEntityInstance entity)
 		{
 			if (!Config.Additional.SkinEnabled) return;
-			var designerName = entity.DesignerName;
+			if (entity == null || !entity.IsValid || string.IsNullOrEmpty(entity.DesignerName)) return;
+			string designerName = entity.DesignerName;
 			if (!weaponList.ContainsKey(designerName)) return;
 			bool isKnife = false;
 			var weapon = new CBasePlayerWeapon(entity.Handle);
@@ -85,34 +92,30 @@ namespace WeaponPaints
 
 			if (player == null || !player.IsValid) return HookResult.Continue;
 
+			/*
 			if (Config.Additional.SkinVisibilityFix)
 				AddTimer(0.2f, () => RefreshSkins(player));
+			*/
 
 			return HookResult.Continue;
 		}
 
+		/*
 		private HookResult OnItemPickup(EventItemPickup @event, GameEventInfo info)
 		{
 			if (@event.Defindex == 42 || @event.Defindex == 59)
 			{
-				Server.PrintToChatAll("test1");
-
 				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;
 
-				Server.PrintToChatAll("test2");
-
 
 				if (g_knifePickupCount[(int)player.Index] >= 2) return HookResult.Continue;
-				Server.PrintToChatAll("test3");
-
 
 				if (g_playersKnife.ContainsKey((int)player.Index)
 					&&
 				   g_playersKnife[(int)player.Index] != "weapon_knife")
 				{
-					Server.PrintToChatAll("usuwam noz");
 					g_knifePickupCount[(int)player.Index]++;
 
 					RemovePlayerKnife(player, true);
@@ -123,6 +126,7 @@ namespace WeaponPaints
 			}
 			return HookResult.Continue;
 		}
+		*/
 
 		public HookResult OnPickup(CEntityIOOutput output, string name, CEntityInstance activator, CEntityInstance caller, CVariant value, float delay)
 		{
@@ -131,7 +135,7 @@ namespace WeaponPaints
 			if (player == null || player.IsBot || player.IsHLTV)
 				return HookResult.Continue;
 
-			if (player == null || !player.IsValid || player.AuthorizedSteamID == null ||
+			if (player == null || !player.IsValid || player.SteamID.ToString() == "" ||
 				!g_knifePickupCount.ContainsKey((int)player.Index) || !g_playersKnife.ContainsKey((int)player.Index))
 				return HookResult.Continue;
 
@@ -145,15 +149,14 @@ namespace WeaponPaints
 			if (g_playersKnife[(int)player.Index] != "weapon_knife")
 			{
 				g_knifePickupCount[(int)player.Index]++;
-				weapon.Remove();
+				player.RemoveItemByDesignerName(weapon.DesignerName);
-				if (!PlayerHasKnife(player) && Config.Additional.GiveKnifeAfterRemove)
+				if (Config.Additional.GiveKnifeAfterRemove)
 					AddTimer(0.2f, () => GiveKnifeToPlayer(player));
 			}
 
 			return HookResult.Continue;
 		}
 
-
 		private void OnMapStart(string mapName)
 		{
 			if (!Config.Additional.KnifeEnabled) return;
@@ -178,14 +181,14 @@ namespace WeaponPaints
 
 				foreach (CCSPlayerController player in players)
 				{
-					if (player.IsBot || player.IsHLTV || player.AuthorizedSteamID == null) continue;
+					if (player.IsBot || player.IsHLTV || player.SteamID.ToString() == "") continue;
 					if (gPlayerWeaponsInfo.ContainsKey((int)player.Index)) continue;
 
 					PlayerInfo playerInfo = new PlayerInfo
 					{
 						UserId = player.UserId,
 						Index = (int)player.Index,
-						SteamId = player?.AuthorizedSteamID?.SteamId64.ToString(),
+						SteamId = player?.SteamID.ToString(),
 						Name = player?.PlayerName,
 						IpAddress = player?.IpAddress?.Split(":")[0]
 					};
@@ -208,7 +211,7 @@ namespace WeaponPaints
 			{
 				UserId = player.UserId,
 				Index = (int)player.Index,
-				SteamId = player?.AuthorizedSteamID?.SteamId64.ToString(),
+				SteamId = player?.SteamID.ToString(),
 				Name = player?.PlayerName,
 				IpAddress = player?.IpAddress?.Split(":")[0]
 			};
@@ -231,21 +234,24 @@ namespace WeaponPaints
 		private HookResult OnPlayerSpawn(EventPlayerSpawn @event, GameEventInfo info)
 		{
 			CCSPlayerController? player = @event.Userid;
-			if (player == null || !player.IsValid || player.IsBot)
+			if (player == null || !player.IsValid)
 			{
 				return HookResult.Continue;
 			}
 
-			if (Config.Additional.KnifeEnabled)
+			if (Config.Additional.KnifeEnabled && !PlayerHasKnife(player))
 			{
 				g_knifePickupCount[(int)player.Index] = 0;
-				AddTimer(0.1f, () => GiveKnifeToPlayer(player));
+				GiveKnifeToPlayer(player);
+				//AddTimer(0.1f, () => GiveKnifeToPlayer(player));
 			}
 
+			/*
 			if (Config.Additional.SkinVisibilityFix)
 			{
 				AddTimer(0.3f, () => RefreshSkins(player));
 			}
+			*/
 
 			return HookResult.Continue;
 		}
@@ -267,12 +273,52 @@ namespace WeaponPaints
 			return HookResult.Continue;
 		}
 
+		private void OnTick()
+		{
+			foreach (var player in Utilities.GetPlayers())
+			{
+				try
+				{
+					if (player == null || !player.IsValid || !player.PawnIsAlive || player.IsBot || player.IsHLTV) continue;
+
+					var viewModels = GetPlayerViewModels(player);
+
+					if (viewModels == null) continue;
+
+					var viewModel = viewModels[0];
+					if (viewModel == null || viewModel.Value == null || viewModel.Value.Weapon == null || viewModel.Value.Weapon.Value == null) continue;
+					CBasePlayerWeapon weapon = viewModel.Value.Weapon.Value;
+
+					if (weapon == null || !weapon.IsValid) continue;
+
+					var isKnife = viewModel.Value.VMName.Contains("knife");
+
+					if (!isKnife)
+					{
+						if (
+							viewModel.Value.CBodyComponent != null
+							&& viewModel.Value.CBodyComponent.SceneNode != null
+						)
+						{
+							var skeleton = GetSkeletonInstance(viewModel.Value.CBodyComponent.SceneNode);
+							skeleton.ModelState.MeshGroupMask = 2;
+						}
+
+						Utilities.SetStateChanged(viewModel.Value, "CBaseEntity", "m_CBodyComponent");
+					}
+				}
+				catch (Exception)
+				{ }
+			}
+		}
+
 		private void RegisterListeners()
 		{
 			RegisterListener<Listeners.OnEntityCreated>(OnEntityCreated);
-			RegisterListener<Listeners.OnClientAuthorized>(OnClientAuthorized);
+			RegisterListener<Listeners.OnClientPutInServer>(OnClientPutInServer);
 			RegisterListener<Listeners.OnClientDisconnect>(OnClientDisconnect);
 			RegisterListener<Listeners.OnMapStart>(OnMapStart);
+			RegisterListener<Listeners.OnTick>(OnTick);
 
 			RegisterEventHandler<EventPlayerConnectFull>(OnPlayerConnectFull);
 			RegisterEventHandler<EventPlayerSpawn>(OnPlayerSpawn);
@@ -283,6 +329,7 @@ namespace WeaponPaints
 			HookEntityOutput("weapon_knife", "OnPlayerPickup", OnPickup, HookMode.Pre);
 		}
 
+
 		/* WORKAROUND FOR CLIENTS WITHOUT STEAMID ON AUTHORIZATION */
 		/*private HookResult OnPlayerConnectFull(EventPlayerConnectFull @event, GameEventInfo info)
 		{

PlayerExtensions.cs

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

PluginServices.cs

@@ -1 +0,0 @@
-

README.md

@@ -1,26 +1,28 @@
 # CS2 Weapon Paints
 
 ## Description
-Unfinished, unoptimized and not fully functional ugly demo weapon paints plugin for **[CSSharp](https://docs.cssharp.dev/)**.
+Unfinished, unoptimized and not fully functional ugly demo weapon paints plugin for **[CSSharp](https://docs.cssharp.dev/docs/guides/getting-started.html)**. 
 
-## Created [Discord server](https://discord.gg/d9CvaYPSFe) where you can discus about plugin.
+## Created [Discord server](https://discord.gg/d9CvaYPSFe) where you can discuss about plugin.
 
 ### Consider to donate instead of buying from unknown sources.
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/E1E2G0P2O) or [![Donate on Steam](https://github.com/Nereziel/cs2-WeaponPaints/assets/32937653/a0d53822-4ca7-4caf-83b4-e1a9b5f8c94e)](https://steamcommunity.com/tradeoffer/new/?partner=41515647&token=gW2W-nXE)
 
 ## Features
-- Changes only paint, seed and wear on weapons and knives;
+- Changes only paint, seed and wear on weapons and knives
-- MySQL based or global website at [weaponpaints.fun](https://weaponpaints.fun/), so you dont need MySQL/Website;
+- MySQL based or global website at [weaponpaints.fun](https://weaponpaints.fun/), so you dont need MySQL/Website
-- Data sync on player connect;
+- Data syncs on player connect
-- Added command **`!wp`** to refresh skins; ***(with cooldown in second can be configured)***
+- Added command **`!wp`** to refresh skins ***(with cooldown in seconds can be configured)***
-- Added command **`!ws`** to show website;
+- Added command **`!ws`** to show website
-- Added command **`!knife`** to show menu with knives;
+- Added command **`!knife`** to show menu with knives
-- Knife change is now limited to have these cvars empty **`mp_t_default_melee ""`** and **`mp_ct_default_melee ""`**;
+- Knife change is now limited to have these cvars empty **`mp_t_default_melee ""`** and **`mp_ct_default_melee ""`**
+- Translations support, submit a PR if you want to share your translation
 
 ## CS2 Server
-- Compile and copy plugin to plugins, [more info here](https://docs.cssharp.dev/guides/hello-world-plugin/);
+- Have working CounterStrikeSharp (**with RUNTIME!**)
-- Setup **`addons/counterstrikesharp/configs/plugins/WeaponPaints/WeaponPaints.json`** set **`GlobalShare`** to **`true`** for global, or include database credentials;
+- Download from Release and copy plugin to plugins
-- in **`addons/counterstrikesharp/configs/core.json`** set **FollowCS2ServerGuidelines** to **`false`**;
+- Setup `addons/counterstrikesharp/configs/`**`plugins/WeaponPaints/WeaponPaints.json`** set **`GlobalShare`** to **`true`** for global, or include database credentials
+- In `addons/counterstrikesharp/configs/`**`core.json`** set **FollowCS2ServerGuidelines** to **`false`**
 
 ## Plugin Configuration
 <details>
@@ -69,15 +71,31 @@ Unfinished, unoptimized and not fully functional ugly demo weapon paints plugin
 </details>
     
 ## Web install
-Disregard if the config is **`GlobalShare = true`**;
+Disregard if the config is **`GlobalShare = true`**
-- Requires PHP >= 7.4; ***(Tested on php ver **`8.2.3`** and nginx webserver)***
+- Requires PHP >= 7.4 ***(Tested on php ver **`8.2.3`** and nginx webserver)***
-- Copy website to web server; ***(Folder `img` not needed)***
+- Copy website to web server ***(Folder `img` not needed)***
-- Get [Steam API Key](https://steamcommunity.com/dev/apikey);
+- Get [Steam API Key](https://steamcommunity.com/dev/apikey)
-- Fill in database credentials and api key in `class/config.php`;
+- Fill in database credentials and api key in `class/config.php`
-- Visit website and login via steam;
+- Visit website and login via steam
+
+## Web Features
+- Basic website
+- Steam login/logout
+- Change knife, paint, seed and wear
 
 ## Known issues
 - Issue on Windows servers, no knives are given.
+- Can cause incompatibility with plugins which changes, removes
+
+## Troubleshooting
+**Skins are not changing:**
+Set FollowCSGOGuidelines to false in cssharp’s core.jcon config
+
+**Database error table does not exists:**
+Plugin is not loaded or configured with mysql credentials. Tables are auto-created by plugin.
+
+**Knives are disappearing:**
+Set in config GiveKnifeAfterRemove to true 
 
 ### 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/)
 

VERSION

@@ -1 +1 @@
-1.3f
+1.4b

WeaponAction.cs

@@ -3,6 +3,7 @@ using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Memory;
 using CounterStrikeSharp.API.Modules.Utils;
 using Microsoft.Extensions.Logging;
+using System.Runtime.InteropServices;
 
 namespace WeaponPaints
 {
@@ -20,6 +21,7 @@ namespace WeaponPaints
 
 			int weaponDefIndex = weapon.AttributeManager.Item.ItemDefinitionIndex;
 
+
 			if (isKnife)
 			{
 				weapon.AttributeManager.Item.EntityQuality = 3;
@@ -38,7 +40,10 @@ namespace WeaponPaints
 				if (!isKnife && weapon.CBodyComponent != null && weapon.CBodyComponent.SceneNode != null)
 				{
 					var skeleton = GetSkeletonInstance(weapon.CBodyComponent.SceneNode);
-					skeleton.ModelState.MeshGroupMask = 2;
+					if (skeleton.ModelState.MeshGroupMask != 2)
+					{
+						skeleton.ModelState.MeshGroupMask = 2;
+					}
 				}
 				return;
 			}
@@ -52,16 +57,21 @@ namespace WeaponPaints
 			weapon.FallbackPaintKit = weaponInfo.Paint;
 			weapon.FallbackSeed = weaponInfo.Seed;
 			weapon.FallbackWear = weaponInfo.Wear;
+
 			if (!isKnife && weapon.CBodyComponent != null && weapon.CBodyComponent.SceneNode != null)
 			{
 				var skeleton = GetSkeletonInstance(weapon.CBodyComponent.SceneNode);
-				skeleton.ModelState.MeshGroupMask = 2;
+				if (skeleton.ModelState.MeshGroupMask != 2)
+				{
+					skeleton.ModelState.MeshGroupMask = 2;
+				}
 			}
 		}
 
 		internal static void GiveKnifeToPlayer(CCSPlayerController? player)
 		{
 			if (!_config.Additional.KnifeEnabled || player == null || !player.IsValid) return;
+
 			if (g_playersKnife.TryGetValue((int)player.Index, out var knife))
 			{
 				player.GiveNamedItem(knife);
@@ -170,6 +180,7 @@ namespace WeaponPaints
 
 		internal void RefreshSkins(CCSPlayerController? player)
 		{
+			return;
 			if (!Utility.IsPlayerValid(player) || !player!.PawnIsAlive) return;
 
 			AddTimer(0.18f, () => NativeAPI.IssueClientCommand((int)player.Index - 1, "slot3"));
@@ -197,7 +208,7 @@ namespace WeaponPaints
 						{
 							if (weapon.Value.DesignerName.Contains("knife") || weapon.Value.DesignerName.Contains("bayonet"))
 							{
-								weapon.Value.Remove();
+								player.RemoveItemByDesignerName(weapon.Value.DesignerName, true);
 								GiveKnifeToPlayer(player);
 							}
 							else
@@ -208,8 +219,8 @@ namespace WeaponPaints
 								clip1 = weapon.Value.Clip1;
 								reservedAmmo = weapon.Value.ReserveAmmo[0];
 
-								weapon.Value.Remove();
 								string weaponByDefindex = weaponDefindex[weapon.Value.AttributeManager.Item.ItemDefinitionIndex];
+								player.RemoveItemByDesignerName(weapon.Value.DesignerName, true);
 								CBasePlayerWeapon newWeapon = new(player.GiveNamedItem(weaponByDefindex));
 
 								Server.NextFrame(() =>
@@ -233,8 +244,11 @@ namespace WeaponPaints
 						}
 					}
 				}
+
+				/*
 				if (Config.Additional.SkinVisibilityFix)
 					RefreshSkins(player);
+				*/
 			}
 		}
 
@@ -313,5 +327,27 @@ namespace WeaponPaints
 			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;
+			CCSPlayer_ViewModelServices viewModelServices = new CCSPlayer_ViewModelServices(player.PlayerPawn.Value.ViewModelServices!.Handle);
+			return GetFixedArray<CHandle<CBaseViewModel>>(viewModelServices.Handle, "CCSPlayer_ViewModelServices", "m_hViewModel", 3);
+		}
+
+		public static unsafe T[] GetFixedArray<T>(nint pointer, string @class, string member, int length) where T : CHandle<CBaseViewModel>
+		{
+			nint ptr = pointer + Schema.GetSchemaOffset(@class, member);
+			Span<nint> references = MemoryMarshal.CreateSpan<nint>(ref ptr, length);
+			T[] values = new T[length];
+
+			for (int i = 0; i < length; i++)
+			{
+				values[i] = (T)Activator.CreateInstance(typeof(T), references[i])!;
+			}
+
+			return values;
+		}
+
 	}
 }

WeaponPaints.cs

@@ -2,13 +2,14 @@ using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes;
 using CounterStrikeSharp.API.Modules.Cvars;
-using Newtonsoft.Json.Linq;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json.Linq;
+using System.Collections.Concurrent;
 
 namespace WeaponPaints;
 
-[MinimumApiVersion(121)]
+[MinimumApiVersion(144)]
 public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 {
 	internal static readonly Dictionary<string, string> weaponList = new()
@@ -72,16 +73,15 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 	internal static WeaponPaintsConfig _config = new WeaponPaintsConfig();
 	internal static IStringLocalizer? _localizer;
 	internal static Dictionary<int, int> g_knifePickupCount = new Dictionary<int, int>();
-	internal static Dictionary<int, string> g_playersKnife = new();
+	internal static ConcurrentDictionary<int, string> g_playersKnife = new ConcurrentDictionary<int, string>();
-	internal static Dictionary<int, Dictionary<int, WeaponInfo>> gPlayerWeaponsInfo = new Dictionary<int, Dictionary<int, WeaponInfo>>();
+	internal static ConcurrentDictionary<int, ConcurrentDictionary<int, WeaponInfo>> gPlayerWeaponsInfo = new ConcurrentDictionary<int, ConcurrentDictionary<int, WeaponInfo>>();
 	internal static List<JObject> skinsList = new List<JObject>();
 	internal static WeaponSynchronization? weaponSync;
-	//internal static List<int> g_changedKnife = new();
 	internal bool g_bCommandsAllowed = true;
 
 	internal Uri GlobalShareApi = new("https://weaponpaints.fun/api.php");
 	internal int GlobalShareServerId = 0;
-	private DateTime[] commandCooldown = new DateTime[Server.MaxPlayers];
+	internal static Dictionary<int, DateTime> commandsCooldown = new Dictionary<int, DateTime>();
 	private string DatabaseConnectionString = string.Empty;
 	private CounterStrikeSharp.API.Modules.Timers.Timer? g_hTimerCheckSkinsData = null;
 	public static Dictionary<int, string> weaponDefindex { get; } = new Dictionary<int, string>
@@ -145,7 +145,7 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 	public override string ModuleAuthor => "Nereziel & daffyy";
 	public override string ModuleDescription => "Skin and knife selector, standalone and web-based";
 	public override string ModuleName => "WeaponPaints";
-	public override string ModuleVersion => "1.3g";
+	public override string ModuleVersion => "1.4b";
 
 	public static WeaponPaintsConfig GetWeaponPaintsConfig()
 	{
@@ -168,14 +168,14 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 
 			foreach (CCSPlayerController player in players)
 			{
-				if (player == null || !player.IsValid || player.IsBot || player.IsHLTV || player.AuthorizedSteamID == null) continue;
+				if (player == null || !player.IsValid || player.IsBot || player.IsHLTV || player.SteamID.ToString() == "") continue;
 				if (gPlayerWeaponsInfo.ContainsKey((int)player.Index)) continue;
 
 				PlayerInfo playerInfo = new PlayerInfo
 				{
 					UserId = player.UserId,
 					Index = (int)player.Index,
-					SteamId = player?.AuthorizedSteamID?.SteamId64.ToString(),
+					SteamId = player?.SteamID.ToString(),
 					Name = player?.PlayerName,
 					IpAddress = player?.IpAddress?.Split(":")[0]
 				};

WeaponPaints.csproj

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

WeaponSynchronization.cs

@@ -1,6 +1,7 @@
 using Dapper;
 using MySqlConnector;
 using Newtonsoft.Json.Linq;
+using System.Collections.Concurrent;
 
 namespace WeaponPaints
 {
@@ -94,7 +95,7 @@ namespace WeaponPaints
 
 			if (!WeaponPaints.gPlayerWeaponsInfo.TryGetValue(player.Index, out _))
 			{
-				WeaponPaints.gPlayerWeaponsInfo[player.Index] = new Dictionary<int, WeaponInfo>();
+				WeaponPaints.gPlayerWeaponsInfo[player.Index] = new ConcurrentDictionary<int, WeaponInfo>();
 			}
 			try
 			{

lang/ua.json

@@ -0,0 +1,14 @@
+{
+	"wp_prefix": "{lightblue}[WeaponPaints] {default}",
+	"wp_info_website": "Відвідайте веб-сайт {lime}{0},{default} щоб вибрати скин",
+	"wp_info_refresh": "Напишіть у чат {lime}!wp{default} для синхронізації вибраних скинів",
+	"wp_info_knife": "Напишіть у чат {lime}!knife,{default} щоб вибрати ніж",
+	"wp_command_cooldown": "{lightred}Ви не можете вибрати зброю зараз",
+	"wp_command_refresh_done": "{lime}Оновлення скинів для зброї",
+	"wp_knife_menu_select": "Ви вибрали скин {lime}{0}{default} для ножа",
+	"wp_knife_menu_kill": "Щоб правильно застосувати скин для ножа, напишіть у чат {lime}!kill{default}",
+	"wp_knife_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

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

website/class/config.php

@@ -5,6 +5,8 @@ define('DB_NAME', '');
 define('DB_USER', '');
 define('DB_PASS', '');
 
+define('WEB_STYLE_DARK', true);
+
 define('STEAM_API_KEY', '');
 define('STEAM_DOMAIN_NAME', '');
 define('STEAM_LOGOUT_PAGE', '');

website/class/database.php

@@ -4,7 +4,14 @@ class DataBase {
     private $PDO;
 
     public function __construct() {
-        $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"));
+        try {
+            $this->PDO = new PDO("mysql:host=".DB_HOST."; port=".DB_PORT."; dbname=".DB_NAME, DB_USER, DB_PASS, array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES utf8"));
+        }
+        catch(PDOException $ex)
+        {
+            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 = []) {
         $STH = $this->PDO->prepare($query);

website/class/utils.php

@@ -88,7 +88,11 @@ class UtilsClass
         $selected = [];
 
         foreach ($temp as $weapon) {
-            $selected[$weapon['weapon_defindex']] = $weapon['weapon_paint_id'];
+            $selected[$weapon['weapon_defindex']] =  [
+                'weapon_paint_id' => $weapon['weapon_paint_id'],
+                'weapon_seed' => $weapon['weapon_seed'],
+                'weapon_wear' => $weapon['weapon_wear'],
+            ];
         }
 
         return $selected;

website/getskins.php

@@ -0,0 +1,73 @@
+<?php
+$weapons = array (
+"weapon_deagle" => 1,
+"weapon_elite" => 2,
+"weapon_fiveseven" => 3,
+"weapon_glock" => 4,
+"weapon_ak47" => 7,
+"weapon_aug" => 8,
+"weapon_awp" => 9,
+"weapon_famas" => 10,
+"weapon_g3sg1" => 10,
+"weapon_galilar" => 13,
+"weapon_m249" => 14,
+"weapon_m4a1" => 16,
+"weapon_mac10" => 17,
+"weapon_p90" => 19,
+"weapon_mp5sd" => 23,
+"weapon_ump45" => 24,
+"weapon_xm1014" => 25,
+"weapon_bizon" => 26,
+"weapon_mag7" => 27,
+"weapon_negev" => 28,
+"weapon_sawedoff" => 29,
+"weapon_tec9" => 30,
+"weapon_hkp2000" => 32,
+"weapon_mp7" => 33,
+"weapon_mp9" => 34,
+"weapon_nova" => 35,
+"weapon_p250" => 36,
+"weapon_scar20" => 38,
+"weapon_sg556" => 39,
+"weapon_ssg08" => 40,
+"weapon_m4a1_silencer" => 60,
+"weapon_usp_silencer" => 61,
+"weapon_cz75a" => 63,
+"weapon_revolver" => 64,
+"weapon_bayonet" => 500,
+"weapon_knife_css" => 503,
+"weapon_knife_flip" => 505,
+"weapon_knife_gut" => 506,
+"weapon_knife_karambit" => 507,
+"weapon_knife_m9_bayonet" => 508,
+"weapon_knife_tactical" => 509,
+"weapon_knife_falchion" => 512,
+"weapon_knife_survival_bowie"=> 514,
+"weapon_knife_butterfly" => 515,
+"weapon_knife_push" => 516,
+"weapon_knife_cord" => 517,
+"weapon_knife_canis" => 518,
+"weapon_knife_ursus" => 519,
+"weapon_knife_gypsy_jackknife" => 520,
+"weapon_knife_outdoor" => 521,
+"weapon_knife_stiletto" => 522,
+"weapon_knife_widowmaker" => 523,
+"weapon_knife_skeleton" => 525);
+$json = json_decode(file_get_contents('skins.json')); 
+echo "<pre>";
+foreach($json as $skin)
+{
+	if(!str_contains($skin->weapon->id, "weapon_")) continue;
+	$name = $skin->name;
+	$name = str_replace("'","\'",$name);
+	$weapon = $skin->weapon->id;
+	$image = $skin->image;
+	$paint = $skin->paint_index;
+	echo "('{$weapon}', {$weapons[$weapon]}, {$paint}, '{$image}', '{$name}')";
+	echo ",<br>";
+	
+}
+//print_r($json);
+echo "</pre>";
+
+?>

website/index.php

@@ -7,22 +7,21 @@ require_once 'class/utils.php';
 $db = new DataBase();
 if (isset($_SESSION['steamid'])) {
 
-    include('steamauth/userInfo.php');
+	$steamid = $_SESSION['steamid'];
-    $steamid = $steamprofile['steamid'];
 
-    $weapons = UtilsClass::getWeaponsFromArray();
+	$weapons = UtilsClass::getWeaponsFromArray();
-    $skins = UtilsClass::skinsFromJson();
+	$skins = UtilsClass::skinsFromJson();
-    $querySelected = $query3 = $db->select("SELECT `weapon_defindex`, `weapon_paint_id`, `weapon_wear` FROM `wp_player_skins` WHERE `wp_player_skins`.`steamid` = :steamid", ["steamid" => $steamid]);
+	$querySelected = $db->select("SELECT `weapon_defindex`, `weapon_paint_id`, `weapon_wear`, `weapon_seed` FROM `wp_player_skins` WHERE `wp_player_skins`.`steamid` = :steamid", ["steamid" => $steamid]);
-    $selectedSkins = UtilsClass::getSelectedSkins($querySelected);
+	$selectedSkins = UtilsClass::getSelectedSkins($querySelected);
-    $selectedKnife = $db->select("SELECT * FROM `wp_player_knife` WHERE `wp_player_knife`.`steamid` = :steamid", ["steamid" => $steamid])[0];
+	$selectedKnife = $db->select("SELECT * FROM `wp_player_knife` WHERE `wp_player_knife`.`steamid` = :steamid", ["steamid" => $steamid]);
-    $knifes = UtilsClass::getKnifeTypes();
+	$knifes = UtilsClass::getKnifeTypes();
 
-    if (isset($_POST['forma'])) {
+	if (isset($_POST['forma'])) {
-        $ex = explode("-", $_POST['forma']);
+		$ex = explode("-", $_POST['forma']);
 
-        if ($ex[0] == "knife") {
+		if ($ex[0] == "knife") {
-            $db->query("INSERT INTO `wp_player_knife` (`steamid`, `knife`) VALUES(:steamid, :knife) ON DUPLICATE KEY UPDATE `knife` = :knife", ["steamid" => $steamid, "knife" => $knifes[$ex[1]]['weapon_name']]);
+			$db->query("INSERT INTO `wp_player_knife` (`steamid`, `knife`) VALUES(:steamid, :knife) ON DUPLICATE KEY UPDATE `knife` = :knife", ["steamid" => $steamid, "knife" => $knifes[$ex[1]]['weapon_name']]);
-        } else {
+		} else {
 			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
@@ -32,24 +31,21 @@ if (isset($_SESSION['steamid'])) {
 					$db->query("INSERT INTO wp_player_skins (`steamid`, `weapon_defindex`, `weapon_paint_id`, `weapon_wear`, `weapon_seed`) VALUES (:steamid, :weapon_defindex, :weapon_paint_id, :weapon_wear, :weapon_seed)", ["steamid" => $steamid, "weapon_defindex" => $ex[0], "weapon_paint_id" => $ex[1], "weapon_wear" => $wear, "weapon_seed" => $seed]);
 				}
 			}
-        }
+		}
-        header("Location: index.php");
+		header("Location: {$_SERVER['PHP_SELF']}");
-    }
+	}
 }
 ?>
 
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en"<?php if(WEB_STYLE_DARK) echo 'data-bs-theme="dark"'?>>
 
 <head>
 	<meta charset="utf-8">
-	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet"
+	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
-		integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
+	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"
-		integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
-		crossorigin="anonymous"></script>
 	<script src="https://code.jquery.com/jquery-3.6.4.min.js"></script>
-        <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/js/bootstrap.min.js"></script>
+	<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/js/bootstrap.min.js"></script>
 	<link rel="stylesheet" href="style.css">
 	<title>CS2 Simple Weapon Paints</title>
 </head>
@@ -62,19 +58,22 @@ if (isset($_SESSION['steamid'])) {
 		loginbutton("rectangle");
 		echo "</h2></div>";
 	} else {
-		echo "<div class='bg-primary'>Your current weapon skin loadout<form action='' method='get'><button class='btn btn-secondary' name='logout' type='submit'>Logout</button></form></div>";
+		echo "<div class='bg-primary'><h2>Your current weapon skin loadout <a class='btn btn-danger' href='{$_SERVER['PHP_SELF']}?logout'>Logout</a></h2> </div>";
 		echo "<div class='card-group mt-2'>";
-		?>
+	?>
 
 		<div class="col-sm-2">
 			<div class="card text-center mb-3 border border-primary">
 				<div class="card-body">
 					<?php
 					$actualKnife = $knifes[0];
-					foreach ($knifes as $knife) {
+					if ($selectedKnife != null)
-						if ($selectedKnife['knife'] == $knife['weapon_name']) {
+					{
-							$actualKnife = $knife;
+						foreach ($knifes as $knife) {
-							break;
+							if ($selectedKnife[0]['knife'] == $knife['weapon_name']) {
+								$actualKnife = $knife;
+								break;
+							}
 						}
 					}
 
@@ -91,7 +90,7 @@ if (isset($_SESSION['steamid'])) {
 							<option disabled>Select knife</option>
 							<?php
 							foreach ($knifes as $knifeKey => $knife) {
-								if ($selectedKnife['knife'] == $knife['weapon_name'])
+								if ($selectedKnife[0]['knife'] == $knife['weapon_name'])
 									echo "<option selected value=\"knife-{$knifeKey}\">{$knife['paint_name']}</option>";
 								else
 									echo "<option value=\"knife-{$knifeKey}\">{$knife['paint_name']}</option>";
@@ -111,9 +110,9 @@ if (isset($_SESSION['steamid'])) {
 						<?php
 						if (array_key_exists($defindex, $selectedSkins)) {
 							echo "<div class='card-header'>";
-							echo "<h5 class='card-title item-name'>{$skins[$defindex][$selectedSkins[$defindex]]["paint_name"]}</h5>";
+							echo "<h5 class='card-title item-name'>{$skins[$defindex][$selectedSkins[$defindex]['weapon_paint_id']]["paint_name"]}</h5>";
 							echo "</div>";
-							echo "<img src='{$skins[$defindex][$selectedSkins[$defindex]]['image_url']}' class='skin-image'>";
+							echo "<img src='{$skins[$defindex][$selectedSkins[$defindex]['weapon_paint_id']]['image_url']}' class='skin-image'>";
 						} else {
 							echo "<div class='card-header'>";
 							echo "<h5 class='card-title item-name'>{$default["paint_name"]}</h5>";
@@ -128,131 +127,135 @@ if (isset($_SESSION['steamid'])) {
 								<option disabled>Select skin</option>
 								<?php
 								foreach ($skins[$defindex] as $paintKey => $paint) {
-									if (array_key_exists($defindex, $selectedSkins) && $selectedSkins[$defindex] == $paintKey)
+									if (array_key_exists($defindex, $selectedSkins) && $selectedSkins[$defindex]['weapon_paint_id'] == $paintKey)
 										echo "<option selected value=\"{$defindex}-{$paintKey}\">{$paint['paint_name']}</option>";
 									else
 										echo "<option value=\"{$defindex}-{$paintKey}\">{$paint['paint_name']}</option>";
 								}
 								?>
 							</select>
-						<br></br>
+							<br></br>
-<?php
+							<?php
-$selectedSkinInfo = isset($selectedSkins[$defindex]) ? $selectedSkins[$defindex] : null;
+							$selectedSkinInfo = isset($selectedSkins[$defindex]) ? $selectedSkins[$defindex] : null;
-$steamid = $_SESSION['steamid'];
+							$steamid = $_SESSION['steamid'];
-$defindex = $defindex; // get defindex here, correct if not
-$queryCheck = $db->select("SELECT 1 FROM `wp_player_skins` WHERE `steamid` = :steamid AND `weapon_defindex` = :defindex", ["steamid" => $steamid, "defindex" => $defindex]);
-$hasSkinData = !empty($queryCheck);
 
-if ($selectedSkinInfo && $hasSkinData):
+							if ($selectedSkinInfo) :
-?>
+							?>
-    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#weaponModal<?php echo $defindex ?>">
+								<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#weaponModal<?php echo $defindex ?>">
-        Settings
+									Settings
-    </button>
+								</button>
-<?php else: ?>
+							<?php else : ?>
-    <button type="button" class="btn btn-primary" onclick="showSkinSelectionAlert()">
+								<button type="button" class="btn btn-primary" onclick="showSkinSelectionAlert()">
-        Settings
+									Settings
-    </button>
+								</button>
-    <script>
+								<script>
-        function showSkinSelectionAlert() {
+									function showSkinSelectionAlert() {
-            alert("You need to select a skin first.");
+										alert("You need to select a skin first.");
-        }
+									}
-    </script>
+								</script>
-<?php endif; ?>
+							<?php endif; ?>
-							     
-</div>
-							
- <?php
-// wear value 
-$queryWear = $db->select("SELECT `weapon_wear` FROM `wp_player_skins` WHERE `steamid` = :steamid AND `weapon_defindex` = :weapon_defindex", ["steamid" => $steamid, "weapon_defindex" => $defindex]);
-$selectedSkinInfo = isset($selectedSkins[$defindex]) ? $selectedSkins[$defindex] : null;
-$initialWearValue = isset($selectedSkinInfo['weapon_wear']) ? $selectedSkinInfo['weapon_wear'] : (isset($queryWear[0]['weapon_wear']) ? $queryWear[0]['weapon_wear'] : 0);
-	
-// seed value 
-$querySeed = $db->select("SELECT `weapon_seed` FROM `wp_player_skins` WHERE `steamid` = :steamid AND `weapon_defindex` = :weapon_defindex", ["steamid" => $steamid, "weapon_defindex" => $defindex]);
-$selectedSkinInfo = isset($selectedSkins[$defindex]) ? $selectedSkins[$defindex] : null;
-$initialSeedValue = isset($selectedSkinInfo['weapon_seed']) ? $selectedSkinInfo['weapon_seed'] : (isset($querySeed[0]['weapon_seed']) ? $querySeed[0]['weapon_seed'] : 0);
-?>
 
-							
+					</div>
-		 <div class="modal fade" id="weaponModal<?php echo $defindex ?>" tabindex="-1" role="dialog" aria-labelledby="weaponModalLabel<?php echo $defindex ?>" aria-hidden="true">
-                    <div class="modal-dialog" role="document">
-                        <div class="modal-content">
-                            <div class="modal-header">
-			       <h5 class='card-title item-name'>
-				<?php
-				if (array_key_exists($defindex, $selectedSkins)) {
-                                     echo "{$skins[$defindex][$selectedSkins[$defindex]]["paint_name"]} Settings";
-                                    } else {
-                                     echo "{$default["paint_name"]} Settings";
-                                    }
-			         ?>
-                                </h5>
-                            </div>
-			<div class="modal-body">
-			 <div class="form-group">
-                              <select class="form-select" id="wearSelect<?php echo $defindex ?>" name="wearSelect" onchange="updateWearValue<?php echo $defindex ?>(this.value)">
-                                  <option disabled>Select Wear</option>
-                                  <option value="0.00" <?php echo ($initialWearValue == 0.00) ? 'selected' : ''; ?>>Factory New</option>
-                                  <option value="0.07" <?php echo ($initialWearValue == 0.07) ? 'selected' : ''; ?>>Minimal Wear</option>
-                                  <option value="0.15" <?php echo ($initialWearValue == 0.15) ? 'selected' : ''; ?>>Field-Tested</option>
-                                  <option value="0.38" <?php echo ($initialWearValue == 0.38) ? 'selected' : ''; ?>>Well-Worn</option>
-                                  <option value="0.45" <?php echo ($initialWearValue == 0.45) ? 'selected' : ''; ?>>Battle-Scarred</option>
-                              </select>
 
-                           </div>
+					<?php
-                          <div class="row">
+					// wear value 
-                            <div class="col-md-6">
+					$selectedSkinInfo = isset($selectedSkins[$defindex]['weapon_paint_id']) ? $selectedSkins[$defindex] : null;
-                              <div class="form-group">
+					$queryWear = $selectedSkins[$defindex]['weapon_wear'] ?? 1.0;
-                                   <label for="wear">Wear:</label>
+					$initialWearValue = isset($selectedSkinInfo['weapon_wear']) ? $selectedSkinInfo['weapon_wear'] : (isset($queryWear[0]['weapon_wear']) ? $queryWear[0] : 0.0);
-                                    <input type="text" value="<?php echo $initialWearValue; ?>" class="form-control" id="wear<?php echo $defindex ?>" name="wear">
-                           </div>
-                           </div>
-                           <div class="col-md-6">
-                             <div class="form-group">
-                                   <label for="seed">Seed:</label>
-                                   <input type="text" value="<?php echo $initialSeedValue; ?>" class="form-control" id="seed<?php echo $defindex ?>" name="seed" oninput="validateSeed(this)">
-                         </div>
-                        </div>
-                       </div>
-		       </div>
-                            <div class="modal-footer">
-                                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                                <button type="submit" class="btn btn-danger">Use</button>
-                         </form>
-                            </div>
-                        </div>
-                       </div>
-                      </div>
-	              </div>
-                   </div>
-		    <script>
-				     //  wear
-                        function updateWearValue<?php echo $defindex ?>(selectedValue) {
-                             var wearInputElement = document.getElementById("wear<?php echo $defindex ?>");
-                             wearInputElement.value = selectedValue;
-                         }
-                          function validateWear(inputElement) {
-                        inputElement.value = inputElement.value.replace(/[^0-9]/g, '');
-                        }
-                     // seed
-		               function validateSeed(input) {
-                         // Check entered value
-                      var inputValue = input.value.replace(/[^0-9]/g, ''); // Just get the numbers
 
-                       if (inputValue === "") {
+					// seed value 
-                        input.value = 0; // Set to 0 if empty or no numbers
+					$querySeed = $selectedSkins[$defindex]['weapon_seed'] ?? 0;
-                       } else {
+					$initialSeedValue = isset($selectedSkinInfo['weapon_seed']) ? $selectedSkinInfo['weapon_seed'] : 0;
-                         var numericValue = parseInt(inputValue);
+					?>
-                       numericValue = Math.min(1000, Math.max(1, numericValue)); // Interval control
 
-                       input.value = numericValue;
+
-                       }
+					<div class="modal fade" id="weaponModal<?php echo $defindex ?>" tabindex="-1" role="dialog" aria-labelledby="weaponModalLabel<?php echo $defindex ?>" aria-hidden="true">
-                   }	
+						<div class="modal-dialog" role="document">
-                 </script>
+							<div class="modal-content">
+								<div class="modal-header">
+									<h5 class='card-title item-name'>
+										<?php
+										if (array_key_exists($defindex, $selectedSkins)) {
+											echo "{$skins[$defindex][$selectedSkins[$defindex]['weapon_paint_id']]["paint_name"]} Settings";
+										} else {
+											echo "{$default["paint_name"]} Settings";
+										}
+										?>
+									</h5>
+								</div>
+								<div class="modal-body">
+									<div class="form-group">
+										<select class="form-select" id="wearSelect<?php echo $defindex ?>" name="wearSelect" onchange="updateWearValue<?php echo $defindex ?>(this.value)">
+											<option disabled>Select Wear</option>
+											<option value="0.00" <?php echo ($initialWearValue == 0.00) ? 'selected' : ''; ?>>Factory New</option>
+											<option value="0.07" <?php echo ($initialWearValue == 0.07) ? 'selected' : ''; ?>>Minimal Wear</option>
+											<option value="0.15" <?php echo ($initialWearValue == 0.15) ? 'selected' : ''; ?>>Field-Tested</option>
+											<option value="0.38" <?php echo ($initialWearValue == 0.38) ? 'selected' : ''; ?>>Well-Worn</option>
+											<option value="0.45" <?php echo ($initialWearValue == 0.45) ? 'selected' : ''; ?>>Battle-Scarred</option>
+										</select>
+
+									</div>
+									<div class="row">
+										<div class="col-md-6">
+											<div class="form-group">
+												<label for="wear">Wear:</label>
+												<input type="text" value="<?php echo $initialWearValue; ?>" class="form-control" id="wear<?php echo $defindex ?>" name="wear">
+											</div>
+										</div>
+										<div class="col-md-6">
+											<div class="form-group">
+												<label for="seed">Seed:</label>
+												<input type="text" value="<?php echo $initialSeedValue; ?>" class="form-control" id="seed<?php echo $defindex ?>" name="seed" oninput="validateSeed(this)">
+											</div>
+										</div>
+									</div>
+								</div>
+								<div class="modal-footer">
+									<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+									<button type="submit" class="btn btn-danger">Use</button>
+									</form>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<script>
+				//  wear
+				function updateWearValue<?php echo $defindex ?>(selectedValue) {
+					var wearInputElement = document.getElementById("wear<?php echo $defindex ?>");
+					wearInputElement.value = selectedValue;
+				}
+
+				function validateWear(inputElement) {
+					inputElement.value = inputElement.value.replace(/[^0-9]/g, '');
+				}
+				// seed
+				function validateSeed(input) {
+					// Check entered value
+					var inputValue = input.value.replace(/[^0-9]/g, ''); // Just get the numbers
+
+					if (inputValue === "") {
+						input.value = 0; // Set to 0 if empty or no numbers
+					} else {
+						var numericValue = parseInt(inputValue);
+						numericValue = Math.min(1000, Math.max(1, numericValue)); // Interval control
+
+						input.value = numericValue;
+					}
+				}
+			</script>
 		<?php } ?>
 	<?php } ?>
 	</div>
-
+	</div>
+	<div class="container">
+		<footer class="d-flex flex-wrap justify-content-between align-items-center py-3 my-4 border-top">
+			<div class="col-md-4 d-flex align-items-center">
+				<span class="mb-3 mb-md-0 text-body-secondary">© 2023 <a href="https://github.com/Nereziel/cs2-WeaponPaints">Nereziel/cs2-WeaponPaints</a></span>
+			</div>
+		</footer>
+	</div>
 </body>
 
 </html>