From 3561522d1432e152fef267bc6880f9e458ff7450 Mon Sep 17 00:00:00 2001 From: Gravita Date: Tue, 26 Jul 2022 17:22:34 +0700 Subject: [PATCH] [FIX] Remove updateFastCheck --- .../launcher/client/ClientLauncherEntryPoint.java | 13 ++++++------- .../pro/gravit/launcher/profiles/ClientProfile.java | 8 +++----- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncherEntryPoint.java b/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncherEntryPoint.java index b3ea44ad..6d820cee 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncherEntryPoint.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncherEntryPoint.java @@ -118,7 +118,6 @@ public static void main(String[] args) throws Throwable { List classpath = resolveClassPath(clientDir, params.actions, params.profile).collect(Collectors.toList()); List classpathURLs = classpath.stream().map(IOHelper::toURL).collect(Collectors.toList()); // Start client with WatchService monitoring - boolean digest = !profile.isUpdateFastCheck(); RequestService service; if(params.offlineMode) { service = initOffline(LauncherEngine.modulesManager, params); @@ -187,9 +186,9 @@ public static void main(String[] args) throws Throwable { FileNameMatcher assetMatcher = profile.getAssetUpdateMatcher(); FileNameMatcher clientMatcher = profile.getClientUpdateMatcher(); Path javaDir = Paths.get(System.getProperty("java.home")); - try (DirWatcher assetWatcher = new DirWatcher(assetDir, params.assetHDir, assetMatcher, digest); - DirWatcher clientWatcher = new DirWatcher(clientDir, params.clientHDir, clientMatcher, digest); - DirWatcher javaWatcher = params.javaHDir == null ? null : new DirWatcher(javaDir, params.javaHDir, null, digest)) { + try (DirWatcher assetWatcher = new DirWatcher(assetDir, params.assetHDir, assetMatcher, true); + DirWatcher clientWatcher = new DirWatcher(clientDir, params.clientHDir, clientMatcher, true); + DirWatcher javaWatcher = params.javaHDir == null ? null : new DirWatcher(javaDir, params.javaHDir, null, true)) { // Verify current state of all dirs //verifyHDir(IOHelper.JVM_DIR, jvmHDir.object, null, digest); //for (OptionalFile s : Launcher.profile.getOptional()) { @@ -201,10 +200,10 @@ public static void main(String[] args) throws Throwable { CommonHelper.newThread("Client Directory Watcher", true, clientWatcher).start(); if (javaWatcher != null) CommonHelper.newThread("Java Directory Watcher", true, javaWatcher).start(); - verifyHDir(assetDir, params.assetHDir, assetMatcher, digest); - verifyHDir(clientDir, params.clientHDir, clientMatcher, digest); + verifyHDir(assetDir, params.assetHDir, assetMatcher, false); + verifyHDir(clientDir, params.clientHDir, clientMatcher, false); if (javaWatcher != null) - verifyHDir(javaDir, params.javaHDir, null, digest); + verifyHDir(javaDir, params.javaHDir, null, false); LauncherEngine.modulesManager.invokeEvent(new ClientProcessLaunchEvent(engine, params)); launch(profile, params); } diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java index 1a01038b..0f8fc429 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java @@ -80,8 +80,6 @@ public final class ClientProfile implements Comparable { @LauncherNetworkAPI private ProfileDefaultSettings settings = new ProfileDefaultSettings(); @LauncherNetworkAPI - private boolean updateFastCheck; - @LauncherNetworkAPI private boolean limited; // Client launcher @LauncherNetworkAPI @@ -107,7 +105,7 @@ public ClientProfile() { runtimeInClientConfig = RuntimeInClientConfig.NONE; } - public ClientProfile(List update, List updateExclusions, List updateShared, List updateVerify, Set updateOptional, List jvmArgs, List classPath, List modulePath, List modules, List altClassPath, List clientArgs, List compatClasses, Map properties, List servers, SecurityManagerConfig securityManagerConfig, ClassLoaderConfig classLoaderConfig, SignedClientConfig signedClientConfig, RuntimeInClientConfig runtimeInClientConfig, String version, String assetIndex, String dir, String assetDir, int recommendJavaVersion, int minJavaVersion, int maxJavaVersion, boolean warnMissJavaVersion, ProfileDefaultSettings settings, int sortIndex, UUID uuid, String title, String info, boolean updateFastCheck, String mainClass) { + public ClientProfile(List update, List updateExclusions, List updateShared, List updateVerify, Set updateOptional, List jvmArgs, List classPath, List modulePath, List modules, List altClassPath, List clientArgs, List compatClasses, Map properties, List servers, SecurityManagerConfig securityManagerConfig, ClassLoaderConfig classLoaderConfig, SignedClientConfig signedClientConfig, RuntimeInClientConfig runtimeInClientConfig, String version, String assetIndex, String dir, String assetDir, int recommendJavaVersion, int minJavaVersion, int maxJavaVersion, boolean warnMissJavaVersion, ProfileDefaultSettings settings, int sortIndex, UUID uuid, String title, String info, String mainClass) { this.update = update; this.updateExclusions = updateExclusions; this.updateShared = updateShared; @@ -139,7 +137,6 @@ public ClientProfile(List update, List updateExclusions, List