From ee32d261487be41e6957d7baf74aead26017eb19 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Wed, 8 Jan 2025 14:43:34 -0500
Subject: [PATCH] Move one Equals implementation to correct base class

---
 SabreTools.DatItems.Test/DatItemTests.cs |  1 -
 SabreTools.DatItems/DatItem.cs           | 30 ++++++++++++------------
 SabreTools.DatItems/Formats/Blank.cs     |  2 +-
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/SabreTools.DatItems.Test/DatItemTests.cs b/SabreTools.DatItems.Test/DatItemTests.cs
index fbf47a88..242f9c28 100644
--- a/SabreTools.DatItems.Test/DatItemTests.cs
+++ b/SabreTools.DatItems.Test/DatItemTests.cs
@@ -1,4 +1,3 @@
-using SabreTools.Core.Filter;
 using SabreTools.DatItems.Formats;
 using Xunit;
 
diff --git a/SabreTools.DatItems/DatItem.cs b/SabreTools.DatItems/DatItem.cs
index 5dbcb64f..a0da9eb9 100644
--- a/SabreTools.DatItems/DatItem.cs
+++ b/SabreTools.DatItems/DatItem.cs
@@ -174,6 +174,21 @@ namespace SabreTools.DatItems
             return string.Compare(selfName, otherName, StringComparison.Ordinal);
         }
 
+        /// <inheritdoc/>
+        public override bool Equals(ModelBackedItem? other)
+        {
+            // If other is null
+            if (other == null)
+                return false;
+
+            // If the type is mismatched
+            if (other is not DatItem otherItem)
+                return false;
+
+            // Compare internal models
+            return _internal.Equals(otherItem);
+        }
+
         /// <summary>
         /// Determine if an item is a duplicate using partial matching logic
         /// </summary>
@@ -582,21 +597,6 @@ namespace SabreTools.DatItems
             return string.Compare(selfName, otherName, StringComparison.Ordinal);
         }
 
-        /// <inheritdoc/>
-        public override bool Equals(ModelBackedItem? other)
-        {
-            // If other is null
-            if (other == null)
-                return false;
-
-            // If the type is mismatched
-            if (other is not DatItem<T> otherItem)
-                return false;
-
-            // Compare internal models
-            return _internal.Equals(otherItem);
-        }
-
         /// <inheritdoc/>
         public override bool Equals(ModelBackedItem<Models.Metadata.DatItem>? other)
         {
diff --git a/SabreTools.DatItems/Formats/Blank.cs b/SabreTools.DatItems/Formats/Blank.cs
index 3fdbc0e6..f8a89e05 100644
--- a/SabreTools.DatItems/Formats/Blank.cs
+++ b/SabreTools.DatItems/Formats/Blank.cs
@@ -88,7 +88,7 @@ namespace SabreTools.DatItems.Formats
             // Otherwise, treat it as a Blank
             Blank? newOther = other as Blank;
 
-            // If the archive information matches
+            // If the machine information matches
             return GetFieldValue<Machine>(DatItem.MachineKey) == newOther!.GetFieldValue<Machine>(DatItem.MachineKey);
         }