The-Homebrew-Cloud/JNUSTool
2
0
Fork 0
mirror of https://github.com/Maschell/JNUSTool.git synced 2024-11-24 08:59:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated CSV

Browse Source 
-fixed cert creation when a full tile has a tile.tik
-Java 7 Jar
This commit is contained in:
Maschell 2016-10-23 06:28:16 +02:00
parent 6e595b9305
commit 7a06b71c47
7 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
jar/JNUSTool.jar
View File

Binary file not shown.

2
jar/updatetitles.csv
View File

@ -231,7 +231,7 @@
0005000E-1017C600;2;WUP;0052;WUP-P-BK7E;BK7E52;Skylanders Trap Team;16 0005000E-1017C600;2;WUP;0052;WUP-P-BK7E;BK7E52;Skylanders Trap Team;16
0005000E-1017CD00;1;WUP;00C8;WUP-U-BWPJ;BWPJC8;Hyrule Warriors;32,49,64,80,98,112,113,128,144,160,176,192,208,224,240,256 0005000E-1017CD00;1;WUP;00C8;WUP-U-BWPJ;BWPJC8;Hyrule Warriors;32,49,64,80,98,112,113,128,144,160,176,192,208,224,240,256
0005000E-1017D800;2;WUP;0001;WUP-U-BWPE;BWPE01;Hyrule Warriors;16,32,48,64,80,96,112,128,144,160,176,192 0005000E-1017D800;2;WUP;0001;WUP-U-BWPE;BWPE01;Hyrule Warriors;16,32,48,64,80,96,112,128,144,160,176,192
0005000E-1017D900;4;WUP;0001;WUP-U-BWPP;BWPP01;Hyrule Warriors;16,33,48,64,80,96,112,128,144,160,176,192 0005000E-1017D900;4;WUP;0001;WUP-U-BWPP;BWPP01;Hyrule Warriors;16,33,48,64,80,96,112,128,144,160,176,192,208
0005000E-1017DA00;2;WUP;011S;WUP-P-ACQE;ACQE1S;Costume Quest 2;16 0005000E-1017DA00;2;WUP;011S;WUP-P-ACQE;ACQE1S;Costume Quest 2;16
0005000E-1017E000;4;WUP;00XQ;WUP-P-WK8P;WK8PXQ;Turtle Tale;16 0005000E-1017E000;4;WUP;00XQ;WUP-P-WK8P;WK8PXQ;Turtle Tale;16
0005000E-1017E200;4;WUP;0102;WUP-P-WTSP;WTSP02;3Souls;16 0005000E-1017E200;4;WUP;0102;WUP-P-WTSP;WTSP02;3Souls;16

1 0005000E-10100600 1 WUP 00AF WUP-U-AKNJ AKNJAF TEKKEN TAG TOURNAMENT 2 Wii U EDITION 16
231 0005000E-1017C600 2 WUP 0052 WUP-P-BK7E BK7E52 Skylanders Trap Team 16
232 0005000E-1017CD00 1 WUP 00C8 WUP-U-BWPJ BWPJC8 Hyrule Warriors 32,49,64,80,98,112,113,128,144,160,176,192,208,224,240,256
233 0005000E-1017D800 2 WUP 0001 WUP-U-BWPE BWPE01 Hyrule Warriors 16,32,48,64,80,96,112,128,144,160,176,192
234 0005000E-1017D900 4 WUP 0001 WUP-U-BWPP BWPP01 Hyrule Warriors 16,33,48,64,80,96,112,128,144,160,176,192 16,33,48,64,80,96,112,128,144,160,176,192,208
235 0005000E-1017DA00 2 WUP 011S WUP-P-ACQE ACQE1S Costume Quest 2 16
236 0005000E-1017E000 4 WUP 00XQ WUP-P-WK8P WK8PXQ Turtle Tale 16
237 0005000E-1017E200 4 WUP 0102 WUP-P-WTSP WTSP02 3Souls 16

BIN
release.zip
View File

Binary file not shown.

4
src/de/mas/jnustool/NUSTitle.java
View File

@ -9,6 +9,7 @@ import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.concurrent.ForkJoinPool; import java.util.concurrent.ForkJoinPool;
@ -245,7 +246,7 @@ public class NUSTitle {
byte[] defaultcert = null; byte[] defaultcert = null;
Logger.log("Trying to create title.cert"); Logger.log("Trying to create title.cert");
if(!f.exists()){ if(!f.exists() || Arrays.equals(ticket.cert1, new byte[0x300])){
try{ try{
defaultcert = Util.getDefaultCert(); defaultcert = Util.getDefaultCert();
}catch(Exception e){ }catch(Exception e){
@ -255,6 +256,7 @@ public class NUSTitle {
} }
Logger.log("Got missing cert from OSv10 title"); Logger.log("Got missing cert from OSv10 title");
}else{ }else{
defaultcert = ticket.cert1; defaultcert = ticket.cert1;
} }

18
src/de/mas/jnustool/Starter.java
View File

@ -87,7 +87,7 @@ public class Starter {
m.setVisible(true); m.setVisible(true);
} }
}else{ }else{
for(NUSTitleInformation nus : getTitleID()){ for(final NUSTitleInformation nus : getTitleID()){
final long tID = nus.getTitleID(); final long tID = nus.getTitleID();
new Thread(new Runnable() { new Thread(new Runnable() {
@ -199,11 +199,11 @@ public class Starter {
return true; return true;
} }
public static void downloadMeta(List<NUSTitleInformation> output_, Progress totalProgress) { public static void downloadMeta(List<NUSTitleInformation> output_, final Progress totalProgress) {
ForkJoinPool pool = ForkJoinPool.commonPool(); ForkJoinPool pool = ForkJoinPool.commonPool();
List<ForkJoinTask<Boolean>> list = new ArrayList<>(); List<ForkJoinTask<Boolean>> list = new ArrayList<>();
for(NUSTitleInformation nus : output_){ for(final NUSTitleInformation nus : output_){
final long tID = nus.getTitleID(); final long tID = nus.getTitleID();
list.add(pool.submit(new Callable<Boolean>(){ list.add(pool.submit(new Callable<Boolean>(){
@Override @Override
@ -232,11 +232,11 @@ public class Starter {
} }
} }
public static void downloadEncrypted(List<NUSTitleInformation> output_, Progress progress) { public static void downloadEncrypted(List<NUSTitleInformation> output_, final Progress progress) {
ForkJoinPool pool = ForkJoinPool.commonPool(); ForkJoinPool pool = ForkJoinPool.commonPool();
List<ForkJoinTask<Boolean>> list = new ArrayList<>(); List<ForkJoinTask<Boolean>> list = new ArrayList<>();
for(NUSTitleInformation nus : output_){ for(final NUSTitleInformation nus : output_){
final long tID = nus.getTitleID(); final long tID = nus.getTitleID();
list.add(pool.submit(new Callable<Boolean>(){ list.add(pool.submit(new Callable<Boolean>(){
@Override @Override
@ -266,12 +266,12 @@ public class Starter {
public static AtomicInteger finished = new AtomicInteger(); public static AtomicInteger finished = new AtomicInteger();
public static void downloadEncryptedAllVersions(List<NUSTitleInformation> output_, Progress progress) { public static void downloadEncryptedAllVersions(List<NUSTitleInformation> output_, final Progress progress) {
ForkJoinPool pool = new ForkJoinPool(25); ForkJoinPool pool = new ForkJoinPool(25);
List<ForkJoinTask<Boolean>> list = new ArrayList<>(); List<ForkJoinTask<Boolean>> list = new ArrayList<>();
final int outputsize = output_.size();
for(NUSTitleInformation nus : output_){ for(final NUSTitleInformation nus : output_){
final long tID = nus.getTitleID(); final long tID = nus.getTitleID();
list.add(pool.submit(new Callable<Boolean>(){ list.add(pool.submit(new Callable<Boolean>(){
@Override @Override
@ -285,7 +285,7 @@ public class Starter {
System.out.println("Update download progress " + "(" + nus.getLongnameEN() + ") version "+ i + " complete! This was " + count + " of " + nus.getAllVersions().size() + "!"); System.out.println("Update download progress " + "(" + nus.getLongnameEN() + ") version "+ i + " complete! This was " + count + " of " + nus.getAllVersions().size() + "!");
count++; count++;
} }
System.out.println("Update download complete " + "(" + nus.getLongnameEN() +")" +"! Loaded updates for " + nus.getAllVersions().size() + " version. Now are " + finished.incrementAndGet() + " of " + output_.size() + " done! "); System.out.println("Update download complete " + "(" + nus.getLongnameEN() +")" +"! Loaded updates for " + nus.getAllVersions().size() + " version. Now are " + finished.incrementAndGet() + " of " + outputsize + " done! ");
return true; return true;
} }
})); }));

8
src/de/mas/jnustool/gui/NUSGUI.java
View File

@ -57,11 +57,11 @@ public class NUSGUI extends JFrame {
JButton btnNewButton = new JButton("Download"); JButton btnNewButton = new JButton("Download");
panel_1.add(btnNewButton); panel_1.add(btnNewButton);
JProgressBar progressBar = new JProgressBar(); final JProgressBar progressBar = new JProgressBar();
panel_1.add(progressBar); panel_1.add(progressBar);
progressBar.setValue(0); progressBar.setValue(0);
Progress progress = new Progress(); final Progress progress = new Progress();
progress.setProgressUpdateListener(new ProgressUpdateListener() { progress.setProgressUpdateListener(new ProgressUpdateListener() {
@Override @Override
@ -69,7 +69,7 @@ public class NUSGUI extends JFrame {
progressBar.setValue((int)p.statusInPercent()); progressBar.setValue((int)p.statusInPercent());
} }
}); });
final NUSTitle nuscpy = nus;
btnNewButton.addActionListener(new ActionListener() { btnNewButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
if(!progress.isInProgress()){ if(!progress.isInProgress()){
@ -85,7 +85,7 @@ public class NUSGUI extends JFrame {
list.add((FEntry) ((DefaultMutableTreeNode)obj).getUserObject()); list.add((FEntry) ((DefaultMutableTreeNode)obj).getUserObject());
} }
} }
nus.decryptFEntries(list, progress); nuscpy.decryptFEntries(list, progress);
progress.operationFinish(); progress.operationFinish();
Logger.messageBox("Finished"); Logger.messageBox("Finished");
}}).start(); }}).start();

6
src/de/mas/jnustool/gui/UpdateChooser.java
View File

@ -55,7 +55,7 @@ public class UpdateChooser extends JPanel {
JTable table; JTable table;
String newline = "\n"; String newline = "\n";
ListSelectionModel listSelectionModel; ListSelectionModel listSelectionModel;
public UpdateChooser(JFrame window) { public UpdateChooser(final JFrame window) {
super(new BorderLayout()); super(new BorderLayout());
setSize(800, 650); setSize(800, 650);
@ -170,10 +170,10 @@ public class UpdateChooser extends JPanel {
JButton btnDownloadMeta = new JButton("Download META"); JButton btnDownloadMeta = new JButton("Download META");
JButton btnDownloadEncrypted = new JButton("Download Encrypted Files"); JButton btnDownloadEncrypted = new JButton("Download Encrypted Files");
JProgressBar progressBar_1 = new JProgressBar(); final JProgressBar progressBar_1 = new JProgressBar();
panel.add(progressBar_1); panel.add(progressBar_1);
progressBar_1.setValue(0); progressBar_1.setValue(0);
Progress progress = new Progress(); final Progress progress = new Progress();
progress.setProgressUpdateListener(new ProgressUpdateListener() { progress.setProgressUpdateListener(new ProgressUpdateListener() {
@Override @Override