imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-03-30 21:05:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '3c3225900123390868a718f5553d552bd0385000' into dev/1.8

Browse Source
This commit is contained in:
shedaniel
2024-11-16 19:27:08 +08:00
parent abe3ef2ef2 3c32259001
commit 24e5aeb201
37 changed files with 1271 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -157,10 +157,6 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
getUseMixinAP().set(LoomGradleExtension.get(getProject()).getMixin().getUseLegacyMixinAp());
if (getLoomExtension().multiProjectOptimisation()) {
setupPreparationTask();
}
// Make outputs reproducible by default
setReproducibleFileOrder(true);
setPreserveFileTimestamps(false);
@@ -168,19 +164,6 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
getJarType().set("classes");
}
private void setupPreparationTask() {
PrepareJarRemapTask prepareJarTask = getProject().getTasks().create("prepare" + getName().substring(0, 1).toUpperCase() + getName().substring(1), PrepareJarRemapTask.class, this);
dependsOn(prepareJarTask);
mustRunAfter(prepareJarTask);
getProject().getGradle().allprojects(project -> {
project.getTasks()
.withType(PrepareJarRemapTask.class)
.configureEach(this::mustRunAfter);
});
}
@TaskAction
public void run() {
final LoomGradleExtension extension = LoomGradleExtension.get(getProject());
@@ -194,8 +177,6 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
params.getTinyRemapperBuildServiceUuid().set(UnsafeWorkQueueHelper.create(getTinyRemapperService()));
params.getRemapClasspath().from(getClasspath());
params.getMultiProjectOptimisation().set(getLoomExtension().multiProjectOptimisation());
final boolean mixinAp = getUseMixinAP().get();
params.getUseMixinExtension().set(!mixinAp);
@@ -280,7 +261,6 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
SetProperty<String> getAtAccessWideners();
Property<Boolean> getUseMixinExtension();
Property<Boolean> getMultiProjectOptimisation();
Property<Boolean> getOptimizeFmj();
record RefmapData(List<String> mixinConfigs, String refmapName) implements Serializable { }
@@ -307,9 +287,7 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
try {
LOGGER.info("Remapping {} to {}", inputFile, outputFile);
if (!getParameters().getMultiProjectOptimisation().getOrElse(false)) {
prepare();
}
prepare();
if (tinyRemapperService != null) {
tinyRemapper = tinyRemapperService.getTinyRemapperForRemapping();
@@ -341,7 +319,7 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
optimizeFMJ();
}
if (tinyRemapperService != null && !getParameters().getMultiProjectOptimisation().get()) {
if (tinyRemapperService != null) {
tinyRemapperService.close();
}
@@ -361,7 +339,7 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
final Path inputFile = getParameters().getInputFile().getAsFile().get().toPath();
if (tinyRemapperService != null) {
PrepareJarRemapTask.prepare(tinyRemapperService, inputFile);
tinyRemapperService.getTinyRemapperForInputs().readInputsAsync(tinyRemapperService.getOrCreateTag(inputFile), inputFile);
}
}