Merge commit 'af21d602' into exp/1.1

This commit is contained in:
Juuz
2023-02-16 20:46:17 +02:00
16 changed files with 137 additions and 26 deletions

View File

@@ -76,7 +76,6 @@ import net.fabricmc.loom.build.nesting.IncludedJarFactory.LazyNestedFile;
import net.fabricmc.loom.build.nesting.IncludedJarFactory.NestedFile;
import net.fabricmc.loom.build.nesting.JarNester;
import net.fabricmc.loom.configuration.accesswidener.AccessWidenerFile;
import net.fabricmc.loom.configuration.providers.minecraft.MinecraftSourceSets;
import net.fabricmc.loom.extension.MixinExtension;
import net.fabricmc.loom.task.service.MappingsService;
import net.fabricmc.loom.task.service.TinyRemapperService;
@@ -453,9 +452,7 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
}
@Override
protected List<String> getClientOnlyEntries() {
final SourceSet clientSourceSet = MinecraftSourceSets.Split.getClientSourceSet(getProject());
protected List<String> getClientOnlyEntries(SourceSet clientSourceSet) {
final ConfigurableFileCollection output = getProject().getObjects().fileCollection();
output.from(clientSourceSet.getOutput().getClassesDirs());
output.from(clientSourceSet.getOutput().getResourcesDir());