From a1a3adfafae95e241a017fccc4d3fb52e47225af Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Thu, 8 Dec 2022 22:50:42 -0800 Subject: [PATCH] Move `psxt001z` to own library --- BurnOutSharp.sln | 8 ++++++- BurnOutSharp/BurnOutSharp.csproj | 1 + BurnOutSharp/External/README.MD | 1 - README.md | 2 +- .../External/psxt001z => psxt001z}/CRC16.cs | 0 .../External/psxt001z => psxt001z}/CRC32.cs | 0 .../External/psxt001z => psxt001z}/Common.cs | 0 .../psxt001z => psxt001z}/FileTools.cs | 0 .../psxt001z => psxt001z}/Functions.cs | 0 .../External/psxt001z => psxt001z}/Info.cs | 0 psxt001z/LICENSE.md | 20 ++++++++++++++++ .../psxt001z => psxt001z}/LibCrypt.cs | 0 .../External/psxt001z => psxt001z}/Main.cs | 0 .../psxt001z => psxt001z}/Scramble.cs | 0 .../External/psxt001z => psxt001z}/Track.cs | 0 psxt001z/psxt001z.csproj | 23 +++++++++++++++++++ 16 files changed, 52 insertions(+), 3 deletions(-) rename {BurnOutSharp/External/psxt001z => psxt001z}/CRC16.cs (100%) rename {BurnOutSharp/External/psxt001z => psxt001z}/CRC32.cs (100%) rename {BurnOutSharp/External/psxt001z => psxt001z}/Common.cs (100%) rename {BurnOutSharp/External/psxt001z => psxt001z}/FileTools.cs (100%) rename {BurnOutSharp/External/psxt001z => psxt001z}/Functions.cs (100%) rename {BurnOutSharp/External/psxt001z => psxt001z}/Info.cs (100%) create mode 100644 psxt001z/LICENSE.md rename {BurnOutSharp/External/psxt001z => psxt001z}/LibCrypt.cs (100%) rename {BurnOutSharp/External/psxt001z => psxt001z}/Main.cs (100%) rename {BurnOutSharp/External/psxt001z => psxt001z}/Scramble.cs (100%) rename {BurnOutSharp/External/psxt001z => psxt001z}/Track.cs (100%) create mode 100644 psxt001z/psxt001z.csproj diff --git a/BurnOutSharp.sln b/BurnOutSharp.sln index 2fe0f0a6..aafd7199 100644 --- a/BurnOutSharp.sln +++ b/BurnOutSharp.sln @@ -30,7 +30,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExecutableTest", "Executabl EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BurnOutSharp.Wrappers", "BurnOutSharp.Wrappers\BurnOutSharp.Wrappers.csproj", "{35BD489F-E58D-45DD-9929-DC4B32414750}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BurnOutSharp.Matching", "BurnOutSharp.Matching\BurnOutSharp.Matching.csproj", "{563BC37B-8E02-4178-B6FE-F3F6F65E0096}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BurnOutSharp.Matching", "BurnOutSharp.Matching\BurnOutSharp.Matching.csproj", "{563BC37B-8E02-4178-B6FE-F3F6F65E0096}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "psxt001z", "psxt001z\psxt001z.csproj", "{D9574B47-0D6B-445A-97BF-272B5EF9AD3F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -82,6 +84,10 @@ Global {563BC37B-8E02-4178-B6FE-F3F6F65E0096}.Debug|Any CPU.Build.0 = Debug|Any CPU {563BC37B-8E02-4178-B6FE-F3F6F65E0096}.Release|Any CPU.ActiveCfg = Release|Any CPU {563BC37B-8E02-4178-B6FE-F3F6F65E0096}.Release|Any CPU.Build.0 = Release|Any CPU + {D9574B47-0D6B-445A-97BF-272B5EF9AD3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D9574B47-0D6B-445A-97BF-272B5EF9AD3F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D9574B47-0D6B-445A-97BF-272B5EF9AD3F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D9574B47-0D6B-445A-97BF-272B5EF9AD3F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/BurnOutSharp/BurnOutSharp.csproj b/BurnOutSharp/BurnOutSharp.csproj index b362b40d..4b612bc0 100644 --- a/BurnOutSharp/BurnOutSharp.csproj +++ b/BurnOutSharp/BurnOutSharp.csproj @@ -76,6 +76,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all + diff --git a/BurnOutSharp/External/README.MD b/BurnOutSharp/External/README.MD index bd6aed86..3a7046f5 100644 --- a/BurnOutSharp/External/README.MD +++ b/BurnOutSharp/External/README.MD @@ -4,5 +4,4 @@ This directory contains multiple external libraries. Here is the status of each: | Directory | Library | Status | | --------- | ------- | ------ | -| psxt001z | [psxt001z](https://github.com/Dremora/psxt001z) | 90% ported to C#, device reading disabled | | stormlibsharp | [stormlibsharp](https://github.com/robpaveza/stormlibsharp) | External submodule | \ No newline at end of file diff --git a/README.md b/README.md index effd48b2..432c4824 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ In addition to the original BurnOut code, the following libraries (or ports ther - [HLLibSharp](https://github.com/mnadareski/HLLibSharp) - Various Valve archive format extraction - [LibMSPackSharp](https://github.com/mnadareski/LibMSPackSharp) - Microsoft CAB extraction [Currently unused] - [openmcdf](https://github.com/ironfede/openmcdf) - MSI extraction -- [psxt001z](https://github.com/Dremora/psxt001z) - PS1 LibCrypt detection +- [psxt001z](https://github.com/Dremora/psxt001z) - PS1 LibCrypt detection [Ported to C#] - [SharpCompress](https://github.com/adamhathcock/sharpcompress) - 7zip/GZip/RAR/PKZIP extraction - [StormLibSharp](https://github.com/robpaveza/stormlibsharp) - MPQ extraction - [UnshieldSharp](https://github.com/mnadareski/UnshieldSharp) - InstallShield CAB extraction diff --git a/BurnOutSharp/External/psxt001z/CRC16.cs b/psxt001z/CRC16.cs similarity index 100% rename from BurnOutSharp/External/psxt001z/CRC16.cs rename to psxt001z/CRC16.cs diff --git a/BurnOutSharp/External/psxt001z/CRC32.cs b/psxt001z/CRC32.cs similarity index 100% rename from BurnOutSharp/External/psxt001z/CRC32.cs rename to psxt001z/CRC32.cs diff --git a/BurnOutSharp/External/psxt001z/Common.cs b/psxt001z/Common.cs similarity index 100% rename from BurnOutSharp/External/psxt001z/Common.cs rename to psxt001z/Common.cs diff --git a/BurnOutSharp/External/psxt001z/FileTools.cs b/psxt001z/FileTools.cs similarity index 100% rename from BurnOutSharp/External/psxt001z/FileTools.cs rename to psxt001z/FileTools.cs diff --git a/BurnOutSharp/External/psxt001z/Functions.cs b/psxt001z/Functions.cs similarity index 100% rename from BurnOutSharp/External/psxt001z/Functions.cs rename to psxt001z/Functions.cs diff --git a/BurnOutSharp/External/psxt001z/Info.cs b/psxt001z/Info.cs similarity index 100% rename from BurnOutSharp/External/psxt001z/Info.cs rename to psxt001z/Info.cs diff --git a/psxt001z/LICENSE.md b/psxt001z/LICENSE.md new file mode 100644 index 00000000..855d1503 --- /dev/null +++ b/psxt001z/LICENSE.md @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2005-2013 Kirill Korolyov + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/BurnOutSharp/External/psxt001z/LibCrypt.cs b/psxt001z/LibCrypt.cs similarity index 100% rename from BurnOutSharp/External/psxt001z/LibCrypt.cs rename to psxt001z/LibCrypt.cs diff --git a/BurnOutSharp/External/psxt001z/Main.cs b/psxt001z/Main.cs similarity index 100% rename from BurnOutSharp/External/psxt001z/Main.cs rename to psxt001z/Main.cs diff --git a/BurnOutSharp/External/psxt001z/Scramble.cs b/psxt001z/Scramble.cs similarity index 100% rename from BurnOutSharp/External/psxt001z/Scramble.cs rename to psxt001z/Scramble.cs diff --git a/BurnOutSharp/External/psxt001z/Track.cs b/psxt001z/Track.cs similarity index 100% rename from BurnOutSharp/External/psxt001z/Track.cs rename to psxt001z/Track.cs diff --git a/psxt001z/psxt001z.csproj b/psxt001z/psxt001z.csproj new file mode 100644 index 00000000..f7ea4c59 --- /dev/null +++ b/psxt001z/psxt001z.csproj @@ -0,0 +1,23 @@ + + + + netstandard2.0;net6.0 + psxt001z + psxt001z + Matt Nadareski;Dremora + BurnOutSharp + Copyright (c)2013 Dremora, Copyright (c)2018-2022 Matt Nadareski + LICENSE.md + https://github.com/mnadareski/BurnOutSharp + 0.21-beta1 + 0.21.1 + 0.21.1 + true + true + + + + true + + +