basically redo the cache

hours of my life lost to Apache Ivy

Author: TropheusJ

build.gradle.kts

@@ -11,11 +11,13 @@ repositories {
     mavenCentral()
     cichlid.snapshots()
     minecraft.libraries()
-    minecraft.pistonMeta()
+    minecraft.versions()
 }
 
+val mcVer = "1.17.1"
+
 dependencies {
-    implementation(minecraft.client("1.17.1"))
+    implementation(minecraft.client(mcVer))
     // compile against Cichlid API
 //    compileOnly(cichlid.loaderApi("0.1.0"))
     // run with full Cichlid
@@ -25,7 +27,7 @@ dependencies {
 cichlid {
     runs {
         register("client") {
-            version = "1.17.1"
+            version = mcVer
         }
 //        register("client 1.21.4") {
 //            version = "1.21.4"

gradlew

@@ -1,19 +1,18 @@
 package io.github.cichlidmc.cichlid_gradle;
 
-import java.util.Objects;
-
 import io.github.cichlidmc.cichlid_gradle.cache.CichlidCache;
-import io.github.cichlidmc.cichlid_gradle.cache.MinecraftMaven;
 import io.github.cichlidmc.cichlid_gradle.extension.CichlidExtension;
 import io.github.cichlidmc.cichlid_gradle.extension.dep.CichlidDepsExtension;
-import io.github.cichlidmc.cichlid_gradle.extension.repo.CichlidReposExtension;
 import io.github.cichlidmc.cichlid_gradle.extension.dep.MinecraftDepsExtension;
+import io.github.cichlidmc.cichlid_gradle.extension.repo.CichlidReposExtension;
 import io.github.cichlidmc.cichlid_gradle.extension.repo.MinecraftReposExtension;
 import io.github.cichlidmc.cichlid_gradle.run.RunTaskGeneration;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Dependency;
 
+import java.util.Objects;
+
 public abstract class CichlidGradlePlugin implements Plugin<Project> {
 	public static final String NAME = "CichlidGradle";
 	public static final String VERSION = "1.0-SNAPSHOT";
@@ -33,15 +32,15 @@ public void apply(Project project) {
 					if (isMinecraftDependency(dep)) {
 						String version = Objects.requireNonNull(dep.getVersion());
 						CichlidCache cache = CichlidCache.get(project);
-						cache.maven.ensureVersionDownloaded(version);
+						cache.ensureVersionIsCached(version);
 					}
 				})
 		);
 	}
 
 	private static boolean isMinecraftDependency(Dependency dep) {
 		return "net.minecraft".equals(dep.getGroup())
-				&& MinecraftMaven.MC_MODULES.contains(dep.getName())
+				&& CichlidCache.MINECRAFT_MODULES.contains(dep.getName())
 				&& dep.getVersion() != null;
 	}
 }

plugin/src/main/java/io/github/cichlidmc/cichlid_gradle/CichlidGradlePlugin.java

@@ -1,25 +1,74 @@
 package io.github.cichlidmc.cichlid_gradle.cache;
 
+import io.github.cichlidmc.cichlid_gradle.cache.storage.AssetStorage;
+import io.github.cichlidmc.cichlid_gradle.cache.storage.VersionStorage;
+import io.github.cichlidmc.cichlid_gradle.cache.task.TaskContext;
+import io.github.cichlidmc.pistonmetaparser.FullVersion;
+import io.github.cichlidmc.pistonmetaparser.manifest.Version;
+import org.gradle.api.Project;
+
 import java.nio.file.Path;
 import java.util.Objects;
+import java.util.Set;
 
-import org.gradle.api.Project;
-
+/**
+ * Interface for Cichlid's global Minecraft cache. Holds no state, just interfaces with the filesystem.
+ * Layout:
+ * - root
+ *   - v1
+ *     - assets
+ *       - indices
+ *       - objects
+ *       - .lock
+ *     - <version>
+ *       - natives
+ *       - mappings
+ *       - jars
+ *       - runs
+ */
 public class CichlidCache {
+	// pattern is relative to root
+	public static final String IVY_PATTERN = "[revision]/jars/[module]-[revision].[ext]";
+	public static final String MINECRAFT_GROUP = "net.minecraft";
+	public static final Set<String> MINECRAFT_MODULES = Set.of(
+			"minecraft-client", "minecraft-server", "minecraft-merged", "minecraft-bundler"
+	);
+
 	public static final String PROJECT_CACHE_PROPERTY = "cichlid.use_project_cache";
-	public static final String PATH = "cichlid-gradle";
+	public static final int FORMAT = 1;
+	public static final String PATH = "cichlid-gradle-cache/v" + FORMAT;
 
+	public final Path root;
+	// assets are shared by many versions, they're stored separately
 	public final AssetStorage assets;
-	public final NativesStorage natives;
-	public final RunsStorage runs;
-	public final MinecraftMaven maven;
 
 	private CichlidCache(Path root) {
-		Path mc = root.resolve("minecraft");
-		this.assets = new AssetStorage(mc.resolve("assets"));
-		this.natives = new NativesStorage(mc.resolve("natives"));
-		this.runs = new RunsStorage(mc.resolve("runs"));
-		this.maven = new MinecraftMaven(mc.resolve(MinecraftMaven.PATH), this);
+		this.root = root;
+		this.assets = new AssetStorage(this.root.resolve("assets"));
+	}
+
+	public VersionStorage getVersion(String version) {
+		return new VersionStorage(this.root.resolve(version), version);
+	}
+
+	public void ensureVersionIsCached(String versionId) {
+		// see if this version actually exists
+		Version version = ManifestCache.getVersion(versionId);
+		if (version == null)
+			return;
+
+		FullVersion fullVersion = ManifestCache.expand(version);
+
+		TaskContext ctx = new TaskContext();
+		this.assets.submitInitialTasks(fullVersion.assetIndex, ctx);
+
+		VersionStorage storage = this.getVersion(versionId);
+		storage.submitInitialTasks(fullVersion, ctx);
+
+		ctx.report();
+
+		// all tasks are done. If an exception wasn't thrown by report, everything was successful.
+		storage.markComplete();
 	}
 
 	public static CichlidCache get(Project project) {

plugin/src/main/java/io/github/cichlidmc/cichlid_gradle/cache/AssetStorage.java

@@ -0,0 +1,34 @@
+package io.github.cichlidmc.cichlid_gradle.cache;
+
+import io.github.cichlidmc.pistonmetaparser.FullVersion;
+import io.github.cichlidmc.pistonmetaparser.PistonMeta;
+import io.github.cichlidmc.pistonmetaparser.VersionManifest;
+import io.github.cichlidmc.pistonmetaparser.manifest.Version;
+
+/**
+ * Wraps access to a cached manifest singleton in synchronization so it's safe to share
+ */
+public class ManifestCache {
+	private static VersionManifest manifest;
+
+	public static synchronized VersionManifest get() {
+		if (manifest == null) {
+			manifest = PistonMeta.fetch();
+		}
+		return manifest;
+	}
+
+	public static Version getVersion(String id) {
+		VersionManifest manifest = get();
+		synchronized (manifest) {
+			return manifest.getVersion(id);
+		}
+	}
+
+	public static FullVersion expand(Version version) {
+		//noinspection SynchronizationOnLocalVariableOrMethodParameter - I'm pretty sure this is fine here
+		synchronized (version) {
+			return version.expand();
+		}
+	}
+}