diff --git a/src/Launcher/Main.java b/src/Launcher/Main.java index 5881709..86ff329 100644 --- a/src/Launcher/Main.java +++ b/src/Launcher/Main.java @@ -15,6 +15,7 @@ import javafx.application.Application; import javafx.fxml.FXMLLoader; import javafx.scene.Scene; import javafx.scene.control.Button; +import javafx.scene.control.Tab; import javafx.scene.control.TextField; import javafx.scene.image.Image; import javafx.scene.image.ImageView; @@ -30,7 +31,7 @@ public class Main extends Application { 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; // Define buttons + private Button exit, min, Home_btn, Modpack_btn, Settings_btn, Instance_btn; // Define buttons private ImageView icon; private TextField Search_modpacks; private Image appIcon; @@ -61,6 +62,7 @@ public class Main extends Application { Home_btn = (Button) root.lookup("#Home-btn"); Modpack_btn = (Button) root.lookup("#Modpacks-btn"); Settings_btn = (Button) root.lookup("#Settings-btn"); + Instance_btn = (Button) root.lookup("#Instance-btn"); tab = (Pane) root.lookup("#tab"); @@ -92,6 +94,13 @@ public class Main extends Application { } }); + Instance_btn.setOnMouseClicked(event -> { + if(activeTab!=Tabs.Instance){ + (activeTab = Tabs.Instance).switchTab(tab); + + } + }); + Settings_btn.setOnMouseClicked(event ->{ if(activeTab!=Tabs.Settings){ (activeTab=Tabs.Settings).switchTab(tab); // Sets the active tab to the settings tab unless it's already active diff --git a/src/Launcher/Tabs.java b/src/Launcher/Tabs.java index bf1c46b..d82baba 100644 --- a/src/Launcher/Tabs.java +++ b/src/Launcher/Tabs.java @@ -8,7 +8,10 @@ import java.net.URL; public enum Tabs { - Modpacks(Tabs.class.getResource("../assets/layout/modpacks.fxml")), Home(Tabs.class.getResource("../assets/layout/home.fxml")), Settings(Tabs.class.getResource("../assets/layout/settings.fxml")); + Modpacks(Tabs.class.getResource("../assets/layout/modpacks.fxml")), + Home(Tabs.class.getResource("../assets/layout/home.fxml")), + Settings(Tabs.class.getResource("../assets/layout/settings.fxml")), + Instance(Tabs.class.getResource("../assets/layout/instance.fxml")); /** * Url referencing xml. diff --git a/src/assets/layout/main.fxml b/src/assets/layout/main.fxml index 7e2d47d..a725d1e 100644 --- a/src/assets/layout/main.fxml +++ b/src/assets/layout/main.fxml @@ -29,7 +29,12 @@ - +