From 641c496bd1e7612869857ad4f084a9cd76f1cf1e Mon Sep 17 00:00:00 2001
From: Michael-Jouanneau <tacomundu12@gmail.com>
Date: Thu, 23 Feb 2017 17:46:43 +0100
Subject: [PATCH] Getting ready for big update.

---
 src/Launcher/Main.java                    |  6 ++--
 src/assets/layout/home.fxml               | 37 +++++++++++++++--------
 src/assets/layout/instance.fxml           | 30 +++++++++---------
 src/assets/layout/main.fxml               | 14 ++++-----
 src/assets/layout/settings.fxml           |  6 ++--
 src/assets/layout/settings_generic.fxml   |  2 +-
 src/assets/layout/settings_minecraft.fxml |  2 +-
 7 files changed, 55 insertions(+), 42 deletions(-)

diff --git a/src/Launcher/Main.java b/src/Launcher/Main.java
index 0f5a469..21db02c 100644
--- a/src/Launcher/Main.java
+++ b/src/Launcher/Main.java
@@ -52,10 +52,10 @@ Beware the crocodiles on line 100!
 public class Main extends Application {
 
     // Semantic versioning system data
-    public static final String  semVerDevState  = "alpha-Dev";                                                             // Development stage
+    public static final String  semVerDevState  = "Alpha-Dev";                                                             // Development stage
     public static final int     semVerMajor     = 0;                                                                    // Major version
-    public static final int     semVerMinor     = 3;                                                                    // Minor version
-    public static final int     semVerPatch     = 0;                                                                    // Patch version
+    public static final int     semVerMinor     = 0;                                                                    // Minor version
+    public static final int     semVerPatch     = 1;                                                                    // Patch version
 
 
     double xOffset = 0, yOffset = 0;                                                                                    // Offsets for dragging
diff --git a/src/assets/layout/home.fxml b/src/assets/layout/home.fxml
index 02f4ed8..e0740df 100644
--- a/src/assets/layout/home.fxml
+++ b/src/assets/layout/home.fxml
@@ -1,52 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.scene.control.Label?>
-<?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.image.Image?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.Pane?>
 <?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="450.0" prefWidth="830.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
    <children>
-      <Rectangle id="home-back" height="40.0" strokeType="INSIDE" width="750.0" />
+      <Rectangle id="home-back" height="40.0" strokeType="INSIDE" width="830.0" />
       <Label id="lable" layoutX="339.0" layoutY="1.0" text="Home">
          <font>
             <Font name="Centaur" size="31.0" />
          </font>
       </Label>
-      <Rectangle id="rectangle-3" height="140.0" layoutX="10.0" layoutY="50.0" width="410.0" />
-      <Label id="lable" layoutX="43.0" layoutY="63.0" text="NEW LAYOUTS">
+
+      <Rectangle id="rectangle-3" height="140.0" layoutX="10.0" layoutY="50.0" width="550.0" />
+      <Label id="lable" layoutX="43.0" layoutY="63.0" text="NEW LAUNCHER">
          <font>
             <Font name="Centaur" size="20.0" />
          </font>
       </Label>
-      <Label id="lable" layoutX="202.0" layoutY="67.0" text="PreDev-0.2.4"/>
-      <Label id="lable" layoutX="43.0" layoutY="98.0" text="Two new themes to check out :">
+      <Label id="lable" layoutX="211.0" layoutY="68.0" text="Alpha-Dev-0.0.1" />
+      <Label id="lable" layoutX="39.0" layoutY="120.0" prefHeight="22.0" prefWidth="500.0" text="Changed all the layouts and colors of the launcher.">
          <font>
             <Font name="Centaur" size="18.0" />
          </font>
       </Label>
-      <Label id="lable" layoutX="43.0" layoutY="140.0" text="Light :">
+
+      <Rectangle id="rectangle-3" height="140.0" layoutX="14.0" layoutY="212.0" width="550.0" />
+      <Label id="lable" layoutX="43.0" layoutY="225.0" text="NEW LAYOUTS">
+         <font>
+            <Font name="Centaur" size="20.0" />
+         </font>
+      </Label>
+      <Label id="lable" layoutX="198.0" layoutY="230.0" text="PreDev-0.2.4" />
+      <Label id="lable" layoutX="43.0" layoutY="260.0" text="Two new themes to check out :">
+         <font>
+            <Font name="Centaur" size="18.0" />
+         </font>
+      </Label>
+      <Label id="lable" layoutX="53.0" layoutY="304.0" text="Light :">
          <font>
             <Font name="Centaur" size="16.0" />
          </font>
       </Label>
-      <ImageView fitHeight="56.0" fitWidth="89.0" layoutX="97.0" layoutY="123.0" pickOnBounds="true" preserveRatio="true">
+      <ImageView fitHeight="56.0" fitWidth="89.0" layoutX="113.0" layoutY="290.0" pickOnBounds="true" preserveRatio="true">
          <image>
             <Image url="@../icons/light-theme.png" />
          </image></ImageView>
-      <Label id="lable" layoutX="217.0" layoutY="139.0" text="Dark:">
+      <Label id="lable" layoutX="229.0" layoutY="304.0" text="Dark:">
          <font>
             <Font name="Centaur" size="16.0" />
          </font>
       </Label>
-      <ImageView fitHeight="56.0" fitWidth="89.0" layoutX="275.0" layoutY="123.0" pickOnBounds="true" preserveRatio="true">
+      <ImageView fitHeight="56.0" fitWidth="89.0" layoutX="275.0" layoutY="290.0" pickOnBounds="true" preserveRatio="true">
          <image>
             <Image url="@../icons/dark-theme.png" />
          </image></ImageView>
-      <ImageView fitHeight="345.0" fitWidth="226.0" layoutX="468.0" layoutY="56.0" pickOnBounds="true" preserveRatio="true">
+      <ImageView fitHeight="345.0" fitWidth="226.0" layoutX="584.0" layoutY="56.0" pickOnBounds="true" preserveRatio="true">
          <image>
             <Image url="@../icons/Creeper.png" />
          </image></ImageView>
diff --git a/src/assets/layout/instance.fxml b/src/assets/layout/instance.fxml
index 6afdee9..6adbfc1 100644
--- a/src/assets/layout/instance.fxml
+++ b/src/assets/layout/instance.fxml
@@ -8,42 +8,42 @@
 <?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="450.0" prefWidth="830.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
     <children>
-        <Rectangle id="instance-back" height="40.0" width="750.0" />
+        <Rectangle id="instance-back" height="40.0" width="830.0" />
         <Label id="lable" layoutX="324.0" layoutY="1.0" text="Instances">
             <font>
                 <Font name="Centaur" size="31.0" />
             </font>
         </Label>
-        <Rectangle id="rectangle-3" height="140.0" layoutX="15.0" layoutY="50.0" width="346.0" />
-        <ImageView fitHeight="87.0" fitWidth="165.0" layoutX="29.0" layoutY="61.0" pickOnBounds="true" preserveRatio="true">
+        <Rectangle id="rectangle-3" height="140.0" layoutX="41.0" layoutY="50.0" width="346.0" />
+        <ImageView fitHeight="87.0" fitWidth="165.0" layoutX="62.0" layoutY="65.0" pickOnBounds="true" preserveRatio="true">
             <image>
                 <Image url="@../icons/modpack-default-img.png" />
             </image>
         </ImageView>
-        <Label id="lable" layoutX="159.0" layoutY="61.0" text="Vanilla Minecraft">
+        <Label id="lable" layoutX="200.0" layoutY="61.0" text="Vanilla Minecraft">
             <font>
                 <Font name="Centaur" size="20.0" />
             </font>
         </Label>
-        <Button id="Launch-VM" layoutX="242.0" layoutY="142.0" mnemonicParsing="false" prefHeight="38.0" prefWidth="94.0" text="Launch" />
-        <Label id="lable" layoutX="148.0" layoutY="88.0" prefHeight="40.0" prefWidth="196.0" text="Pure Vanilla, No mods, No addons. Have fun!" wrapText="true" />
-      <Label id="lable" layoutX="41.0" layoutY="161.0" text="Latest Version : Minecraft v1.11" />
-      <Rectangle id="rectangle-3" height="140.0" layoutX="385.0" layoutY="50.0" width="346.0" />
-        <ImageView fitHeight="87.0" fitWidth="165.0" layoutX="409.0" layoutY="61.0" pickOnBounds="true" preserveRatio="true">
+        <Button id="Launch-VM" layoutX="277.0" layoutY="142.0" mnemonicParsing="false" prefHeight="38.0" prefWidth="94.0" text="Launch" />
+        <Label id="lable" layoutX="179.0" layoutY="88.0" prefHeight="40.0" prefWidth="196.0" text="Pure Vanilla, No mods, No addons. Have fun!" wrapText="true" />
+      <Label id="lable" layoutX="62.0" layoutY="161.0" prefHeight="16.0" prefWidth="177.0" text="Latest Version : Minecraft v1.11.2" />
+      <Rectangle id="rectangle-3" height="140.0" layoutX="426.0" layoutY="50.0" width="346.0" />
+        <ImageView fitHeight="87.0" fitWidth="165.0" layoutX="438.0" layoutY="61.0" pickOnBounds="true" preserveRatio="true">
             <image>
                 <Image url="@../icons/modpack-default-img.png" />
             </image>
         </ImageView>
-        <Label id="lable" layoutX="539.0" layoutY="61.0" text="Avion Test">
+        <Label id="lable" layoutX="599.0" layoutY="61.0" text="Avion Test">
             <font>
                 <Font name="Centaur" size="20.0" />
             </font>
         </Label>
-        <Button id="Launch-VM" layoutX="622.0" layoutY="142.0" mnemonicParsing="false" prefHeight="38.0" prefWidth="94.0" text="Launch" />
-        <Button id="Update-VM" layoutX="522.0" layoutY="142.0" mnemonicParsing="false" prefHeight="38.0" prefWidth="94.0" text="Update" />
-        <Label id="lable" layoutX="528.0" layoutY="88.0" prefHeight="40.0" prefWidth="196.0" text="Unique, and fun" wrapText="true" />
-        <Label id="lable" layoutX="400.0" layoutY="161.0" text="Version : Pre-Release" />
+        <Button id="Launch-VM" layoutX="669.0" layoutY="142.0" mnemonicParsing="false" prefHeight="38.0" prefWidth="94.0" text="Launch" />
+        <Button id="Update-VM" layoutX="563.0" layoutY="142.0" mnemonicParsing="false" prefHeight="38.0" prefWidth="94.0" text="Update" />
+        <Label id="lable" layoutX="563.0" layoutY="88.0" prefHeight="40.0" prefWidth="196.0" text="Unique, and fun" wrapText="true" />
+        <Label id="lable" layoutX="438.0" layoutY="161.0" text="Version : TEST" />
     </children>
 </Pane>
diff --git a/src/assets/layout/main.fxml b/src/assets/layout/main.fxml
index e05560b..58e9931 100644
--- a/src/assets/layout/main.fxml
+++ b/src/assets/layout/main.fxml
@@ -19,23 +19,23 @@
             <Font name="Centaur" size="24.0" />
          </font>
       </Label>
-       <Rectangle id="rectangle-1" height="450.0" layoutY="50.0" styleClass="nav-bar" width="69.0" />
-      <Button id="Home-btn" layoutY="50.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="69.0" styleClass="selected" text="Home" textOverrun="CLIP">
+       <Rectangle id="rectangle-1" height="450.0" layoutY="50.0" styleClass="nav-bar" width="86.0" />
+      <Button id="Home-btn" layoutY="50.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="86.0" styleClass="selected" text="Home" textOverrun="CLIP">
          <font>
             <Font name="Centaur" size="16.0" />
          </font>
       </Button>
-      <Button id="Modpacks-btn" layoutY="90.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="69.0" styleClass="tab" text="Modpack" textAlignment="CENTER" textOverrun="CLIP">
+      <Button id="Modpacks-btn" layoutY="90.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="86.0" styleClass="tab" text="Modpack" textAlignment="CENTER" textOverrun="CLIP">
           <font>
               <Font name="Centaur" size="16.0" />
           </font>
       </Button>
-       <Button id="Instance-btn" layoutY="130.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="69.0" styleClass="tab" text="Instances" textOverrun="CLIP">
+       <Button id="Instance-btn" layoutY="130.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="86.0" styleClass="tab" text="Instances" textOverrun="CLIP">
            <font>
                <Font name="Centaur" size="16.0" />
            </font>
        </Button>
-       <Button id="Settings-btn" layoutY="170.0" mnemonicParsing="false" prefHeight="42.0" prefWidth="69.0" styleClass="tab" textOverrun="CLIP">
+       <Button id="Settings-btn" layoutY="170.0" mnemonicParsing="false" prefHeight="42.0" prefWidth="86.0" styleClass="tab" textOverrun="CLIP">
            <font>
                <Font name="Centaur" size="16.0" />
            </font>
@@ -46,9 +46,9 @@
                </image></ImageView>
          </graphic>
        </Button>
-      <Pane id="tab" layoutX="70.0" layoutY="50.0" prefHeight="450.0" prefWidth="830.0" />
+      <Pane id="tab" layoutX="88.0" layoutY="50.0" prefHeight="450.0" prefWidth="812.0" />
       <Label id="version" layoutX="282.0" layoutY="14.0" prefHeight="24.0" prefWidth="132.0" text="Version : $v" wrapText="true" />
-      <Label id="lable" layoutX="6.0" layoutY="450.0" prefHeight="50.0" prefWidth="60.0" text="2016-2017 TeamAvion" wrapText="true">
+      <Label id="lable" layoutX="6.0" layoutY="450.0" prefHeight="50.0" prefWidth="60.0" text="2016 TeamAvion" wrapText="true">
          <font>
             <Font size="11.0" />
          </font>
diff --git a/src/assets/layout/settings.fxml b/src/assets/layout/settings.fxml
index 5dd69fd..e0d6df8 100644
--- a/src/assets/layout/settings.fxml
+++ b/src/assets/layout/settings.fxml
@@ -6,15 +6,15 @@
 <?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-ea" xmlns:fx="http://javafx.com/fxml/1">
+<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="830.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
     <children>
-        <Rectangle id="Settings-back" height="40.0" strokeType="INSIDE" width="750.0" />
+        <Rectangle id="Settings-back" height="40.0" strokeType="INSIDE" width="830.0" />
         <Label id="lable" layoutX="331.0" layoutY="1.0" text="Settings">
             <font>
                 <Font name="Centaur" size="31.0" />
             </font>
         </Label>
-      <Rectangle id="rectangle-2" height="40.0" layoutY="40.0" width="750.0" />
+      <Rectangle id="rectangle-2" height="40.0" layoutY="40.0" width="830.0" />
       <Button id="Settings-Gen-btn" layoutY="40.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="100.0" styleClass="selected" text="General" />
       <Button id="Settings-Mine-btn" layoutX="100.0" layoutY="40.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="100.0" styleClass="tab" text="Minecraft">
          <font>
diff --git a/src/assets/layout/settings_generic.fxml b/src/assets/layout/settings_generic.fxml
index 06611ef..1f48a88 100644
--- a/src/assets/layout/settings_generic.fxml
+++ b/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" xmlns:fx="http://javafx.com/fxml/1">
+<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="370.0" prefWidth="830.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>
diff --git a/src/assets/layout/settings_minecraft.fxml b/src/assets/layout/settings_minecraft.fxml
index 12c5026..d5dfd91 100644
--- a/src/assets/layout/settings_minecraft.fxml
+++ b/src/assets/layout/settings_minecraft.fxml
@@ -7,7 +7,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" xmlns:fx="http://javafx.com/fxml/1">
+<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="370.0" prefWidth="830.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>