diff --git a/.idea/artifacts/TAL_jar.xml b/.idea/artifacts/TAL_jar.xml new file mode 100644 index 0000000..3e03979 --- /dev/null +++ b/.idea/artifacts/TAL_jar.xml @@ -0,0 +1,10 @@ + + + $PROJECT_DIR$/out/artifacts/TAL_jar + + + + + + + \ No newline at end of file diff --git a/src/Launcher/Main.java b/src/Launcher/Main.java index 7a692ad..6e67d89 100644 --- a/src/Launcher/Main.java +++ b/src/Launcher/Main.java @@ -29,7 +29,7 @@ import com.tofvesson.async.*; public class Main extends Application { - public static final URL mainLauncher = Main.class.getResource("../assets/layout/main.fxml"); // Launcher body + public static final URL mainLauncher = Main.class.getResource("/assets/layout/main.fxml"); // Launcher body private double xOffset = 0, yOffset = 0; // Offsets for dragging private Button exit, min, Home_btn, Modpack_btn, Settings_btn, Instance_btn; // Define buttons @@ -51,7 +51,7 @@ public class Main extends Application { primaryStage.setScene(new Scene(root, 900, 500)); primaryStage.show(); primaryStage.getIcons().clear(); - primaryStage.getIcons().add(appIcon = new Image(getClass().getResourceAsStream("../assets/icons/app.png"))); + primaryStage.getIcons().add(appIcon = new Image(getClass().getResourceAsStream("/assets/icons/app.png"))); // Field initialization exit = (Button) root.lookup("#exit"); @@ -127,9 +127,6 @@ public class Main extends Application { } }); - - System.out.println(settings_activeTab.getId()); - Tabs.switchTab(settings_activeTab.getId().equals("Settings-Gen-btn") ? "settings_generic" : "settings_minecraft", (Pane) n.lookup("#Settings-Pane")); } }); diff --git a/src/Launcher/Tabs.java b/src/Launcher/Tabs.java index e8b844b..45b90ee 100644 --- a/src/Launcher/Tabs.java +++ b/src/Launcher/Tabs.java @@ -21,7 +21,7 @@ public class Tabs { */ public static Node load(String fileName){ if(!fileName.endsWith(".fxml")) fileName+=".fxml"; - URL file = Main.class.getResource("../assets/layout/"+fileName); + URL file = Main.class.getResource("/assets/layout/"+fileName); try { final boolean[] b = {false}; loaded.stream().filter(p -> p.getKey().equals(file)).forEach(p->b[0]=true); @@ -57,7 +57,7 @@ public class Tabs { */ public static void unloadTab(String fileName){ if(!fileName.endsWith(".fxml")) fileName+=".fxml"; - URL file = Main.class.getResource("../assets/layout/"+fileName); + URL file = Main.class.getResource("/assets/layout/"+fileName); loaded.stream().filter(p->p.getKey().equals(file)).forEach(loaded::remove); } diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF new file mode 100644 index 0000000..33021cc --- /dev/null +++ b/src/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: Launcher.Main + diff --git a/src/assets/layout/main.fxml b/src/assets/layout/main.fxml index 7e4e3e6..0d7daeb 100644 --- a/src/assets/layout/main.fxml +++ b/src/assets/layout/main.fxml @@ -40,7 +40,7 @@ -