diff --git a/README.MD b/README.MD index 865e470a..87f2c784 100644 --- a/README.MD +++ b/README.MD @@ -98,8 +98,8 @@ Below is a table representing the various non-conversion interfaces that are imp | Interface Name | Purpose | | --- | --- | +| `SabreTools.Data.Printers.IPrinter` | Provides a formatted output for a model | | `SabreTools.Serialization.Interfaces.IExtractable` | Marks a wrapper as able to be extracted | -| `SabreTools.Serialization.Interfaces.IPrinter` | Provides a formatted output for a model | | `SabreTools.Serialization.Interfaces.IWrapper` / `SabreTools.Serialization.Interfaces.IWrapper` | Wraps a model or set of models to provide additional functionality | ## Namespaces diff --git a/SabreTools.Serialization/Printers/AACSMediaKeyBlock.cs b/SabreTools.Serialization/Printers/AACSMediaKeyBlock.cs index f1c50def..689023a2 100644 --- a/SabreTools.Serialization/Printers/AACSMediaKeyBlock.cs +++ b/SabreTools.Serialization/Printers/AACSMediaKeyBlock.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.AACS; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/BDPlusSVM.cs b/SabreTools.Serialization/Printers/BDPlusSVM.cs index b8ca8143..bc41d332 100644 --- a/SabreTools.Serialization/Printers/BDPlusSVM.cs +++ b/SabreTools.Serialization/Printers/BDPlusSVM.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.BDPlus; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/BFPK.cs b/SabreTools.Serialization/Printers/BFPK.cs index 49d0c5fa..5880e877 100644 --- a/SabreTools.Serialization/Printers/BFPK.cs +++ b/SabreTools.Serialization/Printers/BFPK.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.BFPK; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/BSP.cs b/SabreTools.Serialization/Printers/BSP.cs index 35f63f4a..52997990 100644 --- a/SabreTools.Serialization/Printers/BSP.cs +++ b/SabreTools.Serialization/Printers/BSP.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.BSP; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/CFB.cs b/SabreTools.Serialization/Printers/CFB.cs index d36aa920..23714e9f 100644 --- a/SabreTools.Serialization/Printers/CFB.cs +++ b/SabreTools.Serialization/Printers/CFB.cs @@ -1,7 +1,6 @@ using System; using System.Text; using SabreTools.Data.Models.CFB; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/CHD.cs b/SabreTools.Serialization/Printers/CHD.cs index dce5c686..49b4b1b3 100644 --- a/SabreTools.Serialization/Printers/CHD.cs +++ b/SabreTools.Serialization/Printers/CHD.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.Text; using SabreTools.Data.Models.CHD; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/CIA.cs b/SabreTools.Serialization/Printers/CIA.cs index f36d8d2d..76020192 100644 --- a/SabreTools.Serialization/Printers/CIA.cs +++ b/SabreTools.Serialization/Printers/CIA.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.N3DS; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/GCF.cs b/SabreTools.Serialization/Printers/GCF.cs index 56c2dae6..dff703c9 100644 --- a/SabreTools.Serialization/Printers/GCF.cs +++ b/SabreTools.Serialization/Printers/GCF.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Text; using SabreTools.Data.Models.GCF; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/GZip.cs b/SabreTools.Serialization/Printers/GZip.cs index a0348913..dc88d071 100644 --- a/SabreTools.Serialization/Printers/GZip.cs +++ b/SabreTools.Serialization/Printers/GZip.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.GZIP; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Interfaces/IPrinter.cs b/SabreTools.Serialization/Printers/IPrinter.cs similarity index 92% rename from SabreTools.Serialization/Interfaces/IPrinter.cs rename to SabreTools.Serialization/Printers/IPrinter.cs index df3ed88f..631d7e04 100644 --- a/SabreTools.Serialization/Interfaces/IPrinter.cs +++ b/SabreTools.Serialization/Printers/IPrinter.cs @@ -1,6 +1,6 @@ using System.Text; -namespace SabreTools.Serialization.Interfaces +namespace SabreTools.Data.Printers { /// /// Marks a class as a printer associated with a model diff --git a/SabreTools.Serialization/Printers/IRD.cs b/SabreTools.Serialization/Printers/IRD.cs index 03a038dd..cffb4b61 100644 --- a/SabreTools.Serialization/Printers/IRD.cs +++ b/SabreTools.Serialization/Printers/IRD.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.IRD; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/InstallShieldArchiveV3.cs b/SabreTools.Serialization/Printers/InstallShieldArchiveV3.cs index 000b1cc0..e0222049 100644 --- a/SabreTools.Serialization/Printers/InstallShieldArchiveV3.cs +++ b/SabreTools.Serialization/Printers/InstallShieldArchiveV3.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.InstallShieldArchiveV3; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/InstallShieldCabinet.cs b/SabreTools.Serialization/Printers/InstallShieldCabinet.cs index 270b330c..221c8510 100644 --- a/SabreTools.Serialization/Printers/InstallShieldCabinet.cs +++ b/SabreTools.Serialization/Printers/InstallShieldCabinet.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Text; using SabreTools.Data.Models.InstallShieldCabinet; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/LZKWAJ.cs b/SabreTools.Serialization/Printers/LZKWAJ.cs index a73f7f3f..eed019f4 100644 --- a/SabreTools.Serialization/Printers/LZKWAJ.cs +++ b/SabreTools.Serialization/Printers/LZKWAJ.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.LZ; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/LZQBasic.cs b/SabreTools.Serialization/Printers/LZQBasic.cs index 3a7e9a17..dc7df664 100644 --- a/SabreTools.Serialization/Printers/LZQBasic.cs +++ b/SabreTools.Serialization/Printers/LZQBasic.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.LZ; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/LZSZDD.cs b/SabreTools.Serialization/Printers/LZSZDD.cs index ebc3f193..298bc2a4 100644 --- a/SabreTools.Serialization/Printers/LZSZDD.cs +++ b/SabreTools.Serialization/Printers/LZSZDD.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.LZ; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/LinearExecutable.cs b/SabreTools.Serialization/Printers/LinearExecutable.cs index ce00adc1..309b87b7 100644 --- a/SabreTools.Serialization/Printers/LinearExecutable.cs +++ b/SabreTools.Serialization/Printers/LinearExecutable.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.LinearExecutable; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/MSDOS.cs b/SabreTools.Serialization/Printers/MSDOS.cs index ed424963..c04747b0 100644 --- a/SabreTools.Serialization/Printers/MSDOS.cs +++ b/SabreTools.Serialization/Printers/MSDOS.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.MSDOS; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/MicrosoftCabinet.cs b/SabreTools.Serialization/Printers/MicrosoftCabinet.cs index 59ec4df6..d3ea45d8 100644 --- a/SabreTools.Serialization/Printers/MicrosoftCabinet.cs +++ b/SabreTools.Serialization/Printers/MicrosoftCabinet.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.MicrosoftCabinet; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/MoPaQ.cs b/SabreTools.Serialization/Printers/MoPaQ.cs index cd254958..6e78296d 100644 --- a/SabreTools.Serialization/Printers/MoPaQ.cs +++ b/SabreTools.Serialization/Printers/MoPaQ.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.MoPaQ; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/N3DS.cs b/SabreTools.Serialization/Printers/N3DS.cs index 228ad916..18463152 100644 --- a/SabreTools.Serialization/Printers/N3DS.cs +++ b/SabreTools.Serialization/Printers/N3DS.cs @@ -1,7 +1,6 @@ using System; using System.Text; using SabreTools.Data.Models.N3DS; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/NCF.cs b/SabreTools.Serialization/Printers/NCF.cs index 4c6f2c09..b664dbdb 100644 --- a/SabreTools.Serialization/Printers/NCF.cs +++ b/SabreTools.Serialization/Printers/NCF.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Text; using SabreTools.Data.Models.NCF; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/NewExecutable.cs b/SabreTools.Serialization/Printers/NewExecutable.cs index 52e45143..943646dd 100644 --- a/SabreTools.Serialization/Printers/NewExecutable.cs +++ b/SabreTools.Serialization/Printers/NewExecutable.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.NewExecutable; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/Nitro.cs b/SabreTools.Serialization/Printers/Nitro.cs index 9baadcd4..fbf37801 100644 --- a/SabreTools.Serialization/Printers/Nitro.cs +++ b/SabreTools.Serialization/Printers/Nitro.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.Nitro; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/PAK.cs b/SabreTools.Serialization/Printers/PAK.cs index 9b30d13d..7e3e5538 100644 --- a/SabreTools.Serialization/Printers/PAK.cs +++ b/SabreTools.Serialization/Printers/PAK.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.PAK; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/PFF.cs b/SabreTools.Serialization/Printers/PFF.cs index c39f355d..4fc83d8d 100644 --- a/SabreTools.Serialization/Printers/PFF.cs +++ b/SabreTools.Serialization/Printers/PFF.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.PFF; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/PIC.cs b/SabreTools.Serialization/Printers/PIC.cs index de990a73..8c3e5584 100644 --- a/SabreTools.Serialization/Printers/PIC.cs +++ b/SabreTools.Serialization/Printers/PIC.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.PIC; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/PKZIP.cs b/SabreTools.Serialization/Printers/PKZIP.cs index 9678ce49..091444eb 100644 --- a/SabreTools.Serialization/Printers/PKZIP.cs +++ b/SabreTools.Serialization/Printers/PKZIP.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.PKZIP; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/PlayJAudioFile.cs b/SabreTools.Serialization/Printers/PlayJAudioFile.cs index fde8037f..ebc8b8de 100644 --- a/SabreTools.Serialization/Printers/PlayJAudioFile.cs +++ b/SabreTools.Serialization/Printers/PlayJAudioFile.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.PlayJ; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/PlayJPlaylist.cs b/SabreTools.Serialization/Printers/PlayJPlaylist.cs index 4ffb2c24..d086ec0d 100644 --- a/SabreTools.Serialization/Printers/PlayJPlaylist.cs +++ b/SabreTools.Serialization/Printers/PlayJPlaylist.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.PlayJ; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/PortableExecutable.cs b/SabreTools.Serialization/Printers/PortableExecutable.cs index 1241d55e..474f1307 100644 --- a/SabreTools.Serialization/Printers/PortableExecutable.cs +++ b/SabreTools.Serialization/Printers/PortableExecutable.cs @@ -8,7 +8,6 @@ using SabreTools.Data.Models.COFF.SymbolTableEntries; using SabreTools.Data.Models.PortableExecutable; using SabreTools.Data.Models.PortableExecutable.Resource.Entries; using SabreTools.IO.Extensions; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/Quantum.cs b/SabreTools.Serialization/Printers/Quantum.cs index 5eeb2b41..b041a42c 100644 --- a/SabreTools.Serialization/Printers/Quantum.cs +++ b/SabreTools.Serialization/Printers/Quantum.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.Quantum; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/SGA.cs b/SabreTools.Serialization/Printers/SGA.cs index 3e311c13..d8d05e32 100644 --- a/SabreTools.Serialization/Printers/SGA.cs +++ b/SabreTools.Serialization/Printers/SGA.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.SGA; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/SecuROMDFA.cs b/SabreTools.Serialization/Printers/SecuROMDFA.cs index 31bd6527..ce1e74c9 100644 --- a/SabreTools.Serialization/Printers/SecuROMDFA.cs +++ b/SabreTools.Serialization/Printers/SecuROMDFA.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.SecuROM; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/TapeArchive.cs b/SabreTools.Serialization/Printers/TapeArchive.cs index a0deac59..a9692e8f 100644 --- a/SabreTools.Serialization/Printers/TapeArchive.cs +++ b/SabreTools.Serialization/Printers/TapeArchive.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.TAR; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/VBSP.cs b/SabreTools.Serialization/Printers/VBSP.cs index 8f3eaf23..ee24b4a9 100644 --- a/SabreTools.Serialization/Printers/VBSP.cs +++ b/SabreTools.Serialization/Printers/VBSP.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.BSP; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/VPK.cs b/SabreTools.Serialization/Printers/VPK.cs index 3428386e..464f0045 100644 --- a/SabreTools.Serialization/Printers/VPK.cs +++ b/SabreTools.Serialization/Printers/VPK.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.VPK; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/WAD3.cs b/SabreTools.Serialization/Printers/WAD3.cs index 9d0a8ddd..81c84e73 100644 --- a/SabreTools.Serialization/Printers/WAD3.cs +++ b/SabreTools.Serialization/Printers/WAD3.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.WAD3; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/WiseOverlayHeader.cs b/SabreTools.Serialization/Printers/WiseOverlayHeader.cs index 23771aca..a6d1008e 100644 --- a/SabreTools.Serialization/Printers/WiseOverlayHeader.cs +++ b/SabreTools.Serialization/Printers/WiseOverlayHeader.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.WiseInstaller; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/WiseScript.cs b/SabreTools.Serialization/Printers/WiseScript.cs index f5ab6c1a..10322542 100644 --- a/SabreTools.Serialization/Printers/WiseScript.cs +++ b/SabreTools.Serialization/Printers/WiseScript.cs @@ -2,7 +2,6 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.WiseInstaller; using SabreTools.Data.Models.WiseInstaller.Actions; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/WiseSectionHeader.cs b/SabreTools.Serialization/Printers/WiseSectionHeader.cs index cb75b25e..eac0d58b 100644 --- a/SabreTools.Serialization/Printers/WiseSectionHeader.cs +++ b/SabreTools.Serialization/Printers/WiseSectionHeader.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.WiseInstaller; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/XMID.cs b/SabreTools.Serialization/Printers/XMID.cs index 6787bad2..cdc6e7a2 100644 --- a/SabreTools.Serialization/Printers/XMID.cs +++ b/SabreTools.Serialization/Printers/XMID.cs @@ -1,5 +1,4 @@ using System.Text; -using SabreTools.Serialization.Interfaces; using static SabreTools.Data.Models.Xbox.Constants; namespace SabreTools.Data.Printers diff --git a/SabreTools.Serialization/Printers/XZP.cs b/SabreTools.Serialization/Printers/XZP.cs index 58e12441..cc89e615 100644 --- a/SabreTools.Serialization/Printers/XZP.cs +++ b/SabreTools.Serialization/Printers/XZP.cs @@ -1,6 +1,5 @@ using System.Text; using SabreTools.Data.Models.XZP; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Data.Printers { diff --git a/SabreTools.Serialization/Printers/XeMID.cs b/SabreTools.Serialization/Printers/XeMID.cs index c5947985..1603527a 100644 --- a/SabreTools.Serialization/Printers/XeMID.cs +++ b/SabreTools.Serialization/Printers/XeMID.cs @@ -1,5 +1,4 @@ using System.Text; -using SabreTools.Serialization.Interfaces; using static SabreTools.Data.Models.Xbox.Constants; namespace SabreTools.Data.Printers