Merge pull request #134 from daffyyyy/main

1.5a

.gitignore

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

Commands.cs

@@ -10,7 +10,9 @@ namespace WeaponPaints
 		{
 			if (!Config.Additional.CommandWpEnabled || !Config.Additional.SkinEnabled || !g_bCommandsAllowed) return;
 			if (!Utility.IsPlayerValid(player)) return;
-			if (player == null || player.Index <= 0) return;
+
+			if (player == null || !player.IsValid || player.UserId == null || player.IsBot) return;
+
 			int playerIndex = (int)player!.Index;
 
 			PlayerInfo playerInfo = new PlayerInfo
@@ -22,31 +24,35 @@ namespace WeaponPaints
 				IpAddress = player?.IpAddress?.Split(":")[0]
 			};
 
-			if (player == null || player.UserId == null) return;
+			if (player == null || !player.IsValid || player.UserId == null || player.IsBot) return;
 
-			if (!commandsCooldown.TryGetValue((int)player.UserId, out DateTime cooldownEndTime) ||
+			try
-				DateTime.UtcNow >= (commandsCooldown.TryGetValue((int)player.UserId, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
 			{
-				commandsCooldown[(int)player.UserId] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
+				if (!commandsCooldown.TryGetValue((int)player.UserId, out DateTime cooldownEndTime) ||
-				if (weaponSync != null)
+	DateTime.UtcNow >= (commandsCooldown.TryGetValue((int)player.UserId, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
-					Task.Run(async () => await weaponSync.GetWeaponPaintsFromDatabase(playerInfo));
-				if (Config.Additional.KnifeEnabled)
 				{
+					commandsCooldown[(int)player.UserId] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
 					if (weaponSync != null)
-						Task.Run(async () => await weaponSync.GetKnifeFromDatabase(playerInfo));
+						Task.Run(async () => await weaponSync.GetWeaponPaintsFromDatabase(playerInfo));
+					if (Config.Additional.KnifeEnabled)
+					{
+						if (weaponSync != null)
+							Task.Run(async () => await weaponSync.GetKnifeFromDatabase(playerInfo));
 
-					RefreshWeapons(player);
+						RefreshWeapons(player);
+					}
+					if (!string.IsNullOrEmpty(Localizer["wp_command_refresh_done"]))
+					{
+						player!.Print(Localizer["wp_command_refresh_done"]);
+					}
+					return;
 				}
-				if (!string.IsNullOrEmpty(Localizer["wp_command_refresh_done"]))
+				if (!string.IsNullOrEmpty(Localizer["wp_command_cooldown"]))
 				{
-					player!.Print(Localizer["wp_command_refresh_done"]);
+					player!.Print(Localizer["wp_command_cooldown"]);
 				}
-				return;
-			}
-			if (!string.IsNullOrEmpty(Localizer["wp_command_cooldown"]))
-			{
-				player!.Print(Localizer["wp_command_cooldown"]);
 			}
+			catch (Exception) { }
 		}
 
 		private void OnCommandWS(CCSPlayerController? player, CommandInfo command)
@@ -155,7 +161,7 @@ namespace WeaponPaints
 					DateTime.UtcNow >= (commandsCooldown.TryGetValue((int)player.UserId, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
 				{
 					commandsCooldown[(int)player.UserId] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
-					ChatMenus.OpenMenu(player, giveItemMenu);
+					MenuManager.OpenChatMenu(player, giveItemMenu);
 					return;
 				}
 				if (!string.IsNullOrEmpty(Localizer["wp_command_cooldown"]))
@@ -262,7 +268,7 @@ namespace WeaponPaints
 					}
 
 					// Open the submenu for skin selection of the chosen weapon
-					ChatMenus.OpenMenu(player, skinSubMenu);
+					MenuManager.OpenChatMenu(player, skinSubMenu);
 				}
 			};
 
@@ -283,7 +289,7 @@ namespace WeaponPaints
 					DateTime.UtcNow >= (commandsCooldown.TryGetValue((int)player.UserId, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
 				{
 					commandsCooldown[(int)player.UserId] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
-					ChatMenus.OpenMenu(player, weaponSelectionMenu);
+					MenuManager.OpenChatMenu(player, weaponSelectionMenu);
 					return;
 				}
 				if (!string.IsNullOrEmpty(Localizer["wp_command_cooldown"]))

Events.cs

@@ -9,27 +9,28 @@ namespace WeaponPaints
 		{
 			CCSPlayerController? player = Utilities.GetPlayerFromSlot(playerSlot);
 
+			if (player == null || !player.IsValid || player.IsBot || player.IsHLTV || weaponSync == null || player.Connected == PlayerConnectedState.PlayerDisconnecting) return;
+
 			PlayerInfo playerInfo = new PlayerInfo
 			{
 				UserId = player.UserId,
 				Index = (int)player.Index,
 				SteamId = player.SteamID.ToString(),
-				Name = player?.PlayerName,
+				Name = player.PlayerName,
-				IpAddress = player?.IpAddress?.Split(":")[0]
+				IpAddress = player.IpAddress?.Split(":")[0]
 			};
 
-			if (player == null || !player.IsValid || player.IsBot || player.IsHLTV || weaponSync == null) return;
+			if (!gPlayerWeaponsInfo.ContainsKey((int)player.Index))
-
-			Task.Run(async () =>
 			{
-				if (Config.Additional.SkinEnabled)
+				Task.Run(async () =>
-					await weaponSync.GetKnifeFromDatabase(playerInfo);
+				{
-			});
+					if (Config.Additional.SkinEnabled)
-
+						await weaponSync.GetWeaponPaintsFromDatabase(playerInfo);
-			//if (Config.Additional.KnifeEnabled && weaponSync != null)
+					if (Config.Additional.KnifeEnabled)
-			//_ = weaponSync.GetKnifeFromDatabase(playerIndex);
+						await weaponSync.GetKnifeFromDatabase(playerInfo);
+				});
+			}
 		}
-
 		private void OnClientDisconnect(int playerSlot)
 		{
 			CCSPlayerController player = Utilities.GetPlayerFromSlot(playerSlot);
@@ -175,6 +176,7 @@ namespace WeaponPaints
 				weaponSync = new WeaponSynchronization(DatabaseConnectionString, Config, GlobalShareApi, GlobalShareServerId);
 			});
 
+			/*
 			g_hTimerCheckSkinsData = AddTimer(10.0f, () =>
 			{
 				List<CCSPlayerController> players = Utilities.GetPlayers();
@@ -199,6 +201,7 @@ namespace WeaponPaints
 						_ = weaponSync.GetKnifeFromDatabase(playerInfo);
 				}
 			}, CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE | CounterStrikeSharp.API.Modules.Timers.TimerFlags.REPEAT);
+			*/
 		}
 
 		private HookResult OnPlayerConnectFull(EventPlayerConnectFull @event, GameEventInfo info)
@@ -279,7 +282,7 @@ namespace WeaponPaints
 			{
 				try
 				{
-					if (player == null || !player.IsValid || !player.PawnIsAlive || player.IsBot || player.IsHLTV) continue;
+					if (player == null || !player.IsValid || !player.PawnIsAlive || player.IsBot || player.IsHLTV || player.Connected == PlayerConnectedState.PlayerDisconnecting) continue;
 
 					var viewModels = GetPlayerViewModels(player);
 
@@ -301,7 +304,20 @@ namespace WeaponPaints
 						)
 						{
 							var skeleton = GetSkeletonInstance(viewModel.Value.CBodyComponent.SceneNode);
-							skeleton.ModelState.MeshGroupMask = 2;
+							int[] array = { 1171, 1170, 1169, 1164, 1162, 1161, 1159, 1175, 1174, 1167, 1165, 1168, 1163, 1160, 1166, 1173 };
+							int fallbackPaintKit = weapon.FallbackPaintKit;
+							if (array.Contains(fallbackPaintKit))
+							{
+								skeleton.ModelState.MeshGroupMask = 1;
+							}
+							else
+							{
+								if (skeleton.ModelState.MeshGroupMask != 2)
+								{
+									skeleton.ModelState.MeshGroupMask = 2;
+								}
+							}
+
 						}
 
 						Utilities.SetStateChanged(viewModel.Value, "CBaseEntity", "m_CBodyComponent");
@@ -320,11 +336,11 @@ namespace WeaponPaints
 			RegisterListener<Listeners.OnMapStart>(OnMapStart);
 			RegisterListener<Listeners.OnTick>(OnTick);
 
-			RegisterEventHandler<EventPlayerConnectFull>(OnPlayerConnectFull);
+			//RegisterEventHandler<EventPlayerConnectFull>(OnPlayerConnectFull);
 			RegisterEventHandler<EventPlayerSpawn>(OnPlayerSpawn);
 			RegisterEventHandler<EventRoundStart>(OnRoundStart, HookMode.Pre);
 			RegisterEventHandler<EventRoundEnd>(OnRoundEnd);
-			RegisterEventHandler<EventItemPurchase>(OnEventItemPurchasePost);
+			//RegisterEventHandler<EventItemPurchase>(OnEventItemPurchasePost);
 			//RegisterEventHandler<EventItemPickup>(OnItemPickup);
 			HookEntityOutput("weapon_knife", "OnPlayerPickup", OnPickup, HookMode.Pre);
 		}

README.md

@@ -23,7 +23,8 @@ Unfinished, unoptimized and not fully functional ugly demo weapon paints plugin
 ## CS2 Server
 - Have working CounterStrikeSharp (**with RUNTIME!**)
 - Download from Release and copy plugin to plugins
-- Setup `addons/counterstrikesharp/configs/`**`plugins/WeaponPaints/WeaponPaints.json`** set **`GlobalShare`** to **`true`** for global, or include database credentials
+- Run server with plugin, **it will generate config if installed correctly!**
+- Edit `addons/counterstrikesharp/configs/`**`plugins/WeaponPaints/WeaponPaints.json`** set **`GlobalShare`** to **`true`** for global, or include database credentials
 - In `addons/counterstrikesharp/configs/`**`core.json`** set **FollowCS2ServerGuidelines** to **`false`**
 
 ## Plugin Configuration
@@ -88,6 +89,7 @@ Disregard if the config is **`GlobalShare = true`**
 
 ## Known issues
 - Issue on Windows servers, no knives are given.
+- You can't change knife if it's equpied in cs2 inventory
 - Can cause incompatibility with plugins/maps which manipulates weapons and knives
 
 ## Troubleshooting
@@ -100,6 +102,9 @@ Plugin is not loaded or configured with mysql credentials. Tables are auto-creat
 
 **Knives are disappearing:**
 Set in config GiveKnifeAfterRemove to true 
+
+**Knives are not changing for players:**
+You can't change knife if you have your own equipped
 </details>
 
 ### Use this plugin at your own risk! Using this may lead to GSLT ban or something else Valve come with. [Valve Server guidelines](https://blog.counter-strike.net/index.php/server_guidelines/)

VERSION

@@ -1 +1 @@
-1.4b
+1.5a

WeaponAction.cs

@@ -40,9 +40,19 @@ namespace WeaponPaints
 				if (!isKnife && weapon.CBodyComponent != null && weapon.CBodyComponent.SceneNode != null)
 				{
 					var skeleton = GetSkeletonInstance(weapon.CBodyComponent.SceneNode);
-					if (skeleton.ModelState.MeshGroupMask != 2)
+
+					int[] array = { 1171, 1170, 1169, 1164, 1162, 1161, 1159, 1175, 1174, 1167, 1165, 1168, 1163, 1160, 1166, 1173 };
+					int fallbackPaintKit = weapon.FallbackPaintKit;
+					if (array.Contains(fallbackPaintKit))
 					{
-						skeleton.ModelState.MeshGroupMask = 2;
+						skeleton.ModelState.MeshGroupMask = 1;
+					}
+					else
+					{
+						if (skeleton.ModelState.MeshGroupMask != 2)
+						{
+							skeleton.ModelState.MeshGroupMask = 2;
+						}
 					}
 				}
 				return;
@@ -61,9 +71,18 @@ namespace WeaponPaints
 			if (!isKnife && weapon.CBodyComponent != null && weapon.CBodyComponent.SceneNode != null)
 			{
 				var skeleton = GetSkeletonInstance(weapon.CBodyComponent.SceneNode);
-				if (skeleton.ModelState.MeshGroupMask != 2)
+				int[] array = { 1171, 1170, 1169, 1164, 1162, 1161, 1159, 1175, 1174, 1167, 1165, 1168, 1163, 1160, 1166, 1173 };
+				int fallbackPaintKit = weapon.FallbackPaintKit;
+				if (array.Contains(fallbackPaintKit))
 				{
-					skeleton.ModelState.MeshGroupMask = 2;
+					skeleton.ModelState.MeshGroupMask = 1;
+				}
+				else
+				{
+					if (skeleton.ModelState.MeshGroupMask != 2)
+					{
+						skeleton.ModelState.MeshGroupMask = 2;
+					}
 				}
 			}
 		}

WeaponPaints.cs

@@ -36,6 +36,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,7 +68,8 @@ 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" }
 	};
 
 	internal static WeaponPaintsConfig _config = new WeaponPaintsConfig();
@@ -83,7 +85,7 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 	internal int GlobalShareServerId = 0;
 	internal static Dictionary<int, DateTime> commandsCooldown = new Dictionary<int, DateTime>();
 	private string DatabaseConnectionString = string.Empty;
-	private CounterStrikeSharp.API.Modules.Timers.Timer? g_hTimerCheckSkinsData = null;
+	//private CounterStrikeSharp.API.Modules.Timers.Timer? g_hTimerCheckSkinsData = null;
 	public static Dictionary<int, string> weaponDefindex { get; } = new Dictionary<int, string>
 	{
 		{ 1, "weapon_deagle" },
@@ -108,6 +110,7 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 		{ 28, "weapon_negev" },
 		{ 29, "weapon_sawedoff" },
 		{ 30, "weapon_tec9" },
+		{ 31, "weapon_taser" },
 		{ 32, "weapon_hkp2000" },
 		{ 33, "weapon_mp7" },
 		{ 34, "weapon_mp9" },
@@ -138,14 +141,15 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 		{ 521, "weapon_knife_outdoor" },
 		{ 522, "weapon_knife_stiletto" },
 		{ 523, "weapon_knife_widowmaker" },
-		{ 525, "weapon_knife_skeleton" }
+		{ 525, "weapon_knife_skeleton" },
+		{ 526, "weapon_knife_kukri" }
 	};
 
 	public WeaponPaintsConfig Config { get; set; } = new();
 	public override string ModuleAuthor => "Nereziel & daffyy";
 	public override string ModuleDescription => "Skin and knife selector, standalone and web-based";
 	public override string ModuleName => "WeaponPaints";
-	public override string ModuleVersion => "1.4b";
+	public override string ModuleVersion => "1.5a";
 
 	public static WeaponPaintsConfig GetWeaponPaintsConfig()
 	{
@@ -168,8 +172,13 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 
 			foreach (CCSPlayerController player in players)
 			{
-				if (player == null || !player.IsValid || player.IsBot || player.IsHLTV || player.SteamID.ToString() == "") continue;
+				if (player == null || !player.IsValid || player.IsBot || player.IsHLTV) continue;
-				if (gPlayerWeaponsInfo.ContainsKey((int)player.Index)) continue;
+				//if (gPlayerWeaponsInfo.ContainsKey((int)player.Index)) continue;
+
+				if (gPlayerWeaponsInfo.ContainsKey((int)player.Index))
+					gPlayerWeaponsInfo.TryRemove((int)player.Index, out _);
+				if (g_playersKnife.ContainsKey((int)player.Index))
+					g_playersKnife.TryRemove((int)player.Index, out _);
 
 				PlayerInfo playerInfo = new PlayerInfo
 				{
@@ -187,10 +196,6 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 
 				g_knifePickupCount[(int)player!.Index] = 0;
 			}
-			/*
-			RegisterListeners();
-			RegisterCommands();
-			*/
 		}
 
 		if (Config.Additional.KnifeEnabled)
@@ -253,7 +258,7 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 				Task<string> responseBodyTask = response.Content.ReadAsStringAsync();
 				responseBodyTask.Wait();
 				string responseBody = responseBodyTask.Result;
-				GlobalShareServerId = Int32.Parse(responseBody);
+				GlobalShareServerId = int.Parse(responseBody);
 			}
 			else
 			{

WeaponPaints.csproj

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

website/class/utils.php

@@ -62,7 +62,8 @@ class UtilsClass
                     521,
                     522,
                     523,
-                    525
+                    525,
+                    526
                 ])
             )
                 continue;