Hide ClosureOwner#getDelegateOwner

This member is only ever used internally. No need to expose it.

Author: Jonathing

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

@@ -12,27 +12,16 @@
 /// without needing to create an object that does so. For example, the [net.minecraftforge.gradle.MinecraftDependency]
 /// implementation is not itself an [ExternalModuleDependency], but the [MinecraftDependency] closure owner provides an
 /// abstraction that delegates to both of those interfaces simultaneously.
-///
-/// @param <D> The type of the owner delegate to be used on top of the original owner
-public interface ClosureOwner<D> {
-    /// Gets the owner delegate for this closure owner.
-    ///
-    /// The owner delegate sits on top of the [Closure][groovy.lang.Closure]'s original
-    /// {@linkplain groovy.lang.Closure#getOwner() owner}, and is used primarily on top of it when the closure owner is
-    /// invoked. If a member can't be found in the owner delegate, the original owner is queried instead.
-    ///
-    /// @return The owner delegate
-    D getOwnerDelegate();
-
+public interface ClosureOwner {
     /// A closure owner that delegates to [net.minecraftforge.gradle.MinecraftDependency] and
     /// [ExternalModuleDependency].
     ///
     /// @see ClosureOwner
-    interface MinecraftDependency extends ClosureOwner<net.minecraftforge.gradle.MinecraftDependency>, net.minecraftforge.gradle.MinecraftDependency, ExternalModuleDependency { }
+    interface MinecraftDependency extends ClosureOwner, net.minecraftforge.gradle.MinecraftDependency, ExternalModuleDependency { }
 
     /// A closure owner that delegates to [net.minecraftforge.gradle.MinecraftDependencyWithAccessTransformers] and
     /// [ExternalModuleDependency].
     ///
     /// @see ClosureOwner
-    interface MinecraftDependencyWithAccessTransformers extends ClosureOwner<net.minecraftforge.gradle.MinecraftDependencyWithAccessTransformers>, net.minecraftforge.gradle.MinecraftDependencyWithAccessTransformers, ExternalModuleDependency { }
+    interface MinecraftDependencyWithAccessTransformers extends ClosureOwner, net.minecraftforge.gradle.MinecraftDependencyWithAccessTransformers, ExternalModuleDependency { }
 }

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

@@ -18,7 +18,7 @@
 ///
 /// @param <T> The type of closure owner used for [#dependency]
 /// @see MinecraftExtension
-public interface MinecraftExtensionForProject<T extends ClosureOwner<?>> extends MinecraftExtension {
+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

src/main/java/net/minecraftforge/gradle/internal/ClosureOwnerInternal.java

@@ -32,7 +32,16 @@
 import java.util.Map;
 import java.util.Set;
 
-interface ClosureOwnerInternal<D> extends ClosureOwner<D> {
+interface ClosureOwnerInternal<D> extends ClosureOwner {
+    /// Gets the owner delegate for this closure owner.
+    ///
+    /// The owner delegate sits on top of the [Closure][groovy.lang.Closure]'s original
+    /// {@linkplain groovy.lang.Closure#getOwner() owner}, and is used primarily on top of it when the closure owner is
+    /// invoked. If a member can't be found in the owner delegate, the original owner is queried instead.
+    ///
+    /// @return The owner delegate
+    D getOwnerDelegate();
+
     private static RuntimeException stub() {
         return new UnsupportedOperationException();
     }

src/main/java/net/minecraftforge/gradle/internal/MinecraftExtensionImpl.java

@@ -143,7 +143,7 @@ private void finish(Settings settings) {
         }
     }
 
-    static abstract class ForProjectImpl<T extends ClosureOwner<?> & MinecraftDependency & ExternalModuleDependency> extends MinecraftExtensionImpl implements MinecraftExtensionInternal.ForProject<T> {
+    static abstract class ForProjectImpl<T extends ClosureOwner & MinecraftDependency & ExternalModuleDependency> extends MinecraftExtensionImpl implements MinecraftExtensionInternal.ForProject<T> {
         // Slime Launcher
         private final NamedDomainObjectContainer<SlimeLauncherOptionsImpl> runs;
 

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

@@ -49,7 +49,7 @@ public Attribute<String> getMappingsVersion() {
         }
     }
 
-    interface ForProject<T extends ClosureOwner<?>> extends MinecraftExtensionForProject<T>, MinecraftExtensionInternal, HasPublicType {
+    interface ForProject<T extends ClosureOwner> extends MinecraftExtensionForProject<T>, MinecraftExtensionInternal, HasPublicType {
         @Override
         default TypeOf<?> getPublicType() {
             return new TypeOf<MinecraftExtensionForProject<ClosureOwner.MinecraftDependency>>() { };