From 705754de804a408589df32e7d1efdf797d0f8b6a Mon Sep 17 00:00:00 2001 From: Juuxel <6596629+Juuxel@users.noreply.github.com> Date: Sun, 29 Dec 2019 19:29:19 +0200 Subject: [PATCH] Change mixin refmap default name to use archivesBaseName instead of the project name (#158) * Change mixin refmap default name to use archivesBaseName instead of the project name Using the project name can be problematic in libraries pulled in with Jitpack. Jitpack clones projects in a directory called "build", which sets the project name to "build" if not manually defined. The resulting refmap, "build-refmap.json", can conflict with other mods' refmaps, leading to mixin crashes. * Shut up checkstyle --- src/main/java/net/fabricmc/loom/LoomGradleExtension.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java index 7a05416..bbef924 100644 --- a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java +++ b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java @@ -43,6 +43,7 @@ import org.cadixdev.mercury.Mercury; import org.gradle.api.Project; import org.gradle.api.artifacts.Configuration; import org.gradle.api.artifacts.Dependency; +import org.gradle.api.plugins.BasePluginConvention; import net.fabricmc.loom.providers.MappingsProvider; import net.fabricmc.loom.providers.MinecraftMappedProvider; @@ -284,8 +285,9 @@ public class LoomGradleExtension { public String getRefmapName() { if (refmapName == null || refmapName.isEmpty()) { - project.getLogger().warn("Could not find refmap definition, will be using default name: " + project.getName() + "-refmap.json"); - refmapName = project.getName() + "-refmap.json"; + String defaultRefmapName = project.getConvention().getPlugin(BasePluginConvention.class).getArchivesBaseName() + "-refmap.json"; + project.getLogger().warn("Could not find refmap definition, will be using default name: " + defaultRefmapName); + refmapName = defaultRefmapName; } return refmapName;