Carry Chests 1.2.1 (#11)

* Bump version to 1.2.1 and enhance mod functionality

Updated the version number in `CarryChests.csproj` to `1.2.1`.
Changed `ModConfig` to a sealed class and added a `GetSummary()` method.
Modified the `Entry` method in `ModEntry` to handle configuration changes.
Improved button press handling in `OnButtonPressed` for better user experience.
Refined chest menu display logic and added new patches for `SObject` location handling.
Updated commit hash for the FauxCore subproject.

* Update subproject to new commit version

Updated the subproject commit from `123fb98f960c40b74eef46543c1258b26ee5aade` to `708006982a2c373ead6db808867083d4bc16b194`, integrating the latest changes and improvements.

Author: LeFauxMatt

CarryChests/CarryChests.csproj

@@ -6,7 +6,7 @@
 	<PropertyGroup>
 		<Name>Carry Chests</Name>
 		<Description>Allows you to pick up placed chests with items.</Description>
-		<Version>1.2.0</Version>
+		<Version>1.2.1</Version>
 		<EnableHarmony>true</EnableHarmony>
 		<RootNamespace>LeFauxMods.CarryChest</RootNamespace>
 		<UniqueId>furyx639.CarryChest</UniqueId>

CarryChests/ModConfig.cs

@@ -6,7 +6,7 @@
 namespace LeFauxMods.CarryChest;
 
 /// <inheritdoc cref="IModConfig{TConfig}" />
-internal class ModConfig : IModConfig<ModConfig>, IConfigWithLogAmount
+internal sealed class ModConfig : IModConfig<ModConfig>, IConfigWithLogAmount
 {
     /// <summary>Gets or sets a value indicating whether held chests can be opened.</summary>
     public bool OpenHeldChest { get; set; } = true;
@@ -45,6 +45,7 @@ public void CopyTo(ModConfig other)
         other.TotalLimit = this.TotalLimit;
     }
 
+    /// <inheritdoc />
     public string GetSummary() =>
         new StringBuilder()
             .AppendLine(CultureInfo.InvariantCulture, $"{nameof(this.GrabEmptyAsItem),25}: {this.GrabEmptyAsItem}")

CarryChests/ModEntry.cs

@@ -19,7 +19,7 @@ internal sealed class ModEntry : Mod
     /// <inheritdoc />
     public override void Entry(IModHelper helper)
     {
-        // Apply
+        // Init
         ModEvents.Subscribe<ConfigChangedEventArgs<ModConfig>>(this.OnConfigChanged);
         I18n.Init(helper.Translation);
         ModState.Init(helper);
@@ -83,6 +83,9 @@ private void OnCommandReceived(CommandReceivedEventArgs e)
             case "backup":
                 Game1.activeClickableMenu = new ItemGrabMenu(ModState.Backups);
                 return;
+            default:
+                Log.Warn(I18n.Command_Unknown_Description());
+                break;
         }
     }
 
@@ -91,12 +94,7 @@ private void OnGameLaunched(object? sender, GameLaunchedEventArgs e) =>
 
     private void OnButtonPressed(object? sender, ButtonPressedEventArgs e)
     {
-        if (!Context.IsPlayerFree)
-        {
-            return;
-        }
-
-        if (e.Button.IsUseToolButton())
+        if (e.Button.IsUseToolButton() && Context.IsPlayerFree)
         {
             if (Game1.player.CurrentItem is Tool && !ModState.Config.OverrideTool)
             {
@@ -129,16 +127,47 @@ private void OnButtonPressed(object? sender, ButtonPressedEventArgs e)
             return;
         }
 
-        if (e.Button.IsActionButton())
+        if (!e.Button.IsActionButton() || !ModState.Config.OpenHeldChest)
+        {
+            return;
+        }
+
+        if (Context.IsPlayerFree && Game1.player.ActiveObject is Chest heldChest)
+        {
+            this.Helper.Input.Suppress(e.Button);
+            heldChest.ShowMenu();
+            return;
+        }
+
+        Game1.InUIMode(() =>
         {
-            if (!ModState.Config.OpenHeldChest || Game1.player.ActiveObject is not Chest heldChest)
+            var (mouseX, mouseY) = e.Cursor.GetScaledScreenPixels().ToPoint();
+            var inventoryMenu = Game1.activeClickableMenu switch
+            {
+                ItemGrabMenu { ItemsToGrabMenu: { } itemsToGrabMenu } when itemsToGrabMenu.isWithinBounds(mouseX,
+                    mouseY) => itemsToGrabMenu,
+                ItemGrabMenu { inventory: { } inventory } when inventory.isWithinBounds(mouseX, mouseY) =>
+                    inventory,
+                GameMenu gameMenu when gameMenu.GetCurrentPage() is InventoryPage { inventory: { } inventory } &&
+                    inventory.isWithinBounds(mouseX, mouseY) => inventory,
+                _ => null
+            };
+
+            if (inventoryMenu is not { inventory: { } slots, actualInventory: { } items })
+            {
+                return;
+            }
+
+            var slot = slots.FirstOrDefault(slot => slot.containsPoint(mouseX, mouseY));
+            if (slot is null || !int.TryParse(slot.name, out var index) ||
+                items[index] is not Chest chest)
             {
                 return;
             }
 
             this.Helper.Input.Suppress(e.Button);
-            heldChest.ShowMenu();
-        }
+            chest.ShowMenu();
+        });
     }
 
     private void OnConfigChanged(ConfigChangedEventArgs<ModConfig> e)

CarryChests/Services/ModPatches.cs

@@ -46,6 +46,10 @@ public static void Apply()
                 AccessTools.DeclaredMethod(typeof(SObject), nameof(SObject.drawWhenHeld)),
                 new HarmonyMethod(typeof(ModPatches), nameof(Object_drawWhenHeld_prefix)));
 
+            _ = Harmony.Patch(
+                AccessTools.DeclaredPropertyGetter(typeof(SObject), nameof(SObject.Location)),
+                postfix: new HarmonyMethod(typeof(ModPatches), nameof(Object_Location_postfix)));
+
             _ = Harmony.Patch(
                 AccessTools.DeclaredMethod(typeof(SObject), nameof(SObject.maximumStackSize)),
                 postfix: new HarmonyMethod(typeof(ModPatches), nameof(Object_maximumStackSize_postfix)));
@@ -190,4 +194,13 @@ private static void Object_placementAction_postfix(
             chest.ToLocalInventory();
         }
     }
+
+    [SuppressMessage("ReSharper", "InconsistentNaming", Justification = "Harmony")]
+    private static void Object_Location_postfix(SObject __instance, ref GameLocation __result)
+    {
+        if (__instance is Chest)
+        {
+            __result ??= Game1.player.currentLocation;
+        }
+    }
 }