Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-12-23 09:01:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

Обновление дизайна от DrLeonardo

Browse source
This commit is contained in:
Gravit 2018-11-08 22:06:02 +07:00
parent b4f097d187
commit e316674946
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
28 changed files with 330 additions and 269 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Launcher/runtime/config.js
View file

@ -5,8 +5,8 @@ var config = {
icons: [ "favicon.png" ], // Window icon paths icons: [ "favicon.png" ], // Window icon paths
// Auth config // Auth config
linkText: "GravitHome site", // Text for link under "Auth" button linkText: "GravitLauncher", // Text for link under "Auth" button
linkURL: new java.net.URL("https://gravithome.ru/"), // URL for link under "Auth" button linkURL: new java.net.URL("https://gravitlauncher.ml"), // URL for link under "Auth" button
// Menu config // Menu config
discord_url: new java.net.URL("https://discord.gg/bf7ZtwC"), discord_url: new java.net.URL("https://discord.gg/bf7ZtwC"),
@ -19,6 +19,7 @@ var config = {
}; };
// ====== DON'T TOUCH! ====== // // ====== DON'T TOUCH! ====== //
DirBridge.dir = IOHelper.HOME_DIR.resolve(config.dir); DirBridge.dir = IOHelper.HOME_DIR.resolve(config.dir);
if (!IOHelper.isDir(DirBridge.dir)) { if (!IOHelper.isDir(DirBridge.dir)) {
java.nio.file.Files.createDirectory(DirBridge.dir); java.nio.file.Files.createDirectory(DirBridge.dir);
@ -27,3 +28,17 @@ DirBridge.defaultUpdatesDir = DirBridge.dir.resolve("updates");
if (!IOHelper.isDir(DirBridge.defaultUpdatesDir)) { if (!IOHelper.isDir(DirBridge.defaultUpdatesDir)) {
java.nio.file.Files.createDirectory(DirBridge.defaultUpdatesDir); java.nio.file.Files.createDirectory(DirBridge.defaultUpdatesDir);
} }
//====== SERVERS CONFIG ====== //
var serversConfig = {
defaults: {
// Лозунг сервера
description: "Мир в котором возможно все"
},
getServerProperty: function(profile, property){
if(serversConfig[profile]==null || serversConfig[profile][property]==null){
return serversConfig.defaults[property];
}
return serversConfig[profile][property];
}
};

3
Launcher/runtime/dialog/dialog.js
View file

@ -206,8 +206,6 @@ function verifyLauncher(e) {
} }
}); });
})); }));
})); }));
} }
@ -419,4 +417,3 @@ launcher.loadScript("dialog/overlay/processing/processing.js");
launcher.loadScript("dialog/overlay/settings/settings.js"); launcher.loadScript("dialog/overlay/settings/settings.js");
launcher.loadScript("dialog/overlay/options/options.js"); launcher.loadScript("dialog/overlay/options/options.js");
launcher.loadScript("dialog/overlay/update/update.js"); launcher.loadScript("dialog/overlay/update/update.js");

BIN
Launcher/runtime/dialog/images/background.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 141 KiB

After

Width:  |  Height:  |  Size: 60 KiB

BIN
Launcher/runtime/dialog/images/downloader/background.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 106 KiB

0
Launcher/runtime/dialog/images/downloader/cl_line.png → Launcher/runtime/dialog/images/downloader/line.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 433 B

After

Width:  |  Height:  |  Size: 433 B

0
Launcher/runtime/dialog/overlay/processing/error.png → Launcher/runtime/dialog/images/icons/error.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 894 B

After

Width:  |  Height:  |  Size: 894 B

BIN
Launcher/runtime/dialog/images/icons/loading.gif
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 51 KiB

BIN
Launcher/runtime/dialog/images/icons/logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
Launcher/runtime/dialog/images/icons/logo_small.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 322 B

BIN
Launcher/runtime/dialog/images/icons/server.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
Launcher/runtime/dialog/images/icons/server_hover.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
Launcher/runtime/dialog/images/icons/settings.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 427 B

BIN
Launcher/runtime/dialog/images/mainmenu/background.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 118 KiB

24
Launcher/runtime/dialog/login.css
View file

@ -6,6 +6,10 @@ #layout {
-fx-background-color: transparent; -fx-background-color: transparent;
} }
#mask{
-fx-background-color: rgba(0, 0, 0, 0.5);
}
#link { #link {
-fx-font-weight: bold; -fx-font-weight: bold;
-fx-font-size: 8pt; -fx-font-size: 8pt;
@ -70,6 +74,16 @@ #rememberchb:selected .box {
-fx-background-color: transparent; -fx-background-color: transparent;
} }
#errormessage{
-fx-background-color: transparent;
-fx-text-alignment: center;
-fx-text-fill: #ffd96f;
}
.loginPane {
-fx-background-color: rgba(0, 0, 0, 0.46);
}
.btn { .btn {
-fx-font-weight: bold; -fx-font-weight: bold;
-fx-font-size: 13pt; -fx-font-size: 13pt;
@ -108,16 +122,6 @@ .text-area .scroll-pane .content{
-fx-background-color: transparent; -fx-background-color: transparent;
} }
#errormessage{
-fx-background-color: transparent;
-fx-text-alignment: center;
-fx-text-fill: #ffd96f;
}
.error{ .error{
-fx-text-fill: #ff5555; -fx-text-fill: #ff5555;
} }
#mask{
-fx-background-color: rgba(0, 0, 0, 0.5);
}

59
Launcher/runtime/dialog/login.fxml
View file

@ -12,31 +12,42 @@
<!-- DrLeonardo Design --> <!-- DrLeonardo Design -->
<Pane fx:id="layout" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" <Pane fx:id="layout" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" visible="true" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
prefHeight="400.0" prefWidth="600.0" <children>
xmlns="http://javafx.com/javafx/10.0.1" xmlns:fx="http://javafx.com/fxml/1">
<stylesheets>
<URL value="@login.css"/>
</stylesheets>
<ImageView id="background" fitHeight="400.0" fitWidth="600.0"> <ImageView id="background" fitHeight="400.0" fitWidth="600.0">
<Image preserveRatio="true" smooth="true" url="@images/background.png"/> <image>
<Image preserveRatio="true" smooth="true" url="@images/background.png" />
</image>
</ImageView> </ImageView>
<Pane id="authPane" layoutX="1.0" layoutY="2.0" prefHeight="400.0" prefWidth="600.0"> <Pane layoutX="160.0" layoutY="61.0" prefHeight="306.0" prefWidth="267.0" styleClass="loginPane">
<TextField id="login" alignment="CENTER" layoutX="175.0" layoutY="144.0" prefHeight="45.0" prefWidth="233.0" <children>
promptText="Логин"/> <ImageView id="background" fitHeight="27.0" fitWidth="123.0" layoutX="72.0" layoutY="33.0">
<PasswordField id="password" alignment="CENTER" layoutX="175.0" layoutY="197.0" prefHeight="45.0" <image>
prefWidth="233.0" promptText="Пароль"/> <Image url="@images/icons/logo.png" />
<Button id="goAuth" layoutX="159.0" layoutY="319.0" mnemonicParsing="false" prefHeight="45.0" prefWidth="267.0" </image>
styleClass="btn" text="ВОЙТИ"/> </ImageView>
<CheckBox id="rememberchb" fx:id="savePassword" contentDisplay="CENTER" layoutX="224.0" layoutY="291.0" </children>
prefHeight="17.0" prefWidth="137.0" text="Сохранить пароль" textFill="#dadada"/>
<Hyperlink id="link" fx:id="link" layoutY="371.0" prefHeight="30.0" prefWidth="158.0" textAlignment="CENTER"/>
<Button id="discord_url" layoutX="278.0" layoutY="373.0" minHeight="16.0" minWidth="28.0" mnemonicParsing="false"
prefHeight="16.0" prefWidth="28.0"/>
</Pane> </Pane>
<Pane id="mask" opacity="0.0" prefHeight="400.0" prefWidth="600.0" visible="false"/> <Pane id="authPane" layoutX="1.0" layoutY="2.0" prefHeight="400.0" prefWidth="600.0">
<Button id="hidebtn" focusTraversable="false" layoutX="535.0" layoutY="2.0" minHeight="25.0" minWidth="35.0" <children>
prefHeight="25.0" prefWidth="25.0"/> <TextField id="login" alignment="CENTER" layoutX="175.0" layoutY="144.0" prefHeight="45.0" prefWidth="233.0" promptText="Логин" />
<Button id="exitbtn" focusTraversable="false" layoutX="574.0" layoutY="2.0" minHeight="25.0" minWidth="20.0" <PasswordField id="password" alignment="CENTER" layoutX="175.0" layoutY="197.0" prefHeight="45.0" prefWidth="233.0" promptText="Пароль" />
prefHeight="25.0" prefWidth="20.0"/> <Button id="goAuth" layoutX="159.0" layoutY="319.0" mnemonicParsing="false" opacity="1.0" prefHeight="45.0" prefWidth="267.0" styleClass="btn" text="ВОЙТИ" visible="true" />
<CheckBox id="rememberchb" fx:id="savePassword" contentDisplay="CENTER" layoutX="224.0" layoutY="291.0" prefHeight="17.0" prefWidth="137.0" text="Сохранить пароль" textFill="#dadada" />
<Hyperlink id="link" fx:id="link" layoutY="371.0" prefHeight="30.0" prefWidth="158.0" textAlignment="CENTER" />
<Button id="discord_url" layoutX="278.0" layoutY="373.0" minHeight="16.0" minWidth="28.0" mnemonicParsing="false" prefHeight="16.0" prefWidth="28.0" text="" />
</children>
</Pane>
<Pane id="mask" opacity="0.0" prefHeight="400.0" prefWidth="600.0" visible="false" />
<Button id="hidebtn" focusTraversable="false" layoutX="535.0" layoutY="2.0" minHeight="25.0" minWidth="35.0" prefHeight="25.0" prefWidth="25.0" />
<Button id="exitbtn" focusTraversable="false" layoutX="574.0" layoutY="2.0" minHeight="25.0" minWidth="20.0" prefHeight="25.0" prefWidth="20.0" />
<ImageView fitHeight="12.0" fitWidth="11.0" layoutX="9.0" layoutY="8.0">
<image>
<Image url="@images/icons/logo_small.png" />
</image>
</ImageView>
</children>
<stylesheets>
<URL value="@login.css" />
</stylesheets>
</Pane> </Pane>

87
Launcher/runtime/dialog/mainmenu.css
View file

@ -10,10 +10,6 @@ #mask {
-fx-background-color: rgba(0, 0, 0, 0.5); -fx-background-color: rgba(0, 0, 0, 0.5);
} }
.heading{
-fx-text-fill: #555555;
}
#serverLabel{ #serverLabel{
-fx-text-fill: #fff; -fx-text-fill: #fff;
} }
@ -65,10 +61,6 @@ #serverdesc > .viewport {
-fx-background-color: transparent; -fx-background-color: transparent;
} }
.toggle-button:disabled{
-fx-opacity: 1.0;
}
#serverinfo{ #serverinfo{
-fx-background-color: transparent; -fx-background-color: transparent;
} }
@ -85,7 +77,7 @@ #servercontainer .toggle-button{
-fx-pref-height: 50; -fx-pref-height: 50;
-fx-background-image: url('images/icons/server.png'); -fx-background-image: url('images/icons/server.png');
-fx-padding: 0 0 0 40; -fx-padding: 0 0 0 40;
-fx-opacity: 0.8; -fx-opacity: 0.7;
-fx-alignment: CENTER-LEFT; -fx-alignment: CENTER-LEFT;
-fx-text-fill: #fff; -fx-text-fill: #fff;
-fx-translate-y: -1px; -fx-translate-y: -1px;
@ -98,7 +90,50 @@ #servercontainer .toggle-button:hover{
} }
#servercontainer .toggle-button:selected{ #servercontainer .toggle-button:selected{
-fx-opacity: 1; -fx-opacity: 1;
-fx-background-image: url('images/icons/server_hover.png'); -fx-background-image: url('images/icons/server.png');
}
#discord_url{
-fx-opacity: 0.8;
-fx-background-color: transparent;
-fx-background-image: url('images/icons/discord.png');
-fx-background-repeat: no-repeat;
}
#settingsbtn{
-fx-opacity: 0.4;
-fx-background-position: center;
-fx-background-color: transparent;
-fx-background-radius: 0;
-fx-background-repeat: no-repeat;
-fx-background-image: url('images/icons/settings.png');
}
#serverLaunch{
-fx-background-radius: 0;
-fx-font-weight: bold;
-fx-font-size: 18pt;
-fx-background-color: #61B373;
-fx-text-fill: #ffffff;
}
#clientbtn{
-fx-background-radius: 0;
-fx-background-color: #61B373;
-fx-background-image: url('images/icons/options.png');
-fx-background-repeat: no-repeat;
}
#serverLaunch:hover, #serverLaunch:pressed, #clientbtn:hover, #clientbtn:pressed {
-fx-background-color: #74C085;
}
#settingsbtn:hover, #settingsbtn:pressed, #discord_url:hover, #discord_url:pressed, #hidebtn:hover, #hidebtn:pressed, #exitbtn:hover, #exitbtn:pressed { -fx-opacity: 1; }
.toggle-button:disabled{
-fx-opacity: 1.0;
}
.menuPane {
-fx-background-color: rgba(0, 0, 0, 0.46);
}
.heading{
-fx-text-fill: #555555;
} }
.scroll-pane { .scroll-pane {
@ -133,35 +168,3 @@ .scroll-bar{
.scroll-pane > .corner { .scroll-pane > .corner {
-fx-background-color: black; -fx-background-color: black;
} }
#discord_url{
-fx-opacity: 0.8;
-fx-background-color: transparent;
-fx-background-image: url('images/icons/discord.png');
-fx-background-repeat: no-repeat;
}
#settingsbtn{
-fx-opacity: 0.4;
-fx-background-position: center;
-fx-background-color: transparent;
-fx-background-radius: 0;
-fx-background-repeat: no-repeat;
-fx-background-image: url('images/icons/settings.png');
}
#serverLaunch{
-fx-background-radius: 0;
-fx-font-weight: bold;
-fx-font-size: 18pt;
-fx-background-color: #61B373;
-fx-text-fill: #ffffff;
}
#clientbtn{
-fx-background-radius: 0;
-fx-background-color: #61B373;
-fx-background-image: url('images/icons/options.png');
-fx-background-repeat: no-repeat;
}
#serverLaunch:hover, #serverLaunch:pressed, #clientbtn:hover, #clientbtn:pressed {
-fx-background-color: #74C085;
}
#settingsbtn:hover, #settingsbtn:pressed, #discord_url:hover, #discord_url:pressed, #hidebtn:hover, #hidebtn:pressed, #exitbtn:hover, #exitbtn:pressed { -fx-opacity: 1; }

97
Launcher/runtime/dialog/mainmenu.fxml
View file

@ -13,79 +13,80 @@
<!-- DrLeonardo Design --> <!-- DrLeonardo Design -->
<Pane fx:id="layout" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/10.0.1" <Pane fx:id="layout" maxHeight="-1.0" maxWidth="-1.0" prefHeight="400.0" prefWidth="600.0" visible="true" xmlns="http://javafx.com/javafx/10.0.1" xmlns:fx="http://javafx.com/fxml/1">
xmlns:fx="http://javafx.com/fxml/1"> <children>
<stylesheets> <ImageView id="background" fitHeight="400.0" fitWidth="600.0">
<URL value="@mainmenu.css"/> <image>
</stylesheets> <Image url="@images/background.png" />
<ImageView id="sl_background" fitHeight="400.0" fitWidth="600.0"> </image>
<Image preserveRatio="true" smooth="true" url="@images/mainmenu/background.png"/>
</ImageView> </ImageView>
<ImageView fitHeight="12.0" fitWidth="11.0" layoutX="9.0" layoutY="8.0">
<image>
<Image url="@images/icons/logo_small.png" />
</image>
</ImageView>
<Pane layoutX="171.0" layoutY="28.0" prefHeight="372.0" prefWidth="429.0" styleClass="menuPane" />
<Pane id="serverPane" prefHeight="400.0" prefWidth="600.0"> <Pane id="serverPane" prefHeight="400.0" prefWidth="600.0">
<Button id="hidebtn" focusTraversable="false" layoutX="545.0" layoutY="2.0" minHeight="25.0" minWidth="20.0" <children>
prefHeight="25.0" prefWidth="25.0" textAlignment="CENTER"/> <Button id="hidebtn" focusTraversable="false" layoutX="545.0" layoutY="2.0" minHeight="25.0" minWidth="20.0" prefHeight="25.0" prefWidth="25.0" textAlignment="CENTER" />
<Button id="exitbtn" alignment="CENTER" contentDisplay="CENTER" focusTraversable="false" layoutX="572.0" <Button id="exitbtn" alignment="CENTER" contentDisplay="CENTER" focusTraversable="false" layoutX="572.0" layoutY="2.0" minHeight="25.0" minWidth="20.0" prefHeight="25.0" prefWidth="25.0" rotate="360.0" textAlignment="CENTER" translateX="0.0" />
layoutY="2.0" minHeight="25.0" minWidth="20.0" prefHeight="25.0" prefWidth="25.0" rotate="360.0" <ScrollPane id="serverlist" hbarPolicy="NEVER" layoutX="0.0" layoutY="27.0" prefHeight="306.0" prefWidth="171.0" visible="true">
textAlignment="CENTER"/> <content>
<ScrollPane id="serverlist" hbarPolicy="NEVER" layoutY="27.0" prefHeight="306.0" prefWidth="171.0"> <FlowPane id="servercontainer" alignment="TOP_LEFT" columnHalignment="LEFT" focusTraversable="false" hgap="0.0" maxHeight="0.0" maxWidth="0.0" orientation="HORIZONTAL" prefHeight="-1.0" prefWidth="161.0" prefWrapLength="0.0" rowValignment="TOP" vgap="7.0" visible="true">
<FlowPane id="servercontainer" maxHeight="0.0" maxWidth="0.0" prefWidth="161.0" prefWrapLength="0.0"
rowValignment="TOP" vgap="7.0">
<padding> <padding>
<Insets top="10.0"/> <Insets top="10.0" />
</padding> </padding>
</FlowPane> </FlowPane>
</content>
</ScrollPane> </ScrollPane>
<ScrollPane id="serverinfo" hbarPolicy="NEVER" layoutX="170.0" layoutY="71.0" pannable="true" <ScrollPane id="serverinfo" hbarPolicy="NEVER" layoutX="170.0" layoutY="71.0" pannable="true" prefHeight="234.0" prefWidth="432.0" visible="true">
prefHeight="234.0" prefWidth="432.0"> <content>
<FlowPane id="" prefHeight="234.0" prefWidth="428.0" rowValignment="TOP"> <FlowPane id="" focusTraversable="false" orientation="HORIZONTAL" prefHeight="219.0" prefWidth="428.0" rowValignment="TOP" visible="true">
<padding> <padding>
<Insets bottom="10.0" left="15.0" top="7.0"/> <Insets bottom="10.0" left="15.0" top="7.0" />
</padding> </padding>
<Label id="serverDescription" alignment="TOP_LEFT" nodeOrientation="LEFT_TO_RIGHT" prefHeight="213.0" <children>
prefWidth="407.0" <Label id="serverDescription" alignment="TOP_LEFT" contentDisplay="LEFT" nodeOrientation="LEFT_TO_RIGHT" prefHeight="204.0" prefWidth="407.0" text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla convallis magna tellus, in bibendum tortor dignissim non. Phasellus vel tincidunt nulla, eu convallis ligula. Suspendisse ut diam vestibulum, tincidunt neque ut, posuere risus. Pellentesque posuere molestie eros, quis laoreet ante ornare quis. Morbi eu tortor fermentum, iaculis risus sit amet, fringilla augue. Aenean nulla purus, rutrum non sapien et, convallis tincidunt purus. Vivamus a eros pulvinar, dignissim leo lacinia, sodales nulla. Aliquam tortor augue, cursus a rutrum viverra, consequat non tellus. Donec porta nisl sed quam dictum commodo. Sed et vulputate dolor. Morbi ultrices justo vitae convallis semper. Donec sodales velit vel velit faucibus, et scelerisque felis finibus. Sed rutrum lacinia mauris, porta cursus mauris tempor eu. Duis turpis nulla, dictum vitae commodo rhoncus, pretium in turpis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos." textFill="#d3d3d3" wrapText="true">
text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla convallis magna tellus, in bibendum tortor dignissim non. Phasellus vel tincidunt nulla, eu convallis ligula. Suspendisse ut diam vestibulum, tincidunt neque ut, posuere risus. Pellentesque posuere molestie eros, quis laoreet ante ornare quis. Morbi eu tortor fermentum, iaculis risus sit amet, fringilla augue. Aenean nulla purus, rutrum non sapien et, convallis tincidunt purus. Vivamus a eros pulvinar, dignissim leo lacinia, sodales nulla. Aliquam tortor augue, cursus a rutrum viverra, consequat non tellus. Donec porta nisl sed quam dictum commodo. Sed et vulputate dolor. Morbi ultrices justo vitae convallis semper. Donec sodales velit vel velit faucibus, et scelerisque felis finibus. Sed rutrum lacinia mauris, porta cursus mauris tempor eu. Duis turpis nulla, dictum vitae commodo rhoncus, pretium in turpis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos."
textFill="#d3d3d3" wrapText="true">
<font> <font>
<Font size="14.0" fx:id="x3"/> <Font size="14.0" fx:id="x3" />
</font> </font>
</Label> </Label>
</children>
</FlowPane> </FlowPane>
</content>
</ScrollPane> </ScrollPane>
<Pane id="serverentrance" layoutX="170.0" layoutY="27.0" prefHeight="372.0" prefWidth="430.0"> <Pane id="serverentrance" layoutX="170.0" layoutY="27.0" prefHeight="372.0" prefWidth="430.0">
<children>
<Button id="serverLaunch" layoutX="180.0" layoutY="294.0" mnemonicParsing="false" prefHeight="60.0" <Button id="serverLaunch" layoutX="180.0" layoutY="294.0" mnemonicParsing="false" prefHeight="60.0" prefWidth="182.0" text="ИГРАТЬ">
prefWidth="182.0" text="ИГРАТЬ">
<font> <font>
<Font size="22.0"/> <Font size="22.0" />
</font> </font>
</Button> </Button>
<Button id="clientbtn" layoutX="363.0" layoutY="294.0" mnemonicParsing="false" prefHeight="60.0" <Button id="clientbtn" layoutX="363.0" layoutY="294.0" mnemonicParsing="false" prefHeight="60.0" prefWidth="50.0" text="" />
prefWidth="50.0"/> <Label id="serverStatus" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="14.0" layoutY="312.0" opacity="0.61" prefHeight="25.0" prefWidth="153.0" text="12/100" textAlignment="RIGHT" textFill="WHITE">
<Label id="serverStatus" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="14.0" layoutY="312.0"
opacity="0.61" prefHeight="25.0" prefWidth="153.0" text="12/100" textAlignment="RIGHT"
textFill="WHITE">
<font> <font>
<Font name="System Bold" size="16.0"/> <Font name="System Bold" size="16.0" />
</font> </font>
</Label> </Label>
<Label id="serverLabel" layoutX="2.0" layoutY="11.0" prefHeight="40.0" prefWidth="274.0" <Label id="serverLabel" layoutX="2.0" layoutY="11.0" prefHeight="40.0" prefWidth="274.0" text="СЕРВЕР IFARM">
text="СЕРВЕР IFARM">
<font> <font>
<Font name="System Bold" size="18.0"/> <Font name="System Bold" size="18.0" />
</font> </font>
<padding> <padding>
<Insets left="14.0"/> <Insets left="14.0" />
</padding> </padding>
</Label> </Label>
<Button id="discord_url" alignment="BOTTOM_CENTER" contentDisplay="CENTER" layoutX="386.0" layoutY="23.0" <Button id="discord_url" alignment="BOTTOM_CENTER" contentDisplay="CENTER" layoutX="386.0" layoutY="23.0" minHeight="16.0" minWidth="28.0" mnemonicParsing="false" prefHeight="16.0" prefWidth="28.0" text="" textAlignment="CENTER" />
minHeight="16.0" minWidth="28.0" mnemonicParsing="false" prefHeight="16.0" prefWidth="28.0" </children>
textAlignment="CENTER"/>
</Pane> </Pane>
<Button id="logoutbtn" layoutX="19.0" layoutY="350.0" mnemonicParsing="false" prefHeight="31.0" <Button id="logoutbtn" layoutX="19.0" layoutY="350.0" mnemonicParsing="false" prefHeight="31.0" prefWidth="133.0" styleClass="logoutbtn" text="Выйти" />
prefWidth="133.0" styleClass="logoutbtn" text="Выйти"/> <Button id="settingsbtn" alignment="CENTER" contentDisplay="CENTER" layoutX="518.0" layoutY="2.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="25.0" text="" textAlignment="CENTER" />
<Button id="settingsbtn" alignment="CENTER" contentDisplay="CENTER" layoutX="518.0" layoutY="2.0" </children>
mnemonicParsing="false" prefHeight="25.0" prefWidth="25.0"
textAlignment="CENTER"/>
</Pane> </Pane>
<Pane id="mask" opacity="0.0" prefHeight="400.0" prefWidth="600.0" visible="false"/> <Pane id="mask" opacity="0.0" prefHeight="400.0" prefWidth="600.0" visible="false" />
</children>
<stylesheets>
<URL value="@mainmenu.css" />
</stylesheets>
</Pane> </Pane>

2
Launcher/runtime/dialog/overlay/debug/debug.fxml
View file

@ -7,7 +7,7 @@
<!-- DrLeonardo Design --> <!-- DrLeonardo Design -->
<Pane fx:id="overlay" prefHeight="400.0" prefWidth="600.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/10.0.1"> <Pane fx:id="overlay" prefHeight="400.0" prefWidth="600.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8">
<stylesheets> <stylesheets>
<URL value="@debug.css" /> <URL value="@debug.css" />
</stylesheets> </stylesheets>

42
Launcher/runtime/dialog/overlay/options/options.css
View file

@ -17,12 +17,54 @@ #holder > #apply:focused{
-fx-background-color: #74C085; -fx-background-color: #74C085;
} }
#holder > #modlist {
-fx-background-color: transparent;
}
#holder > #modlist > .viewport {
-fx-background-color: transparent;
}
.scroll-pane {
-fx-background-color: transparent;
}
.scroll-bar:horizontal, .scroll-bar:vertical{
-fx-background-color:transparent;
}
.increment-button, .decrement-button, .increment-arrow, .decrement-arrow {
-fx-background-color: transparent;
-fx-border-color: transparent;
}
.scroll-bar:horizontal .track,
.scroll-bar:vertical .track{
-fx-background-color: transparent;
-fx-border-color: transparent;
}
.scroll-bar:horizontal .thumb,
.scroll-bar:vertical .thumb {
-fx-background-color: rgba(0, 0, 0, 0.19);
-fx-background-radius: 0;
}
.scroll-bar{
-fx-font-size: 6px;
}
.scroll-pane > .corner {
-fx-background-color: black;
}
.check-box{ .check-box{
-fx-background-color: transparent; -fx-background-color: transparent;
-fx-text-fill:#2c2c2c; -fx-text-fill:#2c2c2c;
-fx-font-size: 13; -fx-font-size: 13;
-fx-background-image: url('../../images/icons/checkbox.png'); -fx-background-image: url('../../images/icons/checkbox.png');
-fx-background-repeat: no-repeat; -fx-background-repeat: no-repeat;
-fx-padding: 0 0 10 0;
} }
.check-box .mark { .check-box .mark {
-fx-background-color: transparent; -fx-background-color: transparent;

30
Launcher/runtime/dialog/overlay/options/options.fxml
View file

@ -1,23 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import java.net.URL?> <?import java.net.URL?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?> <?import javafx.scene.control.Button?>
<?import javafx.scene.control.CheckBox?>
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.layout.FlowPane?> <?import javafx.scene.layout.FlowPane?>
<?import javafx.scene.text.Text?> <?import javafx.scene.layout.Pane?>
<!-- DrLeonardo Design --> <!-- DrLeonardo Design -->
<Pane fx:id="overlay" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/10.0.1" <Pane fx:id="overlay" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/10.0.1" xmlns:fx="http://javafx.com/fxml/1">
xmlns:fx="http://javafx.com/fxml/1"> <children>
<stylesheets> <Pane id="holder" layoutX="171.0" layoutY="28.0" prefHeight="371.0" prefWidth="428.0">
<URL value="@options.css"/> <children>
</stylesheets> <Button fx:id="apply" defaultButton="true" layoutX="315.0" layoutY="333.0" prefHeight="25.0" prefWidth="100.0" text="Применить" />
<Pane id="holder" layoutX="171.0" layoutY="28.0" prefHeight="372.0" prefWidth="429.0"> <FlowPane id="modlist" orientation="VERTICAL" prefHeight="371.0">
<Button fx:id="apply" defaultButton="true" layoutX="315.0" layoutY="333.0" prefHeight="25.0" <children>
prefWidth="100.0" text="Применить"/> </children>
<FlowPane id="holderpane"> <padding>
<Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
</padding>
</FlowPane> </FlowPane>
</children>
</Pane> </Pane>
</children>
<stylesheets>
<URL value="@options.css" />
</stylesheets>
</Pane> </Pane>

7
Launcher/runtime/dialog/overlay/options/options.js
View file

@ -1,6 +1,5 @@
var options = { var options = {
file: DirBridge.dir.resolve("options.bin"), // options file file: DirBridge.dir.resolve("options.bin"), // options file
autoEnter: false, // Client
/* options and overlay functions */ /* options and overlay functions */
load: function() { load: function() {
@ -39,17 +38,14 @@ var options = {
initOverlay: function() { initOverlay: function() {
options.overlay = loadFXML("dialog/overlay/options/options.fxml"); options.overlay = loadFXML("dialog/overlay/options/options.fxml");
// Lookup autoEnter checkbox
var holder = options.overlay.lookup("#holder"); var holder = options.overlay.lookup("#holder");
// Lookup apply settings button
holder.lookup("#apply").setOnAction(function(event) overlay.hide(0, null)); holder.lookup("#apply").setOnAction(function(event) overlay.hide(0, null));
}, },
}; };
function updateOptional() function updateOptional()
{ {
var holder = options.overlay.lookup("#holderpane"); var holder = options.overlay.lookup("#modlist");
var nodelist = new java.util.ArrayList; var nodelist = new java.util.ArrayList;
holder.getChildren().forEach(function(node,i,arr) { holder.getChildren().forEach(function(node,i,arr) {
@ -64,6 +60,7 @@ function updateOptional()
var checkboxlist = new java.util.ArrayList; var checkboxlist = new java.util.ArrayList;
list.forEach(function(modfile,i,arr) { list.forEach(function(modfile,i,arr) {
var testMod = new javafx.scene.control.CheckBox(modfile.string); var testMod = new javafx.scene.control.CheckBox(modfile.string);
testMod.setSelected(modfile.mark); testMod.setSelected(modfile.mark);
//testMod.setLayoutY(2+3*i); //testMod.setLayoutY(2+3*i);
//testMod.setLayoutX(2); //testMod.setLayoutX(2);

27
Launcher/runtime/dialog/overlay/processing/processing.fxml
View file

@ -8,20 +8,23 @@
<!-- DrLeonardo Design --> <!-- DrLeonardo Design -->
<Pane fx:id="overlay" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/10.0.1" <Pane fx:id="overlay" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/10.0.1" xmlns:fx="http://javafx.com/fxml/1">
xmlns:fx="http://javafx.com/fxml/1"> <children>
<stylesheets> <ImageView fitHeight="161.0" fitWidth="161.0" layoutX="213.0" layoutY="94.0" y="-6.0">
<URL value="@processing.css"/> <image>
</stylesheets> <Image url="@../../images/icons/loading.gif" />
<ImageView fitHeight="161.0" fitWidth="161.0" layoutX="220.0" layoutY="94.0" y="-6.0"> </image>
<Image url="@../../images/icons/loading.gif"/>
</ImageView> </ImageView>
<!-- Icon image --> <!-- Icon image -->
<ImageView id="spinner" fx:id="spinner" blendMode="COLOR_BURN" fitHeight="79.0" fitWidth="79.0" layoutX="261.0" <ImageView id="spinner" fx:id="spinner" blendMode="COLOR_BURN" fitHeight="79.0" fitWidth="79.0" layoutX="254.0" layoutY="116.0" preserveRatio="true">
layoutY="116.0" preserveRatio="true"> <image>
<Image url="@error.png"/> <Image url="@../../images/icons/error.png" />
</image>
</ImageView> </ImageView>
<!-- Description --> <!-- Description -->
<Label fx:id="description" alignment="CENTER" contentDisplay="CENTER" layoutX="159.0" layoutY="249.0" <Label fx:id="description" alignment="CENTER" contentDisplay="CENTER" layoutX="152.0" layoutY="249.0" prefHeight="64.0" prefWidth="283.0" text="..." textAlignment="CENTER" />
prefHeight="64.0" prefWidth="283.0" text="..." textAlignment="CENTER"/> </children>
<stylesheets>
<URL value="@processing.css" />
</stylesheets>
</Pane> </Pane>

2
Launcher/runtime/dialog/overlay/processing/processing.js
View file

@ -13,7 +13,7 @@ var processing = {
processing.processingImage = new javafx.scene.image.Image( processing.processingImage = new javafx.scene.image.Image(
Launcher.getResourceURL("dialog/images/icons/loading.gif").toString()); Launcher.getResourceURL("dialog/images/icons/loading.gif").toString());
processing.errorImage = new javafx.scene.image.Image( processing.errorImage = new javafx.scene.image.Image(
Launcher.getResourceURL("dialog/overlay/processing/error.png").toString()); Launcher.getResourceURL("dialog/images/icons/error.png").toString());
}, },
resetOverlay: function() { resetOverlay: function() {

62
Launcher/runtime/dialog/overlay/settings/settings.fxml
View file

@ -14,46 +14,36 @@
<!-- DrLeonardo Design --> <!-- DrLeonardo Design -->
<Pane fx:id="overlay" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/10.0.1" <Pane fx:id="overlay" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/10.0.1" xmlns:fx="http://javafx.com/fxml/1">
xmlns:fx="http://javafx.com/fxml/1"> <children>
<stylesheets> <Pane id="holder" layoutX="1.0" layoutY="28.0" prefHeight="371.0" prefWidth="598.0">
<URL value="@settings.css"/> <children>
</stylesheets> <CheckBox fx:id="autoEnter" layoutX="14.0" layoutY="80.0" text="Автовход на сервер" />
<Pane id="holder" layoutY="28.0" prefHeight="372.0" prefWidth="600.0"> <CheckBox fx:id="fullScreen" layoutX="13.0" layoutY="185.0" text="Клиент в полный экран" />
<CheckBox fx:id="autoEnter" layoutX="14.0" layoutY="80.0" text="Автовход на сервер"/>
<CheckBox fx:id="fullScreen" layoutX="13.0" layoutY="185.0" text="Клиент в полный экран"/>
<!-- RAM settings --> <!-- RAM settings -->
<TextFlow layoutX="20.0" layoutY="70.0"/> <TextFlow layoutX="20.0" layoutY="70.0" />
<Slider fx:id="ramSlider" layoutX="18.0" layoutY="36.0" prefHeight="3.0" prefWidth="563.0"/> <Slider fx:id="ramSlider" layoutX="18.0" layoutY="36.0" prefHeight="3.0" prefWidth="563.0" />
<Separator layoutY="65.0" prefHeight="1.0" prefWidth="600.0"/> <Separator layoutY="65.0" prefHeight="1.0" prefWidth="600.0" />
<Label id="" layoutX="18.0" layoutY="16.0" prefHeight="17.0" prefWidth="217.0" <Label id="" alignment="CENTER_LEFT" layoutX="18.0" layoutY="16.0" prefHeight="17.0" prefWidth="217.0" text="Лимит памяти для клиента ОЗУ (RAM)" textFill="#2f2f2f" />
text="Лимит памяти для клиента ОЗУ (RAM)" textFill="#2f2f2f"/>
<!-- RAM settings --> <!-- RAM settings -->
<Button fx:id="deleteDir" layoutX="15.0" layoutY="333.0" prefHeight="25.0" prefWidth="245.0" <Button fx:id="deleteDir" layoutX="15.0" layoutY="333.0" prefHeight="25.0" prefWidth="245.0" text="Очистить данные игровых клиентов" textAlignment="CENTER" wrapText="true">
text="Очистить данные игровых клиентов" textAlignment="CENTER" wrapText="true">
<font> <font>
<Font name="System Bold" size="12.0"/> <Font name="System Bold" size="12.0" />
</font> </font></Button>
</Button> <Button fx:id="changeDir" layoutX="14.0" layoutY="229.0" prefHeight="25.0" prefWidth="200.0" text="Сменить директорию загрузки" textAlignment="CENTER" wrapText="true" />
<Button fx:id="changeDir" layoutX="14.0" layoutY="229.0" prefHeight="25.0" prefWidth="200.0" <Hyperlink id="dirLabel" alignment="TOP_LEFT" layoutX="215.0" layoutY="230.0" prefHeight="23.0" prefWidth="371.0" text="C:/Users" wrapText="true" />
text="Сменить директорию загрузки" textAlignment="CENTER" wrapText="true"/> <Button fx:id="apply" defaultButton="true" layoutX="486.0" layoutY="335.0" prefHeight="23.0" prefWidth="100.0" text="Применить" />
<Hyperlink id="dirLabel" alignment="TOP_LEFT" layoutX="215.0" layoutY="230.0" prefHeight="23.0" <CheckBox id="debug" layoutX="13.0" layoutY="124.0" text="Режим Откладки" />
prefWidth="371.0" text="C:/Users" wrapText="true"/> <Text fill="#8c8c8c" layoutX="38.0" layoutY="95.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Включение авто-входа означает что вы сразу после загрузки клиента попадете на сервер" wrappingWidth="533.0000102519989" y="15.0" />
<Button fx:id="apply" defaultButton="true" layoutX="486.0" layoutY="335.0" prefHeight="23.0" <Text fill="#8c8c8c" layoutX="38.0" layoutY="139.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Режим отладки позволяет просмотреть лог запуска и работы программы в реальном времени прямо из лаунчера, что упрощает поиск нужной информации" wrappingWidth="533.0000016447157" y="15.0" />
prefWidth="100.0" text="Применить"/> <Text fill="#8c8c8c" layoutX="38.0" layoutY="200.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Включение данной функции позволяет запустить игру сразу в полноэкранном режиме" wrappingWidth="533.0000102519989" y="15.0" />
<CheckBox id="debug" layoutX="13.0" layoutY="124.0" text="Режим Откладки"/> <Label fx:id="ramLabel" alignment="CENTER_RIGHT" layoutX="481.0" layoutY="17.0" prefWidth="100.0" text="RAM" />
<Text fill="#8c8c8c" layoutX="38.0" layoutY="95.0" strokeType="OUTSIDE" strokeWidth="0.0" </children>
text="Включение авто-входа означает что вы сразу после загрузки клиента попадете на сервер"
wrappingWidth="533.0000102519989" y="15.0"/>
<Text fill="#8c8c8c" layoutX="38.0" layoutY="139.0" strokeType="OUTSIDE" strokeWidth="0.0"
text="Режим отладки позволяет просмотреть лог запуска и работы программы в реальном времени прямо из лаунчера, что упрощает поиск нужной информации"
wrappingWidth="533.0000016447157" y="15.0"/>
<Text fill="#8c8c8c" layoutX="38.0" layoutY="200.0" strokeType="OUTSIDE" strokeWidth="0.0"
text="Включение данной функции позволяет запустить игру сразу в полноэкранном режиме"
wrappingWidth="533.0000102519989" y="15.0"/>
<Label fx:id="ramLabel" alignment="CENTER_RIGHT" layoutX="481.0" layoutY="17.0" prefWidth="100.0"
text="RAM"/>
</Pane> </Pane>
</children>
<stylesheets>
<URL value="@settings.css" />
</stylesheets>
</Pane> </Pane>

6
Launcher/runtime/dialog/overlay/update/update.css
View file

@ -11,6 +11,10 @@ #overlay > #description.error {
-fx-text-fill: red; -fx-text-fill: red;
} }
.downloadPane {
-fx-background-color: rgba(0, 0, 0, 0.46);
}
/* Progress bar */ /* Progress bar */
.progress-bar { .progress-bar {
-fx-indeterminate-bar-flip: false; -fx-indeterminate-bar-flip: false;
@ -26,7 +30,7 @@ .progress-indicator .indicator {
} }
.progress-bar > .bar { .progress-bar > .bar {
-fx-background-image: url("../../images/downloader/cl_line.png"); -fx-background-image: url("../../images/downloader/line.png");
-fx-background-color: transparent; -fx-background-color: transparent;
-fx-background-insets: 0; -fx-background-insets: 0;
-fx-background-radius: 0; -fx-background-radius: 0;

35
Launcher/runtime/dialog/overlay/update/update.fxml
View file

@ -10,25 +10,34 @@
<!-- DrLeonardo Design --> <!-- DrLeonardo Design -->
<Pane fx:id="overlay" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/10.0.1" <Pane fx:id="overlay" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
xmlns:fx="http://javafx.com/fxml/1"> <children>
<stylesheets>
<URL value="@update.css"/>
</stylesheets>
<ImageView fitHeight="400.0" fitWidth="600.0" pickOnBounds="true" preserveRatio="true"> <ImageView fitHeight="400.0" fitWidth="600.0" pickOnBounds="true" preserveRatio="true">
<Image url="@../../images/downloader/background.png"/> <image>
<Image url="@../../images/background.png" />
</image>
</ImageView> </ImageView>
<Label fx:id="description" layoutX="12.0" layoutY="267.0" prefHeight="98.0" prefWidth="576.0" text="..." <Pane layoutY="28.0" prefHeight="372.0" prefWidth="600.0" styleClass="downloadPane" />
textFill="WHITE"/> <ImageView fitHeight="12.0" fitWidth="11.0" layoutX="9.0" layoutY="8.0">
<ProgressBar fx:id="progress" layoutX="-1.0" layoutY="376.0" prefHeight="24.0" prefWidth="600.0" progress="1.0"/> <image>
<Image url="@../../images/icons/logo_small.png" />
</image>
</ImageView>
<Label fx:id="description" layoutX="12.0" layoutY="267.0" prefHeight="98.0" prefWidth="576.0" text="..." textFill="WHITE" />
<ProgressBar fx:id="progress" disable="false" layoutX="-1.0" layoutY="376.0" opacity="1.0" prefHeight="24.0" prefWidth="600.0" progress="1.0" style="" />
<!-- Update controls --> <!-- Update controls -->
<Label fx:id="utitle" alignment="TOP_LEFT" layoutX="15.0" layoutY="236.0" prefHeight="30.0" prefWidth="470.0" <Label fx:id="utitle" alignment="TOP_LEFT" layoutX="15.0" layoutY="236.0" prefHeight="30.0" prefWidth="470.0" text="Обновление..." textFill="WHITE">
text="Обновление..." textFill="WHITE">
<font> <font>
<Font name="System Bold" size="20.0"/> <Font name="System Bold" size="20.0" />
</font> </font>
</Label> </Label>
<ImageView fitHeight="160.0" fitWidth="160.0" layoutX="219.0" layoutY="70.0" y="-6.0"> <ImageView fitHeight="160.0" fitWidth="160.0" layoutX="219.0" layoutY="70.0" y="-6.0">
<Image url="@../../images/icons/loading.gif"/> <image>
<Image url="@../../images/icons/loading.gif" />
</image>
</ImageView> </ImageView>
</children>
<stylesheets>
<URL value="@update.css" />
</stylesheets>
</Pane> </Pane>

7
Launcher/runtime/init.js
View file

@ -1,12 +1,5 @@
var app, stage, scene, loginScene, menuScene; var app, stage, scene, loginScene, menuScene;
var rootPane, loginPane, authPane, menuPane; var rootPane, loginPane, authPane, menuPane;
launcher.loadScript("servers.js");
// internal
function getPathDirHelper() {
return dir;
}
// Override application class // Override application class
var LauncherApp = Java.extend(JSApplication, { var LauncherApp = Java.extend(JSApplication, {

14
Launcher/runtime/servers.js
View file

@ -1,14 +0,0 @@
// ====== SERVERS CONFIG ====== //
var serversConfig = {
defaults: {
// Лозунг сервера
description: "Мир в котором возможно все"
},
getServerProperty: function(profile, property){
if(serversConfig[profile]==null || serversConfig[profile][property]==null){
return serversConfig.defaults[property];
}
return serversConfig[profile][property];
}
};