imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-04-02 13:37:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix Aw2At not being applied

Browse Source
This commit is contained in:
Juuz
2022-01-21 01:21:54 +02:00
parent 14db61e6e6
commit a7c3a9f740
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/net/fabricmc/loom/task/RemapJarTask.java
View File

@@ -169,13 +169,10 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
params.getForge().set(extension.isForge());
params.getMappingBuildServiceUuid().convention("this should be unavailable!");
params.getAtAccessWideners().set(getAtAccessWideners());
if (extension.isForge()) {
params.getAtAccessWideners().set(getAtAccessWideners());
if (!getAtAccessWideners().get().isEmpty()) {
params.getMappingBuildServiceUuid().set(UnsafeWorkQueueHelper.create(getProject(), MappingsService.createDefault(getProject(), getSourceNamespace().get(), getTargetNamespace().get())));
}
if (!getAtAccessWideners().get().isEmpty()) {
params.getMappingBuildServiceUuid().set(UnsafeWorkQueueHelper.create(getProject(), MappingsService.createDefault(getProject(), getSourceNamespace().get(), getTargetNamespace().get())));
}
});
}
@@ -324,7 +321,7 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
}
AccessTransformSet at = AccessTransformSet.create();
File jar = inputFile.toFile();
File jar = outputFile.toFile();
try (FileSystemUtil.Delegate fileSystem = FileSystemUtil.getJarFileSystem(jar, false)) {
FileSystem fs = fileSystem.get();

10
src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java
View File

@@ -40,6 +40,8 @@ import org.gradle.api.tasks.bundling.Jar;
import net.fabricmc.loom.LoomGradleExtension;
import net.fabricmc.loom.util.Constants;
import net.fabricmc.loom.util.PropertyUtil;
import net.fabricmc.loom.util.aw2at.Aw2At;
public class RemapTaskConfiguration {
public static final String REMAP_JAR_TASK_NAME = "remapJar";
@@ -91,6 +93,14 @@ public class RemapTaskConfiguration {
});
}
}
project.afterEvaluate(p -> {
if (extension.isForge()) {
if (PropertyUtil.getAndFinalize(extension.getForge().getConvertAccessWideners())) {
Aw2At.setup(project, remapJarTask);
}
}
});
}
private static void trySetupSourceRemapping(Project project) {