From fe0f67bcad264fc0101796ad4781e92c5715e8a9 Mon Sep 17 00:00:00 2001 From: Dmitry Isaenko Date: Sat, 21 Jan 2023 14:47:02 +0300 Subject: [PATCH] Update to work with the latest libKonogonka code revision --- README.md | 5 ++++- src/main/java/konogonka/Child/ChildWindow.java | 2 +- .../java/konogonka/Controllers/ITabController.java | 2 +- .../java/konogonka/Controllers/MainController.java | 2 +- .../konogonka/Controllers/NCA/NCAController.java | 6 +++--- .../Controllers/NCA/NCAFsHeaderController.java | 8 ++++---- .../NCA/NCASectionContentController.java | 4 ++-- .../Controllers/NCA/NCATableController.java | 2 +- .../NPDM/FSAccessControlController.java | 2 +- .../Controllers/NPDM/FSAccessHeaderController.java | 2 +- .../NPDM/KernelAccessControlController.java | 2 +- .../konogonka/Controllers/NPDM/NPDMController.java | 8 ++++---- .../konogonka/Controllers/NSP/NSPController.java | 4 ++-- .../Controllers/NSP/Pfs0TableViewController.java | 6 +++--- .../RFS/RFSFolderTableViewController.java | 2 +- .../konogonka/Controllers/RFS/RFSModelEntry.java | 2 +- .../konogonka/Controllers/RFS/RomFsController.java | 8 ++++---- .../konogonka/Controllers/TIK/TIKController.java | 4 ++-- .../Controllers/XCI/HFSBlockController.java | 4 ++-- .../Controllers/XCI/Hfs0TableViewController.java | 4 ++-- .../konogonka/Controllers/XCI/XCIController.java | 4 ++-- .../konogonka/Controllers/XML/XMLController.java | 2 +- src/main/java/konogonka/Workers/Analyzer.java | 14 +++++++------- .../Workers/DumbNCA3ContentExtractor.java | 2 +- .../java/konogonka/Workers/DumbRomFsExtractor.java | 4 ++-- src/main/java/konogonka/Workers/Extractor.java | 2 +- 26 files changed, 55 insertions(+), 52 deletions(-) diff --git a/README.md b/README.md index 8cf4f9d..840414d 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,10 @@ JRE/JDK 8u60 or higher. * [x] NPDM support (to check) * [ ] CERT support * [ ] CNMT support -* [ ] NSO support +* [ ] NSO support (to add; available at lib) +* [ ] package2 support (to add; available at lib) +* [ ] INI1 support (to add; available at lib) +* [ ] KIP support (to add; available at lib) * [x] RomFS * [ ] LogPrinter to singleton implementation. * [x] 'Save to folder' option \ No newline at end of file diff --git a/src/main/java/konogonka/Child/ChildWindow.java b/src/main/java/konogonka/Child/ChildWindow.java index f68d91f..9d6b888 100644 --- a/src/main/java/konogonka/Child/ChildWindow.java +++ b/src/main/java/konogonka/Child/ChildWindow.java @@ -26,7 +26,7 @@ import javafx.stage.Stage; import konogonka.Controllers.IRowModel; import konogonka.Controllers.ITabController; import konogonka.Controllers.XML.XMLController; -import libKonogonka.Tools.ISuperProvider; +import libKonogonka.fs.ISuperProvider; import java.io.IOException; import java.util.Locale; diff --git a/src/main/java/konogonka/Controllers/ITabController.java b/src/main/java/konogonka/Controllers/ITabController.java index 9531d67..418b9eb 100644 --- a/src/main/java/konogonka/Controllers/ITabController.java +++ b/src/main/java/konogonka/Controllers/ITabController.java @@ -19,7 +19,7 @@ package konogonka.Controllers; import javafx.fxml.Initializable; -import libKonogonka.Tools.ISuperProvider; +import libKonogonka.fs.ISuperProvider; import java.io.File; diff --git a/src/main/java/konogonka/Controllers/MainController.java b/src/main/java/konogonka/Controllers/MainController.java index 1531761..a9a8800 100644 --- a/src/main/java/konogonka/Controllers/MainController.java +++ b/src/main/java/konogonka/Controllers/MainController.java @@ -36,7 +36,7 @@ import konogonka.Controllers.XCI.XCIController; import konogonka.Controllers.XML.XMLController; import konogonka.MediatorControl; import konogonka.Settings.SettingsWindow; -import libKonogonka.Tools.ISuperProvider; +import libKonogonka.fs.ISuperProvider; import java.io.*; import java.net.URL; diff --git a/src/main/java/konogonka/Controllers/NCA/NCAController.java b/src/main/java/konogonka/Controllers/NCA/NCAController.java index 243cc20..9a66a25 100644 --- a/src/main/java/konogonka/Controllers/NCA/NCAController.java +++ b/src/main/java/konogonka/Controllers/NCA/NCAController.java @@ -24,9 +24,9 @@ import javafx.scene.control.Label; import javafx.scene.control.TextField; import konogonka.AppPreferences; import konogonka.Controllers.ITabController; -import libKonogonka.Tools.ISuperProvider; -import libKonogonka.Tools.NCA.NCAContent; -import libKonogonka.Tools.NCA.NCAProvider; +import libKonogonka.fs.ISuperProvider; +import libKonogonka.fs.NCA.NCAContent; +import libKonogonka.fs.NCA.NCAProvider; import konogonka.Workers.Analyzer; import java.io.File; diff --git a/src/main/java/konogonka/Controllers/NCA/NCAFsHeaderController.java b/src/main/java/konogonka/Controllers/NCA/NCAFsHeaderController.java index 57303fc..bd56edf 100644 --- a/src/main/java/konogonka/Controllers/NCA/NCAFsHeaderController.java +++ b/src/main/java/konogonka/Controllers/NCA/NCAFsHeaderController.java @@ -22,10 +22,10 @@ import javafx.fxml.FXML; import javafx.scene.control.Label; import javafx.scene.control.TextField; import javafx.scene.control.TitledPane; -import libKonogonka.Tools.NCA.NCASectionTableBlock.CompressionInfo; -import libKonogonka.Tools.NCA.NCASectionTableBlock.MetaDataHashDataInfo; -import libKonogonka.Tools.NCA.NCASectionTableBlock.NcaFsHeader; -import libKonogonka.Tools.NCA.NCASectionTableBlock.SparseInfo; +import libKonogonka.fs.NCA.NCASectionTableBlock.CompressionInfo; +import libKonogonka.fs.NCA.NCASectionTableBlock.MetaDataHashDataInfo; +import libKonogonka.fs.NCA.NCASectionTableBlock.NcaFsHeader; +import libKonogonka.fs.NCA.NCASectionTableBlock.SparseInfo; import static libKonogonka.Converter.byteArrToHexStringAsLE; diff --git a/src/main/java/konogonka/Controllers/NCA/NCASectionContentController.java b/src/main/java/konogonka/Controllers/NCA/NCASectionContentController.java index b5f931e..0a74e1d 100644 --- a/src/main/java/konogonka/Controllers/NCA/NCASectionContentController.java +++ b/src/main/java/konogonka/Controllers/NCA/NCASectionContentController.java @@ -31,9 +31,9 @@ import konogonka.Controllers.NSP.NSPController; import konogonka.Controllers.RFS.RomFsController; import libKonogonka.Converter; import konogonka.MediatorControl; -import libKonogonka.Tools.NCA.NCAContent; +import libKonogonka.fs.NCA.NCAContent; import konogonka.Workers.DumbNCA3ContentExtractor; -import libKonogonka.Tools.PFS0.PFS0Provider; +import libKonogonka.fs.PFS0.PFS0Provider; import java.io.File; import java.net.URL; diff --git a/src/main/java/konogonka/Controllers/NCA/NCATableController.java b/src/main/java/konogonka/Controllers/NCA/NCATableController.java index f148369..a7f968d 100644 --- a/src/main/java/konogonka/Controllers/NCA/NCATableController.java +++ b/src/main/java/konogonka/Controllers/NCA/NCATableController.java @@ -20,7 +20,7 @@ package konogonka.Controllers.NCA; import javafx.fxml.FXML; import javafx.scene.control.Label; -import libKonogonka.Tools.NCA.NCAHeaderTableEntry; +import libKonogonka.fs.NCA.NCAHeaderTableEntry; import static libKonogonka.Converter.byteArrToHexStringAsLE; diff --git a/src/main/java/konogonka/Controllers/NPDM/FSAccessControlController.java b/src/main/java/konogonka/Controllers/NPDM/FSAccessControlController.java index 8a3dce0..a92f777 100644 --- a/src/main/java/konogonka/Controllers/NPDM/FSAccessControlController.java +++ b/src/main/java/konogonka/Controllers/NPDM/FSAccessControlController.java @@ -22,7 +22,7 @@ import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.scene.control.Label; import javafx.scene.control.TextField; -import libKonogonka.Tools.NPDM.ACID.FSAccessControlProvider; +import libKonogonka.fs.NPDM.ACID.FSAccessControlProvider; import java.net.URL; import java.util.ResourceBundle; diff --git a/src/main/java/konogonka/Controllers/NPDM/FSAccessHeaderController.java b/src/main/java/konogonka/Controllers/NPDM/FSAccessHeaderController.java index e4d7b67..a0730e4 100644 --- a/src/main/java/konogonka/Controllers/NPDM/FSAccessHeaderController.java +++ b/src/main/java/konogonka/Controllers/NPDM/FSAccessHeaderController.java @@ -22,7 +22,7 @@ import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.scene.control.Label; import javafx.scene.control.TextField; -import libKonogonka.Tools.NPDM.ACI0.FSAccessHeaderProvider; +import libKonogonka.fs.NPDM.ACI0.FSAccessHeaderProvider; import java.net.URL; import java.util.ResourceBundle; diff --git a/src/main/java/konogonka/Controllers/NPDM/KernelAccessControlController.java b/src/main/java/konogonka/Controllers/NPDM/KernelAccessControlController.java index ca217ac..016b0c4 100644 --- a/src/main/java/konogonka/Controllers/NPDM/KernelAccessControlController.java +++ b/src/main/java/konogonka/Controllers/NPDM/KernelAccessControlController.java @@ -24,7 +24,7 @@ import javafx.scene.control.Label; import javafx.scene.control.Separator; import javafx.scene.layout.HBox; import javafx.scene.layout.VBox; -import libKonogonka.Tools.NPDM.KernelAccessControlProvider; +import libKonogonka.fs.NPDM.KernelAccessControlProvider; import java.util.Map; diff --git a/src/main/java/konogonka/Controllers/NPDM/NPDMController.java b/src/main/java/konogonka/Controllers/NPDM/NPDMController.java index bd788f2..f583b70 100644 --- a/src/main/java/konogonka/Controllers/NPDM/NPDMController.java +++ b/src/main/java/konogonka/Controllers/NPDM/NPDMController.java @@ -23,10 +23,10 @@ import javafx.fxml.FXML; import javafx.scene.control.Label; import javafx.scene.control.TextField; import konogonka.Controllers.ITabController; -import libKonogonka.Tools.ISuperProvider; -import libKonogonka.Tools.NPDM.ACI0.ACI0Provider; -import libKonogonka.Tools.NPDM.ACID.ACIDProvider; -import libKonogonka.Tools.NPDM.NPDMProvider; +import libKonogonka.fs.ISuperProvider; +import libKonogonka.fs.NPDM.ACI0.ACI0Provider; +import libKonogonka.fs.NPDM.ACID.ACIDProvider; +import libKonogonka.fs.NPDM.NPDMProvider; import konogonka.Workers.Analyzer; import java.io.File; diff --git a/src/main/java/konogonka/Controllers/NSP/NSPController.java b/src/main/java/konogonka/Controllers/NSP/NSPController.java index 91a90cc..cc993f9 100644 --- a/src/main/java/konogonka/Controllers/NSP/NSPController.java +++ b/src/main/java/konogonka/Controllers/NSP/NSPController.java @@ -26,8 +26,8 @@ import konogonka.AppPreferences; import konogonka.Controllers.IRowModel; import konogonka.Controllers.ITabController; import konogonka.MediatorControl; -import libKonogonka.Tools.ISuperProvider; -import libKonogonka.Tools.PFS0.PFS0Provider; +import libKonogonka.fs.ISuperProvider; +import libKonogonka.fs.PFS0.PFS0Provider; import konogonka.Workers.Analyzer; import konogonka.Workers.Extractor; diff --git a/src/main/java/konogonka/Controllers/NSP/Pfs0TableViewController.java b/src/main/java/konogonka/Controllers/NSP/Pfs0TableViewController.java index 5400d29..f41c136 100644 --- a/src/main/java/konogonka/Controllers/NSP/Pfs0TableViewController.java +++ b/src/main/java/konogonka/Controllers/NSP/Pfs0TableViewController.java @@ -34,9 +34,9 @@ import javafx.scene.input.KeyEvent; import javafx.scene.input.MouseButton; import konogonka.Controllers.IRowModel; import konogonka.MediatorControl; -import libKonogonka.Tools.ISuperProvider; -import libKonogonka.Tools.PFS0.PFS0Provider; -import libKonogonka.Tools.PFS0.PFS0subFile; +import libKonogonka.fs.ISuperProvider; +import libKonogonka.fs.PFS0.PFS0Provider; +import libKonogonka.fs.PFS0.PFS0subFile; import java.net.URL; import java.util.ArrayList; diff --git a/src/main/java/konogonka/Controllers/RFS/RFSFolderTableViewController.java b/src/main/java/konogonka/Controllers/RFS/RFSFolderTableViewController.java index ac3b09b..b1d268c 100644 --- a/src/main/java/konogonka/Controllers/RFS/RFSFolderTableViewController.java +++ b/src/main/java/konogonka/Controllers/RFS/RFSFolderTableViewController.java @@ -34,7 +34,7 @@ import javafx.scene.input.KeyCode; import javafx.scene.input.MouseButton; import javafx.scene.layout.HBox; import javafx.scene.layout.Region; -import libKonogonka.Tools.RomFs.FileSystemEntry; +import libKonogonka.fs.RomFs.FileSystemEntry; import java.net.URL; import java.util.*; diff --git a/src/main/java/konogonka/Controllers/RFS/RFSModelEntry.java b/src/main/java/konogonka/Controllers/RFS/RFSModelEntry.java index ac8cd95..4af6388 100644 --- a/src/main/java/konogonka/Controllers/RFS/RFSModelEntry.java +++ b/src/main/java/konogonka/Controllers/RFS/RFSModelEntry.java @@ -19,7 +19,7 @@ package konogonka.Controllers.RFS; import konogonka.Controllers.IRowModel; -import libKonogonka.Tools.RomFs.FileSystemEntry; +import libKonogonka.fs.RomFs.FileSystemEntry; public class RFSModelEntry implements IRowModel { private FileSystemEntry fileSystemEntry; diff --git a/src/main/java/konogonka/Controllers/RFS/RomFsController.java b/src/main/java/konogonka/Controllers/RFS/RomFsController.java index f22c7d9..df75b97 100644 --- a/src/main/java/konogonka/Controllers/RFS/RomFsController.java +++ b/src/main/java/konogonka/Controllers/RFS/RomFsController.java @@ -25,12 +25,12 @@ import javafx.scene.layout.Region; import konogonka.AppPreferences; import konogonka.Controllers.ITabController; import konogonka.MediatorControl; -import libKonogonka.Tools.ISuperProvider; -import libKonogonka.Tools.RomFs.FileSystemEntry; -import libKonogonka.Tools.RomFs.Level6Header; +import libKonogonka.fs.ISuperProvider; +import libKonogonka.fs.RomFs.FileSystemEntry; +import libKonogonka.fs.RomFs.Level6Header; import konogonka.Workers.Analyzer; import konogonka.Workers.DumbRomFsExtractor; -import libKonogonka.Tools.RomFs.RomFsProvider; +import libKonogonka.fs.RomFs.RomFsProvider; import java.io.File; import java.net.URL; diff --git a/src/main/java/konogonka/Controllers/TIK/TIKController.java b/src/main/java/konogonka/Controllers/TIK/TIKController.java index 44be0fd..93c8bd4 100644 --- a/src/main/java/konogonka/Controllers/TIK/TIKController.java +++ b/src/main/java/konogonka/Controllers/TIK/TIKController.java @@ -25,8 +25,8 @@ import javafx.scene.control.Label; import javafx.scene.control.TextField; import konogonka.AppPreferences; import konogonka.Controllers.ITabController; -import libKonogonka.Tools.ISuperProvider; -import libKonogonka.Tools.TIK.TIKProvider; +import libKonogonka.fs.ISuperProvider; +import libKonogonka.fs.TIK.TIKProvider; import konogonka.Workers.Analyzer; import java.io.File; diff --git a/src/main/java/konogonka/Controllers/XCI/HFSBlockController.java b/src/main/java/konogonka/Controllers/XCI/HFSBlockController.java index 8f63372..c845176 100644 --- a/src/main/java/konogonka/Controllers/XCI/HFSBlockController.java +++ b/src/main/java/konogonka/Controllers/XCI/HFSBlockController.java @@ -26,8 +26,8 @@ import javafx.scene.control.TitledPane; import konogonka.AppPreferences; import konogonka.Controllers.IRowModel; import konogonka.MediatorControl; -import libKonogonka.Tools.ISuperProvider; -import libKonogonka.Tools.XCI.HFS0Provider; +import libKonogonka.fs.ISuperProvider; +import libKonogonka.fs.XCI.HFS0Provider; import konogonka.Workers.Extractor; import java.io.File; diff --git a/src/main/java/konogonka/Controllers/XCI/Hfs0TableViewController.java b/src/main/java/konogonka/Controllers/XCI/Hfs0TableViewController.java index 85268be..9c78758 100644 --- a/src/main/java/konogonka/Controllers/XCI/Hfs0TableViewController.java +++ b/src/main/java/konogonka/Controllers/XCI/Hfs0TableViewController.java @@ -37,8 +37,8 @@ import javafx.scene.input.MouseButton; import javafx.util.Callback; import konogonka.Controllers.IRowModel; import konogonka.MediatorControl; -import libKonogonka.Tools.ISuperProvider; -import libKonogonka.Tools.XCI.HFS0Provider; +import libKonogonka.fs.ISuperProvider; +import libKonogonka.fs.XCI.HFS0Provider; import java.net.URL; diff --git a/src/main/java/konogonka/Controllers/XCI/XCIController.java b/src/main/java/konogonka/Controllers/XCI/XCIController.java index 6254411..28dc2de 100644 --- a/src/main/java/konogonka/Controllers/XCI/XCIController.java +++ b/src/main/java/konogonka/Controllers/XCI/XCIController.java @@ -24,8 +24,8 @@ import javafx.scene.control.Label; import javafx.scene.control.TextField; import konogonka.AppPreferences; import konogonka.Controllers.ITabController; -import libKonogonka.Tools.ISuperProvider; -import libKonogonka.Tools.XCI.XCIProvider; +import libKonogonka.fs.ISuperProvider; +import libKonogonka.fs.XCI.XCIProvider; import konogonka.Workers.Analyzer; import java.io.File; diff --git a/src/main/java/konogonka/Controllers/XML/XMLController.java b/src/main/java/konogonka/Controllers/XML/XMLController.java index a116b5b..420c572 100644 --- a/src/main/java/konogonka/Controllers/XML/XMLController.java +++ b/src/main/java/konogonka/Controllers/XML/XMLController.java @@ -22,7 +22,7 @@ import javafx.fxml.FXML; import javafx.scene.control.TextArea; import konogonka.Controllers.ITabController; import konogonka.MediatorControl; -import libKonogonka.Tools.ISuperProvider; +import libKonogonka.fs.ISuperProvider; import java.io.BufferedInputStream; import java.io.File; diff --git a/src/main/java/konogonka/Workers/Analyzer.java b/src/main/java/konogonka/Workers/Analyzer.java index 5c14f63..a2012a8 100644 --- a/src/main/java/konogonka/Workers/Analyzer.java +++ b/src/main/java/konogonka/Workers/Analyzer.java @@ -21,13 +21,13 @@ package konogonka.Workers; import javafx.concurrent.Task; import konogonka.ModelControllers.EMsgType; import konogonka.ModelControllers.LogPrinter; -import libKonogonka.Tools.ISuperProvider; -import libKonogonka.Tools.NCA.NCAProvider; -import libKonogonka.Tools.NPDM.NPDMProvider; -import libKonogonka.Tools.PFS0.PFS0Provider; -import libKonogonka.Tools.RomFs.RomFsProvider; -import libKonogonka.Tools.TIK.TIKProvider; -import libKonogonka.Tools.XCI.XCIProvider; +import libKonogonka.fs.ISuperProvider; +import libKonogonka.fs.NCA.NCAProvider; +import libKonogonka.fs.NPDM.NPDMProvider; +import libKonogonka.fs.PFS0.PFS0Provider; +import libKonogonka.fs.RomFs.RomFsProvider; +import libKonogonka.fs.TIK.TIKProvider; +import libKonogonka.fs.XCI.XCIProvider; import java.io.File; import java.util.HashMap; diff --git a/src/main/java/konogonka/Workers/DumbNCA3ContentExtractor.java b/src/main/java/konogonka/Workers/DumbNCA3ContentExtractor.java index ff1b94b..abdcb97 100644 --- a/src/main/java/konogonka/Workers/DumbNCA3ContentExtractor.java +++ b/src/main/java/konogonka/Workers/DumbNCA3ContentExtractor.java @@ -3,7 +3,7 @@ package konogonka.Workers; import javafx.concurrent.Task; import konogonka.ModelControllers.EMsgType; import konogonka.ModelControllers.LogPrinter; -import libKonogonka.Tools.NCA.NCAContent; +import libKonogonka.fs.NCA.NCAContent; public class DumbNCA3ContentExtractor extends Task { diff --git a/src/main/java/konogonka/Workers/DumbRomFsExtractor.java b/src/main/java/konogonka/Workers/DumbRomFsExtractor.java index 63dd488..33c9602 100644 --- a/src/main/java/konogonka/Workers/DumbRomFsExtractor.java +++ b/src/main/java/konogonka/Workers/DumbRomFsExtractor.java @@ -3,8 +3,8 @@ package konogonka.Workers; import javafx.concurrent.Task; import konogonka.ModelControllers.EMsgType; import konogonka.ModelControllers.LogPrinter; -import libKonogonka.Tools.RomFs.FileSystemEntry; -import libKonogonka.Tools.RomFs.RomFsProvider; +import libKonogonka.fs.RomFs.FileSystemEntry; +import libKonogonka.fs.RomFs.RomFsProvider; import java.util.List; diff --git a/src/main/java/konogonka/Workers/Extractor.java b/src/main/java/konogonka/Workers/Extractor.java index c4e562b..c7991e3 100644 --- a/src/main/java/konogonka/Workers/Extractor.java +++ b/src/main/java/konogonka/Workers/Extractor.java @@ -22,7 +22,7 @@ import javafx.concurrent.Task; import konogonka.Controllers.IRowModel; import konogonka.ModelControllers.EMsgType; import konogonka.ModelControllers.LogPrinter; -import libKonogonka.Tools.ISuperProvider; +import libKonogonka.fs.ISuperProvider; import java.util.List;