imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-04-02 13:37:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Initial gradle 6.0 rc1 fixes, ugly but works. Closes #131

Browse Source
This commit is contained in:
modmuss50
2019-10-22 20:28:00 +01:00
parent 40d895095f
commit 13ae0ae263
3 changed files with 62 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/fabricmc/loom/util/ModCompileRemapper.java
View File

@@ -78,7 +78,7 @@ public class ModCompileRemapper {
String remappedLog = group + ":" + name + ":" + version + classifierSuffix + " (" + mappingsPrefix + ")";
String remappedNotation = "net.fabricmc.mapped:" + mappingsPrefix + "." + group + "." + name + ":" + version + classifierSuffix;
String remappedFilename = mappingsPrefix + "." + group + "." + name + "-" + version + classifierSuffix.replace(':', '-');
project.getLogger().lifecycle(":providing " + remappedLog);
project.getLogger().info(":providing " + remappedLog);
File modStore = extension.getRemappedModCache();
@@ -109,7 +109,7 @@ public class ModCompileRemapper {
}
private static void addToRegularCompile(Project project, Configuration regularCompile, String notation) {
project.getLogger().lifecycle(":providing " + notation);
project.getLogger().info(":providing " + notation);
DependencyHandler dependencies = project.getDependencies();
Dependency dep = dependencies.module(notation);
if (dep instanceof ModuleDependency) {
@@ -158,7 +158,7 @@ public class ModCompileRemapper {
private static void scheduleSourcesRemapping(Project project, Consumer<Runnable> postPopulationScheduler, File sources, String remappedLog, String remappedFilename, File modStore) {
postPopulationScheduler.accept(() -> {
project.getLogger().lifecycle(":providing " + remappedLog + " sources");
project.getLogger().info(":providing " + remappedLog + " sources");
File remappedSources = new File(modStore, remappedFilename + "-sources.jar");
if (!remappedSources.exists() || sources.lastModified() <= 0 || sources.lastModified() > remappedSources.lastModified()) {