Merge pull request 'Updated for 3.10.x' (#1) from ShinCFN/SPT-ContainerQuickLoot:master into master

Reviewed-on: #1

src/CactusPie.ContainerQuickLoot/QuickTransferPatch.cs

@@ -23,11 +23,11 @@ namespace CactusPie.ContainerQuickLoot
 
         [PatchPrefix]
         public static bool PatchPrefix(
-            ref GStruct414<GInterface339> __result,
+            ref GStruct446<GInterface385> __result,
             object __instance,
             Item item,
             TraderControllerClass controller,
-            IEnumerable<LootItemClass> targets,
+            IEnumerable<CompoundItem> targets,
             InteractionsHandlerClass.EMoveItemOrder order,
             bool simulate)
         {
@@ -80,7 +80,7 @@ namespace CactusPie.ContainerQuickLoot
                 }
 
                 // ReSharper disable once PossibleMultipleEnumeration
-                if (!(targets.SingleOrDefaultWithoutException() is EquipmentClass))
+                if (!(targets.SingleOrDefaultWithoutException() is InventoryEquipment))
                 {
                     continue;
                 }
@@ -99,19 +99,19 @@ namespace CactusPie.ContainerQuickLoot
                             continue;
                         }
 
-                        GStruct414<GClass2804> mergeResult = InteractionsHandlerClass.Merge(item, containedItem.Key, controller, simulate);
-                        __result = new GStruct414<GInterface339>(mergeResult.Value);
+                        GStruct446<GClass3138> mergeResult = InteractionsHandlerClass.Merge(item, containedItem.Key, controller, simulate);
+                        __result = new GStruct446<GInterface385>(mergeResult.Value);
                         return false;
                     }
                 }
 
-                ItemAddressClass location = container.FindLocationForItem(item);
+                ItemAddress location = container.FindLocationForItem(item);
                 if (location == null)
                 {
                     continue;
                 }
 
-                GStruct414<GClass2802> moveResult = InteractionsHandlerClass.Move(item, location, controller, simulate);
+                GStruct446<GClass3132> moveResult = InteractionsHandlerClass.Move(item, location, controller, simulate);
                 if (moveResult.Failed)
                 {
                     return true;
@@ -119,7 +119,7 @@ namespace CactusPie.ContainerQuickLoot
 
                 if (!moveResult.Value.ItemsDestroyRequired)
                 {
-                    __result = moveResult.Cast<GClass2802, GInterface339>();
+                    __result = moveResult.Cast<GClass3132, GInterface385>();
                 }
 
                 return false;
@@ -158,7 +158,7 @@ namespace CactusPie.ContainerQuickLoot
 
         private static IEnumerable<EFT.InventoryLogic.IContainer> FindTargetContainers(Item item, Inventory inventory)
         {
-            var matchingContainerCollections = new List<(ContainerCollection containerCollection, int priority)>();
+            var matchingContainerCollections = new List<(GClass2981 containerCollection, int priority)>();
 
             string tag = ContainerQuickLootPlugin.CustomizeTagForLootContainers.Value.ToString();
             Regex lootTagRegex = new Regex
@@ -191,7 +191,7 @@ namespace CactusPie.ContainerQuickLoot
                 }
 
                 // We check if any of the containers in the collection can hold our item
-                var containerCollection = inventoryItem as ContainerCollection;
+                var containerCollection = inventoryItem as GClass2981;
 
                 if (containerCollection == null || !containerCollection.Containers.Any(container => container.CanAccept(item)))
                 {
@@ -221,7 +221,7 @@ namespace CactusPie.ContainerQuickLoot
             Inventory inventory,
             TraderControllerClass controller,
             bool simulate,
-            ref GStruct414<GInterface339> result)
+            ref GStruct446<GInterface385> result)
         {
             if (!ContainerQuickLootPlugin.AutoMergeStacksForNonLootContainers.Value)
             {
@@ -245,14 +245,14 @@ namespace CactusPie.ContainerQuickLoot
                     continue;
                 }
 
-                GStruct414<GClass2804> mergeResult = InteractionsHandlerClass.Merge(item, targetItem, controller, simulate);
+                GStruct446<GClass3138> mergeResult = InteractionsHandlerClass.Merge(item, targetItem, controller, simulate);
 
                 if (!mergeResult.Succeeded)
                 {
                     return false;
                 }
 
-                result = new GStruct414<GInterface339>(mergeResult.Value);
+                result = new GStruct446<GInterface385>(mergeResult.Value);
                 return true;
             }