switch to Ornithe manifests

Author: SpaceWalkerRS

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

@@ -5,7 +5,7 @@ public class Constants {
 	public static final String ORNITHE_GLOBAL_CACHE_DIR = "ornithe-keratin";
 	public static final String ORNITHE_LOCAL_CACHE_DIR = "ornithe-keratin";
 
-	public static final String VERSIONS_MANIFEST_URL = "https://ornithemc.net/mc-versions/version_manifest.json";
+	public static final String VERSIONS_MANIFEST_URL = "https://ornithemc.net/mc-versions/gen%d/version_manifest.json";
 
 	public static final String MAVEN_NAME = "Ornithe";
 	public static final String MAVEN_URL = "https://maven.ornithemc.net/releases";

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

@@ -2,7 +2,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.net.URI;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -50,6 +49,7 @@
 import net.ornithemc.keratin.api.maven.SingleBuildMavenArtifacts;
 import net.ornithemc.keratin.api.settings.BuildNumbers;
 import net.ornithemc.keratin.api.settings.ProcessorSettings;
+import net.ornithemc.keratin.api.task.Downloader;
 import net.ornithemc.keratin.api.task.MinecraftTask;
 import net.ornithemc.keratin.api.task.build.BuildMappingsJarTask;
 import net.ornithemc.keratin.api.task.build.BuildMappingsTask;
@@ -197,18 +197,16 @@ public KeratinGradleExtension(Project project) {
 		this.versionInfos = new Versioned<>(minecraftVersion -> {
 			File file = this.files.getGlobalCache().getMetadataCache().getVersionInfoJson(minecraftVersion);
 
-			if (project.getGradle().getStartParameter().isRefreshDependencies() || !file.exists()) {
-				VersionsManifest manifest = versionsManifest;
-				VersionsManifest.Entry entry = manifest.findOrThrow(minecraftVersion);
+			VersionsManifest manifest = versionsManifest;
+			VersionsManifest.Entry entry = manifest.findOrThrow(minecraftVersion);
 
-				try {
-					FileUtils.copyURLToFile(new URI(entry.url()).toURL(), file);
-				} catch (IOException e) {
-					// if the file already exits, just use it despite the download failing
-					// it is likely still valid anyway
-					if (!file.exists()) {
-						throw new Exception("failed to download version info for " + minecraftVersion, e);
-					}
+			try {
+				Downloader.download(project, entry.url(), entry.sha1(), file);
+			} catch (Exception e) {
+				// if the file already exits, just use it despite the download failing
+				// it is likely still valid anyway
+				if (!file.exists()) {
+					throw new Exception("failed to download version info for " + minecraftVersion, e);
 				}
 			}
 
@@ -220,18 +218,16 @@ public KeratinGradleExtension(Project project) {
 		this.versionDetails = new Versioned<>(minecraftVersion -> {
 			File file = this.files.getGlobalCache().getMetadataCache().getVersionDetailJson(minecraftVersion);
 
-			if (project.getGradle().getStartParameter().isRefreshDependencies() || !file.exists()) {
-				VersionsManifest manifest = versionsManifest;
-				VersionsManifest.Entry entry = manifest.findOrThrow(minecraftVersion);
+			VersionsManifest manifest = versionsManifest;
+			VersionsManifest.Entry entry = manifest.findOrThrow(minecraftVersion);
 
-				try {
-					FileUtils.copyURLToFile(new URI(entry.details()).toURL(), file);
-				} catch (IOException e) {
-					// if the file already exits, just use it despite the download failing
-					// it is likely still valid anyway
-					if (!file.exists()) {
-						throw new Exception("failed to download version details for " + minecraftVersion, e);
-					}
+			try {
+				Downloader.download(project, entry.details(), entry.detailsSha1(), file);
+			} catch (Exception e) {
+				// if the file already exits, just use it despite the download failing
+				// it is likely still valid anyway
+				if (!file.exists()) {
+					throw new Exception("failed to download version details for " + minecraftVersion, e);
 				}
 			}
 
@@ -355,15 +351,13 @@ private Set<MinecraftVersion> configure(TaskSelection selection) throws Exceptio
 
 		File manifestFile = files.getGlobalCache().getVersionsManifestJson();
 
-		if (project.getGradle().getStartParameter().isRefreshDependencies() || !manifestFile.exists()) {
-			try {
-				FileUtils.copyURLToFile(new URI(versionsManifestUrl.get()).toURL(), manifestFile);
-			} catch (IOException e) {
-				// if the file already exits, just use it despite the download failing
-				// it is likely still valid anyway
-				if (!manifestFile.exists()) {
-					throw new Exception("failed to download versions manifest!", e);
-				}
+		try {
+			Downloader.download(project, String.format(versionsManifestUrl.get(), intermediaryGen.get()), null, manifestFile, true);
+		} catch (Exception e) {
+			// if the file already exits, just use it despite the download failing
+			// it is likely still valid anyway
+			if (!manifestFile.exists()) {
+				throw new Exception("failed to download versions manifest!", e);
 			}
 		}
 

src/main/java/net/ornithemc/keratin/api/manifest/VersionsManifest.java

@@ -5,7 +5,7 @@
 
 public record VersionsManifest(List<Entry> versions) {
 
-	public record Entry(String id, String url, String details) {
+	public record Entry(String id, String url, String sha1, String details, String detailsSha1) {
 	}
 
 	public Optional<Entry> find(String version) {

src/main/java/net/ornithemc/keratin/api/task/Downloader.java

@@ -75,4 +75,20 @@ private static boolean validateChecksum(File file, String sha1) throws IOExcepti
 
 		return sb.toString().equals(sha1);
 	}
+
+	public static void download(Project project, String url, String sha1, File output) throws Exception {
+		download(project, url, sha1, output, false);
+	}
+
+	public static void download(Project project, String url, String sha1, File output, boolean overwrite) throws Exception {
+		if (overwrite || !output.exists() || project.getGradle().getStartParameter().isRefreshDependencies() || !validateChecksum(output, sha1)) {
+			DownloadAction downloader = new DownloadAction(project);
+
+			downloader.src(new URI(url));
+			downloader.dest(output);
+			downloader.overwrite(true);
+
+			downloader.execute().join();
+		}
+	}
 }