Merge pull request #11 from GabrielTofvesson/master

Merge pull request #10 from GabrielTofvesson/master

.idea/misc.xml

@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="ProjectKey">
     <option name="state" value="project://e79810c8-c5c8-43b1-b19c-90c1f4095425" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="WebServicesPlugin" addRequiredLibraries="true" />

src/Launcher/Main.java

@@ -7,8 +7,6 @@ always tell me that it's virtually unreadable and it doesn't help that it's diff
 does without them losing interest. Also, in case you are actually, seriously going to read this crap, do yourself a
 favour and pour yourself some nice Jack Daniels. You deserve it if you're going to read through this.
 
-
-
 Do not Read Past this point... This is a human health advisory. Anyone reading past this point will risk his or her life.
 If you get sick reading, we will not claim responsibility on your health. Please Stay Clear of the Code.
 */
@@ -17,7 +15,6 @@ package Launcher;
 
 import Launcher.net.Updater;
 import com.tofvesson.async.Async;
-import com.tofvesson.joe.Localization;
 import com.tofvesson.reflection.SafeReflection;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
@@ -26,21 +23,25 @@ import javafx.collections.ObservableList;
 import javafx.scene.Node;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
-import javafx.scene.control.Button;
+import javafx.scene.control.*;
-import javafx.scene.control.Label;
-import javafx.scene.control.TextField;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
+import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.Pane;
 import javafx.scene.shape.Rectangle;
+import javafx.stage.Modality;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.util.Duration;
 
+import java.io.BufferedReader;
 import java.io.File;
-import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /*
@@ -54,19 +55,22 @@ public class Main extends Application {
     public static final String  semVerDevState  = "PreDev";                                                             // Development stage
     public static final int     semVerMajor     = 0;                                                                    // Major version
     public static final int     semVerMinor     = 2;                                                                    // Minor version
-    public static final int     semVerPatch     = 5;                                                                    // Patch version
+    public static final int     semVerPatch     = 6;                                                                    // Patch version
 
 
     double xOffset = 0, yOffset = 0;                                                                                    // Offsets for dragging
     private static String[] args;
-    Button exit, min, Home_btn, Modpack_btn, Settings_btn, Instance_btn, Default_theme, Dark_theme, Light_theme;        // Define buttons
+    Button exit, min, Home_btn, Modpack_btn, Settings_btn, Instance_btn, Default_theme, Dark_theme, Light_theme, Login_minecraft;        // Define buttons
     private ImageView icon;
-    private TextField Search_modpacks;
+    private TextField Search_modpacks, Username_minecraft;
     private Image appIcon;
     private Rectangle dragBar;                                                                                          // Draggable top bar
-    Pane root, tab;
+    Pane root, tab, dragbar_1;
+    private PasswordField Password_minecraft;
     Node activeTab, settings_activeTab;
     private Label dialog_changer;
+    private CheckBox RAM_Default;
+    private Slider RAM_slider;
 
     Async stringUpdater;
 
@@ -82,6 +86,7 @@ public class Main extends Application {
             d.initStyle(StageStyle.UNDECORATED);
             Pane n = (Pane) Tabs.load("dialog_update");
             d.setScene(new Scene(n));
+            d.getIcons().add(appIcon = new Image(getClass().getResourceAsStream("/assets/icons/app.png")));
             d.show();
             Thread t1 = new Thread(()->{
                 try { Thread.sleep(1000); } catch (InterruptedException e) { e.printStackTrace(); }
@@ -93,8 +98,8 @@ public class Main extends Application {
 
         root = (Pane) Tabs.load("main");                                                                       // Load via layout loader
         ((Label)root.lookup("#version")).setText(((Label) root.lookup("#version"))                      // Dynamically set version label
-                .getText().replace("$v", semVerDevState+"-"+semVerMajor+"."+semVerMinor+"."+semVerPatch));              // Use variables to define version
+                .getText().replace("$v", semVerDevState+" "+semVerMajor+"."+semVerMinor+"."+semVerPatch));              // Use variables to define version
-        primaryStage.setTitle("Team-Avion Launcher [WIP]");
+        primaryStage.setTitle("Team-Avion Launcher");
         primaryStage.setScene(new Scene(root, 900, 500));
         primaryStage.getIcons().clear();
         primaryStage.getIcons().add(appIcon = new Image(getClass().getResourceAsStream("/assets/icons/app.png")));
@@ -112,6 +117,7 @@ public class Main extends Application {
         Default_theme = (Button) root.lookup("#default-theme");
         Light_theme = (Button) root.lookup("#light-theme");
         Dark_theme = (Button) root.lookup("#dark-theme");
+        Login_minecraft = (Button) root.lookup("#minecraft-login-btn");
 
         dialog_changer = (Label) root.lookup("#dialog-changer");
 
@@ -120,6 +126,8 @@ public class Main extends Application {
         icon = (ImageView) root.lookup("#icon");
 
         Search_modpacks = (TextField) root.lookup("#search-modpacks");
+        Username_minecraft = (TextField) root.lookup("#minecraftuser");
+        Password_minecraft = (PasswordField) root.lookup("#minecraftpass");
 
         // Infrastructural navigation
         exit.setOnMouseClicked(event -> primaryStage.close());                                                          // Closes the program if exit button is clicked
@@ -131,7 +139,6 @@ public class Main extends Application {
                 Tabs.switchTab("home", tab);
             }
         });                                                                                                             // Sets the active tab to the home tab unless it's already active
-
         Modpack_btn.setOnMouseClicked(event ->{
             if(!activeTab.equals(Modpack_btn)){
                 updateTabSelection(Modpack_btn, TabType.MAIN);
@@ -162,23 +169,20 @@ public class Main extends Application {
                 });
             }
         });
-
+        Settings_btn.setOnMouseClicked((MouseEvent event) ->{
-        Settings_btn.setOnMouseClicked(event ->{
             if(!activeTab.equals(Settings_btn)){
                 updateTabSelection(Settings_btn, TabType.MAIN);
                 Node n = Tabs.switchTab("settings", tab), tmp;                                                          // Sets the active tab to the settings tab unless it's already active
-
                 if(settings_activeTab==null) settings_activeTab = n.lookup("#Settings-Gen-btn");                        // First time stuff
-
+                    n.lookup("#Settings-Gen-btn").setOnMouseClicked(event1 -> {
-                n.lookup("#Settings-Gen-btn").setOnMouseClicked(event1 -> {
                     // Generic Settings Sub-tab
                     if(!settings_activeTab.getId().equals(n.lookup("#Settings-Gen-btn").getId())){                      // Use id to identify layouts
                         updateTabSelection(n.lookup("#Settings-Gen-btn"), TabType.SETTINGS);
                         Node genericLayout = Tabs.switchTab("settings_generic", (Pane) n.lookup("#Settings-Pane"));
 
+
                     }
                 });
-
                 n.lookup("#Settings-Mine-btn").setOnMouseClicked(event1 -> {
                     // Minecraft Settings Sub-tab
                     if(!settings_activeTab.getId().equals(n.lookup("#Settings-Mine-btn").getId())){                     // Use id to identify layouts
@@ -187,7 +191,61 @@ public class Main extends Application {
                         Tabs.load("settings_minecraft").lookup("#minecraft-login-btn").setOnMouseClicked(event3 ->{
                             System.out.println("Logging into minecraft");
 
+                            Stage login = new Stage();
+                            login.initModality(Modality.APPLICATION_MODAL);
+                            login.initStyle(StageStyle.UNDECORATED);
+                            Pane minecraftlogin = (Pane) Tabs.reloadTab("instance_userinfo");
+                            login.setScene(new Scene(minecraftlogin, 300, 308));
+                            login.show();
+                            login.setResizable(false);
+                            login.setTitle("Minecraft Login");
+
+                            dragbar_1 = (Pane) minecraftlogin.lookup("#dragbar-1");
+
+                            dragbar_1.setOnMousePressed(event4 -> {
+                                xOffset = event4.getSceneX();
+                                yOffset = event4.getSceneY();
+                            });
+                            dragbar_1.setOnMouseDragged(event4 -> {
+                                login.setX(event4.getScreenX() - xOffset);
+                                login.setY(event4.getScreenY() - yOffset);
+                            });
+
+                            minecraftlogin.lookup("#close-minecraft-login-window").setOnMouseClicked(event4 ->{
+                                System.out.println("Closing window");
+                                login.close();
+                            });
+
+                            minecraftlogin.lookup("#minecraft-login").setOnMouseClicked(event4 ->{
+                                System.out.println("Logging in ....");
+                                Pane lw;
+                                Scene s = login.getScene();
+                                login.setScene(new Scene(lw=(Pane)Tabs.reloadTab("instance_loginwait"), 300, 308));
+                                login.getScene().getRoot().setOnMousePressed(event5 -> {
+                                    xOffset = event5.getSceneX();
+                                    yOffset = event5.getSceneY();
+                                });
+                                login.getScene().getRoot().setOnMouseDragged(event5 -> {
+                                    login.setX(event5.getScreenX() - xOffset);
+                                    login.setY(event5.getScreenY() - yOffset);
+                                });
+                                lw.lookup("#login_cancel").setOnMouseClicked(event2 -> {
+                                    System.out.println("Canceled");
+                                    login.setScene(s);
+                                });
+                            });
                         });
+
+                        Node Minecraft_settings = Tabs.load("settings_minecraft");
+
+                        RAM_Default = (CheckBox) Minecraft_settings.lookup("#RAM-Default");
+                        RAM_slider = (Slider) Minecraft_settings.lookup("#RAM-slider");
+
+
+                        // Default States for the General Settings
+                        RAM_slider.setDisable(true);
+                        RAM_Default.setSelected(true);
+
                     }
                 });
 
@@ -226,7 +284,7 @@ public class Main extends Application {
     }
 
     public static void main(String[] args) throws Exception{
-        // TODO: Try and fix this code please, It still doesn't work on my PC.
+        // TODO: Needs Fixing.
         /* Localization l = new Localization(new File(Main.class.getResource("../assets/lang/").getFile()));                // Create a localization with aggressive loading
         System.out.println(Arrays.toString(l.getLanguageNames()));
         System.out.println("Success: "+l.get("du_label")); */
@@ -238,6 +296,40 @@ public class Main extends Application {
         launch(args);
     }
 
+    private static String MakeJSONRequest(String username, String password){ return "{\"agent\": { \"name\": \"Minecraft\", \"version\": 1 }, \"username\": \""+username+"\", \"password\": \""+password+"\"}"; }
+
+    private static String httpRequest(URL url, String content) throws Exception {
+        byte[] contentBytes = content.getBytes("UTF-8");
+
+        URLConnection connection = url.openConnection();
+        connection.setDoInput(true);
+        connection.setDoOutput(true);
+        connection.setRequestProperty("Accept-Charset", "UTF-8");
+        connection.setRequestProperty("Content-Type", "application/json");
+        connection.setRequestProperty("Content-Length", Integer.toString(contentBytes.length));
+
+        OutputStream requestStream = connection.getOutputStream();
+        requestStream.write(contentBytes, 0, contentBytes.length);
+        requestStream.close();
+
+        String response = "";
+        BufferedReader responseStream;
+        if (((HttpURLConnection) connection).getResponseCode() == 200) {
+            responseStream = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"));
+        } else {
+            responseStream = new BufferedReader(new InputStreamReader(((HttpURLConnection) connection).getErrorStream(), "UTF-8"));
+        }
+
+        response = responseStream.readLine();
+        responseStream.close();
+
+        if (((HttpURLConnection) connection).getResponseCode() != 200) {
+            //Failed to login (Invalid Credentials or whatever)
+        }
+
+        return response;
+    }
+
     /**
      * Search for packs with an 80% match compared to detected string.
      * @param toRead TextField to read from.

src/Launcher/Tabs.java

@@ -33,10 +33,10 @@ public class Tabs {
         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);
+            loaded.stream().filter(p ->p!=null && p.getKey().equals(file)).forEach(p->b[0]=true);
             if(!b[0]) loaded.add(new Pair<>(file, FXMLLoader.load(file)));                                              // Load file if it isn't already loaded
             final Node[] p1 = new Node[]{new Pane()};
-            loaded.stream().filter(p->p.getKey().equals(file)).forEach(p->p1[0]=p.getValue());
+            loaded.stream().filter(p->p!=null && p.getKey().equals(file)).forEach(p->p1[0]=p.getValue());
             return p1[0];
         } catch (IOException e) {
             e.printStackTrace();
@@ -67,7 +67,7 @@ public class Tabs {
     public static void unloadTab(String fileName){
         if(!fileName.endsWith(".fxml")) fileName+=".fxml";
         URL file = Main.class.getResource("/assets/layout/"+fileName);
-        loaded.stream().filter(p->p.getKey().equals(file)).forEach(loaded::remove);
+        loaded.stream().filter(p->p!=null && p.getKey().equals(file)).forEach(loaded::remove);
     }
 
     /**

src/Launcher/minecraft/Launcher.java

@@ -1,5 +1,7 @@
 package Launcher.minecraft;
 
 public class Launcher {
-    
+
+
+
 }

src/assets/layout/dialog_update.fxml

@@ -11,7 +11,7 @@
 <Pane id="dialog" prefHeight="109.0" prefWidth="432.0" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
    <Label prefHeight="56.0" prefWidth="432.0" text="Launching TAL..." textAlignment="CENTER">
       <font>
-         <Font name="Centaur" size="44.0" />
+         <Font name="Centaur" size="45.0" />
       </font>
       <padding>
          <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />

src/assets/layout/instance_loginwait.fxml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.Cursor?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ProgressIndicator?>
+<?import javafx.scene.effect.ColorAdjust?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.text.Font?>
+
+<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="308.0" prefWidth="300.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
+   <children>
+      <Label alignment="BOTTOM_CENTER" layoutX="104.0" layoutY="229.0" text="Logging in...">
+         <font>
+            <Font size="17.0" />
+         </font></Label>
+       <ProgressIndicator layoutX="124.0" layoutY="127.0" mouseTransparent="true" nodeOrientation="LEFT_TO_RIGHT" scaleX="2.0" scaleY="2.0">
+           <cursor>
+               <Cursor fx:constant="WAIT" />
+           </cursor>
+           <effect>
+               <ColorAdjust brightness="-1.0" contrast="-0.00" hue="-0.5" saturation="-0.98" />
+           </effect></ProgressIndicator>
+      <Button id="login_cancel" layoutX="124.0" layoutY="267.0" mnemonicParsing="false" text="Cancel" />
+   </children>
+</Pane>

src/assets/layout/instance_userinfo.fxml

@@ -1,5 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.PasswordField?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.Pane?>
+<?import javafx.scene.text.Font?>
 
-<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.92" xmlns:fx="http://javafx.com/fxml/1" />
+<Pane id="dragbar-1" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="308.0" prefWidth="300.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
+   <children>
+      <Button id="minecraft-login" layoutX="120.0" layoutY="253.0" mnemonicParsing="false" text="Login">
+         <font>
+            <Font name="Century" size="15.0" />
+         </font></Button>
+      <CheckBox layoutX="88.0" layoutY="217.0" mnemonicParsing="false" text="Remember Me">
+         <font>
+            <Font name="Century" size="14.0" />
+         </font></CheckBox>
+      <PasswordField id="minecraftpass" layoutX="108.0" layoutY="174.0" prefHeight="27.0" prefWidth="165.0" promptText="Password" />
+      <TextField id="minecraftuser" layoutX="108.0" layoutY="130.0" prefHeight="27.0" prefWidth="165.0" promptText="Username / Email" />
+      <ImageView fitHeight="94.0" fitWidth="274.0" layoutX="14.0" layoutY="56.0" pickOnBounds="true" preserveRatio="true">
+         <image>
+            <Image url="@../icons/minecraft.png" />
+         </image>
+      </ImageView>
+      <Button id="close-minecraft-login-window" layoutX="259.0" layoutY="14.0" mnemonicParsing="false" prefHeight="19.0" prefWidth="28.0" text="X" />
+      <Label layoutX="14.0" layoutY="134.0" text="Username :">
+         <font>
+            <Font name="Century" size="15.0" />
+         </font>
+      </Label>
+      <Label layoutX="14.0" layoutY="178.0" prefHeight="19.0" prefWidth="80.0" text="Password :">
+         <font>
+            <Font name="Century" size="15.0" />
+         </font>
+      </Label>
+   </children>
+</Pane>

src/assets/layout/main.fxml

@@ -7,11 +7,11 @@
 <?import javafx.scene.shape.Rectangle?>
 <?import javafx.scene.text.Font?>
 
-<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500" prefWidth="900" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
+<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500" prefWidth="900" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
    <children>
       <Rectangle id="rectangle" fill="white" height="50.0" strokeType="INSIDE" width="900.0" />
-      <Button id="exit" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="862.0" layoutY="13.0" mnemonicParsing="false" text="X"/>
+      <Button id="exit" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="862.0" layoutY="13.0" mnemonicParsing="false" text="X" />
-       <Button id="min" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="841.0" layoutY="13.0" mnemonicParsing="false" text="-"/>
+       <Button id="min" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="841.0" layoutY="13.0" mnemonicParsing="false" text="-" />
        <ImageView id="icon" fitHeight="50.0" fitWidth="50.0" layoutX="14.0" />
        <Label id="lable" layoutX="75.0" layoutY="11.0" text="Team-Avion Launcher">
          <font>
@@ -40,7 +40,7 @@
            </font>
        </Button>
       <Pane id="tab" layoutX="150.0" layoutY="50.0" prefHeight="450.0" prefWidth="750.0" />
-      <Label id="version" layoutX="17.0" layoutY="455.0" text="Version : $v" />
+      <Label id="version" layoutX="8.0" layoutY="455.0" text="Version : $v" />
       <Label id="lable" layoutX="9.0" layoutY="472.0" text="Copyright 2016 TeamAvion">
          <font>
             <Font size="11.0" />

src/assets/layout/modpacks.fxml

@@ -2,7 +2,6 @@
 
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ScrollBar?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.image.Image?>
 <?import javafx.scene.image.ImageView?>
@@ -10,7 +9,7 @@
 <?import javafx.scene.shape.Rectangle?>
 <?import javafx.scene.text.Font?>
 
-<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="750.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
+<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="536.0" prefWidth="750.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
     <children>
         <Rectangle id="Modpack-back" height="40.0" strokeType="INSIDE" width="750.0" />
         <Label id="lable" layoutX="40.0" layoutY="1.0" text="Modpacks">
@@ -19,7 +18,7 @@
             </font>
         </Label>
       <TextField id="search-modpacks" layoutX="475.0" layoutY="2.0" prefHeight="37.0" prefWidth="261.0" promptText="Search Modpacks" />
-      <Rectangle id="rectangle-3" height="140.0" layoutX="10.0" layoutY="50.0" width="720.0" />
+      <Rectangle id="rectangle-3" height="140.0" layoutX="10.0" layoutY="50.0" width="728.0" />
       <ImageView fitHeight="119.0" fitWidth="138.0" layoutX="30.0" layoutY="61.0" pickOnBounds="true" preserveRatio="true">
          <image>
             <Image url="@../icons/modpack-default-img.png" />
@@ -30,11 +29,11 @@
             <Font name="Centaur" size="20.0" />
          </font>
       </Label>
-      <Button id="view-modpack" layoutX="644.0" layoutY="145.0" mnemonicParsing="false" prefHeight="37.0" prefWidth="47.0" text="View" />
+      <Button id="view-modpack" layoutX="644.0" layoutY="145.0" mnemonicParsing="false" prefHeight="37.0" prefWidth="77.0" text="View" />
       <Button id="download-modpack" layoutX="553.0" layoutY="145.0" mnemonicParsing="false" prefHeight="37.0" prefWidth="77.0" text="Download" />
       <Label id="lable" layoutX="205.0" layoutY="86.0" prefHeight="25.0" prefWidth="480.0" text="Some random text. " wrapText="true" />
 
-        <Rectangle id="rectangle-3" height="140.0" layoutX="10.0" layoutY="200.0" width="720.0" />
+        <Rectangle id="rectangle-3" height="140.0" layoutX="10.0" layoutY="200.0" width="728.0" />
         <ImageView fitHeight="119.0" fitWidth="138.0" layoutX="30.0" layoutY="211.0" pickOnBounds="true" preserveRatio="true">
             <image>
                 <Image url="@../icons/Modpack-modded.png" />
@@ -45,9 +44,8 @@
                 <Font name="Centaur" size="20.0" />
             </font>
         </Label>
-        <Button id="view-modpack-a" layoutX="644.0" layoutY="295.0" mnemonicParsing="false" prefHeight="37.0" prefWidth="47.0" text="View" />
+        <Button id="view-modpack-a" layoutX="644.0" layoutY="295.0" mnemonicParsing="false" prefHeight="37.0" prefWidth="77.0" text="View" />
         <Button id="download-modpack-a" layoutX="553.0" layoutY="295.0" mnemonicParsing="false" prefHeight="37.0" prefWidth="77.0" text="Download" />
         <Label id="lable" layoutX="205.0" layoutY="246.0" prefHeight="25.0" prefWidth="480.0" text="Some random text. " wrapText="true" />
-      <ScrollBar layoutX="736.0" layoutY="40.0" orientation="VERTICAL" prefHeight="410.0" prefWidth="14.0" />
     </children>
 </Pane>

src/assets/layout/settings_generic.fxml

@@ -6,7 +6,7 @@
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.text.Font?>
 
-<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="370.0" prefWidth="750.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
+<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="370.0" prefWidth="750.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
    <children>
       <Label id="lable" layoutX="22.0" layoutY="14.0" text="General Settings">
          <font>
@@ -21,5 +21,25 @@
             <Font name="Centaur" size="17.0" />
          </font>
       </Label>
+      <CheckBox id="lable" layoutX="35.0" layoutY="117.0" mnemonicParsing="false" text="Autoupdate">
+         <font>
+            <Font name="Century" size="15.0" />
+         </font>
+      </CheckBox>
+      <CheckBox id="lable" layoutX="35.0" layoutY="154.0" mnemonicParsing="false" text="Start on windosw Startup">
+         <font>
+            <Font name="Century" size="15.0" />
+         </font>
+      </CheckBox>
+      <CheckBox id="Close_window_minecraft_launch" disable="true" layoutX="35.0" layoutY="185.0" mnemonicParsing="false" text="Close Window when Mincraft Launches">
+         <font>
+            <Font name="Century" size="15.0" />
+         </font>
+      </CheckBox>
+      <CheckBox id="Minimized_window_minecraft_launch" layoutX="344.0" layoutY="185.0" mnemonicParsing="false" selected="true" text="Minimize Window when Minecraft Launches">
+         <font>
+            <Font name="Century" size="15.0" />
+         </font>
+      </CheckBox>
    </children>
 </Pane>

src/assets/layout/settings_minecraft.fxml

@@ -1,19 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Slider?>
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.text.Font?>
 
-<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="370.0" prefWidth="750.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
+<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="370.0" prefWidth="750.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
     <children>
         <Label id="lable" layoutX="22.0" layoutY="14.0" text="Minecraft Settings">
             <font>
                 <Font name="Centaur" size="25.0" />
             </font>
         </Label>
-      <Label id="lable" layoutX="32.0" layoutY="77.0" text="Account:" />
+      <Label id="lable" layoutX="14.0" layoutY="77.0" text="Account :">
+         <font>
+            <Font name="Century" size="15.0" />
+         </font></Label>
       <Button id="minecraft-login-btn" layoutX="90.0" layoutY="71.0" mnemonicParsing="false" prefHeight="30.0" prefWidth="59.0" text="Login" />
       <Label id="login" layoutX="160.0" layoutY="78.0" text="Not logged in" />
+      <Slider id="RAM-slider" blockIncrement="1.0" layoutX="15.0" layoutY="147.0" majorTickUnit="1.0" max="16.0" minorTickCount="0" prefHeight="37.0" prefWidth="286.0" showTickLabels="true" showTickMarks="true" value="8.0" />
+      <Label id="lable" layoutX="14.0" layoutY="123.0" text="Alocated RAM :">
+         <font>
+            <Font name="Century" size="15.0" />
+         </font>
+      </Label>
+      <CheckBox id="RAM-Default"  layoutX="149.0" layoutY="124.0" mnemonicParsing="false" text="Use Systems Default">
+         <font>
+            <Font name="Century" size="13.0" />
+         </font>
+      </CheckBox>
     </children>
 </Pane>

src/assets/style/dark-theme.css

@@ -57,7 +57,7 @@
     -fx-text-fill: black;
 }
 
-#lable {
+#lable, #RAM-Default, #RAM-slider, #Minimized_window_minecraft_launch, #Close_window_minecraft_launch {
     -fx-text-fill: white;
 }
 
@@ -134,4 +134,15 @@
 
 .selected:hover {
     -fx-background-color: #060606;
+}
+#minecraftuser, #minecraftpass{
+    -fx-prompt-text-fill: white;
+    -fx-text-fill: white;
+    -fx-background-color: transparent;
+    -fx-padding: 5px;
+}
+#minecraftuser:hover, #minecraftpass:hover, #minecraftuser:focused, #minecraftpass:focused{
+    -fx-border-style: solid;
+    -fx-border-color: white;
+    -fx-border-width: 0px 0px 2px 0px;
 }

src/assets/style/default-theme.css

@@ -57,7 +57,7 @@
     -fx-text-fill: black;
 }
 
-#lable {
+#lable, #RAM-Default, #RAM-slider, #Minimized_window_minecraft_launch, #Close_window_minecraft_launch {
     -fx-text-fill: white;
 }
 
@@ -134,4 +134,36 @@
 
 .selected:hover {
     -fx-background-color: #05030c;
+}
+
+#minecraftuser, #minecraftpass{
+    -fx-prompt-text-fill: #000000;
+    -fx-text-fill: #000000;
+    -fx-background-color: transparent;
+    -fx-padding: 5px;
+}
+#minecraftuser:hover, #minecraftpass:hover, #minecraftuser:focused, #minecraftpass:focused{
+    -fx-border-style: solid;
+    -fx-border-color: #444444;
+    -fx-border-width: 0px 0px 2px 0px;
+}
+#minecraft-login {
+    -fx-background-color: #292929;
+    -fx-background-radius: 2px;
+    -fx-text-fill: #ffffff;
+}
+#minecraft-login:hover, #close-minecraft-login-window:hover{
+    -fx-background-color: #575757;
+    -fx-background-radius: 2px;
+    -fx-text-fill: #e4e4e4;
+}
+#close-minecraft-login-window {
+    -fx-background-color: #2c0004;
+    -fx-background-radius: 2px;
+    -fx-text-fill: white;
+}
+#close-minecraft-login-window:hover{
+    -fx-background-color: #6e0003;
+    -fx-background-radius: 2px;
+    -fx-text-fill: white;
 }

src/assets/style/light-theme.css

@@ -57,7 +57,7 @@
     -fx-text-fill: black;
 }
 
-#lable {
+#lable, #RAM-Default, #RAM-slider, #Minimized_window_minecraft_launch, #Close_window_minecraft_launch {
     -fx-text-fill: black;
 }
 
@@ -134,4 +134,16 @@
 
 .selected:hover {
     -fx-background-color: #fff;
+}
+
+#minecraftuser, #minecraftpass{
+    -fx-prompt-text-fill: white;
+    -fx-text-fill: white;
+    -fx-background-color: transparent;
+    -fx-padding: 5px;
+}
+#minecraftuser:hover, #minecraftpass:hover, #minecraftuser:focused, #minecraftpass:focused{
+    -fx-border-style: solid;
+    -fx-border-color: white;
+    -fx-border-width: 0px 0px 2px 0px;
 }