Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed the publish of reobfuscated jars #232

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+9 −3
Open

Changed the publish of reobfuscated jars #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20b189d
Changed the publication of reobfuscated jars
Icosider Jan 29, 2025
f6401e4
Removed wildcard import
Icosider Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/legacy/java/net/neoforged/moddevgradle/legacyforge/dsl/ObfuscationExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,15 @@ public TaskProvider<RemapJar> reobfuscate(TaskProvider<? extends AbstractArchive
// Move plain jars into a subdirectory to be able to maintain the same classifier for the reobfuscated version
task.getDestinationDirectory().set(task.getProject().getLayout().getBuildDirectory().dir("devlibs"));
});
return reobf;
}

// Replace the publication of the jar task with the reobfuscated jar
/**
* Replace the publication of the jar task with the reobfuscated jar
*
* @param reobf the remapJar task to replace
*/
public void publishReobfuscated(TaskProvider<RemapJar> reobf) {
var configurations = project.getConfigurations();
var java = (AdhocComponentWithVariants) project.getComponents().getByName("java");
for (var configurationName : List.of(JavaPlugin.RUNTIME_ELEMENTS_CONFIGURATION_NAME, JavaPlugin.API_ELEMENTS_CONFIGURATION_NAME)) {
Expand All @@ -146,8 +153,6 @@ public TaskProvider<RemapJar> reobfuscate(TaskProvider<? extends AbstractArchive
java.withVariantsFromConfiguration(config, ConfigurationVariantDetails::skip);
java.addVariantsFromConfiguration(reobfConfig, spec -> {});
}

return reobf;
}

private static <T> void copyAttribute(Project project, Attribute<T> attribute, Configuration fromConfig, Configuration toConfig) {
Expand Down
1 change: 1 addition & 0 deletions src/legacy/java/net/neoforged/moddevgradle/legacyforge/internal/LegacyForgeModDevPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ public void enable(Project project, LegacyForgeModdingSettings settings, LegacyF
var reobfJar = obf.reobfuscate(
project.getTasks().named(JavaPlugin.JAR_TASK_NAME, Jar.class),
project.getExtensions().getByType(SourceSetContainer.class).getByName(SourceSet.MAIN_SOURCE_SET_NAME));
obf.publishReobfuscated(reobfJar);

project.getTasks().named("assemble", assemble -> assemble.dependsOn(reobfJar));

Expand Down