Merge pull request #12 from Michael-Jouanneau/master

Pull

README.md

@@ -1,4 +1,6 @@
-# Team Avion Launcher (TAL)
+# Team Avion Launcher (TAL) 
+###### Current Version : Alpha Dev 0.0.2 [Download Current Version](https://github.com/GabrielTofvesson/TeamAvionLauncher/releases/download/AlphaDev-0.0.2/Team-Avion-Launcher-AlphaDev-0.0.2.jar) |      [Version Notes](https://github.com/GabrielTofvesson/TeamAvionLauncher/releases/tag/AlphaDev-0.0.2) | [Other Versions](https://github.com/GabrielTofvesson/TeamAvionLauncher/releases)
+
 Created by [Taco Dev](https://github.com/Michael-Jouanneau), [Blynd3 Dev](https://github.com/GabrielTofvesson) and, [Deathly Dev](https://github.com/ADeathyTouch) for Team Avion
 
 ### What is Team Avion Launcher (TAL)?

_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-cayman

src/Launcher/Main.java

@@ -13,6 +13,7 @@ If you get sick reading, we will not claim responsibility on your health. Please
 
 package Launcher;
 
+// import Launcher.net.Updater;
 import Launcher.net.Updater;
 import com.tofvesson.async.Async;
 import com.tofvesson.reflection.SafeReflection;
@@ -52,10 +53,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     = 0;                                                                    // Minor version
-    public static final int     semVerPatch     = 1;                                                                    // Patch version
+    public static final int     semVerMinor     = 3;                                                                    // Minor version
+    public static final int     semVerPatch     = 0;                                                                    // Patch version
 
 
     double xOffset = 0, yOffset = 0;                                                                                    // Offsets for dragging
@@ -79,6 +80,7 @@ public class Main extends Application {
 
         primaryStage.initStyle(StageStyle.UNDECORATED);
 
+        //TODO: Remove the comments under when updater class is fixed
         if(args.length<2 || !args[1].equals("false")){
             Stage d = new Stage();
             Timeline t = new Timeline();
@@ -94,7 +96,7 @@ public class Main extends Application {
             });
             t1.setDaemon(true);
             t1.start();
-        } else primaryStage.show();                                                                                     // Remove ugly trash
+        } else primaryStage.show();                                                                                // Remove ugly trash
 
         root = (Pane) Tabs.load("main");                                                                       // Load via layout loader
         ((Label)root.lookup("#version")).setText(((Label) root.lookup("#version"))                      // Dynamically set version label
@@ -103,6 +105,7 @@ public class Main extends Application {
         primaryStage.setScene(new Scene(root, 900, 500));
         primaryStage.getIcons().clear();
         primaryStage.getIcons().add(appIcon = new Image(getClass().getResourceAsStream("/assets/icons/app.png")));
+        primaryStage.show(); // TODO: remove when the Upodater class is fixed
 
         // Field initialization
         exit = (Button) root.lookup("#exit");

src/Launcher/net/Updater.java

@@ -48,7 +48,6 @@ public class Updater {
             }
             conn.connect();
 
-
             BufferedReader in = new BufferedReader(new InputStreamReader(
                     conn.getInputStream()));
             String inputLine;

src/assets/layout/main.fxml

@@ -2,7 +2,6 @@
 
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
-<?import javafx.scene.image.Image?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.shape.Rectangle?>
@@ -35,19 +34,13 @@
                <Font name="Centaur" size="16.0" />
            </font>
        </Button>
-       <Button id="Settings-btn" layoutY="170.0" mnemonicParsing="false" prefHeight="42.0" prefWidth="88.0" styleClass="tab" textOverrun="CLIP">
+       <Button id="Settings-btn" layoutY="170.0" mnemonicParsing="false" prefHeight="42.0" prefWidth="88.0" styleClass="tab" text="Settings" textOverrun="CLIP">
            <font>
                <Font name="Centaur" size="16.0" />
            </font>
-         <graphic>
-            <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
-               <image>
-                  <Image url="@../icons/settings.png" />
-               </image></ImageView>
-         </graphic>
        </Button>
       <Pane id="tab" layoutX="88.0" layoutY="50.0" prefHeight="450.0" prefWidth="812.0" />
-      <Label id="version" layoutX="299.0" layoutY="14.0" prefHeight="24.0" prefWidth="132.0" text="Version : $v" wrapText="true" />
+      <Label id="version" layoutX="299.0" layoutY="14.0" prefHeight="24.0" prefWidth="198.0" text="Version : $v" 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" />

src/assets/style/default-theme.css

@@ -1,46 +1,48 @@
 #pane {
-    -fx-background-color: #05030c;
+    -fx-background-color: #6770e3;
 }
 #rectangle {
-    -fx-fill: #050519;
+    -fx-fill: #373ab0;
     -fx-text-fill: white;
 }
 
 #rectangle-1 {
-    -fx-fill: #070620;
+    -fx-fill: #4e4ecf;
     -fx-text-fill: white;
 }
 
 #rectangle-2 {
-    -fx-fill: #060317;
+    -fx-fill: #4c46d5;
     -fx-text-fill: white;
 }
 
 #rectangle-3 {
-    -fx-fill: #0b052e;
+    -fx-fill: #3736ac;
     -fx-text-fill: white;
+    -webkit-box-shadow: 10px 10px 15px rgba(191, 191, 191, 0.72);
+    box-shadow: 10px 10px 15px rgba(191, 191, 191, 0.72);
 }
 
 #download-modpack, #download-modpack-a, #view-modpack-a, #view-modpack, #Launch-VM, #Update-VM {
-    -fx-background-color: #0a073b;
+    -fx-background-color: #5d7ba6;
     -fx-background-radius: 0em;
     -fx-text-fill: white;
 }
 
 #download-modpack:hover, #view-modpack:hover, #view-modpack-a:hover, #download-modpack-a:hover, #Launch-VM:hover, #Update-VM:hover {
-    -fx-background-color: #07061b;
+    -fx-background-color: #2442da;
     -fx-background-radius: 0em;
     -fx-text-fill: white;
 }
 
 #default-theme,#dark-theme, #light-theme {
-    -fx-background-color: #0d072f;
+    -fx-background-color: #4051c2;
     -fx-background-radius: 0em;
     -fx-text-fill: white;
 }
 
 #default-theme:hover {
-    -fx-background-color: #0d0c39;
+    -fx-background-color: #19168c;
     -fx-background-radius: 0em;
     -fx-text-fill: white;
 }
@@ -70,19 +72,19 @@
 }
 
 #minecraft-login-btn {
-    -fx-background-color: #0a073b;
+    -fx-background-color: #3e58cb;
     -fx-background-radius: 0em;
     -fx-text-fill: white;
 }
 
 #minecraft-login-btn:hover {
-    -fx-background-color: #07061b;
+    -fx-background-color: #2c3f7b;
     -fx-background-radius: 0em;
     -fx-text-fill: white;
 }
 
 #Modpack-back, #home-back, #Settings-back, #instance-back {
-    -fx-fill: #0a0e2e;
+    -fx-fill: #2a36c9;
     -fx-text-fill: white;
 }
 #exit, #min{
@@ -96,7 +98,7 @@
 #search-modpacks {
     -fx-prompt-text-fill: white;
     -fx-text-fill: white;
-    -fx-background-color: #0a0e2e;
+    -fx-background-color: rgba(230, 42, 152, 0);
     -fx-padding: 5px;
 }
 
@@ -123,17 +125,17 @@
 }
 
 .tab:hover{
-    -fx-background-color: #09042e;
+    -fx-background-color: #372bf1;
 
 }
 
 .selected {
-    -fx-background-color: #05030c;
+    -fx-background-color: #496ce2;
     -fx-background-radius: 0em;
 }
 
 .selected:hover {
-    -fx-background-color: #05030c;
+    -fx-background-color: #2421e0;
 }
 
 #minecraftuser, #minecraftpass{