[FIX] Forge 1.18+ without patches bug fixes

Author: gravit0

components/launcher-api/src/main/java/pro/gravit/launcher/base/profiles/ClientProfile.java

@@ -423,7 +423,7 @@ public enum ClassLoaderConfig {
     }
 
     public enum CompatibilityFlags {
-        LEGACY_NATIVES_DIR, CLASS_CONTROL_API, ENABLE_HACKS, WAYLAND_USE_CUSTOM_GLFW, DONT_ADD_YOURSELF_TO_CLASSPATH_PROPERTY
+        LEGACY_NATIVES_DIR, CLASS_CONTROL_API, ENABLE_HACKS, WAYLAND_USE_CUSTOM_GLFW, HIDE_SYSTEM_ARGS_CLASSPATH
     }
 
     public static class Version implements Comparable<Version> {

components/launcher-client/src/main/java/pro/gravit/launcher/client/ClientLauncherEntryPoint.java

@@ -190,12 +190,7 @@ private static void realMain(String[] args) throws Throwable {
             ClientService.baseURLs = classLoaderControl.getURLs();
         } else if (classLoaderConfig == ClientProfile.ClassLoaderConfig.SYSTEM_ARGS) {
             launch = new BasicLaunch();
-            if(profile.hasFlag(ClientProfile.CompatibilityFlags.DONT_ADD_YOURSELF_TO_CLASSPATH_PROPERTY)) {
-                List<String> split = new ArrayList<>(List.of(System.getProperty("java.class.path").split(File.pathSeparator)));
-                String pathToLauncher = IOHelper.getCodeSource(ClientLauncherEntryPoint.class).toAbsolutePath().toString();
-                split.removeIf(e -> e.equals(pathToLauncher));
-                System.setProperty("java.class.path", String.join(File.pathSeparator, split));
-            }
+            System.setProperty("java.class.path", classpath.stream().map(Path::toString).collect(Collectors.joining(File.pathSeparator)));
             classLoaderControl = launch.init(classpath, params.nativesDir, options);
             ClientService.baseURLs = classpathURLs.toArray(new URL[0]);
         } else {

components/launcher-runtime/src/main/java/pro/gravit/launcher/runtime/client/ClientLauncherProcess.java

@@ -186,9 +186,11 @@ public void start(boolean pipeOutput) throws IOException, InterruptedException {
                     }
                 }
             }
-            systemClassPath.addAll(ClientLauncherEntryPoint.resolveClassPath(ignorePath, workDir, params.actions, params.profile)
-                    .map(Path::toString)
-                    .toList());
+            if(!params.profile.hasFlag(ClientProfile.CompatibilityFlags.HIDE_SYSTEM_ARGS_CLASSPATH)) {
+                systemClassPath.addAll(ClientLauncherEntryPoint.resolveClassPath(ignorePath, workDir, params.actions, params.profile)
+                        .map(Path::toString)
+                        .toList());
+            }
         }
         if (Launcher.getConfig().environment != LauncherConfig.LauncherEnvironment.PROD) {
             processArgs.add(JVMHelper.jvmProperty(LogHelper.DEV_PROPERTY, String.valueOf(LogHelper.isDevEnabled())));