From 1f25e917c39a8ba3b297534d0d749349f27538b8 Mon Sep 17 00:00:00 2001 From: Dmitry Isaenko Date: Sat, 21 Jan 2023 14:45:44 +0300 Subject: [PATCH] Small optimizations, renaming --- .../java/libKonogonka/{ => aesctr}/IProducer.java | 2 +- .../aesctr/InFileStreamClassicProducer.java | 2 -- .../libKonogonka/aesctr/InFileStreamProducer.java | 2 -- .../java/libKonogonka/{Tools => fs}/ExportAble.java | 2 +- .../libKonogonka/{Tools => fs}/ISuperProvider.java | 5 +++-- .../libKonogonka/{Tools => fs}/NCA/NCAContent.java | 8 ++++---- .../{Tools => fs}/NCA/NCAHeaderTableEntry.java | 2 +- .../libKonogonka/{Tools => fs}/NCA/NCAProvider.java | 4 ++-- .../NCA/NCASectionTableBlock/BucketTreeHeader.java | 2 +- .../NCA/NCASectionTableBlock/CompressionInfo.java | 2 +- .../NCASectionTableBlock/MetaDataHashDataInfo.java | 2 +- .../NCA/NCASectionTableBlock/NcaFsHeader.java | 2 +- .../NCA/NCASectionTableBlock/SparseInfo.java | 2 +- .../NCA/NCASectionTableBlock/SuperBlockIVFC.java | 2 +- .../NCA/NCASectionTableBlock/SuperBlockPFS0.java | 2 +- .../{Tools => fs}/NPDM/ACI0/ACI0Provider.java | 6 +++--- .../NPDM/ACI0/FSAccessHeaderProvider.java | 2 +- .../{Tools => fs}/NPDM/ACID/ACIDProvider.java | 6 +++--- .../NPDM/ACID/FSAccessControlProvider.java | 2 +- .../NPDM/KernelAccessControlProvider.java | 4 ++-- .../{Tools => fs}/NPDM/NPDMProvider.java | 6 +++--- .../NPDM/ServiceAccessControlProvider.java | 2 +- .../libKonogonka/{Tools => fs}/NSO/NSO0Header.java | 2 +- .../libKonogonka/{Tools => fs}/NSO/NSO0Provider.java | 2 +- .../java/libKonogonka/{Tools => fs}/NSO/NSO0Raw.java | 2 +- .../libKonogonka/{Tools => fs}/NSO/NSO0Unpacker.java | 2 +- .../{Tools => fs}/NSO/SegmentHeader.java | 2 +- .../{Tools => fs}/NSO/SegmentHeaderRelative.java | 2 +- .../libKonogonka/{Tools => fs}/PFS0/PFS0Header.java | 2 +- .../{Tools => fs}/PFS0/PFS0Provider.java | 8 ++++---- .../libKonogonka/{Tools => fs}/PFS0/PFS0subFile.java | 2 +- .../{Tools => fs}/RomFs/FileSystemEntry.java | 4 ++-- .../{Tools => fs}/RomFs/Level6Header.java | 2 +- .../{Tools => fs}/RomFs/RomFsConstruct.java | 2 +- .../{Tools => fs}/RomFs/RomFsProvider.java | 8 ++++---- .../RomFs/view/DirectoryMetaTablePlainView.java | 2 +- .../RomFs/view/FileMetaTablePlainView.java | 2 +- .../RomFs/view/FileSystemTreeViewMaker.java | 4 ++-- .../libKonogonka/{Tools => fs}/TIK/TIKProvider.java | 2 +- .../libKonogonka/{Tools => fs}/XCI/HFS0File.java | 2 +- .../libKonogonka/{Tools => fs}/XCI/HFS0Provider.java | 6 +++--- .../{Tools => fs}/XCI/XCIGamecardCert.java | 2 +- .../{Tools => fs}/XCI/XCIGamecardHeader.java | 2 +- .../{Tools => fs}/XCI/XCIGamecardInfo.java | 2 +- .../libKonogonka/{Tools => fs}/XCI/XCIProvider.java | 2 +- .../{Tools => fs}/other/System2/KernelMap.java | 2 +- .../{Tools => fs}/other/System2/System2Header.java | 2 +- .../{Tools => fs}/other/System2/System2Provider.java | 6 +++--- .../{Tools => fs}/other/System2/ini1/Ini1Header.java | 2 +- .../other/System2/ini1/Ini1Provider.java | 6 +++--- .../{Tools => fs}/other/System2/ini1/KIP1Header.java | 6 +++--- .../other/System2/ini1/KIP1Provider.java | 4 ++-- .../{Tools => fs}/other/System2/ini1/KIP1Raw.java | 2 +- .../other/System2/ini1/Kip1Unpacker.java | 9 ++++----- .../libKonogonka/package2/ExtractPackage2Test.java | 6 +++--- .../java/libKonogonka/package2/Ini1ExtractTest.java | 10 +++++----- .../libKonogonka/package2/KernelBinExtractTest.java | 8 ++++---- .../package2/Kip1ExtractDecompressedTest.java | 12 ++++++------ .../java/libKonogonka/package2/Kip1ExtractTest.java | 12 ++++++------ .../libKonogonka/unsorted/ExportNso0FromNcaTest.java | 6 +++--- .../libKonogonka/unsorted/KeyChainHolderTest.java | 10 +++++----- .../libKonogonka/unsorted/NCAProviderSimpleTest.java | 2 +- .../libKonogonka/unsorted/NSODecompressTest.java | 2 +- src/test/java/libKonogonka/unsorted/NSOTest.java | 8 ++++---- .../libKonogonka/unsorted/NSPpfs0EncryptedTest.java | 8 ++++---- src/test/java/libKonogonka/unsorted/PFS0Test.java | 4 ++-- .../libKonogonka/unsorted/Pfs0EncryptedTest.java | 8 ++++---- .../libKonogonka/unsorted/RomFsDecryptedTest.java | 4 ++-- .../libKonogonka/unsorted/RomFsEncryptedTest.java | 6 +++--- src/test/java/libKonogonka/unsorted/XciTest.java | 8 ++++---- 70 files changed, 142 insertions(+), 146 deletions(-) rename src/main/java/libKonogonka/{ => aesctr}/IProducer.java (89%) rename src/main/java/libKonogonka/{Tools => fs}/ExportAble.java (98%) rename src/main/java/libKonogonka/{Tools => fs}/ISuperProvider.java (93%) rename src/main/java/libKonogonka/{Tools => fs}/NCA/NCAContent.java (97%) rename src/main/java/libKonogonka/{Tools => fs}/NCA/NCAHeaderTableEntry.java (98%) rename src/main/java/libKonogonka/{Tools => fs}/NCA/NCAProvider.java (99%) rename src/main/java/libKonogonka/{Tools => fs}/NCA/NCASectionTableBlock/BucketTreeHeader.java (97%) rename src/main/java/libKonogonka/{Tools => fs}/NCA/NCASectionTableBlock/CompressionInfo.java (97%) rename src/main/java/libKonogonka/{Tools => fs}/NCA/NCASectionTableBlock/MetaDataHashDataInfo.java (97%) rename src/main/java/libKonogonka/{Tools => fs}/NCA/NCASectionTableBlock/NcaFsHeader.java (99%) rename src/main/java/libKonogonka/{Tools => fs}/NCA/NCASectionTableBlock/SparseInfo.java (97%) rename src/main/java/libKonogonka/{Tools => fs}/NCA/NCASectionTableBlock/SuperBlockIVFC.java (99%) rename src/main/java/libKonogonka/{Tools => fs}/NCA/NCASectionTableBlock/SuperBlockPFS0.java (97%) rename src/main/java/libKonogonka/{Tools => fs}/NPDM/ACI0/ACI0Provider.java (96%) rename src/main/java/libKonogonka/{Tools => fs}/NPDM/ACI0/FSAccessHeaderProvider.java (98%) rename src/main/java/libKonogonka/{Tools => fs}/NPDM/ACID/ACIDProvider.java (97%) rename src/main/java/libKonogonka/{Tools => fs}/NPDM/ACID/FSAccessControlProvider.java (97%) rename src/main/java/libKonogonka/{Tools => fs}/NPDM/KernelAccessControlProvider.java (99%) rename src/main/java/libKonogonka/{Tools => fs}/NPDM/NPDMProvider.java (97%) rename src/main/java/libKonogonka/{Tools => fs}/NPDM/ServiceAccessControlProvider.java (97%) rename src/main/java/libKonogonka/{Tools => fs}/NSO/NSO0Header.java (99%) rename src/main/java/libKonogonka/{Tools => fs}/NSO/NSO0Provider.java (98%) rename src/main/java/libKonogonka/{Tools => fs}/NSO/NSO0Raw.java (98%) rename src/main/java/libKonogonka/{Tools => fs}/NSO/NSO0Unpacker.java (99%) rename src/main/java/libKonogonka/{Tools => fs}/NSO/SegmentHeader.java (98%) rename src/main/java/libKonogonka/{Tools => fs}/NSO/SegmentHeaderRelative.java (97%) rename src/main/java/libKonogonka/{Tools => fs}/PFS0/PFS0Header.java (99%) rename src/main/java/libKonogonka/{Tools => fs}/PFS0/PFS0Provider.java (97%) rename src/main/java/libKonogonka/{Tools => fs}/PFS0/PFS0subFile.java (97%) rename src/main/java/libKonogonka/{Tools => fs}/RomFs/FileSystemEntry.java (98%) rename src/main/java/libKonogonka/{Tools => fs}/RomFs/Level6Header.java (99%) rename src/main/java/libKonogonka/{Tools => fs}/RomFs/RomFsConstruct.java (99%) rename src/main/java/libKonogonka/{Tools => fs}/RomFs/RomFsProvider.java (96%) rename src/main/java/libKonogonka/{Tools => fs}/RomFs/view/DirectoryMetaTablePlainView.java (99%) rename src/main/java/libKonogonka/{Tools => fs}/RomFs/view/FileMetaTablePlainView.java (98%) rename src/main/java/libKonogonka/{Tools => fs}/RomFs/view/FileSystemTreeViewMaker.java (95%) rename src/main/java/libKonogonka/{Tools => fs}/TIK/TIKProvider.java (99%) rename src/main/java/libKonogonka/{Tools => fs}/XCI/HFS0File.java (98%) rename src/main/java/libKonogonka/{Tools => fs}/XCI/HFS0Provider.java (98%) rename src/main/java/libKonogonka/{Tools => fs}/XCI/XCIGamecardCert.java (99%) rename src/main/java/libKonogonka/{Tools => fs}/XCI/XCIGamecardHeader.java (99%) rename src/main/java/libKonogonka/{Tools => fs}/XCI/XCIGamecardInfo.java (99%) rename src/main/java/libKonogonka/{Tools => fs}/XCI/XCIProvider.java (99%) rename src/main/java/libKonogonka/{Tools => fs}/other/System2/KernelMap.java (99%) rename src/main/java/libKonogonka/{Tools => fs}/other/System2/System2Header.java (99%) rename src/main/java/libKonogonka/{Tools => fs}/other/System2/System2Provider.java (97%) rename src/main/java/libKonogonka/{Tools => fs}/other/System2/ini1/Ini1Header.java (97%) rename src/main/java/libKonogonka/{Tools => fs}/other/System2/ini1/Ini1Provider.java (96%) rename src/main/java/libKonogonka/{Tools => fs}/other/System2/ini1/KIP1Header.java (98%) rename src/main/java/libKonogonka/{Tools => fs}/other/System2/ini1/KIP1Provider.java (97%) rename src/main/java/libKonogonka/{Tools => fs}/other/System2/ini1/KIP1Raw.java (98%) rename src/main/java/libKonogonka/{Tools => fs}/other/System2/ini1/Kip1Unpacker.java (96%) diff --git a/src/main/java/libKonogonka/IProducer.java b/src/main/java/libKonogonka/aesctr/IProducer.java similarity index 89% rename from src/main/java/libKonogonka/IProducer.java rename to src/main/java/libKonogonka/aesctr/IProducer.java index 7710e83..f7f891f 100644 --- a/src/main/java/libKonogonka/IProducer.java +++ b/src/main/java/libKonogonka/aesctr/IProducer.java @@ -1,4 +1,4 @@ -package libKonogonka; +package libKonogonka.aesctr; import java.io.BufferedInputStream; import java.io.File; diff --git a/src/main/java/libKonogonka/aesctr/InFileStreamClassicProducer.java b/src/main/java/libKonogonka/aesctr/InFileStreamClassicProducer.java index 5eec1ff..ffb7676 100644 --- a/src/main/java/libKonogonka/aesctr/InFileStreamClassicProducer.java +++ b/src/main/java/libKonogonka/aesctr/InFileStreamClassicProducer.java @@ -18,8 +18,6 @@ */ package libKonogonka.aesctr; -import libKonogonka.IProducer; - import java.io.BufferedInputStream; import java.io.File; import java.io.InputStream; diff --git a/src/main/java/libKonogonka/aesctr/InFileStreamProducer.java b/src/main/java/libKonogonka/aesctr/InFileStreamProducer.java index c52ddd1..c712701 100644 --- a/src/main/java/libKonogonka/aesctr/InFileStreamProducer.java +++ b/src/main/java/libKonogonka/aesctr/InFileStreamProducer.java @@ -18,8 +18,6 @@ */ package libKonogonka.aesctr; -import libKonogonka.IProducer; - import java.io.BufferedInputStream; import java.io.File; import java.nio.file.Files; diff --git a/src/main/java/libKonogonka/Tools/ExportAble.java b/src/main/java/libKonogonka/fs/ExportAble.java similarity index 98% rename from src/main/java/libKonogonka/Tools/ExportAble.java rename to src/main/java/libKonogonka/fs/ExportAble.java index 3116c13..c585911 100644 --- a/src/main/java/libKonogonka/Tools/ExportAble.java +++ b/src/main/java/libKonogonka/fs/ExportAble.java @@ -1,4 +1,4 @@ -package libKonogonka.Tools; +package libKonogonka.fs; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/src/main/java/libKonogonka/Tools/ISuperProvider.java b/src/main/java/libKonogonka/fs/ISuperProvider.java similarity index 93% rename from src/main/java/libKonogonka/Tools/ISuperProvider.java rename to src/main/java/libKonogonka/fs/ISuperProvider.java index b6b46a6..24d09a0 100644 --- a/src/main/java/libKonogonka/Tools/ISuperProvider.java +++ b/src/main/java/libKonogonka/fs/ISuperProvider.java @@ -16,18 +16,19 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools; +package libKonogonka.fs; import libKonogonka.aesctr.InFileStreamProducer; import java.io.File; +import java.io.FileNotFoundException; /** * Any class of this type must provide streams * */ public interface ISuperProvider { InFileStreamProducer getStreamProducer(String subFileName) throws Exception; - InFileStreamProducer getStreamProducer(int subFileNumber) throws Exception; + InFileStreamProducer getStreamProducer(int subFileNumber) throws FileNotFoundException; boolean exportContent(String saveToLocation, String subFileName) throws Exception; boolean exportContent(String saveToLocation, int subFileNumber) throws Exception; File getFile(); diff --git a/src/main/java/libKonogonka/Tools/NCA/NCAContent.java b/src/main/java/libKonogonka/fs/NCA/NCAContent.java similarity index 97% rename from src/main/java/libKonogonka/Tools/NCA/NCAContent.java rename to src/main/java/libKonogonka/fs/NCA/NCAContent.java index 9451d5b..92bcdf0 100644 --- a/src/main/java/libKonogonka/Tools/NCA/NCAContent.java +++ b/src/main/java/libKonogonka/fs/NCA/NCAContent.java @@ -16,11 +16,11 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.NCA; +package libKonogonka.fs.NCA; -import libKonogonka.Tools.NCA.NCASectionTableBlock.NcaFsHeader; -import libKonogonka.Tools.PFS0.PFS0Provider; -import libKonogonka.Tools.RomFs.RomFsProvider; +import libKonogonka.fs.NCA.NCASectionTableBlock.NcaFsHeader; +import libKonogonka.fs.PFS0.PFS0Provider; +import libKonogonka.fs.RomFs.RomFsProvider; import libKonogonka.aesctr.AesCtrBufferedInputStream; import libKonogonka.aesctr.AesCtrDecryptForMediaBlocks; import libKonogonka.aesctr.InFileStreamProducer; diff --git a/src/main/java/libKonogonka/Tools/NCA/NCAHeaderTableEntry.java b/src/main/java/libKonogonka/fs/NCA/NCAHeaderTableEntry.java similarity index 98% rename from src/main/java/libKonogonka/Tools/NCA/NCAHeaderTableEntry.java rename to src/main/java/libKonogonka/fs/NCA/NCAHeaderTableEntry.java index 7364d25..25014ee 100644 --- a/src/main/java/libKonogonka/Tools/NCA/NCAHeaderTableEntry.java +++ b/src/main/java/libKonogonka/fs/NCA/NCAHeaderTableEntry.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.NCA; +package libKonogonka.fs.NCA; import libKonogonka.Converter; diff --git a/src/main/java/libKonogonka/Tools/NCA/NCAProvider.java b/src/main/java/libKonogonka/fs/NCA/NCAProvider.java similarity index 99% rename from src/main/java/libKonogonka/Tools/NCA/NCAProvider.java rename to src/main/java/libKonogonka/fs/NCA/NCAProvider.java index 65789eb..176c7bf 100644 --- a/src/main/java/libKonogonka/Tools/NCA/NCAProvider.java +++ b/src/main/java/libKonogonka/fs/NCA/NCAProvider.java @@ -16,10 +16,10 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.NCA; +package libKonogonka.fs.NCA; import libKonogonka.Converter; -import libKonogonka.Tools.NCA.NCASectionTableBlock.NcaFsHeader; +import libKonogonka.fs.NCA.NCASectionTableBlock.NcaFsHeader; import libKonogonka.exceptions.EmptySectionException; import libKonogonka.xtsaes.XTSAESCipher; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/libKonogonka/Tools/NCA/NCASectionTableBlock/BucketTreeHeader.java b/src/main/java/libKonogonka/fs/NCA/NCASectionTableBlock/BucketTreeHeader.java similarity index 97% rename from src/main/java/libKonogonka/Tools/NCA/NCASectionTableBlock/BucketTreeHeader.java rename to src/main/java/libKonogonka/fs/NCA/NCASectionTableBlock/BucketTreeHeader.java index 6c32176..831b92e 100644 --- a/src/main/java/libKonogonka/Tools/NCA/NCASectionTableBlock/BucketTreeHeader.java +++ b/src/main/java/libKonogonka/fs/NCA/NCASectionTableBlock/BucketTreeHeader.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.NCA.NCASectionTableBlock; +package libKonogonka.fs.NCA.NCASectionTableBlock; import libKonogonka.Converter; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/libKonogonka/Tools/NCA/NCASectionTableBlock/CompressionInfo.java b/src/main/java/libKonogonka/fs/NCA/NCASectionTableBlock/CompressionInfo.java similarity index 97% rename from src/main/java/libKonogonka/Tools/NCA/NCASectionTableBlock/CompressionInfo.java rename to src/main/java/libKonogonka/fs/NCA/NCASectionTableBlock/CompressionInfo.java index 9e1d69d..0c8e26b 100644 --- a/src/main/java/libKonogonka/Tools/NCA/NCASectionTableBlock/CompressionInfo.java +++ b/src/main/java/libKonogonka/fs/NCA/NCASectionTableBlock/CompressionInfo.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.NCA.NCASectionTableBlock; +package libKonogonka.fs.NCA.NCASectionTableBlock; import libKonogonka.Converter; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/libKonogonka/Tools/NCA/NCASectionTableBlock/MetaDataHashDataInfo.java b/src/main/java/libKonogonka/fs/NCA/NCASectionTableBlock/MetaDataHashDataInfo.java similarity index 97% rename from src/main/java/libKonogonka/Tools/NCA/NCASectionTableBlock/MetaDataHashDataInfo.java rename to src/main/java/libKonogonka/fs/NCA/NCASectionTableBlock/MetaDataHashDataInfo.java index 3e9156f..379b7a0 100644 --- a/src/main/java/libKonogonka/Tools/NCA/NCASectionTableBlock/MetaDataHashDataInfo.java +++ b/src/main/java/libKonogonka/fs/NCA/NCASectionTableBlock/MetaDataHashDataInfo.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.NCA.NCASectionTableBlock; +package libKonogonka.fs.NCA.NCASectionTableBlock; import libKonogonka.Converter; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/libKonogonka/Tools/NCA/NCASectionTableBlock/NcaFsHeader.java b/src/main/java/libKonogonka/fs/NCA/NCASectionTableBlock/NcaFsHeader.java similarity index 99% rename from src/main/java/libKonogonka/Tools/NCA/NCASectionTableBlock/NcaFsHeader.java rename to src/main/java/libKonogonka/fs/NCA/NCASectionTableBlock/NcaFsHeader.java index dda045e..e56855e 100644 --- a/src/main/java/libKonogonka/Tools/NCA/NCASectionTableBlock/NcaFsHeader.java +++ b/src/main/java/libKonogonka/fs/NCA/NCASectionTableBlock/NcaFsHeader.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.NCA.NCASectionTableBlock; +package libKonogonka.fs.NCA.NCASectionTableBlock; import libKonogonka.Converter; import libKonogonka.RainbowDump; diff --git a/src/main/java/libKonogonka/Tools/NCA/NCASectionTableBlock/SparseInfo.java b/src/main/java/libKonogonka/fs/NCA/NCASectionTableBlock/SparseInfo.java similarity index 97% rename from src/main/java/libKonogonka/Tools/NCA/NCASectionTableBlock/SparseInfo.java rename to src/main/java/libKonogonka/fs/NCA/NCASectionTableBlock/SparseInfo.java index 9b21470..f9d4423 100644 --- a/src/main/java/libKonogonka/Tools/NCA/NCASectionTableBlock/SparseInfo.java +++ b/src/main/java/libKonogonka/fs/NCA/NCASectionTableBlock/SparseInfo.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.NCA.NCASectionTableBlock; +package libKonogonka.fs.NCA.NCASectionTableBlock; import libKonogonka.Converter; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/libKonogonka/Tools/NCA/NCASectionTableBlock/SuperBlockIVFC.java b/src/main/java/libKonogonka/fs/NCA/NCASectionTableBlock/SuperBlockIVFC.java similarity index 99% rename from src/main/java/libKonogonka/Tools/NCA/NCASectionTableBlock/SuperBlockIVFC.java rename to src/main/java/libKonogonka/fs/NCA/NCASectionTableBlock/SuperBlockIVFC.java index bec990e..a4ba31b 100644 --- a/src/main/java/libKonogonka/Tools/NCA/NCASectionTableBlock/SuperBlockIVFC.java +++ b/src/main/java/libKonogonka/fs/NCA/NCASectionTableBlock/SuperBlockIVFC.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.NCA.NCASectionTableBlock; +package libKonogonka.fs.NCA.NCASectionTableBlock; import java.nio.charset.StandardCharsets; import java.util.Arrays; diff --git a/src/main/java/libKonogonka/Tools/NCA/NCASectionTableBlock/SuperBlockPFS0.java b/src/main/java/libKonogonka/fs/NCA/NCASectionTableBlock/SuperBlockPFS0.java similarity index 97% rename from src/main/java/libKonogonka/Tools/NCA/NCASectionTableBlock/SuperBlockPFS0.java rename to src/main/java/libKonogonka/fs/NCA/NCASectionTableBlock/SuperBlockPFS0.java index 6b008a7..a168c30 100644 --- a/src/main/java/libKonogonka/Tools/NCA/NCASectionTableBlock/SuperBlockPFS0.java +++ b/src/main/java/libKonogonka/fs/NCA/NCASectionTableBlock/SuperBlockPFS0.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.NCA.NCASectionTableBlock; +package libKonogonka.fs.NCA.NCASectionTableBlock; import java.util.Arrays; diff --git a/src/main/java/libKonogonka/Tools/NPDM/ACI0/ACI0Provider.java b/src/main/java/libKonogonka/fs/NPDM/ACI0/ACI0Provider.java similarity index 96% rename from src/main/java/libKonogonka/Tools/NPDM/ACI0/ACI0Provider.java rename to src/main/java/libKonogonka/fs/NPDM/ACI0/ACI0Provider.java index 729645c..bf82559 100644 --- a/src/main/java/libKonogonka/Tools/NPDM/ACI0/ACI0Provider.java +++ b/src/main/java/libKonogonka/fs/NPDM/ACI0/ACI0Provider.java @@ -16,10 +16,10 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.NPDM.ACI0; +package libKonogonka.fs.NPDM.ACI0; -import libKonogonka.Tools.NPDM.KernelAccessControlProvider; -import libKonogonka.Tools.NPDM.ServiceAccessControlProvider; +import libKonogonka.fs.NPDM.KernelAccessControlProvider; +import libKonogonka.fs.NPDM.ServiceAccessControlProvider; import java.nio.charset.StandardCharsets; import java.util.Arrays; diff --git a/src/main/java/libKonogonka/Tools/NPDM/ACI0/FSAccessHeaderProvider.java b/src/main/java/libKonogonka/fs/NPDM/ACI0/FSAccessHeaderProvider.java similarity index 98% rename from src/main/java/libKonogonka/Tools/NPDM/ACI0/FSAccessHeaderProvider.java rename to src/main/java/libKonogonka/fs/NPDM/ACI0/FSAccessHeaderProvider.java index 114fe69..f5ae6c9 100644 --- a/src/main/java/libKonogonka/Tools/NPDM/ACI0/FSAccessHeaderProvider.java +++ b/src/main/java/libKonogonka/fs/NPDM/ACI0/FSAccessHeaderProvider.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.NPDM.ACI0; +package libKonogonka.fs.NPDM.ACI0; import libKonogonka.Converter; diff --git a/src/main/java/libKonogonka/Tools/NPDM/ACID/ACIDProvider.java b/src/main/java/libKonogonka/fs/NPDM/ACID/ACIDProvider.java similarity index 97% rename from src/main/java/libKonogonka/Tools/NPDM/ACID/ACIDProvider.java rename to src/main/java/libKonogonka/fs/NPDM/ACID/ACIDProvider.java index 5ab84f8..3bc2e8b 100644 --- a/src/main/java/libKonogonka/Tools/NPDM/ACID/ACIDProvider.java +++ b/src/main/java/libKonogonka/fs/NPDM/ACID/ACIDProvider.java @@ -16,10 +16,10 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.NPDM.ACID; +package libKonogonka.fs.NPDM.ACID; -import libKonogonka.Tools.NPDM.KernelAccessControlProvider; -import libKonogonka.Tools.NPDM.ServiceAccessControlProvider; +import libKonogonka.fs.NPDM.KernelAccessControlProvider; +import libKonogonka.fs.NPDM.ServiceAccessControlProvider; import java.nio.charset.StandardCharsets; import java.util.Arrays; diff --git a/src/main/java/libKonogonka/Tools/NPDM/ACID/FSAccessControlProvider.java b/src/main/java/libKonogonka/fs/NPDM/ACID/FSAccessControlProvider.java similarity index 97% rename from src/main/java/libKonogonka/Tools/NPDM/ACID/FSAccessControlProvider.java rename to src/main/java/libKonogonka/fs/NPDM/ACID/FSAccessControlProvider.java index a06c2c3..4dc0575 100644 --- a/src/main/java/libKonogonka/Tools/NPDM/ACID/FSAccessControlProvider.java +++ b/src/main/java/libKonogonka/fs/NPDM/ACID/FSAccessControlProvider.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.NPDM.ACID; +package libKonogonka.fs.NPDM.ACID; import libKonogonka.Converter; diff --git a/src/main/java/libKonogonka/Tools/NPDM/KernelAccessControlProvider.java b/src/main/java/libKonogonka/fs/NPDM/KernelAccessControlProvider.java similarity index 99% rename from src/main/java/libKonogonka/Tools/NPDM/KernelAccessControlProvider.java rename to src/main/java/libKonogonka/fs/NPDM/KernelAccessControlProvider.java index b6ebccc..34c9e43 100644 --- a/src/main/java/libKonogonka/Tools/NPDM/KernelAccessControlProvider.java +++ b/src/main/java/libKonogonka/fs/NPDM/KernelAccessControlProvider.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.NPDM; +package libKonogonka.fs.NPDM; import libKonogonka.Converter; import org.apache.logging.log4j.LogManager; @@ -88,7 +88,7 @@ public class KernelAccessControlProvider { DEBUGFLAGS = 16; // RAW data private final LinkedList rawData; - private byte[] raw; + private final byte[] raw; // Kernel flags private boolean kernelFlagsAvailable; private int kernelFlagCpuIdHi; diff --git a/src/main/java/libKonogonka/Tools/NPDM/NPDMProvider.java b/src/main/java/libKonogonka/fs/NPDM/NPDMProvider.java similarity index 97% rename from src/main/java/libKonogonka/Tools/NPDM/NPDMProvider.java rename to src/main/java/libKonogonka/fs/NPDM/NPDMProvider.java index 6fe4d88..7774060 100644 --- a/src/main/java/libKonogonka/Tools/NPDM/NPDMProvider.java +++ b/src/main/java/libKonogonka/fs/NPDM/NPDMProvider.java @@ -16,10 +16,10 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.NPDM; +package libKonogonka.fs.NPDM; -import libKonogonka.Tools.NPDM.ACI0.ACI0Provider; -import libKonogonka.Tools.NPDM.ACID.ACIDProvider; +import libKonogonka.fs.NPDM.ACI0.ACI0Provider; +import libKonogonka.fs.NPDM.ACID.ACIDProvider; import libKonogonka.aesctr.InFileStreamProducer; import java.io.BufferedInputStream; diff --git a/src/main/java/libKonogonka/Tools/NPDM/ServiceAccessControlProvider.java b/src/main/java/libKonogonka/fs/NPDM/ServiceAccessControlProvider.java similarity index 97% rename from src/main/java/libKonogonka/Tools/NPDM/ServiceAccessControlProvider.java rename to src/main/java/libKonogonka/fs/NPDM/ServiceAccessControlProvider.java index d97d254..864c2df 100644 --- a/src/main/java/libKonogonka/Tools/NPDM/ServiceAccessControlProvider.java +++ b/src/main/java/libKonogonka/fs/NPDM/ServiceAccessControlProvider.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.NPDM; +package libKonogonka.fs.NPDM; import java.nio.charset.StandardCharsets; import java.util.LinkedHashMap; diff --git a/src/main/java/libKonogonka/Tools/NSO/NSO0Header.java b/src/main/java/libKonogonka/fs/NSO/NSO0Header.java similarity index 99% rename from src/main/java/libKonogonka/Tools/NSO/NSO0Header.java rename to src/main/java/libKonogonka/fs/NSO/NSO0Header.java index 753906d..0eabe26 100644 --- a/src/main/java/libKonogonka/Tools/NSO/NSO0Header.java +++ b/src/main/java/libKonogonka/fs/NSO/NSO0Header.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.NSO; +package libKonogonka.fs.NSO; import libKonogonka.Converter; import libKonogonka.RainbowDump; diff --git a/src/main/java/libKonogonka/Tools/NSO/NSO0Provider.java b/src/main/java/libKonogonka/fs/NSO/NSO0Provider.java similarity index 98% rename from src/main/java/libKonogonka/Tools/NSO/NSO0Provider.java rename to src/main/java/libKonogonka/fs/NSO/NSO0Provider.java index adb5794..a167023 100644 --- a/src/main/java/libKonogonka/Tools/NSO/NSO0Provider.java +++ b/src/main/java/libKonogonka/fs/NSO/NSO0Provider.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.NSO; +package libKonogonka.fs.NSO; import libKonogonka.aesctr.InFileStreamProducer; diff --git a/src/main/java/libKonogonka/Tools/NSO/NSO0Raw.java b/src/main/java/libKonogonka/fs/NSO/NSO0Raw.java similarity index 98% rename from src/main/java/libKonogonka/Tools/NSO/NSO0Raw.java rename to src/main/java/libKonogonka/fs/NSO/NSO0Raw.java index db7e42f..d4a8de9 100644 --- a/src/main/java/libKonogonka/Tools/NSO/NSO0Raw.java +++ b/src/main/java/libKonogonka/fs/NSO/NSO0Raw.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.NSO; +package libKonogonka.fs.NSO; public class NSO0Raw { private NSO0Header headerObject; diff --git a/src/main/java/libKonogonka/Tools/NSO/NSO0Unpacker.java b/src/main/java/libKonogonka/fs/NSO/NSO0Unpacker.java similarity index 99% rename from src/main/java/libKonogonka/Tools/NSO/NSO0Unpacker.java rename to src/main/java/libKonogonka/fs/NSO/NSO0Unpacker.java index 8e47b0b..09bc98d 100644 --- a/src/main/java/libKonogonka/Tools/NSO/NSO0Unpacker.java +++ b/src/main/java/libKonogonka/fs/NSO/NSO0Unpacker.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.NSO; +package libKonogonka.fs.NSO; import libKonogonka.aesctr.InFileStreamProducer; import net.jpountz.lz4.LZ4Factory; diff --git a/src/main/java/libKonogonka/Tools/NSO/SegmentHeader.java b/src/main/java/libKonogonka/fs/NSO/SegmentHeader.java similarity index 98% rename from src/main/java/libKonogonka/Tools/NSO/SegmentHeader.java rename to src/main/java/libKonogonka/fs/NSO/SegmentHeader.java index 9581def..bd94f33 100644 --- a/src/main/java/libKonogonka/Tools/NSO/SegmentHeader.java +++ b/src/main/java/libKonogonka/fs/NSO/SegmentHeader.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.NSO; +package libKonogonka.fs.NSO; import libKonogonka.Converter; diff --git a/src/main/java/libKonogonka/Tools/NSO/SegmentHeaderRelative.java b/src/main/java/libKonogonka/fs/NSO/SegmentHeaderRelative.java similarity index 97% rename from src/main/java/libKonogonka/Tools/NSO/SegmentHeaderRelative.java rename to src/main/java/libKonogonka/fs/NSO/SegmentHeaderRelative.java index 7eb28de..6feaf19 100644 --- a/src/main/java/libKonogonka/Tools/NSO/SegmentHeaderRelative.java +++ b/src/main/java/libKonogonka/fs/NSO/SegmentHeaderRelative.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.NSO; +package libKonogonka.fs.NSO; import libKonogonka.Converter; diff --git a/src/main/java/libKonogonka/Tools/PFS0/PFS0Header.java b/src/main/java/libKonogonka/fs/PFS0/PFS0Header.java similarity index 99% rename from src/main/java/libKonogonka/Tools/PFS0/PFS0Header.java rename to src/main/java/libKonogonka/fs/PFS0/PFS0Header.java index afe6846..2a787b9 100644 --- a/src/main/java/libKonogonka/Tools/PFS0/PFS0Header.java +++ b/src/main/java/libKonogonka/fs/PFS0/PFS0Header.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.PFS0; +package libKonogonka.fs.PFS0; import libKonogonka.Converter; import libKonogonka.RainbowDump; diff --git a/src/main/java/libKonogonka/Tools/PFS0/PFS0Provider.java b/src/main/java/libKonogonka/fs/PFS0/PFS0Provider.java similarity index 97% rename from src/main/java/libKonogonka/Tools/PFS0/PFS0Provider.java rename to src/main/java/libKonogonka/fs/PFS0/PFS0Provider.java index 461439f..4542668 100644 --- a/src/main/java/libKonogonka/Tools/PFS0/PFS0Provider.java +++ b/src/main/java/libKonogonka/fs/PFS0/PFS0Provider.java @@ -16,12 +16,12 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.PFS0; +package libKonogonka.fs.PFS0; import libKonogonka.RainbowDump; -import libKonogonka.Tools.ExportAble; -import libKonogonka.Tools.ISuperProvider; -import libKonogonka.Tools.NCA.NCASectionTableBlock.SuperBlockPFS0; +import libKonogonka.fs.ExportAble; +import libKonogonka.fs.ISuperProvider; +import libKonogonka.fs.NCA.NCASectionTableBlock.SuperBlockPFS0; import libKonogonka.aesctr.InFileStreamProducer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/libKonogonka/Tools/PFS0/PFS0subFile.java b/src/main/java/libKonogonka/fs/PFS0/PFS0subFile.java similarity index 97% rename from src/main/java/libKonogonka/Tools/PFS0/PFS0subFile.java rename to src/main/java/libKonogonka/fs/PFS0/PFS0subFile.java index ed2dbca..1dd696b 100644 --- a/src/main/java/libKonogonka/Tools/PFS0/PFS0subFile.java +++ b/src/main/java/libKonogonka/fs/PFS0/PFS0subFile.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.PFS0; +package libKonogonka.fs.PFS0; public class PFS0subFile { private final String name; diff --git a/src/main/java/libKonogonka/Tools/RomFs/FileSystemEntry.java b/src/main/java/libKonogonka/fs/RomFs/FileSystemEntry.java similarity index 98% rename from src/main/java/libKonogonka/Tools/RomFs/FileSystemEntry.java rename to src/main/java/libKonogonka/fs/RomFs/FileSystemEntry.java index 72cde32..b3a012b 100644 --- a/src/main/java/libKonogonka/Tools/RomFs/FileSystemEntry.java +++ b/src/main/java/libKonogonka/fs/RomFs/FileSystemEntry.java @@ -17,10 +17,10 @@ * along with libKonogonka. If not, see . */ -package libKonogonka.Tools.RomFs; +package libKonogonka.fs.RomFs; import libKonogonka.Converter; -import libKonogonka.Tools.RomFs.view.FileSystemTreeViewMaker; +import libKonogonka.fs.RomFs.view.FileSystemTreeViewMaker; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/libKonogonka/Tools/RomFs/Level6Header.java b/src/main/java/libKonogonka/fs/RomFs/Level6Header.java similarity index 99% rename from src/main/java/libKonogonka/Tools/RomFs/Level6Header.java rename to src/main/java/libKonogonka/fs/RomFs/Level6Header.java index 9f1b982..eb839c9 100644 --- a/src/main/java/libKonogonka/Tools/RomFs/Level6Header.java +++ b/src/main/java/libKonogonka/fs/RomFs/Level6Header.java @@ -17,7 +17,7 @@ * along with libKonogonka. If not, see . */ -package libKonogonka.Tools.RomFs; +package libKonogonka.fs.RomFs; import libKonogonka.Converter; import libKonogonka.RainbowDump; diff --git a/src/main/java/libKonogonka/Tools/RomFs/RomFsConstruct.java b/src/main/java/libKonogonka/fs/RomFs/RomFsConstruct.java similarity index 99% rename from src/main/java/libKonogonka/Tools/RomFs/RomFsConstruct.java rename to src/main/java/libKonogonka/fs/RomFs/RomFsConstruct.java index 98bfb79..d10b7e2 100644 --- a/src/main/java/libKonogonka/Tools/RomFs/RomFsConstruct.java +++ b/src/main/java/libKonogonka/fs/RomFs/RomFsConstruct.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.RomFs; +package libKonogonka.fs.RomFs; import libKonogonka.Converter; import libKonogonka.aesctr.InFileStreamProducer; diff --git a/src/main/java/libKonogonka/Tools/RomFs/RomFsProvider.java b/src/main/java/libKonogonka/fs/RomFs/RomFsProvider.java similarity index 96% rename from src/main/java/libKonogonka/Tools/RomFs/RomFsProvider.java rename to src/main/java/libKonogonka/fs/RomFs/RomFsProvider.java index 10062f9..16d096b 100644 --- a/src/main/java/libKonogonka/Tools/RomFs/RomFsProvider.java +++ b/src/main/java/libKonogonka/fs/RomFs/RomFsProvider.java @@ -16,11 +16,11 @@ * You should have received a copy of the GNU General Public License * along with libKonogonka. If not, see . */ -package libKonogonka.Tools.RomFs; +package libKonogonka.fs.RomFs; -import libKonogonka.Tools.ExportAble; -import libKonogonka.Tools.RomFs.view.DirectoryMetaTablePlainView; -import libKonogonka.Tools.RomFs.view.FileMetaTablePlainView; +import libKonogonka.fs.ExportAble; +import libKonogonka.fs.RomFs.view.DirectoryMetaTablePlainView; +import libKonogonka.fs.RomFs.view.FileMetaTablePlainView; import libKonogonka.aesctr.InFileStreamProducer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/libKonogonka/Tools/RomFs/view/DirectoryMetaTablePlainView.java b/src/main/java/libKonogonka/fs/RomFs/view/DirectoryMetaTablePlainView.java similarity index 99% rename from src/main/java/libKonogonka/Tools/RomFs/view/DirectoryMetaTablePlainView.java rename to src/main/java/libKonogonka/fs/RomFs/view/DirectoryMetaTablePlainView.java index b396457..2e1eef8 100644 --- a/src/main/java/libKonogonka/Tools/RomFs/view/DirectoryMetaTablePlainView.java +++ b/src/main/java/libKonogonka/fs/RomFs/view/DirectoryMetaTablePlainView.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.RomFs.view; +package libKonogonka.fs.RomFs.view; import libKonogonka.Converter; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/libKonogonka/Tools/RomFs/view/FileMetaTablePlainView.java b/src/main/java/libKonogonka/fs/RomFs/view/FileMetaTablePlainView.java similarity index 98% rename from src/main/java/libKonogonka/Tools/RomFs/view/FileMetaTablePlainView.java rename to src/main/java/libKonogonka/fs/RomFs/view/FileMetaTablePlainView.java index 919c260..eb653d6 100644 --- a/src/main/java/libKonogonka/Tools/RomFs/view/FileMetaTablePlainView.java +++ b/src/main/java/libKonogonka/fs/RomFs/view/FileMetaTablePlainView.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.RomFs.view; +package libKonogonka.fs.RomFs.view; import libKonogonka.Converter; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/libKonogonka/Tools/RomFs/view/FileSystemTreeViewMaker.java b/src/main/java/libKonogonka/fs/RomFs/view/FileSystemTreeViewMaker.java similarity index 95% rename from src/main/java/libKonogonka/Tools/RomFs/view/FileSystemTreeViewMaker.java rename to src/main/java/libKonogonka/fs/RomFs/view/FileSystemTreeViewMaker.java index ce2c5e8..f899de2 100644 --- a/src/main/java/libKonogonka/Tools/RomFs/view/FileSystemTreeViewMaker.java +++ b/src/main/java/libKonogonka/fs/RomFs/view/FileSystemTreeViewMaker.java @@ -16,9 +16,9 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.RomFs.view; +package libKonogonka.fs.RomFs.view; -import libKonogonka.Tools.RomFs.FileSystemEntry; +import libKonogonka.fs.RomFs.FileSystemEntry; import java.util.List; /** diff --git a/src/main/java/libKonogonka/Tools/TIK/TIKProvider.java b/src/main/java/libKonogonka/fs/TIK/TIKProvider.java similarity index 99% rename from src/main/java/libKonogonka/Tools/TIK/TIKProvider.java rename to src/main/java/libKonogonka/fs/TIK/TIKProvider.java index 0824563..7c4a282 100644 --- a/src/main/java/libKonogonka/Tools/TIK/TIKProvider.java +++ b/src/main/java/libKonogonka/fs/TIK/TIKProvider.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.TIK; +package libKonogonka.fs.TIK; import java.io.BufferedInputStream; import java.io.File; diff --git a/src/main/java/libKonogonka/Tools/XCI/HFS0File.java b/src/main/java/libKonogonka/fs/XCI/HFS0File.java similarity index 98% rename from src/main/java/libKonogonka/Tools/XCI/HFS0File.java rename to src/main/java/libKonogonka/fs/XCI/HFS0File.java index fe53041..23f247a 100644 --- a/src/main/java/libKonogonka/Tools/XCI/HFS0File.java +++ b/src/main/java/libKonogonka/fs/XCI/HFS0File.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.XCI; +package libKonogonka.fs.XCI; public class HFS0File { private final String name; diff --git a/src/main/java/libKonogonka/Tools/XCI/HFS0Provider.java b/src/main/java/libKonogonka/fs/XCI/HFS0Provider.java similarity index 98% rename from src/main/java/libKonogonka/Tools/XCI/HFS0Provider.java rename to src/main/java/libKonogonka/fs/XCI/HFS0Provider.java index 2cc6000..9a4b2d6 100644 --- a/src/main/java/libKonogonka/Tools/XCI/HFS0Provider.java +++ b/src/main/java/libKonogonka/fs/XCI/HFS0Provider.java @@ -16,10 +16,10 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.XCI; +package libKonogonka.fs.XCI; -import libKonogonka.Tools.ExportAble; -import libKonogonka.Tools.ISuperProvider; +import libKonogonka.fs.ExportAble; +import libKonogonka.fs.ISuperProvider; import libKonogonka.aesctr.InFileStreamProducer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/libKonogonka/Tools/XCI/XCIGamecardCert.java b/src/main/java/libKonogonka/fs/XCI/XCIGamecardCert.java similarity index 99% rename from src/main/java/libKonogonka/Tools/XCI/XCIGamecardCert.java rename to src/main/java/libKonogonka/fs/XCI/XCIGamecardCert.java index 17e8b57..8fc9144 100644 --- a/src/main/java/libKonogonka/Tools/XCI/XCIGamecardCert.java +++ b/src/main/java/libKonogonka/fs/XCI/XCIGamecardCert.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.XCI; +package libKonogonka.fs.XCI; import libKonogonka.Converter; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/libKonogonka/Tools/XCI/XCIGamecardHeader.java b/src/main/java/libKonogonka/fs/XCI/XCIGamecardHeader.java similarity index 99% rename from src/main/java/libKonogonka/Tools/XCI/XCIGamecardHeader.java rename to src/main/java/libKonogonka/fs/XCI/XCIGamecardHeader.java index 726c976..14c5802 100644 --- a/src/main/java/libKonogonka/Tools/XCI/XCIGamecardHeader.java +++ b/src/main/java/libKonogonka/fs/XCI/XCIGamecardHeader.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.XCI; +package libKonogonka.fs.XCI; import libKonogonka.Converter; diff --git a/src/main/java/libKonogonka/Tools/XCI/XCIGamecardInfo.java b/src/main/java/libKonogonka/fs/XCI/XCIGamecardInfo.java similarity index 99% rename from src/main/java/libKonogonka/Tools/XCI/XCIGamecardInfo.java rename to src/main/java/libKonogonka/fs/XCI/XCIGamecardInfo.java index 11c924e..139d039 100644 --- a/src/main/java/libKonogonka/Tools/XCI/XCIGamecardInfo.java +++ b/src/main/java/libKonogonka/fs/XCI/XCIGamecardInfo.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.XCI; +package libKonogonka.fs.XCI; import javax.crypto.Cipher; import javax.crypto.spec.IvParameterSpec; diff --git a/src/main/java/libKonogonka/Tools/XCI/XCIProvider.java b/src/main/java/libKonogonka/fs/XCI/XCIProvider.java similarity index 99% rename from src/main/java/libKonogonka/Tools/XCI/XCIProvider.java rename to src/main/java/libKonogonka/fs/XCI/XCIProvider.java index 662d4bd..8d1ceba 100644 --- a/src/main/java/libKonogonka/Tools/XCI/XCIProvider.java +++ b/src/main/java/libKonogonka/fs/XCI/XCIProvider.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.XCI; +package libKonogonka.fs.XCI; import java.io.File; import java.io.FileNotFoundException; diff --git a/src/main/java/libKonogonka/Tools/other/System2/KernelMap.java b/src/main/java/libKonogonka/fs/other/System2/KernelMap.java similarity index 99% rename from src/main/java/libKonogonka/Tools/other/System2/KernelMap.java rename to src/main/java/libKonogonka/fs/other/System2/KernelMap.java index cb3aa91..27f5d62 100644 --- a/src/main/java/libKonogonka/Tools/other/System2/KernelMap.java +++ b/src/main/java/libKonogonka/fs/other/System2/KernelMap.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.other.System2; +package libKonogonka.fs.other.System2; import libKonogonka.Converter; import libKonogonka.RainbowDump; diff --git a/src/main/java/libKonogonka/Tools/other/System2/System2Header.java b/src/main/java/libKonogonka/fs/other/System2/System2Header.java similarity index 99% rename from src/main/java/libKonogonka/Tools/other/System2/System2Header.java rename to src/main/java/libKonogonka/fs/other/System2/System2Header.java index a6be53b..8439b3f 100644 --- a/src/main/java/libKonogonka/Tools/other/System2/System2Header.java +++ b/src/main/java/libKonogonka/fs/other/System2/System2Header.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.other.System2; +package libKonogonka.fs.other.System2; import libKonogonka.Converter; import libKonogonka.RainbowDump; diff --git a/src/main/java/libKonogonka/Tools/other/System2/System2Provider.java b/src/main/java/libKonogonka/fs/other/System2/System2Provider.java similarity index 97% rename from src/main/java/libKonogonka/Tools/other/System2/System2Provider.java rename to src/main/java/libKonogonka/fs/other/System2/System2Provider.java index 71f3343..bdce424 100644 --- a/src/main/java/libKonogonka/Tools/other/System2/System2Provider.java +++ b/src/main/java/libKonogonka/fs/other/System2/System2Provider.java @@ -16,11 +16,11 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.other.System2; +package libKonogonka.fs.other.System2; import libKonogonka.KeyChainHolder; -import libKonogonka.Tools.ExportAble; -import libKonogonka.Tools.other.System2.ini1.Ini1Provider; +import libKonogonka.fs.ExportAble; +import libKonogonka.fs.other.System2.ini1.Ini1Provider; import libKonogonka.aesctr.InFileStreamProducer; import libKonogonka.aesctr.InFileStreamClassicProducer; diff --git a/src/main/java/libKonogonka/Tools/other/System2/ini1/Ini1Header.java b/src/main/java/libKonogonka/fs/other/System2/ini1/Ini1Header.java similarity index 97% rename from src/main/java/libKonogonka/Tools/other/System2/ini1/Ini1Header.java rename to src/main/java/libKonogonka/fs/other/System2/ini1/Ini1Header.java index 737de8f..b8cdbdc 100644 --- a/src/main/java/libKonogonka/Tools/other/System2/ini1/Ini1Header.java +++ b/src/main/java/libKonogonka/fs/other/System2/ini1/Ini1Header.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.other.System2.ini1; +package libKonogonka.fs.other.System2.ini1; import libKonogonka.Converter; import libKonogonka.RainbowDump; diff --git a/src/main/java/libKonogonka/Tools/other/System2/ini1/Ini1Provider.java b/src/main/java/libKonogonka/fs/other/System2/ini1/Ini1Provider.java similarity index 96% rename from src/main/java/libKonogonka/Tools/other/System2/ini1/Ini1Provider.java rename to src/main/java/libKonogonka/fs/other/System2/ini1/Ini1Provider.java index ac94341..b9004bf 100644 --- a/src/main/java/libKonogonka/Tools/other/System2/ini1/Ini1Provider.java +++ b/src/main/java/libKonogonka/fs/other/System2/ini1/Ini1Provider.java @@ -16,10 +16,10 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.other.System2.ini1; +package libKonogonka.fs.other.System2.ini1; -import libKonogonka.Tools.ExportAble; -import libKonogonka.Tools.other.System2.System2Header; +import libKonogonka.fs.ExportAble; +import libKonogonka.fs.other.System2.System2Header; import libKonogonka.aesctr.InFileStreamClassicProducer; import java.io.IOException; diff --git a/src/main/java/libKonogonka/Tools/other/System2/ini1/KIP1Header.java b/src/main/java/libKonogonka/fs/other/System2/ini1/KIP1Header.java similarity index 98% rename from src/main/java/libKonogonka/Tools/other/System2/ini1/KIP1Header.java rename to src/main/java/libKonogonka/fs/other/System2/ini1/KIP1Header.java index 95e9a4b..8cf1ab1 100644 --- a/src/main/java/libKonogonka/Tools/other/System2/ini1/KIP1Header.java +++ b/src/main/java/libKonogonka/fs/other/System2/ini1/KIP1Header.java @@ -16,12 +16,12 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.other.System2.ini1; +package libKonogonka.fs.other.System2.ini1; import libKonogonka.Converter; import libKonogonka.RainbowDump; -import libKonogonka.Tools.NPDM.KernelAccessControlProvider; -import libKonogonka.Tools.NSO.SegmentHeader; +import libKonogonka.fs.NPDM.KernelAccessControlProvider; +import libKonogonka.fs.NSO.SegmentHeader; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/libKonogonka/Tools/other/System2/ini1/KIP1Provider.java b/src/main/java/libKonogonka/fs/other/System2/ini1/KIP1Provider.java similarity index 97% rename from src/main/java/libKonogonka/Tools/other/System2/ini1/KIP1Provider.java rename to src/main/java/libKonogonka/fs/other/System2/ini1/KIP1Provider.java index 79b2b75..69b1481 100644 --- a/src/main/java/libKonogonka/Tools/other/System2/ini1/KIP1Provider.java +++ b/src/main/java/libKonogonka/fs/other/System2/ini1/KIP1Provider.java @@ -16,9 +16,9 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.other.System2.ini1; +package libKonogonka.fs.other.System2.ini1; -import libKonogonka.Tools.ExportAble; +import libKonogonka.fs.ExportAble; import libKonogonka.aesctr.InFileStreamClassicProducer; import java.nio.file.Paths; diff --git a/src/main/java/libKonogonka/Tools/other/System2/ini1/KIP1Raw.java b/src/main/java/libKonogonka/fs/other/System2/ini1/KIP1Raw.java similarity index 98% rename from src/main/java/libKonogonka/Tools/other/System2/ini1/KIP1Raw.java rename to src/main/java/libKonogonka/fs/other/System2/ini1/KIP1Raw.java index b58e0ab..d5558ef 100644 --- a/src/main/java/libKonogonka/Tools/other/System2/ini1/KIP1Raw.java +++ b/src/main/java/libKonogonka/fs/other/System2/ini1/KIP1Raw.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.other.System2.ini1; +package libKonogonka.fs.other.System2.ini1; import java.nio.ByteBuffer; diff --git a/src/main/java/libKonogonka/Tools/other/System2/ini1/Kip1Unpacker.java b/src/main/java/libKonogonka/fs/other/System2/ini1/Kip1Unpacker.java similarity index 96% rename from src/main/java/libKonogonka/Tools/other/System2/ini1/Kip1Unpacker.java rename to src/main/java/libKonogonka/fs/other/System2/ini1/Kip1Unpacker.java index a08cdec..566d757 100644 --- a/src/main/java/libKonogonka/Tools/other/System2/ini1/Kip1Unpacker.java +++ b/src/main/java/libKonogonka/fs/other/System2/ini1/Kip1Unpacker.java @@ -16,9 +16,9 @@ You should have received a copy of the GNU General Public License along with libKonogonka. If not, see . */ -package libKonogonka.Tools.other.System2.ini1; +package libKonogonka.fs.other.System2.ini1; -import libKonogonka.Tools.NSO.SegmentHeader; +import libKonogonka.fs.NSO.SegmentHeader; import libKonogonka.blz.BlzDecompress; import libKonogonka.aesctr.InFileStreamClassicProducer; @@ -29,7 +29,7 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.charset.StandardCharsets; -import static libKonogonka.Tools.other.System2.ini1.KIP1Provider.HEADER_SIZE; +import static libKonogonka.fs.other.System2.ini1.KIP1Provider.HEADER_SIZE; public class Kip1Unpacker { private static final String DECOMPRESSED_FILE_POSTFIX = "_decompressed"; @@ -42,7 +42,6 @@ public class Kip1Unpacker { private byte[] _rwDataDecompressedSection; private int textFileOffsetNew; private int roDataFileOffsetNew; - private int rwDataFileOffsetNew; private Kip1Unpacker(KIP1Header kip1Header, InFileStreamClassicProducer producer) throws Exception{ this.kip1Header = kip1Header; @@ -150,7 +149,7 @@ public class Kip1Unpacker { private void makeHeader(){ textFileOffsetNew = kip1Header.getTextSegmentHeader().getMemoryOffset(); roDataFileOffsetNew = kip1Header.getRoDataSegmentHeader().getMemoryOffset(); - rwDataFileOffsetNew = kip1Header.getRwDataSegmentHeader().getMemoryOffset(); + int rwDataFileOffsetNew = kip1Header.getRwDataSegmentHeader().getMemoryOffset(); byte flags = kip1Header.getFlags(); flags &= ~0b111; //mark .text .ro .rw as 'not compress' diff --git a/src/test/java/libKonogonka/package2/ExtractPackage2Test.java b/src/test/java/libKonogonka/package2/ExtractPackage2Test.java index cc04fcd..831b633 100644 --- a/src/test/java/libKonogonka/package2/ExtractPackage2Test.java +++ b/src/test/java/libKonogonka/package2/ExtractPackage2Test.java @@ -2,9 +2,9 @@ package libKonogonka.package2; import libKonogonka.Converter; import libKonogonka.KeyChainHolder; -import libKonogonka.Tools.NCA.NCAProvider; -import libKonogonka.Tools.RomFs.FileSystemEntry; -import libKonogonka.Tools.RomFs.RomFsProvider; +import libKonogonka.fs.NCA.NCAProvider; +import libKonogonka.fs.RomFs.FileSystemEntry; +import libKonogonka.fs.RomFs.RomFsProvider; import org.junit.jupiter.api.*; import java.io.File; diff --git a/src/test/java/libKonogonka/package2/Ini1ExtractTest.java b/src/test/java/libKonogonka/package2/Ini1ExtractTest.java index 326e254..3ac56d0 100644 --- a/src/test/java/libKonogonka/package2/Ini1ExtractTest.java +++ b/src/test/java/libKonogonka/package2/Ini1ExtractTest.java @@ -2,11 +2,11 @@ package libKonogonka.package2; import libKonogonka.Converter; import libKonogonka.KeyChainHolder; -import libKonogonka.Tools.NCA.NCAProvider; -import libKonogonka.Tools.RomFs.FileSystemEntry; -import libKonogonka.Tools.RomFs.RomFsProvider; -import libKonogonka.Tools.other.System2.System2Provider; -import libKonogonka.Tools.other.System2.ini1.Ini1Provider; +import libKonogonka.fs.NCA.NCAProvider; +import libKonogonka.fs.RomFs.FileSystemEntry; +import libKonogonka.fs.RomFs.RomFsProvider; +import libKonogonka.fs.other.System2.System2Provider; +import libKonogonka.fs.other.System2.ini1.Ini1Provider; import libKonogonka.aesctr.InFileStreamProducer; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/libKonogonka/package2/KernelBinExtractTest.java b/src/test/java/libKonogonka/package2/KernelBinExtractTest.java index 6b09c36..b56062b 100644 --- a/src/test/java/libKonogonka/package2/KernelBinExtractTest.java +++ b/src/test/java/libKonogonka/package2/KernelBinExtractTest.java @@ -2,10 +2,10 @@ package libKonogonka.package2; import libKonogonka.Converter; import libKonogonka.KeyChainHolder; -import libKonogonka.Tools.NCA.NCAProvider; -import libKonogonka.Tools.RomFs.FileSystemEntry; -import libKonogonka.Tools.RomFs.RomFsProvider; -import libKonogonka.Tools.other.System2.System2Provider; +import libKonogonka.fs.NCA.NCAProvider; +import libKonogonka.fs.RomFs.FileSystemEntry; +import libKonogonka.fs.RomFs.RomFsProvider; +import libKonogonka.fs.other.System2.System2Provider; import libKonogonka.aesctr.InFileStreamProducer; import org.junit.jupiter.api.*; diff --git a/src/test/java/libKonogonka/package2/Kip1ExtractDecompressedTest.java b/src/test/java/libKonogonka/package2/Kip1ExtractDecompressedTest.java index dfeaeed..c121f05 100644 --- a/src/test/java/libKonogonka/package2/Kip1ExtractDecompressedTest.java +++ b/src/test/java/libKonogonka/package2/Kip1ExtractDecompressedTest.java @@ -2,12 +2,12 @@ package libKonogonka.package2; import libKonogonka.Converter; import libKonogonka.KeyChainHolder; -import libKonogonka.Tools.NCA.NCAProvider; -import libKonogonka.Tools.RomFs.FileSystemEntry; -import libKonogonka.Tools.RomFs.RomFsProvider; -import libKonogonka.Tools.other.System2.System2Provider; -import libKonogonka.Tools.other.System2.ini1.Ini1Provider; -import libKonogonka.Tools.other.System2.ini1.KIP1Provider; +import libKonogonka.fs.NCA.NCAProvider; +import libKonogonka.fs.RomFs.FileSystemEntry; +import libKonogonka.fs.RomFs.RomFsProvider; +import libKonogonka.fs.other.System2.System2Provider; +import libKonogonka.fs.other.System2.ini1.Ini1Provider; +import libKonogonka.fs.other.System2.ini1.KIP1Provider; import libKonogonka.aesctr.InFileStreamProducer; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/libKonogonka/package2/Kip1ExtractTest.java b/src/test/java/libKonogonka/package2/Kip1ExtractTest.java index 8172a63..838d140 100644 --- a/src/test/java/libKonogonka/package2/Kip1ExtractTest.java +++ b/src/test/java/libKonogonka/package2/Kip1ExtractTest.java @@ -2,12 +2,12 @@ package libKonogonka.package2; import libKonogonka.Converter; import libKonogonka.KeyChainHolder; -import libKonogonka.Tools.NCA.NCAProvider; -import libKonogonka.Tools.RomFs.FileSystemEntry; -import libKonogonka.Tools.RomFs.RomFsProvider; -import libKonogonka.Tools.other.System2.System2Provider; -import libKonogonka.Tools.other.System2.ini1.Ini1Provider; -import libKonogonka.Tools.other.System2.ini1.KIP1Provider; +import libKonogonka.fs.NCA.NCAProvider; +import libKonogonka.fs.RomFs.FileSystemEntry; +import libKonogonka.fs.RomFs.RomFsProvider; +import libKonogonka.fs.other.System2.System2Provider; +import libKonogonka.fs.other.System2.ini1.Ini1Provider; +import libKonogonka.fs.other.System2.ini1.KIP1Provider; import libKonogonka.aesctr.InFileStreamProducer; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/libKonogonka/unsorted/ExportNso0FromNcaTest.java b/src/test/java/libKonogonka/unsorted/ExportNso0FromNcaTest.java index ccff433..ed7ec0f 100644 --- a/src/test/java/libKonogonka/unsorted/ExportNso0FromNcaTest.java +++ b/src/test/java/libKonogonka/unsorted/ExportNso0FromNcaTest.java @@ -19,9 +19,9 @@ package libKonogonka.unsorted; import libKonogonka.KeyChainHolder; -import libKonogonka.Tools.NCA.NCAProvider; -import libKonogonka.Tools.NSO.NSO0Provider; -import libKonogonka.Tools.PFS0.PFS0Provider; +import libKonogonka.fs.NCA.NCAProvider; +import libKonogonka.fs.NSO.NSO0Provider; +import libKonogonka.fs.PFS0.PFS0Provider; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/libKonogonka/unsorted/KeyChainHolderTest.java b/src/test/java/libKonogonka/unsorted/KeyChainHolderTest.java index afc4b5b..cb84fd5 100644 --- a/src/test/java/libKonogonka/unsorted/KeyChainHolderTest.java +++ b/src/test/java/libKonogonka/unsorted/KeyChainHolderTest.java @@ -54,31 +54,31 @@ public class KeyChainHolderTest { void printKAKApplication(){ System.out.println("-=== key_area_key_application test ===-"); - for (Map.Entry entry : keyChainHolder.getKey_area_key_application().entrySet()){ + for (Map.Entry entry : keyChainHolder.getKey_area_key_application().entrySet()){ System.out.println(entry.getKey() + " - " + entry.getValue()); } } void printKAKOcean(){ System.out.println("-=== key_area_key_ocean test ===-"); - for (Map.Entry entry : keyChainHolder.getKey_area_key_ocean().entrySet()){ + for (Map.Entry entry : keyChainHolder.getKey_area_key_ocean().entrySet()){ System.out.println(entry.getKey() + " - " + entry.getValue()); } } void printKAKSystem(){ System.out.println("-=== key_area_key_system test ===-"); - for (Map.Entry entry : keyChainHolder.getKey_area_key_system().entrySet()){ + for (Map.Entry entry : keyChainHolder.getKey_area_key_system().entrySet()){ System.out.println(entry.getKey() + " - " + entry.getValue()); } } void printKAKTitleKek(){ System.out.println("-=== titlekek test ===-"); - for (Map.Entry entry : keyChainHolder.getTitlekek().entrySet()){ + for (Map.Entry entry : keyChainHolder.getTitlekek().entrySet()){ System.out.println(entry.getKey() + " - " + entry.getValue()); } } void printRawKeySet(){ System.out.println("-=== Raw Key Set (everything) test ===-"); - for (Map.Entry entry : keyChainHolder.getRawKeySet().entrySet()){ + for (Map.Entry entry : keyChainHolder.getRawKeySet().entrySet()){ System.out.println(entry.getKey() + " - " + entry.getValue()); } } diff --git a/src/test/java/libKonogonka/unsorted/NCAProviderSimpleTest.java b/src/test/java/libKonogonka/unsorted/NCAProviderSimpleTest.java index 36377f5..7417a47 100644 --- a/src/test/java/libKonogonka/unsorted/NCAProviderSimpleTest.java +++ b/src/test/java/libKonogonka/unsorted/NCAProviderSimpleTest.java @@ -19,7 +19,7 @@ package libKonogonka.unsorted; import libKonogonka.KeyChainHolder; -import libKonogonka.Tools.NCA.NCAProvider; +import libKonogonka.fs.NCA.NCAProvider; import org.junit.jupiter.api.*; import java.io.BufferedReader; diff --git a/src/test/java/libKonogonka/unsorted/NSODecompressTest.java b/src/test/java/libKonogonka/unsorted/NSODecompressTest.java index 7c50d66..7268e32 100644 --- a/src/test/java/libKonogonka/unsorted/NSODecompressTest.java +++ b/src/test/java/libKonogonka/unsorted/NSODecompressTest.java @@ -18,7 +18,7 @@ */ package libKonogonka.unsorted; -import libKonogonka.Tools.NSO.NSO0Provider; +import libKonogonka.fs.NSO.NSO0Provider; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/libKonogonka/unsorted/NSOTest.java b/src/test/java/libKonogonka/unsorted/NSOTest.java index 5c10d78..5b1ca06 100644 --- a/src/test/java/libKonogonka/unsorted/NSOTest.java +++ b/src/test/java/libKonogonka/unsorted/NSOTest.java @@ -20,10 +20,10 @@ package libKonogonka.unsorted; import libKonogonka.KeyChainHolder; import libKonogonka.RainbowDump; -import libKonogonka.Tools.NCA.NCAProvider; -import libKonogonka.Tools.NSO.NSO0Provider; -import libKonogonka.Tools.PFS0.PFS0Provider; -import libKonogonka.Tools.PFS0.PFS0subFile; +import libKonogonka.fs.NCA.NCAProvider; +import libKonogonka.fs.NSO.NSO0Provider; +import libKonogonka.fs.PFS0.PFS0Provider; +import libKonogonka.fs.PFS0.PFS0subFile; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/libKonogonka/unsorted/NSPpfs0EncryptedTest.java b/src/test/java/libKonogonka/unsorted/NSPpfs0EncryptedTest.java index 8509346..eefab04 100644 --- a/src/test/java/libKonogonka/unsorted/NSPpfs0EncryptedTest.java +++ b/src/test/java/libKonogonka/unsorted/NSPpfs0EncryptedTest.java @@ -21,9 +21,9 @@ package libKonogonka.unsorted; import libKonogonka.KeyChainHolder; import libKonogonka.RainbowDump; import libKonogonka.TitleKeyChainHolder; -import libKonogonka.Tools.NCA.NCAProvider; -import libKonogonka.Tools.PFS0.PFS0Provider; -import libKonogonka.Tools.PFS0.PFS0subFile; +import libKonogonka.fs.NCA.NCAProvider; +import libKonogonka.fs.PFS0.PFS0Provider; +import libKonogonka.fs.PFS0.PFS0subFile; import libKonogonka.aesctr.AesCtrBufferedInputStream; import libKonogonka.aesctr.AesCtrDecryptForMediaBlocks; import org.junit.jupiter.api.Disabled; @@ -209,7 +209,7 @@ public class NSPpfs0EncryptedTest { private void exportContentLegacy(PFS0subFile entry, String saveToLocation) throws Exception { File contentFile = new File(saveToLocation + entry.getName()); - BufferedOutputStream extractedFileBOS = new BufferedOutputStream(new FileOutputStream(contentFile)); + BufferedOutputStream extractedFileBOS = new BufferedOutputStream(Files.newOutputStream(contentFile.toPath())); BufferedInputStream pis = ncaProvider.getNCAContentProvider(0) .getPfs0() .getStreamProducer(entry.getName()) diff --git a/src/test/java/libKonogonka/unsorted/PFS0Test.java b/src/test/java/libKonogonka/unsorted/PFS0Test.java index 9c76293..a4d1551 100644 --- a/src/test/java/libKonogonka/unsorted/PFS0Test.java +++ b/src/test/java/libKonogonka/unsorted/PFS0Test.java @@ -20,8 +20,8 @@ package libKonogonka.unsorted; import libKonogonka.KeyChainHolder; import libKonogonka.TitleKeyChainHolder; -import libKonogonka.Tools.PFS0.PFS0Provider; -import libKonogonka.Tools.PFS0.PFS0subFile; +import libKonogonka.fs.PFS0.PFS0Provider; +import libKonogonka.fs.PFS0.PFS0subFile; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/libKonogonka/unsorted/Pfs0EncryptedTest.java b/src/test/java/libKonogonka/unsorted/Pfs0EncryptedTest.java index d656e02..8c4705a 100644 --- a/src/test/java/libKonogonka/unsorted/Pfs0EncryptedTest.java +++ b/src/test/java/libKonogonka/unsorted/Pfs0EncryptedTest.java @@ -20,9 +20,9 @@ package libKonogonka.unsorted; import libKonogonka.KeyChainHolder; import libKonogonka.RainbowDump; -import libKonogonka.Tools.NCA.NCAProvider; -import libKonogonka.Tools.PFS0.PFS0Provider; -import libKonogonka.Tools.PFS0.PFS0subFile; +import libKonogonka.fs.NCA.NCAProvider; +import libKonogonka.fs.PFS0.PFS0Provider; +import libKonogonka.fs.PFS0.PFS0subFile; import libKonogonka.aesctr.AesCtrBufferedInputStream; import libKonogonka.aesctr.AesCtrDecryptForMediaBlocks; import org.junit.jupiter.api.*; @@ -183,7 +183,7 @@ public class Pfs0EncryptedTest { private void exportContentLegacy(PFS0subFile entry, String saveToLocation) throws Exception { File contentFile = new File(saveToLocation + entry.getName()); - BufferedOutputStream extractedFileBOS = new BufferedOutputStream(new FileOutputStream(contentFile)); + BufferedOutputStream extractedFileBOS = new BufferedOutputStream(Files.newOutputStream(contentFile.toPath())); BufferedInputStream pis = ncaProvider.getNCAContentProvider(0) .getPfs0() .getStreamProducer(entry.getName()) diff --git a/src/test/java/libKonogonka/unsorted/RomFsDecryptedTest.java b/src/test/java/libKonogonka/unsorted/RomFsDecryptedTest.java index 2db5589..d42a97f 100644 --- a/src/test/java/libKonogonka/unsorted/RomFsDecryptedTest.java +++ b/src/test/java/libKonogonka/unsorted/RomFsDecryptedTest.java @@ -22,8 +22,8 @@ import java.io.*; import java.nio.file.Files; import java.nio.file.Path; -import libKonogonka.Tools.RomFs.FileSystemEntry; -import libKonogonka.Tools.RomFs.RomFsProvider; +import libKonogonka.fs.RomFs.FileSystemEntry; +import libKonogonka.fs.RomFs.RomFsProvider; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/libKonogonka/unsorted/RomFsEncryptedTest.java b/src/test/java/libKonogonka/unsorted/RomFsEncryptedTest.java index 4ef5417..dcaf28c 100644 --- a/src/test/java/libKonogonka/unsorted/RomFsEncryptedTest.java +++ b/src/test/java/libKonogonka/unsorted/RomFsEncryptedTest.java @@ -21,9 +21,9 @@ package libKonogonka.unsorted; import libKonogonka.aesctr.AesCtrBufferedInputStream; import libKonogonka.KeyChainHolder; import libKonogonka.RainbowDump; -import libKonogonka.Tools.NCA.NCAProvider; -import libKonogonka.Tools.NCA.NCASectionTableBlock.NcaFsHeader; -import libKonogonka.Tools.RomFs.FileSystemEntry; +import libKonogonka.fs.NCA.NCAProvider; +import libKonogonka.fs.NCA.NCASectionTableBlock.NcaFsHeader; +import libKonogonka.fs.RomFs.FileSystemEntry; import libKonogonka.aesctr.AesCtrDecryptForMediaBlocks; import org.junit.jupiter.api.*; diff --git a/src/test/java/libKonogonka/unsorted/XciTest.java b/src/test/java/libKonogonka/unsorted/XciTest.java index 5112640..bad7e5e 100644 --- a/src/test/java/libKonogonka/unsorted/XciTest.java +++ b/src/test/java/libKonogonka/unsorted/XciTest.java @@ -19,10 +19,10 @@ package libKonogonka.unsorted; import libKonogonka.KeyChainHolder; -import libKonogonka.Tools.NCA.NCAProvider; -import libKonogonka.Tools.XCI.HFS0File; -import libKonogonka.Tools.XCI.HFS0Provider; -import libKonogonka.Tools.XCI.XCIProvider; +import libKonogonka.fs.NCA.NCAProvider; +import libKonogonka.fs.XCI.HFS0File; +import libKonogonka.fs.XCI.HFS0Provider; +import libKonogonka.fs.XCI.XCIProvider; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test;