diff --git a/SabreTools.DatFiles.Test/DatFileTests.cs b/SabreTools.DatFiles.Test/DatFileTests.cs index 3595dab3..2b4b2014 100644 --- a/SabreTools.DatFiles.Test/DatFileTests.cs +++ b/SabreTools.DatFiles.Test/DatFileTests.cs @@ -244,12 +244,6 @@ namespace SabreTools.DatFiles.Test #endregion - #region ContainsWritableDB - - // TODO: Write ContainsWritableDB tests - - #endregion - #region ResolveNames // TODO: Write ResolveNames tests diff --git a/SabreTools.DatFiles/DatFile.cs b/SabreTools.DatFiles/DatFile.cs index 435679a8..4f9e4a28 100644 --- a/SabreTools.DatFiles/DatFile.cs +++ b/SabreTools.DatFiles/DatFile.cs @@ -469,28 +469,6 @@ namespace SabreTools.DatFiles return false; } - /// - /// Get if a machine contains any writable items - /// - /// DatItems to check - /// True if the machine contains at least one writable item, false otherwise - /// Empty machines are kept with this - protected bool ContainsWritableDB(Dictionary? datItems) - { - // Empty machines are considered writable - if (datItems == null || datItems.Count == 0) - return true; - - foreach (var datItem in datItems) - { - ItemType itemType = datItem.Value.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue(); - if (Array.Exists(SupportedTypes, t => t == itemType)) - return true; - } - - return false; - } - /// /// Resolve name duplicates in an arbitrary set of DatItems based on the supplied information /// diff --git a/SabreTools.DatFiles/Formats/Missfile.cs b/SabreTools.DatFiles/Formats/Missfile.cs index 6e32ba88..05bd1c49 100644 --- a/SabreTools.DatFiles/Formats/Missfile.cs +++ b/SabreTools.DatFiles/Formats/Missfile.cs @@ -123,7 +123,7 @@ namespace SabreTools.DatFiles.Formats { // If this machine doesn't contain any writable items, skip var itemsDict = ItemsDB.GetItemsForBucket(key, filter: true); - if (itemsDict == null || !ContainsWritableDB(itemsDict)) + if (itemsDict == null || !ContainsWritable([.. itemsDict.Values])) continue; // Resolve the names in the block diff --git a/SabreTools.DatFiles/Formats/SabreJSON.cs b/SabreTools.DatFiles/Formats/SabreJSON.cs index 61ba3b32..ef1290dd 100644 --- a/SabreTools.DatFiles/Formats/SabreJSON.cs +++ b/SabreTools.DatFiles/Formats/SabreJSON.cs @@ -479,7 +479,7 @@ namespace SabreTools.DatFiles.Formats { // If this machine doesn't contain any writable items, skip var itemsDict = ItemsDB.GetItemsForBucket(key, filter: true); - if (itemsDict == null || !ContainsWritableDB(itemsDict)) + if (itemsDict == null || !ContainsWritable([.. itemsDict.Values])) continue; // Resolve the names in the block diff --git a/SabreTools.DatFiles/Formats/SabreXML.cs b/SabreTools.DatFiles/Formats/SabreXML.cs index 68b00687..d4086c10 100644 --- a/SabreTools.DatFiles/Formats/SabreXML.cs +++ b/SabreTools.DatFiles/Formats/SabreXML.cs @@ -308,7 +308,7 @@ namespace SabreTools.DatFiles.Formats { // If this machine doesn't contain any writable items, skip var itemsDict = ItemsDB.GetItemsForBucket(key, filter: true); - if (itemsDict == null || !ContainsWritableDB(itemsDict)) + if (itemsDict == null || !ContainsWritable([.. itemsDict.Values])) continue; // Resolve the names in the block