From b8966f5e37a01804dc5d19c83b9f2e768df4e515 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Thu, 16 Apr 2026 13:00:13 -0400
Subject: [PATCH] Remove unnecessary RemapDatItemToMachine method

---
 .../ItemDatabaseTests.cs                      | 29 -------------------
 .../DatFile.Filtering.cs                      |  2 +-
 .../DatFile.Splitting.cs                      | 10 +++----
 SabreTools.Metadata.DatFiles/ItemDatabase.cs  | 11 -------
 4 files changed, 6 insertions(+), 46 deletions(-)

diff --git a/SabreTools.Metadata.DatFiles.Test/ItemDatabaseTests.cs b/SabreTools.Metadata.DatFiles.Test/ItemDatabaseTests.cs
index eb51e168..887c5d94 100644
--- a/SabreTools.Metadata.DatFiles.Test/ItemDatabaseTests.cs
+++ b/SabreTools.Metadata.DatFiles.Test/ItemDatabaseTests.cs
@@ -508,35 +508,6 @@ namespace SabreTools.Metadata.DatFiles.Test
 
         #endregion
 
-        #region RemapDatItemToMachine
-
-        [Fact]
-        public void RemapDatItemToMachineTest()
-        {
-            Source source = new Source(0, source: null);
-
-            Machine origMachine = new Machine { Name = "original" };
-
-            Machine newMachine = new Machine { Name = "new" };
-
-            DatItem datItem = new Rom();
-
-            var dict = new ItemDatabase();
-            long sourceIndex = dict.AddSource(source);
-            long origMachineIndex = dict.AddMachine(origMachine);
-            long newMachineIndex = dict.AddMachine(newMachine);
-            long itemIndex = dict.AddItem(datItem, origMachineIndex, sourceIndex, statsOnly: false);
-
-            dict.RemapDatItemToMachine(itemIndex, newMachineIndex);
-
-            var actual = dict.GetMachineForItem(itemIndex);
-            Assert.Equal(1, actual.Key);
-            Assert.NotNull(actual.Value);
-            Assert.Equal("new", actual.Value.Name);
-        }
-
-        #endregion
-
         #region RemoveBucket
 
         [Fact]
diff --git a/SabreTools.Metadata.DatFiles/DatFile.Filtering.cs b/SabreTools.Metadata.DatFiles/DatFile.Filtering.cs
index e23f2e9a..44f71d0c 100644
--- a/SabreTools.Metadata.DatFiles/DatFile.Filtering.cs
+++ b/SabreTools.Metadata.DatFiles/DatFile.Filtering.cs
@@ -600,7 +600,7 @@ namespace SabreTools.Metadata.DatFiles
                 return;
 
             // Reassign the item to the new machine
-            ItemsDB.RemapDatItemToMachine(datItem.Key, newMachineIndex);
+            datItem.Value.MachineIndex = newMachineIndex;
 
             // Remove extensions from File and Rom items
             if (datItem.Value is DatItems.Formats.File || datItem.Value is Rom)
diff --git a/SabreTools.Metadata.DatFiles/DatFile.Splitting.cs b/SabreTools.Metadata.DatFiles/DatFile.Splitting.cs
index 45637c1e..1066a97c 100644
--- a/SabreTools.Metadata.DatFiles/DatFile.Splitting.cs
+++ b/SabreTools.Metadata.DatFiles/DatFile.Splitting.cs
@@ -450,7 +450,7 @@ namespace SabreTools.Metadata.DatFiles
                             .Select(i => (i as Disk)!.Name)
                             .Contains(mergeTag))
                         {
-                            ItemsDB.RemapDatItemToMachine(item.Key, cloneOfMachine.Key);
+                            item.Value.MachineIndex = cloneOfMachine.Key;
                             ItemsDB.AddItem(item.Value, cloneOfMachine.Key, source.Key);
                         }
 
@@ -460,7 +460,7 @@ namespace SabreTools.Metadata.DatFiles
                             .Select(i => (i as Disk)!.Name)
                             .Contains(disk.Name))
                         {
-                            ItemsDB.RemapDatItemToMachine(item.Key, cloneOfMachine.Key);
+                            item.Value.MachineIndex = cloneOfMachine.Key;
                             ItemsDB.AddItem(item.Value, cloneOfMachine.Key, source.Key);
                         }
                     }
@@ -488,7 +488,7 @@ namespace SabreTools.Metadata.DatFiles
                             if (subfolder)
                                 rom.Name = $"{machineName}\\{rom.Name}";
 
-                            ItemsDB.RemapDatItemToMachine(item.Key, machineIndex: cloneOfMachine.Key);
+                            item.Value.MachineIndex = cloneOfMachine.Key;
                             ItemsDB.AddItem(item.Value, cloneOfMachine.Key, source.Key);
                         }
 
@@ -498,7 +498,7 @@ namespace SabreTools.Metadata.DatFiles
                             if (subfolder)
                                 rom.Name = $"{machineName}\\{rom.Name}";
 
-                            ItemsDB.RemapDatItemToMachine(item.Key, cloneOfMachine.Key);
+                            item.Value.MachineIndex = cloneOfMachine.Key;
                             ItemsDB.AddItem(item.Value, cloneOfMachine.Key, source.Key);
                         }
                     }
@@ -509,7 +509,7 @@ namespace SabreTools.Metadata.DatFiles
                         if (subfolder)
                             item.Value.SetName($"{machineName}\\{item.Value.GetName()}");
 
-                        ItemsDB.RemapDatItemToMachine(item.Key, cloneOfMachine.Key);
+                        item.Value.MachineIndex = cloneOfMachine.Key;
                         ItemsDB.AddItem(item.Value, cloneOfMachine.Key, source.Key);
                     }
 
diff --git a/SabreTools.Metadata.DatFiles/ItemDatabase.cs b/SabreTools.Metadata.DatFiles/ItemDatabase.cs
index e0625eb3..50454ef9 100644
--- a/SabreTools.Metadata.DatFiles/ItemDatabase.cs
+++ b/SabreTools.Metadata.DatFiles/ItemDatabase.cs
@@ -447,17 +447,6 @@ namespace SabreTools.Metadata.DatFiles
         /// </summary>
         public IDictionary<long, Source> GetSources() => _sources;
 
-        /// <summary>
-        /// Remap an item to a new machine index without validation
-        /// </summary>
-        /// <param name="itemIndex">Current item index</param>
-        /// <param name="machineIndex">New machine index</param>
-        public void RemapDatItemToMachine(long itemIndex, long machineIndex)
-        {
-            if (_items.TryGetValue(itemIndex, out var item))
-                item.MachineIndex = machineIndex;
-        }
-
         /// <summary>
         /// Remove a key from the file dictionary if it exists
         /// </summary>