From 7341575237b5ac40abc2c2755b7440b11bcc3424 Mon Sep 17 00:00:00 2001 From: TheCodedOne Date: Fri, 11 May 2018 21:57:42 +0100 Subject: [PATCH] Rename to OpenGradle --- README.md | 8 ++++---- build.gradle | 4 ++-- gradle.properties | 6 +++--- src/main/java/net/fabricmc/loom/AbstractPlugin.java | 5 +---- src/main/java/net/fabricmc/loom/LoomGradlePlugin.java | 2 +- 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 518ef91..1a28f51 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# fabric-loom -Gradle plugin for Fabric +# OpenGradle +Gradle plugin for OpenModLoader -Usage: `gradlew setupFabric idea` -(Prefix with `./` on macOS and Linux) +Usage: `gradlew setup idea` +(Use `./gradle` on macOS and Linux) diff --git a/build.gradle b/build.gradle index 2c7e385..f3b8ab5 100644 --- a/build.gradle +++ b/build.gradle @@ -13,8 +13,8 @@ targetCompatibility = 1.8 apply from: 'https://github.com/FabricMC/fabric-docs/raw/master/gradle/maven.gradle' apply from: 'https://github.com/FabricMC/fabric-docs/raw/master/gradle/license.gradle' -group = 'net.fabricmc' -archivesBaseName = project.name.toLowerCase() +group = 'com.openmodloader' +archivesBaseName = project.name version = '0.0.7-SNAPSHOT' repositories { diff --git a/gradle.properties b/gradle.properties index 7cf5344..036af22 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -name = fabric-loom -description = The Gradle plugin for Fabric -url = https://github.com/FabricMC/fabric-loom +name = OpenGradle +description = The Gradle plugin for OpenModLoader +url = https://github.com/OpenModLoader/OpenGradle diff --git a/src/main/java/net/fabricmc/loom/AbstractPlugin.java b/src/main/java/net/fabricmc/loom/AbstractPlugin.java index 1ded748..5699e46 100644 --- a/src/main/java/net/fabricmc/loom/AbstractPlugin.java +++ b/src/main/java/net/fabricmc/loom/AbstractPlugin.java @@ -39,7 +39,6 @@ import org.gradle.api.artifacts.repositories.MavenArtifactRepository; import org.gradle.api.plugins.JavaPlugin; import org.gradle.api.plugins.JavaPluginConvention; import org.gradle.api.tasks.SourceSet; -import org.gradle.api.tasks.compile.JavaCompile; import org.gradle.api.tasks.javadoc.Javadoc; import org.gradle.plugins.ide.eclipse.model.EclipseModel; import org.gradle.plugins.ide.idea.model.IdeaModel; @@ -48,8 +47,6 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; -import java.util.Map; -import java.util.Set; public class AbstractPlugin implements Plugin { protected Project project; @@ -229,7 +226,7 @@ public class AbstractPlugin implements Plugin { }); project.afterEvaluate(project12 -> { - project12.getTasks().getByName("idea").dependsOn(project12.getTasks().getByName("cleanIdea")).dependsOn(project12.getTasks().getByName("setupFabric")).dependsOn(project12.getTasks().getByName("extractNatives")); + project12.getTasks().getByName("idea").dependsOn(project12.getTasks().getByName("cleanIdea")).dependsOn(project12.getTasks().getByName("setup")).dependsOn(project12.getTasks().getByName("extractNatives")); project12.getTasks().getByName("idea").finalizedBy(project12.getTasks().getByName("genIdeaWorkspace")); }); diff --git a/src/main/java/net/fabricmc/loom/LoomGradlePlugin.java b/src/main/java/net/fabricmc/loom/LoomGradlePlugin.java index 93cc8a4..c5c521f 100644 --- a/src/main/java/net/fabricmc/loom/LoomGradlePlugin.java +++ b/src/main/java/net/fabricmc/loom/LoomGradlePlugin.java @@ -37,7 +37,7 @@ public class LoomGradlePlugin extends AbstractPlugin { makeTask("mergeJars", MergeJarsTask.class).dependsOn("download"); makeTask("mapJars", MapJarsTask.class).dependsOn("mergeJars"); makeTask("processMods", ProcessModsTask.class).dependsOn("mapJars"); - makeTask("setupFabric", DefaultTask.class).dependsOn("processMods"); + makeTask("setup", DefaultTask.class).dependsOn("processMods"); makeTask("extractNatives", ExtractNativesTask.class).dependsOn("download"); makeTask("genIdeaWorkspace", GenIdeaProjectTask.class).dependsOn("idea");