diff --git a/src/main/java/net/fabricmc/loom/AbstractPlugin.java b/src/main/java/net/fabricmc/loom/AbstractPlugin.java index 8c2fd9a..c20ea5f 100644 --- a/src/main/java/net/fabricmc/loom/AbstractPlugin.java +++ b/src/main/java/net/fabricmc/loom/AbstractPlugin.java @@ -87,11 +87,6 @@ public class AbstractPlugin implements Plugin { configureIDEs(); configureCompile(); - if(extension.refmapName == null || extension.refmapName.isEmpty()){ - project.getLogger().warn("Could not find refmap definition, will be using default name: " + project.getName() + "-refmap.json"); - extension.refmapName = project.getName() + "-refmap.json"; - } - Map> taskMap = project.getAllTasks(true); for (Map.Entry> entry : taskMap.entrySet()) { Project project = entry.getKey(); @@ -105,7 +100,7 @@ public class AbstractPlugin implements Plugin { try { javaCompileTask.getOptions().getCompilerArgs().add("-AinMapFileNamedIntermediary=" + extension.getMappingsProvider().MAPPINGS_TINY.getCanonicalPath()); javaCompileTask.getOptions().getCompilerArgs().add("-AoutMapFileNamedIntermediary=" + extension.getMappingsProvider().MAPPINGS_MIXIN_EXPORT.getCanonicalPath()); - javaCompileTask.getOptions().getCompilerArgs().add("-AoutRefMapFile=" + new File(javaCompileTask.getDestinationDir(), extension.refmapName).getCanonicalPath()); + javaCompileTask.getOptions().getCompilerArgs().add("-AoutRefMapFile=" + new File(javaCompileTask.getDestinationDir(), extension.getRefmapName()).getCanonicalPath()); javaCompileTask.getOptions().getCompilerArgs().add("-AdefaultObfuscationEnv=named:intermediary"); } catch (IOException e) { e.printStackTrace(); diff --git a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java index 345644d..34824d7 100644 --- a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java +++ b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java @@ -216,4 +216,13 @@ public class LoomGradleExtension { public void setDependencyManager(LoomDependencyManager dependencyManager) { this.dependencyManager = dependencyManager; } + + 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"; + } + + return refmapName; + } } diff --git a/src/main/java/net/fabricmc/loom/util/ModRemapper.java b/src/main/java/net/fabricmc/loom/util/ModRemapper.java index 3c2fcee..9c4c997 100644 --- a/src/main/java/net/fabricmc/loom/util/ModRemapper.java +++ b/src/main/java/net/fabricmc/loom/util/ModRemapper.java @@ -101,10 +101,8 @@ public class ModRemapper { throw new RuntimeException("Failed to reobfuscate JAR"); } - if (extension.refmapName != null && extension.refmapName.length() > 0) { - if (MixinRefmapHelper.addRefmapName(extension.refmapName, extension.getMixinJsonVersion(), modJarOutput)) { - project.getLogger().debug("Transformed mixin reference maps in output JAR!"); - } + if (MixinRefmapHelper.addRefmapName(extension.getRefmapName(), extension.getMixinJsonVersion(), modJarOutput)) { + project.getLogger().debug("Transformed mixin reference maps in output JAR!"); } try {