updating 2.4.0 (#176)

Author: oqyh

Resources/RetakesAllocator_gamedata.json

@@ -1,4 +1,18 @@
 {
+	"GetCSWeaponDataFromKey": {
+		"signatures": {
+			"library": "server",
+			"windows": "48 89 5C 24 ? 48 89 74 24 ? 57 48 83 EC ? 48 8B FA 8B F1 48 85 D2 0F 84",
+			"linux": "55 48 89 E5 41 57 41 56 41 89 FE 41 55 41 54 45"
+		}
+	},
+	"CCSPlayer_ItemServices_CanAcquire": {
+		"signatures": {
+			"library": "server",
+			"windows": "44 89 44 24 ? 48 89 54 24 ? 48 89 4C 24 ? 55 56 57 41 54 41 55 41 56 41 57 48 8B EC",
+			"linux": "55 48 89 E5 41 57 41 56 41 55 49 89 CD 41 54 53 48 83 EC"
+		}
+	},
 	"GiveNamedItem2": {
 		"signatures": {
 			"library": "server",

RetakesAllocator/CustomGameData.cs

@@ -12,18 +12,16 @@ public class CustomGameData
 {
     public static Dictionary<string, Dictionary<OSPlatform, string>> _customGameData = new();
     private readonly MemoryFunctionVoid<IntPtr, string, IntPtr, IntPtr, IntPtr, IntPtr, IntPtr, IntPtr> GiveNamedItem2;
-
-    public readonly
-        MemoryFunctionWithReturn<CCSPlayer_ItemServices, CEconItemView, AcquireMethod, NativeObject, AcquireResult>
-        CCSPlayer_ItemServices_CanAcquireFunc = new(GameData.GetSignature("CCSPlayer_ItemServices_CanAcquire"));
-
-    public readonly MemoryFunctionWithReturn<int, string, CCSWeaponBaseVData> GetCSWeaponDataFromKeyFunc = new(GameData.GetSignature("GetCSWeaponDataFromKey"));
+    public readonly MemoryFunctionWithReturn<CCSPlayer_ItemServices, CEconItemView, AcquireMethod, NativeObject, AcquireResult> CCSPlayer_ItemServices_CanAcquireFunc;
+    public readonly MemoryFunctionWithReturn<int, string, CCSWeaponBaseVData> GetCSWeaponDataFromKeyFunc;
 
     public CustomGameData()
     {
         LoadCustomGameDataFromJson();
-
+        
         GiveNamedItem2 = new(GetCustomGameDataKey("GiveNamedItem2"));
+        CCSPlayer_ItemServices_CanAcquireFunc = new(GetCustomGameDataKey("CCSPlayer_ItemServices_CanAcquire"));
+        GetCSWeaponDataFromKeyFunc = new(GetCustomGameDataKey("GetCSWeaponDataFromKey"));
     }
     public void LoadCustomGameDataFromJson()
     {

RetakesAllocator/RetakesAllocator.cs

@@ -81,7 +81,7 @@ public override void Load(bool hotReload)
 
         CustomFunctions = new();
 
-        if (Configs.GetConfigData().EnableCanAcquireHook && !Helpers.IsWindows())
+        if (Configs.GetConfigData().EnableCanAcquireHook)
         {
             CustomFunctions.CCSPlayer_ItemServices_CanAcquireFunc.Hook(OnWeaponCanAcquire, HookMode.Pre);
         }
@@ -353,13 +353,7 @@ public void OnPrintConfigCommand(CCSPlayerController? player, CommandInfo comman
     public HookResult OnWeaponCanAcquire(DynamicHook hook)
     {
         Log.Debug("OnWeaponCanAcquire");
-        // GetCSWeaponDataFromKeyFunc doesnt work on windows
-        if (Helpers.IsWindows())
-        {
-            Log.Debug("Exit early");
-            return HookResult.Continue;
-        }
-
+        
         var acquireMethod = hook.GetParam<AcquireMethod>(2);
         if (acquireMethod == AcquireMethod.PickUp)
         {