diff --git a/bin/.gitignore b/bin/.gitignore index 9eb92dc..0a416df 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,2 +1,3 @@ /application/ /datatypes/ +/libraries/ diff --git a/bin/application/MainWindowController$1.class b/bin/application/MainWindowController$1.class index 936e9c3..5a1b4a7 100644 Binary files a/bin/application/MainWindowController$1.class and b/bin/application/MainWindowController$1.class differ diff --git a/bin/application/MainWindowController$10.class b/bin/application/MainWindowController$10.class index e5bb083..439d001 100644 Binary files a/bin/application/MainWindowController$10.class and b/bin/application/MainWindowController$10.class differ diff --git a/bin/application/MainWindowController$11.class b/bin/application/MainWindowController$11.class index 3d5549f..f0306e1 100644 Binary files a/bin/application/MainWindowController$11.class and b/bin/application/MainWindowController$11.class differ diff --git a/bin/application/MainWindowController$12.class b/bin/application/MainWindowController$12.class index 75a7966..c8ef48f 100644 Binary files a/bin/application/MainWindowController$12.class and b/bin/application/MainWindowController$12.class differ diff --git a/bin/application/MainWindowController$2.class b/bin/application/MainWindowController$2.class index de9a5f5..ba9ecd6 100644 Binary files a/bin/application/MainWindowController$2.class and b/bin/application/MainWindowController$2.class differ diff --git a/bin/application/MainWindowController$3.class b/bin/application/MainWindowController$3.class index da7e036..87abca3 100644 Binary files a/bin/application/MainWindowController$3.class and b/bin/application/MainWindowController$3.class differ diff --git a/bin/application/MainWindowController$4.class b/bin/application/MainWindowController$4.class index 71c6442..43cc472 100644 Binary files a/bin/application/MainWindowController$4.class and b/bin/application/MainWindowController$4.class differ diff --git a/bin/application/MainWindowController$5.class b/bin/application/MainWindowController$5.class index fa9915f..516c942 100644 Binary files a/bin/application/MainWindowController$5.class and b/bin/application/MainWindowController$5.class differ diff --git a/bin/application/MainWindowController$6.class b/bin/application/MainWindowController$6.class index bd9a6e7..6196736 100644 Binary files a/bin/application/MainWindowController$6.class and b/bin/application/MainWindowController$6.class differ diff --git a/bin/application/MainWindowController$7.class b/bin/application/MainWindowController$7.class index 0e7a8c5..b8ae180 100644 Binary files a/bin/application/MainWindowController$7.class and b/bin/application/MainWindowController$7.class differ diff --git a/bin/application/MainWindowController$8.class b/bin/application/MainWindowController$8.class index 95da18f..9ebc86b 100644 Binary files a/bin/application/MainWindowController$8.class and b/bin/application/MainWindowController$8.class differ diff --git a/bin/application/MainWindowController$9.class b/bin/application/MainWindowController$9.class index 19e5083..656851c 100644 Binary files a/bin/application/MainWindowController$9.class and b/bin/application/MainWindowController$9.class differ diff --git a/bin/application/MainWindowController.class b/bin/application/MainWindowController.class index d899aa1..39e1810 100644 Binary files a/bin/application/MainWindowController.class and b/bin/application/MainWindowController.class differ diff --git a/bin/application/MainWindows.css b/bin/application/MainWindows.css index 3a08deb..db8b365 100644 --- a/bin/application/MainWindows.css +++ b/bin/application/MainWindows.css @@ -16,16 +16,14 @@ * TREE TABLE CSS */ - .tree-table-view { - -fx-tree-table-color: rgba(0, 168, 204, 0.2); + -fx-tree-table-color: rgba(0, 168, 204, 0.2); -fx-tree-table-rippler-color: rgba(0, 168, 204, 0.4); } - .tree-table-view:focused .tree-table-row-cell:selected { -fx-background-color: -fx-tree-table-color; - -fx-table-cell-border-color: -fx-tree-table-color; + -fx-table-cell-border-color: -fx-tree-table-color; -fx-text-fill: BLACK; } @@ -33,13 +31,10 @@ -fx-text-fill: BLACK; } - .tree-table-view .jfx-rippler { -jfx-rippler-fill: -fx-tree-table-rippler-color; } - - .tree-table-view .column-header, .tree-table-view .column-header-background, .tree-table-view .column-header-background .filler { diff --git a/bin/application/SmmdbApiQuery.class b/bin/application/SmmdbApiQuery.class index 1ab62e7..e01f914 100644 Binary files a/bin/application/SmmdbApiQuery.class and b/bin/application/SmmdbApiQuery.class differ diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java index f13f299..8ddc456 100644 --- a/src/application/MainWindowController.java +++ b/src/application/MainWindowController.java @@ -216,7 +216,7 @@ public class MainWindowController { private String color; private String dialogBtnStyle; private String version = "0.1.6"; - private String buildNumber = "033"; + private String buildNumber = "035"; private String versionName = "Throwback Galaxy"; private int xPos = -200; private int yPos = 17; @@ -263,7 +263,6 @@ public class MainWindowController { smmdbApiQuery = new SmmdbApiQuery(); } - @SuppressWarnings("unchecked") //FIXME SuppressWarnings void initUI(){ cemuTextField.setText(cemuPath); romTextField.setText(romPath); @@ -287,7 +286,10 @@ public class MainWindowController { starsColumn.setCellValueFactory(cellData -> cellData.getValue().getValue().stars.asObject()); timeColumn.setCellValueFactory(cellData -> cellData.getValue().getValue().time.asObject()); - courseTreeTable.getColumns().setAll(titleColumn, timeColumn, starsColumn, idColumn); + courseTreeTable.getColumns().add(titleColumn); + courseTreeTable.getColumns().add(timeColumn); + courseTreeTable.getColumns().add(starsColumn); + courseTreeTable.getColumns().add(idColumn); courseTreeTable.getColumns().get(3).setVisible(false); //hide idColumn (important) } @@ -376,7 +378,7 @@ public class MainWindowController { games.remove(selectedUIDataIndex); dbController.removeRom(selectedGameTitleID); //remove all games form gamesAnchorPane (UI) - gamesAnchorPane.getChildren().removeAll(games); + gamesAnchorPane.getChildren().removeAll(gamesAnchorPane.getChildren()); //reset position xPos = -200; yPos = 17; @@ -634,21 +636,19 @@ public class MainWindowController { } else { smmdbAnchorPane.setVisible(true); smmdbTrue = true; - } - //start query - courses.addAll(smmdbApiQuery.startQuery()); - - System.out.println("size: " + courses.size()); - System.out.println(courses.get(3).getNintendoid()); - - //add query response to courseTreeTable - for(int i = 0; i < courses.size(); i++){ - CourseTableDataType helpCourse = new CourseTableDataType(courses.get(i).getTitle(), courses.get(i).getId(), - courses.get(i).getTime(), courses.get(i).getStars()); - - root.getChildren().add(new TreeItem(helpCourse)); //add data to root-node - } + //start query + courses.removeAll(courses); + courses.addAll(smmdbApiQuery.startQuery()); + + //add query response to courseTreeTable + for(int i = 0; i < courses.size(); i++){ + CourseTableDataType helpCourse = new CourseTableDataType(courses.get(i).getTitle(), courses.get(i).getId(), + courses.get(i).getTime(), courses.get(i).getStars()); + + root.getChildren().add(new TreeItem(helpCourse)); //add data to root-node + } + } } @FXML @@ -740,9 +740,7 @@ public class MainWindowController { //get all existing courses in smm directory, new name is highest number +1 for (int j = 0; j < courses.length; j++) { - System.out.println(courses[j].getName()); int courseNumber = Integer.parseInt(courses[j].getName().substring(6)); - if (courseNumber > highestCourseNumber) { highestCourseNumber = courseNumber; } @@ -751,7 +749,7 @@ public class MainWindowController { String number = "000" + (highestCourseNumber +1); courseName = "course" + number.substring(number.length() -3, number.length()); File courseDirectory = new File(outputFile + "mlc01/emulatorSave/" + smmIDs.get(i) + "/"); - System.out.println("Path: " + courseDirectory.getPath()); + destination = courseDirectory.getPath(); } } @@ -763,6 +761,7 @@ public class MainWindowController { //rename zipfile File course = new File(destination + "/course000"); course.renameTo( new File(destination + "/" + courseName)); + System.out.println("Added new course: " + courseName + ", full path is: " + destination + "/" + courseName); } catch (ZipException e) { e.printStackTrace(); System.err.println("an error occurred during unziping the file!"); diff --git a/src/application/MainWindows.css b/src/application/MainWindows.css index 3a08deb..db8b365 100644 --- a/src/application/MainWindows.css +++ b/src/application/MainWindows.css @@ -16,16 +16,14 @@ * TREE TABLE CSS */ - .tree-table-view { - -fx-tree-table-color: rgba(0, 168, 204, 0.2); + -fx-tree-table-color: rgba(0, 168, 204, 0.2); -fx-tree-table-rippler-color: rgba(0, 168, 204, 0.4); } - .tree-table-view:focused .tree-table-row-cell:selected { -fx-background-color: -fx-tree-table-color; - -fx-table-cell-border-color: -fx-tree-table-color; + -fx-table-cell-border-color: -fx-tree-table-color; -fx-text-fill: BLACK; } @@ -33,13 +31,10 @@ -fx-text-fill: BLACK; } - .tree-table-view .jfx-rippler { -jfx-rippler-fill: -fx-tree-table-rippler-color; } - - .tree-table-view .column-header, .tree-table-view .column-header-background, .tree-table-view .column-header-background .filler { diff --git a/src/application/SmmdbApiQuery.java b/src/application/SmmdbApiQuery.java index 0e05384..2524c55 100644 --- a/src/application/SmmdbApiQuery.java +++ b/src/application/SmmdbApiQuery.java @@ -37,92 +37,80 @@ public class SmmdbApiQuery { BufferedReader ina = new BufferedReader(new InputStreamReader(apiUrl.openStream())); output = ina.readLine(); ina.close(); + System.out.println("response from " + URL + " was valid"); } catch (IOException e) { System.out.println("error while making api request or reading response"); + System.out.println("response from " + URL + " was: " + output); e.printStackTrace(); } - System.out.println(URL); - System.out.println("{ \"courses\": " + output + "}"); - - String apiOutput = "{ \"courses\": " + output + "}"; - + String apiOutput = "{ \"courses\": " + output + "}"; JsonArray items = Json.parse(apiOutput).asObject().get("courses").asArray(); + for (JsonValue item : items) { int courseTheme, gameStyle, difficulty, lastmodified, uploaded, autoScroll, stars ,time; String owner, id, nintendoid, title; - - //geht + try { courseTheme = item.asObject().getInt("courseTheme", 9); } catch (Exception e) { courseTheme = 9; } - - //geht + try { gameStyle = item.asObject().getInt("gameStyle", 9); } catch (Exception e) { gameStyle = 9; } - - //geht + try { difficulty = item.asObject().getInt("difficulty", 9); } catch (Exception e) { difficulty = 9; } - - //geht + try { lastmodified = item.asObject().getInt("lastmodified", 9); } catch (Exception e) { lastmodified = 9; } - - //geht + try { uploaded = item.asObject().getInt("uploaded", 9); } catch (Exception e) { uploaded = 9; } - - //geht + try { autoScroll = item.asObject().getInt("autoScroll", 9); } catch (Exception e) { autoScroll = 9; } - - //geht + try { stars = item.asObject().getInt("stars", 9); } catch (Exception e) { stars = 9; } - - //geht + try { time = item.asObject().getInt("time", 9); } catch (Exception e) { time = 9; } - - //geht + try { owner = item.asObject().getString("owner", ""); } catch (Exception e) { owner = "notset"; } - - //geht + try { id = item.asObject().getString("id", ""); } catch (Exception e) { id = "notset"; } - - //geht + try { nintendoid = item.asObject().getString("nintendoid", ""); } catch (Exception e) {