Merge 1.7, part 2

This commit is contained in:
Juuz
2024-07-01 19:28:43 +03:00
18 changed files with 454 additions and 324 deletions

View File

@@ -43,6 +43,7 @@ import org.gradle.api.tasks.bundling.AbstractArchiveTask;
import org.gradle.jvm.tasks.Jar;
import net.fabricmc.loom.LoomGradleExtension;
import net.fabricmc.loom.build.nesting.NestableJarGenerationTask;
import net.fabricmc.loom.util.Constants;
import net.fabricmc.loom.util.PropertyUtil;
import net.fabricmc.loom.util.aw2at.Aw2At;
@@ -76,6 +77,12 @@ public abstract class RemapTaskConfiguration implements Runnable {
return;
}
Configuration includeConfiguration = getProject().getConfigurations().getByName(Constants.Configurations.INCLUDE_INTERNAL);
getTasks().register(Constants.Task.PROCESS_INCLUDE_JARS, NestableJarGenerationTask.class, task -> {
task.from(includeConfiguration);
task.getOutputDirectory().set(getProject().getLayout().getBuildDirectory().dir(task.getName()));
});
Action<RemapJarTask> remapJarTaskAction = task -> {
final AbstractArchiveTask jarTask = getTasks().named(JavaPlugin.JAR_TASK_NAME, AbstractArchiveTask.class).get();