Update versioning and authors for 3.10

Reviewed-on: #1

src/CactusPie.ContainerQuickLoot/CactusPie.ContainerQuickLoot.csproj

@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
-    <Version>1.5.0</Version>
+    <Version>1.6.0</Version>
-    <Authors>bepis69</Authors>
+    <Authors> CactusPiereysonk,ArchmageTony,bepis69,ShinCFN</Authors>
   </PropertyGroup>
 
   <ItemGroup>

src/CactusPie.ContainerQuickLoot/ContainerQuickLootPlugin.cs

@@ -4,7 +4,7 @@ using JetBrains.Annotations;
 
 namespace CactusPie.ContainerQuickLoot
 {
-    [BepInPlugin("com.cactuspie.containerquikloot", "CactusPie.ContainerQuickLoot", "1.4.2")]
+    [BepInPlugin("com.cactuspie.containerquikloot", "CactusPie.ContainerQuickLoot", "1.6.0")]
     public class ContainerQuickLootPlugin : BaseUnityPlugin
     {
         internal static ConfigEntry<bool> EnableForCtrlClick { get; set; }
@@ -15,6 +15,8 @@ namespace CactusPie.ContainerQuickLoot
 
         internal static ConfigEntry<bool> AutoMergeStacksForNonLootContainers { get; set; }
 
+        internal static ConfigEntry<string> CustomizeTagForLootContainers {get; set;}
+
         [UsedImplicitly]
         internal void Start()
         {
@@ -65,6 +67,17 @@ namespace CactusPie.ContainerQuickLoot
                 )
             );
 
+            CustomizeTagForLootContainers = Config.Bind
+            (
+                sectionName,
+                "Customize the keyword used to denote loot containers in tags",
+                "@loot",
+                new ConfigDescription
+                (
+                    "Customize the keyword used to denote loot containers in tags\nDefault value: \"@loot\""
+                )
+            );
+
             new QuickTransferPatch().Enable();
         }
     }

src/CactusPie.ContainerQuickLoot/QuickTransferPatch.cs

@@ -7,12 +7,13 @@ using SPT.Reflection.Patching;
 using Comfort.Common;
 using EFT;
 using EFT.InventoryLogic;
+using System.CodeDom;
+using System.ComponentModel;
 
 namespace CactusPie.ContainerQuickLoot
 {
     public class QuickTransferPatch : ModulePatch
     {
-        private static readonly Regex LootTagRegex = new Regex("@loot[0-9]*", RegexOptions.Compiled, TimeSpan.FromMilliseconds(100));
 
         protected override MethodBase GetTargetMethod()
         {
@@ -22,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)
         {
@@ -79,7 +80,7 @@ namespace CactusPie.ContainerQuickLoot
                 }
 
                 // ReSharper disable once PossibleMultipleEnumeration
-                if (!(targets.SingleOrDefaultWithoutException() is EquipmentClass))
+                if (!(targets.SingleOrDefaultWithoutException() is InventoryEquipment))
                 {
                     continue;
                 }
@@ -98,19 +99,19 @@ namespace CactusPie.ContainerQuickLoot
                             continue;
                         }
 
-                        GStruct414<GClass2804> mergeResult = InteractionsHandlerClass.Merge(item, containedItem.Key, controller, simulate);
+                        GStruct446<GClass3138> mergeResult = InteractionsHandlerClass.Merge(item, containedItem.Key, controller, simulate);
-                        __result = new GStruct414<GInterface339>(mergeResult.Value);
+                        __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;
@@ -118,7 +119,7 @@ namespace CactusPie.ContainerQuickLoot
 
                 if (!moveResult.Value.ItemsDestroyRequired)
                 {
-                    __result = moveResult.Cast<GClass2802, GInterface339>();
+                    __result = moveResult.Cast<GClass3132, GInterface385>();
                 }
 
                 return false;
@@ -139,7 +140,7 @@ namespace CactusPie.ContainerQuickLoot
                 // Logger.LogError("在这里代表gameworld==null");
                 return false;
             }
-            
+
             Player player = GetLocalPlayerFromWorld(gameWorld);
             // inventory = (Inventory)typeof(Player)
             // .GetProperty("Inventory", BindingFlags.NonPublic | BindingFlags.Instance)
@@ -157,7 +158,15 @@ 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
+            (
+                tag + "[0-9]*",
+                RegexOptions.None,
+                TimeSpan.FromMilliseconds(100)
+            );
 
             foreach (Item inventoryItem in inventory.Equipment.GetAllItems())
             {
@@ -173,8 +182,8 @@ namespace CactusPie.ContainerQuickLoot
                     continue;
                 }
 
-                // We check if there is a @loot tag
+                // We check if there is a tag
-                Match regexMatch = LootTagRegex.Match(tagComponent.Name);
+                Match regexMatch = lootTagRegex.Match(tagComponent.Name);
 
                 if (!regexMatch.Success)
                 {
@@ -182,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)))
                 {
@@ -191,9 +200,8 @@ namespace CactusPie.ContainerQuickLoot
 
                 // We extract the suffix - if not suffix provided, we assume 0
                 // Length of @loot - we only want the number suffix
-                const int lootTagLength = 5;
 
-                string priorityString = regexMatch.Value.Substring(lootTagLength);
+                string priorityString = regexMatch.Value.Substring(tag.Length);
                 int priority = priorityString.Length == 0 ? 0 : int.Parse(priorityString);
 
                 matchingContainerCollections.Add((containerCollection, priority));
@@ -213,7 +221,7 @@ namespace CactusPie.ContainerQuickLoot
             Inventory inventory,
             TraderControllerClass controller,
             bool simulate,
-            ref GStruct414<GInterface339> result)
+            ref GStruct446<GInterface385> result)
         {
             if (!ContainerQuickLootPlugin.AutoMergeStacksForNonLootContainers.Value)
             {
@@ -228,7 +236,7 @@ namespace CactusPie.ContainerQuickLoot
             foreach (Item targetItem in inventory.Equipment.GetNotMergedItems().Reverse())
             {
                 if (targetItem.Template._id != item.Template._id)
-                {   
+                {
                     continue;
                 }
 
@@ -237,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;
             }