diff --git a/src/CactusPie.ContainerQuickLoot/CactusPie.ContainerQuickLoot.csproj b/src/CactusPie.ContainerQuickLoot/CactusPie.ContainerQuickLoot.csproj index dd95c4c..399dcbf 100644 --- a/src/CactusPie.ContainerQuickLoot/CactusPie.ContainerQuickLoot.csproj +++ b/src/CactusPie.ContainerQuickLoot/CactusPie.ContainerQuickLoot.csproj @@ -2,8 +2,8 @@ net472 - 1.4.2 - CactusPie + 1.5.0 + bepis69 @@ -13,36 +13,36 @@ - - ..\References\EFT_Managed\Aki.Reflection.dll + + ..\..\..\resources\spt-reflection.dll False - ..\References\EFT_Managed\Assembly-CSharp.dll + ..\..\..\resources\Assembly-CSharp.dll False - ..\References\EFT_Managed\Comfort.dll + ..\..\..\resources\Comfort.dll False - ..\References\EFT_Managed\Comfort.Unity.dll + ..\..\..\resources\Comfort.Unity.dll False - ..\References\EFT_Managed\ItemComponent.Types.dll + ..\..\..\resources\ItemComponent.Types.dll False - ..\References\EFT_Managed\UnityEngine.dll + ..\..\..\resources\UnityEngine.dll False - ..\References\EFT_Managed\UnityEngine.CoreModule.dll + ..\..\..\resources\UnityEngine.CoreModule.dll False - ..\References\EFT_Managed\UnityEngine.InputLegacyModule.dll + ..\..\..\resources\UnityEngine.InputLegacyModule.dll False diff --git a/src/CactusPie.ContainerQuickLoot/QuickTransferPatch.cs b/src/CactusPie.ContainerQuickLoot/QuickTransferPatch.cs index a99de0b..192c198 100644 --- a/src/CactusPie.ContainerQuickLoot/QuickTransferPatch.cs +++ b/src/CactusPie.ContainerQuickLoot/QuickTransferPatch.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Text.RegularExpressions; -using Aki.Reflection.Patching; +using SPT.Reflection.Patching; using Comfort.Common; using EFT; using EFT.InventoryLogic; @@ -22,7 +22,7 @@ namespace CactusPie.ContainerQuickLoot [PatchPrefix] public static bool PatchPrefix( - ref GStruct414 __result, + ref GStruct414 __result, object __instance, Item item, TraderControllerClass controller, @@ -98,19 +98,19 @@ namespace CactusPie.ContainerQuickLoot continue; } - GStruct414 mergeResult = InteractionsHandlerClass.Merge(item, containedItem.Key, controller, simulate); - __result = new GStruct414(mergeResult.Value); + GStruct414 mergeResult = InteractionsHandlerClass.Merge(item, containedItem.Key, controller, simulate); + __result = new GStruct414(mergeResult.Value); return false; } } - GClass2769 location = container.FindLocationForItem(item); + ItemAddressClass location = container.FindLocationForItem(item); if (location == null) { continue; } - GStruct414 moveResult = InteractionsHandlerClass.Move(item, location, controller, simulate); + GStruct414 moveResult = InteractionsHandlerClass.Move(item, location, controller, simulate); if (moveResult.Failed) { return true; @@ -118,7 +118,7 @@ namespace CactusPie.ContainerQuickLoot if (!moveResult.Value.ItemsDestroyRequired) { - __result = moveResult.Cast(); + __result = moveResult.Cast(); } return false; @@ -213,7 +213,7 @@ namespace CactusPie.ContainerQuickLoot Inventory inventory, TraderControllerClass controller, bool simulate, - ref GStruct414 result) + ref GStruct414 result) { if (!ContainerQuickLootPlugin.AutoMergeStacksForNonLootContainers.Value) { @@ -237,14 +237,14 @@ namespace CactusPie.ContainerQuickLoot continue; } - GStruct414 mergeResult = InteractionsHandlerClass.Merge(item, targetItem, controller, simulate); + GStruct414 mergeResult = InteractionsHandlerClass.Merge(item, targetItem, controller, simulate); if (!mergeResult.Succeeded) { return false; } - result = new GStruct414(mergeResult.Value); + result = new GStruct414(mergeResult.Value); return true; }