diff --git a/src/Launcher/Main.java b/src/Launcher/Main.java index 6b1885a..c27941e 100644 --- a/src/Launcher/Main.java +++ b/src/Launcher/Main.java @@ -30,7 +30,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, Instance_btn; // Define buttons + private Button exit, min, Home_btn, Modpack_btn, Settings_btn, Instance_btn, Settings_General_btn, Settings_Minecraft_btn; // Define buttons private ImageView icon; private TextField Search_modpacks; private Image appIcon; @@ -61,6 +61,8 @@ public class Main extends Application { Modpack_btn = (Button) root.lookup("#Modpacks-btn"); Settings_btn = (Button) root.lookup("#Settings-btn"); Instance_btn = (Button) root.lookup("#Instance-btn"); + Settings_General_btn = (Button) root.lookup("Settings-Gen-btn"); + Settings_Minecraft_btn = (Button) root.lookup("Settings-Mine-btn"); tab = (Pane) root.lookup("#tab"); diff --git a/src/Launcher/minecraft/Launcher.java b/src/Launcher/minecraft/Launcher.java index d27414a..9e31fcb 100644 --- a/src/Launcher/minecraft/Launcher.java +++ b/src/Launcher/minecraft/Launcher.java @@ -1,5 +1,5 @@ package Launcher.minecraft; public class Launcher { - + } diff --git a/src/assets/layout/settings.fxml b/src/assets/layout/settings.fxml index df22225..04d1877 100644 --- a/src/assets/layout/settings.fxml +++ b/src/assets/layout/settings.fxml @@ -1,19 +1,27 @@ + + + + - - + + + - diff --git a/src/assets/style/nav.css b/src/assets/style/nav.css index b96f663..4f1feff 100644 --- a/src/assets/style/nav.css +++ b/src/assets/style/nav.css @@ -13,10 +13,10 @@ #min:hover, #exit:hover{ -fx-background-color: #bf0000; } -#Home-btn, #Modpacks-btn, #Settings-btn, #Instance-btn { +#Home-btn, #Modpacks-btn, #Settings-btn, #Instance-btn, #Settings-Gen-btn, #Settings-Mine-btn{ -fx-background-color: rgba(0, 0, 0, 0); } -#Home-btn:hover, #Modpacks-btn:hover, #Settings-btn:hover, #Instance-btn:hover { +#Home-btn:hover, #Modpacks-btn:hover, #Settings-btn:hover, #Instance-btn:hover, #Settings-Gen-btn:hover, #Settings-Mine-btn:hover { -fx-background-color: #0c182d; -fx-background-radius: 0em; }