bepis69/SPT-ContainerQuickLoot
bepis69/SPT-ContainerQuickLoot
0
0
Fork 0
Code Issues Pull Requests Releases 3 Activity

Adapt to 3.9

Browse Source
This commit is contained in:
bepis69 2024-09-01 14:00:19 -04:00
parent f8d2a1f943
commit 7a145e1105
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/CactusPie.ContainerQuickLoot/CactusPie.ContainerQuickLoot.csproj
View File

@ -2,8 +2,8 @@
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<Version>1.4.2</Version>
<Authors>CactusPie</Authors>
<Version>1.5.0</Version>
<Authors>bepis69</Authors>
</PropertyGroup>
<ItemGroup>
@ -13,36 +13,36 @@
</ItemGroup>
<ItemGroup>
<Reference Include="Aki.Reflection">
<HintPath>..\References\EFT_Managed\Aki.Reflection.dll</HintPath>
<Reference Include="spt-reflection">
<HintPath>..\..\..\resources\spt-reflection.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Assembly-CSharp">
<HintPath>..\References\EFT_Managed\Assembly-CSharp.dll</HintPath>
<HintPath>..\..\..\resources\Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Comfort">
<HintPath>..\References\EFT_Managed\Comfort.dll</HintPath>
<HintPath>..\..\..\resources\Comfort.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Comfort.Unity">
<HintPath>..\References\EFT_Managed\Comfort.Unity.dll</HintPath>
<HintPath>..\..\..\resources\Comfort.Unity.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="ItemComponent.Types">
<HintPath>..\References\EFT_Managed\ItemComponent.Types.dll</HintPath>
<HintPath>..\..\..\resources\ItemComponent.Types.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine">
<HintPath>..\References\EFT_Managed\UnityEngine.dll</HintPath>
<HintPath>..\..\..\resources\UnityEngine.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.CoreModule">
<HintPath>..\References\EFT_Managed\UnityEngine.CoreModule.dll</HintPath>
<HintPath>..\..\..\resources\UnityEngine.CoreModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.InputLegacyModule">
<HintPath>..\References\EFT_Managed\UnityEngine.InputLegacyModule.dll</HintPath>
<HintPath>..\..\..\resources\UnityEngine.InputLegacyModule.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>

20
src/CactusPie.ContainerQuickLoot/QuickTransferPatch.cs
View File

@ -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<GInterface324> __result,
ref GStruct414<GInterface339> __result,
object __instance,
Item item,
TraderControllerClass controller,
@ -98,19 +98,19 @@ namespace CactusPie.ContainerQuickLoot
continue;
}
GStruct414<GClass2788> mergeResult = InteractionsHandlerClass.Merge(item, containedItem.Key, controller, simulate);
__result = new GStruct414<GInterface324>(mergeResult.Value);
GStruct414<GClass2804> mergeResult = InteractionsHandlerClass.Merge(item, containedItem.Key, controller, simulate);
__result = new GStruct414<GInterface339>(mergeResult.Value);
return false;
}
}
GClass2769 location = container.FindLocationForItem(item);
ItemAddressClass location = container.FindLocationForItem(item);
if (location == null)
{
continue;
}
GStruct414<GClass2786> moveResult = InteractionsHandlerClass.Move(item, location, controller, simulate);
GStruct414<GClass2802> 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<GClass2786, GInterface324>();
__result = moveResult.Cast<GClass2802, GInterface339>();
}
return false;
@ -213,7 +213,7 @@ namespace CactusPie.ContainerQuickLoot
Inventory inventory,
TraderControllerClass controller,
bool simulate,
ref GStruct414<GInterface324> result)
ref GStruct414<GInterface339> result)
{
if (!ContainerQuickLootPlugin.AutoMergeStacksForNonLootContainers.Value)
{
@ -237,14 +237,14 @@ namespace CactusPie.ContainerQuickLoot
continue;
}
GStruct414<GClass2788> mergeResult = InteractionsHandlerClass.Merge(item, targetItem, controller, simulate);
GStruct414<GClass2804> mergeResult = InteractionsHandlerClass.Merge(item, targetItem, controller, simulate);
if (!mergeResult.Succeeded)
{
return false;
}
result = new GStruct414<GInterface324>(mergeResult.Value);
result = new GStruct414<GInterface339>(mergeResult.Value);
return true;
}