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

fix #47

dev/0.11
asie 2018-12-23 09:37:54 +01:00
parent 8d326da8be
commit 4700788ead
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/net/fabricmc/loom/providers/ModRemapperProvider.java
View File

@ -43,7 +43,8 @@ public class ModRemapperProvider extends DependencyProvider {
// Provide JAR // Provide JAR
File input = dependency.resolveFile().orElseThrow(() -> new RuntimeException("Could not find dependency " + dependency)); 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); MappingsProvider mappingsProvider = getDependencyManager().getProvider(MappingsProvider.class);
String verSuffix = ".mapped." + mappingsProvider.mappingsName + "." + mappingsProvider.mappingsVersion; String verSuffix = ".mapped." + mappingsProvider.mappingsName + "." + mappingsProvider.mappingsVersion;
@ -62,14 +63,14 @@ public class ModRemapperProvider extends DependencyProvider {
} }
project.getDependencies().add("compile", project.getDependencies().module( project.getDependencies().add("compile", project.getDependencies().module(
dependency.getDepString() + verSuffix rds + verSuffix
)); ));
postPopulationScheduler.accept(() -> { postPopulationScheduler.accept(() -> {
// Provide sources JAR, if present // Provide sources JAR, if present
Optional<File> sourcesFile = dependency.resolveFile("sources"); Optional<File> sourcesFile = dependency.resolveFile("sources");
if (sourcesFile.isPresent()) { if (sourcesFile.isPresent()) {
project.getLogger().lifecycle(":providing " + dependency.getDepString() + " sources"); project.getLogger().lifecycle(":providing " + rds + " sources");
try { try {
SourceRemapper.remapSources(project, sourcesFile.get(), new File(modStore, outputNamePrefix + "-sources.jar"), true); SourceRemapper.remapSources(project, sourcesFile.get(), new File(modStore, outputNamePrefix + "-sources.jar"), true);

4
src/main/java/net/fabricmc/loom/util/DependencyProvider.java
View File

@ -169,5 +169,9 @@ public abstract class DependencyProvider {
public String getDepString(){ public String getDepString(){
return dependency.getGroup() + ":" + dependency.getName() + ":" + dependency.getVersion(); return dependency.getGroup() + ":" + dependency.getName() + ":" + dependency.getVersion();
} }
public String getResolvedDepString(){
return dependency.getGroup() + ":" + dependency.getName() + ":" + getResolvedVersion();
}
} }
} }