Update to work with the latest libKonogonka code revision
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Dmitry Isaenko 2023-01-21 14:47:02 +03:00
parent 8f5481ab3e
commit fe0f67bcad
26 changed files with 55 additions and 52 deletions

View file

@ -61,7 +61,10 @@ JRE/JDK 8u60 or higher.
* [x] NPDM support (to check) * [x] NPDM support (to check)
* [ ] CERT support * [ ] CERT support
* [ ] CNMT 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 * [x] RomFS
* [ ] LogPrinter to singleton implementation. * [ ] LogPrinter to singleton implementation.
* [x] 'Save to folder' option * [x] 'Save to folder' option

View file

@ -26,7 +26,7 @@ import javafx.stage.Stage;
import konogonka.Controllers.IRowModel; import konogonka.Controllers.IRowModel;
import konogonka.Controllers.ITabController; import konogonka.Controllers.ITabController;
import konogonka.Controllers.XML.XMLController; import konogonka.Controllers.XML.XMLController;
import libKonogonka.Tools.ISuperProvider; import libKonogonka.fs.ISuperProvider;
import java.io.IOException; import java.io.IOException;
import java.util.Locale; import java.util.Locale;

View file

@ -19,7 +19,7 @@
package konogonka.Controllers; package konogonka.Controllers;
import javafx.fxml.Initializable; import javafx.fxml.Initializable;
import libKonogonka.Tools.ISuperProvider; import libKonogonka.fs.ISuperProvider;
import java.io.File; import java.io.File;

View file

@ -36,7 +36,7 @@ import konogonka.Controllers.XCI.XCIController;
import konogonka.Controllers.XML.XMLController; import konogonka.Controllers.XML.XMLController;
import konogonka.MediatorControl; import konogonka.MediatorControl;
import konogonka.Settings.SettingsWindow; import konogonka.Settings.SettingsWindow;
import libKonogonka.Tools.ISuperProvider; import libKonogonka.fs.ISuperProvider;
import java.io.*; import java.io.*;
import java.net.URL; import java.net.URL;

View file

@ -24,9 +24,9 @@ import javafx.scene.control.Label;
import javafx.scene.control.TextField; import javafx.scene.control.TextField;
import konogonka.AppPreferences; import konogonka.AppPreferences;
import konogonka.Controllers.ITabController; import konogonka.Controllers.ITabController;
import libKonogonka.Tools.ISuperProvider; import libKonogonka.fs.ISuperProvider;
import libKonogonka.Tools.NCA.NCAContent; import libKonogonka.fs.NCA.NCAContent;
import libKonogonka.Tools.NCA.NCAProvider; import libKonogonka.fs.NCA.NCAProvider;
import konogonka.Workers.Analyzer; import konogonka.Workers.Analyzer;
import java.io.File; import java.io.File;

View file

@ -22,10 +22,10 @@ import javafx.fxml.FXML;
import javafx.scene.control.Label; import javafx.scene.control.Label;
import javafx.scene.control.TextField; import javafx.scene.control.TextField;
import javafx.scene.control.TitledPane; import javafx.scene.control.TitledPane;
import libKonogonka.Tools.NCA.NCASectionTableBlock.CompressionInfo; import libKonogonka.fs.NCA.NCASectionTableBlock.CompressionInfo;
import libKonogonka.Tools.NCA.NCASectionTableBlock.MetaDataHashDataInfo; import libKonogonka.fs.NCA.NCASectionTableBlock.MetaDataHashDataInfo;
import libKonogonka.Tools.NCA.NCASectionTableBlock.NcaFsHeader; import libKonogonka.fs.NCA.NCASectionTableBlock.NcaFsHeader;
import libKonogonka.Tools.NCA.NCASectionTableBlock.SparseInfo; import libKonogonka.fs.NCA.NCASectionTableBlock.SparseInfo;
import static libKonogonka.Converter.byteArrToHexStringAsLE; import static libKonogonka.Converter.byteArrToHexStringAsLE;

View file

@ -31,9 +31,9 @@ import konogonka.Controllers.NSP.NSPController;
import konogonka.Controllers.RFS.RomFsController; import konogonka.Controllers.RFS.RomFsController;
import libKonogonka.Converter; import libKonogonka.Converter;
import konogonka.MediatorControl; import konogonka.MediatorControl;
import libKonogonka.Tools.NCA.NCAContent; import libKonogonka.fs.NCA.NCAContent;
import konogonka.Workers.DumbNCA3ContentExtractor; import konogonka.Workers.DumbNCA3ContentExtractor;
import libKonogonka.Tools.PFS0.PFS0Provider; import libKonogonka.fs.PFS0.PFS0Provider;
import java.io.File; import java.io.File;
import java.net.URL; import java.net.URL;

View file

@ -20,7 +20,7 @@ package konogonka.Controllers.NCA;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.Label; import javafx.scene.control.Label;
import libKonogonka.Tools.NCA.NCAHeaderTableEntry; import libKonogonka.fs.NCA.NCAHeaderTableEntry;
import static libKonogonka.Converter.byteArrToHexStringAsLE; import static libKonogonka.Converter.byteArrToHexStringAsLE;

View file

@ -22,7 +22,7 @@ import javafx.fxml.FXML;
import javafx.fxml.Initializable; import javafx.fxml.Initializable;
import javafx.scene.control.Label; import javafx.scene.control.Label;
import javafx.scene.control.TextField; import javafx.scene.control.TextField;
import libKonogonka.Tools.NPDM.ACID.FSAccessControlProvider; import libKonogonka.fs.NPDM.ACID.FSAccessControlProvider;
import java.net.URL; import java.net.URL;
import java.util.ResourceBundle; import java.util.ResourceBundle;

View file

@ -22,7 +22,7 @@ import javafx.fxml.FXML;
import javafx.fxml.Initializable; import javafx.fxml.Initializable;
import javafx.scene.control.Label; import javafx.scene.control.Label;
import javafx.scene.control.TextField; import javafx.scene.control.TextField;
import libKonogonka.Tools.NPDM.ACI0.FSAccessHeaderProvider; import libKonogonka.fs.NPDM.ACI0.FSAccessHeaderProvider;
import java.net.URL; import java.net.URL;
import java.util.ResourceBundle; import java.util.ResourceBundle;

View file

@ -24,7 +24,7 @@ import javafx.scene.control.Label;
import javafx.scene.control.Separator; import javafx.scene.control.Separator;
import javafx.scene.layout.HBox; import javafx.scene.layout.HBox;
import javafx.scene.layout.VBox; import javafx.scene.layout.VBox;
import libKonogonka.Tools.NPDM.KernelAccessControlProvider; import libKonogonka.fs.NPDM.KernelAccessControlProvider;
import java.util.Map; import java.util.Map;

View file

@ -23,10 +23,10 @@ import javafx.fxml.FXML;
import javafx.scene.control.Label; import javafx.scene.control.Label;
import javafx.scene.control.TextField; import javafx.scene.control.TextField;
import konogonka.Controllers.ITabController; import konogonka.Controllers.ITabController;
import libKonogonka.Tools.ISuperProvider; import libKonogonka.fs.ISuperProvider;
import libKonogonka.Tools.NPDM.ACI0.ACI0Provider; import libKonogonka.fs.NPDM.ACI0.ACI0Provider;
import libKonogonka.Tools.NPDM.ACID.ACIDProvider; import libKonogonka.fs.NPDM.ACID.ACIDProvider;
import libKonogonka.Tools.NPDM.NPDMProvider; import libKonogonka.fs.NPDM.NPDMProvider;
import konogonka.Workers.Analyzer; import konogonka.Workers.Analyzer;
import java.io.File; import java.io.File;

View file

@ -26,8 +26,8 @@ import konogonka.AppPreferences;
import konogonka.Controllers.IRowModel; import konogonka.Controllers.IRowModel;
import konogonka.Controllers.ITabController; import konogonka.Controllers.ITabController;
import konogonka.MediatorControl; import konogonka.MediatorControl;
import libKonogonka.Tools.ISuperProvider; import libKonogonka.fs.ISuperProvider;
import libKonogonka.Tools.PFS0.PFS0Provider; import libKonogonka.fs.PFS0.PFS0Provider;
import konogonka.Workers.Analyzer; import konogonka.Workers.Analyzer;
import konogonka.Workers.Extractor; import konogonka.Workers.Extractor;

View file

@ -34,9 +34,9 @@ import javafx.scene.input.KeyEvent;
import javafx.scene.input.MouseButton; import javafx.scene.input.MouseButton;
import konogonka.Controllers.IRowModel; import konogonka.Controllers.IRowModel;
import konogonka.MediatorControl; import konogonka.MediatorControl;
import libKonogonka.Tools.ISuperProvider; import libKonogonka.fs.ISuperProvider;
import libKonogonka.Tools.PFS0.PFS0Provider; import libKonogonka.fs.PFS0.PFS0Provider;
import libKonogonka.Tools.PFS0.PFS0subFile; import libKonogonka.fs.PFS0.PFS0subFile;
import java.net.URL; import java.net.URL;
import java.util.ArrayList; import java.util.ArrayList;

View file

@ -34,7 +34,7 @@ import javafx.scene.input.KeyCode;
import javafx.scene.input.MouseButton; import javafx.scene.input.MouseButton;
import javafx.scene.layout.HBox; import javafx.scene.layout.HBox;
import javafx.scene.layout.Region; import javafx.scene.layout.Region;
import libKonogonka.Tools.RomFs.FileSystemEntry; import libKonogonka.fs.RomFs.FileSystemEntry;
import java.net.URL; import java.net.URL;
import java.util.*; import java.util.*;

View file

@ -19,7 +19,7 @@
package konogonka.Controllers.RFS; package konogonka.Controllers.RFS;
import konogonka.Controllers.IRowModel; import konogonka.Controllers.IRowModel;
import libKonogonka.Tools.RomFs.FileSystemEntry; import libKonogonka.fs.RomFs.FileSystemEntry;
public class RFSModelEntry implements IRowModel { public class RFSModelEntry implements IRowModel {
private FileSystemEntry fileSystemEntry; private FileSystemEntry fileSystemEntry;

View file

@ -25,12 +25,12 @@ import javafx.scene.layout.Region;
import konogonka.AppPreferences; import konogonka.AppPreferences;
import konogonka.Controllers.ITabController; import konogonka.Controllers.ITabController;
import konogonka.MediatorControl; import konogonka.MediatorControl;
import libKonogonka.Tools.ISuperProvider; import libKonogonka.fs.ISuperProvider;
import libKonogonka.Tools.RomFs.FileSystemEntry; import libKonogonka.fs.RomFs.FileSystemEntry;
import libKonogonka.Tools.RomFs.Level6Header; import libKonogonka.fs.RomFs.Level6Header;
import konogonka.Workers.Analyzer; import konogonka.Workers.Analyzer;
import konogonka.Workers.DumbRomFsExtractor; import konogonka.Workers.DumbRomFsExtractor;
import libKonogonka.Tools.RomFs.RomFsProvider; import libKonogonka.fs.RomFs.RomFsProvider;
import java.io.File; import java.io.File;
import java.net.URL; import java.net.URL;

View file

@ -25,8 +25,8 @@ import javafx.scene.control.Label;
import javafx.scene.control.TextField; import javafx.scene.control.TextField;
import konogonka.AppPreferences; import konogonka.AppPreferences;
import konogonka.Controllers.ITabController; import konogonka.Controllers.ITabController;
import libKonogonka.Tools.ISuperProvider; import libKonogonka.fs.ISuperProvider;
import libKonogonka.Tools.TIK.TIKProvider; import libKonogonka.fs.TIK.TIKProvider;
import konogonka.Workers.Analyzer; import konogonka.Workers.Analyzer;
import java.io.File; import java.io.File;

View file

@ -26,8 +26,8 @@ import javafx.scene.control.TitledPane;
import konogonka.AppPreferences; import konogonka.AppPreferences;
import konogonka.Controllers.IRowModel; import konogonka.Controllers.IRowModel;
import konogonka.MediatorControl; import konogonka.MediatorControl;
import libKonogonka.Tools.ISuperProvider; import libKonogonka.fs.ISuperProvider;
import libKonogonka.Tools.XCI.HFS0Provider; import libKonogonka.fs.XCI.HFS0Provider;
import konogonka.Workers.Extractor; import konogonka.Workers.Extractor;
import java.io.File; import java.io.File;

View file

@ -37,8 +37,8 @@ import javafx.scene.input.MouseButton;
import javafx.util.Callback; import javafx.util.Callback;
import konogonka.Controllers.IRowModel; import konogonka.Controllers.IRowModel;
import konogonka.MediatorControl; import konogonka.MediatorControl;
import libKonogonka.Tools.ISuperProvider; import libKonogonka.fs.ISuperProvider;
import libKonogonka.Tools.XCI.HFS0Provider; import libKonogonka.fs.XCI.HFS0Provider;
import java.net.URL; import java.net.URL;

View file

@ -24,8 +24,8 @@ import javafx.scene.control.Label;
import javafx.scene.control.TextField; import javafx.scene.control.TextField;
import konogonka.AppPreferences; import konogonka.AppPreferences;
import konogonka.Controllers.ITabController; import konogonka.Controllers.ITabController;
import libKonogonka.Tools.ISuperProvider; import libKonogonka.fs.ISuperProvider;
import libKonogonka.Tools.XCI.XCIProvider; import libKonogonka.fs.XCI.XCIProvider;
import konogonka.Workers.Analyzer; import konogonka.Workers.Analyzer;
import java.io.File; import java.io.File;

View file

@ -22,7 +22,7 @@ import javafx.fxml.FXML;
import javafx.scene.control.TextArea; import javafx.scene.control.TextArea;
import konogonka.Controllers.ITabController; import konogonka.Controllers.ITabController;
import konogonka.MediatorControl; import konogonka.MediatorControl;
import libKonogonka.Tools.ISuperProvider; import libKonogonka.fs.ISuperProvider;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.File; import java.io.File;

View file

@ -21,13 +21,13 @@ package konogonka.Workers;
import javafx.concurrent.Task; import javafx.concurrent.Task;
import konogonka.ModelControllers.EMsgType; import konogonka.ModelControllers.EMsgType;
import konogonka.ModelControllers.LogPrinter; import konogonka.ModelControllers.LogPrinter;
import libKonogonka.Tools.ISuperProvider; import libKonogonka.fs.ISuperProvider;
import libKonogonka.Tools.NCA.NCAProvider; import libKonogonka.fs.NCA.NCAProvider;
import libKonogonka.Tools.NPDM.NPDMProvider; import libKonogonka.fs.NPDM.NPDMProvider;
import libKonogonka.Tools.PFS0.PFS0Provider; import libKonogonka.fs.PFS0.PFS0Provider;
import libKonogonka.Tools.RomFs.RomFsProvider; import libKonogonka.fs.RomFs.RomFsProvider;
import libKonogonka.Tools.TIK.TIKProvider; import libKonogonka.fs.TIK.TIKProvider;
import libKonogonka.Tools.XCI.XCIProvider; import libKonogonka.fs.XCI.XCIProvider;
import java.io.File; import java.io.File;
import java.util.HashMap; import java.util.HashMap;

View file

@ -3,7 +3,7 @@ package konogonka.Workers;
import javafx.concurrent.Task; import javafx.concurrent.Task;
import konogonka.ModelControllers.EMsgType; import konogonka.ModelControllers.EMsgType;
import konogonka.ModelControllers.LogPrinter; import konogonka.ModelControllers.LogPrinter;
import libKonogonka.Tools.NCA.NCAContent; import libKonogonka.fs.NCA.NCAContent;
public class DumbNCA3ContentExtractor extends Task<Void> { public class DumbNCA3ContentExtractor extends Task<Void> {

View file

@ -3,8 +3,8 @@ package konogonka.Workers;
import javafx.concurrent.Task; import javafx.concurrent.Task;
import konogonka.ModelControllers.EMsgType; import konogonka.ModelControllers.EMsgType;
import konogonka.ModelControllers.LogPrinter; import konogonka.ModelControllers.LogPrinter;
import libKonogonka.Tools.RomFs.FileSystemEntry; import libKonogonka.fs.RomFs.FileSystemEntry;
import libKonogonka.Tools.RomFs.RomFsProvider; import libKonogonka.fs.RomFs.RomFsProvider;
import java.util.List; import java.util.List;

View file

@ -22,7 +22,7 @@ import javafx.concurrent.Task;
import konogonka.Controllers.IRowModel; import konogonka.Controllers.IRowModel;
import konogonka.ModelControllers.EMsgType; import konogonka.ModelControllers.EMsgType;
import konogonka.ModelControllers.LogPrinter; import konogonka.ModelControllers.LogPrinter;
import libKonogonka.Tools.ISuperProvider; import libKonogonka.fs.ISuperProvider;
import java.util.List; import java.util.List;