Compare commits

..

1 Commits
master ... Dev

Author SHA1 Message Date
Michael Jouanneau
3f62d0deb2 Update Alpha-Dev 0.0.2
Removed Updater class from being called, because it need some fixing.
2017-02-26 12:57:54 +01:00
3 changed files with 20 additions and 24 deletions

View File

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

View File

@ -14,7 +14,6 @@ If you get sick reading, we will not claim responsibility on your health. Please
package Launcher; package Launcher;
// import Launcher.net.Updater; // import Launcher.net.Updater;
import Launcher.net.Updater;
import com.tofvesson.async.Async; import com.tofvesson.async.Async;
import com.tofvesson.reflection.SafeReflection; import com.tofvesson.reflection.SafeReflection;
import javafx.animation.KeyFrame; import javafx.animation.KeyFrame;
@ -55,8 +54,8 @@ public class Main extends Application {
// Semantic versioning system data // 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 semVerMajor = 0; // Major version
public static final int semVerMinor = 3; // Minor version public static final int semVerMinor = 0; // Minor version
public static final int semVerPatch = 0; // Patch version public static final int semVerPatch = 3; // Patch version
double xOffset = 0, yOffset = 0; // Offsets for dragging double xOffset = 0, yOffset = 0; // Offsets for dragging
@ -81,7 +80,7 @@ public class Main extends Application {
primaryStage.initStyle(StageStyle.UNDECORATED); primaryStage.initStyle(StageStyle.UNDECORATED);
//TODO: Remove the comments under when updater class is fixed //TODO: Remove the comments under when updater class is fixed
if(args.length<2 || !args[1].equals("false")){ /* if(args.length<2 || !args[1].equals("false")){
Stage d = new Stage(); Stage d = new Stage();
Timeline t = new Timeline(); Timeline t = new Timeline();
t.getKeyFrames().add(new KeyFrame(Duration.millis(1), event ->{ d.close(); primaryStage.show(); })); t.getKeyFrames().add(new KeyFrame(Duration.millis(1), event ->{ d.close(); primaryStage.show(); }));
@ -96,7 +95,7 @@ public class Main extends Application {
}); });
t1.setDaemon(true); t1.setDaemon(true);
t1.start(); t1.start();
} else primaryStage.show(); // Remove ugly trash } else primaryStage.show(); */ // Remove ugly trash
root = (Pane) Tabs.load("main"); // Load via layout loader root = (Pane) Tabs.load("main"); // Load via layout loader
((Label)root.lookup("#version")).setText(((Label) root.lookup("#version")) // Dynamically set version label ((Label)root.lookup("#version")).setText(((Label) root.lookup("#version")) // Dynamically set version label

View File

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