diff --git a/RombaSharp/RombaSharp.csproj b/RombaSharp/RombaSharp.csproj
index 65970af0..7284cf37 100644
--- a/RombaSharp/RombaSharp.csproj
+++ b/RombaSharp/RombaSharp.csproj
@@ -40,7 +40,6 @@
-
diff --git a/SabreTools.Filtering/Cleaner.cs b/SabreTools.DatTools/Cleaner.cs
similarity index 99%
rename from SabreTools.Filtering/Cleaner.cs
rename to SabreTools.DatTools/Cleaner.cs
index db52661e..dc877800 100644
--- a/SabreTools.Filtering/Cleaner.cs
+++ b/SabreTools.DatTools/Cleaner.cs
@@ -6,7 +6,7 @@ using SabreTools.DatFiles;
using SabreTools.DatItems;
using SabreTools.IO.Logging;
-namespace SabreTools.Filtering
+namespace SabreTools.DatTools
{
///
/// Represents the cleaning operations that need to be performed on a set of items, usually a DAT
diff --git a/SabreTools.DatTools/DatFileTool.cs b/SabreTools.DatTools/DatFileTool.cs
index 4ef7624e..dcbcaf82 100644
--- a/SabreTools.DatTools/DatFileTool.cs
+++ b/SabreTools.DatTools/DatFileTool.cs
@@ -6,7 +6,6 @@ using System.Threading.Tasks;
#endif
using SabreTools.DatFiles;
using SabreTools.DatItems;
-using SabreTools.Filtering;
using SabreTools.IO;
using SabreTools.IO.Logging;
diff --git a/SabreTools.Filtering/ExtraIni.cs b/SabreTools.DatTools/ExtraIni.cs
similarity index 99%
rename from SabreTools.Filtering/ExtraIni.cs
rename to SabreTools.DatTools/ExtraIni.cs
index 335c74e8..e5c9efcf 100644
--- a/SabreTools.Filtering/ExtraIni.cs
+++ b/SabreTools.DatTools/ExtraIni.cs
@@ -5,7 +5,7 @@ using SabreTools.DatFiles;
using SabreTools.DatItems;
using SabreTools.IO.Logging;
-namespace SabreTools.Filtering
+namespace SabreTools.DatTools
{
public class ExtraIni
{
diff --git a/SabreTools.Filtering/Splitter.cs b/SabreTools.DatTools/MergeSplit.cs
similarity index 99%
rename from SabreTools.Filtering/Splitter.cs
rename to SabreTools.DatTools/MergeSplit.cs
index 247de2e1..30268635 100644
--- a/SabreTools.Filtering/Splitter.cs
+++ b/SabreTools.DatTools/MergeSplit.cs
@@ -4,9 +4,9 @@ using SabreTools.DatFiles;
using SabreTools.DatItems;
using SabreTools.IO.Logging;
-namespace SabreTools.Filtering
+namespace SabreTools.DatTools
{
- public class Splitter
+ public class MergeSplit
{
#region Fields
diff --git a/SabreTools.Filtering/Remover.cs b/SabreTools.DatTools/Remover.cs
similarity index 99%
rename from SabreTools.Filtering/Remover.cs
rename to SabreTools.DatTools/Remover.cs
index c36814a4..1c35cc91 100644
--- a/SabreTools.Filtering/Remover.cs
+++ b/SabreTools.DatTools/Remover.cs
@@ -3,7 +3,7 @@ using SabreTools.Core.Filter;
using SabreTools.DatFiles;
using SabreTools.IO.Logging;
-namespace SabreTools.Filtering
+namespace SabreTools.DatTools
{
///
/// Represents the removal operations that need to be performed on a set of items, usually a DAT
diff --git a/SabreTools.Filtering/Replacer.cs b/SabreTools.DatTools/Replacer.cs
similarity index 99%
rename from SabreTools.Filtering/Replacer.cs
rename to SabreTools.DatTools/Replacer.cs
index 86349672..f1d822e4 100644
--- a/SabreTools.Filtering/Replacer.cs
+++ b/SabreTools.DatTools/Replacer.cs
@@ -4,7 +4,7 @@ using SabreTools.Core.Tools;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
-namespace SabreTools.Filtering
+namespace SabreTools.DatTools
{
///
/// Replace fields in DatItems
diff --git a/SabreTools.DatTools/SabreTools.DatTools.csproj b/SabreTools.DatTools/SabreTools.DatTools.csproj
index 9781ea4a..242be84d 100644
--- a/SabreTools.DatTools/SabreTools.DatTools.csproj
+++ b/SabreTools.DatTools/SabreTools.DatTools.csproj
@@ -33,12 +33,15 @@
net6.0;net7.0;net8.0
+
+
+
+
-
diff --git a/SabreTools.Filtering/Setter.cs b/SabreTools.DatTools/Setter.cs
similarity index 99%
rename from SabreTools.Filtering/Setter.cs
rename to SabreTools.DatTools/Setter.cs
index f112de8d..11c8b780 100644
--- a/SabreTools.Filtering/Setter.cs
+++ b/SabreTools.DatTools/Setter.cs
@@ -7,7 +7,7 @@ using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.IO.Logging;
-namespace SabreTools.Filtering
+namespace SabreTools.DatTools
{
///
/// Set fields on DatItems
diff --git a/SabreTools.Filtering/SabreTools.Filtering.csproj b/SabreTools.Filtering/SabreTools.Filtering.csproj
deleted file mode 100644
index 38db434b..00000000
--- a/SabreTools.Filtering/SabreTools.Filtering.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
- net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0
- false
- false
- latest
- enable
- true
- true
- 1.1.2
-
-
- Matt Nadareski
- Copyright (c)2016-2024 Matt Nadareski
- https://github.com/SabreTools/
- https://github.com/SabreTools/SabreTools
- git
-
-
-
-
- win-x86;win-x64
-
-
- win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64
-
-
- win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64
-
-
- net6.0;net7.0;net8.0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/SabreTools.Test/DatFiles/SetterTests.cs b/SabreTools.Test/DatFiles/SetterTests.cs
index e98d6fa0..a14b5630 100644
--- a/SabreTools.Test/DatFiles/SetterTests.cs
+++ b/SabreTools.Test/DatFiles/SetterTests.cs
@@ -1,7 +1,7 @@
using SabreTools.Core.Filter;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
-using SabreTools.Filtering;
+using SabreTools.DatTools;
using Xunit;
namespace SabreTools.Test.DatFiles
diff --git a/SabreTools.Test/Filtering/CleaningTests.cs b/SabreTools.Test/Filtering/CleaningTests.cs
index f8afcd0d..dfa5bd6c 100644
--- a/SabreTools.Test/Filtering/CleaningTests.cs
+++ b/SabreTools.Test/Filtering/CleaningTests.cs
@@ -1,6 +1,6 @@
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
-using SabreTools.Filtering;
+using SabreTools.DatTools;
using Xunit;
namespace SabreTools.Test.Filtering
diff --git a/SabreTools.Test/Filtering/PopulationTests.cs b/SabreTools.Test/Filtering/PopulationTests.cs
index 63710a65..7af18920 100644
--- a/SabreTools.Test/Filtering/PopulationTests.cs
+++ b/SabreTools.Test/Filtering/PopulationTests.cs
@@ -1,5 +1,5 @@
using System.Collections.Generic;
-using SabreTools.Filtering;
+using SabreTools.DatTools;
using Xunit;
namespace SabreTools.Test.Filtering
diff --git a/SabreTools.Test/Filtering/ReplacerTests.cs b/SabreTools.Test/Filtering/ReplacerTests.cs
index f42d6ef0..ea0094ea 100644
--- a/SabreTools.Test/Filtering/ReplacerTests.cs
+++ b/SabreTools.Test/Filtering/ReplacerTests.cs
@@ -1,7 +1,7 @@
using System.Collections.Generic;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
-using SabreTools.Filtering;
+using SabreTools.DatTools;
using Xunit;
namespace SabreTools.Test.Filtering
diff --git a/SabreTools.Test/SabreTools.Test.csproj b/SabreTools.Test/SabreTools.Test.csproj
index 9ab26fb3..066db682 100644
--- a/SabreTools.Test/SabreTools.Test.csproj
+++ b/SabreTools.Test/SabreTools.Test.csproj
@@ -13,7 +13,6 @@
-
diff --git a/SabreTools.sln b/SabreTools.sln
index d3f0f9f7..e77e153d 100644
--- a/SabreTools.sln
+++ b/SabreTools.sln
@@ -20,8 +20,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SabreTools.Core", "SabreToo
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SabreTools.Help", "SabreTools.Help\SabreTools.Help.csproj", "{55364167-844F-4B58-8280-F5327FA3D8E7}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SabreTools.Filtering", "SabreTools.Filtering\SabreTools.Filtering.csproj", "{35129634-0F13-416A-8D4D-35B71DFECFFD}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SabreTools.FileTypes", "SabreTools.FileTypes\SabreTools.FileTypes.csproj", "{0B36F39B-69CB-4E8A-B251-D063CB08B247}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SabreTools.DatItems", "SabreTools.DatItems\SabreTools.DatItems.csproj", "{90ADE461-33B1-4E0D-925F-C99913665F0C}"
@@ -80,14 +78,6 @@ Global
{55364167-844F-4B58-8280-F5327FA3D8E7}.Release|Any CPU.Build.0 = Release|Any CPU
{55364167-844F-4B58-8280-F5327FA3D8E7}.Release|x64.ActiveCfg = Release|Any CPU
{55364167-844F-4B58-8280-F5327FA3D8E7}.Release|x64.Build.0 = Release|Any CPU
- {35129634-0F13-416A-8D4D-35B71DFECFFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {35129634-0F13-416A-8D4D-35B71DFECFFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {35129634-0F13-416A-8D4D-35B71DFECFFD}.Debug|x64.ActiveCfg = Debug|Any CPU
- {35129634-0F13-416A-8D4D-35B71DFECFFD}.Debug|x64.Build.0 = Debug|Any CPU
- {35129634-0F13-416A-8D4D-35B71DFECFFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {35129634-0F13-416A-8D4D-35B71DFECFFD}.Release|Any CPU.Build.0 = Release|Any CPU
- {35129634-0F13-416A-8D4D-35B71DFECFFD}.Release|x64.ActiveCfg = Release|Any CPU
- {35129634-0F13-416A-8D4D-35B71DFECFFD}.Release|x64.Build.0 = Release|Any CPU
{0B36F39B-69CB-4E8A-B251-D063CB08B247}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0B36F39B-69CB-4E8A-B251-D063CB08B247}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0B36F39B-69CB-4E8A-B251-D063CB08B247}.Debug|x64.ActiveCfg = Debug|Any CPU
diff --git a/SabreTools/Features/BaseFeature.cs b/SabreTools/Features/BaseFeature.cs
index ef64507c..961a57f1 100644
--- a/SabreTools/Features/BaseFeature.cs
+++ b/SabreTools/Features/BaseFeature.cs
@@ -5,7 +5,6 @@ using SabreTools.Core.Tools;
using SabreTools.DatFiles;
using SabreTools.DatTools;
using SabreTools.FileTypes;
-using SabreTools.Filtering;
using SabreTools.Hashing;
using SabreTools.Help;
using SabreTools.IO.Logging;
@@ -1792,7 +1791,7 @@ Some special strings that can be used:
///
/// Pre-configured Splitter
///
- protected Filtering.Splitter? Splitter { get; set; }
+ protected MergeSplit? Splitter { get; set; }
#endregion
@@ -2252,9 +2251,9 @@ Some special strings that can be used:
///
/// Get Splitter from feature list
///
- private static Filtering.Splitter GetSplitter(Dictionary features)
+ private static MergeSplit GetSplitter(Dictionary features)
{
- Filtering.Splitter splitter = new()
+ MergeSplit splitter = new()
{
SplitType = GetSplitType(features),
};
diff --git a/SabreTools/Features/Batch.cs b/SabreTools/Features/Batch.cs
index e7c93aee..9dcf373a 100644
--- a/SabreTools/Features/Batch.cs
+++ b/SabreTools/Features/Batch.cs
@@ -7,7 +7,6 @@ using SabreTools.Core.Filter;
using SabreTools.Core.Tools;
using SabreTools.DatFiles;
using SabreTools.DatTools;
-using SabreTools.Filtering;
using SabreTools.Hashing;
using SabreTools.Help;
using SabreTools.IO;
@@ -583,7 +582,7 @@ Reset the internal state: reset();";
MergingFlag mergingFlag = Arguments[0].AsEnumValue();
// Apply the merging flag
- Filtering.Splitter splitter = new() { SplitType = mergingFlag };
+ MergeSplit splitter = new() { SplitType = mergingFlag };
splitter.ApplySplitting(batchState.DatFile, false, false);
}
}
diff --git a/SabreTools/SabreTools.csproj b/SabreTools/SabreTools.csproj
index cdf92a55..8f03d1ef 100644
--- a/SabreTools/SabreTools.csproj
+++ b/SabreTools/SabreTools.csproj
@@ -38,7 +38,6 @@
-