Merge pull request #121 from daffyyyy/main

1.4b

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.GetPlayerFromIndex(playerIndex);
+			CCSPlayerController? player = Utilities.GetPlayerFromSlot(playerSlot);
 
 			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]
 			};
@@ -95,8 +92,10 @@ namespace WeaponPaints
 
 			if (player == null || !player.IsValid) return HookResult.Continue;
 
+			/*
 			if (Config.Additional.SkinVisibilityFix)
 				AddTimer(0.2f, () => RefreshSkins(player));
+			*/
 
 			return HookResult.Continue;
 		}
@@ -136,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;
 
@@ -182,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]
 					};
@@ -212,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]
 			};
@@ -243,13 +242,16 @@ namespace WeaponPaints
 			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;
 		}
@@ -271,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);
@@ -287,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)
 		{

PluginServices.cs

@@ -1 +0,0 @@
-

README.md

@@ -1,9 +1,9 @@
 # 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)
@@ -11,17 +11,18 @@ Unfinished, unoptimized and not fully functional ugly demo weapon paints plugin
 ## Features
 - 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
-- Data sync on player connect
-- Added command **`!wp`** to refresh skins ***(with cooldown in second can be configured)***
+- Data syncs on player connect
+- Added command **`!wp`** to refresh skins ***(with cooldown in seconds can be configured)***
 - Added command **`!ws`** to show website
 - Added command **`!knife`** to show menu with knives
 - 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
+- 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
-- 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>
@@ -84,6 +85,17 @@ Disregard if the config is **`GlobalShare = true`**
 
 ## 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.3i
+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,10 +57,14 @@ 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;
+				}
 			}
 		}
 
@@ -171,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"));
@@ -234,8 +244,11 @@ namespace WeaponPaints
 						}
 					}
 				}
+
+				/*
 				if (Config.Additional.SkinVisibilityFix)
 					RefreshSkins(player);
+				*/
 			}
 		}
 
@@ -314,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

@@ -9,7 +9,7 @@ using System.Collections.Concurrent;
 
 namespace WeaponPaints;
 
-[MinimumApiVersion(142)]
+[MinimumApiVersion(144)]
 public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 {
 	internal static readonly Dictionary<string, string> weaponList = new()
@@ -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.3i";
+	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,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.147" />
+    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.148" />
     <PackageReference Include="Dapper" Version="2.1.28" />
     <PackageReference Include="MySqlConnector" Version="2.3.4" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />