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 @@ - 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