Skip to content

Commit b6cb2d0

Browse files
committed
A few renames to make more sense
- MinecraftMavenExec -> SyncMinecraftMaven - DefaultTools -> Tools (this is already package-private)
1 parent 7b7b68c commit b6cb2d0

File tree

4 files changed

+9
-19
lines changed

4 files changed

+9
-19
lines changed

src/main/groovy/net/minecraftforge/gradle/ForgeGradleProblems.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ void reportMissingMetadata(Throwable throwable) {
182182
.withException(throwable)
183183
.stackLocation()
184184
.solution("Re-run the synchronization for your Gradle project.")
185-
.solution("Manually run the " + MinecraftMavenExec.NAME + " task if necessary.")
185+
.solution("Manually run the " + SyncMinecraftMaven.NAME + " task if necessary.")
186186
.solution(HELP_MESSAGE)
187187
);
188188
}

src/main/groovy/net/minecraftforge/gradle/MinecraftExtensionImpl.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ import java.util.concurrent.Callable
219219
it.attributes(this.&applyAttributes)
220220
}
221221

222-
MinecraftMavenExec.register(project, MinecraftExtensionImpl.this.globalCaches, this.minecraft)
222+
SyncMinecraftMaven.register(project, MinecraftExtensionImpl.this.globalCaches, this.minecraft)
223223

224224
var repositories = project.extensions.extraProperties.has(EXT_MAVEN_REPOS)
225225
? new AppliedRepos(project.extensions.extraProperties.get(EXT_MAVEN_REPOS) as List<? extends MavenArtifactRepository>)

src/main/groovy/net/minecraftforge/gradle/MinecraftMavenExec.groovy renamed to src/main/groovy/net/minecraftforge/gradle/SyncMinecraftMaven.groovy

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@ import groovy.transform.CompileStatic
99
import groovy.transform.PackageScope
1010
import groovy.transform.PackageScopeTarget
1111
import org.gradle.api.Project
12-
import org.gradle.api.artifacts.Configuration
1312
import org.gradle.api.artifacts.Dependency
1413
import org.gradle.api.file.DirectoryProperty
1514
import org.gradle.api.problems.Problems
1615
import org.gradle.api.provider.Property
17-
import org.gradle.api.provider.ProviderFactory
1816
import org.gradle.api.tasks.Input
1917
import org.gradle.api.tasks.InputDirectory
2018
import org.gradle.api.tasks.JavaExec
@@ -30,16 +28,16 @@ import javax.inject.Inject
3028
*/
3129
@CompileStatic
3230
@PackageScope([PackageScopeTarget.CLASS, PackageScopeTarget.FIELDS])
33-
abstract class MinecraftMavenExec extends JavaExec {
31+
abstract class SyncMinecraftMaven extends JavaExec {
3432
/** The name of the task that is used to sync the Minecraft Maven. */
3533
static final String NAME = 'syncMinecraftMaven'
3634

37-
@PackageScope static TaskProvider<MinecraftMavenExec> register(Project project, DirectoryProperty globalCaches, Dependency dependency) {
38-
project.tasks.register(NAME, MinecraftMavenExec) {
35+
@PackageScope static TaskProvider<SyncMinecraftMaven> register(Project project, DirectoryProperty globalCaches, Dependency dependency) {
36+
project.tasks.register(NAME, SyncMinecraftMaven) {
3937
it.group = 'Build Setup'
4038
it.description = 'Syncs the Minecraft Maven dependencies.'
4139

42-
it.classpath = it.objectFactory.fileCollection().from(DefaultTools.MINECRAFT_MAVEN.get(globalCaches, it.providerFactory))
40+
it.classpath = it.objectFactory.fileCollection().from(Tools.MINECRAFT_MAVEN.get(globalCaches, it.providerFactory))
4341

4442
it.cacheDir.set globalCaches.dir('mc-maven/cache').map(it.problems.ensureDirectory())
4543
it.jdkCacheDir.set globalCaches.dir('mc-maven/cache/jdks').map(it.problems.ensureDirectory())
@@ -62,7 +60,7 @@ abstract class MinecraftMavenExec extends JavaExec {
6260
* @param classpath The classpath containing the Minecraft Mavenizer.
6361
*/
6462
@Inject
65-
MinecraftMavenExec(Problems problems) {
63+
SyncMinecraftMaven(Problems problems) {
6664
this.problems = new ForgeGradleProblems(problems, this.providerFactory)
6765

6866
this.mainClass.convention(Constants.MCMAVEN_MAIN)

src/main/groovy/net/minecraftforge/gradle/DefaultTools.java renamed to src/main/groovy/net/minecraftforge/gradle/Tools.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,21 @@
1717
import org.gradle.api.tasks.InputFile;
1818
import org.gradle.api.tasks.PathSensitive;
1919
import org.gradle.api.tasks.PathSensitivity;
20-
import org.jetbrains.annotations.Nullable;
21-
import org.jetbrains.annotations.UnknownNullability;
2220

2321
import javax.inject.Inject;
2422
import java.io.File;
2523
import java.io.IOException;
26-
import java.util.Objects;
27-
import java.util.concurrent.Callable;
28-
import java.util.concurrent.CompletableFuture;
29-
import java.util.concurrent.Future;
3024

3125
import static net.minecraftforge.gradle.ForgeGradlePlugin.LOGGER;
3226

33-
enum DefaultTools {
27+
enum Tools {
3428
MINECRAFT_MAVEN("minecraft-maven-" + Constants.MCMAVEN_VERSION + ".jar", Constants.MCMAVEN_DL_URL),
3529
SLIME_LAUNCHER("slime-launcher-" + Constants.SL_VERSION + ".jar", Constants.SL_DL_URL);
3630

3731
private final String fileName;
3832
private final String downloadUrl;
3933

40-
private static @UnknownNullability DirectoryProperty caches;
41-
42-
DefaultTools(String fileName, String downloadUrl) {
34+
Tools(String fileName, String downloadUrl) {
4335
this.fileName = fileName;
4436
this.downloadUrl = downloadUrl;
4537
}

0 commit comments

Comments
 (0)