Add option to disable auto skip remap

architectury · Nov 22, 2023 · 072d4b3 · 072d4b3
1 parent 5b63d05
commit 072d4b3
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 17 deletions.
diff --git a/src/main/java/net/fabricmc/loom/task/AbstractRemapJarTask.java b/src/main/java/net/fabricmc/loom/task/AbstractRemapJarTask.java
@@ -112,6 +112,11 @@ public abstract class AbstractRemapJarTask extends Jar {
 	@ApiStatus.Internal
 	public abstract Property<String> getJarType();
 
+	@ApiStatus.Experimental
+	@Input
+	@Optional
+	public abstract Property<Boolean> getAutoSkipRemap();
+
 	private final Provider<JarManifestService> jarManifestServiceProvider;
 
 	@Inject
@@ -126,6 +131,20 @@ public AbstractRemapJarTask() {
 		usesService(jarManifestServiceProvider);
 	}
 
+	protected final <P extends AbstractRemapParams> void autoSkipRemap(LoomGradleExtension extension, P params) {
+		if (getAutoSkipRemap().getOrElse(true) && shouldSkipRemap(extension)) {
+			params.getSourceNamespace().set(getTargetNamespace());
+		}
+	}
+
+	private boolean shouldSkipRemap(LoomGradleExtension extension) {
+		return extension.isNeoForge()
+				&& extension.getMappingConfiguration() instanceof FieldMigratedMappingConfiguration c
+				&& c.isMojangMappedProject()
+				&& MappingsNamespace.of(this.getSourceNamespace().get()) == MappingsNamespace.NAMED
+				&& MappingsNamespace.of(this.getTargetNamespace().get()) == MappingsNamespace.MOJANG;
+	}
+
 	public final <P extends AbstractRemapParams> void submitWork(Class<? extends AbstractRemapAction<P>> workAction, Action<P> action) {
 		final WorkQueue workQueue = getWorkerExecutor().noIsolation();
 
@@ -160,15 +179,6 @@ public final <P extends AbstractRemapParams> void submitWork(Class<? extends Abs
 
 	protected abstract List<String> getClientOnlyEntries(SourceSet sourceSet);
 
-	@ApiStatus.Internal
-	public boolean shouldSkipRemap(LoomGradleExtension extension) {
-		return extension.isNeoForge()
-				&& extension.getMappingConfiguration() instanceof FieldMigratedMappingConfiguration c
-				&& c.isMojangMappedProject()
-				&& MappingsNamespace.of(this.getSourceNamespace().get()) == MappingsNamespace.NAMED
-				&& MappingsNamespace.of(this.getTargetNamespace().get()) == MappingsNamespace.MOJANG;
-	}
-
 	public interface AbstractRemapParams extends WorkParameters {
 		RegularFileProperty getInputFile();
 		RegularFileProperty getOutputFile();

diff --git a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java
@@ -200,11 +200,9 @@ private void setupPreparationTask() {
 	public void run() {
 		final LoomGradleExtension extension = LoomGradleExtension.get(getProject());
 
-		if (shouldSkipRemap(extension)) {
-			getSourceNamespace().convention(getTargetNamespace());
-		}
-
 		submitWork(RemapAction.class, params -> {
+			autoSkipRemap(extension, params);
+
 			if (getAddNestedDependencies().get()) {
 				params.getNestedJars().from(getNestedJars());
 

diff --git a/src/main/java/net/fabricmc/loom/task/RemapSourcesJarTask.java b/src/main/java/net/fabricmc/loom/task/RemapSourcesJarTask.java
@@ -61,11 +61,9 @@ public RemapSourcesJarTask() {
 	public void run() {
 		final LoomGradleExtension extension = LoomGradleExtension.get(getProject());
 
-		if (shouldSkipRemap(extension)) {
-			getSourceNamespace().convention(getTargetNamespace());
-		}
-
 		submitWork(RemapSourcesAction.class, params -> {
+			autoSkipRemap(extension, params);
+
 			if (!params.namespacesMatch()) {
 				params.getSourcesRemapperServiceUuid().set(UnsafeWorkQueueHelper.create(SourceRemapperService.create(serviceManagerProvider.get().get(), this)));
 			}