From 24338e344c4468cbbe1a15182ea0b13a2137f7ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Autin?=
 <francois.autin@etudiant.univ-rennes1.fr>
Date: Thu, 3 Jun 2021 01:53:32 +0200
Subject: [PATCH] Fixed resource not being found by Launcher

---
 src/launcher/Launcher.java          | 5 +++--
 src/launcher/{ui => }/launcher.fxml | 2 +-
 src/launcher/{ui => }/style.css     | 0
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename src/launcher/{ui => }/launcher.fxml (94%)
 rename src/launcher/{ui => }/style.css (100%)

diff --git a/src/launcher/Launcher.java b/src/launcher/Launcher.java
index 76353b8..2a32a12 100644
--- a/src/launcher/Launcher.java
+++ b/src/launcher/Launcher.java
@@ -37,7 +37,7 @@ public class Launcher extends Application {
 	 */
 	public void start(Stage primaryStage) throws Exception {
 		
-		Parent root = FXMLLoader.load(getClass().getResource("/launcher/ui/launcher.fxml"));
+		Parent root = FXMLLoader.load(getClass().getResource("launcher.fxml"));
 		
 		Scene main = new Scene(root);
 		
@@ -51,11 +51,12 @@ public class Launcher extends Application {
 	public static void runGame() {
 		try {
 			setter.setSettings();
+			Engine.main(null);
 		} catch (Exception e) {
 			e.printStackTrace();
 			System.exit(1);
 		}
-		Engine.main(null);
+		
 	}
 	
 	public static void openSettings() {
diff --git a/src/launcher/ui/launcher.fxml b/src/launcher/launcher.fxml
similarity index 94%
rename from src/launcher/ui/launcher.fxml
rename to src/launcher/launcher.fxml
index 75dd44f..60d61b8 100644
--- a/src/launcher/ui/launcher.fxml
+++ b/src/launcher/launcher.fxml
@@ -7,7 +7,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.layout.Pane?>
 
-<HBox xmlns:fx="http://javafx.com/fxml" stylesheets="/launcher/ui/style.css" fx:id="window"
+<HBox xmlns:fx="http://javafx.com/fxml" stylesheets="@style.css" fx:id="window"
       prefWidth="640" prefHeight="380"
       fx:controller="launcher.FXMLController">
       
diff --git a/src/launcher/ui/style.css b/src/launcher/style.css
similarity index 100%
rename from src/launcher/ui/style.css
rename to src/launcher/style.css