Добавлены настройки по умолчанию

Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java

@@ -74,12 +74,20 @@ 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 ) {
-			if (runtimeProvider == null) runtimeProvider = new GuiRuntimeProvider();
+			runtimeProvider = new GuiRuntimeProvider();
 		}
         runtimeProvider.init(false);
         runtimeProvider.preLoad();

Launcher/src/main/java/pro/gravit/launcher/gui/GuiRuntimeProvider.java

@@ -24,6 +24,7 @@ public void loadConfig(String get) {
     @Override
     public void run(String[] args) throws NoSuchMethodException, IOException {
         preLoad();
+		loadConfig("INIT");
         LogHelper.info("Invoking start() function");
         Launcher.modulesManager.postInitModules();
         engine.start((String[]) args);
@@ -33,7 +34,8 @@ public void run(String[] args) throws NoSuchMethodException, IOException {
     @Override
     public void preLoad() throws IOException {
         if (!isPreLoaded) {
-            loadConfig("API");
+            //loadConfig("API");
+			//loadConfig("SETTINGS");
             loadConfig("CONFIG");
             isPreLoaded = true;
         }
@@ -41,6 +43,6 @@ public void preLoad() throws IOException {
 
     @Override
     public void init(boolean clientInstance) {
-        loadConfig("INIT");
+        
     }
 }

Launcher/src/main/java/pro/gravit/launcher/sgui/api/GuiEngine.java

@@ -2,7 +2,10 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
 import pro.gravit.launcher.sgui.Application;
+import pro.gravit.utils.helper.LogHelper;
 public class GuiEngine {
 	private Map<String, String> Configs = new HashMap<String, String>();
 	private Map<String, Object> Settings = new HashMap<String, Object>();
@@ -11,15 +14,14 @@ public void start(String[] args) {
 	}
 	public void config(GuiEngine engine,String config) {
 		try {
-			System.out.println("Настройка "+config+" Загружена");
+			LogHelper.info("Настройка "+config+" Загружена");
 			Class c = Class.forName("pro.gravit.launcher.sgui.config."+config);
-			Object configclass = c.newInstance();
+			Method runmethod = c.getMethod("main", GuiEngine.class);
-			GuiEngineConfig runclass = (GuiEngineConfig) configclass;
+			runmethod.invoke(c.newInstance(), engine);
-			runclass.main(engine);
-			
 	}
-catch (Exception e){
+catch (ClassNotFoundException | InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e){
-    System.out.println("Ошибка при загрузке настройки "+config);
+    LogHelper.info("Ошибка при загрузке настройки "+config);
+	e.printStackTrace();
 }
 	}
 	public void configset(String path, String value) {

Launcher/src/main/java/pro/gravit/launcher/sgui/api/GuiEngineConfig.java

@@ -1,4 +1,10 @@
 package pro.gravit.launcher.sgui.api;
+
+import java.io.IOException;
+import pro.gravit.utils.helper.LogHelper;
+
 public class GuiEngineConfig {
-	void main(GuiEngine engine) {}
+	void main(GuiEngine engine) throws IOException{
+		LogHelper.info("Вызов фунции не получился");
+	};
 }

Launcher/src/main/java/pro/gravit/launcher/sgui/config/CONFIG.java

@@ -2,12 +2,13 @@
 
 import java.io.IOException;
 import pro.gravit.launcher.client.DirBridge;
-import pro.gravit.utils.helper.IOHelper;
 import pro.gravit.launcher.sgui.api.GuiEngine;
 import pro.gravit.launcher.sgui.api.GuiEngineConfig;
+import pro.gravit.utils.helper.IOHelper;
+import pro.gravit.utils.helper.LogHelper;
 
 public class CONFIG extends GuiEngineConfig {
-	void main(GuiEngine engine) throws IOException {
+	public void main(GuiEngine engine) throws IOException {
         engine.configset("dir", "GravitLauncher");
 		engine.configset("title", "GravitLauncher");
 		engine.configset("favicon", "favicon.png");
@@ -28,6 +29,6 @@ void main(GuiEngine engine) throws IOException {
 			if (!IOHelper.isDir(DirBridge.defaultUpdatesDir)) {
 				java.nio.file.Files.createDirectory(DirBridge.defaultUpdatesDir);
 				}
-		System.out.println("Настройка...");
+		LogHelper.info("Настройка...");
 	}
 }

Launcher/src/main/java/pro/gravit/launcher/sgui/config/INIT.java

@@ -4,14 +4,17 @@
 import pro.gravit.launcher.managers.SettingsManager;
 import pro.gravit.launcher.sgui.api.GuiEngine;
 import pro.gravit.launcher.sgui.api.GuiEngineConfig;
+import pro.gravit.utils.helper.LogHelper;
 
 public class INIT extends GuiEngineConfig {
-	private SettingsManager settingsManager;
+	private SettingsManager settingsManagerClass;
-	void main(GuiEngine engine) throws IOException {
+	public void main(GuiEngine engine) throws IOException {
+		engine.config(engine, "SETTINGS");
+		SettingsManager settingsManager = (SettingsManager) engine.configget("SettingsManagerClass",true);
 		engine.configset("version-gui","0.0.1");
 		settingsManager.loadConfig();
-        engine.configset("SettingsManager", settingsManager.settings);
+        engine.configset("SettingsManager", SettingsManager.settings);
         settingsManager.loadHDirStore();
-		System.out.println("Инициализация...");
+		LogHelper.info("Инициализация...");
 	}
 }

Launcher/src/main/java/pro/gravit/launcher/sgui/config/SETTINGS.java

@@ -0,0 +1,34 @@
+package pro.gravit.launcher.sgui.config;
+
+import java.io.IOException;
+import pro.gravit.launcher.client.DirBridge;
+import pro.gravit.launcher.NewLauncherSettings;
+import pro.gravit.launcher.managers.SettingsManager;
+import pro.gravit.launcher.sgui.api.GuiEngine;
+import pro.gravit.launcher.sgui.api.GuiEngineConfig;
+import pro.gravit.utils.helper.LogHelper;
+
+public class SETTINGS extends GuiEngineConfig {
+	public void main(GuiEngine engine) throws IOException {
+		class settingsManagerClass extends SettingsManager {
+			public NewLauncherSettings getDefaultConfig() {
+				NewLauncherSettings new_settings = new NewLauncherSettings();
+				new_settings.login = null;
+				new_settings.rsaPassword = null;
+				new_settings.profile = 0;
+				
+				new_settings.updatesDir = DirBridge.defaultUpdatesDir;
+				new_settings.autoEnter = (boolean) engine.configget("autoEnterDefault", true);
+				new_settings.fullScreen = (boolean) engine.configget("fullScreenDefault", true);
+				new_settings.ram = (int) engine.configget("ramDefault", true);
+				new_settings.lastDigest = null;
+				new_settings.lastProfiles.clear();
+				new_settings.lastHDirs.clear();
+				return new_settings;
+			}
+		}
+		settingsManagerClass settingsManager = new settingsManagerClass();
+		engine.configset("SettingsManager", settingsManager.settings);
+		engine.configset("SettingsManagerClass", settingsManager);
+	}
+}