From 3b0561cde6a9aa817701b8e1959099acc48324b6 Mon Sep 17 00:00:00 2001
From: Michael-Jouanneau <tacomundu12@gmail.com>
Date: Fri, 4 Nov 2016 20:44:58 +0100
Subject: [PATCH] Chnaged things

---
 TAL.iml                         |  9 +++++++++
 src/Launcher/Main.java          | 10 +++++++++-
 src/assets/layout/home.fxml     | 11 ++++-------
 src/assets/layout/main.fxml     |  2 +-
 src/assets/layout/modpacks.fxml |  8 +++-----
 src/assets/layout/settings.fxml |  6 ++++--
 6 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/TAL.iml b/TAL.iml
index 7647c6b..f0db93c 100644
--- a/TAL.iml
+++ b/TAL.iml
@@ -8,5 +8,14 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="libRefTools" level="project" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$APPLICATION_HOME_DIR$/redist/annotations-java8.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
 </module>
\ No newline at end of file
diff --git a/src/Launcher/Main.java b/src/Launcher/Main.java
index 3648db2..22fbc11 100644
--- a/src/Launcher/Main.java
+++ b/src/Launcher/Main.java
@@ -23,7 +23,9 @@ import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import java.net.URL;
+
 import com.tofvesson.async.*;
+import org.jetbrains.annotations.Contract;
 
 public class Main extends Application {
 
@@ -81,7 +83,7 @@ public class Main extends Application {
         Modpack_btn.setOnMouseClicked(event ->{
             if(activeTab!=Tabs.Modpacks){
                 (activeTab=Tabs.Modpacks).switchTab(tab);                                                               // Sets the active tab to the modpacks tab unless it's already active
-                //TODO: Create a dynamic updating string from the input ( Text Field )
+
             }
         });
 
@@ -92,6 +94,10 @@ public class Main extends Application {
             }
         });
 
+        //TODO: Create a dynamic updating string from the input ( Text Field )
+
+
+
 
         Async a = new Async(null, SafeReflection.getMethod(getClass(), "run", (Class<?>[]) null), null);
         System.out.println(a.await());
@@ -116,8 +122,10 @@ public class Main extends Application {
         launch(args);
     }
 
+    @Contract(pure = true)
     public static int run(){
         return 1500;
     }
 
+
 }
diff --git a/src/assets/layout/home.fxml b/src/assets/layout/home.fxml
index 229fbf3..b896070 100644
--- a/src/assets/layout/home.fxml
+++ b/src/assets/layout/home.fxml
@@ -5,18 +5,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/nav.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
    <children>
-      <Rectangle id="Modpack-back" arcHeight="5.0" arcWidth="5.0" height="55.0" strokeType="INSIDE" width="750.0" />
-      <Label layoutX="54.0" layoutY="9.0" text="Home" textFill="WHITE">
+      <Rectangle id="Modpack-back" arcHeight="5.0" arcWidth="5.0" height="47.0" strokeType="INSIDE" width="750.0" />
+      <Label layoutX="34.0" layoutY="5.0" text="Home" textFill="WHITE">
          <font>
             <Font name="Centaur" size="31.0" />
          </font>
       </Label>
-      <Label layoutX="314.0" layoutY="15.0" text="This is a Dev Build ... things are subject to change" textFill="RED">
-         <font>
-            <Font name="Centaur" size="21.0" />
-         </font>
-      </Label>
    </children>
 </Pane>
+
diff --git a/src/assets/layout/main.fxml b/src/assets/layout/main.fxml
index 3cf22f3..7e2d47d 100644
--- a/src/assets/layout/main.fxml
+++ b/src/assets/layout/main.fxml
@@ -35,7 +35,7 @@
            </font>
        </Button>
       <Pane id="tab" layoutX="150.0" layoutY="50.0" prefHeight="450.0" prefWidth="750.0" />
-      <Label layoutX="26.0" layoutY="455.0" text="Version : Dev-0.0.1" textFill="white" />
+      <Label layoutX="17.0" layoutY="455.0" text="Version : PreDev-0.0.1" textFill="white" />
       <Label layoutX="9.0" layoutY="472.0" text="Copyright 2016 TeamAvion" textFill="WHITE">
          <font>
             <Font size="11.0" />
diff --git a/src/assets/layout/modpacks.fxml b/src/assets/layout/modpacks.fxml
index 7975cee..1421d3f 100644
--- a/src/assets/layout/modpacks.fxml
+++ b/src/assets/layout/modpacks.fxml
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.AnchorPane?>
 <?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/nav.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
     <children>
-        <Rectangle id="Modpack-back" arcHeight="5.0" arcWidth="5.0" height="55.0" strokeType="INSIDE" width="750.0" />
-        <Label layoutX="34.0" layoutY="9.0" text="Modpacks" textFill="WHITE">
+        <Rectangle id="Modpack-back" arcHeight="5.0" arcWidth="5.0" height="47.0" strokeType="INSIDE" width="750.0" />
+        <Label layoutX="34.0" layoutY="5.0" text="Modpacks" textFill="WHITE">
             <font>
                 <Font name="Centaur" size="31.0" />
             </font>
         </Label>
-      <TextField id="search-modpacks" layoutX="524.0" layoutY="9.0" prefHeight="25.0" prefWidth="212.0" promptText="Search Modpacks" />
+      <TextField id="search-modpacks" layoutX="524.0" layoutY="5.0" prefHeight="25.0" prefWidth="212.0" promptText="Search Modpacks" />
     </children>
 </Pane>
diff --git a/src/assets/layout/settings.fxml b/src/assets/layout/settings.fxml
index 30abf17..df22225 100644
--- a/src/assets/layout/settings.fxml
+++ b/src/assets/layout/settings.fxml
@@ -5,13 +5,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/nav.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
     <children>
-        <Rectangle id="Modpack-back" arcHeight="5.0" arcWidth="5.0" height="55.0" strokeType="INSIDE" width="750.0" />
-        <Label layoutX="331.0" layoutY="9.0" text="Settings" textFill="WHITE">
+        <Rectangle id="Modpack-back" arcHeight="5.0" arcWidth="5.0" height="47.0" strokeType="INSIDE" width="750.0" />
+        <Label layoutX="34.0" layoutY="5.0" text="Settings" textFill="WHITE">
             <font>
                 <Font name="Centaur" size="31.0" />
             </font>
         </Label>
     </children>
 </Pane>
+