make an interface to connect these

DREDGE-Mods · Aug 25, 2024 · 7840165 · 7840165
1 parent 9ff570f
commit 7840165
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 38 deletions.
diff --git a/Winch/Assets/Textures/MaterialsIcon.png b/Winch/Assets/Textures/MaterialsIcon.png
diff --git a/Winch/Data/Item/CrabPotItemData.cs b/Winch/Data/Item/CrabPotItemData.cs
@@ -3,7 +3,7 @@
 
 namespace Winch.Data.Item
 {
-    public class CrabPotItemData : GridConfigDeployableItemData
+    public class CrabPotItemData : GridConfigDeployableItemData, IAbilityItemData
     {
         [SerializeField]
         public AbilityMode abilityMode = AbilityMode.POT;
@@ -13,6 +13,10 @@ public class CrabPotItemData : GridConfigDeployableItemData
 
         [SerializeField]
         public Sprite qualityIcon;
+
+        public AbilityMode AbilityMode => abilityMode;
+
+        public Sprite QualityIcon => qualityIcon;
     }
 
     public enum PotType

diff --git a/Winch/Data/Item/IAbilityItemData.cs b/Winch/Data/Item/IAbilityItemData.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using static ActiveAbilityInfoPanel;
+using UnityEngine;
+
+namespace Winch.Data.Item
+{
+    public interface IAbilityItemData
+    {
+        public AbilityMode AbilityMode { get; }
+
+        public Sprite QualityIcon { get; }
+    }
+}
diff --git a/Winch/Data/Item/TrawlNetItemData.cs b/Winch/Data/Item/TrawlNetItemData.cs
@@ -4,7 +4,7 @@
 
 namespace Winch.Data.Item
 {
-    public class TrawlNetItemData : GridConfigDeployableItemData
+    public class TrawlNetItemData : GridConfigDeployableItemData, IAbilityItemData
     {
         [SerializeField]
         public AbilityMode abilityMode = AbilityMode.TRAWL;
@@ -17,5 +17,9 @@ public class TrawlNetItemData : GridConfigDeployableItemData
 
         [SerializeField]
         public Sprite qualityIcon;
+
+        public AbilityMode AbilityMode => abilityMode;
+
+        public Sprite QualityIcon => qualityIcon;
     }
 }
diff --git a/Winch/Patches/API/ActiveAbilityInfoPanelPatcher.cs b/Winch/Patches/API/ActiveAbilityInfoPanelPatcher.cs
@@ -5,6 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using Winch.Data.Item;
+using static ActiveAbilityInfoPanel;
 
 namespace Winch.Patches.API
 {
@@ -15,43 +16,21 @@ internal static class ActiveAbilityInfoPanelPatcher
         [HarmonyPatch(nameof(ActiveAbilityInfoPanel.RefreshUI))]
         public static bool ActiveAbilityInfoPanel_RefreshUI_Prefix(ActiveAbilityInfoPanel __instance, SpatialItemData spatialItemData, AbilityData abilityData)
         {
-            if (abilityData.name == __instance.potAbility.name)
+            if (spatialItemData != null && spatialItemData is IAbilityItemData abilityItemData)
             {
-                if (spatialItemData != null && spatialItemData is CrabPotItemData potData)
+                __instance.abilityMode = abilityItemData.AbilityMode;
+                if (abilityItemData.QualityIcon != null)
                 {
-                    __instance.abilityMode = potData.abilityMode;
-                    if (potData.qualityIcon != null)
-                    {
-                        __instance.qualityIcon.sprite = potData.qualityIcon;
-                    }
-                    else
-                    {
-                        __instance.qualityIcon.sprite = __instance.GetSpriteForAbilityMode(potData.abilityMode);
-                    }
-                    __instance.Show();
-                    __instance.RefreshItemNameField(potData);
-                    __instance.UpdateCatchableSpecies();
-                    return false;
+                    __instance.qualityIcon.sprite = abilityItemData.QualityIcon;
                 }
-            }
-            else if (abilityData.name == __instance.trawlAbility.name)
-            {
-                if (spatialItemData != null && spatialItemData is TrawlNetItemData trawlNetData)
+                else
                 {
-                    __instance.abilityMode = trawlNetData.abilityMode;
-                    if (trawlNetData.qualityIcon != null)
-                    {
-                        __instance.qualityIcon.sprite = trawlNetData.qualityIcon;
-                    }
-                    else
-                    {
-                        __instance.qualityIcon.sprite = __instance.GetSpriteForAbilityMode(trawlNetData.abilityMode);
-                    }
-                    __instance.Show();
-                    __instance.RefreshItemNameField(trawlNetData);
-                    __instance.UpdateCatchableSpecies();
-                    return false;
+                    __instance.qualityIcon.sprite = __instance.GetSpriteForAbilityMode(abilityItemData.AbilityMode);
                 }
+                __instance.Show();
+                __instance.RefreshItemNameField(spatialItemData);
+                __instance.UpdateCatchableSpecies();
+                return false;
             }
             return true;
         }

diff --git a/Winch/Util/WinchExtensions.cs b/Winch/Util/WinchExtensions.cs
@@ -306,10 +306,8 @@ public static bool IsItemHarvestable(this PlayerZoneDetector playerZoneDetector,
 
     public static AbilityMode GetAbilityModeFromItemData(this SpatialItemData data)
     {
-        if (data is TrawlNetItemData netData)
-            return netData.abilityMode;
-        else if (data is CrabPotItemData potData)
-            return potData.abilityMode;
+        if (data is IAbilityItemData abilityItemData)
+            return abilityItemData.AbilityMode;
         else if (data.id == "tir-pot1")
             return AbilityMode.POT_MATERIAL;
         else if (data.itemSubtype == ItemSubtype.POT)