diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/CreditsController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/CreditsController.java index 5614e1e27ca93f41f9f40a7f9ba8d2fc424f64c5..a6e47b9d714df5d509ec60ac27bd6ac89029fa5f 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/CreditsController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/CreditsController.java @@ -15,10 +15,12 @@ import java.util.Objects; import java.util.ResourceBundle; public class CreditsController implements Initializable { - @FXML public BorderPane parent; - @FXML public MediaView mediaView; + @FXML + public BorderPane parent; + @FXML + public MediaView mediaView; private MediaPlayer mediaPlayer; - private final File file = new File("src/main/resources/textures/videos/credits.mp4"); + private final File file = new File("src/main/resources/videos/credits.mp4"); @Override public void initialize(URL url, ResourceBundle resourceBundle) { diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/IntroController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/IntroController.java index 2546ac2824806c70eb544f1a6d384e415ee4e50a..7a77864cb6349989b9ee99f84e56f98932683146 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/IntroController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/IntroController.java @@ -20,7 +20,7 @@ public class IntroController implements Initializable { public MediaView mediaView; @FXML public BorderPane introParent; - private final String fileName = "src/main/resources/textures/videos/"; + private final String fileName = "src/main/resources/videos/"; // nextVideo() will iterate through this array so the next video will be played TODO: change the videos to non memes lmao private final String[] videos = {"sony.mp4", "gamecube.mp4", "gameboy.mp4", "monke.mp4"}; private File file = new File(fileName + videos[0]); diff --git a/src/main/resources/textures/videos/allMyFellas.mp4 b/src/main/resources/videos/allMyFellas.mp4 similarity index 100% rename from src/main/resources/textures/videos/allMyFellas.mp4 rename to src/main/resources/videos/allMyFellas.mp4 diff --git a/src/main/resources/textures/videos/bobama.mp4 b/src/main/resources/videos/bobama.mp4 similarity index 100% rename from src/main/resources/textures/videos/bobama.mp4 rename to src/main/resources/videos/bobama.mp4 diff --git a/src/main/resources/textures/videos/credits.mp4 b/src/main/resources/videos/credits.mp4 similarity index 100% rename from src/main/resources/textures/videos/credits.mp4 rename to src/main/resources/videos/credits.mp4 diff --git a/src/main/resources/textures/videos/gameboy.mp4 b/src/main/resources/videos/gameboy.mp4 similarity index 100% rename from src/main/resources/textures/videos/gameboy.mp4 rename to src/main/resources/videos/gameboy.mp4 diff --git a/src/main/resources/textures/videos/gamecube.mp4 b/src/main/resources/videos/gamecube.mp4 similarity index 100% rename from src/main/resources/textures/videos/gamecube.mp4 rename to src/main/resources/videos/gamecube.mp4 diff --git a/src/main/resources/textures/videos/lifeCouldBeMonke.mp4 b/src/main/resources/videos/lifeCouldBeMonke.mp4 similarity index 100% rename from src/main/resources/textures/videos/lifeCouldBeMonke.mp4 rename to src/main/resources/videos/lifeCouldBeMonke.mp4 diff --git a/src/main/resources/textures/videos/monke.mp4 b/src/main/resources/videos/monke.mp4 similarity index 100% rename from src/main/resources/textures/videos/monke.mp4 rename to src/main/resources/videos/monke.mp4 diff --git a/src/main/resources/textures/videos/pepe.mp4 b/src/main/resources/videos/pepe.mp4 similarity index 100% rename from src/main/resources/textures/videos/pepe.mp4 rename to src/main/resources/videos/pepe.mp4 diff --git a/src/main/resources/textures/videos/russianKid.mp4 b/src/main/resources/videos/russianKid.mp4 similarity index 100% rename from src/main/resources/textures/videos/russianKid.mp4 rename to src/main/resources/videos/russianKid.mp4 diff --git a/src/main/resources/textures/videos/sony.mp4 b/src/main/resources/videos/sony.mp4 similarity index 100% rename from src/main/resources/textures/videos/sony.mp4 rename to src/main/resources/videos/sony.mp4