RemapJarTask: Support config cache for Aw2At

architectury · Dec 6, 2024 · ea3d34b · ea3d34b
1 parent ef2f09a
commit ea3d34b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/src/main/java/dev/architectury/loom/extensions/ModBuildExtensions.java b/src/main/java/dev/architectury/loom/extensions/ModBuildExtensions.java
@@ -19,6 +19,7 @@
 import dev.architectury.at.AccessTransformSet;
 import dev.architectury.at.io.AccessTransformFormats;
 import org.gradle.api.provider.Property;
+import org.gradle.api.provider.Provider;
 import org.gradle.api.provider.SetProperty;
 import org.jetbrains.annotations.Nullable;
 
@@ -49,13 +50,7 @@ public static Set<String> readMixinConfigsFromManifest(File jarFile) {
 		}
 	}
 
-	public static void convertAwToAt(ServiceFactory serviceFactory, SetProperty<String> atAccessWidenersProperty, Path outputFile, Property<MappingsService.Options> options) throws IOException {
-		if (!atAccessWidenersProperty.isPresent()) {
-			return;
-		}
-
-		Set<String> atAccessWideners = atAccessWidenersProperty.get();
-
+	public static void convertAwToAt(ServiceFactory serviceFactory, Set<String> atAccessWideners, Path outputFile, Provider<MappingsService.Options> options) throws IOException {
 		if (atAccessWideners.isEmpty()) {
 			return;
 		}

diff --git a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java
@@ -212,10 +212,6 @@ public void run() {
 			params.getReadMixinConfigsFromManifest().set(getReadMixinConfigsFromManifest());
 			params.getAtAccessWideners().set(getAtAccessWideners());
 
-			if (!getAtAccessWideners().get().isEmpty()) {
-				params.getMappingsServiceOptions().set(MappingsService.createOptionsWithProjectMappings(getProject(), getSourceNamespace(), getTargetNamespace()));
-			}
-
 			params.getOptimizeFmj().set(getOptimizeFabricModJson().get());
 		});
 	}
@@ -236,7 +232,6 @@ public interface RemapParams extends AbstractRemapParams {
 
 		Property<TinyRemapperService.Options> getTinyRemapperServiceOptions();
 		ListProperty<MixinRefmapService.Options> getMixinRefmapServiceOptions();
-		Property<MappingsService.Options> getMappingsServiceOptions();
 	}
 
 	public abstract static class RemapAction extends AbstractRemapAction<RemapParams> {
@@ -277,7 +272,13 @@ public void execute() {
 
 				addRefmaps(serviceFactory);
 				addNestedJars();
-				ModBuildExtensions.convertAwToAt(serviceFactory, getParameters().getAtAccessWideners(), outputFile, getParameters().getMappingsServiceOptions());
+
+				if (getParameters().getAtAccessWideners().isPresent()) {
+					final Provider<MappingsService.Options> mappingsServiceOptions = getParameters().getTinyRemapperServiceOptions()
+							.flatMap(TinyRemapperService.Options::getMappings)
+							.map(mappingsOptions -> mappingsOptions.get(0));
+					ModBuildExtensions.convertAwToAt(serviceFactory, getParameters().getAtAccessWideners().get(), outputFile, mappingsServiceOptions);
+				}
 
 				if (!getParameters().getPlatform().get().isForgeLike()) {
 					modifyJarManifest();