Update VERSION

Fix update

Patches/MemoryLinux.cs

@@ -0,0 +1,221 @@
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+
+namespace WeaponPaints;
+
+public static class MemoryLinux
+{
+    // Based on https://github.com/Source2ZE/CS2Fixes/blob/main/src/utils/plat_unix.cpp
+    static int ParseProt(string s)
+    {
+        int prot = 0;
+
+        foreach (var c in s)
+        {
+            switch (c)
+            {
+                case '-':
+                    break;
+                case 'r':
+                    prot |= NativeMethods.PROT_READ;
+                    break;
+                case 'w':
+                    prot |= NativeMethods.PROT_WRITE;
+                    break;
+                case 'x':
+                    prot |= NativeMethods.PROT_EXEC;
+                    break;
+                case 's':
+                    break;
+                case 'p':
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        return prot;
+    }
+
+    static int GetProt(IntPtr pAddr, uint nSize)
+    {
+        using (var f = File.OpenRead("/proc/self/maps"))
+        using (var reader = new StreamReader(f))
+        {
+            while (!reader.EndOfStream)
+            {
+                var line = reader.ReadLine();
+                if (line == null)
+                    continue;
+
+                var parts = line.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+                if (parts.Length < 5)
+                    continue;
+
+                var range = parts[0];
+                var prot = parts[1];
+
+                var startEnd = range.Split('-');
+                if (startEnd.Length != 2)
+                    continue;
+
+                var start = Convert.ToUInt64(startEnd[0], 16);
+                var end = Convert.ToUInt64(startEnd[1], 16);
+
+                if (start < (ulong)pAddr && end > (ulong)pAddr + nSize)
+                {
+                    return ParseProt(prot);
+                }
+            }
+        }
+
+        return 0;
+    }
+
+    public static void PatchBytesAtAddress(IntPtr pPatchAddress, byte[] pPatch, int iPatchSize)
+    {
+        if (!RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) return;
+        
+        var oldProt = GetProt(pPatchAddress, (uint)iPatchSize);
+
+        var pageSize = (ulong)NativeMethods.sysconf(NativeMethods._SC_PAGESIZE);
+        var alignAddr = (IntPtr)((long)pPatchAddress & ~(long)(pageSize - 1));
+
+        var end = (IntPtr)((long)pPatchAddress + iPatchSize);
+        var alignSize = (ulong)((long)end - (long)alignAddr);
+
+        var result = NativeMethods.mprotect(alignAddr, alignSize, NativeMethods.PROT_READ | NativeMethods.PROT_WRITE);
+
+        Marshal.Copy(pPatch, 0, pPatchAddress, iPatchSize);
+
+        result = NativeMethods.mprotect(alignAddr, alignSize, oldProt);
+    }
+    
+    private static byte[]? ReadProcessMemory(int pid, long address, int size)
+    {
+        if (!RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) return null;
+        
+        byte[] buffer = new byte[size];
+
+        NativeMethods.Iovec local = new NativeMethods.Iovec
+        {
+            iov_base = Marshal.UnsafeAddrOfPinnedArrayElement(buffer, 0),
+            iov_len = new IntPtr(size)
+        };
+
+        NativeMethods.Iovec remote = new NativeMethods.Iovec
+        {
+            iov_base = new IntPtr(address),
+            iov_len = new IntPtr(size)
+        };
+
+        long bytesRead = NativeMethods.process_vm_readv(pid, new NativeMethods.Iovec[] { local }, 1, new NativeMethods.Iovec[] { remote }, 1, 0);
+        if (bytesRead == -1)
+        {
+            throw new Exception($"process_vm_readv failed with error {Marshal.GetLastPInvokeError()}");
+        }
+
+        return buffer;
+    }
+    
+    public static byte[]? ReadMemory(IntPtr address, int size)
+    {
+        if (!RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) return null;
+        
+        return ReadProcessMemory(Process.GetCurrentProcess().Id, (long)address, size);
+    }
+
+    #pragma warning disable CS0649 // Field is never assigned to, and will always have its default value
+    #pragma warning disable CS8981 // The type name only contains lower-cased ascii characters. Such names may become reserved for the language.
+    static class NativeMethods
+    {
+        public const int O_RDONLY = 0;
+        public const int PROT_READ = 0x1;
+        public const int PROT_WRITE = 0x2;
+        public const int PROT_EXEC = 0x4;
+        public const int MAP_PRIVATE = 0x2;
+        public const int PT_LOAD = 1;
+        public const int PF_X = 0x1;
+        public const int _SC_PAGESIZE = 30;
+        public const int RTLD_DI_LINKMAP = 2;
+
+        [DllImport("libc")]
+        public static extern int dlinfo(IntPtr handle, int request, out link_map lmap);
+
+        [DllImport("libc")]
+        public static extern int dlclose(IntPtr handle);
+
+        [DllImport("libc")]
+        public static extern int open(string pathname, int flags);
+
+        [DllImport("libc")]
+        public static extern int fstat(int fd, out stat buf);
+
+        [DllImport("libc")]
+        public static extern IntPtr mmap(IntPtr addr, ulong length, int prot, int flags, int fd, ulong offset);
+
+        [DllImport("libc")]
+        public static extern int munmap(IntPtr addr, ulong length);
+
+        [DllImport("libc")]
+        public static extern int mprotect(IntPtr addr, ulong len, int prot);
+
+        [DllImport("libc")]
+        public static extern long sysconf(int name);
+
+        [DllImport("libc")]
+        public static extern long process_vm_readv(int pid, Iovec[] local_iov, ulong liovcnt, Iovec[] remote_iov, ulong riovcnt, ulong flags);
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct Iovec
+        {
+            public IntPtr iov_base;
+            public IntPtr iov_len;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct link_map
+        {
+            public IntPtr l_addr;
+            public IntPtr l_name;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct ElfW
+        {
+            public struct Ehdr
+            {
+                public byte e_shnum;
+                public uint e_shoff;
+                public ushort e_phnum;
+                public uint e_phoff;
+            }
+
+            public struct Phdr
+            {
+                public int p_type;
+                public int p_flags;
+
+                public ulong p_vaddr;
+                public ulong p_filesz;
+            }
+
+            public struct Shdr
+            {
+                public uint sh_name;
+                public uint sh_offset;
+                public uint sh_size;
+                public ulong sh_addr;
+            }
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+
+        public struct stat
+        {
+            public ulong st_size;
+        }
+    }
+    #pragma warning restore CS8981 // The type name only contains lower-cased ascii characters. Such names may become reserved for the language.
+    #pragma warning restore CS0649 // Field is never assigned to, and will always have its default value
+}

Patches/MemoryWindows.cs

@@ -0,0 +1,34 @@
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+
+namespace WeaponPaints;
+
+public static class MemoryWindows
+{
+    [DllImport("kernel32.dll", SetLastError = true)]
+    static extern bool WriteProcessMemory(IntPtr hProcess, IntPtr lpBaseAddress, byte[] lpBuffer, uint nSize, out IntPtr lpNumberOfBytesWritten);
+    
+    public static void PatchBytesAtAddress(IntPtr pPatchAddress, byte[] pPatch, int iPatchSize)
+    {
+        if(!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) return;
+        
+        IntPtr bytesWritten;
+        WriteProcessMemory(Process.GetCurrentProcess().Handle, pPatchAddress, pPatch, (uint)iPatchSize, out bytesWritten);
+    }
+    
+    [DllImport("kernel32.dll", SetLastError = true)]
+    private static extern IntPtr OpenProcess(int processAccess, bool bInheritHandle, int processId);
+
+    [DllImport("kernel32.dll", SetLastError = true)]
+    private static extern bool ReadProcessMemory(IntPtr hProcess, IntPtr lpBaseAddress, [Out] byte[] lpBuffer, int dwSize, out int lpNumberOfBytesRead);
+    
+    public static byte[]? ReadMemory(IntPtr address, int size)
+    {
+        if(!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) return null;
+        
+        byte[] buffer = new byte[size];
+        int bytesRead;
+        ReadProcessMemory(Process.GetCurrentProcess().Handle, address, buffer, size, out bytesRead);
+        return buffer;
+    }
+}

Patches/Patch.cs

@@ -0,0 +1,104 @@
+using System.Runtime.InteropServices;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Memory;
+
+namespace WeaponPaints;
+
+// Thanks cssharp-fixes
+public static class Patch
+{
+    private static IntPtr GetAddress(string modulePath, string signature)
+    {
+        // Returns address if found, otherwise a C++ nullptr which is a IntPtr.Zero in C#
+        var address = NativeAPI.FindSignature(modulePath, signature);
+        
+        return address;
+    }
+
+    public static void PerformPatch(string signature, string patch)
+    {
+        IntPtr address = GetAddress(Addresses.ServerPath, signature);
+        if(address == IntPtr.Zero)
+        {
+            return;
+        }
+        
+        WriteBytesToAddress(address, HexToByte(patch));
+    }
+
+    private static void WriteBytesToAddress(IntPtr address, List<byte> bytes)
+    {
+        int patchSize = bytes.Count;
+        if(patchSize == 0) throw new ArgumentException("Patch bytes list cannot be empty.");
+        
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+        {
+            MemoryLinux.PatchBytesAtAddress(address, bytes.ToArray(), patchSize);
+        }
+        else
+        {
+            MemoryWindows.PatchBytesAtAddress(address, bytes.ToArray(), patchSize);
+        }
+    }
+
+    private static List<byte> HexToByte(string src)
+    {
+        if (string.IsNullOrEmpty(src))
+        {
+            return new List<byte>();
+        }
+
+        byte HexCharToByte(char c)
+        {
+            if (c is >= '0' and <= '9') return (byte)(c - '0');
+            if (c is >= 'A' and <= 'F') return (byte)(c - 'A' + 10);
+            if (c is >= 'a' and <= 'f') return (byte)(c - 'a' + 10);
+            return 0xFF; // Invalid hex character
+        }
+
+        List<byte> result = new List<byte>();
+        bool isCodeStyle = src[0] == '\\';
+        string pattern = isCodeStyle ? "\\x" : " ";
+        string wildcard = isCodeStyle ? "2A" : "?";
+        int pos = 0;
+
+        while (pos < src.Length)
+        {
+            int found = src.IndexOf(pattern, pos);
+            if (found == -1)
+            {
+                found = src.Length;
+            }
+
+            string str = src.Substring(pos, found - pos);
+            pos = found + pattern.Length;
+
+            if (string.IsNullOrEmpty(str)) continue;
+
+            string byteStr = str;
+
+            if (byteStr.Substring(0, wildcard.Length) == wildcard)
+            {
+                result.Add(0xFF); // Representing wildcard as 0xFF
+                continue;
+            }
+
+            if (byteStr.Length < 2)
+            {
+                return new List<byte>(); // Invalid byte length
+            }
+
+            byte high = HexCharToByte(byteStr[0]);
+            byte low = HexCharToByte(byteStr[1]);
+
+            if (high == 0xFF || low == 0xFF)
+            {
+                return new List<byte>(); // Invalid hex character
+            }
+
+            result.Add((byte)((high << 4) | low));
+        }
+
+        return result;
+    }
+}

VERSION

@@ -1 +1 @@
-3.1c
+3.1d

Variables.cs

@@ -93,10 +93,11 @@ public partial class WeaponPaints
 
 	private static readonly MemoryFunctionVoid<nint, string, float> CAttributeListSetOrAddAttributeValueByName = new(GameData.GetSignature("CAttributeList_SetOrAddAttributeValueByName"));
 	
-	private static readonly MemoryFunctionWithReturn<nint, string, int, int> SetBodygroupFunc = new(
-		GameData.GetSignature("CBaseModelEntity_SetBodygroup"));
+	//we dont need anymore because we use AcceptInput
+	//private static readonly MemoryFunctionWithReturn<nint, string, int, int> SetBodygroupFunc = new(
+	//	GameData.GetSignature("CBaseModelEntity_SetBodygroup"));
 
-	private static readonly Func<nint, string, int, int> SetBodygroup = SetBodygroupFunc.Invoke;
+	//private static readonly Func<nint, string, int, int> SetBodygroup = SetBodygroupFunc.Invoke;
 
 	private static Dictionary<int, string> WeaponDefindex { get; } = new()
 	{

WeaponAction.cs

@@ -285,7 +285,6 @@ namespace WeaponPaints
 				if (!weapon.Value.OwnerEntity.IsValid) continue;
 				if (gun.Entity == null) continue;
 				if (!gun.IsValid) continue;
-				if (!gun.VisibleinPVS) continue;
 
 				try
 				{
@@ -406,7 +405,7 @@ namespace WeaponPaints
 
 					item.Initialized = true;
 
-					SetBodygroup(pawn.Handle, "default_gloves", 1);
+					SetBodygroup(pawn, "default_gloves", 1);
 				}
 				catch (Exception) { }
 			}, TimerFlags.STOP_ON_MAPCHANGE);
@@ -430,13 +429,15 @@ namespace WeaponPaints
 			return int.TryParse(randomWeapon["paint"]?.ToString(), out var paintValue) ? paintValue : 0;
 		}
 
-		private static void SubclassChange(CBasePlayerWeapon weapon, ushort itemD)
+		//xstage idea on css discord
+		public static void SubclassChange(CBasePlayerWeapon weapon, ushort itemD)
 		{
-			var subclassChangeFunc = VirtualFunction.Create<nint, string, int>(
-				GameData.GetSignature("ChangeSubclass")
-			);
+			weapon.AcceptInput("ChangeSubclass", value: itemD.ToString());
+		}
 
-			subclassChangeFunc(weapon.Handle, itemD.ToString());
+		public static void SetBodygroup(CCSPlayerPawn pawn, string group, int value)
+		{
+			pawn.AcceptInput("SetBodygroup", value:$"{group},{value}");
 		}
 
 		private static void UpdateWeaponMeshGroupMask(CBaseEntity weapon, bool isLegacy = false)
@@ -454,13 +455,6 @@ namespace WeaponPaints
 		private static void UpdatePlayerWeaponMeshGroupMask(CCSPlayerController player, CBasePlayerWeapon weapon, bool isLegacy)
 		{
 			UpdateWeaponMeshGroupMask(weapon, isLegacy);
-
-			var viewModel = GetPlayerViewModel(player);
-			if (viewModel == null || viewModel.Weapon.Value == null ||
-			    viewModel.Weapon.Value.Index != weapon.Index) return;
-			
-			UpdateWeaponMeshGroupMask(viewModel, isLegacy);
-			Utilities.SetStateChanged(viewModel, "CBaseEntity", "m_CBodyComponent");
 		}
 
 		private static void GivePlayerAgent(CCSPlayerController player)
@@ -558,16 +552,6 @@ namespace WeaponPaints
 			return !Utility.IsPlayerValid(player) ? null : player;
 		}
 
-		private static unsafe CBaseViewModel? GetPlayerViewModel(CCSPlayerController player)
-		{
-			if (player.PlayerPawn.Value == null || player.PlayerPawn.Value.ViewModelServices == null) return null;
-			CCSPlayer_ViewModelServices viewModelServices = new(player.PlayerPawn.Value.ViewModelServices!.Handle);
-			var ptr = viewModelServices.Handle + Schema.GetSchemaOffset("CCSPlayer_ViewModelServices", "m_hViewModel");
-			var references = MemoryMarshal.CreateSpan(ref ptr, 3);
-			var viewModel = (CHandle<CBaseViewModel>)Activator.CreateInstance(typeof(CHandle<CBaseViewModel>), references[0])!;
-			return viewModel.Value == null ? null : viewModel.Value;
-		}
-
 		private static bool HasChangedKnife(CCSPlayerController player, out string? knifeValue)
 		{
 			knifeValue = null;

WeaponPaints.cs

@@ -1,3 +1,4 @@
+using System.Runtime.InteropServices;
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes;
@@ -16,10 +17,16 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
     public override string ModuleAuthor => "Nereziel & daffyy";
 	public override string ModuleDescription => "Skin, gloves, agents and knife selector, standalone and web-based";
 	public override string ModuleName => "WeaponPaints";
-	public override string ModuleVersion => "3.1c";
+	public override string ModuleVersion => "3.1d";
 
 	public override void Load(bool hotReload)
 	{
+		// Hardcoded hotfix needs to be changed later
+		if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+			Patch.PerformPatch("0F 85 ? ? ? ? 31 C0 B9 ? ? ? ? BA ? ? ? ? 66 0F EF C0 31 F6 31 FF 48 C7 45 ? ? ? ? ? 48 C7 45 ? ? ? ? ? 48 C7 45 ? ? ? ? ? 48 C7 45 ? ? ? ? ? 0F 29 45 ? 48 C7 45 ? ? ? ? ? C7 45 ? ? ? ? ? 66 89 45 ? E8 ? ? ? ? 41 89 C5 85 C0 0F 8E", "90 90 90 90 90 90");
+		else
+			Patch.PerformPatch("74 ? 48 8D 0D ? ? ? ? FF 15 ? ? ? ? EB ? BA", "EB");
+		
 		Instance = this;
 
 		if (hotReload)

WeaponPaints.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.281" />
+    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.331" />
     <PackageReference Include="Dapper" Version="2.1.35" />
     <PackageReference Include="MySqlConnector" Version="2.4.0-beta.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

gamedata/weaponpaints.json

@@ -1,23 +1,9 @@
 {
-	"ChangeSubclass": {
-		"signatures": {
-			"library": "server",
-			"windows": "48 89 6C 24 ? 56 48 83 EC ? 48 8B EA 48 8B F1 E8 ? ? ? ? 84 C0 0F 84",
-			"linux": "55 48 89 E5 41 57 41 56 41 55 49 89 F5 41 54 49 89 FC 53 48 81 EC A8 00 00 00"
-		}
-	},
 	"CAttributeList_SetOrAddAttributeValueByName": {
 		"signatures": {
 			"library": "server",
-			"windows": "40 53 41 56 41 57 48 81 EC 90 00 00 00 0F 29 74 24 70",
-			"linux": "55 48 89 E5 41 57 41 56 49 89 FE 41 55 41 54 49 89 F4 53 48 83 EC 78"
-		}
-	},
-	"CBaseModelEntity_SetBodygroup": {
-		"signatures": {
-			"library": "server",
-			"windows": "48 89 5C 24 08 48 89 74 24 10 57 48 83 EC 20 41 8B F8 48 8B F2 48 8B D9 E8 ? ? ? ?",
-			"linux": "55 48 89 E5 41 56 49 89 F6 41 55 41 89 D5 41 54 49 89 FC 48 83 EC 08"
+			"windows": "40 53 55 41 56 48 81 EC 90 00 00 00",
+			"linux": "55 48 89 E5 41 57 41 56 49 89 FE 41 55 41 54 53 48 89 F3 48 83 EC ? F3 0F 11 85"
 		}
 	}
 }