From 4700788ead761dc81c134c6156817e2faece41b5 Mon Sep 17 00:00:00 2001 From: asie Date: Sun, 23 Dec 2018 09:37:54 +0100 Subject: [PATCH] fix #47 --- .../net/fabricmc/loom/providers/ModRemapperProvider.java | 7 ++++--- .../java/net/fabricmc/loom/util/DependencyProvider.java | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/providers/ModRemapperProvider.java b/src/main/java/net/fabricmc/loom/providers/ModRemapperProvider.java index ec2073c..34c5df2 100644 --- a/src/main/java/net/fabricmc/loom/providers/ModRemapperProvider.java +++ b/src/main/java/net/fabricmc/loom/providers/ModRemapperProvider.java @@ -43,7 +43,8 @@ public class ModRemapperProvider extends DependencyProvider { // Provide JAR File input = dependency.resolveFile().orElseThrow(() -> new RuntimeException("Could not find dependency " + dependency)); - project.getLogger().lifecycle(":providing " + dependency.getDepString()); + String rds = dependency.getResolvedDepString(); + project.getLogger().lifecycle(":providing " + rds); MappingsProvider mappingsProvider = getDependencyManager().getProvider(MappingsProvider.class); String verSuffix = ".mapped." + mappingsProvider.mappingsName + "." + mappingsProvider.mappingsVersion; @@ -62,14 +63,14 @@ public class ModRemapperProvider extends DependencyProvider { } project.getDependencies().add("compile", project.getDependencies().module( - dependency.getDepString() + verSuffix + rds + verSuffix )); postPopulationScheduler.accept(() -> { // Provide sources JAR, if present Optional sourcesFile = dependency.resolveFile("sources"); if (sourcesFile.isPresent()) { - project.getLogger().lifecycle(":providing " + dependency.getDepString() + " sources"); + project.getLogger().lifecycle(":providing " + rds + " sources"); try { SourceRemapper.remapSources(project, sourcesFile.get(), new File(modStore, outputNamePrefix + "-sources.jar"), true); diff --git a/src/main/java/net/fabricmc/loom/util/DependencyProvider.java b/src/main/java/net/fabricmc/loom/util/DependencyProvider.java index e6d4b01..1151a59 100644 --- a/src/main/java/net/fabricmc/loom/util/DependencyProvider.java +++ b/src/main/java/net/fabricmc/loom/util/DependencyProvider.java @@ -169,5 +169,9 @@ public abstract class DependencyProvider { public String getDepString(){ return dependency.getGroup() + ":" + dependency.getName() + ":" + dependency.getVersion(); } + + public String getResolvedDepString(){ + return dependency.getGroup() + ":" + dependency.getName() + ":" + getResolvedVersion(); + } } }