Skip to content

Make fabric.mod.json path configurable at configuration stage. #1364

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

Merged
merged 9 commits into from
Oct 3, 2025
Merged

Make fabric.mod.json path configurable at configuration stage. #1364

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1c86983
Add `fabric.mod.json` path property.
kikugie Sep 5, 2025
1159657
Add path provider integration tests.
kikugie Sep 5, 2025
87cb7b7
Separate fabric.mod.json reading methods and move selection to the he…
kikugie Sep 10, 2025
4dceae8
Separate FMJ getter methods and add configuration to datagen and test…
kikugie Sep 11, 2025
5f92ab2
Remove the `fabricModJsonPath` property from Fabric API source sets
kikugie Oct 2, 2025
4f790ba
Address review requests by fixing formatting and removing redundant c…
kikugie Oct 2, 2025
a932931
Fix build
modmuss50 Oct 3, 2025
af18d97
Move tests to existing file, and remove var usage.
modmuss50 Oct 3, 2025
23f97b1
Fix build :)
modmuss50 Oct 3, 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
2 changes: 2 additions & 0 deletions src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ public interface LoomGradleExtensionAPI {

RegularFileProperty getAccessWidenerPath();

RegularFileProperty getFabricModJsonPath();

NamedDomainObjectContainer<DecompilerOptions> getDecompilerOptions();

void decompilers(Action<NamedDomainObjectContainer<DecompilerOptions>> action);
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ public abstract class LoomGradleExtensionApiImpl implements LoomGradleExtensionA
protected final ListProperty<JarProcessor> jarProcessors;
protected final ConfigurableFileCollection log4jConfigs;
protected final RegularFileProperty accessWidener;
protected final RegularFileProperty fabricModJsonPath;
protected final ManifestLocations versionsManifests;
protected final Property<String> customMetadata;
protected final SetProperty<String> knownIndyBsms;
Expand Down Expand Up @@ -118,6 +119,7 @@ protected LoomGradleExtensionApiImpl(Project project, LoomFiles directories) {
.empty();
this.log4jConfigs = project.files(directories.getDefaultLog4jConfigFile());
this.accessWidener = project.getObjects().fileProperty();
this.fabricModJsonPath = project.getObjects().fileProperty();
this.versionsManifests = new ManifestLocations();
this.versionsManifests.add("mojang", MirrorUtil.getVersionManifests(project), -2);
this.versionsManifests.add("fabric_experimental", MirrorUtil.getExperimentalVersions(project), -1);
Expand Down Expand Up @@ -205,6 +207,11 @@ public RegularFileProperty getAccessWidenerPath() {
return accessWidener;
}

@Override
public RegularFileProperty getFabricModJsonPath() {
return fabricModJsonPath;
}

@Override
public NamedDomainObjectContainer<DecompilerOptions> getDecompilerOptions() {
return decompilers;
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/net/fabricmc/loom/util/fmj/FabricModJsonFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@

import com.google.gson.JsonObject;
import com.google.gson.JsonSyntaxException;
import net.fabricmc.loom.api.LoomGradleExtensionAPI;
import org.gradle.api.Project;
import org.gradle.api.file.RegularFileProperty;
import org.gradle.api.tasks.SourceSet;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.VisibleForTesting;
Expand Down Expand Up @@ -109,7 +111,10 @@ public static Optional<FabricModJson> createFromZipOptional(Path zipPath) {

@Nullable
public static FabricModJson createFromSourceSetsNullable(Project project, SourceSet... sourceSets) throws IOException {
final File file = SourceSetHelper.findFirstFileInResource(FABRIC_MOD_JSON, project, sourceSets);
final RegularFileProperty fmjPath = project.getExtensions().getByType(LoomGradleExtensionAPI.class).getFabricModJsonPath();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I dont think this right place to do this, FabricModJsonHelpers.getModsInProject is the place for it.

Copy link
Author

@kikugie kikugie Sep 5, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What exactly? My implementation was based on the fact that the createFromSourceSetsNullable method is called from the Loom and Fabric API extensions (LoomGradleExtensionApiImpl.getModVersion and FabricApiAbstractSourceSet.configureSourceSet), so using the property here would provide the desired file to those too.

final File file = fmjPath.isPresent()
? fmjPath.getAsFile().get()
: SourceSetHelper.findFirstFileInResource(FABRIC_MOD_JSON, project, sourceSets);

if (file == null) {
return null;
Expand Down