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

[Non-Obf]: Support JIJ with the regular jar task (#1425)

Browse Source 
* Implement JIJ for jar task

* Implement JIJ for jar task, now without beeing a dumbass

* Reimplement old task, decouple

* reimplement last missing functionality

* fix checkstyle

* fix checkstyle v2

* fix checkstyle v3

* Remove dead / unneccesary check

* Cleanup / Code-Style

* Cleanup / Code-Style v2
This commit is contained in:
Finn Rades
2025-11-07 20:10:28 +01:00
committed by GitHub
parent e50fce87cc
commit 3a2a67bffe
9 changed files with 239 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java
View File

@@ -67,17 +67,18 @@ public abstract class RemapTaskConfiguration implements Runnable {
SyncTaskBuildService.register(getProject());
if (extension.dontRemapOutputs()) {
extension.getUnmappedModCollection().from(getTasks().getByName(JavaPlugin.JAR_TASK_NAME));
return;
}
Configuration includeConfiguration = getProject().getConfigurations().getByName(Constants.Configurations.INCLUDE_INTERNAL);
getTasks().register(Constants.Task.PROCESS_INCLUDE_JARS, NestableJarGenerationTask.class, task -> {
TaskProvider<NestableJarGenerationTask> processIncludeJarsTask = getTasks().register(Constants.Task.PROCESS_INCLUDE_JARS, NestableJarGenerationTask.class, task -> {
task.from(includeConfiguration);
task.getOutputDirectory().set(getProject().getLayout().getBuildDirectory().dir(task.getName()));
});
if (extension.dontRemapOutputs()) {
new NonRemappedJarTaskConfiguration(getProject(), extension, processIncludeJarsTask).configure();
return;
}
// Remapping needed - use the traditional remapJar task with JIJ support (original logic)
Action<RemapJarTask> remapJarTaskAction = task -> {
final TaskProvider<AbstractArchiveTask> jarTask = getTasks().named(JavaPlugin.JAR_TASK_NAME, AbstractArchiveTask.class);