Move all internal/impl classes to separate package (#1000)

Also, hide MinecraftMappings implementation and include built-in null-checks.

Author: Jonathing

build.gradle

@@ -75,7 +75,7 @@ gradlePlugin {
 
     plugins.register('forgegradle') {
         id = 'net.minecraftforge.gradle'
-        implementationClass = 'net.minecraftforge.gradle.ForgeGradlePlugin'
+        implementationClass = 'net.minecraftforge.gradle.internal.ForgeGradlePlugin'
         displayName = gradleutils.displayName.get()
         description = project.description
         tags = ['minecraftforge', 'minecraft']

src/main/java/net/minecraftforge/gradle/ClosureOwner.java

@@ -28,11 +28,11 @@ public interface ClosureOwner<D> {
     /// [ExternalModuleDependency].
     ///
     /// @see ClosureOwner
-    sealed interface MinecraftDependency extends ClosureOwner<net.minecraftforge.gradle.MinecraftDependency>, net.minecraftforge.gradle.MinecraftDependency, ExternalModuleDependency permits ClosureOwnerInternal.MinecraftDependency { }
+    interface MinecraftDependency extends ClosureOwner<net.minecraftforge.gradle.MinecraftDependency>, net.minecraftforge.gradle.MinecraftDependency, ExternalModuleDependency { }
 
     /// A closure owner that delegates to [net.minecraftforge.gradle.MinecraftDependencyWithAccessTransformers] and
     /// [ExternalModuleDependency].
     ///
     /// @see ClosureOwner
-    sealed interface MinecraftDependencyWithAccessTransformers extends ClosureOwner<net.minecraftforge.gradle.MinecraftDependencyWithAccessTransformers>, net.minecraftforge.gradle.MinecraftDependencyWithAccessTransformers, ExternalModuleDependency permits ClosureOwnerInternal.MinecraftDependencyWithAccessTransformers { }
+    interface MinecraftDependencyWithAccessTransformers extends ClosureOwner<net.minecraftforge.gradle.MinecraftDependencyWithAccessTransformers>, net.minecraftforge.gradle.MinecraftDependencyWithAccessTransformers, ExternalModuleDependency { }
 }

src/main/java/net/minecraftforge/gradle/ForgeGradleExtension.java

@@ -10,7 +10,7 @@
 
 /// The ForgeGradle extension contains a handful of helpers that are not directly related to development involving
 /// Minecraft.
-public sealed interface ForgeGradleExtension permits ForgeGradleExtensionInternal {
+public interface ForgeGradleExtension {
     /// The name for this extension in Gradle.
     String NAME = "fg";
 
@@ -28,9 +28,7 @@ public sealed interface ForgeGradleExtension permits ForgeGradleExtensionInterna
      *
      * @return The closure
      */
-    default Action<MavenArtifactRepository> getForgeMaven() {
-        return ForgeGradleExtensionInternal.forgeMaven;
-    }
+    Action<MavenArtifactRepository> getForgeMaven();
 
     /**
      * A closure for the Minecraft libraries maven to be passed into
@@ -45,7 +43,5 @@ default Action<MavenArtifactRepository> getForgeMaven() {
      *
      * @return The closure
      */
-    default Action<MavenArtifactRepository> getMinecraftLibsMaven() {
-        return ForgeGradleExtensionInternal.minecraftLibsMaven;
-    }
+    Action<MavenArtifactRepository> getMinecraftLibsMaven();
 }

src/main/java/net/minecraftforge/gradle/MinecraftDependency.java

@@ -6,4 +6,4 @@
 
 /// The Minecraft dependency contains information essential for how the
 /// {@linkplain MinecraftExtensionForProject minecraft extension} processes Minecraft dependencies.
-public sealed interface MinecraftDependency extends MinecraftMappingsContainer permits ClosureOwner.MinecraftDependency, MinecraftDependencyWithAccessTransformers, MinecraftDependencyInternal { }
+public interface MinecraftDependency extends MinecraftMappingsContainer { }

src/main/java/net/minecraftforge/gradle/MinecraftDependencyWithAccessTransformers.java

@@ -10,7 +10,7 @@
 /// AccessTransformers.
 ///
 /// @see MinecraftDependency
-public sealed interface MinecraftDependencyWithAccessTransformers extends MinecraftDependency permits ClosureOwner.MinecraftDependencyWithAccessTransformers, MinecraftDependencyInternal.WithAccessTransformers {
+public interface MinecraftDependencyWithAccessTransformers extends MinecraftDependency {
     /// The default path, from the source set's [resources][org.gradle.api.tasks.SourceSet#getResources()], for the
     /// AccessTransformers config to be located in.
     String DEFAULT_PATH = "META-INF/accesstransformer.cfg";

src/main/java/net/minecraftforge/gradle/MinecraftExtension.java

@@ -9,7 +9,6 @@
 import org.gradle.api.artifacts.dsl.RepositoryHandler;
 import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
 import org.gradle.api.attributes.Attribute;
-import org.gradle.nativeplatform.OperatingSystemFamily;
 
 /// The main extension for ForgeGradle, where the Minecraft dependency resolution takes place.
 ///
@@ -20,9 +19,9 @@
 /// supported.
 ///   - The resulting Minecraft dependency is created by the Minecraft Mavenizer. It is not merely a dependency
 /// transformation, which means that it cannot use file and project dependencies to generate the Minecraft artifacts.
-///   - Attempting to provide a non-module dependency to [MinecraftExtensionForProject#dependency(Object)], will cause the
-/// build to fail.
-public sealed interface MinecraftExtension extends MinecraftMappingsContainer permits MinecraftExtensionInternal, MinecraftExtensionForProject {
+///   - Attempting to provide a non-module dependency to [MinecraftExtensionForProject#dependency(Object)], will cause
+/// the build to fail.
+public interface MinecraftExtension extends MinecraftMappingsContainer {
     /// The name for this extension in Gradle.
     String NAME = "minecraft";
 
@@ -68,30 +67,34 @@ default MavenArtifactRepository mavenizer(RepositoryHandler repositories) {
      * @return The attributes object
      * @see Attributes
      */
-    default Attributes getAttributes() {
-        return MinecraftExtensionInternal.AttributesInternal.INSTANCE;
-    };
+    Attributes getAttributes();
 
     /// This interface contains the attributes used by the [Minecraft][MinecraftExtension] extension for resolving the
     /// Minecraft and deobfuscated dependencies.
     ///
     /// @see MinecraftExtension#getAttributes()
-    sealed interface Attributes permits MinecraftExtensionInternal.AttributesInternal {
-        /// The [operating system family][OperatingSystemFamily] of the project's host.
+    interface Attributes {
+        /// The operating system of the project's host.
         ///
         /// This is used to filter natives from the Minecraft repo.
-        Attribute<String> os = Attribute.of("net.minecraftforge.native.operatingSystem", String.class);
+        ///
+        /// @return The operating system attribute
+        Attribute<String> getOs();
+
         /// The requested mappings channel of the project.
         ///
-        /// This is determined using [MinecraftMappings#channel()] via [#getMappings()]
+        /// This is determined using [MinecraftMappings#getChannel()] via [#getMappings()]
         ///
-        /// @see #mappingsVersion
-        Attribute<String> mappingsChannel = Attribute.of("net.minecraftforge.mappings.channel", String.class);
+        /// @return The mappings channel attribute
+        /// @see #getMappingsVersion()
+        Attribute<String> getMappingsChannel();
+
         /// The requested mappings version of the project.
         ///
-        /// This is determined using [MinecraftMappings#version()] via [#getMappings()]
+        /// This is determined using [MinecraftMappings#getVersion()] via [#getMappings()]
         ///
-        /// @see #mappingsChannel
-        Attribute<String> mappingsVersion = Attribute.of("net.minecraftforge.mappings.version", String.class);
+        /// @return The mappings channel version
+        /// @see #getMappingsChannel()
+        Attribute<String> getMappingsVersion();
     }
 }

src/main/java/net/minecraftforge/gradle/MinecraftExtensionForProject.java

@@ -12,15 +12,13 @@
 import org.gradle.api.Action;
 import org.gradle.api.NamedDomainObjectContainer;
 import org.gradle.api.artifacts.ExternalModuleDependency;
-import org.gradle.api.provider.Provider;
-import org.gradle.api.provider.ProviderConvertible;
 
 /// [Project][org.gradle.api.Project]-specific additions for the Minecraft extension. These will be accessible from the
 /// `minecraft` DSL object within your project's buildscript.
 ///
 /// @param <T> The type of closure owner used for [#dependency]
 /// @see MinecraftExtension
-sealed public interface MinecraftExtensionForProject<T extends ClosureOwner<?>> extends MinecraftExtension permits MinecraftExtensionForProjectWithAccessTransformers, MinecraftExtensionInternal.ForProject {
+public interface MinecraftExtensionForProject<T extends ClosureOwner<?>> extends MinecraftExtension {
     /// The collection of Slime Launcher options with which to create the launcher tasks.
     ///
     /// @return The collection of run task options
@@ -78,82 +76,4 @@ default ExternalModuleDependency dependency(Object value, Action<? super T> acti
     default ExternalModuleDependency dependency(Object value) {
         return this.dependency(value, Closures.empty(this));
     }
-
-    /// Creates (or marks if existing) the given dependency as a Minecraft dependency and configures it with the given
-    /// closure.
-    ///
-    /// @param value   The dependency
-    /// @param closure The closure to configure the dependency with
-    /// @return The dependency
-    /// @see <a href="https://docs.gradle.org/current/userguide/declaring_dependencies.html">Declaring Dependencies
-    /// in Gradle</a>
-    default ExternalModuleDependency dependency(
-        Provider<?> value,
-        @DelegatesTo(ExternalModuleDependency.class)
-        @ClosureParams(value = FromString.class, options = "T")
-        Closure<?> closure
-    ) {
-        return this.dependency(value.get(), closure);
-    }
-
-    /// Creates (or marks if existing) the given dependency as a Minecraft dependency and applies the given action to
-    /// it.
-    ///
-    /// @param value  The dependency
-    /// @param action The action to apply to the dependency attributes
-    /// @return The dependency
-    /// @see <a href="https://docs.gradle.org/current/userguide/declaring_dependencies.html">Declaring Dependencies
-    /// in Gradle</a>
-    default ExternalModuleDependency dependency(Provider<?> value, Action<? super T> action) {
-        return this.dependency(value, Closures.action(this, action));
-    }
-
-    /// Creates (or marks if existing) the given dependency as a Minecraft dependency.
-    ///
-    /// @param value The dependency
-    /// @return The dependency
-    /// @see <a href="https://docs.gradle.org/current/userguide/declaring_dependencies.html">Declaring Dependencies
-    /// in Gradle</a>
-    default ExternalModuleDependency dependency(Provider<?> value) {
-        return this.dependency(value, Closures.empty(this));
-    }
-
-    /// Creates (or marks if existing) the given dependency as a Minecraft dependency and configures it with the given
-    /// closure.
-    ///
-    /// @param value   The dependency
-    /// @param closure The closure to configure the dependency with
-    /// @return The dependency
-    /// @see <a href="https://docs.gradle.org/current/userguide/declaring_dependencies.html">Declaring Dependencies
-    /// in Gradle</a>
-    default ExternalModuleDependency dependency(
-        ProviderConvertible<?> value,
-        @DelegatesTo(ExternalModuleDependency.class)
-        @ClosureParams(value = FromString.class, options = "T")
-        Closure<?> closure
-    ) {
-        return this.dependency(value.asProvider(), closure);
-    }
-
-    /// Creates (or marks if existing) the given dependency as a Minecraft dependency and applies the given action to
-    /// it.
-    ///
-    /// @param value  The dependency
-    /// @param action The action to apply to the dependency attributes
-    /// @return The dependency
-    /// @see <a href="https://docs.gradle.org/current/userguide/declaring_dependencies.html">Declaring Dependencies
-    /// in Gradle</a>
-    default ExternalModuleDependency dependency(ProviderConvertible<?> value, Action<? super T> action) {
-        return this.dependency(value, Closures.action(this, action));
-    }
-
-    /// Creates (or marks if existing) the given dependency as a Minecraft dependency.
-    ///
-    /// @param value The dependency
-    /// @return The dependency
-    /// @see <a href="https://docs.gradle.org/current/userguide/declaring_dependencies.html">Declaring Dependencies
-    /// in Gradle</a>
-    default ExternalModuleDependency dependency(ProviderConvertible<?> value) {
-        return this.dependency(value, Closures.empty(this));
-    }
 }

src/main/java/net/minecraftforge/gradle/MinecraftExtensionForProjectWithAccessTransformers.java

@@ -10,7 +10,7 @@
 /// the `net.minecraftforge.accesstransformers` plugin has been applied before ForgeGradle.
 ///
 /// @see MinecraftExtensionForProject
-public sealed interface MinecraftExtensionForProjectWithAccessTransformers extends MinecraftExtensionForProject<ClosureOwner.MinecraftDependencyWithAccessTransformers> permits MinecraftExtensionInternal.ForProject.WithAccessTransformers {
+public interface MinecraftExtensionForProjectWithAccessTransformers extends MinecraftExtensionForProject<ClosureOwner.MinecraftDependencyWithAccessTransformers> {
     /// The path, relative to the related Minecraft dependency's [org.gradle.api.tasks.SourceSet#getResources()], to the
     /// AccessTransformers config file to use. If set, this will recursively enable access transformers for all
     /// Minecraft dependencies in the project.

src/main/java/net/minecraftforge/gradle/MinecraftExtensionInternal.java

@@ -4,33 +4,19 @@
  */
 package net.minecraftforge.gradle;
 
-import org.jetbrains.annotations.UnknownNullability;
-
 import java.io.Serializable;
-import java.util.Objects;
 
 /// The mappings used for the Minecraft dependency.
 ///
-/// @param channel The channel to use (i.e. `'official'`)
-/// @param version The version to use (i.e. `'1.21.5'`)
-/// @see MinecraftExtensionForProject#mappings(String, String)
-public record MinecraftMappings(String channel, String version) implements Serializable {
-    /// Creates a new Mappings object.
-    ///
-    /// Both the channel and version are required, and cannot be null.
+/// @see MinecraftMappingsContainer#mappings(String, String)
+public interface MinecraftMappings extends Serializable {
+    /// Gets the channel for these mappings (i.e. `official`)
     ///
-    /// @param channel The channel to use
-    /// @param version The version to use
-    /// @throws NullPointerException If any parameter is `null`
-    public MinecraftMappings(String channel, String version) {
-        this.channel = Objects.requireNonNull(channel, "Mappings channel cannot be null");
-        this.version = Objects.requireNonNull(version, "Mappings version cannot be null");
-    }
+    /// @return The channel
+    String getChannel();
 
-    static String checkParam(ForgeGradleProblems problems, @UnknownNullability Object param, String name) {
-        if (param == null)
-            throw problems.nullMappingsParam(name);
-
-        return param.toString();
-    }
+    /// Gets the version for these mappings (i.e. `1.21.10`)
+    ///
+    /// @return The version
+    String getVersion();
 }