Updated for client version 0.14.9.1.30626

CustomInteractions.Prepatch/CustomInteractions.Prepatch.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
     <AssemblyName>IcyClawz.CustomInteractions.Prepatch</AssemblyName>
-    <Version>1.4.0</Version>
+    <Version>1.5.0</Version>
     <RootNamespace>IcyClawz.CustomInteractions</RootNamespace>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>

CustomInteractions/CustomInteractions.cs

@@ -9,7 +9,7 @@ using System.Linq;
 using System.Reflection;
 using UnityEngine;
 
-using EmptyInteractionsAbstractClass = GClass3039;
+using EmptyInteractionsAbstractClass = GClass3061;
 
 namespace IcyClawz.CustomInteractions;
 

CustomInteractions/CustomInteractions.csproj

@@ -3,15 +3,12 @@
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
     <AssemblyName>IcyClawz.CustomInteractions</AssemblyName>
-    <Version>1.4.0</Version>
+    <Version>1.5.0</Version>
     <RootNamespace>IcyClawz.CustomInteractions</RootNamespace>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <Reference Include="Aki.Reflection">
-      <HintPath>..\Shared\Aki.Reflection.dll</HintPath>
-    </Reference>
     <Reference Include="Assembly-CSharp">
       <HintPath>..\Shared\Assembly-CSharp-CustomInteractions.dll</HintPath>
     </Reference>
@@ -24,6 +21,9 @@
     <Reference Include="Sirenix.Serialization">
       <HintPath>..\Shared\Sirenix.Serialization.dll</HintPath>
     </Reference>
+    <Reference Include="SPT.Reflection">
+      <HintPath>..\Shared\spt-reflection.dll</HintPath>
+    </Reference>
     <Reference Include="UnityEngine">
       <HintPath>..\Shared\UnityEngine.dll</HintPath>
     </Reference>

CustomInteractions/Plugin.cs

@@ -1,12 +1,12 @@
-using Aki.Reflection.Patching;
 using BepInEx;
 using EFT.UI;
+using SPT.Reflection.Patching;
 using System.Linq;
 using System.Reflection;
 
 namespace IcyClawz.CustomInteractions;
 
-[BepInPlugin("com.IcyClawz.CustomInteractions", "IcyClawz.CustomInteractions", "1.4.0")]
+[BepInPlugin("com.IcyClawz.CustomInteractions", "IcyClawz.CustomInteractions", "1.5.0")]
 public class Plugin : BaseUnityPlugin
 {
     private void Awake()

ItemAttributeFix/ItemAttributeFix.csproj

@@ -3,21 +3,21 @@
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
     <AssemblyName>IcyClawz.ItemAttributeFix</AssemblyName>
-    <Version>1.3.0</Version>
+    <Version>1.4.0</Version>
     <RootNamespace>IcyClawz.ItemAttributeFix</RootNamespace>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <Reference Include="Aki.Reflection">
-      <HintPath>..\Shared\Aki.Reflection.dll</HintPath>
-    </Reference>
     <Reference Include="Assembly-CSharp">
       <HintPath>..\Shared\Assembly-CSharp.dll</HintPath>
     </Reference>
     <Reference Include="BepInEx">
       <HintPath>..\Shared\BepInEx.dll</HintPath>
     </Reference>
+    <Reference Include="SPT.Reflection">
+      <HintPath>..\Shared\spt-reflection.dll</HintPath>
+    </Reference>
     <Reference Include="UnityEngine">
       <HintPath>..\Shared\UnityEngine.dll</HintPath>
     </Reference>

ItemAttributeFix/Plugin.cs

@@ -1,11 +1,11 @@
-using Aki.Reflection.Patching;
 using BepInEx;
 using EFT.UI;
+using SPT.Reflection.Patching;
 using System.Reflection;
 
 namespace IcyClawz.ItemAttributeFix;
 
-[BepInPlugin("com.IcyClawz.ItemAttributeFix", "IcyClawz.ItemAttributeFix", "1.3.0")]
+[BepInPlugin("com.IcyClawz.ItemAttributeFix", "IcyClawz.ItemAttributeFix", "1.4.0")]
 public class Plugin : BaseUnityPlugin
 {
     private void Awake() =>

ItemContextMenuExt/ItemContextMenuExt.cs

@@ -8,8 +8,8 @@ using System.Linq;
 using System.Reflection;
 using UnityEngine;
 
-using ILightTemplate = GInterface295;
+using ILightTemplate = GInterface310;
-using GlobalEvents = GClass3019;
+using GlobalEvents = GClass3040;
 
 namespace IcyClawz.ItemContextMenuExt;
 

ItemContextMenuExt/ItemContextMenuExt.csproj

@@ -3,11 +3,15 @@
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
     <AssemblyName>IcyClawz.ItemContextMenuExt</AssemblyName>
-    <Version>1.4.0</Version>
+    <Version>1.5.0</Version>
     <RootNamespace>IcyClawz.ItemContextMenuExt</RootNamespace>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="ItemContextMenuExt.cs~RF18496b2.TMP" />
+  </ItemGroup>
+
   <ItemGroup>
     <Reference Include="Assembly-CSharp">
       <HintPath>..\Shared\Assembly-CSharp.dll</HintPath>

ItemContextMenuExt/Plugin.cs

@@ -3,7 +3,7 @@ using IcyClawz.CustomInteractions;
 
 namespace IcyClawz.ItemContextMenuExt;
 
-[BepInPlugin("com.IcyClawz.ItemContextMenuExt", "IcyClawz.ItemContextMenuExt", "1.4.0")]
+[BepInPlugin("com.IcyClawz.ItemContextMenuExt", "IcyClawz.ItemContextMenuExt", "1.5.0")]
 [BepInDependency("com.IcyClawz.CustomInteractions")]
 public class Plugin : BaseUnityPlugin
 {

ItemSellPrice/ItemSellPrice.cs

@@ -1,14 +1,14 @@
-using Aki.Reflection.Utils;
 using Comfort.Common;
 using EFT;
 using EFT.InventoryLogic;
+using SPT.Reflection.Utils;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using UnityEngine;
 
-using CurrencyUtil = GClass2517;
+using CurrencyUtil = GClass2531;
 
 namespace IcyClawz.ItemSellPrice;
 

ItemSellPrice/ItemSellPrice.csproj

@@ -3,15 +3,12 @@
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
     <AssemblyName>IcyClawz.ItemSellPrice</AssemblyName>
-    <Version>1.3.0</Version>
+    <Version>1.4.0</Version>
     <RootNamespace>IcyClawz.ItemSellPrice</RootNamespace>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <Reference Include="Aki.Reflection">
-      <HintPath>..\Shared\Aki.Reflection.dll</HintPath>
-    </Reference>
     <Reference Include="Assembly-CSharp">
       <HintPath>..\Shared\Assembly-CSharp.dll</HintPath>
     </Reference>
@@ -21,6 +18,9 @@
     <Reference Include="Comfort">
       <HintPath>..\Shared\Comfort.dll</HintPath>
     </Reference>
+    <Reference Include="SPT.Reflection">
+      <HintPath>..\Shared\spt-reflection.dll</HintPath>
+    </Reference>
     <Reference Include="UnityEngine">
       <HintPath>..\Shared\UnityEngine.dll</HintPath>
     </Reference>

ItemSellPrice/Plugin.cs

@@ -1,11 +1,11 @@
-using Aki.Reflection.Patching;
 using BepInEx;
 using EFT.InventoryLogic;
+using SPT.Reflection.Patching;
 using System.Reflection;
 
 namespace IcyClawz.ItemSellPrice;
 
-[BepInPlugin("com.IcyClawz.ItemSellPrice", "IcyClawz.ItemSellPrice", "1.3.0")]
+[BepInPlugin("com.IcyClawz.ItemSellPrice", "IcyClawz.ItemSellPrice", "1.4.0")]
 public class Plugin : BaseUnityPlugin
 {
     private void Awake()

MagazineInspector/MagazineInspector.cs

@@ -1,13 +1,13 @@
-using Aki.Reflection.Utils;
 using Comfort.Common;
 using EFT;
 using EFT.InventoryLogic;
+using SPT.Reflection.Utils;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
 
-using InGameStatus = GClass1849;
+using InGameStatus = GClass1864;
 
 namespace IcyClawz.MagazineInspector;
 

MagazineInspector/MagazineInspector.csproj

@@ -3,15 +3,12 @@
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
     <AssemblyName>IcyClawz.MagazineInspector</AssemblyName>
-    <Version>1.3.0</Version>
+    <Version>1.4.0</Version>
     <RootNamespace>IcyClawz.MagazineInspector</RootNamespace>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <Reference Include="Aki.Reflection">
-      <HintPath>..\Shared\Aki.Reflection.dll</HintPath>
-    </Reference>
     <Reference Include="Assembly-CSharp">
       <HintPath>..\Shared\Assembly-CSharp.dll</HintPath>
     </Reference>
@@ -21,6 +18,9 @@
     <Reference Include="Comfort">
       <HintPath>..\Shared\Comfort.dll</HintPath>
     </Reference>
+    <Reference Include="SPT.Reflection">
+      <HintPath>..\Shared\spt-reflection.dll</HintPath>
+    </Reference>
     <Reference Include="UnityEngine">
       <HintPath>..\Shared\UnityEngine.dll</HintPath>
     </Reference>

MagazineInspector/Plugin.cs

@@ -1,10 +1,10 @@
-using Aki.Reflection.Patching;
 using BepInEx;
+using SPT.Reflection.Patching;
 using System.Reflection;
 
 namespace IcyClawz.MagazineInspector;
 
-[BepInPlugin("com.IcyClawz.MagazineInspector", "IcyClawz.MagazineInspector", "1.3.0")]
+[BepInPlugin("com.IcyClawz.MagazineInspector", "IcyClawz.MagazineInspector", "1.4.0")]
 public class Plugin : BaseUnityPlugin
 {
     private void Awake() =>

MunitionsExpert/MunitionsExpert.cs

@@ -39,7 +39,7 @@ internal static class ColorCache
 
 internal enum EAmmoExtraAttributeId
 {
-    Damage, PenetrationPower, ArmorDamage, FragmentationChance, RicochetChance
+    ArmorDamage, FragmentationChance, RicochetChance
 }
 
 internal static class ImageExtensions
@@ -48,8 +48,8 @@ internal static class ImageExtensions
     {
         using MemoryStream ms = new();
         instance.Save(ms, System.Drawing.Imaging.ImageFormat.Png);
-        Texture2D texture = new(instance.Width, instance.Height);
+        Texture2D texture = new(instance.Width, instance.Height, TextureFormat.RGBA32, false);
-        ImageConversion.LoadImage(texture, ms.ToArray());
+        texture.LoadImage(ms.ToArray());
         return Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), Vector2.zero);
     }
 }
@@ -58,8 +58,6 @@ internal static class IconCache
 {
     private static readonly Dictionary<Enum, Sprite> Cache = new()
     {
-        [EAmmoExtraAttributeId.Damage] = Properties.Resources.Damage.ToSprite(),
-        [EAmmoExtraAttributeId.PenetrationPower] = Properties.Resources.PenetrationPower.ToSprite(),
         [EAmmoExtraAttributeId.ArmorDamage] = Properties.Resources.ArmorDamage.ToSprite(),
         [EAmmoExtraAttributeId.FragmentationChance] = Properties.Resources.FragmentationChance.ToSprite(),
         [EAmmoExtraAttributeId.RicochetChance] = Properties.Resources.RicochetChance.ToSprite()
@@ -78,34 +76,6 @@ internal static class AmmoTemplateExtensions
 
     public static void AddExtraAttributes(this AmmoTemplate instance)
     {
-        instance.SafelyAddQualityToList(new ItemAttributeClass(EAmmoExtraAttributeId.Damage)
-        {
-            Name = EAmmoExtraAttributeId.Damage.ToString(),
-            DisplayNameFunc = () => "Damage",
-            Base = () => instance.Damage * instance.ProjectileCount,
-            StringValue = () =>
-            {
-                int totalDamage = instance.Damage * instance.ProjectileCount;
-                return instance.ProjectileCount > 1
-                    ? $"{instance.ProjectileCount} × {instance.Damage} = {totalDamage}"
-                    : totalDamage.ToString();
-            },
-            DisplayType = () => EItemAttributeDisplayType.Compact
-        });
-
-        instance.SafelyAddQualityToList(new ItemAttributeClass(EAmmoExtraAttributeId.PenetrationPower)
-        {
-            Name = EAmmoExtraAttributeId.PenetrationPower.ToString(),
-            DisplayNameFunc = () => "Penetration power",
-            Base = () => instance.PenetrationPower,
-            StringValue = () =>
-            {
-                int armorClass = instance.GetPenetrationArmorClass();
-                return (armorClass > 0 ? $"Class {armorClass}" : "Unarmored") + $" ({instance.PenetrationPower})";
-            },
-            DisplayType = () => EItemAttributeDisplayType.Compact
-        });
-
         instance.SafelyAddQualityToList(new ItemAttributeClass(EAmmoExtraAttributeId.ArmorDamage)
         {
             Name = EAmmoExtraAttributeId.ArmorDamage.ToString(),

MunitionsExpert/MunitionsExpert.csproj

@@ -3,15 +3,12 @@
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
     <AssemblyName>IcyClawz.MunitionsExpert</AssemblyName>
-    <Version>1.3.0</Version>
+    <Version>1.4.0</Version>
     <RootNamespace>IcyClawz.MunitionsExpert</RootNamespace>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <Reference Include="Aki.Reflection">
-      <HintPath>..\Shared\Aki.Reflection.dll</HintPath>
-    </Reference>
     <Reference Include="Assembly-CSharp">
       <HintPath>..\Shared\Assembly-CSharp.dll</HintPath>
     </Reference>
@@ -24,6 +21,9 @@
     <Reference Include="Sirenix.Serialization">
       <HintPath>..\Shared\Sirenix.Serialization.dll</HintPath>
     </Reference>
+    <Reference Include="SPT.Reflection">
+      <HintPath>..\Shared\spt-reflection.dll</HintPath>
+    </Reference>
     <Reference Include="UnityEngine">
       <HintPath>..\Shared\UnityEngine.dll</HintPath>
     </Reference>

MunitionsExpert/Plugin.cs

@@ -1,10 +1,10 @@
-using Aki.Reflection.Patching;
 using BepInEx;
 using BepInEx.Configuration;
 using EFT.HandBook;
 using EFT.InventoryLogic;
 using EFT.UI;
 using EFT.UI.DragAndDrop;
+using SPT.Reflection.Patching;
 using System;
 using System.Collections.Generic;
 using System.Reflection;
@@ -13,7 +13,7 @@ using UnityEngine.UI;
 
 namespace IcyClawz.MunitionsExpert;
 
-[BepInPlugin("com.IcyClawz.MunitionsExpert", "IcyClawz.MunitionsExpert", "1.3.0")]
+[BepInPlugin("com.IcyClawz.MunitionsExpert", "IcyClawz.MunitionsExpert", "1.4.0")]
 public class Plugin : BaseUnityPlugin
 {
     private static ConfigEntry<bool> ColorizeSwitch { get; set; }

MunitionsExpert/Properties/Resources.Designer.cs

@@ -70,16 +70,6 @@ internal class Resources {
         }
     }
     
-    /// <summary>
-    ///   Looks up a localized resource of type System.Drawing.Bitmap.
-    /// </summary>
-    internal static System.Drawing.Bitmap Damage {
-        get {
-            object obj = ResourceManager.GetObject("Damage", resourceCulture);
-            return ((System.Drawing.Bitmap)(obj));
-        }
-    }
-    
     /// <summary>
     ///   Looks up a localized resource of type System.Drawing.Bitmap.
     /// </summary>
@@ -90,16 +80,6 @@ internal class Resources {
         }
     }
     
-    /// <summary>
-    ///   Looks up a localized resource of type System.Drawing.Bitmap.
-    /// </summary>
-    internal static System.Drawing.Bitmap PenetrationPower {
-        get {
-            object obj = ResourceManager.GetObject("PenetrationPower", resourceCulture);
-            return ((System.Drawing.Bitmap)(obj));
-        }
-    }
-    
     /// <summary>
     ///   Looks up a localized resource of type System.Drawing.Bitmap.
     /// </summary>

MunitionsExpert/Properties/Resources.resx

@@ -121,15 +121,9 @@
   <data name="ArmorDamage" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ArmorDamage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Damage" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Damage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="FragmentationChance" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\FragmentationChance.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="PenetrationPower" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\PenetrationPower.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="RicochetChance" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\RicochetChance.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>