From 22f1743a08c54c42ab2f00b396ccf171bfe6af0d Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 9 Oct 2016 13:18:00 +0100 Subject: [PATCH] Fix mixin pre-baker --- build.gradle | 2 -- src/main/java/net/fabricmc/loom/AbstractPlugin.java | 4 +++- .../java/net/fabricmc/loom/task/ProcessModsTask.java | 9 +++------ src/main/java/net/fabricmc/loom/util/Constants.java | 1 + 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index b222764..3c6d5b1 100644 --- a/build.gradle +++ b/build.gradle @@ -58,8 +58,6 @@ dependencies { shade 'com.google.guava:guava:19.0' shade 'net.fabricmc:weave:0.1.0.6' shade 'cuchaz:enigma:0.11.0.5:lib' - shade 'org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-depchain:2.2.4' - compile 'net.fabricmc:fabric-base:16w38a-0.0.4-SNAPSHOT' } diff --git a/src/main/java/net/fabricmc/loom/AbstractPlugin.java b/src/main/java/net/fabricmc/loom/AbstractPlugin.java index fcfa9f5..b6862c0 100644 --- a/src/main/java/net/fabricmc/loom/AbstractPlugin.java +++ b/src/main/java/net/fabricmc/loom/AbstractPlugin.java @@ -77,6 +77,8 @@ public class AbstractPlugin implements Plugin { project.getConfigurations().maybeCreate(Constants.CONFIG_NATIVES); project.getConfigurations().maybeCreate(Constants.COMPILE_MODS); + project.getConfigurations().maybeCreate(Constants.PROCESS_MODS_DEPENDENCIES); + // Common libraries extends from client libraries, CONFIG_MC_DEPENDENCIES will contains all MC dependencies project.getConfigurations().getByName(Constants.CONFIG_MC_DEPENDENCIES).extendsFrom(project.getConfigurations().getByName(Constants.CONFIG_MC_DEPENDENCIES_CLIENT)); @@ -233,8 +235,8 @@ public class AbstractPlugin implements Plugin { //only add this when not in a fabric dev env project1.getDependencies().add(Constants.CONFIG_MC_DEPENDENCIES, "net.fabricmc:fabric-base:" + extension.version + "-" + extension.fabricVersion); } + project1.getDependencies().add(Constants.PROCESS_MODS_DEPENDENCIES, "net.fabricmc:fabric-base:16w38a-0.0.4-SNAPSHOT"); }); - } protected void readModJson(LoomGradleExtension extension) { diff --git a/src/main/java/net/fabricmc/loom/task/ProcessModsTask.java b/src/main/java/net/fabricmc/loom/task/ProcessModsTask.java index f9d856e..e5cb902 100644 --- a/src/main/java/net/fabricmc/loom/task/ProcessModsTask.java +++ b/src/main/java/net/fabricmc/loom/task/ProcessModsTask.java @@ -32,8 +32,6 @@ import org.gradle.api.DefaultTask; import org.gradle.api.artifacts.Configuration; import org.gradle.api.artifacts.ResolvedArtifact; import org.gradle.api.tasks.TaskAction; -import org.jboss.shrinkwrap.resolver.api.maven.ConfigurableMavenResolverSystem; -import org.jboss.shrinkwrap.resolver.api.maven.Maven; import java.io.File; import java.io.IOException; @@ -69,10 +67,9 @@ public class ProcessModsTask extends DefaultTask { } public void downloadRequiredDeps(LoomGradleExtension extension) { - ConfigurableMavenResolverSystem mavenResolver = Maven.configureResolver().withRemoteRepo("Fabric", "http://maven.fabricmc.net/", "default").withRemoteRepo("SpongePowered", "http://repo.spongepowered.org/maven/", "default").withRemoteRepo("Mojang", "https://libraries.minecraft.net/", "default"); - File[] files = mavenResolver.resolve("net.fabricmc:fabric-base:16w38a-0.0.4-SNAPSHOT").withTransitivity().asFile(); - for (File file : files) { - addFile(file, this); + Configuration configuration = getProject().getConfigurations().getByName(Constants.PROCESS_MODS_DEPENDENCIES); + for (ResolvedArtifact artifact : configuration.getResolvedConfiguration().getResolvedArtifacts()) { + addFile(artifact.getFile(), this); } } diff --git a/src/main/java/net/fabricmc/loom/util/Constants.java b/src/main/java/net/fabricmc/loom/util/Constants.java index 602abb2..60f715f 100644 --- a/src/main/java/net/fabricmc/loom/util/Constants.java +++ b/src/main/java/net/fabricmc/loom/util/Constants.java @@ -65,6 +65,7 @@ public class Constants { public static final String CONFIG_NATIVES = "MC_NATIVES"; public static final String CONFIG_MC_DEPENDENCIES = "MC_DEPENDENCIES"; public static final String CONFIG_MC_DEPENDENCIES_CLIENT = "MC_DEPENDENCIES_CLIENT"; + public static final String PROCESS_MODS_DEPENDENCIES = "PROCESS_MODS_DEPENDENCIES"; public static final String SYSTEM_ARCH = System.getProperty("os.arch").equals("64") ? "64" : "32"; public static final String COMPILE_MODS = "modCompile";