transforming is real

Author: TropheusJ

build.gradle.kts

@@ -24,7 +24,8 @@ val mc by minecraft.creating {
 dependencies {
     implementation(mc.dependency)
 
-//    mc.transformer(fileTree("src/main/resources/transformers"))
+    mc.transformers.mod(files("src/main/resources"))
+//    mc.transformers.namespaced("testmod")(files("src/main/resources/transformers"))
 
     compileOnly(cichlid.api("0.3.2"))
     cichlidRuntime(cichlid.runtime("0.3.2"))

plugin/src/main/java/fish/cichlidmc/cichlid_gradle/cache/Transformers.java

@@ -3,13 +3,13 @@
 import fish.cichlidmc.cichlid_gradle.cache.Artifact;
 import fish.cichlidmc.cichlid_gradle.cache.CichlidCache;
 import fish.cichlidmc.cichlid_gradle.cache.ManifestCache;
-import fish.cichlidmc.cichlid_gradle.cache.Transformers;
 import fish.cichlidmc.cichlid_gradle.cache.task.CacheTaskEnvironment;
 import fish.cichlidmc.cichlid_gradle.cache.task.impl.AssetsTask;
 import fish.cichlidmc.cichlid_gradle.cache.task.impl.ReassembleBinaryTask;
 import fish.cichlidmc.cichlid_gradle.cache.task.impl.ReassembleSourcesTask;
 import fish.cichlidmc.cichlid_gradle.extension.def.MinecraftDefinition;
 import fish.cichlidmc.cichlid_gradle.extension.def.MinecraftDefinitionImpl;
+import fish.cichlidmc.cichlid_gradle.extension.def.TransformersImpl;
 import fish.cichlidmc.cichlid_gradle.util.Distribution;
 import fish.cichlidmc.cichlid_gradle.util.hash.Encoding;
 import fish.cichlidmc.cichlid_gradle.util.hash.HashAlgorithm;
@@ -23,7 +23,6 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.io.ByteArrayInputStream;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
@@ -73,10 +72,7 @@ public InputStream get(URI uri) throws IOException {
 
 		String version = def.version();
 
-		Iterable<File> transformerFiles = def.resolvableTransformers().getIncoming().getFiles();
-		Transformers transformers = new Transformers(transformerFiles, request.hash);
-
-		InputStream stream = this.getArtifact(version, def.dist(), transformers, request);
+		InputStream stream = this.getArtifact(version, def.dist(), def.getTransformers(), request);
 		if (stream == null || request.hashAlgorithm.isEmpty())
 			return stream;
 
@@ -85,9 +81,8 @@ public InputStream get(URI uri) throws IOException {
 		return new ByteArrayInputStream(hash.getBytes(StandardCharsets.UTF_8));
 	}
 
-
 	@Nullable
-	private InputStream getArtifact(String versionId, Distribution dist, Transformers transformers, Request request) throws IOException {
+	private InputStream getArtifact(String versionId, Distribution dist, TransformersImpl transformers, Request request) throws IOException {
 		// see if this version actually exists
 		Version version = ManifestCache.getVersion(versionId);
 		if (version == null) {
@@ -111,14 +106,14 @@ private InputStream getArtifact(String versionId, Distribution dist, Transformer
 		}
 
 		boolean needsAssets = dist.needsAssets() && !this.cache.assets.isComplete(fullVersion.assetIndex);
-		Path jar = this.cache.reassembledJars.get(versionId, transformers.hash(), dist, request.artifact);
+		Path jar = this.cache.reassembledJars.get(versionId, request.hash, dist, request.artifact);
 		boolean needsJar = !Files.exists(jar);
 
 		if (!needsAssets && !needsJar) {
 			return Files.newInputStream(jar);
 		}
 
-		CacheTaskEnvironment.Builder builder = new CacheTaskEnvironment.Builder(fullVersion, this.cache, dist, transformers);
+		CacheTaskEnvironment.Builder builder = new CacheTaskEnvironment.Builder(request.hash, fullVersion, this.cache, dist, transformers);
 
 		if (needsAssets) {
 			builder.add(AssetsTask::new);

plugin/src/main/java/fish/cichlidmc/cichlid_gradle/cache/mcmaven/MinecraftMaven.java

@@ -12,27 +12,27 @@ public ReassembledJarStorage(Path root) {
 		this.root = root;
 	}
 
-	public Path get(String version, String transformersHash, Distribution dist, Artifact artifact) {
+	public Path get(String version, String defHash, Distribution dist, Artifact artifact) {
 		return switch (artifact) {
-			case JAR -> this.binary(version, transformersHash, dist);
-			case SOURCES -> this.sources(version, transformersHash, dist);
+			case JAR -> this.binary(version, defHash, dist);
+			case SOURCES -> this.sources(version, defHash, dist);
 			case POM -> throw new IllegalArgumentException("poms are not jars");
 		};
 	}
 
-	public Path get(String version, String transformersHash, Distribution dist, boolean sources) {
-		return sources ? this.sources(version, transformersHash, dist) : this.binary(version, transformersHash, dist);
+	public Path get(String version, String defHash, Distribution dist, boolean sources) {
+		return sources ? this.sources(version, defHash, dist) : this.binary(version, defHash, dist);
 	}
 
-	public Path binary(String version, String transformersHash, Distribution dist) {
-		return this.path(version, transformersHash, dist, "binary");
+	public Path binary(String version, String defHash, Distribution dist) {
+		return this.path(version, defHash, dist, "binary");
 	}
 
-	public Path sources(String version, String transformersHash, Distribution dist) {
-		return this.path(version, transformersHash, dist, "sources");
+	public Path sources(String version, String defHash, Distribution dist) {
+		return this.path(version, defHash, dist, "sources");
 	}
 
-	private Path path(String version, String transformersHash, Distribution dist, String name) {
-		return this.root.resolve(version).resolve(dist.name).resolve(transformersHash).resolve(name + ".jar");
+	private Path path(String version, String defHash, Distribution dist, String name) {
+		return this.root.resolve(version).resolve(dist.name).resolve(defHash).resolve(name + ".jar");
 	}
 }

plugin/src/main/java/fish/cichlidmc/cichlid_gradle/cache/storage/ReassembledJarStorage.java

@@ -9,7 +9,7 @@ public TransformedClassStorage(Path root) {
 		this.root = root;
 	}
 
-	public Path get(String transformersHash, String bytecodeHash) {
-		return this.root.resolve(transformersHash).resolve(bytecodeHash + ".class");
+	public Path get(String defHash, String bytecodeHash) {
+		return this.root.resolve(defHash).resolve(bytecodeHash + ".class");
 	}
 }

plugin/src/main/java/fish/cichlidmc/cichlid_gradle/cache/storage/TransformedClassStorage.java

@@ -1,7 +1,7 @@
 package fish.cichlidmc.cichlid_gradle.cache.task;
 
 import fish.cichlidmc.cichlid_gradle.cache.CichlidCache;
-import fish.cichlidmc.cichlid_gradle.cache.Transformers;
+import fish.cichlidmc.cichlid_gradle.extension.def.TransformersImpl;
 import fish.cichlidmc.cichlid_gradle.util.Distribution;
 import fish.cichlidmc.pistonmetaparser.FullVersion;
 import fish.cichlidmc.tinycodecs.util.Either;
@@ -21,22 +21,28 @@
 public class CacheTaskEnvironment {
 	private static final Logger logger = Logging.getLogger(CacheTaskEnvironment.class);
 
+	public final String hash;
 	public final FullVersion version;
 	public final CichlidCache cache;
 	public final Distribution dist;
-	public final Transformers transformers;
+	public final TransformersImpl transformers;
 
 	private final Map<CacheTask.Runner, CompletableFuture<Void>> futures = Collections.synchronizedMap(new IdentityHashMap<>());
 	private final Set<CacheTask.Runner> incompleteTasks = Collections.synchronizedSet(new HashSet<>());
 	private final Map<CacheTask.Runner, Throwable> errors = Collections.synchronizedMap(new IdentityHashMap<>());
 
-	public CacheTaskEnvironment(FullVersion version, CichlidCache cache, Distribution dist, Transformers transformers) {
+	public CacheTaskEnvironment(String hash, FullVersion version, CichlidCache cache, Distribution dist, TransformersImpl transformers) {
+		this.hash = hash;
 		this.version = version;
 		this.cache = cache;
 		this.dist = dist;
 		this.transformers = transformers;
 	}
 
+	public CacheTaskEnvironment withDist(Distribution dist) {
+		return this.dist == dist ? this : new CacheTaskEnvironment(this.hash, this.version, this.cache, dist, this.transformers);
+	}
+
 	public void submitAndAwait(TaskFactory factory) {
 		this.submit(factory).join();
 	}
@@ -113,13 +119,15 @@ public interface TaskFactory {
 	}
 
 	public static final class Builder {
+		private final String hash;
 		private final FullVersion version;
 		private final CichlidCache cache;
 		private final Distribution dist;
-		private final Transformers transformers;
+		private final TransformersImpl transformers;
 		private final List<TaskFactory> factories;
 
-		public Builder(FullVersion version, CichlidCache cache, Distribution dist, Transformers transformers) {
+		public Builder(String hash, FullVersion version, CichlidCache cache, Distribution dist, TransformersImpl transformers) {
+			this.hash = hash;
 			this.version = version;
 			this.cache = cache;
 			this.dist = dist;
@@ -133,7 +141,7 @@ public void add(TaskFactory factory) {
 
 		public CacheTaskEnvironment start() {
 			logger.quiet("Starting {} cache task(s)...", this.factories.size());
-			CacheTaskEnvironment env = new CacheTaskEnvironment(this.version, this.cache, this.dist, this.transformers);
+			CacheTaskEnvironment env = new CacheTaskEnvironment(this.hash, this.version, this.cache, this.dist, this.transformers);
 			this.factories.forEach(env::submit);
 			return env;
 		}

plugin/src/main/java/fish/cichlidmc/cichlid_gradle/cache/task/CacheTaskEnvironment.java

@@ -34,7 +34,7 @@ public DecompileTask(CacheTaskEnvironment env) {
 
 	@Override
 	protected String run() throws FileNotFoundException {
-		Path input = this.env.cache.reassembledJars.binary(this.env.version.id, this.env.transformers.hash(), this.env.dist);
+		Path input = this.env.cache.reassembledJars.binary(this.env.version.id, this.env.hash, this.env.dist);
 
 		if (!Files.exists(input)) {
 			this.env.submitAndAwait(ReassembleBinaryTask::new);

plugin/src/main/java/fish/cichlidmc/cichlid_gradle/cache/task/impl/DecompileTask.java

@@ -38,7 +38,7 @@ protected String run() throws IOException {
 				};
 
 				if (distribution != null) {
-					CacheTaskEnvironment env = this.environmentFor(distribution);
+					CacheTaskEnvironment env = this.env.withDist(distribution);
 					futures.add(env.submit(SetupTask::new).thenApply($ -> MergeSource.createUnchecked(dist, jar)));
 				}
 			}
@@ -48,12 +48,4 @@ protected String run() throws IOException {
 		JarMerger.merge(sources, jars.get(Distribution.MERGED));
 		return null;
 	}
-
-	private CacheTaskEnvironment environmentFor(Distribution dist) {
-		if (this.env.dist == dist) {
-			return this.env;
-		} else {
-			return new CacheTaskEnvironment(this.env.version, this.env.cache, dist, this.env.transformers);
-		}
-	}
 }

plugin/src/main/java/fish/cichlidmc/cichlid_gradle/cache/task/impl/MergeTask.java

@@ -28,7 +28,7 @@ protected String run() throws IOException {
 		}
 
 		FileUtils.assertExists(input);
-		Path output = this.env.cache.reassembledJars.binary(this.env.version.id, this.env.transformers.hash(), this.env.dist);
+		Path output = this.env.cache.reassembledJars.binary(this.env.version.id, this.env.hash, this.env.dist);
 
 		JarProcessor.run(input, output, this::transform);
 		return null;
@@ -43,7 +43,7 @@ private JarProcessor.ClassEntry transform(JarProcessor.ClassEntry entry) throws
 			return entry;
 
 		String bytecodeHash = Encoding.BASE_FUNNY.encode(HashAlgorithm.SHA256.hash(entry.content()));
-		Path transformed = this.env.cache.transformedClasses.get(this.env.transformers.hash(), bytecodeHash);
+		Path transformed = this.env.cache.transformedClasses.get(this.env.hash, bytecodeHash);
 
 		if (!Files.exists(transformed)) {
 			if (this.ranTransform) {

plugin/src/main/java/fish/cichlidmc/cichlid_gradle/cache/task/impl/ReassembleBinaryTask.java

@@ -18,8 +18,8 @@ public ReassembleSourcesTask(CacheTaskEnvironment env) {
 
 	@Override
 	protected String run() throws IOException {
-		Path output = this.env.cache.reassembledJars.sources(this.env.version.id, this.env.transformers.hash(), this.env.dist);
-		Path binary = this.env.cache.reassembledJars.binary(this.env.version.id, this.env.transformers.hash(), this.env.dist);
+		Path output = this.env.cache.reassembledJars.sources(this.env.version.id, this.env.hash, this.env.dist);
+		Path binary = this.env.cache.reassembledJars.binary(this.env.version.id, this.env.hash, this.env.dist);
 		if (!Files.exists(binary)) {
 			// reassemble the binary and wait for it
 			this.env.submitAndAwait(ReassembleBinaryTask::new);