From b3cbc2f812e2df19d0bef9e95c5e35cbb51290cf Mon Sep 17 00:00:00 2001
From: Marc Hermans <marc.hermans@ldtteam.com>
Date: Tue, 4 Nov 2025 13:13:25 +0100
Subject: [PATCH 1/2] Refactor DependencyCollectorInjector method names for
 clarity

---
 .../gradle/common/util/DependencyCollectorInjector.java         | 2 +-
 .../java/net/neoforged/gradle/common/util/ToolUtilities.java    | 2 +-
 .../gradle/userdev/dependency/UserDevDependencyManager.java     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/net/neoforged/gradle/common/util/DependencyCollectorInjector.java b/common/src/main/java/net/neoforged/gradle/common/util/DependencyCollectorInjector.java
index fe08b8007..0d1efee56 100644
--- a/common/src/main/java/net/neoforged/gradle/common/util/DependencyCollectorInjector.java
+++ b/common/src/main/java/net/neoforged/gradle/common/util/DependencyCollectorInjector.java
@@ -8,5 +8,5 @@ public interface DependencyCollectorInjector
 {
 
     @Inject
-    public DependencyCollector dependencyCollector();
+    public DependencyCollector getDependencyCollector();
 }
diff --git a/common/src/main/java/net/neoforged/gradle/common/util/ToolUtilities.java b/common/src/main/java/net/neoforged/gradle/common/util/ToolUtilities.java
index eec60e0bf..9a7f9a113 100644
--- a/common/src/main/java/net/neoforged/gradle/common/util/ToolUtilities.java
+++ b/common/src/main/java/net/neoforged/gradle/common/util/ToolUtilities.java
@@ -37,7 +37,7 @@ public static Provider<File> resolveTool(final Project project, final Provider<S
         //the project that converts the string to a dependency.
         //This breaks the configuration cache as Projects can not be serialized.
         final DependencyCollectorInjector inject = project.getObjects().newInstance(DependencyCollectorInjector.class);
-        final DependencyCollector collector = inject.dependencyCollector();
+        final DependencyCollector collector = inject.getDependencyCollector();
         collector.add(tool.map(project.getDependencies()::create));
         final Configuration config = ConfigurationUtils.temporaryUnhandledConfiguration(
                 project.getConfigurations(),
diff --git a/userdev/src/main/java/net/neoforged/gradle/userdev/dependency/UserDevDependencyManager.java b/userdev/src/main/java/net/neoforged/gradle/userdev/dependency/UserDevDependencyManager.java
index 4b6e3d44e..5ed1f6b80 100644
--- a/userdev/src/main/java/net/neoforged/gradle/userdev/dependency/UserDevDependencyManager.java
+++ b/userdev/src/main/java/net/neoforged/gradle/userdev/dependency/UserDevDependencyManager.java
@@ -54,7 +54,7 @@ private void registerUnitTestDependencyMapping(Project project) {
                                         .flatMap(TransformerUtils.combineAllLists(project, String.class, Function.identity()))
                                         .map(dependencyCoordinates -> {
                                             final DependencyCollectorInjector injector = project.getObjects().newInstance(DependencyCollectorInjector.class);
-                                            final DependencyCollector collector = injector.dependencyCollector();
+                                            final DependencyCollector collector = injector.getDependencyCollector();
                                             dependencyCoordinates.forEach(collector::add);
                                             return collector;
                                         })

From ae6dd0ed09da7fd30d4f785ad15aa27a8e0da906 Mon Sep 17 00:00:00 2001
From: Marc Hermans <marc.hermans@ldtteam.com>
Date: Tue, 4 Nov 2025 16:15:27 +0100
Subject: [PATCH 2/2] Simplify DependencyCollectorInjector by removing
 redundant access modifier from getDependencyCollector method

---
 .../gradle/common/util/DependencyCollectorInjector.java       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/common/src/main/java/net/neoforged/gradle/common/util/DependencyCollectorInjector.java b/common/src/main/java/net/neoforged/gradle/common/util/DependencyCollectorInjector.java
index 0d1efee56..8032dcadb 100644
--- a/common/src/main/java/net/neoforged/gradle/common/util/DependencyCollectorInjector.java
+++ b/common/src/main/java/net/neoforged/gradle/common/util/DependencyCollectorInjector.java
@@ -6,7 +6,5 @@
 
 public interface DependencyCollectorInjector
 {
-
-    @Inject
-    public DependencyCollector getDependencyCollector();
+    DependencyCollector getDependencyCollector();
 }