Small unpushed fixes (more to come later)

Jonathing · Jonathing · commit e3d5b351ad57 · 2025-08-03T15:31:15.000-04:00
diff --git a/src/main/groovy/net/minecraftforge/gradle/DeobfExtensionImpl.groovy b/src/main/groovy/net/minecraftforge/gradle/DeobfExtensionImpl.groovy
@@ -19,10 +19,12 @@ import org.gradle.api.attributes.AttributeContainer
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
+import org.gradle.api.reflect.HasPublicType
+import org.gradle.api.reflect.TypeOf
 
 @CompileStatic
 @PackageScope([PackageScopeTarget.CLASS, PackageScopeTarget.CONSTRUCTORS])
-final class DeobfExtensionImpl implements DeobfExtension {
+final class DeobfExtensionImpl implements DeobfExtension, HasPublicType {
     private final Project project
     private final ForgeGradleProblems problems
 
@@ -40,6 +42,11 @@ final class DeobfExtensionImpl implements DeobfExtension {
         this.mappingsProp = objects.property(MinecraftExtension.Mappings).convention(mappings)
     }
 
+    @Override
+    TypeOf<?> getPublicType() {
+        TypeOf.typeOf(DeobfExtension)
+    }
+
     private MinecraftExtension.Mappings getMappings() {
         this.mappingsProp.get()
     }
diff --git a/src/main/groovy/net/minecraftforge/gradle/ForgeGradleExtensionImpl.java b/src/main/groovy/net/minecraftforge/gradle/ForgeGradleExtensionImpl.java
@@ -6,8 +6,10 @@
 
 import org.gradle.api.plugins.ExtensionAware;
 import org.gradle.api.plugins.PluginAware;
+import org.gradle.api.reflect.HasPublicType;
+import org.gradle.api.reflect.TypeOf;
 
-record ForgeGradleExtensionImpl() implements ForgeGradleExtension {
+record ForgeGradleExtensionImpl() implements ForgeGradleExtension, HasPublicType {
     private static final ForgeGradleExtensionImpl INSTANCE = new ForgeGradleExtensionImpl();
 
     static void register(ExtensionAware target) {
@@ -17,4 +19,9 @@ static void register(ExtensionAware target) {
             INSTANCE
         );
     }
+
+    @Override
+    public TypeOf<?> getPublicType() {
+        return TypeOf.typeOf(ForgeGradleExtension.class);
+    }
 }
diff --git a/src/main/groovy/net/minecraftforge/gradle/ForgeGradlePlugin.groovy b/src/main/groovy/net/minecraftforge/gradle/ForgeGradlePlugin.groovy
@@ -20,7 +20,6 @@ import org.gradle.api.logging.Logger
 import org.gradle.api.logging.Logging
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.plugins.ExtensionAware
-import org.gradle.api.plugins.PluginAware
 import org.gradle.api.problems.Problems
 import org.gradle.api.provider.Provider
 import org.gradle.api.provider.ProviderFactory
@@ -64,7 +63,7 @@ class ForgeGradlePlugin implements Plugin<ExtensionAware> {
     @Override
     void apply(ExtensionAware target) {
         this.globalCaches = this.objects.directoryProperty().convention(
-            this.objects.directoryProperty().fileValue(this.getGradleUserHomeDir(target)).dir(Constants.CACHES_LOCATION).map(this.enhancedProblems.ensureDirectory())
+            this.objects.directoryProperty().fileValue(this.getGradleUserHomeDir(target)).dir(Constants.CACHES_LOCATION).map(this.enhancedProblems.ensureFileLocation())
         )
 
         ForgeGradleExtensionImpl.register(
diff --git a/src/main/groovy/net/minecraftforge/gradle/ForgeGradleProblems.java b/src/main/groovy/net/minecraftforge/gradle/ForgeGradleProblems.java
@@ -9,6 +9,7 @@
 import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.artifacts.ExternalModuleDependency;
 import org.gradle.api.file.Directory;
+import org.gradle.api.file.FileSystemLocation;
 import org.gradle.api.problems.Problem;
 import org.gradle.api.problems.ProblemGroup;
 import org.gradle.api.problems.ProblemId;
@@ -287,22 +288,24 @@ RuntimeException accessTransformerFailed(RuntimeException e, File inJar, File at
     //endregion
 
     //region Utilities
-    Transformer<Directory, Directory> ensureDirectory() {
-        return dir -> {
+    <T extends FileSystemLocation> Transformer<T, T> ensureFileLocation() {
+        return file -> {
+            var dir = file instanceof Directory ? file.getAsFile() : file.getAsFile().getParentFile();
             try {
-                Files.createDirectories(dir.getAsFile().toPath());
-                return dir;
+                Files.createDirectories(dir.toPath());
             } catch (IOException e) {
                 throw this.getReporter().throwing(e, id("cannot-ensure-directory", "Failed to create directory"), spec -> spec
                     .details("""
                         Failed to create a directory required for ForgeGradle to function.
                         Directory: %s"""
-                        .formatted(dir.getAsFile().getAbsolutePath()))
+                        .formatted(dir.getAbsolutePath()))
                     .severity(Severity.ERROR)
                     .stackLocation()
                     .solution("Ensure that the you have write access to the directory that needs to be created.")
                     .solution(HELP_MESSAGE));
             }
+
+            return file;
         };
     }
     //endregion
diff --git a/src/main/groovy/net/minecraftforge/gradle/MinecraftDependencyImpl.groovy b/src/main/groovy/net/minecraftforge/gradle/MinecraftDependencyImpl.groovy
@@ -18,7 +18,6 @@ import org.gradle.api.attributes.Attribute
 import org.gradle.api.file.RegularFile
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.plugins.ExtraPropertiesExtension.UnknownPropertyException
-import org.gradle.api.problems.Problems
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import org.gradle.api.provider.ProviderFactory
diff --git a/src/main/groovy/net/minecraftforge/gradle/MinecraftDependencyInternal.java b/src/main/groovy/net/minecraftforge/gradle/MinecraftDependencyInternal.java
@@ -19,15 +19,22 @@
 import org.gradle.api.artifacts.capability.CapabilitySelector;
 import org.gradle.api.attributes.AttributeContainer;
 import org.gradle.api.capabilities.Capability;
+import org.gradle.api.reflect.HasPublicType;
+import org.gradle.api.reflect.TypeOf;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-sealed interface MinecraftDependencyInternal extends MinecraftDependency permits MinecraftDependencyImpl {
+sealed interface MinecraftDependencyInternal extends MinecraftDependency, HasPublicType permits MinecraftDependencyImpl {
     ExternalModuleDependency getDelegate();
 
+    @Override
+    default TypeOf<?> getPublicType() {
+        return TypeOf.typeOf(MinecraftDependency.class);
+    }
+
     @Override
     default boolean isForce() {
         return this.getDelegate().isForce();
diff --git a/src/main/groovy/net/minecraftforge/gradle/MinecraftExtension.java b/src/main/groovy/net/minecraftforge/gradle/MinecraftExtension.java
@@ -21,6 +21,8 @@
 import org.gradle.api.file.RegularFile;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.provider.ProviderConvertible;
+import org.gradle.api.reflect.HasPublicType;
+import org.gradle.api.reflect.TypeOf;
 import org.gradle.nativeplatform.OperatingSystemFamily;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.UnknownNullability;
@@ -190,7 +192,7 @@ void accessTransformer(
         void runs(
             @DelegatesTo(NamedDomainObjectContainer.class)
             @ClosureParams(value = SimpleType.class, options = "org.gradle.api.NamedDomainObjectContainer<net.minecraftforge.gradle.SlimeLauncherOptions>")
-            Closure<Void> closure
+            Closure closure
         );
 
         /// Configures the Slime Launcher options for this project, which will be used to create the launcher tasks.
diff --git a/src/main/groovy/net/minecraftforge/gradle/MinecraftExtensionImpl.groovy b/src/main/groovy/net/minecraftforge/gradle/MinecraftExtensionImpl.groovy
@@ -34,11 +34,13 @@ import org.gradle.api.provider.MapProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import org.gradle.api.provider.ProviderFactory
+import org.gradle.api.reflect.HasPublicType
+import org.gradle.api.reflect.TypeOf
 
 import java.util.concurrent.Callable
 
 @CompileStatic
-@PackageScope final class MinecraftExtensionImpl implements MinecraftExtension {
+@PackageScope final class MinecraftExtensionImpl implements MinecraftExtension, HasPublicType {
     private static final String EXT_MAVEN_REPOS = 'fg_mc_maven_repos'
     private static final String EXT_MAPPINGS = 'fg_mc_mappings'
 
@@ -77,11 +79,16 @@ import java.util.concurrent.Callable
         this.plugin = plugin
         this.objects = objects
 
-        this.output = objects.directoryProperty().convention(plugin.globalCaches.dir('mavenizer/output').map(problems.ensureDirectory()))
+        this.output = objects.directoryProperty().convention(plugin.globalCaches.dir('mavenizer/output').map(problems.ensureFileLocation()))
 
         this.mappingsProp = objects.property(Mappings)
     }
 
+    @Override
+    TypeOf<?> getPublicType() {
+        TypeOf.typeOf(MinecraftExtension)
+    }
+
     @PackageScope ForgeGradleProblems getProblems() {
         this.plugin.enhancedProblems
     }
@@ -170,7 +177,7 @@ import java.util.concurrent.Callable
             this.providers = providers
 
             this.localCaches = MinecraftExtensionImpl.this.objects.directoryProperty().convention(
-                this.layout.buildDirectory.dir(Constants.CACHES_LOCATION).map(MinecraftExtensionImpl.this.problems.ensureDirectory())
+                this.layout.buildDirectory.dir(Constants.CACHES_LOCATION).map(MinecraftExtensionImpl.this.problems.ensureFileLocation())
             )
 
             this.runs = SlimeLauncherOptions.container(MinecraftExtensionImpl.this.objects, layout)
@@ -223,8 +230,8 @@ import java.util.concurrent.Callable
                     } else if (allDependencies.size() > 1) {
                         throw new IllegalArgumentException('Cannot create run configurations for more than one Minecraft dependency')
                     } else {
-                        var cacheDir = MinecraftExtensionImpl.this.plugin.globalCaches.dir("slime-launcher/cache/${this.minecraftDependencies[0].group.replace('.', '/')}/${this.minecraftDependencies[0].name}/${this.minecraftDependencies[0].version}").map(MinecraftExtensionImpl.this.problems.ensureDirectory())
-                        var metadataDir = MinecraftExtensionImpl.this.objects.directoryProperty().value(cacheDir).dir('metadata').map(MinecraftExtensionImpl.this.problems.ensureDirectory())
+                        var cacheDir = MinecraftExtensionImpl.this.plugin.globalCaches.dir("slime-launcher/cache/${this.minecraftDependencies[0].group.replace('.', '/')}/${this.minecraftDependencies[0].name}/${this.minecraftDependencies[0].version}").map(MinecraftExtensionImpl.this.problems.ensureFileLocation())
+                        var metadataDir = MinecraftExtensionImpl.this.objects.directoryProperty().value(cacheDir).dir('metadata').map(MinecraftExtensionImpl.this.problems.ensureFileLocation())
                         var metadataZip = MinecraftExtensionImpl.this.output.file(Util.artifactPath(this.minecraftDependencies[0].group, this.minecraftDependencies[0].name, this.minecraftDependencies[0].version, 'metadata', 'zip'))
 
                         try {
diff --git a/src/main/groovy/net/minecraftforge/gradle/SlimeLauncherExec.groovy b/src/main/groovy/net/minecraftforge/gradle/SlimeLauncherExec.groovy
@@ -48,7 +48,7 @@ import java.nio.file.Files
             )
 
             var caches = task.objectFactory.directoryProperty().value(task.globalCaches.dir("slime-launcher/cache/${dependency.group.replace('.', '/')}/${dependency.name}/${dependency.version}"))
-            task.cacheDir.set caches.map(task.problems.ensureDirectory())
+            task.cacheDir.set caches.map(task.problems.ensureFileLocation())
             task.metadataZip.set metadataZip
 
             task.inherit(configs, options.name)
diff --git a/src/main/groovy/net/minecraftforge/gradle/SlimeLauncherOptions.java b/src/main/groovy/net/minecraftforge/gradle/SlimeLauncherOptions.java
@@ -15,6 +15,8 @@
 import org.gradle.api.provider.MapProperty;
 import org.gradle.api.provider.Property;
 import org.gradle.api.provider.Provider;
+import org.gradle.api.reflect.HasPublicType;
+import org.gradle.api.reflect.TypeOf;
 import org.gradle.api.tasks.Classpath;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.InputDirectory;
@@ -563,12 +565,17 @@ private SlimeLauncherOptions(String name) {
 
     abstract ProjectLayout getLayout();
 
-    abstract non-sealed static class Impl extends SlimeLauncherOptions {
+    abstract non-sealed static class Impl extends SlimeLauncherOptions implements HasPublicType {
         @Inject
         public Impl(String name) {
             super(name);
         }
 
+        @Override
+        public TypeOf<?> getPublicType() {
+            return TypeOf.typeOf(SlimeLauncherOptions.class);
+        }
+
         @Override
         protected abstract @Inject ObjectFactory getObjects();
 
diff --git a/src/main/groovy/net/minecraftforge/gradle/SyncMinecraftMaven.java b/src/main/groovy/net/minecraftforge/gradle/SyncMinecraftMaven.java
@@ -67,9 +67,9 @@ public SyncMinecraftMaven(Problems problems, ObjectFactory objects, ProviderFact
         this.getMainClass().convention(Constants.MCMAVEN_MAIN);
 
         // Minecraft Maven
-        var defaultDirectory = objects.directoryProperty().value(this.getGlobalCaches().dir("mavenizer").map(this.problems.ensureDirectory()));
-        this.getCaches().convention(defaultDirectory.dir("cache").map(this.problems.ensureDirectory()));
-        this.getOutput().convention(defaultDirectory.dir("output").map(this.problems.ensureDirectory()));
+        var defaultDirectory = objects.directoryProperty().value(this.getGlobalCaches().dir("mavenizer").map(this.problems.ensureFileLocation()));
+        this.getCaches().convention(defaultDirectory.dir("cache").map(this.problems.ensureFileLocation()));
+        this.getOutput().convention(defaultDirectory.dir("output").map(this.problems.ensureFileLocation()));
 
         this.onlyIf(
             "Minecraft Mavenizer will not run if no Minecraft dependencies are present.",
diff --git a/src/main/groovy/net/minecraftforge/gradle/Tools.java b/src/main/groovy/net/minecraftforge/gradle/Tools.java
@@ -53,7 +53,7 @@ Provider<File> get(DirectoryProperty cachesDir, ProviderFactory providers) {
 
     static abstract class Source implements ValueSource<File, Source.Parameters> {
         interface Parameters extends ValueSourceParameters {
-            @InputFile @PathSensitive(PathSensitivity.ABSOLUTE) RegularFileProperty getInputFile();
+            @InputFile RegularFileProperty getInputFile();
 
             @Input Property<String> getDownloadUrl();
         }

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ import java.nio.file.Files`
`48`	`48`	`)`
`49`	`49`
`50`	`50`	`var caches = task.objectFactory.directoryProperty().value(task.globalCaches.dir("slime-launcher/cache/${dependency.group.replace('.', '/')}/${dependency.name}/${dependency.version}"))`
`51`		`- task.cacheDir.set caches.map(task.problems.ensureDirectory())`
	`51`	`+ task.cacheDir.set caches.map(task.problems.ensureFileLocation())`
`52`	`52`	`task.metadataZip.set metadataZip`
`53`	`53`
`54`	`54`	`task.inherit(configs, options.name)`