Merge branch '1.21.4-pre2' into dispenser-stuff

buildSrc/build.gradle

@@ -6,11 +6,11 @@ plugins {
 repositories {
 	mavenCentral()
 	maven {
-		name "Quilt Repositiory"
+		name "Quilt Repository"
 		url "https://maven.quiltmc.org/repository/release"
 	}
 	maven {
-		name "Quilt Snapshot Repositiory"
+		name "Quilt Snapshot Repository"
 		url "https://maven.quiltmc.org/repository/snapshot"
 	}
 	maven {
@@ -21,10 +21,6 @@ repositories {
 		name "Mojang"
 		url 'https://libraries.minecraft.net/'
 	}
-	// remove when ASM fix is released
-	maven {
-		url = "https://repository.ow2.org/nexus/content/repositories/snapshots/"
-	}
 	mavenLocal()
 }
 
@@ -34,7 +30,6 @@ configurations {
 
 dependencies {
 	implementation(libs.commons.io)
-	implementation(libs.download.task)
 	implementation(libs.guava)
 	implementation(libs.jackson.xml)
 	implementation(libs.launchermeta.parser)
@@ -86,9 +81,51 @@ test {
 
 gradlePlugin {
 	plugins {
-		mappingsLogic {
-			id = 'mappings-logic'
-			implementationClass = 'quilt.internal.MappingsPlugin'
+		final pluginPackage = 'quilt.internal.plugin.'
+
+		quiltMappingsBase {
+			id = 'quilt-mappings-base'
+			implementationClass = pluginPackage + 'QuiltMappingsBasePlugin'
+		}
+
+		minecraftJars {
+			id = 'minecraft-jars'
+			implementationClass = pluginPackage + 'MinecraftJarsPlugin'
+		}
+
+		mapMinecraftJars {
+			id = 'map-minecraft-jars'
+			implementationClass = pluginPackage + 'MapMinecraftJarsPlugin'
+		}
+
+		mapV2 {
+			id = 'map-v2'
+			implementationClass = pluginPackage + 'MapV2Plugin'
+		}
+
+		mapIntermediary {
+			id = 'map-intermediary'
+			implementationClass = pluginPackage + 'MapIntermediaryPlugin'
+		}
+
+		processMappings {
+			id = 'process-mappings'
+			implementationClass = pluginPackage + 'ProcessMappingsPlugin'
+		}
+
+		enigmaMappings {
+			id = 'enigma-mappings'
+			implementationClass = pluginPackage + 'EnigmaMappingsPlugin'
+		}
+
+		targetDiff {
+			id = 'target-diff'
+			implementationClass = pluginPackage + 'TargetDiffPlugin'
+		}
+
+		quiltMappings {
+			id = 'quilt-mappings'
+			implementationClass = pluginPackage + 'QuiltMappingsPlugin'
 		}
 	}
-}
+}

buildSrc/classpath-holders/.gitignore

@@ -0,0 +1 @@
+build/

buildSrc/classpath-holders/build.gradle

@@ -0,0 +1,56 @@
+plugins {
+    id 'java'
+}
+
+// these contain the classpath contents necessary for JavaExec tasks registered by buildSrc plugins
+configurations {
+    configurations.ext.classpathHolder = { String configName, String capabilityName ->
+        configurations.create(configName) {
+            canBeResolved = false
+
+            attributes.attribute Usage.USAGE_ATTRIBUTE, objects.named(Usage, Usage.JAVA_RUNTIME)
+
+            components.java.addVariantsFromConfiguration(it) { }
+
+            outgoing.capability "$group:$capabilityName:$version"
+        }
+    }
+
+    // for UnpickJarTask
+    classpathHolder 'unpickCli', "$name-unpick-cli"
+
+    // for EnigmaMappingsTask
+    classpathHolder 'enigmaSwing', "$name-enigma-swing"
+
+    // for EnigmaMappingsServerTask
+    classpathHolder 'enigmaServer', "$name-enigma-server"
+}
+
+repositories {
+    mavenCentral()
+
+    maven {
+        name "Quilt Repository"
+        url "https://maven.quiltmc.org/repository/release"
+    }
+
+    maven {
+        name "Fabric Repository"
+        url 'https://maven.fabricmc.net'
+    }
+
+    // TODO remove when ASM fix is released
+    maven {
+        url = "https://repository.ow2.org/nexus/content/repositories/snapshots/"
+    }
+}
+
+dependencies {
+    unpickCli libs.unpick.cli
+
+    enigmaSwing libs.enigma.swing
+    enigmaSwing libs.enigma.plugin
+
+    enigmaServer libs.enigma.server
+    enigmaServer libs.enigma.plugin
+}

buildSrc/classpath-holders/gradle.properties

@@ -0,0 +1,3 @@
+group = quilt.internal
+# version is irrelevant
+version = 1.0

buildSrc/classpath-holders/settings.gradle

@@ -0,0 +1,7 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        libs {
+            from(files("../../gradle/libs.versions.toml"))
+        }
+    }
+}

buildSrc/settings.gradle

@@ -5,3 +5,5 @@ dependencyResolutionManagement {
 		}
 	}
 }
+
+includeBuild 'classpath-holders'

buildSrc/src/main/java/quilt/internal/constants/Classifiers.java

@@ -0,0 +1,21 @@
+package quilt.internal.constants;
+
+public interface Classifiers {
+    String INTERMEDIATE = Namespaces.INTERMEDIATE;
+    String NAMED = Namespaces.NAMED;
+    String INTERMEDIARY = Namespaces.INTERMEDIARY;
+
+    String V2 = "v2";
+    String MERGED_V2 = "merged" + V2;
+    String INTERMEDIARY_V2 = INTERMEDIARY + "-" + V2;
+    String INTERMEDIARY_V2_MERGED = INTERMEDIARY + "-" + MERGED_V2;
+
+    String UNPICKED = "unpicked";
+    String INTERMEDIATE_UNPICKED = INTERMEDIATE + "-" + UNPICKED;
+
+    String TINY = Constants.TINY_NAME;
+
+    String CONSTANTS = "constants";
+    String JAVADOC = "javadoc";
+    String SOURCES = "sources";
+}

buildSrc/src/main/java/quilt/internal/constants/Constants.java

@@ -0,0 +1,9 @@
+package quilt.internal.constants;
+
+public interface Constants {
+    String MAPPINGS_NAME = "quilt-mappings";
+
+    String UNPICK_NAME = "unpick";
+
+    String TINY_NAME = "tiny";
+}

buildSrc/src/main/java/quilt/internal/constants/Extensions.java

@@ -0,0 +1,11 @@
+package quilt.internal.constants;
+
+import org.gradle.jvm.tasks.Jar;
+
+public interface Extensions {
+    String JAR = Jar.DEFAULT_EXTENSION;
+    String TINY = Constants.TINY_NAME;
+    String UNPICK = Constants.UNPICK_NAME;
+    String GZ = "gz";
+    String JSON = "json";
+}