diff options
Diffstat (limited to 'src/main/java/net/sowgro/npehero/devmenu')
6 files changed, 27 insertions, 16 deletions
diff --git a/src/main/java/net/sowgro/npehero/devmenu/DiffEditor.java b/src/main/java/net/sowgro/npehero/devmenu/DiffEditor.java index 74cfab6..84abf6f 100755 --- a/src/main/java/net/sowgro/npehero/devmenu/DiffEditor.java +++ b/src/main/java/net/sowgro/npehero/devmenu/DiffEditor.java @@ -15,6 +15,7 @@ import javafx.scene.layout.VBox; import javafx.scene.text.Text; import net.sowgro.npehero.main.Difficulty; import net.sowgro.npehero.main.Note; +import net.sowgro.npehero.main.SoundController; public class DiffEditor extends Pane { @@ -102,7 +103,7 @@ public class DiffEditor extends Pane Button exit = new Button(); exit.setText("Back"); exit.setOnAction(e -> { - Driver.soundController.playSfx("backward"); + SoundController.playSfx(SoundController.BACKWARD); Driver.setMenu(prev); }); diff --git a/src/main/java/net/sowgro/npehero/devmenu/DiffList.java b/src/main/java/net/sowgro/npehero/devmenu/DiffList.java index be4126d..6345c2b 100755 --- a/src/main/java/net/sowgro/npehero/devmenu/DiffList.java +++ b/src/main/java/net/sowgro/npehero/devmenu/DiffList.java @@ -11,6 +11,7 @@ import javafx.scene.layout.VBox; import net.sowgro.npehero.Driver; import net.sowgro.npehero.main.Difficulty; import net.sowgro.npehero.main.Level; +import net.sowgro.npehero.main.SoundController; public class DiffList extends Pane { @@ -91,7 +92,7 @@ public class DiffList extends Pane Button exit = new Button(); exit.setText("Back"); exit.setOnAction(e -> { - Driver.soundController.playSfx("backward"); + SoundController.playSfx(SoundController.BACKWARD); Driver.setMenu(prev); }); diff --git a/src/main/java/net/sowgro/npehero/devmenu/LevelEditor.java b/src/main/java/net/sowgro/npehero/devmenu/LevelEditor.java index e5ecf1c..411c15d 100755 --- a/src/main/java/net/sowgro/npehero/devmenu/LevelEditor.java +++ b/src/main/java/net/sowgro/npehero/devmenu/LevelEditor.java @@ -15,6 +15,7 @@ import javafx.stage.FileChooser.ExtensionFilter; import net.sowgro.npehero.Driver; import net.sowgro.npehero.main.Difficulty; import net.sowgro.npehero.main.Level; +import net.sowgro.npehero.main.SoundController; public class LevelEditor extends Pane { @@ -157,7 +158,7 @@ public class LevelEditor extends Pane Button exit = new Button(); exit.setText("Back"); exit.setOnAction(e -> { - Driver.soundController.playSfx("backward"); + SoundController.playSfx(SoundController.BACKWARD); Driver.setMenu(prev); }); diff --git a/src/main/java/net/sowgro/npehero/devmenu/LevelList.java b/src/main/java/net/sowgro/npehero/devmenu/LevelList.java index e37e2ea..61b9d47 100755 --- a/src/main/java/net/sowgro/npehero/devmenu/LevelList.java +++ b/src/main/java/net/sowgro/npehero/devmenu/LevelList.java @@ -12,6 +12,7 @@ import javafx.scene.layout.VBox; import net.sowgro.npehero.gui.MainMenu; import net.sowgro.npehero.main.Level; import net.sowgro.npehero.main.LevelController; +import net.sowgro.npehero.main.SoundController; public class LevelList extends Pane { @@ -60,13 +61,13 @@ public class LevelList extends Pane edit.disableProperty().bind(levels.getSelectionModel().selectedItemProperty().isNull()); Button remove = new Button("Delete"); - remove.setOnAction(e -> Driver.levelController.removeLevel(levels.getSelectionModel().getSelectedItem())); + remove.setOnAction(e -> LevelController.removeLevel(levels.getSelectionModel().getSelectedItem())); remove.setDisable(true); remove.disableProperty().bind(levels.getSelectionModel().selectedItemProperty().isNull()); Button refresh = new Button("Refresh"); refresh.setOnAction(e -> { - Driver.levelController.readData(); + LevelController.readData(); levels.setItems(LevelController.getLevelList()); }); @@ -95,7 +96,7 @@ public class LevelList extends Pane Button exit = new Button(); exit.setText("Back"); exit.setOnAction(e -> { - Driver.soundController.playSfx("backward"); + SoundController.playSfx(SoundController.BACKWARD); Driver.setMenu(new MainMenu()); }); @@ -121,7 +122,7 @@ public class LevelList extends Pane }); newLevelButton.setOnAction(_ -> { - Driver.levelController.addLevel(newLevelEntry.getText()); + LevelController.addLevel(newLevelEntry.getText()); newLevelEntry.clear(); refresh.fire(); sidebar.getChildren().clear(); diff --git a/src/main/java/net/sowgro/npehero/devmenu/NotesEditor.java b/src/main/java/net/sowgro/npehero/devmenu/NotesEditor.java index 6f2721e..7e78701 100755 --- a/src/main/java/net/sowgro/npehero/devmenu/NotesEditor.java +++ b/src/main/java/net/sowgro/npehero/devmenu/NotesEditor.java @@ -7,6 +7,7 @@ import java.io.UnsupportedEncodingException; import javafx.geometry.Pos; import javafx.scene.layout.HBox; import javafx.scene.layout.Pane; +import javafx.scene.media.Media; import net.sowgro.npehero.gameplay.Timer; import net.sowgro.npehero.Driver; import javafx.scene.Scene; @@ -15,6 +16,7 @@ import javafx.scene.input.KeyCode; import javafx.scene.layout.VBox; import javafx.scene.text.Text; import net.sowgro.npehero.main.Difficulty; +import net.sowgro.npehero.main.SoundController; public class NotesEditor extends Pane { @@ -45,7 +47,7 @@ public class NotesEditor extends Pane Button exit = new Button(); exit.setText("Back"); exit.setOnAction(e -> { - Driver.soundController.playSfx("backward"); + SoundController.playSfx(SoundController.BACKWARD); Driver.setMenu(prev); }); @@ -98,7 +100,7 @@ public class NotesEditor extends Pane private void start() { - Driver.soundController.playSong(diff.level.song); + SoundController.playSong(new Media(diff.level.song.toString())); timer = new Timer(diff.bpm); help.setText(t2); } @@ -107,7 +109,7 @@ public class NotesEditor extends Pane { try { - Driver.soundController.endSong(); + SoundController.endSong(); diff.numBeats = (int)Double.parseDouble(timer.toString()); timer = null; writer.close(); diff --git a/src/main/java/net/sowgro/npehero/devmenu/NotesEditor2.java b/src/main/java/net/sowgro/npehero/devmenu/NotesEditor2.java index fc44339..99aacec 100644 --- a/src/main/java/net/sowgro/npehero/devmenu/NotesEditor2.java +++ b/src/main/java/net/sowgro/npehero/devmenu/NotesEditor2.java @@ -23,6 +23,7 @@ import net.sowgro.npehero.gameplay.Block; import net.sowgro.npehero.gameplay.Target; import net.sowgro.npehero.main.Difficulty; import net.sowgro.npehero.main.Note; +import net.sowgro.npehero.main.SoundController; import java.util.concurrent.atomic.AtomicInteger; @@ -41,14 +42,15 @@ public class NotesEditor2 extends Pane { noteList = diff.notes.deepCopyList(); m = new MediaPlayer(new Media(diff.level.song.toURI().toString())); + SoundController.endSong(); // Buttons VBox actionBox = new VBox(); actionBox.setSpacing(10); - Label noteLabel = new Label("Notes"); + Label noteLabel = new Label("Notes"); ToggleButton addNote = new ToggleButton("Add"); - Button delNote = new Button("Delete"); + Button delNote = new Button("Delete"); ToggleButton moveNote = new ToggleButton("Move"); actionBox.getChildren().addAll(noteLabel, addNote, delNote, moveNote); @@ -79,7 +81,6 @@ public class NotesEditor2 extends Pane { Block sizer = drawBlock(new Note(0, 0)); for (Pane lane : lanes) { lane.prefWidthProperty().bind(sizer.widthProperty()); - lane.prefHeightProperty().bind(sizer.heightProperty()); } Pane rulerLane = new Pane(); Pane playheadLane = new Pane(); @@ -135,16 +136,20 @@ public class NotesEditor2 extends Pane { Button exit = new Button(); exit.setText("Cancel"); exit.setOnAction(_ -> { - Driver.soundController.playSfx("backward"); + m.stop(); + SoundController.playSfx(SoundController.BACKWARD); Driver.setMenu(prev); + SoundController.playSong(SoundController.MENUSONG); }); Button save = new Button(); save.setText("Done"); save.setOnAction(_ -> { diff.notes.list = noteList; - Driver.soundController.playSfx("backward"); + m.stop(); + SoundController.playSfx(SoundController.BACKWARD); Driver.setMenu(new DiffEditor(diff, prev.prev)); + SoundController.playSong(SoundController.MENUSONG); }); HBox buttons = new HBox(save, exit); @@ -153,7 +158,7 @@ public class NotesEditor2 extends Pane { // Draw notes noteList.forEach(n -> lanes[n.lane].getChildren().add(drawBlock(n))); - noteList.addListener((ListChangeListener<? super Note>) e -> { + noteList.addListener((ListChangeListener<? super Note>) _ -> { // TODO for (Pane lane : lanes) { lane.getChildren().clear(); |