diff options
Diffstat (limited to 'src/main/java/net/sowgro/npehero/gui')
8 files changed, 29 insertions, 16 deletions
diff --git a/src/main/java/net/sowgro/npehero/gui/ControlEditor.java b/src/main/java/net/sowgro/npehero/gui/ControlEditor.java index 90161e0..7fd288b 100644 --- a/src/main/java/net/sowgro/npehero/gui/ControlEditor.java +++ b/src/main/java/net/sowgro/npehero/gui/ControlEditor.java @@ -76,6 +76,7 @@ public class ControlEditor extends Page { Control.writeToFile(); } catch (IOException e) { Driver.setMenu(new ErrorDisplay("An error occured while saving your controls\n"+e, this)); + e.printStackTrace(); } }); controlButton.setOnAction(_ -> { diff --git a/src/main/java/net/sowgro/npehero/gui/GameOver.java b/src/main/java/net/sowgro/npehero/gui/GameOver.java index dd23f5f..b66d0c6 100755 --- a/src/main/java/net/sowgro/npehero/gui/GameOver.java +++ b/src/main/java/net/sowgro/npehero/gui/GameOver.java @@ -10,11 +10,14 @@ import javafx.scene.layout.Pane; import javafx.scene.layout.VBox; import javafx.scene.text.Text; import net.sowgro.npehero.Driver; -import net.sowgro.npehero.main.Difficulty; -import net.sowgro.npehero.main.Level; +import net.sowgro.npehero.editor.ErrorDisplay; +import net.sowgro.npehero.levelapi.Difficulty; +import net.sowgro.npehero.levelapi.Level; import net.sowgro.npehero.main.Page; import net.sowgro.npehero.main.Sound; +import java.io.IOException; + public class GameOver extends Page { HBox content = new HBox(); @@ -67,7 +70,12 @@ public class GameOver extends Page Sound.playSfx(Sound.FORWARD); save.setDisable(true); name.setDisable(true); - diff.leaderboard.add(name.getText(), score2); + try { + diff.leaderboard.add(name.getText(), score2); + } catch (IOException e) { + e.printStackTrace(); + Driver.setMenu(new ErrorDisplay("Failed to save score to leaderboard:\n"+e, this)); + } }); BorderPane b = new BorderPane(); diff --git a/src/main/java/net/sowgro/npehero/gui/LeaderboardView.java b/src/main/java/net/sowgro/npehero/gui/LeaderboardView.java index 46ce22f..1a87e27 100755 --- a/src/main/java/net/sowgro/npehero/gui/LeaderboardView.java +++ b/src/main/java/net/sowgro/npehero/gui/LeaderboardView.java @@ -10,6 +10,8 @@ import javafx.scene.layout.HBox; import javafx.scene.layout.Pane; import javafx.scene.layout.VBox; import net.sowgro.npehero.Driver; +import net.sowgro.npehero.levelapi.Difficulty; +import net.sowgro.npehero.levelapi.LeaderboardEntry; import net.sowgro.npehero.main.*; public class LeaderboardView extends Page @@ -29,9 +31,9 @@ public class LeaderboardView extends Page scores.getColumns().add(scoreCol); scores.getColumns().add(dateCol); - nameCol.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().getName())); - scoreCol.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().getScore() + "")); - dateCol.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().getDate())); + nameCol.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().name)); + scoreCol.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().score + "")); + dateCol.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().date)); scores.setItems(diff.leaderboard.entries); diff --git a/src/main/java/net/sowgro/npehero/gui/LevelDetails.java b/src/main/java/net/sowgro/npehero/gui/LevelDetails.java index 4bd1e09..55c45bd 100755 --- a/src/main/java/net/sowgro/npehero/gui/LevelDetails.java +++ b/src/main/java/net/sowgro/npehero/gui/LevelDetails.java @@ -15,8 +15,8 @@ import javafx.scene.text.Text; import javafx.scene.text.TextAlignment; import javafx.scene.text.TextFlow; import net.sowgro.npehero.Driver; -import net.sowgro.npehero.main.Difficulty; -import net.sowgro.npehero.main.Level; +import net.sowgro.npehero.levelapi.Difficulty; +import net.sowgro.npehero.levelapi.Level; import net.sowgro.npehero.main.Sound; public class LevelDetails extends VBox diff --git a/src/main/java/net/sowgro/npehero/gui/LevelSelector.java b/src/main/java/net/sowgro/npehero/gui/LevelSelector.java index 3c8f25f..b2c028b 100755 --- a/src/main/java/net/sowgro/npehero/gui/LevelSelector.java +++ b/src/main/java/net/sowgro/npehero/gui/LevelSelector.java @@ -9,8 +9,8 @@ import javafx.scene.layout.HBox; import javafx.scene.layout.Pane; import javafx.scene.layout.VBox; import net.sowgro.npehero.Driver; -import net.sowgro.npehero.main.Level; -import net.sowgro.npehero.main.Levels; +import net.sowgro.npehero.levelapi.Level; +import net.sowgro.npehero.levelapi.Levels; import net.sowgro.npehero.main.Page; import net.sowgro.npehero.main.Sound; diff --git a/src/main/java/net/sowgro/npehero/gui/LevelSurround.java b/src/main/java/net/sowgro/npehero/gui/LevelSurround.java index ea1eb30..8ab722d 100755 --- a/src/main/java/net/sowgro/npehero/gui/LevelSurround.java +++ b/src/main/java/net/sowgro/npehero/gui/LevelSurround.java @@ -11,8 +11,8 @@ import javafx.scene.layout.Pane; import javafx.scene.layout.StackPane; import javafx.scene.layout.VBox; import javafx.scene.text.Text; -import net.sowgro.npehero.main.Difficulty; -import net.sowgro.npehero.main.Level; +import net.sowgro.npehero.levelapi.Difficulty; +import net.sowgro.npehero.levelapi.Level; import net.sowgro.npehero.gameplay.ScoreController; import net.sowgro.npehero.main.Page; import net.sowgro.npehero.main.Sound; @@ -28,7 +28,7 @@ public class LevelSurround extends Page Button exit = new Button(); exit.setText("Back"); - exit.setOnAction(e -> { + exit.setOnAction(_ -> { Driver.setMenu(prev); Sound.playSfx(Sound.BACKWARD); game.cancel(); diff --git a/src/main/java/net/sowgro/npehero/gui/MainMenu.java b/src/main/java/net/sowgro/npehero/gui/MainMenu.java index 3b8c8db..6160245 100755 --- a/src/main/java/net/sowgro/npehero/gui/MainMenu.java +++ b/src/main/java/net/sowgro/npehero/gui/MainMenu.java @@ -1,5 +1,6 @@ package net.sowgro.npehero.gui; +import javafx.application.Platform; import javafx.geometry.Pos; import javafx.scene.control.Button; import javafx.scene.effect.BlurType; @@ -55,8 +56,8 @@ public class MainMenu extends Page { exit.setOnAction(_ -> { Sound.playSfx(Sound.BACKWARD); // Driver.quit(); -// Platform.exit(); - System.exit(0); + Platform.exit(); +// System.exit(0); }); VBox buttonBox = new VBox(); diff --git a/src/main/java/net/sowgro/npehero/gui/SettingsEditor.java b/src/main/java/net/sowgro/npehero/gui/SettingsEditor.java index 12555ed..efd136a 100755 --- a/src/main/java/net/sowgro/npehero/gui/SettingsEditor.java +++ b/src/main/java/net/sowgro/npehero/gui/SettingsEditor.java @@ -95,7 +95,8 @@ public class SettingsEditor extends Page try { Settings.save(); } catch (IOException ex) { - Driver.setMenu(new ErrorDisplay("Failed to save settings"+e, this)); + ex.printStackTrace(); + Driver.setMenu(new ErrorDisplay("Failed to save settings"+ex, this)); } Sound.playSfx(Sound.BACKWARD); Driver.setMenu(new MainMenu()); |