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

Merge remote-tracking branch 'upstream/dev/1.0' into dev/1.0

Browse Source
This commit is contained in:
Juuz
2022-12-11 15:40:24 +02:00
parent 892da2826a ec76760ca4
commit 8dad64dc66
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@ import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -93,6 +94,9 @@ public abstract class AbstractRemapJarTask extends Jar {
@Input
public abstract Property<Boolean> getIncludesClientOnlyClasses();
@Input
public abstract ListProperty<String> getAdditionalClientOnlyEntries();
@Inject
public AbstractRemapJarTask() {
getSourceNamespace().convention(MappingsNamespace.NAMED.toString()).finalizeValueOnRead();
@@ -117,7 +121,8 @@ public abstract class AbstractRemapJarTask extends Jar {
params.getJarManifestService().set(JarManifestService.get(getProject()));
if (getIncludesClientOnlyClasses().get()) {
final List<String> clientOnlyEntries = getClientOnlyEntries();
final List<String> clientOnlyEntries = new ArrayList<>(getClientOnlyEntries());
clientOnlyEntries.addAll(getAdditionalClientOnlyEntries().get());
applyClientOnlyManifestAttributes(params, clientOnlyEntries);
params.getClientOnlyEntries().set(clientOnlyEntries.stream().filter(s -> s.endsWith(".class")).toList());
}