diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/AbstractSQLCoreProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/AbstractSQLCoreProvider.java index 1336c331..ccd20378 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/AbstractSQLCoreProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/AbstractSQLCoreProvider.java @@ -136,7 +136,7 @@ public AuthManager.AuthReport refreshAccessToken(String refreshToken, AuthRespon public AuthManager.AuthReport authorize(String login, AuthResponse.AuthContext context, AuthRequest.AuthPasswordInterface password, boolean minecraftAccess) throws IOException { SQLUser SQLUser = (SQLUser) getUserByLogin(login); if (SQLUser == null) { - throw AuthException.wrongPassword(); + throw AuthException.userNotFound(); } if (context != null) { AuthPlainPassword plainPassword = (AuthPlainPassword) password; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/Launcher.java b/LauncherAPI/src/main/java/pro/gravit/launcher/Launcher.java index 28bb2374..27457da0 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/Launcher.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/Launcher.java @@ -76,8 +76,6 @@ public static URL getResourceURL(String name) throws IOException { // Resolve URL and verify digest URL url = IOHelper.getResourceURL(RUNTIME_DIR + '/' + name); - if (!Arrays.equals(validDigest, SecurityHelper.digest(SecurityHelper.DigestAlgorithm.MD5, url))) - throw new NoSuchFileException(name); // Digest mismatch // Return verified URL return url; @@ -91,8 +89,6 @@ public static URL getResourceURL(String name, String prefix) throws IOException // Resolve URL and verify digest URL url = IOHelper.getResourceURL(prefix + '/' + name); - if (!Arrays.equals(validDigest, SecurityHelper.digest(SecurityHelper.DigestAlgorithm.MD5, url))) - throw new NoSuchFileException(name); // Digest mismatch // Return verified URL return url; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfileVersions.java b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfileVersions.java index 0af1185c..ef038715 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfileVersions.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfileVersions.java @@ -15,4 +15,5 @@ private ClientProfileVersions() { public static final ClientProfile.Version MINECRAFT_1_17 = ClientProfile.Version.of("1.17"); public static final ClientProfile.Version MINECRAFT_1_18 = ClientProfile.Version.of("1.18"); public static final ClientProfile.Version MINECRAFT_1_19 = ClientProfile.Version.of("1.19"); + public static final ClientProfile.Version MINECRAFT_1_20 = ClientProfile.Version.of("1.20"); } diff --git a/LauncherCore/src/main/java/pro/gravit/utils/Version.java b/LauncherCore/src/main/java/pro/gravit/utils/Version.java index f1b83844..7c694318 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 = 4; - public static final int PATCH = 1; + public static final int PATCH = 2; public static final int BUILD = 1; public static final Version.Type RELEASE = Type.STABLE; public final int major; diff --git a/LauncherCore/src/main/java/pro/gravit/utils/helper/JavaHelper.java b/LauncherCore/src/main/java/pro/gravit/utils/helper/JavaHelper.java index 8c52aa53..6a9ec45d 100644 --- a/LauncherCore/src/main/java/pro/gravit/utils/helper/JavaHelper.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/helper/JavaHelper.java @@ -119,7 +119,13 @@ private static JavaVersion tryFindJavaByPath(Path path) { public static void tryAddJava(List javaPaths, List result, JavaVersion version) { if (version == null) return; - String path = version.jvmDir.toAbsolutePath().toString(); + Path realPath = version.jvmDir.toAbsolutePath(); + try { + realPath = realPath.toRealPath(); + } catch (IOException ignored) { + + } + String path = realPath.toString(); if (javaPaths.contains(path)) return; javaPaths.add(path); result.add(version); diff --git a/build.gradle b/build.gradle index adcbb69a..4ec0d34b 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ id 'org.openjfx.javafxplugin' version '0.0.10' apply false } group = 'pro.gravit.launcher' -version = '5.4.1' +version = '5.4.2' apply from: 'props.gradle' diff --git a/modules b/modules index fc263e19..bade21a2 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit fc263e19bc73cc7cb0f64c4e78c092c363b6769a +Subproject commit bade21a21b1fb9525c017b9f27a80a2276ff95e3