diff --git a/build.gradle b/build.gradle index 5c02a34..8306433 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'maven' apply plugin: 'maven-publish' apply plugin: 'idea' -group = 'chorusmc.gradle' +group = 'net.fabric.gradle' version = '0.0.1' sourceCompatibility = targetCompatibility = '1.8' @@ -14,12 +14,9 @@ if (System.getenv().BUILD_NUMBER) { repositories { mavenCentral() - flatDir { - dirs 'libs' - } maven { - name = "Modmuss50" - url = "http://maven.modmuss50.me/" + name = "Fabric" + url = "https://maven.fabricmc.net/" } maven { name "Cuchaz" @@ -42,7 +39,7 @@ dependencies { shade 'commons-io:commons-io:1.4' shade 'com.google.guava:guava:19.0' - shade 'chorusmc:enigma:0.11.+' + shade 'net.fabricmc:enigma:0.11.+' shade 'org.javassist:javassist:3.+' shade 'org.bitbucket.mstrobel:procyon-decompiler:0.5.28-enigma' shade 'org.javassist:javassist:3.20.0-GA' @@ -76,27 +73,27 @@ uploadArchives { repository(url: "file:///var/www/maven/") } pom { - groupId = "chorusmc" + groupId = "net.fabricmc" version = project.version artifactId = project.archivesBaseName project { name project.archivesBaseName packaging 'jar' - description 'chorus-gradle' - url 'https://github.com/ChorusMC/chorus-gradle' + description 'fabric-loom' + url 'https://github.com/FabricMC/fabric-loom' scm { - url 'https://github.com/ChorusMC/chorus-gradle' - connection 'scm:git:git@github.com:ChorusMC/chorus-gradle.git' - developerConnection 'scm:git:git@github.com:ChorusMC/chorus-gradle.git' + url 'https://github.com/FabricMC/fabric-loom' + connection 'scm:git:git@github.com:FabricMC/fabric-loom.git' + developerConnection 'scm:git:git@github.com:FabricMC/fabric-loom.git' } issueManagement { system 'github' - url 'https://github.com/ChorusMC/chorus-gradle/issues' + url 'https://github.com/FabricMC/fabric-loom/issues' } licenses { license { name 'License' - url 'https://github.com/ChorusMC/chorus-gradle/blob/master/readme.txt' + url 'https://github.com/FabricMC/fabric-loom/blob/master/readme.txt' distribution 'repo' } } diff --git a/settings.gradle b/settings.gradle index d55c27e..64f38e9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ -rootProject.name = 'ChorusGradle' +rootProject.name = 'fabric-loom' diff --git a/src/main/java/chorusmc/gradle/util/delayed/IDelayed.java b/src/main/java/chorusmc/gradle/util/delayed/IDelayed.java deleted file mode 100644 index 5faa9d1..0000000 --- a/src/main/java/chorusmc/gradle/util/delayed/IDelayed.java +++ /dev/null @@ -1,7 +0,0 @@ -package chorusmc.gradle.util.delayed; - -import chorusmc.gradle.ChorusGradleExtension; - -public interface IDelayed { - T get(ChorusGradleExtension extension); -} diff --git a/src/main/java/chorusmc/gradle/AbstractPlugin.java b/src/main/java/net/fabric/loom/AbstractPlugin.java similarity index 97% rename from src/main/java/chorusmc/gradle/AbstractPlugin.java rename to src/main/java/net/fabric/loom/AbstractPlugin.java index b411611..4e3514e 100644 --- a/src/main/java/chorusmc/gradle/AbstractPlugin.java +++ b/src/main/java/net/fabric/loom/AbstractPlugin.java @@ -1,6 +1,6 @@ -package chorusmc.gradle; +package net.fabric.loom; -import chorusmc.gradle.util.Constants; +import net.fabric.loom.util.Constants; import com.google.common.collect.ImmutableMap; import org.gradle.api.Plugin; import org.gradle.api.Project; @@ -25,7 +25,7 @@ public class AbstractPlugin implements Plugin { project.apply(ImmutableMap.of("plugin", "eclipse")); project.apply(ImmutableMap.of("plugin", "idea")); - project.getExtensions().create("minecraft", ChorusGradleExtension.class); + project.getExtensions().create("minecraft", LoomGradleExtension.class); // Force add Mojang repository addMavenRepo(target, "Mojang", "https://libraries.minecraft.net/"); diff --git a/src/main/java/chorusmc/gradle/ChorusGradleExtension.java b/src/main/java/net/fabric/loom/LoomGradleExtension.java similarity index 50% rename from src/main/java/chorusmc/gradle/ChorusGradleExtension.java rename to src/main/java/net/fabric/loom/LoomGradleExtension.java index ecc06fd..50277ec 100644 --- a/src/main/java/chorusmc/gradle/ChorusGradleExtension.java +++ b/src/main/java/net/fabric/loom/LoomGradleExtension.java @@ -1,6 +1,6 @@ -package chorusmc.gradle; +package net.fabric.loom; -public class ChorusGradleExtension { +public class LoomGradleExtension { public String version; public String runDir = "run"; } diff --git a/src/main/java/chorusmc/gradle/ChorusGradlePlugin.java b/src/main/java/net/fabric/loom/LoomGradlePlugin.java similarity index 60% rename from src/main/java/chorusmc/gradle/ChorusGradlePlugin.java rename to src/main/java/net/fabric/loom/LoomGradlePlugin.java index fb311e2..158f1ca 100644 --- a/src/main/java/chorusmc/gradle/ChorusGradlePlugin.java +++ b/src/main/java/net/fabric/loom/LoomGradlePlugin.java @@ -1,17 +1,20 @@ -package chorusmc.gradle; +package net.fabric.loom; -import chorusmc.gradle.task.*; +import net.fabric.loom.task.DownloadTask; +import net.fabric.loom.task.ExtractNativesTask; +import net.fabric.loom.task.GenIdeaProjectTask; +import net.fabric.loom.task.MapJarsTask; import org.gradle.api.DefaultTask; import org.gradle.api.Project; -public class ChorusGradlePlugin extends AbstractPlugin { +public class LoomGradlePlugin extends AbstractPlugin { @Override public void apply(Project target) { super.apply(target); makeTask("download", DownloadTask.class); makeTask("mapJars", MapJarsTask.class).dependsOn("download"); - makeTask("setupChorus", DefaultTask.class).dependsOn("mapJars"); + makeTask("setupFabric", DefaultTask.class).dependsOn("mapJars"); makeTask("extractNatives", ExtractNativesTask.class).dependsOn("download"); makeTask("genIdeaRuns", GenIdeaProjectTask.class).dependsOn("cleanIdea").dependsOn("idea").dependsOn("extractNatives"); diff --git a/src/main/java/chorusmc/gradle/task/DownloadNewTask.java b/src/main/java/net/fabric/loom/task/DownloadNewTask.java similarity index 97% rename from src/main/java/chorusmc/gradle/task/DownloadNewTask.java rename to src/main/java/net/fabric/loom/task/DownloadNewTask.java index b8658d9..8fd98c2 100644 --- a/src/main/java/chorusmc/gradle/task/DownloadNewTask.java +++ b/src/main/java/net/fabric/loom/task/DownloadNewTask.java @@ -1,11 +1,11 @@ -package chorusmc.gradle.task; +package net.fabric.loom.task; -import chorusmc.gradle.util.Constants; +import net.fabric.loom.util.Constants; +import net.fabric.loom.util.progress.ProgressLogger; import org.gradle.api.DefaultTask; import org.gradle.api.tasks.Input; import org.gradle.api.tasks.OutputFile; import org.gradle.api.tasks.TaskAction; -import chorusmc.gradle.util.progress.ProgressLogger; import java.io.File; import java.io.FileOutputStream; diff --git a/src/main/java/chorusmc/gradle/task/DownloadTask.java b/src/main/java/net/fabric/loom/task/DownloadTask.java similarity index 91% rename from src/main/java/chorusmc/gradle/task/DownloadTask.java rename to src/main/java/net/fabric/loom/task/DownloadTask.java index ccf544b..9b3371d 100644 --- a/src/main/java/chorusmc/gradle/task/DownloadTask.java +++ b/src/main/java/net/fabric/loom/task/DownloadTask.java @@ -1,7 +1,7 @@ -package chorusmc.gradle.task; +package net.fabric.loom.task; -import chorusmc.gradle.util.Constants; -import chorusmc.gradle.util.Version; +import net.fabric.loom.util.Constants; +import net.fabric.loom.util.Version; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import org.apache.commons.io.FileUtils; @@ -9,12 +9,12 @@ import org.gradle.api.DefaultTask; import org.gradle.api.artifacts.Configuration; import org.gradle.api.artifacts.dsl.DependencyHandler; import org.gradle.api.tasks.TaskAction; -import chorusmc.gradle.ChorusGradleExtension; -import chorusmc.gradle.util.Checksum; -import chorusmc.gradle.util.ManifestVersion; -import chorusmc.gradle.util.assets.AssetIndex; -import chorusmc.gradle.util.assets.AssetObject; -import chorusmc.gradle.util.progress.ProgressLogger; +import net.fabric.loom.LoomGradleExtension; +import net.fabric.loom.util.Checksum; +import net.fabric.loom.util.ManifestVersion; +import net.fabric.loom.util.assets.AssetIndex; +import net.fabric.loom.util.assets.AssetObject; +import net.fabric.loom.util.progress.ProgressLogger; import java.io.File; import java.io.FileReader; @@ -27,7 +27,7 @@ public class DownloadTask extends DefaultTask { @TaskAction public void download() { try { - ChorusGradleExtension extension = this.getProject().getExtensions().getByType(ChorusGradleExtension.class); + LoomGradleExtension extension = this.getProject().getExtensions().getByType(LoomGradleExtension.class); if (!Constants.MINECRAFT_JSON.get(extension).exists()) { this.getLogger().lifecycle(":downloading minecraft json"); @@ -56,7 +56,7 @@ public class DownloadTask extends DefaultTask { } this.getLogger().lifecycle(":downloading mappings"); - FileUtils.copyURLToFile(new URL("https://github.com/ChorusMC/pomf/archive/master.zip"), Constants.MAPPINGS_ZIP); + FileUtils.copyURLToFile(new URL("https://github.com/FabricMC/pomf/archive/master.zip"), Constants.MAPPINGS_ZIP); DependencyHandler dependencyHandler = getProject().getDependencies(); diff --git a/src/main/java/chorusmc/gradle/task/ExtractNativesTask.java b/src/main/java/net/fabric/loom/task/ExtractNativesTask.java similarity index 89% rename from src/main/java/chorusmc/gradle/task/ExtractNativesTask.java rename to src/main/java/net/fabric/loom/task/ExtractNativesTask.java index 41577d4..f4b6542 100644 --- a/src/main/java/chorusmc/gradle/task/ExtractNativesTask.java +++ b/src/main/java/net/fabric/loom/task/ExtractNativesTask.java @@ -1,9 +1,9 @@ -package chorusmc.gradle.task; +package net.fabric.loom.task; +import net.fabric.loom.util.Constants; import org.gradle.api.DefaultTask; import org.gradle.api.tasks.TaskAction; import org.zeroturnaround.zip.ZipUtil; -import chorusmc.gradle.util.Constants; import java.io.File; import java.io.FileNotFoundException; diff --git a/src/main/java/chorusmc/gradle/task/GenIdeaProjectTask.java b/src/main/java/net/fabric/loom/task/GenIdeaProjectTask.java similarity index 94% rename from src/main/java/chorusmc/gradle/task/GenIdeaProjectTask.java rename to src/main/java/net/fabric/loom/task/GenIdeaProjectTask.java index 0645303..122f89c 100644 --- a/src/main/java/chorusmc/gradle/task/GenIdeaProjectTask.java +++ b/src/main/java/net/fabric/loom/task/GenIdeaProjectTask.java @@ -1,9 +1,9 @@ -package chorusmc.gradle.task; +package net.fabric.loom.task; -import chorusmc.gradle.ChorusGradleExtension; -import chorusmc.gradle.util.Constants; -import chorusmc.gradle.util.IdeaRunConfig; -import chorusmc.gradle.util.Version; +import net.fabric.loom.LoomGradleExtension; +import net.fabric.loom.util.Constants; +import net.fabric.loom.util.IdeaRunConfig; +import net.fabric.loom.util.Version; import com.google.gson.Gson; import org.gradle.api.DefaultTask; import org.gradle.api.tasks.TaskAction; @@ -29,7 +29,7 @@ import java.io.IOException; public class GenIdeaProjectTask extends DefaultTask { @TaskAction public void genIdeaRuns() throws IOException, ParserConfigurationException, SAXException, TransformerException { - ChorusGradleExtension extension = this.getProject().getExtensions().getByType(ChorusGradleExtension.class); + LoomGradleExtension extension = this.getProject().getExtensions().getByType(LoomGradleExtension.class); File file = new File(getProject().getName() + ".iml"); DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance(); @@ -143,7 +143,7 @@ public class GenIdeaProjectTask extends DefaultTask { } IdeaRunConfig ideaClient = new IdeaRunConfig(); - ideaClient.mainClass = "chorusmc.base.launch.ChorusClientMain"; + ideaClient.mainClass = "net.fabricmc.base.launch.FabricClientMain "; ideaClient.projectName = getProject().getName(); ideaClient.configName = "Minecraft Client"; ideaClient.runDir = "file://$PROJECT_DIR$/" + extension.runDir; diff --git a/src/main/java/chorusmc/gradle/task/MapJarsTask.java b/src/main/java/net/fabric/loom/task/MapJarsTask.java similarity index 86% rename from src/main/java/chorusmc/gradle/task/MapJarsTask.java rename to src/main/java/net/fabric/loom/task/MapJarsTask.java index 4fea7a5..8c3cc56 100644 --- a/src/main/java/chorusmc/gradle/task/MapJarsTask.java +++ b/src/main/java/net/fabric/loom/task/MapJarsTask.java @@ -1,16 +1,13 @@ -package chorusmc.gradle.task; +package net.fabric.loom.task; import cuchaz.enigma.Deobfuscator; import cuchaz.enigma.mapping.MappingsEnigmaReader; import cuchaz.enigma.throwables.MappingParseException; -import groovy.lang.Closure; +import net.fabric.loom.LoomGradleExtension; +import net.fabric.loom.util.Constants; import org.apache.commons.io.FileUtils; import org.gradle.api.DefaultTask; import org.gradle.api.tasks.TaskAction; -import org.gradle.process.ExecResult; -import org.gradle.process.JavaExecSpec; -import chorusmc.gradle.ChorusGradleExtension; -import chorusmc.gradle.util.Constants; import org.zeroturnaround.zip.ZipUtil; import java.io.File; @@ -23,7 +20,7 @@ public class MapJarsTask extends DefaultTask { @TaskAction public void mapJars() throws IOException, MappingParseException { - ChorusGradleExtension extension = this.getProject().getExtensions().getByType(ChorusGradleExtension.class); + LoomGradleExtension extension = this.getProject().getExtensions().getByType(LoomGradleExtension.class); if(Constants.MINECRAFT_CLIENT_MAPPED_JAR.get(extension).exists()){ Constants.MINECRAFT_CLIENT_MAPPED_JAR.get(extension).delete(); } diff --git a/src/main/java/chorusmc/gradle/util/Checksum.java b/src/main/java/net/fabric/loom/util/Checksum.java similarity index 96% rename from src/main/java/chorusmc/gradle/util/Checksum.java rename to src/main/java/net/fabric/loom/util/Checksum.java index a725168..7938600 100644 --- a/src/main/java/chorusmc/gradle/util/Checksum.java +++ b/src/main/java/net/fabric/loom/util/Checksum.java @@ -1,4 +1,4 @@ -package chorusmc.gradle.util; +package net.fabric.loom.util; import com.google.common.hash.HashCode; import com.google.common.hash.Hashing; diff --git a/src/main/java/chorusmc/gradle/util/Constants.java b/src/main/java/net/fabric/loom/util/Constants.java similarity index 94% rename from src/main/java/chorusmc/gradle/util/Constants.java rename to src/main/java/net/fabric/loom/util/Constants.java index a9e10c1..693f324 100644 --- a/src/main/java/chorusmc/gradle/util/Constants.java +++ b/src/main/java/net/fabric/loom/util/Constants.java @@ -1,7 +1,7 @@ -package chorusmc.gradle.util; +package net.fabric.loom.util; -import chorusmc.gradle.util.delayed.IDelayed; -import chorusmc.gradle.util.delayed.DelayedFile; +import net.fabric.loom.util.delayed.IDelayed; +import net.fabric.loom.util.delayed.DelayedFile; import java.io.File; import java.net.URL; diff --git a/src/main/java/chorusmc/gradle/util/IdeaRunConfig.java b/src/main/java/net/fabric/loom/util/IdeaRunConfig.java similarity index 98% rename from src/main/java/chorusmc/gradle/util/IdeaRunConfig.java rename to src/main/java/net/fabric/loom/util/IdeaRunConfig.java index 808aa49..a0c3781 100644 --- a/src/main/java/chorusmc/gradle/util/IdeaRunConfig.java +++ b/src/main/java/net/fabric/loom/util/IdeaRunConfig.java @@ -1,4 +1,4 @@ -package chorusmc.gradle.util; +package net.fabric.loom.util; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; diff --git a/src/main/java/chorusmc/gradle/util/ManifestVersion.java b/src/main/java/net/fabric/loom/util/ManifestVersion.java similarity index 87% rename from src/main/java/chorusmc/gradle/util/ManifestVersion.java rename to src/main/java/net/fabric/loom/util/ManifestVersion.java index 8dc94cf..78fa42f 100644 --- a/src/main/java/chorusmc/gradle/util/ManifestVersion.java +++ b/src/main/java/net/fabric/loom/util/ManifestVersion.java @@ -1,4 +1,4 @@ -package chorusmc.gradle.util; +package net.fabric.loom.util; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/chorusmc/gradle/util/OperatingSystem.java b/src/main/java/net/fabric/loom/util/OperatingSystem.java similarity index 95% rename from src/main/java/chorusmc/gradle/util/OperatingSystem.java rename to src/main/java/net/fabric/loom/util/OperatingSystem.java index 118dd8a..dc229b6 100644 --- a/src/main/java/chorusmc/gradle/util/OperatingSystem.java +++ b/src/main/java/net/fabric/loom/util/OperatingSystem.java @@ -1,4 +1,4 @@ -package chorusmc.gradle.util; +package net.fabric.loom.util; public class OperatingSystem { public static String getOS() { diff --git a/src/main/java/chorusmc/gradle/util/Version.java b/src/main/java/net/fabric/loom/util/Version.java similarity index 99% rename from src/main/java/chorusmc/gradle/util/Version.java rename to src/main/java/net/fabric/loom/util/Version.java index 647f8f6..10156b7 100644 --- a/src/main/java/chorusmc/gradle/util/Version.java +++ b/src/main/java/net/fabric/loom/util/Version.java @@ -1,4 +1,4 @@ -package chorusmc.gradle.util; +package net.fabric.loom.util; import com.google.gson.JsonObject; diff --git a/src/main/java/chorusmc/gradle/util/assets/AssetIndex.java b/src/main/java/net/fabric/loom/util/assets/AssetIndex.java similarity index 93% rename from src/main/java/chorusmc/gradle/util/assets/AssetIndex.java rename to src/main/java/net/fabric/loom/util/assets/AssetIndex.java index fe4bec4..282c402 100644 --- a/src/main/java/chorusmc/gradle/util/assets/AssetIndex.java +++ b/src/main/java/net/fabric/loom/util/assets/AssetIndex.java @@ -1,4 +1,4 @@ -package chorusmc.gradle.util.assets; +package net.fabric.loom.util.assets; import java.util.HashSet; import java.util.LinkedHashMap; diff --git a/src/main/java/chorusmc/gradle/util/assets/AssetObject.java b/src/main/java/net/fabric/loom/util/assets/AssetObject.java similarity index 95% rename from src/main/java/chorusmc/gradle/util/assets/AssetObject.java rename to src/main/java/net/fabric/loom/util/assets/AssetObject.java index 26a9def..07eef88 100644 --- a/src/main/java/chorusmc/gradle/util/assets/AssetObject.java +++ b/src/main/java/net/fabric/loom/util/assets/AssetObject.java @@ -1,4 +1,4 @@ -package chorusmc.gradle.util.assets; +package net.fabric.loom.util.assets; public class AssetObject { private String hash; diff --git a/src/main/java/chorusmc/gradle/util/delayed/DelayedFile.java b/src/main/java/net/fabric/loom/util/delayed/DelayedFile.java similarity index 54% rename from src/main/java/chorusmc/gradle/util/delayed/DelayedFile.java rename to src/main/java/net/fabric/loom/util/delayed/DelayedFile.java index 633937c..58eda3c 100644 --- a/src/main/java/chorusmc/gradle/util/delayed/DelayedFile.java +++ b/src/main/java/net/fabric/loom/util/delayed/DelayedFile.java @@ -1,20 +1,20 @@ -package chorusmc.gradle.util.delayed; +package net.fabric.loom.util.delayed; -import chorusmc.gradle.ChorusGradleExtension; +import net.fabric.loom.LoomGradleExtension; import java.io.File; import java.util.function.Function; public class DelayedFile implements IDelayed { private File file; - private Function function; + private Function function; - public DelayedFile(Function function) { + public DelayedFile(Function function) { this.function = function; } @Override - public File get(ChorusGradleExtension extension) { + public File get(LoomGradleExtension extension) { if (this.file == null) { this.file = this.function.apply(extension); } diff --git a/src/main/java/net/fabric/loom/util/delayed/IDelayed.java b/src/main/java/net/fabric/loom/util/delayed/IDelayed.java new file mode 100644 index 0000000..1ec58c7 --- /dev/null +++ b/src/main/java/net/fabric/loom/util/delayed/IDelayed.java @@ -0,0 +1,7 @@ +package net.fabric.loom.util.delayed; + +import net.fabric.loom.LoomGradleExtension; + +public interface IDelayed { + T get(LoomGradleExtension extension); +} diff --git a/src/main/java/chorusmc/gradle/util/progress/ProgressLogger.java b/src/main/java/net/fabric/loom/util/progress/ProgressLogger.java similarity index 99% rename from src/main/java/chorusmc/gradle/util/progress/ProgressLogger.java rename to src/main/java/net/fabric/loom/util/progress/ProgressLogger.java index 671c09f..8891229 100644 --- a/src/main/java/chorusmc/gradle/util/progress/ProgressLogger.java +++ b/src/main/java/net/fabric/loom/util/progress/ProgressLogger.java @@ -1,4 +1,4 @@ -package chorusmc.gradle.util.progress; +package net.fabric.loom.util.progress; import org.gradle.api.Project; diff --git a/src/main/resources/META-INF/gradle-plugins/chorus.gradle.properties b/src/main/resources/META-INF/gradle-plugins/chorus.gradle.properties index a92d33c..0babbd0 100644 --- a/src/main/resources/META-INF/gradle-plugins/chorus.gradle.properties +++ b/src/main/resources/META-INF/gradle-plugins/chorus.gradle.properties @@ -1 +1 @@ -implementation-class=chorusmc.gradle.ChorusGradlePlugin \ No newline at end of file +implementation-class=net.fabric.loom.LoomGradlePlugin \ No newline at end of file