From a8e275b8ac3144afc8092234493f8e60989005b9 Mon Sep 17 00:00:00 2001
From: Peter <pt033@hdm-stuttgart.de>
Date: Sat, 9 Dec 2023 13:17:52 +0100
Subject: [PATCH] refactor(videos): move video folder one directory higher
---
.../battlearena/Controller/CreditsController.java | 8 +++++---
.../battlearena/Controller/IntroController.java | 2 +-
.../resources/{textures => }/videos/allMyFellas.mp4 | Bin
src/main/resources/{textures => }/videos/bobama.mp4 | Bin
.../resources/{textures => }/videos/credits.mp4 | Bin
.../resources/{textures => }/videos/gameboy.mp4 | Bin
.../resources/{textures => }/videos/gamecube.mp4 | Bin
.../{textures => }/videos/lifeCouldBeMonke.mp4 | Bin
src/main/resources/{textures => }/videos/monke.mp4 | Bin
src/main/resources/{textures => }/videos/pepe.mp4 | Bin
.../resources/{textures => }/videos/russianKid.mp4 | Bin
src/main/resources/{textures => }/videos/sony.mp4 | Bin
12 files changed, 6 insertions(+), 4 deletions(-)
rename src/main/resources/{textures => }/videos/allMyFellas.mp4 (100%)
rename src/main/resources/{textures => }/videos/bobama.mp4 (100%)
rename src/main/resources/{textures => }/videos/credits.mp4 (100%)
rename src/main/resources/{textures => }/videos/gameboy.mp4 (100%)
rename src/main/resources/{textures => }/videos/gamecube.mp4 (100%)
rename src/main/resources/{textures => }/videos/lifeCouldBeMonke.mp4 (100%)
rename src/main/resources/{textures => }/videos/monke.mp4 (100%)
rename src/main/resources/{textures => }/videos/pepe.mp4 (100%)
rename src/main/resources/{textures => }/videos/russianKid.mp4 (100%)
rename src/main/resources/{textures => }/videos/sony.mp4 (100%)
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 5614e1e2..a6e47b9d 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 2546ac28..7a77864c 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
--
GitLab