diff --git a/Launcher/src/main/java/pro/gravit/launcher/runtime/LauncherEngine.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/LauncherEngine.java index 0a3d7d3e..d9533a40 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/runtime/LauncherEngine.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/LauncherEngine.java @@ -170,6 +170,8 @@ public static LauncherEngine newInstance(boolean clientInstance, Class runtime, String projec runtimeEncryptKey = null; } + public void apply() { + Version version = Version.getVersion(); + BuildInParams.setVersion(new Version(version.major, version.minor, version.patch, (int) buildNumber)); + BuildInParams.setProjectName(projectName); + } + public static void initModules(LauncherModulesManager modulesManager) { if(JVMHelper.JVM_VERSION >= 17) { modulesClasses.addAll(ModernModulesClass.modulesClasses); diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherEntryPoint.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherEntryPoint.java index a4d29434..8cccd439 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherEntryPoint.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherEntryPoint.java @@ -119,12 +119,14 @@ private static void realMain(String[] args) throws Throwable { // Verify ClientLauncher sign and classpath LogHelper.debug("Verifying ClientLauncher sign and classpath"); // Start client with WatchService monitoring + var config = Launcher.getConfig(); + config.apply(); RequestService service; if (params.offlineMode) { service = ClientLauncherMethods.initOffline(modulesManager, params); Request.setRequestService(service); } else { - service = StdWebSocketService.initWebSockets(Launcher.getConfig().address).get(); + service = StdWebSocketService.initWebSockets(config.address).get(); Request.setRequestService(service); LogHelper.debug("Restore sessions"); Request.restore(false, false, true); diff --git a/LauncherCore/src/main/java/pro/gravit/launcher/core/BuildInParams.java b/LauncherCore/src/main/java/pro/gravit/launcher/core/BuildInParams.java new file mode 100644 index 00000000..8bc1044f --- /dev/null +++ b/LauncherCore/src/main/java/pro/gravit/launcher/core/BuildInParams.java @@ -0,0 +1,24 @@ +package pro.gravit.launcher.core; + +import pro.gravit.utils.Version; + +public class BuildInParams { + private static volatile Version version; + private static volatile String projectName; + + public static Version getVersion() { + return version; + } + + public static void setVersion(Version version) { + BuildInParams.version = version; + } + + public static String getProjectName() { + return projectName; + } + + public static void setProjectName(String projectName) { + BuildInParams.projectName = projectName; + } +}