SplitTools Cleanup (#280)

* SplitTools Cleanup * Remove SACompGC DLLs * Remove SACompGC BuildEvent
X-Hax · Dec 19, 2024 · 74ba563 · 74ba563
1 parent 3181292
commit 74ba563
Show file tree

Hide file tree

Showing 58 changed files with 1,007 additions and 510 deletions.
diff --git a/CommandLine/AnimJSONConverter/AnimJSONConverter.csproj b/CommandLine/AnimJSONConverter/AnimJSONConverter.csproj
@@ -9,7 +9,6 @@
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
 		<DebugType>embedded</DebugType>
-		<Platforms>x64;x86</Platforms>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\Libraries\SAModel\SAModel.csproj" />

diff --git a/CommandLine/ArchiveTool/ArchiveTool.csproj b/CommandLine/ArchiveTool/ArchiveTool.csproj
@@ -7,7 +7,6 @@
 		<DebugType>embedded</DebugType>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-		<Platforms>x64;x86</Platforms>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\Libraries\ArchiveLib\ArchiveLib.csproj" />

diff --git a/CommandLine/BuildEvent/BuildEvent.csproj b/CommandLine/BuildEvent/BuildEvent.csproj
@@ -7,7 +7,6 @@
 		<DebugType>embedded</DebugType>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-		<Platforms>x64;x86</Platforms>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\Libraries\FraGag.Compression.Prs\FraGag.Compression.Prs.csproj" />

diff --git a/CommandLine/BuildMDL/BuildMDL.csproj b/CommandLine/BuildMDL/BuildMDL.csproj
@@ -7,7 +7,6 @@
 		<DebugType>embedded</DebugType>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-		<Platforms>x64;x86</Platforms>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\Libraries\FraGag.Compression.Prs\FraGag.Compression.Prs.csproj" />

diff --git a/CommandLine/BuildMTN/BuildMTN.csproj b/CommandLine/BuildMTN/BuildMTN.csproj
@@ -7,7 +7,6 @@
 		<DebugType>embedded</DebugType>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-		<Platforms>x64;x86</Platforms>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\Libraries\FraGag.Compression.Prs\FraGag.Compression.Prs.csproj" />

diff --git a/CommandLine/BuildShapeMotion/BuildShapeMotion.csproj b/CommandLine/BuildShapeMotion/BuildShapeMotion.csproj
@@ -7,7 +7,6 @@
 		<DebugType>embedded</DebugType>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-		<Platforms>x64;x86</Platforms>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\Libraries\SplitTools\SplitTools.csproj" />

diff --git a/CommandLine/LevelConverter/LevelConverter.csproj b/CommandLine/LevelConverter/LevelConverter.csproj
@@ -7,7 +7,6 @@
 		<DebugType>embedded</DebugType>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-		<Platforms>x64;x86</Platforms>
 	</PropertyGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\..\Libraries\SAEditorCommon\SAEditorCommon.csproj" />

diff --git a/CommandLine/ModelConverter/ModelConverter.csproj b/CommandLine/ModelConverter/ModelConverter.csproj
@@ -7,7 +7,6 @@
 		<DebugType>embedded</DebugType>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-		<Platforms>x64;x86</Platforms>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\Libraries\SAEditorCommon\SAEditorCommon.csproj" />

diff --git a/CommandLine/ModelFixes/ModelFixes.csproj b/CommandLine/ModelFixes/ModelFixes.csproj
@@ -7,7 +7,6 @@
 		<DebugType>embedded</DebugType>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-		<Platforms>x64;x86</Platforms>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\Libraries\SAModel\SAModel.csproj" />

diff --git a/CommandLine/ModelRelabeler/ModelRelabeler.csproj b/CommandLine/ModelRelabeler/ModelRelabeler.csproj
@@ -7,7 +7,6 @@
 		<DebugType>embedded</DebugType>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-		<Platforms>x64;x86</Platforms>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\Libraries\SAModel\SAModel.csproj" />

diff --git a/CommandLine/OptimizeAnim/OptimizeAnim.csproj b/CommandLine/OptimizeAnim/OptimizeAnim.csproj
@@ -9,7 +9,6 @@
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
 		<DebugType>embedded</DebugType>
-		<Platforms>x64;x86</Platforms>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\Libraries\SAModel\SAModel.csproj" />

diff --git a/CommandLine/PAKtool/PAKtool.csproj b/CommandLine/PAKtool/PAKtool.csproj
@@ -7,7 +7,6 @@
    <DebugType>embedded</DebugType>
 <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-   <Platforms>x64;x86</Platforms>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Libraries\ArchiveLib\ArchiveLib.csproj" />

diff --git a/CommandLine/SplitShapeMotion/SplitShapeMotion.csproj b/CommandLine/SplitShapeMotion/SplitShapeMotion.csproj
@@ -7,7 +7,6 @@
 		<DebugType>embedded</DebugType>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-		<Platforms>x64;x86</Platforms>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\Libraries\SplitTools\SplitTools.csproj" />

diff --git a/CommandLine/TextureRemap/TextureRemap.csproj b/CommandLine/TextureRemap/TextureRemap.csproj
@@ -7,7 +7,6 @@
 		<DebugType>embedded</DebugType>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-		<Platforms>x64;x86</Platforms>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\Libraries\SAModel\SAModel.csproj" />

diff --git a/CommandLine/WeldConverter/WeldConverter.csproj b/CommandLine/WeldConverter/WeldConverter.csproj
@@ -8,7 +8,6 @@
     <DebugType>embedded</DebugType>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-    <Platforms>x64;x86</Platforms>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/CommandLine/buildSATools/buildSATools.csproj b/CommandLine/buildSATools/buildSATools.csproj
@@ -7,6 +7,5 @@
 		<DebugType>embedded</DebugType>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-		<Platforms>x64;x86</Platforms>
 	</PropertyGroup>
 </Project>
diff --git a/CommandLine/split/split.csproj b/CommandLine/split/split.csproj
@@ -8,7 +8,6 @@
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
 		<DebugType>embedded</DebugType>
-		<Platforms>x64;x86</Platforms>
 	</PropertyGroup>
 	<ItemGroup>
 	  <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />

diff --git a/CommandLine/splitEvent/Program.cs b/CommandLine/splitEvent/Program.cs
@@ -7,23 +7,14 @@ namespace splitEvent
 {
 	static class Program
 	{
-		public class Wildcard : Regex
+		private class Wildcard : Regex
 		{
-			/// <summary>
-			/// Initializes a wildcard with the given search pattern.
-			/// </summary>
-			/// <param name="pattern">The wildcard pattern to match.</param>
-			public Wildcard(string pattern)
-			 : base(WildcardToRegex(pattern))
-			{
-			}
-
 			/// <summary>
 			/// Initializes a wildcard with the given search pattern and options.
 			/// </summary>
 			/// <param name="pattern">The wildcard pattern to match.</param>
 			/// <param name="options">A combination of one or more
-			/// <see cref="System.Text.RegexOptions"/>.</param>
+			/// <see cref="System.Text.RegularExpressions.RegexOptions"/>.</param>
 			public Wildcard(string pattern, RegexOptions options)
 			 : base(WildcardToRegex(pattern), options)
 			{
@@ -45,19 +36,23 @@ static void Main(string[] args)
 		{
 			string fullpath_out;
 			string fullpath_bin;
+
 			if (args.Length == 0)
 			{
 				Console.Write("Filename: ");
-				args = new string[] { Console.ReadLine().Trim('"') };
+				args = [Console.ReadLine().Trim('"')];
 			}
+
 			fullpath_bin = Path.GetFullPath(args[0]);
 			string name = Path.GetFileName(fullpath_bin);
+
 			Wildcard evwcard = new Wildcard("e*", RegexOptions.IgnoreCase);
 			Wildcard mevwcard = new Wildcard("me*", RegexOptions.IgnoreCase);
 			Wildcard evxwcard = new Wildcard("e*_*", RegexOptions.IgnoreCase);
 			Wildcard mevxwcard = new Wildcard("me*_*", RegexOptions.IgnoreCase);
 			Wildcard exfwcard = new Wildcard("e*_*.*", RegexOptions.IgnoreCase);
 			Wildcard mexfwcard = new Wildcard("me*_*.*", RegexOptions.IgnoreCase);
+
 			if (!name.EndsWith("texlist.prs", StringComparison.OrdinalIgnoreCase))
 			{
 				if (mevwcard.IsMatch(name))
@@ -111,22 +106,40 @@ static void Main(string[] args)
 			if (args.Length > 1)
 			{
 				fullpath_out = args[1];
-				if (fullpath_out[fullpath_out.Length - 1] != '/') fullpath_out = string.Concat(fullpath_out, '/');
+				if (fullpath_out[fullpath_out.Length - 1] != '/')
+				{
+					fullpath_out = string.Concat(fullpath_out, '/');
+				}
+
 				fullpath_out = Path.GetFullPath(fullpath_out);
 			}
+
 			Console.WriteLine("Output folder: {0}", fullpath_out);
+
 			if (name.Contains("tailsplain", StringComparison.OrdinalIgnoreCase))
+			{
 				sa2EventTailsPlane.Split(fullpath_bin, fullpath_out);
+			}
 			else if (name.EndsWith("texlist.prs", StringComparison.OrdinalIgnoreCase))
+			{
 				SA2Event.SplitExternalTexList(fullpath_bin, fullpath_out);
+			}
 			else if (mexfwcard.IsMatch(name))
+			{
 				sa2EventExtra.SplitMini(fullpath_bin, fullpath_out);
+			}
 			else if (exfwcard.IsMatch(name))
+			{
 				sa2EventExtra.Split(fullpath_bin, fullpath_out);
+			}
 			else if (name.StartsWith("me", StringComparison.OrdinalIgnoreCase))
+			{
 				SA2MiniEvent.Split(fullpath_bin, fullpath_out);
+			}
 			else
+			{
 				SA2Event.Split(fullpath_bin, fullpath_out);
+			}
 		}
 	}
 }
diff --git a/CommandLine/splitEvent/splitEvent.csproj b/CommandLine/splitEvent/splitEvent.csproj
@@ -7,7 +7,6 @@
 		<DebugType>embedded</DebugType>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-		<Platforms>x64;x86</Platforms>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\Libraries\FraGag.Compression.Prs\FraGag.Compression.Prs.csproj" />

diff --git a/CommandLine/splitMDL/splitMDL.csproj b/CommandLine/splitMDL/splitMDL.csproj
@@ -9,7 +9,6 @@
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
 		<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
 		<DebugType>embedded</DebugType>
-		<Platforms>x64;x86</Platforms>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\Libraries\FraGag.Compression.Prs\FraGag.Compression.Prs.csproj" />

diff --git a/CommandLine/splitMTN/Program.cs b/CommandLine/splitMTN/Program.cs
@@ -4,24 +4,26 @@
 
 namespace splitMTN
 {
-	class Program
+	internal static class Program
 	{
-		static void Main(string[] args)
+		private static void Main(string[] args)
 		{
-			Queue<string> argq = new Queue<string>(args);
+			var argQueue = new Queue<string>(args);
+
 			string filename;
-			if (argq.Count > 0)
+
+			if (argQueue.Count > 0)
 			{
-				filename = argq.Dequeue();
+				filename = argQueue.Dequeue();
 				Console.WriteLine("File: {0}", filename);
-				SA2MTN.Split(filename);
 			}
 			else
 			{
 				Console.Write("File: ");
 				filename = Console.ReadLine();
-				SA2MTN.Split(filename);
 			}
+
+			SA2MTN.Split(filename);
 		}
 	}
 }
diff --git a/CommandLine/splitMTN/splitMTN.csproj b/CommandLine/splitMTN/splitMTN.csproj
@@ -7,7 +7,6 @@
 		<DebugType>embedded</DebugType>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-		<Platforms>x64;x86</Platforms>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\Libraries\FraGag.Compression.Prs\FraGag.Compression.Prs.csproj" />

diff --git a/DataToolbox/DataToolbox.csproj b/DataToolbox/DataToolbox.csproj
@@ -8,7 +8,6 @@
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
 		<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
 		<DebugType>embedded</DebugType>
-		<Platforms>x64;x86</Platforms>
 		<ApplicationIcon>datatoolbox.ico</ApplicationIcon>
 	</PropertyGroup>
 	<ItemGroup>

diff --git a/Dependencies/SACompGC_x64.dll b/Dependencies/SACompGC_x64.dll
diff --git a/Dependencies/SACompGC_x86.dll b/Dependencies/SACompGC_x86.dll
diff --git a/Libraries/ArchiveLib/ArchiveLib.csproj b/Libraries/ArchiveLib/ArchiveLib.csproj
@@ -8,7 +8,6 @@
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
 		<DebugType>embedded</DebugType>
-		<Platforms>x64;x86</Platforms>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\SplitTools\SplitTools.csproj" />

diff --git a/Libraries/FraGag.Compression.Prs/FraGag.Compression.Prs.csproj b/Libraries/FraGag.Compression.Prs/FraGag.Compression.Prs.csproj
@@ -7,6 +7,5 @@
 		<DebugType>embedded</DebugType>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-		<Platforms>x64;x86</Platforms>
 	</PropertyGroup>
 </Project>
diff --git a/Libraries/NvTriStripDotNet/NvTriStripDotNet.csproj b/Libraries/NvTriStripDotNet/NvTriStripDotNet.csproj
@@ -7,7 +7,6 @@
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<Platforms>x64;x86</Platforms>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />

diff --git a/Libraries/SAEditorCommon/SAEditorCommon.csproj b/Libraries/SAEditorCommon/SAEditorCommon.csproj
@@ -9,7 +9,6 @@
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
 		<DebugType>embedded</DebugType>
-		<Platforms>x64;x86</Platforms>
 	</PropertyGroup>
 	<ItemGroup>
 		<Compile Update="UI\GCMaterialEditor.cs">

diff --git a/Libraries/SAModel.Direct3D/SAModel.Direct3D.csproj b/Libraries/SAModel.Direct3D/SAModel.Direct3D.csproj
@@ -8,7 +8,6 @@
 		<DebugType>embedded</DebugType>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-		<Platforms>x64;x86</Platforms>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\ArchiveLib\ArchiveLib.csproj" />

diff --git a/Libraries/SAModel/SAModel.csproj b/Libraries/SAModel/SAModel.csproj
@@ -1,14 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-
 		<TargetFramework>net8.0-windows7.0</TargetFramework>
 		<OutputType>Library</OutputType>
 		<UseWindowsForms>true</UseWindowsForms>
 		<OutputPath>..\..\build\lib\</OutputPath>
 		<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-		<Platforms>x64;x86</Platforms>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />