diff --git a/Launcher/runtime/config.js b/Launcher/runtime/config.js index 8c8f6dcd..40c9e5fd 100644 --- a/Launcher/runtime/config.js +++ b/Launcher/runtime/config.js @@ -5,8 +5,8 @@ var config = { icons: [ "favicon.png" ], // Window icon paths // Auth config - linkText: "GravitHome site", // Text for link under "Auth" button - linkURL: new java.net.URL("https://gravithome.ru/"), // URL for link under "Auth" button + linkText: "GravitLauncher", // Text for link under "Auth" button + linkURL: new java.net.URL("https://gravitlauncher.ml"), // URL for link under "Auth" button // Menu config discord_url: new java.net.URL("https://discord.gg/bf7ZtwC"), @@ -19,6 +19,7 @@ var config = { }; // ====== DON'T TOUCH! ====== // + DirBridge.dir = IOHelper.HOME_DIR.resolve(config.dir); if (!IOHelper.isDir(DirBridge.dir)) { java.nio.file.Files.createDirectory(DirBridge.dir); @@ -27,3 +28,17 @@ DirBridge.defaultUpdatesDir = DirBridge.dir.resolve("updates"); if (!IOHelper.isDir(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]; + } +}; \ No newline at end of file diff --git a/Launcher/runtime/dialog/dialog.js b/Launcher/runtime/dialog/dialog.js index c01123d5..2ca9cf9d 100644 --- a/Launcher/runtime/dialog/dialog.js +++ b/Launcher/runtime/dialog/dialog.js @@ -206,8 +206,6 @@ function verifyLauncher(e) { } }); })); - - })); } @@ -418,5 +416,4 @@ launcher.loadScript("dialog/overlay/debug/debug.js"); launcher.loadScript("dialog/overlay/processing/processing.js"); launcher.loadScript("dialog/overlay/settings/settings.js"); launcher.loadScript("dialog/overlay/options/options.js"); -launcher.loadScript("dialog/overlay/update/update.js"); - +launcher.loadScript("dialog/overlay/update/update.js"); \ No newline at end of file diff --git a/Launcher/runtime/dialog/images/background.png b/Launcher/runtime/dialog/images/background.png index 8878326a..1770db7b 100644 Binary files a/Launcher/runtime/dialog/images/background.png and b/Launcher/runtime/dialog/images/background.png differ diff --git a/Launcher/runtime/dialog/images/downloader/background.png b/Launcher/runtime/dialog/images/downloader/background.png deleted file mode 100644 index 5f8a5249..00000000 Binary files a/Launcher/runtime/dialog/images/downloader/background.png and /dev/null differ diff --git a/Launcher/runtime/dialog/images/downloader/cl_line.png b/Launcher/runtime/dialog/images/downloader/line.png similarity index 100% rename from Launcher/runtime/dialog/images/downloader/cl_line.png rename to Launcher/runtime/dialog/images/downloader/line.png diff --git a/Launcher/runtime/dialog/overlay/processing/error.png b/Launcher/runtime/dialog/images/icons/error.png similarity index 100% rename from Launcher/runtime/dialog/overlay/processing/error.png rename to Launcher/runtime/dialog/images/icons/error.png diff --git a/Launcher/runtime/dialog/images/icons/loading.gif b/Launcher/runtime/dialog/images/icons/loading.gif index 2d20f1a5..b8f27733 100644 Binary files a/Launcher/runtime/dialog/images/icons/loading.gif and b/Launcher/runtime/dialog/images/icons/loading.gif differ diff --git a/Launcher/runtime/dialog/images/icons/logo.png b/Launcher/runtime/dialog/images/icons/logo.png new file mode 100644 index 00000000..323ffead Binary files /dev/null and b/Launcher/runtime/dialog/images/icons/logo.png differ diff --git a/Launcher/runtime/dialog/images/icons/logo_small.png b/Launcher/runtime/dialog/images/icons/logo_small.png new file mode 100644 index 00000000..22423624 Binary files /dev/null and b/Launcher/runtime/dialog/images/icons/logo_small.png differ diff --git a/Launcher/runtime/dialog/images/icons/server.png b/Launcher/runtime/dialog/images/icons/server.png index 9aa89e6f..0f88f144 100644 Binary files a/Launcher/runtime/dialog/images/icons/server.png and b/Launcher/runtime/dialog/images/icons/server.png differ diff --git a/Launcher/runtime/dialog/images/icons/server_hover.png b/Launcher/runtime/dialog/images/icons/server_hover.png deleted file mode 100644 index 0f88f144..00000000 Binary files a/Launcher/runtime/dialog/images/icons/server_hover.png and /dev/null differ diff --git a/Launcher/runtime/dialog/images/icons/settings.png b/Launcher/runtime/dialog/images/icons/settings.png index f01e79ec..628ac06b 100644 Binary files a/Launcher/runtime/dialog/images/icons/settings.png and b/Launcher/runtime/dialog/images/icons/settings.png differ diff --git a/Launcher/runtime/dialog/images/mainmenu/background.png b/Launcher/runtime/dialog/images/mainmenu/background.png deleted file mode 100644 index cc9937d7..00000000 Binary files a/Launcher/runtime/dialog/images/mainmenu/background.png and /dev/null differ diff --git a/Launcher/runtime/dialog/login.css b/Launcher/runtime/dialog/login.css index 9fe4e321..2810015c 100644 --- a/Launcher/runtime/dialog/login.css +++ b/Launcher/runtime/dialog/login.css @@ -6,6 +6,10 @@ #layout { -fx-background-color: transparent; } +#mask{ + -fx-background-color: rgba(0, 0, 0, 0.5); +} + #link { -fx-font-weight: bold; -fx-font-size: 8pt; @@ -70,6 +74,16 @@ #rememberchb:selected .box { -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 { -fx-font-weight: bold; -fx-font-size: 13pt; @@ -108,16 +122,6 @@ .text-area .scroll-pane .content{ -fx-background-color: transparent; } -#errormessage{ - -fx-background-color: transparent; - -fx-text-alignment: center; - -fx-text-fill: #ffd96f; -} - .error{ -fx-text-fill: #ff5555; -} - -#mask{ - -fx-background-color: rgba(0, 0, 0, 0.5); } \ No newline at end of file diff --git a/Launcher/runtime/dialog/login.fxml b/Launcher/runtime/dialog/login.fxml index b8f955b3..514d279e 100644 --- a/Launcher/runtime/dialog/login.fxml +++ b/Launcher/runtime/dialog/login.fxml @@ -12,31 +12,42 @@ - + + + + + + + + + + + + + + + + + + + + + - - +