GabrielTofvesson/TeamAvionLauncher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10 from GabrielTofvesson/master

Browse Source 
Merge pull request #9 from GabrielTofvesson/master
This commit is contained in:
Taco Dev 2016-12-19 08:29:54 +01:00 committed by GitHub
commit f9450c3505
9 changed files with 59 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Launcher/Main.java
View File

@ -89,10 +89,10 @@ 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
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
primaryStage.setTitle("Team-Avion Launcher [WIP]");
primaryStage.setScene(new Scene(root, 900, 500));
@ -144,6 +144,12 @@ public class Main extends Application {
Tabs.load("modpacks").lookup("#view-modpack").setOnMouseClicked(event1 -> {
System.out.println("Viewing Modpack");
});
Tabs.load("modpacks").lookup("#download-modpack-a").setOnMouseClicked(event1 -> {
System.out.println("Downloading Modpack-a");
});
Tabs.load("modpacks").lookup("#view-modpack-a").setOnMouseClicked(event1 -> {
System.out.println("Viewing Modpack-a");
});
}
});

BIN
src/assets/icons/Creeper.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 794 KiB

BIN
src/assets/icons/Modpack-modded.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

11
src/assets/layout/home.fxml
View File

@ -1,13 +1,14 @@
<?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-ea" xmlns:fx="http://javafx.com/fxml/1">
<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">
<children>
<Rectangle id="home-back" height="40.0" strokeType="INSIDE" width="750.0" />
<Label id="lable" layoutX="339.0" layoutY="1.0" text="Home">
@ -15,13 +16,13 @@
<Font name="Centaur" size="31.0" />
</font>
</Label>
<Rectangle id="rectangle-3" height="140.0" layoutX="10.0" layoutY="50.0" width="730.0" />
<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">
<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="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 :">
<font>
<Font name="Centaur" size="18.0" />
@ -45,5 +46,9 @@
<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">
<image>
<Image url="@../icons/Creeper.png" />
</image></ImageView>
</children>
</Pane>

19
src/assets/layout/instance.fxml
View File

@ -8,7 +8,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-ea" xmlns:fx="http://javafx.com/fxml/1">
<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">
<children>
<Rectangle id="instance-back" height="40.0" width="750.0" />
<Label id="lable" layoutX="324.0" layoutY="1.0" text="Instances">
@ -16,7 +16,7 @@
<Font name="Centaur" size="31.0" />
</font>
</Label>
<Rectangle id="rectangle-3" height="140.0" layoutX="14.0" layoutY="50.0" width="346.0" />
<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">
<image>
<Image url="@../icons/modpack-default-img.png" />
@ -30,5 +30,20 @@
<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">
<image>
<Image url="@../icons/modpack-default-img.png" />
</image>
</ImageView>
<Label id="lable" layoutX="539.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" />
</children>
</Pane>

21
src/assets/layout/modpacks.fxml
View File

@ -2,6 +2,7 @@
<?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?>
@ -9,7 +10,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-ea" xmlns:fx="http://javafx.com/fxml/1">
<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">
<children>
<Rectangle id="Modpack-back" height="40.0" strokeType="INSIDE" width="750.0" />
<Label id="lable" layoutX="40.0" layoutY="1.0" text="Modpacks">
@ -17,7 +18,7 @@
<Font name="Centaur" size="31.0" />
</font>
</Label>
<TextField id="search-modpacks" layoutX="475.0" layoutY="2.0" prefHeight="37.0" prefWidth="261.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>
@ -32,5 +33,21 @@
<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" />
<Rectangle id="rectangle-3" height="140.0" layoutX="10.0" layoutY="200.0" width="720.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" />
</image>
</ImageView>
<Label id="lable" layoutX="205.0" layoutY="225.0" text="Example Modpack Layout">
<font>
<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="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>

4
src/assets/style/dark-theme.css
View File

@ -21,13 +21,13 @@
-fx-text-fill: white;
}
#download-modpack, #view-modpack, #Launch-VM {
#download-modpack, #download-modpack-a, #view-modpack-a, #view-modpack, #Launch-VM, #Update-VM {
-fx-background-color: #393939;
-fx-background-radius: 0em;
-fx-text-fill: white;
}
#download-modpack:hover, #view-modpack:hover, #Launch-VM:hover {
#download-modpack:hover, #download-modpack-a:hover, #view-modpack-a:hover, #view-modpack:hover, #Launch-VM:hover, #Update-VM:hover {
-fx-background-color: #ffffff;
-fx-background-radius: 0em;
-fx-text-fill: #000000;

4
src/assets/style/default-theme.css
View File

@ -21,13 +21,13 @@
-fx-text-fill: white;
}
#download-modpack, #view-modpack, #Launch-VM {
#download-modpack, #download-modpack-a, #view-modpack-a, #view-modpack, #Launch-VM, #Update-VM {
-fx-background-color: #0a073b;
-fx-background-radius: 0em;
-fx-text-fill: white;
}
#download-modpack:hover, #view-modpack:hover, #Launch-VM:hover {
#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-radius: 0em;
-fx-text-fill: white;

4
src/assets/style/light-theme.css
View File

@ -21,13 +21,13 @@
-fx-text-fill: black;
}
#download-modpack, #view-modpack, #Launch-VM {
#download-modpack, #download-modpack-a, #view-modpack-a, #view-modpack, #Launch-VM, #Update-VM {
-fx-background-color: #b8b8b8;
-fx-background-radius: 0em;
-fx-text-fill: black;
}
#download-modpack:hover, #view-modpack:hover, #Launch-VM:hover {
#download-modpack:hover, #download-modpack-a:hover, #view-modpack-a:hover, #view-modpack:hover, #Launch-VM:hover, #Update-VM:hover {
-fx-background-color: #000000;
-fx-background-radius: 0em;
-fx-text-fill: white;