diff --git a/Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java b/Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java index 237186cb..5a9e1b12 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java +++ b/Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java @@ -10,7 +10,6 @@ import pro.gravit.launcher.guard.LauncherGuardManager; import pro.gravit.launcher.gui.JSRuntimeProvider; import pro.gravit.launcher.gui.RuntimeProvider; -import pro.gravit.launcher.gui.GuiRuntimeProvider; import pro.gravit.launcher.managers.ClientGsonManager; import pro.gravit.launcher.managers.ConsoleManager; import pro.gravit.launcher.request.Request; @@ -74,24 +73,23 @@ public void start(String... args) throws Throwable { Launcher.modulesManager.preInitModules(); // INIT GUI try - { - Class.forName( "com.jfoenixparts.controls.JFXPButton" ); - if (runtimeProvider == null) runtimeProvider = new JSRuntimeProvider(); - } - catch( ClassNotFoundException e ) { - runtimeProvider = new GuiRuntimeProvider(); - } - try { Class.forName( "javafx.application.Application" ); if (runtimeProvider == null) runtimeProvider = new JSRuntimeProvider(); } catch( ClassNotFoundException e ) { - runtimeProvider = new GuiRuntimeProvider(); + if (runtimeProvider == null) runtimeProvider = new GuiRuntimeProvider(); + } + try + { + Class.forName( "com.jfoenixparts.controls.JFXPButton" ); + if (runtimeProvider == null) runtimeProvider = new JSRuntimeProvider(); + } + catch( ClassNotFoundException e ) { + if (runtimeProvider == null) runtimeProvider = new GuiRuntimeProvider(); } runtimeProvider.init(false); runtimeProvider.preLoad(); - // INIT GUI if (Request.service == null) { String address = Launcher.getConfig().address; LogHelper.debug("Start async connection to %s", address); diff --git a/Launcher/src/main/java/pro/gravit/launcher/sgui/gui/login.java b/Launcher/src/main/java/pro/gravit/launcher/sgui/gui/login.java index f71a0a68..a52cdc48 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/sgui/gui/login.java +++ b/Launcher/src/main/java/pro/gravit/launcher/sgui/gui/login.java @@ -11,8 +11,8 @@ public class login { public static JButton loginbutton = new JButton("Войти"); public static JTextField login = new JTextField("Логин"); public static JPasswordField password = new JPasswordField("Пароль"); + public static JFrame frame = new JFrame("Имя лаунчера не задано(Лаунчер не собран)"); static { - JFrame frame = new JFrame("Имя лаунчера не задано(Лаунчер не собран)"); JPanel contents = new JPanel(); frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); contents.add(login); @@ -23,6 +23,7 @@ public class login { frame.add(contents); frame.setPreferredSize(new Dimension(400,100)); frame.pack(); + frame.setVisible(true); } } \ No newline at end of file