From cf8f3d35716cd93d0d5d123d80b07f9ae704f939 Mon Sep 17 00:00:00 2001 From: sowgro Date: Mon, 8 Jul 2024 14:49:30 -0400 Subject: Embed level utility into main window --- src/main/java/net/sowgro/npehero/gui/MainMenu.java | 12 ++++++++++-- src/main/java/net/sowgro/npehero/gui/Settings.java | 8 +------- 2 files changed, 11 insertions(+), 9 deletions(-) (limited to 'src/main/java/net/sowgro/npehero/gui') diff --git a/src/main/java/net/sowgro/npehero/gui/MainMenu.java b/src/main/java/net/sowgro/npehero/gui/MainMenu.java index bb1970f..2da6036 100755 --- a/src/main/java/net/sowgro/npehero/gui/MainMenu.java +++ b/src/main/java/net/sowgro/npehero/gui/MainMenu.java @@ -9,6 +9,7 @@ import javafx.scene.layout.VBox; import javafx.scene.paint.Color; import javafx.scene.text.Text; import net.sowgro.npehero.Driver; +import net.sowgro.npehero.devmenu.LevelList; public class MainMenu extends Pane @@ -39,10 +40,17 @@ public class MainMenu extends Pane Button settings = new Button(); settings.setText("Settings"); - settings.setOnAction(e -> {Driver.setMenu(new Settings()); + settings.setOnAction(_ -> { + Driver.setMenu(new Settings()); Driver.soundController.playSfx("forward"); }); + Button levelEdit = new Button("Level Editor"); + levelEdit.setOnAction(e -> { + Driver.soundController.playSfx("forward"); + Driver.setMenu(new LevelList()); + }); + Button exit = new Button(); exit.setText("Quit"); exit.setOnAction(e -> {Driver.quit(); @@ -50,7 +58,7 @@ public class MainMenu extends Pane }); VBox buttonBox = new VBox(); - buttonBox.getChildren().addAll(play, settings, exit); + buttonBox.getChildren().addAll(play, settings, levelEdit, exit); buttonBox.setAlignment(Pos.CENTER); buttonBox.setSpacing(10); diff --git a/src/main/java/net/sowgro/npehero/gui/Settings.java b/src/main/java/net/sowgro/npehero/gui/Settings.java index 882eb86..e6ae13b 100755 --- a/src/main/java/net/sowgro/npehero/gui/Settings.java +++ b/src/main/java/net/sowgro/npehero/gui/Settings.java @@ -73,12 +73,6 @@ public class Settings extends Pane Text devLabel = new Text("Advanced"); devLabel.getStyleClass().add("t3"); - - Button levelEdit = new Button("Level Utility"); - levelEdit.setOnAction(e -> { - Driver.soundController.playSfx("forward"); - new LevelList(); - }); Button devMenu = new Button(); devMenu.setText("Debug Menu"); @@ -89,7 +83,7 @@ public class Settings extends Pane VBox devBox = new VBox(); devBox.getStyleClass().add("box"); - devBox.getChildren().addAll(devLabel,levelEdit,devMenu); + devBox.getChildren().addAll(devLabel,devMenu); devBox.setVisible(false); devBox.setManaged(false); devBox.setPadding(new Insets(10)); -- cgit v1.2.3