Relativize config file path in errors

Author: Jonathing

at-gradle/src/main/java/net/minecraftforge/accesstransformers/gradle/AccessTransformersContainerImpl.java

@@ -23,6 +23,7 @@
 import org.gradle.api.attributes.HasConfigurableAttributes;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.file.FileSystemLocation;
+import org.gradle.api.file.ProjectLayout;
 import org.gradle.api.file.RegularFile;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.logging.LogLevel;
@@ -38,6 +39,7 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.Serial;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Objects;
 
@@ -50,6 +52,7 @@ abstract class AccessTransformersContainerImpl implements AccessTransformersCont
     private final OptionsImpl options;
 
     protected abstract @Inject ObjectFactory getObjects();
+    protected abstract @Inject ProjectLayout getProjectLayout();
     protected abstract @Inject ProviderFactory getProviders();
 
     @Inject
@@ -113,19 +116,20 @@ private void validateATFile(Attribute<Boolean> attribute, RegularFileProperty at
         }
 
         // check that the file exists
-        File atFile = atFileSource.getAsFile();
+        var atFile = atFileSource.getAsFile();
+        var atFilePath = this.getProjectLayout().getProjectDirectory().getAsFile().toPath().relativize(atFile.toPath()).toString();
         if (!atFile.exists())
-            throw this.problems.accessTransformerConfigMissing(new RuntimeException(new FileNotFoundException("Config file does not exist at " + atFile)), attribute, atFile);
+            throw this.problems.accessTransformerConfigMissing(new RuntimeException(new FileNotFoundException("Config file does not exist at " + atFilePath)), attribute, atFilePath);
 
         // check that the file can be read and isn't empty
         String atFileContents;
         try {
             atFileContents = this.getProviders().fileContents(atFileSource).getAsText().get();
         } catch (Throwable e) {
-            throw this.problems.accessTransformerConfigUnreadable(new RuntimeException(new IOException("Failed to read config file at " + atFile, e)), attribute, atFile);
+            throw this.problems.accessTransformerConfigUnreadable(new RuntimeException(new IOException("Failed to read config file at " + atFilePath, e)), attribute, atFilePath);
         }
         if (atFileContents.isBlank())
-            throw this.problems.accessTransformerConfigEmpty(new IllegalStateException("Config file must not be blank at " + atFile), attribute, atFile);
+            throw this.problems.accessTransformerConfigEmpty(new IllegalStateException("Config file must not be blank at " + atFilePath), attribute, atFilePath);
     }
 
     private void setAttributes(AttributeContainer attributes, boolean value) {

at-gradle/src/main/java/net/minecraftforge/accesstransformers/gradle/AccessTransformersProblems.java

@@ -47,36 +47,36 @@ RuntimeException accessTransformerConfigNotDefined(Exception e, Attribute<Boolea
             .solution(HELP_MESSAGE));
     }
 
-    RuntimeException accessTransformerConfigMissing(Exception e, Attribute<Boolean> attribute, File atFile) {
+    RuntimeException accessTransformerConfigMissing(Exception e, Attribute<Boolean> attribute, String atFilePath) {
         return this.getReporter().throwing(e, this.id("access-transformer-config-missing", "Access transformer config file not found"), spec -> spec
             .details("""
                 The access transformer cannot transform the input artifact because the configuration file could not be found.
                 Attribute: %s
-                AccessTransformer Config: %s""".formatted(attribute, atFile))
+                AccessTransformer Config: %s""".formatted(attribute, atFilePath))
             .severity(Severity.ERROR)
             .solution("Ensure your AccessTransformers configuration file exists.")
             .solution("Do not use AccessTransformers if you do not need to.")
             .solution(HELP_MESSAGE));
     }
 
-    RuntimeException accessTransformerConfigUnreadable(Throwable e, Attribute<Boolean> attribute, File atFile) {
+    RuntimeException accessTransformerConfigUnreadable(Throwable e, Attribute<Boolean> attribute, String atFilePath) {
         return this.getReporter().throwing(e, this.id("access-transformer-config-unreadable", "Access transformer config file not read"), spec -> spec
             .details("""
                 The access transformer cannot transform the input artifact because the configuration file could not be read.
                 This may be due to insufficient file permissions or a corrupted file.
                 Attribute: %s
-                AccessTransformer Config: %s""".formatted(attribute, atFile))
+                AccessTransformer Config: %s""".formatted(attribute, atFilePath))
             .severity(Severity.ERROR)
             .solution("Ensure you (and/or Gradle) have proper read/write permissions to the AccessTransformer config file.")
             .solution(HELP_MESSAGE));
     }
 
-    RuntimeException accessTransformerConfigEmpty(Exception e, Attribute<Boolean> attribute, File atFile) {
+    RuntimeException accessTransformerConfigEmpty(Exception e, Attribute<Boolean> attribute, String atFilePath) {
         return this.getReporter().throwing(e, this.id("access-transformer-config-empty", "Access transformer config missing or empty"), spec -> spec
             .details("""
                 The access transformer cannot transform the input artifact because the configuration file is empty or blank.
                 Attribute: %s
-                AccessTransformer Config: %s""".formatted(attribute, atFile))
+                AccessTransformer Config: %s""".formatted(attribute, atFilePath))
             .severity(Severity.ERROR)
             .solution("Ensure your AccessTransformers configuration file contains definitions to be used.")
             .solution("Do not use AccessTransformers if you do not need to.")