diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-05-14 06:56:18 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-05-14 06:56:18 +0800 |
| commit | dd5e6df3aeff2fd63b4c3f42eca445d2f52caa34 (patch) | |
| tree | 74f791c46f9145ae19300f36501fae3dbfc95739 /src/main/java/net/fabricmc/loom/build | |
| parent | ec2b47fa140750c45038c0dfb8a4b06ac35cb456 (diff) | |
| download | architectury-loom-dd5e6df3aeff2fd63b4c3f42eca445d2f52caa34.tar.gz architectury-loom-dd5e6df3aeff2fd63b4c3f42eca445d2f52caa34.tar.bz2 architectury-loom-dd5e6df3aeff2fd63b4c3f42eca445d2f52caa34.zip | |
Fix merge conflicts
Signed-off-by: shedaniel <daniel@shedaniel.me>
Diffstat (limited to 'src/main/java/net/fabricmc/loom/build')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java b/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java index fb4dbe6c..5f72791e 100644 --- a/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java +++ b/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java @@ -82,7 +82,7 @@ public class ModCompileRemapper { String name = artifact.getModuleVersion().getId().getName(); String version = artifact.getModuleVersion().getId().getVersion(); - if (!shouldRemapMod(logger, artifact, extension.isForge(), sourceConfig.getName())) { + if (!shouldRemapMod(logger, artifact, extension.isForge(), sourceConfig.getName())) { addToRegularCompile(project, regularConfig, artifact); continue; } @@ -95,7 +95,7 @@ public class ModCompileRemapper { modDependencies.add(info); - String remappedLog = group + ":" + name + ":" + version + (artifact.getClassifier() == null ? "" : ":" + artifact.getClassifier()) + " (" + mappingsSuffix + ")" + (info.requiresRemapping() ? " requires remapping" : " already remapped in " + info.getRemappedOutput().getAbsolutePath()); + String remappedLog = group + ":" + name + ":" + version + (artifact.getClassifier() == null ? "" : ":" + artifact.getClassifier()) + " (" + mappingsSuffix + ")" + (info.requiresRemapping() ? " requires remapping" : " already remapped in " + info.getRemappedOutput().getAbsolutePath()); project.getLogger().info(":providing " + remappedLog); File remappedSources = info.getRemappedOutput("sources"); @@ -119,7 +119,7 @@ public class ModCompileRemapper { // Add all of the remapped mods onto the config for (ModDependencyInfo info : modDependencies) { - project.getLogger().info(":adding " + info.toString() + " into " + info.targetConfig.getName()); + project.getLogger().info(":adding " + info.toString() + " into " + info.targetConfig.getName()); project.getDependencies().add(info.targetConfig.getName(), info.getRemappedNotation()); } }); |