From b0e840a040195520fda17e7d09d53f7d5191d9cc Mon Sep 17 00:00:00 2001 From: Gravita <12893402+gravit0@users.noreply.github.com> Date: Sat, 21 Jun 2025 19:59:11 +0700 Subject: [PATCH] [FIX] ModuleConf resolve mudule path, not class path --- .../pro/gravit/launcher/client/ClientLauncherEntryPoint.java | 2 +- LauncherCore/src/main/java/pro/gravit/utils/Version.java | 2 +- build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 d38100b3..e0cef46f 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherEntryPoint.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherEntryPoint.java @@ -151,7 +151,7 @@ private static void realMain(String[] args) throws Throwable { } Set ignoredPath = new HashSet<>(); if(options.moduleConf != null && options.moduleConf.modulePath != null) { - List resolvedModulePath = resolveClassPath(ignoredPath, clientDir, null, params.profile).toList(); + List resolvedModulePath = resolveClassPathStream(ignoredPath, clientDir, options.moduleConf.modulePath).toList(); } List classpath = resolveClassPath(ignoredPath, clientDir, params.actions, params.profile) .collect(Collectors.toCollection(ArrayList::new)); diff --git a/LauncherCore/src/main/java/pro/gravit/utils/Version.java b/LauncherCore/src/main/java/pro/gravit/utils/Version.java index dd3bcf83..90fa4d40 100644 --- a/LauncherCore/src/main/java/pro/gravit/utils/Version.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/Version.java @@ -6,7 +6,7 @@ public final class Version implements Comparable { public static final int MAJOR = 5; public static final int MINOR = 6; - public static final int PATCH = 15; + public static final int PATCH = 16; public static final int BUILD = 1; public static final Version.Type RELEASE = Type.STABLE; public final int major; diff --git a/build.gradle b/build.gradle index 2cb7fbc8..3528d142 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ id 'org.openjfx.javafxplugin' version '0.1.0' apply false } group = 'pro.gravit.launcher' -version = '5.6.15' +version = '5.6.16' apply from: 'props.gradle'