Merge pull request #8 from GabrielTofvesson/master

New

.idea/libraries/JOE.xml

@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="JOE">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/libs/JOE.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/libs/JOE.jar!/" />
+    </SOURCES>
+  </library>
+</component>

README.md

@@ -17,10 +17,11 @@ Team Avion Launcher (TAL) Is an open source java launcher for all of Team Avion'
 We wish to form a Community that is fueled by passion and unwitting determination. In order to establish such a community we are going to develop a custom Minecraft launcher for Windows and MAC. We are also developing a fast, fun, and easy way to explore modded Minecraft through Android, IOS, Xbox, and Playstation.
 
 ### More Info
-Please visit our [Project Page](https://github.com/Michael-Jouanneau/TeamAvion-Lancher/projects/1) to see our progress as we delve into the future of a stronger community!
+Please visit our [Project Page](https://github.com/GabrielTofvesson/TeamAvionLauncher/projects/1) to see our progress as we delve into the future of a stronger community!
 <br>
 <br>
-Please Read [Terms of Services](https://github.com/Michael-Jouanneau/Team-Avion-Launcher/blob/master/agreements/Terms%20of%20Service.md) and [Privacy Policy](https://github.com/Michael-Jouanneau/Team-Avion-Launcher/blob/master/agreements/Privacy%20Policy.md)
+Please Read [Terms of Services](https://github.com/GabrielTofvesson/TeamAvionLauncher/blob/master/agreements/Terms%20of%20Service.md) and [Privacy Policy](https://github.com/GabrielTofvesson/TeamAvionLauncher/blob/master/agreements/Privacy%20Policy.md)
 
 ### - Libraries
 - [RefTools](https://github.com/GabrielTofvesson/libRefTools) (Provided by [Blynd3 Dev](https://github.com/GabrielTofvesson))
+- [JOE](https://github.com/GabrielTofvesson/JOE) (Provided by [Blynd3 Dev](https://github.com/GabrielTofvesson))

TAL.iml

@@ -17,5 +17,6 @@
       </library>
     </orderEntry>
     <orderEntry type="library" name="libRefTools" level="project" />
+    <orderEntry type="library" name="JOE" level="project" />
   </component>
 </module>

src/Launcher/Main.java

@@ -6,45 +6,68 @@ not-so-messy code is extremely messy just because of how I work. I mean, I try t
 always tell me that it's virtually unreadable and it doesn't help that it's difficult to explain to them what the code
 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.
+*/
 
 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;
 import javafx.application.Application;
+import javafx.collections.ObservableList;
 import javafx.scene.Node;
+import javafx.scene.Parent;
 import javafx.scene.Scene;
-import javafx.scene.control.*;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.Pane;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
-import java.io.File;
-import com.tofvesson.async.*;
 import javafx.util.Duration;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/*
+Do not go further. you risk your life. Read guideline above. Anyone reading past this point is no longer under our responsibility.
+Beware the crocodiles on line 100!
+*/
+
 public class Main extends Application {
 
     // Semantic versioning system data
     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     = 2;                                                                    // Patch version
+    public static final int     semVerPatch     = 4;                                                                    // Patch version
 
-    private double xOffset = 0, yOffset = 0;                                                                            // Offsets for dragging
+
+    double xOffset = 0, yOffset = 0;                                                                                    // Offsets for dragging
     private static String[] args;
-    private Button exit, min, Home_btn, Modpack_btn, Settings_btn, Instance_btn;                                        // Define buttons
+    Button exit, min, Home_btn, Modpack_btn, Settings_btn, Instance_btn, Default_theme, Dark_theme, Light_theme;        // Define buttons
     private ImageView icon;
     private TextField Search_modpacks;
     private Image appIcon;
     private Rectangle dragBar;                                                                                          // Draggable top bar
-    private Pane root, tab;
+    Pane root, tab;
-    private Node activeTab, settings_activeTab;
+    Node activeTab, settings_activeTab;
+    private Label dialog_changer;
+
     Async stringUpdater;
 
     @Override
@@ -86,6 +109,11 @@ 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");
+        Default_theme = (Button) root.lookup("#default-theme");
+        Light_theme = (Button) root.lookup("#light-theme");
+        Dark_theme = (Button) root.lookup("#dark-theme");
+
+        dialog_changer = (Label) root.lookup("#dialog-changer");
 
         tab = (Pane) root.lookup("#tab");
 
@@ -110,6 +138,12 @@ public class Main extends Application {
                 Tabs.switchTab("modpacks", tab);
                 if(stringUpdater!=null && stringUpdater.isAlive()) stringUpdater.cancel();
                 stringUpdater = new Async(SafeReflection.getFirstMethod(Main.class, "detectStringUpdate"), Tabs.load("modpacks").lookup("#search-modpacks"));
+                Tabs.load("modpacks").lookup("#download-modpack").setOnMouseClicked(event1 -> {
+                    System.out.println("Downloading Modpack");
+                });
+                Tabs.load("modpacks").lookup("#view-modpack").setOnMouseClicked(event1 -> {
+                    System.out.println("Viewing Modpack");
+                });
             }
         });
 
@@ -118,7 +152,7 @@ public class Main extends Application {
                 updateTabSelection(Instance_btn, TabType.MAIN);
                 Tabs.switchTab("instance", tab);
                 Tabs.load("instance").lookup("#Launch-VM").setOnMouseClicked(event1 -> {
-
+                    System.out.println("Launching Minecraft");
                 });
             }
         });
@@ -126,7 +160,7 @@ public class Main extends Application {
         Settings_btn.setOnMouseClicked(event ->{
             if(!activeTab.equals(Settings_btn)){
                 updateTabSelection(Settings_btn, TabType.MAIN);
-                Node n = Tabs.switchTab("settings", tab);                                                               // Sets the active tab to the settings tab unless it's already active
+                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
 
@@ -136,7 +170,6 @@ public class Main extends Application {
                         updateTabSelection(n.lookup("#Settings-Gen-btn"), TabType.SETTINGS);
                         Node genericLayout = Tabs.switchTab("settings_generic", (Pane) n.lookup("#Settings-Pane"));
 
-
                     }
                 });
 
@@ -145,11 +178,28 @@ public class Main extends Application {
                     if(!settings_activeTab.getId().equals(n.lookup("#Settings-Mine-btn").getId())){                     // Use id to identify layouts
                         updateTabSelection(n.lookup("#Settings-Mine-btn"), TabType.SETTINGS);
                         Node minecraftLayout = Tabs.switchTab("settings_minecraft", (Pane) n.lookup("#Settings-Pane"));
+                        Tabs.load("settings_minecraft").lookup("#minecraft-login-btn").setOnMouseClicked(event3 ->{
+                            System.out.println("Logging into minecraft");
 
+                        });
                     }
                 });
 
                 Tabs.switchTab(settings_activeTab.getId().equals("Settings-Gen-btn") ? "settings_generic" : "settings_minecraft", (Pane) n.lookup("#Settings-Pane"));
+                if((tmp=Tabs.load("settings_generic").lookup("#default-theme")).getOnMouseClicked()==null) {
+                    tmp.setOnMouseClicked(event2 -> {
+                        Theme.Default.switchTo(root);
+                        System.out.println("Changing Theme to Default");
+                    });
+                    Tabs.load("settings_generic").lookup("#light-theme").setOnMouseClicked(event2 -> {
+                        Theme.Light.switchTo(root);
+                        System.out.println("Changing Theme to Light");
+                    });
+                    Tabs.load("settings_generic").lookup("#dark-theme").setOnMouseClicked(event1 -> {
+                        Theme.Dark.switchTo(root);
+                        System.out.println("Changing Theme to Dark");
+                    });
+                }
             }
         });
 
@@ -170,10 +220,14 @@ 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.
+        /* 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")); */
         Main.args = args;
         if (args.length > 0) {
             File f = new File(args[0]);
-            if (f.isFile()) f.delete();                                                                                 // Delete previous jar
+            if (f.isFile()) while(!f.delete()) Thread.sleep(50);                                                        // Delete previous jar
         }
         launch(args);
     }
@@ -198,7 +252,36 @@ public class Main extends Application {
         newTab.getStyleClass().add("selected");
     }
 
+    public static List<Node> getFlatRepresentation(Parent root){
+        List<Node> l = new ArrayList<>();
+        l.add(root);
+        for(Node n : root.getChildrenUnmodifiable()){
+            if(n instanceof Parent)
+                l.addAll(getFlatRepresentation((Parent)n));
+            else l.add(n);
+        }
+        return l;
+    }
+
+    public void processStyleData(Node n){
+
+    }
+
     enum TabType{
         SETTINGS, MAIN
     }
+
+    enum Theme{
+        Default(""), Dark(Main.class.getResource("/assets/style/dark-theme.css").toExternalForm()), Light(Main.class.getResource("/assets/style/light-theme.css").toExternalForm());
+
+        public final String style;
+        Theme(String style){ this.style = style; }
+
+        public void switchTo(Pane root){
+            ObservableList<String> l = root.getStylesheets();
+            if(l.contains(Light.style)) l.remove(Light.style);
+            if(l.contains(Dark.style)) l.remove(Dark.style);
+            if(this!=Default) l.add(style);
+        }
+    }
 }

src/Launcher/Tabs.java

@@ -8,11 +8,12 @@ import javafx.util.Pair;
 import java.io.IOException;
 import java.net.URL;
 
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "WeakerAccess"})
 public class Tabs {
 
     private static final ShiftingList<Pair<URL, Node>> loaded = new ShiftingList<>(35);                                 // Memory-efficient list of loaded files
 
+
     /**
      * Loads layout from file in layout assets folder. If layout is already loaded,
      * Tabs won't bother with reloading and will instead return the cached version.

src/Launcher/net/Updater.java

@@ -1,9 +1,13 @@
 package Launcher.net;
 
 import Launcher.Main;
+import Launcher.Tabs;
 import com.tofvesson.async.Async;
 import com.tofvesson.reflection.SafeReflection;
 import javafx.animation.Timeline;
+import javafx.scene.control.Label;
+import javafx.scene.layout.Pane;
+
 import javax.net.ssl.HttpsURLConnection;
 import java.io.*;
 import java.net.MalformedURLException;

src/assets/lang/default.txt

@@ -0,0 +1,4 @@
+Language: Default
+
+du_label:Launching...
+du_updater:Updating...

src/assets/lang/svenska.txt

@@ -0,0 +1,4 @@
+Language: Swedish
+
+du_label:Startar...
+du_updater:Uppdaterar...

src/assets/layout/dialog_update.fxml

@@ -1,18 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.geometry.Insets?>
+<?import javafx.scene.Cursor?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ProgressIndicator?>
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.text.Font?>
 
-<Pane xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
+<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="103.0" prefWidth="421.0" text="Looking for updates..." textAlignment="CENTER">
+   <Label prefHeight="56.0" prefWidth="432.0" text="Launching TAL..." textAlignment="CENTER">
       <font>
-         <Font size="40.0" />
+         <Font name="Centaur" size="44.0" />
       </font>
       <padding>
          <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
       </padding>
    </Label>
-   <Label layoutX="23.0" layoutY="72.0" prefHeight="21.0" prefWidth="104.0" text="Everything is good" />
+   <Label layoutX="23.0" layoutY="70.0" text="Looking for updates...">
+      <font>
+         <Font name="Centaur" size="17.0" />
+      </font>
+   </Label>
+   <Label id="i" layoutX="202.0" layoutY="75.0" />
+   <ProgressIndicator layoutX="331.0" layoutY="28.0" mouseTransparent="true" nodeOrientation="LEFT_TO_RIGHT">
+      <cursor>
+         <Cursor fx:constant="WAIT" />
+      </cursor></ProgressIndicator>
 </Pane>

src/assets/layout/home.fxml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?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?>
 <?import javafx.scene.text.Font?>
@@ -8,10 +10,40 @@
 <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">
    <children>
       <Rectangle id="Modpack-back" height="40.0" strokeType="INSIDE" width="750.0" />
-      <Label layoutX="339.0" layoutY="1.0" text="Home" textFill="WHITE">
+      <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="730.0" />
+      <Label id="lable" layoutX="43.0" layoutY="63.0" text="NEW LAYOUTS">
+         <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 thems to cheack out :">
+         <font>
+            <Font name="Centaur" size="18.0" />
+         </font>
+      </Label>
+      <Label id="lable" layoutX="43.0" layoutY="140.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">
+         <image>
+            <Image url="@../icons/light-theme.png" />
+         </image></ImageView>
+      <Label id="lable" layoutX="217.0" layoutY="139.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">
+         <image>
+            <Image url="@../icons/dark-theme.png" />
+         </image></ImageView>
    </children>
 </Pane>

src/assets/layout/instance.fxml

@@ -2,6 +2,8 @@
 
 <?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?>
 <?import javafx.scene.text.Font?>
@@ -9,16 +11,24 @@
 <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">
     <children>
         <Rectangle id="Modpack-back" height="40.0" strokeType="INSIDE" width="750.0" />
-        <Label layoutX="324.0" layoutY="1.0" text="Instances" textFill="WHITE">
+        <Label id="lable" layoutX="324.0" layoutY="1.0" text="Instances">
             <font>
                 <Font name="Centaur" size="31.0" />
             </font>
         </Label>
-      <Button id="Launch-VM" layoutX="34.0" layoutY="105.0" mnemonicParsing="false" text="Launch" />
+        <Rectangle id="rectangle-3" height="140.0" layoutX="14.0" layoutY="50.0" width="346.0" />
-      <Label layoutX="34.0" layoutY="79.0" text="Vanilla Minecraft" textFill="WHITE">
+        <ImageView fitHeight="87.0" fitWidth="165.0" layoutX="29.0" layoutY="61.0" pickOnBounds="true" preserveRatio="true">
-         <font>
+            <image>
-            <Font name="Centaur" size="21.0" />
+                <Image url="@../icons/modpack-default-img.png" />
-         </font>
+            </image>
-      </Label>
+        </ImageView>
+        <Label id="lable" layoutX="159.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" />
     </children>
 </Pane>

src/assets/layout/main.fxml

@@ -10,38 +10,38 @@
 <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">
    <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" textFill="WHITE" />
+      <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="-" textFill="WHITE" />
+       <Button id="min" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="841.0" layoutY="13.0" mnemonicParsing="false" text="-"/>
-       <ImageView id="icon" fitHeight="30" fitWidth="30" layoutX="26.0" layoutY="11.0" />
+       <ImageView id="icon" fitHeight="50.0" fitWidth="50.0" layoutX="14.0" />
-       <Label layoutX="75.0" layoutY="11.0" text="Team-Avion Launcher" textFill="WHITE">
+       <Label id="lable" layoutX="75.0" layoutY="11.0" text="Team-Avion Launcher">
          <font>
             <Font name="Centaur" size="24.0" />
          </font>
       </Label>
        <Rectangle id="rectangle-1" height="450.0" layoutY="50.0" styleClass="nav-bar" width="150.0" />
-      <Button id="Home-btn" layoutY="50.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" styleClass="selected" text="Home" textFill="WHITE" textOverrun="CLIP">
+      <Button id="Home-btn" layoutY="50.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.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="150.0" styleClass="tab" text="Modpack" textAlignment="CENTER" textFill="WHITE" textOverrun="CLIP">
+      <Button id="Modpacks-btn" layoutY="90.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.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="150.0" styleClass="tab" text="Instances" textFill="WHITE" textOverrun="CLIP">
+       <Button id="Instance-btn" layoutY="130.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.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="40.0" prefWidth="150.0" styleClass="tab" text="Settings" textFill="WHITE" textOverrun="CLIP">
+       <Button id="Settings-btn" layoutY="170.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" styleClass="tab" text="Settings" textOverrun="CLIP">
            <font>
                <Font name="Centaur" size="16.0" />
            </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" textFill="white" />
+      <Label id="version" layoutX="17.0" layoutY="455.0" text="Version : $v" />
-      <Label layoutX="9.0" layoutY="472.0" text="Copyright 2016 TeamAvion" textFill="WHITE">
+      <Label id="lable" layoutX="9.0" layoutY="472.0" text="Copyright 2016 TeamAvion">
          <font>
             <Font size="11.0" />
          </font>

src/assets/layout/modpacks.fxml

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.TextField?>
+<?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?>
@@ -9,11 +12,25 @@
 <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">
     <children>
         <Rectangle id="Modpack-back" height="40.0" strokeType="INSIDE" width="750.0" />
-        <Label layoutX="40.0" layoutY="1.0" text="Modpacks" textFill="WHITE">
+        <Label id="lable" layoutX="40.0" layoutY="1.0" text="Modpacks">
             <font>
                 <Font name="Centaur" size="31.0" />
             </font>
         </Label>
-      <TextField id="search-modpacks" layoutX="518.0" layoutY="2.0" prefHeight="25.0" prefWidth="212.0" promptText="Search Modpacks" />
+      <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" />
+      <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" />
+         </image>
+      </ImageView>
+      <Label id="lable" layoutX="205.0" layoutY="61.0" text="Example Modpack Layout">
+         <font>
+            <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="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" />
     </children>
 </Pane>

src/assets/layout/settings.fxml

@@ -9,18 +9,18 @@
 <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">
     <children>
         <Rectangle id="Modpack-back" height="40.0" strokeType="INSIDE" width="750.0" />
-        <Label layoutX="331.0" layoutY="1.0" text="Settings" textFill="WHITE">
+        <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" />
-      <Button id="Settings-Gen-btn" layoutY="40.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="100.0" styleClass="selected" text="General" textFill="WHITE" />
+      <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" textFill="WHITE">
+      <Button id="Settings-Mine-btn" layoutX="100.0" layoutY="40.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="100.0" styleClass="tab" text="Minecraft">
          <font>
             <Font name="Candara" size="12.0" />
          </font>
       </Button>
-      <Pane id="Settings-Pane" layoutY="90.0" prefHeight="360.0" prefWidth="750.0" />
+      <Pane id="Settings-Pane" layoutY="80.0" prefHeight="370.0" prefWidth="750.0" />
     </children>
 </Pane>

src/assets/layout/settings_generic.fxml

@@ -1,19 +1,25 @@
 <?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.layout.Pane?>
 <?import javafx.scene.text.Font?>
 
-<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="360.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-ea" xmlns:fx="http://javafx.com/fxml/1">
    <children>
-      <Label layoutX="22.0" layoutY="14.0" text="General Settings">
+      <Label id="lable" layoutX="22.0" layoutY="14.0" text="General Settings">
          <font>
             <Font name="Centaur" size="25.0" />
          </font>
       </Label>
-      <Button layoutX="22.0" layoutY="72.0" mnemonicParsing="false" text="light" />
+      <Button id="light-theme" layoutX="242.0" layoutY="71.0" prefHeight="30.0" prefWidth="62.0" styleClass="selected" text="light" />
-      <Button layoutX="96.0" layoutY="72.0" mnemonicParsing="false" text="dark" />
+      <Button id="dark-theme" layoutX="172.0" layoutY="71.0" prefHeight="30.0" prefWidth="62.0" styleClass="tab" text="dark" />
-      <Button layoutX="170.0" layoutY="72.0" mnemonicParsing="false" text="default" />
+      <Button id="default-theme" layoutX="100.0" layoutY="71.0" prefHeight="30.0" prefWidth="62.0" styleClass="tab" text="default" />
+      <Label id="lable" layoutX="35.0" layoutY="75.0" text="Theme:">
+         <font>
+            <Font name="Centaur" size="17.0" />
+         </font>
+      </Label>
    </children>
 </Pane>

src/assets/layout/settings_minecraft.fxml

@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.text.Font?>
 
-<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="360.0" prefWidth="750.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.92" 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-ea" xmlns:fx="http://javafx.com/fxml/1">
     <children>
-        <Label layoutX="22.0" layoutY="14.0" text="Minecraft Settings">
+        <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:" />
+      <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" />
     </children>
-</Pane>
+</Pane>

src/assets/style/dark-theme.css

@@ -1,31 +1,123 @@
 #pane {
-    -fx-background-color: rgba(7, 4, 20, 0.85);
+    -fx-background-color: #060606;
 }
 #rectangle {
-    -fx-fill: #050517;
+    -fx-fill: #0f0f0f;
+    -fx-text-fill: white;
 }
 
 #rectangle-1 {
-    -fx-fill: #080920;
+    -fx-fill: #171717;
+    -fx-text-fill: white;
 }
 
 #rectangle-2 {
-    -fx-fill: #0d0d39;
+    -fx-fill: #0f0f0f;
+    -fx-text-fill: white;
+}
+
+#rectangle-3 {
+    -fx-fill: #272727;
+    -fx-text-fill: white;
+}
+
+#download-modpack, #view-modpack, #Launch-VM {
+    -fx-background-color: #393939;
+    -fx-background-radius: 0em;
+    -fx-text-fill: white;
+}
+
+#download-modpack:hover, #view-modpack:hover, #Launch-VM:hover {
+    -fx-background-color: #ffffff;
+    -fx-background-radius: 0em;
+    -fx-text-fill: #000000;
+}
+
+#default-theme,#dark-theme, #light-theme {
+    -fx-background-color: #252525;
+    -fx-background-radius: 0em;
+    -fx-text-fill: white;
+}
+
+#default-theme:hover {
+    -fx-background-color: #0d0c39;
+    -fx-background-radius: 0em;
+    -fx-text-fill: white;
+}
+
+#dark-theme:hover {
+    -fx-background-color: #1c1c1c;
+    -fx-background-radius: 0em;
+    -fx-text-fill: white;
+}
+
+#light-theme:hover {
+    -fx-background-color: #bcbcbc;
+    -fx-background-radius: 0em;
+    -fx-text-fill: black;
+}
+
+#lable {
+    -fx-text-fill: white;
+}
+
+#login {
+    -fx-text-fill: #950c14;
+}
+
+#login:hover {
+    -fx-text-fill: #ffffff;
+    -fx-border-style: solid;
+    -fx-border-color: #49000d;
+    -fx-border-width: 0px 0px 2px 0px;
+}
+
+#minecraft-login-btn {
+    -fx-background-color: #393939;
+    -fx-background-radius: 0em;
+    -fx-text-fill: white;
+}
+
+#minecraft-login-btn:hover {
+    -fx-background-color: #ffffff;
+    -fx-background-radius: 0em;
+    -fx-text-fill: black;
 }
 
 #Modpack-back {
-    -fx-fill: #0a0e2e;
+    -fx-fill: #1d1d1d;
+    -fx-text-fill: white;
 }
 #exit, #min{
     -fx-background-color: rgba(30, 25, 25, 0);
+    -fx-text-fill: white;
 }
 #min:hover, #exit:hover{
-    -fx-background-color: #bf0000;
+    -fx-background-color: #8d0000;
+    -fx-text-fill: white;
 }
 #search-modpacks {
-    -fx-text-inner-color: white;
+    -fx-prompt-text-fill: white;
-    -fx-background-color: rgba(0, 0, 0, 0.17);
+    -fx-text-fill: white;
-    -fx-padding: 10px;
+    -fx-background-color: #1d1d1d;
+    -fx-padding: 5px;
+}
+
+#search-modpacks:hover {
+    -fx-border-style: solid;
+    -fx-border-color: white;
+    -fx-border-width: 0px 0px 2px 0px;
+}
+
+#Home-btn, #Modpacks-btn, #Instance-btn, #Settings-btn {
+    -fx-text-fill: white;
+}
+#version {
+    -fx-text-fill: white;
+}
+
+#Settings-Gen-btn, #Settings-Mine-btn {
+    -fx-text-fill: white;
 }
 
 .tab {
@@ -34,15 +126,15 @@
 }
 
 .tab:hover{
-    -fx-background-color: #0c182d;
+    -fx-background-color: #0d0d0d;
 
 }
 
 .selected {
-    -fx-background-color: #0c182d;
+    -fx-background-color: #060606;
     -fx-background-radius: 0em;
 }
 
 .selected:hover {
-    -fx-background-color: #0c182d;
+    -fx-background-color: #060606;
 }

src/assets/style/default-theme.css

@@ -1,31 +1,123 @@
 #pane {
-    -fx-background-color: rgba(7, 4, 20, 0.85);
+    -fx-background-color: #05030c;
 }
 #rectangle {
-    -fx-fill: #050517;
+    -fx-fill: #050519;
+    -fx-text-fill: white;
 }
 
 #rectangle-1 {
-    -fx-fill: #080920;
+    -fx-fill: #070620;
+    -fx-text-fill: white;
 }
 
 #rectangle-2 {
-    -fx-fill: #0d0d39;
+    -fx-fill: #060317;
+    -fx-text-fill: white;
+}
+
+#rectangle-3 {
+    -fx-fill: #0b052e;
+    -fx-text-fill: white;
+}
+
+#download-modpack, #view-modpack, #Launch-VM {
+    -fx-background-color: #0a073b;
+    -fx-background-radius: 0em;
+    -fx-text-fill: white;
+}
+
+#download-modpack:hover, #view-modpack:hover, #Launch-VM:hover {
+    -fx-background-color: #07061b;
+    -fx-background-radius: 0em;
+    -fx-text-fill: white;
+}
+
+#default-theme,#dark-theme, #light-theme {
+    -fx-background-color: #0d072f;
+    -fx-background-radius: 0em;
+    -fx-text-fill: white;
+}
+
+#default-theme:hover {
+    -fx-background-color: #0d0c39;
+    -fx-background-radius: 0em;
+    -fx-text-fill: white;
+}
+
+#dark-theme:hover {
+    -fx-background-color: #1c1c1c;
+    -fx-background-radius: 0em;
+    -fx-text-fill: white;
+}
+
+#light-theme:hover {
+    -fx-background-color: #bcbcbc;
+    -fx-background-radius: 0em;
+    -fx-text-fill: black;
+}
+
+#lable {
+    -fx-text-fill: white;
+}
+
+#login {
+    -fx-text-fill: #950c14;
+}
+
+#login:hover {
+    -fx-text-fill: #ffffff;
+    -fx-border-style: solid;
+    -fx-border-color: #49000d;
+    -fx-border-width: 0px 0px 2px 0px;
+}
+
+#minecraft-login-btn {
+    -fx-background-color: #0a073b;
+    -fx-background-radius: 0em;
+    -fx-text-fill: white;
+}
+
+#minecraft-login-btn:hover {
+    -fx-background-color: #07061b;
+    -fx-background-radius: 0em;
+    -fx-text-fill: white;
 }
 
 #Modpack-back {
     -fx-fill: #0a0e2e;
+    -fx-text-fill: white;
 }
 #exit, #min{
     -fx-background-color: rgba(30, 25, 25, 0);
+    -fx-text-fill: white;
 }
 #min:hover, #exit:hover{
-    -fx-background-color: #bf0000;
+    -fx-background-color: #8d0000;
+    -fx-text-fill: white;
 }
 #search-modpacks {
-    -fx-text-inner-color: white;
+    -fx-prompt-text-fill: white;
-    -fx-background-color: rgba(0, 0, 0, 0.17);
+    -fx-text-fill: white;
-    -fx-padding: 10px;
+    -fx-background-color: #0a0e2e;
+    -fx-padding: 5px;
+}
+
+#search-modpacks:hover {
+    -fx-border-style: solid;
+    -fx-border-color: white;
+    -fx-border-width: 0px 0px 2px 0px;
+}
+
+#Home-btn, #Modpacks-btn, #Instance-btn, #Settings-btn {
+    -fx-text-fill: white;
+}
+#version {
+    -fx-text-fill: white;
+}
+
+#Settings-Gen-btn, #Settings-Mine-btn {
+    -fx-text-fill: white;
 }
 
 .tab {
@@ -34,15 +126,15 @@
 }
 
 .tab:hover{
-    -fx-background-color: #0c182d;
+    -fx-background-color: #09042e;
 
 }
 
 .selected {
-    -fx-background-color: #0c182d;
+    -fx-background-color: #05030c;
     -fx-background-radius: 0em;
 }
 
 .selected:hover {
-    -fx-background-color: #0c182d;
+    -fx-background-color: #05030c;
 }

src/assets/style/light-theme.css

@@ -1,31 +1,123 @@
 #pane {
-    -fx-background-color: rgba(206, 206, 206, 0.85);
+    -fx-background-color: #ffffff;
 }
 #rectangle {
-    -fx-fill: #898989;
+    -fx-fill: #cccccc;
+    -fx-text-fill: black;
 }
 
 #rectangle-1 {
-    -fx-fill: #bfbfbf;
+    -fx-fill: #8c8c8c;
+    -fx-text-fill: black;
 }
 
 #rectangle-2 {
-    -fx-fill: #909090;
+    -fx-fill: #e5e5e5;
+    -fx-text-fill: black;
+}
+
+#rectangle-3 {
+    -fx-fill: #cdcdcd;
+    -fx-text-fill: black;
+}
+
+#download-modpack, #view-modpack, #Launch-VM {
+    -fx-background-color: #b8b8b8;
+    -fx-background-radius: 0em;
+    -fx-text-fill: black;
+}
+
+#download-modpack:hover, #view-modpack:hover, #Launch-VM:hover {
+    -fx-background-color: #000000;
+    -fx-background-radius: 0em;
+    -fx-text-fill: white;
+}
+
+#default-theme,#dark-theme, #light-theme {
+    -fx-background-color: #979797;
+    -fx-background-radius: 0em;
+    -fx-text-fill: black;
+}
+
+#default-theme:hover {
+    -fx-background-color: #0d0c39;
+    -fx-background-radius: 0em;
+    -fx-text-fill: white;
+}
+
+#dark-theme:hover {
+    -fx-background-color: #1c1c1c;
+    -fx-background-radius: 0em;
+    -fx-text-fill: white;
+}
+
+#light-theme:hover {
+    -fx-background-color: #bcbcbc;
+    -fx-background-radius: 0em;
+    -fx-text-fill: black;
+}
+
+#lable {
+    -fx-text-fill: black;
+}
+
+#login {
+    -fx-text-fill: #950c14;
+}
+
+#login:hover {
+    -fx-text-fill: black;
+    -fx-border-style: solid;
+    -fx-border-color: #49000d;
+    -fx-border-width: 0px 0px 2px 0px;
+}
+
+#minecraft-login-btn {
+    -fx-background-color: #b8b8b8;
+    -fx-background-radius: 0em;
+    -fx-text-fill: black;
+}
+
+#minecraft-login-btn:hover {
+    -fx-background-color: #000000;
+    -fx-background-radius: 0em;
+    -fx-text-fill: white;
 }
 
 #Modpack-back {
-    -fx-fill: #9f9f9f;
+    -fx-fill: #c3c3c3;
+    -fx-text-fill: black;
 }
 #exit, #min{
     -fx-background-color: rgba(30, 25, 25, 0);
+    -fx-text-fill: black;
 }
 #min:hover, #exit:hover{
-    -fx-background-color: #bf0000;
+    -fx-background-color: #8d0000;
+    -fx-text-fill: white;
 }
 #search-modpacks {
-    -fx-text-inner-color: white;
+    -fx-prompt-text-fill: black;
-    -fx-background-color: rgba(0, 0, 0, 0.17);
+    -fx-text-fill: black;
-    -fx-padding: 10px;
+    -fx-background-color: #c3c3c3;
+    -fx-padding: 5px;
+}
+
+#search-modpacks:hover {
+    -fx-border-style: solid;
+    -fx-border-color: #000000;
+    -fx-border-width: 0px 0px 2px 0px;
+}
+
+#Home-btn, #Modpacks-btn, #Instance-btn, #Settings-btn {
+    -fx-text-fill: black;
+}
+#version {
+    -fx-text-fill: black;
+}
+
+#Settings-Gen-btn, #Settings-Mine-btn {
+    -fx-text-fill: black;
 }
 
 .tab {
@@ -34,15 +126,15 @@
 }
 
 .tab:hover{
-    -fx-background-color: #d5d5d5;
+    -fx-background-color: #c4c4c4;
 
 }
 
 .selected {
-    -fx-background-color: #6e6e6e;
+    -fx-background-color: #ffffff;
     -fx-background-radius: 0em;
 }
 
 .selected:hover {
-    -fx-background-color: #6e6e6e;
+    -fx-background-color: #fff;
 }