Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2025-03-30 21:18:17 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FIX] Remove updateFastCheck

Browse source
This commit is contained in:
Gravita 2022-07-26 17:22:34 +07:00
parent c8768326ea
commit 3561522d14
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncherEntryPoint.java
View file

@ -118,7 +118,6 @@ public static void main(String[] args) throws Throwable {
List<Path> classpath = resolveClassPath(clientDir, params.actions, params.profile).collect(Collectors.toList()); List<Path> classpath = resolveClassPath(clientDir, params.actions, params.profile).collect(Collectors.toList());
List<URL> classpathURLs = classpath.stream().map(IOHelper::toURL).collect(Collectors.toList()); List<URL> classpathURLs = classpath.stream().map(IOHelper::toURL).collect(Collectors.toList());
// Start client with WatchService monitoring // Start client with WatchService monitoring
boolean digest = !profile.isUpdateFastCheck();
RequestService service; RequestService service;
if(params.offlineMode) { if(params.offlineMode) {
service = initOffline(LauncherEngine.modulesManager, params); service = initOffline(LauncherEngine.modulesManager, params);
@ -187,9 +186,9 @@ public static void main(String[] args) throws Throwable {
FileNameMatcher assetMatcher = profile.getAssetUpdateMatcher(); FileNameMatcher assetMatcher = profile.getAssetUpdateMatcher();
FileNameMatcher clientMatcher = profile.getClientUpdateMatcher(); FileNameMatcher clientMatcher = profile.getClientUpdateMatcher();
Path javaDir = Paths.get(System.getProperty("java.home")); Path javaDir = Paths.get(System.getProperty("java.home"));
try (DirWatcher assetWatcher = new DirWatcher(assetDir, params.assetHDir, assetMatcher, digest); try (DirWatcher assetWatcher = new DirWatcher(assetDir, params.assetHDir, assetMatcher, true);
DirWatcher clientWatcher = new DirWatcher(clientDir, params.clientHDir, clientMatcher, digest); DirWatcher clientWatcher = new DirWatcher(clientDir, params.clientHDir, clientMatcher, true);
DirWatcher javaWatcher = params.javaHDir == null ? null : new DirWatcher(javaDir, params.javaHDir, null, digest)) { DirWatcher javaWatcher = params.javaHDir == null ? null : new DirWatcher(javaDir, params.javaHDir, null, true)) {
// Verify current state of all dirs // Verify current state of all dirs
//verifyHDir(IOHelper.JVM_DIR, jvmHDir.object, null, digest); //verifyHDir(IOHelper.JVM_DIR, jvmHDir.object, null, digest);
//for (OptionalFile s : Launcher.profile.getOptional()) { //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(); CommonHelper.newThread("Client Directory Watcher", true, clientWatcher).start();
if (javaWatcher != null) if (javaWatcher != null)
CommonHelper.newThread("Java Directory Watcher", true, javaWatcher).start(); CommonHelper.newThread("Java Directory Watcher", true, javaWatcher).start();
verifyHDir(assetDir, params.assetHDir, assetMatcher, digest); verifyHDir(assetDir, params.assetHDir, assetMatcher, false);
verifyHDir(clientDir, params.clientHDir, clientMatcher, digest); verifyHDir(clientDir, params.clientHDir, clientMatcher, false);
if (javaWatcher != null) if (javaWatcher != null)
verifyHDir(javaDir, params.javaHDir, null, digest); verifyHDir(javaDir, params.javaHDir, null, false);
LauncherEngine.modulesManager.invokeEvent(new ClientProcessLaunchEvent(engine, params)); LauncherEngine.modulesManager.invokeEvent(new ClientProcessLaunchEvent(engine, params));
launch(profile, params); launch(profile, params);
} }

8
LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java
View file

@ -80,8 +80,6 @@ public final class ClientProfile implements Comparable<ClientProfile> {
@LauncherNetworkAPI @LauncherNetworkAPI
private ProfileDefaultSettings settings = new ProfileDefaultSettings(); private ProfileDefaultSettings settings = new ProfileDefaultSettings();
@LauncherNetworkAPI @LauncherNetworkAPI
private boolean updateFastCheck;
@LauncherNetworkAPI
private boolean limited; private boolean limited;
// Client launcher // Client launcher
@LauncherNetworkAPI @LauncherNetworkAPI
@ -107,7 +105,7 @@ public ClientProfile() {
runtimeInClientConfig = RuntimeInClientConfig.NONE; runtimeInClientConfig = RuntimeInClientConfig.NONE;
} }
public ClientProfile(List<String> update, List<String> updateExclusions, List<String> updateShared, List<String> updateVerify, Set<OptionalFile> updateOptional, List<String> jvmArgs, List<String> classPath, List<String> modulePath, List<String> modules, List<String> altClassPath, List<String> clientArgs, List<String> compatClasses, Map<String, String> properties, List<ServerProfile> 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<String> update, List<String> updateExclusions, List<String> updateShared, List<String> updateVerify, Set<OptionalFile> updateOptional, List<String> jvmArgs, List<String> classPath, List<String> modulePath, List<String> modules, List<String> altClassPath, List<String> clientArgs, List<String> compatClasses, Map<String, String> properties, List<ServerProfile> 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.update = update;
this.updateExclusions = updateExclusions; this.updateExclusions = updateExclusions;
this.updateShared = updateShared; this.updateShared = updateShared;
@ -139,7 +137,6 @@ public ClientProfile(List<String> update, List<String> updateExclusions, List<St
this.uuid = uuid; this.uuid = uuid;
this.title = title; this.title = title;
this.info = info; this.info = info;
this.updateFastCheck = updateFastCheck;
this.mainClass = mainClass; this.mainClass = mainClass;
} }
@ -316,8 +313,9 @@ public void setVersion(Version version) {
this.version = version.name; this.version = version.name;
} }
@Deprecated
public boolean isUpdateFastCheck() { public boolean isUpdateFastCheck() {
return updateFastCheck; return true;
} }
@Override @Override