hibiscus-client
/
fabric-loom
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev/0.2.6' into dev/0.2.6

dev/0.11
modmuss50 2019-10-26 23:01:22 +01:00
parent 94751530f4 ba426c04fb
commit 2bd339241f
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/fabricmc/loom/AbstractPlugin.java
View File

@ -339,8 +339,8 @@ public class AbstractPlugin implements Plugin<Project> {
extension.addUnmappedMod(jarTask.getArchivePath().toPath());
remapJarTask.getAddNestedDependencies().set(true);
remapJarTask.doLast(task -> project1.getArtifacts().add("archives", remapJarTask.getArchivePath()));
remapJarTask.dependsOn(project1.getTasks().getByName("jar"));
project1.getArtifacts().add("archives", remapJarTask);
remapJarTask.dependsOn(jarTask);
project1.getTasks().getByName("build").dependsOn(remapJarTask);
Map<Project, Set<Task>> taskMap = project.getAllTasks(true);

5
src/main/java/net/fabricmc/loom/LoomGradleExtension.java
View File

@ -196,7 +196,10 @@ public class LoomGradleExtension {
return recurseProjects((p) -> {
List<Configuration> configs = new ArrayList<>();
// check compile classpath first
configs.add(p.getConfigurations().getByName("compileClasspath"));
Configuration possibleCompileClasspath = p.getConfigurations().findByName("compileClasspath");
if (possibleCompileClasspath != null) {
configs.add(possibleCompileClasspath);
}
// failing that, buildscript
configs.addAll(p.getBuildscript().getConfigurations());

2
src/main/java/net/fabricmc/loom/task/RemapJarTask.java
View File

@ -78,7 +78,7 @@ public class RemapJarTask extends Jar {
Set<File> classpathFiles = new LinkedHashSet<>(
project.getConfigurations().getByName("compileClasspath").getFiles()
);
Path[] classpath = classpathFiles.stream().map(File::toPath).filter((p) -> !input.equals(p)).toArray(Path[]::new);
Path[] classpath = classpathFiles.stream().map(File::toPath).filter((p) -> !input.equals(p) && Files.exists(p)).toArray(Path[]::new);
File mixinMapFile = mappingsProvider.MAPPINGS_MIXIN_EXPORT;
Path mixinMapPath = mixinMapFile.toPath();