never force download when other cache is invalid

Author: SpaceWalkerRS

src/main/java/net/ornithemc/keratin/KeratinGradleExtension.java

@@ -222,7 +222,7 @@ public KeratinGradleExtension(Project project) {
 		this.versionsManifest.convention(this.project.provider(() -> {
 			File file = KeratinGradleExtension.this.files.getGlobalCache().getVersionsManifestJson();
 
-			if (cacheInvalid || project.getGradle().getStartParameter().isRefreshDependencies() || !file.exists()) {
+			if (project.getGradle().getStartParameter().isRefreshDependencies() || !file.exists()) {
 				FileUtils.copyURLToFile(new URL(this.versionsManifestUrl.get()), file);
 			}
 
@@ -235,7 +235,7 @@ public KeratinGradleExtension(Project project) {
 		this.versionInfos = new Versioned<>(minecraftVersion -> {
 			File file = this.files.getGlobalCache().getMetadataCache().getVersionInfoJson(minecraftVersion);
 
-			if (cacheInvalid || project.getGradle().getStartParameter().isRefreshDependencies() || !file.exists()) {
+			if (project.getGradle().getStartParameter().isRefreshDependencies() || !file.exists()) {
 				VersionsManifest manifest = versionsManifest.get();
 				VersionsManifest.Entry entry = manifest.findOrThrow(minecraftVersion);
 
@@ -250,7 +250,7 @@ public KeratinGradleExtension(Project project) {
 		this.versionDetails = new Versioned<>(minecraftVersion -> {
 			File file = this.files.getGlobalCache().getMetadataCache().getVersionDetailJson(minecraftVersion);
 
-			if (cacheInvalid || project.getGradle().getStartParameter().isRefreshDependencies() || !file.exists()) {
+			if (project.getGradle().getStartParameter().isRefreshDependencies() || !file.exists()) {
 				VersionsManifest manifest = versionsManifest.get();
 				VersionsManifest.Entry entry = manifest.findOrThrow(minecraftVersion);
 

…tin/api/task/DownloaderAndExtracter.java …tin/api/task/DownloaderAndExtractor.javasrc/main/java/net/ornithemc/keratin/api/task/DownloaderAndExtracter.java renamed to src/main/java/net/ornithemc/keratin/api/task/DownloaderAndExtractor.java src/main/java/net/ornithemc/keratin/api/task/DownloaderAndExtracter.java renamed to src/main/java/net/ornithemc/keratin/api/task/DownloaderAndExtractor.java

@@ -5,7 +5,7 @@
 
 import net.ornithemc.keratin.api.maven.MavenArtifact;
 
-public interface DownloaderAndExtracter extends Downloader, Extractor {
+public interface DownloaderAndExtractor extends Downloader, Extractor {
 
 	default boolean downloadAndExtract(MavenArtifact artifact, String pathInJar, File dstJar, File dst) throws Exception {
 		return downloadAndExtract(artifact, pathInJar, dstJar, dst, false);

src/main/java/net/ornithemc/keratin/api/task/mapping/DownloadIntermediaryTask.java

@@ -5,12 +5,12 @@
 import net.ornithemc.keratin.KeratinGradleExtension;
 import net.ornithemc.keratin.api.MinecraftVersion;
 import net.ornithemc.keratin.api.maven.SingleBuildMavenArtifacts;
-import net.ornithemc.keratin.api.task.DownloaderAndExtracter;
+import net.ornithemc.keratin.api.task.DownloaderAndExtractor;
 import net.ornithemc.keratin.api.task.MinecraftTask;
 import net.ornithemc.keratin.files.GlobalCache.MappingsCache;
 import net.ornithemc.keratin.files.OrnitheFiles;
 
-public abstract class DownloadIntermediaryTask extends MinecraftTask implements DownloaderAndExtracter {
+public abstract class DownloadIntermediaryTask extends MinecraftTask implements DownloaderAndExtractor {
 
 	private static final String PATH_IN_JAR = "mappings/mappings.tiny";
 
@@ -30,7 +30,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 				PATH_IN_JAR,
 				mappings.getMergedIntermediaryMappingsJar(minecraftVersion),
 				mappings.getMergedIntermediaryMappingsFile(minecraftVersion),
-				keratin.isCacheInvalid()
+				false
 			);
 		} else {
 			if (minecraftVersion.hasClient()) {
@@ -39,7 +39,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 					PATH_IN_JAR,
 					mappings.getClientIntermediaryMappingsJar(minecraftVersion),
 					mappings.getClientIntermediaryMappingsFile(minecraftVersion),
-					keratin.isCacheInvalid()
+					false
 				);
 			}
 			if (minecraftVersion.hasServer()) {
@@ -48,7 +48,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 					PATH_IN_JAR,
 					mappings.getServerIntermediaryMappingsJar(minecraftVersion),
 					mappings.getServerIntermediaryMappingsFile(minecraftVersion),
-					keratin.isCacheInvalid()
+					false
 				);
 			}
 		}

src/main/java/net/ornithemc/keratin/api/task/minecraft/DownloadMinecraftJarsTask.java

@@ -28,7 +28,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 				download.url(),
 				download.sha1(),
 				gameJars.getClientJar(minecraftVersion),
-				keratin.isCacheInvalid()
+				false
 			);
 		}
 		if (minecraftVersion.hasServer()) {
@@ -38,7 +38,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 				download.url(),
 				download.sha1(),
 				gameJars.getServerJar(minecraftVersion),
-				keratin.isCacheInvalid()
+				false
 			);
 		}
 

src/main/java/net/ornithemc/keratin/api/task/processing/DownloadExceptionsTask.java

@@ -6,12 +6,12 @@
 import net.ornithemc.keratin.api.MinecraftVersion;
 import net.ornithemc.keratin.api.maven.MultipleBuildsMavenArtifacts;
 import net.ornithemc.keratin.api.settings.BuildNumbers;
-import net.ornithemc.keratin.api.task.DownloaderAndExtracter;
+import net.ornithemc.keratin.api.task.DownloaderAndExtractor;
 import net.ornithemc.keratin.api.task.MinecraftTask;
 import net.ornithemc.keratin.files.GlobalCache.ExceptionsCache;
 import net.ornithemc.keratin.files.OrnitheFiles;
 
-public abstract class DownloadExceptionsTask extends MinecraftTask implements DownloaderAndExtracter {
+public abstract class DownloadExceptionsTask extends MinecraftTask implements DownloaderAndExtractor {
 
 	private static final String PATH_IN_JAR = "exceptions/mappings.excs";
 
@@ -34,7 +34,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 					PATH_IN_JAR,
 					exceptions.getMergedExceptionsJar(minecraftVersion, builds),
 					exceptions.getMergedExceptionsFile(minecraftVersion, builds),
-					keratin.isCacheInvalid()
+					false
 				);
 			}
 		} else {
@@ -49,7 +49,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 						PATH_IN_JAR,
 						exceptions.getClientExceptionsJar(minecraftVersion, builds),
 						exceptions.getClientExceptionsFile(minecraftVersion, builds),
-						keratin.isCacheInvalid()
+						false
 					);
 				}
 			}
@@ -64,7 +64,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 						PATH_IN_JAR,
 						exceptions.getServerExceptionsJar(minecraftVersion, builds),
 						exceptions.getServerExceptionsFile(minecraftVersion, builds),
-						keratin.isCacheInvalid()
+						false
 					);
 				}
 			}

src/main/java/net/ornithemc/keratin/api/task/processing/DownloadNestsTask.java

@@ -6,12 +6,12 @@
 import net.ornithemc.keratin.api.MinecraftVersion;
 import net.ornithemc.keratin.api.maven.MultipleBuildsMavenArtifacts;
 import net.ornithemc.keratin.api.settings.BuildNumbers;
-import net.ornithemc.keratin.api.task.DownloaderAndExtracter;
+import net.ornithemc.keratin.api.task.DownloaderAndExtractor;
 import net.ornithemc.keratin.api.task.MinecraftTask;
 import net.ornithemc.keratin.files.GlobalCache.NestsCache;
 import net.ornithemc.keratin.files.OrnitheFiles;
 
-public abstract class DownloadNestsTask extends MinecraftTask implements DownloaderAndExtracter {
+public abstract class DownloadNestsTask extends MinecraftTask implements DownloaderAndExtractor {
 
 	private static final String PATH_IN_JAR = "nests/mappings.nest";
 
@@ -34,7 +34,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 					PATH_IN_JAR,
 					nests.getMergedNestsJar(minecraftVersion, builds),
 					nests.getMergedNestsFile(minecraftVersion, builds),
-					keratin.isCacheInvalid()
+					false
 				);
 			}
 		} else {
@@ -49,7 +49,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 						PATH_IN_JAR,
 						nests.getClientNestsJar(minecraftVersion, builds),
 						nests.getClientNestsFile(minecraftVersion, builds),
-						keratin.isCacheInvalid()
+						false
 					);
 				}
 			}
@@ -64,7 +64,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 						PATH_IN_JAR,
 						nests.getServerNestsJar(minecraftVersion, builds),
 						nests.getServerNestsFile(minecraftVersion, builds),
-						keratin.isCacheInvalid()
+						false
 					);
 				}
 			}

src/main/java/net/ornithemc/keratin/api/task/processing/DownloadSignaturesTask.java

@@ -6,12 +6,12 @@
 import net.ornithemc.keratin.api.MinecraftVersion;
 import net.ornithemc.keratin.api.maven.MultipleBuildsMavenArtifacts;
 import net.ornithemc.keratin.api.settings.BuildNumbers;
-import net.ornithemc.keratin.api.task.DownloaderAndExtracter;
+import net.ornithemc.keratin.api.task.DownloaderAndExtractor;
 import net.ornithemc.keratin.api.task.MinecraftTask;
 import net.ornithemc.keratin.files.GlobalCache.SignaturesCache;
 import net.ornithemc.keratin.files.OrnitheFiles;
 
-public abstract class DownloadSignaturesTask extends MinecraftTask implements DownloaderAndExtracter {
+public abstract class DownloadSignaturesTask extends MinecraftTask implements DownloaderAndExtractor {
 
 	private static final String PATH_IN_JAR = "signatures/mappings.sigs";
 
@@ -34,7 +34,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 					PATH_IN_JAR,
 					signatures.getMergedSignaturesJar(minecraftVersion, builds),
 					signatures.getMergedSignaturesFile(minecraftVersion, builds),
-					keratin.isCacheInvalid()
+					false
 				);
 			}
 		} else {
@@ -49,7 +49,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 						PATH_IN_JAR,
 						signatures.getClientSignaturesJar(minecraftVersion, builds),
 						signatures.getClientSignaturesFile(minecraftVersion, builds),
-						keratin.isCacheInvalid()
+						false
 					);
 				}
 			}
@@ -64,7 +64,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 						PATH_IN_JAR,
 						signatures.getServerSignaturesJar(minecraftVersion, builds),
 						signatures.getServerSignaturesFile(minecraftVersion, builds),
-						keratin.isCacheInvalid()
+						false
 					);
 				}
 			}

src/main/java/net/ornithemc/keratin/api/task/setup/DownloadNamedMappingsTask.java

@@ -5,12 +5,12 @@
 import net.ornithemc.keratin.KeratinGradleExtension;
 import net.ornithemc.keratin.api.MinecraftVersion;
 import net.ornithemc.keratin.api.maven.MultipleBuildsMavenArtifacts;
-import net.ornithemc.keratin.api.task.DownloaderAndExtracter;
+import net.ornithemc.keratin.api.task.DownloaderAndExtractor;
 import net.ornithemc.keratin.api.task.MinecraftTask;
 import net.ornithemc.keratin.files.GlobalCache.MappingsCache;
 import net.ornithemc.keratin.files.OrnitheFiles;
 
-public abstract class DownloadNamedMappingsTask extends MinecraftTask implements DownloaderAndExtracter {
+public abstract class DownloadNamedMappingsTask extends MinecraftTask implements DownloaderAndExtractor {
 
 	private static final String PATH_IN_JAR = "mappings/mappings.tiny";
 
@@ -49,7 +49,7 @@ private boolean downloadNamedMappings(String minecraftVersion) throws Exception
 				PATH_IN_JAR,
 				mappings.getNamedMappingsJar(minecraftVersion, build),
 				mappings.getNamedMappingsFile(minecraftVersion, build),
-				keratin.isCacheInvalid()
+				false
 			);
 		}