From b4625ddfc8701c3ba49f27225afd354a3913938e Mon Sep 17 00:00:00 2001
From: Mohammad Shoaib Khan <shoaib.khan20@outlook.com>
Date: Sun, 14 Aug 2022 20:09:09 +0530
Subject: [PATCH] Issue#29 Fixed crab pot not getting detected as a machine

---
 stardew-access/Features/TileInfo.cs | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/stardew-access/Features/TileInfo.cs b/stardew-access/Features/TileInfo.cs
index 240572c..64df1c7 100644
--- a/stardew-access/Features/TileInfo.cs
+++ b/stardew-access/Features/TileInfo.cs
@@ -9,7 +9,7 @@ namespace stardew_access.Features
 {
     public class TileInfo
     {
-        public static string[] trackable_machines = { "bee house", "cask", "press", "keg", "machine", "maker", "preserves jar", "bone mill", "kiln", "crystalarium", "furnace", "geode crusher", "tapper", "lightning rod", "incubator", "wood chipper", "worm bin", "loom", "statue of endless fortune", "statue of perfection" };
+        public static string[] trackable_machines = { "bee house", "cask", "press", "keg", "machine", "maker", "preserves jar", "bone mill", "kiln", "crystalarium", "furnace", "geode crusher", "tapper", "lightning rod", "incubator", "wood chipper", "worm bin", "loom", "statue of endless fortune", "statue of perfection", "crab pot" };
 
         ///<summary>Returns the name of the object at tile alongwith it's category's name</summary>
         public static (string? name, string? categoryName) getNameWithCategoryNameAtTile(Vector2 tile)
@@ -80,17 +80,17 @@ namespace stardew_access.Features
                 toReturn = "Lava";
                 category = CATEGORY.WaterTiles;
             }
-            else if (Game1.currentLocation.isWaterTile(x, y) && isColliding && !lessInfo)
-            {
-                toReturn = "Water";
-                category = CATEGORY.WaterTiles;
-            }
             else if (Game1.currentLocation.isObjectAtTile(x, y))
             {
                 (string? name, CATEGORY? category) obj = getObjectAtTile(x, y, lessInfo);
                 toReturn = obj.name;
                 category = obj.category;
             }
+            else if (Game1.currentLocation.isWaterTile(x, y) && isColliding && !lessInfo)
+            {
+                toReturn = "Water";
+                category = CATEGORY.WaterTiles;
+            }
             else if (resourceClump != null)
             {
                 toReturn = resourceClump;
@@ -711,9 +711,8 @@ namespace stardew_access.Features
                     toReturn.category = CATEGORY.Furnitures;
 
             }
-            else if (obj.Type == "Crafting" && obj.bigCraftable.Value)
+            else if ((obj.Type == "Crafting" && obj.bigCraftable.Value) || obj.Name.ToLower().Equals("crab pot"))
             {
-
                 foreach (string machine in trackable_machines)
                 {
                     if (obj.Name.ToLower().Contains(machine))
@@ -739,8 +738,12 @@ namespace stardew_access.Features
         private static MachineState GetMachineState(StardewValley.Object machine)
         {
             if (machine is CrabPot crabPot)
+            {
                 if (crabPot.bait.Value is not null && crabPot.heldObject.Value is null)
                     return MachineState.Busy;
+                if (crabPot.bait.Value is not null && crabPot.heldObject.Value is not null)
+                    return MachineState.Ready;
+            }
             return GetMachineState(machine.readyForHarvest.Value, machine.MinutesUntilReady, machine.heldObject.Value);
         }