diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo index 27314353..5d1d309c 100644 Binary files a/.vs/Switch_Toolbox/v15/.suo and b/.vs/Switch_Toolbox/v15/.suo differ diff --git a/Switch_FileFormatsMain/FileFormats/Archives/SARC.cs b/Switch_FileFormatsMain/FileFormats/Archives/SARC.cs index 26620dca..e23200fd 100644 --- a/Switch_FileFormatsMain/FileFormats/Archives/SARC.cs +++ b/Switch_FileFormatsMain/FileFormats/Archives/SARC.cs @@ -9,7 +9,7 @@ using Switch_Toolbox.Library; using Switch_Toolbox.Library.IO; using Switch_Toolbox.Library.Forms; -namespace FirstPlugin +namespace FirstPlugin.New { public class SARC : IArchiveFile, IFileFormat { diff --git a/Switch_FileFormatsMain/FileFormats/Archives/SARC_OLD.cs b/Switch_FileFormatsMain/FileFormats/Archives/SARC_OLD.cs index d966f1ee..bf3830b3 100644 --- a/Switch_FileFormatsMain/FileFormats/Archives/SARC_OLD.cs +++ b/Switch_FileFormatsMain/FileFormats/Archives/SARC_OLD.cs @@ -9,7 +9,7 @@ using Switch_Toolbox.Library; using Switch_Toolbox.Library.IO; using Switch_Toolbox.Library.Forms; -namespace FirstPlugin.Old +namespace FirstPlugin { public class SARC : TreeNodeFile, IFileFormat { diff --git a/Switch_FileFormatsMain/FileFormats/Texture/BFLIM.cs b/Switch_FileFormatsMain/FileFormats/Texture/BFLIM.cs index d6e15015..08bd6d93 100644 --- a/Switch_FileFormatsMain/FileFormats/Texture/BFLIM.cs +++ b/Switch_FileFormatsMain/FileFormats/Texture/BFLIM.cs @@ -220,7 +220,7 @@ namespace FirstPlugin { foreach (var file in ((SARC)FileFormat).Files) { - var archiveFile = STFileLoader.OpenFileFormat(file.FileName, new Type[] { typeof(BFLIM) , typeof(SARC) }, file.FileData); + var archiveFile = STFileLoader.OpenFileFormat(file.FullName, new Type[] { typeof(BFLIM) , typeof(SARC) }, file.Data); if (archiveFile == null) continue; diff --git a/Switch_FileFormatsMain/Main.cs b/Switch_FileFormatsMain/Main.cs index 74040bd8..8f218363 100644 --- a/Switch_FileFormatsMain/Main.cs +++ b/Switch_FileFormatsMain/Main.cs @@ -213,10 +213,10 @@ namespace FirstPlugin { foreach (var file in ((SARC)FileFormat).Files) { - string ext = System.IO.Path.GetExtension(file.FileName); + string ext = System.IO.Path.GetExtension(file.FullName); if (ext == ".bfres") { - bfresFiles.Add((BFRES)STFileLoader.OpenFileFormat(file.FileName, file.FileData)); + bfresFiles.Add((BFRES)STFileLoader.OpenFileFormat(file.FullName, file.Data)); } } } diff --git a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache index 1742df6f..44fcfaaf 100644 Binary files a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache index a54e1b1d..0f52d183 100644 Binary files a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache and b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache differ