gradle cleanup

build.gradle

@@ -32,6 +32,10 @@ plugins {
  id "mappings-logic"
 }
 
+mappings {
+ enigmaProfile = file("enigma_profile.json")
+}
+
 def USE_SNAPSHOT_HASHES = false
 
 def minecraft_version = Constants.MINECRAFT_VERSION
@@ -92,7 +96,6 @@ dependencies {
  intermediary "net.fabricmc:intermediary:${minecraft_version}:v2"
 }
 
-
 import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.Opcodes
 import org.quiltmc.draftsman.asm.visitor.DraftsmanAdapterClassVisitor
@@ -115,11 +118,10 @@ clean.doFirst {
 
 tasks.build.dependsOn "compressTiny", "tinyJar", "v2UnmergedMappingsJar", "v2MergedMappingsJar"
 
-task insertAutoGeneratedMappings(dependsOn: [buildMappingsTiny, downloadPerVersionMappings], type: AddProposedMappingsTask) {
- inputJar.set mappings.fileConstants.perVersionMappingsJar
- inputMappings.set buildMappingsTiny.outputMappings
- profile.set file("enigma_profile.json")
-}
+// task insertAutoGeneratedMappings(dependsOn: [buildMappingsTiny, downloadPerVersionMappings], type: AddProposedMappingsTask) {
+// inputJar.set mappings.fileConstants.perVersionMappingsJar
+// inputMappings.set buildMappingsTiny.outputMappings
+// }
 
 combineUnpickDefinitions {
  input = mappings.fileConstants.unpickDefinitions
@@ -188,6 +190,7 @@ task mappings(type: EnigmaMappingsTask, dependsOn: "mapPerVersionMappingsJar") {
 
 build.dependsOn constantsJar, generatePackageInfoMappings
 
+// TODO despaghetify this
 task v2UnmergedMappingsJar(type: MappingsV2JarTask, dependsOn: [insertAutoGeneratedMappings, combineUnpickDefinitions]) {
  archiveFileName = "${Constants.MAPPINGS_NAME}-${Constants.MAPPINGS_VERSION}-v2.jar"
  mappings = insertAutoGeneratedMappings.outputMappings

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

@@ -1,12 +1,16 @@
 package quilt.internal;
 
+// TODO consider moving these to MappingsExtension
 public class Constants {
  public static final String MINECRAFT_VERSION = "24w38a";
 
  public static final String MAPPINGS_NAME = "quilt-mappings";
 
  public static final String PER_VERSION_MAPPINGS_NAME = "hashed";
 
+ // TODO replace duplicates with this
+ public static final String INTERMEDIARY_MAPPINGS_NAME = "intermediary";
+
  public static final String MAPPINGS_VERSION = MINECRAFT_VERSION + "+build." + System.getenv().getOrDefault("BUILD_NUMBER", "local");
 
  public static final class Groups {

buildSrc/src/main/java/quilt/internal/MappingsExtension.java

@@ -1,15 +1,54 @@
 package quilt.internal;
 
+import org.gradle.api.GradleException;
 import org.gradle.api.Project;
+import org.gradle.api.file.RegularFile;
+import org.gradle.api.file.RegularFileProperty;
+import org.gradle.api.provider.Provider;
+import org.quiltmc.enigma.api.EnigmaProfile;
+
+import java.io.File;
+import java.io.IOException;
+
+public abstract class MappingsExtension {
+ public final Provider<EnigmaProfile> enigmaProfile;
 
-public class MappingsExtension {
  private final FileConstants fileConstants;
 
- public MappingsExtension(Project target) {
- fileConstants = new FileConstants(target);
+ public static MappingsExtension get(Project project) {
+ return project.getExtensions().getByType(MappingsExtension.class);
+ }
+
+ protected abstract RegularFileProperty getEnigmaProfileFile();
+
+ public MappingsExtension(Project project) {
+ this.fileConstants = new FileConstants(project);
+
+ this.enigmaProfile = this.getEnigmaProfileFile()
+ .map(RegularFile::getAsFile)
+ .map(File::toPath)
+ .map(profilePath -> {
+ try {
+ return EnigmaProfile.read(profilePath);
+ } catch (IOException e) {
+ throw new GradleException("Failed to read enigma profile", e);
+ }
+ });
  }
 
  public FileConstants getFileConstants() {
- return fileConstants;
+ return this.fileConstants;
+ }
+
+ public void setEnigmaProfile(File file) {
+ this.getEnigmaProfileFile().set(file);
+ }
+
+ public void setEnigmaProfile(RegularFile file) {
+ this.getEnigmaProfileFile().set(file);
+ }
+
+ public void setEnigmaProfile(Provider<? extends RegularFile> fileProvider) {
+ this.getEnigmaProfileFile().set(fileProvider);
  }
 }