[FIX] JAVA_HOME override

LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/PrepareBuildTask.java

@@ -45,7 +45,7 @@ public Path process(Path inputFile) throws IOException {
                 throw new RuntimeException(ex);
             }
         })) {
-            var map = stream.collect(Collectors.toMap(k -> server.launcherPack.relativize(k).toString(), (v) -> v));
+            var map = stream.collect(Collectors.toMap(k -> server.launcherPack.relativize(k).toString().replace("\\", "/"), (v) -> v));
             server.launcherBinary.files.putAll(map);
         }
         UnpackHelper.unpack(IOHelper.getResourceURL("Launcher.jar"), result);

LaunchServer/src/main/java/pro/gravit/launchserver/launchermodules/LauncherModuleLoader.java

@@ -119,17 +119,6 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
                         ModuleEntity entity = new ModuleEntity();
                         entity.path = file;
                         entity.moduleMainClass = mainClass;
-                        try {
-                            Class<? extends LauncherModule> mainClazz = (Class<? extends LauncherModule>) classLoader.loadClass(entity.moduleMainClass);
-                            entity.checkResult = server.modulesManager.checkModuleClass(mainClazz);
-                        } catch (Throwable e) {
-                            if (e instanceof ClassNotFoundException || e instanceof NoClassDefFoundError) {
-                                logger.error("Module-MainClass in module {} incorrect", file.toString());
-                            } else {
-                                logger.error(e);
-                            }
-                            return super.visitFile(file, attrs);
-                        }
                         entity.moduleConfigClass = attributes.getValue("Module-Config-Class");
                         if (entity.moduleConfigClass != null) {
                             entity.moduleConfigName = attributes.getValue("Module-Config-Name");

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

@@ -141,8 +141,12 @@ public static void main(String[] arguments) throws IOException, InterruptedExcep
         if (customJvmOptions != null) {
             args.addAll(customJvmOptions);
         }
-        args.add("-cp");
-        args.add(String.join(IOHelper.PLATFORM_SEPARATOR, context.classpath));
+        if(context.useLegacyClasspathProperty) {
+            args.add(String.format("-Djava.class.path=%s", String.join(IOHelper.PLATFORM_SEPARATOR, context.classpath)));
+        } else {
+            args.add("-cp");
+            args.add(String.join(IOHelper.PLATFORM_SEPARATOR, context.classpath));
+        }
         args.add(context.mainClass);
         args.addAll(context.clientArgs);
         LogHelper.debug("Commandline: " + args);
@@ -170,6 +174,7 @@ public static class ClientLauncherWrapperContext {
         public Path executePath;
         public String mainClass;
         public int memoryLimit;
+        public boolean useLegacyClasspathProperty;
         public ProcessBuilder processBuilder;
         public List<String> args = new ArrayList<>(8);
         public Map<String, String> jvmProperties = new HashMap<>();

Launcher/src/main/java/pro/gravit/launcher/client/DirBridge.java

@@ -113,7 +113,7 @@ public static Path getGuardDir() {
     }
 
     public static Path getGuardDir(JVMHelper.ARCH arch, JVMHelper.OS os) {
-        Path dir = getGuardDir().resolve(makeSpecialGuardDirName(arch, os));
+        Path dir = getGuardDir().resolve(Launcher.makeSpecialGuardDirName(arch, os));
         try {
             IOHelper.createParentDirs(dir);
         } catch (Throwable e) {
@@ -123,11 +123,6 @@ public static Path getGuardDir(JVMHelper.ARCH arch, JVMHelper.OS os) {
     }
 
 
-
-    public static String makeSpecialGuardDirName(JVMHelper.ARCH arch, JVMHelper.OS os) {
-        return String.format("%s-%s", arch.name, os.name);
-    }
-
     public static Path getLegacyLauncherDir(String projectname) {
         return IOHelper.HOME_DIR.resolve(projectname);
     }

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

@@ -4,6 +4,7 @@
 import pro.gravit.launcher.profiles.ClientProfile;
 import pro.gravit.launcher.serialize.HInput;
 import pro.gravit.utils.helper.IOHelper;
+import pro.gravit.utils.helper.JVMHelper;
 import pro.gravit.utils.helper.LogHelper;
 import pro.gravit.utils.helper.SecurityHelper;
 
@@ -122,4 +123,8 @@ public static void applyLauncherEnv(LauncherConfig.LauncherEnvironment env) {
                 break;
         }
     }
+
+    public static String makeSpecialGuardDirName(JVMHelper.ARCH arch, JVMHelper.OS os) {
+        return String.format("%s-%s", arch.name, os.name);
+    }
 }

modules

@@ -1 +1 @@
-Subproject commit 9be16b2bc7047659577f976b5f95a71469d8a735
+Subproject commit 8adf9de6efe47bd820f756184f2a184e1d677dd8