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

AbstractRemapJarTask: Fix manifest attributes not being inherited from input

Browse Source
This commit is contained in:
Juuz
2025-11-03 15:14:12 +02:00
parent c11fdb8756
commit 680d26fb46
2 changed files with 50 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/main/java/net/fabricmc/loom/task/AbstractRemapJarTask.java
View File

@@ -34,6 +34,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.jar.Attributes;
import java.util.jar.Manifest;
import javax.inject.Inject;
@@ -69,12 +70,19 @@ import net.fabricmc.loom.task.service.JarManifestService;
import net.fabricmc.loom.util.Check;
import net.fabricmc.loom.util.Constants;
import net.fabricmc.loom.util.ExceptionUtil;
import net.fabricmc.loom.util.ModPlatform;
import net.fabricmc.loom.util.ZipReprocessorUtil;
import net.fabricmc.loom.util.ZipUtils;
import net.fabricmc.loom.util.gradle.SourceSetHelper;
import net.fabricmc.loom.util.service.ScopedServiceFactory;
public abstract class AbstractRemapJarTask extends Jar {
/**
* The main input jar to remap.
* Other contents can be added to this task, but this jar must always be present.
*
* <p>The input file's manifest will be copied into the remapped jar.
*/
@InputFile
public abstract RegularFileProperty getInputFile();
@@ -117,6 +125,10 @@ public abstract class AbstractRemapJarTask extends Jar {
@Optional
protected abstract Property<ClientEntriesService.Options> getClientEntriesServiceOptions();
@Input
@ApiStatus.Internal
protected abstract Property<ModPlatform> getModPlatform();
private final Provider<JarManifestService> jarManifestServiceProvider;
@Inject
@@ -138,12 +150,15 @@ public abstract class AbstractRemapJarTask extends Jar {
jarManifestServiceProvider = JarManifestService.get(getProject());
usesService(jarManifestServiceProvider);
getModPlatform().value(LoomGradleExtension.get(getProject()).getPlatform()).finalizeValue();
}
public final <P extends AbstractRemapParams> void submitWork(Class<? extends AbstractRemapAction<P>> workAction, Action<P> action) {
final WorkQueue workQueue = getWorkerExecutor().noIsolation();
workQueue.submit(workAction, params -> {
params.getMainInputFile().set(getInputFile());
params.getArchiveFile().set(getArchiveFile());
params.getSourceNamespace().set(getSourceNamespace());
@@ -155,6 +170,8 @@ public abstract class AbstractRemapJarTask extends Jar {
params.getJarManifestService().set(jarManifestServiceProvider);
params.getEntryCompression().set(getEntryCompression());
params.getPlatform().set(getModPlatform());
if (getIncludesClientOnlyClasses().get()) {
final List<String> clientOnlyEntries;
@@ -182,6 +199,7 @@ public abstract class AbstractRemapJarTask extends Jar {
protected abstract Provider<? extends ClientEntriesService.Options> getClientOnlyEntriesOptionsProvider(SourceSet clientSourceSet);
public interface AbstractRemapParams extends WorkParameters {
RegularFileProperty getMainInputFile();
RegularFileProperty getArchiveFile();
Property<String> getSourceNamespace();
@@ -207,6 +225,8 @@ public abstract class AbstractRemapJarTask extends Jar {
MapProperty<String, String> getManifestAttributes();
ListProperty<String> getClientOnlyEntries();
Property<ModPlatform> getPlatform();
}
protected void applyClientOnlyManifestAttributes(AbstractRemapParams params, List<String> entries) {
@@ -249,8 +269,17 @@ public abstract class AbstractRemapJarTask extends Jar {
int count = ZipUtils.transform(outputFile, Map.of(Constants.Manifest.PATH, bytes -> {
var manifest = new Manifest(new ByteArrayInputStream(bytes));
getParameters().getJarManifestService().get().apply(manifest, getParameters().getManifestAttributes().get());
manifest.getMainAttributes().putValue(Constants.Manifest.MAPPING_NAMESPACE, getParameters().getTargetNamespace().get());
if (!getParameters().getPlatform().get().isForgeLike()) {
getParameters().getJarManifestService().get().apply(manifest, getParameters().getManifestAttributes().get());
manifest.getMainAttributes().putValue(Constants.Manifest.MAPPING_NAMESPACE, getParameters().getTargetNamespace().get());
}
byte[] sourceManifestBytes = ZipUtils.unpackNullable(getParameters().getMainInputFile().get().getAsFile().toPath(), Constants.Manifest.PATH);
if (sourceManifestBytes != null) {
var sourceManifest = new Manifest(new ByteArrayInputStream(sourceManifestBytes));
mergeManifests(manifest, sourceManifest);
}
ByteArrayOutputStream out = new ByteArrayOutputStream();
manifest.write(out);
@@ -269,6 +298,24 @@ public abstract class AbstractRemapJarTask extends Jar {
ZipReprocessorUtil.reprocessZip(outputFile, isReproducibleFileOrder, isPreserveFileTimestamps, compression);
}
}
private static void mergeManifests(Manifest target, Manifest source) {
mergeAttributes(target.getMainAttributes(), source.getMainAttributes());
source.getEntries().forEach((name, sourceAttributes) -> {
final Attributes targetAttributes = target.getAttributes(name);
if (targetAttributes != null) {
mergeAttributes(targetAttributes, sourceAttributes);
} else {
target.getEntries().put(name, sourceAttributes);
}
});
}
private static void mergeAttributes(Attributes target, Attributes source) {
source.forEach(target::putIfAbsent);
}
}
@Deprecated

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

@@ -142,10 +142,6 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
@Optional
public abstract RegularFileProperty getInjectedAccessWidenerPath();
@Input
@ApiStatus.Internal
protected abstract Property<ModPlatform> getModPlatform();
@Input
@ApiStatus.Internal
public abstract Property<Boolean> getUseMixinAP();
@@ -179,8 +175,6 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
getTinyRemapperServiceOptions().set(TinyRemapperService.createOptions(this));
getMixinRefmapServiceOptions().set(MixinRefmapService.createOptions(this));
getModPlatform().value(LoomGradleExtension.get(getProject()).getPlatform()).finalizeValue();
getInjectedAccessWidenerPath().convention(LoomGradleExtension.get(getProject()).getAccessWidenerPath());
}
@@ -211,8 +205,6 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
throw new RuntimeException("Forge must have useLegacyMixinAp enabled");
}
params.getPlatform().set(getModPlatform());
if (getInjectAccessWidener().get() && getInjectedAccessWidenerPath().isPresent()) {
params.getInjectAccessWidener().set(getInjectedAccessWidenerPath());
}
@@ -229,8 +221,6 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
ConfigurableFileCollection getRemapClasspath();
Property<ModPlatform> getPlatform();
RegularFileProperty getInjectAccessWidener();
Property<Boolean> getReadMixinConfigsFromManifest();
SetProperty<String> getAtAccessWideners();
@@ -280,6 +270,7 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
remapAccessWidener();
}
modifyJarManifest(); // Arch: must be executed before refmaps are added for the MixinConfigs attr
addRefmaps(serviceFactory);
addNestedJars();
@@ -294,10 +285,6 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
convertQmj5();
}
if (!getParameters().getPlatform().get().isForgeLike()) {
modifyJarManifest();
}
rewriteJar();
if (getParameters().getOptimizeFmj().get()) {