From aa916b0f06be0d42bec1e035d0efeec954e09243 Mon Sep 17 00:00:00 2001 From: sowgro Date: Thu, 29 Aug 2024 22:16:21 -0400 Subject: add button click sounds to all buttons --- .../java/net/sowgro/npehero/editor/DiffEditor.java | 6 +----- .../net/sowgro/npehero/editor/FolderNameEntry.java | 11 +++++++++-- .../java/net/sowgro/npehero/editor/LevelEditor.java | 21 +++++++++++++++++---- .../java/net/sowgro/npehero/editor/LevelList.java | 8 +++++++- .../net/sowgro/npehero/editor/NotesEditor2.java | 10 ++++++++++ .../java/net/sowgro/npehero/gui/ControlEditor.java | 2 ++ 6 files changed, 46 insertions(+), 12 deletions(-) diff --git a/src/main/java/net/sowgro/npehero/editor/DiffEditor.java b/src/main/java/net/sowgro/npehero/editor/DiffEditor.java index f306d60..77e5fa9 100755 --- a/src/main/java/net/sowgro/npehero/editor/DiffEditor.java +++ b/src/main/java/net/sowgro/npehero/editor/DiffEditor.java @@ -147,7 +147,7 @@ public class DiffEditor extends Page Button exit = new Button(); exit.setText("Back"); - exit.setOnAction(e -> { + exit.setOnAction(_ -> { Sound.playSfx(Sound.BACKWARD); Driver.setMenu(prev); }); @@ -183,10 +183,6 @@ public class DiffEditor extends Page return b; } - private DoubleBinding secondToScreenPos(double second) { - return scroll.heightProperty().multiply(second * 0.9); - } - private DoubleBinding secondToScreenPos(DoubleBinding second) { return scroll.heightProperty().multiply(second).multiply(0.9); } diff --git a/src/main/java/net/sowgro/npehero/editor/FolderNameEntry.java b/src/main/java/net/sowgro/npehero/editor/FolderNameEntry.java index f2245a8..1b60bf9 100644 --- a/src/main/java/net/sowgro/npehero/editor/FolderNameEntry.java +++ b/src/main/java/net/sowgro/npehero/editor/FolderNameEntry.java @@ -9,6 +9,7 @@ import javafx.scene.layout.HBox; import javafx.scene.layout.VBox; import net.sowgro.npehero.Driver; import net.sowgro.npehero.main.Page; +import net.sowgro.npehero.main.Sound; public class FolderNameEntry extends Page { private final HBox content = new HBox(); @@ -38,10 +39,16 @@ public class FolderNameEntry extends Page { newLevelBox.setPrefWidth(400); Button newLevelButton = new Button("Create"); - newLevelButton.setOnAction(_ -> next.run(newLevelEntry.getText())); + newLevelButton.setOnAction(_ -> { + Sound.playSfx(Sound.FORWARD); + next.run(newLevelEntry.getText()); + }); Button cancel = new Button("Cancel"); - cancel.setOnAction(_ -> Driver.setMenu(prev)); + cancel.setOnAction(_ -> { + Sound.playSfx(Sound.BACKWARD); + Driver.setMenu(prev); + }); HBox buttonBox = new HBox(cancel, newLevelButton); buttonBox.setSpacing(10); diff --git a/src/main/java/net/sowgro/npehero/editor/LevelEditor.java b/src/main/java/net/sowgro/npehero/editor/LevelEditor.java index e17d209..e02da0f 100755 --- a/src/main/java/net/sowgro/npehero/editor/LevelEditor.java +++ b/src/main/java/net/sowgro/npehero/editor/LevelEditor.java @@ -68,17 +68,26 @@ public class LevelEditor extends Page FileChooser backgroundChooser = new FileChooser(); backgroundChooser.getExtensionFilters().add(new ExtensionFilter("Image Files", "*.png", "*.jpg", "*.gif")); Button backgroundButton = new Button("Background Image"); - backgroundButton.setOnAction(_ -> selectedBackground = backgroundChooser.showOpenDialog(Driver.primaryStage)); + backgroundButton.setOnAction(_ -> { + Sound.playSfx(Sound.FORWARD); + selectedBackground = backgroundChooser.showOpenDialog(Driver.primaryStage); + }); FileChooser previewChooser = new FileChooser(); previewChooser.getExtensionFilters().add(new ExtensionFilter("Image Files", "*.png", "*.jpg", "*.gif")); Button previewButton = new Button("Preview Image"); - previewButton.setOnAction(_ -> selectedPreview = previewChooser.showOpenDialog(Driver.primaryStage)); + previewButton.setOnAction(_ -> { + Sound.playSfx(Sound.FORWARD); + selectedPreview = previewChooser.showOpenDialog(Driver.primaryStage); + }); FileChooser songChooser = new FileChooser(); songChooser.getExtensionFilters().add(new ExtensionFilter("Audio Files", "*.wav", "*.mp3", "*.aac")); Button songButton = new Button("Song file"); - songButton.setOnAction(_ -> selectedSong = songChooser.showOpenDialog(Driver.primaryStage)); + songButton.setOnAction(_ -> { + Sound.playSfx(Sound.FORWARD); + selectedSong = songChooser.showOpenDialog(Driver.primaryStage); + }); HBox diffLabel = new HBox(new Text("Difficulties"), diffsInvalid); @@ -112,12 +121,16 @@ public class LevelEditor extends Page }); Button newDiffs = new Button("Edit difficulties"); - newDiffs.setOnAction(_ -> Driver.setMenu(new DiffList(level, this))); + newDiffs.setOnAction(_ -> { + Sound.playSfx(Sound.FORWARD); + Driver.setMenu(new DiffList(level, this)); + }); diffList.setSelectionModel(null); Button save = new Button("Save"); save.setOnAction(e -> { //assigns fields to values + Sound.playSfx(Sound.FORWARD); level.title = title.getText(); level.artist = artist.getText(); level.desc = desc.getText(); diff --git a/src/main/java/net/sowgro/npehero/editor/LevelList.java b/src/main/java/net/sowgro/npehero/editor/LevelList.java index e9d69af..6bd725f 100755 --- a/src/main/java/net/sowgro/npehero/editor/LevelList.java +++ b/src/main/java/net/sowgro/npehero/editor/LevelList.java @@ -84,12 +84,16 @@ public class LevelList extends Page Button edit = new Button("Edit"); - edit.setOnAction(e -> Driver.setMenu(new LevelEditor(levels.getSelectionModel().getSelectedItem(), this))); + edit.setOnAction(_ -> { + Sound.playSfx(Sound.FORWARD); + Driver.setMenu(new LevelEditor(levels.getSelectionModel().getSelectedItem(), this)); + }); edit.setDisable(true); edit.disableProperty().bind(levels.getSelectionModel().selectedItemProperty().isNull()); Button remove = new Button("Delete"); remove.setOnAction(e -> { + Sound.playSfx(Sound.FORWARD); try { Levels.remove(levels.getSelectionModel().getSelectedItem()); } catch (IOException ex) { @@ -102,6 +106,7 @@ public class LevelList extends Page Button refresh = new Button("Refresh"); refresh.setOnAction(e -> { + Sound.playSfx(Sound.FORWARD); try { Levels.readData(); } catch (IOException ex) { @@ -115,6 +120,7 @@ public class LevelList extends Page Button viewFolder = new Button("Open Folder"); viewFolder.setOnAction(_ -> new Thread(() -> { + Sound.playSfx(Sound.FORWARD); try { Desktop.getDesktop().open(Levels.dir); } catch (IOException ex) { diff --git a/src/main/java/net/sowgro/npehero/editor/NotesEditor2.java b/src/main/java/net/sowgro/npehero/editor/NotesEditor2.java index e3db0b1..f5b63e2 100644 --- a/src/main/java/net/sowgro/npehero/editor/NotesEditor2.java +++ b/src/main/java/net/sowgro/npehero/editor/NotesEditor2.java @@ -165,6 +165,7 @@ public class NotesEditor2 extends Page { Button save = new Button(); save.setText("Save"); save.setOnAction(_ -> { + Sound.playSfx(Sound.FORWARD); diff.notes.list = noteList; try { diff.notes.writeFile(); @@ -256,6 +257,7 @@ public class NotesEditor2 extends Page { }); play.setOnAction(_ -> { + Sound.playSfx(Sound.FORWARD); if (play.isSelected()) { m.play(); } @@ -266,6 +268,7 @@ public class NotesEditor2 extends Page { }); scrollLock.setOnAction(_ -> { + Sound.playSfx(Sound.FORWARD); if (scrollLock.isSelected()) { // vvalue takes in a value between 0 and 1 NOT a pixel value scroll.vvalueProperty().bind(playhead.layoutYProperty().subtract(scroll.heightProperty().divide(2)).divide(scrollContent.heightProperty().subtract(scroll.heightProperty()))); @@ -278,10 +281,12 @@ public class NotesEditor2 extends Page { }); reset.setOnAction(_ -> { + Sound.playSfx(Sound.FORWARD); m.seek(new Duration(0)); }); delNote.setOnAction(_ -> { + Sound.playSfx(Sound.FORWARD); activeNotes.forEach(e -> { noteList.remove(e.note); }); @@ -289,11 +294,13 @@ public class NotesEditor2 extends Page { }); clearSelect.setOnAction(_ -> { + Sound.playSfx(Sound.FORWARD); activeNotes.forEach(e -> e.setFill(e.color)); activeNotes.clear(); }); selectAll.setOnAction(_ -> { + Sound.playSfx(Sound.FORWARD); activeNotes.clear(); for (Pane lane : lanes) { lane.getChildren().forEach(e -> activeNotes.add((Block) e)); @@ -304,6 +311,7 @@ public class NotesEditor2 extends Page { Pane addHelp = addHelp(); Pane moveHelp = moveHelp(); addNote.setOnAction(_ -> { + Sound.playSfx(Sound.FORWARD); if (addNote.isSelected()) { helpBox.getChildren().clear(); helpBox.getChildren().add(addHelp); @@ -314,6 +322,7 @@ public class NotesEditor2 extends Page { }); moveNote.setOnAction(_ -> { + Sound.playSfx(Sound.FORWARD); if (moveNote.isSelected()) { helpBox.getChildren().clear(); helpBox.getChildren().add(moveHelp); @@ -331,6 +340,7 @@ public class NotesEditor2 extends Page { }); setEnd.setOnAction(_ -> { + Sound.playSfx(Sound.FORWARD); double tmp = screenPosToSecond(playhead.getLayoutY()); if (Math.round(tmp*10)/10 == Math.round(m.getTotalDuration().toSeconds() * 10)/10) { newEndTime.set(0); diff --git a/src/main/java/net/sowgro/npehero/gui/ControlEditor.java b/src/main/java/net/sowgro/npehero/gui/ControlEditor.java index 666f7d8..8e4d1d5 100644 --- a/src/main/java/net/sowgro/npehero/gui/ControlEditor.java +++ b/src/main/java/net/sowgro/npehero/gui/ControlEditor.java @@ -83,6 +83,7 @@ public class ControlEditor extends Page { } }); controlButton.setOnAction(_ -> { + Sound.playSfx(Sound.FORWARD); EventHandler keyListener = new EventHandler<>() { @Override public void handle(KeyEvent k) { @@ -104,6 +105,7 @@ public class ControlEditor extends Page { // reset button Button resetButton = new Button("Reset"); resetButton.setOnAction(_ -> { + Sound.playSfx(Sound.FORWARD); control.keyProperty.set(control.defaultKey); }); controls.add(resetButton, 2, i); -- cgit v1.2.3